diff options
author | ritsuka <[email protected]> | 2014-08-19 17:10:28 +0000 |
---|---|---|
committer | ritsuka <[email protected]> | 2014-08-19 17:10:28 +0000 |
commit | f743cbf1ede8d996ed4fad4812aebce5d34ef3be (patch) | |
tree | cc066a6a587dd62e1c118251fa68e291f7ecb4aa /macosx | |
parent | d9cb9cea31d6c3a4e3220202cd77471a8b37b02b (diff) |
MacGui: Removed the code to show/hide the fSrcAngle* UI elements in Controller.m, the same work is now done in the MainMenu.xib with bindings.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6321 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/Controller.m | 28 | ||||
-rw-r--r-- | macosx/English.lproj/MainMenu.xib | 20 |
2 files changed, 23 insertions, 25 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 72cd0055c..f17eda416 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -611,10 +611,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It [fPresetDrawer open]; } - /* Initially set the dvd angle widgets to hidden (dvdnav only) */ - [fSrcAngleLabel setHidden:YES]; - [fSrcAnglePopUp setHidden:YES]; - /* Setup the start / stop popup */ [fEncodeStartStopPopUp removeAllItems]; [fEncodeStartStopPopUp addItemWithTitle: @"Chapters"]; @@ -4318,26 +4314,14 @@ fWorkingCount = 0; [fSrcChapterEndPopUp selectItemAtIndex: hb_list_count( title->list_chapter ) - 1]; [self chapterPopUpChanged:nil]; - - /* if using dvd nav, show the angle widget */ - if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"UseDvdNav"] boolValue]) - { - [fSrcAngleLabel setHidden:NO]; - [fSrcAnglePopUp setHidden:NO]; - - [fSrcAnglePopUp removeAllItems]; - for( int i = 0; i < title->angle_count; i++ ) - { - [fSrcAnglePopUp addItemWithTitle: [NSString stringWithFormat: @"%d", i + 1]]; - } - [fSrcAnglePopUp selectItemAtIndex: 0]; - } - else + + [fSrcAnglePopUp removeAllItems]; + for( int i = 0; i < title->angle_count; i++ ) { - [fSrcAngleLabel setHidden:YES]; - [fSrcAnglePopUp setHidden:YES]; + [fSrcAnglePopUp addItemWithTitle: [NSString stringWithFormat: @"%d", i + 1]]; } - + [fSrcAnglePopUp selectItemAtIndex: 0]; + /* Start Get and set the initial pic size for display */ fTitle = title; diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index 7ce7fc867..33f0c5d72 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13F14" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment version="1060" defaultVersion="1090" identifier="macosx"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/> @@ -140,6 +140,13 @@ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> + <connections> + <binding destination="5676" name="hidden" keyPath="values.UseDvdNav" id="GhV-lP-BWw"> + <dictionary key="options"> + <string key="NSValueTransformerName">NSNegateBoolean</string> + </dictionary> + </binding> + </connections> </textField> <popUpButton verticalHuggingPriority="750" id="5181"> <rect key="frame" x="436" y="506" width="44" height="22"/> @@ -153,6 +160,13 @@ </items> </menu> </popUpButtonCell> + <connections> + <binding destination="5676" name="hidden" keyPath="values.UseDvdNav" id="8xq-AL-yDc"> + <dictionary key="options"> + <string key="NSValueTransformerName">NSNegateBoolean</string> + </dictionary> + </binding> + </connections> </popUpButton> <textField verticalHuggingPriority="750" id="1552"> <rect key="frame" x="5" y="454" width="47" height="17"/> @@ -225,7 +239,7 @@ <font key="titleFont" metaFont="system"/> </box> <textField verticalHuggingPriority="750" id="1539"> - <rect key="frame" x="70" y="540" width="310" height="14.000000042040575"/> + <rect key="frame" x="70" y="540" width="310" height="14.000000042040593"/> <autoresizingMask key="autoresizingMask" flexibleMinY="YES" heightSizable="YES"/> <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingMiddle" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" id="4906"> <font key="font" metaFont="smallSystem"/> @@ -341,7 +355,7 @@ <font key="titleFont" metaFont="system"/> </box> <progressIndicator hidden="YES" verticalHuggingPriority="750" maxValue="100" bezeled="NO" controlSize="small" style="bar" id="3203"> - <rect key="frame" x="386" y="542.00000004203991" width="541" height="12"/> + <rect key="frame" x="386" y="542.0000000420406" width="541" height="12"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/> </progressIndicator> <button toolTip="This rearranges the header of the MP4 file to optimize it for streaming across the web." id="4579"> |