Skip to content

Commit a109f4e

Browse files
DynesshelyDynesshely
authored
💾 Feat: Merge pull request #154 from Crequency/dev=main
[Pull Request] 一些 UI 更新
2 parents 25f4249 + 574192c commit a109f4e

File tree

9 files changed

+212
-194
lines changed

9 files changed

+212
-194
lines changed

‎KitX Dashboard/KitX Dashboard.csproj‎

Lines changed: 23 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,17 @@
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net6.0</TargetFramework>
55
<Nullable>enable</Nullable>
6-
<!--Avalonia doesn't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
76
<TrimMode>copyused</TrimMode>
87
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
98
<ApplicationIcon>Assets\KitX-Icon-256x.ico</ApplicationIcon>
10-
<!--<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>-->
119
<BaseOutputPath>..\KitX Build\Dashboard\</BaseOutputPath>
1210
<BaseIntermediateOutputPath>..\KitX Build\Temp\Dashboard\</BaseIntermediateOutputPath>
13-
14-
<!--<AssemblyVersion>3.2204.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays).$([System.Math]::Floor($([MSBuild]::Divide($([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds), 1.32))))</AssemblyVersion>
15-
<FileVersion>3.2204.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays).$([System.Math]::Floor($([MSBuild]::Divide($([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds), 1.32))))</FileVersion>
16-
<Version>3.2204.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays).$([System.Math]::Floor($([MSBuild]::Divide($([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds), 1.32))))</Version>-->
17-
1811
<AssemblyVersion>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</AssemblyVersion>
1912
<FileVersion>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</FileVersion>
2013
<Version>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</Version>
2114
</PropertyGroup>
2215

23-
<!--<PropertyGroup>
24-
<IlcOptimizationPreference>Speed</IlcOptimizationPreference>
25-
<IlcFoldIdenticalMethodBodies>true</IlcFoldIdenticalMethodBodies>
26-
</PropertyGroup>
27-
<ItemGroup>
16+
<!--<ItemGroup>
2817
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="6.0.0-*" />
2918
</ItemGroup>-->
3019

@@ -105,7 +94,7 @@
10594
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10695
</None>
10796
<None Update="Assets\KitX-Icon.png">
108-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
97+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
10998
</None>
11099
<None Update="Assets\ThirdPartLicense.md">
111100
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -115,36 +104,32 @@
115104
</None>
116105
</ItemGroup>
117106
<ItemGroup>
118-
<EmbeddedResource Include="Assets\KitX-Icon-128x.ico">
119-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
120-
</EmbeddedResource>
121-
<EmbeddedResource Include="Assets\KitX-Icon-16x.ico">
122-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
123-
</EmbeddedResource>
124-
<EmbeddedResource Include="Assets\KitX-Icon-256x.ico">
125-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
126-
</EmbeddedResource>
127-
<EmbeddedResource Include="Assets\KitX-Icon-32x.ico">
128-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
129-
</EmbeddedResource>
130-
<EmbeddedResource Include="Assets\KitX-Icon-48x.ico">
131-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
132-
</EmbeddedResource>
133-
<EmbeddedResource Include="Assets\KitX-Icon-64x.ico">
134-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
135-
</EmbeddedResource>
107+
<EmbeddedResource Include="Assets\KitX-Icon-128x.ico">
108+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
109+
</EmbeddedResource>
110+
<EmbeddedResource Include="Assets\KitX-Icon-16x.ico">
111+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
112+
</EmbeddedResource>
113+
<EmbeddedResource Include="Assets\KitX-Icon-256x.ico">
114+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
115+
</EmbeddedResource>
116+
<EmbeddedResource Include="Assets\KitX-Icon-32x.ico">
117+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
118+
</EmbeddedResource>
119+
<EmbeddedResource Include="Assets\KitX-Icon-48x.ico">
120+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
121+
</EmbeddedResource>
122+
<EmbeddedResource Include="Assets\KitX-Icon-64x.ico">
123+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
124+
</EmbeddedResource>
136125
</ItemGroup>
137126
<ItemGroup>
138-
<!--This helps with theme dll-s trimming.
139-
If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
140-
https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
141127
<TrimmableAssembly Include="Avalonia.Themes.Fluent" />
142128
<TrimmableAssembly Include="Avalonia.Themes.Default" />
143129
</ItemGroup>
144130
<ItemGroup>
145131
<PackageReference Include="Avalonia" Version="0.10.18" />
146132
<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
147-
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
148133
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
149134
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.18" />
150135
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
@@ -165,30 +150,8 @@
165150
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
166151
</ItemGroup>
167152
<ItemGroup>
168-
<ProjectReference Include="..\KitX Dashboard Helper\KitX.Fonts\KitX.Fonts.csproj" />
169-
<ProjectReference Include="..\KitX File Format Helper\KitX.KXP.Helper\KitX.KXP.Helper.csproj" />
170-
<ProjectReference Include="..\KitX Rules\KitX.Web.Rules\KitX.Web.Rules.csproj" />
153+
<ProjectReference Include="..\KitX Dashboard Helper\KitX.Fonts\KitX.Fonts.csproj" />
154+
<ProjectReference Include="..\KitX File Format Helper\KitX.KXP.Helper\KitX.KXP.Helper.csproj" />
155+
<ProjectReference Include="..\KitX Rules\KitX.Web.Rules\KitX.Web.Rules.csproj" />
171156
</ItemGroup>
172-
<!--<ItemGroup>
173-
<Compile Update="Views\AnouncementsWindow.axaml.cs">
174-
<DependentUpon>AnouncementsWindow.axaml</DependentUpon>
175-
</Compile>
176-
<Compile Update="Views\Pages\Controls\DeviceCard.axaml.cs">
177-
<DependentUpon>DeviceCard.axaml</DependentUpon>
178-
</Compile>
179-
<Compile Update="Views\Pages\Controls\Home_ActivityLog.axaml.cs">
180-
<DependentUpon>Home_ActivityLog.axaml</DependentUpon>
181-
</Compile>
182-
<Compile Update="Views\Pages\Controls\Home_Count.axaml.cs">
183-
<DependentUpon>Home_Count.axaml</DependentUpon>
184-
</Compile>
185-
<Compile Update="Views\Pages\Controls\Home_RecentUse.axaml.cs">
186-
<DependentUpon>Home_RecentUse.axaml</DependentUpon>
187-
</Compile>
188-
</ItemGroup>-->
189-
<ProjectExtensions>
190-
<VisualStudio>
191-
<UserProperties properties_4launchsettings_1json__JsonSchema="" />
192-
</VisualStudio>
193-
</ProjectExtensions>
194157
</Project>

‎KitX Dashboard/Languages/en-us.axaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<ResourceDictionary xmlns="https://github.com/avaloniaui"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3-
<!-- Add Resources Here -->
1+
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
2+
<!-- Add Resources Here -->
43
<x:String x:Key="Text_MainWindow_Title">KitX Dashboard</x:String>
54

65

@@ -27,40 +26,40 @@
2726
<x:String x:Key="Text_Log_Fatal">Fatal</x:String>
2827

2928

30-
<!--GreetingStart-->
29+
<!-- GreetingStart -->
3130

32-
<!--MorningStart-->
31+
<!-- MorningStart -->
3332
<x:String x:Key="Text_Greeting_Morning_1">Good Morning! ο(=•ω＜=)ρ⌒☆</x:String>
3433
<x:String x:Key="Text_Greeting_Morning_2">Have a good mood every day! OvO</x:String>
3534
<x:String x:Key="Text_Greeting_Morning_3">Today's event, today's end!</x:String>
3635
<x:String x:Key="Text_Greeting_Morning_4">Nice day begins~</x:String>
37-
<!--MorningEnd-->
36+
<!-- MorningEnd -->
3837

39-
<!--NoonStart-->
38+
<!-- NoonStart -->
4039
<x:String x:Key="Text_Greeting_Noon_1">Good noon! o(〃＾▽＾〃)o</x:String>
4140
<x:String x:Key="Text_Greeting_Noon_2">It's noon, take a break~</x:String>
4241
<x:String x:Key="Text_Greeting_Noon_3">Today is also a full morning</x:String>
43-
<!--NoonEnd-->
42+
<!-- NoonEnd -->
4443

45-
<!--AfterNoonStart-->
44+
<!-- AfterNoonStart -->
4645
<x:String x:Key="Text_Greeting_AfterNoon_1">Good afternoon! ヾ(≧▽≦*)o</x:String>
4746
<x:String x:Key="Text_Greeting_AfterNoon_2">Afternoon tea time!</x:String>
4847
<x:String x:Key="Text_Greeting_AfterNoon_3">What tasks are left unfinished today?</x:String>
49-
<!--AfterNoonEnd-->
48+
<!-- AfterNoonEnd -->
5049

51-
<!--EveningStart-->
50+
<!-- EveningStart -->
5251
<x:String x:Key="Text_Greeting_Evening_1">Good evening! o(*￣▽￣*)ブ</x:String>
5352
<x:String x:Key="Text_Greeting_Evening_2">I'm going to have a nice meal tonight!</x:String>
54-
<!--EveningEnd-->
53+
<!-- EveningEnd -->
5554

56-
<!--NightStart-->
55+
<!-- NightStart -->
5756
<x:String x:Key="Text_Greeting_Night_1">It's quiet at night! o(*￣▽￣*)ブ</x:String>
5857
<x:String x:Key="Text_Greeting_Night_2">It's late at night, rest early~</x:String>
5958
<x:String x:Key="Text_Greeting_Night_3">Tomorrow will be a good day!</x:String>
60-
<!--NightEnd-->
59+
<!-- NightEnd -->
60+
61+
<!-- GreetingEnd -->
6162

62-
<!--GreetingEnd-->
63-
6463
<x:String x:Key="Text_MainWindow_NavigationView_Home">Home</x:String>
6564
<x:String x:Key="Text_MainWindow_NavigationView_Lib">Library</x:String>
6665
<x:String x:Key="Text_MainWindow_NavigationView_Market">Market</x:String>
@@ -117,12 +116,14 @@
117116

118117
<x:String x:Key="Text_Device_No">No other devices in network.</x:String>
119118
<x:String x:Key="Text_Device_This">This Device</x:String>
119+
<x:String x:Key="Text_Device_Type_Slave">Slave</x:String>
120+
<x:String x:Key="Text_Device_Type_Master">Master</x:String>
120121
<x:String x:Key="Text_Device_Resources_CPU">CPU</x:String>
121122
<x:String x:Key="Text_Device_Resources_RAM">RAM</x:String>
122123
<x:String x:Key="Text_Device_Resources_NET">NET</x:String>
123124
<x:String x:Key="Text_Device_Tip_Detected">Devices Detected.</x:String>
124125
<x:String x:Key="Text_Device_PluginsCount">Enabled Plugins Count:</x:String>
125-
126+
126127

127128
<x:String x:Key="Text_Settings_General">General</x:String>
128129
<x:String x:Key="Text_Settings_General_LocalPluginsFileDirectory">Local Plugins Program Files Path</x:String>
@@ -131,7 +132,7 @@
131132
<x:String x:Key="Text_Settings_General_ShowAnnouncement">Show Announcements When Start</x:String>
132133
<x:String x:Key="Text_Settings_General_ShowAnnouncementNow">Show Announcements Now</x:String>
133134

134-
135+
135136
<x:String x:Key="Text_Settings_Personalise">Personalise</x:String>
136137
<x:String x:Key="Text_Settings_Personalise_DisplayLanguage">Display Language</x:String>
137138
<x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica Effect</x:String>
@@ -160,8 +161,7 @@
160161
<x:String x:Key="Text_Settings_Update">Update</x:String>
161162
<x:String x:Key="Text_Settings_Update_Check">Check Update</x:String>
162163
<x:String x:Key="Text_Settings_Update_ComponentName">Component Name</x:String>
163-
<x:String x:Key="Text_Settings_Update_ComponentMD5">MD5</x:String>
164-
<x:String x:Key="Text_Settings_Update_ComponentSHA1">SHA1</x:String>
164+
<x:String x:Key="Text_Settings_Update_ComponentHash">Hash Code</x:String>
165165
<x:String x:Key="Text_Settings_Update_ComponentUpdatable">Updatable</x:String>
166166
<x:String x:Key="Text_Settings_Update_ComponentsCount">Components founded</x:String>
167167

‎KitX Dashboard/Languages/ja-jp.axaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<ResourceDictionary xmlns="https://github.com/avaloniaui"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3-
<!-- Add Resources Here -->
1+
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
2+
<!-- Add Resources Here -->
43
<x:String x:Key="Text_MainWindow_Title">KitX ダッシュボード</x:String>
54

65

@@ -27,39 +26,39 @@
2726
<x:String x:Key="Text_Log_Fatal">崩壊</x:String>
2827

2928

30-
<!--GreetingStart-->
29+
<!-- GreetingStart -->
3130

32-
<!--MorningStart-->
31+
<!-- MorningStart -->
3332
<x:String x:Key="Text_Greeting_Morning_1">おはよう! ο(=•ω＜=)ρ⌒☆</x:String>
3433
<x:String x:Key="Text_Greeting_Morning_2">毎日良い気分を OvO</x:String>
3534
<x:String x:Key="Text_Greeting_Morning_3">今日のイベント、今日の終わり!</x:String>
3635
<x:String x:Key="Text_Greeting_Morning_4">良い一日が始まります~</x:String>
37-
<!--MorningEnd-->
36+
<!-- MorningEnd -->
3837

39-
<!--NoonStart-->
38+
<!-- NoonStart -->
4039
<x:String x:Key="Text_Greeting_Noon_1">こんにちは! o(〃＾▽＾〃)o</x:String>
4140
<x:String x:Key="Text_Greeting_Noon_2">正午です、休憩してください~</x:String>
4241
<x:String x:Key="Text_Greeting_Noon_3">今日もおはようございます</x:String>
43-
<!--NoonEnd-->
42+
<!-- NoonEnd -->
4443

45-
<!--AfterNoonStart-->
44+
<!-- AfterNoonStart -->
4645
<x:String x:Key="Text_Greeting_AfterNoon_1">こんにちは! ヾ(≧▽≦*)o</x:String>
4746
<x:String x:Key="Text_Greeting_AfterNoon_2">アフタヌーンティータイム!</x:String>
4847
<x:String x:Key="Text_Greeting_AfterNoon_3">今日、どのようなタスクが未完了のままになっていますか？</x:String>
49-
<!--AfterNoonEnd-->
48+
<!-- AfterNoonEnd -->
5049

51-
<!--EveningStart-->
50+
<!-- EveningStart -->
5251
<x:String x:Key="Text_Greeting_Evening_1">こんばんは! o(*￣▽￣*)ブ</x:String>
5352
<x:String x:Key="Text_Greeting_Evening_2">今夜は美味しい食事をします!</x:String>
54-
<!--EveningEnd-->
53+
<!-- EveningEnd -->
5554

56-
<!--NightStart-->
55+
<!-- NightStart -->
5756
<x:String x:Key="Text_Greeting_Night_1">夜は静かです! o(*￣▽￣*)ブ</x:String>
5857
<x:String x:Key="Text_Greeting_Night_2">夜遅く、早く休む</x:String>
5958
<x:String x:Key="Text_Greeting_Night_3">明日はいい日になる!</x:String>
60-
<!--NightEnd-->
59+
<!-- NightEnd -->
6160

62-
<!--GreetingEnd-->
61+
<!-- GreetingEnd -->
6362

6463
<x:String x:Key="Text_MainWindow_NavigationView_Home">表紙</x:String>
6564
<x:String x:Key="Text_MainWindow_NavigationView_Lib">庫</x:String>
@@ -117,21 +116,23 @@
117116

118117
<x:String x:Key="Text_Device_No">ネットワーク上に他のデバイスがない</x:String>
119118
<x:String x:Key="Text_Device_This">この装置</x:String>
119+
<x:String x:Key="Text_Device_Type_Slave">Slave</x:String>
120+
<x:String x:Key="Text_Device_Type_Master">Master</x:String>
120121
<x:String x:Key="Text_Device_Resources_CPU">CPU</x:String>
121122
<x:String x:Key="Text_Device_Resources_RAM">メモリー</x:String>
122123
<x:String x:Key="Text_Device_Resources_NET">通信網</x:String>
123124
<x:String x:Key="Text_Device_Tip_Detected">台のデバイスが検出されました</x:String>
124125
<x:String x:Key="Text_Device_PluginsCount">利用可能なプラグインの数:</x:String>
125126

126-
127+
127128
<x:String x:Key="Text_Settings_General">ユニバーサル</x:String>
128129
<x:String x:Key="Text_Settings_General_LocalPluginsFileDirectory">ローカル プラグイン ディレクトリ</x:String>
129130
<x:String x:Key="Text_Settings_General_LocalPluginsDataDirectory">ローカル プラグイン データ ディレクトリ</x:String>
130131
<x:String x:Key="Text_Settings_General_DeveloperSetting">開発者向けオプション</x:String>
131132
<x:String x:Key="Text_Settings_General_ShowAnnouncement">起動時にアナウンスを表示</x:String>
132133
<x:String x:Key="Text_Settings_General_ShowAnnouncementNow">最新のお知らせを見る</x:String>
133-
134-
134+
135+
135136
<x:String x:Key="Text_Settings_Personalise">パーソナライズ</x:String>
136137
<x:String x:Key="Text_Settings_Personalise_DisplayLanguage">表示言語</x:String>
137138
<x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica 効果</x:String>
@@ -145,7 +146,7 @@
145146
<x:String x:Key="Text_Settings_Personalise_Theme_HighContrast">ハイコントラスト</x:String>
146147
<x:String x:Key="Text_Settings_Personalise_Theme_Follow">システムに従ってください</x:String>
147148

148-
149+
149150
<x:String x:Key="Text_Settings_Performence">パフォーマンス</x:String>
150151
<x:String x:Key="Text_Settings_Performence_Web_Port">ポート</x:String>
151152
<x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">ネイティブ IP フィルタリング ルール</x:String>
@@ -160,8 +161,7 @@
160161
<x:String x:Key="Text_Settings_Update">更新する</x:String>
161162
<x:String x:Key="Text_Settings_Update_Check">アップデートを確認</x:String>
162163
<x:String x:Key="Text_Settings_Update_ComponentName">コンポーネント名</x:String>
163-
<x:String x:Key="Text_Settings_Update_ComponentMD5">MD5</x:String>
164-
<x:String x:Key="Text_Settings_Update_ComponentSHA1">SHA1</x:String>
164+
<x:String x:Key="Text_Settings_Update_ComponentHash">チェック値</x:String>
165165
<x:String x:Key="Text_Settings_Update_ComponentUpdatable">新しい！</x:String>
166166
<x:String x:Key="Text_Settings_Update_ComponentsCount">見つかった</x:String>
167167

0 commit comments

Comments
 (0)