Skip to content

Commit

Permalink
ui changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@arkypita
arkypita committed Jul 1, 2017
1 parent bb1801d commit 1759982
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 155 deletions.
32 changes: 16 additions & 16 deletions LaserGRBL/MainForm.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

194 changes: 97 additions & 97 deletions LaserGRBL/MainForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<value>ConnectionForm</value>
</data>
<data name="&gt;&gt;ConnectionForm.Type" xml:space="preserve">
<value>LaserGRBL.ConnectLogForm, LaserGRBL, Version=2.6.13.30720, Culture=neutral, PublicKeyToken=null</value>
<value>LaserGRBL.ConnectLogForm, LaserGRBL, Version=2.7.0.32068, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ConnectionForm.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
Expand All @@ -175,7 +175,7 @@
<value>JogForm</value>
</data>
<data name="&gt;&gt;JogForm.Type" xml:space="preserve">
<value>LaserGRBL.JogForm, LaserGRBL, Version=2.6.13.30720, Culture=neutral, PublicKeyToken=null</value>
<value>LaserGRBL.JogForm, LaserGRBL, Version=2.7.0.32068, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;JogForm.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
Expand Down Expand Up @@ -217,7 +217,7 @@
<value>PreviewForm</value>
</data>
<data name="&gt;&gt;PreviewForm.Type" xml:space="preserve">
<value>LaserGRBL.PreviewForm, LaserGRBL, Version=2.6.13.30720, Culture=neutral, PublicKeyToken=null</value>
<value>LaserGRBL.PreviewForm, LaserGRBL, Version=2.7.0.32068, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;PreviewForm.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
Expand Down Expand Up @@ -261,33 +261,6 @@
<metadata name="StatusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>194, 17</value>
</metadata>
<data name="StatusBar.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 556</value>
</data>
<data name="StatusBar.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 0, 19, 0</value>
</data>
<data name="StatusBar.Size" type="System.Drawing.Size, System.Drawing">
<value>883, 24</value>
</data>
<data name="StatusBar.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="StatusBar.Text" xml:space="preserve">
<value>statusStrip1</value>
</data>
<data name="&gt;&gt;StatusBar.Name" xml:space="preserve">
<value>StatusBar</value>
</data>
<data name="&gt;&gt;StatusBar.Type" xml:space="preserve">
<value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;StatusBar.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;StatusBar.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="TTLLines.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 19</value>
</data>
Expand Down Expand Up @@ -369,72 +342,39 @@
<data name="TTTStatus.Text" xml:space="preserve">
<value>Disconnected</value>
</data>
<metadata name="UpdateTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>295, 17</value>
</metadata>
<metadata name="MMn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<data name="grblToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>41, 20</value>
</data>
<data name="grblToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Grbl</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;File</value>
</data>
<data name="linguaToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 20</value>
</data>
<data name="linguaToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Language</value>
</data>
<data name="MNGrblEmulator.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="MNGrblEmulator.Text" xml:space="preserve">
<value>&amp;Grbl Emulator</value>
</data>
<data name="MNEsp8266.Size" type="System.Drawing.Size, System.Drawing">
<value>62, 20</value>
</data>
<data name="MNEsp8266.Text" xml:space="preserve">
<value>&amp;ESP8266</value>
</data>
<data name="toolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 20</value>
</data>
<data name="toolStripMenuItem4.Text" xml:space="preserve">
<value>?</value>
<data name="StatusBar.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 556</value>
</data>
<data name="MMn.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
<data name="StatusBar.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 0, 19, 0</value>
</data>
<data name="MMn.Size" type="System.Drawing.Size, System.Drawing">
<data name="StatusBar.Size" type="System.Drawing.Size, System.Drawing">
<value>883, 24</value>
</data>
<data name="MMn.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<data name="StatusBar.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="MMn.Text" xml:space="preserve">
<value>menuStrip1</value>
<data name="StatusBar.Text" xml:space="preserve">
<value>statusStrip1</value>
</data>
<data name="&gt;&gt;MMn.Name" xml:space="preserve">
<value>MMn</value>
<data name="&gt;&gt;StatusBar.Name" xml:space="preserve">
<value>StatusBar</value>
</data>
<data name="&gt;&gt;MMn.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;StatusBar.Type" xml:space="preserve">
<value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MMn.Parent" xml:space="preserve">
<data name="&gt;&gt;StatusBar.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;MMn.ZOrder" xml:space="preserve">
<value>2</value>
<data name="&gt;&gt;StatusBar.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="UpdateTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>295, 17</value>
</metadata>
<metadata name="MMn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 17</value>
</metadata>
<data name="MnConnect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
Expand Down Expand Up @@ -674,6 +614,12 @@
<data name="MnExit.Text" xml:space="preserve">
<value>&amp;Exit</value>
</data>
<data name="grblToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>41, 20</value>
</data>
<data name="grblToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Grbl</value>
</data>
<data name="MnFileOpen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAJxAIA3kywAAACBjSFJNAABu
Expand Down Expand Up @@ -751,6 +697,24 @@
<data name="MnFileSend.Text" xml:space="preserve">
<value>Send To &amp;Machine</value>
</data>
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>37, 20</value>
</data>
<data name="fileToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;File</value>
</data>
<data name="MNGrblEmulator.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="MNGrblEmulator.Text" xml:space="preserve">
<value>&amp;Grbl Emulator</value>
</data>
<data name="MNEsp8266.Size" type="System.Drawing.Size, System.Drawing">
<value>62, 20</value>
</data>
<data name="MNEsp8266.Text" xml:space="preserve">
<value>&amp;ESP8266</value>
</data>
<data name="MNEnglish.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAhNJREFUOE/N
Expand Down Expand Up @@ -898,6 +862,12 @@
<data name="russianToolStripMenuItem.Text" xml:space="preserve">
<value>Russian</value>
</data>
<data name="linguaToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>71, 20</value>
</data>
<data name="linguaToolStripMenuItem.Text" xml:space="preserve">
<value>&amp;Language</value>
</data>
<data name="helpOnLineToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 22</value>
</data>
Expand Down Expand Up @@ -928,6 +898,36 @@
<data name="aboutToolStripMenuItem.Text" xml:space="preserve">
<value>Web Site</value>
</data>
<data name="toolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
<value>24, 20</value>
</data>
<data name="toolStripMenuItem4.Text" xml:space="preserve">
<value>?</value>
</data>
<data name="MMn.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="MMn.Size" type="System.Drawing.Size, System.Drawing">
<value>883, 24</value>
</data>
<data name="MMn.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="MMn.Text" xml:space="preserve">
<value>menuStrip1</value>
</data>
<data name="&gt;&gt;MMn.Name" xml:space="preserve">
<value>MMn</value>
</data>
<data name="&gt;&gt;MMn.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MMn.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;MMn.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Expand Down Expand Up @@ -1262,6 +1262,18 @@
<data name="&gt;&gt;russianToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MNEsp8266.Name" xml:space="preserve">
<value>MNEsp8266</value>
</data>
<data name="&gt;&gt;MNEsp8266.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MNGrblEmulator.Name" xml:space="preserve">
<value>MNGrblEmulator</value>
</data>
<data name="&gt;&gt;MNGrblEmulator.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripMenuItem4.Name" xml:space="preserve">
<value>toolStripMenuItem4</value>
</data>
Expand Down Expand Up @@ -1304,18 +1316,6 @@
<data name="&gt;&gt;aboutToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MNEsp8266.Name" xml:space="preserve">
<value>MNEsp8266</value>
</data>
<data name="&gt;&gt;MNEsp8266.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MNGrblEmulator.Name" xml:space="preserve">
<value>MNGrblEmulator</value>
</data>
<data name="&gt;&gt;MNGrblEmulator.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainForm</value>
</data>
Expand Down
Loading

0 comments on commit 1759982

Please sign in to comment.