Slight Shiftnet mods, new default skin.

ShiftOS.WinForms/Applications/Chat.resx

@@ -123,6 +123,12 @@
   <metadata name="tsbottombar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>122, 17</value>
   </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="tsbottombar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>122, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnsend.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

ShiftOS.WinForms/Applications/Shiftnet.cs

@@ -80,6 +80,7 @@ namespace ShiftOS.WinForms.Applications
             txturl.Location = new Point(btnforward.Left + btnforward.Width + 2, 2);
             txturl.Width = flcontrols.Width - btnback.Width - 2 - btnforward.Width - 2 - (btngo.Width*2) - 2;
             btngo.Location = new Point(flcontrols.Width - btngo.Width - 2, 2);
+            flcontrols.BackColor = SkinEngine.LoadedSkin.TitleBackgroundColor;
         }
 
         public bool OnUnload()
@@ -147,6 +148,7 @@ namespace ShiftOS.WinForms.Applications
 
         public void NavigateToUrl(string url)
         {
+            
             txturl.Text = url;
             foreach(var exe in Directory.GetFiles(Environment.CurrentDirectory))
             {
@@ -188,6 +190,7 @@ namespace ShiftOS.WinForms.Applications
                                                 obj.OnUpgrade();
                                                 obj.OnSkinLoad();
                                                 obj.Setup();
+                                                AppearanceManager.SetWindowTitle(this, attribute.Name + " - Shiftnet");
                                                 return;
                                             }
                                         }

ShiftOS.WinForms/ShiftOS.WinForms.csproj

@@ -388,6 +388,12 @@
     <Compile Include="ShiftnetSites\ShiftGames.Designer.cs">
       <DependentUpon>ShiftGames.cs</DependentUpon>
     </Compile>
+    <Compile Include="ShiftnetSites\ShiftSoft.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ShiftnetSites\ShiftSoft.Designer.cs">
+      <DependentUpon>ShiftSoft.cs</DependentUpon>
+    </Compile>
     <Compile Include="ShiftnetSites\ShiftSoft_Ping.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -589,6 +595,9 @@
     <EmbeddedResource Include="ShiftnetSites\ShiftGames.resx">
       <DependentUpon>ShiftGames.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="ShiftnetSites\ShiftSoft.resx">
+      <DependentUpon>ShiftSoft.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ShiftnetSites\ShiftSoft_Ping.resx">
       <DependentUpon>ShiftSoft_Ping.cs</DependentUpon>
     </EmbeddedResource>

ShiftOS.WinForms/ShiftnetSites/ShiftSoft.Designer.cs

@@ -0,0 +1,61 @@
+namespace ShiftOS.WinForms.ShiftnetSites
+{
+    partial class ShiftSoft
+    {
+        /// <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.label1 = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("Franklin Gothic Heavy", 24.75F, System.Drawing.FontStyle.Italic);
+            this.label1.Location = new System.Drawing.Point(13, 17);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(152, 38);
+            this.label1.TabIndex = 0;
+            this.label1.Tag = "keepfont";
+            this.label1.Text = "Shiftsoft";
+            // 
+            // ShiftSoft
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.label1);
+            this.Name = "ShiftSoft";
+            this.Size = new System.Drawing.Size(523, 384);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+    }
+}

ShiftOS.WinForms/ShiftnetSites/ShiftSoft.cs

@@ -0,0 +1,38 @@
+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;
+
+namespace ShiftOS.WinForms.ShiftnetSites
+{
+    [ShiftnetSite("shiftnet/shiftsoft", "ShiftSoft", "What do you want to shift today?")]
+    [ShiftnetFundamental]
+    public partial class ShiftSoft : UserControl, IShiftnetSite
+    {
+        public ShiftSoft()
+        {
+            InitializeComponent();
+        }
+
+        public event Action GoBack;
+        public event Action<string> GoToUrl;
+
+        public void OnSkinLoad()
+        {
+        }
+
+        public void OnUpgrade()
+        {
+        }
+
+        public void Setup()
+        {
+        }
+    }
+}

ShiftOS.WinForms/ShiftnetSites/ShiftSoft.resx

@@ -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>

ShiftOS.WinForms/ShiftnetSites/ShiftSoft_Ping.cs

@@ -25,11 +25,6 @@ namespace ShiftOS.WinForms.ShiftnetSites
         public event Action GoBack;
         public event Action<string> GoToUrl;
 
-        public void OnLoad()
-        {
-            SetupListing();
-        }
-
         public void OnSkinLoad()
         {
             ControlManager.SetupControls(this);
@@ -38,6 +33,7 @@ namespace ShiftOS.WinForms.ShiftnetSites
 
         public void SetupListing()
         {
+            fllist.Controls.Clear();
             foreach(var exec in Directory.GetFiles(Environment.CurrentDirectory))
             {
                 if(exec.ToLower().EndsWith(".exe") || exec.ToLower().EndsWith(".dll"))
@@ -50,27 +46,36 @@ namespace ShiftOS.WinForms.ShiftnetSites
                         {
                             if (type.GetInterfaces().Contains(typeof(IShiftnetSite)))
                             {
-                                var attr = type.GetCustomAttributes(false).Where(x => x is ShiftnetSiteAttribute) as ShiftnetSiteAttribute;
+                                var attr = type.GetCustomAttributes(false).FirstOrDefault(x => x is ShiftnetSiteAttribute) as ShiftnetSiteAttribute;
                                 if (attr != null)
                                 {
-                                    var lnk = new LinkLabel();
-                                    lnk.LinkColor = SkinEngine.LoadedSkin.ControlTextColor;
-                                    lnk.Tag = "header3";
-                                    lnk.Text = attr.Name;
-                                    var desc = new Label();
-                                    desc.AutoSize = true;
-                                    lnk.AutoSize = true;
-                                    desc.MaximumSize = new Size(this.Width / 3, 0);
-                                    desc.Text = attr.Description;
-                                    lnk.Click += (o, a) =>
+                                    if (attr.Url.StartsWith("shiftnet/"))
                                     {
-                                        GoToUrl?.Invoke(attr.Url);
-                                    };
-                                    fllist.Controls.Add(lnk);
-                                    fllist.Controls.Add(desc);
-                                    ControlManager.SetupControls(lnk);
-                                    lnk.Show();
-                                    desc.Show();
+                                        var lnk = new LinkLabel();
+                                        lnk.LinkColor = SkinEngine.LoadedSkin.ControlTextColor;
+                                        lnk.Text = attr.Name;
+                                        var desc = new Label();
+                                        desc.AutoSize = true;
+                                        lnk.AutoSize = true;
+                                        desc.MaximumSize = new Size(this.Width / 3, 0);
+                                        desc.Text = attr.Description;
+                                        desc.Padding = new Padding
+                                        {
+                                            Bottom = 25,
+                                            Top = 0,
+                                            Left = 10,
+                                            Right = 10
+                                        };
+                                        lnk.Click += (o, a) =>
+                                        {
+                                            GoToUrl?.Invoke(attr.Url);
+                                        };
+                                        fllist.Controls.Add(lnk);
+                                        fllist.Controls.Add(desc);
+                                        ControlManager.SetupControls(lnk);
+                                        lnk.Show();
+                                        desc.Show();
+                                    }
                                 }
                             }
                         }

ShiftOS_TheReturn/Skinning.cs

@@ -332,18 +332,18 @@ namespace ShiftOS.Engine
     public class Skin
     {
         //borrowing from the discourse theme for the default skin
-        private static readonly Color DefaultBackground = Color.FromArgb(0, 0x44, 0x00);
+        private static readonly Color DefaultBackground = Color.FromArgb(0x11, 0x11, 0x11);
         private static readonly Color DefaultForeground = Color.FromArgb(0xDD, 0xDD, 0xDD);
         private static readonly Color Accent1 = Color.FromArgb(0x66, 0x66, 0x66);
         private static readonly Color Accent2 = Color.FromArgb(0x80, 0, 0);
-        private static readonly Color DesktopBG = Color.FromArgb(0x22, 0x22, 0x22);
+        private static readonly Color DesktopBG = Color.FromArgb(0x00, 0x00, 0x00);
         private static readonly Font SysFont = new Font("Tahoma", 9F);
         private static readonly Font SysFont2 = new Font("Tahoma", 10F, FontStyle.Bold);
-        private static readonly Font Header1 = new Font("Helvetica", 20F, FontStyle.Bold);
-        private static readonly Font Header2 = new Font("Helvetica", 17.5F, FontStyle.Bold);
-        private static readonly Font Header3 = new Font("Tahoma", 15F, FontStyle.Bold);
+        private static readonly Font Header1 = new Font("Courier New", 20F, FontStyle.Bold);
+        private static readonly Font Header2 = new Font("Courier New", 17.5F, FontStyle.Bold);
+        private static readonly Font Header3 = new Font("Courier New", 15F, FontStyle.Bold);
 
-        private static readonly Color TitleBG = Color.FromArgb(0x11, 0x11, 0x11);
+        private static readonly Color TitleBG = Color.FromArgb(0x55, 0x11, 0x11);
         private static readonly Color TitleFG = Color.FromArgb(0xaa, 0xaa, 0xaa);
 
         //Todo: When making Shifter GUI we need to label all these with proper Shifter attributes to get 'em displaying in the right places.