MacGui: do not let an instance edit a job that another instance is currently encoding...

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

diff --git a/macosx/English.lproj/Queue.xib b/macosx/English.lproj/Queue.xib
index 96598ec01f1c263bea5bd289422173d444d4b9b2..6ed8f9109764d5e2f784c9b345adc4eb52b88ed3 100644 (file)
--- 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 e97f7162ca698c6c9cd3bde02765e50cec11322b..d43c43d70bf56bdf6fb17a7288c42ba5fb057676 100644 (file)
--- 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];