diff options
| author | ritsuka <[email protected]> | 2015-07-22 11:38:23 +0000 |
|---|---|---|
| committer | ritsuka <[email protected]> | 2015-07-22 11:38:23 +0000 |
| commit | 438ffd01fdc4615aab516394d7eb422f7ca3af3f (patch) | |
| tree | b69aebf71cdb97a499e57d949b634eefcb70cef2 /macosx | |
| parent | be9ac805c8fbc2c8ba37389ce034db92f15b7e4a (diff) | |
MacGui: do not let an instance edit a job that another instance is currently encoding. Fix the "Stop encoding" menu item key equivalent.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7359 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/English.lproj/Queue.xib | 14 | ||||
| -rw-r--r-- | macosx/HBQueueController.m | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/macosx/English.lproj/Queue.xib b/macosx/English.lproj/Queue.xib index 96598ec01..6ed8f9109 100644 --- a/macosx/English.lproj/Queue.xib +++ b/macosx/English.lproj/Queue.xib @@ -167,20 +167,20 @@ </window> <menu id="2649" userLabel="ContextMenu"> <items> - <menuItem title="Edit" id="2650"> + <menuItem title="Show in Finder" id="2655"> <modifierMask key="keyEquivalentModifierMask"/> <connections> - <action selector="editSelectedQueueItem:" target="-2" id="2654"/> + <action selector="revealSelectedQueueItems:" target="-2" id="qtj-uq-KvZ"/> </connections> </menuItem> - <menuItem title="Show in Finder" id="2655"> + <menuItem isSeparatorItem="YES" id="Au5-j1-AAd"/> + <menuItem title="Edit" id="2650"> <modifierMask key="keyEquivalentModifierMask"/> <connections> - <action selector="revealSelectedQueueItems:" target="-2" id="qtj-uq-KvZ"/> + <action selector="editSelectedQueueItem:" target="-2" id="2654"/> </connections> </menuItem> - <menuItem isSeparatorItem="YES" id="Au5-j1-AAd"/> - <menuItem title="Reset job" id="zy6-ab-ush"> + <menuItem title="Reset" id="zy6-ab-ush"> <modifierMask key="keyEquivalentModifierMask"/> <connections> <action selector="resetJobState:" target="-1" id="fxd-BP-VY6"/> @@ -207,7 +207,7 @@ </connections> </menuItem> </items> - <point key="canvasLocation" x="192" y="450.5"/> + <point key="canvasLocation" x="233" y="753.5"/> </menu> <userDefaultsController representsSharedInstance="YES" id="z2J-h1-IDv"/> </objects> diff --git a/macosx/HBQueueController.m b/macosx/HBQueueController.m index e97f7162c..d43c43d70 100644 --- a/macosx/HBQueueController.m +++ b/macosx/HBQueueController.m @@ -113,14 +113,12 @@ if (self.core.state == HBStateIdle) { menuItem.title = NSLocalizedString(@"Start Encoding", nil); - menuItem.keyEquivalent = @"s"; return (self.pendingItemsCount > 0); } else if (self.core.state != HBStateIdle) { menuItem.title = NSLocalizedString(@"Stop Encoding", nil); - menuItem.keyEquivalent = @"."; return YES; } @@ -1015,7 +1013,7 @@ didEndSelector:@selector(didDimissEditCurrentJob:returnCode:contextInfo:) contextInfo:(__bridge void *)(job)]; } - else + else if (job.state != HBJobStateWorking) { // since we are not a currently encoding item, we can just be edit it HBJob *item = [[self.jobs[row] representedObject] copy]; |