shiftos-archive/ShiftOS-C-
1
0
Fork 0
mirror of https://github.com/seriocomedy/ShiftOS-C-.git synced 2025-02-02 04:57:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deleted more unused resources, fixed upgrade issue with GNOME2-like elements

Browse source
This commit is contained in:
MichaelTheShifter 2016-05-25 08:46:57 -04:00
parent 4f05f2de01
commit e2d2829ce9
3 changed files with 28 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
source/WindowsFormsApplication1/Properties/Resources.Designer.cs generated
View file

@ -109,46 +109,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> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>

12
source/WindowsFormsApplication1/Properties/Resources.resx
View file

@ -142,9 +142,6 @@
<data name="upgradealshiftorium" type="System.Resources.ResXFileRef, System.Windows.Forms"> <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> <value>..\Resources\upgradealshiftorium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </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"> <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> <value>..\Resources\crash.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -169,9 +166,6 @@
<data name="upgradeyellowshadeset" type="System.Resources.ResXFileRef, System.Windows.Forms"> <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> <value>..\Resources\upgradeyellowshadeset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </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"> <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> <value>..\Resources\upgradegrayshades.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -511,9 +505,6 @@
<data name="ArtPadlinetool" type="System.Resources.ResXFileRef, System.Windows.Forms"> <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> <value>..\Resources\ArtPadlinetool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </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"> <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> <value>..\Resources\3beepvirus.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
@ -991,9 +982,6 @@
<data name="floodgateicn" type="System.Resources.ResXFileRef, System.Windows.Forms"> <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> <value>..\Resources\floodgateicn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </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"> <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> <value>..\Resources\downloadmanagericon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>

54
source/WindowsFormsApplication1/ShiftOSDesktop.cs
View file

@ -735,8 +735,8 @@ namespace ShiftOS
{ {
this.ContextMenuStrip = cmbdesktopoptions; this.ContextMenuStrip = cmbdesktopoptions;
NewToolStripMenuItem.Visible = API.Upgrades["desktopicons"]; NewToolStripMenuItem.Visible = API.Upgrades["desktopicons"];
addDesktopPanelToolStripMenuItem.Visible = API.Upgrades["desktoppanel"]; addDesktopPanelToolStripMenuItem.Visible = API.Upgrades["advanceddesktop"];
//addDesktopPanelToolStripMenuItem.Visible = API.Upgrades["midgamebridge"]; //Uncomment when mid game bridge sequence finished. widgetManagerToolStripMenuItem.Visible = API.Upgrades["advanceddesktop"]; //Uncomment when mid game bridge sequence finished.
} }
@ -770,36 +770,38 @@ namespace ShiftOS
} }
}; };
wlocmenu.DropDownItems.Clear(); wlocmenu.DropDownItems.Clear();
foreach (var p in DesktopPanels) if (API.Upgrades["advanceddesktop"])
{ {
var dp = (Skinning.DesktopPanel)p.Tag; foreach (var p in DesktopPanels)
p.ContextMenuStrip = cbdpanel;
var itm = new ToolStripMenuItem();
itm.Text = dp.Position;
wlocmenu.DropDownItems.Add(itm);
itm.Click += (object s, EventArgs a) =>
{ {
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() public void SetupPanelClock()