Switch to template images for the step buttons.

The blue color of the original design is hard to see in dark mode.

diff --git a/CHANGES b/CHANGES
index 64a91f68db5864fb3747e051a43e987b1c1b28f3..005eec3c429dc3642ece126116e0337852a17f0b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ MacGDBp                                                               CHANGE LOG
 - Change: Make the Remote Paths preferences pane larger.
 - Fix: #260  Use macOS standard colors for syntax highlighting for better dark-
   mode compatibility.
+- Change: Improve toolbar buttons under dark mode.
 
 2.0 Beta 1
 #####################

diff --git a/Icons/StepIn.png b/Icons/StepIn.png
deleted file mode 100644 (file)
index 8b42851..0000000
Binary files a/Icons/StepIn.png and /dev/null differ

diff --git a/Icons/StepInTemplate.png b/Icons/StepInTemplate.png
new file mode 100644 (file)
index 0000000..d0232f6
Binary files /dev/null and b/Icons/StepInTemplate.png differ

diff --git a/Icons/StepOut.png b/Icons/StepOut.png
deleted file mode 100644 (file)
index 993d0a6..0000000
Binary files a/Icons/StepOut.png and /dev/null differ

diff --git a/Icons/StepOutTemplate.png b/Icons/StepOutTemplate.png
new file mode 100644 (file)
index 0000000..5d5c915
Binary files /dev/null and b/Icons/StepOutTemplate.png differ

diff --git a/Icons/StepOver.png b/Icons/StepOver.png
deleted file mode 100644 (file)
index f6f0aed..0000000
Binary files a/Icons/StepOver.png and /dev/null differ

diff --git a/Icons/StepOverTemplate.png b/Icons/StepOverTemplate.png
new file mode 100644 (file)
index 0000000..a38bb93
Binary files /dev/null and b/Icons/StepOverTemplate.png differ

diff --git a/MacGDBp.xcodeproj/project.pbxproj b/MacGDBp.xcodeproj/project.pbxproj
index 745c9f0995053d4c1ad6971363d848a1bd88cc86..744b3718e45884c7c47554d9ec7ecaf14d4af5da 100644 (file)
--- a/MacGDBp.xcodeproj/project.pbxproj
+++ b/MacGDBp.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
                1E027F0A0D36F23F00885DEE /* Run.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E027F080D36F23F00885DEE /* Run.png */; };
-               1E027F0B0D36F23F00885DEE /* StepOver.png in Resources */ = {isa = PBXBuildFile; fileRef = 1E027F090D36F23F00885DEE /* StepOver.png */; };
                1E02C3D50C60EC2C006F1752 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C3D40C60EC2C006F1752 /* AppDelegate.m */; };
                1E02C5710C610158006F1752 /* DebuggerBackEnd.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5700C610158006F1752 /* DebuggerBackEnd.m */; };
                1E02C5F60C610724006F1752 /* DebuggerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E02C5F50C610724006F1752 /* DebuggerController.m */; };
@@ -44,14 +43,15 @@
                1E9C305B239D6DC600EFE30E /* FileAccess.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1E9C3059239D6DC600EFE30E /* FileAccess.xib */; };
                1E9C305F239D6E4200EFE30E /* FileAccessController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E9C305E239D6E4200EFE30E /* FileAccessController.m */; };
                1EB7BED50ECF3CA90033283A /* StackFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EB7BED40ECF3CA90033283A /* StackFrame.m */; };
+               1EBE15B324381342006D0D07 /* StepInTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EBE15B224381342006D0D07 /* StepInTemplate.png */; };
+               1EBE15B62438143B006D0D07 /* StepOverTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EBE15B42438143B006D0D07 /* StepOverTemplate.png */; };
+               1EBE15B72438143B006D0D07 /* StepOutTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EBE15B52438143B006D0D07 /* StepOutTemplate.png */; };
                1EC1337E127DBB00007946FC /* VariableNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EC1337D127DBB00007946FC /* VariableNode.m */; };
                1EDA9CF812DD13B300596211 /* BSLineNumberRulerView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1EDA9CF712DD13B300596211 /* BSLineNumberRulerView.mm */; };
                1EE97E55232B11CB000FA8E6 /* ValidatingNSToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EE97E54232B11CB000FA8E6 /* ValidatingNSToolbarItem.m */; };
                1EEBE842176FEA80003622C3 /* MessageQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EEBE841176FEA80003622C3 /* MessageQueue.m */; };
                1EEBE845176FFE04003622C3 /* ProtocolClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EEBE844176FFE04003622C3 /* ProtocolClient.m */; };
                1EEBFBE50D34C793008F835B /* Debugger.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFBE30D34C793008F835B /* Debugger.xib */; };
-               1EEBFC2B0D358EBD008F835B /* StepIn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFC2A0D358EBD008F835B /* StepIn.png */; };
-               1EEBFC370D358F1B008F835B /* StepOut.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EEBFC360D358F1B008F835B /* StepOut.png */; };
                1EECC0BA1BC9B1E800FB22D3 /* DebuggerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EECC0B91BC9B1E700FB22D3 /* DebuggerModel.m */; };
                1EEE875D0D9DE4B4009CBA7C /* MacGDBp.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1EEE875C0D9DE4B4009CBA7C /* MacGDBp.icns */; };
                1EFF70C30DFDC018006B9D33 /* BreakpointController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EFF70C20DFDC018006B9D33 /* BreakpointController.m */; };
@@ -87,7 +87,6 @@
                1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
                1E027F080D36F23F00885DEE /* Run.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Run.png; path = Icons/Run.png; sourceTree = "<group>"; };
-               1E027F090D36F23F00885DEE /* StepOver.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepOver.png; path = Icons/StepOver.png; sourceTree = "<group>"; };
                1E02C3D30C60EC2C006F1752 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Source/AppDelegate.h; sourceTree = "<group>"; };
                1E02C3D40C60EC2C006F1752 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Source/AppDelegate.m; sourceTree = "<group>"; };
                1E02C56F0C610158006F1752 /* DebuggerBackEnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerBackEnd.h; path = Source/DebuggerBackEnd.h; sourceTree = "<group>"; };
@@ -139,6 +138,9 @@
                1E9C305E239D6E4200EFE30E /* FileAccessController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = FileAccessController.m; path = Source/FileAccessController.m; sourceTree = "<group>"; };
                1EB7BED30ECF3CA90033283A /* StackFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StackFrame.h; path = Source/StackFrame.h; sourceTree = "<group>"; };
                1EB7BED40ECF3CA90033283A /* StackFrame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StackFrame.m; path = Source/StackFrame.m; sourceTree = "<group>"; };
+               1EBE15B224381342006D0D07 /* StepInTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepInTemplate.png; path = Icons/StepInTemplate.png; sourceTree = "<group>"; };
+               1EBE15B42438143B006D0D07 /* StepOverTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepOverTemplate.png; path = Icons/StepOverTemplate.png; sourceTree = "<group>"; };
+               1EBE15B52438143B006D0D07 /* StepOutTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepOutTemplate.png; path = Icons/StepOutTemplate.png; sourceTree = "<group>"; };
                1EC1337C127DBB00007946FC /* VariableNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VariableNode.h; path = Source/VariableNode.h; sourceTree = "<group>"; };
                1EC1337D127DBB00007946FC /* VariableNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VariableNode.m; path = Source/VariableNode.m; sourceTree = "<group>"; };
                1ED58817231CC66000F0A713 /* MacGDBp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacGDBp.entitlements; sourceTree = "<group>"; };
@@ -150,8 +152,6 @@
                1EEBE841176FEA80003622C3 /* MessageQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MessageQueue.m; path = Source/MessageQueue.m; sourceTree = "<group>"; };
                1EEBE843176FFE04003622C3 /* ProtocolClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProtocolClient.h; path = Source/ProtocolClient.h; sourceTree = "<group>"; };
                1EEBE844176FFE04003622C3 /* ProtocolClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProtocolClient.m; path = Source/ProtocolClient.m; sourceTree = "<group>"; };
-               1EEBFC2A0D358EBD008F835B /* StepIn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepIn.png; path = Icons/StepIn.png; sourceTree = "<group>"; };
-               1EEBFC360D358F1B008F835B /* StepOut.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = StepOut.png; path = Icons/StepOut.png; sourceTree = "<group>"; };
                1EECC0B81BC9B1E700FB22D3 /* DebuggerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DebuggerModel.h; path = Source/DebuggerModel.h; sourceTree = "<group>"; };
                1EECC0B91BC9B1E700FB22D3 /* DebuggerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DebuggerModel.m; path = Source/DebuggerModel.m; sourceTree = "<group>"; };
                1EEE875C0D9DE4B4009CBA7C /* MacGDBp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacGDBp.icns; path = Icons/MacGDBp.icns; sourceTree = "<group>"; };
@@ -232,12 +232,12 @@
                1E027F0D0D36F24200885DEE /* Toolbar Icons */ = {
                        isa = PBXGroup;
                        children = (
+                               1EBE15B52438143B006D0D07 /* StepOutTemplate.png */,
+                               1EBE15B42438143B006D0D07 /* StepOverTemplate.png */,
+                               1EBE15B224381342006D0D07 /* StepInTemplate.png */,
                                1E2F0A6812D5371B00EBF675 /* Stop.png */,
                                1E0AFBB80FC2518700C67031 /* HUDIcon.png */,
                                1E027F080D36F23F00885DEE /* Run.png */,
-                               1E027F090D36F23F00885DEE /* StepOver.png */,
-                               1EEBFC360D358F1B008F835B /* StepOut.png */,
-                               1EEBFC2A0D358EBD008F835B /* StepIn.png */,
                        );
                        name = "Toolbar Icons";
                        sourceTree = "<group>";
@@ -486,13 +486,13 @@
                                1E9C305B239D6DC600EFE30E /* FileAccess.xib in Resources */,
                                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
                                1EEBFBE50D34C793008F835B /* Debugger.xib in Resources */,
-                               1EEBFC2B0D358EBD008F835B /* StepIn.png in Resources */,
-                               1EEBFC370D358F1B008F835B /* StepOut.png in Resources */,
+                               1EBE15B62438143B006D0D07 /* StepOverTemplate.png in Resources */,
+                               1EBE15B324381342006D0D07 /* StepInTemplate.png in Resources */,
                                1E027F0A0D36F23F00885DEE /* Run.png in Resources */,
-                               1E027F0B0D36F23F00885DEE /* StepOver.png in Resources */,
                                1E416FF90D36F821009A53A2 /* MainMenu.xib in Resources */,
                                1EEE875D0D9DE4B4009CBA7C /* MacGDBp.icns in Resources */,
                                1E1E53030DF9B89800D334F9 /* Breakpoints.xib in Resources */,
+                               1EBE15B72438143B006D0D07 /* StepOutTemplate.png in Resources */,
                                1E9582620E252474001A3D89 /* Preferences.xib in Resources */,
                                1E0AFBB90FC2518700C67031 /* HUDIcon.png in Resources */,
                                1E6B594C11610993001189D2 /* Log.xib in Resources */,

diff --git a/dev/Resource Masters/Toolbar Buttons 2.psd b/dev/Resource Masters/Toolbar Buttons 2.psd
index 55eb5cbac5f7292a84a7721ec1eebef89195ecb9..f47a128c3909279ea95b4faa6930ccb07c685a48 100644 (file)
Binary files a/dev/Resource Masters/Toolbar Buttons 2.psd and b/dev/Resource Masters/Toolbar Buttons 2.psd differ

diff --git a/en.lproj/Debugger.xib b/en.lproj/Debugger.xib
index e0b894a9ac15e08424e02f3d340e39b7048a3616..7a323ca1375d2a828295263fe5a8dfafe4009f09 100644 (file)
--- a/en.lproj/Debugger.xib
+++ b/en.lproj/Debugger.xib
@@ -319,13 +319,13 @@
             </view>
             <toolbar key="toolbar" implicitIdentifier="2E704228-00D1-43C3-B458-9839CEF5A7D0" displayMode="iconOnly" sizeMode="regular" id="471">
                 <allowedToolbarItems>
-                    <toolbarItem implicitItemIdentifier="69AE2ACB-C36A-4083-9D2B-3572B7A21CA0" label="Step In" paletteLabel="Step In" toolTip="Step In" image="StepIn" id="wHU-wT-jc4" customClass="ValidatingNSToolbarItem">
+                    <toolbarItem implicitItemIdentifier="69AE2ACB-C36A-4083-9D2B-3572B7A21CA0" label="Step In" paletteLabel="Step In" toolTip="Step In" image="StepInTemplate" id="wHU-wT-jc4" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="YNB-SH-ciO">
                             <rect key="frame" x="0.0" y="14" width="45" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="StepIn" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9sF-Wx-nCI">
+                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="StepInTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9sF-Wx-nCI">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
@@ -334,13 +334,13 @@
                             <action selector="stepIn:" target="-2" id="wB8-VT-8r1"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="BCF9D13D-041F-4A9B-9D75-6AC074995436" label="Step Out" paletteLabel="Step Out" toolTip="Step Out" image="StepOut" id="ufJ-5Q-WL7" customClass="ValidatingNSToolbarItem">
+                    <toolbarItem implicitItemIdentifier="BCF9D13D-041F-4A9B-9D75-6AC074995436" label="Step Out" paletteLabel="Step Out" toolTip="Step Out" image="StepOutTemplate" id="ufJ-5Q-WL7" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="Mjb-90-kNO">
                             <rect key="frame" x="5" y="14" width="45" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="StepOut" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3kU-ib-eyA">
+                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="StepOutTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3kU-ib-eyA">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
@@ -349,13 +349,13 @@
                             <action selector="stepOut:" target="-2" id="C6v-5h-qFh"/>
                         </connections>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="EC9FAEF4-0C25-4E7D-9F3D-443E4672DE6E" label="Step Over" paletteLabel="Step Over" toolTip="Step Over" image="StepOver" id="5k5-MH-RDF" customClass="ValidatingNSToolbarItem">
+                    <toolbarItem implicitItemIdentifier="EC9FAEF4-0C25-4E7D-9F3D-443E4672DE6E" label="Step Over" paletteLabel="Step Over" toolTip="Step Over" image="StepOverTemplate" id="5k5-MH-RDF" customClass="ValidatingNSToolbarItem">
                         <size key="minSize" width="45" height="25"/>
                         <size key="maxSize" width="45" height="25"/>
                         <button key="view" verticalHuggingPriority="750" id="bvu-m4-jMC">
                             <rect key="frame" x="8" y="14" width="45" height="25"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="StepOver" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mga-QP-Tfn">
+                            <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="StepOverTemplate" imagePosition="overlaps" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mga-QP-Tfn">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
                             </buttonCell>
@@ -659,11 +659,11 @@
         <userDefaultsController representsSharedInstance="YES" id="582"/>
     </objects>
     <resources>
-        <image name="HUDIcon" width="32" height="32"/>
+        <image name="HUDIcon" width="400" height="400"/>
         <image name="Run" width="400" height="400"/>
-        <image name="StepIn" width="400" height="400"/>
-        <image name="StepOut" width="400" height="400"/>
-        <image name="StepOver" width="400" height="400"/>
+        <image name="StepInTemplate" width="400" height="400"/>
+        <image name="StepOutTemplate" width="400" height="400"/>
+        <image name="StepOverTemplate" width="400" height="400"/>
         <image name="Stop" width="400" height="400"/>
     </resources>
 </document>