From e1f284cbb6e47bec22f18c19bd07d3037412ccbf Mon Sep 17 00:00:00 2001 From: Blacktempel <6657796+Blacktempel@users.noreply.github.com> Date: Fri, 15 May 2026 10:29:57 +0200 Subject: [PATCH] Prepare for Avalonia app - rename LHM UI project (#2360) * Prepare for Avalonia app - rename LHM UI project. * Rename * Fix icons not being displayed. * Rename workflow project --- .github/workflows/master.yml | 8 +- .github/workflows/pull requests.yml | 8 +- .../LibreHardwareMonitor.Windows.Forms.csproj | 6 +- .../Program.cs | 4 +- .../Resources/PawnIO_setup.exe | Bin .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_75_ffffff_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../ui-bg_inset-soft_95_fef1ec_1x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_2e83ff_256x240.png | Bin .../images/ui-icons_454545_256x240.png | Bin .../images/ui-icons_888888_256x240.png | Bin .../images/ui-icons_cd0a0a_256x240.png | Bin .../custom-theme/jquery-ui-1.8.16.custom.css | 0 .../Resources/Web/css/jquery.treeTable.css | 0 .../Resources/Web/css/ohm_web.css | 0 .../Resources/Web/favicon.ico | Bin .../Web/images/toggle-collapse-dark.png | Bin .../Web/images/toggle-collapse-light.png | Bin .../Web/images/toggle-expand-dark.png | Bin .../Web/images/toggle-expand-light.png | Bin .../Resources/Web/images/transparent.png | Bin .../Resources/Web/index.html | 0 .../Resources/Web/js/jquery-1.7.2.js | 0 .../Resources/Web/js/jquery-1.7.2.min.js | 0 .../Web/js/jquery-ui-1.8.16.custom.min.js | 0 .../Resources/Web/js/jquery.tmpl.js | 0 .../Resources/Web/js/jquery.tmpl.min.js | 0 .../Resources/Web/js/jquery.treeTable.min.js | 0 .../Resources/Web/js/knockout-2.1.0.js | 0 .../Resources/Web/js/knockout-2.1.0.min.js | 0 .../Web/js/knockout.mapping-latest.js | 0 .../Web/js/knockout.mapping-latest.min.js | 0 .../Resources/Web/js/ohm_web.js | 0 .../Resources/amd.png | Bin .../Resources/app.manifest | 0 .../Resources/ati.png | Bin .../Resources/bar.png | Bin .../Resources/barback.png | Bin .../Resources/battery.png | Bin .../Resources/chip.png | Bin .../Resources/clock.png | Bin .../Resources/computer.png | Bin .../Resources/control.png | Bin .../Resources/cpu.png | Bin .../Resources/current.png | Bin .../Resources/data.png | Bin .../Resources/factor.png | Bin .../Resources/fan.png | Bin .../Resources/flow.png | Bin .../Resources/gadget.png | Bin .../Resources/gadget.xcf | Bin .../Resources/hdd.png | Bin .../Resources/humidity.png | Bin .../Resources/icon.ico | Bin .../Resources/icon.xcf | Bin .../Resources/intel.png | Bin .../Resources/level.png | Bin .../Resources/load.png | Bin .../Resources/loudspeaker.png | Bin .../Resources/mainboard.png | Bin .../Resources/nic.png | Bin .../Resources/nvidia.png | Bin .../Resources/power-supply.png | Bin .../Resources/power.png | Bin .../Resources/powermonitor.png | Bin .../Resources/ram.png | Bin .../Resources/smallicon.ico | Bin .../Resources/temperature.png | Bin .../Resources/throughput.png | Bin .../Resources/time.png | Bin .../Resources/voltage.png | Bin .../TestScripts/LiquidCool.py | 0 .../TestScripts/basicrest.py | 0 .../TestScripts/basicwmi.py | 0 .../UI/AboutBox.Designer.cs | 2 +- .../UI/AboutBox.cs | 4 +- .../UI/AboutBox.resx | 0 .../UI/AuthForm.Designer.cs | 2 +- .../UI/AuthForm.cs | 2 +- .../UI/AuthForm.resx | 0 .../UI/Gadget.cs | 2 +- .../UI/GadgetWindow.cs | 2 +- .../UI/HardwareNode.cs | 6 +- .../UI/HardwareTypeImage.cs | 2 +- .../UI/IExpandPersistNode.cs | 2 +- .../UI/InterfacePortForm.Designer.cs | 2 +- .../UI/InterfacePortForm.cs | 2 +- .../UI/InterfacePortForm.resx | 0 .../UI/MainForm.Designer.cs | 92 +++++++++--------- .../UI/MainForm.cs | 6 +- .../UI/MainForm.resx | 0 .../UI/Node.cs | 2 +- .../UI/NodeToolTipProvider.cs | 2 +- .../UI/NotifyIconAdv.cs | 2 +- .../UI/ParameterForm.Designer.cs | 2 +- .../UI/ParameterForm.cs | 2 +- .../UI/ParameterForm.resx | 0 .../UI/PlotPanel.cs | 6 +- .../UI/ScaledPlotModel.cs | 2 +- .../UI/SensorGadget.cs | 6 +- .../UI/SensorNode.cs | 4 +- .../UI/SensorNotifyIcon.cs | 4 +- .../UI/ShowDesktop.cs | 2 +- .../UI/SplitContainerAdv.cs | 4 +- .../UI/StartupManager.cs | 2 +- .../UI/SystemTray.cs | 6 +- .../UI/Theme.cs | 2 +- .../UI/Themes/BlackTheme.cs | 2 +- .../UI/Themes/DarkTheme.cs | 2 +- .../UI/Themes/LightTheme.cs | 2 +- .../UI/Themes/ThemedHScrollIndicator.cs | 2 +- .../UI/Themes/ThemedToolStripRenderer.cs | 2 +- .../UI/Themes/ThemedVScrollIndicator.cs | 2 +- .../UI/ToolStripRadioButtonMenuItem.cs | 2 +- .../UI/TreeModel.cs | 2 +- .../UI/TypeNode.cs | 4 +- .../UI/UnitManager.cs | 6 +- .../UI/UpdateVisitor.cs | 2 +- .../UI/UserOption.cs | 6 +- .../UI/UserRadioGroup.cs | 6 +- .../Utilities/EmbeddedResources.cs | 10 +- .../Utilities/HttpServer.cs | 4 +- .../Utilities/IconFactory.cs | 2 +- .../Utilities/Logger.cs | 2 +- .../Utilities/LoggerFileRotation.cs | 2 +- .../Utilities/PersistentSettings.cs | 2 +- LibreHardwareMonitor.sln | 2 +- 133 files changed, 133 insertions(+), 131 deletions(-) rename LibreHardwareMonitor/LibreHardwareMonitor.csproj => LibreHardwareMonitor.Windows.Forms/LibreHardwareMonitor.Windows.Forms.csproj (94%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Program.cs (95%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/PawnIO_setup.exe (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-icons_222222_256x240.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-icons_2e83ff_256x240.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-icons_454545_256x240.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-icons_888888_256x240.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/images/ui-icons_cd0a0a_256x240.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/custom-theme/jquery-ui-1.8.16.custom.css (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/jquery.treeTable.css (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/css/ohm_web.css (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/favicon.ico (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/images/toggle-collapse-dark.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/images/toggle-collapse-light.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/images/toggle-expand-dark.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/images/toggle-expand-light.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/images/transparent.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/index.html (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/jquery-1.7.2.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/jquery-1.7.2.min.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/jquery-ui-1.8.16.custom.min.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/jquery.tmpl.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/jquery.tmpl.min.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/jquery.treeTable.min.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/knockout-2.1.0.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/knockout-2.1.0.min.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/knockout.mapping-latest.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/knockout.mapping-latest.min.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/Web/js/ohm_web.js (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/amd.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/app.manifest (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/ati.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/bar.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/barback.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/battery.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/chip.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/clock.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/computer.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/control.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/cpu.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/current.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/data.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/factor.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/fan.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/flow.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/gadget.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/gadget.xcf (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/hdd.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/humidity.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/icon.ico (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/icon.xcf (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/intel.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/level.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/load.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/loudspeaker.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/mainboard.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/nic.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/nvidia.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/power-supply.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/power.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/powermonitor.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/ram.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/smallicon.ico (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/temperature.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/throughput.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/time.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Resources/voltage.png (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/TestScripts/LiquidCool.py (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/TestScripts/basicrest.py (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/TestScripts/basicwmi.py (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/AboutBox.Designer.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/AboutBox.cs (92%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/AboutBox.resx (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/AuthForm.Designer.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/AuthForm.cs (96%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/AuthForm.resx (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Gadget.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/GadgetWindow.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/HardwareNode.cs (97%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/HardwareTypeImage.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/IExpandPersistNode.cs (58%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/InterfacePortForm.Designer.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/InterfacePortForm.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/InterfacePortForm.resx (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/MainForm.Designer.cs (94%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/MainForm.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/MainForm.resx (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Node.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/NodeToolTipProvider.cs (91%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/NotifyIconAdv.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/ParameterForm.Designer.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/ParameterForm.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/ParameterForm.resx (100%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/PlotPanel.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/ScaledPlotModel.cs (95%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/SensorGadget.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/SensorNode.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/SensorNotifyIcon.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/ShowDesktop.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/SplitContainerAdv.cs (97%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/StartupManager.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/SystemTray.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Theme.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Themes/BlackTheme.cs (96%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Themes/DarkTheme.cs (96%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Themes/LightTheme.cs (96%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Themes/ThemedHScrollIndicator.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Themes/ThemedToolStripRenderer.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/Themes/ThemedVScrollIndicator.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/ToolStripRadioButtonMenuItem.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/TreeModel.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/TypeNode.cs (98%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/UnitManager.cs (91%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/UpdateVisitor.cs (94%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/UserOption.cs (94%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/UI/UserRadioGroup.cs (94%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Utilities/EmbeddedResources.cs (88%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Utilities/HttpServer.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Utilities/IconFactory.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Utilities/Logger.cs (99%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Utilities/LoggerFileRotation.cs (84%) rename {LibreHardwareMonitor => LibreHardwareMonitor.Windows.Forms}/Utilities/PersistentSettings.cs (99%) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index de15b70..75f8748 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -34,22 +34,22 @@ jobs: } | Set-Content Directory.Build.props - name: Restore application packages - run: dotnet restore LibreHardwareMonitor\LibreHardwareMonitor.csproj + run: dotnet restore LibreHardwareMonitor.Windows.Forms\LibreHardwareMonitor.Windows.Forms.csproj - name: Build application - run: dotnet build LibreHardwareMonitor\LibreHardwareMonitor.csproj -c Release --no-restore -p:Platform=x64 + run: dotnet build LibreHardwareMonitor.Windows.Forms\LibreHardwareMonitor.Windows.Forms.csproj -c Release --no-restore -p:Platform=x64 - name: Publish net472 application uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # 7.0.1 with: - name: LibreHardwareMonitor + name: LibreHardwareMonitor.Windows.Forms path: | bin/Release/net472 - name: Publish net10.0 application uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # 7.0.1 with: - name: LibreHardwareMonitor (.NET 10) + name: LibreHardwareMonitor.Windows.Forms (.NET 10) path: | bin/Release/net10.0-windows diff --git a/.github/workflows/pull requests.yml b/.github/workflows/pull requests.yml index a269cf8..6bd3f3e 100644 --- a/.github/workflows/pull requests.yml +++ b/.github/workflows/pull requests.yml @@ -34,22 +34,22 @@ jobs: } | Set-Content Directory.Build.props - name: Restore application packages - run: dotnet restore LibreHardwareMonitor\LibreHardwareMonitor.csproj + run: dotnet restore LibreHardwareMonitor.Windows.Forms\LibreHardwareMonitor.Windows.Forms.csproj - name: Build application - run: dotnet build LibreHardwareMonitor\LibreHardwareMonitor.csproj -c Release --no-restore -p:Platform=x64 + run: dotnet build LibreHardwareMonitor.Windows.Forms\LibreHardwareMonitor.Windows.Forms.csproj -c Release --no-restore -p:Platform=x64 - name: Publish net472 application uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # 7.0.1 with: - name: LibreHardwareMonitor + name: LibreHardwareMonitor.Windows.Forms path: | bin/Release/net472 - name: Publish net10.0 application uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # 7.0.1 with: - name: LibreHardwareMonitor (.NET 10) + name: LibreHardwareMonitor.Windows.Forms (.NET 10) path: | bin/Release/net10.0-windows diff --git a/LibreHardwareMonitor/LibreHardwareMonitor.csproj b/LibreHardwareMonitor.Windows.Forms/LibreHardwareMonitor.Windows.Forms.csproj similarity index 94% rename from LibreHardwareMonitor/LibreHardwareMonitor.csproj rename to LibreHardwareMonitor.Windows.Forms/LibreHardwareMonitor.Windows.Forms.csproj index 55f051d..82db4dd 100644 --- a/LibreHardwareMonitor/LibreHardwareMonitor.csproj +++ b/LibreHardwareMonitor.Windows.Forms/LibreHardwareMonitor.Windows.Forms.csproj @@ -1,16 +1,16 @@ - + WinExe net472;net10.0-windows x64;x86;ARM64 win-x64;win-x86;win-arm64 - LibreHardwareMonitor + LibreHardwareMonitor.Windows.Forms Libre Hardware Monitor LibreHardwareMonitor true Resources\icon.ico Resources\app.manifest - LibreHardwareMonitor.Program + LibreHardwareMonitor.Windows.Forms.Program true ..\bin\$(Configuration)\ latest diff --git a/LibreHardwareMonitor/Program.cs b/LibreHardwareMonitor.Windows.Forms/Program.cs similarity index 95% rename from LibreHardwareMonitor/Program.cs rename to LibreHardwareMonitor.Windows.Forms/Program.cs index d4a3bda..dad447f 100644 --- a/LibreHardwareMonitor/Program.cs +++ b/LibreHardwareMonitor.Windows.Forms/Program.cs @@ -7,9 +7,9 @@ using System; using System.IO; using System.Windows.Forms; -using LibreHardwareMonitor.UI; +using LibreHardwareMonitor.Windows.Forms.UI; -namespace LibreHardwareMonitor; +namespace LibreHardwareMonitor.Windows.Forms; public static class Program { diff --git a/LibreHardwareMonitor/Resources/PawnIO_setup.exe b/LibreHardwareMonitor.Windows.Forms/Resources/PawnIO_setup.exe similarity index 100% rename from LibreHardwareMonitor/Resources/PawnIO_setup.exe rename to LibreHardwareMonitor.Windows.Forms/Resources/PawnIO_setup.exe diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_222222_256x240.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_222222_256x240.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_222222_256x240.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_222222_256x240.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_2e83ff_256x240.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_2e83ff_256x240.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_2e83ff_256x240.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_454545_256x240.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_454545_256x240.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_454545_256x240.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_454545_256x240.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_888888_256x240.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_888888_256x240.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_888888_256x240.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_888888_256x240.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_cd0a0a_256x240.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/images/ui-icons_cd0a0a_256x240.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/images/ui-icons_cd0a0a_256x240.png diff --git a/LibreHardwareMonitor/Resources/Web/css/custom-theme/jquery-ui-1.8.16.custom.css b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/jquery-ui-1.8.16.custom.css similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/custom-theme/jquery-ui-1.8.16.custom.css rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/custom-theme/jquery-ui-1.8.16.custom.css diff --git a/LibreHardwareMonitor/Resources/Web/css/jquery.treeTable.css b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/jquery.treeTable.css similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/jquery.treeTable.css rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/jquery.treeTable.css diff --git a/LibreHardwareMonitor/Resources/Web/css/ohm_web.css b/LibreHardwareMonitor.Windows.Forms/Resources/Web/css/ohm_web.css similarity index 100% rename from LibreHardwareMonitor/Resources/Web/css/ohm_web.css rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/css/ohm_web.css diff --git a/LibreHardwareMonitor/Resources/Web/favicon.ico b/LibreHardwareMonitor.Windows.Forms/Resources/Web/favicon.ico similarity index 100% rename from LibreHardwareMonitor/Resources/Web/favicon.ico rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/favicon.ico diff --git a/LibreHardwareMonitor/Resources/Web/images/toggle-collapse-dark.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-collapse-dark.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/images/toggle-collapse-dark.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-collapse-dark.png diff --git a/LibreHardwareMonitor/Resources/Web/images/toggle-collapse-light.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-collapse-light.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/images/toggle-collapse-light.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-collapse-light.png diff --git a/LibreHardwareMonitor/Resources/Web/images/toggle-expand-dark.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-expand-dark.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/images/toggle-expand-dark.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-expand-dark.png diff --git a/LibreHardwareMonitor/Resources/Web/images/toggle-expand-light.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-expand-light.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/images/toggle-expand-light.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/images/toggle-expand-light.png diff --git a/LibreHardwareMonitor/Resources/Web/images/transparent.png b/LibreHardwareMonitor.Windows.Forms/Resources/Web/images/transparent.png similarity index 100% rename from LibreHardwareMonitor/Resources/Web/images/transparent.png rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/images/transparent.png diff --git a/LibreHardwareMonitor/Resources/Web/index.html b/LibreHardwareMonitor.Windows.Forms/Resources/Web/index.html similarity index 100% rename from LibreHardwareMonitor/Resources/Web/index.html rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/index.html diff --git a/LibreHardwareMonitor/Resources/Web/js/jquery-1.7.2.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery-1.7.2.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/jquery-1.7.2.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery-1.7.2.js diff --git a/LibreHardwareMonitor/Resources/Web/js/jquery-1.7.2.min.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery-1.7.2.min.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/jquery-1.7.2.min.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery-1.7.2.min.js diff --git a/LibreHardwareMonitor/Resources/Web/js/jquery-ui-1.8.16.custom.min.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery-ui-1.8.16.custom.min.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/jquery-ui-1.8.16.custom.min.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery-ui-1.8.16.custom.min.js diff --git a/LibreHardwareMonitor/Resources/Web/js/jquery.tmpl.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery.tmpl.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/jquery.tmpl.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery.tmpl.js diff --git a/LibreHardwareMonitor/Resources/Web/js/jquery.tmpl.min.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery.tmpl.min.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/jquery.tmpl.min.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery.tmpl.min.js diff --git a/LibreHardwareMonitor/Resources/Web/js/jquery.treeTable.min.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery.treeTable.min.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/jquery.treeTable.min.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/jquery.treeTable.min.js diff --git a/LibreHardwareMonitor/Resources/Web/js/knockout-2.1.0.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout-2.1.0.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/knockout-2.1.0.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout-2.1.0.js diff --git a/LibreHardwareMonitor/Resources/Web/js/knockout-2.1.0.min.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout-2.1.0.min.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/knockout-2.1.0.min.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout-2.1.0.min.js diff --git a/LibreHardwareMonitor/Resources/Web/js/knockout.mapping-latest.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout.mapping-latest.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/knockout.mapping-latest.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout.mapping-latest.js diff --git a/LibreHardwareMonitor/Resources/Web/js/knockout.mapping-latest.min.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout.mapping-latest.min.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/knockout.mapping-latest.min.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/knockout.mapping-latest.min.js diff --git a/LibreHardwareMonitor/Resources/Web/js/ohm_web.js b/LibreHardwareMonitor.Windows.Forms/Resources/Web/js/ohm_web.js similarity index 100% rename from LibreHardwareMonitor/Resources/Web/js/ohm_web.js rename to LibreHardwareMonitor.Windows.Forms/Resources/Web/js/ohm_web.js diff --git a/LibreHardwareMonitor/Resources/amd.png b/LibreHardwareMonitor.Windows.Forms/Resources/amd.png similarity index 100% rename from LibreHardwareMonitor/Resources/amd.png rename to LibreHardwareMonitor.Windows.Forms/Resources/amd.png diff --git a/LibreHardwareMonitor/Resources/app.manifest b/LibreHardwareMonitor.Windows.Forms/Resources/app.manifest similarity index 100% rename from LibreHardwareMonitor/Resources/app.manifest rename to LibreHardwareMonitor.Windows.Forms/Resources/app.manifest diff --git a/LibreHardwareMonitor/Resources/ati.png b/LibreHardwareMonitor.Windows.Forms/Resources/ati.png similarity index 100% rename from LibreHardwareMonitor/Resources/ati.png rename to LibreHardwareMonitor.Windows.Forms/Resources/ati.png diff --git a/LibreHardwareMonitor/Resources/bar.png b/LibreHardwareMonitor.Windows.Forms/Resources/bar.png similarity index 100% rename from LibreHardwareMonitor/Resources/bar.png rename to LibreHardwareMonitor.Windows.Forms/Resources/bar.png diff --git a/LibreHardwareMonitor/Resources/barback.png b/LibreHardwareMonitor.Windows.Forms/Resources/barback.png similarity index 100% rename from LibreHardwareMonitor/Resources/barback.png rename to LibreHardwareMonitor.Windows.Forms/Resources/barback.png diff --git a/LibreHardwareMonitor/Resources/battery.png b/LibreHardwareMonitor.Windows.Forms/Resources/battery.png similarity index 100% rename from LibreHardwareMonitor/Resources/battery.png rename to LibreHardwareMonitor.Windows.Forms/Resources/battery.png diff --git a/LibreHardwareMonitor/Resources/chip.png b/LibreHardwareMonitor.Windows.Forms/Resources/chip.png similarity index 100% rename from LibreHardwareMonitor/Resources/chip.png rename to LibreHardwareMonitor.Windows.Forms/Resources/chip.png diff --git a/LibreHardwareMonitor/Resources/clock.png b/LibreHardwareMonitor.Windows.Forms/Resources/clock.png similarity index 100% rename from LibreHardwareMonitor/Resources/clock.png rename to LibreHardwareMonitor.Windows.Forms/Resources/clock.png diff --git a/LibreHardwareMonitor/Resources/computer.png b/LibreHardwareMonitor.Windows.Forms/Resources/computer.png similarity index 100% rename from LibreHardwareMonitor/Resources/computer.png rename to LibreHardwareMonitor.Windows.Forms/Resources/computer.png diff --git a/LibreHardwareMonitor/Resources/control.png b/LibreHardwareMonitor.Windows.Forms/Resources/control.png similarity index 100% rename from LibreHardwareMonitor/Resources/control.png rename to LibreHardwareMonitor.Windows.Forms/Resources/control.png diff --git a/LibreHardwareMonitor/Resources/cpu.png b/LibreHardwareMonitor.Windows.Forms/Resources/cpu.png similarity index 100% rename from LibreHardwareMonitor/Resources/cpu.png rename to LibreHardwareMonitor.Windows.Forms/Resources/cpu.png diff --git a/LibreHardwareMonitor/Resources/current.png b/LibreHardwareMonitor.Windows.Forms/Resources/current.png similarity index 100% rename from LibreHardwareMonitor/Resources/current.png rename to LibreHardwareMonitor.Windows.Forms/Resources/current.png diff --git a/LibreHardwareMonitor/Resources/data.png b/LibreHardwareMonitor.Windows.Forms/Resources/data.png similarity index 100% rename from LibreHardwareMonitor/Resources/data.png rename to LibreHardwareMonitor.Windows.Forms/Resources/data.png diff --git a/LibreHardwareMonitor/Resources/factor.png b/LibreHardwareMonitor.Windows.Forms/Resources/factor.png similarity index 100% rename from LibreHardwareMonitor/Resources/factor.png rename to LibreHardwareMonitor.Windows.Forms/Resources/factor.png diff --git a/LibreHardwareMonitor/Resources/fan.png b/LibreHardwareMonitor.Windows.Forms/Resources/fan.png similarity index 100% rename from LibreHardwareMonitor/Resources/fan.png rename to LibreHardwareMonitor.Windows.Forms/Resources/fan.png diff --git a/LibreHardwareMonitor/Resources/flow.png b/LibreHardwareMonitor.Windows.Forms/Resources/flow.png similarity index 100% rename from LibreHardwareMonitor/Resources/flow.png rename to LibreHardwareMonitor.Windows.Forms/Resources/flow.png diff --git a/LibreHardwareMonitor/Resources/gadget.png b/LibreHardwareMonitor.Windows.Forms/Resources/gadget.png similarity index 100% rename from LibreHardwareMonitor/Resources/gadget.png rename to LibreHardwareMonitor.Windows.Forms/Resources/gadget.png diff --git a/LibreHardwareMonitor/Resources/gadget.xcf b/LibreHardwareMonitor.Windows.Forms/Resources/gadget.xcf similarity index 100% rename from LibreHardwareMonitor/Resources/gadget.xcf rename to LibreHardwareMonitor.Windows.Forms/Resources/gadget.xcf diff --git a/LibreHardwareMonitor/Resources/hdd.png b/LibreHardwareMonitor.Windows.Forms/Resources/hdd.png similarity index 100% rename from LibreHardwareMonitor/Resources/hdd.png rename to LibreHardwareMonitor.Windows.Forms/Resources/hdd.png diff --git a/LibreHardwareMonitor/Resources/humidity.png b/LibreHardwareMonitor.Windows.Forms/Resources/humidity.png similarity index 100% rename from LibreHardwareMonitor/Resources/humidity.png rename to LibreHardwareMonitor.Windows.Forms/Resources/humidity.png diff --git a/LibreHardwareMonitor/Resources/icon.ico b/LibreHardwareMonitor.Windows.Forms/Resources/icon.ico similarity index 100% rename from LibreHardwareMonitor/Resources/icon.ico rename to LibreHardwareMonitor.Windows.Forms/Resources/icon.ico diff --git a/LibreHardwareMonitor/Resources/icon.xcf b/LibreHardwareMonitor.Windows.Forms/Resources/icon.xcf similarity index 100% rename from LibreHardwareMonitor/Resources/icon.xcf rename to LibreHardwareMonitor.Windows.Forms/Resources/icon.xcf diff --git a/LibreHardwareMonitor/Resources/intel.png b/LibreHardwareMonitor.Windows.Forms/Resources/intel.png similarity index 100% rename from LibreHardwareMonitor/Resources/intel.png rename to LibreHardwareMonitor.Windows.Forms/Resources/intel.png diff --git a/LibreHardwareMonitor/Resources/level.png b/LibreHardwareMonitor.Windows.Forms/Resources/level.png similarity index 100% rename from LibreHardwareMonitor/Resources/level.png rename to LibreHardwareMonitor.Windows.Forms/Resources/level.png diff --git a/LibreHardwareMonitor/Resources/load.png b/LibreHardwareMonitor.Windows.Forms/Resources/load.png similarity index 100% rename from LibreHardwareMonitor/Resources/load.png rename to LibreHardwareMonitor.Windows.Forms/Resources/load.png diff --git a/LibreHardwareMonitor/Resources/loudspeaker.png b/LibreHardwareMonitor.Windows.Forms/Resources/loudspeaker.png similarity index 100% rename from LibreHardwareMonitor/Resources/loudspeaker.png rename to LibreHardwareMonitor.Windows.Forms/Resources/loudspeaker.png diff --git a/LibreHardwareMonitor/Resources/mainboard.png b/LibreHardwareMonitor.Windows.Forms/Resources/mainboard.png similarity index 100% rename from LibreHardwareMonitor/Resources/mainboard.png rename to LibreHardwareMonitor.Windows.Forms/Resources/mainboard.png diff --git a/LibreHardwareMonitor/Resources/nic.png b/LibreHardwareMonitor.Windows.Forms/Resources/nic.png similarity index 100% rename from LibreHardwareMonitor/Resources/nic.png rename to LibreHardwareMonitor.Windows.Forms/Resources/nic.png diff --git a/LibreHardwareMonitor/Resources/nvidia.png b/LibreHardwareMonitor.Windows.Forms/Resources/nvidia.png similarity index 100% rename from LibreHardwareMonitor/Resources/nvidia.png rename to LibreHardwareMonitor.Windows.Forms/Resources/nvidia.png diff --git a/LibreHardwareMonitor/Resources/power-supply.png b/LibreHardwareMonitor.Windows.Forms/Resources/power-supply.png similarity index 100% rename from LibreHardwareMonitor/Resources/power-supply.png rename to LibreHardwareMonitor.Windows.Forms/Resources/power-supply.png diff --git a/LibreHardwareMonitor/Resources/power.png b/LibreHardwareMonitor.Windows.Forms/Resources/power.png similarity index 100% rename from LibreHardwareMonitor/Resources/power.png rename to LibreHardwareMonitor.Windows.Forms/Resources/power.png diff --git a/LibreHardwareMonitor/Resources/powermonitor.png b/LibreHardwareMonitor.Windows.Forms/Resources/powermonitor.png similarity index 100% rename from LibreHardwareMonitor/Resources/powermonitor.png rename to LibreHardwareMonitor.Windows.Forms/Resources/powermonitor.png diff --git a/LibreHardwareMonitor/Resources/ram.png b/LibreHardwareMonitor.Windows.Forms/Resources/ram.png similarity index 100% rename from LibreHardwareMonitor/Resources/ram.png rename to LibreHardwareMonitor.Windows.Forms/Resources/ram.png diff --git a/LibreHardwareMonitor/Resources/smallicon.ico b/LibreHardwareMonitor.Windows.Forms/Resources/smallicon.ico similarity index 100% rename from LibreHardwareMonitor/Resources/smallicon.ico rename to LibreHardwareMonitor.Windows.Forms/Resources/smallicon.ico diff --git a/LibreHardwareMonitor/Resources/temperature.png b/LibreHardwareMonitor.Windows.Forms/Resources/temperature.png similarity index 100% rename from LibreHardwareMonitor/Resources/temperature.png rename to LibreHardwareMonitor.Windows.Forms/Resources/temperature.png diff --git a/LibreHardwareMonitor/Resources/throughput.png b/LibreHardwareMonitor.Windows.Forms/Resources/throughput.png similarity index 100% rename from LibreHardwareMonitor/Resources/throughput.png rename to LibreHardwareMonitor.Windows.Forms/Resources/throughput.png diff --git a/LibreHardwareMonitor/Resources/time.png b/LibreHardwareMonitor.Windows.Forms/Resources/time.png similarity index 100% rename from LibreHardwareMonitor/Resources/time.png rename to LibreHardwareMonitor.Windows.Forms/Resources/time.png diff --git a/LibreHardwareMonitor/Resources/voltage.png b/LibreHardwareMonitor.Windows.Forms/Resources/voltage.png similarity index 100% rename from LibreHardwareMonitor/Resources/voltage.png rename to LibreHardwareMonitor.Windows.Forms/Resources/voltage.png diff --git a/LibreHardwareMonitor/TestScripts/LiquidCool.py b/LibreHardwareMonitor.Windows.Forms/TestScripts/LiquidCool.py similarity index 100% rename from LibreHardwareMonitor/TestScripts/LiquidCool.py rename to LibreHardwareMonitor.Windows.Forms/TestScripts/LiquidCool.py diff --git a/LibreHardwareMonitor/TestScripts/basicrest.py b/LibreHardwareMonitor.Windows.Forms/TestScripts/basicrest.py similarity index 100% rename from LibreHardwareMonitor/TestScripts/basicrest.py rename to LibreHardwareMonitor.Windows.Forms/TestScripts/basicrest.py diff --git a/LibreHardwareMonitor/TestScripts/basicwmi.py b/LibreHardwareMonitor.Windows.Forms/TestScripts/basicwmi.py similarity index 100% rename from LibreHardwareMonitor/TestScripts/basicwmi.py rename to LibreHardwareMonitor.Windows.Forms/TestScripts/basicwmi.py diff --git a/LibreHardwareMonitor/UI/AboutBox.Designer.cs b/LibreHardwareMonitor.Windows.Forms/UI/AboutBox.Designer.cs similarity index 99% rename from LibreHardwareMonitor/UI/AboutBox.Designer.cs rename to LibreHardwareMonitor.Windows.Forms/UI/AboutBox.Designer.cs index 1e4e17c..9527553 100644 --- a/LibreHardwareMonitor/UI/AboutBox.Designer.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/AboutBox.Designer.cs @@ -4,7 +4,7 @@ // Partial Copyright (C) Michael Möller and Contributors. // All Rights Reserved. -namespace LibreHardwareMonitor.UI +namespace LibreHardwareMonitor.Windows.Forms.UI { sealed partial class AboutBox { diff --git a/LibreHardwareMonitor/UI/AboutBox.cs b/LibreHardwareMonitor.Windows.Forms/UI/AboutBox.cs similarity index 92% rename from LibreHardwareMonitor/UI/AboutBox.cs rename to LibreHardwareMonitor.Windows.Forms/UI/AboutBox.cs index 3ecd41a..17854db 100644 --- a/LibreHardwareMonitor/UI/AboutBox.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/AboutBox.cs @@ -7,9 +7,9 @@ using System.Diagnostics; using System.Drawing; using System.Windows.Forms; -using LibreHardwareMonitor.UI.Themes; +using LibreHardwareMonitor.Windows.Forms.UI.Themes; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public sealed partial class AboutBox : Form { diff --git a/LibreHardwareMonitor/UI/AboutBox.resx b/LibreHardwareMonitor.Windows.Forms/UI/AboutBox.resx similarity index 100% rename from LibreHardwareMonitor/UI/AboutBox.resx rename to LibreHardwareMonitor.Windows.Forms/UI/AboutBox.resx diff --git a/LibreHardwareMonitor/UI/AuthForm.Designer.cs b/LibreHardwareMonitor.Windows.Forms/UI/AuthForm.Designer.cs similarity index 99% rename from LibreHardwareMonitor/UI/AuthForm.Designer.cs rename to LibreHardwareMonitor.Windows.Forms/UI/AuthForm.Designer.cs index 9a9e873..734aa55 100644 --- a/LibreHardwareMonitor/UI/AuthForm.Designer.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/AuthForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LibreHardwareMonitor.UI +namespace LibreHardwareMonitor.Windows.Forms.UI { partial class AuthForm { diff --git a/LibreHardwareMonitor/UI/AuthForm.cs b/LibreHardwareMonitor.Windows.Forms/UI/AuthForm.cs similarity index 96% rename from LibreHardwareMonitor/UI/AuthForm.cs rename to LibreHardwareMonitor.Windows.Forms/UI/AuthForm.cs index b590495..acc7b28 100644 --- a/LibreHardwareMonitor/UI/AuthForm.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/AuthForm.cs @@ -7,7 +7,7 @@ using System; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public partial class AuthForm : Form { diff --git a/LibreHardwareMonitor/UI/AuthForm.resx b/LibreHardwareMonitor.Windows.Forms/UI/AuthForm.resx similarity index 100% rename from LibreHardwareMonitor/UI/AuthForm.resx rename to LibreHardwareMonitor.Windows.Forms/UI/AuthForm.resx diff --git a/LibreHardwareMonitor/UI/Gadget.cs b/LibreHardwareMonitor.Windows.Forms/UI/Gadget.cs similarity index 98% rename from LibreHardwareMonitor/UI/Gadget.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Gadget.cs index 41ef4cc..b8b45ab 100644 --- a/LibreHardwareMonitor/UI/Gadget.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Gadget.cs @@ -8,7 +8,7 @@ using System; using System.Drawing; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public abstract class Gadget : IDisposable { diff --git a/LibreHardwareMonitor/UI/GadgetWindow.cs b/LibreHardwareMonitor.Windows.Forms/UI/GadgetWindow.cs similarity index 99% rename from LibreHardwareMonitor/UI/GadgetWindow.cs rename to LibreHardwareMonitor.Windows.Forms/UI/GadgetWindow.cs index 45a302b..e6b7ea9 100644 --- a/LibreHardwareMonitor/UI/GadgetWindow.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/GadgetWindow.cs @@ -12,7 +12,7 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public sealed class GadgetWindow : NativeWindow, IDisposable { diff --git a/LibreHardwareMonitor/UI/HardwareNode.cs b/LibreHardwareMonitor.Windows.Forms/UI/HardwareNode.cs similarity index 97% rename from LibreHardwareMonitor/UI/HardwareNode.cs rename to LibreHardwareMonitor.Windows.Forms/UI/HardwareNode.cs index 86f3e11..cb2f4f5 100644 --- a/LibreHardwareMonitor/UI/HardwareNode.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/HardwareNode.cs @@ -5,12 +5,12 @@ // All Rights Reserved. using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; using System; using System.Collections.Generic; using System.Text; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class HardwareNode : Node, IExpandPersistNode { @@ -154,4 +154,4 @@ public class HardwareNode : Node, IExpandPersistNode PlotSelectionChanged?.Invoke(this, null); } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitor/UI/HardwareTypeImage.cs b/LibreHardwareMonitor.Windows.Forms/UI/HardwareTypeImage.cs similarity index 98% rename from LibreHardwareMonitor/UI/HardwareTypeImage.cs rename to LibreHardwareMonitor.Windows.Forms/UI/HardwareTypeImage.cs index 3d867b8..0a59909 100644 --- a/LibreHardwareMonitor/UI/HardwareTypeImage.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/HardwareTypeImage.cs @@ -8,7 +8,7 @@ using System.Drawing; using System.Collections.Generic; using LibreHardwareMonitor.Hardware; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class HardwareTypeImage { diff --git a/LibreHardwareMonitor/UI/IExpandPersistNode.cs b/LibreHardwareMonitor.Windows.Forms/UI/IExpandPersistNode.cs similarity index 58% rename from LibreHardwareMonitor/UI/IExpandPersistNode.cs rename to LibreHardwareMonitor.Windows.Forms/UI/IExpandPersistNode.cs index 63b433b..36b8246 100644 --- a/LibreHardwareMonitor/UI/IExpandPersistNode.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/IExpandPersistNode.cs @@ -1,4 +1,4 @@ -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public interface IExpandPersistNode { diff --git a/LibreHardwareMonitor/UI/InterfacePortForm.Designer.cs b/LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.Designer.cs similarity index 99% rename from LibreHardwareMonitor/UI/InterfacePortForm.Designer.cs rename to LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.Designer.cs index b791af2..143ca58 100644 --- a/LibreHardwareMonitor/UI/InterfacePortForm.Designer.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.Designer.cs @@ -4,7 +4,7 @@ // Partial Copyright (C) Michael Möller and Contributors. // All Rights Reserved. -namespace LibreHardwareMonitor.UI +namespace LibreHardwareMonitor.Windows.Forms.UI { partial class InterfacePortForm { diff --git a/LibreHardwareMonitor/UI/InterfacePortForm.cs b/LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.cs similarity index 98% rename from LibreHardwareMonitor/UI/InterfacePortForm.cs rename to LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.cs index 54b050b..f326a34 100644 --- a/LibreHardwareMonitor/UI/InterfacePortForm.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.cs @@ -12,7 +12,7 @@ using System.Diagnostics; using static System.Windows.Forms.VisualStyles.VisualStyleElement; using System.Net.NetworkInformation; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public partial class InterfacePortForm : Form { diff --git a/LibreHardwareMonitor/UI/InterfacePortForm.resx b/LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.resx similarity index 100% rename from LibreHardwareMonitor/UI/InterfacePortForm.resx rename to LibreHardwareMonitor.Windows.Forms/UI/InterfacePortForm.resx diff --git a/LibreHardwareMonitor/UI/MainForm.Designer.cs b/LibreHardwareMonitor.Windows.Forms/UI/MainForm.Designer.cs similarity index 94% rename from LibreHardwareMonitor/UI/MainForm.Designer.cs rename to LibreHardwareMonitor.Windows.Forms/UI/MainForm.Designer.cs index dba5a5e..369317b 100644 --- a/LibreHardwareMonitor/UI/MainForm.Designer.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/MainForm.Designer.cs @@ -4,7 +4,7 @@ // Partial Copyright (C) Michael Möller and Contributors. // All Rights Reserved. -namespace LibreHardwareMonitor.UI +namespace LibreHardwareMonitor.Windows.Forms.UI { sealed partial class MainForm { @@ -84,62 +84,62 @@ namespace LibreHardwareMonitor.UI this.startupMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.separatorMenuItem = new System.Windows.Forms.ToolStripSeparator(); this.temperatureUnitsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.celsiusMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.fahrenheitMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.celsiusMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.fahrenheitMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.plotLocationMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.plotWindowMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.plotBottomMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.plotRightMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.plotWindowMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.plotBottomMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.plotRightMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.themeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.strokeThicknessMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.strokeThickness1ptMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.strokeThickness2ptMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.strokeThickness3ptMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.strokeThickness4ptMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.strokeThickness1ptMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.strokeThickness2ptMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.strokeThickness3ptMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.strokeThickness4ptMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.splitPlotPanelScalingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.splitPanelPercentageScalingMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.splitPanelFixedPlotScalingMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.splitPanelFixedSensorScalingMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.splitPanelPercentageScalingMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.splitPanelFixedPlotScalingMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.splitPanelFixedSensorScalingMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.logSeparatorMenuItem = new System.Windows.Forms.ToolStripSeparator(); this.logSensorsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.forceDriveWakeupItem = new System.Windows.Forms.ToolStripMenuItem(); this.fileRotationMethod = new System.Windows.Forms.ToolStripMenuItem(); - this.perSessionFileRotationMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.dailyFileRotationMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.perSessionFileRotationMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.dailyFileRotationMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.loggingIntervalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.log1sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log2sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log5sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log10sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log30sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log1minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log2minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log5minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log10minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log30minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log1hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log2hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.log6hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.log1sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log2sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log5sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log10sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log30sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log1minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log2minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log5minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log10minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log30minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log1hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log2hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.log6hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.updateIntervalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.updateInterval250msMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.updateInterval500msMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.updateInterval1sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.updateInterval2sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.updateInterval5sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.updateInterval10sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.updateInterval250msMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.updateInterval500msMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.updateInterval1sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.updateInterval2sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.updateInterval5sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.updateInterval10sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.throttleAtaUpdateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sensorValuesTimeWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.timeWindow30sMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow1minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow2minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow5minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow10minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow30minMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow1hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow2hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow6hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow12hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); - this.timeWindow24hMenuItem = new LibreHardwareMonitor.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow30sMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow1minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow2minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow5minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow10minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow30minMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow1hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow2hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow6hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow12hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); + this.timeWindow24hMenuItem = new LibreHardwareMonitor.Windows.Forms.UI.ToolStripRadioButtonMenuItem(); this.webMenuItemSeparator = new System.Windows.Forms.ToolStripSeparator(); this.webMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.runWebServerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -150,7 +150,7 @@ namespace LibreHardwareMonitor.UI this.treeContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.timer = new System.Windows.Forms.Timer(this.components); - this.splitContainer = new LibreHardwareMonitor.UI.SplitContainerAdv(); + this.splitContainer = new LibreHardwareMonitor.Windows.Forms.UI.SplitContainerAdv(); this.treeView = new Aga.Controls.Tree.TreeViewAdv(); this.batteryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.backgroundUpdater = new System.ComponentModel.BackgroundWorker(); diff --git a/LibreHardwareMonitor/UI/MainForm.cs b/LibreHardwareMonitor.Windows.Forms/UI/MainForm.cs similarity index 99% rename from LibreHardwareMonitor/UI/MainForm.cs rename to LibreHardwareMonitor.Windows.Forms/UI/MainForm.cs index 1a3970d..f33c28c 100644 --- a/LibreHardwareMonitor/UI/MainForm.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/MainForm.cs @@ -17,10 +17,10 @@ using Aga.Controls.Tree; using Aga.Controls.Tree.NodeControls; using LibreHardwareMonitor.Hardware; using LibreHardwareMonitor.Hardware.Storage; -using LibreHardwareMonitor.UI.Themes; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.UI.Themes; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public sealed partial class MainForm : Form { diff --git a/LibreHardwareMonitor/UI/MainForm.resx b/LibreHardwareMonitor.Windows.Forms/UI/MainForm.resx similarity index 100% rename from LibreHardwareMonitor/UI/MainForm.resx rename to LibreHardwareMonitor.Windows.Forms/UI/MainForm.resx diff --git a/LibreHardwareMonitor/UI/Node.cs b/LibreHardwareMonitor.Windows.Forms/UI/Node.cs similarity index 98% rename from LibreHardwareMonitor/UI/Node.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Node.cs index 875d720..2f1b3af 100644 --- a/LibreHardwareMonitor/UI/Node.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Node.cs @@ -8,7 +8,7 @@ using System; using System.Collections.ObjectModel; using System.Drawing; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class Node { diff --git a/LibreHardwareMonitor/UI/NodeToolTipProvider.cs b/LibreHardwareMonitor.Windows.Forms/UI/NodeToolTipProvider.cs similarity index 91% rename from LibreHardwareMonitor/UI/NodeToolTipProvider.cs rename to LibreHardwareMonitor.Windows.Forms/UI/NodeToolTipProvider.cs index 1c19569..4edb37c 100644 --- a/LibreHardwareMonitor/UI/NodeToolTipProvider.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/NodeToolTipProvider.cs @@ -6,7 +6,7 @@ using Aga.Controls.Tree; using Aga.Controls.Tree.NodeControls; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; internal class NodeToolTipProvider : IToolTipProvider { diff --git a/LibreHardwareMonitor/UI/NotifyIconAdv.cs b/LibreHardwareMonitor.Windows.Forms/UI/NotifyIconAdv.cs similarity index 99% rename from LibreHardwareMonitor/UI/NotifyIconAdv.cs rename to LibreHardwareMonitor.Windows.Forms/UI/NotifyIconAdv.cs index 7798e45..a3a8eef 100644 --- a/LibreHardwareMonitor/UI/NotifyIconAdv.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/NotifyIconAdv.cs @@ -11,7 +11,7 @@ using System.Runtime.InteropServices; using System.Reflection; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class NotifyIconAdv : IDisposable { diff --git a/LibreHardwareMonitor/UI/ParameterForm.Designer.cs b/LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.Designer.cs similarity index 99% rename from LibreHardwareMonitor/UI/ParameterForm.Designer.cs rename to LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.Designer.cs index ae6ee44..ed08b02 100644 --- a/LibreHardwareMonitor/UI/ParameterForm.Designer.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.Designer.cs @@ -4,7 +4,7 @@ // Partial Copyright (C) Michael Möller and Contributors. // All Rights Reserved. -namespace LibreHardwareMonitor.UI +namespace LibreHardwareMonitor.Windows.Forms.UI { partial class ParameterForm { diff --git a/LibreHardwareMonitor/UI/ParameterForm.cs b/LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.cs similarity index 98% rename from LibreHardwareMonitor/UI/ParameterForm.cs rename to LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.cs index ee8f867..084c28a 100644 --- a/LibreHardwareMonitor/UI/ParameterForm.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.cs @@ -10,7 +10,7 @@ using System.ComponentModel; using System.Windows.Forms; using LibreHardwareMonitor.Hardware; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public partial class ParameterForm : Form { diff --git a/LibreHardwareMonitor/UI/ParameterForm.resx b/LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.resx similarity index 100% rename from LibreHardwareMonitor/UI/ParameterForm.resx rename to LibreHardwareMonitor.Windows.Forms/UI/ParameterForm.resx diff --git a/LibreHardwareMonitor/UI/PlotPanel.cs b/LibreHardwareMonitor.Windows.Forms/UI/PlotPanel.cs similarity index 99% rename from LibreHardwareMonitor/UI/PlotPanel.cs rename to LibreHardwareMonitor.Windows.Forms/UI/PlotPanel.cs index 861d731..b050b53 100644 --- a/LibreHardwareMonitor/UI/PlotPanel.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/PlotPanel.cs @@ -10,15 +10,15 @@ using System.Drawing; using System.Linq; using System.Windows.Forms; using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; using OxyPlot; using OxyPlot.Annotations; using OxyPlot.Axes; using OxyPlot.WindowsForms; using OxyPlot.Series; -using LibreHardwareMonitor.UI.Themes; +using LibreHardwareMonitor.Windows.Forms.UI.Themes; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class PlotPanel : UserControl { diff --git a/LibreHardwareMonitor/UI/ScaledPlotModel.cs b/LibreHardwareMonitor.Windows.Forms/UI/ScaledPlotModel.cs similarity index 95% rename from LibreHardwareMonitor/UI/ScaledPlotModel.cs rename to LibreHardwareMonitor.Windows.Forms/UI/ScaledPlotModel.cs index eb02187..9e1b89d 100644 --- a/LibreHardwareMonitor/UI/ScaledPlotModel.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/ScaledPlotModel.cs @@ -1,7 +1,7 @@ using OxyPlot; using OxyPlot.Legends; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; class ScaledPlotModel : PlotModel { diff --git a/LibreHardwareMonitor/UI/SensorGadget.cs b/LibreHardwareMonitor.Windows.Forms/UI/SensorGadget.cs similarity index 99% rename from LibreHardwareMonitor/UI/SensorGadget.cs rename to LibreHardwareMonitor.Windows.Forms/UI/SensorGadget.cs index 7e516c0..beba3ef 100644 --- a/LibreHardwareMonitor/UI/SensorGadget.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/SensorGadget.cs @@ -14,10 +14,10 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.UI.Themes; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.UI.Themes; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class SensorGadget : Gadget { diff --git a/LibreHardwareMonitor/UI/SensorNode.cs b/LibreHardwareMonitor.Windows.Forms/UI/SensorNode.cs similarity index 98% rename from LibreHardwareMonitor/UI/SensorNode.cs rename to LibreHardwareMonitor.Windows.Forms/UI/SensorNode.cs index 22e723e..49fa946 100644 --- a/LibreHardwareMonitor/UI/SensorNode.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/SensorNode.cs @@ -9,9 +9,9 @@ using System.Drawing; using System.Globalization; using System.Text; using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class SensorNode : Node { diff --git a/LibreHardwareMonitor/UI/SensorNotifyIcon.cs b/LibreHardwareMonitor.Windows.Forms/UI/SensorNotifyIcon.cs similarity index 99% rename from LibreHardwareMonitor/UI/SensorNotifyIcon.cs rename to LibreHardwareMonitor.Windows.Forms/UI/SensorNotifyIcon.cs index 577b67a..f427d15 100644 --- a/LibreHardwareMonitor/UI/SensorNotifyIcon.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/SensorNotifyIcon.cs @@ -12,9 +12,9 @@ using System.Drawing.Text; using System.Runtime.InteropServices; using System.Windows.Forms; using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class SensorNotifyIcon : IDisposable { diff --git a/LibreHardwareMonitor/UI/ShowDesktop.cs b/LibreHardwareMonitor.Windows.Forms/UI/ShowDesktop.cs similarity index 99% rename from LibreHardwareMonitor/UI/ShowDesktop.cs rename to LibreHardwareMonitor.Windows.Forms/UI/ShowDesktop.cs index 97d1dbf..220f684 100644 --- a/LibreHardwareMonitor/UI/ShowDesktop.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/ShowDesktop.cs @@ -8,7 +8,7 @@ using System; using System.Runtime.InteropServices; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class ShowDesktop : IDisposable { diff --git a/LibreHardwareMonitor/UI/SplitContainerAdv.cs b/LibreHardwareMonitor.Windows.Forms/UI/SplitContainerAdv.cs similarity index 97% rename from LibreHardwareMonitor/UI/SplitContainerAdv.cs rename to LibreHardwareMonitor.Windows.Forms/UI/SplitContainerAdv.cs index 7d06347..a2da4b5 100644 --- a/LibreHardwareMonitor/UI/SplitContainerAdv.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/SplitContainerAdv.cs @@ -7,9 +7,9 @@ using System; using System.Drawing; using System.Windows.Forms; -using LibreHardwareMonitor.UI.Themes; +using LibreHardwareMonitor.Windows.Forms.UI.Themes; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class SplitContainerAdv : SplitContainer { diff --git a/LibreHardwareMonitor/UI/StartupManager.cs b/LibreHardwareMonitor.Windows.Forms/UI/StartupManager.cs similarity index 99% rename from LibreHardwareMonitor/UI/StartupManager.cs rename to LibreHardwareMonitor.Windows.Forms/UI/StartupManager.cs index 10a8a1d..18e610a 100644 --- a/LibreHardwareMonitor/UI/StartupManager.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/StartupManager.cs @@ -14,7 +14,7 @@ using Microsoft.Win32; using Microsoft.Win32.TaskScheduler; using Action = Microsoft.Win32.TaskScheduler.Action; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class StartupManager { diff --git a/LibreHardwareMonitor/UI/SystemTray.cs b/LibreHardwareMonitor.Windows.Forms/UI/SystemTray.cs similarity index 98% rename from LibreHardwareMonitor/UI/SystemTray.cs rename to LibreHardwareMonitor.Windows.Forms/UI/SystemTray.cs index 048d2df..10ec3d8 100644 --- a/LibreHardwareMonitor/UI/SystemTray.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/SystemTray.cs @@ -8,9 +8,9 @@ using System; using System.Collections.Generic; using System.Windows.Forms; using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class SystemTray : IDisposable { @@ -182,4 +182,4 @@ public class SystemTray : IDisposable } } } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitor/UI/Theme.cs b/LibreHardwareMonitor.Windows.Forms/UI/Theme.cs similarity index 99% rename from LibreHardwareMonitor/UI/Theme.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Theme.cs index e7bf614..33d7f0f 100644 --- a/LibreHardwareMonitor/UI/Theme.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Theme.cs @@ -7,7 +7,7 @@ using System.Windows.Forms; using Aga.Controls.Tree; using Microsoft.Win32; -namespace LibreHardwareMonitor.UI.Themes +namespace LibreHardwareMonitor.Windows.Forms.UI.Themes { public abstract class Theme { diff --git a/LibreHardwareMonitor/UI/Themes/BlackTheme.cs b/LibreHardwareMonitor.Windows.Forms/UI/Themes/BlackTheme.cs similarity index 96% rename from LibreHardwareMonitor/UI/Themes/BlackTheme.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Themes/BlackTheme.cs index 897185b..63badcf 100644 --- a/LibreHardwareMonitor/UI/Themes/BlackTheme.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Themes/BlackTheme.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Linq; -namespace LibreHardwareMonitor.UI.Themes +namespace LibreHardwareMonitor.Windows.Forms.UI.Themes { public class BlackTheme : LightTheme { diff --git a/LibreHardwareMonitor/UI/Themes/DarkTheme.cs b/LibreHardwareMonitor.Windows.Forms/UI/Themes/DarkTheme.cs similarity index 96% rename from LibreHardwareMonitor/UI/Themes/DarkTheme.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Themes/DarkTheme.cs index 462de55..62ec8d8 100644 --- a/LibreHardwareMonitor/UI/Themes/DarkTheme.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Themes/DarkTheme.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Linq; -namespace LibreHardwareMonitor.UI.Themes +namespace LibreHardwareMonitor.Windows.Forms.UI.Themes { public class DarkTheme : LightTheme { diff --git a/LibreHardwareMonitor/UI/Themes/LightTheme.cs b/LibreHardwareMonitor.Windows.Forms/UI/Themes/LightTheme.cs similarity index 96% rename from LibreHardwareMonitor/UI/Themes/LightTheme.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Themes/LightTheme.cs index 0612acf..6ff8b76 100644 --- a/LibreHardwareMonitor/UI/Themes/LightTheme.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Themes/LightTheme.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace LibreHardwareMonitor.UI.Themes +namespace LibreHardwareMonitor.Windows.Forms.UI.Themes { public class LightTheme : Theme { diff --git a/LibreHardwareMonitor/UI/Themes/ThemedHScrollIndicator.cs b/LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedHScrollIndicator.cs similarity index 98% rename from LibreHardwareMonitor/UI/Themes/ThemedHScrollIndicator.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedHScrollIndicator.cs index 17a0775..9f27c6f 100644 --- a/LibreHardwareMonitor/UI/Themes/ThemedHScrollIndicator.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedHScrollIndicator.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI.Themes +namespace LibreHardwareMonitor.Windows.Forms.UI.Themes { public class ThemedHScrollIndicator : Control { diff --git a/LibreHardwareMonitor/UI/Themes/ThemedToolStripRenderer.cs b/LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedToolStripRenderer.cs similarity index 98% rename from LibreHardwareMonitor/UI/Themes/ThemedToolStripRenderer.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedToolStripRenderer.cs index 32a1eda..e6f6682 100644 --- a/LibreHardwareMonitor/UI/Themes/ThemedToolStripRenderer.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedToolStripRenderer.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI.Themes +namespace LibreHardwareMonitor.Windows.Forms.UI.Themes { public class ThemedToolStripRenderer : ToolStripRenderer { diff --git a/LibreHardwareMonitor/UI/Themes/ThemedVScrollIndicator.cs b/LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedVScrollIndicator.cs similarity index 98% rename from LibreHardwareMonitor/UI/Themes/ThemedVScrollIndicator.cs rename to LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedVScrollIndicator.cs index 16b15f5..31d59a7 100644 --- a/LibreHardwareMonitor/UI/Themes/ThemedVScrollIndicator.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/Themes/ThemedVScrollIndicator.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Windows.Forms; -namespace LibreHardwareMonitor.UI.Themes +namespace LibreHardwareMonitor.Windows.Forms.UI.Themes { public class ThemedVScrollIndicator : Control { diff --git a/LibreHardwareMonitor/UI/ToolStripRadioButtonMenuItem.cs b/LibreHardwareMonitor.Windows.Forms/UI/ToolStripRadioButtonMenuItem.cs similarity index 99% rename from LibreHardwareMonitor/UI/ToolStripRadioButtonMenuItem.cs rename to LibreHardwareMonitor.Windows.Forms/UI/ToolStripRadioButtonMenuItem.cs index c1dacb9..467defd 100644 --- a/LibreHardwareMonitor/UI/ToolStripRadioButtonMenuItem.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/ToolStripRadioButtonMenuItem.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Windows.Forms; using System.Windows.Forms.VisualStyles; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; /// /// https://docs.microsoft.com/en-us/dotnet/desktop/winforms/controls/how-to-display-option-buttons-in-a-menustrip-windows-forms diff --git a/LibreHardwareMonitor/UI/TreeModel.cs b/LibreHardwareMonitor.Windows.Forms/UI/TreeModel.cs similarity index 98% rename from LibreHardwareMonitor/UI/TreeModel.cs rename to LibreHardwareMonitor.Windows.Forms/UI/TreeModel.cs index 896eb5c..d475cd8 100644 --- a/LibreHardwareMonitor/UI/TreeModel.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/TreeModel.cs @@ -11,7 +11,7 @@ using System.Collections.ObjectModel; using System.Linq; using Aga.Controls.Tree; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class TreeModel : ITreeModel { diff --git a/LibreHardwareMonitor/UI/TypeNode.cs b/LibreHardwareMonitor.Windows.Forms/UI/TypeNode.cs similarity index 98% rename from LibreHardwareMonitor/UI/TypeNode.cs rename to LibreHardwareMonitor.Windows.Forms/UI/TypeNode.cs index 0b2bf4e..23ab5df 100644 --- a/LibreHardwareMonitor/UI/TypeNode.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/TypeNode.cs @@ -5,9 +5,9 @@ // All Rights Reserved. using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public sealed class TypeNode : Node, IExpandPersistNode { diff --git a/LibreHardwareMonitor/UI/UnitManager.cs b/LibreHardwareMonitor.Windows.Forms/UI/UnitManager.cs similarity index 91% rename from LibreHardwareMonitor/UI/UnitManager.cs rename to LibreHardwareMonitor.Windows.Forms/UI/UnitManager.cs index 2453c2d..7c8bc96 100644 --- a/LibreHardwareMonitor/UI/UnitManager.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/UnitManager.cs @@ -4,9 +4,9 @@ // Partial Copyright (C) Michael Möller and Contributors. // All Rights Reserved. -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public enum TemperatureUnit { @@ -40,4 +40,4 @@ public class UnitManager { return valueInCelsius * 1.8f + 32; } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitor/UI/UpdateVisitor.cs b/LibreHardwareMonitor.Windows.Forms/UI/UpdateVisitor.cs similarity index 94% rename from LibreHardwareMonitor/UI/UpdateVisitor.cs rename to LibreHardwareMonitor.Windows.Forms/UI/UpdateVisitor.cs index fa8cf19..65b93aa 100644 --- a/LibreHardwareMonitor/UI/UpdateVisitor.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/UpdateVisitor.cs @@ -6,7 +6,7 @@ using LibreHardwareMonitor.Hardware; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class UpdateVisitor : IVisitor { diff --git a/LibreHardwareMonitor/UI/UserOption.cs b/LibreHardwareMonitor.Windows.Forms/UI/UserOption.cs similarity index 94% rename from LibreHardwareMonitor/UI/UserOption.cs rename to LibreHardwareMonitor.Windows.Forms/UI/UserOption.cs index 017410f..c3a9420 100644 --- a/LibreHardwareMonitor/UI/UserOption.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/UserOption.cs @@ -6,9 +6,9 @@ using System; using System.Windows.Forms; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class UserOption { @@ -61,4 +61,4 @@ public class UserOption _changed -= value; } } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitor/UI/UserRadioGroup.cs b/LibreHardwareMonitor.Windows.Forms/UI/UserRadioGroup.cs similarity index 94% rename from LibreHardwareMonitor/UI/UserRadioGroup.cs rename to LibreHardwareMonitor.Windows.Forms/UI/UserRadioGroup.cs index 201a0c0..b4a6271 100644 --- a/LibreHardwareMonitor/UI/UserRadioGroup.cs +++ b/LibreHardwareMonitor.Windows.Forms/UI/UserRadioGroup.cs @@ -6,9 +6,9 @@ using System; using System.Windows.Forms; -using LibreHardwareMonitor.Utilities; +using LibreHardwareMonitor.Windows.Forms.Utilities; -namespace LibreHardwareMonitor.UI; +namespace LibreHardwareMonitor.Windows.Forms.UI; public class UserRadioGroup { @@ -66,4 +66,4 @@ public class UserRadioGroup _changed -= value; } } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitor/Utilities/EmbeddedResources.cs b/LibreHardwareMonitor.Windows.Forms/Utilities/EmbeddedResources.cs similarity index 88% rename from LibreHardwareMonitor/Utilities/EmbeddedResources.cs rename to LibreHardwareMonitor.Windows.Forms/Utilities/EmbeddedResources.cs index 9ad6d56..9996784 100644 --- a/LibreHardwareMonitor/Utilities/EmbeddedResources.cs +++ b/LibreHardwareMonitor.Windows.Forms/Utilities/EmbeddedResources.cs @@ -8,13 +8,15 @@ using System.Drawing; using System.IO; using System.Reflection; -namespace LibreHardwareMonitor.Utilities; +namespace LibreHardwareMonitor.Windows.Forms.Utilities; public class EmbeddedResources { + const string ResourceNamespace = $"LibreHardwareMonitor.Windows.Forms.Resources"; + public static Image GetImage(string name) { - name = "LibreHardwareMonitor.Resources." + name; + name = $"{ResourceNamespace}." + name; string[] names = Assembly.GetExecutingAssembly().GetManifestResourceNames(); for (int i = 0; i < names.Length; i++) @@ -41,7 +43,7 @@ public class EmbeddedResources public static Icon GetIcon(string name) { - name = "LibreHardwareMonitor.Resources." + name; + name = $"{ResourceNamespace}." + name; string[] names = Assembly.GetExecutingAssembly().GetManifestResourceNames(); for (int i = 0; i < names.Length; i++) { @@ -56,4 +58,4 @@ public class EmbeddedResources return null; } -} \ No newline at end of file +} diff --git a/LibreHardwareMonitor/Utilities/HttpServer.cs b/LibreHardwareMonitor.Windows.Forms/Utilities/HttpServer.cs similarity index 99% rename from LibreHardwareMonitor/Utilities/HttpServer.cs rename to LibreHardwareMonitor.Windows.Forms/Utilities/HttpServer.cs index ab7f0f4..5ab663a 100644 --- a/LibreHardwareMonitor/Utilities/HttpServer.cs +++ b/LibreHardwareMonitor.Windows.Forms/Utilities/HttpServer.cs @@ -21,9 +21,9 @@ using System.Threading; using System.Threading.Tasks; using System.Web; using LibreHardwareMonitor.Hardware; -using LibreHardwareMonitor.UI; +using LibreHardwareMonitor.Windows.Forms.UI; -namespace LibreHardwareMonitor.Utilities; +namespace LibreHardwareMonitor.Windows.Forms.Utilities; public class HttpServer { diff --git a/LibreHardwareMonitor/Utilities/IconFactory.cs b/LibreHardwareMonitor.Windows.Forms/Utilities/IconFactory.cs similarity index 99% rename from LibreHardwareMonitor/Utilities/IconFactory.cs rename to LibreHardwareMonitor.Windows.Forms/Utilities/IconFactory.cs index 54947e9..c3b49f5 100644 --- a/LibreHardwareMonitor/Utilities/IconFactory.cs +++ b/LibreHardwareMonitor.Windows.Forms/Utilities/IconFactory.cs @@ -10,7 +10,7 @@ using System.Drawing.Imaging; using System.IO; using System.Runtime.InteropServices; -namespace LibreHardwareMonitor.Utilities; +namespace LibreHardwareMonitor.Windows.Forms.Utilities; public static class IconFactory { diff --git a/LibreHardwareMonitor/Utilities/Logger.cs b/LibreHardwareMonitor.Windows.Forms/Utilities/Logger.cs similarity index 99% rename from LibreHardwareMonitor/Utilities/Logger.cs rename to LibreHardwareMonitor.Windows.Forms/Utilities/Logger.cs index 1fbe1ba..7d53f8a 100644 --- a/LibreHardwareMonitor/Utilities/Logger.cs +++ b/LibreHardwareMonitor.Windows.Forms/Utilities/Logger.cs @@ -11,7 +11,7 @@ using System.IO; using System.Linq; using LibreHardwareMonitor.Hardware; -namespace LibreHardwareMonitor.Utilities; +namespace LibreHardwareMonitor.Windows.Forms.Utilities; public class Logger { diff --git a/LibreHardwareMonitor/Utilities/LoggerFileRotation.cs b/LibreHardwareMonitor.Windows.Forms/Utilities/LoggerFileRotation.cs similarity index 84% rename from LibreHardwareMonitor/Utilities/LoggerFileRotation.cs rename to LibreHardwareMonitor.Windows.Forms/Utilities/LoggerFileRotation.cs index c91c6b5..17f00df 100644 --- a/LibreHardwareMonitor/Utilities/LoggerFileRotation.cs +++ b/LibreHardwareMonitor.Windows.Forms/Utilities/LoggerFileRotation.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LibreHardwareMonitor.Utilities +namespace LibreHardwareMonitor.Windows.Forms.Utilities { public enum LoggerFileRotation { diff --git a/LibreHardwareMonitor/Utilities/PersistentSettings.cs b/LibreHardwareMonitor.Windows.Forms/Utilities/PersistentSettings.cs similarity index 99% rename from LibreHardwareMonitor/Utilities/PersistentSettings.cs rename to LibreHardwareMonitor.Windows.Forms/Utilities/PersistentSettings.cs index 3d08756..59c004e 100644 --- a/LibreHardwareMonitor/Utilities/PersistentSettings.cs +++ b/LibreHardwareMonitor.Windows.Forms/Utilities/PersistentSettings.cs @@ -12,7 +12,7 @@ using System.Text; using System.Xml; using LibreHardwareMonitor.Hardware; -namespace LibreHardwareMonitor.Utilities; +namespace LibreHardwareMonitor.Windows.Forms.Utilities; public class PersistentSettings : ISettings { diff --git a/LibreHardwareMonitor.sln b/LibreHardwareMonitor.sln index bc0df0b..80a34af 100644 --- a/LibreHardwareMonitor.sln +++ b/LibreHardwareMonitor.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 18.0.11018.127 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreHardwareMonitorLib", "LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreHardwareMonitor", "LibreHardwareMonitor\LibreHardwareMonitor.csproj", "{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreHardwareMonitor.Windows.Forms", "LibreHardwareMonitor.Windows.Forms\LibreHardwareMonitor.Windows.Forms.csproj", "{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}" ProjectSection(ProjectDependencies) = postProject {B0397530-545A-471D-BB74-027AE456DF1A} = {B0397530-545A-471D-BB74-027AE456DF1A} EndProjectSection