From e2d2829ce94c81ad5c36e0fc59cac63438520d67 Mon Sep 17 00:00:00 2001 From: MichaelTheShifter Date: Wed, 25 May 2016 08:46:57 -0400 Subject: [PATCH] Deleted more unused resources, fixed upgrade issue with GNOME2-like elements --- .../Properties/Resources.Designer.cs | 40 -------------- .../Properties/Resources.resx | 12 ----- .../ShiftOSDesktop.cs | 54 ++++++++++--------- 3 files changed, 28 insertions(+), 78 deletions(-) diff --git a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs index 83f2083..71beb06 100644 --- a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs +++ b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs @@ -109,46 +109,6 @@ internal static System.Drawing.Bitmap anycolourshade4 { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap appscapeaudioplayerbox { - get { - object obj = ResourceManager.GetObject("appscapeaudioplayerbox", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap appscapeaudioplayerprice { - get { - object obj = ResourceManager.GetObject("appscapeaudioplayerprice", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap appscapeaudioplayerpricepressed { - get { - object obj = ResourceManager.GetObject("appscapeaudioplayerpricepressed", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap appscapecalculator { - get { - object obj = ResourceManager.GetObject("appscapecalculator", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/source/WindowsFormsApplication1/Properties/Resources.resx b/source/WindowsFormsApplication1/Properties/Resources.resx index c011a49..d2f0adf 100644 --- a/source/WindowsFormsApplication1/Properties/Resources.resx +++ b/source/WindowsFormsApplication1/Properties/Resources.resx @@ -142,9 +142,6 @@ ..\Resources\upgradealshiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\appscapeaudioplayerpricepressed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\crash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,9 +166,6 @@ ..\Resources\upgradeyellowshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\appscapeaudioplayerprice.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\upgradegrayshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -511,9 +505,6 @@ ..\Resources\ArtPadlinetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\appscapecalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\3beepvirus.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -991,9 +982,6 @@ ..\Resources\floodgateicn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\appscapeaudioplayerbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\downloadmanagericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/source/WindowsFormsApplication1/ShiftOSDesktop.cs b/source/WindowsFormsApplication1/ShiftOSDesktop.cs index 3dcb156..365494d 100644 --- a/source/WindowsFormsApplication1/ShiftOSDesktop.cs +++ b/source/WindowsFormsApplication1/ShiftOSDesktop.cs @@ -735,8 +735,8 @@ public void SetupGNOME2Elements() { this.ContextMenuStrip = cmbdesktopoptions; NewToolStripMenuItem.Visible = API.Upgrades["desktopicons"]; - addDesktopPanelToolStripMenuItem.Visible = API.Upgrades["desktoppanel"]; - //addDesktopPanelToolStripMenuItem.Visible = API.Upgrades["midgamebridge"]; //Uncomment when mid game bridge sequence finished. + addDesktopPanelToolStripMenuItem.Visible = API.Upgrades["advanceddesktop"]; + widgetManagerToolStripMenuItem.Visible = API.Upgrades["advanceddesktop"]; //Uncomment when mid game bridge sequence finished. } @@ -770,36 +770,38 @@ public void SetupGNOME2Elements() } }; wlocmenu.DropDownItems.Clear(); - foreach (var p in DesktopPanels) + if (API.Upgrades["advanceddesktop"]) { - var dp = (Skinning.DesktopPanel)p.Tag; - p.ContextMenuStrip = cbdpanel; - var itm = new ToolStripMenuItem(); - itm.Text = dp.Position; - wlocmenu.DropDownItems.Add(itm); - itm.Click += (object s, EventArgs a) => + foreach (var p in DesktopPanels) { - if (SelectedObject != null) + var dp = (Skinning.DesktopPanel)p.Tag; + p.ContextMenuStrip = cbdpanel; + var itm = new ToolStripMenuItem(); + itm.Text = dp.Position; + wlocmenu.DropDownItems.Add(itm); + itm.Click += (object s, EventArgs a) => { - if (SelectedObject == AppLauncherPanel) + if (SelectedObject != null) { - API.CurrentSkin.ALPosition = itm.Text; + if (SelectedObject == AppLauncherPanel) + { + API.CurrentSkin.ALPosition = itm.Text; + } + else if (SelectedObject == Clock) + { + API.CurrentSkin.ClockPosition = itm.Text; + } + else if (SelectedObject == PanelButtonHolder) + { + API.CurrentSkin.PanelButtonPosition = itm.Text; + } + SelectedObject.Parent.Controls.Remove(SelectedObject); + SetupDesktopPanel(); + Skinning.Utilities.saveskin(); } - else if (SelectedObject == Clock) - { - API.CurrentSkin.ClockPosition = itm.Text; - } - else if (SelectedObject == PanelButtonHolder) - { - API.CurrentSkin.PanelButtonPosition = itm.Text; - } - SelectedObject.Parent.Controls.Remove(SelectedObject); - SetupDesktopPanel(); - Skinning.Utilities.saveskin(); - } - }; + }; + } } - } public void SetupPanelClock()