Implemented cancel

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

5 files changed, 46 insertions, 1 deletions

diff --git a/macosx/English.lproj/Express.nib/classes.nib b/macosx/English.lproj/Express.nib/classes.nib
index 6fd9650d7..0a71cdc64 100644
--- a/macosx/English.lproj/Express.nib/classes.nib
+++ b/macosx/English.lproj/Express.nib/classes.nib
@@ -29,6 +29,7 @@
         }, 
         {
             ACTIONS = {
+                convertCancel = id; 
                 convertGo = id; 
                 openBrowse = id; 
                 openGo = id; 
@@ -42,8 +43,10 @@
                 fConvertAudioPopUp = NSPopUpButton; 
                 fConvertFolderPopUp = NSPopUpButton; 
                 fConvertFormatPopUp = NSPopUpButton; 
+                fConvertGoButton = NSButton; 
                 fConvertIndicator = NSProgressIndicator; 
                 fConvertInfoString = NSTextField; 
+                fConvertOpenButton = NSButton; 
                 fConvertSubtitlePopUp = NSPopUpButton; 
                 fConvertTableView = NSTableView; 
                 fConvertView = NSView; 
diff --git a/macosx/English.lproj/Express.nib/info.nib b/macosx/English.lproj/Express.nib/info.nib
index 078c0be99..1b2dad352 100644
--- a/macosx/English.lproj/Express.nib/info.nib
+++ b/macosx/English.lproj/Express.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>55 353 371 303 0 0 1280 832 </string>
+	<string>80 374 371 303 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>248</key>
diff --git a/macosx/English.lproj/Express.nib/keyedobjects.nib b/macosx/English.lproj/Express.nib/keyedobjects.nib
index 59442d000..08099a292 100644
--- a/macosx/English.lproj/Express.nib/keyedobjects.nib
+++ b/macosx/English.lproj/Express.nib/keyedobjects.nib
diff --git a/macosx/ExpressController.h b/macosx/ExpressController.h
index 9a2f407c8..03ce5eb49 100644
--- a/macosx/ExpressController.h
+++ b/macosx/ExpressController.h
@@ -33,6 +33,8 @@
     IBOutlet NSPopUpButton       * fConvertSubtitlePopUp;
     IBOutlet NSTextField         * fConvertInfoString;
     IBOutlet NSProgressIndicator * fConvertIndicator;
+    IBOutlet NSButton            * fConvertOpenButton;
+    IBOutlet NSButton            * fConvertGoButton;
     NSMutableArray               * fConvertCheckArray;
     NSString                     * fConvertFolderString;
 
@@ -45,6 +47,7 @@
 - (void) openGo: (id) sender;
 
 - (void) convertGo: (id) sender;
+- (void) convertCancel: (id) sender;
 
 @end
 
diff --git a/macosx/ExpressController.m b/macosx/ExpressController.m
index f496accdc..285b5a8f6 100644
--- a/macosx/ExpressController.m
+++ b/macosx/ExpressController.m
@@ -12,6 +12,7 @@
 - (void) openTimer: (NSTimer *) timer;
 
 - (void) convertShow;
+- (void) convertEnable: (BOOL) b;
 - (void) convertTimer: (NSTimer *) timer;
 
 @end
@@ -292,6 +293,14 @@
     NSTimer * timer = [NSTimer scheduledTimerWithTimeInterval: 0.5
         target: self selector: @selector( convertTimer: ) userInfo: nil
         repeats: YES];
+
+    [self convertEnable: NO];
+}
+
+- (void) convertCancel: (id) sender
+{
+    hb_stop( fHandle );
+    [fConvertGoButton setEnabled: NO];
 }
 
 @end
@@ -454,6 +463,29 @@
     [image16 unlockFocus];                                                      
     [item setImage: image16];
     [image16 release];
+
+    [self convertEnable: YES];
+}
+
+- (void) convertEnable: (BOOL) b
+{
+    [fConvertTableView setEnabled: b];
+    [fConvertFolderPopUp setEnabled: b];
+    [fConvertFormatPopUp setEnabled: b];
+    [fConvertAspectPopUp setEnabled: b];
+    [fConvertAudioPopUp setEnabled: b];
+    [fConvertSubtitlePopUp setEnabled: b];
+    [fConvertOpenButton setEnabled: b];
+    if( b )
+    {
+        [fConvertGoButton setTitle: @"Convert"];
+        [fConvertGoButton setAction: @selector(convertGo:)];
+    }
+    else
+    {
+        [fConvertGoButton setTitle: @"Cancel"];
+        [fConvertGoButton setAction: @selector(convertCancel:)];
+    }
 }
 
 - (void) convertTimer: (NSTimer *) timer
@@ -502,6 +534,13 @@
             [fConvertInfoString setStringValue: @"Done."];
             [fConvertIndicator setIndeterminate: NO];
             [fConvertIndicator setDoubleValue: 0.0];
+            [self convertEnable: YES];
+
+            hb_job_t * job;
+            while( ( job = hb_job( fHandle, 0 ) ) )
+            {
+                hb_rem( fHandle, job );
+            }
             break;
 
         default: