From 9d9958e18bda9142cb118f13332f2649a530f27f Mon Sep 17 00:00:00 2001 From: AShifter Date: Tue, 20 Mar 2018 09:17:12 -0600 Subject: [PATCH] i think it builds now lets get this road on the show --- ShiftOS.Main/Properties/Resources.Designer.cs | 10 ++++++++++ ShiftOS.Main/Properties/Resources.resx | 3 +++ ShiftOS.Main/Resources/pixel.png | Bin 0 -> 156 bytes ShiftOS.Main/ShiftOS.Main.csproj | 1 + ShiftOS.Main/ShiftOS/Desktop.Designer.cs | 15 +++++++++------ 5 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 ShiftOS.Main/Resources/pixel.png diff --git a/ShiftOS.Main/Properties/Resources.Designer.cs b/ShiftOS.Main/Properties/Resources.Designer.cs index c7d0f79..fd20334 100644 --- a/ShiftOS.Main/Properties/Resources.Designer.cs +++ b/ShiftOS.Main/Properties/Resources.Designer.cs @@ -149,6 +149,16 @@ namespace ShiftOS.Main.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap pixel { + get { + object obj = ResourceManager.GetObject("pixel", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShiftOS.Main/Properties/Resources.resx b/ShiftOS.Main/Properties/Resources.resx index af5474b..d9a33d4 100644 --- a/ShiftOS.Main/Properties/Resources.resx +++ b/ShiftOS.Main/Properties/Resources.resx @@ -151,4 +151,7 @@ ..\resources\fonts\ubuntumono.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\resources\pixel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShiftOS.Main/Resources/pixel.png b/ShiftOS.Main/Resources/pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..22db5ace79f4091b24c3b590efd3319785a9dadb GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7)VaDV6D^h@hk|nMYCBgY=CFO}lsSE{)nRz98d8s7|CVB>X sMus01GN%F+@p!s8hDd}b7Zel#?Py^*sM)%11yG#9)78&qol`;+0L>jIqW}N^ literal 0 HcmV?d00001 diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index 554f8a8..7105060 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -166,6 +166,7 @@ + \ No newline at end of file diff --git a/ShiftOS.Main/ShiftOS/Desktop.Designer.cs b/ShiftOS.Main/ShiftOS/Desktop.Designer.cs index ca9afb2..722f619 100644 --- a/ShiftOS.Main/ShiftOS/Desktop.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Desktop.Designer.cs @@ -33,13 +33,13 @@ this.clockPanel = new System.Windows.Forms.Panel(); this.lblClock = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); + this.timer1 = new System.Windows.Forms.Timer(this.components); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.applicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.shifterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.terminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.textPadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fileSkimmerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.timer1 = new System.Windows.Forms.Timer(this.components); this.taskbar.SuspendLayout(); this.clockPanel.SuspendLayout(); this.panel2.SuspendLayout(); @@ -88,15 +88,21 @@ this.panel2.Size = new System.Drawing.Size(102, 24); this.panel2.TabIndex = 0; // + // timer1 + // + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // // menuStrip1 // + this.menuStrip1.BackgroundImage = global::ShiftOS.Main.Properties.Resources.pixel; + this.menuStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.menuStrip1.Dock = System.Windows.Forms.DockStyle.None; this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.applicationsToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.menuStrip1.Size = new System.Drawing.Size(185, 24); + this.menuStrip1.Size = new System.Drawing.Size(93, 24); this.menuStrip1.TabIndex = 2; this.menuStrip1.Text = "Applications"; // @@ -107,6 +113,7 @@ this.terminalToolStripMenuItem, this.textPadToolStripMenuItem, this.fileSkimmerToolStripMenuItem}); + this.applicationsToolStripMenuItem.ForeColor = System.Drawing.Color.White; this.applicationsToolStripMenuItem.Name = "applicationsToolStripMenuItem"; this.applicationsToolStripMenuItem.Size = new System.Drawing.Size(85, 20); this.applicationsToolStripMenuItem.Text = "Applications"; @@ -139,10 +146,6 @@ this.fileSkimmerToolStripMenuItem.Text = "File Skimmer"; this.fileSkimmerToolStripMenuItem.Click += new System.EventHandler(this.fileSkimmerToolStripMenuItem_Click); // - // timer1 - // - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); - // // Desktop // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);