💾 Feat: 更新页 UI 更新, 无可用更新时禁用更新按钮

Crequency · Oct 2, 2022 · 574192c · 574192c
1 parent 7c2ae5a
commit 574192c
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 26 deletions.
diff --git a/KitX Dashboard/Languages/en-us.axaml b/KitX Dashboard/Languages/en-us.axaml
@@ -161,8 +161,7 @@
     <x:String x:Key="Text_Settings_Update">Update</x:String>
     <x:String x:Key="Text_Settings_Update_Check">Check Update</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentName">Component Name</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentMD5">MD5</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentSHA1">SHA1</x:String>
+    <x:String x:Key="Text_Settings_Update_ComponentHash">Hash Code</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentUpdatable">Updatable</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentsCount">Components founded</x:String>
 

diff --git a/KitX Dashboard/Languages/ja-jp.axaml b/KitX Dashboard/Languages/ja-jp.axaml
@@ -161,8 +161,7 @@
     <x:String x:Key="Text_Settings_Update">更新する</x:String>
     <x:String x:Key="Text_Settings_Update_Check">アップデートを確認</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentName">コンポーネント名</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentMD5">MD5</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentSHA1">SHA1</x:String>
+    <x:String x:Key="Text_Settings_Update_ComponentHash">チェック値</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentUpdatable">新しい！</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentsCount">見つかった</x:String>
 

diff --git a/KitX Dashboard/Languages/zh-cn.axaml b/KitX Dashboard/Languages/zh-cn.axaml
@@ -161,8 +161,7 @@
     <x:String x:Key="Text_Settings_Update">更新</x:String>
     <x:String x:Key="Text_Settings_Update_Check">检查更新</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentName">组件名称</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentMD5">组件 MD5 值</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentSHA1">组件 SHA1 值</x:String>
+    <x:String x:Key="Text_Settings_Update_ComponentHash">校验值</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentUpdatable">可更新</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentsCount">个组件已发现</x:String>
 

diff --git a/KitX Dashboard/Languages/zh-cnt.axaml b/KitX Dashboard/Languages/zh-cnt.axaml
@@ -161,8 +161,7 @@
     <x:String x:Key="Text_Settings_Update">更新</x:String>
     <x:String x:Key="Text_Settings_Update_Check">檢查更新</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentName">組件名稱</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentMD5">組件 MD5 值</x:String>
-    <x:String x:Key="Text_Settings_Update_ComponentSHA1">組件 SHA1 值</x:String>
+    <x:String x:Key="Text_Settings_Update_ComponentHash">校驗值</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentUpdatable">可更新</x:String>
     <x:String x:Key="Text_Settings_Update_ComponentsCount">個組件已發現</x:String>
 

diff --git a/KitX Dashboard/ViewModels/Pages/Controls/Settings_UpdateViewModel.cs b/KitX Dashboard/ViewModels/Pages/Controls/Settings_UpdateViewModel.cs
@@ -34,7 +34,7 @@ internal void InitEvents()
             {
                 if (_canUpdateDataGridView)
                 {
-                    CanUpdateCount = $"{Components.Count(x => x.CanUpdate)}";
+                    CanUpdateCount = Components.Count(x => x.CanUpdate);
                     PropertyChanged?.Invoke(this, new(nameof(ComponentsCount)));
                 }
             };
@@ -56,12 +56,12 @@ internal void InitData()
 
         }
 
-        internal string canUpdateCount = "0";
+        internal int canUpdateCount = 0;
 
         /// <summary>
         /// 可以更新的插件数量
         /// </summary>
-        internal string CanUpdateCount
+        internal int CanUpdateCount
         {
             get => canUpdateCount;
             set
@@ -128,6 +128,8 @@ private void CheckUpdate(object _)
                         .AppendIgnoreFolder("Config")
                         .AppendIgnoreFolder("Languages")
                         .AppendIgnoreFolder("Log")
+                        .AppendIgnoreFolder(Program.Config.App.LocalPluginsFileDirectory)
+                        .AppendIgnoreFolder(Program.Config.App.LocalPluginsDataDirectory)
                         .AppendIncludeFile($"{ld}/zh-cn.axaml")
                         .AppendIncludeFile($"{ld}/zh-cnt.axaml")
                         .AppendIncludeFile($"{ld}/en-us.axaml")
@@ -160,7 +162,8 @@ private void CheckUpdate(object _)
                             });
                         }
 
-                        AbleUpdateCommand(true);
+                        if (canUpdateCount > 0)
+                            AbleUpdateCommand(true);
                     });
                 }
                 else

diff --git a/KitX Dashboard/Views/Pages/Controls/Settings_Update.axaml b/KitX Dashboard/Views/Pages/Controls/Settings_Update.axaml
@@ -73,30 +73,69 @@
                   CanUserReorderColumns="True"
                   CanUserResizeColumns="True"
                   CanUserSortColumns="True"
+                  ColumnWidth="Auto"
                   CornerRadius="5"
+                  GridLinesVisibility="All"
                   IsReadOnly="True"
                   Items="{Binding Components}"
                   SelectionMode="Single">
             <DataGrid.Columns>
-                <DataGridCheckBoxColumn Width="Auto"
-                                        Binding="{Binding CanUpdate}"
-                                        Header="{DynamicResource Text_Settings_Update_ComponentUpdatable}"
-                                        IsThreeState="False"/>
+                <DataGridTemplateColumn Width="90"
+                                        CanUserReorder="False"
+                                        CanUserResize="False"
+                                        Header="{DynamicResource Text_Settings_Update_ComponentUpdatable}">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Border Width="200">
+                                <CheckBox Margin="10,0"
+                                          HorizontalAlignment="Right"
+                                          VerticalAlignment="Center"
+                                          IsChecked="{Binding CanUpdate}"
+                                          IsEnabled="False"
+                                          IsThreeState="False"/>
+                            </Border>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
                 <DataGridTextColumn Width="Auto"
                                     Binding="{Binding Name}"
                                     FontFamily="{StaticResource SourceHanSans}"
                                     FontWeight="Bold"
                                     Header="{DynamicResource Text_Settings_Update_ComponentName}"/>
-                <DataGridTextColumn Width="Auto"
-                                    Binding="{Binding MD5}"
-                                    FontFamily="{StaticResource SarasaMonoCL}"
-                                    FontWeight="Regular"
-                                    Header="{DynamicResource Text_Settings_Update_ComponentMD5}"/>
-                <DataGridTextColumn Width="Auto"
-                                    Binding="{Binding SHA1}"
-                                    FontFamily="{StaticResource SarasaMonoCL}"
-                                    FontWeight="Regular"
-                                    Header="{DynamicResource Text_Settings_Update_ComponentSHA1}"/>
+                <DataGridTemplateColumn Header="{DynamicResource Text_Settings_Update_ComponentHash}">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <ScrollViewer Height="29">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <StackPanel Grid.Row="0" Orientation="Horizontal">
+                                        <TextBlock Margin="10,5,0,5"
+                                                   FontFamily="{StaticResource SarasaMonoCL}"
+                                                   FontWeight="Regular"
+                                                   Text="MD5: "/>
+                                        <TextBlock Margin="5"
+                                                   FontFamily="{StaticResource SarasaMonoCL}"
+                                                   FontWeight="Regular"
+                                                   Text="{Binding MD5}"/>
+                                    </StackPanel>
+                                    <StackPanel Grid.Row="1" Orientation="Horizontal">
+                                        <TextBlock Margin="10,5,0,5"
+                                                   FontFamily="{StaticResource SarasaMonoCL}"
+                                                   FontWeight="Regular"
+                                                   Text="SHA1:"/>
+                                        <TextBlock Margin="5"
+                                                   FontFamily="{StaticResource SarasaMonoCL}"
+                                                   FontWeight="Regular"
+                                                   Text="{Binding SHA1}"/>
+                                    </StackPanel>
+                                </Grid>
+                            </ScrollViewer>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>