fixed status icon messing up on changing appearance

Closes #7
artginzburg · Feb 11, 2020 · 5931de8 · 5931de8
1 parent c5b672b
commit 5931de8
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 4 deletions.
diff --git a/MiddleClick.xcodeproj/project.pbxproj b/MiddleClick.xcodeproj/project.pbxproj
@@ -155,7 +155,12 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1130;
+				TargetAttributes = {
+					8D1107260486CEB800E47090 = {
+						ProvisioningStyle = Automatic;
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MiddleClick" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -205,8 +210,12 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 12022020;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -217,8 +226,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/MiddleClick/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
+				MARKETING_VERSION = 2.4.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rouge41.middleClick;
 				PRODUCT_NAME = MiddleClick;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 			};
 			name = Debug;
@@ -229,8 +240,12 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_OBJC_WEAK = YES;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 12022020;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
@@ -239,8 +254,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/MiddleClick/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
+				MARKETING_VERSION = 2.4.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.rouge41.middleClick;
 				PRODUCT_NAME = MiddleClick;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 			};
 			name = Release;

diff --git a/MiddleClick/Controller.m b/MiddleClick/Controller.m
@@ -293,6 +293,7 @@ static void restartApp()
   [task setLaunchPath:@"/bin/sh"];
   [task setArguments:args];
   [task launch];
+  NSLog(@"Restarting app...");
 
   [NSApp terminate:NULL];
 }

diff --git a/MiddleClick/Images.xcassets/StatusIcon.imageset/Contents.json b/MiddleClick/Images.xcassets/StatusIcon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "mouse32x32.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mouse-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mouse128x128.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/MiddleClick/Images.xcassets/StatusIcon.imageset/mouse-1.png b/MiddleClick/Images.xcassets/StatusIcon.imageset/mouse-1.png
diff --git a/MiddleClick/Images.xcassets/StatusIcon.imageset/mouse128x128.png b/MiddleClick/Images.xcassets/StatusIcon.imageset/mouse128x128.png
diff --git a/MiddleClick/Images.xcassets/StatusIcon.imageset/mouse32x32.png b/MiddleClick/Images.xcassets/StatusIcon.imageset/mouse32x32.png
diff --git a/MiddleClick/Info.plist b/MiddleClick/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.5</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>29082019</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/MiddleClick/TrayMenu.m b/MiddleClick/TrayMenu.m
@@ -92,7 +92,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 {
   NSMenu* menu = [self createMenu];
 
-  NSImage* icon = [NSApp applicationIconImage];
+  NSImage* icon = [NSImage imageNamed:(@"StatusIcon")];
   [icon setSize:CGSizeMake(24, 24)];
 
   // Check if Darkmode menubar is supported and enable templating of the icon in