2 files changed, 64 insertions, 77 deletions
diff --git a/macosx/HBController.h b/macosx/HBController.h
index ed604d6a2..9d9c3f46c 100644
--- a/macosx/HBController.h
+++ b/macosx/HBController.h
@@ -7,86 +7,11 @@
 #import <Cocoa/Cocoa.h>
 
 @class HBQueueController;
-
-@class HBPictureViewController;
-@class HBVideoController;
-@class HBAudioController;
-@class HBSubtitlesController;
-@class HBAdvancedController;
-@class HBChapterTitlesController;
-
-@class HBPreviewController;
-
-@class HBPreferencesController;
-@class HBPresetsViewController;
 @class HBPresetsManager;
 
 @class HBJob;
 
-@interface HBController : NSWindowController <NSDrawerDelegate>
-{
-    IBOutlet NSTabView *fMainTabView;
-
-    // Picture controller
-    HBPictureViewController * fPictureViewController;
-    IBOutlet NSTabViewItem  * fPictureTab;
-
-    // Video view controller
-    HBVideoController       * fVideoController;
-    IBOutlet NSTabViewItem  * fVideoTab;
-
-    // Subtitles view controller
-	HBSubtitlesController   * fSubtitlesViewController;
-    IBOutlet NSTabViewItem  * fSubtitlesTab;
-
-	// Audio view controller
-	HBAudioController       * fAudioController;
-    IBOutlet NSTabViewItem  * fAudioTab;
-
-	// Chapters view controller
-	HBChapterTitlesController    * fChapterTitlesController;
-    IBOutlet NSTabViewItem       * fChaptersTitlesTab;
-
-    // Advanced options tab
-    HBAdvancedController         * fAdvancedOptions;
-	IBOutlet NSTabViewItem       * fAdvancedTab;
-
-    // Picture Preview
-    HBPreviewController           * fPreviewController;
-    HBPreferencesController       * fPreferencesController;
-    
-    // Queue panel
-    HBQueueController            * fQueueController;
-	
-    // Source box
-	IBOutlet NSProgressIndicator * fScanIndicator;
-	IBOutlet NSBox               * fScanHorizontalLine;
-    
-    IBOutlet NSTextField         * fSrcDVD2Field;
-    IBOutlet NSPopUpButton       * fSrcTitlePopUp;
-    
-    // pts based start / stop
-    IBOutlet NSTextField         * fSrcTimeStartEncodingField;
-    IBOutlet NSTextField         * fSrcTimeEndEncodingField;
-    // frame based based start / stop
-    IBOutlet NSTextField         * fSrcFrameStartEncodingField;
-    IBOutlet NSTextField         * fSrcFrameEndEncodingField;
-
-    IBOutlet NSPopUpButton       * fSrcChapterStartPopUp;
-    IBOutlet NSPopUpButton       * fSrcChapterEndPopUp;
-
-    // Bottom
-    IBOutlet NSTextField         * fStatusField;
-    IBOutlet NSTextField         * fQueueStatus;
-    IBOutlet NSProgressIndicator * fRipIndicator;
-	BOOL                           fRipIndicatorShown;
-
-	// User Preset
-	HBPresetsManager             * presetManager;
-    HBPresetsViewController      * fPresetsView;
-
-	IBOutlet NSDrawer            * fPresetDrawer;
-}
+@interface HBController : NSWindowController
 
 - (instancetype)initWithQueue:(HBQueueController *)queueController presetsManager:(HBPresetsManager *)manager;
 
diff --git a/macosx/HBController.m b/macosx/HBController.m
index ac7f4ada6..6b651ddbd 100644
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -31,7 +31,69 @@
 #import "HBJob.h"
 #import "HBStateFormatter.h"
 
-@interface HBController () <HBPresetsViewControllerDelegate, HBTitleSelectionDelegate>
+@interface HBController () <HBPresetsViewControllerDelegate, HBTitleSelectionDelegate, NSDrawerDelegate>
+{
+    IBOutlet NSTabView *fMainTabView;
+
+    // Picture controller
+    HBPictureViewController * fPictureViewController;
+    IBOutlet NSTabViewItem  * fPictureTab;
+
+    // Video view controller
+    HBVideoController       * fVideoController;
+    IBOutlet NSTabViewItem  * fVideoTab;
+
+    // Subtitles view controller
+    HBSubtitlesController   * fSubtitlesViewController;
+    IBOutlet NSTabViewItem  * fSubtitlesTab;
+
+    // Audio view controller
+    HBAudioController       * fAudioController;
+    IBOutlet NSTabViewItem  * fAudioTab;
+
+    // Chapters view controller
+    HBChapterTitlesController    * fChapterTitlesController;
+    IBOutlet NSTabViewItem       * fChaptersTitlesTab;
+
+    // Advanced options tab
+    HBAdvancedController         * fAdvancedOptions;
+    IBOutlet NSTabViewItem       * fAdvancedTab;
+
+    // Picture Preview
+    HBPreviewController           * fPreviewController;
+
+    // Queue panel
+    HBQueueController            * fQueueController;
+
+    // Source box
+    IBOutlet NSProgressIndicator * fScanIndicator;
+    IBOutlet NSBox               * fScanHorizontalLine;
+
+    IBOutlet NSTextField         * fSrcDVD2Field;
+    IBOutlet NSPopUpButton       * fSrcTitlePopUp;
+
+    // pts based start / stop
+    IBOutlet NSTextField         * fSrcTimeStartEncodingField;
+    IBOutlet NSTextField         * fSrcTimeEndEncodingField;
+    // frame based based start / stop
+    IBOutlet NSTextField         * fSrcFrameStartEncodingField;
+    IBOutlet NSTextField         * fSrcFrameEndEncodingField;
+
+    IBOutlet NSPopUpButton       * fSrcChapterStartPopUp;
+    IBOutlet NSPopUpButton       * fSrcChapterEndPopUp;
+
+    // Bottom
+    IBOutlet NSTextField         * fStatusField;
+    IBOutlet NSTextField         * fQueueStatus;
+    IBOutlet NSProgressIndicator * fRipIndicator;
+    BOOL                           fRipIndicatorShown;
+
+    // User Preset
+    HBPresetsManager             * presetManager;
+    HBPresetsViewController      * fPresetsView;
+    
+    IBOutlet NSDrawer            * fPresetDrawer;
+}
 
 @property (unsafe_unretained) IBOutlet NSView *openTitleView;
 @property (nonatomic, readwrite) BOOL scanSpecificTitle;