aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAShifter <[email protected]>2018-03-20 09:17:12 -0600
committerAShifter <[email protected]>2018-03-20 09:17:12 -0600
commit9d9958e18bda9142cb118f13332f2649a530f27f (patch)
tree2311908fcaf0d2188f9cf7924a9ac679a07acc21
parent1f2973db8ec75ce7e1b752b79842f7fbebcbb0b1 (diff)
downloadshiftos-rewind-9d9958e18bda9142cb118f13332f2649a530f27f.tar.gz
shiftos-rewind-9d9958e18bda9142cb118f13332f2649a530f27f.tar.bz2
shiftos-rewind-9d9958e18bda9142cb118f13332f2649a530f27f.zip
i think it builds now
lets get this road on the show
-rw-r--r--ShiftOS.Main/Properties/Resources.Designer.cs10
-rw-r--r--ShiftOS.Main/Properties/Resources.resx3
-rw-r--r--ShiftOS.Main/Resources/pixel.pngbin0 -> 156 bytes
-rw-r--r--ShiftOS.Main/ShiftOS.Main.csproj1
-rw-r--r--ShiftOS.Main/ShiftOS/Desktop.Designer.cs15
5 files changed, 23 insertions, 6 deletions
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
@@ -152,6 +152,16 @@ namespace ShiftOS.Main.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
+ internal static System.Drawing.Bitmap pixel {
+ get {
+ object obj = ResourceManager.GetObject("pixel", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap Symbolinfo {
get {
object obj = ResourceManager.GetObject("Symbolinfo", resourceCulture);
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 @@
<data name="UbuntuMono_R" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\fonts\ubuntumono.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="pixel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\pixel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root> \ 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 0000000..22db5ac
--- /dev/null
+++ b/ShiftOS.Main/Resources/pixel.png
Binary files differ
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 @@
<Content Include="Resources\Icons\iconTerminal.png" />
<Content Include="Resources\Icons\iconTextPad.png" />
<Content Include="Resources\Icons\Symbolinfo.png" />
+ <Content Include="Resources\pixel.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> \ 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);