mirror of
https://github.com/Hofknecht/SystemTrayMenu.git
synced 2024-06-11 23:15:20 +12:00
[Feature] Framework Self-Contained, not more necessary to install .Net 6 sdk (#277), version 1.3.3.0
This commit is contained in:
parent
1b09ee8c9b
commit
5fbba28fa6
|
@ -51,13 +51,8 @@
|
||||||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
||||||
<DefaultLanguage>en-US</DefaultLanguage>
|
<DefaultLanguage>en-US</DefaultLanguage>
|
||||||
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
|
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
|
||||||
<EntryPointProjectUniqueName>..\SystemTrayMenu.csproj</EntryPointProjectUniqueName>
|
|
||||||
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
|
|
||||||
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
|
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
|
||||||
<GenerateTestArtifacts>True</GenerateTestArtifacts>
|
|
||||||
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
|
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
|
||||||
<AppInstallerUri>https://github.com/Hofknecht/SystemTrayMenu/releases</AppInstallerUri>
|
|
||||||
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
|
|
||||||
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
|
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
@ -95,11 +90,6 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Package.StoreAssociation.xml" />
|
<None Include="Package.StoreAssociation.xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\SystemTrayMenu.csproj">
|
|
||||||
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="Properties\" />
|
<Folder Include="Properties\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -1,4 +1,8 @@
|
||||||
namespace SystemTrayMenu.UserInterface
|
// <copyright file="HintYouCanOpenSettingsInSystemtrayIconRightClickForm.cs" company="PlaceholderCompany">
|
||||||
|
// Copyright (c) PlaceholderCompany. All rights reserved.
|
||||||
|
// </copyright>
|
||||||
|
|
||||||
|
namespace SystemTrayMenu.UserInterface
|
||||||
{
|
{
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using SystemTrayMenu.Utilities;
|
using SystemTrayMenu.Utilities;
|
||||||
|
|
|
@ -416,6 +416,20 @@ namespace SystemTrayMenu.UserInterface.HotkeyTextboxControl
|
||||||
return HotkeyToString(HotkeyModifiers, Hotkey);
|
return HotkeyToString(HotkeyModifiers, Hotkey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Disposes of the resources used by the HotkeyControl.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">True if being called from Dispose, false otherwise.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing)
|
||||||
|
{
|
||||||
|
dummy.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Handles some misc keys, such as Ctrl+Delete and Shift+Insert.
|
/// Handles some misc keys, such as Ctrl+Delete and Shift+Insert.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -580,23 +580,6 @@ namespace SystemTrayMenu.UserInterface
|
||||||
textBoxColorArrowHoverBackgroundDarkMode.Text = Settings.Default.ColorArrowHoverBackgroundDarkMode;
|
textBoxColorArrowHoverBackgroundDarkMode.Text = Settings.Default.ColorArrowHoverBackgroundDarkMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShowHintToFindSettings(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
if (!((CheckBox)sender).Checked &&
|
|
||||||
Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick)
|
|
||||||
{
|
|
||||||
using (HintYouCanOpenSettingsInSystemtrayIconRightClickForm hintForm = new())
|
|
||||||
{
|
|
||||||
hintForm.ShowDialog();
|
|
||||||
Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick =
|
|
||||||
hintForm.GetShowHintAgain();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets NewHotKey.
|
|
||||||
/// </summary>
|
|
||||||
public string NewHotKey { get; } = string.Empty;
|
public string NewHotKey { get; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -819,6 +802,18 @@ namespace SystemTrayMenu.UserInterface
|
||||||
return useStartupTask;
|
return useStartupTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ShowHintToFindSettings(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (!((CheckBox)sender).Checked &&
|
||||||
|
Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick)
|
||||||
|
{
|
||||||
|
using HintYouCanOpenSettingsInSystemtrayIconRightClickForm hintForm = new();
|
||||||
|
hintForm.ShowDialog();
|
||||||
|
Settings.Default.ShowHintYouCanOpenSettingsInSystemtrayIconRightClick =
|
||||||
|
hintForm.GetShowHintAgain();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void SettingsForm_Load(object sender, EventArgs e)
|
private void SettingsForm_Load(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
AdjustControlMultilineIfNecessary(checkBoxStayOpenWhenFocusLost);
|
AdjustControlMultilineIfNecessary(checkBoxStayOpenWhenFocusLost);
|
||||||
|
@ -1509,6 +1504,7 @@ namespace SystemTrayMenu.UserInterface
|
||||||
|
|
||||||
private void SettingsForm_FormClosed(object sender, FormClosedEventArgs e)
|
private void SettingsForm_FormClosed(object sender, FormClosedEventArgs e)
|
||||||
{
|
{
|
||||||
|
textBoxHotkey?.Dispose();
|
||||||
settingsForm?.Dispose();
|
settingsForm?.Dispose();
|
||||||
settingsForm = null;
|
settingsForm = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -167,7 +167,6 @@ namespace SystemTrayMenu.Utilities
|
||||||
|
|
||||||
using Process p = new()
|
using Process p = new()
|
||||||
{
|
{
|
||||||
|
|
||||||
StartInfo = new ProcessStartInfo(fileName)
|
StartInfo = new ProcessStartInfo(fileName)
|
||||||
{
|
{
|
||||||
FileName = fileName,
|
FileName = fileName,
|
||||||
|
|
Loading…
Reference in a new issue