@@ -329,13 +329,13 @@ namespace Shadowsocks.Controller | |||||
} | } | ||||
} | } | ||||
public string GetQRCodeForCurrentServer() | |||||
public string GetServerURLForCurrentServer() | |||||
{ | { | ||||
Server server = GetCurrentServer(); | Server server = GetCurrentServer(); | ||||
return GetQRCode(server); | |||||
return GetServerURL(server); | |||||
} | } | ||||
public static string GetQRCode(Server server) | |||||
public static string GetServerURL(Server server) | |||||
{ | { | ||||
string tag = string.Empty; | string tag = string.Empty; | ||||
string url = string.Empty; | string url = string.Empty; | ||||
@@ -659,7 +659,7 @@ namespace Shadowsocks.View | |||||
private void QRCodeItem_Click(object sender, EventArgs e) | private void QRCodeItem_Click(object sender, EventArgs e) | ||||
{ | { | ||||
QRCodeForm qrCodeForm = new QRCodeForm(controller.GetQRCodeForCurrentServer()); | |||||
QRCodeForm qrCodeForm = new QRCodeForm(controller.GetServerURLForCurrentServer()); | |||||
//qrCodeForm.Icon = this.Icon; | //qrCodeForm.Icon = this.Icon; | ||||
// TODO | // TODO | ||||
qrCodeForm.Show(); | qrCodeForm.Show(); | ||||
@@ -67,7 +67,7 @@ namespace Shadowsocks.View | |||||
var servers = Configuration.Load(); | var servers = Configuration.Load(); | ||||
var serverDatas = servers.configs.Select( | var serverDatas = servers.configs.Select( | ||||
server => | server => | ||||
new KeyValuePair<string, string>(ShadowsocksController.GetQRCode(server), server.FriendlyName()) | |||||
new KeyValuePair<string, string>(ShadowsocksController.GetServerURL(server), server.FriendlyName()) | |||||
).ToList(); | ).ToList(); | ||||
listBox1.DataSource = serverDatas; | listBox1.DataSource = serverDatas; | ||||
@@ -436,7 +436,7 @@ namespace test | |||||
string expected = testCase.Key; | string expected = testCase.Key; | ||||
Server config = testCase.Value; | Server config = testCase.Value; | ||||
var actual = ShadowsocksController.GetQRCode(config); | |||||
var actual = ShadowsocksController.GetServerURL(config); | |||||
Assert.AreEqual(expected, actual); | Assert.AreEqual(expected, actual); | ||||
} | } | ||||
} | } | ||||