vlc | branch: master | Felix Paul Kühne <[email protected]> | Wed Aug 22 18:13:49 2012 +0200| [f0a7d9a4906754d9c4c5f84354953e8bda79f535] | committer: Felix Paul Kühne
macosx: improve main window initialization This targets the same issue as 5b8a4057, but in a saner approach > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f0a7d9a4906754d9c4c5f84354953e8bda79f535 --- .../macosx/Resources/English.lproj/MainMenu.xib | 22 ++++++++++---------- modules/gui/macosx/intf.m | 10 ++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib index 7b1c62e..93885ce 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib @@ -21,17 +21,17 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="5160"/> + <integer value="4722"/> + <integer value="3707"/> <integer value="21"/> - <integer value="4850"/> <integer value="1617"/> <integer value="2730"/> - <integer value="4722"/> - <integer value="3707"/> - <integer value="915"/> <integer value="2770"/> - <integer value="4845"/> + <integer value="915"/> <integer value="4948"/> - <integer value="5160"/> + <integer value="4850"/> + <integer value="4845"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -11939,7 +11939,7 @@ LCAuLi4</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{329, 65}, {604, 310}}</string> <boolean value="YES"/> - <boolean value="NO"/> + <boolean value="YES"/> <boolean value="NO"/> <string>{604, 36}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -12130,7 +12130,7 @@ LCAuLi4</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{592, 715}, {468, 20}}</string> + <string>{{500, 715}, {468, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -12476,7 +12476,7 @@ LCAuLi4</string> <string>{{329, 634}, {100, 100}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{688, 601}, {400, 22}}</string> + <string>{{568, 601}, {400, 22}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSAffineTransform"/> <string>VLCCustomWindowCloseButton</string> @@ -12640,7 +12640,7 @@ LCAuLi4</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{736, 282}, {302, 433}}</string> + <string>{{644, 282}, {302, 433}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -12692,7 +12692,7 @@ LCAuLi4</string> <string>{{1340, 354}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{1038, 299}, {64, 6}}</string> + <string>{{946, 299}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSAffineTransform"> diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 02bb652..9b381d7 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -654,11 +654,6 @@ static VLCMain *_o_sharedMainInstance = nil; [[VLCApplication sharedApplication] setApplicationIconImage: [NSImage imageNamed:@"vlc-xmas"]]; } - [o_mainwindow updateWindow]; - [o_mainwindow updateTimeSlider]; - [o_mainwindow updateVolumeSlider]; - [o_mainwindow makeKeyAndOrderFront: self]; - [self initStrings]; nib_main_loaded = TRUE; @@ -692,6 +687,11 @@ static VLCMain *_o_sharedMainInstance = nil; /* we will need this, so let's load it here so the interface appears to be more responsive */ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp]; + + /* update the main window */ + [o_mainwindow updateWindow]; + [o_mainwindow updateTimeSlider]; + [o_mainwindow updateVolumeSlider]; } - (void)initStrings _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
