📦 Struct: Change projects names and adapt resources path.

Crequency · Jul 26, 2023 · 587cfd0 · 587cfd0
1 parent fa47fa8
commit 587cfd0
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/KitX Dashboard Assets/KitX.Assets.csproj → ...board Assets/KitX.Dashboard.Assets.csproj b/KitX Dashboard Assets/KitX.Assets.csproj → ...board Assets/KitX.Dashboard.Assets.csproj
diff --git a/KitX Dashboard Fonts/KitX.Fonts.csproj → ...shboard Fonts/KitX.Dashboard.Fonts.csproj b/KitX Dashboard Fonts/KitX.Fonts.csproj → ...shboard Fonts/KitX.Dashboard.Fonts.csproj
diff --git a/...hboard Repair Tool/KitX.RepairTool.csproj → ...air Tool/KitX.Dashboard.RepairTool.csproj b/...hboard Repair Tool/KitX.RepairTool.csproj → ...air Tool/KitX.Dashboard.RepairTool.csproj
diff --git a/KitX Dashboard Updater/KitX.Updater.csproj → ...ard Updater/KitX.Dashboard.Updater.csproj b/KitX Dashboard Updater/KitX.Updater.csproj → ...ard Updater/KitX.Dashboard.Updater.csproj
diff --git a/KitX Dashboard/App.axaml b/KitX Dashboard/App.axaml
@@ -30,8 +30,8 @@
             <SolidColorBrush x:Key="ThemePrimaryAccentTransparent22" Color="#223873D9"/>
             <SolidColorBrush x:Key="ThemePrimaryAccentTransparent11" Color="#113873D9"/>
 
-            <FontFamily x:Key="SarasaMonoCL">avares://KitX.Fonts/sarasa-mono-cl-regular.ttf#Sarasa Mono CL</FontFamily>
-            <FontFamily x:Key="SourceHanSans">avares://KitX.Fonts/SourceHanSans-VF.ttf#Source Han Sans VF</FontFamily>
+            <FontFamily x:Key="SarasaMonoCL">avares://KitX.Dashboard.Fonts/sarasa-mono-cl-regular.ttf#Sarasa Mono CL</FontFamily>
+            <FontFamily x:Key="SourceHanSans">avares://KitX.Dashboard.Fonts/SourceHanSans-VF.ttf#Source Han Sans VF</FontFamily>
         </ResourceDictionary>
     </Application.Resources>
 

diff --git a/KitX Dashboard/KitX Dashboard.csproj → KitX Dashboard/KitX.Dashboard.csproj b/KitX Dashboard/KitX Dashboard.csproj → KitX Dashboard/KitX.Dashboard.csproj
@@ -93,7 +93,7 @@
         <PackageReference Include="Common.ExternalConsole" Version="1.0.6446.288" Condition="$(Is2Publish) == 'False'" />
         <PackageReference Include="Common.Update.Checker" Version="1.0.1.3" />
         <PackageReference Include="FluentAvaloniaUI" Version="1.4.5" />
-        <PackageReference Include="KitX.KXP.Helper" Version="22.4.6351.975" />
+        <!--<PackageReference Include="KitX.KXP.Helper" Version="22.4.6351.975" />-->
         <PackageReference Include="KitX.Web.Rules" Version="22.4.6351.974" />
         <PackageReference Include="LiteDB" Version="5.0.16" />
         <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.701" />
@@ -107,9 +107,10 @@
         <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\KitX Dashboard Assets\KitX.Assets.csproj" />
-        <ProjectReference Include="..\KitX Dashboard Fonts\KitX.Fonts.csproj" />
-        <ProjectReference Include="..\..\..\KitX Standard\KitX File Formats\KitX.KXP.Helper\KitX.KXP.Helper.csproj" />
+        <ProjectReference Include="..\KitX Dashboard Assets\KitX.Dashboard.Assets.csproj" />
+        <ProjectReference Include="..\KitX Dashboard Fonts\KitX.Dashboard.Fonts.csproj" />
+        <ProjectReference Include="..\KitX Dashboard Updater\KitX.Dashboard.Updater.csproj" />
+        <ProjectReference Include="..\..\..\KitX Standard\KitX File Formats\KitX.File.Format.KXP\KitX.File.Format.KXP.csproj" />
         <ProjectReference Include="..\..\..\KitX Standard\KitX Rules\KitX.Web.Rules\KitX.Web.Rules.csproj" />
         <ProjectReference Include="..\..\..\Reference\Common.Activity\Common.Activity\Common.Activity.csproj" />
         <ProjectReference Include="..\..\..\Reference\Common.Algorithm\Common.Algorithm.Interop\Common.Algorithm.Interop.csproj" />

diff --git a/KitX Dashboard/Views/AnouncementsWindow.axaml b/KitX Dashboard/Views/AnouncementsWindow.axaml
@@ -14,7 +14,7 @@
         MinHeight="600"
         d:DesignHeight="450"
         d:DesignWidth="800"
-        Icon="avares://KitX.Assets/KitX-Icon-32x32.png"
+        Icon="avares://KitX.Dashboard.Assets/KitX-Icon-32x32.png"
         mc:Ignorable="d">
     <Grid>
         <ui:NavigationView IsBackButtonVisible="False"

diff --git a/KitX Dashboard/Views/MainWindow.axaml b/KitX Dashboard/Views/MainWindow.axaml
@@ -15,7 +15,7 @@
         d:DesignWidth="800"
         FontFamily="{StaticResource SourceHanSans}"
         FontWeight="Bold"
-        Icon="avares://KitX.Assets/KitX-Icon-32x32.png"
+        Icon="avares://KitX.Dashboard.Assets/KitX-Icon-32x32.png"
         mc:Ignorable="d">
 
     <Window.Styles>
@@ -40,7 +40,7 @@
             <TrayIcon x:Key="TrayIcon"
                       Command="{Binding TrayIconClickedCommand}"
                       CommandParameter="{DynamicResource MainWindow}"
-                      Icon="resm:KitX_Dashboard.Assets.KitX-Icon-256x256.ico"
+                      Icon="resm:KitX.Dashboard.Assets.KitX-Icon-256x256.ico"
                       IsVisible="True"
                       ToolTipText="{Binding TrayIconText}">
                 <TrayIcon.Menu>

diff --git a/KitX Dashboard/Views/Pages/Controls/Settings_About.axaml b/KitX Dashboard/Views/Pages/Controls/Settings_About.axaml
@@ -21,7 +21,7 @@
                     <Image Width="128"
                            Height="128"
                            Margin="20"
-                           Source="avares://KitX.Assets/KitX-Icon-1920x-margin-2x.png"/>
+                           Source="avares://KitX.Dashboard.Assets/KitX-Icon-1920x-margin-2x.png"/>
                 </Button>
 
                 <Button Width="110"

diff --git a/KitX Dashboard/Views/PluginDetailWindow.axaml b/KitX Dashboard/Views/PluginDetailWindow.axaml
@@ -12,7 +12,7 @@
         d:DesignWidth="800"
         Background="Transparent"
         ExtendClientAreaToDecorationsHint="True"
-        Icon="avares://KitX.Assets/KitX-Icon-32x32.png"
+        Icon="avares://KitX.Dashboard.Assets/KitX-Icon-32x32.png"
         TransparencyLevelHint="AcrylicBlur"
         mc:Ignorable="d">
 

diff --git a/KitX Dashboard/Views/PluginsLaunchWindow.axaml b/KitX Dashboard/Views/PluginsLaunchWindow.axaml
@@ -10,7 +10,7 @@
         d:DesignWidth="800"
         Background="Transparent"
         ExtendClientAreaToDecorationsHint="True"
-        Icon="avares://KitX.Assets/KitX-Icon-32x32.png"
+        Icon="avares://KitX.Dashboard.Assets/KitX-Icon-32x32.png"
         KeyDown="PluginsLaunchWindow_KeyDown"
         PointerPressed="PluginsLaunchWindow_PointerPressed"
         Topmost="True"