v1.5.8

lich426 · Mar 5, 2023 · 48717ca · 48717ca
1 parent 112001b
commit 48717ca
Show file tree

Hide file tree

Showing 41 changed files with 900 additions and 554 deletions.
diff --git a/FanCtrl.csproj b/FanCtrl.csproj
@@ -28,7 +28,7 @@
     <PublisherName>Lich</PublisherName>
     <SuiteName>FanCtrl</SuiteName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.5.7.0</ApplicationVersion>
+    <ApplicationVersion>1.5.8.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -90,6 +90,10 @@
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DarkUI, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>dll\DarkUI.dll</HintPath>
+    </Reference>
     <Reference Include="HidSharp, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>dll\HidSharp.dll</HintPath>
@@ -306,6 +310,21 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>StringLib.ko.resx</DependentUpon>
     </Compile>
+    <Compile Include="src\UI\Theme\ThemeListView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="src\UI\Theme\ThemePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="src\UI\Theme\ThemeForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="src\UI\Theme\ThemeHardwareLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="src\UI\Theme\ThemeLibLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <EmbeddedResource Include="src\UI\ControlForm.resx">
       <DependentUpon>ControlForm.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
-[assembly: AssemblyVersion("1.5.7")]
-[assembly: AssemblyFileVersion("1.5.7")]
-[assembly: AssemblyInformationalVersion("1.5.7")]
+[assembly: AssemblyVersion("1.5.8")]
+[assembly: AssemblyFileVersion("1.5.8")]
+[assembly: AssemblyInformationalVersion("1.5.8")]
diff --git a/Resources/StringLib.Designer.cs b/Resources/StringLib.Designer.cs
diff --git a/Resources/StringLib.fr.resx b/Resources/StringLib.fr.resx
@@ -366,6 +366,18 @@
   <data name="Temperature" xml:space="preserve">
     <value>Température</value>
   </data>
+  <data name="Theme" xml:space="preserve">
+    <value>thème :</value>
+  </data>
+  <data name="Theme_Dark" xml:space="preserve">
+    <value>Dark</value>
+  </data>
+  <data name="Theme_Light" xml:space="preserve">
+    <value>Light</value>
+  </data>
+  <data name="Theme_System" xml:space="preserve">
+    <value>système</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>FanCtrl</value>
   </data>

diff --git a/Resources/StringLib.ja.resx b/Resources/StringLib.ja.resx
@@ -366,6 +366,18 @@
   <data name="Temperature" xml:space="preserve">
     <value>温度</value>
   </data>
+  <data name="Theme" xml:space="preserve">
+    <value>テーマ:</value>
+  </data>
+  <data name="Theme_Dark" xml:space="preserve">
+    <value>暗い</value>
+  </data>
+  <data name="Theme_Light" xml:space="preserve">
+    <value>明るい</value>
+  </data>
+  <data name="Theme_System" xml:space="preserve">
+    <value>システム</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>FanCtrl</value>
   </data>

diff --git a/Resources/StringLib.ko.resx b/Resources/StringLib.ko.resx
@@ -366,6 +366,18 @@
   <data name="Temperature" xml:space="preserve">
     <value>온도</value>
   </data>
+  <data name="Theme" xml:space="preserve">
+    <value>테마 :</value>
+  </data>
+  <data name="Theme_Dark" xml:space="preserve">
+    <value>다크</value>
+  </data>
+  <data name="Theme_Light" xml:space="preserve">
+    <value>라이트</value>
+  </data>
+  <data name="Theme_System" xml:space="preserve">
+    <value>시스템</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>FanCtrl</value>
   </data>

diff --git a/Resources/StringLib.resx b/Resources/StringLib.resx
@@ -366,6 +366,18 @@
   <data name="Temperature" xml:space="preserve">
     <value>Temperature</value>
   </data>
+  <data name="Theme" xml:space="preserve">
+    <value>Theme :</value>
+  </data>
+  <data name="Theme_Dark" xml:space="preserve">
+    <value>Dark</value>
+  </data>
+  <data name="Theme_Light" xml:space="preserve">
+    <value>Light</value>
+  </data>
+  <data name="Theme_System" xml:space="preserve">
+    <value>System</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>FanCtrl</value>
   </data>

diff --git a/dll/DarkUI.dll b/dll/DarkUI.dll
diff --git a/dll/LibreHardwareMonitorLib.dll b/dll/LibreHardwareMonitorLib.dll
diff --git a/plugin/liquidctl.exe b/plugin/liquidctl.exe
diff --git a/src/Program.cs b/src/Program.cs
@@ -1,4 +1,5 @@
-using System;
+using DarkUI.Config;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -27,6 +28,16 @@ static void Main(string[] args)
             if (Program.createMutex() == false)
                 return;
 
+            var type = OptionManager.getInstance().getNowTheme();
+            if (type == THEME_TYPE.DARK)
+            {
+                ThemeProvider.Theme = new DarkTheme();
+            }
+            else
+            {
+                ThemeProvider.Theme = new LightTheme();
+            }
+
             Application.Run(new MainForm());
 
             Program.releaseMutex();