From e7851cd2f619496ad72d67fdbb076b1e2a21b17d Mon Sep 17 00:00:00 2001
From: Vector Von <v@vvzero.com>
Date: Tue, 14 Jun 2022 16:40:40 +0800
Subject: [PATCH] add inno pack file

---
 .gitignore                    |   4 ++-
 MainWindow.xaml               |   3 ++-
 MainWindow.xaml.cs            |  36 ++++++++++++++++++++++---
 Topuino.ico                   | Bin 0 -> 16958 bytes
 Topuino_Client_Windows.csproj |   5 ++++
 pack.iss                      |  49 ++++++++++++++++++++++++++++++++++
 6 files changed, 92 insertions(+), 5 deletions(-)
 create mode 100644 Topuino.ico
 create mode 100644 pack.iss

diff --git a/.gitignore b/.gitignore
index 9491a2f..34c856c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -360,4 +360,6 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
\ No newline at end of file
+FodyWeavers.xsd
+
+Output
diff --git a/MainWindow.xaml b/MainWindow.xaml
index b5f7b8d..74d4d66 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Topuino_Client_Windows"
         mc:Ignorable="d"
+        Closing="Window_Closing"
         Title="Topuino 客户端" Height="150" Width="400">
     <Grid>
         <Grid.RowDefinitions>
@@ -26,7 +27,7 @@
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="5">
             <Button Content="保存" Click="Button_Save_Click" Height="20" Width="40" />
             <Separator Width="10" Background="Transparent" />
-            <Button Content="隐藏" Height="20" Width="40" />
+            <Button Content="隐藏" Click="Button_Hide_Click" Height="20" Width="40" />
         </StackPanel>
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 67ab850..83cd4f7 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -6,6 +6,8 @@ using System.IO;
 using System.Net.NetworkInformation;
 using System.Collections.Generic;
 using System.Windows.Input;
+using System.Drawing;
+using System.Windows.Forms;
 using Newtonsoft.Json;
 
 namespace Topuino_Client_Windows
@@ -36,6 +38,8 @@ namespace Topuino_Client_Windows
 
             if (File.Exists("Config.json"))
             {
+                ShowInTaskbar = true;
+                Visibility = Visibility.Hidden;
                 LoadConfig();
             }
             else
@@ -43,8 +47,15 @@ namespace Topuino_Client_Windows
                 ComboBox_Disk0.SelectedIndex = 0;
                 ComboBox_Disk1.SelectedIndex = 0;
             }
+
+            trayIon.Icon = new Icon(@"Topuino.ico");
+            trayIon.Visible = true;
+            trayIon.Text = "Topuino";
+            trayIon.DoubleClick += TrayIcon_DoubleClick;
         }
 
+        private NotifyIcon trayIon = new NotifyIcon();
+
         private string sn = "";
         private List<DriveInfo> allDrives;
         private DriveInfo? drive0 = null;
@@ -159,8 +170,8 @@ namespace Topuino_Client_Windows
 
         public void ShowErrorBox(string msg)
         {
-            MessageBox.Show(
-                Application.Current.MainWindow,
+            System.Windows.MessageBox.Show(
+                System.Windows.Application.Current.MainWindow,
                 msg,
                 "错误",
                 MessageBoxButton.OK,
@@ -177,7 +188,7 @@ namespace Topuino_Client_Windows
 
         private void StartRun()
         {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = System.Windows.Input.Cursors.Wait;
             if (refreshThread != null)
             {
                 requestStop.Set();
@@ -218,5 +229,24 @@ namespace Topuino_Client_Windows
             SaveConfig();
             StartRun();
         }
+
+        private void TrayIcon_DoubleClick(object? sender, EventArgs e)
+        {
+            Visibility = Visibility.Visible;
+        }
+
+        private void Button_Hide_Click(object sender, RoutedEventArgs e)
+        {
+            Visibility = Visibility.Hidden;
+        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (refreshThread != null)
+            {
+                requestStop.Set();
+                stopDone.WaitOne();
+            }
+        }
     }
 }
diff --git a/Topuino.ico b/Topuino.ico
new file mode 100644
index 0000000000000000000000000000000000000000..00f90606ae29d5cd9eed1f8b90b90a0228089ba4
GIT binary patch
literal 16958
zcmeHM%Wl(95WP{Vngt@PP#1_GvFVC63q&fugwJ5td|G}4DW8y~k*b;*+Y^l^XYRu(
zs+;<v<lLD#bLO6FQv`&tpkH@)fxbV7+n*tP2qE0khf-lnAI`VyE`%>%yHA&BzZ?3V
zKl2^T@4);H%<q8z4yYfQqqn*DJ9<E(F?YVlOUNh7p03R&g+>zWoH6mp(Zzqpj-3<h
z8{-%C#AbLkq!Y_|I_KnL^Ga(a=NM?;{`uRW4+#!<B?B_KR^N+R&a3Hs=GdVY^3FLh
zGgm*Chi0Ih=%Jd;3D-l*htJ;e&%IB%PR>H&D5qzly3J|6-COQU^Ur=xJb;|_?e-PC
z|1uY8kI9K%3XyiIhwFC1o)_w$y+J=FFL&T_NBBo~D|1TFJ(J@BY3FEgpUZpU{-fSv
zzWZ8;_)lqb{hZ}K6B5<6oEe&5vcDAnd`Bg|ncJ?!^Jh*>w-Xun9n;md5_R2|+PAtF
z=AS*Kd~^M{GW;_)rg_vV+{83>tx&e5>wa(F5?`@@zL(U`zxIy$FYg{(9Zk&K$Mke9
zQ*J=h{n35q^Jnpx&R}?E5YyAOOt~XX_a^rR{&_%5?|6XBO-xJIGUbjm-J9HBnE#|-
zx}^c9&_7@Dpx?w?&s{McUCY&Dp6;`ISid0u)~}BB9qN4S-#>JZ-48UVsAJ3ZV%-zl
zd;K<FqH*Moc>X;1*bnyhTwWa0&^51L=QZE%HBawbUc^7wW6RFbajZ{jnjhN>KZaxb
zWADFcdUK_Y(Cg88)Q57q2klXh<Pd+5OFaLSj?@tj=70e8pd4r&q)?CK21FEO`e!|~
zWDY{a*E!UKa=ORv5npna3*!R+tc#Y+Lx}j2LwuAIK0?Ho9O9qk3jMRTT`~`$<?0ym
zQBL>hJ>p7E^P>9^{&|L7G8ducN{qNDCwz;DD>=(`<B|S(j$Sesq2}p5;-Z}Hkv-x`
zPB>Y3hJT)?m&`|~d9p`5loP&2#FL!nCHE2k+$)+flo>f3;pS?yrd_3TZ2urm_-Afx
zp43EBVuZpGL>!b8zTgSR^Y9#bI^@au`kb6!(Bs*>@EL8bji1A(H`6;~pJxxUpcg9I
zyzm)q?KSy_-uX_vXYm|)?-{8)ZQJGgp{lO+^g&M7UxWXFUwc2#@tnPx=4{@%`I&k(
zn@@4w|HJUk_&@WRzEYm-9e6S8yhQ(=pVEBme*#~n=Y9(Q1Z)qE@D!d(GzP;b5|o_(
z9PUKy!egA{E4LR8o=`H^#~9v(Y(|eV##>HLbm+v2Ietnw6SJ3foDzR2Zq~pFl2X3r
zdj8)B=DV8jYJLYU^Bu_h(Y<N*RnzRly2n+sTXJ0WxNNoyimw(OUh_XSP+W!k4!1u-
zxTkpcsl)x-5H=Jat~#v4oA+yqA9{QYH#aMa8^P_jj}^zen;zeMTDEcMa2wVOjs-(l
zZ#iCc__*AzclZ11ak*>pq1vzZ8=6-gD#m(MFAwV$7mSB>9qLtwzX|u7I()A>{7AUF
zufw}#i|?-qw@rPsToCeg5;BBv#Op5pC3r=)X?+$9bRF$lHBIwCyEWlskNi7tLos>l
UaL0E@Yv1F6@0eEIBMaoMe}Yk(=l}o!

literal 0
HcmV?d00001

diff --git a/Topuino_Client_Windows.csproj b/Topuino_Client_Windows.csproj
index f41d130..d10e8fa 100644
--- a/Topuino_Client_Windows.csproj
+++ b/Topuino_Client_Windows.csproj
@@ -5,10 +5,15 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="xcopy &quot;$(ProjectDir)Topuino.ico&quot; &quot;$(ProjectDir)$(OutDir)&quot; /y /f" />
+  </Target>
+
 </Project>
diff --git a/pack.iss b/pack.iss
new file mode 100644
index 0000000..f3f1771
--- /dev/null
+++ b/pack.iss
@@ -0,0 +1,49 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "TopuinoClient"
+#define MyAppVersion "0.1"
+#define MyAppPublisher "VVZERO"
+#define MyAppURL "https://iot.vvzero.com"
+#define MyAppExeName "Topuino_Client_Windows.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{775354B5-2CB5-4689-B28C-534A1848B810}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+DisableDirPage=yes
+DisableProgramGroupPage=yes
+; Remove the following line to run in administrative install mode (install for all users.)
+PrivilegesRequired=lowest
+OutputDir=Output
+OutputBaseFilename=Topuino_Client
+SetupIconFile=Topuino.ico
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "bin\Release\net6.0-windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+