deemoe404 · dimojang · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021 · Mar 28, 2021
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -13,6 +13,9 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Threading;
+using System.Security.Principal;
+
+using Frogy.Methods;
 
 namespace Frogy
 {
@@ -27,6 +30,11 @@ public partial class App : Application
 
         protected override void OnStartup(StartupEventArgs e)
         {
+            //Promote permission if not Administrator
+            var principal = new WindowsPrincipal(WindowsIdentity.GetCurrent());
+            if (!principal.IsInRole(WindowsBuiltInRole.Administrator))
+                MyDeviceHelper.PromotePermission();
+
             //Launage switch
             ResourceDictionary dict = new ResourceDictionary();
             switch (appData.LanguageSetting)
@@ -41,6 +49,7 @@ protected override void OnStartup(StartupEventArgs e)
                     break;
                 default: //english default
                     dict.Source = new Uri(@"Resources\Language\en-US.xaml", UriKind.Relative);
+                    ConfigHelper.Instance.SetLang("en");
                     break;
             }
             Current.Resources.MergedDictionaries.Add(dict);
@@ -68,7 +77,7 @@ protected override void OnStartup(StartupEventArgs e)
 
             //tray icon
             mutex = new Mutex(true, "FrogyMainProgram");
-            if (mutex.WaitOne(0, false))
+            if (mutex.WaitOne(0, false) || e.Args[0] == "restart")
             {
                 taskbarIcon = (TaskbarIcon)FindResource("icon");
 
@@ -91,10 +100,11 @@ protected override void OnStartup(StartupEventArgs e)
                     MessageBoxButton.OK,
                     MessageBoxImage.Warning);
 
-                Current.Shutdown();
+                Environment.Exit(1);
             }
         }
 
+
         private void SystemEvents_SessionEnded(object sender, SessionEndedEventArgs e)
         {
             appData.Save();

diff --git a/Frogy.csproj b/Frogy.csproj
@@ -74,7 +74,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetZone>LocalIntranet</TargetZone>
+    <TargetZone>Internet</TargetZone>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>false</GenerateManifests>
@@ -168,7 +168,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Resources\Language\LanguageHelper.cs" />
-    <Compile Include="Resources\Theme\ThemeHelper.cs" />
     <Compile Include="ViewModels\DashboardViewModel.cs" />
     <Compile Include="ViewModels\OptionViewModel.cs" />
     <Compile Include="ViewModels\OverViewViewModel.cs" />

diff --git a/Methods/MyDeviceHelper.cs b/Methods/MyDeviceHelper.cs
@@ -1,10 +1,13 @@
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Frogy.Methods
 {
@@ -110,7 +113,6 @@ private struct LARGE_INTEGER //此结构体在C++中使用的为union结构，
             readonly long QuadPart;
         }
 
-
         /// <summary>
         /// 读取设备状态
         /// 0 代表锁定
@@ -138,5 +140,66 @@ public static int DeviceState
                 return dwFlags;
             }
         }
+
+        public static void RegisterStartup()
+        {
+            try
+            {
+                RegistryKey key = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true) ?? 
+                    Registry.CurrentUser.CreateSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run");
+
+                Assembly curAssembly = Assembly.GetExecutingAssembly();
+                key.SetValue(curAssembly.GetName().Name, curAssembly.Location);
+            }
+            catch { }
+        }
+
+        public static void DeregisterStartup()
+        {
+            try
+            {
+                RegistryKey key = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true) ?? 
+                    Registry.CurrentUser.CreateSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run");
+
+                Assembly curAssembly = Assembly.GetExecutingAssembly();
+                key.DeleteValue(curAssembly.GetName().Name);
+            }
+            catch { }
+        }
+
+        public static bool GetStartupStatus()
+        {
+            bool result = false;
+            try
+            {
+                RegistryKey key = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true) ?? 
+                    Registry.CurrentUser.CreateSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run");
+
+                Assembly curAssembly = Assembly.GetExecutingAssembly();
+
+                string[] values = key.GetValueNames();
+                foreach(string s in values) if (s == curAssembly.GetName().Name) result = true;
+            }
+            catch { }
+
+            return result;
+        }
+
+        public static void PromotePermission()
+        {
+            ProcessStartInfo psi = new ProcessStartInfo();
+            Assembly curAssembly = Assembly.GetExecutingAssembly();
+
+            psi.FileName = curAssembly.Location;
+            psi.Verb = "runas";
+            psi.Arguments = "restart";
+
+            try
+            {
+                Process.Start(psi);
+                Environment.Exit(1);
+            }
+            catch { }
+        }
     }
 }
diff --git a/Methods/MyProcessHelper.cs b/Methods/MyProcessHelper.cs
@@ -7,6 +7,7 @@
 using System.Runtime.InteropServices;
 using System.Drawing;
 using System.Windows.Media.Imaging;
+using System.Windows;
 
 namespace Frogy.Methods
 {
@@ -150,7 +151,7 @@ public static bool IsProcessUWP(Process process)
             }
             catch(Exception e)
             {
-                throw e;
+                throw (e);
             }
         }
     }

diff --git a/Properties/app.manifest b/Properties/app.manifest
@@ -16,11 +16,11 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="highestAvailable" uiAccess="false" />
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
       <applicationRequestMinimum>
         <defaultAssemblyRequest permissionSetReference="Custom" />
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" />
       </applicationRequestMinimum>
     </security>
   </trustInfo>

diff --git a/Resources/Language/en-US.xaml b/Resources/Language/en-US.xaml
@@ -28,5 +28,9 @@
     <system:String x:Key="Option_LanguageTitle">Launage</system:String>
     <system:String x:Key="Option_Info">*Some of the setting(s) will take effect after restarting Frogy.</system:String>
     <system:String x:Key="Option_ThemeTitle">Theme</system:String>
+    <system:String x:Key="Option_ThemeDefault">Default</system:String>
+    <system:String x:Key="Option_ThemeNight">Night</system:String>
+    <system:String x:Key="Option_SystemTitle">System</system:String>
+    <system:String x:Key="Option_Startup">Start with windows</system:String>
 
 </ResourceDictionary>
diff --git a/Resources/Language/zh-CN.xaml b/Resources/Language/zh-CN.xaml
@@ -28,5 +28,9 @@
     <system:String x:Key="Option_LanguageTitle">语言</system:String>
     <system:String x:Key="Option_Info">*部分设置在重启 时常 后生效。</system:String>
     <system:String x:Key="Option_ThemeTitle">主题</system:String>
+    <system:String x:Key="Option_ThemeDefault">默认</system:String>
+    <system:String x:Key="Option_ThemeNight">夜晚</system:String>
+    <system:String x:Key="Option_SystemTitle">系统</system:String>
+    <system:String x:Key="Option_Startup">开机自启</system:String>
 
 </ResourceDictionary>
diff --git a/Resources/Theme/DarkTheme.xaml b/Resources/Theme/DarkTheme.xaml
@@ -1,7 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf">
-
+                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <system:String x:Key="en-US">Dark</system:String>
+    <system:String x:Key="zh-CN">夜间模式</system:String>
+
     <Style x:Key="DefaultChartStyle" TargetType="lvc:CartesianChart">
         <Setter Property="Foreground" Value="White"/>
     </Style>

diff --git a/Resources/Theme/DefaultTheme.xaml b/Resources/Theme/DefaultTheme.xaml
@@ -1,7 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf">
+                    xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <system:String x:Key="en-US">Default</system:String>
+    <system:String x:Key="zh-CN">默认</system:String>
 
     <Style x:Key="DefaultChartStyle" TargetType="lvc:CartesianChart">
         <Setter Property="Foreground" Value="Black"/>

diff --git a/Resources/Theme/ThemeHelper.cs b/Resources/Theme/ThemeHelper.cs
diff --git a/ViewModels/OptionViewModel.cs b/ViewModels/OptionViewModel.cs
@@ -12,7 +12,6 @@
 using System.Windows.Input;
 
 using Frogy.Resources.Language;
-using Frogy.Resources.Theme;
 using System.Windows.Controls;
 
 namespace Frogy.ViewModels
@@ -116,20 +115,6 @@ public int LanguageListSelectedIndex
         #endregion
 
         #region Theme setting
-        private List<string> themeList = new List<string>();
-        public List<string> ThemeList
-        {
-            get
-            {
-                themeList.Clear();
-
-                foreach (KeyValuePair<int, string> pair in ThemeHelper.ThemeSets)
-                    themeList.Add(pair.Value);
-
-                return themeList;
-            }
-        }
-
         private int themeListSelectedIndex = ((App)Application.Current).appData.ThemeSetting >= 0 && ((App)Application.Current).appData.ThemeSetting <= 1 ?
             ((App)Application.Current).appData.ThemeSetting : 0;
         public int ThemeListSelectedIndex
@@ -147,6 +132,23 @@ public int ThemeListSelectedIndex
         }
         #endregion
 
+        #region
+        private bool startupStatus = MyDeviceHelper.GetStartupStatus();
+        public bool StartupStatus
+        {
+            get { return startupStatus; }
+            set
+            {
+                if (value)
+                    MyDeviceHelper.RegisterStartup();
+                else
+                    MyDeviceHelper.DeregisterStartup();
+
+                startupStatus = value;
+            }
+        }
+        #endregion
+
         #region INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged = delegate { };
         public void OnPropertyChanged([CallerMemberName] string propertyName = null)

diff --git a/ViewModels/OverViewViewModel.cs b/ViewModels/OverViewViewModel.cs
@@ -120,32 +120,14 @@ private List<DetailViewItem> PrintSummaryView(List<MyTimeDuration> durations)
         {
             List<DetailViewItem> result = new List<DetailViewItem>();
 
-            string systemState;
-
             foreach (MyTimeDuration timeSpan in durations)
             {
-                switch (timeSpan.TimeDurationTask.ComputerStatus)
-                {
-                    case 1:
-                        systemState = "On active";
-                        break;
-
-                    case 0:
-                        systemState = "Locked";
-                        break;
-
-                    case 2:
-                        systemState = "Forgy exited";
-                        break;
-                }
-
                 DetailViewItem tmp = new DetailViewItem()
                 {
                     StartTime = timeSpan.StartTime.ToString(),
                     StopTime = timeSpan.StopTime.ToString(),
                     AppDuration = timeSpan.Duration.ToString(),
-                    AppIcon = MyDataHelper.BitmapToBitmapImage(
-                        MyDataHelper.Base64StringToImage(timeSpan.TimeDurationTask.ApplicationIcon_Base64)),
+                    AppIcon = MyDataHelper.BitmapToBitmapImage(MyDataHelper.Base64StringToImage(timeSpan.TimeDurationTask.ApplicationIcon_Base64)),
                     AppName = timeSpan.TimeDurationTask.ApplicationName,
                     WindowTitle = timeSpan.TimeDurationTask.ApplicationTitle,
                     SystemState = timeSpan.TimeDurationTask.ComputerStatus.ToString()
@@ -164,18 +146,12 @@ public OverViewViewModel()
             "13:00", "14:00", "15:00", "16:00", "17:00", "18:00",
             "19:00", "20:00", "21:00", "22:00", "23:00"};
 
-
-
             OverviewChartFormatter = value => value + "min";
         }
 
         private async void Update()
         {
-            await Task.Run(() =>
-            {
-                ((App)Application.Current).appData.Load(displayDate);
-            });
-
+            ((App)Application.Current).appData.Load(displayDate);
             MyDay today = ((App)Application.Current).appData.AllDays[displayDate];
 
             await Task.Run(() =>
@@ -191,7 +167,7 @@ await Task.Run(() =>
                 foreach (StackedColumnSeries i in OverviewChart_tmp)
                 {
                     OverviewChart.Add(i);
-                    Thread.Sleep(220);
+                    Thread.Sleep(20);
                 }
             });
         }