MacGui: various queue improvements, including:

- multiple items drag & drop
- "reset job" in contextual menu item to reset the job state
- a toolbar item to select the action to perform when the queue is done
- useless animations.

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

2 files changed, 55 insertions, 19 deletions

diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib
index 7243893fc..9cde5f346 100644
--- a/macosx/English.lproj/Preferences.xib
+++ b/macosx/English.lproj/Preferences.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14E17e" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F6a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
         <development version="5100" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBPreferencesController">
@@ -211,22 +211,22 @@
                 <popUpButton verticalHuggingPriority="750" id="491">
                     <rect key="frame" x="124" y="271" width="195" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <popUpButtonCell key="cell" type="push" title="Do Nothing" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="494" id="492">
+                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="492">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
                         <menu key="menu" title="OtherViews" id="493">
                             <items>
-                                <menuItem title="Do Nothing" state="on" id="494"/>
-                                <menuItem title="Alert Window" id="495"/>
-                                <menuItem title="Growl Notification" id="499"/>
-                                <menuItem title="Alert Window And Growl" id="496"/>
-                                <menuItem title="Put Computer To Sleep" id="497"/>
-                                <menuItem title="Shut Down Computer" id="498"/>
+                                <menuItem title="Do Nothing" id="494"/>
+                                <menuItem title="Alert" tag="1" id="495"/>
+                                <menuItem title="Notification" tag="2" id="499"/>
+                                <menuItem title="Alert And Notification" tag="3" id="496"/>
+                                <menuItem title="Put Computer To Sleep" tag="4" id="497"/>
+                                <menuItem title="Shut Down Computer" tag="5" id="498"/>
                             </items>
                         </menu>
                     </popUpButtonCell>
                     <connections>
-                        <binding destination="61" name="selectedValue" keyPath="values.AlertWhenDone" id="501"/>
+                        <binding destination="61" name="selectedTag" keyPath="values.HBAlertWhenDone" id="xxK-qX-yth"/>
                     </connections>
                 </popUpButton>
                 <tokenField verticalHuggingPriority="750" id="6aa-GX-TuM">
diff --git a/macosx/English.lproj/Queue.xib b/macosx/English.lproj/Queue.xib
index 82fc7ee3b..96598ec01 100644
--- a/macosx/English.lproj/Queue.xib
+++ b/macosx/English.lproj/Queue.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6724" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F6a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment version="1060" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6724"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBQueueController">
@@ -17,6 +17,7 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Queue" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="QueueWindow" animationBehavior="default" id="2576" userLabel="Window">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" unifiedTitleAndToolbar="YES"/>
+            <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="893" y="128" width="574" height="423"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
@@ -32,11 +33,11 @@
                             <rect key="frame" x="1" y="1" width="532" height="336"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="2624" id="2597" customClass="HBQueueOutlineView">
-                                    <rect key="frame" x="0.0" y="0.0" width="532" height="19"/>
+                                <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="2624" id="2597" customClass="HBQueueOutlineView">
+                                    <rect key="frame" x="0.0" y="0.0" width="532" height="336"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
-                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
                                         <tableColumn identifier="icon" width="38" minWidth="38" maxWidth="38" id="2624">
@@ -54,7 +55,7 @@
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
                                             </tableHeaderCell>
-                                            <textFieldCell key="dataCell" selectable="YES" editable="YES" alignment="left" id="2609" customClass="HBImageAndTextCell">
+                                            <textFieldCell key="dataCell" selectable="YES" editable="YES" alignment="left" id="2609">
                                                 <font key="font" metaFont="cellTitle"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -125,17 +126,44 @@
                     </toolbarItem>
                     <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="rHN-a0-oZQ"/>
                     <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="QuV-M8-cet"/>
+                    <toolbarItem implicitItemIdentifier="938D3EC6-1547-4AAB-86AF-B3FD3C7AF8BD" label="When Done" paletteLabel="When Done" id="a3c-kV-98E">
+                        <nil key="toolTip"/>
+                        <size key="minSize" width="100" height="25"/>
+                        <size key="maxSize" width="210" height="25"/>
+                        <popUpButton key="view" verticalHuggingPriority="750" id="rfS-M1-CnB">
+                            <rect key="frame" x="0.0" y="14" width="200" height="25"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="pch-jl-VXA">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="menu"/>
+                                <menu key="menu" id="1Ee-Xt-VES">
+                                    <items>
+                                        <menuItem title="Do Nothing" id="sm5-26-sAg"/>
+                                        <menuItem title="Alert" tag="1" id="fAD-ky-zo6"/>
+                                        <menuItem title="Notification" tag="2" id="jDL-sB-8e3"/>
+                                        <menuItem title="Alert and Notification" tag="3" id="aat-1N-Odn"/>
+                                        <menuItem title="Put Computer to Sleep" tag="4" id="GUQ-xb-HVS"/>
+                                        <menuItem title="Shut Down Computer" tag="5" id="QmP-SQ-XKK"/>
+                                    </items>
+                                </menu>
+                            </popUpButtonCell>
+                            <connections>
+                                <binding destination="z2J-h1-IDv" name="selectedTag" keyPath="values.HBAlertWhenDone" id="trt-6H-UtD"/>
+                            </connections>
+                        </popUpButton>
+                    </toolbarItem>
                 </allowedToolbarItems>
                 <defaultToolbarItems>
                     <toolbarItem reference="SX6-mq-Hck"/>
                     <toolbarItem reference="s7o-pK-heI"/>
                     <toolbarItem reference="QuV-M8-cet"/>
+                    <toolbarItem reference="a3c-kV-98E"/>
                 </defaultToolbarItems>
             </toolbar>
             <connections>
                 <outlet property="delegate" destination="-2" id="2579"/>
             </connections>
-            <point key="canvasLocation" x="666" y="695.5"/>
+            <point key="canvasLocation" x="322" y="355.5"/>
         </window>
         <menu id="2649" userLabel="ContextMenu">
             <items>
@@ -148,10 +176,17 @@
                 <menuItem title="Show in Finder" id="2655">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
-                        <action selector="revealSelectedQueueItem:" target="-2" id="2657"/>
+                        <action selector="revealSelectedQueueItems:" target="-2" id="qtj-uq-KvZ"/>
                     </connections>
                 </menuItem>
                 <menuItem isSeparatorItem="YES" id="Au5-j1-AAd"/>
+                <menuItem title="Reset job" id="zy6-ab-ush">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="resetJobState:" target="-1" id="fxd-BP-VY6"/>
+                    </connections>
+                </menuItem>
+                <menuItem isSeparatorItem="YES" id="1ZZ-71-d6P"/>
                 <menuItem title="Clear All" id="2652">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
@@ -174,6 +209,7 @@
             </items>
             <point key="canvasLocation" x="192" y="450.5"/>
         </menu>
+        <userDefaultsController representsSharedInstance="YES" id="z2J-h1-IDv"/>
     </objects>
     <resources>
         <image name="Delete" width="16" height="16"/>