From 978cfef1f0a13cd8505125047d9804478c59b59e Mon Sep 17 00:00:00 2001 From: HuskyTeufel Date: Tue, 29 Mar 2022 10:36:08 +0200 Subject: [PATCH] Externe Sprachpaket entfernt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Im Sourcecode wurde teils festkodierte Texte einprogrammiert. Macht somit externe Library überflüssig --- SanShared/ILanguage.cs | 23 ----- SanShared/SanShared.csproj | 1 - SanSystem/FrmSelectNewSan.Designer.cs | 33 +++---- SanSystem/FrmSelectNewSan.cs | 6 +- SanSystem/Global.cs | 6 -- SanSystem/Program.cs | 2 +- SanSystem/SanSystem.csproj | 4 - SanSystem/frmMain.cs | 4 +- SanSystem/frmObjektEdit.Designer.cs | 126 +++++++++++++------------- SanSystem/frmObjektEdit.cs | 5 +- SanSystem/frmObjekteList.Designer.cs | 10 +- SanSystem/frmObjekteList.cs | 19 ++-- SanSystem/frmStrassenList.cs | 2 +- SanVerwaltung.sln | 20 +--- 14 files changed, 97 insertions(+), 164 deletions(-) delete mode 100644 SanShared/ILanguage.cs diff --git a/SanShared/ILanguage.cs b/SanShared/ILanguage.cs deleted file mode 100644 index c6b1140..0000000 --- a/SanShared/ILanguage.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SanShared -{ - /// - /// - /// - public interface ILanguage - { - /// - /// - /// - Dictionary Fehlermeldungen { get; } - /// - /// - /// - Dictionary Labels { get; } - } -} diff --git a/SanShared/SanShared.csproj b/SanShared/SanShared.csproj index a6a5944..617c8f1 100644 --- a/SanShared/SanShared.csproj +++ b/SanShared/SanShared.csproj @@ -61,7 +61,6 @@ - diff --git a/SanSystem/FrmSelectNewSan.Designer.cs b/SanSystem/FrmSelectNewSan.Designer.cs index a228108..64eff52 100644 --- a/SanSystem/FrmSelectNewSan.Designer.cs +++ b/SanSystem/FrmSelectNewSan.Designer.cs @@ -37,62 +37,57 @@ // btn_inliner // this.btn_inliner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_inliner.Location = new System.Drawing.Point(16, 15); - this.btn_inliner.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btn_inliner.Location = new System.Drawing.Point(12, 12); this.btn_inliner.Name = "btn_inliner"; - this.btn_inliner.Size = new System.Drawing.Size(249, 71); + this.btn_inliner.Size = new System.Drawing.Size(187, 58); this.btn_inliner.TabIndex = 0; - this.btn_inliner.Text = "btn_inliner"; + this.btn_inliner.Text = "Inliner"; this.btn_inliner.UseVisualStyleBackColor = true; this.btn_inliner.Click += new System.EventHandler(this.btn_inliner_Click); // // btn_schacht_anb // this.btn_schacht_anb.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_schacht_anb.Location = new System.Drawing.Point(283, 15); - this.btn_schacht_anb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btn_schacht_anb.Location = new System.Drawing.Point(212, 12); this.btn_schacht_anb.Name = "btn_schacht_anb"; - this.btn_schacht_anb.Size = new System.Drawing.Size(249, 71); + this.btn_schacht_anb.Size = new System.Drawing.Size(187, 58); this.btn_schacht_anb.TabIndex = 1; - this.btn_schacht_anb.Text = "btn_schachtanb"; + this.btn_schacht_anb.Text = "Schachtanbindung"; this.btn_schacht_anb.UseVisualStyleBackColor = true; this.btn_schacht_anb.Click += new System.EventHandler(this.btn_schacht_anb_Click); // // btn_kurzliner // this.btn_kurzliner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_kurzliner.Location = new System.Drawing.Point(549, 15); - this.btn_kurzliner.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btn_kurzliner.Location = new System.Drawing.Point(412, 12); this.btn_kurzliner.Name = "btn_kurzliner"; - this.btn_kurzliner.Size = new System.Drawing.Size(249, 71); + this.btn_kurzliner.Size = new System.Drawing.Size(187, 58); this.btn_kurzliner.TabIndex = 2; - this.btn_kurzliner.Text = "btn_kurzliner"; + this.btn_kurzliner.Text = "Kurzliner"; this.btn_kurzliner.UseVisualStyleBackColor = true; this.btn_kurzliner.Click += new System.EventHandler(this.btn_kurzliner_Click); // // btn_hut // this.btn_hut.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_hut.Location = new System.Drawing.Point(816, 15); - this.btn_hut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btn_hut.Location = new System.Drawing.Point(612, 12); this.btn_hut.Name = "btn_hut"; - this.btn_hut.Size = new System.Drawing.Size(249, 71); + this.btn_hut.Size = new System.Drawing.Size(187, 58); this.btn_hut.TabIndex = 3; - this.btn_hut.Text = "btn_hutprofil"; + this.btn_hut.Text = "Hutprofil"; this.btn_hut.UseVisualStyleBackColor = true; this.btn_hut.Click += new System.EventHandler(this.btn_hut_Click); // // frmSelectNewSan // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1085, 107); + this.ClientSize = new System.Drawing.Size(814, 87); this.Controls.Add(this.btn_hut); this.Controls.Add(this.btn_kurzliner); this.Controls.Add(this.btn_schacht_anb); this.Controls.Add(this.btn_inliner); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "frmSelectNewSan"; this.Text = "FrmSelectNewSan"; this.ResumeLayout(false); diff --git a/SanSystem/FrmSelectNewSan.cs b/SanSystem/FrmSelectNewSan.cs index dd848cb..79b3101 100644 --- a/SanSystem/FrmSelectNewSan.cs +++ b/SanSystem/FrmSelectNewSan.cs @@ -90,10 +90,6 @@ namespace SanSystem { InitializeComponent(); - btn_inliner.Text = Global.Instance.language.Labels["inliner"]; - btn_hut.Text = Global.Instance.language.Labels["hut"]; - btn_kurzliner.Text = Global.Instance.language.Labels["kurzliner"]; - btn_schacht_anb.Text = Global.Instance.language.Labels["schacht_an"]; using (Dongle dongle = new Dongle(60)) { @@ -101,7 +97,7 @@ namespace SanSystem btn_kurzliner.Enabled = dongle.IsLicensed((byte)Sanierungsarten.KURZLINER) ? true : false; //sanArt.SanierungActivated(Sanierungsarten.KURZLINER); btn_hut.Enabled = dongle.IsLicensed((byte)Sanierungsarten.HUTPROFIL) ? true : false;// sanArt.SanierungActivated(Sanierungsarten.HUTPROFIL); btn_schacht_anb.Enabled = dongle.IsLicensed((byte)Sanierungsarten.SCHACHTANBINDUNG) ? true : false; // sanArt.SanierungActivated(Sanierungsarten.SCHACHTANBINDUNG); - //1btn_hut.Enabled = btn_kurzliner.Enabled = false; + dongle.CleanDongle(); } diff --git a/SanSystem/Global.cs b/SanSystem/Global.cs index dd5db30..eac87bc 100644 --- a/SanSystem/Global.cs +++ b/SanSystem/Global.cs @@ -113,7 +113,6 @@ namespace SanSystem return Path.Combine(Properties.Settings.Default.DATABASEMAIN,speicherpfad_to_projekts, projektpfad); } } - public ILanguage language = null; public static Global Instance { @@ -195,11 +194,6 @@ namespace SanSystem } - public void LoadLanguage() - { - language = Language.Language.GetLanguage(Language.BUILTINLANGUAGES.GERMAN); - } - public Global() { LadeRegistry(); diff --git a/SanSystem/Program.cs b/SanSystem/Program.cs index c2de1c8..229342f 100644 --- a/SanSystem/Program.cs +++ b/SanSystem/Program.cs @@ -30,7 +30,7 @@ namespace SanSystem { dongle.CleanDongle(); - Global.Instance.LoadLanguage(); + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new frmMain()); diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index ec49594..5d76bbf 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -395,10 +395,6 @@ {c82bd650-466b-403f-bed9-2b1660771f54} KlassenBIB - - {be364e88-92da-4a6c-97e7-ddd7d887b3d4} - Language - {c949087e-20e1-4a17-b021-faead363c1d8} SanShared diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index a80d72d..73e0369 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -58,9 +58,7 @@ namespace SanSystem this.StartPosition = FormStartPosition.Manual; this.Location = new Point(0, 0); - projektToolStripMenuItem.Text = Global.Instance.language.Labels["mainmenu_projekt"]; - neuToolStripMenuItem.Text = Global.Instance.language.Labels["mainmenu_projekt_new"]; - öffnenToolStripMenuItem.Text = Global.Instance.language.Labels["mainmenu_projekt_open"]; + toolStripStatus_projekt_Label.Text = Datenbank.Instance.projekt; this.Text += " " + Global.Instance.PROGRAMMVERSION; diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index 192dad8..f45e46d 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -35,6 +35,8 @@ this.Kanalinformationen = new System.Windows.Forms.TabPage(); this.dgv_schadenkuerzel = new System.Windows.Forms.DataGridView(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.btn_auftraggeber = new System.Windows.Forms.Button(); + this.cb_overrideAuftraggeber = new System.Windows.Forms.CheckBox(); this.txt_san_nr = new System.Windows.Forms.TextBox(); this.txt_ort = new System.Windows.Forms.TextBox(); this.txt_bemerkung = new System.Windows.Forms.TextBox(); @@ -68,8 +70,6 @@ this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.tabControl1 = new System.Windows.Forms.TabControl(); - this.cb_overrideAuftraggeber = new System.Windows.Forms.CheckBox(); - this.btn_auftraggeber = new System.Windows.Forms.Button(); this.tabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgv_sanierungen)).BeginInit(); this.Kanalinformationen.SuspendLayout(); @@ -88,7 +88,7 @@ this.btn_add_san.Name = "btn_add_san"; this.btn_add_san.Size = new System.Drawing.Size(202, 50); this.btn_add_san.TabIndex = 30; - this.btn_add_san.Text = "Add San"; + this.btn_add_san.Text = "Sanierung hinzufügen"; this.btn_add_san.UseVisualStyleBackColor = true; this.btn_add_san.Click += new System.EventHandler(this.btn_add_san_Click); // @@ -101,17 +101,17 @@ this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(181, 50); this.btn_close.TabIndex = 29; - this.btn_close.Text = "Close"; + this.btn_close.Text = "Schließen"; this.btn_close.UseVisualStyleBackColor = true; this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // // tabPage2 // this.tabPage2.Controls.Add(this.dgv_sanierungen); - this.tabPage2.Location = new System.Drawing.Point(4, 34); + this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1282, 651); + this.tabPage2.Size = new System.Drawing.Size(1282, 656); this.tabPage2.TabIndex = 2; this.tabPage2.Text = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; @@ -130,10 +130,10 @@ // Kanalinformationen // this.Kanalinformationen.Controls.Add(this.dgv_schadenkuerzel); - this.Kanalinformationen.Location = new System.Drawing.Point(4, 34); + this.Kanalinformationen.Location = new System.Drawing.Point(4, 29); this.Kanalinformationen.Name = "Kanalinformationen"; this.Kanalinformationen.Padding = new System.Windows.Forms.Padding(3); - this.Kanalinformationen.Size = new System.Drawing.Size(1282, 651); + this.Kanalinformationen.Size = new System.Drawing.Size(1282, 656); this.Kanalinformationen.TabIndex = 1; this.Kanalinformationen.Text = "Kanalinformationen"; this.Kanalinformationen.UseVisualStyleBackColor = true; @@ -182,21 +182,44 @@ 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, 34); + this.tabPage1.Location = new System.Drawing.Point(4, 29); 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(1282, 651); + this.tabPage1.Size = new System.Drawing.Size(1282, 656); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Grunddaten"; this.tabPage1.UseVisualStyleBackColor = true; // + // btn_auftraggeber + // + this.btn_auftraggeber.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_auftraggeber.Location = new System.Drawing.Point(670, 226); + this.btn_auftraggeber.Name = "btn_auftraggeber"; + this.btn_auftraggeber.Size = new System.Drawing.Size(268, 103); + this.btn_auftraggeber.TabIndex = 34; + this.btn_auftraggeber.Text = "Auftraggeber"; + this.btn_auftraggeber.UseVisualStyleBackColor = true; + this.btn_auftraggeber.Click += new System.EventHandler(this.Btn_auftraggeber_Click); + // + // cb_overrideAuftraggeber + // + this.cb_overrideAuftraggeber.AutoSize = true; + this.cb_overrideAuftraggeber.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cb_overrideAuftraggeber.Location = new System.Drawing.Point(590, 191); + this.cb_overrideAuftraggeber.Name = "cb_overrideAuftraggeber"; + this.cb_overrideAuftraggeber.Size = new System.Drawing.Size(190, 24); + this.cb_overrideAuftraggeber.TabIndex = 33; + this.cb_overrideAuftraggeber.Text = "Spezielle Auftraggeber"; + this.cb_overrideAuftraggeber.UseVisualStyleBackColor = true; + this.cb_overrideAuftraggeber.CheckedChanged += new System.EventHandler(this.Cb_overrideAuftraggeber_CheckedChanged); + // // txt_san_nr // this.txt_san_nr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_san_nr.Location = new System.Drawing.Point(745, 29); this.txt_san_nr.Name = "txt_san_nr"; - this.txt_san_nr.Size = new System.Drawing.Size(191, 30); + this.txt_san_nr.Size = new System.Drawing.Size(191, 26); this.txt_san_nr.TabIndex = 7; // // txt_ort @@ -204,7 +227,7 @@ this.txt_ort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_ort.Location = new System.Drawing.Point(745, 145); this.txt_ort.Name = "txt_ort"; - this.txt_ort.Size = new System.Drawing.Size(191, 30); + this.txt_ort.Size = new System.Drawing.Size(191, 26); this.txt_ort.TabIndex = 9; // // txt_bemerkung @@ -220,7 +243,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, 30); + this.txt_objekt_name.Size = new System.Drawing.Size(330, 26); this.txt_objekt_name.TabIndex = 2; // // txt_hausnummer @@ -229,7 +252,7 @@ this.txt_hausnummer.Location = new System.Drawing.Point(745, 107); 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, 30); + this.txt_hausnummer.Size = new System.Drawing.Size(148, 26); this.txt_hausnummer.TabIndex = 8; // // txt_strasse @@ -238,7 +261,7 @@ this.txt_strasse.Location = new System.Drawing.Point(745, 67); 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, 30); + this.txt_strasse.Size = new System.Drawing.Size(320, 26); this.txt_strasse.TabIndex = 7; // // txt_dn @@ -247,7 +270,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, 30); + this.txt_dn.Size = new System.Drawing.Size(330, 26); this.txt_dn.TabIndex = 5; // // txt_punkt_bis @@ -256,7 +279,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, 30); + this.txt_punkt_bis.Size = new System.Drawing.Size(330, 26); this.txt_punkt_bis.TabIndex = 4; this.txt_punkt_bis.Leave += new System.EventHandler(this.Txt_punkt_bis_Leave); // @@ -266,7 +289,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, 30); + this.txt_punkt_von.Size = new System.Drawing.Size(330, 26); this.txt_punkt_von.TabIndex = 3; this.txt_punkt_von.TextChanged += new System.EventHandler(this.txt_punkt_von_TextChanged); // @@ -276,7 +299,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, 30); + this.txt_pro_nr.Size = new System.Drawing.Size(330, 26); this.txt_pro_nr.TabIndex = 1; // // label9 @@ -285,7 +308,7 @@ this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.Location = new System.Drawing.Point(585, 32); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(84, 25); + this.label9.Size = new System.Drawing.Size(66, 20); this.label9.TabIndex = 32; this.label9.Text = "SAN. Nr"; // @@ -308,7 +331,7 @@ this.cb_objekname_man.AutoSize = true; this.cb_objekname_man.Location = new System.Drawing.Point(108, 70); this.cb_objekname_man.Name = "cb_objekname_man"; - this.cb_objekname_man.Size = new System.Drawing.Size(72, 24); + this.cb_objekname_man.Size = new System.Drawing.Size(59, 20); this.cb_objekname_man.TabIndex = 29; this.cb_objekname_man.Text = "man?"; this.cb_objekname_man.UseVisualStyleBackColor = true; @@ -320,7 +343,7 @@ this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.Location = new System.Drawing.Point(601, 340); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(112, 25); + this.label8.Size = new System.Drawing.Size(91, 20); this.label8.TabIndex = 28; this.label8.Text = "Bemerkung"; // @@ -330,7 +353,7 @@ this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.Location = new System.Drawing.Point(584, 148); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(39, 25); + this.label7.Size = new System.Drawing.Size(31, 20); this.label7.TabIndex = 27; this.label7.Text = "Ort"; // @@ -340,7 +363,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(118, 25); + this.lbl_objektname.Size = new System.Drawing.Size(95, 20); this.lbl_objektname.TabIndex = 25; this.lbl_objektname.Text = "Objektname"; // @@ -387,7 +410,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, 33); + this.cb_material.Size = new System.Drawing.Size(323, 28); this.cb_material.TabIndex = 6; // // groupBox2 @@ -409,7 +432,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, 30); + this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 26); this.txt_haltungslaenge.TabIndex = 11; // // txt_laenge_schacht @@ -417,7 +440,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, 30); + this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 26); this.txt_laenge_schacht.TabIndex = 13; // // label21 @@ -426,7 +449,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(132, 25); + this.label21.Size = new System.Drawing.Size(107, 20); this.label21.TabIndex = 21; this.label21.Text = "Schachtlänge"; // @@ -436,7 +459,7 @@ this.cb_geschlossenesEnde.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cb_geschlossenesEnde.Location = new System.Drawing.Point(9, 75); this.cb_geschlossenesEnde.Name = "cb_geschlossenesEnde"; - this.cb_geschlossenesEnde.Size = new System.Drawing.Size(210, 29); + this.cb_geschlossenesEnde.Size = new System.Drawing.Size(172, 24); this.cb_geschlossenesEnde.TabIndex = 12; this.cb_geschlossenesEnde.Text = "Geschlossene Ende"; this.cb_geschlossenesEnde.UseVisualStyleBackColor = true; @@ -448,7 +471,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(137, 25); + this.label6.Size = new System.Drawing.Size(112, 20); this.label6.TabIndex = 5; this.label6.Text = "Haltungslänge"; // @@ -461,7 +484,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, 30); + this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 26); this.dt_haltunggemessen_datum.TabIndex = 10; // // label20 @@ -471,7 +494,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(265, 25); + this.label20.Size = new System.Drawing.Size(216, 20); this.label20.TabIndex = 16; this.label20.Text = "Haltungslänge gemessen am"; // @@ -482,7 +505,7 @@ this.label19.Location = new System.Drawing.Point(584, 111); this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(129, 25); + this.label19.Size = new System.Drawing.Size(105, 20); this.label19.TabIndex = 13; this.label19.Text = "Hausnummer"; // @@ -493,7 +516,7 @@ this.label18.Location = new System.Drawing.Point(584, 72); this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(79, 25); + this.label18.Size = new System.Drawing.Size(64, 20); this.label18.TabIndex = 12; this.label18.Text = "Strasse"; // @@ -504,7 +527,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(81, 25); + this.label5.Size = new System.Drawing.Size(65, 20); this.label5.TabIndex = 4; this.label5.Text = "Material"; // @@ -515,7 +538,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(128, 25); + this.label4.Size = new System.Drawing.Size(104, 20); this.label4.TabIndex = 3; this.label4.Text = "Durchmesser"; // @@ -526,7 +549,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(94, 25); + this.label3.Size = new System.Drawing.Size(76, 20); this.label3.TabIndex = 2; this.label3.Text = "Bis Punkt"; // @@ -537,7 +560,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(103, 25); + this.label2.Size = new System.Drawing.Size(83, 20); this.label2.TabIndex = 1; this.label2.Text = "Von Punkt"; // @@ -548,7 +571,7 @@ 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(143, 25); + this.label1.Size = new System.Drawing.Size(116, 20); this.label1.TabIndex = 0; this.label1.Text = "Projektnummer"; // @@ -566,32 +589,9 @@ this.tabControl1.TabIndex = 0; this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // - // cb_overrideAuftraggeber - // - this.cb_overrideAuftraggeber.AutoSize = true; - this.cb_overrideAuftraggeber.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_overrideAuftraggeber.Location = new System.Drawing.Point(590, 191); - this.cb_overrideAuftraggeber.Name = "cb_overrideAuftraggeber"; - this.cb_overrideAuftraggeber.Size = new System.Drawing.Size(232, 29); - this.cb_overrideAuftraggeber.TabIndex = 33; - this.cb_overrideAuftraggeber.Text = "Spezielle Auftraggeber"; - this.cb_overrideAuftraggeber.UseVisualStyleBackColor = true; - this.cb_overrideAuftraggeber.CheckedChanged += new System.EventHandler(this.Cb_overrideAuftraggeber_CheckedChanged); - // - // btn_auftraggeber - // - this.btn_auftraggeber.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_auftraggeber.Location = new System.Drawing.Point(670, 226); - this.btn_auftraggeber.Name = "btn_auftraggeber"; - this.btn_auftraggeber.Size = new System.Drawing.Size(268, 103); - this.btn_auftraggeber.TabIndex = 34; - this.btn_auftraggeber.Text = "Auftraggeber"; - this.btn_auftraggeber.UseVisualStyleBackColor = true; - this.btn_auftraggeber.Click += new System.EventHandler(this.Btn_auftraggeber_Click); - // // frmObjektEdit // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.ClientSize = new System.Drawing.Size(1290, 689); diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index 62ab613..9ddf533 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -33,8 +33,7 @@ namespace SanSystem InitializeComponent(); this.neu = neu; - btn_add_san.Text = Global.Instance.language.Labels["add_san"]; - btn_close.Text = Global.Instance.language.Labels["btn_close"]; + this.inspektionsobjekt = inspektion; #if !DEBUG @@ -179,7 +178,7 @@ namespace SanSystem san.Datum = new DateTime(2018, 01, 01, 12, 00, 00); inspektionsobjekt.Sanierung.Add(san); TabPage tab = new TabPage(); - tab.Text = Global.Instance.language.Labels["inliner"]; + tab.Text = "Schlauchliner"; UCInliner uCInliner = new UCInliner(san); uCInliner.Dock = DockStyle.Fill; tab.Controls.Add(uCInliner); diff --git a/SanSystem/frmObjekteList.Designer.cs b/SanSystem/frmObjekteList.Designer.cs index 2c9f215..e903bb5 100644 --- a/SanSystem/frmObjekteList.Designer.cs +++ b/SanSystem/frmObjekteList.Designer.cs @@ -190,9 +190,9 @@ this.lbl_projwrong.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_projwrong.Location = new System.Drawing.Point(46, 25); this.lbl_projwrong.Name = "lbl_projwrong"; - this.lbl_projwrong.Size = new System.Drawing.Size(51, 20); + this.lbl_projwrong.Size = new System.Drawing.Size(224, 20); this.lbl_projwrong.TabIndex = 13; - this.lbl_projwrong.Text = "label2"; + this.lbl_projwrong.Text = "Projektnummer nicht vergeben"; // // label5 // @@ -210,9 +210,9 @@ this.lbl_grounddata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_grounddata.Location = new System.Drawing.Point(46, 51); this.lbl_grounddata.Name = "lbl_grounddata"; - this.lbl_grounddata.Size = new System.Drawing.Size(51, 20); + this.lbl_grounddata.Size = new System.Drawing.Size(282, 20); this.lbl_grounddata.TabIndex = 15; - this.lbl_grounddata.Text = "label6"; + this.lbl_grounddata.Text = "Grunddaten sind nicht richtig vergeben"; // // gb_error_messages // @@ -225,7 +225,7 @@ this.gb_error_messages.Size = new System.Drawing.Size(480, 103); this.gb_error_messages.TabIndex = 16; this.gb_error_messages.TabStop = false; - this.gb_error_messages.Text = "error_messages"; + this.gb_error_messages.Text = "Fehlermeldungsarten"; // // btn_search // diff --git a/SanSystem/frmObjekteList.cs b/SanSystem/frmObjekteList.cs index 61eed31..2a20b36 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -88,15 +88,10 @@ namespace SanSystem dGObjekte.Columns.Add(checkBoxColumn); } - lbl_ort.Text = Global.Instance.language.Labels["ort"]; - lbl_projekt.Text = Global.Instance.language.Labels["projekt"]; - lbl_street.Text = Global.Instance.language.Labels["street"]; - btn_add.Text = Global.Instance.language.Labels["add_objekt"]; + - gb_error_messages.Text = Global.Instance.language.Labels["error_messages"]; - lbl_grounddata.Text = Global.Instance.language.Labels["error_groundData"]; - lbl_projwrong.Text = Global.Instance.language.Labels["error_projwrong"]; + label1.BackColor = Color.Red; label5.BackColor = Color.Olive; @@ -108,11 +103,11 @@ namespace SanSystem string fehlermeldung = string.Empty; // Prüfen nach Projektnummern List projektnummern = inspektionsobjekte.Select(x => x.Projektnummer).Distinct().ToList(); - if(projektnummern.Count > 1) fehlermeldung = string.Format("{0}", Global.Instance.language.Fehlermeldungen["duplicate_projektnumber_in_street"]); + if (projektnummern.Count > 1) fehlermeldung = "Es sind mehrere Projektnummern in eine gleiche Straße vorhanden"; // Prüfen nach Ortnamen List ortnamen = inspektionsobjekte.Select(x => x.OrtName).Distinct().ToList(); - if (ortnamen.Count > 1) fehlermeldung = string.Format("{0}\n\n{1}",fehlermeldung,Global.Instance.language.Fehlermeldungen["difference_ortnames_in_street"]); + if (ortnamen.Count > 1) fehlermeldung = string.Format("{0}\n\n{1}",fehlermeldung, "Es sind verschiedene Ortnamen angegeben"); if (!fehlermeldung.Equals(string.Empty)) MessageBox.Show(fehlermeldung, "Inhalt Fehler", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -135,9 +130,9 @@ namespace SanSystem else continue; } - if (empProjNummer.Count > 1) MessageBox.Show(Global.Instance.language.Fehlermeldungen["suggest_proj_nr_not_found"]); + if (empProjNummer.Count > 1) MessageBox.Show("Es konnte leider keine empfohlene Projektnummer emittelt werden!"); else - MessageBox.Show(string.Format("{0}\n{1}", Global.Instance.language.Fehlermeldungen["suggest_proj_nr"], empProjNummer.Last())); + MessageBox.Show(string.Format("{0}\n{1}", "Der vermeintliche Projektnummer lautet: ", empProjNummer.Last())); } @@ -146,7 +141,7 @@ namespace SanSystem if (projektnummern.First() == null) { - MessageBox.Show(Global.Instance.language.Fehlermeldungen["wrong_project_number"], "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Projektnummer wurde nicht korrekt vergeben!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } string[] vs = projektnummern.First().Split('-'); diff --git a/SanSystem/frmStrassenList.cs b/SanSystem/frmStrassenList.cs index b579e2e..668f80a 100644 --- a/SanSystem/frmStrassenList.cs +++ b/SanSystem/frmStrassenList.cs @@ -141,7 +141,7 @@ namespace SanSystem rdbtn_ort.Checked = false; } buildStreetList(); - btn_add.Text = Global.Instance.language.Labels["add_objekt"]; + } diff --git a/SanVerwaltung.sln b/SanVerwaltung.sln index 38ee013..e5c0ae1 100644 --- a/SanVerwaltung.sln +++ b/SanVerwaltung.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.156 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.31911.260 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SanSystem", "SanSystem\SanSystem.csproj", "{C6546A88-8830-4EF2-B99C-B9183171F6EF}" EndProject @@ -15,14 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchnittstelleImporter", "Sc EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TempCAN", "TempCAN\TempCAN.csproj", "{E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language", "Language", "{8DB2B84C-B8C5-4C32-82C0-47AD5FADD649}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DE", "DE\DE.csproj", "{FF6C3E9C-0AB0-4C67-A150-318C22734FBD}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SanShared", "SanShared\SanShared.csproj", "{C949087E-20E1-4A17-B021-FAEAD363C1D8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Language", "Language\Language.csproj", "{BE364E88-92DA-4A6C-97E7-DDD7D887B3D4}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BerichtGen", "BerichtGen\BerichtGen.csproj", "{3022DA07-FD06-4AEA-9FC8-00D318E95A82}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchnittstelleImporterTests", "SchnittstelleImporterTests\SchnittstelleImporterTests.csproj", "{9264791A-9D57-4133-BE47-75721057DBBB}" @@ -65,18 +59,10 @@ Global {E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}.Debug|Any CPU.Build.0 = Debug|Any CPU {E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}.Release|Any CPU.Build.0 = Release|Any CPU - {FF6C3E9C-0AB0-4C67-A150-318C22734FBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF6C3E9C-0AB0-4C67-A150-318C22734FBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF6C3E9C-0AB0-4C67-A150-318C22734FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF6C3E9C-0AB0-4C67-A150-318C22734FBD}.Release|Any CPU.Build.0 = Release|Any CPU {C949087E-20E1-4A17-B021-FAEAD363C1D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C949087E-20E1-4A17-B021-FAEAD363C1D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {C949087E-20E1-4A17-B021-FAEAD363C1D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {C949087E-20E1-4A17-B021-FAEAD363C1D8}.Release|Any CPU.Build.0 = Release|Any CPU - {BE364E88-92DA-4A6C-97E7-DDD7D887B3D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE364E88-92DA-4A6C-97E7-DDD7D887B3D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE364E88-92DA-4A6C-97E7-DDD7D887B3D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE364E88-92DA-4A6C-97E7-DDD7D887B3D4}.Release|Any CPU.Build.0 = Release|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Debug|Any CPU.Build.0 = Debug|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -103,8 +89,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {0FEC903E-6C9F-48AC-A207-0BACA184AAA8} = {DDF8C748-82A0-4FFC-8EE1-9C81C26A75E3} - {FF6C3E9C-0AB0-4C67-A150-318C22734FBD} = {8DB2B84C-B8C5-4C32-82C0-47AD5FADD649} - {BE364E88-92DA-4A6C-97E7-DDD7D887B3D4} = {8DB2B84C-B8C5-4C32-82C0-47AD5FADD649} {9264791A-9D57-4133-BE47-75721057DBBB} = {DDF8C748-82A0-4FFC-8EE1-9C81C26A75E3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution