diff --git a/KeyboardDisplay/App.config b/KeyboardDisplay/App.config
index ecdcf8a..ea55c80 100644
--- a/KeyboardDisplay/App.config
+++ b/KeyboardDisplay/App.config
@@ -1,6 +1,18 @@
+
+
+
+
+
+
+
+
+ False
+
+
+
diff --git a/KeyboardDisplay/MainWindow.xaml.cs b/KeyboardDisplay/MainWindow.xaml.cs
index 544a3fc..2d71d4c 100644
--- a/KeyboardDisplay/MainWindow.xaml.cs
+++ b/KeyboardDisplay/MainWindow.xaml.cs
@@ -160,9 +160,12 @@ private async void ShowChange(CancellationToken token)
{
//tokenSource.Dispose();
}
- Storyboard sb2 = FindResource("FadeOut") as Storyboard;
- Storyboard.SetTarget(sb2, this);
- sb2.Begin();
+ if (Properties.Settings.Default.alwaysOn == false)
+ {
+ Storyboard sb2 = FindResource("FadeOut") as Storyboard;
+ Storyboard.SetTarget(sb2, this);
+ sb2.Begin();
+ }
}
protected override void OnSourceInitialized(EventArgs e)
diff --git a/KeyboardDisplay/Properties/Settings.Designer.cs b/KeyboardDisplay/Properties/Settings.Designer.cs
index f9b49fe..4b6c5b5 100644
--- a/KeyboardDisplay/Properties/Settings.Designer.cs
+++ b/KeyboardDisplay/Properties/Settings.Designer.cs
@@ -22,5 +22,17 @@ public static Settings Default {
return defaultInstance;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("False")]
+ public bool alwaysOn {
+ get {
+ return ((bool)(this["alwaysOn"]));
+ }
+ set {
+ this["alwaysOn"] = value;
+ }
+ }
}
}
diff --git a/KeyboardDisplay/Properties/Settings.settings b/KeyboardDisplay/Properties/Settings.settings
index 033d7a5..647fb04 100644
--- a/KeyboardDisplay/Properties/Settings.settings
+++ b/KeyboardDisplay/Properties/Settings.settings
@@ -1,7 +1,9 @@
-
-
-
-
-
+
+
+
+
+ False
+
+
\ No newline at end of file
diff --git a/KeyboardDisplay/Window1.xaml b/KeyboardDisplay/Window1.xaml
index 3188a1f..3f659be 100644
--- a/KeyboardDisplay/Window1.xaml
+++ b/KeyboardDisplay/Window1.xaml
@@ -5,12 +5,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:KeyboardDisplay"
mc:Ignorable="d"
- Title="Keyboard Display Settings" Icon="Resources/KBDDisp.ico" SizeToContent="Height" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Width="300">
+ Title="Keyboard Display Settings" Icon="Resources/KBDDisp.ico" SizeToContent="Height" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" Width="424.413" Loaded="Window_Loaded">
+
diff --git a/KeyboardDisplay/Window1.xaml.cs b/KeyboardDisplay/Window1.xaml.cs
index 350112c..ae19f48 100644
--- a/KeyboardDisplay/Window1.xaml.cs
+++ b/KeyboardDisplay/Window1.xaml.cs
@@ -20,6 +20,7 @@ namespace KeyboardDisplay
///
public partial class Window1 : Window
{
+
public Window1()
{
InitializeComponent();
@@ -27,6 +28,7 @@ public Window1()
//set checkbox
startupCheckbox.IsChecked = Functions.GetStartupRegistryKeyStatus("currentUser");
startupCheckbox_AllUsers.IsChecked = Functions.GetStartupRegistryKeyStatus("localMachine");
+ alwaysOnCheckbox.IsChecked = Properties.Settings.Default.alwaysOn;
}
private void StartupCheckbox_Click(object sender, RoutedEventArgs e)
@@ -59,5 +61,17 @@ private void Button_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
+
+ private void alwaysOnCheckbox_Click(object sender, RoutedEventArgs e)
+ {
+ Properties.Settings.Default.alwaysOn = alwaysOnCheckbox.IsChecked.Value;
+ Properties.Settings.Default.Save();
+
+ }
+
+ private void Window_Loaded(object sender, RoutedEventArgs e)
+ {
+
+ }
}
}
diff --git a/Output/setup.exe b/Output/setup.exe
new file mode 100644
index 0000000..8d5cd6b
Binary files /dev/null and b/Output/setup.exe differ
diff --git a/setupScript.iss b/setupScript.iss
new file mode 100644
index 0000000..fb5a55a
--- /dev/null
+++ b/setupScript.iss
@@ -0,0 +1,56 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "Keyboard Display"
+#define MyAppVersion "b0.5"
+#define MyAppPublisher "Nathan Banks"
+#define MyAppURL "https://www.github.com/banksio/KeyboardDisplay"
+#define MyAppExeName "KeyboardDisplay.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={{28C8AB21-2F98-4D95-8591-052EC938186E}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+AllowNoIcons=yes
+OutputBaseFilename=setup
+Compression=lzma
+SolidCompression=yes
+
+[Tasks]
+Name: startAtLogon; Description: "Start at sign in"; GroupDescription: "Startup parameters:"
+Name: startAtLogon\common; Description: "For all users"; GroupDescription: "Startup parameters"; Flags: exclusive
+Name: startAtLogon\user; Description: "For the current user only"; GroupDescription:"Startup parameters"; Flags: exclusive unchecked
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+Source: "F:\Development\GitHub\originals\KeyboardDisplay\KeyboardDisplay\bin\Release\KeyboardDisplay.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "F:\Development\GitHub\originals\KeyboardDisplay\KeyboardDisplay\bin\Release\Hardcodet.Wpf.TaskbarNotification.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "F:\Development\GitHub\originals\KeyboardDisplay\KeyboardDisplay\bin\Release\Hardcodet.Wpf.TaskbarNotification.pdb"; DestDir: "{app}"; Flags: ignoreversion
+Source: "F:\Development\GitHub\originals\KeyboardDisplay\KeyboardDisplay\bin\Release\Hardcodet.Wpf.TaskbarNotification.xml"; DestDir: "{app}"; Flags: ignoreversion
+Source: "F:\Development\GitHub\originals\KeyboardDisplay\KeyboardDisplay\bin\Release\KeyboardDisplay.exe.config"; DestDir: "{app}"; Flags: ignoreversion
+Source: "F:\Development\GitHub\originals\KeyboardDisplay\KeyboardDisplay\bin\Release\KeyboardDisplay.pdb"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+
+[Registry]
+Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "KbdDispStart"; ValueData: """{app}\KeyboardDisplay.exe"""; Flags: uninsdeletevalue; Tasks: startAtLogon\user
+Root: HKLM; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "KbdDispStart"; ValueData: """{app}\KeyboardDisplay.exe"""; Flags: uninsdeletevalue; Tasks: startAtLogon\common
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+