diff --git a/KlassenBIB/Inspektionsobjekt.cs b/KlassenBIB/Inspektionsobjekt.cs index ebe3db7..3bd47a1 100644 --- a/KlassenBIB/Inspektionsobjekt.cs +++ b/KlassenBIB/Inspektionsobjekt.cs @@ -85,6 +85,10 @@ namespace KlassenBIB /// /// /// + public string Sanierungsnummer { get; set; } + /// + /// + /// public Guid Guid { get; set; } /// /// diff --git a/SanSystem/Properties/Resources.Designer.cs b/SanSystem/Properties/Resources.Designer.cs index 978bcd1..9de9c3c 100644 --- a/SanSystem/Properties/Resources.Designer.cs +++ b/SanSystem/Properties/Resources.Designer.cs @@ -22,7 +22,7 @@ namespace SanSystem.Properties { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { + public class Resources { private static global::System.Resources.ResourceManager resourceMan; @@ -36,7 +36,7 @@ namespace SanSystem.Properties { /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SanSystem.Properties.Resources", typeof(Resources).Assembly); @@ -51,7 +51,7 @@ namespace SanSystem.Properties { /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -59,5 +59,225 @@ namespace SanSystem.Properties { resourceCulture = value; } } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). + /// + public static System.Drawing.Icon add { + get { + object obj = ResourceManager.GetObject("add", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Add1 { + get { + object obj = ResourceManager.GetObject("Add1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). + /// + public static System.Drawing.Icon application { + get { + object obj = ResourceManager.GetObject("application", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). + /// + public static System.Drawing.Icon apply { + get { + object obj = ResourceManager.GetObject("apply", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Apply1 { + get { + object obj = ResourceManager.GetObject("Apply1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). + /// + public static System.Drawing.Icon close { + get { + object obj = ResourceManager.GetObject("close", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Close1 { + get { + object obj = ResourceManager.GetObject("Close1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Create { + get { + object obj = ResourceManager.GetObject("Create", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Danger { + get { + object obj = ResourceManager.GetObject("Danger", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Database { + get { + object obj = ResourceManager.GetObject("Database", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). + /// + public static System.Drawing.Icon delete { + get { + object obj = ResourceManager.GetObject("delete", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Delete1 { + get { + object obj = ResourceManager.GetObject("Delete1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Erase { + get { + object obj = ResourceManager.GetObject("Erase", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Error { + get { + object obj = ResourceManager.GetObject("Error", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Find { + get { + object obj = ResourceManager.GetObject("Find", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap List { + get { + object obj = ResourceManager.GetObject("List", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Modify { + get { + object obj = ResourceManager.GetObject("Modify", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap New_document { + get { + object obj = ResourceManager.GetObject("New_document", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap OK { + get { + object obj = ResourceManager.GetObject("OK", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Save { + get { + object obj = ResourceManager.GetObject("Save", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Turn_off { + get { + object obj = ResourceManager.GetObject("Turn_off", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Yes { + get { + object obj = ResourceManager.GetObject("Yes", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/SanSystem/Properties/Resources.resx b/SanSystem/Properties/Resources.resx index af7dbeb..4f703da 100644 --- a/SanSystem/Properties/Resources.resx +++ b/SanSystem/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,76 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\add.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Add.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\application.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\apply.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Apply.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\close.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Close.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Create.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Danger.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Database.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\delete.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Delete.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Erase.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Error.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Find.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\List.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Modify.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\New document.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OK.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Turn off.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Yes.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/SanSystem/Resources/Add.bmp b/SanSystem/Resources/Add.bmp new file mode 100644 index 0000000..9100274 Binary files /dev/null and b/SanSystem/Resources/Add.bmp differ diff --git a/SanSystem/Resources/Apply.bmp b/SanSystem/Resources/Apply.bmp new file mode 100644 index 0000000..49c2dda Binary files /dev/null and b/SanSystem/Resources/Apply.bmp differ diff --git a/SanSystem/Resources/Close.bmp b/SanSystem/Resources/Close.bmp new file mode 100644 index 0000000..eccdc85 Binary files /dev/null and b/SanSystem/Resources/Close.bmp differ diff --git a/SanSystem/Resources/Create.bmp b/SanSystem/Resources/Create.bmp new file mode 100644 index 0000000..05c59a8 Binary files /dev/null and b/SanSystem/Resources/Create.bmp differ diff --git a/SanSystem/Resources/Danger.bmp b/SanSystem/Resources/Danger.bmp new file mode 100644 index 0000000..e5ce362 Binary files /dev/null and b/SanSystem/Resources/Danger.bmp differ diff --git a/SanSystem/Resources/Database.bmp b/SanSystem/Resources/Database.bmp new file mode 100644 index 0000000..3c1706b Binary files /dev/null and b/SanSystem/Resources/Database.bmp differ diff --git a/SanSystem/Resources/Delete.bmp b/SanSystem/Resources/Delete.bmp new file mode 100644 index 0000000..0381a6f Binary files /dev/null and b/SanSystem/Resources/Delete.bmp differ diff --git a/SanSystem/Resources/Erase.bmp b/SanSystem/Resources/Erase.bmp new file mode 100644 index 0000000..aca8a43 Binary files /dev/null and b/SanSystem/Resources/Erase.bmp differ diff --git a/SanSystem/Resources/Error.bmp b/SanSystem/Resources/Error.bmp new file mode 100644 index 0000000..93ef96a Binary files /dev/null and b/SanSystem/Resources/Error.bmp differ diff --git a/SanSystem/Resources/Find.bmp b/SanSystem/Resources/Find.bmp new file mode 100644 index 0000000..0056e19 Binary files /dev/null and b/SanSystem/Resources/Find.bmp differ diff --git a/SanSystem/Resources/Icon1.ico b/SanSystem/Resources/Icon1.ico new file mode 100644 index 0000000..5d06b9f Binary files /dev/null and b/SanSystem/Resources/Icon1.ico differ diff --git a/SanSystem/Resources/Image1.png b/SanSystem/Resources/Image1.png new file mode 100644 index 0000000..3e9d6ed Binary files /dev/null and b/SanSystem/Resources/Image1.png differ diff --git a/SanSystem/Resources/List.bmp b/SanSystem/Resources/List.bmp new file mode 100644 index 0000000..c8c5a27 Binary files /dev/null and b/SanSystem/Resources/List.bmp differ diff --git a/SanSystem/Resources/Modify.bmp b/SanSystem/Resources/Modify.bmp new file mode 100644 index 0000000..43c0156 Binary files /dev/null and b/SanSystem/Resources/Modify.bmp differ diff --git a/SanSystem/Resources/New document.bmp b/SanSystem/Resources/New document.bmp new file mode 100644 index 0000000..a55a4da Binary files /dev/null and b/SanSystem/Resources/New document.bmp differ diff --git a/SanSystem/Resources/OK.bmp b/SanSystem/Resources/OK.bmp new file mode 100644 index 0000000..8294be2 Binary files /dev/null and b/SanSystem/Resources/OK.bmp differ diff --git a/SanSystem/Resources/Save.bmp b/SanSystem/Resources/Save.bmp new file mode 100644 index 0000000..e540df4 Binary files /dev/null and b/SanSystem/Resources/Save.bmp differ diff --git a/SanSystem/Resources/Turn off.bmp b/SanSystem/Resources/Turn off.bmp new file mode 100644 index 0000000..e8e5fc3 Binary files /dev/null and b/SanSystem/Resources/Turn off.bmp differ diff --git a/SanSystem/Resources/Yes.bmp b/SanSystem/Resources/Yes.bmp new file mode 100644 index 0000000..0951396 Binary files /dev/null and b/SanSystem/Resources/Yes.bmp differ diff --git a/SanSystem/Resources/add.ico b/SanSystem/Resources/add.ico new file mode 100644 index 0000000..de5f68c Binary files /dev/null and b/SanSystem/Resources/add.ico differ diff --git a/SanSystem/Resources/application.ico b/SanSystem/Resources/application.ico new file mode 100644 index 0000000..e5c82d6 Binary files /dev/null and b/SanSystem/Resources/application.ico differ diff --git a/SanSystem/Resources/apply.ico b/SanSystem/Resources/apply.ico new file mode 100644 index 0000000..0d8a8e7 Binary files /dev/null and b/SanSystem/Resources/apply.ico differ diff --git a/SanSystem/Resources/close.ico b/SanSystem/Resources/close.ico new file mode 100644 index 0000000..ffa3802 Binary files /dev/null and b/SanSystem/Resources/close.ico differ diff --git a/SanSystem/Resources/delete.ico b/SanSystem/Resources/delete.ico new file mode 100644 index 0000000..fa55fc7 Binary files /dev/null and b/SanSystem/Resources/delete.ico differ diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 1d1b165..448121b 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -208,7 +208,7 @@ frmMain.cs - ResXFileCodeGenerator + PublicResXFileCodeGenerator Resources.Designer.cs Designer @@ -289,6 +289,78 @@ Always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + git rev-parse HEAD > "$(ProjectDir)\version.txt" diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index fc5c998..d8c974e 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -31,6 +31,7 @@ this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.btn_delete = new System.Windows.Forms.Button(); + this.btn_close = new System.Windows.Forms.Button(); this.cb_objekname_man = new System.Windows.Forms.CheckBox(); this.label8 = new System.Windows.Forms.Label(); this.txt_ort = new System.Windows.Forms.TextBox(); @@ -62,8 +63,9 @@ this.label1 = new System.Windows.Forms.Label(); this.Kanalinformationen = new System.Windows.Forms.TabPage(); this.dgv_schadenkuerzel = new System.Windows.Forms.DataGridView(); - this.btn_close = new System.Windows.Forms.Button(); this.btn_add_san = new System.Windows.Forms.Button(); + this.label9 = new System.Windows.Forms.Label(); + this.txt_san_nr = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -86,7 +88,10 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.txt_san_nr); + this.tabPage1.Controls.Add(this.label9); this.tabPage1.Controls.Add(this.btn_delete); + this.tabPage1.Controls.Add(this.btn_close); this.tabPage1.Controls.Add(this.cb_objekname_man); this.tabPage1.Controls.Add(this.label8); this.tabPage1.Controls.Add(this.txt_ort); @@ -125,6 +130,8 @@ // this.btn_delete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btn_delete.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_delete.Image = global::SanSystem.Properties.Resources.Delete1; + this.btn_delete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btn_delete.Location = new System.Drawing.Point(428, 608); this.btn_delete.Name = "btn_delete"; this.btn_delete.Size = new System.Drawing.Size(166, 49); @@ -133,6 +140,19 @@ this.btn_delete.UseVisualStyleBackColor = true; this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click); // + // btn_close + // + this.btn_close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btn_close.Image = global::SanSystem.Properties.Resources.Close1; + this.btn_close.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.btn_close.Location = new System.Drawing.Point(24, 606); + 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.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); + // // cb_objekname_man // this.cb_objekname_man.AutoSize = true; @@ -157,7 +177,7 @@ // txt_ort // 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, 139); + 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.TabIndex = 9; @@ -166,7 +186,7 @@ // this.label7.AutoSize = true; 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, 136); + this.label7.Location = new System.Drawing.Point(584, 148); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(39, 25); this.label7.TabIndex = 27; @@ -332,7 +352,7 @@ // txt_hausnummer // this.txt_hausnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_hausnummer.Location = new System.Drawing.Point(758, 85); + 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); @@ -341,7 +361,7 @@ // txt_strasse // this.txt_strasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_strasse.Location = new System.Drawing.Point(758, 35); + 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); @@ -351,7 +371,7 @@ // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label19.Location = new System.Drawing.Point(560, 89); + 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); @@ -362,7 +382,7 @@ // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label18.Location = new System.Drawing.Point(560, 40); + 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); @@ -485,20 +505,11 @@ this.dgv_schadenkuerzel.TabIndex = 0; this.dgv_schadenkuerzel.RowHeaderMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgv_schadenkuerzel_RowHeaderMouseDoubleClick); // - // 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); - this.btn_close.TabIndex = 29; - this.btn_close.Text = "Close"; - this.btn_close.UseVisualStyleBackColor = true; - this.btn_close.Click += new System.EventHandler(this.btn_close_Click); - // // btn_add_san // this.btn_add_san.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btn_add_san.Image = global::SanSystem.Properties.Resources.Add1; + this.btn_add_san.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btn_add_san.Location = new System.Drawing.Point(224, 641); this.btn_add_san.Name = "btn_add_san"; this.btn_add_san.Size = new System.Drawing.Size(202, 50); @@ -507,6 +518,24 @@ this.btn_add_san.UseVisualStyleBackColor = true; this.btn_add_san.Click += new System.EventHandler(this.btn_add_san_Click); // + // label9 + // + this.label9.AutoSize = true; + 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.TabIndex = 32; + this.label9.Text = "SAN. Nr"; + // + // 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.TabIndex = 7; + // // frmObjektEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); @@ -515,7 +544,6 @@ 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.SizableToolWindow; @@ -572,5 +600,7 @@ private System.Windows.Forms.CheckBox cb_objekname_man; private System.Windows.Forms.TabPage Kanalinformationen; private System.Windows.Forms.DataGridView dgv_schadenkuerzel; + private System.Windows.Forms.TextBox txt_san_nr; + private System.Windows.Forms.Label label9; } } \ No newline at end of file diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index d9506a6..c43336b 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -85,6 +85,7 @@ namespace SanSystem dt_haltunggemessen_datum.DataBindings.Add(new Binding("Value", inspektionsobjekt, "HaltungGemessen")); txt_bemerkung.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Bemerkung")); cb_geschlossenesEnde.DataBindings.Add(new Binding("Checked", inspektionsobjekt, "GeschlossenesEnde")); + txt_san_nr.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Sanierungsnummer")); } private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) @@ -113,6 +114,7 @@ namespace SanSystem dt_haltunggemessen_datum.DataBindings.Clear(); txt_bemerkung.DataBindings.Clear(); txt_ort.DataBindings.Clear(); + txt_san_nr.DataBindings.Clear(); cb_geschlossenesEnde.DataBindings.Clear(); //MessageBox.Show(string.Format("width: {0} height: {1}", width, height)); diff --git a/SanSystem/frmStrassenList.Designer.cs b/SanSystem/frmStrassenList.Designer.cs index f5689f6..ea1e4ff 100644 --- a/SanSystem/frmStrassenList.Designer.cs +++ b/SanSystem/frmStrassenList.Designer.cs @@ -39,34 +39,37 @@ | System.Windows.Forms.AnchorStyles.Right))); this.lst_strassen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lst_strassen.FormattingEnabled = true; - this.lst_strassen.ItemHeight = 20; - this.lst_strassen.Location = new System.Drawing.Point(12, 79); - this.lst_strassen.Margin = new System.Windows.Forms.Padding(2); + this.lst_strassen.ItemHeight = 25; + this.lst_strassen.Location = new System.Drawing.Point(16, 122); + this.lst_strassen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lst_strassen.Name = "lst_strassen"; - this.lst_strassen.Size = new System.Drawing.Size(190, 464); + this.lst_strassen.Size = new System.Drawing.Size(252, 529); this.lst_strassen.TabIndex = 0; this.lst_strassen.DoubleClick += new System.EventHandler(this.lst_strassen_DoubleClick); // // btn_add // this.btn_add.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_add.Location = new System.Drawing.Point(12, 12); + this.btn_add.Image = global::SanSystem.Properties.Resources.Add1; + this.btn_add.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.btn_add.Location = new System.Drawing.Point(16, 15); + this.btn_add.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btn_add.Name = "btn_add"; - this.btn_add.Size = new System.Drawing.Size(188, 59); + this.btn_add.Size = new System.Drawing.Size(251, 101); this.btn_add.TabIndex = 1; - this.btn_add.Text = "Neues Objekt hinzufügen"; + this.btn_add.Text = "Neues \r\nObjekt hinzufügen"; this.btn_add.UseVisualStyleBackColor = true; this.btn_add.Click += new System.EventHandler(this.btn_add_Click); // // frmStrassenList // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(212, 546); + this.ClientSize = new System.Drawing.Size(283, 672); this.ControlBox = false; this.Controls.Add(this.btn_add); this.Controls.Add(this.lst_strassen); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "frmStrassenList"; this.Text = "Strassen"; this.Load += new System.EventHandler(this.frmStrassenList_Load);