MacGui: New queue enhancements

- clean up work related to starting and stopping of jobs to make sure the behavior is the same in both the queue window and the main window
- No longer adds jobs to queue when you've hit Start but then canceled the overwrite warning.
- Added overwrite alert when doing an Add to Queue. Was only happening previously when you did a Start.
- Stopping a job from either the Queue window or the Main window now goes through the same code path and so the behavior will be identical.
- In the main window, the Start button now changes to Start Queue once you've added things to the queue. This helps clear up any ambiguity about what that button will do
- Cancel button now named Stop. Recommended by BradleyS and/or hawkman I think because this button no longer cancels everything in the queue, just the current job. Wording in the stop warning dialog has been improved (mentions job title).
- The "Show Alert When Done" options now work when you have started the queue from the Queue window.
- Uses the term "passes" in main window
- Added unique icons for each pass type.

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

1 files changed, 15 insertions, 7 deletions

diff --git a/macosx/HBQueueController.h b/macosx/HBQueueController.h
index 7ee030eec..474392507 100644
--- a/macosx/HBQueueController.h
+++ b/macosx/HBQueueController.h
@@ -8,14 +8,24 @@
 #include <Cocoa/Cocoa.h>
 
 #include "hb.h"
+@class HBController;
+
+// HB_OUTLINE_QUEUE turns on an outline view for the queue.
+#define HB_OUTLINE_QUEUE 0
+
 
 @interface HBQueueController : NSObject
 {
     hb_handle_t                  *fHandle;
+    HBController                 *fHBController;
     NSViewAnimation              *fAnimation;
     BOOL                         fCurrentJobHidden;  // YES when fCurrentJobPane has been shifted out of view (see showCurrentJobPane)
     BOOL                         fShowsJobsAsGroups;
     BOOL                         fShowsDetail;
+#if HB_OUTLINE_QUEUE
+    NSMutableArray               *fEncodes;
+    IBOutlet NSOutlineView       *fOutlineView;
+#endif
     
     //  +---------------fQueueWindow----------------+
     //  |+-------------fCurrentJobPane-------------+|
@@ -46,24 +56,22 @@
     // fQueuePane - always visible; fills entire window when fCurrentJobPane is hidden
     IBOutlet NSView              *fQueuePane;
     IBOutlet NSTableView         *fTaskView;
-    IBOutlet NSButton            *fDetailCheckbox;
-    IBOutlet NSButton            *fJobGroupsCheckbox;    // just for testing
     IBOutlet NSTextField         *fQueueCountField;
-    IBOutlet NSButton            *fStartPauseButton;
     
 }
 
 - (void)setHandle: (hb_handle_t *)handle;
+- (void)setHBController: (HBController *)controller;
 - (void)updateQueueUI;
 - (void)updateCurrentJobUI;
 
 - (IBAction)showQueueWindow: (id)sender;
 - (IBAction)removeSelectedJob: (id)sender;
 - (IBAction)cancelCurrentJob: (id)sender;
-- (IBAction)detailChanged: (id)sender;
-- (IBAction)jobGroupsChanged: (id)sender;
-- (IBAction)toggleShowsDetail: (id)sender;
-- (IBAction)toggleShowsJobsAsGroups: (id)sender;
+- (IBAction)showDetail: (id)sender;
+- (IBAction)hideDetail: (id)sender;
+- (IBAction)showJobsAsGroups: (id)sender;
+- (IBAction)showJobsAsPasses: (id)sender;
 - (IBAction)toggleStartPause: (id)sender;
 
 @end