v3.0.16 store release with a light theme tweak (slider and combobox)

torum · Dec 31, 2022 · fdf30c5 · fdf30c5
1 parent c3ea085
commit fdf30c5
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 11 deletions.
diff --git a/MPDCtrl-Desktop/MPDCtrl.sln b/MPDCtrl-Desktop/MPDCtrl.sln
@@ -1,34 +1,46 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30717.126
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPDCtrl", "MPDCtrl\MPDCtrl.csproj", "{72A81192-4291-42D0-ABBD-9B3FC27B0B54}"
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MSStorePackageProject", "MSStorePackageProject\MSStorePackageProject.wapproj", "{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}"
 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
+		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.ActiveCfg = Debug|x64
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.Build.0 = Debug|x64
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.ActiveCfg = Debug|x86
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.Build.0 = Debug|x86
+		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.ActiveCfg = Release|x64
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.Build.0 = Release|x64
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.ActiveCfg = Release|x86
 		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.Build.0 = Release|x86
+		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x64.ActiveCfg = Debug|x64
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x64.Build.0 = Debug|x64
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x64.Deploy.0 = Debug|x64
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x86.ActiveCfg = Debug|x86
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x86.Build.0 = Debug|x86
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x86.Deploy.0 = Debug|x86
+		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|x64.ActiveCfg = Release|x64
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|x64.Build.0 = Release|x64
 		{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|x64.Deploy.0 = Release|x64

diff --git a/MPDCtrl-Desktop/MPDCtrl/App.xaml b/MPDCtrl-Desktop/MPDCtrl/App.xaml
@@ -1257,7 +1257,7 @@
                                             </TextBox.Template>
                                         </TextBox>
 
-                                        <TextBlock x:Name="SelectMessage" HorizontalAlignment="Center" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Tag}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}"  Visibility="Collapsed" IsHitTestVisible="False" TextElement.Foreground="White" />
+                                        <TextBlock x:Name="SelectMessage" HorizontalAlignment="Center" Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Tag}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}"  Visibility="Collapsed" IsHitTestVisible="False" TextElement.Foreground="{DynamicResource NormalTextColorBrush}" />
 
                                         <!-- Popup showing items -->
                                         <Popup Name="Popup" Placement="Bottom" Focusable="False" AllowsTransparency="True" IsOpen="{TemplateBinding ComboBox.IsDropDownOpen}" PopupAnimation="Slide" Margin="0" TextElement.Foreground="{DynamicResource NormalTextColorBrush}">
@@ -1342,7 +1342,7 @@
                         <Setter Property="FocusVisualStyle" Value="{StaticResource CheckBoxFocusVisual}"/>
                         <Setter Property="Background" Value="{StaticResource OptionMark.Static.Background}"/>
                         <Setter Property="BorderBrush" Value="{StaticResource OptionMark.Static.Border}"/>
-                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+                        <Setter Property="Foreground" Value="{DynamicResource NormalTextColorBrush}"/>
                         <Setter Property="BorderThickness" Value="1"/>
                         <Setter Property="Template">
                             <Setter.Value>
@@ -1399,7 +1399,7 @@
 
 
                     <Style x:Key="DefaultCheckBoxStyle" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource CustomCheckBoxStyle}">
-                        <Setter Property="Foreground" Value="{StaticResource ControlMediumColorBrush}" />
+                        <Setter Property="Foreground" Value="{StaticResource NormalTextColorBrush}" />
                         <Setter Property="Background" Value="{DynamicResource NormalTextBoxBackgroundColorBrush}"/>
                         <Setter Property="FontSize" Value="12" />
                         <Setter Property="FontStyle" Value="Normal" />

diff --git a/MPDCtrl-Desktop/MPDCtrl/MPDCtrl.csproj b/MPDCtrl-Desktop/MPDCtrl/MPDCtrl.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>MPDCtrl2.ico</ApplicationIcon>
     <Version>3.0.15.0</Version>
@@ -13,7 +13,7 @@
     <PackageProjectUrl>https://torum.github.io/MPDCtrl/</PackageProjectUrl>
     <StartupObject>MPDCtrl.App</StartupObject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x86;x64</Platforms>
+    <Platforms>x86;x64;ARM64;AnyCPU</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MPDCtrl-Desktop/MPDCtrl/Properties/Resources.Designer.cs b/MPDCtrl-Desktop/MPDCtrl/Properties/Resources.Designer.cs
diff --git a/MPDCtrl-Desktop/MPDCtrl/Properties/Resources.ja-JP.resx b/MPDCtrl-Desktop/MPDCtrl/Properties/Resources.ja-JP.resx
@@ -442,6 +442,9 @@ SOFTWARE.</value>
   <data name="Profiles" xml:space="preserve">
     <value>プロファイル</value>
   </data>
+  <data name="Profile_NewProfile" xml:space="preserve">
+    <value>新しいプロファイル</value>
+  </data>
   <data name="QueueItemContextMenu_Move" xml:space="preserve">
     <value>移動</value>
   </data>

diff --git a/MPDCtrl-Desktop/MPDCtrl/Properties/Resources.resx b/MPDCtrl-Desktop/MPDCtrl/Properties/Resources.resx
@@ -441,6 +441,9 @@ SOFTWARE.</value>
   <data name="Profiles" xml:space="preserve">
     <value>Profiles</value>
   </data>
+  <data name="Profile_NewProfile" xml:space="preserve">
+    <value>New Profile</value>
+  </data>
   <data name="QueueItemContextMenu_Move" xml:space="preserve">
     <value>Move</value>
   </data>

diff --git a/MPDCtrl-Desktop/MPDCtrl/ViewModels/MainViewModel.cs b/MPDCtrl-Desktop/MPDCtrl/ViewModels/MainViewModel.cs
@@ -40,7 +40,9 @@ namespace MPDCtrl.ViewModels
     /// Add Search option "Exact" or "Contain".
     /// 
     /// Version history：
-    /// v3.0.16   Fixed and tweaked light theme mainly slider.
+    /// v3.0.16
+    /// v3.0.15.2 tweaked the light theme (mainly setting > connection profile combobox and checkbox).
+    /// v3.0.15.1 tweaked the light theme (mainly sliders).
     /// v3.0.15   MS Store release.
     /// v3.0.14.3 fixed a few issues of LightTheme mainly combobox and scrollviewer's thumb.
     /// v3.0.14.2 Tweaked and refined LightTheme. Remember the selection and change Theme on startup.
@@ -122,7 +124,7 @@ public class MainViewModel : ViewModelBase
         const string _appName = "MPDCtrl";
 
         // Application version
-        const string _appVer = "v3.0.15.0";
+        const string _appVer = "v3.0.16.0";
 
         public static string AppVer
         {

diff --git a/MPDCtrl-Desktop/MPDCtrl/Views/MainWindow.xaml b/MPDCtrl-Desktop/MPDCtrl/Views/MainWindow.xaml
@@ -3085,7 +3085,7 @@
 
                 <StackPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="top">
 
-                    <ComboBox Style="{StaticResource ComboBoxFlatStyle}" ItemsSource="{Binding Profiles}" SelectedItem="{Binding SelectedProfile}" HorizontalAlignment="Center" Tag="New Profile" Visibility="{Binding IsCurrentProfileSet, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                    <ComboBox Style="{StaticResource ComboBoxFlatStyle}" ItemsSource="{Binding Profiles}" SelectedItem="{Binding SelectedProfile}" HorizontalAlignment="Center" Tag="{x:Static properties:Resources.Profile_NewProfile}" Visibility="{Binding IsCurrentProfileSet, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
@@ -3285,7 +3285,7 @@
                                                 </StackPanel>
 
                                                 <StackPanel Orientation="Horizontal" Margin="0 12 0 0">
-                                                    <ComboBox Style="{StaticResource ComboBoxFlatStyle}" HorizontalAlignment="Left" ItemsSource="{Binding Profiles}" SelectedItem="{Binding SelectedProfile}" Tag="New Profile" Width="170">
+                                                    <ComboBox Style="{StaticResource ComboBoxFlatStyle}" HorizontalAlignment="Left" ItemsSource="{Binding Profiles}" SelectedItem="{Binding SelectedProfile}" Tag="{x:Static properties:Resources.Profile_NewProfile}" Width="170">
                                                         <ComboBox.ItemTemplate>
                                                             <DataTemplate>
                                                                 <StackPanel Orientation="Horizontal">