diff options
| author | dynaflash <[email protected]> | 2007-09-05 20:01:14 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2007-09-05 20:01:14 +0000 |
| commit | 5d4117bccd9ce796e102842270726eae9fcf07e5 (patch) | |
| tree | eaba13aa4509c81e30969d5ceeda0e19d8fbebad /macosx/Controller.h | |
| parent | a963935e4d220ec9153573cef8f9f1b12654f0c3 (diff) | |
MacGui: New Active Queue implementation courtesy of travistex
- Thanks travistex!
- queue is now in a separate window
- queue currently shows jobs grouped together as one encode, which is configurable
- queue now shows currently encoding job, which is independently cancellable without losing the rest of the queue.
- can start and pause encoding in the queue window
- queue uses its own nib
- progress status needs work
- This has a way to go, but needed to get checked in as it changes the current xcode project structure.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@925 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/Controller.h')
| -rw-r--r-- | macosx/Controller.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h index 2ef1144fb..733c47338 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -12,7 +12,7 @@ #include "ChapterTitles.h" #include "PictureController.h" -#include "QueueController.h" +#include "HBQueueController.h" #import "MVMenuButton.h" @class HBOutputPanelController; @@ -26,8 +26,7 @@ IBOutlet NSPanel * fPicturePanel; /* Queue panel */ - IBOutlet QueueController * fQueueController; - IBOutlet NSPanel * fQueuePanel; + HBQueueController * fQueueController; IBOutlet NSTextField * fQueueStatus; /* Menu Items */ @@ -160,6 +159,7 @@ IBOutlet NSButton * fAddToQuButton; IBOutlet NSButton * fPauseButton; IBOutlet NSButton * fRipButton; + BOOL fRipIndicatorShown; /* Advanced Tab for opts fX264optView*/ IBOutlet NSView * fX264optView; @@ -238,6 +238,8 @@ NSString * currentSource; HBOutputPanelController *outputPanel; + hb_job_t * fLastKnownCurrentJob; + BOOL startButtonEnabled; BOOL pauseButtonEnabled; BOOL addToQueueButtonEnabled; @@ -283,7 +285,7 @@ - (IBAction) openMainWindow: (id) sender; - (IBAction) addToQueue: (id) sender; -- (IBAction) showQueuePanel: (id) sender; +- (IBAction) showQueueWindow:(id)sender; - (IBAction) Rip: (id) sender; - (void) overWriteAlertDone: (NSWindow *) sheet |