Merge master

2026-04-06 03:07:04 +02:00 · 2015-12-13 13:32:30 +00:00
parent b11972d1b7 bb9684f7d3
commit 539eadf533
82 changed files with 687 additions and 736 deletions
--- a/Plugins/Wox.Plugin.Sys/Images/recyclebin.png
+++ b/Plugins/Wox.Plugin.Sys/Images/recyclebin.png
--- a/Plugins/Wox.Plugin.Sys/Images/restartcomp.png
+++ b/Plugins/Wox.Plugin.Sys/Images/restartcomp.png
--- a/Plugins/Wox.Plugin.Sys/Languages/en.xaml
+++ b/Plugins/Wox.Plugin.Sys/Languages/en.xaml
@@ -6,12 +6,14 @@
    <system:String x:Key="wox_plugin_sys_desc">Description</system:String>

    <system:String x:Key="wox_plugin_sys_shutdown_computer">Shutdown Computer</system:String>
+    <system:String x:Key="wox_plugin_sys_restart_computer">Restart Computer</system:String>
    <system:String x:Key="wox_plugin_sys_log_off">Log off</system:String>
    <system:String x:Key="wox_plugin_sys_lock">Lock this computer</system:String>
    <system:String x:Key="wox_plugin_sys_exit">Close Wox</system:String>
    <system:String x:Key="wox_plugin_sys_restart">Restart Wox</system:String>
    <system:String x:Key="wox_plugin_sys_setting">Tweak this app</system:String>
    <system:String x:Key="wox_plugin_sys_sleep">Put computer to sleep</system:String>
+    <system:String x:Key="wox_plugin_sys_emptyrecyclebin">Empty recycle bin</system:String>

    <system:String x:Key="wox_plugin_sys_plugin_name">System Commands</system:String>
    <system:String x:Key="wox_plugin_sys_plugin_description">Provide System related commands. e.g. shutdown,lock,setting etc.</system:String>
--- a/Plugins/Wox.Plugin.Sys/Languages/zh-cn.xaml
+++ b/Plugins/Wox.Plugin.Sys/Languages/zh-cn.xaml
@@ -6,12 +6,14 @@
    <system:String x:Key="wox_plugin_sys_desc">描述</system:String>

    <system:String x:Key="wox_plugin_sys_shutdown_computer">关闭电脑</system:String>
+    <system:String x:Key="wox_plugin_sys_restart_computer">Restart Computer</system:String>
    <system:String x:Key="wox_plugin_sys_log_off">注销</system:String>
    <system:String x:Key="wox_plugin_sys_lock">锁定这台电脑</system:String>
    <system:String x:Key="wox_plugin_sys_exit">退出Wox</system:String>
    <system:String x:Key="wox_plugin_sys_restart">重启Wox</system:String>
    <system:String x:Key="wox_plugin_sys_setting">设置</system:String>
    <system:String x:Key="wox_plugin_sys_sleep">休眠这台电脑</system:String>
+    <system:String x:Key="wox_plugin_sys_emptyrecyclebin">Empty recycle bin</system:String>

    <system:String x:Key="wox_plugin_sys_plugin_name">系统命令</system:String>
    <system:String x:Key="wox_plugin_sys_plugin_description">系统系统相关的命令。例如，关机，锁定，设置等</system:String>
--- a/Plugins/Wox.Plugin.Sys/Languages/zh-tw.xaml
+++ b/Plugins/Wox.Plugin.Sys/Languages/zh-tw.xaml
@@ -6,12 +6,14 @@
    <system:String x:Key="wox_plugin_sys_desc">描述</system:String>

    <system:String x:Key="wox_plugin_sys_shutdown_computer">關閉電腦</system:String>
+    <system:String x:Key="wox_plugin_sys_restart_computer">Restart Computer</system:String>
    <system:String x:Key="wox_plugin_sys_log_off">註銷</system:String>
    <system:String x:Key="wox_plugin_sys_lock">鎖定這臺電腦</system:String>
    <system:String x:Key="wox_plugin_sys_exit">退出Wox</system:String>
    <system:String x:Key="wox_plugin_sys_restart">重啟Wox</system:String>
    <system:String x:Key="wox_plugin_sys_setting">設置</system:String>
    <system:String x:Key="wox_plugin_sys_sleep">休眠这台电脑</system:String>
+    <system:String x:Key="wox_plugin_sys_emptyrecyclebin">Empty recycle bin</system:String>

    <system:String x:Key="wox_plugin_sys_plugin_name">系統命令</system:String>
    <system:String x:Key="wox_plugin_sys_plugin_description">系統系統相關的命令。例如，關機，鎖定，設置等</system:String>
--- a/Plugins/Wox.Plugin.Sys/Properties/AssemblyInfo.cs
+++ b/Plugins/Wox.Plugin.Sys/Properties/AssemblyInfo.cs
@@ -1,36 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

-// 有关程序集的常规信息通过以下
-// 特性集控制。更改这些特性值可修改
-// 与程序集关联的信息。
 [assembly: AssemblyTitle("Wox.Plugin.Sys")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Wox.Plugin.Sys")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 使此程序集中的类型
-// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
-// 则将该类型上的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("e1eecff6-3f25-424d-9bbd-cbd7d6e1e11e")]
-
-// 程序集的版本信息由下面四个值组成: 
-//
-//      主版本
-//      次版本 
-//      生成号
-//      修订号
-//
-// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
-// 方法是按如下所示使用“*”: 
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: Guid("e1eecff6-3f25-424d-9bbd-cbd7d6e1e11e")]
--- a/Plugins/Wox.Plugin.Sys/Sys.cs
+++ b/Plugins/Wox.Plugin.Sys/Sys.cs
@@ -1,10 +1,14 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
+using System.Windows;
+using System.Windows.Interop;
 using Wox.Infrastructure;
+using FormsApplication = System.Windows.Forms.Application;
+using PowerState = System.Windows.Forms.PowerState;
 using Control = System.Windows.Controls.Control;

 namespace Wox.Plugin.Sys
@@ -22,11 +26,23 @@ namespace Wox.Plugin.Sys
        internal const int EWX_FORCE = 0x00000004;
        internal const int EWX_POWEROFF = 0x00000008;
        internal const int EWX_FORCEIFHUNG = 0x00000010;
+
        [DllImport("user32")]
        private static extern bool ExitWindowsEx(uint uFlags, uint dwReason);
+
        [DllImport("user32")]
        private static extern void LockWorkStation();

+        [DllImport("Shell32.dll", CharSet = CharSet.Unicode)]
+        private static extern uint SHEmptyRecycleBin(IntPtr hWnd, uint dwFlags);
+
+        // http://www.pinvoke.net/default.aspx/Enums/HRESULT.html
+        private enum HRESULT : uint
+        {
+            S_FALSE = 0x0001,
+            S_OK = 0x0000
+        }
+
        #endregion

        public Control CreateSettingPanel()
@@ -58,7 +74,8 @@ namespace Wox.Plugin.Sys

        private void LoadCommands()
        {
-            availableResults.AddRange(new Result[] {
+            availableResults.AddRange(new Result[]
+            {
                new Result
                {
                    Title = "Shutdown",
@@ -66,13 +83,32 @@ namespace Wox.Plugin.Sys
                    IcoPath = "Images\\exit.png",
                    Action = (c) =>
                    {
-                        if (MessageBox.Show("Are you sure you want to shut the computer down?","Shutdown Computer?",MessageBoxButtons.YesNo,MessageBoxIcon.Warning) == DialogResult.Yes) {
+                        var reuslt = MessageBox.Show("Are you sure you want to shut the computer down?",
+                                                     "Shutdown Computer?", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+                        if (reuslt == MessageBoxResult.Yes)
+                        {
                            Process.Start("shutdown", "/s /t 0");
                        }
                        return true;
                    }
                },
                new Result
+                {
+                    Title = "Restart",
+                    SubTitle = context.API.GetTranslation("wox_plugin_sys_restart_computer"),
+                    IcoPath = "Images\\restartcomp.png",
+                    Action = (c) =>
+                    {
+                        var result = MessageBox.Show("Are you sure you want to restart the computer?",
+                                                     "Restart Computer?", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+                        if (result == MessageBoxResult.Yes)
+                        {
+                            Process.Start("shutdown", "/r /t 0");
+                        }
+                        return true;
+                    }
+                },
+                new Result
                {
                    Title = "Log off",
                    SubTitle = context.API.GetTranslation("wox_plugin_sys_log_off"),
@@ -89,13 +125,33 @@ namespace Wox.Plugin.Sys
                        LockWorkStation();
                        return true;
                    }
-                },
+                },  
                new Result
                {
                    Title = "Sleep",
                    SubTitle = context.API.GetTranslation("wox_plugin_sys_sleep"),
                    IcoPath = "Images\\sleep.png",
-                    Action = (c) => Application.SetSuspendState(PowerState.Suspend, false, false)
+                    Action = (c) => FormsApplication.SetSuspendState(PowerState.Suspend, false, false)
+                },
+                new Result
+                {
+                    Title = "Empty Recycle Bin",
+                    SubTitle = context.API.GetTranslation("wox_plugin_sys_emptyrecyclebin"),
+                    IcoPath = "Images\\recyclebin.png",
+                    Action = (c) =>
+                    {
+                        // http://www.pinvoke.net/default.aspx/shell32/SHEmptyRecycleBin.html
+                        // 0 for nothing
+                        var result = SHEmptyRecycleBin(new WindowInteropHelper(Application.Current.MainWindow).Handle, 0);
+                        if (result != (uint) HRESULT.S_OK)
+                        {
+                            MessageBox.Show($"Error emptying recycle bin, error code: {result}\n" +
+                                            "please refer to https://msdn.microsoft.com/en-us/library/windows/desktop/aa378137",
+                                            "Error",
+                                            MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
+                        return true;
+                    }
                },
                new Result
                {
@@ -115,14 +171,8 @@ namespace Wox.Plugin.Sys
                    IcoPath = "Images\\restart.png",
                    Action = (c) =>
                    {
-                        ProcessStartInfo Info = new ProcessStartInfo();
-                        Info.Arguments = "/C ping 127.0.0.1 -n 1 && \"" + Application.ExecutablePath + "\"";
-                        Info.WindowStyle = ProcessWindowStyle.Hidden;
-                        Info.CreateNoWindow = true;
-                        Info.FileName = "cmd.exe";
-                        Process.Start(Info);
-                        context.API.CloseApp();
-                        return true;
+                        context.API.RestarApp();
+                        return false;
                    }
                },
                new Result
@@ -142,7 +192,6 @@ namespace Wox.Plugin.Sys
        public string GetLanguagesFolder()
        {
            return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Languages");
-
        }

        public string GetTranslatedPluginTitle()
@@ -155,4 +204,4 @@ namespace Wox.Plugin.Sys
            return context.API.GetTranslation("wox_plugin_sys_plugin_description");
        }
    }
-}
+}
--- a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj
+++ b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj
@@ -47,6 +47,9 @@
    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="..\..\SolutionAssemblyInfo.cs">
+      <Link>Properties\SolutionAssemblyInfo.cs</Link>
+    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Sys.cs" />
    <Compile Include="SysSettings.xaml.cs">
@@ -64,6 +67,12 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
+    <Content Include="Images\recyclebin.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\restartcomp.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="Images\sleep.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>