201902111.1 - 修正一处【简易副本攻略】新UI细节问题，优化冗余代码。

DieMoe233 · Feb 11, 2019 · 0246f0d · 0246f0d
1 parent bc07e4b
commit 0246f0d
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 32 deletions.
diff --git a/App/Api/WebApi.cs b/App/Api/WebApi.cs
@@ -5,7 +5,6 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web;
 
 namespace App
 {

diff --git a/App/Form/MainForm.Designer.cs b/App/Form/MainForm.Designer.cs
diff --git a/App/Form/MainForm.cs b/App/Form/MainForm.cs
@@ -113,14 +113,14 @@ private void MainForm_Load(object sender, EventArgs e)
                 checkBox_tracker_CNmirror.Checked = true;
             }
             trackBar_tts_speed.Value = int.Parse(Settings.TTSSpeed);
-            if (System.IO.File.Exists(Settings.SoundLocation) == false)
+            if (File.Exists(Settings.SoundLocation) == false)
             {
                 checkBox_PlaySound.Checked = false;
                 label_SoundLocation.Text = "";
             }
             else
             {
-                label_SoundLocation.Text = System.IO.Path.GetFileName(Settings.SoundLocation);
+                label_SoundLocation.Text = Path.GetFileName(Settings.SoundLocation);
             }
             if (checkBox_PlaySound.Checked == false) { button_SoundLocation.Enabled = false; }
             SetCheatRoulleteCheckBox(Settings.CheatRoulette);
@@ -655,7 +655,7 @@ private void button_SoundLocation_Click(object sender, EventArgs e)
             DialogResult result = openFileDialog1.ShowDialog();
             if (result == DialogResult.OK)
             {
-                label_SoundLocation.Text = System.IO.Path.GetFileName(openFileDialog1.FileName);
+                label_SoundLocation.Text = Path.GetFileName(openFileDialog1.FileName);
                 Settings.SoundLocation = openFileDialog1.FileName;
                 Settings.Save();
             }
@@ -839,5 +839,10 @@ private void checkBox_netFilter_CheckedChanged(object sender, EventArgs e)
             FFXIVProcess = null;
             FindFFXIVProcess();
         }
+
+        private void toolStripTextBox1_TextChanged(object sender, EventArgs e)
+        {
+            triStateTreeView_FATEs.Nodes.Find(toolStripTextBox1.Text, true);
+        }
     }
 }
diff --git a/App/Form/TipsForm.Designer.cs b/App/Form/TipsForm.Designer.cs
diff --git a/App/Form/TipsForm.cs b/App/Form/TipsForm.cs
@@ -1,10 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace App
@@ -20,13 +14,15 @@ public TipsForm(string Roullete, string Instance, string Tip, string Macro = nul
         {
             this.Roullete = Roullete;
             this.Instance = Instance;
-            this.Tip = Tip;
+            this.Tip = Tip.Replace("\r\n","\n").Replace("\n", Environment.NewLine);
             this.Macro = Macro;
             InitializeComponent();
         }
 
         private void TipsForm_Load(object sender, EventArgs e)
         {
+            textBox1.SelectionStart = 0;
+            textBox1.SelectionLength = 0;
             textBox1.Text = Tip;
             if (Macro == null)
             {

diff --git a/App/Form/TrackerForm.cs b/App/Form/TrackerForm.cs
@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Kyozy.MiniblinkNet;

diff --git a/App/Global.cs b/App/Global.cs
@@ -2,7 +2,7 @@
 {
     internal class Global
     {
-        public const string VERSION = "v20190112.2";
+        public const string VERSION = "v20190211.1";
 
         public const string APPNAME = "DFAssist";
         public const string SETTINGS_FILEPATH = @"config.ini";

diff --git a/App/Network/Network.Analyser.cs b/App/Network/Network.Analyser.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Text;
 
 namespace App
 {

diff --git a/App/Util/LMessageBox.cs b/App/Util/LMessageBox.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace App
 {

diff --git a/App/Util/Sound_Helper.cs b/App/Util/Sound_Helper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using System.Threading;
 
 namespace App
 {

diff --git a/App/Util/ZipStorer.cs b/App/Util/ZipStorer.cs
@@ -413,7 +413,7 @@ public static bool RemoveEntries(ref ZipStorer _zip, List<ZipFileEntry> _zfes)
 
             try
             {
-                var tempZip = ZipStorer.Create(tempZipName, string.Empty);
+                var tempZip = Create(tempZipName, string.Empty);
 
                 foreach (var zfe in fullList)
                 {
-Original file line number
+Diff line change
@@ Expand Up @@
                 try
                 {
-                    var tempZip = ZipStorer.Create(tempZipName, string.Empty);
+                    var tempZip = Create(tempZipName, string.Empty);
                     foreach (var zfe in fullList)
                     {
@@ Expand Down @@