MacGui: "Ritsuka Bar" toolbar initial implementation

- Thanks goes to Ritsuka!
- Moves the Start/Cancel, Pause/Resume, Presets Drawer and Activity Window (previously debug) controls into a nice toolbar at the top of the main window
- Resizes the height of the main window to allow for the progress bar at the bottom during encoding
- Small change in that now muxmkv.c is included in the xcode project under libhb resources. Instead of under the main project heading.

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

1 files changed, 20 insertions, 14 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 9479c3699..be931df58 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -21,22 +21,22 @@
 
 {
     IBOutlet NSWindow            * fWindow;
-
+	
     /* Scan panel */
 	IBOutlet ScanController      * fScanController;
     IBOutlet NSPanel             * fScanPanel;
-
+	
     /* Picture panel */
     IBOutlet PictureController   * fPictureController;
     IBOutlet NSPanel             * fPicturePanel;
-
+	
     /* Queue panel */
     IBOutlet QueueController     * fQueueController;
     IBOutlet NSPanel             * fQueuePanel;
     IBOutlet NSTextField         * fQueueStatus;
-    IBOutlet NSButton            * fQueueAddButton;
-    IBOutlet NSButton            * fQueueShowButton;
-
+    //IBOutlet NSButton            * fQueueAddButton;
+    //IBOutlet NSButton            * fQueueShowButton;
+	
     /* Source box */
     IBOutlet NSTextField         * fSrcDVD1Field;
     IBOutlet NSTextField         * fSrcDVD2Field;
@@ -48,7 +48,7 @@
     IBOutlet NSPopUpButton       * fSrcChapterEndPopUp;
     IBOutlet NSTextField         * fSrcDuration1Field;
     IBOutlet NSTextField         * fSrcDuration2Field;
-
+	
     /* Destination box */
     IBOutlet NSTextField         * fDstFormatField;
 	IBOutlet NSPopUpButton       * fDstFormatPopUp;
@@ -58,7 +58,7 @@
     IBOutlet NSTextField         * fDstFile1Field;
     IBOutlet NSTextField         * fDstFile2Field;
     IBOutlet NSButton            * fDstBrowseButton;
-
+	
     /* Video box */
     IBOutlet NSTextField         * fVidRateField;
     IBOutlet NSPopUpButton       * fVidRatePopUp;
@@ -110,7 +110,7 @@
     /* Subtitles box */
     IBOutlet NSTextField         * fSubField;
     IBOutlet NSPopUpButton       * fSubPopUp;
-
+	
     /* Audio box */
     IBOutlet NSTextField         * fAudLang1Field;
     IBOutlet NSPopUpButton       * fAudLang1PopUp;
@@ -130,8 +130,8 @@
     /* Chapters box */
     IBOutlet NSButton            * fCreateChapterMarkers;
     IBOutlet NSTableView         * fChapterTable;
-             ChapterTitles       * fChapterTitlesDelegate;
-
+	ChapterTitles       * fChapterTitlesDelegate;
+	
     /* Bottom */
     IBOutlet NSButton            * fPictureButton;
     IBOutlet NSTextField         * fStatusField;
@@ -140,7 +140,7 @@
     IBOutlet NSButton            * fAddToQuButton;
     IBOutlet NSButton            * fPauseButton;
     IBOutlet NSButton            * fRipButton;
-
+	
 	/* Advanced Tab for opts fX264optView*/
 	IBOutlet NSView              * fX264optView;
 	IBOutlet NSTextField         * fX264optViewTitleLabel;
@@ -202,11 +202,17 @@
     hb_handle_t                  * fHandle;
 	hb_title_t                   * fTitle;
     /* integer to set to determine the previous state
-	of encode 0==idle, 1==encoding, 2==cancelled*/
+		of encode 0==idle, 1==encoding, 2==cancelled*/
     int                            fEncodeState;
 	int                            currentScanCount;
 	NSString                      * currentSource;
 	HBOutputPanelController *outputPanel;
+	
+	BOOL                         startButtonEnabled;
+    BOOL                         pauseButtonEnabled;
+    BOOL                         AddToQueueButtonEnabled;
+	BOOL                         stopOrStart;
+	BOOL                         resumeOrPause;
 }
 
 - (void)     TranslateStrings;
@@ -318,6 +324,6 @@
 - (NSDictionary *) registrationDictionaryForGrowl;
 -(IBAction)showGrowlDoneNotification:(id)sender;
 - (IBAction)showDebugOutputPanel:(id)sender;
-
+- (void)setupToolbar;
 @end