Skip to content

Commit 7ce49a4

Browse files
torumtorum
committed
WinUI3: Settings page is almost done except localization.
1 parent 223e581 commit 7ce49a4

File tree

3 files changed

+150
-26
lines changed

3 files changed

+150
-26
lines changed

‎MPDCtrl-WinUI3/MPDCtrl/Strings/en-us/Resources.resw‎

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,6 @@
135135
<data name="Settings_Theme_Default.Content" xml:space="preserve">
136136
<value>Default</value>
137137
</data>
138-
<data name="Settings_About.Text" xml:space="preserve">
139-
<value>About this application</value>
140-
</data>
141-
<data name="Settings_AboutDescription.Text" xml:space="preserve">
142-
<value>TODO: Replace with your app description.</value>
143-
</data>
144-
<data name="SettingsPage_PrivacyTermsLink.Content" xml:space="preserve">
145-
<value>Privacy Statement</value>
146-
</data>
147-
<data name="SettingsPage_PrivacyTermsLink.NavigateUri" xml:space="preserve">
148-
<value>https://YourPrivacyUrlGoesHere/</value>
149-
</data>
150138
<data name="ShellMenuBarItem_File_New.Text" xml:space="preserve">
151139
<value>New</value>
152140
</data>
@@ -447,4 +435,50 @@
447435
<data name="Settings_Opts_AutoScrollToNowPlaying.Content" xml:space="preserve">
448436
<value>Auto scroll to current song</value>
449437
</data>
438+
<data name="Settings_ProjectPage.Header" xml:space="preserve">
439+
<value>Project info</value>
440+
</data>
441+
<data name="Settings_ProjectPage.Description" xml:space="preserve">
442+
<value>This project is hosted at GitHub as a open source project.</value>
443+
</data>
444+
<data name="Settings_License.Header" xml:space="preserve">
445+
<value>License</value>
446+
</data>
447+
<data name="Settings_LicenseText.Text" xml:space="preserve">
448+
<value>Permission is hereby granted, free of charge, to any person obtaining a copy
449+
of this software and associated documentation files (the "Software"), to deal
450+
in the Software without restriction, including without limitation the rights
451+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
452+
copies of the Software, and to permit persons to whom the Software is
453+
furnished to do so, subject to the following conditions:
454+
455+
The above copyright notice and this permission notice shall be included in all
456+
copies or substantial portions of the Software.
457+
458+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
459+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
460+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
461+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
462+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
463+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
464+
SOFTWARE.</value>
465+
</data>
466+
<data name="Settings_License.Description" xml:space="preserve">
467+
<value>The MIT License</value>
468+
</data>
469+
<data name="Settings_PrivacyPolicy.Header" xml:space="preserve">
470+
<value>App Privacy Policy</value>
471+
</data>
472+
<data name="Settings_PrivacyPolicyText.Text" xml:space="preserve">
473+
<value>MPDCtrl allows you to access your music player via specified IP address with optional user credentials. None of the data is transmitted anywhere besides your specified music player and your settings are stored on your device only.</value>
474+
</data>
475+
<data name="Settings_PrivacyPolicy.Description" xml:space="preserve">
476+
<value>Nothing Is Collected</value>
477+
</data>
478+
<data name="Settings_LocalStrage.Header" xml:space="preserve">
479+
<value>Local storage</value>
480+
</data>
481+
<data name="Settings_LocalStrage.Description" xml:space="preserve">
482+
<value>Cache folder for album cover/art images</value>
483+
</data>
450484
</root>

‎MPDCtrl-WinUI3/MPDCtrl/Strings/ja-jp/Resources.resw‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,6 @@
135135
<data name="Settings_Theme_Default.Content" xml:space="preserve">
136136
<value>既定</value>
137137
</data>
138-
<data name="Settings_About.Text" xml:space="preserve">
139-
<value>About this application</value>
140-
</data>
141-
<data name="Settings_AboutDescription.Text" xml:space="preserve">
142-
<value>TODO: Replace with your app description.</value>
143-
</data>
144-
<data name="SettingsPage_PrivacyTermsLink.Content" xml:space="preserve">
145-
<value>Privacy Statement</value>
146-
</data>
147-
<data name="SettingsPage_PrivacyTermsLink.NavigateUri" xml:space="preserve">
148-
<value>https://YourPrivacyUrlGoesHere/</value>
149-
</data>
150138
<data name="ShellMenuBarItem_File_New.Text" xml:space="preserve">
151139
<value>新規</value>
152140
</data>
@@ -447,4 +435,51 @@
447435
<data name="Settings_Opts_AutoScrollToNowPlaying.Content" xml:space="preserve">
448436
<value>現在の曲へ自動でジャンプする</value>
449437
</data>
438+
<data name="Settings_ProjectPage.Header" xml:space="preserve">
439+
<value>プロジェクト情報</value>
440+
</data>
441+
<data name="Settings_ProjectPage.Description" xml:space="preserve">
442+
<value>オープンソースプロジェクトとして GitHubでホスティングされています</value>
443+
</data>
444+
<data name="Settings_License.Header" xml:space="preserve">
445+
<value>ライセンス</value>
446+
</data>
447+
<data name="Settings_LicenseText.Text" xml:space="preserve">
448+
<value>Permission is hereby granted, free of charge, to any person obtaining a copy
449+
of this software and associated documentation files (the "Software"), to deal
450+
in the Software without restriction, including without limitation the rights
451+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
452+
copies of the Software, and to permit persons to whom the Software is
453+
furnished to do so, subject to the following conditions:
454+
455+
The above copyright notice and this permission notice shall be included in all
456+
copies or substantial portions of the Software.
457+
458+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
459+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
460+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
461+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
462+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
463+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
464+
SOFTWARE.</value>
465+
</data>
466+
<data name="Settings_License.Description" xml:space="preserve">
467+
<value>The MIT License</value>
468+
</data>
469+
<data name="Settings_PrivacyPolicy.Header" xml:space="preserve">
470+
<value>プライバシーポリシー</value>
471+
</data>
472+
<data name="Settings_PrivacyPolicyText.Text" xml:space="preserve">
473+
<value>MPDCtrlは、指定されたIPアドレスとオプションの認証情報を利用してネットワーク上のMPDにアクセスします。
474+
いかなる情報も、指定されたMPD以外、他へ一切送信されることは無く、設定情報はローカルのデバイスのみに保存されます。</value>
475+
</data>
476+
<data name="Settings_PrivacyPolicy.Description" xml:space="preserve">
477+
<value>いかなる情報も収集しません</value>
478+
</data>
479+
<data name="Settings_LocalStrage.Header" xml:space="preserve">
480+
<value>ローカルストレージ</value>
481+
</data>
482+
<data name="Settings_LocalStrage.Description" xml:space="preserve">
483+
<value>アルバムカバー画像のローカル保存用フォルダ</value>
484+
</data>
450485
</root>

‎MPDCtrl-WinUI3/MPDCtrl/Views/SettingsPage.xaml‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<Grid Grid.Row="1" x:Name="BodyGrid" Margin="24,0,0,0">
4444
<ScrollViewer Margin="0,24,0,0">
45-
<StackPanel Spacing="24">
45+
<StackPanel Spacing="24" Padding="0,0,0,24">
4646

4747
<!-- Themes -->
4848
<controls:SettingsExpander x:Name="SettingsCardTheme"
@@ -184,7 +184,7 @@
184184
<!-- Local strage usage -->
185185
<controls:SettingsExpander x:Name="SettingsCardLocalStrage"
186186
VerticalAlignment="Top"
187-
Header="Local storage usage" Description="Cache folder/directory for album cover/art images"
187+
x:Uid="Settings_LocalStrage"
188188
IsEnabled="True"
189189
IsExpanded="False">
190190
<controls:SettingsExpander.Items>
@@ -208,6 +208,61 @@ Header="Local storage usage" Description="Cache folder/directory for album cover
208208
</controls:SettingsExpander.Items>
209209
</controls:SettingsExpander>
210210

211+
<!-- Project info -->
212+
<controls:SettingsExpander x:Uid="Settings_ProjectPage">
213+
<controls:SettingsExpander.Items>
214+
<controls:SettingsCard Header="Project Page" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="@Github">
215+
<HyperlinkButton NavigateUri="https://github.com/torum/MPDCtrl">https://github.com/torum/MPDCtrl</HyperlinkButton>
216+
</controls:SettingsCard>
217+
<controls:SettingsCard Header="App Page" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="@Github">
218+
<HyperlinkButton NavigateUri="https://torum.github.io/MPDCtrl/">https://torum.github.io/MPDCtrl/</HyperlinkButton>
219+
</controls:SettingsCard>
220+
<controls:SettingsCard Header="Microsoft App Store Page" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="@Microsoft">
221+
<HyperlinkButton NavigateUri="https://apps.microsoft.com/detail/9nv2bbj82brx">https://apps.microsoft.com/detail/9nv2bbj82brx</HyperlinkButton>
222+
</controls:SettingsCard>
223+
</controls:SettingsExpander.Items>
224+
</controls:SettingsExpander>
225+
226+
<!-- License -->
227+
<controls:SettingsExpander x:Uid="Settings_License">
228+
229+
<controls:SettingsExpander.Items>
230+
<controls:SettingsCard Header="The MIT License" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="Copyright (c) 2018~ torum">
231+
<TextBlock x:Uid="Settings_LicenseText" TextWrapping="Wrap"></TextBlock>
232+
</controls:SettingsCard>
233+
</controls:SettingsExpander.Items>
234+
235+
</controls:SettingsExpander>
236+
237+
<!-- PrivacyPolicy -->
238+
<controls:SettingsExpander x:Uid="Settings_PrivacyPolicy">
239+
240+
<controls:SettingsExpander.Items>
241+
<controls:SettingsCard Header="" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="">
242+
<TextBlock x:Uid="Settings_PrivacyPolicyText" TextWrapping="Wrap"></TextBlock>
243+
</controls:SettingsCard>
244+
</controls:SettingsExpander.Items>
245+
246+
</controls:SettingsExpander>
247+
248+
<!-- Third party -->
249+
<controls:SettingsExpander Header="Third-Party Dependency &amp; Libraries" Description="Built with C#/.NET">
250+
251+
<controls:SettingsExpander.Items>
252+
<controls:SettingsCard Header="Microsoft" HorizontalContentAlignment="Stretch" ContentAlignment="Vertical" Description="The MIT License">
253+
<StackPanel Spacing="12">
254+
<HyperlinkButton NavigateUri="https://github.com/CommunityToolkit/Windows">CommunityToolkit.Mvvm/WinUI</HyperlinkButton>
255+
<HyperlinkButton NavigateUri="https://www.nuget.org/packages/microsoft.extensions.dependencyinjection/">Microsoft.Extensions.DependencyInjection</HyperlinkButton>
256+
<HyperlinkButton NavigateUri="https://www.nuget.org/packages/Microsoft.Extensions.Hosting">Microsoft.Extensions.Hosting</HyperlinkButton>
257+
<HyperlinkButton NavigateUri="https://www.nuget.org/packages/System.Security.Cryptography.ProtectedData/">System.Security.Cryptography.ProtectedData</HyperlinkButton>
258+
<HyperlinkButton NavigateUri="https://github.com/microsoft/WindowsAppSDK">WindowsAppSDK</HyperlinkButton>
259+
<HyperlinkButton NavigateUri="https://github.com/microsoft/microsoft-ui-xaml">WinUI3</HyperlinkButton>
260+
</StackPanel>
261+
</controls:SettingsCard>
262+
</controls:SettingsExpander.Items>
263+
264+
</controls:SettingsExpander>
265+
211266
</StackPanel>
212267
</ScrollViewer>
213268
</Grid>

0 commit comments

Comments
 (0)