Skip to content

V
vlc
Commit 848daa45 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf
Browse files
Options

macosx: re-written the way we render 3 part images by using another custom view (refs #5742) 

this fixes various drawing issues with the time slider and the window title
(cherry picked from commit fb10d756)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent c4364d3b
Show whitespace changes
Inline Side-by-side
Showing with 385 additions and 545 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ 848daa45
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1617"/> <integer value="21"/>
<integer value="29"/> <integer value="29"/>
<integer value="2730"/>
<integer value="4722"/> <integer value="4722"/>
<integer value="4758"/>
<integer value="4596"/> <integer value="4596"/>
<integer value="1617"/>
<integer value="2730"/>
<integer value="4895"/>
<integer value="915"/> <integer value="915"/>
<integer value="4756"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -659,11 +659,11 @@ ...@@ -659,11 +659,11 @@
<object class="NSCustomView" id="202538583"> <object class="NSCustomView" id="202538583">
<reference key="NSNextResponder" ref="129808516"/> <reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{219, 12}, {60, 12}}</string> <string key="NSFrame">{{218, 12}, {60, 12}}</string>
<reference key="NSSuperview" ref="129808516"/> <reference key="NSSuperview" ref="129808516"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSViewCanDrawConcurrently">YES</bool> <bool key="NSViewCanDrawConcurrently">YES</bool>
<string key="NSClassName">VLCProgressBarGradientEffect</string> <string key="NSClassName">VLCThreePartImageView</string>
</object> </object>
<object class="NSButton" id="707945673"> <object class="NSButton" id="707945673">
<reference key="NSNextResponder" ref="129808516"/> <reference key="NSNextResponder" ref="129808516"/>
...@@ -698,39 +698,6 @@ ...@@ -698,39 +698,6 @@
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSImageView" id="354459361">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">292</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple PNG pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{217, 11}, {3, 14}}</string>
<reference key="NSSuperview" ref="129808516"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="187033403">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">progression-track-wrapper-left</string>
</object>
<int key="NSAlign">0</int>
<int key="NSScale">2</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSButton" id="291209196"> <object class="NSButton" id="291209196">
<reference key="NSNextResponder" ref="129808516"/> <reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
...@@ -977,39 +944,6 @@ ...@@ -977,39 +944,6 @@
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSImageView" id="21901908">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">290</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple PNG pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{220, 11}, {179, 14}}</string>
<reference key="NSSuperview" ref="129808516"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="586405807">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">progression-track-wrapper-middle</string>
</object>
<int key="NSAlign">0</int>
<int key="NSScale">1</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSButton" id="474770834"> <object class="NSButton" id="474770834">
<reference key="NSNextResponder" ref="129808516"/> <reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">289</int> <int key="NSvFlags">289</int>
...@@ -1125,39 +1059,6 @@ ...@@ -1125,39 +1059,6 @@
</object> </object>
<bool key="NSEditable">YES</bool> <bool key="NSEditable">YES</bool>
</object> </object>
<object class="NSImageView" id="828712633">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">289</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple PNG pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{397, 11}, {3, 14}}</string>
<reference key="NSSuperview" ref="129808516"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="41671586">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">progression-track-wrapper-right</string>
</object>
<int key="NSAlign">0</int>
<int key="NSScale">2</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSProgressIndicator" id="664576649"> <object class="NSProgressIndicator" id="664576649">
<reference key="NSNextResponder" ref="129808516"/> <reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">-2147482334</int> <int key="NSvFlags">-2147482334</int>
...@@ -1228,6 +1129,14 @@ ...@@ -1228,6 +1129,14 @@
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSCustomView" id="304081293">
<reference key="NSNextResponder" ref="129808516"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{217, 11}, {185, 14}}</string>
<reference key="NSSuperview" ref="129808516"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCThreePartImageView</string>
</object>
</object> </object>
<string key="NSFrame">{{-1, 0}, {605, 36}}</string> <string key="NSFrame">{{-1, 0}, {605, 36}}</string>
<reference key="NSSuperview" ref="429932428"/> <reference key="NSSuperview" ref="429932428"/>
...@@ -4494,19 +4403,36 @@ LCAuLi4</string> ...@@ -4494,19 +4403,36 @@ LCAuLi4</string>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSClassName">VLCMainWindowTitleView</string> <string key="NSClassName">VLCMainWindowTitleView</string>
</object> </object>
<object class="NSCustomView" id="471121744"> <object class="NSCustomView" id="767040302">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{100, 100}</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSDrawer" id="689081542">
<nil key="NSNextResponder"/>
<string key="NSContentSize">{100, 100}</string>
<string key="NSMinContentSize">{0, 0}</string>
<string key="NSMaxContentSize">{10000, 10000}</string>
<int key="NSPreferredEdge">2</int>
<double key="NSLeadingOffset">0.0</double>
<double key="NSTrailingOffset">15</double>
<nil key="NSParentWindow"/>
<nil key="NSDelegate"/>
</object>
<object class="NSCustomView" id="661733562">
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="659976200"> <object class="NSTextField" id="329129268">
<reference key="NSNextResponder" ref="471121744"/> <reference key="NSNextResponder" ref="661733562"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrame">{{65, 3}, {263, 17}}</string> <string key="NSFrame">{{65, 3}, {263, 17}}</string>
<reference key="NSSuperview" ref="471121744"/> <reference key="NSSuperview" ref="661733562"/>
<string key="NSReuseIdentifierKey">_NS:4068</string> <string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="434038964"> <object class="NSTextFieldCell" key="NSCell" id="645411226">
<int key="NSCellFlags">67239488</int> <int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">1212155968</int> <int key="NSCellFlags2">1212155968</int>
<string key="NSContents">Label</string> <string key="NSContents">Label</string>
...@@ -4516,7 +4442,7 @@ LCAuLi4</string> ...@@ -4516,7 +4442,7 @@ LCAuLi4</string>
<int key="NSfFlags">16</int> <int key="NSfFlags">16</int>
</object> </object>
<string key="NSCellIdentifier">_NS:4068</string> <string key="NSCellIdentifier">_NS:4068</string>
<reference key="NSControlView" ref="659976200"/> <reference key="NSControlView" ref="329129268"/>
<reference key="NSBackgroundColor" ref="3414043"/> <reference key="NSBackgroundColor" ref="3414043"/>
<object class="NSColor" key="NSTextColor"> <object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">1</int> <int key="NSColorSpace">1</int>
...@@ -4524,20 +4450,20 @@ LCAuLi4</string> ...@@ -4524,20 +4450,20 @@ LCAuLi4</string>
</object> </object>
</object> </object>
</object> </object>
<object class="NSButton" id="912813065"> <object class="NSButton" id="725350360">
<reference key="NSNextResponder" ref="471121744"/> <reference key="NSNextResponder" ref="661733562"/>
<int key="NSvFlags">265</int> <int key="NSvFlags">265</int>
<string key="NSFrame">{{383, 4}, {14, 14}}</string> <string key="NSFrame">{{383, 4}, {14, 14}}</string>
<reference key="NSSuperview" ref="471121744"/> <reference key="NSSuperview" ref="661733562"/>
<string key="NSReuseIdentifierKey">_NS:610</string> <string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="883426607"> <object class="NSButtonCell" key="NSCell" id="113847949">
<int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int> <int key="NSCellFlags2">134217728</int>
<string key="NSContents"/> <string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/> <reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string> <string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="912813065"/> <reference key="NSControlView" ref="725350360"/>
<int key="NSButtonFlags">134365439</int> <int key="NSButtonFlags">134365439</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
...@@ -4546,20 +4472,20 @@ LCAuLi4</string> ...@@ -4546,20 +4472,20 @@ LCAuLi4</string>
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSButton" id="47797873"> <object class="NSButton" id="880009621">
<reference key="NSNextResponder" ref="471121744"/> <reference key="NSNextResponder" ref="661733562"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{48, 1}, {14, 16}}</string> <string key="NSFrame">{{48, 1}, {14, 16}}</string>
<reference key="NSSuperview" ref="471121744"/> <reference key="NSSuperview" ref="661733562"/>
<string key="NSReuseIdentifierKey">_NS:610</string> <string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="576041215"> <object class="NSButtonCell" key="NSCell" id="978616291">
<int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134217728</int> <int key="NSCellFlags2">134217728</int>
<string key="NSContents"/> <string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/> <reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string> <string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="47797873"/> <reference key="NSControlView" ref="880009621"/>
<int key="NSButtonFlags">138690815</int> <int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
...@@ -4568,20 +4494,20 @@ LCAuLi4</string> ...@@ -4568,20 +4494,20 @@ LCAuLi4</string>
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSButton" id="145580725"> <object class="NSButton" id="297736534">
<reference key="NSNextResponder" ref="471121744"/> <reference key="NSNextResponder" ref="661733562"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{28, 1}, {14, 16}}</string> <string key="NSFrame">{{28, 1}, {14, 16}}</string>
<reference key="NSSuperview" ref="471121744"/> <reference key="NSSuperview" ref="661733562"/>
<string key="NSReuseIdentifierKey">_NS:610</string> <string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="887230843"> <object class="NSButtonCell" key="NSCell" id="267729555">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int> <int key="NSCellFlags2">134217728</int>
<string key="NSContents"/> <string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/> <reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string> <string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="145580725"/> <reference key="NSControlView" ref="297736534"/>
<int key="NSButtonFlags">138690815</int> <int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
...@@ -4590,21 +4516,21 @@ LCAuLi4</string> ...@@ -4590,21 +4516,21 @@ LCAuLi4</string>
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSButton" id="369193052"> <object class="NSButton" id="425279991">
<reference key="NSNextResponder" ref="471121744"/> <reference key="NSNextResponder" ref="661733562"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{8, 1}, {14, 16}}</string> <string key="NSFrame">{{8, 1}, {14, 16}}</string>
<reference key="NSSuperview" ref="471121744"/> <reference key="NSSuperview" ref="661733562"/>
<string key="NSReuseIdentifierKey">_NS:610</string> <string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1021277036"> <object class="NSButtonCell" key="NSCell" id="155309985">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int> <int key="NSCellFlags2">134217728</int>
<string key="NSContents"/> <string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/> <reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string> <string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="369193052"/> <reference key="NSControlView" ref="425279991"/>
<int key="NSButtonFlags">138690815</int> <int key="NSButtonFlags">139215103</int>
<int key="NSButtonFlags2">6</int> <int key="NSButtonFlags2">6</int>
<string key="NSAlternateContents"/> <string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/> <string key="NSKeyEquivalent"/>
...@@ -6894,30 +6820,6 @@ LCAuLi4</string> ...@@ -6894,30 +6820,6 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">4641</int> <int key="connectionID">4641</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_time_sld_left_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="354459361"/>
</object>
<int key="connectionID">4642</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_time_sld_middle_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="21901908"/>
</object>
<int key="connectionID">4643</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_time_sld_right_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="828712633"/>
</object>
<int key="connectionID">4644</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_volume_down_btn</string> <string key="label">o_volume_down_btn</string>
...@@ -7302,125 +7204,133 @@ LCAuLi4</string> ...@@ -7302,125 +7204,133 @@ LCAuLi4</string>
</object> </object>
<int key="connectionID">4757</int> <int key="connectionID">4757</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">clearRecentDocuments:</string>
<reference key="source" ref="936559509"/>
<reference key="destination" ref="740178575"/>
</object>
<int key="connectionID">4830</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_fullscreen_btn</string> <string key="label">o_mi_open_recent</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="651263286"/>
<reference key="destination" ref="912813065"/> <reference key="destination" ref="957503076"/>
</object> </object>
<int key="connectionID">4769</int> <int key="connectionID">4835</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_green_btn</string> <string key="label">delegate</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="302568132"/>
<reference key="destination" ref="47797873"/> <reference key="destination" ref="498338108"/>
</object> </object>
<int key="connectionID">4770</int> <int key="connectionID">4842</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_red_btn</string> <string key="label">o_resize_view</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="498338108"/>
<reference key="destination" ref="369193052"/> <reference key="destination" ref="884724451"/>
</object> </object>
<int key="connectionID">4771</int> <int key="connectionID">4843</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_yellow_btn</string> <string key="label">contentView</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="689081542"/>
<reference key="destination" ref="145580725"/> <reference key="destination" ref="767040302"/>
</object> </object>
<int key="connectionID">4772</int> <int key="connectionID">4849</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">buttonAction:</string> <string key="label">o_title_lbl</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="369193052"/> <reference key="destination" ref="329129268"/>
</object> </object>
<int key="connectionID">4773</int> <int key="connectionID">4909</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">buttonAction:</string> <string key="label">o_fullscreen_btn</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="145580725"/> <reference key="destination" ref="725350360"/>
</object> </object>
<int key="connectionID">4774</int> <int key="connectionID">4910</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">buttonAction:</string> <string key="label">o_green_btn</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="47797873"/> <reference key="destination" ref="880009621"/>
</object> </object>
<int key="connectionID">4775</int> <int key="connectionID">4911</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">buttonAction:</string> <string key="label">o_yellow_btn</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="912813065"/> <reference key="destination" ref="297736534"/>
</object> </object>
<int key="connectionID">4776</int> <int key="connectionID">4912</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_title_lbl</string> <string key="label">o_red_btn</string>
<reference key="source" ref="471121744"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="659976200"/> <reference key="destination" ref="425279991"/>
</object> </object>
<int key="connectionID">4779</int> <int key="connectionID">4913</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">miniaturize:</string> <string key="label">buttonAction:</string>
<reference key="source" ref="498338108"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="471121744"/> <reference key="destination" ref="725350360"/>
</object> </object>
<int key="connectionID">4780</int> <int key="connectionID">4914</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">o_titlebar_view</string> <string key="label">buttonAction:</string>
<reference key="source" ref="498338108"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="471121744"/> <reference key="destination" ref="880009621"/>
</object> </object>
<int key="connectionID">4781</int> <int key="connectionID">4915</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">clearRecentDocuments:</string> <string key="label">buttonAction:</string>
<reference key="source" ref="936559509"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="740178575"/> <reference key="destination" ref="297736534"/>
</object> </object>
<int key="connectionID">4830</int> <int key="connectionID">4916</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">o_mi_open_recent</string> <string key="label">buttonAction:</string>
<reference key="source" ref="651263286"/> <reference key="source" ref="661733562"/>
<reference key="destination" ref="957503076"/> <reference key="destination" ref="425279991"/>
</object> </object>
<int key="connectionID">4835</int> <int key="connectionID">4917</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">delegate</string> <string key="label">o_titlebar_view</string>
<reference key="source" ref="302568132"/> <reference key="source" ref="498338108"/>
<reference key="destination" ref="498338108"/> <reference key="destination" ref="661733562"/>
</object> </object>
<int key="connectionID">4842</int> <int key="connectionID">4918</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_resize_view</string> <string key="label">o_time_sld_background</string>
<reference key="source" ref="498338108"/> <reference key="source" ref="498338108"/>
<reference key="destination" ref="884724451"/> <reference key="destination" ref="304081293"/>
</object> </object>
<int key="connectionID">4843</int> <int key="connectionID">4920</int>
</object> </object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
...@@ -9798,90 +9708,6 @@ LCAuLi4</string> ...@@ -9798,90 +9708,6 @@ LCAuLi4</string>
<reference key="object" ref="261314859"/> <reference key="object" ref="261314859"/>
<reference key="parent" ref="1017583928"/> <reference key="parent" ref="1017583928"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">4758</int>
<reference key="object" ref="471121744"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="912813065"/>
<reference ref="47797873"/>
<reference ref="145580725"/>
<reference ref="369193052"/>
<reference ref="659976200"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">MainWindowTitle</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">4765</int>
<reference key="object" ref="912813065"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="883426607"/>
</object>
<reference key="parent" ref="471121744"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4766</int>
<reference key="object" ref="883426607"/>
<reference key="parent" ref="912813065"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4763</int>
<reference key="object" ref="47797873"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="576041215"/>
</object>
<reference key="parent" ref="471121744"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4764</int>
<reference key="object" ref="576041215"/>
<reference key="parent" ref="47797873"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4761</int>
<reference key="object" ref="145580725"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="887230843"/>
</object>
<reference key="parent" ref="471121744"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4762</int>
<reference key="object" ref="887230843"/>
<reference key="parent" ref="145580725"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4759</int>
<reference key="object" ref="369193052"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1021277036"/>
</object>
<reference key="parent" ref="471121744"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4760</int>
<reference key="object" ref="1021277036"/>
<reference key="parent" ref="369193052"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4777</int>
<reference key="object" ref="659976200"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="434038964"/>
</object>
<reference key="parent" ref="471121744"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4778</int>
<reference key="object" ref="434038964"/>
<reference key="parent" ref="659976200"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">4815</int> <int key="objectID">4815</int>
<reference key="object" ref="957503076"/> <reference key="object" ref="957503076"/>
...@@ -9911,11 +9737,9 @@ LCAuLi4</string> ...@@ -9911,11 +9737,9 @@ LCAuLi4</string>
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="704525034"/> <reference ref="704525034"/>
<reference ref="21901908"/>
<reference ref="828315098"/> <reference ref="828315098"/>
<reference ref="809192538"/> <reference ref="809192538"/>
<reference ref="664576649"/> <reference ref="664576649"/>
<reference ref="828712633"/>
<reference ref="784705424"/> <reference ref="784705424"/>
<reference ref="963106097"/> <reference ref="963106097"/>
<reference ref="533732100"/> <reference ref="533732100"/>
...@@ -9928,9 +9752,9 @@ LCAuLi4</string> ...@@ -9928,9 +9752,9 @@ LCAuLi4</string>
<reference ref="955174811"/> <reference ref="955174811"/>
<reference ref="714984330"/> <reference ref="714984330"/>
<reference ref="291209196"/> <reference ref="291209196"/>
<reference ref="354459361"/>
<reference ref="707945673"/> <reference ref="707945673"/>
<reference ref="884724451"/> <reference ref="884724451"/>
<reference ref="304081293"/>
</object> </object>
<reference key="parent" ref="429932428"/> <reference key="parent" ref="429932428"/>
</object> </object>
...@@ -9948,20 +9772,6 @@ LCAuLi4</string> ...@@ -9948,20 +9772,6 @@ LCAuLi4</string>
<reference key="object" ref="276068486"/> <reference key="object" ref="276068486"/>
<reference key="parent" ref="704525034"/> <reference key="parent" ref="704525034"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">4438</int>
<reference key="object" ref="21901908"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="586405807"/>
</object>
<reference key="parent" ref="129808516"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4439</int>
<reference key="object" ref="586405807"/>
<reference key="parent" ref="21901908"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">3648</int> <int key="objectID">3648</int>
<reference key="object" ref="828315098"/> <reference key="object" ref="828315098"/>
...@@ -9995,20 +9805,6 @@ LCAuLi4</string> ...@@ -9995,20 +9805,6 @@ LCAuLi4</string>
<reference key="object" ref="664576649"/> <reference key="object" ref="664576649"/>
<reference key="parent" ref="129808516"/> <reference key="parent" ref="129808516"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">4436</int>
<reference key="object" ref="828712633"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="41671586"/>
</object>
<reference key="parent" ref="129808516"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4437</int>
<reference key="object" ref="41671586"/>
<reference key="parent" ref="828712633"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">4417</int> <int key="objectID">4417</int>
<reference key="object" ref="784705424"/> <reference key="object" ref="784705424"/>
...@@ -10171,20 +9967,6 @@ LCAuLi4</string> ...@@ -10171,20 +9967,6 @@ LCAuLi4</string>
<reference key="object" ref="482976610"/> <reference key="object" ref="482976610"/>
<reference key="parent" ref="291209196"/> <reference key="parent" ref="291209196"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">4434</int>
<reference key="object" ref="354459361"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="187033403"/>
</object>
<reference key="parent" ref="129808516"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4435</int>
<reference key="object" ref="187033403"/>
<reference key="parent" ref="354459361"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">3571</int> <int key="objectID">3571</int>
<reference key="object" ref="707945673"/> <reference key="object" ref="707945673"/>
...@@ -10213,6 +9995,105 @@ LCAuLi4</string> ...@@ -10213,6 +9995,105 @@ LCAuLi4</string>
<reference key="object" ref="655520031"/> <reference key="object" ref="655520031"/>
<reference key="parent" ref="884724451"/> <reference key="parent" ref="884724451"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">4845</int>
<reference key="object" ref="767040302"/>
<reference key="parent" ref="0"/>
<string key="objectName">Drawer Content View</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">4846</int>
<reference key="object" ref="689081542"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4850</int>
<reference key="object" ref="661733562"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="425279991"/>
<reference ref="297736534"/>
<reference ref="880009621"/>
<reference ref="725350360"/>
<reference ref="329129268"/>
</object>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4895</int>
<reference key="object" ref="425279991"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="155309985"/>
</object>
<reference key="parent" ref="661733562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4896</int>
<reference key="object" ref="297736534"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="267729555"/>
</object>
<reference key="parent" ref="661733562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4897</int>
<reference key="object" ref="880009621"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="978616291"/>
</object>
<reference key="parent" ref="661733562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4898</int>
<reference key="object" ref="725350360"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="113847949"/>
</object>
<reference key="parent" ref="661733562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4899</int>
<reference key="object" ref="329129268"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="645411226"/>
</object>
<reference key="parent" ref="661733562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4900</int>
<reference key="object" ref="645411226"/>
<reference key="parent" ref="329129268"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4901</int>
<reference key="object" ref="113847949"/>
<reference key="parent" ref="725350360"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4902</int>
<reference key="object" ref="978616291"/>
<reference key="parent" ref="880009621"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4903</int>
<reference key="object" ref="267729555"/>
<reference key="parent" ref="297736534"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4904</int>
<reference key="object" ref="155309985"/>
<reference key="parent" ref="425279991"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4919</int>
<reference key="object" ref="304081293"/>
<reference key="parent" ref="129808516"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
...@@ -10837,15 +10718,6 @@ LCAuLi4</string> ...@@ -10837,15 +10718,6 @@ LCAuLi4</string>
<string>4423.ImportedFromIB2</string> <string>4423.ImportedFromIB2</string>
<string>4424.IBPluginDependency</string> <string>4424.IBPluginDependency</string>
<string>4425.IBPluginDependency</string> <string>4425.IBPluginDependency</string>
<string>4434.IBPluginDependency</string>
<string>4434.IBViewBoundsToFrameTransform</string>
<string>4435.IBPluginDependency</string>
<string>4436.IBPluginDependency</string>
<string>4436.IBViewBoundsToFrameTransform</string>
<string>4437.IBPluginDependency</string>
<string>4438.IBPluginDependency</string>
<string>4438.IBViewBoundsToFrameTransform</string>
<string>4439.IBPluginDependency</string>
<string>4440.IBPluginDependency</string> <string>4440.IBPluginDependency</string>
<string>446.IBPluginDependency</string> <string>446.IBPluginDependency</string>
<string>446.ImportedFromIB2</string> <string>446.ImportedFromIB2</string>
...@@ -10917,27 +10789,6 @@ LCAuLi4</string> ...@@ -10917,27 +10789,6 @@ LCAuLi4</string>
<string>4732.IBPluginDependency</string> <string>4732.IBPluginDependency</string>
<string>4753.IBPluginDependency</string> <string>4753.IBPluginDependency</string>
<string>4756.IBViewBoundsToFrameTransform</string> <string>4756.IBViewBoundsToFrameTransform</string>
<string>4758.IBEditorWindowLastContentRect</string>
<string>4758.IBPluginDependency</string>
<string>4758.IBViewBoundsToFrameTransform</string>
<string>4759.IBPluginDependency</string>
<string>4759.IBViewBoundsToFrameTransform</string>
<string>4760.CustomClassName</string>
<string>4760.IBPluginDependency</string>
<string>4761.IBPluginDependency</string>
<string>4761.IBViewBoundsToFrameTransform</string>
<string>4762.CustomClassName</string>
<string>4762.IBPluginDependency</string>
<string>4763.IBPluginDependency</string>
<string>4763.IBViewBoundsToFrameTransform</string>
<string>4764.CustomClassName</string>
<string>4764.IBPluginDependency</string>
<string>4765.IBPluginDependency</string>
<string>4765.IBViewBoundsToFrameTransform</string>
<string>4766.CustomClassName</string>
<string>4766.IBPluginDependency</string>
<string>4777.IBPluginDependency</string>
<string>4778.IBPluginDependency</string>
<string>4815.IBPluginDependency</string> <string>4815.IBPluginDependency</string>
<string>4824.IBEditorWindowLastContentRect</string> <string>4824.IBEditorWindowLastContentRect</string>
<string>4824.IBPluginDependency</string> <string>4824.IBPluginDependency</string>
...@@ -10945,6 +10796,30 @@ LCAuLi4</string> ...@@ -10945,6 +10796,30 @@ LCAuLi4</string>
<string>4839.CustomClassName</string> <string>4839.CustomClassName</string>
<string>4839.IBPluginDependency</string> <string>4839.IBPluginDependency</string>
<string>4840.IBPluginDependency</string> <string>4840.IBPluginDependency</string>
<string>4845.IBPluginDependency</string>
<string>4846.IBPluginDependency</string>
<string>4850.IBEditorWindowLastContentRect</string>
<string>4850.IBPluginDependency</string>
<string>4895.IBPluginDependency</string>
<string>4895.IBViewBoundsToFrameTransform</string>
<string>4896.IBPluginDependency</string>
<string>4896.IBViewBoundsToFrameTransform</string>
<string>4897.IBPluginDependency</string>
<string>4897.IBViewBoundsToFrameTransform</string>
<string>4898.IBPluginDependency</string>
<string>4898.IBViewBoundsToFrameTransform</string>
<string>4899.IBPluginDependency</string>
<string>4899.IBViewBoundsToFrameTransform</string>
<string>4900.IBPluginDependency</string>
<string>4901.CustomClassName</string>
<string>4901.IBPluginDependency</string>
<string>4902.CustomClassName</string>
<string>4902.IBPluginDependency</string>
<string>4903.CustomClassName</string>
<string>4903.IBPluginDependency</string>
<string>4904.CustomClassName</string>
<string>4904.IBPluginDependency</string>
<string>4919.IBPluginDependency</string>
<string>5.IBPluginDependency</string> <string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string> <string>5.ImportedFromIB2</string>
<string>56.IBPluginDependency</string> <string>56.IBPluginDependency</string>
...@@ -11175,9 +11050,9 @@ LCAuLi4</string> ...@@ -11175,9 +11050,9 @@ LCAuLi4</string>
<string>{{430, 565}, {137, 103}}</string> <string>{{430, 565}, {137, 103}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{329, 101}, {604, 310}}</string> <string>{{329, 81}, {604, 310}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{329, 101}, {604, 310}}</string> <string>{{329, 81}, {604, 310}}</string>
<boolean value="YES"/> <boolean value="YES"/>
<boolean value="NO"/> <boolean value="NO"/>
<boolean value="YES"/> <boolean value="YES"/>
...@@ -11642,21 +11517,6 @@ LCAuLi4</string> ...@@ -11642,21 +11517,6 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUNNAABDkAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUOKgABDkAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUN+AABAoAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/> <boolean value="YES"/>
<string>{{633, 470}, {307, 53}}</string> <string>{{633, 470}, {307, 53}}</string>
...@@ -11757,40 +11617,45 @@ LCAuLi4</string> ...@@ -11757,40 +11617,45 @@ LCAuLi4</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">Ab+AAAAAAAAAA</bytes> <bytes key="NSTransformStruct">Ab+AAAAAAAAAA</bytes>
</object> </object>
<string>{{354, 575}, {400, 22}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"/> <string>{{684, 529}, {143, 23}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLCResizeControl</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{329, 712}, {400, 22}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBAAAAwXAAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABBAAAAwXAAAA</bytes>
</object> </object>
<string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABB4AAAwXAAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABB4AAAwXAAAA</bytes>
</object> </object>
<string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCQAAAwXAAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABCQAAAwXAAAA</bytes>
</object> </object>
<string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDvwAAwYAAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABDv4AAwYAAAA</bytes>
</object> </object>
<string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCggAAwZAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{684, 529}, {143, 23}}</string> <string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLCResizeControl</string> <string>VLCWindowButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -11852,7 +11717,7 @@ LCAuLi4</string> ...@@ -11852,7 +11717,7 @@ LCAuLi4</string>
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">4843</int> <int key="maxID">4920</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
...@@ -14153,7 +14018,7 @@ LCAuLi4</string> ...@@ -14153,7 +14018,7 @@ LCAuLi4</string>
</object> </object>
</object> </object>
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="90305680"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string> <string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/MainWindow.h</string> <string key="minorKey">../../../modules/gui/macosx/MainWindow.h</string>
</object> </object>
...@@ -14559,11 +14424,6 @@ LCAuLi4</string> ...@@ -14559,11 +14424,6 @@ LCAuLi4</string>
<string key="superclassName">NSOutlineView</string> <string key="superclassName">NSOutlineView</string>
<reference key="sourceIdentifier" ref="877349596"/> <reference key="sourceIdentifier" ref="877349596"/>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">VLCProgressBarGradientEffect</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="90305680"/>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCTimeField</string> <string key="className">VLCTimeField</string>
<string key="superclassName">NSTextField</string> <string key="superclassName">NSTextField</string>
...@@ -14575,7 +14435,7 @@ LCAuLi4</string> ...@@ -14575,7 +14435,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">ITSlider</string> <string key="className">ITSlider</string>
<string key="superclassName">NSSlider</string> <string key="superclassName">NSSlider</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="673816334">
<string key="majorKey">IBDocumentRelativeSource</string> <string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/misc.h</string> <string key="minorKey">../../../../../modules/gui/macosx/misc.h</string>
</object> </object>
...@@ -14583,18 +14443,12 @@ LCAuLi4</string> ...@@ -14583,18 +14443,12 @@ LCAuLi4</string>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">TimeLineSlider</string> <string key="className">TimeLineSlider</string>
<string key="superclassName">NSSlider</string> <string key="superclassName">NSSlider</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <reference key="sourceIdentifier" ref="673816334"/>
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/misc.h</string>
</object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLBrushedMetalImageView</string> <string key="className">VLBrushedMetalImageView</string>
<string key="superclassName">NSImageView</string> <string key="superclassName">NSImageView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <reference key="sourceIdentifier" ref="673816334"/>
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/misc.h</string>
</object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCApplication</string> <string key="className">VLCApplication</string>
...@@ -14607,10 +14461,7 @@ LCAuLi4</string> ...@@ -14607,10 +14461,7 @@ LCAuLi4</string>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCControllerView</string> <string key="className">VLCControllerView</string>
<string key="superclassName">NSView</string> <string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <reference key="sourceIdentifier" ref="673816334"/>
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/misc.h</string>
</object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCControls</string> <string key="className">VLCControls</string>
...@@ -16461,10 +16312,8 @@ LCAuLi4</string> ...@@ -16461,10 +16312,8 @@ LCAuLi4</string>
<string>o_stop_btn</string> <string>o_stop_btn</string>
<string>o_time_fld</string> <string>o_time_fld</string>
<string>o_time_sld</string> <string>o_time_sld</string>
<string>o_time_sld_background</string>
<string>o_time_sld_fancygradient_view</string> <string>o_time_sld_fancygradient_view</string>
<string>o_time_sld_left_view</string>
<string>o_time_sld_middle_view</string>
<string>o_time_sld_right_view</string>
<string>o_titlebar_view</string> <string>o_titlebar_view</string>
<string>o_video_view</string> <string>o_video_view</string>
<string>o_volume_down_btn</string> <string>o_volume_down_btn</string>
...@@ -16507,8 +16356,6 @@ LCAuLi4</string> ...@@ -16507,8 +16356,6 @@ LCAuLi4</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
...@@ -16540,10 +16387,8 @@ LCAuLi4</string> ...@@ -16540,10 +16387,8 @@ LCAuLi4</string>
<string>o_stop_btn</string> <string>o_stop_btn</string>
<string>o_time_fld</string> <string>o_time_fld</string>
<string>o_time_sld</string> <string>o_time_sld</string>
<string>o_time_sld_background</string>
<string>o_time_sld_fancygradient_view</string> <string>o_time_sld_fancygradient_view</string>
<string>o_time_sld_left_view</string>
<string>o_time_sld_middle_view</string>
<string>o_time_sld_right_view</string>
<string>o_titlebar_view</string> <string>o_titlebar_view</string>
<string>o_video_view</string> <string>o_video_view</string>
<string>o_volume_down_btn</string> <string>o_volume_down_btn</string>
...@@ -16654,19 +16499,11 @@ LCAuLi4</string> ...@@ -16654,19 +16499,11 @@ LCAuLi4</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">o_time_sld_fancygradient_view</string> <string key="name">o_time_sld_background</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">o_time_sld_left_view</string> <string key="name">o_time_sld_fancygradient_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_sld_middle_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_sld_right_view</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
...@@ -16695,7 +16532,7 @@ LCAuLi4</string> ...@@ -16695,7 +16532,7 @@ LCAuLi4</string>
</object> </object>
</object> </object>
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="919687584"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBDocumentRelativeSource</string> <string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/MainWindow.h</string> <string key="minorKey">../../../../../modules/gui/macosx/MainWindow.h</string>
</object> </object>
...@@ -16703,14 +16540,11 @@ LCAuLi4</string> ...@@ -16703,14 +16540,11 @@ LCAuLi4</string>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCMainWindowSplitView</string> <string key="className">VLCMainWindowSplitView</string>
<string key="superclassName">NSSplitView</string> <string key="superclassName">NSSplitView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <reference key="sourceIdentifier" ref="673816334"/>
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/misc.h</string>
</object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCMainWindowTitleView</string> <string key="className">VLCMainWindowTitleView</string>
<string key="superclassName">NSImageView</string> <string key="superclassName">VLCThreePartImageView</string>
<object class="NSMutableDictionary" key="actions"> <object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">buttonAction:</string> <string key="NS.key.0">buttonAction:</string>
<string key="NS.object.0">id</string> <string key="NS.object.0">id</string>
...@@ -16780,23 +16614,20 @@ LCAuLi4</string> ...@@ -16780,23 +16614,20 @@ LCAuLi4</string>
<string key="minorKey">../../../../../modules/gui/macosx/MainWindowTitle.h</string> <string key="minorKey">../../../../../modules/gui/macosx/MainWindowTitle.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">VLCProgressBarGradientEffect</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="919687584"/>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCResizeControl</string> <string key="className">VLCResizeControl</string>
<string key="superclassName">NSImageView</string> <string key="superclassName">NSImageView</string>
<reference key="sourceIdentifier" ref="444352063"/> <reference key="sourceIdentifier" ref="444352063"/>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">VLCThreePartImageView</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="673816334"/>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCTimeField</string> <string key="className">VLCTimeField</string>
<string key="superclassName">NSTextField</string> <string key="superclassName">NSTextField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <reference key="sourceIdentifier" ref="673816334"/>
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/misc.h</string>
</object>
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">VLCWindowButtonCell</string> <string key="className">VLCWindowButtonCell</string>
...@@ -17768,9 +17599,6 @@ LCAuLi4</string> ...@@ -17768,9 +17599,6 @@ LCAuLi4</string>
<string>play-pressed</string> <string>play-pressed</string>
<string>playlist</string> <string>playlist</string>
<string>playlist-pressed</string> <string>playlist-pressed</string>
<string>progression-track-wrapper-left</string>
<string>progression-track-wrapper-middle</string>
<string>progression-track-wrapper-right</string>
<string>repeat</string> <string>repeat</string>
<string>repeat-pressed</string> <string>repeat-pressed</string>
<string>shuffle</string> <string>shuffle</string>
...@@ -17813,9 +17641,6 @@ LCAuLi4</string> ...@@ -17813,9 +17641,6 @@ LCAuLi4</string>
<string>{29, 30}</string> <string>{29, 30}</string>
<string>{512, 512}</string> <string>{512, 512}</string>
<string>{28, 23}</string> <string>{28, 23}</string>
<string>{3, 14}</string>
<string>{3, 14}</string>
<string>{3, 14}</string>
<string>{28, 23}</string> <string>{28, 23}</string>
<string>{28, 23}</string> <string>{28, 23}</string>
<string>{29, 23}</string> <string>{29, 23}</string>
......
modules/gui/macosx/MainWindow.h
View file @ 848daa45
...@@ -51,10 +51,7 @@ ...@@ -51,10 +51,7 @@
IBOutlet id o_time_fld; IBOutlet id o_time_fld;
IBOutlet id o_progress_bar; IBOutlet id o_progress_bar;
IBOutlet id o_bottombar_view; IBOutlet id o_bottombar_view;
IBOutlet id o_time_sld_left_view; IBOutlet id o_time_sld_background;
IBOutlet id o_time_sld_middle_view;
IBOutlet id o_time_sld_right_view;
// TODO Playlist table, additional ui stuff at the top of the window
IBOutlet id o_playlist_table; IBOutlet id o_playlist_table;
IBOutlet id o_video_view; IBOutlet id o_video_view;
IBOutlet id o_split_view; IBOutlet id o_split_view;
...@@ -172,12 +169,3 @@ ...@@ -172,12 +169,3 @@
- (void)windowWillExitFullScreen:(NSNotification *)notification; - (void)windowWillExitFullScreen:(NSNotification *)notification;
@end @end
@interface VLCProgressBarGradientEffect : NSView {
NSImage * o_time_sld_gradient_left_img;
NSImage * o_time_sld_gradient_middle_img;
NSImage * o_time_sld_gradient_right_img;
}
- (void)loadImagesInDarkStyle:(BOOL)b_value;
@end
modules/gui/macosx/MainWindow.m
View file @ 848daa45
...@@ -162,9 +162,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -162,9 +162,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
o_shuffle_pressed_img = [[NSImage imageNamed:@"shuffle-pressed"] retain]; o_shuffle_pressed_img = [[NSImage imageNamed:@"shuffle-pressed"] retain];
o_shuffle_on_img = [[NSImage imageNamed:@"shuffle-blue"] retain]; o_shuffle_on_img = [[NSImage imageNamed:@"shuffle-blue"] retain];
o_shuffle_on_pressed_img = [[NSImage imageNamed:@"shuffle-blue-pressed"] retain]; o_shuffle_on_pressed_img = [[NSImage imageNamed:@"shuffle-blue-pressed"] retain];
[o_time_sld_left_view setImage: [NSImage imageNamed:@"progression-track-wrapper-left"]]; [o_time_sld_background setImagesLeft: [NSImage imageNamed:@"progression-track-wrapper-left"] middle: [NSImage imageNamed:@"progression-track-wrapper-middle"] right: [NSImage imageNamed:@"progression-track-wrapper-right"]];
[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_down_btn setImage: [NSImage imageNamed:@"volume-low"]];
[o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track"]]; [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track"]];
[o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]]; [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]];
...@@ -180,7 +178,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -180,7 +178,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
} }
[o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons"]]; [o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons"]];
[o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed"]]; [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed"]];
[o_time_sld_fancygradient_view loadImagesInDarkStyle:NO]; [o_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progression-fill-left"] middle:[NSImage imageNamed:@"progression-fill-middle"] right:[NSImage imageNamed:@"progression-fill-right"]];
} }
else else
{ {
...@@ -208,9 +206,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -208,9 +206,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
o_shuffle_on_img = [[NSImage imageNamed:@"shuffle-blue_dark"] retain]; o_shuffle_on_img = [[NSImage imageNamed:@"shuffle-blue_dark"] retain];
o_shuffle_on_pressed_img = [[NSImage imageNamed:@"shuffle-blue-pressed_dark"] retain]; o_shuffle_on_pressed_img = [[NSImage imageNamed:@"shuffle-blue-pressed_dark"] retain];
[o_time_fld setTextColor: [NSColor colorWithCalibratedRed:229.0 green:229.0 blue:229.0 alpha:100.0]]; [o_time_fld setTextColor: [NSColor colorWithCalibratedRed:229.0 green:229.0 blue:229.0 alpha:100.0]];
[o_time_sld_left_view setImage: [NSImage imageNamed:@"progression-track-wrapper-left_dark"]]; [o_time_sld_background setImagesLeft: [NSImage imageNamed:@"progression-track-wrapper-left_dark"] middle: [NSImage imageNamed:@"progression-track-wrapper-middle_dark"] right: [NSImage imageNamed:@"progression-track-wrapper-right_dark"]];
[o_time_sld_middle_view setImage: [NSImage imageNamed:@"progression-track-wrapper-middle_dark"]];
[o_time_sld_right_view setImage: [NSImage imageNamed:@"progression-track-wrapper-right_dark"]];
[o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low_dark"]]; [o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low_dark"]];
[o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track_dark"]]; [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track_dark"]];
[o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high_dark"]]; [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high_dark"]];
...@@ -226,7 +222,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -226,7 +222,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
} }
[o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons_dark"]]; [o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons_dark"]];
[o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed_dark"]]; [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed_dark"]];
[o_time_sld_fancygradient_view loadImagesInDarkStyle:YES]; [o_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progressbar-fill-left_dark"] middle:[NSImage imageNamed:@"progressbar-fill-middle_dark"] right:[NSImage imageNamed:@"progressbar-fill-right_dark"]];
} }
[o_repeat_btn setImage: o_repeat_img]; [o_repeat_btn setImage: o_repeat_img];
[o_repeat_btn setAlternateImage: o_repeat_pressed_img]; [o_repeat_btn setAlternateImage: o_repeat_pressed_img];
...@@ -267,7 +263,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -267,7 +263,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
moveItem( o_volume_track_view ); moveItem( o_volume_track_view );
moveItem( o_volume_down_btn ); moveItem( o_volume_down_btn );
moveItem( o_time_fld ); moveItem( o_time_fld );
moveItem( o_time_sld_right_view ); moveItem( o_time_sld_background );
#undef moveItem #undef moveItem
#define enlargeItem( item ) \ #define enlargeItem( item ) \
...@@ -277,7 +273,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -277,7 +273,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
enlargeItem( o_time_sld ); enlargeItem( o_time_sld );
enlargeItem( o_progress_bar ); enlargeItem( o_progress_bar );
enlargeItem( o_time_sld_middle_view ); enlargeItem( o_time_sld_background );
enlargeItem( o_time_sld_fancygradient_view ); enlargeItem( o_time_sld_fancygradient_view );
#undef enlargeItem #undef enlargeItem
...@@ -1021,15 +1017,15 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1021,15 +1017,15 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)drawFancyGradientEffectForTimeSlider - (void)drawFancyGradientEffectForTimeSlider
{ {
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
float f_value = [o_time_sld_middle_view frame].size.width * ([o_time_sld intValue] / [o_time_sld maxValue]); float f_value = ([o_time_sld frame].size.width - [o_time_sld frame].origin.x - [o_time_sld knobPosition]) * -1.0;
if (f_value > 5.0) if (f_value > 7.5)
{ {
if (f_value != [o_time_sld_fancygradient_view frame].size.width) NSRect oldFrame = [o_time_sld_fancygradient_view frame];
if (f_value != oldFrame.size.width)
{ {
[o_time_sld_fancygradient_view setHidden: NO]; [o_time_sld_fancygradient_view setHidden: NO];
[o_time_sld_fancygradient_view setFrame: NSMakeRect( [o_time_sld_fancygradient_view frame].origin.x, [o_time_sld_fancygradient_view frame].origin.y, f_value, [o_time_sld_fancygradient_view frame].size.height )]; [o_time_sld_fancygradient_view setFrame: NSMakeRect( oldFrame.origin.x, oldFrame.origin.y, f_value, oldFrame.size.height )];
[o_time_sld_fancygradient_view setNeedsDisplay:YES]; [o_time_sld_fancygradient_view setNeedsDisplay:YES];
[o_time_sld_middle_view setNeedsDisplay:YES];
} }
} }
else else
...@@ -1806,35 +1802,3 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1806,35 +1802,3 @@ static VLCMainWindow *_o_sharedInstance = nil;
} }
@end @end
@implementation VLCProgressBarGradientEffect
- (void)dealloc
{
[o_time_sld_gradient_left_img release];
[o_time_sld_gradient_middle_img release];
[o_time_sld_gradient_right_img release];
[super dealloc];
}
- (void)loadImagesInDarkStyle: (BOOL)b_value
{
if (b_value)
{
o_time_sld_gradient_left_img = [[NSImage imageNamed:@"progressbar-fill-left_dark"] retain];
o_time_sld_gradient_middle_img = [[NSImage imageNamed:@"progressbar-fill-middle_dark"] retain];
o_time_sld_gradient_right_img = [[NSImage imageNamed:@"progressbar-fill-right_dark"] retain];
}
else
{
o_time_sld_gradient_left_img = [[NSImage imageNamed:@"progression-fill-left"] retain];
o_time_sld_gradient_middle_img = [[NSImage imageNamed:@"progression-fill-middle"] retain];
o_time_sld_gradient_right_img = [[NSImage imageNamed:@"progression-fill-right"] retain];
}
}
- (void)drawRect:(NSRect)rect
{
NSRect bnds = [self bounds];
NSDrawThreePartImage( bnds, o_time_sld_gradient_left_img, o_time_sld_gradient_middle_img, o_time_sld_gradient_right_img, NO, NSCompositeSourceOver, 1, NO );
}
@end
modules/gui/macosx/MainWindowTitle.h
View file @ 848daa45
...@@ -22,12 +22,13 @@ ...@@ -22,12 +22,13 @@
*****************************************************************************/ *****************************************************************************/
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "misc.h"
/***************************************************************************** /*****************************************************************************
* VLCMainWindowTitleView * VLCMainWindowTitleView
*****************************************************************************/ *****************************************************************************/
@interface VLCMainWindowTitleView : NSImageView @interface VLCMainWindowTitleView : VLCThreePartImageView
{ {
NSImage * o_red_img; NSImage * o_red_img;
NSImage * o_red_over_img; NSImage * o_red_over_img;
......
modules/gui/macosx/MainWindowTitle.m
View file @ 848daa45
...@@ -55,11 +55,8 @@ ...@@ -55,11 +55,8 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[self setImageScaling: NSScaleToFit];
[self setImageFrameStyle: NSImageFrameNone];
[self setImageAlignment: NSImageAlignCenter];
[self setImage: [NSImage imageNamed:@"topbar-dark-center-fill"]];
[self setAutoresizesSubviews: YES]; [self setAutoresizesSubviews: YES];
[self setImagesLeft:[NSImage imageNamed:@"topbar-dark-left"] middle: [NSImage imageNamed:@"topbar-dark-center-fill"] right:[NSImage imageNamed:@"topbar-dark-right"]];
[self loadButtonIcons]; [self loadButtonIcons];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(controlTintChanged:) name: NSControlTintDidChangeNotification object: nil]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(controlTintChanged:) name: NSControlTintDidChangeNotification object: nil];
...@@ -208,7 +205,6 @@ ...@@ -208,7 +205,6 @@
else else
[o_fullscreen_btn setImage: [NSImage imageNamed:@"window-fullscreen"]]; [o_fullscreen_btn setImage: [NSImage imageNamed:@"window-fullscreen"]];
} }
@end @end
/***************************************************************************** /*****************************************************************************
......
modules/gui/macosx/misc.h
View file @ 848daa45
...@@ -118,7 +118,10 @@ ...@@ -118,7 +118,10 @@
@interface TimeLineSlider : NSSlider @interface TimeLineSlider : NSSlider
{ {
NSImage *o_knob_img;
NSRect img_rect;
} }
- (CGFloat)knobPosition;
- (void)drawRect:(NSRect)rect; - (void)drawRect:(NSRect)rect;
- (void)drawKnobInRect:(NSRect)knobRect; - (void)drawKnobInRect:(NSRect)knobRect;
...@@ -158,3 +161,16 @@ ...@@ -158,3 +161,16 @@
} }
@end @end
/*****************************************************************************
* VLCThreePartImageView interface
*****************************************************************************/
@interface VLCThreePartImageView : NSView
{
NSImage * o_left_img;
NSImage * o_middle_img;
NSImage * o_right_img;
}
- (void)setImagesLeft:(NSImage *)left middle: (NSImage *)middle right:(NSImage *)right;
@end
modules/gui/macosx/misc.m
View file @ 848daa45
...@@ -601,17 +601,32 @@ void _drawFrameInRect(NSRect frameRect) ...@@ -601,17 +601,32 @@ void _drawFrameInRect(NSRect frameRect)
@implementation TimeLineSlider @implementation TimeLineSlider
- (void)awakeFromNib
{
o_knob_img = [NSImage imageNamed:@"progression-knob"];
img_rect.size = [o_knob_img size];
img_rect.origin.x = img_rect.origin.y = 0;
}
- (void)dealloc
{
[o_knob_img release];
[super dealloc];
}
- (CGFloat)knobPosition
{
NSRect knobRect = [[self cell] knobRectFlipped:NO];
knobRect.origin.x += knobRect.size.width / 2;
return knobRect.origin.x;
}
- (void)drawKnobInRect:(NSRect)knobRect - (void)drawKnobInRect:(NSRect)knobRect
{ {
NSRect image_rect; knobRect.origin.x += (knobRect.size.width - img_rect.size.width) / 2;
NSImage *img = [NSImage imageNamed:@"progression-knob"]; knobRect.size.width = img_rect.size.width;
image_rect.size = [img size]; knobRect.size.height = img_rect.size.height;
image_rect.origin.x = 0; [o_knob_img drawInRect:knobRect fromRect:img_rect operation:NSCompositeSourceOver fraction:1];
image_rect.origin.y = 0;
knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;
knobRect.size.width = image_rect.size.width;
knobRect.size.height = image_rect.size.height;
[img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];
} }
- (void)drawRect:(NSRect)rect - (void)drawRect:(NSRect)rect
...@@ -732,3 +747,38 @@ void _drawFrameInRect(NSRect frameRect) ...@@ -732,3 +747,38 @@ void _drawFrameInRect(NSRect frameRect)
[[o_subviews objectAtIndex:1] setFrame: rightViewDimensions]; [[o_subviews objectAtIndex:1] setFrame: rightViewDimensions];
} }
@end @end
/*****************************************************************************
* VLCThreePartImageView interface
*****************************************************************************/
@implementation VLCThreePartImageView
- (void)dealloc
{
[o_left_img release];
[o_middle_img release];
[o_right_img release];
[super dealloc];
}
- (void)setImagesLeft:(NSImage *)left middle: (NSImage *)middle right:(NSImage *)right
{
if (o_left_img)
[o_left_img release];
if (o_middle_img)
[o_middle_img release];
if (o_right_img)
[o_right_img release];
o_left_img = [left retain];
o_middle_img = [middle retain];
o_right_img = [right retain];
}
- (void)drawRect:(NSRect)rect
{
NSRect bnds = [self bounds];
NSDrawThreePartImage( bnds, o_left_img, o_middle_img, o_right_img, NO, NSCompositeSourceOver, 1, NO );
}
@end
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