vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Apr 10 20:16:45 2011 +0200| [733940c823566ea6587efb7f2db06422587237c8] | committer: Felix Paul Kühne
macosx: make sure there is enough space to display the remaining time for movies longer than 1 hour additionally, allow switching the time display also in fullscreen mode > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=733940c823566ea6587efb7f2db06422587237c8 --- .../English.lproj/MainMenu.nib/designable.nib | 10 ++++++---- .../English.lproj/MainMenu.nib/keyedobjects.nib | Bin 132613 -> 132736 bytes modules/gui/macosx/fspanel.m | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib index 37fe0eb..91ed00d 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib @@ -13,6 +13,7 @@ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="2"/> + <integer value="2417"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3369,7 +3370,7 @@ <nil key="NSUserInterfaceItemIdentifier"/> <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> <object class="NSView" key="NSWindowView" id="351701434"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -3500,7 +3501,7 @@ <object class="NSSlider" id="400811827"> <reference key="NSNextResponder" ref="351701434"/> <int key="NSvFlags">290</int> - <string key="NSFrame">{{158, 6}, {17, 15}}</string> + <string key="NSFrame">{{158, 6}, {9, 15}}</string> <reference key="NSSuperview" ref="351701434"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="295635233"> @@ -3618,7 +3619,7 @@ <object class="NSTextField" id="262403346"> <reference key="NSNextResponder" ref="351701434"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{172, 7}, {46, 13}}</string> + <string key="NSFrame">{{165, 7}, {53, 13}}</string> <reference key="NSSuperview" ref="351701434"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="742071211"> @@ -3643,7 +3644,8 @@ <string key="NSExtension">NSView</string> </object> </object> - <string key="NSFrame">{{7, 11}, {238, 63}}</string> + <string key="NSFrameSize">{238, 63}</string> + <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string> diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib index c373699..177e58c 100644 Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m index a78b8b3..c2c5a2f 100644 --- a/modules/gui/macosx/fspanel.m +++ b/modules/gui/macosx/fspanel.m @@ -400,8 +400,8 @@ [o_button setAction: @selector(action:)]; \ [self addSubview:o_button]; -#define addTextfield( o_text, align, font, color, size ) \ - o_text = [[NSTextField alloc] initWithFrame: s_rc]; \ +#define addTextfield( class, o_text, align, font, color, size ) \ + o_text = [[class alloc] initWithFrame: s_rc]; \ [o_text setDrawsBackground: NO]; \ [o_text setBordered: NO]; \ [o_text setEditable: NO]; \ @@ -463,11 +463,11 @@ s_rc.origin.y = 64; s_rc.size.width = 352; s_rc.size.height = 14; - addTextfield( o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 ); - s_rc.origin.x = 486; + addTextfield( NSTextField, o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 ); + s_rc.origin.x = 481; s_rc.origin.y = 64; - s_rc.size.width = 50; - addTextfield( o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 ); + s_rc.size.width = 55; + addTextfield( VLCTimefield, o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 ); return view; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
