remove geo

This commit is contained in:
2dust
2022-08-04 17:05:50 +08:00
parent 96ef70592e
commit ef3fad3590
6 changed files with 2234 additions and 2191 deletions

View File

@@ -54,8 +54,8 @@
this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.menuClearProfileStatistics = new System.Windows.Forms.ToolStripMenuItem();
this.qrCodeControl = new clashN.Forms.QRCodeControl();
this.tsbProfile = new System.Windows.Forms.ToolStripDropDownButton();
this.qrCodeControl = new clashN.Forms.QRCodeControl();
this.scBig = new System.Windows.Forms.SplitContainer();
this.tabMain = new System.Windows.Forms.TabControl();
this.tpProxies = new System.Windows.Forms.TabPage();
@@ -85,7 +85,6 @@
this.tsbCurrentProxies = new System.Windows.Forms.ToolStripDropDownButton();
this.tsbProxiesReload = new System.Windows.Forms.ToolStripMenuItem();
this.tsbProxiesSpeedtest = new System.Windows.Forms.ToolStripMenuItem();
this.tsbProxiesSelectActivity = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.tsbQRCodeSwitch = new System.Windows.Forms.ToolStripButton();
this.tsbReload = new System.Windows.Forms.ToolStripButton();
@@ -138,19 +137,17 @@
//
// scServers.Panel1
//
resources.ApplyResources(this.scServers.Panel1, "scServers.Panel1");
this.scServers.Panel1.Controls.Add(this.lvProfiles);
//
// scServers.Panel2
//
resources.ApplyResources(this.scServers.Panel2, "scServers.Panel2");
this.scServers.Panel2.Controls.Add(this.qrCodeControl);
this.scServers.TabStop = false;
//
// lvProfiles
//
resources.ApplyResources(this.lvProfiles, "lvProfiles");
this.lvProfiles.ContextMenuStrip = this.cmsLv;
resources.ApplyResources(this.lvProfiles, "lvProfiles");
this.lvProfiles.FullRowSelect = true;
this.lvProfiles.GridLines = true;
this.lvProfiles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -168,7 +165,6 @@
//
// cmsLv
//
resources.ApplyResources(this.cmsLv, "cmsLv");
this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuAddProfile,
@@ -194,141 +190,142 @@
this.menuClearProfileStatistics});
this.cmsLv.Name = "cmsLv";
this.cmsLv.OwnerItem = this.tsbProfile;
resources.ApplyResources(this.cmsLv, "cmsLv");
//
// menuAddProfile
//
resources.ApplyResources(this.menuAddProfile, "menuAddProfile");
this.menuAddProfile.Name = "menuAddProfile";
resources.ApplyResources(this.menuAddProfile, "menuAddProfile");
this.menuAddProfile.Click += new System.EventHandler(this.menuAddCustomProfile_Click);
//
// menuAddProfileViaClipboard
//
resources.ApplyResources(this.menuAddProfileViaClipboard, "menuAddProfileViaClipboard");
this.menuAddProfileViaClipboard.Name = "menuAddProfileViaClipboard";
resources.ApplyResources(this.menuAddProfileViaClipboard, "menuAddProfileViaClipboard");
this.menuAddProfileViaClipboard.Click += new System.EventHandler(this.menuAddProfiles_Click);
//
// menuScanScreen
//
resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
this.menuScanScreen.Name = "menuScanScreen";
resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
this.menuScanScreen.Click += new System.EventHandler(this.menuScanScreen_Click);
//
// menuExport2Clipboard
//
resources.ApplyResources(this.menuExport2Clipboard, "menuExport2Clipboard");
this.menuExport2Clipboard.Name = "menuExport2Clipboard";
resources.ApplyResources(this.menuExport2Clipboard, "menuExport2Clipboard");
this.menuExport2Clipboard.Click += new System.EventHandler(this.menuExport2ShareUrl_Click);
//
// toolStripSeparator4
//
resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
this.toolStripSeparator4.Name = "toolStripSeparator4";
resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
//
// tsbSubUpdate
//
resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
this.tsbSubUpdate.Name = "tsbSubUpdate";
resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
this.tsbSubUpdate.Click += new System.EventHandler(this.tsbSubUpdate_Click);
//
// tsbSubUpdateSelected
//
resources.ApplyResources(this.tsbSubUpdateSelected, "tsbSubUpdateSelected");
this.tsbSubUpdateSelected.Name = "tsbSubUpdateSelected";
resources.ApplyResources(this.tsbSubUpdateSelected, "tsbSubUpdateSelected");
this.tsbSubUpdateSelected.Click += new System.EventHandler(this.tsbSubUpdateSelected_Click);
//
// tsbSubUpdateViaProxy
//
resources.ApplyResources(this.tsbSubUpdateViaProxy, "tsbSubUpdateViaProxy");
this.tsbSubUpdateViaProxy.Name = "tsbSubUpdateViaProxy";
resources.ApplyResources(this.tsbSubUpdateViaProxy, "tsbSubUpdateViaProxy");
this.tsbSubUpdateViaProxy.Click += new System.EventHandler(this.tsbSubUpdateViaProxy_Click);
//
// tsbSubUpdateViaProxySelected
//
resources.ApplyResources(this.tsbSubUpdateViaProxySelected, "tsbSubUpdateViaProxySelected");
this.tsbSubUpdateViaProxySelected.Name = "tsbSubUpdateViaProxySelected";
resources.ApplyResources(this.tsbSubUpdateViaProxySelected, "tsbSubUpdateViaProxySelected");
this.tsbSubUpdateViaProxySelected.Click += new System.EventHandler(this.tsbSubUpdateViaProxySelected_Click);
//
// toolStripSeparator1
//
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
this.toolStripSeparator1.Name = "toolStripSeparator1";
resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
//
// menuRemoveProfile
//
resources.ApplyResources(this.menuRemoveProfile, "menuRemoveProfile");
this.menuRemoveProfile.Name = "menuRemoveProfile";
resources.ApplyResources(this.menuRemoveProfile, "menuRemoveProfile");
this.menuRemoveProfile.Click += new System.EventHandler(this.menuRemoveProfile_Click);
//
// menuCopyProfile
//
resources.ApplyResources(this.menuCopyProfile, "menuCopyProfile");
this.menuCopyProfile.Name = "menuCopyProfile";
resources.ApplyResources(this.menuCopyProfile, "menuCopyProfile");
this.menuCopyProfile.Click += new System.EventHandler(this.menuCopyProfile_Click);
//
// menuSetDefaultProfile
//
resources.ApplyResources(this.menuSetDefaultProfile, "menuSetDefaultProfile");
this.menuSetDefaultProfile.Name = "menuSetDefaultProfile";
resources.ApplyResources(this.menuSetDefaultProfile, "menuSetDefaultProfile");
this.menuSetDefaultProfile.Click += new System.EventHandler(this.menuSetDefaultProfile_Click);
//
// toolStripSeparator3
//
resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
this.toolStripSeparator3.Name = "toolStripSeparator3";
resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
//
// menuMoveTop
//
resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
this.menuMoveTop.Name = "menuMoveTop";
resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click);
//
// menuMoveUp
//
resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
this.menuMoveUp.Name = "menuMoveUp";
resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click);
//
// menuMoveDown
//
resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
this.menuMoveDown.Name = "menuMoveDown";
resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click);
//
// menuMoveBottom
//
resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
this.menuMoveBottom.Name = "menuMoveBottom";
resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
//
// menuSelectAll
//
resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
this.menuSelectAll.Name = "menuSelectAll";
resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
//
// toolStripSeparator9
//
resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
this.toolStripSeparator9.Name = "toolStripSeparator9";
resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
//
// menuClearProfileStatistics
//
resources.ApplyResources(this.menuClearProfileStatistics, "menuClearProfileStatistics");
this.menuClearProfileStatistics.Name = "menuClearProfileStatistics";
resources.ApplyResources(this.menuClearProfileStatistics, "menuClearProfileStatistics");
this.menuClearProfileStatistics.Click += new System.EventHandler(this.menuClearStatistic_Click);
//
// tsbProfile
//
this.tsbProfile.DropDown = this.cmsLv;
this.tsbProfile.Image = global::clashN.Properties.Resources.server;
resources.ApplyResources(this.tsbProfile, "tsbProfile");
this.tsbProfile.Name = "tsbProfile";
//
// qrCodeControl
//
resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
this.qrCodeControl.Name = "qrCodeControl";
//
// tsbProfile
//
resources.ApplyResources(this.tsbProfile, "tsbProfile");
this.tsbProfile.DropDown = this.cmsLv;
this.tsbProfile.Image = global::clashN.Properties.Resources.server;
this.tsbProfile.Name = "tsbProfile";
//
// scBig
//
resources.ApplyResources(this.scBig, "scBig");
@@ -336,27 +333,25 @@
//
// scBig.Panel1
//
resources.ApplyResources(this.scBig.Panel1, "scBig.Panel1");
this.scBig.Panel1.Controls.Add(this.tabMain);
//
// scBig.Panel2
//
resources.ApplyResources(this.scBig.Panel2, "scBig.Panel2");
this.scBig.Panel2.Controls.Add(this.mainMsgControl);
//
// tabMain
//
resources.ApplyResources(this.tabMain, "tabMain");
this.tabMain.Controls.Add(this.tpProxies);
this.tabMain.Controls.Add(this.tpProfile);
resources.ApplyResources(this.tabMain, "tabMain");
this.tabMain.Name = "tabMain";
this.tabMain.SelectedIndex = 0;
this.tabMain.SelectedIndexChanged += new System.EventHandler(this.tabMain_SelectedIndexChanged);
//
// tpProxies
//
resources.ApplyResources(this.tpProxies, "tpProxies");
this.tpProxies.Controls.Add(this.proxiesControl);
resources.ApplyResources(this.tpProxies, "tpProxies");
this.tpProxies.Name = "tpProxies";
this.tpProxies.UseVisualStyleBackColor = true;
//
@@ -367,8 +362,8 @@
//
// tpProfile
//
resources.ApplyResources(this.tpProfile, "tpProfile");
this.tpProfile.Controls.Add(this.scServers);
resources.ApplyResources(this.tpProfile, "tpProfile");
this.tpProfile.Name = "tpProfile";
this.tpProfile.UseVisualStyleBackColor = true;
//
@@ -379,14 +374,14 @@
//
// notifyMain
//
resources.ApplyResources(this.notifyMain, "notifyMain");
this.notifyMain.ContextMenuStrip = this.cmsMain;
resources.ApplyResources(this.notifyMain, "notifyMain");
this.notifyMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyMain_MouseClick);
//
// cmsMain
//
resources.ApplyResources(this.cmsMain, "cmsMain");
this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
resources.ApplyResources(this.cmsMain, "cmsMain");
this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuSysAgentMode,
this.menuRuleMode,
@@ -404,102 +399,102 @@
//
// menuSysAgentMode
//
resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuKeepClear,
this.menuGlobal,
this.menuKeepNothing});
this.menuSysAgentMode.Name = "menuSysAgentMode";
resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
//
// menuKeepClear
//
resources.ApplyResources(this.menuKeepClear, "menuKeepClear");
this.menuKeepClear.Name = "menuKeepClear";
resources.ApplyResources(this.menuKeepClear, "menuKeepClear");
this.menuKeepClear.Click += new System.EventHandler(this.menuKeepClear_Click);
//
// menuGlobal
//
resources.ApplyResources(this.menuGlobal, "menuGlobal");
this.menuGlobal.Name = "menuGlobal";
resources.ApplyResources(this.menuGlobal, "menuGlobal");
this.menuGlobal.Click += new System.EventHandler(this.menuGlobal_Click);
//
// menuKeepNothing
//
resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
this.menuKeepNothing.Name = "menuKeepNothing";
resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
this.menuKeepNothing.Click += new System.EventHandler(this.menuKeepNothing_Click);
//
// menuRuleMode
//
resources.ApplyResources(this.menuRuleMode, "menuRuleMode");
this.menuRuleMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.menuModeRule,
this.menuModeGlobal,
this.menuModeDirect,
this.menuModeKeep});
this.menuRuleMode.Name = "menuRuleMode";
resources.ApplyResources(this.menuRuleMode, "menuRuleMode");
//
// menuModeRule
//
resources.ApplyResources(this.menuModeRule, "menuModeRule");
this.menuModeRule.Name = "menuModeRule";
resources.ApplyResources(this.menuModeRule, "menuModeRule");
this.menuModeRule.Click += new System.EventHandler(this.menuModeRule_Click);
//
// menuModeGlobal
//
resources.ApplyResources(this.menuModeGlobal, "menuModeGlobal");
this.menuModeGlobal.Name = "menuModeGlobal";
resources.ApplyResources(this.menuModeGlobal, "menuModeGlobal");
this.menuModeGlobal.Click += new System.EventHandler(this.menuModeGlobal_Click);
//
// menuModeDirect
//
resources.ApplyResources(this.menuModeDirect, "menuModeDirect");
this.menuModeDirect.Name = "menuModeDirect";
resources.ApplyResources(this.menuModeDirect, "menuModeDirect");
this.menuModeDirect.Click += new System.EventHandler(this.menuModeDirect_Click);
//
// menuModeKeep
//
resources.ApplyResources(this.menuModeKeep, "menuModeKeep");
this.menuModeKeep.Name = "menuModeKeep";
resources.ApplyResources(this.menuModeKeep, "menuModeKeep");
this.menuModeKeep.Click += new System.EventHandler(this.menuModeKeep_Click);
//
// menuProfiles
//
resources.ApplyResources(this.menuProfiles, "menuProfiles");
this.menuProfiles.Name = "menuProfiles";
resources.ApplyResources(this.menuProfiles, "menuProfiles");
//
// toolStripSeparator13
//
resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
this.toolStripSeparator13.Name = "toolStripSeparator13";
resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
//
// menuScanScreen2
//
resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
this.menuScanScreen2.Name = "menuScanScreen2";
resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
this.menuScanScreen2.Click += new System.EventHandler(this.menuScanScreen_Click);
//
// menuUpdateSubscriptions
//
resources.ApplyResources(this.menuUpdateSubscriptions, "menuUpdateSubscriptions");
this.menuUpdateSubscriptions.Name = "menuUpdateSubscriptions";
resources.ApplyResources(this.menuUpdateSubscriptions, "menuUpdateSubscriptions");
this.menuUpdateSubscriptions.Click += new System.EventHandler(this.menuUpdateSubscriptions_Click);
//
// menuUpdateSubViaProxy
//
resources.ApplyResources(this.menuUpdateSubViaProxy, "menuUpdateSubViaProxy");
this.menuUpdateSubViaProxy.Name = "menuUpdateSubViaProxy";
resources.ApplyResources(this.menuUpdateSubViaProxy, "menuUpdateSubViaProxy");
this.menuUpdateSubViaProxy.Click += new System.EventHandler(this.menuUpdateSubViaProxy_Click);
//
// toolStripSeparator2
//
resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
this.toolStripSeparator2.Name = "toolStripSeparator2";
resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
//
// menuExit
//
resources.ApplyResources(this.menuExit, "menuExit");
this.menuExit.Name = "menuExit";
resources.ApplyResources(this.menuExit, "menuExit");
this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
//
// panel1
@@ -509,7 +504,6 @@
//
// tsMain
//
resources.ApplyResources(this.tsMain, "tsMain");
this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32);
this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbCurrentProxies,
@@ -526,105 +520,98 @@
this.tsbPromotion,
this.toolStripSeparator11,
this.tsbClose});
resources.ApplyResources(this.tsMain, "tsMain");
this.tsMain.Name = "tsMain";
this.tsMain.TabStop = true;
//
// tsbCurrentProxies
//
resources.ApplyResources(this.tsbCurrentProxies, "tsbCurrentProxies");
this.tsbCurrentProxies.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbProxiesReload,
this.tsbProxiesSpeedtest,
this.tsbProxiesSelectActivity});
this.tsbProxiesSpeedtest});
this.tsbCurrentProxies.Image = global::clashN.Properties.Resources.active;
resources.ApplyResources(this.tsbCurrentProxies, "tsbCurrentProxies");
this.tsbCurrentProxies.Name = "tsbCurrentProxies";
//
// tsbProxiesReload
//
resources.ApplyResources(this.tsbProxiesReload, "tsbProxiesReload");
this.tsbProxiesReload.Name = "tsbProxiesReload";
resources.ApplyResources(this.tsbProxiesReload, "tsbProxiesReload");
this.tsbProxiesReload.Click += new System.EventHandler(this.tsbProxiesReload_Click);
//
// tsbProxiesSpeedtest
//
resources.ApplyResources(this.tsbProxiesSpeedtest, "tsbProxiesSpeedtest");
this.tsbProxiesSpeedtest.Name = "tsbProxiesSpeedtest";
resources.ApplyResources(this.tsbProxiesSpeedtest, "tsbProxiesSpeedtest");
this.tsbProxiesSpeedtest.Click += new System.EventHandler(this.tsbProxiesSpeedtest_Click);
//
// tsbProxiesSelectActivity
//
resources.ApplyResources(this.tsbProxiesSelectActivity, "tsbProxiesSelectActivity");
this.tsbProxiesSelectActivity.Name = "tsbProxiesSelectActivity";
this.tsbProxiesSelectActivity.Click += new System.EventHandler(this.tsbProxiesSelectActivity_Click);
//
// toolStripSeparator6
//
resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
this.toolStripSeparator6.Name = "toolStripSeparator6";
resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
//
// tsbQRCodeSwitch
//
resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
this.tsbQRCodeSwitch.CheckOnClick = true;
this.tsbQRCodeSwitch.ForeColor = System.Drawing.Color.Black;
this.tsbQRCodeSwitch.Image = global::clashN.Properties.Resources.share;
resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
this.tsbQRCodeSwitch.Name = "tsbQRCodeSwitch";
this.tsbQRCodeSwitch.CheckedChanged += new System.EventHandler(this.tsbQRCodeSwitch_CheckedChanged);
//
// tsbReload
//
resources.ApplyResources(this.tsbReload, "tsbReload");
this.tsbReload.Image = global::clashN.Properties.Resources.restart;
resources.ApplyResources(this.tsbReload, "tsbReload");
this.tsbReload.Name = "tsbReload";
this.tsbReload.Click += new System.EventHandler(this.tsbReload_Click);
//
// toolStripSeparator8
//
resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
this.toolStripSeparator8.Name = "toolStripSeparator8";
resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
//
// tsbSetting
//
resources.ApplyResources(this.tsbSetting, "tsbSetting");
this.tsbSetting.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbOptionSetting,
this.tsbGlobalHotkeySetting,
this.toolStripSeparator14,
this.tsbBackupGuiNConfig});
this.tsbSetting.Image = global::clashN.Properties.Resources.option;
resources.ApplyResources(this.tsbSetting, "tsbSetting");
this.tsbSetting.Name = "tsbSetting";
//
// tsbOptionSetting
//
resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
this.tsbOptionSetting.Name = "tsbOptionSetting";
resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click);
//
// tsbGlobalHotkeySetting
//
resources.ApplyResources(this.tsbGlobalHotkeySetting, "tsbGlobalHotkeySetting");
this.tsbGlobalHotkeySetting.Name = "tsbGlobalHotkeySetting";
resources.ApplyResources(this.tsbGlobalHotkeySetting, "tsbGlobalHotkeySetting");
this.tsbGlobalHotkeySetting.Click += new System.EventHandler(this.tsbGlobalHotkeySetting_Click);
//
// toolStripSeparator14
//
resources.ApplyResources(this.toolStripSeparator14, "toolStripSeparator14");
this.toolStripSeparator14.Name = "toolStripSeparator14";
resources.ApplyResources(this.toolStripSeparator14, "toolStripSeparator14");
//
// tsbBackupGuiNConfig
//
resources.ApplyResources(this.tsbBackupGuiNConfig, "tsbBackupGuiNConfig");
this.tsbBackupGuiNConfig.Name = "tsbBackupGuiNConfig";
resources.ApplyResources(this.tsbBackupGuiNConfig, "tsbBackupGuiNConfig");
this.tsbBackupGuiNConfig.Click += new System.EventHandler(this.tsbBackupGuiNConfig_Click);
//
// toolStripSeparator7
//
resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
this.toolStripSeparator7.Name = "toolStripSeparator7";
resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
//
// tsbCheckUpdate
//
resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbCheckUpdateN,
this.tsbCheckUpdateCore,
@@ -632,110 +619,111 @@
this.toolStripSeparator15,
this.tsbCheckUpdateGeo});
this.tsbCheckUpdate.Image = global::clashN.Properties.Resources.checkupdate;
resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
this.tsbCheckUpdate.Name = "tsbCheckUpdate";
//
// tsbCheckUpdateN
//
resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
this.tsbCheckUpdateN.Click += new System.EventHandler(this.tsbCheckUpdateN_Click);
//
// tsbCheckUpdateCore
//
resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
this.tsbCheckUpdateCore.Click += new System.EventHandler(this.tsbCheckUpdateCore_Click);
//
// tsbCheckUpdateMetaCore
//
resources.ApplyResources(this.tsbCheckUpdateMetaCore, "tsbCheckUpdateMetaCore");
this.tsbCheckUpdateMetaCore.Name = "tsbCheckUpdateMetaCore";
resources.ApplyResources(this.tsbCheckUpdateMetaCore, "tsbCheckUpdateMetaCore");
this.tsbCheckUpdateMetaCore.Click += new System.EventHandler(this.tsbCheckUpdateMetaCore_Click);
//
// toolStripSeparator15
//
resources.ApplyResources(this.toolStripSeparator15, "toolStripSeparator15");
this.toolStripSeparator15.Name = "toolStripSeparator15";
resources.ApplyResources(this.toolStripSeparator15, "toolStripSeparator15");
//
// tsbCheckUpdateGeo
//
resources.ApplyResources(this.tsbCheckUpdateGeo, "tsbCheckUpdateGeo");
this.tsbCheckUpdateGeo.Name = "tsbCheckUpdateGeo";
resources.ApplyResources(this.tsbCheckUpdateGeo, "tsbCheckUpdateGeo");
this.tsbCheckUpdateGeo.Click += new System.EventHandler(this.tsbCheckUpdateGeo_Click);
//
// toolStripSeparator10
//
resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
this.toolStripSeparator10.Name = "toolStripSeparator10";
resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
//
// tsbHelp
//
resources.ApplyResources(this.tsbHelp, "tsbHelp");
this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbAbout,
this.toolStripSeparator12,
this.tsbLanguageDef,
this.tsbLanguageZhHans});
this.tsbHelp.Image = global::clashN.Properties.Resources.help;
resources.ApplyResources(this.tsbHelp, "tsbHelp");
this.tsbHelp.Name = "tsbHelp";
//
// tsbAbout
//
resources.ApplyResources(this.tsbAbout, "tsbAbout");
this.tsbAbout.Name = "tsbAbout";
resources.ApplyResources(this.tsbAbout, "tsbAbout");
this.tsbAbout.Click += new System.EventHandler(this.tsbAbout_Click);
//
// toolStripSeparator12
//
resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
this.toolStripSeparator12.Name = "toolStripSeparator12";
resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
//
// tsbLanguageDef
//
resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
this.tsbLanguageDef.Name = "tsbLanguageDef";
resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
this.tsbLanguageDef.Click += new System.EventHandler(this.tsbLanguageDef_Click);
//
// tsbLanguageZhHans
//
resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
this.tsbLanguageZhHans.Click += new System.EventHandler(this.tsbLanguageZhHans_Click);
//
// tsbPromotion
//
resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
this.tsbPromotion.ForeColor = System.Drawing.Color.Black;
this.tsbPromotion.Image = global::clashN.Properties.Resources.promotion;
resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
this.tsbPromotion.Name = "tsbPromotion";
this.tsbPromotion.Click += new System.EventHandler(this.tsbPromotion_Click);
//
// toolStripSeparator11
//
resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
this.toolStripSeparator11.Name = "toolStripSeparator11";
resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
//
// tsbClose
//
resources.ApplyResources(this.tsbClose, "tsbClose");
this.tsbClose.Image = global::clashN.Properties.Resources.minimize;
resources.ApplyResources(this.tsbClose, "tsbClose");
this.tsbClose.Name = "tsbClose";
this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
//
// toolStripMenuItem1
//
resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
//
// toolStripMenuItem3
//
resources.ApplyResources(this.toolStripMenuItem3, "toolStripMenuItem3");
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
resources.ApplyResources(this.toolStripMenuItem3, "toolStripMenuItem3");
//
// toolStripMenuItem4
//
resources.ApplyResources(this.toolStripMenuItem4, "toolStripMenuItem4");
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
resources.ApplyResources(this.toolStripMenuItem4, "toolStripMenuItem4");
//
// MainForm
//
@@ -853,7 +841,6 @@
private System.Windows.Forms.ToolStripDropDownButton tsbCurrentProxies;
private System.Windows.Forms.ToolStripMenuItem tsbProxiesReload;
private System.Windows.Forms.ToolStripMenuItem tsbProxiesSpeedtest;
private System.Windows.Forms.ToolStripMenuItem tsbProxiesSelectActivity;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;

View File

@@ -1257,9 +1257,5 @@ namespace clashN.Forms
proxiesControl.ProxiesDelayTest();
}
private void tsbProxiesSelectActivity_Click(object sender, EventArgs e)
{
proxiesControl.ProxiesSelectActivity();
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,64 @@
<root>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
@@ -183,19 +243,19 @@
</data>
<data name="lvProfiles.Items" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5DAMAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNp
b249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNh
BQEAAAAhU3lzdGVtLldpbmRvd3MuRm9ybXMuTGlzdFZpZXdJdGVtBwAAAARUZXh0CkltYWdlSW5kZXgJ
QmFja0NvbG9yB0NoZWNrZWQERm9udAlGb3JlQ29sb3IXVXNlSXRlbVN0eWxlRm9yU3ViSXRlbXMBAAQA
BAQACBRTeXN0ZW0uRHJhd2luZy5Db2xvcgMAAAABE1N5c3RlbS5EcmF3aW5nLkZvbnQDAAAAFFN5c3Rl
bS5EcmF3aW5nLkNvbG9yAwAAAAECAAAABgQAAAAA/////wX7////FFN5c3RlbS5EcmF3aW5nLkNvbG9y
BAAAAARuYW1lBXZhbHVlCmtub3duQ29sb3IFc3RhdGUBAAAACQcHAwAAAAoAAAAAAAAAABgAAQAACQYA
AAAB+f////v///8KAAAAAAAAAAAaAAEAAQUGAAAAE1N5c3RlbS5EcmF3aW5nLkZvbnQEAAAABE5hbWUE
U2l6ZQVTdHlsZQRVbml0AQAEBAsYU3lzdGVtLkRyYXdpbmcuRm9udFN0eWxlAwAAABtTeXN0ZW0uRHJh
d2luZy5HcmFwaGljc1VuaXQDAAAAAwAAAAYIAAAABuWui+S9kwAAEEEF9////xhTeXN0ZW0uRHJhd2lu
Zy5Gb250U3R5bGUBAAAAB3ZhbHVlX18ACAMAAAAAAAAABfb///8bU3lzdGVtLkRyYXdpbmcuR3JhcGhp
Y3NVbml0AQAAAAd2YWx1ZV9fAAgDAAAAAwAAAAs=
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkMAwAAAFFTeXN0
ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0HAAAA
BFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJdGVtU3R5
bGVGb3JTdWJJdGVtcwEABAAEBAAIFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAAAAETU3lzdGVtLkRyYXdp
bmcuRm9udAMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAAQIAAAAGBAAAAAD/////Bfv///8UU3lz
dGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAA
CgAAAAAAAAAAGAABAAAJBgAAAAH5////+////woAAAAAAAAAABoAAQABBQYAAAATU3lzdGVtLkRyYXdp
bmcuRm9udAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5
bGUDAAAAG1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAMAAAADAAAABggAAAAG5a6L5L2TAAAQQQX3
////GFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQEAAAAHdmFsdWVfXwAIAwAAAAAAAAAF9v///xtTeXN0
ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
</value>
</data>
<data name="tpProxies.Text" xml:space="preserve">
@@ -313,14 +373,11 @@
<value>180, 22</value>
</data>
<data name="tsbProxiesSpeedtest.Text" xml:space="preserve">
<value>延迟测试</value>
<value>全部节点延迟测试</value>
</data>
<data name="tsbProxiesSelectActivity.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 22</value>
</data>
<data name="tsbProxiesSelectActivity.Text" xml:space="preserve">
<value>选择活动节点</value>
</data>
<data name="tsbQRCodeSwitch.Size" type="System.Drawing.Size, System.Drawing">
<value>52, 53</value>
</data>

View File

@@ -81,31 +81,30 @@
//
// btnClose
//
resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// tabControl1
//
resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage7);
this.tabControl1.Controls.Add(this.tabPage3);
resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
//
// tabPage1
//
resources.ApplyResources(this.tabPage1, "tabPage1");
this.tabPage1.Controls.Add(this.groupBox1);
resources.ApplyResources(this.tabPage1, "tabPage1");
this.tabPage1.Name = "tabPage1";
this.tabPage1.UseVisualStyleBackColor = true;
//
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.chkEnableIpv6);
this.groupBox1.Controls.Add(this.txtmixedPort);
this.groupBox1.Controls.Add(this.label6);
@@ -118,6 +117,7 @@
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txthttpPort);
this.groupBox1.Controls.Add(this.label2);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
@@ -165,7 +165,6 @@
//
// cmbloglevel
//
resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbloglevel.FormattingEnabled = true;
this.cmbloglevel.Items.AddRange(new object[] {
@@ -174,6 +173,7 @@
resources.GetString("cmbloglevel.Items2"),
resources.GetString("cmbloglevel.Items3"),
resources.GetString("cmbloglevel.Items4")});
resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
this.cmbloglevel.Name = "cmbloglevel";
//
// label5
@@ -193,7 +193,6 @@
//
// tabPage7
//
resources.ApplyResources(this.tabPage7, "tabPage7");
this.tabPage7.Controls.Add(this.txtautoDelayTestInterval);
this.tabPage7.Controls.Add(this.label8);
this.tabPage7.Controls.Add(this.label7);
@@ -209,6 +208,7 @@
this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore);
this.tabPage7.Controls.Add(this.chkEnableStatistics);
this.tabPage7.Controls.Add(this.chkAutoRun);
resources.ApplyResources(this.tabPage7, "tabPage7");
this.tabPage7.Name = "tabPage7";
this.tabPage7.UseVisualStyleBackColor = true;
//
@@ -229,8 +229,8 @@
//
// cmbSubConvertUrl
//
resources.ApplyResources(this.cmbSubConvertUrl, "cmbSubConvertUrl");
this.cmbSubConvertUrl.FormattingEnabled = true;
resources.ApplyResources(this.cmbSubConvertUrl, "cmbSubConvertUrl");
this.cmbSubConvertUrl.Name = "cmbSubConvertUrl";
//
// btnFontReset
@@ -300,17 +300,17 @@
//
// tabPage3
//
resources.ApplyResources(this.tabPage3, "tabPage3");
this.tabPage3.Controls.Add(this.groupBox2);
resources.ApplyResources(this.tabPage3, "tabPage3");
this.tabPage3.Name = "tabPage3";
this.tabPage3.UseVisualStyleBackColor = true;
//
// groupBox2
//
resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Controls.Add(this.label13);
this.groupBox2.Controls.Add(this.label12);
this.groupBox2.Controls.Add(this.txtsystemProxyExceptions);
resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
@@ -331,9 +331,9 @@
//
// panel2
//
resources.ApplyResources(this.panel2, "panel2");
this.panel2.Controls.Add(this.btnClose);
this.panel2.Controls.Add(this.btnOK);
resources.ApplyResources(this.panel2, "panel2");
this.panel2.Name = "panel2";
//
// btnOK

File diff suppressed because it is too large Load Diff