mirror of
https://github.com/ckaczor/SystemTemperatureStatusWindow.git
synced 2026-03-10 12:01:40 -04:00
Compare commits
4 Commits
1.0.5
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
832b0ca200 | ||
| b79863a38e | |||
| 61d74ff9db | |||
| e956bf6553 |
@@ -60,6 +60,8 @@ namespace SystemTemperatureService
|
||||
|
||||
public void Shutdown()
|
||||
{
|
||||
_computer.Close();
|
||||
|
||||
Program.MainDispatcher.Invoke(Application.Current.Shutdown);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<tags>cpu</tags>
|
||||
</metadata>
|
||||
<files>
|
||||
<file src="Window\bin\$configuration$\**\*" target="lib\net45\Window" exclude="*.pdb;*.nupkg;*.vshost.*" />
|
||||
<file src="Window\bin\$configuration$\**\*" target="lib\net45" exclude="*.pdb;*.nupkg;*.vshost.*" />
|
||||
<file src="Service\bin\$configuration$\**\*" target="lib\net45\Service" exclude="*.pdb;*.nupkg;*.vshost.*" />
|
||||
</files>
|
||||
</package>
|
||||
|
||||
18
Window/Properties/Resources.Designer.cs
generated
18
Window/Properties/Resources.Designer.cs
generated
@@ -242,6 +242,24 @@ namespace SystemTemperatureStatusWindow.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Service not installed - please restart application.
|
||||
/// </summary>
|
||||
public static string ServiceNotInstalled {
|
||||
get {
|
||||
return ResourceManager.GetString("ServiceNotInstalled", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Waiting for service to start....
|
||||
/// </summary>
|
||||
public static string ServiceNotStarted {
|
||||
get {
|
||||
return ResourceManager.GetString("ServiceNotStarted", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to _Start when Windows starts.
|
||||
/// </summary>
|
||||
|
||||
@@ -190,4 +190,10 @@
|
||||
<data name="OptionsWindow_Title" xml:space="preserve">
|
||||
<value>Options</value>
|
||||
</data>
|
||||
<data name="ServiceNotInstalled" xml:space="preserve">
|
||||
<value>Service not installed - please restart application</value>
|
||||
</data>
|
||||
<data name="ServiceNotStarted" xml:space="preserve">
|
||||
<value>Waiting for service to start...</value>
|
||||
</data>
|
||||
</root>
|
||||
@@ -1,4 +1,5 @@
|
||||
using FloatingStatusWindowLibrary;
|
||||
using Common.Wpf.Windows;
|
||||
using FloatingStatusWindowLibrary;
|
||||
using Microsoft.Win32.TaskScheduler;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -12,8 +13,6 @@ using System.Windows.Threading;
|
||||
using SystemTemperatureStatusWindow.Options;
|
||||
using SystemTemperatureStatusWindow.Properties;
|
||||
using SystemTemperatureStatusWindow.SystemTemperatureService;
|
||||
using Common.Wpf.Windows;
|
||||
using Task = Microsoft.Win32.TaskScheduler.Task;
|
||||
|
||||
namespace SystemTemperatureStatusWindow
|
||||
{
|
||||
@@ -45,7 +44,7 @@ namespace SystemTemperatureStatusWindow
|
||||
|
||||
if (path != null)
|
||||
{
|
||||
var fileName = Path.Combine(path, "SystemTemperatureService.exe");
|
||||
var fileName = Path.Combine(path, "Service", "SystemTemperatureService.exe");
|
||||
|
||||
Process.Start(fileName, "-install");
|
||||
}
|
||||
@@ -63,7 +62,6 @@ namespace SystemTemperatureStatusWindow
|
||||
_refreshTimer = new Timer(Settings.Default.UpdateInterval) { AutoReset = false };
|
||||
_refreshTimer.Elapsed += HandleTimerElapsed;
|
||||
|
||||
|
||||
System.Threading.Tasks.Task.Factory.StartNew(UpdateApp).ContinueWith(task => StartUpdate(task.Result.Result));
|
||||
}
|
||||
|
||||
@@ -97,6 +95,23 @@ namespace SystemTemperatureStatusWindow
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var taskService = new TaskService())
|
||||
{
|
||||
var existingTask = taskService.FindTask(ScheduledTaskName);
|
||||
|
||||
if (existingTask == null)
|
||||
{
|
||||
UpdateText(Resources.ServiceNotInstalled);
|
||||
return;
|
||||
}
|
||||
|
||||
if (existingTask.State != TaskState.Running)
|
||||
{
|
||||
UpdateText(Resources.ServiceNotStarted);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
using (var client = new SystemTemperatureServiceClient())
|
||||
{
|
||||
var builder = new StringBuilder();
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
|
||||
<package id="FloatingStatusWindow" version="1.0.0.9" targetFramework="net45" />
|
||||
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
|
||||
<package id="SharpCompress" version="0.17.1" targetFramework="net45" />
|
||||
<package id="SharpCompress" version="0.29.0" targetFramework="net45" />
|
||||
<package id="Splat" version="1.6.2" targetFramework="net45" />
|
||||
<package id="squirrel.windows" version="1.8.0" targetFramework="net45" />
|
||||
<package id="TaskScheduler" version="2.8.1" targetFramework="net45" />
|
||||
|
||||
Reference in New Issue
Block a user