Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
4d406ab2
Commit
4d406ab2
authored
Sep 28, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: remove unneeded outlet for window in controlsBar code
parent
5d2ed11e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
32 deletions
+7
-32
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+6
-29
modules/gui/macosx/ControlsBar.h
modules/gui/macosx/ControlsBar.h
+0
-2
modules/gui/macosx/ControlsBar.m
modules/gui/macosx/ControlsBar.m
+1
-1
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
4d406ab2
...
...
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">12
B19
</string>
<string key="IBDocument.SystemVersion">12
C54
</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">62
4
.00</string>
<string key="IBDocument.AppKitVersion">1187
.34
</string>
<string key="IBDocument.HIToolboxVersion">62
5
.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
...
...
@@ -21,10 +21,10 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="4596"/>
<integer value="4948"/>
<integer value="5248"/>
<integer value="21"/>
<integer value="4596"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
...
...
@@ -8404,14 +8404,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">5364</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_associated_window</string>
<reference key="source" ref="878580547"/>
<reference key="destination" ref="498338108"/>
</object>
<int key="connectionID">5365</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_progress_view</string>
...
...
@@ -8476,14 +8468,6 @@ LCAuLi4</string>
</object>
<int key="connectionID">5374</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_associated_window</string>
<reference key="source" ref="573738745"/>
<reference key="destination" ref="429979276"/>
</object>
<int key="connectionID">5375</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_bottombar_view</string>
...
...
@@ -14385,7 +14369,6 @@ LCAuLi4</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_associated_window</string>
<string>o_bottombar_view</string>
<string>o_bwd_btn</string>
<string>o_fullscreen_btn</string>
...
...
@@ -14413,14 +14396,12 @@ LCAuLi4</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_associated_window</string>
<string>o_bottombar_view</string>
<string>o_bwd_btn</string>
<string>o_fullscreen_btn</string>
...
...
@@ -14436,10 +14417,6 @@ LCAuLi4</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">o_associated_window</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_bottombar_view</string>
<string key="candidateClassName">id</string>
...
...
@@ -16996,7 +16973,7 @@ LCAuLi4</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>
id
</string>
<string>
VLCControlsBarCommon
</string>
<string>id</string>
</object>
</object>
...
...
@@ -17011,7 +16988,7 @@ LCAuLi4</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">o_controls_bar</string>
<string key="candidateClassName">
id
</string>
<string key="candidateClassName">
VLCControlsBarCommon
</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_titlebar_view</string>
...
...
modules/gui/macosx/ControlsBar.h
View file @
4d406ab2
...
...
@@ -36,8 +36,6 @@
@interface
VLCControlsBarCommon
:
NSObject
{
IBOutlet
id
o_associated_window
;
IBOutlet
id
o_bottombar_view
;
IBOutlet
id
o_play_btn
;
...
...
modules/gui/macosx/ControlsBar.m
View file @
4d406ab2
...
...
@@ -136,7 +136,7 @@
if
(
!
OSX_SNOW_LEOPARD
)
[
o_resize_view
setImage
:
NULL
];
if
([
o_
associated_
window
styleMask
]
&
NSResizableWindowMask
)
if
([
[
o_
bottombar_view
window
]
styleMask
]
&
NSResizableWindowMask
)
[
o_resize_view
removeFromSuperviewWithoutNeedingDisplay
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment