Skip to content

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

macosx: prove-of-concept of a styled window title bar 

current lacks support for zooming and therefore behaves incorrectly when using Lion's native fullscreen mode
(cherry picked from commit b40f9cee8617f6da0ddc4a3c3a4c0efa4ebcd837)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 78931a83
Show whitespace changes
Inline Side-by-side
Showing with 615 additions and 51 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ 1a67d630
......@@ -21,15 +21,14 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1617"/>
<integer value="4596"/>
<integer value="4722"/>
<integer value="915"/>
<integer value="4380"/>
<integer value="334"/>
<integer value="1617"/>
<integer value="4758"/>
<integer value="2730"/>
<integer value="3707"/>
<integer value="2709"/>
<integer value="2"/>
<integer value="915"/>
<integer value="4722"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -3214,7 +3213,7 @@
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSCustomView" id="356649608">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -3306,7 +3305,6 @@
</object>
</object>
<string key="NSFrameSize">{488, 40}</string>
<reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
......@@ -3868,7 +3866,7 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="366395044">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -3953,29 +3951,6 @@ LCAuLi4</string>
<object class="NSTextView" id="550703508">
<reference key="NSNextResponder" ref="1059447005"/>
<int key="NSvFlags">2322</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple HTML pasteboard type</string>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple PNG pasteboard type</string>
<string>Apple URL pasteboard type</string>
<string>CorePasteboardFlavorType 0x6D6F6F76</string>
<string>NSColor pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NSStringPboardType</string>
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT RTFD pasteboard type</string>
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
<string>NeXT font pasteboard type</string>
<string>NeXT ruler pasteboard type</string>
<string>WebURLsWithTitlesPboardType</string>
<string>public.url</string>
</object>
</object>
<string key="NSFrameSize">{498, 14}</string>
<reference key="NSSuperview" ref="1059447005"/>
<object class="NSTextContainer" key="NSTextContainer" id="527106919">
......@@ -4041,7 +4016,6 @@ LCAuLi4</string>
</object>
<string key="NSFrame">{{1, 1}, {498, 102}}</string>
<reference key="NSSuperview" ref="563453281"/>
<reference key="NSNextKeyView" ref="550703508"/>
<reference key="NSDocView" ref="550703508"/>
<reference key="NSBGColor" ref="712893775"/>
<reference key="NSCursor" ref="1071817267"/>
......@@ -4070,7 +4044,6 @@ LCAuLi4</string>
</object>
<string key="NSFrame">{{92, 96}, {500, 104}}</string>
<reference key="NSSuperview" ref="366395044"/>
<reference key="NSNextKeyView" ref="1059447005"/>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="444566474"/>
<reference key="NSHScroller" ref="599664251"/>
......@@ -4159,7 +4132,6 @@ LCAuLi4</string>
</object>
</object>
<string key="NSFrameSize">{612, 324}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
......@@ -4485,7 +4457,131 @@ LCAuLi4</string>
<bool key="CIEnabled">YES</bool>
</object>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSClassName">NSView</string>
<string key="NSClassName">VLCMainWindowTitleView</string>
</object>
<object class="NSCustomView" id="471121744">
<reference key="NSNextResponder"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="659976200">
<reference key="NSNextResponder" ref="471121744"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{65, 3}, {270, 17}}</string>
<reference key="NSSuperview" ref="471121744"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="434038964">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">1212155968</int>
<string key="NSContents">Label</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:4068</string>
<reference key="NSControlView" ref="659976200"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
</object>
</object>
<object class="NSButton" id="912813065">
<reference key="NSNextResponder" ref="471121744"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{382, 4}, {14, 14}}</string>
<reference key="NSSuperview" ref="471121744"/>
<string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="883426607">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="912813065"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">134</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="47797873">
<reference key="NSNextResponder" ref="471121744"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{48, 4.93359375}, {12, 12}}</string>
<reference key="NSSuperview" ref="471121744"/>
<string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="576041215">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="47797873"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">134</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="145580725">
<reference key="NSNextResponder" ref="471121744"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{28, 5}, {12, 12}}</string>
<reference key="NSSuperview" ref="471121744"/>
<string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="887230843">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="145580725"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">134</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="369193052">
<reference key="NSNextResponder" ref="471121744"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{8, 5}, {12, 12}}</string>
<reference key="NSSuperview" ref="471121744"/>
<string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1021277036">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="369193052"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">134</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrameSize">{400, 22}</string>
<reference key="NSSuperview"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCMainWindowTitleView</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
......@@ -7195,6 +7291,94 @@ LCAuLi4</string>
</object>
<int key="connectionID">4757</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_fullscreen_btn</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="912813065"/>
</object>
<int key="connectionID">4769</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_green_btn</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="47797873"/>
</object>
<int key="connectionID">4770</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_red_btn</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="369193052"/>
</object>
<int key="connectionID">4771</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_yellow_btn</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="145580725"/>
</object>
<int key="connectionID">4772</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">buttonAction:</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="369193052"/>
</object>
<int key="connectionID">4773</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">buttonAction:</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="145580725"/>
</object>
<int key="connectionID">4774</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">buttonAction:</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="47797873"/>
</object>
<int key="connectionID">4775</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">buttonAction:</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="912813065"/>
</object>
<int key="connectionID">4776</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_title_lbl</string>
<reference key="source" ref="471121744"/>
<reference key="destination" ref="659976200"/>
</object>
<int key="connectionID">4779</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">miniaturize:</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="471121744"/>
</object>
<int key="connectionID">4780</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_titlebar_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="471121744"/>
</object>
<int key="connectionID">4781</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -9884,6 +10068,90 @@ LCAuLi4</string>
<reference key="object" ref="577223856"/>
<reference key="parent" ref="828315098"/>
</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>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
......@@ -10588,6 +10856,23 @@ LCAuLi4</string>
<string>4732.IBPluginDependency</string>
<string>4753.IBPluginDependency</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.IBPluginDependency</string>
<string>4761.IBPluginDependency</string>
<string>4761.IBViewBoundsToFrameTransform</string>
<string>4762.IBPluginDependency</string>
<string>4763.IBPluginDependency</string>
<string>4763.IBViewBoundsToFrameTransform</string>
<string>4764.IBPluginDependency</string>
<string>4765.IBPluginDependency</string>
<string>4765.IBViewBoundsToFrameTransform</string>
<string>4766.IBPluginDependency</string>
<string>4777.IBPluginDependency</string>
<string>4778.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
<string>56.IBPluginDependency</string>
......@@ -11407,6 +11692,31 @@ LCAuLi4</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">Ab+AAAAAAAAAA</bytes>
</object>
<string>{{354, 575}, {400, 22}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBAAAAwXAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABB4AAAwXAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCQAAAwXAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDvwAAwYAAAA</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"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -11473,7 +11783,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">4757</int>
<int key="maxID">4781</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -16099,6 +16409,7 @@ LCAuLi4</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_video_view</string>
<string>o_volume_down_btn</string>
<string>o_volume_sld</string>
......@@ -16140,6 +16451,7 @@ LCAuLi4</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
......@@ -16174,6 +16486,7 @@ LCAuLi4</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_video_view</string>
<string>o_volume_down_btn</string>
<string>o_volume_sld</string>
......@@ -16294,6 +16607,10 @@ LCAuLi4</string>
<string key="name">o_time_sld_right_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_titlebar_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_video_view</string>
<string key="candidateClassName">id</string>
......@@ -16316,7 +16633,7 @@ LCAuLi4</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="919687584">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/MainWindow.h</string>
</object>
......@@ -16330,13 +16647,82 @@ LCAuLi4</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCProgressBarGradientEffect</string>
<string key="superclassName">NSView</string>
<string key="className">VLCMainWindowTitleView</string>
<string key="superclassName">NSImageView</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">buttonAction:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">buttonAction:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">buttonAction:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_fullscreen_btn</string>
<string>o_green_btn</string>
<string>o_red_btn</string>
<string>o_title_lbl</string>
<string>o_yellow_btn</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_fullscreen_btn</string>
<string>o_green_btn</string>
<string>o_red_btn</string>
<string>o_title_lbl</string>
<string>o_yellow_btn</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">o_fullscreen_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_green_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_red_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_title_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_yellow_btn</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/MainWindow.h</string>
<string key="minorKey">../../../../../modules/gui/macosx/MainWindowTitle.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCProgressBarGradientEffect</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="919687584"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCTimeField</string>
<string key="superclassName">NSTextField</string>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 1a67d630
......@@ -269,6 +269,8 @@
8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = README.MacOSX.rtf; sourceTree = SOURCE_ROOT; };
8EE1AF9F044465080059A3A7 /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = about.h; path = ../../../modules/gui/macosx/about.h; sourceTree = SOURCE_ROOT; };
8EE1AFA0044465080059A3A7 /* about.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = about.m; path = ../../../modules/gui/macosx/about.m; sourceTree = SOURCE_ROOT; };
CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainWindowTitle.h; path = ../../../modules/gui/macosx/MainWindowTitle.h; sourceTree = "<group>"; };
CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainWindowTitle.m; path = ../../../modules/gui/macosx/MainWindowTitle.m; sourceTree = "<group>"; };
CC04321113B246DF00D7D52E /* back_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = back_dark.png; path = Resources/mainwindow_dark/back_dark.png; sourceTree = "<group>"; };
CC04321213B246DF00D7D52E /* back-pressed_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-pressed_dark.png"; path = "Resources/mainwindow_dark/back-pressed_dark.png"; sourceTree = "<group>"; };
CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects-double-buttons_dark.png"; path = "Resources/mainwindow_dark/effects-double-buttons_dark.png"; sourceTree = "<group>"; };
......@@ -622,8 +624,6 @@
8ED6C27B03E2EB1C0059A3A7 /* controls.m */,
8E6BC6F6041643860059A3A7 /* applescript.h */,
8E6BC6F7041643860059A3A7 /* applescript.m */,
8ED6C27F03E2EB1C0059A3A7 /* misc.h */,
8ED6C28003E2EB1C0059A3A7 /* misc.m */,
8EE1AF9F044465080059A3A7 /* about.h */,
8EE1AFA0044465080059A3A7 /* about.m */,
8ED6C28103E2EB1C0059A3A7 /* open.h */,
......@@ -656,6 +656,7 @@
CC707EC4137464CD0003010A /* TrackSynchronization.m */,
CCCE366D13817E4500694F2A /* VideoEffects.h */,
CCCE366E13817E4500694F2A /* VideoEffects.m */,
CC017A0E14A4C8B600C09A4F /* custom UI code */,
CC0CD0E513DE0FC600B0D90D /* Imported Code */,
);
name = Classes;
......@@ -721,6 +722,17 @@
name = fileicons;
sourceTree = "<group>";
};
CC017A0E14A4C8B600C09A4F /* custom UI code */ = {
isa = PBXGroup;
children = (
8ED6C27F03E2EB1C0059A3A7 /* misc.h */,
8ED6C28003E2EB1C0059A3A7 /* misc.m */,
CC017A0B14A4C8AF00C09A4F /* MainWindowTitle.h */,
CC017A0C14A4C8AF00C09A4F /* MainWindowTitle.m */,
);
name = "custom UI code";
sourceTree = "<group>";
};
CC0430EE13B2461A00D7D52E /* 10th anniversary ui */ = {
isa = PBXGroup;
children = (
......
modules/gui/macosx/MainWindow.h
View file @ 1a67d630
......@@ -68,6 +68,7 @@
IBOutlet id o_dropzone_lbl;
IBOutlet VLCFSPanel *o_fspanel;
IBOutlet id o_titlebar_view;
BOOL b_dark_interface;
BOOL b_nativeFullscreenMode;
......@@ -128,6 +129,7 @@
- (IBAction)fullscreen:(id)sender;
- (IBAction)dropzoneButtonAction:(id)sender;
- (void)setTitle:(NSString *)title;
- (void)showDropZone;
- (void)hideDropZone;
- (void)updateTimeSlider;
......
modules/gui/macosx/MainWindow.m
View file @ 1a67d630
......@@ -33,6 +33,7 @@
#import "open.h"
#import "controls.h" // TODO: remove me
#import "SideBarItem.h"
#import "MainWindowTitle.h"
#import <vlc_playlist.h>
#import <vlc_aout_intf.h>
#import <vlc_url.h>
......@@ -69,10 +70,20 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask
backing:(NSBackingStoreType)backingType defer:(BOOL)flag
{
// styleMask ^= NSTexturedBackgroundWindowMask;
b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
self = [super initWithContentRect:contentRect styleMask:styleMask //& ~NSTitledWindowMask
if (b_dark_interface)
{
styleMask = NSBorderlessWindowMask;
self = [super initWithContentRect:contentRect styleMask:styleMask
backing:backingType defer:flag];
}
else
{
self = [super initWithContentRect:contentRect styleMask:styleMask
backing:backingType defer:flag];
}
[[VLCMain sharedInstance] updateTogglePlaylistState];
......@@ -106,7 +117,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)awakeFromNib
{
/* setup the styled interface */
b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
i_lastShownVolume = -1;
......@@ -173,7 +183,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
}
else
{
/* TODO: we also need to change the window style here... */
[o_bottombar_view setImage: [NSImage imageNamed:@"bottom-background_dark"]];
[o_bwd_btn setImage: [NSImage imageNamed:@"back_dark"]];
[o_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed_dark"]];
......@@ -233,7 +242,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
[self setContentMinSize:NSMakeSize(500., 288.)];
[self setTitle: _NS("VLC media player")];
[o_playlist_btn setEnabled:NO];
[o_video_view setFrame: [o_split_view frame]];
o_temp_view = [[NSView alloc] init];
[o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
[o_dropzone_view setFrame: [o_playlist_table frame]];
......@@ -376,6 +384,27 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_sidebar_view reloadData];
[o_sidebar_view selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:YES];
if( b_dark_interface )
{
NSRect winrect;
CGFloat f_titleBarHeight = [o_titlebar_view frame].size.height;
winrect = [self frame];
[o_titlebar_view setFrame: NSMakeRect( 0, winrect.size.height - f_titleBarHeight,
winrect.size.width, f_titleBarHeight )];
[[self contentView] addSubview: o_titlebar_view];
winrect.size.height = winrect.size.height + f_titleBarHeight;
[self setFrame: winrect display:NO animate:NO];
winrect = [o_split_view frame];
winrect.size.height = winrect.size.height - f_titleBarHeight;
[o_split_view setFrame: winrect];
[o_video_view setFrame: winrect];
[self display];
}
else
[o_video_view setFrame: [o_split_view frame]];
}
#pragma mark -
......@@ -630,6 +659,24 @@ static VLCMainWindow *_o_sharedInstance = nil;
[[[VLCMain sharedInstance] open] openFileGeneric];
}
#pragma mark -
#pragma mark overwritten default functionality
- (BOOL)canBecomeKeyWindow
{
return YES;
}
- (void)setTitle:(NSString *)title
{
[o_titlebar_view setWindowTitle: title];
[super setTitle: title];
}
- (void)performZoom:(id)sender
{
[super zoom: sender];
}
#pragma mark -
#pragma mark Update interface and respond to foreign events
- (void)showDropZone
......@@ -869,7 +916,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([o_video_view window] != self)
{
[o_video_view removeFromSuperviewWithoutNeedingDisplay];
[o_video_view setFrame: [o_split_view frame]];
[o_video_view setFrame: [o_right_split_view frame]];
[[self contentView] addSubview:o_video_view positioned:NSWindowAbove relativeTo:nil];
}
b_nonembedded = NO;
......@@ -943,6 +990,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
/* Calculate the window's new size */
new_frame.size.width = [self frame].size.width - [o_video_view frame].size.width + nativeVideoSize.width;
if (b_dark_interface)
new_frame.size.height = [self frame].size.height - [o_video_view frame].size.height + nativeVideoSize.height + [o_titlebar_view frame].size.height;
else
new_frame.size.height = [self frame].size.height - [o_video_view frame].size.height + nativeVideoSize.height;
new_frame.origin.x = topleftscreen.x;
......
modules/gui/macosx/MainWindowTitle.h 0 → 100644
View file @ 1a67d630
/*****************************************************************************
* MainWindowTitle.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2011 Felix Paul Kühne
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import <Cocoa/Cocoa.h>
/*****************************************************************************
* VLCMainWindowTitleView
*****************************************************************************/
@interface VLCMainWindowTitleView : NSImageView
{
IBOutlet id o_red_btn;
IBOutlet id o_yellow_btn;
IBOutlet id o_green_btn;
IBOutlet id o_fullscreen_btn;
IBOutlet id o_title_lbl;
}
- (IBAction)buttonAction:(id)sender;
- (void)setWindowTitle:(NSString *)title;
@end
modules/gui/macosx/MainWindowTitle.m 0 → 100644
View file @ 1a67d630
/*****************************************************************************
* MainWindowTitle.m: MacOS X interface module
*****************************************************************************
* Copyright (C) 2011 Felix Paul Kühne
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import <vlc_common.h>
#import "intf.h"
#import "MainWindowTitle.h"
#import "CoreInteraction.h"
/*****************************************************************************
* VLCMainWindowTitleView
*****************************************************************************/
@implementation VLCMainWindowTitleView
- (void)awakeFromNib
{
[self setImageScaling: NSScaleToFit];
[self setImageFrameStyle: NSImageFrameNone];
[self setImageAlignment: NSImageAlignCenter];
[self setImage: [NSImage imageNamed:@"bottom-background_dark"]];
[self setAutoresizesSubviews: YES];
/* TODO: icon setters */
}
- (BOOL)mouseDownCanMoveWindow
{
return YES;
}
- (IBAction)buttonAction:(id)sender
{
if (sender == o_red_btn)
[[self window] orderOut: sender];
else if (sender == o_yellow_btn)
[[self window] miniaturize: sender];
else if (sender == o_green_btn)
[[self window] performZoom: sender];
else if (sender == o_fullscreen_btn)
[[VLCCoreInteraction sharedInstance] toggleFullscreen];
else
msg_Err( VLCIntf, "unknown button action sender" );
}
- (void)setWindowTitle:(NSString *)title
{
[o_title_lbl setStringValue: title];
}
@end
modules/gui/macosx/Modules.am
View file @ 1a67d630
......@@ -66,5 +66,7 @@ SOURCES_macosx = \
eyetv.m \
VideoView.h \
VideoView.m \
MainWindowTitle.h \
MainWindowTitle.m \
$(NULL)
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