Skip to content

V
vlc-gpu
Commit 5a5846fe authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed volume slider appearance in black intf mode and disable the... 

macosx: fixed volume slider appearance in black intf mode and disable the track slider when appropriate
parent 9b23a3ae
Show whitespace changes
Inline Side-by-side
Showing with 14865 additions and 14853 deletions
Makefile.am
View file @ 5a5846fe
......@@ -245,7 +245,6 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow/volume-low.png \
extras/package/macosx/Resources/mainwindow/volume-slider-knob.png \
extras/package/macosx/Resources/mainwindow/volume-slider-track.png \
extras/package/macosx/Resources/mainwindow/volumetrack.png \
extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
......
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ 5a5846fe
......@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
<string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.SystemVersion">11C26</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<string key="IBDocument.AppKitVersion">1138.11</string>
<string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
......@@ -21,13 +21,13 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="283"/>
<integer value="24"/>
<integer value="2730"/>
<integer value="1617"/>
<integer value="4596"/>
<integer value="24"/>
<integer value="915"/>
<integer value="283"/>
<integer value="2"/>
<integer value="4596"/>
<integer value="21"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -57,7 +57,8 @@
<string key="NSWindowTitle">VLC media player</string>
<string key="NSWindowClass">VLCMainWindow</string>
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSWindowContentMinSize">{400, 200}</string>
<object class="NSView" key="NSWindowView" id="429932428">
<reference key="NSNextResponder"/>
......@@ -111,7 +112,7 @@
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{223, 10}, {153, 14}}</string>
<string key="NSFrame">{{223, 10}, {180, 14}}</string>
<reference key="NSSuperview" ref="429932428"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="586405807">
......@@ -143,7 +144,7 @@
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{445, 16}, {75, 4}}</string>
<string key="NSFrame">{{469, 14}, {48, 5}}</string>
<reference key="NSSuperview" ref="429932428"/>
<object class="CISourceOverCompositing" key="NSViewCompositeFilter">
<bool key="CIEnabled">YES</bool>
......@@ -154,7 +155,7 @@
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">volumetrack</string>
<string key="NSResourceName">volume-slider-track</string>
</object>
<int key="NSAlign">0</int>
<int key="NSScale">2</int>
......@@ -176,7 +177,7 @@
<object class="NSFont" key="NSSupport" id="188716167">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">10</double>
<int key="NSfFlags">2843</int>
<int key="NSfFlags">2832</int>
</object>
<reference key="NSControlView" ref="809192538"/>
<int key="NSButtonFlags">138674431</int>
......@@ -258,7 +259,7 @@
<object class="NSButton" id="474770834">
<reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{519, 8}, {20, 19}}</string>
<string key="NSFrame">{{518, 7}, {20, 19}}</string>
<reference key="NSSuperview" ref="429932428"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="706599501">
......@@ -285,7 +286,7 @@
<object class="NSButton" id="963106097">
<reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{428, 8}, {20, 20}}</string>
<string key="NSFrame">{{449, 7}, {20, 20}}</string>
<reference key="NSSuperview" ref="429932428"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="587429705">
......@@ -384,7 +385,7 @@
<object class="NSFont" key="NSSupport" id="841513812">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
<int key="NSfFlags">1040</int>
</object>
<reference key="NSControlView" ref="291209196"/>
<int key="NSButtonFlags">138690815</int>
......@@ -492,11 +493,11 @@
<object class="NSSlider" id="704525034">
<reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{222, 10}, {157, 15}}</string>
<string key="NSFrame">{{222, 10}, {184, 15}}</string>
<reference key="NSSuperview" ref="429932428"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="276068486">
<int key="NSCellFlags">67501824</int>
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">131072</int>
<object class="NSMutableString" key="NSContents">
<characters key="NS.bytes"/>
......@@ -509,7 +510,7 @@
<reference key="NSControlView" ref="704525034"/>
<double key="NSMaxValue">10000</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">1161.9718309859154</double>
<double key="NSValue">9259.0232749896932</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
......@@ -520,7 +521,7 @@
<object class="NSTextField" id="533732100">
<reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{381, 10}, {53, 13}}</string>
<string key="NSFrame">{{405, 10}, {53, 13}}</string>
<reference key="NSSuperview" ref="429932428"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="896153998">
......@@ -551,7 +552,7 @@
<reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">-2147482334</int>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{222, 11}, {155, 12}}</string>
<string key="NSFrame">{{222, 11}, {182, 12}}</string>
<reference key="NSSuperview" ref="429932428"/>
<int key="NSpiFlags">16650</int>
<double key="NSMaxValue">100</double>
......@@ -603,7 +604,7 @@
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{376, 10}, {3, 14}}</string>
<string key="NSFrame">{{403, 10}, {3, 14}}</string>
<reference key="NSSuperview" ref="429932428"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="41671586">
......@@ -623,7 +624,7 @@
<object class="NSSlider" id="788281303">
<reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{440, 10}, {85, 15}}</string>
<string key="NSFrame">{{464, 9}, {58, 15}}</string>
<reference key="NSSuperview" ref="429932428"/>
<object class="CISourceOverCompositing" key="NSViewCompositeFilter">
<bool key="CIEnabled">YES</bool>
......@@ -699,7 +700,7 @@
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
<int key="NSfFlags">3088</int>
</object>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">3</int>
......@@ -748,8 +749,13 @@
<string key="NSCatalogName">System</string>
<string key="NSColorName">_sourceListBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">alternateSelectedControlColor</string>
<object class="NSColor" key="NSColor" id="829159933">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC44MzkyMTU2OTU5IDAuODY2NjY2Njc0NiAwLjg5ODAzOTIyMTgAA</bytes>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
</object>
</object>
<object class="NSColor" key="NSGridColor" id="756174976">
......@@ -771,6 +777,7 @@
<bool key="NSAllowsTypeSelect">NO</bool>
<int key="NSTableViewSelectionHighlightStyle">1</int>
<int key="NSTableViewDraggingDestinationStyle">1</int>
<int key="NSTableViewGroupRowStyle">1</int>
<bool key="NSOutlineViewAutoresizesOutlineColumnKey">NO</bool>
<float key="NSOutlineViewIndentationPerLevelKey">14</float>
</object>
......@@ -807,7 +814,7 @@
<string key="NSFrameSize">{122, 273}</string>
<reference key="NSSuperview" ref="824340487"/>
<reference key="NSNextKeyView" ref="644916584"/>
<int key="NSsFlags">656</int>
<int key="NSsFlags">133776</int>
<reference key="NSVScroller" ref="1024767070"/>
<reference key="NSHScroller" ref="677088452"/>
<reference key="NSContentView" ref="644916584"/>
......@@ -930,11 +937,10 @@
<reference key="NSSuperview" ref="576307303"/>
<reference key="NSTableView" ref="23448837"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="638975146">
<reference key="NSNextResponder" ref="915491793"/>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="915491793"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -1054,7 +1060,7 @@
<reference key="NSBackgroundColor" ref="885475112"/>
<reference key="NSGridColor" ref="756174976"/>
<double key="NSRowHeight">15</double>
<int key="NSTvFlags">-608174080</int>
<int key="NSTvFlags">-71303168</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<string key="NSAutosaveName">10thaniversary-mainPlaylistView</string>
......@@ -1064,6 +1070,7 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
<int key="NSTableViewGroupRowStyle">1</int>
<reference key="NSOutlineViewOutlineTableColumnKey" ref="965199398"/>
</object>
</object>
......@@ -1086,7 +1093,7 @@
<object class="NSScroller" id="297523533">
<reference key="NSNextResponder" ref="915491793"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 233}, {315.758, 15}}</string>
<string key="NSFrame">{{1, 233}, {315.75799999999998, 15}}</string>
<reference key="NSSuperview" ref="915491793"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="915491793"/>
......@@ -1107,17 +1114,15 @@
<reference key="NSBGColor" ref="885475112"/>
<int key="NScvFlags">4</int>
</object>
<reference ref="638975146"/>
</object>
<string key="NSFrame">{{-1, 0}, {482, 254}}</string>
<reference key="NSSuperview" ref="440594360"/>
<reference key="NSNextKeyView" ref="343242432"/>
<int key="NSsFlags">562</int>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="573737110"/>
<reference key="NSHScroller" ref="297523533"/>
<reference key="NSContentView" ref="343242432"/>
<reference key="NSHeaderClipView" ref="576307303"/>
<reference key="NSCornerView" ref="638975146"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
</object>
<object class="NSImageView" id="447614808">
......@@ -1177,8 +1182,9 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{400, 222}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">vlc-10thanniversary</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSMenu" id="782168084">
<string key="NSTitle">MainMenu</string>
......@@ -2573,7 +2579,8 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSWindowContentMinSize">{599, 368}</string>
<object class="NSView" key="NSWindowView" id="584094047">
<reference key="NSNextResponder"/>
......@@ -2706,17 +2713,16 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSColor" id="829159933">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
<reference ref="829159933"/>
<integer value="1"/>
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
<nil key="NSTextFinder"/>
<int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{1116, 1e+07}</string>
<string key="NSMaxSize">{1116, 10000000}</string>
<string key="NSMinize">{114, 0}</string>
<nil key="NSDelegate"/>
</object>
......@@ -2757,7 +2763,7 @@
<string key="NSFrame">{{20, 44}, {559, 304}}</string>
<reference key="NSSuperview" ref="584094047"/>
<reference key="NSNextKeyView" ref="374521922"/>
<int key="NSsFlags">530</int>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="658731325"/>
<reference key="NSHScroller" ref="487661939"/>
<reference key="NSContentView" ref="374521922"/>
......@@ -2791,8 +2797,9 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{599, 384}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">messages</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSMenu" id="966937735">
<string key="NSTitle">Menu</string>
......@@ -3038,7 +3045,8 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="500944643">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -3057,7 +3065,7 @@
<object class="NSFont" key="NSSupport" id="103182952">
<string key="NSName">LucidaGrande-Bold</string>
<double key="NSSize">13</double>
<int key="NSfFlags">2072</int>
<int key="NSfFlags">2064</int>
</object>
<reference key="NSControlView" ref="855729941"/>
<reference key="NSBackgroundColor" ref="3414043"/>
......@@ -3164,7 +3172,8 @@
<string key="NSFrame">{{1, 9}, {249, 103}}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSCustomView" id="356649608">
<nil key="NSNextResponder"/>
......@@ -3409,7 +3418,8 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="985395477">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -3803,7 +3813,8 @@
<string key="NSFrameSize">{549, 87}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSWindowTemplate" id="747974943">
<int key="NSWindowStyleMask">9</int>
......@@ -3815,7 +3826,8 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="366395044">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -3956,9 +3968,11 @@ LCAuLi4</string>
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
<nil key="NSTextFinder"/>
<int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{998, 1e+07}</string>
<string key="NSMaxSize">{998, 10000000}</string>
<string key="NSMinize">{497, 0}</string>
<nil key="NSDelegate"/>
</object>
......@@ -3995,7 +4009,7 @@ LCAuLi4</string>
<string key="NSFrame">{{92, 96}, {500, 104}}</string>
<reference key="NSSuperview" ref="366395044"/>
<reference key="NSNextKeyView" ref="1059447005"/>
<int key="NSsFlags">530</int>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="444566474"/>
<reference key="NSHScroller" ref="599664251"/>
<reference key="NSContentView" ref="1059447005"/>
......@@ -4085,7 +4099,8 @@ LCAuLi4</string>
<string key="NSFrameSize">{612, 324}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSCustomObject" id="1040926652">
<string key="NSClassName">SUUpdater</string>
......@@ -4098,7 +4113,7 @@ LCAuLi4</string>
<object class="NSTextField" id="103751139">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{227, 35}, {62.7969, 18}}</string>
<string key="NSFrame">{{227, 35}, {62.796900000000001, 18}}</string>
<reference key="NSSuperview" ref="560875128"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="385075814">
......@@ -4193,7 +4208,7 @@ LCAuLi4</string>
<object class="NSTextField" id="754695396">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{210.902, 19}, {79.0977, 14}}</string>
<string key="NSFrame">{{210.90199999999999, 19}, {79.097700000000003, 14}}</string>
<reference key="NSSuperview" ref="560875128"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="908114002">
......@@ -4209,7 +4224,7 @@ LCAuLi4</string>
<object class="NSTextField" id="421148087">
<reference key="NSNextResponder" ref="560875128"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{27, 19}, {76.9648, 14}}</string>
<string key="NSFrame">{{27, 19}, {76.964799999999997, 14}}</string>
<reference key="NSSuperview" ref="560875128"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="647762012">
......@@ -6947,14 +6962,12 @@ LCAuLi4</string>
<reference ref="1051664676"/>
<reference ref="714984330"/>
<reference ref="38046606"/>
<reference ref="784705424"/>
<reference ref="474770834"/>
<reference ref="963106097"/>
<reference ref="1041205852"/>
<reference ref="828712633"/>
<reference ref="354459361"/>
<reference ref="21901908"/>
<reference ref="788281303"/>
<reference ref="955174811"/>
<reference ref="302568132"/>
<reference ref="515305233"/>
......@@ -6962,6 +6975,8 @@ LCAuLi4</string>
<reference ref="202538583"/>
<reference ref="704525034"/>
<reference ref="664576649"/>
<reference ref="784705424"/>
<reference ref="788281303"/>
</object>
<reference key="parent" ref="498338108"/>
</object>
......@@ -10685,7 +10700,7 @@ LCAuLi4</string>
<string>ITSlider</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD3AAAwbgAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABD3YAAwbAAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -10867,7 +10882,7 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUPeAABBgAAAA</bytes>
<bytes key="NSTransformStruct">AUPegABBgAAAA</bytes>
</object>
<real value="0.0"/>
<reference ref="563235091"/>
......@@ -14790,7 +14805,7 @@ LCAuLi4</string>
<string>topbar_background</string>
<string>volume-high</string>
<string>volume-low</string>
<string>volumetrack</string>
<string>volume-slider-track</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -14833,7 +14848,7 @@ LCAuLi4</string>
<string>{5, 23}</string>
<string>{10, 9}</string>
<string>{8, 9}</string>
<string>{75, 4}</string>
<string>{128, 128}</string>
</object>
</object>
</data>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 5a5846fe
......@@ -125,7 +125,6 @@
CC04338F13B28B8200D7D52E /* volume-low.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04335B13B28B8200D7D52E /* volume-low.png */; };
CC04339013B28B8200D7D52E /* volume-slider-knob.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04335C13B28B8200D7D52E /* volume-slider-knob.png */; };
CC04339113B28B8200D7D52E /* volume-slider-track.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04335D13B28B8200D7D52E /* volume-slider-track.png */; };
CC04339213B28B8200D7D52E /* volumetrack.png in Resources */ = {isa = PBXBuildFile; fileRef = CC04335E13B28B8200D7D52E /* volumetrack.png */; };
CC0433A813B28B9C00D7D52E /* aiff.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC04339313B28B9C00D7D52E /* aiff.icns */; };
CC0433A913B28B9C00D7D52E /* audio.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC04339413B28B9C00D7D52E /* audio.icns */; };
CC0433AA13B28B9C00D7D52E /* avi.icns in Resources */ = {isa = PBXBuildFile; fileRef = CC04339513B28B9C00D7D52E /* avi.icns */; };
......@@ -374,7 +373,6 @@
CC04335B13B28B8200D7D52E /* volume-low.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "volume-low.png"; path = "Resources/mainwindow/volume-low.png"; sourceTree = "<group>"; };
CC04335C13B28B8200D7D52E /* volume-slider-knob.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "volume-slider-knob.png"; path = "Resources/mainwindow/volume-slider-knob.png"; sourceTree = "<group>"; };
CC04335D13B28B8200D7D52E /* volume-slider-track.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "volume-slider-track.png"; path = "Resources/mainwindow/volume-slider-track.png"; sourceTree = "<group>"; };
CC04335E13B28B8200D7D52E /* volumetrack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = volumetrack.png; path = Resources/mainwindow/volumetrack.png; sourceTree = "<group>"; };
CC04339313B28B9C00D7D52E /* aiff.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = aiff.icns; path = Resources/icons/aiff.icns; sourceTree = "<group>"; };
CC04339413B28B9C00D7D52E /* audio.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = audio.icns; path = Resources/icons/audio.icns; sourceTree = "<group>"; };
CC04339513B28B9C00D7D52E /* avi.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = avi.icns; path = Resources/icons/avi.icns; sourceTree = "<group>"; };
......@@ -795,7 +793,6 @@
CC04335B13B28B8200D7D52E /* volume-low.png */,
CC04335C13B28B8200D7D52E /* volume-slider-knob.png */,
CC04335D13B28B8200D7D52E /* volume-slider-track.png */,
CC04335E13B28B8200D7D52E /* volumetrack.png */,
);
name = "bright variant";
sourceTree = "<group>";
......@@ -1171,7 +1168,6 @@
CC04338F13B28B8200D7D52E /* volume-low.png in Resources */,
CC04339013B28B8200D7D52E /* volume-slider-knob.png in Resources */,
CC04339113B28B8200D7D52E /* volume-slider-track.png in Resources */,
CC04339213B28B8200D7D52E /* volumetrack.png in Resources */,
CC0433A813B28B9C00D7D52E /* aiff.icns in Resources */,
CC0433A913B28B9C00D7D52E /* audio.icns in Resources */,
CC0433AA13B28B9C00D7D52E /* avi.icns in Resources */,
......
modules/gui/macosx/MainWindow.m
View file @ 5a5846fe
......@@ -144,7 +144,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_time_sld_middle_view setImage: [NSImage imageNamed:@"progression-track-wrapper-middle"]];
[o_time_sld_right_view setImage: [NSImage imageNamed:@"progression-track-wrapper-right"]];
[o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low"]];
[o_volume_track_view setImage: [NSImage imageNamed:@"volumetrack"]];
[o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track"]];
[o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]];
[o_effects_btn setImage: [NSImage imageNamed:@"effects-double-buttons"]];
[o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-double-buttons-pressed"]];
......@@ -458,7 +458,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
p_input = pl_CurrentInput( VLCIntf );
if( p_input )
{
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
vlc_value_t time;
NSString * o_time;
vlc_value_t pos;
......@@ -479,15 +478,25 @@ static VLCMainWindow *_o_sharedInstance = nil;
else
o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
if (dur == -1) {
[o_time_sld setEnabled: NO];
[o_time_sld setHidden: YES];
} else {
[o_time_sld setEnabled: YES];
[o_time_sld setHidden: NO];
}
[o_time_fld setStringValue: o_time];
[o_time_fld setNeedsDisplay:YES];
// [[[[VLCMain sharedInstance] controls] fspanel] setStreamPos: f_updated andTime: o_time];
[o_pool release];
vlc_object_release( p_input );
}
else
{
[o_time_sld setFloatValue: 0.0];
[o_time_fld setStringValue: @"00:00"];
[o_time_sld setEnabled: NO];
[o_time_sld setHidden: YES];
}
[self performSelectorOnMainThread:@selector(drawFancyGradientEffectForTimeSlider) withObject:nil waitUntilDone:NO];
......
modules/gui/macosx/playlist.m
View file @ 5a5846fe
......@@ -1293,8 +1293,7 @@
if( ![[o_outline_view dataSource] outlineView: o_outline_view
isItemExpandable: o_item] )
{
o_item = [o_outline_dict objectForKey: [NSString
stringWithFormat: @"%p", p_item->p_parent]];
o_item = [o_outline_dict objectForKey: [NSString stringWithFormat: @"%p", p_item->p_parent]];
}
/* We need to collapse the node first, since OSX refuses to recursively
......@@ -1404,8 +1403,7 @@
id o_playing_item;
PL_LOCK;
o_playing_item = [o_outline_dict objectForKey:
[NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]];
o_playing_item = [o_outline_dict objectForKey: [NSString stringWithFormat:@"%p", playlist_CurrentPlayingItem( p_playlist )]];
PL_UNLOCK;
if( [self isItem: [o_playing_item pointerValue] inNode:
......@@ -1440,10 +1438,8 @@
{
id o_value = [super outlineView: outlineView child: index ofItem: item];
[o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p",
[o_value pointerValue]]];
[o_outline_dict setObject:o_value forKey:[NSString stringWithFormat:@"%p", [o_value pointerValue]]];
return o_value;
}
/* Required for drag & drop and reordering */
......@@ -1624,14 +1620,11 @@
PL_UNLOCK;
}
[self playlistUpdated];
i_row = [o_outline_view rowForItem:[o_outline_dict
objectForKey:[NSString stringWithFormat: @"%p",
[[o_all_items objectAtIndex: 0] pointerValue]]]];
i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", [[o_all_items objectAtIndex: 0] pointerValue]]]];
if( i_row == -1 )
{
i_row = [o_outline_view rowForItem:[o_outline_dict
objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]];
i_row = [o_outline_view rowForItem:[o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_new_parent]]];
}
[o_outline_view deselectAll: self];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment