Skip to content

Commit

Permalink
💾 Feat: Merge pull request #154 from Crequency/dev=main
Browse files Browse the repository at this point in the history 
[Pull Request] 一些 UI 更新
  • Loading branch information
@Dynesshely
Dynesshely authored Oct 2, 2022
2 parents 25f4249 + 574192c commit a109f4e
Show file tree
Hide file tree
Showing 9 changed files with 212 additions and 194 deletions.
83 changes: 23 additions & 60 deletions KitX Dashboard/KitX Dashboard.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,17 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<!--Avalonia doesn't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
<TrimMode>copyused</TrimMode>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationIcon>Assets\KitX-Icon-256x.ico</ApplicationIcon>
<!--<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>-->
<BaseOutputPath>..\KitX Build\Dashboard\</BaseOutputPath>
<BaseIntermediateOutputPath>..\KitX Build\Temp\Dashboard\</BaseIntermediateOutputPath>

<!--<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>
<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>
<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>-->

<AssemblyVersion>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</AssemblyVersion>
<FileVersion>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</FileVersion>
<Version>3.22.04.$([System.DateTime]::UtcNow.Date.Subtract($([System.DateTime]::Parse("2005-07-16"))).TotalDays)</Version>
</PropertyGroup>

<!--<PropertyGroup>
<IlcOptimizationPreference>Speed</IlcOptimizationPreference>
<IlcFoldIdenticalMethodBodies>true</IlcFoldIdenticalMethodBodies>
</PropertyGroup>
<ItemGroup>
<!--<ItemGroup>
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="6.0.0-*" />
</ItemGroup>-->

Expand Down Expand Up @@ -105,7 +94,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Assets\KitX-Icon.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Assets\ThirdPartLicense.md">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand All @@ -115,36 +104,32 @@
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Assets\KitX-Icon-128x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-16x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-256x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-32x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-48x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-64x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-128x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-16x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-256x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-32x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-48x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Assets\KitX-Icon-64x.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<!--This helps with theme dll-s trimming.
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.
https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
<TrimmableAssembly Include="Avalonia.Themes.Fluent" />
<TrimmableAssembly Include="Avalonia.Themes.Default" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.18" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.18" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
Expand All @@ -165,30 +150,8 @@
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\KitX Dashboard Helper\KitX.Fonts\KitX.Fonts.csproj" />
<ProjectReference Include="..\KitX File Format Helper\KitX.KXP.Helper\KitX.KXP.Helper.csproj" />
<ProjectReference Include="..\KitX Rules\KitX.Web.Rules\KitX.Web.Rules.csproj" />
<ProjectReference Include="..\KitX Dashboard Helper\KitX.Fonts\KitX.Fonts.csproj" />
<ProjectReference Include="..\KitX File Format Helper\KitX.KXP.Helper\KitX.KXP.Helper.csproj" />
<ProjectReference Include="..\KitX Rules\KitX.Web.Rules\KitX.Web.Rules.csproj" />
</ItemGroup>
<!--<ItemGroup>
<Compile Update="Views\AnouncementsWindow.axaml.cs">
<DependentUpon>AnouncementsWindow.axaml</DependentUpon>
</Compile>
<Compile Update="Views\Pages\Controls\DeviceCard.axaml.cs">
<DependentUpon>DeviceCard.axaml</DependentUpon>
</Compile>
<Compile Update="Views\Pages\Controls\Home_ActivityLog.axaml.cs">
<DependentUpon>Home_ActivityLog.axaml</DependentUpon>
</Compile>
<Compile Update="Views\Pages\Controls\Home_Count.axaml.cs">
<DependentUpon>Home_Count.axaml</DependentUpon>
</Compile>
<Compile Update="Views\Pages\Controls\Home_RecentUse.axaml.cs">
<DependentUpon>Home_RecentUse.axaml</DependentUpon>
</Compile>
</ItemGroup>-->
<ProjectExtensions>
<VisualStudio>
<UserProperties properties_4launchsettings_1json__JsonSchema="" />
</VisualStudio>
</ProjectExtensions>
</Project>
40 changes: 20 additions & 20 deletions KitX Dashboard/Languages/en-us.axaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<x:String x:Key="Text_MainWindow_Title">KitX Dashboard</x:String>


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


<!--GreetingStart-->
<!-- GreetingStart -->

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

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

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

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

<!--NightStart-->
<!-- NightStart -->
<x:String x:Key="Text_Greeting_Night_1">It's quiet at night! o(*￣▽￣*)ブ</x:String>
<x:String x:Key="Text_Greeting_Night_2">It's late at night, rest early~</x:String>
<x:String x:Key="Text_Greeting_Night_3">Tomorrow will be a good day!</x:String>
<!--NightEnd-->
<!-- NightEnd -->

<!-- GreetingEnd -->

<!--GreetingEnd-->

<x:String x:Key="Text_MainWindow_NavigationView_Home">Home</x:String>
<x:String x:Key="Text_MainWindow_NavigationView_Lib">Library</x:String>
<x:String x:Key="Text_MainWindow_NavigationView_Market">Market</x:String>
Expand Down Expand Up @@ -117,12 +116,14 @@

<x:String x:Key="Text_Device_No">No other devices in network.</x:String>
<x:String x:Key="Text_Device_This">This Device</x:String>
<x:String x:Key="Text_Device_Type_Slave">Slave</x:String>
<x:String x:Key="Text_Device_Type_Master">Master</x:String>
<x:String x:Key="Text_Device_Resources_CPU">CPU</x:String>
<x:String x:Key="Text_Device_Resources_RAM">RAM</x:String>
<x:String x:Key="Text_Device_Resources_NET">NET</x:String>
<x:String x:Key="Text_Device_Tip_Detected">Devices Detected.</x:String>
<x:String x:Key="Text_Device_PluginsCount">Enabled Plugins Count:</x:String>


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


<x:String x:Key="Text_Settings_Personalise">Personalise</x:String>
<x:String x:Key="Text_Settings_Personalise_DisplayLanguage">Display Language</x:String>
<x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica Effect</x:String>
Expand Down Expand Up @@ -160,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>

Expand Down
42 changes: 21 additions & 21 deletions KitX Dashboard/Languages/ja-jp.axaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- Add Resources Here -->
<x:String x:Key="Text_MainWindow_Title">KitX ダッシュボード</x:String>


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


<!--GreetingStart-->
<!-- GreetingStart -->

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

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

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

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

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

<!--GreetingEnd-->
<!-- GreetingEnd -->

<x:String x:Key="Text_MainWindow_NavigationView_Home">表紙</x:String>
<x:String x:Key="Text_MainWindow_NavigationView_Lib">庫</x:String>
Expand Down Expand Up @@ -117,21 +116,23 @@

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


<x:String x:Key="Text_Settings_General">ユニバーサル</x:String>
<x:String x:Key="Text_Settings_General_LocalPluginsFileDirectory">ローカル プラグイン ディレクトリ</x:String>
<x:String x:Key="Text_Settings_General_LocalPluginsDataDirectory">ローカル プラグイン データ ディレクトリ</x:String>
<x:String x:Key="Text_Settings_General_DeveloperSetting">開発者向けオプション</x:String>
<x:String x:Key="Text_Settings_General_ShowAnnouncement">起動時にアナウンスを表示</x:String>
<x:String x:Key="Text_Settings_General_ShowAnnouncementNow">最新のお知らせを見る</x:String>


<x:String x:Key="Text_Settings_Personalise">パーソナライズ</x:String>
<x:String x:Key="Text_Settings_Personalise_DisplayLanguage">表示言語</x:String>
<x:String x:Key="Text_Settings_Personalise_MicaEffect">Mica 効果</x:String>
Expand All @@ -145,7 +146,7 @@
<x:String x:Key="Text_Settings_Personalise_Theme_HighContrast">ハイコントラスト</x:String>
<x:String x:Key="Text_Settings_Personalise_Theme_Follow">システムに従ってください</x:String>


<x:String x:Key="Text_Settings_Performence">パフォーマンス</x:String>
<x:String x:Key="Text_Settings_Performence_Web_Port">ポート</x:String>
<x:String x:Key="Text_Settings_Performence_Web_MyIP_Filter">ネイティブ IP フィルタリング ルール</x:String>
Expand All @@ -160,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>

Expand Down
Loading

0 comments on commit a109f4e

Please sign in to comment.