..

app/SH3/MacGap/AppDelegate.m

@@ -14,6 +14,7 @@
 - (void)applicationWillFinishLaunching:(NSNotification *)aNotification
 {
     // Insert code here to initialize your application
+
 }
 
 -(BOOL)applicationShouldHandleReopen:(NSApplication*)application

app/SH3/MacGap/Classes/Commands/Dock.h

@@ -14,6 +14,8 @@
 @property (readonly) NSString* badge;
 - (void) addBadge: (NSString*) badge;
 - (void) removeBadge;
+- (void) hideIcon;
+- (void) showIcon;
 @end
 
 @interface Dock : Command <DockExports>

app/SH3/MacGap/Classes/Commands/Dock.m

@@ -12,22 +12,27 @@
 @implementation Dock
 
 
-- (JSValue*) badge
-{
+- (JSValue *)badge {
     NSDockTile *tile = [[NSApplication sharedApplication] dockTile];
-    return [JSValue valueWithObject:[tile badgeLabel] inContext: JSContext.currentContext];
+    return [JSValue valueWithObject:[tile badgeLabel] inContext:JSContext.currentContext];
 }
 
-- (void) addBadge: (NSString*) badge
-{
+- (void)addBadge:(NSString *)badge {
     NSDockTile *tile = [[NSApplication sharedApplication] dockTile];
     [tile setBadgeLabel:badge];
 }
 
-- (void) removeBadge
-{
+- (void)removeBadge {
     NSDockTile *tile = [[NSApplication sharedApplication] dockTile];
     [tile setBadgeLabel:nil];
 }
 
+- (void)hideIcon {
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
+}
+
+- (void)showIcon {
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+}
+
 @end

app/SH3/MacGap/Classes/Commands/Menu.m

@@ -12,165 +12,153 @@
 static char REPRESENTED_OBJECT;
 
 @interface NSMenu (represented)
-@property (strong) id representedObject;
+@property(strong) id representedObject;
 @end
 
 @implementation NSMenu (represented)
 
-- (id) representedObject
-{
+- (id)representedObject {
     return objc_getAssociatedObject(self, &REPRESENTED_OBJECT);
 }
 
-- (void) setRepresentedObject:(id)representedObject
-{
+- (void)setRepresentedObject:(id)representedObject {
     objc_setAssociatedObject(self,
-                             &REPRESENTED_OBJECT,
-                             representedObject,
-                             OBJC_ASSOCIATION_RETAIN);
+            &REPRESENTED_OBJECT,
+            representedObject,
+            OBJC_ASSOCIATION_RETAIN);
 }
 
 @end
 
 @interface Menu ()
-    @property (readwrite) NSString* type;
-    @property (readwrite) NSArray* menuItems;
+@property(readwrite) NSString *type;
+@property(readwrite) NSArray *menuItems;
 @end;
 
 @implementation Menu
 
 @synthesize menu;
 
-+ (Menu*) menuWithContext: (JSContext*) context andMenu: (NSMenu*) aMenu
-{
++ (Menu *)menuWithContext:(JSContext *)context andMenu:(NSMenu *)aMenu {
     Menu *ret = [aMenu representedObject];
-    if (ret)
-    {
+    if (ret) {
         NSLog(@"MP cache hit");
         return ret;
     }
     return [[Menu alloc] initWithMenu:aMenu forContext:context];
 }
 
-- (Menu*) initWithMenu: (NSMenu*) aMenu forContext: (JSContext*) context{
-    
-    return [self initWithMenu: aMenu andType: nil forContext:context];
+- (Menu *)initWithMenu:(NSMenu *)aMenu forContext:(JSContext *)context {
+
+    return [self initWithMenu:aMenu andType:nil forContext:context];
 }
 
-- (Menu*) initWithMenu: (NSMenu*) aMenu andType: (NSString*) type forContext: (JSContext*) aContext{
-    self = [super initWithContext: aContext];
+- (Menu *)initWithMenu:(NSMenu *)aMenu andType:(NSString *)type forContext:(JSContext *)aContext {
+    self = [super initWithContext:aContext];
     if (self) {
-        
+
         menu = aMenu;
         menu.representedObject = self;
         self.type = type;
-        NSArray* items = aMenu.itemArray;
-        NSMutableArray* itemsArr = nil;
-        if(items)
-        {
-            itemsArr = [NSMutableArray arrayWithCapacity: items.count];
-            for( NSMenuItem* item in items) {
-                [itemsArr addObject: [MenuItem menuItemWithContext:aContext andMenu:item] ];
+        NSArray *items = aMenu.itemArray;
+        NSMutableArray *itemsArr = nil;
+        if (items) {
+            itemsArr = [NSMutableArray arrayWithCapacity:items.count];
+            for (NSMenuItem *item in items) {
+                [itemsArr addObject:[MenuItem menuItemWithContext:aContext andMenu:item]];
             }
-            
+
         }
         self.menuItems = itemsArr;
         self.context = aContext;
-        
+
     }
     return self;
 }
 
-- (JSValue*) create: (NSString*) title type: (NSString*) type
-{
-    NSMenu* newMenu = [[NSMenu alloc] initWithTitle:title];
-    Menu* theMenu = [[Menu alloc] initWithMenu:newMenu forContext: [JSContext currentContext]];
+- (JSValue *)create:(NSString *)title type:(NSString *)type {
+    NSMenu *newMenu = [[NSMenu alloc] initWithTitle:title];
+    Menu *theMenu = [[Menu alloc] initWithMenu:newMenu forContext:[JSContext currentContext]];
     theMenu.type = type;
-    
+
     return [JSValue valueWithObject:theMenu inContext:[JSContext currentContext]];
 }
 
-- (JSValue*) addItem: (NSDictionary*) props callback: (JSValue*) aCallback
-{
+- (JSValue *)addItem:(NSDictionary *)props callback:(JSValue *)aCallback {
 
-    NSString* title = [props valueForKey: @"label"];
-    NSString* cmds = [props valueForKey: @"keys"];
-    NSNumber* index = [props valueForKey: @"index"];
-    NSNumber* on = [props valueForKey: @"on"];
+    NSString *title = [props valueForKey:@"label"];
+    NSString *cmds = [props valueForKey:@"keys"];
+    NSNumber *index = [props valueForKey:@"index"];
+    NSNumber *on = [props valueForKey:@"on"];
 //    bool on = [props valueForKey: @"on"];
     NSString *key = nil;
     NSMenuItem *item = nil;
 
-    if (title == nil || [title isKindOfClass: [NSNull class]])
+    if (title == nil || [title isKindOfClass:[NSNull class]])
         title = @"";
-    
-    if (cmds != nil && ![cmds isKindOfClass: [NSNull class]]) {
+
+    if (cmds != nil && ![cmds isKindOfClass:[NSNull class]]) {
         key = [Menu getKeyFromString:cmds];
     } else {
         key = @"";
     }
-   
-    if(index != nil && ![index isKindOfClass:[NSNull class]]) {
-        item = [menu insertItemWithTitle:title action:nil keyEquivalent:key atIndex:[index integerValue] ];
+
+    if (index != nil && ![index isKindOfClass:[NSNull class]]) {
+        item = [menu insertItemWithTitle:title action:nil keyEquivalent:key atIndex:[index integerValue]];
     } else {
-        item = [menu addItemWithTitle:title action:nil keyEquivalent:key ];
-        
+        item = [menu addItemWithTitle:title action:nil keyEquivalent:key];
+
     }
 //    NSLog(@"%@,%@",title, on);
     if ([on intValue] == 1) {
         [item setState:NSOnState];
     }
-    
+
     NSUInteger modifiers = [Menu getModifiersFromString:cmds];
     [item setKeyEquivalentModifierMask:modifiers];
-    
-    if(!menu.supermenu && ![_type isEqualToString:@"statusbar"]) {
-        NSMenu *s = [[NSMenu alloc] initWithTitle: title];
-        
+
+    if (!menu.supermenu && ![_type isEqualToString:@"statusbar"]) {
+        NSMenu *s = [[NSMenu alloc] initWithTitle:title];
+
         [item setSubmenu:s];
     }
-    
-    MenuItem* menuItem = [MenuItem menuItemWithContext:self.context andMenu:item];
 
-    if(aCallback != nil && ![aCallback isKindOfClass: [NSNull class]]) {
-    
+    MenuItem *menuItem = [MenuItem menuItemWithContext:self.context andMenu:item];
+
+    if (aCallback != nil && ![aCallback isKindOfClass:[NSNull class]]) {
+
         [menuItem setCallback:aCallback];
-    
+
     }
 
-    [menu setAutoenablesItems:NO]; 
-    
-    return [JSValue valueWithObject:menuItem inContext:self.context ];
-    
+    [menu setAutoenablesItems:NO];
+
+    return [JSValue valueWithObject:menuItem inContext:self.context];
+
 }
 
-- (JSValue*) addSeparator
-{
+- (JSValue *)addSeparator {
     NSMenuItem *sep = [NSMenuItem separatorItem];
     [self.menu addItem:sep];
-    return [JSValue valueWithObject: self inContext:JSContext.currentContext];
+    return [JSValue valueWithObject:self inContext:JSContext.currentContext];
 
 }
 
-- (JSValue*)itemForKey:(id)key
-{
-    if (!key || [key isKindOfClass: [NSNull class]])
+- (JSValue *)itemForKey:(id)key {
+    if (!key || [key isKindOfClass:[NSNull class]])
         return nil;
-    
+
     NSMenuItem *item = nil;
-    if ([key isKindOfClass:[NSNumber class]])
-    {
-        if([key intValue] >= [[menu itemArray] count]) {
+    if ([key isKindOfClass:[NSNumber class]]) {
+        if ([key intValue] >= [[menu itemArray] count]) {
             return nil;
         }
-        
+
         item = [menu itemAtIndex:[key intValue]];
     }
-    else if ([key isKindOfClass:[NSString class]])
-    {
+    else if ([key isKindOfClass:[NSString class]]) {
         item = [menu itemWithTitle:key];
-        if (!item)
-        {
+        if (!item) {
             // Try again, with ... appended. e.g. "Save..."
             item = [menu itemWithTitle:
                     [key stringByAppendingString:@"\u2026"]];
@@ -178,59 +166,55 @@ static char REPRESENTED_OBJECT;
     }
     if (!item)
         return nil;
-    
+
     MenuItem *mi = [MenuItem menuItemWithContext:self.context andMenu:item]; //[[MenuItem alloc] initWithContext:[JSContext currentContext] andMenuItem:item];
-    
-    return [JSValue valueWithObject: mi inContext: self.context];
+
+    return [JSValue valueWithObject:mi inContext:self.context];
 }
 
 
-+ (NSString*)getKeyFromString:(NSString*)keyCommand {
-    if (keyCommand == nil || [keyCommand isKindOfClass: [NSNull class]])
++ (NSString *)getKeyFromString:(NSString *)keyCommand {
+    if (keyCommand == nil || [keyCommand isKindOfClass:[NSNull class]])
         keyCommand = @"";
-   
+
     // Obtain the key (if there are modifiers, it will be the last character).
     NSString *aKey = @"";
     if ([keyCommand length] > 0) {
         aKey = [keyCommand substringFromIndex:[keyCommand length] - 1];
     }
-    
+
     return aKey;
 }
 
-+ (NSUInteger)getModifiersFromString:(NSString*)keyCommand {
-  if (keyCommand == nil || [keyCommand isKindOfClass: [NSNull class]])
-      return 0;
++ (NSUInteger)getModifiersFromString:(NSString *)keyCommand {
+    if (keyCommand == nil || [keyCommand isKindOfClass:[NSNull class]])
+        return 0;
     // aKeys may optionally specify one or more modifiers.
     NSUInteger modifiers = 0;
-    
+
     if ([keyCommand rangeOfString:@"caps"].location != NSNotFound) modifiers += NSAlphaShiftKeyMask;
     if ([keyCommand rangeOfString:@"shift"].location != NSNotFound) modifiers += NSShiftKeyMask;
     if ([keyCommand rangeOfString:@"cmd"].location != NSNotFound) modifiers += NSCommandKeyMask;
     if ([keyCommand rangeOfString:@"ctrl"].location != NSNotFound) modifiers += NSControlKeyMask;
     if ([keyCommand rangeOfString:@"opt"].location != NSNotFound) modifiers += NSAlternateKeyMask;
     if ([keyCommand rangeOfString:@"alt"].location != NSNotFound) modifiers += NSAlternateKeyMask;
-    
+
     return modifiers;
 }
 
-- (NSMenu*)removeItem:(id)key
-{
-    if(key == nil || [key isKindOfClass: [NSNull class]]) {
+- (NSMenu *)removeItem:(id)key {
+    if (key == nil || [key isKindOfClass:[NSNull class]]) {
         return nil;
     }
-    
+
     NSMenuItem *item = nil;
-   
-    if ([key isKindOfClass:[NSNumber class]])
-    {
+
+    if ([key isKindOfClass:[NSNumber class]]) {
         item = [menu itemAtIndex:[key intValue]];
     }
-    else if ([key isKindOfClass:[NSString class]])
-    {
+    else if ([key isKindOfClass:[NSString class]]) {
         item = [menu itemWithTitle:key];
-        if (!item)
-        {
+        if (!item) {
             // Try again, with ... appended. e.g. "Save..."
             item = [menu itemWithTitle:
                     [key stringByAppendingString:@"\u2026"]];
@@ -238,13 +222,12 @@ static char REPRESENTED_OBJECT;
     }
     if (!item)
         return nil;
-    
+
     [menu removeItem:item];
     return menu;
 }
 
-- (void) dealloc
-{
+- (void)dealloc {
     NSLog(@"Menu Deallocated");
     menu.representedObject = nil;
 }

app/SH3/MacGap/SwitchHosts!-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2700</string>
+	<string>2712</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

app/src/lang.js

@@ -28,6 +28,9 @@ var languages = {
         , where_remote: 'remote'
         , url: 'URL'
         , bad_url: 'URL is not valid.'
+        , hide_dock_icon: 'Hide Dock Icon'
+        , show_dock_icon: 'Show Dock Icon'
+        , toggle_dock_icon: 'Toggle Dock Icon'
     },
     'cn': {
         add: '添加'
@@ -51,6 +54,9 @@ var languages = {
         , where_remote: '远程'
         , url: 'URL 地址'
         , bad_url: 'URL 地址有误。'
+        , hide_dock_icon: '隐藏 Dock 图标'
+        , show_dock_icon: '显示 Dock 图标'
+        , toggle_dock_icon: '显示/隐藏 Dock 图标'
     }
 };
 

app/src/menu.js

@@ -6,6 +6,19 @@
 'use strict';
 
 var config = require('./config');
+var lang = require('./lang').getLang(navigator.language);
+
+var is_dock_icon_show = true;
+
+function toggleDockIcon() {
+    if (is_dock_icon_show) {
+        MacGap.Dock.hideIcon();
+    } else {
+        MacGap.Dock.showIcon();
+        MacGap.activate();
+    }
+    is_dock_icon_show = !is_dock_icon_show;
+}
 
 function initTray(app) {
     var tray = {};
@@ -45,10 +58,19 @@ function initTray(app) {
         });
 
         menu.addSeparator();
+        var idx = (hosts && hosts.list ? hosts.list.length : 0) + 3;
+        menu.addItem({
+            label: lang.toggle_dock_icon,
+            keys: '',
+            index: idx++
+        }, function () {
+            toggleDockIcon();
+        });
+
         menu.addItem({
             label: 'Quit',
             keys: 'cmd+q',
-            index: (hosts && hosts.list ? hosts.list.length : 0) + 3
+            index: idx++
         }, function () {
             MacGap.terminate();
         });