Merge branch 'feature/fixed-hotkey' into 'master'
Feature/fixed hotkey See merge request SympatheticFire/linear-app-launcher!3
This commit is contained in:
commit
99321d1e96
@ -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();
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -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")]
|
||||
|
@ -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]
|
||||
|
2
skye.sln
2
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
|
||||
|
Reference in New Issue
Block a user