diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index ec32650..d7c79eb 100644 --- a/SanSystem/UCInliner.cs +++ b/SanSystem/UCInliner.cs @@ -142,6 +142,9 @@ namespace SanSystem ListFiles(client, "/at0/"); FtpClient newClient = null; + client.Dispose(); + + FtpClient newclient = null; foreach (string file in filenames) { newClient = new FtpClient("192.168.250.2"); diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index ccac597..9ae78c0 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -63,12 +63,15 @@ // // tabControl1 // + this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Location = new System.Drawing.Point(13, 14); this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1101, 612); + this.tabControl1.Size = new System.Drawing.Size(1264, 612); this.tabControl1.TabIndex = 0; this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // @@ -94,11 +97,11 @@ this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.label1); this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabPage1.Location = new System.Drawing.Point(4, 29); + this.tabPage1.Location = new System.Drawing.Point(4, 34); this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPage1.Size = new System.Drawing.Size(1093, 579); + this.tabPage1.Size = new System.Drawing.Size(1256, 574); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Grunddaten"; this.tabPage1.UseVisualStyleBackColor = true; @@ -108,7 +111,7 @@ this.txt_objekt_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_objekt_name.Location = new System.Drawing.Point(192, 67); this.txt_objekt_name.Name = "txt_objekt_name"; - this.txt_objekt_name.Size = new System.Drawing.Size(330, 26); + this.txt_objekt_name.Size = new System.Drawing.Size(330, 30); this.txt_objekt_name.TabIndex = 2; // // lbl_objektname @@ -117,7 +120,7 @@ this.lbl_objektname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_objektname.Location = new System.Drawing.Point(9, 70); this.lbl_objektname.Name = "lbl_objektname"; - this.lbl_objektname.Size = new System.Drawing.Size(95, 20); + this.lbl_objektname.Size = new System.Drawing.Size(118, 25); this.lbl_objektname.TabIndex = 25; this.lbl_objektname.Text = "Objektname"; // @@ -162,7 +165,7 @@ "Ziegelwerk"}); this.cb_material.Location = new System.Drawing.Point(192, 252); this.cb_material.Name = "cb_material"; - this.cb_material.Size = new System.Drawing.Size(323, 28); + this.cb_material.Size = new System.Drawing.Size(323, 33); this.cb_material.TabIndex = 6; // // groupBox2 @@ -184,7 +187,7 @@ this.txt_haltungslaenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_haltungslaenge.Location = new System.Drawing.Point(188, 21); this.txt_haltungslaenge.Name = "txt_haltungslaenge"; - this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 26); + this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 30); this.txt_haltungslaenge.TabIndex = 11; // // txt_laenge_schacht @@ -192,7 +195,7 @@ this.txt_laenge_schacht.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_laenge_schacht.Location = new System.Drawing.Point(188, 112); this.txt_laenge_schacht.Name = "txt_laenge_schacht"; - this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 26); + this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 30); this.txt_laenge_schacht.TabIndex = 13; // // label21 @@ -201,7 +204,7 @@ this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label21.Location = new System.Drawing.Point(6, 114); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(107, 20); + this.label21.Size = new System.Drawing.Size(132, 25); this.label21.TabIndex = 21; this.label21.Text = "Schachtlänge"; // @@ -211,7 +214,7 @@ this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.checkBox1.Location = new System.Drawing.Point(9, 75); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(172, 24); + this.checkBox1.Size = new System.Drawing.Size(210, 29); this.checkBox1.TabIndex = 12; this.checkBox1.Text = "Geschlossene Ende"; this.checkBox1.UseVisualStyleBackColor = true; @@ -223,7 +226,7 @@ this.label6.Location = new System.Drawing.Point(5, 26); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(112, 20); + this.label6.Size = new System.Drawing.Size(137, 25); this.label6.TabIndex = 5; this.label6.Text = "Haltungslänge"; // @@ -236,7 +239,7 @@ this.dt_haltunggemessen_datum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dt_haltunggemessen_datum.Name = "dt_haltunggemessen_datum"; this.dt_haltunggemessen_datum.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 26); + this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 30); this.dt_haltunggemessen_datum.TabIndex = 10; // // label20 @@ -246,7 +249,7 @@ this.label20.Location = new System.Drawing.Point(8, 300); this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(216, 20); + this.label20.Size = new System.Drawing.Size(265, 25); this.label20.TabIndex = 16; this.label20.Text = "Haltungslänge gemessen am"; // @@ -256,7 +259,7 @@ this.txt_hausnummer.Location = new System.Drawing.Point(758, 85); this.txt_hausnummer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_hausnummer.Name = "txt_hausnummer"; - this.txt_hausnummer.Size = new System.Drawing.Size(148, 26); + this.txt_hausnummer.Size = new System.Drawing.Size(148, 30); this.txt_hausnummer.TabIndex = 8; // // txt_strasse @@ -265,7 +268,7 @@ this.txt_strasse.Location = new System.Drawing.Point(758, 35); this.txt_strasse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_strasse.Name = "txt_strasse"; - this.txt_strasse.Size = new System.Drawing.Size(320, 26); + this.txt_strasse.Size = new System.Drawing.Size(320, 30); this.txt_strasse.TabIndex = 7; // // label19 @@ -275,7 +278,7 @@ this.label19.Location = new System.Drawing.Point(560, 89); this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(105, 20); + this.label19.Size = new System.Drawing.Size(129, 25); this.label19.TabIndex = 13; this.label19.Text = "Hausnummer"; // @@ -286,7 +289,7 @@ this.label18.Location = new System.Drawing.Point(560, 40); this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(64, 20); + this.label18.Size = new System.Drawing.Size(79, 25); this.label18.TabIndex = 12; this.label18.Text = "Strasse"; // @@ -296,7 +299,7 @@ this.txt_dn.Location = new System.Drawing.Point(192, 201); this.txt_dn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_dn.Name = "txt_dn"; - this.txt_dn.Size = new System.Drawing.Size(330, 26); + this.txt_dn.Size = new System.Drawing.Size(330, 30); this.txt_dn.TabIndex = 5; // // txt_punkt_bis @@ -305,7 +308,7 @@ this.txt_punkt_bis.Location = new System.Drawing.Point(192, 153); this.txt_punkt_bis.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_punkt_bis.Name = "txt_punkt_bis"; - this.txt_punkt_bis.Size = new System.Drawing.Size(330, 26); + this.txt_punkt_bis.Size = new System.Drawing.Size(330, 30); this.txt_punkt_bis.TabIndex = 4; // // txt_punkt_von @@ -314,7 +317,7 @@ this.txt_punkt_von.Location = new System.Drawing.Point(192, 107); this.txt_punkt_von.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_punkt_von.Name = "txt_punkt_von"; - this.txt_punkt_von.Size = new System.Drawing.Size(330, 26); + this.txt_punkt_von.Size = new System.Drawing.Size(330, 30); this.txt_punkt_von.TabIndex = 3; // // txt_pro_nr @@ -323,7 +326,7 @@ this.txt_pro_nr.Location = new System.Drawing.Point(192, 31); this.txt_pro_nr.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_pro_nr.Name = "txt_pro_nr"; - this.txt_pro_nr.Size = new System.Drawing.Size(330, 26); + this.txt_pro_nr.Size = new System.Drawing.Size(330, 30); this.txt_pro_nr.TabIndex = 1; // // label5 @@ -333,7 +336,7 @@ this.label5.Location = new System.Drawing.Point(9, 255); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(65, 20); + this.label5.Size = new System.Drawing.Size(81, 25); this.label5.TabIndex = 4; this.label5.Text = "Material"; // @@ -344,7 +347,7 @@ this.label4.Location = new System.Drawing.Point(9, 204); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(104, 20); + this.label4.Size = new System.Drawing.Size(128, 25); this.label4.TabIndex = 3; this.label4.Text = "Durchmesser"; // @@ -355,7 +358,7 @@ this.label3.Location = new System.Drawing.Point(9, 156); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(76, 20); + this.label3.Size = new System.Drawing.Size(94, 25); this.label3.TabIndex = 2; this.label3.Text = "Bis Punkt"; // @@ -366,7 +369,7 @@ this.label2.Location = new System.Drawing.Point(9, 110); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(83, 20); + this.label2.Size = new System.Drawing.Size(103, 25); this.label2.TabIndex = 1; this.label2.Text = "Von Punkt"; // @@ -377,12 +380,13 @@ this.label1.Location = new System.Drawing.Point(9, 35); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(116, 20); + this.label1.Size = new System.Drawing.Size(143, 25); this.label1.TabIndex = 0; this.label1.Text = "Projektnummer"; // // btn_close // + this.btn_close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btn_close.Location = new System.Drawing.Point(37, 641); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(181, 50); @@ -393,7 +397,8 @@ // // btn_add_san // - this.btn_add_san.Location = new System.Drawing.Point(230, 643); + this.btn_add_san.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btn_add_san.Location = new System.Drawing.Point(224, 644); this.btn_add_san.Name = "btn_add_san"; this.btn_add_san.Size = new System.Drawing.Size(202, 47); this.btn_add_san.TabIndex = 30; @@ -403,15 +408,16 @@ // // frmObjektEdit // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1131, 702); + this.AutoSize = true; + this.ClientSize = new System.Drawing.Size(1290, 702); this.ControlBox = false; this.Controls.Add(this.btn_add_san); this.Controls.Add(this.btn_close); this.Controls.Add(this.tabControl1); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "frmObjektEdit"; this.Text = "FrmObjektEdit";