MacGui:

- Move Picture Settings window in a new nib
- Cleanup main window nib, delete some useless hidden NSTextfField
- Change "Queue" menu item keyboard shortctus to cmd-2
- Add cmd-? keyboard shortcuts to "HandBrake User Guide" menu item
- HandBrake main windows is now shown if the dock icon is clicked and there is no open window

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

6 files changed, 68 insertions, 28 deletions

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 40dbb00e4..e98d9bf15 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -142,37 +142,29 @@
                 fMenuStartEncode = NSMenuItem; 
                 fPicLabelAnamorphic = NSTextField; 
                 fPicLabelAr = NSTextField; 
-                fPicLabelDeinter = NSTextField; 
+                fPicLabelAutoCrop = NSTextField; 
+                fPicLabelDeinterlace = NSTextField; 
+                fPicLabelDenoise = NSTextField; 
+                fPicLabelDetelecine = NSTextField; 
                 fPicLabelOutp = NSTextField; 
                 fPicLabelOutputX = NSTextField; 
-                fPicLabelPAROutp = NSTextField; 
                 fPicLabelPAROutputX = NSTextField; 
                 fPicLabelSettings = NSTextField; 
                 fPicLabelSrc = NSTextField; 
                 fPicLabelSrcX = NSTextField; 
                 fPicSettingARkeep = NSTextField; 
-                fPicSettingARkeepDsply = NSTextField; 
                 fPicSettingAutoCrop = NSTextField; 
-                fPicSettingAutoCropDsply = NSTextField; 
-                fPicSettingAutoCropLabel = NSTextField; 
                 fPicSettingDeinterlace = NSTextField; 
-                fPicSettingDeinterlaceDsply = NSTextField; 
                 fPicSettingDenoise = NSTextField; 
-                fPicSettingDenoiseDsply = NSTextField; 
-                fPicSettingDenoiseLabel = NSTextField; 
                 fPicSettingDetelecine = NSTextField; 
-                fPicSettingDetelecineLabel = NSTextField; 
                 fPicSettingHeight = NSTextField; 
                 fPicSettingPAR = NSTextField; 
-                fPicSettingPARDsply = NSTextField; 
                 fPicSettingPARHeight = NSTextField; 
                 fPicSettingPARWidth = NSTextField; 
                 fPicSettingWidth = NSTextField; 
                 fPicSrcHeight = NSTextField; 
                 fPicSrcWidth = NSTextField; 
                 fPictureButton = NSButton; 
-                fPictureController = PictureController; 
-                fPicturePanel = NSPanel; 
                 fPresetDrawer = NSDrawer; 
                 fPresetNewDesc = NSTextField; 
                 fPresetNewName = NSTextField; 
@@ -241,7 +233,6 @@
             CLASS = PictureController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
-                fAutoCropMainWindow = NSTextField; 
                 fCropBottomField = NSTextField; 
                 fCropBottomStepper = NSStepper; 
                 fCropLeftField = NSTextField; 
@@ -251,29 +242,18 @@
                 fCropRightStepper = NSStepper; 
                 fCropTopField = NSTextField; 
                 fCropTopStepper = NSStepper; 
-                fDeinterlaceLevelMainWindow = NSTextField; 
                 fDeinterlacePopUp = NSPopUpButton; 
-                fDenoiseMainWindow = NSTextField; 
                 fDenoisePopUp = NSPopUpButton; 
                 fDetelecineCheck = NSButton; 
-                fDetelecineMainWindow = NSTextField; 
                 fEffectsCheck = NSButton; 
                 fHeightField = NSTextField; 
                 fHeightStepper = NSStepper; 
                 fInfoField = NSTextField; 
                 fNextButton = NSButton; 
                 fPARCheck = NSButton; 
-                fPicSettingARkeep = NSTextField; 
-                fPicSettingDeinterlace = NSTextField; 
-                fPicSettingHeight = NSTextField; 
-                fPicSettingWidth = NSTextField; 
-                fPicSettingsDisplay = NSTextField; 
-                fPicSrcHeight = NSTextField; 
-                fPicSrcWidth = NSTextField; 
                 fPictureGLView = HBPictureGLView; 
                 fPrevButton = NSButton; 
                 fRatioCheck = NSButton; 
-                fVidFrameRatePopUpMainWindow = NSPopUpButton; 
                 fWidthField = NSTextField; 
                 fWidthStepper = NSStepper; 
             }; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 532b25d26..11b94a46a 100644
--- 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>720 93 200 530 0 0 1440 878 </string>
+		<string>640 320 200 530 0 0 1440 878 </string>
 		<key>2436</key>
 		<string>307 361 192 68 0 0 1440 878 </string>
 		<key>29</key>
-		<string>790 391 368 44 0 0 1440 878 </string>
+		<string>578 372 368 44 0 0 1440 878 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -27,8 +27,8 @@
 	<integer>4</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>365</integer>
-		<integer>29</integer>
+		<integer>1867</integer>
+		<integer>1843</integer>
 		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 5389ac3de..f1b543d20 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/macosx/English.lproj/PictureSettings.nib/classes.nib b/macosx/English.lproj/PictureSettings.nib/classes.nib
new file mode 100644
index 000000000..0d83d8f54
--- /dev/null
+++ b/macosx/English.lproj/PictureSettings.nib/classes.nib
@@ -0,0 +1,44 @@
+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = HBPictureGLView; LANGUAGE = ObjC; SUPERCLASS = NSOpenGLView; }, 
+        {
+            ACTIONS = {
+                ClosePanel = id; 
+                NextPicture = id; 
+                PreviousPicture = id; 
+                SettingsChanged = id; 
+            }; 
+            CLASS = PictureController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                fCropBottomField = NSTextField; 
+                fCropBottomStepper = NSStepper; 
+                fCropLeftField = NSTextField; 
+                fCropLeftStepper = NSStepper; 
+                fCropMatrix = NSMatrix; 
+                fCropRightField = NSTextField; 
+                fCropRightStepper = NSStepper; 
+                fCropTopField = NSTextField; 
+                fCropTopStepper = NSStepper; 
+                fDeinterlacePopUp = NSPopUpButton; 
+                fDenoisePopUp = NSPopUpButton; 
+                fDetelecineCheck = NSButton; 
+                fEffectsCheck = NSButton; 
+                fHeightField = NSTextField; 
+                fHeightStepper = NSStepper; 
+                fInfoField = NSTextField; 
+                fNextButton = NSButton; 
+                fPARCheck = NSButton; 
+                fPictureGLView = HBPictureGLView; 
+                fPicturePanel = NSPanel; 
+                fPrevButton = NSButton; 
+                fRatioCheck = NSButton; 
+                fWidthField = NSTextField; 
+                fWidthStepper = NSStepper; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/macosx/English.lproj/PictureSettings.nib/info.nib b/macosx/English.lproj/PictureSettings.nib/info.nib
new file mode 100644
index 000000000..c710553a5
--- /dev/null
+++ b/macosx/English.lproj/PictureSettings.nib/info.nib
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>262 95 356 240 0 0 1440 878 </string>
+	<key>IBFramework Version</key>
+	<string>446.1</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>5</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8R2218</string>
+</dict>
+</plist>
diff --git a/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib b/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib
new file mode 100644
index 000000000..2747a082c
--- /dev/null
+++ b/macosx/English.lproj/PictureSettings.nib/keyedobjects.nib