diff --git a/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.Designer.cs b/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.Designer.cs
index 7eca5d3..bb7c655 100644
--- a/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.Designer.cs
+++ b/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.Designer.cs
@@ -28,21 +28,30 @@
///
private void InitializeComponent()
{
-
+ this.shiftButton1 = new ShiftOS.Engine.UI.ShiftButton();
this.SuspendLayout();
//
+ // shiftButton1
+ //
+ this.shiftButton1.Location = new System.Drawing.Point(133, 66);
+ this.shiftButton1.Name = "shiftButton1";
+ this.shiftButton1.Size = new System.Drawing.Size(75, 22);
+ this.shiftButton1.TabIndex = 0;
+ //
// FileOpener
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.shiftButton1);
this.Name = "FileOpener";
this.Size = new System.Drawing.Size(368, 283);
this.ResumeLayout(false);
}
+
#endregion
-
+ private UI.ShiftButton shiftButton1;
}
}
diff --git a/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.cs b/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.cs
index 1947f6f..4c45b18 100644
--- a/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.cs
+++ b/ShiftOS.Engine/ShiftFS/FileGUI/FileOpener.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using ShiftOS.Engine.WindowManager;
namespace ShiftOS.Engine.ShiftFS.FileGUI
{
@@ -15,12 +16,11 @@ namespace ShiftOS.Engine.ShiftFS.FileGUI
public FileOpener()
{
InitializeComponent();
-
}
private void shiftButton1_Click(object sender, EventArgs e)
{
- MessageBox.Show("yay");
+ ShiftWM.StartInfoboxSession("Test", "lol", InfoboxTemplate.ButtonType.Ok);
}
}
}
diff --git a/ShiftOS.Engine/ShiftOS.Engine.csproj b/ShiftOS.Engine/ShiftOS.Engine.csproj
index aa9d370..384d356 100644
--- a/ShiftOS.Engine/ShiftOS.Engine.csproj
+++ b/ShiftOS.Engine/ShiftOS.Engine.csproj
@@ -76,12 +76,6 @@
-
- Component
-
-
- ShiftButton.cs
-
UserControl
@@ -1108,5 +1102,8 @@
+
+
+
\ No newline at end of file
diff --git a/ShiftOS.Engine/UI/ShiftButton.Designer.cs b/ShiftOS.Engine/UI/ShiftButton.Designer.cs
deleted file mode 100644
index c744a90..0000000
--- a/ShiftOS.Engine/UI/ShiftButton.Designer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace ShiftOS.Engine.UI
-{
- partial class ShiftButton
- {
- ///
- /// 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()
- {
- components = new System.ComponentModel.Container();
- }
-
- #endregion
- }
-}
diff --git a/ShiftOS.Engine/UI/ShiftButton.cs b/ShiftOS.Engine/UI/ShiftButton.cs
deleted file mode 100644
index a025a40..0000000
--- a/ShiftOS.Engine/UI/ShiftButton.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ShiftOS.Engine.UI
-{
- public partial class ShiftButton : Control, IButtonControl
- {
- private bool _pressing = false;
- private Color _lightBack;
- public ShiftButton()
- {
- InitializeComponent();
- }
-
- public DialogResult DialogResult { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-
- public void NotifyDefault(bool value)
- {
-
- }
-
- public void PerformClick()
- {
- this.OnClick(new EventArgs());
- }
-
- protected override void OnPaint(PaintEventArgs pe)
- {
- base.OnPaint(pe);
- this.Font = new Font("Lucida Console", 9, FontStyle.Regular);
- _lightBack = Color.WhiteSmoke;
- var g = pe.Graphics;
- g.Clear(BackColor);
- g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
- var sf = new StringFormat();
-
- if (_pressing)
- {
- g.FillRectangle(new SolidBrush(Color.White), 0, 0, Width, Height);
- g.DrawString(Text, Font, new SolidBrush(Color.Black), ((Width / 2) + 1), (Height / 2) + 1);
- }
- else
- {
- g.FillRectangle(new SolidBrush(Color.WhiteSmoke), 0, 0, Width, Height);
- }
- }
- }
-}
diff --git a/ShiftOS.Main/Terminal/TerminalBackend.cs b/ShiftOS.Main/Terminal/TerminalBackend.cs
index 02c9cd0..59e4f27 100644
--- a/ShiftOS.Main/Terminal/TerminalBackend.cs
+++ b/ShiftOS.Main/Terminal/TerminalBackend.cs
@@ -40,6 +40,11 @@ namespace ShiftOS.Main.Terminal
instance.Run(theParams);
return;
}
+ else
+ {
+ Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText($"\nsbash: {command.Split(' ').First()}: invalid command");
+ return;
+ }
}
Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.Text += " \n The command cannot be found. \n";