Add current CPU temperature.

PocketFanController.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.3
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketFanController", "PocketFanController\PocketFanController.csproj", "{8623A908-1563-46EE-98E5-0539DF3ED417}"
 EndProject

PocketFanController/AboutWindow.xaml.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace PocketFanController
+{
+    /// <summary>
+    /// AboutWindow.xaml の相互作用ロジック
+    /// </summary>
+    public partial class AboutWindow : Window
+    {
+        public AboutWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}

PocketFanController/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:PocketFanController"
         mc:Ignorable="d"
-        Title="Pocket Fan Controller  Ver. 0.3.0" Height="100" Width="352" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Icon="Icon.ico" ShowInTaskbar="False">
+        Title="Pocket Fan Controller" Height="100" Width="352" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Icon="Icon.ico" ShowInTaskbar="False" ScrollViewer.VerticalScrollBarVisibility="Disabled">
     <Window.DataContext>
         <local:ViewModel />
     </Window.DataContext>

PocketFanController/Model.cs

@@ -1,7 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Diagnostics;
+using System.Globalization;
 using Microsoft.Win32;
+using OpenHardwareMonitor.Hardware;
 
 namespace PocketFanController
 {
@@ -122,5 +125,33 @@ public void RestartService()
             };
             cmd.Start();
         }
+
+        public string GetCpuTemp()
+        {
+            var computer = new Computer
+            {
+                MainboardEnabled = false,
+                CPUEnabled = true,
+                RAMEnabled = false,
+                GPUEnabled = false,
+                FanControllerEnabled = false,
+                HDDEnabled = false
+            };
+
+            computer.Open();
+
+            var temps = new List<string>();
+
+            foreach (var item in computer.Hardware)
+            {
+                if (item.HardwareType != HardwareType.CPU) continue;
+                item.Update();
+                temps.AddRange(from sensor in item.Sensors where sensor.SensorType == SensorType.Temperature where sensor.Value != null select sensor.Value.Value.ToString(CultureInfo.CurrentCulture));
+            }
+
+            //最初に取得できるのが、現在の温度。
+            return temps[0];
+        }
+
     }
 }

PocketFanController/NotifyIconWrapper.cs

@@ -14,6 +14,7 @@ public NotifyIconWrapper()
 
             toolStripMenuItem_Exit.Click += Exit;
             toolStripMenuItem_OpenWindow.Click += OpenWindow;
+            toolStripMenuItem_OpenAbout.Click += OpenAbout;
 
             toolStripMenuItem_SetDefault.Click += SetDefault;
             toolStripMenuItem_SetFastest.Click += SetFastest;
@@ -69,8 +70,16 @@ private void OpenWindow(object sender, EventArgs e)
             mainWindow.Show();
         }
 
+        private void OpenAbout(object sender, EventArgs e)
+        {
+            var aboutWindow = new AboutWindow();
+            aboutWindow.Show();
+        }
+
         private void UpdateCurrentStatus(object sender, EventArgs e)
         {
+            toolStripMenuItem_CpuTemp.Text = "CPU " + Model.GetCpuTemp() + "℃";
+
             Model.GetCurrentStatus();
 
             switch (Model.CurrentState)

PocketFanController/NotifyIconWrapper.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="notifyIcon1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 60</value>
+    <value>17, 65</value>
   </metadata>
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>170, 17</value>

PocketFanController/PocketFanController.csproj

@@ -40,6 +40,9 @@
     <ApplicationIcon>Icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="OpenHardwareMonitorLib">
+      <HintPath>.\OpenHardwareMonitorLib.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -63,6 +66,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AboutWindow.xaml.cs">
+      <DependentUpon>AboutWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="NotifyIconWrapper.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -72,6 +78,10 @@
     <Compile Include="RelayCommand.cs" />
     <Compile Include="ViewModel.cs" />
     <Compile Include="ViewModelBase.cs" />
+    <Page Include="AboutWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

PocketFanController/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@
 // すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.0.0")]
-[assembly: AssemblyFileVersion("0.3.0.0")]
+[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyFileVersion("0.4.0.0")]
 [assembly: NeutralResourcesLanguage("en")]