jianxin/GZStudio
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust ui

Browse Source
This commit is contained in:
jianxin committed 2024-09-30 21:33:09 +08:00
1 parent 19305adba5
commit d595c4bf3c
2 files changed
+26 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GZStudio/Views/SettingsPage.xaml
+15 -17
View File
@@ -16,10 +16,10 @@
<StackPanel <StackPanel
x:Name="ContentArea"> x:Name="ContentArea">
<TextBlock x:Uid="Settings_Personalization" Style="{ThemeResource SubtitleTextBlockStyle}" /> <TextBlock x:Uid="Settings_Personalization" Style="{ThemeResource SubtitleTextBlockStyle}" />
<controls:SettingsCard Description="选择应用展示的主题" <controls:SettingsCard Description="选择应用展示的主题"
Header="应用主题" Header="应用主题"
HeaderIcon="{ui:FontIcon Glyph=&#xE799;}"> HeaderIcon="{ui:FontIcon Glyph=&#xE790;}">
<ComboBox SelectedIndex="0"> <ComboBox SelectedIndex="0">
<ComboBoxItem>默认</ComboBoxItem> <ComboBoxItem>默认</ComboBoxItem>
<ComboBoxItem>暗色</ComboBoxItem> <ComboBoxItem>暗色</ComboBoxItem>
@@ -27,17 +27,15 @@
</ComboBox> </ComboBox>
</controls:SettingsCard> </controls:SettingsCard>
<TextBlock Style="{ThemeResource SubtitleTextBlockStyle}" x:Uid="Settings_About" /> <TextBlock Style="{ThemeResource SubtitleTextBlockStyle}" x:Uid="Settings_About" />
<controls:SettingsExpander Description="© 2024. All rights reserved." Header="GZStudio"> <controls:SettingsExpander Description="© 2024. All rights reserved." Header="GZStudio"
HeaderIcon="{ui:FontIcon Glyph=&#xE946;}">
<TextBlock IsTextSelectionEnabled="True" Text="Version 0.0.1" /> <TextBlock IsTextSelectionEnabled="True" Text="Version 0.0.1" />
<controls:SettingsExpander.Items> <controls:SettingsExpander.Items>
<controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left"> <controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
<StackPanel Margin="-12,0,0,0" Orientation="Vertical"> <StackPanel Margin="-12,0,0,0" Orientation="Vertical">
<TextBlock x:Uid="Settings_Theme" /> <TextBlock x:Uid="Settings_Theme" />
<StackPanel Margin="{StaticResource XSmallTopMargin}"> <StackPanel Margin="{StaticResource XSmallTopMargin}">
<RadioButton <RadioButton
x:Uid="Settings_Theme_Light" x:Uid="Settings_Theme_Light"
@@ -45,26 +43,26 @@
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}" IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}"
FontSize="15" FontSize="15"
GroupName="AppTheme"> GroupName="AppTheme">
<RadioButton.CommandParameter> <RadioButton.CommandParameter>
<xaml:ElementTheme>Light</xaml:ElementTheme> <xaml:ElementTheme>Light</xaml:ElementTheme>
</RadioButton.CommandParameter> </RadioButton.CommandParameter>
</RadioButton> </RadioButton>
<RadioButton <RadioButton
x:Uid="Settings_Theme_Dark" x:Uid="Settings_Theme_Dark"
Command="{x:Bind ViewModel.SwitchThemeCommand}" Command="{x:Bind ViewModel.SwitchThemeCommand}"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}" IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}"
FontSize="15" FontSize="15"
GroupName="AppTheme"> GroupName="AppTheme">
<RadioButton.CommandParameter> <RadioButton.CommandParameter>
<xaml:ElementTheme>Dark</xaml:ElementTheme> <xaml:ElementTheme>Dark</xaml:ElementTheme>
</RadioButton.CommandParameter> </RadioButton.CommandParameter>
</RadioButton> </RadioButton>
<RadioButton <RadioButton
x:Uid="Settings_Theme_Default" x:Uid="Settings_Theme_Default"
Command="{x:Bind ViewModel.SwitchThemeCommand}" Command="{x:Bind ViewModel.SwitchThemeCommand}"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}" IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}"
FontSize="15" FontSize="15"
GroupName="AppTheme"> GroupName="AppTheme">
<RadioButton.CommandParameter> <RadioButton.CommandParameter>
<xaml:ElementTheme>Default</xaml:ElementTheme> <xaml:ElementTheme>Default</xaml:ElementTheme>
</RadioButton.CommandParameter> </RadioButton.CommandParameter>
GZStudio/Views/ShellPage.xaml
+11 -20
View File
@@ -15,23 +15,14 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <TitleBar x:Name="AppTitleBar"
<Grid.ColumnDefinitions> Title="GZStudio"
<ColumnDefinition Width="*" /> Subtitle="preview"
<ColumnDefinition Width="Auto" /> IsBackButtonVisible="True"
</Grid.ColumnDefinitions> IsPaneToggleButtonVisible="True"
<TitleBar BorderThickness="2"
x:Name="AppTitleBar" BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
Title="GZStudio" CornerRadius="{StaticResource OverlayCornerRadius}" />
Subtitle="preview"
IsBackButtonVisible="True"
IsPaneToggleButtonVisible="True"
BorderThickness="2"
BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
CornerRadius="{StaticResource OverlayCornerRadius}"
></TitleBar>
</Grid>
<NavigationView <NavigationView
Grid.Row="1" Grid.Row="1"
@@ -45,7 +36,7 @@
ExpandedModeThresholdWidth="1280" ExpandedModeThresholdWidth="1280"
DisplayModeChanged="NavigationViewControl_DisplayModeChanged" DisplayModeChanged="NavigationViewControl_DisplayModeChanged"
Header="{x:Bind ((ContentControl)ViewModel.Selected).Content, Mode=OneWay}"> Header="{x:Bind ((ContentControl)ViewModel.Selected).Content, Mode=OneWay}">
<NavigationView.MenuItems> <NavigationView.MenuItems>
<!-- <!--
TODO: Update item titles by updating <x:Uid>.Content entries in Strings/en-us/Resources.resw. TODO: Update item titles by updating <x:Uid>.Content entries in Strings/en-us/Resources.resw.
@@ -56,7 +47,7 @@
--> -->
<NavigationViewItem x:Uid="Shell_AppList" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.AppListViewModel"> <NavigationViewItem x:Uid="Shell_AppList" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.AppListViewModel">
<NavigationViewItem.Icon> <NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe7c3;"/> <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xEA37;"/>
</NavigationViewItem.Icon> </NavigationViewItem.Icon>
</NavigationViewItem> </NavigationViewItem>
<NavigationViewItem x:Uid="Shell_Configuration" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.ConfigurationViewModel"> <NavigationViewItem x:Uid="Shell_Configuration" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.ConfigurationViewModel">
@@ -65,7 +56,7 @@
</NavigationViewItem.Icon> </NavigationViewItem.Icon>
</NavigationViewItem> </NavigationViewItem>
</NavigationView.MenuItems> </NavigationView.MenuItems>
<NavigationView.HeaderTemplate> <NavigationView.HeaderTemplate>
<DataTemplate> <DataTemplate>
<Grid> <Grid>