Merge pull request #15 from ComputeLinux/master

Commiting something

5 files changed, 47 insertions, 35 deletions

diff --git a/source/WindowsFormsApplication1/Apps/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs
index 3d0e2b8..cc69043 100644
--- a/source/WindowsFormsApplication1/Apps/Terminal.cs
+++ b/source/WindowsFormsApplication1/Apps/Terminal.cs
@@ -1662,33 +1662,40 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o
         /// <param name="args">string[] args</param>
         public void runExe(string[] args)
         {
-            bool isFirstArg = true;
-            string exeArgs = "";
-            foreach (string arg in args)
+            if (API.Upgrades[""])
             {
-                if (!isFirstArg)
+                bool isFirstArg = true;
+                string exeArgs = "";
+                foreach (string arg in args)
                 {
-                    exeArgs = exeArgs + " " + arg;
+                    if (!isFirstArg)
+                    {
+                        exeArgs = exeArgs + " " + arg;
+                    }
+                    else
+                    {
+                        isFirstArg = false;
+                    }
                 }
-                else
-                {
-                    isFirstArg = false;
-                }
-            }
-            string lp = "C:\\ShiftOS\\bin\\" + args[0] + ".exe";
-            Process p = new Process();
-            p.StartInfo.Arguments = exeArgs;
-            p.StartInfo.UseShellExecute = false;
-            p.StartInfo.RedirectStandardOutput = true;
-            p.StartInfo.RedirectStandardInput = true;
-            p.StartInfo.FileName = lp;
-            p.StartInfo.CreateNoWindow = true;
-            p.StartInfo.ErrorDialog = false;
-            p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-            p.StartInfo.WorkingDirectory = current_dir;
-            p.Start();
-            WriteLine(p.StandardOutput.ReadToEnd());
-            p.WaitForExit();
+                string lp = "C:\\ShiftOS\\bin\\" + args[0] + ".exe";
+                Process p = new Process();
+                p.StartInfo.Arguments = exeArgs;
+                p.StartInfo.UseShellExecute = false;
+                p.StartInfo.RedirectStandardOutput = true;
+                p.StartInfo.RedirectStandardInput = true;
+                p.StartInfo.FileName = lp;
+                p.StartInfo.CreateNoWindow = true;
+                p.StartInfo.ErrorDialog = false;
+                p.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+                p.StartInfo.WorkingDirectory = current_dir;
+                p.Start();
+                WriteLine(p.StandardOutput.ReadToEnd());
+                p.WaitForExit();
+            }
+            else
+            {
+                wrongcommand();
+            }
         }
         #endregion
 
diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
index 0116fc9..e9bc12b 100644
--- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
+++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
@@ -1179,45 +1179,45 @@
             // FolderToolStripMenuItem
             // 
             this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem";
-            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+            this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.FolderToolStripMenuItem.Text = "Folder";
             this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click);
             // 
             // ToolStripMenuItem2
             // 
             this.ToolStripMenuItem2.Name = "ToolStripMenuItem2";
-            this.ToolStripMenuItem2.Size = new System.Drawing.Size(152, 6);
+            this.ToolStripMenuItem2.Size = new System.Drawing.Size(151, 6);
             // 
             // ArtpadPictureToolStripMenuItem
             // 
             this.ArtpadPictureToolStripMenuItem.Name = "ArtpadPictureToolStripMenuItem";
-            this.ArtpadPictureToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+            this.ArtpadPictureToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.ArtpadPictureToolStripMenuItem.Text = "Artpad Picture";
             // 
             // TextDocumentToolStripMenuItem
             // 
             this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem";
-            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+            this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.TextDocumentToolStripMenuItem.Text = "Text Document";
             this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click);
             // 
             // NewSkin
             // 
             this.NewSkin.Name = "NewSkin";
-            this.NewSkin.Size = new System.Drawing.Size(155, 22);
+            this.NewSkin.Size = new System.Drawing.Size(154, 22);
             this.NewSkin.Text = "Skin";
             this.NewSkin.Click += new System.EventHandler(this.NewSkin_Click);
             // 
             // WebpageToolStripMenuItem
             // 
             this.WebpageToolStripMenuItem.Name = "WebpageToolStripMenuItem";
-            this.WebpageToolStripMenuItem.Size = new System.Drawing.Size(152, 6);
+            this.WebpageToolStripMenuItem.Size = new System.Drawing.Size(151, 6);
             this.WebpageToolStripMenuItem.Visible = false;
             // 
             // ShortcutToolStripMenuItem
             // 
             this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem";
-            this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+            this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.ShortcutToolStripMenuItem.Text = "Shortcut";
             this.ShortcutToolStripMenuItem.Visible = false;
             // 
@@ -1225,7 +1225,7 @@
             // 
             this.scriptToolStripMenuItem.Name = "scriptToolStripMenuItem";
             this.scriptToolStripMenuItem.ShowShortcutKeys = false;
-            this.scriptToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
+            this.scriptToolStripMenuItem.Size = new System.Drawing.Size(154, 22);
             this.scriptToolStripMenuItem.Text = "Script";
             this.scriptToolStripMenuItem.Click += new System.EventHandler(this.scriptToolStripMenuItem_Click);
             // 
@@ -1281,6 +1281,7 @@
             this.flicons.Name = "flicons";
             this.flicons.Size = new System.Drawing.Size(1268, 661);
             this.flicons.TabIndex = 3;
+            this.flicons.Paint += new System.Windows.Forms.PaintEventHandler(this.flicons_Paint);
             // 
             // cmbfactions
             // 
diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
index 19a641d..373461e 100644
--- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
+++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
@@ -1312,6 +1312,11 @@ namespace ShiftOS
                 }
             };
         }
+
+        private void flicons_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
     }
 
     public class DesktopIconManager
diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
index 1ee550a..096ddbf 100644
--- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
+++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.resx
@@ -120,9 +120,6 @@
   <metadata name="desktopappmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="desktopappmenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="clocktick.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>164, 17</value>
   </metadata>
diff --git a/source/WindowsFormsApplication1/Engine/SaveSystem.cs b/source/WindowsFormsApplication1/Engine/SaveSystem.cs
index 9381d9b..492778e 100644
--- a/source/WindowsFormsApplication1/Engine/SaveSystem.cs
+++ b/source/WindowsFormsApplication1/Engine/SaveSystem.cs
@@ -460,6 +460,8 @@ namespace SaveSystem
             DefaultUpgrades.Add(new Shiftorium.Upgrade("nb_tier_medium - 0 CP", null, null, "nodisplay", "fundamental"));
             DefaultUpgrades.Add(new Shiftorium.Upgrade("nb_tier_hard - 0 CP", null, null, "nodisplay", "fundamental"));
 
+            //william341
+            DefaultUpgrades.Add(new Shiftorium.Upgrade("Command Line EXES - 50 CP", null, "With this upgrade we can make the operating system compatible with command line tools from Windows!", null, "useful"));
         }
 
         /// <summary>