From f2f48abfe830650329a568d22c4c88f54ece3095 Mon Sep 17 00:00:00 2001
From: Ray <sympatheticfire@gmail.com>
Date: Sun, 7 Jun 2020 16:06:02 +0100
Subject: [PATCH 1/2] Changed: re-positioned hotkey registration on start up
---
LinearAppLauncher.csproj => FizzyLauncher.csproj | 0
LinearAppLauncher.csproj.user => FizzyLauncher.csproj.user | 0
MainForm.cs | 6 +++---
Properties/AssemblyInfo.cs | 2 +-
skye.sln | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename LinearAppLauncher.csproj => FizzyLauncher.csproj (100%)
rename LinearAppLauncher.csproj.user => FizzyLauncher.csproj.user (100%)
diff --git a/LinearAppLauncher.csproj b/FizzyLauncher.csproj
similarity index 100%
rename from LinearAppLauncher.csproj
rename to FizzyLauncher.csproj
diff --git a/LinearAppLauncher.csproj.user b/FizzyLauncher.csproj.user
similarity index 100%
rename from LinearAppLauncher.csproj.user
rename to FizzyLauncher.csproj.user
diff --git a/MainForm.cs b/MainForm.cs
index f0a94f9..d73a32e 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -437,9 +437,6 @@ namespace AppLauncher
// ui
ThreadControl.SetSize(this, (maxWidth + SystemInformation.VerticalScrollBarWidth + 20 + flowLayoutPanel1.Left), this.CurrentSession.DefaultHeight);
- // hotkey
- invalidateHotKey();
-
//
ThreadControl.SetTopMost(this, this.CurrentSession.AlwaysOnTop);
ThreadControl.SetVisible(this, true);
@@ -455,6 +452,9 @@ namespace AppLauncher
this.Focus();
}
+ // hotkey
+ invalidateHotKey();
+
});
}
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 0be6320..d6aba6e 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.1.1.108")]
+[assembly: AssemblyFileVersion("0.1.1.109")]
diff --git a/skye.sln b/skye.sln
index b8924c6..3b21ce7 100644
--- a/skye.sln
+++ b/skye.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1022
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinearAppLauncher", "LinearAppLauncher.csproj", "{66C1C75C-3612-4D23-B937-C3DE0D653292}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FizzyLauncher", "FizzyLauncher.csproj", "{66C1C75C-3612-4D23-B937-C3DE0D653292}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
From b027d90d740a6336629e5444777e5e037acde6e3 Mon Sep 17 00:00:00 2001
From: Ray <sympatheticfire@gmail.com>
Date: Sun, 7 Jun 2020 16:14:36 +0100
Subject: [PATCH 2/2] Changed: installer paths
---
installer.iss | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/installer.iss b/installer.iss
index 9d134ff..e945c85 100644
--- a/installer.iss
+++ b/installer.iss
@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Fizzy Launcher"
-#define MyAppVersion "0.1.1.108 alpha"
+#define MyAppVersion "0.1.1.109 alpha"
#define MyAppPublisher "Hi, I'm Ray"
#define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
#define MyAppExeName "fizzylauncher.exe"
@@ -23,7 +23,7 @@ DefaultGroupName={#MyAppName}
DisableProgramGroupPage=yes
; Remove the following line to run in administrative install mode (install for all users.)
PrivilegesRequired=lowest
-OutputDir=N:\#\New folder
+OutputDir=L:\gitlab-hiimray\fizzy-launcher\bin
OutputBaseFilename=fizzy-launcher
Compression=lzma
SolidCompression=yes
@@ -36,10 +36,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
-Source: "L:\gitlab-hiimray\fizzy-launcher\bin\v0.1.1.108 alpha\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "L:\gitlab-hiimray\fizzy-launcher\bin\v0.1.1.108 alpha\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "L:\gitlab-hiimray\fizzy-launcher\bin\v0.1.1.108 alpha\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "L:\gitlab-hiimray\fizzy-launcher\bin\v0.1.1.108 alpha\Newtonsoft.Json.xml"; DestDir: "{app}"; Flags: ignoreversion
+Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\fizzylauncher.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "L:\gitlab-hiimray\fizzy-launcher\bin\Release\Newtonsoft.Json.xml"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons]