aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-02-23 17:09:20 -0500
committerMichael <[email protected]>2017-02-23 17:09:25 -0500
commit45ed8faac0588802f3b04a39ba29393988247afb (patch)
tree8856c4d24905a328334bd2b5c31cb4820c359ec4
parentdcc9d72046266d2bb398252d4265ee87bfb75277 (diff)
downloadshiftos_thereturn-45ed8faac0588802f3b04a39ba29393988247afb.tar.gz
shiftos_thereturn-45ed8faac0588802f3b04a39ba29393988247afb.tar.bz2
shiftos_thereturn-45ed8faac0588802f3b04a39ba29393988247afb.zip
RGB 1,0,1 for desktop panel and applauncher BGs
-rw-r--r--ShiftOS.WinForms/Applications/MUDControlCentre.cs7
-rw-r--r--ShiftOS.WinForms/WinformsDesktop.cs4
2 files changed, 10 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
index 0d67776..6426562 100644
--- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs
+++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
@@ -873,7 +873,14 @@ Current legions: {legionname}";
{
if(second == true)
{
+ ServerManager.SendMessage("delete_save", JsonConvert.SerializeObject(new ClientSave
+ {
+ Username = SaveSystem.CurrentSave.Username,
+ Password = SaveSystem.CurrentSave.Password
+ }));
+
SaveSystem.CurrentSave = null;
+
ShiftOS.Objects.ShiftFS.Utils.Delete(Paths.GetPath("user.dat"));
TerminalBackend.InvokeCommand("sos.shutdown");
MessageBox.Show("Thank you for playing ShiftOS. Your save data has been deleted successfully. You can come back at anytime, but you will have to restart your game.");
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 7409040..8ca7969 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -250,8 +250,10 @@ namespace ShiftOS.WinForms
this.BackgroundImage = img;
}));
this.BackgroundImageLayout = GetImageLayout("desktopbackground");
- desktoppanel.BackgroundImage = GetImage("desktoppanel");
+ desktoppanel.BackgroundImage = ((Bitmap)GetImage("desktoppanel"));
+ ((Bitmap)desktoppanel.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
menuStrip1.BackgroundImage = GetImage("applauncher");
+ ((Bitmap)menuStrip1.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor;
lbtime.Font = LoadedSkin.DesktopPanelClockFont;
if (desktoppanel.BackgroundImage == null)