From: Felix Paul Kühne Date: Sun, 14 Mar 2010 23:41:05 +0000 (+0100) Subject: legacy OS X intf: fixed playlist table view as hinted by Derk-Jan X-Git-Tag: 1.1.0-pre1~379 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=66341dc15b6dbe8b153f5668e3630b76c99321f3;p=vlc legacy OS X intf: fixed playlist table view as hinted by Derk-Jan --- diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib index 900aa3e01b..7883c89c0d 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib @@ -12,8 +12,9 @@ YES - + + YES @@ -2897,220 +2898,42 @@ VLCEqualizer - + 274 YES - - - 290 - {{120, 9}, {331, 14}} - - YES - - 67239424 - 138412032 - Statusbar - - - - - - - - - 292 - {{14, 5}, {33, 20}} - - YES - - 67239424 - 134217728 - - - LucidaGrande-Bold - 15 - 16 - - - 138690815 - 2 - - NSImage - add_embedded - - - NSImage - add_embedded_blue - - - - 400 - 75 - - - - - 289 - {{452, 5}, {110, 22}} - - YES - - 343014976 - 268436480 - - - LucidaGrande - 13 - 1044 - - - YES - 1 - - 6 - System - textBackgroundColor - - 3 - MQA - - - - - 130560 - 0 - search - - _searchFieldSearch: - - 138690815 - 0 - - 400 - 75 - - - 130560 - 0 - clear - - YES - - YES - - YES - AXDescription - NSAccessibilityEncodedAttributesValueType - - - YES - cancel - - - - - - _searchFieldCancel: - - 138690815 - 0 - - 400 - 75 - - VLC media player search - 10 - - - - - 292 - {{84, 5}, {33, 20}} - - YES - - 67239424 - 134217728 - - - - 138690815 - 2 - - NSImage - repeat_embedded - - - NSImage - repeat_single_embedded_blue - - - - 200 - 25 - - - - - 292 - {{49, 5}, {33, 20}} - - YES - - 67239424 - 134217728 - - - - -935051009 - 2 - - NSImage - shuffle_embedded - - - NSImage - shuffle_embedded_blue - - - - 200 - 25 - - - + 274 YES - - + + 2304 YES - - + + 274 {574, 33} - + YES - - + + 256 {574, 17} - - + + - - + + -2147483392 - {{560, 0}, {16, 17}} - + {{-26, 0}, {16, 17}} + YES - + status 16 16 @@ -3124,7 +2947,10 @@ 6 System headerColor - + + 3 + MQA + 6 @@ -3133,7 +2959,7 @@ - + 67239424 33685504 @@ -3145,11 +2971,11 @@ 3 YES YES - + - + name - 316 + 309 16 1000 @@ -3157,25 +2983,25 @@ 2048 Name - + 3 MC4zMzMzMzI5OQA - + 67239488 272761856 - + 3 YES - + - + artist 170 20 @@ -3185,22 +3011,22 @@ 2048 Artist - + - + 67239488 272761856 - + 2 YES - + - + duration 60 60 @@ -3213,17 +3039,17 @@ - + 67239488 272761856 - + 2 YES - + 3 @@ -3254,63 +3080,240 @@ 0 YES 0 + {{1, 17}, {574, 33}} - - - + + + 4 - - + + -2147483392 - {{560, 17}, {15, 33}} - - + {{560, 17}, {15, 18}} + + _doScroller: - 0.13865546882152557 + 0.54545456171035767 + + + + -2147483392 + {{1, 35}, {559, 15}} + + 1 + + _doScroller: + 0.97785347700119019 + + + + 2304 + + YES + + + {{1, 0}, {574, 17}} + + + + + 4 + + + + {{0, 30}, {576, 51}} + + + 562 + + + + + + QSAAAEEgAABBiAAAQYgAAA + + + + 290 + {{120, 9}, {331, 14}} + + YES + + 67239424 + 138412032 + Statusbar + + + + + + + + + 292 + {{14, 5}, {33, 20}} + + YES + + 67239424 + 134217728 + + + LucidaGrande-Bold + 15 + 16 + + + 138690815 + 2 + + NSImage + add_embedded + + + NSImage + add_embedded_blue + + + + 400 + 75 + + + + + 289 + {{452, 5}, {110, 22}} + + YES + + 343014976 + 268436480 + + + LucidaGrande + 13 + 1044 + + + YES + 1 + + 6 + System + textBackgroundColor + + + + + 130560 + 0 + search + + _searchFieldSearch: + + 138690815 + 0 + + 400 + 75 + + + 130560 + 0 + clear + + YES + + YES + + YES + AXDescription + NSAccessibilityEncodedAttributesValueType + + + YES + cancel + + + + + + _searchFieldCancel: + + 138690815 + 0 + + 400 + 75 - - - -2147483392 - {{1, 35}, {559, 15}} - - 1 - - _doScroller: - 0.94745761156082153 + VLC media player search + 10 + + + + + 292 + {{84, 5}, {33, 20}} + + YES + + 67239424 + 134217728 + + + + 138690815 + 2 + + NSImage + repeat_embedded - - - 2304 - - YES - - - {{1, 0}, {574, 17}} - - - - - 4 + + NSImage + repeat_single_embedded_blue - + + + 200 + 25 - {{0, 30}, {576, 51}} + + + + 292 + {{49, 5}, {33, 20}} - - 562 - - - - - - QSAAAEEgAABBiAAAQYgAAA + YES + + 67239424 + 134217728 + + + + -935051009 + 2 + + NSImage + shuffle_embedded + + + NSImage + shuffle_embedded_blue + + + + 200 + 25 + {576, 81} + VLBrushedMetalImageView NSImageView @@ -6278,14 +6281,6 @@ LCAuLi4 2135 - - - o_outline_view - - - - 2215 - o_status_field @@ -6294,30 +6289,6 @@ LCAuLi4 2217 - - - o_tc_name - - - - 2219 - - - - o_tc_author - - - - 2220 - - - - o_tc_duration - - - - 2221 - o_random_ckb @@ -7822,6 +7793,38 @@ LCAuLi4 4371 + + + o_outline_view + + + + 4385 + + + + o_tc_duration + + + + 4386 + + + + o_tc_author + + + + 4387 + + + + o_tc_name + + + + 4388 + @@ -9500,96 +9503,16 @@ LCAuLi4 YES - + Playlist - - 2199 - - - YES - - - - - - - - - 2201 - - - YES - - - - - - - - - 2198 - - - YES - - - - - - 3387 - - - - - 2200 - - - YES - - - - - - 3385 - - - - - 2211 - - - YES - - - - - - 3386 - - - - - 3817 - - - YES - - - - - - 3819 - - - 2202 @@ -10906,21 +10829,6 @@ LCAuLi4 - - 4365 - - - - - 4366 - - - - - 4367 - - - 4368 @@ -10942,6 +10850,101 @@ LCAuLi4 + + 4372 + + + YES + + + + + + + + + 4373 + + + + + 4374 + + + + + 4375 + + + + + 4376 + + + YES + + + + + + + + + 4377 + + + YES + + + + + + 4378 + + + YES + + + + + + 4379 + + + YES + + + + + + 4380 + + + YES + + + + + + 4381 + + + + + 4382 + + + + + 4383 + + + + + 4384 + + + @@ -11233,21 +11236,10 @@ LCAuLi4 2197.IBEditorWindowLastContentRect 2197.IBPluginDependency 2197.ImportedFromIB2 - 2198.IBPluginDependency - 2198.ImportedFromIB2 - 2199.IBPluginDependency - 2199.ImportedFromIB2 - 2200.IBPluginDependency - 2200.ImportedFromIB2 - 2201.CustomClassName - 2201.IBPluginDependency - 2201.ImportedFromIB2 2202.IBPluginDependency 2202.ImportedFromIB2 2208.IBPluginDependency 2208.ImportedFromIB2 - 2211.IBPluginDependency - 2211.ImportedFromIB2 2239.IBPluginDependency 2239.ImportedFromIB2 2240.IBPluginDependency @@ -11476,12 +11468,6 @@ LCAuLi4 333.ImportedFromIB2 334.IBPluginDependency 334.ImportedFromIB2 - 3385.IBPluginDependency - 3385.ImportedFromIB2 - 3386.IBPluginDependency - 3386.ImportedFromIB2 - 3387.IBPluginDependency - 3387.ImportedFromIB2 3568.IBEditorWindowLastContentRect 3568.IBPluginDependency 3568.ImportedFromIB2 @@ -11545,10 +11531,6 @@ LCAuLi4 3713.ImportedFromIB2 3714.IBPluginDependency 3714.ImportedFromIB2 - 3817.IBPluginDependency - 3817.ImportedFromIB2 - 3819.IBPluginDependency - 3819.ImportedFromIB2 3914.IBPluginDependency 3914.ImportedFromIB2 3915.IBPluginDependency @@ -11692,16 +11674,34 @@ LCAuLi4 4363.IBShouldRemoveOnLegacySave 4364.IBPluginDependency 4364.IBShouldRemoveOnLegacySave - 4365.IBPluginDependency - 4365.IBShouldRemoveOnLegacySave - 4366.IBPluginDependency - 4366.IBShouldRemoveOnLegacySave - 4367.IBPluginDependency - 4367.IBShouldRemoveOnLegacySave 4368.IBPluginDependency 4368.IBShouldRemoveOnLegacySave 4369.IBPluginDependency 4369.IBShouldRemoveOnLegacySave + 4372.IBPluginDependency + 4372.ImportedFromIB2 + 4373.IBShouldRemoveOnLegacySave + 4374.IBShouldRemoveOnLegacySave + 4375.IBShouldRemoveOnLegacySave + 4376.CustomClassName + 4376.IBPluginDependency + 4376.ImportedFromIB2 + 4377.IBPluginDependency + 4377.ImportedFromIB2 + 4378.IBPluginDependency + 4378.ImportedFromIB2 + 4379.IBPluginDependency + 4379.ImportedFromIB2 + 4380.IBPluginDependency + 4380.ImportedFromIB2 + 4381.IBPluginDependency + 4381.ImportedFromIB2 + 4382.IBPluginDependency + 4382.ImportedFromIB2 + 4383.IBPluginDependency + 4383.ImportedFromIB2 + 4384.IBPluginDependency + 4384.ImportedFromIB2 446.IBPluginDependency 446.ImportedFromIB2 5.IBPluginDependency @@ -12035,18 +12035,7 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin - {{63, 595}, {576, 81}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - VLCPlaylistView - com.apple.InterfaceBuilder.CocoaPlugin - + {{350, 595}, {576, 81}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12281,12 +12270,6 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{0, 702}, {308, 43}} com.apple.InterfaceBuilder.CocoaPlugin @@ -12401,9 +12384,7 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12492,7 +12473,23 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + VLCPlaylistView + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12573,7 +12570,7 @@ LCAuLi4 - 4371 + 4388 @@ -13142,7 +13139,6 @@ LCAuLi4 showInformationPanel: showLicense: showMessagesPanel: - showVLM: showWizard: timeFieldWasClicked: timesliderUpdate: @@ -13182,7 +13178,6 @@ LCAuLi4 id id id - id @@ -13277,7 +13272,6 @@ LCAuLi4 o_mi_open_net o_mi_open_recent o_mi_open_recent_cm - o_mi_open_vlm o_mi_open_wizard o_mi_paste o_mi_play @@ -13346,7 +13340,6 @@ LCAuLi4 o_sprefs o_timefield o_timeslider - o_vlm o_vmi_fullscreen o_vmi_mute o_vmi_next @@ -13487,7 +13480,6 @@ LCAuLi4 NSMenuItem NSMenuItem NSMenuItem - NSMenuItem NSButton NSWindow NSButton @@ -13521,7 +13513,6 @@ LCAuLi4 id NSTextField NSSlider - id NSMenuItem NSMenuItem NSMenuItem diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib index ee5c4c014c..fa635dd2fa 100644 Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ