MacGui: Remove scanned source framrate display from "Same as source" in the fps popup.

- Some feel this is misleading and shouldn't be there since same as source now uses true source frame durations.
- made the fps and encoder popups narrower to fit.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1561 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 13 insertions, 30 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index cec1fd19f..42bd48d8e 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2226,25 +2226,12 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     [self audioTrackPopUpChanged: fAudLang3PopUp];
     [self audioTrackPopUpChanged: fAudLang4PopUp];
     
-    /* We repopulate the Video Framerate popup and show the detected framerate along with "Same as Source"*/
+    /* We repopulate the Video Framerate popup */
+
     [fVidRatePopUp removeAllItems];
-    if (fTitle->rate_base == 1126125) // 23.976 NTSC Film
-    {
-        [fVidRatePopUp addItemWithTitle: @"Same as source (23.976)"];
-    }
-    else if (fTitle->rate_base == 1080000) // 25 PAL Film/Video
-    {
-        [fVidRatePopUp addItemWithTitle: @"Same as source (25)"];
-    }
-    else if (fTitle->rate_base == 900900) // 29.97 NTSC Video
-    {
-        [fVidRatePopUp addItemWithTitle: @"Same as source (29.97)"];
-    }
-    else
-    {
-        /* if none of the common dvd source framerates is detected, just use "Same as source" */
-        [fVidRatePopUp addItemWithTitle: @"Same as source"];
-    }
+    
+    [fVidRatePopUp addItemWithTitle:@"Same as source"];
+    
 	for( int i = 0; i < hb_video_rates_count; i++ )
     {
         if ([[NSString stringWithCString: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%.3f",23.976]])
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 3c46b511f..75e1d609b 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -2,14 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9D34</string>
+		<string key="IBDocument.SystemVersion">9E17</string>
 		<string key="IBDocument.InterfaceBuilderVersion">670</string>
 		<string key="IBDocument.AppKitVersion">949.33</string>
 		<string key="IBDocument.HIToolboxVersion">352.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1843"/>
-			<integer value="21"/>
+			<integer value="1478"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -649,7 +648,7 @@
 											<object class="NSPopUpButton" id="222980245">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{123, 229}, {198, 22}}</string>
+												<string key="NSFrame">{{123, 229}, {168, 22}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="343952154">
@@ -751,7 +750,7 @@
 											<object class="NSPopUpButton" id="12330413">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{123, 254}, {198, 22}}</string>
+												<string key="NSFrame">{{123, 254}, {168, 22}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSPopUpButtonCell" key="NSCell" id="1018849574">
@@ -4030,7 +4029,7 @@
 				<nil key="NSDelegate"/>
 			</object>
 			<object class="NSCustomView" id="621751818">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4135,7 +4134,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {247, 506}}</string>
 								<reference key="NSSuperview" ref="33643505"/>
-								<reference key="NSNextKeyView" ref="807972370"/>
 								<reference key="NSDocView" ref="807972370"/>
 								<reference key="NSBGColor" ref="355843302"/>
 								<int key="NScvFlags">4</int>
@@ -4163,7 +4161,6 @@
 						</object>
 						<string key="NSFrame">{{4, 31}, {260, 508}}</string>
 						<reference key="NSSuperview" ref="621751818"/>
-						<reference key="NSNextKeyView" ref="421228634"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="475123229"/>
 						<reference key="NSHScroller" ref="573337548"/>
@@ -4295,7 +4292,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{270, 550}</string>
-				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
@@ -10926,7 +10922,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{643, 319}, {270, 550}}</string>
+					<string>{{454, 306}, {270, 550}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="0" id="8"/>
 					<reference ref="9"/>
@@ -11019,10 +11015,10 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{80, 445}, {760, 550}}</string>
+					<string>{{40, 306}, {760, 550}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="8"/>
-					<string>{{80, 445}, {760, 550}}</string>
+					<string>{{40, 306}, {760, 550}}</string>
 					<reference ref="9"/>
 					<string>{{65, 541}, {760, 550}}</string>
 					<reference ref="9"/>