Skip to content

Commit

Permalink
[Feature] Option to remove taskbar icon (#123), version 1.0.14.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Hofknecht committed Aug 5, 2020
1 parent 3f7bacd commit fed20a5
Show file tree
Hide file tree
Showing 10 changed files with 239 additions and 34 deletions.
42 changes: 23 additions & 19 deletions Business/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal class App : IDisposable
{
private readonly AppNotifyIcon menuNotifyIcon = new AppNotifyIcon();
private readonly Menus menus = new Menus();
private readonly TaskbarForm taskbarForm = new TaskbarForm();
private readonly TaskbarForm taskbarForm = null;

public App()
{
Expand All @@ -35,34 +35,38 @@ void MenuNotifyIcon_Click()

menuNotifyIcon.OpenLog += Log.OpenLogFile;
menus.MainPreload();
taskbarForm.Activated += TasbkarItemActivated;
void TasbkarItemActivated(object sender, EventArgs e)
if (!Properties.Settings.Default.HideTaskbarForm)
{
SetStateNormal();
taskbarForm.Activate();
taskbarForm.Focus();
menus.SwitchOpenCloseByTaskbarItem();
}
taskbarForm = new TaskbarForm();
taskbarForm.Activated += TasbkarItemActivated;
void TasbkarItemActivated(object sender, EventArgs e)
{
SetStateNormal();
taskbarForm.Activate();
taskbarForm.Focus();
menus.SwitchOpenCloseByTaskbarItem();
}

taskbarForm.Resize += TaskbarForm_Resize;
taskbarForm.FormClosed += TaskbarForm_FormClosed;
static void TaskbarForm_FormClosed(object sender, FormClosedEventArgs e)
{
Application.Exit();
}
taskbarForm.Resize += TaskbarForm_Resize;
taskbarForm.FormClosed += TaskbarForm_FormClosed;
static void TaskbarForm_FormClosed(object sender, FormClosedEventArgs e)
{
Application.Exit();
}

taskbarForm.Deactivate += TaskbarForm_Deactivate;
void TaskbarForm_Resize(object sender, EventArgs e)
{
SetStateNormal();
taskbarForm.Deactivate += TaskbarForm_Deactivate;
void TaskbarForm_Resize(object sender, EventArgs e)
{
SetStateNormal();
}
}

DllImports.NativeMethods.User32ShowInactiveTopmost(taskbarForm);
}

public void Dispose()
{
taskbarForm.Dispose();
taskbarForm?.Dispose();
menus.Dispose();
menuNotifyIcon.Dispose();
}
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.14.0")]
[assembly: AssemblyFileVersion("1.0.14.0")]
[assembly: AssemblyVersion("1.0.14.1")]
[assembly: AssemblyFileVersion("1.0.14.1")]
2 changes: 1 addition & 1 deletion Properties/CustomSettingsProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public override string ApplicationName
/// Gets the setting key this is returning must set before the settings are used.
/// e.g. <c>Properties.Settings.Default.SettingsKey = @"C:\temp\user.config";</c>.
/// </summary>
private string UserConfigPath
private static string UserConfigPath
{
get
{
Expand Down
24 changes: 24 additions & 0 deletions Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Properties/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,11 @@
<Setting Name="IsUpgraded" Provider="CustomSettingsProvider" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="HideTaskbarForm" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="OpenItemWithOneClick" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
27 changes: 27 additions & 0 deletions Resources/lang.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Resources/lang.de-DE.resx
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,13 @@
<data name="MessageRootFolderNoAccess" xml:space="preserve">
<value>Du hast keine Rechte für den Hauptordner. Gewähre die Rechte oder ändere den Hauptordner.</value>
</data>
<data name="Expert" xml:space="preserve">
<value>Experte</value>
</data>
<data name="Hide Taskbar Icon" xml:space="preserve">
<value>Taskbar Icon verstecken</value>
</data>
<data name="Single click to start item" xml:space="preserve">
<value>Einzelner Klick, um Item zu starten</value>
</data>
</root>
9 changes: 9 additions & 0 deletions Resources/lang.resx
Original file line number Diff line number Diff line change
Expand Up @@ -195,4 +195,13 @@
<data name="MessageRootFolderNoAccess" xml:space="preserve">
<value>You have no access to the root folder for the SystemTrayMenu. Grant access to the folder or change the root folder.</value>
</data>
<data name="Expert" xml:space="preserve">
<value>Expert</value>
</data>
<data name="Hide Taskbar Icon" xml:space="preserve">
<value>Hide Taskbar Icon</value>
</data>
<data name="Single click to start item" xml:space="preserve">
<value>Single click to start item</value>
</data>
</root>
Loading

0 comments on commit fed20a5

Please sign in to comment.