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, 24 insertions, 12 deletions

diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index bfc67bb86..9feae1e25 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -21,6 +21,8 @@
     int                        fTexBufSize;
     int                        fPicture;
 
+    IBOutlet NSPanel         * fPicturePanel;
+
     IBOutlet HBPictureGLView * fPictureGLView;
     IBOutlet NSTextField     * fWidthField;
     IBOutlet NSStepper       * fWidthStepper;
@@ -45,18 +47,15 @@
     IBOutlet NSButton        * fNextButton;
     IBOutlet NSTextField     * fInfoField;
 	
-	
-	
-	int                        MaxOutputWidth;
-	int                        MaxOutputHeight;
-	
-	/* widgets in main window */
-	IBOutlet NSTextField     * fAutoCropMainWindow;
-	IBOutlet NSTextField     * fDeinterlaceLevelMainWindow;
-	IBOutlet NSTextField     * fDetelecineMainWindow;
-	IBOutlet NSPopUpButton   * fVidFrameRatePopUpMainWindow;
-	IBOutlet NSTextField     * fDenoiseMainWindow;
-	
+    int     MaxOutputWidth;
+    int     MaxOutputHeight;
+    BOOL    autoCrop;
+    
+    struct {
+        int    detelecine;
+        int     deinterlace;
+        int     denoise;
+    } fPictureFilterSettings;
 
 }
 
@@ -69,4 +68,17 @@
 - (IBAction) NextPicture: (id) sender;
 - (IBAction) ClosePanel: (id) sender;
 
+- (BOOL) autoCrop;
+- (void) setAutoCrop: (BOOL) setting;
+
+- (int) detelecine;
+- (void) setDetelecine: (int) setting;
+- (int) deinterlace;
+- (void) setDeinterlace: (int) setting;
+- (int) denoise;
+- (void) setDenoise: (int) setting;
+
+- (void) showPanelInWindow: (NSWindow *) fWindow forTitle:(hb_title_t *)title;
+- (BOOL) loadMyNibFile;
+
 @end