shiftos-archive/ShiftOS-Rewind
1
0
Fork 0
mirror of https://github.com/ShiftOS-Rewind/ShiftOS.git synced 2025-01-22 03:11:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor changes to the desktop

Browse source
This commit is contained in:
FloppyDiskDrive 2017-11-18 18:06:30 -06:00
parent 98f6f02993
commit 9fe87b10de
3 changed files with 65 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ShiftOS.Main/ShiftOS/Desktop.Designer.cs generated
View file

@ -36,6 +36,9 @@
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();
@ -99,7 +102,10 @@
// applicationsToolStripMenuItem
//
this.applicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.shifterToolStripMenuItem});
this.shifterToolStripMenuItem,
this.terminalToolStripMenuItem,
this.textPadToolStripMenuItem,
this.fileSkimmerToolStripMenuItem});
this.applicationsToolStripMenuItem.Name = "applicationsToolStripMenuItem";
this.applicationsToolStripMenuItem.Size = new System.Drawing.Size(85, 20);
this.applicationsToolStripMenuItem.Text = "Applications";
@ -107,10 +113,35 @@
// shifterToolStripMenuItem
//
this.shifterToolStripMenuItem.Name = "shifterToolStripMenuItem";
this.shifterToolStripMenuItem.Size = new System.Drawing.Size(108, 22);
this.shifterToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
this.shifterToolStripMenuItem.Text = "Shifter";
this.shifterToolStripMenuItem.Click += new System.EventHandler(this.shifterToolStripMenuItem_Click);
//
// terminalToolStripMenuItem
//
this.terminalToolStripMenuItem.Name = "terminalToolStripMenuItem";
this.terminalToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
this.terminalToolStripMenuItem.Text = "Terminal";
this.terminalToolStripMenuItem.Click += new System.EventHandler(this.terminalToolStripMenuItem_Click);
//
// textPadToolStripMenuItem
//
this.textPadToolStripMenuItem.Name = "textPadToolStripMenuItem";
this.textPadToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
this.textPadToolStripMenuItem.Text = "TextPad";
this.textPadToolStripMenuItem.Click += new System.EventHandler(this.textPadToolStripMenuItem_Click);
//
// fileSkimmerToolStripMenuItem
//
this.fileSkimmerToolStripMenuItem.Name = "fileSkimmerToolStripMenuItem";
this.fileSkimmerToolStripMenuItem.Size = new System.Drawing.Size(142, 22);
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);
@ -143,5 +174,8 @@
private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem applicationsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem shifterToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem terminalToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem textPadToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem fileSkimmerToolStripMenuItem;
}
}

48
ShiftOS.Main/ShiftOS/Desktop.cs
View file

@ -14,33 +14,11 @@ namespace ShiftOS.Main.ShiftOS
public Desktop()
{
InitializeComponent();
timer1.Start();
Closed += (sender, args) => { Application.Exit(); };
}
void timer1_Tick(object sender, EventArgs e) =>
lblClock.Text = $"{DateTime.Now:t}";
private void terminalToolStripMenuItem_Click(object sender, EventArgs e)
{
Apps.Terminal trm = new Apps.Terminal();
ShiftWM.Init(trm, "Terminal", null, false, true);
}
void textPadToolStripMenuItem_Click(object sender, EventArgs e)
{
var tp = new TextPad();
ShiftWM.Init(tp, "TextPad", Resources.iconTextPad);
}
void fileSkimmerToolStripMenuItem_Click(object sender, EventArgs e)
{
var fs = new FileSkimmer();
ShiftWM.Init(fs, "File Skimmer", Resources.iconFileSkimmer);
}
private void shifterToolStripMenuItem_Click(object sender, EventArgs e)
{
Apps.ShifterStuff.Shifter app = new Apps.ShifterStuff.Shifter();
@ -51,5 +29,29 @@ namespace ShiftOS.Main.ShiftOS
{
this.WindowState = FormWindowState.Maximized;
}
private void terminalToolStripMenuItem_Click(object sender, EventArgs e)
{
var t = new Apps.Terminal();
ShiftWM.Init(t, "Terminal", Resources.iconTerminal, false);
}
private void textPadToolStripMenuItem_Click(object sender, EventArgs e)
{
var t = new TextPad();
ShiftWM.Init(t, "Untitled - TextPad", Resources.iconTextPad);
}
private void fileSkimmerToolStripMenuItem_Click(object sender, EventArgs e)
{
var fs = new FileSkimmer();
ShiftWM.Init(fs, "File Skimmer", Resources.iconFileSkimmer);
}
private void timer1_Tick(object sender, EventArgs e)
{
lblClock.Text = DateTime.Now.ToString("hh:mm:ss");
}
}
}

3
ShiftOS.Main/ShiftOS/Desktop.resx
View file

@ -120,6 +120,9 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>219, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>219, 17</value>
</metadata>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>132, 17</value>
</metadata>