优化UI

Jeric-X · Aug 8, 2024 · b45f846 · b45f846
1 parent 8c3bdff
commit b45f846
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 41 deletions.
diff --git a/src/SyncClipboard.Core/I18n/Strings.Designer.cs b/src/SyncClipboard.Core/I18n/Strings.Designer.cs
diff --git a/src/SyncClipboard.Core/I18n/Strings.resx b/src/SyncClipboard.Core/I18n/Strings.resx
@@ -543,7 +543,7 @@
   <data name="FileFilterDescription" xml:space="preserve">
     <value>Each file extension per line</value>
   </data>
-  <data name="Save" xml:space="preserve">
-    <value>Save</value>
+  <data name="SaveList" xml:space="preserve">
+    <value>Save List</value>
   </data>
 </root>
diff --git a/src/SyncClipboard.Core/I18n/Strings.zh-CN.resx b/src/SyncClipboard.Core/I18n/Strings.zh-CN.resx
@@ -543,7 +543,7 @@
   <data name="FileFilterDescription" xml:space="preserve">
     <value>每行一个文件扩展名</value>
   </data>
-  <data name="Save" xml:space="preserve">
-    <value>保存</value>
+  <data name="SaveList" xml:space="preserve">
+    <value>保存名单</value>
   </data>
 </root>
diff --git a/src/SyncClipboard.Core/ViewModels/SyncSettingViewModel.cs b/src/SyncClipboard.Core/ViewModels/SyncSettingViewModel.cs
@@ -10,11 +10,15 @@ public partial class SyncSettingViewModel : ObservableObject
     #region server
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsNormalClientEnable))]
+    [NotifyPropertyChangedFor(nameof(UseManulServer))]
+    [NotifyPropertyChangedFor(nameof(ClientEnabled))]
     private bool serverEnable;
     partial void OnServerEnableChanged(bool value) => ServerConfig = ServerConfig with { SwitchOn = value };
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsNormalClientEnable))]
+    [NotifyPropertyChangedFor(nameof(UseManulServer))]
+    [NotifyPropertyChangedFor(nameof(ClientEnabled))]
     private bool clientMixedMode;
     partial void OnClientMixedModeChanged(bool value) => ServerConfig = ServerConfig with { ClientMixedMode = value };
 
@@ -32,6 +36,7 @@ partial void OnServerConfigChanged(ServerConfig value)
 
     #region client
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ClientEnabled))]
     private bool syncEnable;
     partial void OnSyncEnableChanged(bool value) => ClientConfig = ClientConfig with { SyncSwitchOn = value };
 
@@ -113,7 +118,19 @@ private void SetFileSyncFilter()
 
     public bool IsNormalClientEnable => !ServerEnable || !ClientMixedMode;
 
-    public bool UseManulServer => !UseLocalServer;
+    public bool UseManulServer => !UseLocalServer && IsNormalClientEnable;
+
+    public bool ClientEnabled
+    {
+        get => !IsNormalClientEnable || SyncEnable;
+        set 
+        {   
+            if (IsNormalClientEnable)
+            {
+                SyncEnable = value;
+            }
+        }
+    }
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(ServerConfigDescription))]

diff --git a/src/SyncClipboard.Desktop/Views/FileSyncFilterSettingPage.axaml b/src/SyncClipboard.Desktop/Views/FileSyncFilterSettingPage.axaml
@@ -52,7 +52,7 @@
                         Margin="16,0,0,0"
                         Orientation="Vertical"
                         Spacing="10">
-                <Button HorizontalAlignment="Stretch" Content="{x:Static i18n:Strings.Save}" Command="{Binding ApplyCommand}" />
+                <Button HorizontalAlignment="Stretch" Content="{x:Static i18n:Strings.SaveList}" Command="{Binding ApplyCommand}" />
             </StackPanel>
         </Grid>
     </Grid>

diff --git a/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml b/src/SyncClipboard.Desktop/Views/SyncSettingPage.axaml
@@ -77,15 +77,18 @@
                 </ui:SettingsExpanderItem>
             </ui:SettingsExpander.Items>
         </ui:SettingsExpander>
-        <ui:SettingsExpander Header="{x:Static i18n:Strings.ClipboardSyncing}" IsExpanded="{Binding IsNormalClientEnable, Mode=OneWay}" IsEnabled="{Binding IsNormalClientEnable, Mode=OneWay}">
+        <ui:SettingsExpander Header="{x:Static i18n:Strings.ClipboardSyncing}" IsExpanded="True">
             <ui:SettingsExpander.IconSource>
                 <ui:FontIconSource Glyph="&#xE117;" FontFamily="{StaticResource SymbolThemeFontFamily}" />
             </ui:SettingsExpander.IconSource>
             <ui:SettingsExpander.Footer>
-                <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding SyncEnable, Mode=TwoWay}" />
+                <ToggleSwitch OnContent="{x:Static i18n:Strings.On}"
+                              OffContent="{x:Static i18n:Strings.Off}"
+                              IsChecked="{Binding ClientEnabled, Mode=TwoWay}"
+                              IsEnabled="{Binding IsNormalClientEnable, Mode=OneWay}" />
             </ui:SettingsExpander.Footer>
             <ui:SettingsExpander.Items>
-                <ui:SettingsExpanderItem Description="{x:Static i18n:Strings.UseBuiltInServerDescription}" Content="{x:Static i18n:Strings.UseSelfHostServer}">
+                <ui:SettingsExpanderItem Description="{x:Static i18n:Strings.UseBuiltInServerDescription}" Content="{x:Static i18n:Strings.UseSelfHostServer}" IsVisible="{Binding IsNormalClientEnable}">
                     <ui:SettingsExpanderItem.Footer>
                         <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding UseLocalServer, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
@@ -114,38 +117,31 @@
                                         FontSize="12"
                                         FontWeight="SemiBold" />
                 </ui:SettingsExpanderItem>
-                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.QueryInterval}">
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.QueryInterval}" IsVisible="{Binding IsNormalClientEnable}">
                     <ui:SettingsExpanderItem.Footer>
                         <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding IntervalTime, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
-                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.RetryTimes}">
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.RetryTimes}" IsVisible="{Binding IsNormalClientEnable}">
                     <ui:SettingsExpanderItem.Footer>
                         <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding RetryTimes, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
-                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.TimeoutPeriod}">
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.TimeoutPeriod}" IsVisible="{Binding IsNormalClientEnable}">
                     <ui:SettingsExpanderItem.Footer>
                         <ui:NumberBox Minimum="0" Maximum="100000" Value="{Binding TimeOut, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
-                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.DeleteServerTemporaryFileAutoly}">
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.DeleteServerTemporaryFileAutoly}" IsVisible="{Binding IsNormalClientEnable}">
                     <ui:SettingsExpanderItem.Footer>
                         <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding AutoDeleleServerFile, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
-                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.SendNotificationAfterManuallyUpload}">
+                <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.SendNotificationAfterManuallyUpload}" IsVisible="{Binding IsNormalClientEnable}">
                     <ui:SettingsExpanderItem.Footer>
                         <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding NotifyOnManualUpload, Mode=TwoWay}" />
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
-            </ui:SettingsExpander.Items>
-        </ui:SettingsExpander>
-        <ui:SettingsExpander Header="{x:Static i18n:Strings.ClientGeneral}" IsExpanded="True">
-            <ui:SettingsExpander.IconSource>
-                <ui:FontIconSource Glyph="&#xE90F;" FontFamily="{StaticResource SymbolThemeFontFamily}" />
-            </ui:SettingsExpander.IconSource>
-            <ui:SettingsExpander.Items>
                 <ui:SettingsExpanderItem Content="{x:Static i18n:Strings.SendNotificationAfterUpdateLocalClipboard}">
                     <ui:SettingsExpanderItem.Footer>
                         <ToggleSwitch OnContent="{x:Static i18n:Strings.On}" OffContent="{x:Static i18n:Strings.Off}" IsChecked="{Binding NotifyOnDownloaded, Mode=TwoWay}" />

diff --git a/src/SyncClipboard.WinUI3/Views/FileSyncFilterSettingPage.xaml b/src/SyncClipboard.WinUI3/Views/FileSyncFilterSettingPage.xaml
@@ -44,7 +44,7 @@
                         Margin="16,0,0,0"
                         Orientation="Vertical"
                         Spacing="10">
-                <Button HorizontalAlignment="Stretch" Content="{x:Bind i18n:Strings.Save}" Command="{x:Bind _viewModel.ApplyCommand}" />
+                <Button HorizontalAlignment="Stretch" Content="{x:Bind i18n:Strings.SaveList}" Command="{x:Bind _viewModel.ApplyCommand}" />
             </StackPanel>
         </Grid>
     </Grid>

diff --git a/src/SyncClipboard.WinUI3/Views/SyncSettingPage.xaml b/src/SyncClipboard.WinUI3/Views/SyncSettingPage.xaml
@@ -71,16 +71,16 @@
                 </ui:SettingsCard>
             </ui:SettingsExpander.Items>
         </ui:SettingsExpander>
-        <ui:SettingsExpander Header="{x:Bind i18n:Strings.ClipboardSyncing}" IsExpanded="{Binding IsNormalClientEnable, Mode=OneWay}" IsEnabled="{x:Bind _viewModel.IsNormalClientEnable, Mode=OneWay}">
+        <ui:SettingsExpander Header="{x:Bind i18n:Strings.ClipboardSyncing}" IsExpanded="True">
             <ui:SettingsExpander.HeaderIcon>
                 <FontIcon Glyph="&#xE117;" />
             </ui:SettingsExpander.HeaderIcon>
-            <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.SyncEnable, Mode=TwoWay}" />
+            <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.ClientEnabled, Mode=TwoWay}" IsEnabled="{x:Bind _viewModel.IsNormalClientEnable, Mode=OneWay}"/>
             <ui:SettingsExpander.Items>
-                <ui:SettingsCard Description="{x:Bind i18n:Strings.UseBuiltInServerDescription}" Header="{x:Bind i18n:Strings.UseSelfHostServer}">
+                <ui:SettingsCard Description="{x:Bind i18n:Strings.UseBuiltInServerDescription}" Header="{x:Bind i18n:Strings.UseSelfHostServer}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
                     <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.UseLocalServer, Mode=TwoWay}" />
                 </ui:SettingsCard>
-                <ui:SettingsCard Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.UseManulServer), Mode=OneWay}" Description="{x:Bind _viewModel.ClientConfigDescription, Mode=OneWay}">
+                <ui:SettingsCard Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.UseManulServer)}" Description="{x:Bind _viewModel.ClientConfigDescription, Mode=OneWay}">
                     <StackPanel Orientation="Horizontal" Spacing="5">
                         <ToggleButton IsChecked="{x:Bind _viewModel.ShowClientPassword, Mode=TwoWay}">
                             <FontIcon Glyph="{x:Bind _viewModel.ShowClientPassword, Mode=OneWay, Converter={StaticResource BoolToPasswordIconConverter}}" />
@@ -108,28 +108,21 @@
                         <HyperlinkButton Content="{x:Bind i18n:Strings.UseNextcloud}" Command="{x:Bind _viewModel.LoginWithNextcloudCommand}" />
                     </ui:SettingsCard.Description>
                 </ui:SettingsCard>
-                <ui:SettingsCard Header="{x:Bind i18n:Strings.QueryInterval}">
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.QueryInterval}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
                     <NumberBox Minimum="0" Maximum="100000" Value="{x:Bind _viewModel.IntervalTime, Mode=TwoWay}" />
                 </ui:SettingsCard>
-                <ui:SettingsCard Header="{x:Bind i18n:Strings.RetryTimes}">
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.RetryTimes}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
                     <NumberBox Minimum="0" Maximum="100000" Value="{x:Bind _viewModel.RetryTimes, Mode=TwoWay}" />
                 </ui:SettingsCard>
-                <ui:SettingsCard Header="{x:Bind i18n:Strings.TimeoutPeriod}">
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.TimeoutPeriod}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
                     <NumberBox Minimum="0" Maximum="100000" Value="{x:Bind _viewModel.TimeOut, Mode=TwoWay}" />
                 </ui:SettingsCard>
-                <ui:SettingsCard Header="{x:Bind i18n:Strings.DeleteServerTemporaryFileAutoly}">
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.DeleteServerTemporaryFileAutoly}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
                     <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.AutoDeleleServerFile, Mode=TwoWay}" />
                 </ui:SettingsCard>
-                <ui:SettingsCard Header="{x:Bind i18n:Strings.SendNotificationAfterManuallyUpload}">
+                <ui:SettingsCard Header="{x:Bind i18n:Strings.SendNotificationAfterManuallyUpload}" Visibility="{x:Bind vc:ConvertMethod.BoolToVisibility(_viewModel.IsNormalClientEnable), Mode=OneWay}">
                     <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.NotifyOnManualUpload, Mode=TwoWay}" />
                 </ui:SettingsCard>
-            </ui:SettingsExpander.Items>
-        </ui:SettingsExpander>
-        <ui:SettingsExpander Header="{x:Bind i18n:Strings.ClientGeneral}" IsExpanded="True">
-            <ui:SettingsExpander.HeaderIcon>
-                <FontIcon Glyph="&#xE90F;" />
-            </ui:SettingsExpander.HeaderIcon>
-            <ui:SettingsExpander.Items>
                 <ui:SettingsCard Header="{x:Bind i18n:Strings.SendNotificationAfterUpdateLocalClipboard}">
                     <ToggleSwitch OnContent="{x:Bind i18n:Strings.On}" OffContent="{x:Bind i18n:Strings.Off}" IsOn="{x:Bind _viewModel.NotifyOnDownloaded, Mode=TwoWay}" />
                 </ui:SettingsCard>