aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/WindowsFormsApplication1/Properties/Resources.Designer.cs40
-rw-r--r--source/WindowsFormsApplication1/Properties/Resources.resx12
-rw-r--r--source/WindowsFormsApplication1/ShiftOSDesktop.cs56
3 files changed, 29 insertions, 79 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
@@ -112,46 +112,6 @@ namespace ShiftOS.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static System.Drawing.Bitmap appscapeaudioplayerbox {
- get {
- object obj = ResourceManager.GetObject("appscapeaudioplayerbox", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- /// </summary>
- internal static System.Drawing.Bitmap appscapeaudioplayerprice {
- get {
- object obj = ResourceManager.GetObject("appscapeaudioplayerprice", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- /// </summary>
- internal static System.Drawing.Bitmap appscapeaudioplayerpricepressed {
- get {
- object obj = ResourceManager.GetObject("appscapeaudioplayerpricepressed", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- /// </summary>
- internal static System.Drawing.Bitmap appscapecalculator {
- get {
- object obj = ResourceManager.GetObject("appscapecalculator", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- /// </summary>
internal static System.Drawing.Bitmap ArtPadcirclerubber {
get {
object obj = ResourceManager.GetObject("ArtPadcirclerubber", resourceCulture);
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 @@
<data name="upgradealshiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\upgradealshiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="appscapeaudioplayerpricepressed" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\appscapeaudioplayerpricepressed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="crash" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -169,9 +166,6 @@
<data name="upgradeyellowshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\upgradeyellowshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="appscapeaudioplayerprice" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\appscapeaudioplayerprice.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="upgradegrayshades" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\upgradegrayshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -511,9 +505,6 @@
<data name="ArtPadlinetool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ArtPadlinetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="appscapecalculator" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\appscapecalculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="_3beepvirus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3beepvirus.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -991,9 +982,6 @@
<data name="floodgateicn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\floodgateicn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="appscapeaudioplayerbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\appscapeaudioplayerbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="downloadmanagericon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\downloadmanagericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
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 @@ namespace ShiftOS
{
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 @@ namespace ShiftOS
}
};
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) =>
- {
- if (SelectedObject != null)
+ foreach (var p in DesktopPanels)
+ {
+ 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)
- {
- API.CurrentSkin.ALPosition = itm.Text;
- }
- else if (SelectedObject == Clock)
- {
- API.CurrentSkin.ClockPosition = itm.Text;
- }
- else if (SelectedObject == PanelButtonHolder)
+ if (SelectedObject != null)
{
- API.CurrentSkin.PanelButtonPosition = 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();
}
- SelectedObject.Parent.Controls.Remove(SelectedObject);
- SetupDesktopPanel();
- Skinning.Utilities.saveskin();
- }
- };
+ };
+ }
}
-
}
public void SetupPanelClock()
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 04:20:52 +0000