32ビット対応のみかどうか表示する機能実装

Author: k-hatano

SwitchMenu/AppDelegate.m

@@ -35,11 +35,13 @@ @interface AppDelegate ()
 @property (weak) IBOutlet NSMenuItem *miOrderAppName;
 @property (weak) IBOutlet NSMenuItem *miOrderLaunchTime;
 @property (weak) IBOutlet NSMenuItem *miShowNumberOfWindows;
+@property (weak) IBOutlet NSMenuItem *miShow32BitOnly;
 
 @property (assign) NSInteger iMenuTitle;
 @property (assign) NSInteger iIconSmall;
 @property (assign) NSInteger iOrder;
 @property (assign) NSInteger iShowNumberOfWindows;
+@property (assign) NSInteger iShow32BitOnly;
 
 @property (strong, retain) NSStatusItem *sbItem;
 @property (strong, retain) NSMutableArray *apps;
@@ -97,7 +99,7 @@ - (void)changeMenuTitle
 
             switch (self.iMenuTitle) {
                 case 0: {
-                    self.sbItem.title = app.localizedName;
+                    self.sbItem.title = [self appName:app];
                     self.sbItem.image = nil;
                     break;
                 }
@@ -114,13 +116,13 @@ - (void)changeMenuTitle
                     break;
                 }
                 case 3: {
-                    self.sbItem.title = app.localizedName;
+                    self.sbItem.title = [self appName:app];
                     self.sbItem.image = [AppDelegate resizeImage:app.icon small:YES
                                                       monochrome:NO translucent:NO];
                     break;
                 }
                 case 4: {
-                    self.sbItem.title = app.localizedName;
+                    self.sbItem.title = [self appName:app];
                     self.sbItem.image = [AppDelegate resizeImage:app.icon small:YES
                                                       monochrome:YES translucent:NO];
                     break;
@@ -290,7 +292,7 @@ - (void)createSubmenuOfSwitchMenu {
             }
         }
 
-        NSString *title = app.localizedName;
+        NSString *title = [self appName:app];
         NSMutableArray *windows = [[NSMutableArray alloc] init];
 
         NSInteger numWindows = 0;
@@ -361,6 +363,18 @@ - (void)createSubmenuOfSwitchMenu {
 
         NSMutableString *tooltip = [[NSMutableString alloc] init];
         [tooltip appendFormat:@"Full Path:\n%@\n",[app.bundleURL path]];
+        NSString *arch;
+        switch (app.executableArchitecture) {
+            case NSBundleExecutableArchitectureI386:
+                arch = @"i386";
+                break;
+            case NSBundleExecutableArchitectureX86_64:
+                arch = @"x86_64";
+                break;
+            default:
+                arch = @"N/A";
+        }
+        [tooltip appendFormat:@"\nExecutable Architecture:\n%@\n", arch];
         // [tooltip appendFormat:@"\nBundle Identifier:\n%@\n",app.bundleIdentifier];
         if (app.launchDate) {
             [tooltip appendFormat:@"\nLaunch Date/Time:\n%@\n",app.launchDate];
@@ -514,26 +528,37 @@ - (NSImage *)makeAllAppsImageMonochrome:(BOOL)monochrome {
     return tmpImage;
 }
 
+- (NSString *)appName:(NSRunningApplication *)app {
+    if (self.iShow32BitOnly && [app executableArchitecture] == NSBundleExecutableArchitectureI386) {
+        return [app.localizedName stringByAppendingString:@" (32-bit)"];
+    } else {
+        return app.localizedName;
+    }
+}
+
 #pragma mark - User Defaults
 
 #define UD [NSUserDefaults standardUserDefaults]
 #define UDMenuTitle @"MenuTitle"
 #define UDIconSmall @"IconSmall"
 #define UDOrder @"Order"
 #define UDShowNumberOfWindows @"ShowNumberOfWindows"
+#define UDShow32BitOnly @"Show32BitOnly"
 
 - (void)loadUserDefaults {
     self.iMenuTitle = [UD integerForKey:UDMenuTitle];
     self.iIconSmall = [UD integerForKey:UDIconSmall];
     self.iOrder = [UD integerForKey:UDOrder];
     self.iShowNumberOfWindows = [UD integerForKey:UDShowNumberOfWindows];
+    self.iShow32BitOnly = [UD integerForKey:UDShowNumberOfWindows];
 }
 
 - (void)saveUserDefaults {
     [UD setInteger:self.iMenuTitle forKey:UDMenuTitle];
     [UD setInteger:self.iIconSmall forKey:UDIconSmall];
     [UD setInteger:self.iOrder forKey:UDOrder];
     [UD setInteger:self.iShowNumberOfWindows forKey:UDShowNumberOfWindows];
+    [UD setInteger:self.iShow32BitOnly forKey:UDShow32BitOnly];
 }
 
 - (void)recheckMenuItems {
@@ -553,6 +578,7 @@ - (void)recheckMenuItems {
     self.miOrderLaunchTime.state   = self.iOrder == 1 ? NSOnState : NSOffState;
 
     self.miShowNumberOfWindows.state  = self.iShowNumberOfWindows > 0 ? NSOnState : NSOffState;
+    self.miShow32BitOnly.state  = self.iShow32BitOnly > 0 ? NSOnState : NSOffState;
 }
 
 
@@ -594,6 +620,15 @@ - (IBAction)setShowNumberOfWindows:(NSMenuItem *)sender {
     [self saveUserDefaults];
 }
 
+- (IBAction)setShow32BitOnly:(NSMenuItem *)sender {
+    self.iShow32BitOnly = sender.state == NSOnState ? 0 : 1;
+    
+    [self changeMenuTitle];
+    [self recheckMenuItems];
+    [self createSubmenuOfSwitchMenu];
+    [self saveUserDefaults];
+}
+
 
 - (IBAction)actionHideApp:(id)sender {
     for (NSRunningApplication *app in self.apps) {

SwitchMenu/Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -32,6 +32,7 @@
                 <outlet property="miOrderAppName" destination="knp-7g-65a" id="vMb-k8-gzK"/>
                 <outlet property="miOrderLaunchTime" destination="xes-we-Zde" id="pYL-nE-UQq"/>
                 <outlet property="miQuitApp" destination="UY7-mP-BSk" id="tjq-ph-oPn"/>
+                <outlet property="miShow32BitOnly" destination="l9s-PZ-kzX" id="mDk-zS-Nbq"/>
                 <outlet property="miShowAll" destination="0pC-wN-3TZ" id="Lw1-JK-rfa"/>
                 <outlet property="miShowNumberOfWindows" destination="6So-3B-tbA" id="MSX-ep-PR9"/>
                 <outlet property="switchMenu" destination="yLx-0K-94h" id="RUF-J0-XcN"/>
@@ -687,12 +688,13 @@
                     </menu>
                 </menuItem>
             </items>
+            <point key="canvasLocation" x="139" y="154"/>
         </menu>
         <window title="SwitchMenu" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <view key="contentView" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -826,6 +828,12 @@
                                     <action selector="setShowNumberOfWindows:" target="Voe-Tx-rLC" id="VXa-wa-I7u"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Show If the App Supports 32-bit Only" id="l9s-PZ-kzX">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="setShow32BitOnly:" target="Voe-Tx-rLC" id="kAb-gu-dQo"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="lQM-iE-qGD"/>
                             <menuItem title="Open SwitchMenu Items Folder" id="hbg-Rb-mfS">
                                 <modifierMask key="keyEquivalentModifierMask"/>
@@ -847,7 +855,7 @@
             <connections>
                 <outlet property="delegate" destination="-2" id="Db0-MA-GtS"/>
             </connections>
-            <point key="canvasLocation" x="370" y="642"/>
+            <point key="canvasLocation" x="250" y="502"/>
         </menu>
         <userDefaultsController representsSharedInstance="YES" id="9su-vE-kwj"/>
     </objects>