v3.0.9.0 minor UI improvements and some cleaning up.

torum · Jun 11, 2021 · f64184c · f64184c
1 parent d761fda
commit f64184c
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 33 deletions.
diff --git a/MPDCtrl-Desktop/MPDCtrl.sln b/MPDCtrl-Desktop/MPDCtrl.sln
@@ -9,38 +9,22 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MSStorePackageProject", "MS
 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|Any CPU
-		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.Build.0 = Debug|Any CPU
-		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.ActiveCfg = Release|Any CPU
-		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.Build.0 = Release|Any CPU
-		{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|Any CPU
-		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.Build.0 = Release|Any CPU
-		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.ActiveCfg = Release|Any CPU
-		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.Build.0 = Release|Any CPU
-		{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
+		{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 = Release|x86
+		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.Build.0 = Release|x86
+		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.ActiveCfg = Release|x64
+		{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.ActiveCfg = Release|x86
 		{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
@@ -1815,8 +1815,8 @@
                                             -->
                                         </Trigger>
                                         <Trigger Property="IsMouseOver" Value="true">
-                                            
-                                            <Setter TargetName="HeaderBorder" Property="BorderBrush" Value="white" />
+
+                                            <Setter TargetName="HeaderBorder" Property="BorderBrush" Value="#444" />
                                             <!-- ヘッダークリック可の場合削除
                                             -->
                                         </Trigger>

diff --git a/MPDCtrl-Desktop/MPDCtrl/MPDCtrl.csproj b/MPDCtrl-Desktop/MPDCtrl/MPDCtrl.csproj
@@ -5,28 +5,48 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>MPDCtrl2.ico</ApplicationIcon>
-    <Version>3.0.8.0</Version>
+    <Version>3.0.9.0</Version>
     <Authors>torum</Authors>
     <Company>Torum</Company>
     <Copyright>2021</Copyright>
     <Description>MPD Client.</Description>
     <PackageProjectUrl>https://torum.github.io/MPDCtrl/</PackageProjectUrl>
     <StartupObject>MPDCtrl.App</StartupObject>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    <Platforms>x64;x86</Platforms>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <PlatformTarget>x86</PlatformTarget>
-    <Optimize>true</Optimize>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
 
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
@@ -39,4 +59,11 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/MPDCtrl-Desktop/MPDCtrl/Properties/Settings.Designer.cs b/MPDCtrl-Desktop/MPDCtrl/Properties/Settings.Designer.cs
diff --git a/MPDCtrl-Desktop/MPDCtrl/Properties/Settings.settings b/MPDCtrl-Desktop/MPDCtrl/Properties/Settings.settings
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+</SettingsFile>
diff --git a/MPDCtrl-Desktop/MPDCtrl/ViewModels/MainViewModel.cs b/MPDCtrl-Desktop/MPDCtrl/ViewModels/MainViewModel.cs
@@ -31,7 +31,7 @@ namespace MPDCtrl.ViewModels
     /// TODO: 
     /// [Enhancement] Add "Play Next" menu item in playlists and search result.　
     /// [Enhancement] Add "update" and "rescan" button in Setting's page.
-    /// [Enhancement] Add inline renaming in the TreeView popup menu.
+    /// [Enhancement] Add inline renaming in the TreeView popup menu. (and right click select)
     /// [Enhancement] Queue reorder with drag and drop.
     /// [Enhancement] Surpress or fix "Playlist has changed, do you want update" nortification.
     /// [Enhancement] Remove some garbage in the TreeView's popup menu.
@@ -46,6 +46,7 @@ namespace MPDCtrl.ViewModels
     /// Add Search option "Exact" or "Contain".
     /// 
     /// Version history：
+    /// v3.0.9   Store release. Bundle x86 and x64.
     /// v3.0.8.3 Removed none English comments in the source code as much as possible. Little bit of clean up.
     /// v3.0.8.2 Fixed some typo and translations.
     /// v3.0.8.1 Changed Popup's Placement="Mouse" to "Center".
@@ -110,7 +111,7 @@ public class MainViewModel : ViewModelBase
         const string _appName = "MPDCtrl";
 
         // Application version
-        const string _appVer = "v3.0.8.3";
+        const string _appVer = "v3.0.9.0";
 
         public static string AppVer
         {

diff --git a/MPDCtrl-Desktop/MPDCtrl/Views/MainWindow.xaml b/MPDCtrl-Desktop/MPDCtrl/Views/MainWindow.xaml
@@ -911,7 +911,7 @@
                             </ListView.View>
                         </ListView>
 
-                        <!-- Filterボックス -->
+                        <!-- Filter box -->
                         <Border Grid.Row="0" Margin="0 32 23 0" Padding="2" HorizontalAlignment="Right" VerticalAlignment="Top" Width="580" Background="WhiteSmoke" CornerRadius="3" Visibility="{Binding IsQueueFindVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                             <StackPanel>
                                 <TextBox Text="{Binding FilterQueueQuery, UpdateSourceTrigger=PropertyChanged}" KeyboardNavigation.TabNavigation="Local" Margin="0" Padding="3" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" IsVisibleChanged="TextBox_IsVisibleChanged">