修改名称及安装程序图标

SamHou0 · SamHou0 · commit f180fa84ea0c · 2022-03-13T17:59:07.000+08:00
diff --git a/TCSetup/TCSetup.vdproj b/TCSetup/TCSetup.vdproj
@@ -21,6 +21,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_9BF8F60AD5F2474D82994CD2D95F44A1"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_B7C31D1C4E42443D89CA87F9596A43B7"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -127,6 +133,26 @@
         }
         "File"
         {
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9BF8F60AD5F2474D82994CD2D95F44A1"
+            {
+            "SourcePath" = "8:..\\TimeControl\\icons8_sand_watch.ico"
+            "TargetName" = "8:icons8_sand_watch.ico"
+            "Tag" = "8:"
+            "Folder" = "8:_57FF55C0487B4507A7ADC64F8E5966A5"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -183,15 +209,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:TimeControl"
-        "ProductCode" = "8:{BB3E5E5C-6F52-48B4-893C-57EB236F23D6}"
-        "PackageCode" = "8:{65B804AE-9561-4656-8793-2FB8B8BEBCDF}"
+        "ProductCode" = "8:{9EE926BC-8A8C-4684-A53E-1EF64E1537E1}"
+        "PackageCode" = "8:{1E6EC692-5BBF-4CB3-B4B3-5DE3068A184B}"
         "UpgradeCode" = "8:{A7DC5BC4-7E3E-4B58-A0AD-3C9AC9F873C1}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.1.1"
+        "ProductVersion" = "8:3.1.2"
         "Manufacturer" = "8:SamHou"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -201,7 +227,7 @@
         "Keywords" = "8:"
         "ARPCOMMENTS" = "8:TimeControl安装程序"
         "ARPURLINFOABOUT" = "8:"
-        "ARPPRODUCTICON" = "8:"
+        "ARPPRODUCTICON" = "8:_9BF8F60AD5F2474D82994CD2D95F44A1"
         "ARPIconIndex" = "3:0"
         "SearchPath" = "8:"
         "UseSystemSearchPath" = "11:TRUE"
@@ -379,7 +405,7 @@
             "Target" = "8:_B7C31D1C4E42443D89CA87F9596A43B7"
             "Folder" = "8:_EF355E43AD4E49F3B0AE27E1F063797B"
             "WorkingFolder" = "8:_57FF55C0487B4507A7ADC64F8E5966A5"
-            "Icon" = "8:"
+            "Icon" = "8:_9BF8F60AD5F2474D82994CD2D95F44A1"
             "Feature" = "8:"
             }
             "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_5426797F4F7D48478759844D9558460B"
@@ -393,7 +419,7 @@
             "Target" = "8:_B7C31D1C4E42443D89CA87F9596A43B7"
             "Folder" = "8:_24D444A51FBD4D6AB659A544BB198230"
             "WorkingFolder" = "8:_57FF55C0487B4507A7ADC64F8E5966A5"
-            "Icon" = "8:"
+            "Icon" = "8:_9BF8F60AD5F2474D82994CD2D95F44A1"
             "Feature" = "8:"
             }
         }
@@ -797,7 +823,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5003B007B32D429B83CC5372AB9FC0AF"
             {
-            "SourcePath" = "8:..\\TimeControlConsole\\obj\\x64\\Release\\net6.0-windows10.0.22000.0\\apphost.exe"
+            "SourcePath" = "8:..\\TimeControlConsole\\obj\\Release\\net6.0-windows10.0.22000.0\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_57FF55C0487B4507A7ADC64F8E5966A5"
@@ -825,7 +851,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B7C31D1C4E42443D89CA87F9596A43B7"
             {
-            "SourcePath" = "8:..\\TimeControl\\obj\\x64\\Release\\net6.0-windows10.0.22000.0\\apphost.exe"
+            "SourcePath" = "8:..\\TimeControl\\obj\\Release\\net6.0-windows10.0.22000.0\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_57FF55C0487B4507A7ADC64F8E5966A5"
diff --git a/TimeControl/AppController.cs b/TimeControl/AppController.cs
@@ -9,17 +9,17 @@
 
 namespace TimeControl
 {
-    public class ListController
+    public class AppController
     {
-        private FileStream fileStream = new(TimeControlFile.tcTimeFileLocation,
+        private FileStream fileStream = new(TimeControlFile.TimeFileLocation,
             FileMode.OpenOrCreate,
             FileAccess.ReadWrite, FileShare.None);
         private StreamWriter streamWriter;
         private ListBox listBox;
         private List<App> apps;
         private Timer timer;
 
-        public ListController(ListBox listBox, Timer timer)
+        public AppController(ListBox listBox, Timer timer)
         {
             streamWriter = new(fileStream);
             this.listBox = listBox;
diff --git a/TimeControl/ControlPanel.Designer.cs b/TimeControl/ControlPanel.Designer.cs
diff --git a/TimeControl/ControlPanel.cs b/TimeControl/ControlPanel.cs
@@ -19,14 +19,14 @@ public partial class ControlPanel : Form
         private bool hide = false;//指示启动后是否需要隐藏
         private bool isClosable = false;//指示当前是否可以关闭
         private int unlockPasswordHash = 0;//密码哈希值，用作比对
-        private ListController controller;//列表、计时控制器
+        private AppController controller;//列表、计时控制器
         public ControlPanel(bool hide)
         {
             InitializeComponent();
             this.hide = hide;
-            if (File.Exists(TimeControlFile.tcPassLocation))//加载密码哈希值
+            if (File.Exists(TimeControlFile.PassLocation))//加载密码哈希值
             {
-                unlockPasswordHash = Convert.ToInt32(File.ReadAllText(TimeControlFile.tcPassLocation));
+                unlockPasswordHash = Convert.ToInt32(File.ReadAllText(TimeControlFile.PassLocation));
                 PasswordSet();
             }
             controller = new(usageBox, processMonitorTimer);
@@ -140,8 +140,8 @@ private void ControlPanel_Shown(object sender, EventArgs e)//启动隐藏参数
         private void UnloackPasswordSetButton_Click(object sender, EventArgs e)//保存密码
         {
             unlockPasswordHash = unlockPasswordBox.Text.GetHashCode();//保存哈希值
+            File.WriteAllText(TimeControlFile.PassLocation, unlockPasswordHash.ToString());//保存哈希值到文件
             PasswordSet();
-            File.WriteAllText(TimeControlFile.tcPassLocation, unlockPasswordHash.ToString());//保存哈希值到文件
         }
         private void PasswordSet()//密码设置后调用
         {
@@ -150,7 +150,7 @@ private void PasswordSet()//密码设置后调用
             unloackPasswordSetButton.Enabled = false;
         }
 
-        private void clearButton_Click(object sender, EventArgs e)//移除所有的已添加窗口
+        private void ClearButton_Click(object sender, EventArgs e)//移除所有的已添加窗口
         {
             if (PasswordCheck())
             {
diff --git a/TimeControl/LimitWarningWindow.Designer.cs b/TimeControl/LimitWarningWindow.Designer.cs
diff --git a/TimeControl/LimitWarningWindow.cs b/TimeControl/LimitWarningWindow.cs
@@ -20,7 +20,7 @@ public LimitWarningWindow(LimitedApp warningApp)
             this.warningApp = warningApp;
         }
 
-        private void closeButton_Click(object sender, EventArgs e)
+        private void CloseButton_Click(object sender, EventArgs e)
         {
             warningApp.Ban();//禁用掉app
             Close();
diff --git a/TimeControl/PasswordInput.cs b/TimeControl/PasswordInput.cs
@@ -25,7 +25,7 @@ private void OkButton_Click(object sender, EventArgs e)
         {
             if (passwordTextBox.Text.GetHashCode()==passwordHash)
             {
-                File.Delete(TimeControlFile.tcPassLocation);
+                File.Delete(TimeControlFile.PassLocation);
                 DialogResult = DialogResult.OK;
                 Close();
             }
diff --git a/TimeControl/TimeControl.csproj b/TimeControl/TimeControl.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net6.0-windows10.0.22000.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Authors>SamHou</Authors>
-    <Version>3.1.1</Version>
+    <Version>3.1.2</Version>
     <StartupObject>TimeControl.Program</StartupObject>
     <AssemblyVersion></AssemblyVersion>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
diff --git a/TimeControl/TimeControlFile.cs b/TimeControl/TimeControlFile.cs
@@ -8,9 +8,9 @@ namespace TimeControl
 {
     internal class TimeControlFile
     {
-        public static readonly string tcPassLocation = Environment.GetFolderPath
+        public static readonly string PassLocation = Environment.GetFolderPath
             (Environment.SpecialFolder.ApplicationData) + "\\TCPass.txt";//获取密码位置
-        public static readonly string tcTimeFileLocation = Environment.GetFolderPath
+        public static readonly string TimeFileLocation = Environment.GetFolderPath
             (Environment.SpecialFolder.ApplicationData) + "\\TCTimeData.txt";
     }
 }
diff --git a/TimeControl/TimeInput.cs b/TimeControl/TimeInput.cs
@@ -12,29 +12,29 @@ namespace TimeControl
 {
     public partial class TimeInput : Form
     {
-        private ListController listController;
+        private AppController appController;
         private readonly string appName;
         /// <summary>
         /// 创建一个新的输入窗口，并添加进程
         /// </summary>
-        /// <param name="listController">进程列表控制器，用于添加进程</param>
+        /// <param name="appController">进程列表控制器，用于添加进程</param>
         /// <param name="appName">需要添加进程的名称</param>
-        public TimeInput(ListController listController, string appName)
+        public TimeInput(AppController appController, string appName)
         {
             InitializeComponent();
-            this.listController = listController;
+            this.appController = appController;
             this.appName = appName;
         }
 
         private void OkButton_Click(object sender, EventArgs e)
         {
             if (timeBox.Value == 0)
             {
-                listController.AddByName(appName);
+                appController.AddByName(appName);
             }
             else
             {
-                listController.AddByName(appName, Convert.ToInt32(timeBox.Value));
+                appController.AddByName(appName, Convert.ToInt32(timeBox.Value));
             }
             Close();
         }

Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,17 @@`
`9`	`9`
`10`	`10`	`namespace TimeControl`
`11`	`11`	`{`
`12`		`- public class ListController`
	`12`	`+ public class AppController`
`13`	`13`	`{`
`14`		`- private FileStream fileStream = new(TimeControlFile.tcTimeFileLocation,`
	`14`	`+ private FileStream fileStream = new(TimeControlFile.TimeFileLocation,`
`15`	`15`	`FileMode.OpenOrCreate,`
`16`	`16`	`FileAccess.ReadWrite, FileShare.None);`
`17`	`17`	`private StreamWriter streamWriter;`
`18`	`18`	`private ListBox listBox;`
`19`	`19`	`private List<App> apps;`
`20`	`20`	`private Timer timer;`
`21`	`21`
`22`		`- public ListController(ListBox listBox, Timer timer)`
	`22`	`+ public AppController(ListBox listBox, Timer timer)`
`23`	`23`	`{`
`24`	`24`	`streamWriter = new(fileStream);`
`25`	`25`	`this.listBox = listBox;`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ public partial class ControlPanel : Form`
`19`	`19`	`private bool hide = false;//指示启动后是否需要隐藏`
`20`	`20`	`private bool isClosable = false;//指示当前是否可以关闭`
`21`	`21`	`private int unlockPasswordHash = 0;//密码哈希值，用作比对`
`22`		`- private ListController controller;//列表、计时控制器`
	`22`	`+ private AppController controller;//列表、计时控制器`
`23`	`23`	`public ControlPanel(bool hide)`
`24`	`24`	`{`
`25`	`25`	`InitializeComponent();`
`26`	`26`	`this.hide = hide;`
`27`		`- if (File.Exists(TimeControlFile.tcPassLocation))//加载密码哈希值`
	`27`	`+ if (File.Exists(TimeControlFile.PassLocation))//加载密码哈希值`
`28`	`28`	`{`
`29`		`- unlockPasswordHash = Convert.ToInt32(File.ReadAllText(TimeControlFile.tcPassLocation));`
	`29`	`+ unlockPasswordHash = Convert.ToInt32(File.ReadAllText(TimeControlFile.PassLocation));`
`30`	`30`	`PasswordSet();`
`31`	`31`	`}`
`32`	`32`	`controller = new(usageBox, processMonitorTimer);`
`@@ -140,8 +140,8 @@ private void ControlPanel_Shown(object sender, EventArgs e)//启动隐藏参数`
`140`	`140`	`private void UnloackPasswordSetButton_Click(object sender, EventArgs e)//保存密码`
`141`	`141`	`{`
`142`	`142`	`unlockPasswordHash = unlockPasswordBox.Text.GetHashCode();//保存哈希值`
	`143`	`+ File.WriteAllText(TimeControlFile.PassLocation, unlockPasswordHash.ToString());//保存哈希值到文件`
`143`	`144`	`PasswordSet();`
`144`		`- File.WriteAllText(TimeControlFile.tcPassLocation, unlockPasswordHash.ToString());//保存哈希值到文件`
`145`	`145`	`}`
`146`	`146`	`private void PasswordSet()//密码设置后调用`
`147`	`147`	`{`
`@@ -150,7 +150,7 @@ private void PasswordSet()//密码设置后调用`
`150`	`150`	`unloackPasswordSetButton.Enabled = false;`
`151`	`151`	`}`
`152`	`152`
`153`		`- private void clearButton_Click(object sender, EventArgs e)//移除所有的已添加窗口`
	`153`	`+ private void ClearButton_Click(object sender, EventArgs e)//移除所有的已添加窗口`
`154`	`154`	`{`
`155`	`155`	`if (PasswordCheck())`
`156`	`156`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public LimitWarningWindow(LimitedApp warningApp)`
`20`	`20`	`this.warningApp = warningApp;`
`21`	`21`	`}`
`22`	`22`
`23`		`- private void closeButton_Click(object sender, EventArgs e)`
	`23`	`+ private void CloseButton_Click(object sender, EventArgs e)`
`24`	`24`	`{`
`25`	`25`	`warningApp.Ban();//禁用掉app`
`26`	`26`	`Close();`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ private void OkButton_Click(object sender, EventArgs e)`
`25`	`25`	`{`
`26`	`26`	`if (passwordTextBox.Text.GetHashCode()==passwordHash)`
`27`	`27`	`{`
`28`		`- File.Delete(TimeControlFile.tcPassLocation);`
	`28`	`+ File.Delete(TimeControlFile.PassLocation);`
`29`	`29`	`DialogResult = DialogResult.OK;`
`30`	`30`	`Close();`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ namespace TimeControl`
`8`	`8`	`{`
`9`	`9`	`internal class TimeControlFile`
`10`	`10`	`{`
`11`		`- public static readonly string tcPassLocation = Environment.GetFolderPath`
	`11`	`+ public static readonly string PassLocation = Environment.GetFolderPath`
`12`	`12`	`(Environment.SpecialFolder.ApplicationData) + "\\TCPass.txt";//获取密码位置`
`13`		`- public static readonly string tcTimeFileLocation = Environment.GetFolderPath`
	`13`	`+ public static readonly string TimeFileLocation = Environment.GetFolderPath`
`14`	`14`	`(Environment.SpecialFolder.ApplicationData) + "\\TCTimeData.txt";`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,29 +12,29 @@ namespace TimeControl`
`12`	`12`	`{`
`13`	`13`	`public partial class TimeInput : Form`
`14`	`14`	`{`
`15`		`- private ListController listController;`
	`15`	`+ private AppController appController;`
`16`	`16`	`private readonly string appName;`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// 创建一个新的输入窗口，并添加进程`
`19`	`19`	`/// </summary>`
`20`		`- /// <param name="listController">进程列表控制器，用于添加进程</param>`
	`20`	`+ /// <param name="appController">进程列表控制器，用于添加进程</param>`
`21`	`21`	`/// <param name="appName">需要添加进程的名称</param>`
`22`		`- public TimeInput(ListController listController, string appName)`
	`22`	`+ public TimeInput(AppController appController, string appName)`
`23`	`23`	`{`
`24`	`24`	`InitializeComponent();`
`25`		`- this.listController = listController;`
	`25`	`+ this.appController = appController;`
`26`	`26`	`this.appName = appName;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private void OkButton_Click(object sender, EventArgs e)`
`30`	`30`	`{`
`31`	`31`	`if (timeBox.Value == 0)`
`32`	`32`	`{`
`33`		`- listController.AddByName(appName);`
	`33`	`+ appController.AddByName(appName);`
`34`	`34`	`}`
`35`	`35`	`else`
`36`	`36`	`{`
`37`		`- listController.AddByName(appName, Convert.ToInt32(timeBox.Value));`
	`37`	`+ appController.AddByName(appName, Convert.ToInt32(timeBox.Value));`
`38`	`38`	`}`
`39`	`39`	`Close();`
`40`	`40`	`}`