diff --git a/ModpackUpdater.Apps.Client/Form1.Designer.cs b/ModpackUpdater.Apps.Client/Form1.Designer.cs
index 7de264d..9a03e67 100644
--- a/ModpackUpdater.Apps.Client/Form1.Designer.cs
+++ b/ModpackUpdater.Apps.Client/Form1.Designer.cs
@@ -3,7 +3,7 @@ using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
-namespace ModpackUpdater
+namespace ModpackUpdater.Apps.Client
{
[Microsoft.VisualBasic.CompilerServices.DesignerGenerated()]
diff --git a/ModpackUpdater.Apps.Client/Form1.cs b/ModpackUpdater.Apps.Client/Form1.cs
index 1e90c0e..5be97f5 100644
--- a/ModpackUpdater.Apps.Client/Form1.cs
+++ b/ModpackUpdater.Apps.Client/Form1.cs
@@ -1,14 +1,12 @@
-using ModpackUpdater.Apps.Client;
-using ModpackUpdater.Manager;
+using ModpackUpdater.Manager;
using ModpackUpdater.My.Resources;
using Pilz.UI.Symbols;
-using Pilz.UI.Telerik;
using System.Diagnostics;
using System.Reflection;
using Telerik.WinControls;
using Telerik.WinControls.UI;
-namespace ModpackUpdater;
+namespace ModpackUpdater.Apps.Client;
public partial class Form1
{
@@ -35,12 +33,12 @@ public partial class Form1
Text = $"{Text} (v{Assembly.GetExecutingAssembly().GetName().Version})";
- RadButton_Install.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small);
- RadButton_CheckForUpdates.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.update_done, SymbolSize.Small);
- radButton_RefreshConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.refresh, SymbolSize.Small);
- RadButton_SearchMinecraftProfileFolder.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.opened_folder, SymbolSize.Small);
- radButton_PasteInstallKey.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.paste, SymbolSize.Small);
- RadButton_PasteModpackConfig.SvgImage = AppSymbolFactory.Instance.GetSvgImage(AppSymbols.paste, SymbolSize.Small);
+ RadButton_Install.SvgImage = AppGlobals.Symbols.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small);
+ RadButton_CheckForUpdates.SvgImage = AppGlobals.Symbols.GetSvgImage(AppSymbols.update_done, SymbolSize.Small);
+ radButton_RefreshConfig.SvgImage = AppGlobals.Symbols.GetSvgImage(AppSymbols.refresh, SymbolSize.Small);
+ RadButton_SearchMinecraftProfileFolder.SvgImage = AppGlobals.Symbols.GetSvgImage(AppSymbols.opened_folder, SymbolSize.Small);
+ radButton_PasteInstallKey.SvgImage = AppGlobals.Symbols.GetSvgImage(AppSymbols.paste, SymbolSize.Small);
+ RadButton_PasteModpackConfig.SvgImage = AppGlobals.Symbols.GetSvgImage(AppSymbols.paste, SymbolSize.Small);
}
private void LoadMinecraftProfile(string folderPath)
@@ -108,7 +106,7 @@ public partial class Form1
if (modpackInfo == null || string.IsNullOrWhiteSpace(RadTextBoxControl_MinecraftProfileFolder.Text) /*|| modpackInfo.Valid*/)
{
- SetStatus(LangRes.StatusText_MinecraftProfileWarning, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.general_warning_sign, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_MinecraftProfileWarning, AppGlobals.Symbols.GetSvgImage(AppSymbols.general_warning_sign, SymbolSize.Small));
RadButton_PasteModpackConfig.Enabled = false;
radButton_PasteInstallKey.Enabled = false;
RadButton_CheckForUpdates.Enabled = false;
@@ -117,7 +115,7 @@ public partial class Form1
}
else if (updateConfig == null || string.IsNullOrWhiteSpace(RadTextBoxControl_ModpackConfig.Text))
{
- SetStatus(LangRes.StatusText_ConfigIncompleteOrNotLoaded, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.general_warning_sign, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_ConfigIncompleteOrNotLoaded, AppGlobals.Symbols.GetSvgImage(AppSymbols.general_warning_sign, SymbolSize.Small));
RadButton_PasteModpackConfig.Enabled = true;
radButton_PasteInstallKey.Enabled = false;
RadButton_CheckForUpdates.Enabled = false;
@@ -126,7 +124,7 @@ public partial class Form1
}
else if (updateConfig.Maintenance && !updateOptions.IgnoreMaintenance)
{
- SetStatus(LangRes.StatusText_Maintenance, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.services, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_Maintenance, AppGlobals.Symbols.GetSvgImage(AppSymbols.services, SymbolSize.Small));
RadButton_PasteModpackConfig.Enabled = true;
radButton_PasteInstallKey.Enabled = true;
RadButton_CheckForUpdates.Enabled = false;
@@ -149,28 +147,28 @@ public partial class Form1
void error()
{
- SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.close, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_ErrorWhileUpdateCheckOrUpdate, AppGlobals.Symbols.GetSvgImage(AppSymbols.close, SymbolSize.Small));
currentUpdating = false;
}
void installing()
{
- SetStatus(LangRes.StatusText_Installing, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_Installing, AppGlobals.Symbols.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
currentUpdating = true;
}
void updatesAvailable()
{
- SetStatus(LangRes.StatusText_UpdateAvailable, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_UpdateAvailable, AppGlobals.Symbols.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
}
void everythingOk()
{
- SetStatus(LangRes.StatusTest_EverythingOk, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.done, SymbolSize.Small));
+ SetStatus(LangRes.StatusTest_EverythingOk, AppGlobals.Symbols.GetSvgImage(AppSymbols.done, SymbolSize.Small));
currentUpdating = false;
}
// Check only if not pressed "install", not really needed otherwise.
if (lastUpdateCheckResult is null || !doInstall)
{
- SetStatus(LangRes.StatusText_CheckingForUpdates, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.update_done, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_CheckingForUpdates, AppGlobals.Symbols.GetSvgImage(AppSymbols.update_done, SymbolSize.Small));
// Check for extras once again
updateOptions.IncludeExtras = features.IsEnabled(ModpackFeatures.FeatureAllowExtas, new AllowExtrasFeatureContext(modpackInfo));
@@ -239,12 +237,12 @@ public partial class Form1
private void Update_InstallProgessUpdated(UpdateCheckResult result, int processedSyncs)
{
int actionCount = result.Actions.Count;
- SetStatus(Math.Round(processedSyncs / (double)actionCount * 100d, 1) + "%", AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
+ SetStatus(Math.Round(processedSyncs / (double)actionCount * 100d, 1) + "%", AppGlobals.Symbols.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
}
private void Updated_CheckingProgresssUpdated(int toCheck, int processed)
{
- SetStatus(Math.Round(processed / (double)toCheck * 100d, 1) + "%", AppSymbolFactory.Instance.GetSvgImage(AppSymbols.update_done, SymbolSize.Small));
+ SetStatus(Math.Round(processed / (double)toCheck * 100d, 1) + "%", AppGlobals.Symbols.GetSvgImage(AppSymbols.update_done, SymbolSize.Small));
}
private void ButtonX_SearchMinecraftProfile_Click(object sender, EventArgs e)
@@ -300,7 +298,7 @@ public partial class Form1
var updater = new AppUpdater();
if (!updateOptions.NoUpdate && await updater.Check() && RadMessageBox.Show(LangRes.MsgBox_UpdateAvailable, LangRes.MsgBox_UpdateAvailable_Title, MessageBoxButtons.YesNo, RadMessageIcon.Info) == DialogResult.Yes)
{
- SetStatus(LangRes.StatusText_InstallingAppUpdate, AppSymbolFactory.Instance.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
+ SetStatus(LangRes.StatusText_InstallingAppUpdate, AppGlobals.Symbols.GetSvgImage(AppSymbols.software_installer, SymbolSize.Small));
Enabled = false;
await updater.Install();
Application.Restart();
diff --git a/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj b/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj
index 2df3ab1..921995d 100644
--- a/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj
+++ b/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj
@@ -11,14 +11,6 @@
1.5.2.2
-
-
-
-
-
-
-
-
True
@@ -57,12 +49,9 @@
+
-
-
-
-
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Client/Program.cs b/ModpackUpdater.Apps.Client/Program.cs
index 2bf06ca..3d73ffa 100644
--- a/ModpackUpdater.Apps.Client/Program.cs
+++ b/ModpackUpdater.Apps.Client/Program.cs
@@ -44,8 +44,10 @@ public static class Program
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
+ AppGlobals.Initialize();
- if (ThemeResolutionService.LoadPackageResource("ModpackUpdater.CustomThemes.Office2019DarkBluePurple.tssp"))
+ // Keep old theme for now, it looks a bit better
+ if (ThemeResolutionService.LoadPackageResource($"{typeof(AppGlobals).Namespace}.CustomThemes.Office2019DarkBluePurple.tssp"))
ThemeResolutionService.ApplicationThemeName = "Office2019DarkBluePurple";
Application.Run(new Form1(updateOptions));
diff --git a/ModpackUpdater.Apps.Manager/Form1.Designer.cs b/ModpackUpdater.Apps.Manager/Form1.Designer.cs
index 84f0976..4fc193f 100644
--- a/ModpackUpdater.Apps.Manager/Form1.Designer.cs
+++ b/ModpackUpdater.Apps.Manager/Form1.Designer.cs
@@ -28,11 +28,77 @@ partial class Form1
///
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(800, 450);
- this.Text = "Form1";
+ radSplitContainer1 = new Telerik.WinControls.UI.RadSplitContainer();
+ splitPanel1 = new Telerik.WinControls.UI.SplitPanel();
+ splitPanel2 = new Telerik.WinControls.UI.SplitPanel();
+ ((System.ComponentModel.ISupportInitialize)radSplitContainer1).BeginInit();
+ radSplitContainer1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)splitPanel1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splitPanel2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)this).BeginInit();
+ SuspendLayout();
+ //
+ // radSplitContainer1
+ //
+ radSplitContainer1.Controls.Add(splitPanel1);
+ radSplitContainer1.Controls.Add(splitPanel2);
+ radSplitContainer1.Dock = DockStyle.Fill;
+ radSplitContainer1.Location = new Point(0, 0);
+ radSplitContainer1.Name = "radSplitContainer1";
+ //
+ //
+ //
+ radSplitContainer1.RootElement.MinSize = new Size(25, 25);
+ radSplitContainer1.Size = new Size(800, 450);
+ radSplitContainer1.TabIndex = 0;
+ radSplitContainer1.TabStop = false;
+ //
+ // splitPanel1
+ //
+ splitPanel1.Location = new Point(0, 0);
+ splitPanel1.Name = "splitPanel1";
+ //
+ //
+ //
+ splitPanel1.RootElement.MinSize = new Size(25, 25);
+ splitPanel1.Size = new Size(398, 450);
+ splitPanel1.TabIndex = 0;
+ splitPanel1.TabStop = false;
+ splitPanel1.Text = "splitPanel1";
+ //
+ // splitPanel2
+ //
+ splitPanel2.Location = new Point(402, 0);
+ splitPanel2.Name = "splitPanel2";
+ //
+ //
+ //
+ splitPanel2.RootElement.MinSize = new Size(25, 25);
+ splitPanel2.Size = new Size(398, 450);
+ splitPanel2.TabIndex = 1;
+ splitPanel2.TabStop = false;
+ splitPanel2.Text = "splitPanel2";
+ //
+ // Form1
+ //
+ AutoScaleBaseSize = new Size(7, 15);
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(800, 450);
+ Controls.Add(radSplitContainer1);
+ Name = "Form1";
+ Text = "Form1";
+ ((System.ComponentModel.ISupportInitialize)radSplitContainer1).EndInit();
+ radSplitContainer1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)splitPanel1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splitPanel2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)this).EndInit();
+ ResumeLayout(false);
}
#endregion
+
+ private Telerik.WinControls.UI.RadSplitContainer radSplitContainer1;
+ private Telerik.WinControls.UI.SplitPanel splitPanel1;
+ private Telerik.WinControls.UI.SplitPanel splitPanel2;
}
diff --git a/ModpackUpdater.Apps.Manager/Form1.resx b/ModpackUpdater.Apps.Manager/Form1.resx
index 1af7de1..8b2ff64 100644
--- a/ModpackUpdater.Apps.Manager/Form1.resx
+++ b/ModpackUpdater.Apps.Manager/Form1.resx
@@ -1,17 +1,17 @@
-
diff --git a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
index d28b3f7..10afc38 100644
--- a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
+++ b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
@@ -9,7 +9,14 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/Program.cs b/ModpackUpdater.Apps.Manager/Program.cs
index 275204a..fdb001e 100644
--- a/ModpackUpdater.Apps.Manager/Program.cs
+++ b/ModpackUpdater.Apps.Manager/Program.cs
@@ -11,6 +11,7 @@ internal static class Program
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
+ AppGlobals.Initialize();
Application.Run(new Form1());
}
}
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/app.config b/ModpackUpdater.Apps.Manager/app.config
new file mode 100644
index 0000000..61807c2
--- /dev/null
+++ b/ModpackUpdater.Apps.Manager/app.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps/AppGlobals.cs b/ModpackUpdater.Apps/AppGlobals.cs
new file mode 100644
index 0000000..3c7fa85
--- /dev/null
+++ b/ModpackUpdater.Apps/AppGlobals.cs
@@ -0,0 +1,17 @@
+using Pilz.UI.Telerik.Symbols;
+using Pilz.UI.Telerik.Theming;
+using Telerik.WinControls.Themes;
+
+namespace ModpackUpdater.Apps;
+
+public static class AppGlobals
+{
+ public static IRadSymbolFactory Symbols { get; } = new AppSymbolFactory();
+
+ public static void Initialize()
+ {
+ ThemeHelper.ApplyApplicationTheme(ApplicationTheme.Auto,
+ () => new Windows11CompactTheme(),
+ () => new Windows11CompactDarkTheme());
+ }
+}
diff --git a/ModpackUpdater.Apps.Client/AppSymbolFactory.cs b/ModpackUpdater.Apps/AppSymbolFactory.cs
similarity index 64%
rename from ModpackUpdater.Apps.Client/AppSymbolFactory.cs
rename to ModpackUpdater.Apps/AppSymbolFactory.cs
index 065d3c5..b61b8bf 100644
--- a/ModpackUpdater.Apps.Client/AppSymbolFactory.cs
+++ b/ModpackUpdater.Apps/AppSymbolFactory.cs
@@ -2,12 +2,10 @@
using Pilz.UI.Telerik.Symbols;
using System.Reflection;
-namespace ModpackUpdater.Apps.Client;
+namespace ModpackUpdater.Apps;
-public class AppSymbolFactory : RadSymbolFactory
+internal class AppSymbolFactory : RadSymbolFactory
{
- public static IRadSymbolFactory Instance { get; } = new AppSymbolFactory();
-
public override Assembly GetImageResourceAssembly()
{
return Assembly.GetExecutingAssembly();
diff --git a/ModpackUpdater.Apps.Client/AppSymbols.cs b/ModpackUpdater.Apps/AppSymbols.cs
similarity index 86%
rename from ModpackUpdater.Apps.Client/AppSymbols.cs
rename to ModpackUpdater.Apps/AppSymbols.cs
index 44341ee..11df4bd 100644
--- a/ModpackUpdater.Apps.Client/AppSymbols.cs
+++ b/ModpackUpdater.Apps/AppSymbols.cs
@@ -1,4 +1,4 @@
-namespace ModpackUpdater.Apps.Client;
+namespace ModpackUpdater.Apps;
public enum AppSymbols
{
diff --git a/ModpackUpdater.Apps.Client/CustomThemes/Office2019Dark Theme Color Palette.png b/ModpackUpdater.Apps/CustomThemes/Office2019Dark Theme Color Palette.png
similarity index 100%
rename from ModpackUpdater.Apps.Client/CustomThemes/Office2019Dark Theme Color Palette.png
rename to ModpackUpdater.Apps/CustomThemes/Office2019Dark Theme Color Palette.png
diff --git a/ModpackUpdater.Apps.Client/CustomThemes/Office2019DarkBluePurple.tssp b/ModpackUpdater.Apps/CustomThemes/Office2019DarkBluePurple.tssp
similarity index 100%
rename from ModpackUpdater.Apps.Client/CustomThemes/Office2019DarkBluePurple.tssp
rename to ModpackUpdater.Apps/CustomThemes/Office2019DarkBluePurple.tssp
diff --git a/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
new file mode 100644
index 0000000..8d90e5d
--- /dev/null
+++ b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
@@ -0,0 +1,54 @@
+
+
+
+ net8.0-windows
+ enable
+ true
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ModpackUpdater.Apps.Client/Symbols/checkmark.svg b/ModpackUpdater.Apps/Symbols/checkmark.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/checkmark.svg
rename to ModpackUpdater.Apps/Symbols/checkmark.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/close.svg b/ModpackUpdater.Apps/Symbols/close.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/close.svg
rename to ModpackUpdater.Apps/Symbols/close.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/delete.svg b/ModpackUpdater.Apps/Symbols/delete.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/delete.svg
rename to ModpackUpdater.Apps/Symbols/delete.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/done.svg b/ModpackUpdater.Apps/Symbols/done.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/done.svg
rename to ModpackUpdater.Apps/Symbols/done.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/download_from_ftp.svg b/ModpackUpdater.Apps/Symbols/download_from_ftp.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/download_from_ftp.svg
rename to ModpackUpdater.Apps/Symbols/download_from_ftp.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/general_warning_sign.svg b/ModpackUpdater.Apps/Symbols/general_warning_sign.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/general_warning_sign.svg
rename to ModpackUpdater.Apps/Symbols/general_warning_sign.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/opened_folder.svg b/ModpackUpdater.Apps/Symbols/opened_folder.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/opened_folder.svg
rename to ModpackUpdater.Apps/Symbols/opened_folder.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/paste.svg b/ModpackUpdater.Apps/Symbols/paste.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/paste.svg
rename to ModpackUpdater.Apps/Symbols/paste.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/refresh.svg b/ModpackUpdater.Apps/Symbols/refresh.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/refresh.svg
rename to ModpackUpdater.Apps/Symbols/refresh.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/replay.svg b/ModpackUpdater.Apps/Symbols/replay.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/replay.svg
rename to ModpackUpdater.Apps/Symbols/replay.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/save.svg b/ModpackUpdater.Apps/Symbols/save.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/save.svg
rename to ModpackUpdater.Apps/Symbols/save.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/services.svg b/ModpackUpdater.Apps/Symbols/services.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/services.svg
rename to ModpackUpdater.Apps/Symbols/services.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/software_installer.svg b/ModpackUpdater.Apps/Symbols/software_installer.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/software_installer.svg
rename to ModpackUpdater.Apps/Symbols/software_installer.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/update_done.svg b/ModpackUpdater.Apps/Symbols/update_done.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/update_done.svg
rename to ModpackUpdater.Apps/Symbols/update_done.svg
diff --git a/ModpackUpdater.Apps.Client/Symbols/wrench.svg b/ModpackUpdater.Apps/Symbols/wrench.svg
similarity index 100%
rename from ModpackUpdater.Apps.Client/Symbols/wrench.svg
rename to ModpackUpdater.Apps/Symbols/wrench.svg
diff --git a/ModpackUpdater.sln b/ModpackUpdater.sln
index e37a74e..86b5219 100644
--- a/ModpackUpdater.sln
+++ b/ModpackUpdater.sln
@@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{96B711FA-1
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModpackUpdater.Apps.Manager", "ModpackUpdater.Apps.Manager\ModpackUpdater.Apps.Manager.csproj", "{227A37AA-73F0-431D-B976-B9B3A8ADD8C2}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModpackUpdater.Apps", "ModpackUpdater.Apps\ModpackUpdater.Apps.csproj", "{EF2EAFAF-01CD-46BD-BE45-0125B51316A4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -37,6 +39,10 @@ Global
{227A37AA-73F0-431D-B976-B9B3A8ADD8C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{227A37AA-73F0-431D-B976-B9B3A8ADD8C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{227A37AA-73F0-431D-B976-B9B3A8ADD8C2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EF2EAFAF-01CD-46BD-BE45-0125B51316A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EF2EAFAF-01CD-46BD-BE45-0125B51316A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EF2EAFAF-01CD-46BD-BE45-0125B51316A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EF2EAFAF-01CD-46BD-BE45-0125B51316A4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -46,6 +52,7 @@ Global
{0E6B6470-8C1D-0CDD-3681-461297A01960} = {96B711FA-1AF2-469B-BC02-6D1E540E8E9D}
{D3A92EBD-FF6E-09D0-00A1-20221AAA198E} = {96B711FA-1AF2-469B-BC02-6D1E540E8E9D}
{227A37AA-73F0-431D-B976-B9B3A8ADD8C2} = {743892CF-E482-4FBD-9BAB-02920C140F2B}
+ {EF2EAFAF-01CD-46BD-BE45-0125B51316A4} = {743892CF-E482-4FBD-9BAB-02920C140F2B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {322E6A6B-9F3E-4E88-8945-C98A9EF613BF}