1.0.1 update (minor changes)

Author: Rikonardo

Diff for: TopBar/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]

Diff for: TopBar/TopBar.csproj

@@ -219,4 +219,13 @@
     <Resource Include="TopBar.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net451\System.Runtime.WindowsRuntime.targets" Condition="Exists('..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net451\System.Runtime.WindowsRuntime.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их.  Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net451\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.4.6.0\build\net451\System.Runtime.WindowsRuntime.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net45\System.Runtime.WindowsRuntime.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net45\System.Runtime.WindowsRuntime.UI.Xaml.targets'))" />
+  </Target>
+  <Import Project="..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net45\System.Runtime.WindowsRuntime.UI.Xaml.targets" Condition="Exists('..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0\build\net45\System.Runtime.WindowsRuntime.UI.Xaml.targets')" />
 </Project>

Diff for: TopBar/TopBarWindow.xaml.cs

@@ -142,15 +142,15 @@ private void Build()
                 }
                 catch (Exception err)
                 {
-                    System.Windows.MessageBox.Show(err.Message, "Failed to setup widgets!");
+                    System.Windows.MessageBox.Show(err.Message, "Failed to load config!");
                     throw err;
                 }
                 // Load extentions
                 foreach (string dll in Directory.GetFiles(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "TopBar", "extensions"), "*.dll"))
                     this.Extentions.Add(Assembly.LoadFile(dll));
                 // Alert if blur disabled
-                if (this.Config != null && (bool)this.Config.settings["use-blur"] && !(bool)cfg.settings["use-blur"])
-                    System.Windows.MessageBox.Show("You must restart TopBar to disable blur!", "Restart to disable blur");
+                // if (this.Config != null && (bool)this.Config.settings["use-blur"] && !(bool)cfg.settings["use-blur"])
+                //     System.Windows.MessageBox.Show("You must restart TopBar to disable blur!", "Restart to disable blur");
                 // Save config
                 this.Config = cfg;
                 // Enable blur
@@ -175,7 +175,7 @@ private void Build()
                 }
                 catch (Exception err)
                 {
-                    System.Windows.MessageBox.Show(err.ToString(), "Failed to load config!");
+                    System.Windows.MessageBox.Show(err.ToString(), "Failed to setup widgets!");
                     throw new Exception("");
                 }
             }

Diff for: TopBar/Widgets/CPULoad.cs

@@ -78,16 +78,16 @@ public CPULoad(dynamic settings)
                     actual.Add(s, Calculate(cs[s], pc.NextSample()));
                     cs[s] = pc.NextSample();
                 }
-                for (int i = 0; i < cores.Count; i++)
+                Application.Current.Dispatcher.Invoke(DispatcherPriority.Background, new Action(delegate
                 {
-                    Application.Current.Dispatcher.Invoke(DispatcherPriority.Background, new Action(delegate
+                    for (int i = 0; i < cores.Count; i++)
                     {
                         try {
                             if (this.MainColor.Equals("from-percentage")) cores[i].Fill = new SolidColorBrush(this.PercentColor(100 - actual["0," + i]));
                             cores[i].Height = actual["0," + i] / 100 * 12;
                         } catch { }
-                    }));
-                }
+                    }
+                }));
             };
             this.timer.Start();
         }

Diff for: TopBar/packages.config

@@ -35,6 +35,8 @@
   <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net46" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net46" />
   <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.WindowsRuntime" version="4.6.0" targetFramework="net46" />
+  <package id="System.Runtime.WindowsRuntime.UI.Xaml" version="4.6.0" targetFramework="net46" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net46" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />