WinUI3: Settings page is done for now.

torum · torum · commit 0befd2a6e97b · 2025-10-04T03:10:49.000+09:00
diff --git a/MPDCtrl-WinUI3/MPDCtrl/Strings/en-us/Resources.resw b/MPDCtrl-WinUI3/MPDCtrl/Strings/en-us/Resources.resw
@@ -475,10 +475,19 @@ SOFTWARE.</value>
   <data name="Settings_PrivacyPolicy.Description" xml:space="preserve">
     <value>Nothing Is Collected</value>
   </data>
-  <data name="Settings_LocalStrage.Header" xml:space="preserve">
+  <data name="Settings_LocalStorage.Header" xml:space="preserve">
     <value>Local storage</value>
   </data>
-  <data name="Settings_LocalStrage.Description" xml:space="preserve">
+  <data name="Settings_LocalStorage.Description" xml:space="preserve">
     <value>Cache folder for album cover/art images</value>
   </data>
+  <data name="Settings_MPD_Connection_Status_IsConnected" xml:space="preserve">
+    <value>Connected</value>
+  </data>
+  <data name="Settings_MPD_Connection_Status_IsNotConnected" xml:space="preserve">
+    <value>Not Connected</value>
+  </data>
+  <data name="Settings_MPD_Connection_Status_IsConnecting" xml:space="preserve">
+    <value>Connecting</value>
+  </data>
 </root>
diff --git a/MPDCtrl-WinUI3/MPDCtrl/Strings/ja-jp/Resources.resw b/MPDCtrl-WinUI3/MPDCtrl/Strings/ja-jp/Resources.resw
@@ -476,10 +476,19 @@ SOFTWARE.</value>
   <data name="Settings_PrivacyPolicy.Description" xml:space="preserve">
     <value>いかなる情報も収集しません</value>
   </data>
-  <data name="Settings_LocalStrage.Header" xml:space="preserve">
+  <data name="Settings_LocalStorage.Header" xml:space="preserve">
     <value>ローカルストレージ</value>
   </data>
-  <data name="Settings_LocalStrage.Description" xml:space="preserve">
+  <data name="Settings_LocalStorage.Description" xml:space="preserve">
     <value>アルバムカバー画像のローカル保存用フォルダ</value>
   </data>
+  <data name="Settings_MPD_Connection_Status_IsConnected" xml:space="preserve">
+    <value>接続済み</value>
+  </data>
+  <data name="Settings_MPD_Connection_Status_IsNotConnected" xml:space="preserve">
+    <value>未接続</value>
+  </data>
+  <data name="Settings_MPD_Connection_Status_IsConnecting" xml:space="preserve">
+    <value>接続中</value>
+  </data>
 </root>
diff --git a/MPDCtrl-WinUI3/MPDCtrl/ViewModels/MainViewModel.cs b/MPDCtrl-WinUI3/MPDCtrl/ViewModels/MainViewModel.cs
@@ -2020,49 +2020,55 @@ public string ShortStatusWithMpdVersion
         {
             if (IsConnected)
             {
+                var connected = _resourceLoader.GetString("Settings_MPD_Connection_Status_IsConnected");
+
                 if (!string.IsNullOrEmpty(_mpdVersion))
                 {
                     if (CurrentProfile is not null)
                     {
-                        return $"Connected to {CurrentProfile.Name} with MPD Protocol v{_mpdVersion}";
+                        return $"{connected} ({CurrentProfile.Name} with MPD Protocol v{_mpdVersion})";
                     }
                     else
                     {
-                        return $"Connected with MPD Protocol v{_mpdVersion}";
+                        return $"{connected} (MPD Protocol v{_mpdVersion})";
                     }
                 }
                 else
                 {
                     if (CurrentProfile is not null)
                     {
-                        return $"Connected to {CurrentProfile.Name}";
+                        return $"{connected} ({CurrentProfile.Name})";
                     }
                     else
                     {
-                        return "Connected";
+                        return $"{connected}";
                     }
                 }
             }
             else if (IsConnecting)
             {
+                var connecting = _resourceLoader.GetString("Settings_MPD_Connection_Status_IsConnecting");
+
                 if (CurrentProfile is not null)
                 {
-                    return $"Connecting to {CurrentProfile.Name}...";
+                    return $"{connecting} ({CurrentProfile.Name})...";
                 }
                 else
                 {
-                    return "Connecting...";
+                    return $"{connecting}...";
                 }
             }
             else
             {
+                var notConnected = _resourceLoader.GetString("Settings_MPD_Connection_Status_IsNotConnected");
+
                 if (IsNotConnectingNorConnected)
                 {
-                    return "Not connected";
+                    return $"{notConnected}";
                 }
 
 
-                return "Not connected";
+                return $"{notConnected}";
             }
 
 
diff --git a/MPDCtrl-WinUI3/MPDCtrl/Views/SettingsPage.xaml b/MPDCtrl-WinUI3/MPDCtrl/Views/SettingsPage.xaml
@@ -57,7 +57,7 @@
                         <controls:SettingsExpander.Items>
 
                             <controls:SettingsCard x:Uid="Settings_Theme" HorizontalContentAlignment="Left" ContentAlignment="Vertical" Description="">
-                                <StackPanel Orientation="Horizontal" Spacing="24">
+                                <StackPanel Orientation="Horizontal" Spacing="24" Margin="0,6,0,12">
 
                                     <RadioButton x:Uid="Settings_Theme_Light" IsEnabled="{x:Bind ViewModel.IsBackdropEnabled, Mode=OneWay}" Command="{x:Bind ViewModel.SwitchThemeCommand}" IsChecked="{x:Bind ViewModel.Theme, Converter={StaticResource ElementThemeEnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}" FontSize="15" GroupName="AppTheme">
                                         <RadioButton.CommandParameter>
@@ -79,7 +79,7 @@
 
                             <controls:SettingsCard x:Uid="Settings_SystemBackdrop" HorizontalContentAlignment="Left" ContentAlignment="Vertical" Description="">
 
-                                <StackPanel Orientation="Horizontal" Spacing="24">
+                                <StackPanel Orientation="Horizontal" Spacing="24" Margin="0,6,0,12">
 
                                     <RadioButton x:Uid="Settings_SystemBackdrop_Acrylic" IsEnabled="{x:Bind ViewModel.IsAcrylicSupported,Mode=OneWay}" Command="{x:Bind ViewModel.SwitchSystemBackdropCommand}" CommandParameter="Acrylic" IsChecked="{x:Bind ViewModel.Material, Converter={StaticResource SystemBackdropEnumToBooleanConverter}, ConverterParameter=Acrylic, Mode=OneWay}" FontSize="15" GroupName="AppMaterial"/>
                                     <RadioButton x:Uid="Settings_SystemBackdrop_Mica" IsEnabled="{x:Bind ViewModel.IsMicaSupported,Mode=OneWay}" Command="{x:Bind ViewModel.SwitchSystemBackdropCommand}" CommandParameter="Mica" IsChecked="{x:Bind ViewModel.Material, Converter={StaticResource SystemBackdropEnumToBooleanConverter}, ConverterParameter=Mica, Mode=OneWay}" FontSize="15" GroupName="AppMaterial"/>
@@ -102,15 +102,15 @@
                         <TextBlock Text="{x:Bind ViewModel.ShortStatusWithMpdVersion, Mode=OneWay}"></TextBlock>
                         
                         <controls:SettingsExpander.Items>
-                            <controls:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Header="@Connection Profile">
+                            <controls:SettingsCard Header="" Description="" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical">
 
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"></ColumnDefinition>
                                         <ColumnDefinition Width="*"></ColumnDefinition>
                                     </Grid.ColumnDefinitions>
                                     
-                                    <StackPanel Grid.Column="0" Spacing="12" Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <StackPanel Grid.Column="0" Spacing="12" Margin="0,12,0,12" Orientation="Horizontal" HorizontalAlignment="Left">
 
                                         <ComboBox PlaceholderText="" MinWidth="300" Margin="0,0,0,0" SelectedIndex="-1" VerticalAlignment="Center"
                                            ItemsSource="{x:Bind ViewModel.Profiles, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedProfile, Mode=TwoWay}">
@@ -126,19 +126,19 @@
                                             </ComboBox.ItemTemplate>
                                         </ComboBox>
 
-                                        <Button Command="{x:Bind ViewModel.ShowProfileAddDialogCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="39" Height="36">
+                                        <Button Command="{x:Bind ViewModel.ShowProfileAddDialogCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="39" Height="36" Margin="0,12,0,12">
                                             <Viewbox Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,2,0,0">
                                                 <PathIcon Width="NaN" Height="NaN" Data="M11.883 3.007 12 3a1 1 0 0 1 .993.883L13 4v7h7a1 1 0 0 1 .993.883L21 12a1 1 0 0 1-.883.993L20 13h-7v7a1 1 0 0 1-.883.993L12 21a1 1 0 0 1-.993-.883L11 20v-7H4a1 1 0 0 1-.993-.883L3 12a1 1 0 0 1 .883-.993L4 11h7V4a1 1 0 0 1 .883-.993L12 3l-.117.007Z"></PathIcon>
                                             </Viewbox>
                                         </Button>
-                                        
-                                        <Button Command="{x:Bind ViewModel.ShowProfileEditDialogCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="39" Height="36">
+
+                                        <Button Command="{x:Bind ViewModel.ShowProfileEditDialogCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="39" Height="36" Margin="0,12,0,12">
                                             <Viewbox Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,2,0,0">
                                                 <PathIcon Width="NaN" Height="NaN" Data="m13.94 5 5.061 5.06-.962.962a6.5 6.5 0 0 0-7.016 7.016l-1.96 1.96a2.25 2.25 0 0 1-1 .58l-5.115 1.395a.75.75 0 0 1-.92-.92l1.394-5.116a2.25 2.25 0 0 1 .58-1L13.94 5Zm7.091-2.03a3.579 3.579 0 0 1 0 5.06l-.97.97L15 3.94l.97-.97a3.578 3.578 0 0 1 5.061 0ZM14.28 13.974a2 2 0 0 1-1.441 2.497l-.584.144a5.729 5.729 0 0 0 .006 1.807l.54.13a2 2 0 0 1 1.45 2.51l-.187.632c.44.386.94.699 1.484.921l.494-.518a2 2 0 0 1 2.899 0l.498.525a5.28 5.28 0 0 0 1.483-.913l-.198-.686a2 2 0 0 1 1.442-2.496l.583-.144a5.729 5.729 0 0 0-.006-1.808l-.54-.13a2 2 0 0 1-1.45-2.51l.187-.63a5.28 5.28 0 0 0-1.484-.923l-.493.519a2 2 0 0 1-2.9 0l-.498-.525c-.544.22-1.044.53-1.483.912l.198.686ZM17.501 19c-.8 0-1.45-.672-1.45-1.5 0-.829.65-1.5 1.45-1.5.8 0 1.45.671 1.45 1.5 0 .828-.65 1.5-1.45 1.5Z"></PathIcon>
                                             </Viewbox>
                                         </Button>
 
-                                        <Button Command="{x:Bind ViewModel.ShowProfileRemoveNoneDialogCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="39" Height="36">
+                                        <Button Command="{x:Bind ViewModel.ShowProfileRemoveNoneDialogCommand}" HorizontalAlignment="Center" VerticalAlignment="Center" Width="39" Height="36" Margin="0,12,0,12">
                                             <Viewbox Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,2,0,0">
                                                 <PathIcon Width="NaN" Height="NaN" Data="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm-4.25 9.25a.75.75 0 0 0-.102 1.493l.102.007h8.5a.75.75 0 0 0 .102-1.493l-.102-.007h-8.5Z"></PathIcon>
                                             </Viewbox>
@@ -154,12 +154,12 @@
 
                             </controls:SettingsCard>
 
-                            <controls:SettingsCard Header="afd" HorizontalContentAlignment="Left" ContentAlignment="Vertical" Description="fddfasa">
-                                <CheckBox x:Uid="Settings_MPD_Opts_UpdateDatabaseOnStartup" IsChecked="{x:Bind ViewModel.IsUpdateOnStartup, Mode=TwoWay}"/>
+                            <controls:SettingsCard Header="" Description="" HorizontalContentAlignment="Left" ContentAlignment="Vertical">
+                                <CheckBox x:Uid="Settings_MPD_Opts_UpdateDatabaseOnStartup" IsChecked="{x:Bind ViewModel.IsUpdateOnStartup, Mode=TwoWay}" Margin="0,12,0,12"/>
                             </controls:SettingsCard>
 
-                            <controls:SettingsCard Header="asdfsadf" HorizontalContentAlignment="Left" ContentAlignment="Vertical" Description="fdasa">
-                                <CheckBox x:Uid="Settings_MPD_Opts_UseReadPicture" IsChecked="{x:Bind ViewModel.IsDownloadAlbumArtEmbeddedUsingReadPicture, Mode=TwoWay}"/>
+                            <controls:SettingsCard Header="" Description="" HorizontalContentAlignment="Left" ContentAlignment="Vertical">
+                                <CheckBox x:Uid="Settings_MPD_Opts_UseReadPicture" IsChecked="{x:Bind ViewModel.IsDownloadAlbumArtEmbeddedUsingReadPicture, Mode=TwoWay}" Margin="0,12,0,12"/>
                             </controls:SettingsCard>
                             
                         </controls:SettingsExpander.Items>
@@ -173,24 +173,23 @@
                             IsEnabled="True"
                             IsExpanded="False">
                         <controls:SettingsExpander.Items>
-                            
-                            <controls:SettingsCard Header="afd" HorizontalContentAlignment="Left" ContentAlignment="Vertical" Description="fddfasa">
-                            <CheckBox x:Uid="Settings_Opts_AutoScrollToNowPlaying" IsChecked="{x:Bind ViewModel.IsAutoScrollToNowPlaying, Mode=TwoWay}"/>
-                        </controls:SettingsCard>
+                            <controls:SettingsCard Header="" Description="" HorizontalContentAlignment="Left" ContentAlignment="Vertical">
+                                <CheckBox x:Uid="Settings_Opts_AutoScrollToNowPlaying" IsChecked="{x:Bind ViewModel.IsAutoScrollToNowPlaying, Mode=TwoWay}" Margin="0,12,0,12"/>
+                            </controls:SettingsCard>
 
                         </controls:SettingsExpander.Items>
                     </controls:SettingsExpander>
 
-                    <!-- Local strage usage -->
-                    <controls:SettingsExpander x:Name="SettingsCardLocalStrage"
+                    <!-- Local storage usage -->
+                    <controls:SettingsExpander x:Name="SettingsCardLocalStorage"
                             VerticalAlignment="Top"
-                            x:Uid="Settings_LocalStrage"
+                            x:Uid="Settings_LocalStorage"
                             IsEnabled="True"
                             IsExpanded="False">
                         <controls:SettingsExpander.Items>
 
-                            <controls:SettingsCard Header="afd" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="fddfasa">
-                                <Grid>
+                            <controls:SettingsCard Header="" Description="" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical">
+                                <Grid Margin="0,12,0,12">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"></ColumnDefinition>
                                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -212,7 +211,7 @@
                     <controls:SettingsExpander x:Uid="Settings_ProjectPage">
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard Header="Project Page" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="@Github">
-                                <HyperlinkButton NavigateUri="https://github.com/torum/MPDCtrl">https://github.com/torum/MPDCtrl</HyperlinkButton>
+                                <HyperlinkButton NavigateUri="https://github.com/torum/MPDCtrl/">https://github.com/torum/MPDCtrl/</HyperlinkButton>
                             </controls:SettingsCard>
                             <controls:SettingsCard Header="App Page" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="@Github">
                                 <HyperlinkButton NavigateUri="https://torum.github.io/MPDCtrl/">https://torum.github.io/MPDCtrl/</HyperlinkButton>
@@ -228,7 +227,7 @@
 
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard Header="The MIT License" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="Copyright (c) 2018~ torum">
-                                <TextBlock x:Uid="Settings_LicenseText" TextWrapping="Wrap"></TextBlock>
+                                <TextBlock x:Uid="Settings_LicenseText" TextWrapping="Wrap" Margin="0,12,0,12"></TextBlock>
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>
 
@@ -239,7 +238,7 @@
 
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard Header="" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="">
-                                <TextBlock  x:Uid="Settings_PrivacyPolicyText" TextWrapping="Wrap"></TextBlock>
+                                <TextBlock  x:Uid="Settings_PrivacyPolicyText" TextWrapping="Wrap" Margin="0,12,0,12"></TextBlock>
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>
                         
@@ -250,7 +249,7 @@
 
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard Header="Microsoft" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="The MIT License">
-                                <StackPanel Spacing="12">
+                                <StackPanel Spacing="12" Margin="0,12,0,12">
                                     <HyperlinkButton NavigateUri="https://github.com/CommunityToolkit/Windows">CommunityToolkit.Mvvm/WinUI</HyperlinkButton>
                                     <HyperlinkButton NavigateUri="https://www.nuget.org/packages/microsoft.extensions.dependencyinjection/">Microsoft.Extensions.DependencyInjection</HyperlinkButton>
                                     <HyperlinkButton NavigateUri="https://www.nuget.org/packages/Microsoft.Extensions.Hosting">Microsoft.Extensions.Hosting</HyperlinkButton>

Original file line number	Diff line number	Diff line change
`@@ -2020,49 +2020,55 @@ public string ShortStatusWithMpdVersion`
`2020`	`2020`	`{`
`2021`	`2021`	`if (IsConnected)`
`2022`	`2022`	`{`
	`2023`	`+ var connected = _resourceLoader.GetString("Settings_MPD_Connection_Status_IsConnected");`
	`2024`	`+`
`2023`	`2025`	`if (!string.IsNullOrEmpty(_mpdVersion))`
`2024`	`2026`	`{`
`2025`	`2027`	`if (CurrentProfile is not null)`
`2026`	`2028`	`{`
`2027`		`- return $"Connected to {CurrentProfile.Name} with MPD Protocol v{_mpdVersion}";`
	`2029`	`+ return $"{connected} ({CurrentProfile.Name} with MPD Protocol v{_mpdVersion})";`
`2028`	`2030`	`}`
`2029`	`2031`	`else`
`2030`	`2032`	`{`
`2031`		`- return $"Connected with MPD Protocol v{_mpdVersion}";`
	`2033`	`+ return $"{connected} (MPD Protocol v{_mpdVersion})";`
`2032`	`2034`	`}`
`2033`	`2035`	`}`
`2034`	`2036`	`else`
`2035`	`2037`	`{`
`2036`	`2038`	`if (CurrentProfile is not null)`
`2037`	`2039`	`{`
`2038`		`- return $"Connected to {CurrentProfile.Name}";`
	`2040`	`+ return $"{connected} ({CurrentProfile.Name})";`
`2039`	`2041`	`}`
`2040`	`2042`	`else`
`2041`	`2043`	`{`
`2042`		`- return "Connected";`
	`2044`	`+ return $"{connected}";`
`2043`	`2045`	`}`
`2044`	`2046`	`}`
`2045`	`2047`	`}`
`2046`	`2048`	`else if (IsConnecting)`
`2047`	`2049`	`{`
	`2050`	`+ var connecting = _resourceLoader.GetString("Settings_MPD_Connection_Status_IsConnecting");`
	`2051`	`+`
`2048`	`2052`	`if (CurrentProfile is not null)`
`2049`	`2053`	`{`
`2050`		`- return $"Connecting to {CurrentProfile.Name}...";`
	`2054`	`+ return $"{connecting} ({CurrentProfile.Name})...";`
`2051`	`2055`	`}`
`2052`	`2056`	`else`
`2053`	`2057`	`{`
`2054`		`- return "Connecting...";`
	`2058`	`+ return $"{connecting}...";`
`2055`	`2059`	`}`
`2056`	`2060`	`}`
`2057`	`2061`	`else`
`2058`	`2062`	`{`
	`2063`	`+ var notConnected = _resourceLoader.GetString("Settings_MPD_Connection_Status_IsNotConnected");`
	`2064`	`+`
`2059`	`2065`	`if (IsNotConnectingNorConnected)`
`2060`	`2066`	`{`
`2061`		`- return "Not connected";`
	`2067`	`+ return $"{notConnected}";`
`2062`	`2068`	`}`
`2063`	`2069`
`2064`	`2070`
`2065`		`- return "Not connected";`
	`2071`	`+ return $"{notConnected}";`
`2066`	`2072`	`}`
`2067`	`2073`
`2068`	`2074`