updated OHM, ui scale only affects sidebar window, hw name fix, lapto…

…p run on startup fix, isatap nic fix, updated squirrel, v3.4.5
ArcadeRenegade · Feb 3, 2017 · 19a1743 · 19a1743
1 parent 76ae5fa
commit 19a1743
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 26 deletions.
diff --git a/OpenHardwareMonitor b/OpenHardwareMonitor
diff --git a/SidebarDiagnostics/ChangeLog.json b/SidebarDiagnostics/ChangeLog.json
@@ -1,4 +1,16 @@
 [
+  {
+    "Version": "3.4.5",
+    "Changes": [
+      "Updated to the latest version of Open Hardware Monitor with bugfix for Kaby Lake clock speed.",
+      "The \"UI Scale\" setting now only affects the sidebar window.",
+      "Hardware names should now update correctly after the hardware is changed.",
+      "Unfortunately, this fix reset your custom hardware names but you can rename them back.",
+      "The app should now correctly run on Windows startup for laptops running on battery power.",
+      "All isatap network interfaces should be filtered now.",
+      "Updated dependencies."
+    ]
+  },
   {
     "Version": "3.4.4",
     "Changes": [

diff --git a/SidebarDiagnostics/ChangeLog.xaml b/SidebarDiagnostics/ChangeLog.xaml
@@ -1,4 +1,4 @@
-<win:DPIAwareWindow
+<sty:FlatWindow
         x:Class="SidebarDiagnostics.ChangeLog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,6 +7,7 @@
         xmlns:system="clr-namespace:System;assembly=mscorlib"
         xmlns:local="clr-namespace:SidebarDiagnostics"
         xmlns:win="clr-namespace:SidebarDiagnostics.Windows"
+        xmlns:sty="clr-namespace:SidebarDiagnostics.Style"
         xmlns:frame="clr-namespace:SidebarDiagnostics.Framework"
         mc:Ignorable="d"
         Title="Sidebar Diagnostics"
@@ -39,4 +40,4 @@
             </ItemsControl>
         </StackPanel>
     </DockPanel>
-</win:DPIAwareWindow>
+</sty:FlatWindow>
diff --git a/SidebarDiagnostics/ChangeLog.xaml.cs b/SidebarDiagnostics/ChangeLog.xaml.cs
@@ -2,13 +2,14 @@
 using System.Windows;
 using SidebarDiagnostics.Models;
 using SidebarDiagnostics.Windows;
+using SidebarDiagnostics.Style;
 
 namespace SidebarDiagnostics
 {
     /// <summary>
     /// Interaction logic for ChangeLog.xaml
     /// </summary>
-    public partial class ChangeLog : DPIAwareWindow
+    public partial class ChangeLog : FlatWindow
     {
         public ChangeLog(Version version)
         {

diff --git a/SidebarDiagnostics/Graph.xaml b/SidebarDiagnostics/Graph.xaml
@@ -1,4 +1,4 @@
-<win:DPIAwareWindow
+<sty:FlatWindow
         x:Class="SidebarDiagnostics.Graph"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,6 +8,7 @@
         xmlns:oxy="http://oxyplot.org/wpf"
         xmlns:local="clr-namespace:SidebarDiagnostics"
         xmlns:win="clr-namespace:SidebarDiagnostics.Windows"
+        xmlns:sty="clr-namespace:SidebarDiagnostics.Style"
         xmlns:frame="clr-namespace:SidebarDiagnostics.Framework"
         mc:Ignorable="d"
         PreviewKeyDown="Window_PreviewKeyDown"
@@ -57,4 +58,4 @@
             </oxy:Plot.Axes>
         </oxy:Plot>
     </DockPanel>
-</win:DPIAwareWindow>
+</sty:FlatWindow>
diff --git a/SidebarDiagnostics/Graph.xaml.cs b/SidebarDiagnostics/Graph.xaml.cs
@@ -2,13 +2,14 @@
 using SidebarDiagnostics.Models;
 using SidebarDiagnostics.Windows;
 using System.ComponentModel;
+using SidebarDiagnostics.Style;
 
 namespace SidebarDiagnostics
 {
     /// <summary>
     /// Interaction logic for Graph.xaml
     /// </summary>
-    public partial class Graph : DPIAwareWindow
+    public partial class Graph : FlatWindow
     {
         public Graph(Sidebar sidebar)
         {

diff --git a/SidebarDiagnostics/Monitoring.cs b/SidebarDiagnostics/Monitoring.cs
@@ -540,7 +540,7 @@ public static iMonitor[] GetInstances(HardwareConfig[] hardwareConfig, MetricCon
             return (
                 from hw in hardware
                 join c in hardwareConfig on hw.Identifier.ToString() equals c.ID into merged
-                from n in merged.DefaultIfEmpty(new HardwareConfig() { ID = hw.Identifier.ToString(), Name = hw.Name, ActualName = hw.Name }).Select(n => { n.ActualName = hw.Name; return n; })
+                from n in merged.DefaultIfEmpty(new HardwareConfig() { ID = hw.Identifier.ToString(), Name = hw.Name, ActualName = hw.Name }).Select(n => { if (n.ActualName != hw.Name) { n.Name = n.ActualName = hw.Name; } return n; })
                 where n.Enabled
                 orderby n.Order descending, n.Name ascending
                 select new OHMMonitor(type, n.ID, n.Name ?? n.ActualName, hw, board, metrics, parameters)
@@ -1205,7 +1205,7 @@ public static IEnumerable<HardwareConfig> GetHardware()
                 App.ShowPerformanceCounterError();
             }
 
-            Regex _regex = new Regex(@"^isatap\..+\..+\..+$");
+            Regex _regex = new Regex(@"^isatap.*$");
 
             return _instances.Where(i => !_regex.IsMatch(i)).OrderBy(h => h).Select(h => new HardwareConfig() { ID = h, Name = h, ActualName = h });
         }
@@ -2168,7 +2168,22 @@ public string Name
             }
         }
 
-        public string ActualName { get; set; }
+        private string _actualName { get; set; }
+
+        [JsonProperty]
+        public string ActualName
+        {
+            get
+            {
+                return _actualName;
+            }
+            set
+            {
+                _actualName = value;
+
+                NotifyPropertyChanged("ActualName");
+            }
+        }
 
         private bool _enabled { get; set; } = true;
 

diff --git a/SidebarDiagnostics/Properties/AssemblyInfo.cs b/SidebarDiagnostics/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4.4.0")]
-[assembly: AssemblyFileVersion("3.4.4.0")]
+[assembly: AssemblyVersion("3.4.5.0")]
+[assembly: AssemblyFileVersion("3.4.5.0")]
diff --git a/SidebarDiagnostics/Settings.xaml b/SidebarDiagnostics/Settings.xaml
@@ -1,4 +1,4 @@
-<win:DPIAwareWindow
+<sty:FlatWindow
         x:Class="SidebarDiagnostics.Settings"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -10,6 +10,7 @@
         xmlns:monitor="clr-namespace:SidebarDiagnostics.Monitoring"
         xmlns:conv="clr-namespace:SidebarDiagnostics.Converters"
         xmlns:win="clr-namespace:SidebarDiagnostics.Windows"
+        xmlns:sty="clr-namespace:SidebarDiagnostics.Style"
         xmlns:frame="clr-namespace:SidebarDiagnostics.Framework"
         mc:Ignorable="d"
         Loaded="Window_Loaded"
@@ -376,4 +377,4 @@
             </TabItem>
         </TabControl>
     </DockPanel>
-</win:DPIAwareWindow>
+</sty:FlatWindow>
diff --git a/SidebarDiagnostics/Settings.xaml.cs b/SidebarDiagnostics/Settings.xaml.cs
@@ -9,13 +9,14 @@
 using System.Windows.Threading;
 using SidebarDiagnostics.Models;
 using SidebarDiagnostics.Windows;
+using SidebarDiagnostics.Style;
 
 namespace SidebarDiagnostics
 {
     /// <summary>
     /// Interaction logic for Settings.xaml
     /// </summary>
-    public partial class Settings : DPIAwareWindow
+    public partial class Settings : FlatWindow
     {
         public Settings(Sidebar sidebar)
         {

diff --git a/SidebarDiagnostics/Setup.xaml b/SidebarDiagnostics/Setup.xaml
@@ -1,4 +1,4 @@
-<win:DPIAwareWindow
+<sty:FlatWindow
         x:Class="SidebarDiagnostics.Setup"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,6 +7,7 @@
         xmlns:local="clr-namespace:SidebarDiagnostics"
         xmlns:frame="clr-namespace:SidebarDiagnostics.Framework"
         xmlns:win="clr-namespace:SidebarDiagnostics.Windows"
+        xmlns:sty="clr-namespace:SidebarDiagnostics.Style"
         mc:Ignorable="d"
         Closed="Window_Closed"
         Title="{x:Static frame:Resources.AppName}"
@@ -96,4 +97,4 @@
             </StackPanel>
         </DockPanel>
     </Grid>
-</win:DPIAwareWindow>
+</sty:FlatWindow>
diff --git a/SidebarDiagnostics/Setup.xaml.cs b/SidebarDiagnostics/Setup.xaml.cs
@@ -8,13 +8,14 @@
 using System.Windows.Input;
 using System.Windows.Threading;
 using SidebarDiagnostics.Windows;
+using SidebarDiagnostics.Style;
 
 namespace SidebarDiagnostics
 {
     /// <summary>
     /// Interaction logic for Setup.xaml
     /// </summary>
-    public partial class Setup : DPIAwareWindow
+    public partial class Setup : FlatWindow
     {
         public Setup()
         {

diff --git a/SidebarDiagnostics/SidebarDiagnostics.csproj b/SidebarDiagnostics/SidebarDiagnostics.csproj
@@ -107,7 +107,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.1\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Win32.TaskScheduler, Version=2.5.21.0, Culture=neutral, PublicKeyToken=0d013ddd5178a2ae, processorArchitecture=MSIL">
@@ -135,7 +135,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.1\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OpenHardwareMonitorLib, Version=0.7.1.5, Culture=neutral, processorArchitecture=MSIL">
@@ -154,8 +154,8 @@
       <HintPath>..\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Squirrel, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.1\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/SidebarDiagnostics/Update.xaml b/SidebarDiagnostics/Update.xaml
@@ -1,4 +1,4 @@
-<win:DPIAwareWindow
+<sty:FlatWindow
         x:Class="SidebarDiagnostics.Update"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,6 +7,7 @@
         xmlns:local="clr-namespace:SidebarDiagnostics"
         xmlns:win="clr-namespace:SidebarDiagnostics.Windows"
         xmlns:frame="clr-namespace:SidebarDiagnostics.Framework"
+        xmlns:sty="clr-namespace:SidebarDiagnostics.Style"
         mc:Ignorable="d"
         Title="{x:Static frame:Resources.AppName}"
         Icon="Sidebar.ico"
@@ -28,4 +29,4 @@
         <Label DockPanel.Dock="Top" Content="{x:Static frame:Resources.UpdateTitle}" Style="{StaticResource UpdateTitle}" />
         <ProgressBar Value="{Binding Path=Progress, Mode=OneWay}" Style="{StaticResource UpdateProgress}" />
     </DockPanel>
-</win:DPIAwareWindow>
+</sty:FlatWindow>
diff --git a/SidebarDiagnostics/Update.xaml.cs b/SidebarDiagnostics/Update.xaml.cs
@@ -4,13 +4,14 @@
 using System.Windows.Threading;
 using SidebarDiagnostics.Models;
 using SidebarDiagnostics.Windows;
+using SidebarDiagnostics.Style;
 
 namespace SidebarDiagnostics
 {
     /// <summary>
     /// Interaction logic for Update.xaml
     /// </summary>
-    public partial class Update : DPIAwareWindow
+    public partial class Update : FlatWindow
     {
         public Update()
         {

diff --git a/SidebarDiagnostics/Utilities.cs b/SidebarDiagnostics/Utilities.cs
@@ -144,6 +144,10 @@ public static void EnableStartupTask(string exePath = null)
                 _def.Actions.Add(new ExecAction(exePath ?? Assembly.GetExecutingAssembly().Location));
                 _def.Principal.RunLevel = TaskRunLevel.Highest;
 
+                _def.Settings.DisallowStartIfOnBatteries = false;
+                _def.Settings.StopIfGoingOnBatteries = false;
+                _def.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+
                 _taskService.RootFolder.RegisterTaskDefinition(Constants.Generic.TASKNAME, _def);
             }
         }

diff --git a/SidebarDiagnostics/packages.config b/SidebarDiagnostics/packages.config
@@ -9,6 +9,6 @@
   <package id="OxyPlot.Core" version="1.0.0" targetFramework="net461" />
   <package id="OxyPlot.Wpf" version="1.0.0" targetFramework="net461" />
   <package id="Splat" version="2.0.0" targetFramework="net461" />
-  <package id="squirrel.windows" version="1.5.1" targetFramework="net461" />
+  <package id="squirrel.windows" version="1.5.2" targetFramework="net461" />
   <package id="TaskScheduler" version="2.5.21" targetFramework="net461" />
 </packages>