remove mainform

BatteryIndicator/BatteryIndicator.csproj

@@ -46,20 +46,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Model\PTConfig.cs" />
+    <Compile Include="Utils\PTConfig.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\Settings.cs">
+    <Compile Include="UI\SettingForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\Settings.Designer.cs">
-      <DependentUpon>Settings.cs</DependentUpon>
+    <Compile Include="UI\SettingForm.Designer.cs">
+      <DependentUpon>SettingForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\TrayIcon.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -71,8 +65,8 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="UI\Settings.resx">
-      <DependentUpon>Settings.cs</DependentUpon>
+    <EmbeddedResource Include="UI\SettingForm.resx">
+      <DependentUpon>SettingForm.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -89,7 +83,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Control\" />
-    <Folder Include="Utils\" />
+    <Folder Include="Model\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

BatteryIndicator/MainForm.Designer.cs

@@ -1,41 +0,0 @@
-
-namespace BatteryIndicator
-{
-    partial class MainForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "Form1";
-        }
-
-        #endregion
-    }
-}
-

BatteryIndicator/MainForm.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BatteryIndicator
-{
-    public partial class MainForm : Form
-    {
-        public MainForm()
-        {
-            InitializeComponent();
-        }
-    }
-}

BatteryIndicator/Program.cs

@@ -1,4 +1,5 @@
-using BatteryIndicator.Views;
+using BatteryIndicator.UI;
+using BatteryIndicator.Views;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +18,7 @@ namespace BatteryIndicator
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            //Application.Run(new MainForm());
+            //Application.Run(new SettingForm());
 
             TrayIcon trayIcon = new TrayIcon();
             Application.Run();

BatteryIndicator/UI/Settings.Designer.cs → BatteryIndicator/UI/SettingForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace BatteryIndicator.UI
 {
-    partial class Settings
+    partial class SettingForm
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Settings));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingForm));
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();

BatteryIndicator/UI/Settings.cs → BatteryIndicator/UI/SettingForm.cs

@@ -14,9 +14,9 @@ using System.Windows.Forms;
 
 namespace BatteryIndicator.UI
 {
-    public partial class Settings : Form
+    public partial class SettingForm : Form
     {
-        public Settings()
+        public SettingForm()
         {
             PTConfig cfg = new PTConfig();
             cfg.Load();

BatteryIndicator/Model/PTConfig.cs → BatteryIndicator/Utils/PTConfig.cs

@@ -6,6 +6,9 @@ namespace BatteryIndicator.Model
 {
     class PTConfig
     {
+        /// <summary>
+        /// 配置文件路径
+        /// </summary>
         private string _cfgFile = null;
 
 
@@ -23,7 +26,7 @@ namespace BatteryIndicator.Model
             _cfgFile = AppDomain.CurrentDomain.BaseDirectory + "ptcfg.xml";
         }
 
-        public bool ConfigExist()
+        private bool isConfigExist()
         {
             if (_cfgFile != null && File.Exists(_cfgFile))
             {
@@ -60,7 +63,7 @@ namespace BatteryIndicator.Model
 
         public void Load()
         {
-            if (!ConfigExist())
+            if (!isConfigExist())
             {
                 InitConfig();
             }

BatteryIndicator/Views/TrayIcon.cs

@@ -97,9 +97,6 @@ namespace BatteryIndicator.Views
             chargingColor = (Color)new ColorConverter().ConvertFromString(charging);   // 从字符串获取颜色
             lowColor = (Color)new ColorConverter().ConvertFromString(low);   // 从字符串获取颜色
 
-
-
-
             ContextMenu contextMenu = new ContextMenu();
             MenuItem menuItem1 = new MenuItem();    //设置按钮
             MenuItem menuItem2 = new MenuItem();    //退出按钮
@@ -209,7 +206,7 @@ namespace BatteryIndicator.Views
          */
         private void settingButton_Click(object sender, EventArgs e)
         {
-            new Settings().ShowDialog();
+            new SettingForm().ShowDialog();
         }
 
         /**