diff --git a/src/VolumeScroller.sln b/src/VolumeScroller.sln index 64f5744..a41bc8a 100644 --- a/src/VolumeScroller.sln +++ b/src/VolumeScroller.sln @@ -8,13 +8,37 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|ARM.Build.0 = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|ARM64.Build.0 = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|x64.ActiveCfg = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|x64.Build.0 = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|x86.ActiveCfg = Debug|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Debug|x86.Build.0 = Debug|Any CPU {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|Any CPU.ActiveCfg = Release|Any CPU {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|Any CPU.Build.0 = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|ARM.ActiveCfg = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|ARM.Build.0 = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|ARM64.ActiveCfg = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|ARM64.Build.0 = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|x64.ActiveCfg = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|x64.Build.0 = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|x86.ActiveCfg = Release|Any CPU + {1A918D94-2022-4AF6-8E2C-78AFA152524F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/VolumeScroller/MainModel.cs b/src/VolumeScroller/MainModel.cs index 197c18a..95e1eed 100644 --- a/src/VolumeScroller/MainModel.cs +++ b/src/VolumeScroller/MainModel.cs @@ -13,7 +13,7 @@ public MainModel() { } - public static bool DarkTaskbar + public bool DarkTaskbar { get => Properties.Settings.Default.DarkTaskbar; set @@ -23,7 +23,7 @@ public static bool DarkTaskbar } } - public static int Increment + public int Increment { get => Properties.Settings.Default.Increment; set diff --git a/src/VolumeScroller/MainViewModel.cs b/src/VolumeScroller/MainViewModel.cs index cfd0753..a673b5b 100644 --- a/src/VolumeScroller/MainViewModel.cs +++ b/src/VolumeScroller/MainViewModel.cs @@ -16,6 +16,8 @@ public class MainViewModel : ViewModelBase public MainViewModel(MainModel mainModel) { this.mainModel = mainModel; + darkTaskbar = mainModel.DarkTaskbar; + increment = mainModel.Increment * 2; } public string TaskBarIconPath @@ -25,22 +27,22 @@ public string TaskBarIconPath public bool DarkTaskbar { - get => MainModel.DarkTaskbar; + get => darkTaskbar; set { SetProperty(ref darkTaskbar, value); - MainModel.DarkTaskbar = value; + mainModel.DarkTaskbar = value; OnPropertyChanged(nameof(TaskBarIconPath)); } } public int Increment { - get => MainModel.Increment * 2; + get => increment; set { SetProperty(ref increment, value); - MainModel.Increment = value / 2; + mainModel.Increment = value / 2; } } } diff --git a/src/VolumeScroller/VolumeScroller.csproj b/src/VolumeScroller/VolumeScroller.csproj index c233d99..df68819 100644 --- a/src/VolumeScroller/VolumeScroller.csproj +++ b/src/VolumeScroller/VolumeScroller.csproj @@ -1,52 +1,52 @@  + + WinExe + net5.0-windows + true + win-x86;win-x64 + Resources\VolumeScroller_light_ApplicationIcon.ico + - - WinExe - net5.0-windows - true - Resources\VolumeScroller_light_ApplicationIcon.ico - + + + + + + + + + + + + + + + + + + + True + True + Resources.resx + + + True + True + Settings.settings + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - True - True - Settings.settings - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - PublicSettingsSingleFileGenerator - Settings.Designer.cs - - + + PublicSettingsSingleFileGenerator + Settings.Designer.cs + +