MacGui: rename cancel: to cancelRip: so it won't be automatically called when the esc key is pressed.

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

4 files changed, 6 insertions, 17 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 1572ab5e5..49074f322 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -135,8 +135,6 @@
 - (IBAction)showPreferencesWindow:(id)sender;
 
 - (IBAction)rip:(id)sender;
-
-- (IBAction)cancel:(id)sender;
 - (IBAction)pause:(id)sender;
 
 - (IBAction) openHomepage: (id) sender;
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9c4c4b39d..0f729eb57 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1251,7 +1251,8 @@
     // Rip or Cancel ?
     if (fQueueController.core.state == HBStateWorking || fQueueController.core.state == HBStatePaused)
 	{
-        [self cancel:sender];
+        // Displays an alert asking user if the want to cancel encoding of current job.
+        [fQueueController cancelRip:self];
         return;
     }
 
@@ -1308,16 +1309,6 @@
     }
 }
 
-/**
- * Displays an alert asking user if the want to cancel encoding of current job.
- * Cancel: returns immediately after posting the alert. Later, when the user
- * acknowledges the alert, doCancelCurrentJob is called.
- */
-- (IBAction)cancel:(id)sender
-{
-    [fQueueController cancel:self];
-}
-
 - (IBAction)pause:(id)sender
 {
     if (fQueueController.core.state == HBStatePaused)
diff --git a/macosx/HBQueueController.h b/macosx/HBQueueController.h
index 87d114df5..73cdc2a21 100644
--- a/macosx/HBQueueController.h
+++ b/macosx/HBQueueController.h
@@ -33,6 +33,6 @@
 - (void)setEncodingJobsAsPending;
 
 - (IBAction)rip:(id)sender;
-- (IBAction)cancel:(id)sender;
+- (IBAction)cancelRip:(id)sender;
 
 @end
diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm
index 9ca4137bf..3b4ccb5d6 100644
--- a/macosx/HBQueueController.mm
+++ b/macosx/HBQueueController.mm
@@ -915,7 +915,7 @@
     // Rip or Cancel ?
     if (self.core.state == HBStateWorking || self.core.state == HBStatePaused)
     {
-        [self cancel:sender];
+        [self cancelRip:sender];
     }
     // If there are pending jobs in the queue, then this is a rip the queue
     else if (self.pendingItemsCount > 0)
@@ -938,7 +938,7 @@
  * Cancel: returns immediately after posting the alert. Later, when the user
  * acknowledges the alert, doCancelCurrentJob is called.
  */
-- (IBAction)cancel:(id)sender
+- (IBAction)cancelRip:(id)sender
 {
     [self.core pause];
 
@@ -992,7 +992,7 @@
     HBState s = self.core.state;
     if ((s == HBStatePaused) || (s == HBStateWorking) || (s == HBStateMuxing))
     {
-        [self cancel:self];
+        [self cancelRip:self];
     }
     else if (self.pendingItemsCount > 0)
     {