shithub: choc

Download patch

ref: 0458d30af5ae12fdfc04b8b8a30552dfd0060523
parent: 5caec28365fedfd4f1929f80313680ff7a15fa7f
author: Simon Howard <fraggle@soulsphere.org>
date: Sun Jun 12 11:20:11 EDT 2016

osx: Add help button for command line.

We already have this on the help menu, but it's nice to have a help
button in the main interface next to the command line arguments
box.

--- a/pkg/osx/Resources/launcher.nib/designable.nib
+++ b/pkg/osx/Resources/launcher.nib/designable.nib
@@ -15,15 +15,15 @@
         <window title="(Package Name) Launcher" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="21" userLabel="Launcher Window">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="350" y="488" width="530" height="190"/>
+            <rect key="contentRect" x="350" y="488" width="532" height="195"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
             <value key="minSize" type="size" width="243.529" height="107"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="530" height="190"/>
+                <rect key="frame" x="0.0" y="0.0" width="532" height="195"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" id="209">
-                        <rect key="frame" x="18" y="168" width="360" height="11"/>
+                        <rect key="frame" x="18" y="173" width="360" height="11"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="325">
                             <font key="font" metaFont="miniSystem"/>
@@ -34,7 +34,7 @@
                         </textFieldCell>
                     </textField>
                     <popUpButton verticalHuggingPriority="750" id="211">
-                        <rect key="frame" x="17" y="141" width="261" height="26"/>
+                        <rect key="frame" x="18" y="141" width="250" height="26"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <popUpButtonCell key="cell" type="push" title="Game name" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="213" id="326">
                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -47,23 +47,12 @@
                         </popUpButtonCell>
                     </popUpButton>
                     <imageView id="216">
-                        <rect key="frame" x="382" y="51" width="128" height="128"/>
+                        <rect key="frame" x="384" y="47" width="128" height="128"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="128x128" id="327"/>
                     </imageView>
-                    <button verticalHuggingPriority="750" id="217">
-                        <rect key="frame" x="283" y="144" width="93" height="23"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="squareTextured" title="Configure..." bezelStyle="texturedSquare" alignment="center" borderStyle="border" inset="2" id="328">
-                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                            <font key="font" metaFont="system"/>
-                        </buttonCell>
-                        <connections>
-                            <action selector="openConfigWindow:" target="225" id="226"/>
-                        </connections>
-                    </button>
                     <textField verticalHuggingPriority="750" id="218">
-                        <rect key="frame" x="18" y="127" width="360" height="11"/>
+                        <rect key="frame" x="18" y="125" width="360" height="11"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="329">
                             <font key="font" metaFont="miniSystem"/>
@@ -73,19 +62,39 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <button verticalHuggingPriority="750" id="220">
-                        <rect key="frame" x="387" y="12" width="129" height="32"/>
+                    <textField verticalHuggingPriority="750" id="219">
+                        <rect key="frame" x="20" y="49" width="346" height="68"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <buttonCell key="cell" type="push" title="Launch Game" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="331">
+                        <textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="border" drawsBackground="YES" id="330">
+                            <font key="font" size="11" name="CourierNewPSMT"/>
+                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.29793848167539272" green="0.29793848167539272" blue="0.29793848167539272" alpha="1" colorSpace="calibratedRGB"/>
+                        </textFieldCell>
+                    </textField>
+                    <button horizontalHuggingPriority="750" verticalHuggingPriority="750" id="5zZ-CS-NR1">
+                        <rect key="frame" x="372" y="46" width="25" height="25"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Eln-B1-5BH">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <action selector="launch:" target="206" id="224"/>
+                            <action selector="openCMDLINE:" target="206" id="abcde-98765"/>
                         </connections>
                     </button>
+                    <button verticalHuggingPriority="750" id="217">
+                        <rect key="frame" x="273" y="143" width="93" height="23"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <buttonCell key="cell" type="squareTextured" title="Configure..." bezelStyle="texturedSquare" alignment="center" borderStyle="border" inset="2" id="328">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="openConfigWindow:" target="225" id="226"/>
+                        </connections>
+                    </button>
                     <button verticalHuggingPriority="750" id="221">
-                        <rect key="frame" x="14" y="12" width="149" height="32"/>
+                        <rect key="frame" x="14" y="13" width="149" height="32"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <buttonCell key="cell" type="push" title="Run Setup Tool..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="332">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -95,17 +104,20 @@
                             <action selector="runSetup:" target="206" id="223"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" id="219">
-                        <rect key="frame" x="19" y="51" width="355" height="68"/>
+                    <button verticalHuggingPriority="750" id="220">
+                        <rect key="frame" x="389" y="13" width="129" height="32"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="border" drawsBackground="YES" id="330">
-                            <font key="font" size="13" name="CourierNewPSMT"/>
-                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <color key="backgroundColor" red="0.29793848167539272" green="0.29793848167539272" blue="0.29793848167539272" alpha="1" colorSpace="calibratedRGB"/>
-                        </textFieldCell>
-                    </textField>
+                        <buttonCell key="cell" type="push" title="Launch Game" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="331">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="launch:" target="206" id="224"/>
+                        </connections>
+                    </button>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="481" y="360.5"/>
         </window>
         <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
             <items>
binary files a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib differ