diff --git a/TZotGPT/Form1.Designer.cs b/TZotGPT/Form1.Designer.cs
index b1f06be..b4533d9 100644
--- a/TZotGPT/Form1.Designer.cs
+++ b/TZotGPT/Form1.Designer.cs
@@ -30,14 +30,10 @@
{
this.label1 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.label2 = new System.Windows.Forms.Label();
- this.benz92 = new System.Windows.Forms.TextBox();
- this.benz95 = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.benzDT = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
this.maslo = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
+ this.benz = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
this.tipTS = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label();
this.markaTS = new System.Windows.Forms.TextBox();
@@ -45,10 +41,18 @@
this.label7 = new System.Windows.Forms.Label();
this.vin = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
- this.textBox4 = new System.Windows.Forms.TextBox();
+ this.godvuhod = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
+ this.probeg = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
+ this.button1 = new System.Windows.Forms.Button();
+ this.button2 = new System.Windows.Forms.Button();
+ this.gruz = new System.Windows.Forms.TextBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.pass = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.pathtofile = new System.Windows.Forms.TextBox();
+ this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
@@ -65,70 +69,18 @@
//
this.groupBox1.Controls.Add(this.maslo);
this.groupBox1.Controls.Add(this.label5);
- this.groupBox1.Controls.Add(this.benzDT);
- this.groupBox1.Controls.Add(this.label4);
- this.groupBox1.Controls.Add(this.benz95);
- this.groupBox1.Controls.Add(this.label3);
- this.groupBox1.Controls.Add(this.benz92);
+ this.groupBox1.Controls.Add(this.benz);
this.groupBox1.Controls.Add(this.label2);
- this.groupBox1.Location = new System.Drawing.Point(301, 9);
+ this.groupBox1.Location = new System.Drawing.Point(310, 9);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(129, 194);
+ this.groupBox1.Size = new System.Drawing.Size(129, 107);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Стоимость";
//
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(7, 20);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(106, 13);
- this.label2.TabIndex = 0;
- this.label2.Text = "Бензин 92 (за литр)";
- //
- // benz92
- //
- this.benz92.Location = new System.Drawing.Point(7, 37);
- this.benz92.Name = "benz92";
- this.benz92.Size = new System.Drawing.Size(106, 20);
- this.benz92.TabIndex = 1;
- //
- // benz95
- //
- this.benz95.Location = new System.Drawing.Point(7, 80);
- this.benz95.Name = "benz95";
- this.benz95.Size = new System.Drawing.Size(106, 20);
- this.benz95.TabIndex = 3;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(7, 63);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(106, 13);
- this.label3.TabIndex = 2;
- this.label3.Text = "Бензин 95 (за литр)";
- //
- // benzDT
- //
- this.benzDT.Location = new System.Drawing.Point(7, 121);
- this.benzDT.Name = "benzDT";
- this.benzDT.Size = new System.Drawing.Size(106, 20);
- this.benzDT.TabIndex = 5;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(7, 104);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(70, 13);
- this.label4.TabIndex = 4;
- this.label4.Text = "ДТ (за литр)";
- //
// maslo
//
- this.maslo.Location = new System.Drawing.Point(7, 162);
+ this.maslo.Location = new System.Drawing.Point(7, 79);
this.maslo.Name = "maslo";
this.maslo.Size = new System.Drawing.Size(106, 20);
this.maslo.TabIndex = 7;
@@ -136,18 +88,34 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(7, 145);
+ this.label5.Location = new System.Drawing.Point(7, 62);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(40, 13);
this.label5.TabIndex = 6;
this.label5.Text = "Масло";
//
+ // benz
+ //
+ this.benz.Location = new System.Drawing.Point(7, 37);
+ this.benz.Name = "benz";
+ this.benz.Size = new System.Drawing.Size(106, 20);
+ this.benz.TabIndex = 1;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(7, 20);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(91, 13);
+ this.label2.TabIndex = 0;
+ this.label2.Text = "Бензин (за литр)";
+ //
// tipTS
//
this.tipTS.FormattingEnabled = true;
- this.tipTS.Location = new System.Drawing.Point(163, 9);
+ this.tipTS.Location = new System.Drawing.Point(150, 9);
this.tipTS.Name = "tipTS";
- this.tipTS.Size = new System.Drawing.Size(121, 21);
+ this.tipTS.Size = new System.Drawing.Size(154, 21);
this.tipTS.TabIndex = 2;
//
// label6
@@ -161,16 +129,16 @@
//
// markaTS
//
- this.markaTS.Location = new System.Drawing.Point(163, 33);
+ this.markaTS.Location = new System.Drawing.Point(150, 33);
this.markaTS.Name = "markaTS";
- this.markaTS.Size = new System.Drawing.Size(121, 20);
+ this.markaTS.Size = new System.Drawing.Size(154, 20);
this.markaTS.TabIndex = 4;
//
// modelTS
//
- this.modelTS.Location = new System.Drawing.Point(163, 59);
+ this.modelTS.Location = new System.Drawing.Point(150, 59);
this.modelTS.Name = "modelTS";
- this.modelTS.Size = new System.Drawing.Size(121, 20);
+ this.modelTS.Size = new System.Drawing.Size(154, 20);
this.modelTS.TabIndex = 6;
//
// label7
@@ -184,9 +152,9 @@
//
// vin
//
- this.vin.Location = new System.Drawing.Point(163, 85);
+ this.vin.Location = new System.Drawing.Point(150, 85);
this.vin.Name = "vin";
- this.vin.Size = new System.Drawing.Size(121, 20);
+ this.vin.Size = new System.Drawing.Size(154, 20);
this.vin.TabIndex = 8;
//
// label8
@@ -198,12 +166,12 @@
this.label8.TabIndex = 7;
this.label8.Text = "VIN";
//
- // textBox4
+ // godvuhod
//
- this.textBox4.Location = new System.Drawing.Point(163, 111);
- this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(121, 20);
- this.textBox4.TabIndex = 10;
+ this.godvuhod.Location = new System.Drawing.Point(150, 111);
+ this.godvuhod.Name = "godvuhod";
+ this.godvuhod.Size = new System.Drawing.Size(154, 20);
+ this.godvuhod.TabIndex = 10;
//
// label9
//
@@ -214,12 +182,12 @@
this.label9.TabIndex = 9;
this.label9.Text = "Год выпуска";
//
- // textBox1
+ // probeg
//
- this.textBox1.Location = new System.Drawing.Point(163, 137);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(121, 20);
- this.textBox1.TabIndex = 12;
+ this.probeg.Location = new System.Drawing.Point(150, 137);
+ this.probeg.Name = "probeg";
+ this.probeg.Size = new System.Drawing.Size(154, 20);
+ this.probeg.TabIndex = 12;
//
// label10
//
@@ -230,14 +198,82 @@
this.label10.TabIndex = 11;
this.label10.Text = "Пробег за год";
//
+ // button1
+ //
+ this.button1.Location = new System.Drawing.Point(257, 191);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(182, 23);
+ this.button1.TabIndex = 13;
+ this.button1.Text = "Рассчитать и показать";
+ this.button1.UseVisualStyleBackColor = true;
+ //
+ // button2
+ //
+ this.button2.Location = new System.Drawing.Point(257, 219);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(182, 23);
+ this.button2.TabIndex = 14;
+ this.button2.Text = "Сохранить вычисление в файл";
+ this.button2.UseVisualStyleBackColor = true;
+ //
+ // gruz
+ //
+ this.gruz.Location = new System.Drawing.Point(150, 163);
+ this.gruz.Name = "gruz";
+ this.gruz.Size = new System.Drawing.Size(154, 20);
+ this.gruz.TabIndex = 16;
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.Location = new System.Drawing.Point(13, 166);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(104, 13);
+ this.label11.TabIndex = 15;
+ this.label11.Text = "Грузоподъемность";
+ //
+ // pass
+ //
+ this.pass.Location = new System.Drawing.Point(150, 163);
+ this.pass.Name = "pass";
+ this.pass.Size = new System.Drawing.Size(154, 20);
+ this.pass.TabIndex = 18;
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Location = new System.Drawing.Point(13, 166);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(131, 13);
+ this.label12.TabIndex = 17;
+ this.label12.Text = "Количество пассажиров";
+ //
+ // pathtofile
+ //
+ this.pathtofile.Location = new System.Drawing.Point(13, 219);
+ this.pathtofile.Name = "pathtofile";
+ this.pathtofile.Size = new System.Drawing.Size(238, 20);
+ this.pathtofile.TabIndex = 19;
+ //
+ // folderBrowserDialog1
+ //
+ this.folderBrowserDialog1.HelpRequest += new System.EventHandler(this.folderBrowserDialog1_HelpRequest);
+ //
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(451, 235);
- this.Controls.Add(this.textBox1);
+ this.ClientSize = new System.Drawing.Size(451, 252);
+ this.Controls.Add(this.pathtofile);
+ this.Controls.Add(this.pass);
+ this.Controls.Add(this.label12);
+ this.Controls.Add(this.gruz);
+ this.Controls.Add(this.label11);
+ this.Controls.Add(this.button2);
+ this.Controls.Add(this.button1);
+ this.Controls.Add(this.probeg);
this.Controls.Add(this.label10);
- this.Controls.Add(this.textBox4);
+ this.Controls.Add(this.godvuhod);
this.Controls.Add(this.label9);
this.Controls.Add(this.vin);
this.Controls.Add(this.label8);
@@ -265,11 +301,7 @@
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.TextBox maslo;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.TextBox benzDT;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.TextBox benz95;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.TextBox benz92;
+ private System.Windows.Forms.TextBox benz;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox tipTS;
private System.Windows.Forms.Label label6;
@@ -278,10 +310,18 @@
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox vin;
private System.Windows.Forms.Label label8;
- private System.Windows.Forms.TextBox textBox4;
+ private System.Windows.Forms.TextBox godvuhod;
private System.Windows.Forms.Label label9;
- private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.TextBox probeg;
private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.TextBox gruz;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.TextBox pass;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.TextBox pathtofile;
+ private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
}
}
diff --git a/TZotGPT/Form1.cs b/TZotGPT/Form1.cs
index b76bef8..615084d 100644
--- a/TZotGPT/Form1.cs
+++ b/TZotGPT/Form1.cs
@@ -16,5 +16,10 @@ namespace TZotGPT
{
InitializeComponent();
}
+
+ private void folderBrowserDialog1_HelpRequest(object sender, EventArgs e)
+ {
+
+ }
}
}
diff --git a/TZotGPT/Form1.resx b/TZotGPT/Form1.resx
index 1af7de1..69f943d 100644
--- a/TZotGPT/Form1.resx
+++ b/TZotGPT/Form1.resx
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/TZotGPT/README.md b/TZotGPT/README.md
new file mode 100644
index 0000000..e69de29