From 6266bc65e7264ed903558158e44f1570aa58b9ba Mon Sep 17 00:00:00 2001 From: Martin Barker Date: Tue, 7 Nov 2023 00:43:10 +0000 Subject: [PATCH] trying to get on startup working correctly --- Preprocessed.iss | 22 ++++++++++--------- TwitchDesktopNotifications/Assets/twitch.bmp | Bin 0 -> 9798 bytes TwitchDesktopNotifications/Program.cs | 5 +++++ setup.iss | 9 ++++---- 4 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 TwitchDesktopNotifications/Assets/twitch.bmp diff --git a/Preprocessed.iss b/Preprocessed.iss index da6dc8e..a11c22c 100644 --- a/Preprocessed.iss +++ b/Preprocessed.iss @@ -549,7 +549,7 @@ end; ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{7774CEEE-6785-48B9-BA35-6B842F947A21} AppName=Twitchy -AppVersion=0.4.0 +AppVersion=0.4.1 ;AppVerName={#MyAppName} {#MyAppVersion} DefaultDirName={autopf}\Twitchy DisableProgramGroupPage=yes @@ -560,6 +560,7 @@ OutputDir=.\SetupFiles OutputBaseFilename=TwitchySetup SetupIconFile=.\TwitchDesktopNotifications\Assets\icon.ico UninstallDisplayIcon=.\TwitchDesktopNotifications\Assets\icon.ico +WizardSmallImageFile=.\TwitchDesktopNotifications\Assets\twitch.bmp Compression=lzma SolidCompression=yes WizardStyle=modern @@ -571,16 +572,17 @@ SourceDir=.\ Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +Name: "autostarticon"; Description: "{cm:AutoStartProgram,Twitchy}"; GroupDescription: "{cm:AdditionalIcons}"; [Files] -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Twitchy.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Microsoft.Windows.SDK.NET.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Twitchy.deps.json"; DestDir: "{app}"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Twitchy.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Twitchy.runtimeconfig.json"; DestDir: "{app}"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\WinRT.Runtime.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Assets\icon.ico"; DestDir: "{app}\Assets"; Flags: ignoreversion -Source: "TwitchDesktopNotifications\bin\x64\ReleaseSign\net6.0-windows10.0.17763.0\Assets\twitch.png"; DestDir: "{app}\Assets"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Twitchy.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Microsoft.Toolkit.Uwp.Notifications.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Microsoft.Windows.SDK.NET.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Twitchy.deps.json"; DestDir: "{app}"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Twitchy.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Twitchy.runtimeconfig.json"; DestDir: "{app}"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\WinRT.Runtime.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Assets\icon.ico"; DestDir: "{app}\Assets"; Flags: ignoreversion +Source: "TwitchDesktopNotifications\bin\Release\net6.0-windows10.0.17763.0\Assets\twitch.png"; DestDir: "{app}\Assets"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files Source: "netcorecheck.exe"; Flags: dontcopy noencryption Source: "netcorecheck_x64.exe"; Flags: dontcopy noencryption diff --git a/TwitchDesktopNotifications/Assets/twitch.bmp b/TwitchDesktopNotifications/Assets/twitch.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5de6bba62ea5adaa671d0af3100d671e2a248df4 GIT binary patch literal 9798 zcmeI1ZBtZb7{}=gG`{Q;G<^b{@ntWxOtYHF9>&aU9H-H7DyPz3G}>fkSp&F&L7?CR z7zRd&2rP-nfPx0fu&yYAPar|a^W*yWf9<^;*gd;vcMtcn+sxi`_RQI{hjV`X@9Vnm z>$=X1YgRm;;vGx5e}SK6{4D3^nUv?aPf1zA-|L=LAMXk7@P8OdPQ9~aM^BFj<5L)) zhUbZ17>m2v;T)O7ft2qD-OJy zgRjrPc>{O)wL6zK&Xs9+`2f~sV_P9kHlu$;Z*-mG9GXD23;7M+ym%K?AQ7z3?Gbf)#NABp85cElr6(|1% z3d^N|saIWxWZjmws+m(Qki!$`9zbO~Qfu%5J<9=lP*82@eMC)j;$jB|$1IjtJDj}v zmgCrQ%5U3WDS^=#6!zaSwA_Q^Ja(4&U8(+%hQY<+^+V!xw3*auG&q1-}s2BSp!oJXmU(QNIU;BK9a_jN&Zz46_ip={e;B^k+JSXh`1UNS+VQ|o)i`rfF`9AbKRDYaxhtohZpHncGL&DJvg^OnJN}$% za_NR#&c3g}8{P=8`XIh4MQIEAM%3?#!pT_CH;nUcnRJ#gOs?o$EM_UScO(j@qUjmJ zUvBI!^DPS7PvS;zB62c!;^_8hZVsD7)sn zfUCTDEE;EFlh43dwXtLi7&jkD`k~T1x{P@wIRi9F>PbN&?}voVKa+YU_0%4h_=aVF zm2_0ByDp4-VeOMS&lknAv5nAadc{CTV9!KdaIQTdRLEEB_{qYmybXKKNU0LE);3Ot zG(`rAmWk(OG*avG{OcZ;<%kuaNUBIs!t5*tLSL&#PV z%WC%43~gCwvBSo;RgAW*I^VN`)<*`RaXxu^ry=aUL6o#$S1jM!1pR-bGmlgN literal 0 HcmV?d00001 diff --git a/TwitchDesktopNotifications/Program.cs b/TwitchDesktopNotifications/Program.cs index b87ad95..56d2686 100644 --- a/TwitchDesktopNotifications/Program.cs +++ b/TwitchDesktopNotifications/Program.cs @@ -1,4 +1,5 @@ // See https://aka.ms/new-console-template for more information +using Microsoft.Toolkit.Uwp.Notifications; using System.Drawing; using System.Reflection.Metadata; using System.Runtime.InteropServices; @@ -128,6 +129,10 @@ internal class Program thread.Start(); Application.Run(); + + Application.ApplicationExit += (object? sender, EventArgs e) => { + ToastNotificationManagerCompat.Uninstall(); + }; } catch (Exception e) { Logger.GetInstance().Writer.WriteLineAsync(e.ToString()); diff --git a/setup.iss b/setup.iss index f76f427..09b198d 100644 --- a/setup.iss +++ b/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Twitchy" -#define MyAppVersion "0.4.0" +#define MyAppVersion "0.4.2" #define MyAppExeName "Twitchy.exe" #ifndef MyAppTargetFramework @@ -22,7 +22,6 @@ AppId={{7774CEEE-6785-48B9-BA35-6B842F947A21} AppName={#MyAppName} AppVersion={#MyAppVersion} -;AppVerName={#MyAppName} {#MyAppVersion} DefaultDirName={autopf}\{#MyAppName} DisableProgramGroupPage=yes LicenseFile=.\TwitchDesktopNotifications\Lisence.rtf @@ -32,6 +31,7 @@ OutputDir=.\SetupFiles OutputBaseFilename=TwitchySetup SetupIconFile=.\TwitchDesktopNotifications\Assets\icon.ico UninstallDisplayIcon=.\TwitchDesktopNotifications\Assets\icon.ico +WizardSmallImageFile=.\TwitchDesktopNotifications\Assets\twitch.bmp Compression=lzma SolidCompression=yes WizardStyle=modern @@ -45,6 +45,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked +Name: "autostarticon"; Description: "{cm:AutoStartProgram,{#MyAppName}}"; GroupDescription: "{cm:AdditionalIcons}"; [Files] Source: "{#SourceDir}{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion @@ -65,13 +66,11 @@ Source: "netcorecheck_x64.exe"; Flags: dontcopy noencryption [Icons] Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{commonstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: autostarticon [Run] Filename: {app}\{cm:AppName}.exe; Description: {cm:LaunchProgram,{cm:AppName}}; Flags: nowait postinstall skipifsilent -[Registry] -Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "Twitchy"; ValueData: """{app}\{#MyAppExeName}"""; Flags: uninsdeletevalue - [CustomMessages] AppName=Twitchy LaunchProgram=Start Twitchy after finishing installation