Skip to content

Commit f64184c

Browse files
torumtorum
committed
v3.0.9.0 minor UI improvements and some cleaning up.
1 parent d761fda commit f64184c

File tree

7 files changed

+77
-33
lines changed

7 files changed

+77
-33
lines changed

‎MPDCtrl-Desktop/MPDCtrl.sln

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,22 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MSStorePackageProject", "MS
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Any CPU = Debug|Any CPU
1312
Debug|x64 = Debug|x64
1413
Debug|x86 = Debug|x86
15-
Release|Any CPU = Release|Any CPU
1614
Release|x64 = Release|x64
1715
Release|x86 = Release|x86
1816
EndGlobalSection
1917
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.ActiveCfg = Debug|Any CPU
23-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.Build.0 = Debug|Any CPU
24-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.ActiveCfg = Release|Any CPU
25-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.Build.0 = Release|Any CPU
26-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.ActiveCfg = Release|Any CPU
29-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.Build.0 = Release|Any CPU
30-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.ActiveCfg = Release|Any CPU
31-
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.Build.0 = Release|Any CPU
32-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
18+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.ActiveCfg = Debug|x64
19+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x64.Build.0 = Debug|x64
20+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.ActiveCfg = Release|x86
21+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Debug|x86.Build.0 = Release|x86
22+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x64.ActiveCfg = Release|x64
23+
{72A81192-4291-42D0-ABBD-9B3FC27B0B54}.Release|x86.ActiveCfg = Release|x86
3524
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x64.ActiveCfg = Debug|x64
3625
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x64.Build.0 = Debug|x64
37-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x64.Deploy.0 = Debug|x64
3826
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x86.ActiveCfg = Debug|x86
3927
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x86.Build.0 = Debug|x86
40-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Debug|x86.Deploy.0 = Debug|x86
41-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|Any CPU.Deploy.0 = Release|Any CPU
4428
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|x64.ActiveCfg = Release|x64
4529
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|x64.Build.0 = Release|x64
4630
{DA98EE48-EFF6-420F-85F4-F0EBCE56576D}.Release|x64.Deploy.0 = Release|x64

‎MPDCtrl-Desktop/MPDCtrl/App.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,8 +1815,8 @@
18151815
-->
18161816
</Trigger>
18171817
<Trigger Property="IsMouseOver" Value="true">
1818-
1819-
<Setter TargetName="HeaderBorder" Property="BorderBrush" Value="white" />
1818+
1819+
<Setter TargetName="HeaderBorder" Property="BorderBrush" Value="#444" />
18201820
<!-- ヘッダークリック可の場合削除
18211821
-->
18221822
</Trigger>

‎MPDCtrl-Desktop/MPDCtrl/MPDCtrl.csproj

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,48 @@
55
<TargetFramework>net5.0-windows</TargetFramework>
66
<UseWPF>true</UseWPF>
77
<ApplicationIcon>MPDCtrl2.ico</ApplicationIcon>
8-
<Version>3.0.8.0</Version>
8+
<Version>3.0.9.0</Version>
99
<Authors>torum</Authors>
1010
<Company>Torum</Company>
1111
<Copyright>2021</Copyright>
1212
<Description>MPD Client.</Description>
1313
<PackageProjectUrl>https://torum.github.io/MPDCtrl/</PackageProjectUrl>
1414
<StartupObject>MPDCtrl.App</StartupObject>
1515
<ApplicationManifest>app.manifest</ApplicationManifest>
16+
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
17+
<Platforms>x64;x86</Platforms>
1618
</PropertyGroup>
1719

18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
19-
<PlatformTarget>x86</PlatformTarget>
20-
<Optimize>true</Optimize>
21-
<Prefer32Bit>false</Prefer32Bit>
22-
</PropertyGroup>
20+
<ItemGroup Label="ProjectConfigurations">
21+
<ProjectConfiguration Include="Debug|x86">
22+
<Configuration>Debug</Configuration>
23+
<Platform>x86</Platform>
24+
</ProjectConfiguration>
25+
<ProjectConfiguration Include="Release|x86">
26+
<Configuration>Release</Configuration>
27+
<Platform>x86</Platform>
28+
</ProjectConfiguration>
29+
<ProjectConfiguration Include="Debug|x64">
30+
<Configuration>Debug</Configuration>
31+
<Platform>x64</Platform>
32+
</ProjectConfiguration>
33+
<ProjectConfiguration Include="Release|x64">
34+
<Configuration>Release</Configuration>
35+
<Platform>x64</Platform>
36+
</ProjectConfiguration>
37+
</ItemGroup>
2338

2439
<ItemGroup>
2540
<Compile Update="Properties\Resources.Designer.cs">
2641
<DesignTime>True</DesignTime>
2742
<AutoGen>True</AutoGen>
2843
<DependentUpon>Resources.resx</DependentUpon>
2944
</Compile>
45+
<Compile Update="Properties\Settings.Designer.cs">
46+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
47+
<AutoGen>True</AutoGen>
48+
<DependentUpon>Settings.settings</DependentUpon>
49+
</Compile>
3050
</ItemGroup>
3151

3252
<ItemGroup>
@@ -39,4 +59,11 @@
3959
</EmbeddedResource>
4060
</ItemGroup>
4161

62+
<ItemGroup>
63+
<None Update="Properties\Settings.settings">
64+
<Generator>SettingsSingleFileGenerator</Generator>
65+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
66+
</None>
67+
</ItemGroup>
68+
4269
</Project>

‎MPDCtrl-Desktop/MPDCtrl/Properties/Settings.Designer.cs

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MPDCtrl-Desktop/MPDCtrl/Properties/Settings.settings

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
3+
<Profiles>
4+
<Profile Name="(Default)" />
5+
</Profiles>
6+
</SettingsFile>

‎MPDCtrl-Desktop/MPDCtrl/ViewModels/MainViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace MPDCtrl.ViewModels
3131
/// TODO:
3232
/// [Enhancement] Add "Play Next" menu item in playlists and search result.　
3333
/// [Enhancement] Add "update" and "rescan" button in Setting's page.
34-
/// [Enhancement] Add inline renaming in the TreeView popup menu.
34+
/// [Enhancement] Add inline renaming in the TreeView popup menu. (and right click select)
3535
/// [Enhancement] Queue reorder with drag and drop.
3636
/// [Enhancement] Surpress or fix "Playlist has changed, do you want update" nortification.
3737
/// [Enhancement] Remove some garbage in the TreeView's popup menu.
@@ -46,6 +46,7 @@ namespace MPDCtrl.ViewModels
4646
/// Add Search option "Exact" or "Contain".
4747
///
4848
/// Version history：
49+
/// v3.0.9 Store release. Bundle x86 and x64.
4950
/// v3.0.8.3 Removed none English comments in the source code as much as possible. Little bit of clean up.
5051
/// v3.0.8.2 Fixed some typo and translations.
5152
/// v3.0.8.1 Changed Popup's Placement="Mouse" to "Center".
@@ -110,7 +111,7 @@ public class MainViewModel : ViewModelBase
110111
const string _appName = "MPDCtrl";
111112

112113
// Application version
113-
const string _appVer = "v3.0.8.3";
114+
const string _appVer = "v3.0.9.0";
114115

115116
public static string AppVer
116117
{

‎MPDCtrl-Desktop/MPDCtrl/Views/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@
911911
</ListView.View>
912912
</ListView>
913913

914-
<!-- Filterボックス -->
914+
<!-- Filter box -->
915915
<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}}">
916916
<StackPanel>
917917
<TextBox Text="{Binding FilterQueueQuery, UpdateSourceTrigger=PropertyChanged}" KeyboardNavigation.TabNavigation="Local" Margin="0" Padding="3" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" IsVisibleChanged="TextBox_IsVisibleChanged">

0 commit comments

Comments
 (0)