Merge remote-tracking branch 'refs/remotes/origin/master' into shiftui_integration

3 files changed, 15 insertions, 11 deletions

diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs
index ff599a5..533f4b5 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 85659c2..83b71fd 100644
--- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
+++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.cs
@@ -179,6 +179,7 @@ namespace ShiftOS
             {
                 pnlpanelbuttonholder.Width -= a.Widget.Width + API.CurrentSkin.panelbuttongap;
             };
+
             Viruses.CheckForInfected();
             this.ShowInTaskbar = false;
             this.FormBorderStyle = FormBorderStyle.None;
@@ -1316,6 +1317,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 3877945..d28073f 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>