implement menu

clowwindy · clowwindy · commit 4352871318b8 · 2014-11-03T23:21:46.000+08:00
diff --git a/ShadowWeb/zh-Hans.lproj/Localizable.strings b/ShadowWeb/zh-Hans.lproj/Localizable.strings
@@ -47,6 +47,8 @@
 "Turn Shadowsocks Off" = "关闭 Shadowsocks";
 "Auto Proxy Mode" = "自动代理模式";
 "Global Mode" = "全局模式";
+"Public Server" = "公共服务器";
+"Servers" = "服务器";
 "Open Server Preferences..." = "打开服务器设定...";
 "Please fill in the blanks." = "请填写以下内容。";
 "Show Logs..." = "显示日志...";
diff --git a/ShadowsocksX/ProfileManager.m b/ShadowsocksX/ProfileManager.m
@@ -32,19 +32,22 @@ + (Configuration *)configuration {
 
 + (void)saveConfiguration:(Configuration *)configuration {
     [[NSUserDefaults standardUserDefaults] setObject:[configuration JSONData] forKey:CONFIG_DATA_KEY];
+    [ProfileManager reloadShadowsocksRunner];
 }
 
 + (void)reloadShadowsocksRunner {
     Configuration *configuration = [ProfileManager configuration];
     if (configuration.current == -1) {
         [ShadowsocksRunner setUsingPublicServer:YES];
+        [ShadowsocksRunner reloadConfig];
     } else {
         Profile *profile = configuration.profiles[configuration.current];
         [ShadowsocksRunner setUsingPublicServer:NO];
         [ShadowsocksRunner saveConfigForKey:kShadowsocksIPKey value:profile.server];
         [ShadowsocksRunner saveConfigForKey:kShadowsocksPortKey value:[NSString stringWithFormat:@"%ld", (long)profile.serverPort]];
         [ShadowsocksRunner saveConfigForKey:kShadowsocksPasswordKey value:profile.password];
         [ShadowsocksRunner saveConfigForKey:kShadowsocksEncryptionKey value:profile.method];
+        [ShadowsocksRunner reloadConfig];
     }
 }
 
diff --git a/ShadowsocksX/SWBAppDelegate.m b/ShadowsocksX/SWBAppDelegate.m
@@ -12,6 +12,7 @@
 #import "SWBAppDelegate.h"
 #import "GCDWebServer.h"
 #import "ShadowsocksRunner.h"
+#import "ProfileManager.h"
 
 #define kShadowsocksIsRunningKey @"ShadowsocksIsRunning"
 #define kShadowsocksRunningModeKey @"ShadowsocksMode"
@@ -26,6 +27,7 @@ @implementation SWBAppDelegate {
     NSMenuItem *autoMenuItem;
     NSMenuItem *globalMenuItem;
     NSMenuItem *qrCodeMenuItem;
+    NSMenu *serversMenu;
     BOOL isRunning;
     NSString *runningMode;
     NSData *originalPACData;
@@ -79,7 +81,14 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     [menu addItem:globalMenuItem];
     
     [menu addItem:[NSMenuItem separatorItem]];
-    [menu addItemWithTitle:_L(Open Server Preferences...) action:@selector(showConfigWindow) keyEquivalent:@""];
+
+    serversMenu = [[NSMenu alloc] init];
+    NSMenuItem *serversItem = [[NSMenuItem alloc] init];
+    [serversItem setTitle:@"Servers"];
+    [serversItem setSubmenu:serversMenu];
+    [menu addItem:serversItem];
+
+    [menu addItem:[NSMenuItem separatorItem]];
     [menu addItemWithTitle:_L(Edit PAC for Auto Proxy Mode...) action:@selector(editPAC) keyEquivalent:@""];
     qrCodeMenuItem = [[NSMenuItem alloc] initWithTitle:_L(Show QR Code...) action:@selector(showQRCode) keyEquivalent:@""];
     [menu addItem:qrCodeMenuItem];
@@ -122,6 +131,39 @@ - (void)enableGlobal {
     [self reloadSystemProxy];
 }
 
+- (void)chooseServer:(id)sender {
+    NSInteger tag = [sender tag];
+    Configuration *configuration = [ProfileManager configuration];
+    if (tag == -1 || tag < configuration.profiles.count) {
+        configuration.current = tag;
+    }
+    [ProfileManager saveConfiguration:configuration];
+    [self updateServersMenu];
+}
+
+- (void)updateServersMenu {
+    Configuration *configuration = [ProfileManager configuration];
+    [serversMenu removeAllItems];
+    int i = 0;
+    NSMenuItem *publicItem = [[NSMenuItem alloc] initWithTitle:_L(Public Server) action:@selector(chooseServer:) keyEquivalent:@""];
+    publicItem.tag = -1;
+    if (-1 == configuration.current) {
+        [publicItem setState:1];
+    }
+    [serversMenu addItem:publicItem];
+    for (Profile *profile in configuration.profiles) {
+        NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:profile.server action:@selector(chooseServer:) keyEquivalent:@""];
+        item.tag = i;
+        if (i == configuration.current) {
+            [item setState:1];
+        }
+        [serversMenu addItem:item];
+        i++;
+    }
+    [serversMenu addItem:[NSMenuItem separatorItem]];
+    [serversMenu addItemWithTitle:_L(Open Server Preferences...) action:@selector(showConfigWindow) keyEquivalent:@""];
+}
+
 - (void)updateMenu {
     if (isRunning) {
         statusMenuItem.title = _L(Shadowsocks: On);
@@ -151,7 +193,7 @@ - (void)updateMenu {
         [qrCodeMenuItem setTarget:self];
         [qrCodeMenuItem setAction:@selector(showQRCode)];
     }
-
+    [self updateServersMenu];
 }
 
 void onPACChange(
