Skip to content

Commit

Permalink
Form cleanups, common esc handling, remove useless en translation files
Browse files Browse the repository at this point in the history
  • Loading branch information
@bux
bux committed Jan 4, 2019
1 parent 3a21046 commit 4930a2d
Show file tree
Hide file tree
Showing 20 changed files with 493 additions and 10,527 deletions.
12 changes: 11 additions & 1 deletion tabler/Forms/AboutBox.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Diagnostics;
using System.IO;
using System.Reflection;
Expand All @@ -23,6 +23,16 @@ public AboutBox()
textBoxDescription.Text = AssemblyDescription;
}

protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{
if (keyData == Keys.Escape)
{
Close();
return true;
}
return base.ProcessCmdKey(ref msg, keyData);
}

private void labelCompanyName_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
// Send the URL to the operating system.
Expand Down
3 changes: 3 additions & 0 deletions tabler/Forms/AboutBox.de.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@
ex/6P7XzFQVkeN6NAAAAAElFTkSuQmCC
</value>
</data>
<data name="labelProductName.Text" xml:space="preserve">
<value>Name</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Über</value>
</data>
Expand Down
247 changes: 0 additions & 247 deletions tabler/Forms/AboutBox.en.resx
View file

This file was deleted.

4 changes: 2 additions & 2 deletions tabler/Forms/AboutBox.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
<value>24</value>
</data>
<data name="okButton.Text" xml:space="preserve">
<value>&amp;OK</value>
<value>&amp;Ok</value>
</data>
<data name="&gt;&gt;okButton.Name" xml:space="preserve">
<value>okButton</value>
Expand Down Expand Up @@ -532,7 +532,7 @@
<value>CenterParent</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>AboutBox</value>
<value>About</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>AboutBox</value>
Expand Down
17 changes: 10 additions & 7 deletions tabler/Forms/AddLanguage.Designer.cs
View file

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

24 changes: 18 additions & 6 deletions tabler/Forms/AddLanguage.cs
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,38 @@
using System;
using System;
using System.Windows.Forms;

namespace tabler
{
public partial class AddLanguage : Form
{
private readonly GridUI _myParent;
private readonly GridUI _gridUi;

public AddLanguage(GridUI parent)
public AddLanguage(GridUI gridUi)
{
_myParent = parent;
_gridUi = gridUi;
InitializeComponent();
}

private void button1_Click(object sender, EventArgs e)
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{
if (keyData == Keys.Escape)
{
Close();
return true;
}
return base.ProcessCmdKey(ref msg, keyData);
}

private void btnCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
}

private void btnAddThisLanguage_Click(object sender, EventArgs e)
{
_myParent.HandleAddLanguage(textBox1.Text);
_gridUi.HandleAddLanguage(textBox1.Text);
DialogResult = DialogResult.OK;
Close();
}
}
Expand Down
215 changes: 108 additions & 107 deletions tabler/Forms/AddLanguage.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,113 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 25</value>
</data>
<data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>170, 20</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<data name="textBox1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;textBox1.Name" xml:space="preserve">
<value>textBox1</value>
</data>
<data name="&gt;&gt;textBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="lblLanguage.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblLanguage.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 9</value>
</data>
<data name="lblLanguage.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 13</value>
</data>
<data name="lblLanguage.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblLanguage.Text" xml:space="preserve">
<value>Language</value>
</data>
<data name="&gt;&gt;lblLanguage.Name" xml:space="preserve">
<value>lblLanguage</value>
</data>
<data name="&gt;&gt;lblLanguage.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblLanguage.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;lblLanguage.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="btnAddThisLanguage.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 51</value>
</data>
<data name="btnAddThisLanguage.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="btnAddThisLanguage.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="btnAddThisLanguage.Text" xml:space="preserve">
<value>Add</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.Name" xml:space="preserve">
<value>btnAddThisLanguage</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>107, 51</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="&gt;&gt;btnCancel.Name" xml:space="preserve">
<value>btnCancel</value>
</data>
<data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnCancel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>194, 83</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAQAEBAAAAEAIABoBAAARgAAACAgAAABACAAqBAAAK4EAAAwMAAAAQAgAKglAABWFQAAAAAAAAEA
Expand Down Expand Up @@ -4887,115 +4986,17 @@
/////////////////////////////////////////////////////////////////////////////w==
</value>
</data>
<data name="textBox1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Language</value>
<data name="$this.Text" xml:space="preserve">
<value>Add</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>AddLanguage</value>
</data>
<data name="&gt;&gt;textBox1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 9</value>
</data>
<data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>156, 20</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
<value>55, 13</value>
</data>
<data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>180, 83</value>
</data>
<data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>93, 51</value>
</data>
<data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="btnAddThisLanguage.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 51</value>
</data>
<data name="btnAddThisLanguage.Text" xml:space="preserve">
<value>Add</value>
</data>
<data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnAddThisLanguage.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;textBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnCancel.Name" xml:space="preserve">
<value>btnCancel</value>
</data>
<data name="btnAddThisLanguage.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 25</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="btnCancel.Text" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>
</data>
<data name="&gt;&gt;label1.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnAddThisLanguage.Name" xml:space="preserve">
<value>btnAddThisLanguage</value>
</data>
<data name="&gt;&gt;btnCancel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;textBox1.Name" xml:space="preserve">
<value>textBox1</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Add</value>
</data>
<data name="&gt;&gt;label1.Parent" xml:space="preserve">
<value>$this</value>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>en</value>
</metadata>
</root>
Loading

0 comments on commit 4930a2d

Please sign in to comment.