Refactoring, SETextView -> ThemeObservingTextView + more

sveinbjornt · Oct 25, 2023 · a42d829 · a42d829
1 parent 3ed0e07
commit a42d829
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 43 deletions.
diff --git a/Application/ArgsController.m b/Application/ArgsController.m
@@ -146,8 +146,17 @@ - (void)constructCommandString {
         NSString *a = [NSString stringWithFormat:@" %@", interpreterArgs[i]];
         NSMutableDictionary *attrs = [defaultAttrs mutableCopy];
 
+        NSColor *highlightColor = [NSColor lightGrayColor];
+        BOOL dark = NO;
+        if (@available(macOS 10.14, *)) {
+            dark = ([[[NSAppearance currentAppearance] name] isEqualToString:NSAppearanceNameDarkAqua]);
+        }
+        if (dark) {
+            highlightColor = [NSColor darkGrayColor];
+        }
+
         if ([interpreterArgsTableView selectedRow] == i && interpreterArgsTableView == [[self window] firstResponder]) {
-            attrs[NSBackgroundColorAttributeName] = [NSColor lightGrayColor];
+            attrs[NSBackgroundColorAttributeName] = highlightColor;
         }
 
         NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:a attributes:attrs];

diff --git a/Application/Resources/Platypus-Info.plist b/Application/Resources/Platypus-Info.plist
@@ -411,7 +411,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1257</string>
+	<string>1261</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Application/Resources/Platypus.xib b/Application/Resources/Platypus.xib
@@ -1904,7 +1904,7 @@ DQ
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="JcD-yT-ov7">
                             <rect key="frame" x="1" y="1" width="209" height="119"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" headerView="11089" id="1405" customClass="NSResponderNotifyingTableView">
                                     <rect key="frame" x="0.0" y="0.0" width="209" height="102"/>
@@ -1955,7 +1955,7 @@ DQ
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="AXu-6W-m9d">
                             <rect key="frame" x="1" y="1" width="209" height="119"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" headerView="11254" id="11257" customClass="NSResponderNotifyingTableView">
                                     <rect key="frame" x="0.0" y="0.0" width="209" height="102"/>
@@ -2278,7 +2278,7 @@ DQ
                             <rect key="frame" x="1" y="1" width="221" height="113"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textView editable="NO" selectable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" id="2078" customClass="SETextView">
+                                <textView editable="NO" selectable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" id="2078" customClass="ThemeObservingTextView">
                                     <rect key="frame" x="0.0" y="0.0" width="221" height="113"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>

diff --git a/Application/TextSettingsController.m b/Application/TextSettingsController.m
@@ -50,16 +50,14 @@ @implementation TextSettingsController
 - (void)awakeFromNib {
     [self setCurrentFont:[NSFont fontWithName:DEFAULT_TEXT_FONT_NAME size:DEFAULT_TEXT_FONT_SIZE]];
     [self updateTextViewColor:self];
-
 //    [NSDistributedNotificationCenter.defaultCenter addObserver:self
 //                                                      selector:@selector(themeChanged:) name:@"AppleInterfaceThemeChangedNotification"
 //                                                        object: nil];
-
 }
 
-- (void)themeChanged:(NSNotification *)notification {
+//- (void)themeChanged:(NSNotification *)notification {
 //    [self updateTextViewColor:notification];
-}
+//}
 
 - (IBAction)show:(id)sender {
     [parentWindow setTitle:[NSString stringWithFormat:@"%@ - Text Settings", PROGRAM_NAME]];
@@ -101,7 +99,6 @@ - (IBAction)updateTextViewColor:(id)sender {
     BOOL darkPossible = NO;
     if (@available(macOS 10.14, *)) {
         darkPossible = YES;
-
     }
     if (darkPossible) {
         darkMode = [[[NSAppearance currentAppearance] name] isEqualToString:NSAppearanceNameDarkAqua];
@@ -110,8 +107,7 @@ - (IBAction)updateTextViewColor:(id)sender {
             fgColor = [fgColor inverted];
         }
     }
-
-//    NSLog(@"Dark mode?: %d", darkMode);
+
     [textPreviewTextView setBackgroundColor:bgColor];
     [textPreviewTextView setTextColor:fgColor];
 }

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -22,12 +22,12 @@ For future versions...
     TODO: Harden CI testing for this old project
     TODO: Fix selection change when item is deleted from the Bundled Files List
     TODO: Make Status Menu from script generation non-blocking
+    TODO: Upgrade Sparkle version
 
 For 5.4.2
     * Fixed bug where the argument settings window would lock up
     * Better support for Dark Mode
     * TODO?: Performance optimization in the app build process (precompiled nib)
-    * TODO: Upgrade Sparkle version
 
 For 5.4.1 - 22/10/2022
     * Fixed signing issues

diff --git a/Platypus.xcodeproj/project.pbxproj b/Platypus.xcodeproj/project.pbxproj
@@ -89,7 +89,8 @@
 		F47B9F062606E9850076C3EC /* Interpreter_Python_2.png in Resources */ = {isa = PBXBuildFile; fileRef = F47B9F052606E9850076C3EC /* Interpreter_Python_2.png */; };
 		F48002CB121AF042003FB5B3 /* images in Resources */ = {isa = PBXBuildFile; fileRef = F48002BA121AF042003FB5B3 /* images */; };
 		F481A4B02AE860FF000E46DC /* NSColor+Inverted.m in Sources */ = {isa = PBXBuildFile; fileRef = F4911FC8260A6C50004AC8CD /* NSColor+Inverted.m */; };
-		F481A4B12AE86487000E46DC /* SETextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F740D92684CFA5000673C0 /* SETextView.m */; };
+		F481A4B42AE94169000E46DC /* ThemeObservingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F481A4B32AE94169000E46DC /* ThemeObservingTextView.m */; };
+		F481A4B52AE94169000E46DC /* ThemeObservingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F481A4B32AE94169000E46DC /* ThemeObservingTextView.m */; };
 		F482697F1BCAE1EE00169D8B /* TypeListController.m in Sources */ = {isa = PBXBuildFile; fileRef = F482697E1BCAE1EE00169D8B /* TypeListController.m */; };
 		F48269831BCAF1D800169D8B /* UniformTypeListController.m in Sources */ = {isa = PBXBuildFile; fileRef = F48269821BCAF1D800169D8B /* UniformTypeListController.m */; };
 		F484D45921A9DDAE006EE28D /* ScriptDocument.icns in Resources */ = {isa = PBXBuildFile; fileRef = F484D45721A9DDAE006EE28D /* ScriptDocument.icns */; };
@@ -151,7 +152,6 @@
 		F4ECE5891E5F04A4008CC395 /* UriSchemesListController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4ECE5881E5F04A4008CC395 /* UriSchemesListController.m */; };
 		F4F14CBC1C662A4D002A2402 /* make_examples.pl in Resources */ = {isa = PBXBuildFile; fileRef = F4F14CAF1C640857002A2402 /* make_examples.pl */; };
 		F4F2F3BA1BF96C5C00FE463C /* VDKQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F2F3B91BF96C5C00FE463C /* VDKQueue.m */; };
-		F4F740DA2684CFA5000673C0 /* SETextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F740D92684CFA5000673C0 /* SETextView.m */; };
 		F4FB338114FBFC7C00BAECEB /* License.html in Resources */ = {isa = PBXBuildFile; fileRef = F4FB338014FBFC7C00BAECEB /* License.html */; };
 		F4FE739911F792D5005FC23A /* PlatypusAppSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F4FE739711F792D5005FC23A /* PlatypusAppSpec.m */; };
 		F4FE739A11F792D5005FC23A /* PlatypusAppSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = F4FE739711F792D5005FC23A /* PlatypusAppSpec.m */; };
@@ -285,6 +285,8 @@
 		F479672B224EB3EF00CA0746 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		F47B9F052606E9850076C3EC /* Interpreter_Python_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Interpreter_Python_2.png; sourceTree = "<group>"; };
 		F48002BA121AF042003FB5B3 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; path = images; sourceTree = "<group>"; };
+		F481A4B22AE94168000E46DC /* ThemeObservingTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThemeObservingTextView.h; path = Shared/ThemeObservingTextView.h; sourceTree = "<group>"; };
+		F481A4B32AE94169000E46DC /* ThemeObservingTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ThemeObservingTextView.m; path = Shared/ThemeObservingTextView.m; sourceTree = "<group>"; };
 		F482697D1BCAE1EE00169D8B /* TypeListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TypeListController.h; path = Application/TypeListController.h; sourceTree = "<group>"; };
 		F482697E1BCAE1EE00169D8B /* TypeListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TypeListController.m; path = Application/TypeListController.m; sourceTree = "<group>"; };
 		F48269811BCAF1D800169D8B /* UniformTypeListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UniformTypeListController.h; path = Application/UniformTypeListController.h; sourceTree = "<group>"; };
@@ -382,8 +384,6 @@
 		F4F14CAF1C640857002A2402 /* make_examples.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = make_examples.pl; sourceTree = "<group>"; };
 		F4F2F3B81BF96C5C00FE463C /* VDKQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VDKQueue.h; path = Shared/Others/VDKQueue/VDKQueue.h; sourceTree = "<group>"; };
 		F4F2F3B91BF96C5C00FE463C /* VDKQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VDKQueue.m; path = Shared/Others/VDKQueue/VDKQueue.m; sourceTree = "<group>"; };
-		F4F740D82684CFA5000673C0 /* SETextView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SETextView.h; path = ScriptExec/SETextView.h; sourceTree = "<group>"; };
-		F4F740D92684CFA5000673C0 /* SETextView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SETextView.m; path = ScriptExec/SETextView.m; sourceTree = "<group>"; };
 		F4FB338014FBFC7C00BAECEB /* License.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html.documentation; path = License.html; sourceTree = "<group>"; };
 		F4FE739611F792D5005FC23A /* PlatypusAppSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatypusAppSpec.h; path = Shared/PlatypusAppSpec.h; sourceTree = "<group>"; };
 		F4FE739711F792D5005FC23A /* PlatypusAppSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PlatypusAppSpec.m; path = Shared/PlatypusAppSpec.m; sourceTree = "<group>"; };
@@ -427,6 +427,7 @@
 		080E96DDFE201D6D7F000001 /* Shared */ = {
 			isa = PBXGroup;
 			children = (
+				F481A4B62AE9416F000E46DC /* ThemeObservingTextView */,
 				F4A8B5C72229ECB50049FA51 /* AGIconFamily */,
 				F484D46021AA03D7006EE28D /* NSFileManager+TempFiles */,
 				F45B1F041FF5610000A935D7 /* NSTask+Description */,
@@ -708,6 +709,15 @@
 			path = cat2html;
 			sourceTree = "<group>";
 		};
+		F481A4B62AE9416F000E46DC /* ThemeObservingTextView */ = {
+			isa = PBXGroup;
+			children = (
+				F481A4B22AE94168000E46DC /* ThemeObservingTextView.h */,
+				F481A4B32AE94169000E46DC /* ThemeObservingTextView.m */,
+			);
+			name = ThemeObservingTextView;
+			sourceTree = "<group>";
+		};
 		F48269801BCAE7FA00169D8B /* Drop Settings */ = {
 			isa = PBXGroup;
 			children = (
@@ -758,8 +768,6 @@
 				F48B7B9011F766E600351575 /* main.m */,
 				F48B7B9111F766E600351575 /* SEController.h */,
 				F43C431026876F250013914C /* SEController.m */,
-				F4F740D82684CFA5000673C0 /* SETextView.h */,
-				F4F740D92684CFA5000673C0 /* SETextView.m */,
 				F4AB18981BED3A0B00B83A95 /* SEJob.h */,
 				F4AB18991BED3A0B00B83A95 /* SEJob.m */,
 				F44A77471C1887CC003CCA7A /* Resources */,
@@ -1281,7 +1289,6 @@
 				F4975DB61B2E71EE0099D16E /* SuffixTypeListController.m in Sources */,
 				F4AB186F1BE1908100B83A95 /* NSBundle+Templates.m in Sources */,
 				F45B1EFC1FF560D800A935D7 /* NSTextView+JSDExtensions.m in Sources */,
-				F481A4B12AE86487000E46DC /* SETextView.m in Sources */,
 				F4975D751B2E09310099D16E /* STPrivilegedTask.m in Sources */,
 				F4975DB41B2E71EE0099D16E /* ShellCommandController.m in Sources */,
 				F4975DAB1B2E71EE0099D16E /* BundledFilesController.m in Sources */,
@@ -1307,6 +1314,7 @@
 				F44EFF36122971BE00CAC9C2 /* NSColor+HexTools.m in Sources */,
 				F4975DAD1B2E71EE0099D16E /* EditorController.m in Sources */,
 				F4975D711B2E09280099D16E /* NSWorkspace+Additions.m in Sources */,
+				F481A4B42AE94169000E46DC /* ThemeObservingTextView.m in Sources */,
 				F4F2F3BA1BF96C5C00FE463C /* VDKQueue.m in Sources */,
 				F4051DA91C1C812600587F1F /* STReverseDNSTextField.m in Sources */,
 				F48269831BCAF1D800169D8B /* UniformTypeListController.m in Sources */,
@@ -1326,14 +1334,14 @@
 			files = (
 				F48B7B9511F766E600351575 /* main.m in Sources */,
 				F4051D9F1C1B5AF900587F1F /* Common.m in Sources */,
-				F4F740DA2684CFA5000673C0 /* SETextView.m in Sources */,
 				F43C431126876F250013914C /* SEController.m in Sources */,
 				F44EFF0612296F3700CAC9C2 /* NSColor+HexTools.m in Sources */,
 				F4911FCA260A6C50004AC8CD /* NSColor+Inverted.m in Sources */,
 				F4AF785D14D1E5F200544C1B /* STDragWebView.m in Sources */,
 				F4975D741B2E09310099D16E /* STPrivilegedTask.m in Sources */,
 				F4AB186B1BE182FA00B83A95 /* Alerts.m in Sources */,
 				F4AB189A1BED3A0B00B83A95 /* SEJob.m in Sources */,
+				F481A4B52AE94169000E46DC /* ThemeObservingTextView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/ScriptExec/Resources/AppSettings.plist b/ScriptExec/Resources/AppSettings.plist
@@ -11,7 +11,7 @@
 	<key>Creator</key>
 	<string>Platypus-5.4.2</string>
 	<key>InterfaceType</key>
-	<string>Web View</string>
+	<string>Text Window</string>
 	<key>URISchemes</key>
 	<array/>
 	<key>InterpreterArgs</key>