bozhihouc/clashN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clear

Browse Source
This commit is contained in:
2dust
2022-04-18 14:41:37 +08:00
parent 555e8445fc
commit ca7b650e3b
3 changed files with 30 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
clashN/clashN/Forms/MainForm.Designer.cs generated
View File

@@ -52,8 +52,8 @@
this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.menuClearProfileStatistics = new System.Windows.Forms.ToolStripMenuItem();
this.tsbProfile = new System.Windows.Forms.ToolStripDropDownButton();
this.qrCodeControl = new clashN.Forms.QRCodeControl();
this.tsbProfile = new System.Windows.Forms.ToolStripDropDownButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.mainMsgControl = new clashN.Forms.MainMsgControl();
@@ -65,9 +65,7 @@
this.menuKeepNothing = new System.Windows.Forms.ToolStripMenuItem();
this.menuRoutings = new System.Windows.Forms.ToolStripMenuItem();
this.menuProfiles = new System.Windows.Forms.ToolStripMenuItem();
this.menuProfiles2 = new System.Windows.Forms.ToolStripComboBox();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.menuAddProfiles2 = new System.Windows.Forms.ToolStripMenuItem();
this.menuScanScreen2 = new System.Windows.Forms.ToolStripMenuItem();
this.menuUpdateSubscriptions = new System.Windows.Forms.ToolStripMenuItem();
this.menuUpdateSubViaProxy = new System.Windows.Forms.ToolStripMenuItem();
@@ -286,6 +284,11 @@
resources.ApplyResources(this.menuClearProfileStatistics, "menuClearProfileStatistics");
this.menuClearProfileStatistics.Click += new System.EventHandler(this.menuClearStatistic_Click);
//
// qrCodeControl
//
resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
this.qrCodeControl.Name = "qrCodeControl";
//
// tsbProfile
//
this.tsbProfile.DropDown = this.cmsLv;
@@ -293,11 +296,6 @@
resources.ApplyResources(this.tsbProfile, "tsbProfile");
this.tsbProfile.Name = "tsbProfile";
//
// qrCodeControl
//
resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
this.qrCodeControl.Name = "qrCodeControl";
//
// splitContainer1
//
resources.ApplyResources(this.splitContainer1, "splitContainer1");
@@ -337,9 +335,7 @@
this.menuSysAgentMode,
this.menuRoutings,
this.menuProfiles,
this.menuProfiles2,
this.toolStripSeparator13,
this.menuAddProfiles2,
this.menuScanScreen2,
this.menuUpdateSubscriptions,
this.menuUpdateSubViaProxy,
@@ -387,25 +383,11 @@
this.menuProfiles.Name = "menuProfiles";
resources.ApplyResources(this.menuProfiles, "menuProfiles");
//
// menuProfiles2
//
this.menuProfiles2.BackColor = System.Drawing.SystemColors.Window;
this.menuProfiles2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.menuProfiles2.DropDownWidth = 500;
resources.ApplyResources(this.menuProfiles2, "menuProfiles2");
this.menuProfiles2.Name = "menuProfiles2";
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
//
// menuAddProfiles2
//
this.menuAddProfiles2.Name = "menuAddProfiles2";
resources.ApplyResources(this.menuAddProfiles2, "menuAddProfiles2");
this.menuAddProfiles2.Click += new System.EventHandler(this.menuAddProfiles_Click);
//
// menuScanScreen2
//
this.menuScanScreen2.Name = "menuScanScreen2";
@@ -713,7 +695,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
private System.Windows.Forms.ToolStripDropDownButton tsbHelp;
private System.Windows.Forms.ToolStripMenuItem tsbAbout;
private System.Windows.Forms.ToolStripMenuItem menuAddProfiles2;
private System.Windows.Forms.ToolStripMenuItem menuScanScreen;
private System.Windows.Forms.ToolStripMenuItem menuScanScreen2;
private System.Windows.Forms.ToolStripDropDownButton tsbSub;
@@ -739,7 +720,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateGeo;
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.ToolStripComboBox menuProfiles2;
private System.Windows.Forms.ToolStripMenuItem menuUpdateSubViaProxy;
private System.Windows.Forms.ToolStripMenuItem tsbGlobalHotkeySetting;
private System.Windows.Forms.ToolStripMenuItem tsbSubUpdate;

31
clashN/clashN/Forms/MainForm.cs
View File

@@ -330,31 +330,7 @@ namespace clashN.Forms
private void RefreshProfilesMenu()
{
menuProfiles.DropDownItems.Clear();
menuProfiles2.SelectedIndexChanged -= MenuProfiles2_SelectedIndexChanged;
menuProfiles2.Items.Clear();
menuProfiles.Visible = false;
menuProfiles2.Visible = false;
if (lstProfile.Count > 20)
{
for (int k = 0; k < lstProfile.Count; k++)
{
ProfileItem item = lstProfile[k];
string name = item.GetSummary();
if (config.IsActiveNode(item))
{
name = $"√ {name}";
}
menuProfiles2.Items.Add(name);
}
menuProfiles2.SelectedIndex = lstProfile.FindIndex(it => it.indexId == config.indexId);
menuProfiles2.SelectedIndexChanged += MenuProfiles2_SelectedIndexChanged;
menuProfiles2.Visible = true;
}
else
{
List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
for (int k = 0; k < lstProfile.Count; k++)
{
@@ -373,13 +349,6 @@ namespace clashN.Forms
lst.Add(ts);
}
menuProfiles.DropDownItems.AddRange(lst.ToArray());
menuProfiles.Visible = true;
}
}
private void MenuProfiles2_SelectedIndexChanged(object sender, EventArgs e)
{
SetDefaultProfile(((ToolStripComboBox)sender).SelectedIndex);
}
private void ts_Click(object sender, EventArgs e)

52
clashN/clashN/Forms/MainForm.resx
View File

@@ -445,13 +445,13 @@
<value>Do not change system proxy</value>
</data>
<data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
<value>277, 22</value>
</data>
<data name="menuSysAgentMode.Text" xml:space="preserve">
<value>System proxy</value>
</data>
<data name="menuRoutings.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
<value>277, 22</value>
</data>
<data name="menuRoutings.Text" xml:space="preserve">
<value>Routing</value>
@@ -460,61 +460,43 @@
<value>False</value>
</data>
<data name="menuProfiles.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
<value>277, 22</value>
</data>
<data name="menuProfiles.Text" xml:space="preserve">
<value>Profile</value>
</data>
<data name="menuProfiles2.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Standard</value>
</data>
<data name="menuProfiles2.MaxDropDownItems" type="System.Int32, mscorlib">
<value>50</value>
</data>
<data name="menuProfiles2.Size" type="System.Drawing.Size, System.Drawing">
<value>200, 25</value>
</data>
<data name="menuProfiles2.ToolTipText" xml:space="preserve">
<value>Profile</value>
</data>
<data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
<value>291, 6</value>
</data>
<data name="menuAddProfiles2.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
</data>
<data name="menuAddProfiles2.Text" xml:space="preserve">
<value>Add configuration file from clipboard</value>
<value>274, 6</value>
</data>
<data name="menuScanScreen2.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
<value>277, 22</value>
</data>
<data name="menuScanScreen2.Text" xml:space="preserve">
<value>Scan QR code on the screen</value>
</data>
<data name="menuUpdateSubscriptions.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
<value>277, 22</value>
</data>
<data name="menuUpdateSubscriptions.Text" xml:space="preserve">
<value>Update subscription without proxy</value>
</data>
<data name="menuUpdateSubViaProxy.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
<value>277, 22</value>
</data>
<data name="menuUpdateSubViaProxy.Text" xml:space="preserve">
<value>Update subscriptions via proxy</value>
</data>
<data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>291, 6</value>
<value>274, 6</value>
</data>
<data name="menuExit.Size" type="System.Drawing.Size, System.Drawing">
<value>294, 22</value>
<value>277, 22</value>
</data>
<data name="menuExit.Text" xml:space="preserve">
<value>Exit</value>
</data>
<data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>295, 221</value>
<value>278, 192</value>
</data>
<data name="&gt;&gt;cmsMain.Name" xml:space="preserve">
<value>cmsMain</value>
@@ -769,7 +751,7 @@
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>156</value>
<value>78</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>7, 17</value>
@@ -945,24 +927,12 @@
<data name="&gt;&gt;menuProfiles.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuProfiles2.Name" xml:space="preserve">
<value>menuProfiles2</value>
</data>
<data name="&gt;&gt;menuProfiles2.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripComboBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripSeparator13.Name" xml:space="preserve">
<value>toolStripSeparator13</value>
</data>
<data name="&gt;&gt;toolStripSeparator13.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuAddProfiles2.Name" xml:space="preserve">
<value>menuAddProfiles2</value>
</data>
<data name="&gt;&gt;menuAddProfiles2.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuScanScreen2.Name" xml:space="preserve">
<value>menuScanScreen2</value>
</data>