diff --git a/Voltura Tools.sln b/Voltura Tools.sln index 650ffdb..98431c3 100644 --- a/Voltura Tools.sln +++ b/Voltura Tools.sln @@ -11,46 +11,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeekNumber", "WeekNumber\We EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Debug|Any CPU.Build.0 = Debug|Any CPU {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Debug|x64.ActiveCfg = Debug|Any CPU {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Debug|x64.Build.0 = Debug|Any CPU {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Debug|x86.ActiveCfg = Debug|x86 {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Debug|x86.Build.0 = Debug|x86 - {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Release|Any CPU.Build.0 = Debug|Any CPU {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Release|x64.ActiveCfg = Debug|Any CPU {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Release|x64.Build.0 = Debug|Any CPU {7192A019-B0AC-4307-96B6-F2FA0C4CF77C}.Release|x86.ActiveCfg = Release|x86 - {73DDE078-A263-4B90-91FF-476331051B79}.Debug|Any CPU.ActiveCfg = Release - {73DDE078-A263-4B90-91FF-476331051B79}.Debug|Any CPU.Build.0 = Release {73DDE078-A263-4B90-91FF-476331051B79}.Debug|x64.ActiveCfg = Release {73DDE078-A263-4B90-91FF-476331051B79}.Debug|x64.Build.0 = Release {73DDE078-A263-4B90-91FF-476331051B79}.Debug|x86.ActiveCfg = Debug {73DDE078-A263-4B90-91FF-476331051B79}.Debug|x86.Build.0 = Debug - {73DDE078-A263-4B90-91FF-476331051B79}.Release|Any CPU.ActiveCfg = Release - {73DDE078-A263-4B90-91FF-476331051B79}.Release|Any CPU.Build.0 = Release {73DDE078-A263-4B90-91FF-476331051B79}.Release|x64.ActiveCfg = Release {73DDE078-A263-4B90-91FF-476331051B79}.Release|x64.Build.0 = Release {73DDE078-A263-4B90-91FF-476331051B79}.Release|x86.ActiveCfg = Release - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|x64.ActiveCfg = Debug|Any CPU - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|x64.Build.0 = Debug|Any CPU + {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|x64.ActiveCfg = Debug|x64 + {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|x64.Build.0 = Debug|x64 {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|x86.ActiveCfg = Debug|x86 {82D086D4-E145-4487-81FA-28BD3B1577D2}.Debug|x86.Build.0 = Debug|x86 - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|Any CPU.Build.0 = Release|Any CPU - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|x64.ActiveCfg = Release|Any CPU - {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|x64.Build.0 = Release|Any CPU + {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|x64.ActiveCfg = Release|x64 + {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|x64.Build.0 = Release|x64 {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|x86.ActiveCfg = Release|x86 {82D086D4-E145-4487-81FA-28BD3B1577D2}.Release|x86.Build.0 = Release|x86 EndGlobalSection diff --git a/WeekNumber/Program.cs b/WeekNumber/Program.cs index 5d0df90..3466c33 100644 --- a/WeekNumber/Program.cs +++ b/WeekNumber/Program.cs @@ -27,9 +27,9 @@ private static void Main() { if (_mutex.WaitOne(TimeSpan.Zero, true)) { - Application.EnableVisualStyles(); Program program = new Program(); program.Run(); + Application.EnableVisualStyles(); Application.Run(); _mutex.ReleaseMutex(); } diff --git a/WeekNumber/Properties/AssemblyInfo.cs b/WeekNumber/Properties/AssemblyInfo.cs index 1e33597..8531d02 100644 --- a/WeekNumber/Properties/AssemblyInfo.cs +++ b/WeekNumber/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("550adc75-8afb-4813-ac91-8c8c6cb681ae")] -[assembly: AssemblyVersion("1.1.*")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.2.*")] +[assembly: AssemblyFileVersion("1.2.0.0")] #endregion \ No newline at end of file diff --git a/WeekNumber/TaskbarGui.cs b/WeekNumber/TaskbarGui.cs index 78e0b72..9b08d33 100644 --- a/WeekNumber/TaskbarGui.cs +++ b/WeekNumber/TaskbarGui.cs @@ -88,7 +88,7 @@ private static void UpdateIcon(int weekNumber, ref NotifyIcon notifyIcon) } graphics.FillRectangle(Brushes.White, 10, 2, 6, 12); graphics.FillRectangle(Brushes.White, 48, 2, 6, 12); - using (Font font = new Font(FontFamily.GenericMonospace, 36f, FontStyle.Bold)) + using (Font font = new Font(FontFamily.GenericMonospace, 12f, FontStyle.Bold)) { graphics.DrawString(weekNumber.ToString().PadLeft(2, '0').Substring(0, 2), font, Brushes.White, -6f, 10f); } @@ -114,12 +114,12 @@ private static void UpdateIcon(int weekNumber, ref NotifyIcon notifyIcon) #region Private properties - private ContextMenu GetContextMenu => new ContextMenu(new MenuItem[4] + private ContextMenu GetContextMenu => new ContextMenu(new[] { new MenuItem(Text.AboutMenu, new EventHandler(AboutClick)) { DefaultItem = true }, new MenuItem(Text.StartWithWindowsMenu, new EventHandler(StartWithWindowsClick)) { Checked = Settings.StartWithWindows }, new MenuItem(Text.SeparatorMenu), - new MenuItem(Text.ExitMenu, delegate { OnUserClose(); }) + new MenuItem(Text.ExitMenu, delegate { OnUserClose(); })// { OwnerDraw = } }); #endregion diff --git a/WeekNumber/Text.cs b/WeekNumber/Text.cs index 7df7a6c..fa34d9c 100644 --- a/WeekNumber/Text.cs +++ b/WeekNumber/Text.cs @@ -11,9 +11,9 @@ internal static class Text #region Static texts variables internal static readonly string About = Application.ProductName + " by Voltura AB\r\rhttps://github.com/voltura/VolturaTools\r\rFree for all."; - internal static readonly string AboutMenu = "&About " + Application.ProductName + "\tshift+A"; - internal static readonly string StartWithWindowsMenu = "&Start with Windows\tshift+S"; - internal static readonly string ExitMenu = "E&xit " + Application.ProductName + "\tshift+X"; + internal static readonly string AboutMenu = "About " + Application.ProductName; + internal static readonly string StartWithWindowsMenu = "Start with Windows"; + internal static readonly string ExitMenu = "Exit " + Application.ProductName; internal static readonly string SeparatorMenu = "-"; internal static readonly string ApplicationNameAndVersion = Application.ProductName + " version " + Application.ProductVersion; internal static readonly string FailedToSetIcon = "Could not set Icon. Please report to feedback@voltura.se!\r\r"; diff --git a/WeekNumber/WeekNumber.csproj b/WeekNumber/WeekNumber.csproj index 5e10649..9c13485 100644 --- a/WeekNumber/WeekNumber.csproj +++ b/WeekNumber/WeekNumber.csproj @@ -2,8 +2,6 @@ - Debug - AnyCPU {82D086D4-E145-4487-81FA-28BD3B1577D2} WinExe WeekNumber @@ -12,12 +10,12 @@ 512 true - + x64 true full false - bin\Debug\ + bin\x64\Debug\ DEBUG;TRACE prompt 4 @@ -25,11 +23,11 @@ true ExtendedCorrectnessRules.ruleset - + x64 pdbonly true - bin\Release\ + bin\x64\Release\ TRACE prompt 4 @@ -37,7 +35,7 @@ true true ExtendedCorrectnessRules.ruleset - bin\Release\WeekNumber.xml + bin\x64\Release\WeekNumber.xml true @@ -54,7 +52,7 @@ bin\x86\Release\ CODE_ANALYSIS;TRACE - bin\Release\WeekNumber.xml + bin\x86\Release\WeekNumber.xml true true pdbonly @@ -62,6 +60,16 @@ true prompt ExtendedCorrectnessRules.ruleset + true + + + WeekNumber.Program + + + weekicon.ico + + + settings.manifest @@ -79,6 +87,14 @@ + + + Designer + + + + + diff --git a/WeekNumber/settings.manifest b/WeekNumber/settings.manifest new file mode 100644 index 0000000..e6b06db --- /dev/null +++ b/WeekNumber/settings.manifest @@ -0,0 +1,21 @@ + + + + True/PM + + + + + + + + + + + + + + + + + diff --git a/WeekNumber/weekicon.ico b/WeekNumber/weekicon.ico new file mode 100644 index 0000000..200b795 Binary files /dev/null and b/WeekNumber/weekicon.ico differ