MacGui: Layout refinements courtesy of hawkman

git-svn-id: svn://localhost/HandBrake/trunk@817 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index fc1ce37..5fe7436 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -551,7 +551,7 @@ return registrationDictionary;
     [fSrcChapterToField setStringValue: _( @"to" )];
     [fSrcDuration1Field setStringValue: _( @"Duration:" )];
 
-    [fDstFormatField    setStringValue: _( @"File format:" )];
+    [fDstFormatField    setStringValue: _( @"Format:" )];
     [fDstCodecsField    setStringValue: _( @"Codecs:" )];
     [fDstFile1Field     setStringValue: _( @"File:" )];
     [fDstBrowseButton   setTitle:       _( @"Browse" )];
@@ -801,8 +801,8 @@ list = hb_get_titles( fHandle );
                        NSRect frame = [fWindow frame];
                        if (frame.size.width <= 591)
                                frame.size.width = 591;
-                       frame.size.height += -44;
-                       frame.origin.y -= -44;
+                       frame.size.height += -36;
+                       frame.origin.y -= -36;
                        [fWindow setFrame:frame display:YES animate:YES];
                        
             /* FIXME */
@@ -1605,8 +1605,8 @@ list = hb_get_titles( fHandle );
        NSRect frame = [fWindow frame];
     if (frame.size.width <= 591)
         frame.size.width = 591;
-    frame.size.height += 44;
-    frame.origin.y -= 44;
+    frame.size.height += 36;
+    frame.origin.y -= 36;
     [fWindow setFrame:frame display:YES animate:YES];
 }
 
@@ -2510,7 +2510,7 @@ list = hb_get_titles( fHandle );
        
        if (fTitle->job->pixel_ratio > 0)
        {
-               [fPicSettingPARDsply setStringValue: @"On"];
+               [fPicSettingPARDsply setStringValue: @""];
        }
        else
        {

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 8f757bb..bf5d039 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -7,11 +7,11 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>1843</key>
-               <string>620 338 200 530 0 0 1440 878 </string>
+               <string>540 238 200 530 0 0 1280 778 </string>
                <key>2436</key>
-               <string>307 360 192 68 0 0 1440 878 </string>
+               <string>268 316 192 68 0 0 1280 778 </string>
                <key>29</key>
-               <string>17 588 368 44 0 0 1440 878 </string>
+               <string>14 517 368 44 0 0 1280 778 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>446.1</string>
@@ -27,8 +27,9 @@
        <integer>4</integer>
        <key>IBOpenObjects</key>
        <array>
+               <integer>29</integer>
+               <integer>21</integer>
                <integer>2436</integer>
-               <integer>365</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8R2218</string>
@@ -38,7 +39,7 @@
                <dict>
                        <key>guideLocations</key>
                        <array>
-                               <string>Horizontal:492.000000</string>
+                               <string>Horizontal:498.000000</string>
                        </array>
                        <key>guidesLocked</key>
                        <false/>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index a15d84d..be194ed 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib
index 26ec4f3..d50f059 100644 (file)
Binary files a/macosx/English.lproj/Preferences.nib/keyedobjects.nib and b/macosx/English.lproj/Preferences.nib/keyedobjects.nib differ