shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some major Appscape bugs.

Browse source
This commit is contained in:
Michael 2017-06-22 20:52:01 -04:00
parent bb38dad59b
commit 42a7829864
17 changed files with 277 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShiftOS.WinForms/Applications/AddressBook.cs
View file

@ -14,7 +14,7 @@ using Newtonsoft.Json;
namespace ShiftOS.WinForms.Applications
{
[WinOpen("{WO_ADDRESSBOOK}")]
[AppscapeEntry("{TITLE_ADDRESSBOOK}", "{DESC_ADDRESSBOOK}", 1024, 750, null, "{AL_OFFICE}")]
[AppscapeEntry("address_book", "{TITLE_ADDRESSBOOK}", "{DESC_ADDRESSBOOK}", 1024, 750, null, "{AL_OFFICE}")]
[DefaultTitle("{TITLE_ADDRESSBOOK}")]
[Launcher("{TITLE_ADDRESSBOOK}", false, null, "{AL_OFFICE}")]
public partial class AddressBook : UserControl, IShiftOSWindow

2
ShiftOS.WinForms/Applications/AudioPlayer.cs
View file

@ -37,7 +37,7 @@ using System.Threading;
namespace ShiftOS.WinForms.Applications
{
[AppscapeEntry("{TITLE_AUDIOPLAYER}", "{DESC_AUDIOPLAYER}", 3047, 1000, "file_skimmer", "{AL_ENTERTAINMENT}")]
[AppscapeEntry("audio_player", "{TITLE_AUDIOPLAYER}", "{DESC_AUDIOPLAYER}", 3047, 1000, "file_skimmer", "{AL_ENTERTAINMENT}")]
[Launcher("{TITLE_AUDIOPLAYER}", false, null, "{AL_ENTERTAINMENT}")]
[WinOpen("{WO_AUDIOPLAYER}")]
[DefaultTitle("{TITLE_AUDIOPLAYER}")]

2
ShiftOS.WinForms/Applications/Chat.cs
View file

@ -41,7 +41,7 @@ namespace ShiftOS.WinForms.Applications
[WinOpen("{WO_SIMPLESRC}")]
[Launcher("{TITLE_SIMPLESRC}", false, null, "{AL_NETWORKING}")]
[DefaultTitle("{TITLE_SIMPLESRC}")]
[AppscapeEntry("{TITLE_SIMPLESRC}", "{DESC_SIMPLESRC}", 300, 145, "file_skimmer", "{AL_NETWORKING}")]
[AppscapeEntry("simplesrc_client", "{TITLE_SIMPLESRC}", "{DESC_SIMPLESRC}", 300, 145, "file_skimmer", "{AL_NETWORKING}")]
public partial class Chat : UserControl, IShiftOSWindow
{
public Chat()

73
ShiftOS.WinForms/Applications/Clock.Designer.cs generated Normal file
View file

@ -0,0 +1,73 @@
namespace ShiftOS.WinForms.Applications
{
partial class Clock
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.lbheader = new System.Windows.Forms.Label();
this.lbcurrenttime = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// lbheader
//
this.lbheader.AutoSize = true;
this.lbheader.Location = new System.Drawing.Point(234, 183);
this.lbheader.Name = "lbheader";
this.lbheader.Size = new System.Drawing.Size(66, 13);
this.lbheader.TabIndex = 0;
this.lbheader.Tag = "header2";
this.lbheader.Text = "Current time:";
//
// lbcurrenttime
//
this.lbcurrenttime.AutoSize = true;
this.lbcurrenttime.Location = new System.Drawing.Point(294, 140);
this.lbcurrenttime.Name = "lbcurrenttime";
this.lbcurrenttime.Size = new System.Drawing.Size(135, 13);
this.lbcurrenttime.TabIndex = 1;
this.lbcurrenttime.Tag = "header1";
this.lbcurrenttime.Text = "000001 seconds since helll";
//
// Clock
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lbcurrenttime);
this.Controls.Add(this.lbheader);
this.Name = "Clock";
this.Size = new System.Drawing.Size(527, 260);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label lbheader;
private System.Windows.Forms.Label lbcurrenttime;
}
}

55
ShiftOS.WinForms/Applications/Clock.cs Normal file
View file

@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ShiftOS.Engine;
using ShiftOS.WinForms.Tools;
namespace ShiftOS.WinForms.Applications
{
[RequiresUpgrade("clock")]
[WinOpen("clock")]
[Launcher("Clock", false, null, "Accessories")]
[DefaultTitle("Clock")]
public partial class Clock : UserControl, IShiftOSWindow
{
public Clock()
{
InitializeComponent();
clocktimer = new Timer();
clocktimer.Interval = 100;
clocktimer.Tick += (o, a) =>
{
lbheader.CenterParent();
lbheader.Top = 15;
lbcurrenttime.Text = Terminal.GetTime();
lbcurrenttime.CenterParent();
};
}
private Timer clocktimer = null;
public void OnLoad()
{
clocktimer.Start();
}
public void OnSkinLoad()
{
}
public bool OnUnload()
{
return true;
}
public void OnUpgrade()
{
}
}
}

120
ShiftOS.WinForms/Applications/Clock.resx Normal file
View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

2
ShiftOS.WinForms/Applications/NameChanger.cs
View file

@ -40,7 +40,7 @@ namespace ShiftOS.WinForms.Applications {
[MultiplayerOnly]
[Launcher("{TITLE_NAMECHANGER}", false, null, "{AL_CUSTOMIZATION}")]
[AppscapeEntry("{TITLE_NAMECHANGER}", "{DESC_NAMECHANGER}", 342, 500, "skinning;file_skimmer;wm_titlebar", "{AL_CUSTOMIZATION}")]
[AppscapeEntry("name_changer", "{TITLE_NAMECHANGER}", "{DESC_NAMECHANGER}", 342, 500, "skinning;file_skimmer;wm_titlebar", "{AL_CUSTOMIZATION}")]
[WinOpen("{WO_NAMECHANGER}")]
[DefaultTitle("{TITLE_NAMECHANGER}")]
[DefaultIcon("iconNameChanger")]

4
ShiftOS.WinForms/Applications/ShiftLetters.cs
View file

@ -33,12 +33,13 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ShiftOS.WinForms.Tools;
namespace ShiftOS.WinForms.Applications
{
[MultiplayerOnly]
[Launcher("{TITLE_SHIFTLETTERS}", false, null, "{AL_GAMES}")]
[AppscapeEntry("{TITLE_SHIFTLETTERS}", "{DESC_SHIFTLETTERS}", 300, 150, null, "{AL_GAMES}")]
[AppscapeEntry("shiftletters", "{TITLE_SHIFTLETTERS}", "{DESC_SHIFTLETTERS}", 300, 150, null, "{AL_GAMES}")]
[WinOpen("{WO_SHIFTLETTERS}")]
[DefaultIcon("iconShiftLetters")]
public partial class ShiftLetters : UserControl, IShiftOSWindow
@ -181,6 +182,7 @@ namespace ShiftOS.WinForms.Applications
btnrestart.Visible = true;
lblword.Left = (this.Width - lblword.Width) / 2;
comboBox1.SelectedIndex = 0;
this.tbguess.CenterParent();
}
public void OnUpgrade()

2
ShiftOS.WinForms/Applications/ShiftSweeper.cs
View file

@ -35,7 +35,7 @@ using ShiftOS.Engine;
namespace ShiftOS.WinForms.Applications {
[Launcher("{TITLE_SHIFTSWEEPER}", true, "al_shiftsweeper", "{AL_GAMES}")]
[AppscapeEntry("{TITLE_SHIFTSWEEPER}", "{DESC_SHIFTSWEEPER}", 1600, 800, "shiftletters", "{AL_GAMES}")]
[AppscapeEntry("shiftsweeper", "{TITLE_SHIFTSWEEPER}", "{DESC_SHIFTSWEEPER}", 1600, 800, "shiftletters", "{AL_GAMES}")]
[MultiplayerOnly]
[WinOpen("{WO_SHIFTSWEEPER}")]
[DefaultIcon("iconShiftSweeper")]

2
ShiftOS.WinForms/Applications/TriSheet.cs
View file

@ -15,7 +15,7 @@ using ShiftOS.Objects.ShiftFS;
namespace ShiftOS.WinForms.Applications
{
[WinOpen("trisheet")]
[AppscapeEntry("TriSheet", "Part of the trilogy of office applications for enhancement of your system. TriSheet is easliy the best spreadsheet program out there for ShiftOS.", 1024, 750, "file_skimmer;textpad", "Office")]
[AppscapeEntry("trisheet", "TriSheet", "Part of the trilogy of office applications for enhancement of your system. TriSheet is easliy the best spreadsheet program out there for ShiftOS.", 1024, 750, "file_skimmer;textpad", "Office")]
[DefaultTitle("TriSheet")]
[Launcher("TriSheet", false, null, "Office")]
public partial class TriSheet : UserControl, IShiftOSWindow

2
ShiftOS.WinForms/Applications/TriWrite.cs
View file

@ -13,7 +13,7 @@ using ShiftOS.Engine;
namespace ShiftOS.WinForms.Applications
{
[WinOpen("triwrite")]
[AppscapeEntry("TriWrite", "Part of the trilogy of office applications for enhancement of your system. TriWrite is easliy the best text editor out there for ShiftOS.", 1024, 750, "file_skimmer;textpad", "Office")]
[AppscapeEntry("triwrite", "TriWrite", "Part of the trilogy of office applications for enhancement of your system. TriWrite is easliy the best text editor out there for ShiftOS.", 1024, 750, "file_skimmer;textpad", "Office")]
[DefaultTitle("TriWrite")]
[Launcher("TriWrite", false, null, "Office")]
public partial class TriWrite : UserControl, IShiftOSWindow

2
ShiftOS.WinForms/Applications/VideoPlayer.cs
View file

@ -12,7 +12,7 @@ using System.IO;
namespace ShiftOS.WinForms.Applications
{
[AppscapeEntry("Video Player", "Play .mp4 files or .wmv files as videos inside ShiftOS! Perfect for a shifted movie night.", 1524, 1000, "file_skimmer", "Entertainment")]
[AppscapeEntry("video_player", "Video Player", "Play .mp4 files or .wmv files as videos inside ShiftOS! Perfect for a shifted movie night.", 1524, 1000, "file_skimmer", "Entertainment")]
[DefaultTitle("Video Player")]
[Launcher("Video Player", false, null, "Entertainment")]
[WinOpen("video_player")]

2
ShiftOS.WinForms/Applications/WebBrowser.cs
View file

@ -12,7 +12,7 @@ using ShiftOS.Engine;
namespace ShiftOS.WinForms.Applications
{
[WinOpen("web_browser")]
[AppscapeEntry("Web Browser", "We're going surfing on the Internet! This application allows you to break the bounds of the Digital Society and connect to the outer Internet inside ShiftOS.",
[AppscapeEntry("web_browser", "Web Browser", "We're going surfing on the Internet! This application allows you to break the bounds of the Digital Society and connect to the outer Internet inside ShiftOS.",
4096, 10000, "color_depth_24_bits", "Networking")]
[Launcher("Web Browser", false, null, "Networking")]
[DefaultTitle("Web Browser")]

2
ShiftOS.WinForms/Commands.cs
View file

@ -157,7 +157,7 @@ namespace ShiftOS.Engine
//print all unique namespaces.
foreach (var n in TerminalBackend.Commands.Where(x => !(x is TerminalBackend.WinOpenCommand) && Shiftorium.UpgradeInstalled(x.Dependencies) && x.CommandInfo.hide == false).OrderBy(x => x.CommandInfo.name))
{
sb.Append(n.CommandInfo.name);
sb.Append(" - " + n.CommandInfo.name);
if (!string.IsNullOrWhiteSpace(n.CommandInfo.description))
if (Shiftorium.UpgradeInstalled("help_description"))
sb.Append(" - " + n.CommandInfo.description);

2
ShiftOS.WinForms/Program.cs
View file

@ -122,7 +122,7 @@ namespace ShiftOS.WinForms
{
var upgrade = new ShiftoriumUpgrade
{
Id = attrib.Name.ToLower().Replace(" ", "_"),
Id = attrib.Upgrade,
Name = attrib.Name,
Description = attrib.Description,
Cost = attrib.Cost,

9
ShiftOS.WinForms/ShiftOS.WinForms.csproj
View file

@ -71,6 +71,12 @@
<Compile Include="Applications\About.Designer.cs">
<DependentUpon>About.cs</DependentUpon>
</Compile>
<Compile Include="Applications\Clock.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Applications\Clock.Designer.cs">
<DependentUpon>Clock.cs</DependentUpon>
</Compile>
<Compile Include="Applications\IconManager.cs">
<SubType>UserControl</SubType>
</Compile>
@ -469,6 +475,9 @@
<EmbeddedResource Include="Applications\About.resx">
<DependentUpon>About.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Applications\Clock.resx">
<DependentUpon>Clock.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Applications\IconManager.resx">
<DependentUpon>IconManager.cs</DependentUpon>
</EmbeddedResource>

12
ShiftOS.WinForms/ShiftnetSites/AppscapeMain.cs
View file

@ -48,8 +48,8 @@ namespace ShiftOS.WinForms.ShiftnetSites
if (upgrades.Count() > 0)
foreach (var upg in upgrades)
{
if (!cats.Contains(upg.Category))
cats.Add(upg.Category);
if (!cats.Contains(Localization.Parse(upg.Category)))
cats.Add(Localization.Parse(upg.Category));
}
}
catch { }
@ -63,9 +63,9 @@ namespace ShiftOS.WinForms.ShiftnetSites
pnlappslist.Controls.Clear();
pnlappslist.Show();
pnlappslist.BringToFront();
Category = cat;
Category = Localization.Parse(cat);
var upgrades = GetAllInCategory();
lbtitle.Text = cat;
lbtitle.Text = Localization.Parse(cat);
if(upgrades.Length == 0)
{
var err = new Label();
@ -282,7 +282,7 @@ namespace ShiftOS.WinForms.ShiftnetSites
if (Category == "All")
return upgrades.ToArray();
else
return upgrades.Where(x => x.Category == Category).ToArray();
return upgrades.Where(x => Localization.Parse(x.Category) == Localization.Parse(Category)).ToArray();
}
public void Setup()
@ -360,7 +360,7 @@ namespace ShiftOS.WinForms
/// </summary>
public class AppscapeEntryAttribute : RequiresUpgradeAttribute
{
public AppscapeEntryAttribute(string name, string description, int downloadSize, ulong cost, string dependencies = "", string category = "Misc") : base(name.ToLower().Replace(' ', '_'))
public AppscapeEntryAttribute(string id, string name, string description, int downloadSize, ulong cost, string dependencies = "", string category = "Misc") : base(id)
{
Name = name;
Description = description;