MacGui: Queue Improvements from travistex

- Add view selection widget to choose "encode by encode" or "pass by pass" view
- Add "Show Detail" button to toggle detailed view on/off
- Removed #define JOB_GROUPS. You can now control this in the UI and show either "encodes" or "passes".
- Revamped the progress strings to give you exact progress.
- New terminology (encodes and passes)
- New toolbar in queue window (not complete, icons need work)
- New files, added to project:
     Encodes.png
     EncodesPressed.png
     Info.png
     JobPassLarge.png
     JobPassSmall.png
     Passes.png
     PassesPressed.png

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

1 files changed, 10 insertions, 3 deletions

diff --git a/macosx/HBQueueController.h b/macosx/HBQueueController.h
index 4f7cd3fc1..7ee030eec 100644
--- a/macosx/HBQueueController.h
+++ b/macosx/HBQueueController.h
@@ -14,6 +14,8 @@
     hb_handle_t                  *fHandle;
     NSViewAnimation              *fAnimation;
     BOOL                         fCurrentJobHidden;  // YES when fCurrentJobPane has been shifted out of view (see showCurrentJobPane)
+    BOOL                         fShowsJobsAsGroups;
+    BOOL                         fShowsDetail;
     
     //  +---------------fQueueWindow----------------+
     //  |+-------------fCurrentJobPane-------------+|
@@ -36,15 +38,16 @@
 
     // fCurrentJobPane - visible only when processing a job
     IBOutlet NSView              *fCurrentJobPane;
+    IBOutlet NSImageView         *fJobIconView;
     IBOutlet NSTextField         *fJobDescTextField;
     IBOutlet NSProgressIndicator *fProgressBar;
-    IBOutlet NSTextField         *fProgressStatus;
-    IBOutlet NSTextField         *fProgressTimeRemaining;
+    IBOutlet NSTextField         *fProgressTextField;
     
     // 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;
     
@@ -53,10 +56,14 @@
 - (void)setHandle: (hb_handle_t *)handle;
 - (void)updateQueueUI;
 - (void)updateCurrentJobUI;
+
+- (IBAction)showQueueWindow: (id)sender;
 - (IBAction)removeSelectedJob: (id)sender;
 - (IBAction)cancelCurrentJob: (id)sender;
 - (IBAction)detailChanged: (id)sender;
-- (IBAction)showQueueWindow: (id)sender;
+- (IBAction)jobGroupsChanged: (id)sender;
+- (IBAction)toggleShowsDetail: (id)sender;
+- (IBAction)toggleShowsJobsAsGroups: (id)sender;
 - (IBAction)toggleStartPause: (id)sender;
 
 @end