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

1 files changed, 20 insertions, 24 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 232551b8c..704d064a0 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -4,15 +4,14 @@
    Homepage: <http://handbrake.m0k.org/>.
    It may be used under the terms of the GNU General Public License. */
 
-#include <Cocoa/Cocoa.h>
-#include <Growl/Growl.h>
+#import <Cocoa/Cocoa.h>
+#import <Growl/Growl.h>
 
 #include "hb.h"
 
-
-#include "ChapterTitles.h"
-#include "PictureController.h"
-#include "HBQueueController.h"
+#import "ChapterTitles.h"
+#import "PictureController.h"
+#import "HBQueueController.h"
 #import "MVMenuButton.h"
 #import "HBAdvancedController.h"
 
@@ -22,14 +21,21 @@
 
 {
     IBOutlet NSWindow            * fWindow;
-	
+    NSToolbar                    * toolbar;
+    
     /* Picture panel */
-    IBOutlet PictureController   * fPictureController;
-    IBOutlet NSPanel             * fPicturePanel;
+    PictureController            * fPictureController;
+    
+    /* Advanced options tab */
+    HBAdvancedController         * fAdvancedOptions;
 	IBOutlet NSBox               * fAdvancedView;
+
     /* Queue panel */
     HBQueueController            * fQueueController;
     IBOutlet NSTextField         * fQueueStatus;
+    
+    /* Output panel */
+    HBOutputPanelController       *outputPanel;
 	
 	/* Menu Items */
 	/* File Menu */
@@ -90,31 +96,25 @@
 	IBOutlet NSTextField         * fPicLabelSrc;
 	IBOutlet NSTextField         * fPicLabelOutp;
 	IBOutlet NSTextField         * fPicLabelAr;
-	IBOutlet NSTextField         * fPicLabelDeinter;
 	IBOutlet NSTextField         * fPicLabelSrcX;
 	IBOutlet NSTextField         * fPicLabelOutputX;
+	IBOutlet NSTextField         * fPicLabelAutoCrop;
+    IBOutlet NSTextField         * fPicLabelDetelecine;
+	IBOutlet NSTextField         * fPicLabelDeinterlace;
+    IBOutlet NSTextField         * fPicLabelDenoise;
 	
 	IBOutlet NSTextField         * fPicSrcWidth;
 	IBOutlet NSTextField         * fPicSrcHeight;
 	IBOutlet NSTextField         * fPicSettingWidth;
 	IBOutlet NSTextField         * fPicSettingHeight;
+	IBOutlet NSTextField         * fPicSettingDeinterlace;
 	IBOutlet NSTextField         * fPicSettingARkeep;
 	IBOutlet NSTextField         * fPicSettingPAR;
-	IBOutlet NSTextField         * fPicSettingDeinterlace;
-	IBOutlet NSTextField         * fPicSettingDeinterlaceDsply;
-	IBOutlet NSTextField         * fPicSettingARkeepDsply;
-	IBOutlet NSTextField         * fPicSettingPARDsply;
-	IBOutlet NSTextField         * fPicSettingAutoCropLabel;
 	IBOutlet NSTextField         * fPicSettingAutoCrop;
-	IBOutlet NSTextField         * fPicSettingAutoCropDsply;
 	IBOutlet NSTextField         * fPicSettingDetelecine;
-	IBOutlet NSTextField         * fPicSettingDetelecineLabel;
 	IBOutlet NSTextField         * fPicSettingDenoise;
-	IBOutlet NSTextField         * fPicSettingDenoiseDsply;
-	IBOutlet NSTextField         * fPicSettingDenoiseLabel;
 
 	IBOutlet NSTextField         * fPicLabelAnamorphic;
-	IBOutlet NSTextField         * fPicLabelPAROutp;
 	IBOutlet NSTextField         * fPicLabelPAROutputX;
 	IBOutlet NSTextField         * fPicSettingPARWidth;
 	IBOutlet NSTextField         * fPicSettingPARHeight;
@@ -190,12 +190,8 @@
 	int                            currentSuccessfulScanCount;
     int                            SuccessfulScan;
 	NSString                      * currentSource;
-	HBOutputPanelController       *outputPanel;
-    HBAdvancedController          *fAdvancedOptions;
 	
     hb_job_t                     * fLastKnownCurrentJob;
-	
-    NSToolbar                    *toolbar;
 }
 
 - (void)     TranslateStrings;