diff --git a/ShiftOS.WinForms/Applications/Chat.resx b/ShiftOS.WinForms/Applications/Chat.resx
index a7b2b93..e4a35ad 100644
--- a/ShiftOS.WinForms/Applications/Chat.resx
+++ b/ShiftOS.WinForms/Applications/Chat.resx
@@ -123,6 +123,12 @@
122, 17
+
+ 17, 17
+
+
+ 122, 17
+
diff --git a/ShiftOS.WinForms/Applications/Shiftnet.cs b/ShiftOS.WinForms/Applications/Shiftnet.cs
index 7f5d3c1..22b53a0 100644
--- a/ShiftOS.WinForms/Applications/Shiftnet.cs
+++ b/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;
}
}
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 22bd1d2..65a512e 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -388,6 +388,12 @@
ShiftGames.cs
+
+ UserControl
+
+
+ ShiftSoft.cs
+
UserControl
@@ -589,6 +595,9 @@
ShiftGames.cs
+
+ ShiftSoft.cs
+
ShiftSoft_Ping.cs
diff --git a/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.Designer.cs b/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.Designer.cs
new file mode 100644
index 0000000..a62b5a8
--- /dev/null
+++ b/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.Designer.cs
@@ -0,0 +1,61 @@
+namespace ShiftOS.WinForms.ShiftnetSites
+{
+ partial class ShiftSoft
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ 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;
+ }
+}
diff --git a/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.cs b/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.cs
new file mode 100644
index 0000000..18968cd
--- /dev/null
+++ b/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 GoToUrl;
+
+ public void OnSkinLoad()
+ {
+ }
+
+ public void OnUpgrade()
+ {
+ }
+
+ public void Setup()
+ {
+ }
+ }
+}
diff --git a/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.resx b/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ShiftOS.WinForms/ShiftnetSites/ShiftSoft.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/ShiftOS.WinForms/ShiftnetSites/ShiftSoft_Ping.cs b/ShiftOS.WinForms/ShiftnetSites/ShiftSoft_Ping.cs
index 1c64390..1593117 100644
--- a/ShiftOS.WinForms/ShiftnetSites/ShiftSoft_Ping.cs
+++ b/ShiftOS.WinForms/ShiftnetSites/ShiftSoft_Ping.cs
@@ -25,11 +25,6 @@ namespace ShiftOS.WinForms.ShiftnetSites
public event Action GoBack;
public event Action 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();
+ }
}
}
}
diff --git a/ShiftOS_TheReturn/Skinning.cs b/ShiftOS_TheReturn/Skinning.cs
index f5dd211..5bd4ab1 100644
--- a/ShiftOS_TheReturn/Skinning.cs
+++ b/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.