diff --git a/CutOptima/CutOptima.csproj b/CutOptima/CutOptima.csproj
index ce5734c..a7c1b1c 100644
--- a/CutOptima/CutOptima.csproj
+++ b/CutOptima/CutOptima.csproj
@@ -249,6 +249,9 @@
Designer
CuttingResultForm.cs
+
+ DBSelectionForm.cs
+
DetailsListForm.cs
diff --git a/CutOptima/DBSelectionForm.Designer.cs b/CutOptima/DBSelectionForm.Designer.cs
index b616572..8156cd6 100644
--- a/CutOptima/DBSelectionForm.Designer.cs
+++ b/CutOptima/DBSelectionForm.Designer.cs
@@ -39,45 +39,69 @@ private void InitializeComponent()
//
// newButton
//
+ this.newButton.AccessibleDescription = null;
+ this.newButton.AccessibleName = null;
resources.ApplyResources(this.newButton, "newButton");
+ this.newButton.BackgroundImage = null;
+ this.newButton.Font = null;
this.newButton.Name = "newButton";
this.newButton.UseVisualStyleBackColor = true;
this.newButton.Click += new System.EventHandler(this.newButton_Click);
//
// okButton
//
+ this.okButton.AccessibleDescription = null;
+ this.okButton.AccessibleName = null;
resources.ApplyResources(this.okButton, "okButton");
+ this.okButton.BackgroundImage = null;
this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
+ this.okButton.Font = null;
this.okButton.Name = "okButton";
this.okButton.UseVisualStyleBackColor = true;
this.okButton.Click += new System.EventHandler(this.okButton_Click);
//
// databasesListBox
//
+ this.databasesListBox.AccessibleDescription = null;
+ this.databasesListBox.AccessibleName = null;
resources.ApplyResources(this.databasesListBox, "databasesListBox");
+ this.databasesListBox.BackgroundImage = null;
+ this.databasesListBox.Font = null;
this.databasesListBox.FormattingEnabled = true;
this.databasesListBox.Name = "databasesListBox";
this.databasesListBox.DoubleClick += new System.EventHandler(this.databasesListBox_DoubleClick);
//
// addButton
//
+ this.addButton.AccessibleDescription = null;
+ this.addButton.AccessibleName = null;
resources.ApplyResources(this.addButton, "addButton");
+ this.addButton.BackgroundImage = null;
this.addButton.Cursor = System.Windows.Forms.Cursors.Arrow;
+ this.addButton.Font = null;
this.addButton.Name = "addButton";
this.addButton.UseVisualStyleBackColor = true;
this.addButton.Click += new System.EventHandler(this.addButton_Click);
//
// buttonCancel
//
+ this.buttonCancel.AccessibleDescription = null;
+ this.buttonCancel.AccessibleName = null;
resources.ApplyResources(this.buttonCancel, "buttonCancel");
+ this.buttonCancel.BackgroundImage = null;
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.buttonCancel.Font = null;
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
//
// buttonRemove
//
+ this.buttonRemove.AccessibleDescription = null;
+ this.buttonRemove.AccessibleName = null;
resources.ApplyResources(this.buttonRemove, "buttonRemove");
+ this.buttonRemove.BackgroundImage = null;
+ this.buttonRemove.Font = null;
this.buttonRemove.Name = "buttonRemove";
this.buttonRemove.UseVisualStyleBackColor = true;
this.buttonRemove.Click += new System.EventHandler(this.buttonRemove_Click);
@@ -85,8 +109,11 @@ private void InitializeComponent()
// DBSelectionForm
//
this.AcceptButton = this.okButton;
+ this.AccessibleDescription = null;
+ this.AccessibleName = null;
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackgroundImage = null;
this.CancelButton = this.buttonCancel;
this.Controls.Add(this.buttonRemove);
this.Controls.Add(this.buttonCancel);
@@ -94,6 +121,8 @@ private void InitializeComponent()
this.Controls.Add(this.okButton);
this.Controls.Add(this.newButton);
this.Controls.Add(this.databasesListBox);
+ this.Font = null;
+ this.Icon = null;
this.Name = "DBSelectionForm";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DBSelectionForm_FormClosing);
this.ResumeLayout(false);
diff --git a/CutOptima/DBSelectionForm.cs b/CutOptima/DBSelectionForm.cs
index 219e9eb..5150743 100644
--- a/CutOptima/DBSelectionForm.cs
+++ b/CutOptima/DBSelectionForm.cs
@@ -45,7 +45,7 @@ private void okButton_Click(object sender, EventArgs e)
catch (Exception ex)
{
if (MessageBox.Show(ex.Message + Environment.NewLine +
- "Продолжить?", "Ошибка", MessageBoxButtons.YesNo,
+ strings.Continue + "?", strings.Error, MessageBoxButtons.YesNo,
MessageBoxIcon.Error) == DialogResult.Yes)
{
m_currentDB = databasesListBox.SelectedIndex;
@@ -71,7 +71,7 @@ private void databasesListBox_DoubleClick(object sender, EventArgs e)
catch (Exception ex)
{
if (MessageBox.Show(ex.Message + Environment.NewLine +
- "Продолжить?", "Ошибка", MessageBoxButtons.YesNo,
+ strings.Continue + "?", strings.Error, MessageBoxButtons.YesNo,
MessageBoxIcon.Error) == DialogResult.No)
{
return;
diff --git a/CutOptima/DBSelectionForm.resx b/CutOptima/DBSelectionForm.resx
index 70a945c..ab5067d 100644
--- a/CutOptima/DBSelectionForm.resx
+++ b/CutOptima/DBSelectionForm.resx
@@ -117,193 +117,196 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ $this
+
-
+
Bottom, Right
-
-
- 178, 231
+
+ $this
+
75, 23
-
-
- 2
-
-
- New...
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- newButton
+
+ Bottom, Right
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Cancel
-
+
$this
-
- 4
+
+ 75, 23
-
- Bottom, Right
+
+
+ 3
259, 231
-
+
+ 5
+
+
+ 0
+
+
75, 23
-
- 3
+
+ 97, 231
-
- ОК
+
+ 6, 13
-
- okButton
+
+ New...
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Choose Database
-
- $this
+
+ databasesListBox
-
- 3
+
+ 2, 2, 2, 2
Top, Bottom, Left, Right
-
- 12, 12
+
+ $this
399, 199
-
- 0
-
-
- databasesListBox
+
+ 16, 231
-
- System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 75, 23
-
- $this
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 5
+
+ Add...
-
- Bottom, Right
+
+ buttonRemove
-
- 97, 231
+
+ 3
-
- 75, 23
+
+ 0
-
+
1
-
- Add...
-
-
- addButton
+
+ 4
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Remove
-
- $this
+
+ System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 2
+
+ okButton
-
- Bottom, Right
+
+ 5
339, 231
-
- 2, 2, 2, 2
-
-
- 75, 23
+
+ $this
-
- 4
+
+ 2
-
- Cancel
+
+ $this
-
- buttonCancel
+
+ Bottom, Right
-
+
System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- $this
+
+ 75, 23
-
+
+ 423, 266
+
+
1
-
- Bottom, Right
+
+ newButton
-
- 16, 231
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
2, 2, 2, 2
-
- 75, 23
+
+ CenterParent
-
- 5
+
+ addButton
-
- Remove
+
+ 2
-
- buttonRemove
+
+ buttonCancel
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Bottom, Right
-
- $this
+
+ ОК
-
- 0
+
+ 12, 12
-
- True
-
-
- 6, 13
+
+ DBSelectionForm
-
- 423, 266
+
+ 178, 231
-
- CenterParent
+
+ Bottom, Right
-
- Choose Database
+
+ System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- DBSelectionForm
+
+ 4
-
- System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
+
+ Russian
+
\ No newline at end of file
diff --git a/CutOptima/DBSelectionForm.ru.resx b/CutOptima/DBSelectionForm.ru.resx
new file mode 100644
index 0000000..74d3b47
--- /dev/null
+++ b/CutOptima/DBSelectionForm.ru.resx
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Новая...
+
+
+ Добавить...
+
+
+ Отмена
+
+
+ Убрать
+
+
+ Выберите базу данных
+
+
\ No newline at end of file
diff --git a/CutOptima/strings.Designer.cs b/CutOptima/strings.Designer.cs
index 8bc616c..a9578ea 100644
--- a/CutOptima/strings.Designer.cs
+++ b/CutOptima/strings.Designer.cs
@@ -96,6 +96,15 @@ internal static string ConnectionError {
}
}
+ ///
+ /// Looks up a localized string similar to Continue.
+ ///
+ internal static string Continue {
+ get {
+ return ResourceManager.GetString("Continue", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Couldn't connect to the database server.
///
@@ -168,6 +177,15 @@ internal static string DatabaseWithSuchParametersAlreadyPresent {
}
}
+ ///
+ /// Looks up a localized string similar to Error.
+ ///
+ internal static string Error {
+ get {
+ return ResourceManager.GetString("Error", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Inquiry.
///
diff --git a/CutOptima/strings.resx b/CutOptima/strings.resx
index b834680..63e72f0 100644
--- a/CutOptima/strings.resx
+++ b/CutOptima/strings.resx
@@ -129,6 +129,9 @@
Connection error
+
+ Continue
+
Couldn't connect to the database server
@@ -153,6 +156,9 @@
Database with such parameters already present
+
+ Error
+
Inquiry
diff --git a/CutOptima/strings.ru.resx b/CutOptima/strings.ru.resx
index ab1282d..847195b 100644
--- a/CutOptima/strings.ru.resx
+++ b/CutOptima/strings.ru.resx
@@ -130,6 +130,9 @@
Ошибка соединения
+
+ Продолжить
+
Ошибка при подключении к серверу
@@ -154,6 +157,9 @@
База с такими параметрами уже есть в списке
+
+ Ошибка
+
Запрос