Changeset 184584a


Ignore:
Timestamp:
01/20/15 08:05:16 (16 months ago)
Author:
ritsuka <damiog@…>
Branches:
master
Children:
f0b5207
Parents:
6f9fd9e
Message:

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

Location:
macosx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • macosx/Controller.h

    r9f4bbdb r184584a  
    136136
    137137- (IBAction)rip:(id)sender;
    138 
    139 - (IBAction)cancel:(id)sender;
    140138- (IBAction)pause:(id)sender;
    141139
  • macosx/Controller.m

    r9f4bbdb r184584a  
    12521252    if (fQueueController.core.state == HBStateWorking || fQueueController.core.state == HBStatePaused)
    12531253        {
    1254         [self cancel:sender];
     1254        // Displays an alert asking user if the want to cancel encoding of current job.
     1255        [fQueueController cancelRip:self];
    12551256        return;
    12561257    }
     
    13071308        [self doRip];
    13081309    }
    1309 }
    1310 
    1311 /**
    1312  * Displays an alert asking user if the want to cancel encoding of current job.
    1313  * Cancel: returns immediately after posting the alert. Later, when the user
    1314  * acknowledges the alert, doCancelCurrentJob is called.
    1315  */
    1316 - (IBAction)cancel:(id)sender
    1317 {
    1318     [fQueueController cancel:self];
    13191310}
    13201311
  • macosx/HBQueueController.h

    rf69f4e1 r184584a  
    3434
    3535- (IBAction)rip:(id)sender;
    36 - (IBAction)cancel:(id)sender;
     36- (IBAction)cancelRip:(id)sender;
    3737
    3838@end
  • macosx/HBQueueController.mm

    rf69f4e1 r184584a  
    916916    if (self.core.state == HBStateWorking || self.core.state == HBStatePaused)
    917917    {
    918         [self cancel:sender];
     918        [self cancelRip:sender];
    919919    }
    920920    // If there are pending jobs in the queue, then this is a rip the queue
     
    939939 * acknowledges the alert, doCancelCurrentJob is called.
    940940 */
    941 - (IBAction)cancel:(id)sender
     941- (IBAction)cancelRip:(id)sender
    942942{
    943943    [self.core pause];
     
    993993    if ((s == HBStatePaused) || (s == HBStateWorking) || (s == HBStateMuxing))
    994994    {
    995         [self cancel:self];
     995        [self cancelRip:self];
    996996    }
    997997    else if (self.pendingItemsCount > 0)
Note: See TracChangeset for help on using the changeset viewer.