From 81fd7f6a4c5bc8c3328a7e6a962a3028b7ac6ec3 Mon Sep 17 00:00:00 2001 From: Kilian Wirl Date: Wed, 8 Apr 2026 09:24:27 +0200 Subject: [PATCH 1/2] Setup erstellt --- AA-Forms/FormExpedit.Designer.cs | 40 +- Properties/AssemblyInfo.cs | 4 +- SetupVerwaltung/SetupVerwaltung.vdproj | 1236 ++++++++++-------------- Verwaltung_ReadMe.txt | 16 +- 4 files changed, 538 insertions(+), 758 deletions(-) diff --git a/AA-Forms/FormExpedit.Designer.cs b/AA-Forms/FormExpedit.Designer.cs index 4848478..f4d8303 100644 --- a/AA-Forms/FormExpedit.Designer.cs +++ b/AA-Forms/FormExpedit.Designer.cs @@ -192,12 +192,12 @@ this.tableLayoutPanelInfo.Controls.Add(this.labelAnmerkung, 0, 0); this.tableLayoutPanelInfo.Controls.Add(this.labelAufgabe, 0, 1); this.tableLayoutPanelInfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanelInfo.Location = new System.Drawing.Point(3, 22); + this.tableLayoutPanelInfo.Location = new System.Drawing.Point(3, 31); this.tableLayoutPanelInfo.Name = "tableLayoutPanelInfo"; this.tableLayoutPanelInfo.RowCount = 2; this.tableLayoutPanelInfo.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanelInfo.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanelInfo.Size = new System.Drawing.Size(287, 158); + this.tableLayoutPanelInfo.Size = new System.Drawing.Size(287, 149); this.tableLayoutPanelInfo.TabIndex = 0; // // labelAnmerkung @@ -207,7 +207,7 @@ this.labelAnmerkung.ForeColor = System.Drawing.Color.Red; this.labelAnmerkung.Location = new System.Drawing.Point(3, 0); this.labelAnmerkung.Name = "labelAnmerkung"; - this.labelAnmerkung.Size = new System.Drawing.Size(281, 79); + this.labelAnmerkung.Size = new System.Drawing.Size(281, 74); this.labelAnmerkung.TabIndex = 0; this.labelAnmerkung.Text = "label2"; // @@ -215,9 +215,9 @@ // this.labelAufgabe.AutoSize = true; this.labelAufgabe.Dock = System.Windows.Forms.DockStyle.Fill; - this.labelAufgabe.Location = new System.Drawing.Point(3, 79); + this.labelAufgabe.Location = new System.Drawing.Point(3, 74); this.labelAufgabe.Name = "labelAufgabe"; - this.labelAufgabe.Size = new System.Drawing.Size(281, 79); + this.labelAufgabe.Size = new System.Drawing.Size(281, 75); this.labelAufgabe.TabIndex = 1; this.labelAufgabe.Text = "label3"; // @@ -270,9 +270,9 @@ // tabPageRampe // this.tabPageRampe.Controls.Add(this.objectListViewRampe); - this.tabPageRampe.Location = new System.Drawing.Point(4, 34); + this.tabPageRampe.Location = new System.Drawing.Point(4, 46); this.tabPageRampe.Name = "tabPageRampe"; - this.tabPageRampe.Size = new System.Drawing.Size(890, 584); + this.tabPageRampe.Size = new System.Drawing.Size(890, 572); this.tabPageRampe.TabIndex = 3; this.tabPageRampe.Text = "Rampe"; this.tabPageRampe.UseVisualStyleBackColor = true; @@ -291,7 +291,7 @@ this.objectListViewRampe.Location = new System.Drawing.Point(0, 0); this.objectListViewRampe.Name = "objectListViewRampe"; this.objectListViewRampe.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu; - this.objectListViewRampe.Size = new System.Drawing.Size(890, 584); + this.objectListViewRampe.Size = new System.Drawing.Size(890, 572); this.objectListViewRampe.Sorting = System.Windows.Forms.SortOrder.Ascending; this.objectListViewRampe.TabIndex = 2; this.objectListViewRampe.TintSortColumn = true; @@ -309,10 +309,10 @@ // tabPageSonder // this.tabPageSonder.Controls.Add(this.objectListViewSonder); - this.tabPageSonder.Location = new System.Drawing.Point(4, 34); + this.tabPageSonder.Location = new System.Drawing.Point(4, 46); this.tabPageSonder.Name = "tabPageSonder"; this.tabPageSonder.Padding = new System.Windows.Forms.Padding(3); - this.tabPageSonder.Size = new System.Drawing.Size(890, 584); + this.tabPageSonder.Size = new System.Drawing.Size(890, 572); this.tabPageSonder.TabIndex = 1; this.tabPageSonder.Text = "Sonderaufträge"; this.tabPageSonder.UseVisualStyleBackColor = true; @@ -330,7 +330,7 @@ this.objectListViewSonder.Location = new System.Drawing.Point(3, 3); this.objectListViewSonder.Name = "objectListViewSonder"; this.objectListViewSonder.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu; - this.objectListViewSonder.Size = new System.Drawing.Size(884, 578); + this.objectListViewSonder.Size = new System.Drawing.Size(884, 566); this.objectListViewSonder.Sorting = System.Windows.Forms.SortOrder.Ascending; this.objectListViewSonder.TabIndex = 2; this.objectListViewSonder.TintSortColumn = true; @@ -348,10 +348,10 @@ // tabPageGeschaeft // this.tabPageGeschaeft.Controls.Add(this.objectListViewGeschaeft); - this.tabPageGeschaeft.Location = new System.Drawing.Point(4, 34); + this.tabPageGeschaeft.Location = new System.Drawing.Point(4, 46); this.tabPageGeschaeft.Name = "tabPageGeschaeft"; this.tabPageGeschaeft.Padding = new System.Windows.Forms.Padding(3); - this.tabPageGeschaeft.Size = new System.Drawing.Size(890, 584); + this.tabPageGeschaeft.Size = new System.Drawing.Size(890, 572); this.tabPageGeschaeft.TabIndex = 2; this.tabPageGeschaeft.Text = "Geschäft"; this.tabPageGeschaeft.UseVisualStyleBackColor = true; @@ -370,7 +370,7 @@ this.objectListViewGeschaeft.Location = new System.Drawing.Point(3, 3); this.objectListViewGeschaeft.Name = "objectListViewGeschaeft"; this.objectListViewGeschaeft.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu; - this.objectListViewGeschaeft.Size = new System.Drawing.Size(884, 578); + this.objectListViewGeschaeft.Size = new System.Drawing.Size(884, 566); this.objectListViewGeschaeft.Sorting = System.Windows.Forms.SortOrder.Ascending; this.objectListViewGeschaeft.TabIndex = 2; this.objectListViewGeschaeft.TintSortColumn = true; @@ -393,10 +393,10 @@ // tabPageAll // this.tabPageAll.Controls.Add(this.objectListViewAuftrag); - this.tabPageAll.Location = new System.Drawing.Point(4, 34); + this.tabPageAll.Location = new System.Drawing.Point(4, 46); this.tabPageAll.Name = "tabPageAll"; this.tabPageAll.Padding = new System.Windows.Forms.Padding(3); - this.tabPageAll.Size = new System.Drawing.Size(890, 584); + this.tabPageAll.Size = new System.Drawing.Size(890, 572); this.tabPageAll.TabIndex = 0; this.tabPageAll.Text = "Aufträge heute"; this.tabPageAll.UseVisualStyleBackColor = true; @@ -415,7 +415,7 @@ this.objectListViewAuftrag.Location = new System.Drawing.Point(3, 3); this.objectListViewAuftrag.Name = "objectListViewAuftrag"; this.objectListViewAuftrag.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu; - this.objectListViewAuftrag.Size = new System.Drawing.Size(884, 578); + this.objectListViewAuftrag.Size = new System.Drawing.Size(884, 566); this.objectListViewAuftrag.Sorting = System.Windows.Forms.SortOrder.Ascending; this.objectListViewAuftrag.TabIndex = 1; this.objectListViewAuftrag.TintSortColumn = true; @@ -458,9 +458,9 @@ // tabPageVorbereitet // this.tabPageVorbereitet.Controls.Add(this.objectListViewVorbereitet); - this.tabPageVorbereitet.Location = new System.Drawing.Point(4, 34); + this.tabPageVorbereitet.Location = new System.Drawing.Point(4, 46); this.tabPageVorbereitet.Name = "tabPageVorbereitet"; - this.tabPageVorbereitet.Size = new System.Drawing.Size(890, 584); + this.tabPageVorbereitet.Size = new System.Drawing.Size(890, 572); this.tabPageVorbereitet.TabIndex = 4; this.tabPageVorbereitet.Text = "Vorbereitet"; this.tabPageVorbereitet.UseVisualStyleBackColor = true; @@ -480,7 +480,7 @@ this.objectListViewVorbereitet.Location = new System.Drawing.Point(0, 0); this.objectListViewVorbereitet.Name = "objectListViewVorbereitet"; this.objectListViewVorbereitet.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu; - this.objectListViewVorbereitet.Size = new System.Drawing.Size(890, 584); + this.objectListViewVorbereitet.Size = new System.Drawing.Size(890, 572); this.objectListViewVorbereitet.Sorting = System.Windows.Forms.SortOrder.Ascending; this.objectListViewVorbereitet.TabIndex = 2; this.objectListViewVorbereitet.TintSortColumn = true; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index d178a9b..4b9aca2 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: -[assembly: AssemblyVersion("1.0.8.5")] -[assembly: AssemblyFileVersion("1.0.8.5")] +[assembly: AssemblyVersion("1.0.8.6")] +[assembly: AssemblyFileVersion("1.0.8.6")] diff --git a/SetupVerwaltung/SetupVerwaltung.vdproj b/SetupVerwaltung/SetupVerwaltung.vdproj index dad1fea..cb4880a 100644 --- a/SetupVerwaltung/SetupVerwaltung.vdproj +++ b/SetupVerwaltung/SetupVerwaltung.vdproj @@ -15,151 +15,97 @@ { "Entry" { - "MsmKey" = "8:_0846CD93A9DEA4DD0DD05E0933FFBC5B" + "MsmKey" = "8:_0014568666DC36A67BD4258FEDAE4805" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0846CD93A9DEA4DD0DD05E0933FFBC5B" - "OwnerKey" = "8:_8A99731973E81EB05A1847C294F0CECC" + "MsmKey" = "8:_0014568666DC36A67BD4258FEDAE4805" + "OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0BD5D517A5EBAEC4CE21A08AB9CD3422" + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_0BD5D517A5EBAEC4CE21A08AB9CD3422" - "OwnerKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" + "MsmKey" = "8:_16723AF5DFDEF26FC6A07BEB7D389737" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" + "MsmKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" + "MsmKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_9C2D77065F590227E595BA5087763024" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_415A4FE801E6F28929188A3C06EEAEBB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "OwnerKey" = "8:_C718F2556CAE414E1E99F6C2E428F264" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_361CD6DDAD5DAD87766154F455EA61CE" + "MsmKey" = "8:_2DE2024BE0845063AAE50C820ED805AE" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } @@ -171,84 +117,66 @@ } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_415A4FE801E6F28929188A3C06EEAEBB" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_404BC92A271981651469C5BBB22AFBC1" - "OwnerKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" + "MsmKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_415A4FE801E6F28929188A3C06EEAEBB" - "OwnerKey" = "8:_AF0561A39DB2C2DCAF31DD5BAA282B37" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_415A4FE801E6F28929188A3C06EEAEBB" + "MsmKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" - "OwnerKey" = "8:_601349A5165EA7E437FA222E90548041" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_52990414836E4CF7BD50C1245D0F9B6F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -262,79 +190,37 @@ "Entry" { "MsmKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_3518CDF283287B9BB382E0C864B0B344" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" + "MsmKey" = "8:_65845AF9470C67B4E2216A46EFF4246C" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_9C2D77065F590227E595BA5087763024" + "MsmKey" = "8:_65845AF9470C67B4E2216A46EFF4246C" + "OwnerKey" = "8:_16723AF5DFDEF26FC6A07BEB7D389737" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_AF0561A39DB2C2DCAF31DD5BAA282B37" + "MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_415A4FE801E6F28929188A3C06EEAEBB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" - "OwnerKey" = "8:_C718F2556CAE414E1E99F6C2E428F264" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5E4D6952244F4AAC64F327394623EE57" + "MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_601349A5165EA7E437FA222E90548041" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_66BBFB81F226D85D4DFF46362404CBA9" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -346,30 +232,78 @@ "Entry" { "MsmKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" + "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_719473B495FBAC457431A4E48A1F4B17" + "MsmKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_8A99731973E81EB05A1847C294F0CECC" + "MsmKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_9C2D77065F590227E595BA5087763024" + "MsmKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A" + "OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A00008624800CAF367880713AFB719F2" + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } @@ -381,145 +315,139 @@ } "Entry" { - "MsmKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" + "MsmKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AF0561A39DB2C2DCAF31DD5BAA282B37" + "MsmKey" = "8:_BDDC042CD8ACEF57F35D002490214D33" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BA8B9295763872FA6F6B706A524178AD" + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_BF71649AE43FBD7A416893054714CE91" + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C718F2556CAE414E1E99F6C2E428F264" + "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_C718F2556CAE414E1E99F6C2E428F264" - "OwnerKey" = "8:_415A4FE801E6F28929188A3C06EEAEBB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" + "MsmKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" + "MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80" + "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" + "MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "MsmKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" - "OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" + "MsmKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } @@ -532,169 +460,145 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8A99731973E81EB05A1847C294F0CECC" + "OwnerKey" = "8:_16723AF5DFDEF26FC6A07BEB7D389737" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0846CD93A9DEA4DD0DD05E0933FFBC5B" + "OwnerKey" = "8:_65845AF9470C67B4E2216A46EFF4246C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9C2D77065F590227E595BA5087763024" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A00008624800CAF367880713AFB719F2" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_66BBFB81F226D85D4DFF46362404CBA9" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FD8164C4BBFD975FAFD2A4D86340E915" + "OwnerKey" = "8:_2DE2024BE0845063AAE50C820ED805AE" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_361CD6DDAD5DAD87766154F455EA61CE" + "OwnerKey" = "8:_BDDC042CD8ACEF57F35D002490214D33" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AF0561A39DB2C2DCAF31DD5BAA282B37" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_415A4FE801E6F28929188A3C06EEAEBB" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_719473B495FBAC457431A4E48A1F4B17" + "OwnerKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5E4D6952244F4AAC64F327394623EE57" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_14F178F5FD5EFA4C1973A6B30514E332" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2DC89B818FE015B8ED93A73216EFCCE7" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CC6E1B525578AF50C3DD3123399882F3" + "OwnerKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A90E24C686315EC9D9B0BA1C76886A15" + "OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E0CD318B00C3EBC6018E7287D1C5C964" + "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C718F2556CAE414E1E99F6C2E428F264" + "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BA8B9295763872FA6F6B706A524178AD" + "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3518CDF283287B9BB382E0C864B0B344" + "OwnerKey" = "8:_4C0EEC06451FEA61E39F79681578838C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5DDEB1FF3DD78281FF3203E5E9933C19" + "OwnerKey" = "8:_E637243CDA02D043DD2BAED063790F80" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BF71649AE43FBD7A416893054714CE91" + "OwnerKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E73BA90E452C02520292C6FF727EB5AC" + "OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_404BC92A271981651469C5BBB22AFBC1" + "OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_AB17FAEB828C8765351F17BFC0E97F98" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1FC10E99927FDE0DB378759FE2A2C1DD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_601349A5165EA7E437FA222E90548041" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4FCAEBB85B559E3350E3A4912FADA0F0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0BD5D517A5EBAEC4CE21A08AB9CD3422" + "OwnerKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -810,20 +714,20 @@ } "File" { - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0846CD93A9DEA4DD0DD05E0933FFBC5B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0014568666DC36A67BD4258FEDAE4805" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:zxing, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0846CD93A9DEA4DD0DD05E0933FFBC5B" + "_0014568666DC36A67BD4258FEDAE4805" { - "Name" = "8:zxing.dll" + "Name" = "8:AForge.Video.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:zxing.dll" + "SourcePath" = "8:AForge.Video.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -841,20 +745,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0BD5D517A5EBAEC4CE21A08AB9CD3422" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0B016AD02A79C43C243D615B3AD40570" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0BD5D517A5EBAEC4CE21A08AB9CD3422" + "_0B016AD02A79C43C243D615B3AD40570" { - "Name" = "8:AForge.dll" + "Name" = "8:System.Memory.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:AForge.dll" + "SourcePath" = "8:System.Memory.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -872,20 +776,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_14F178F5FD5EFA4C1973A6B30514E332" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_125834DE4128EDE3F82BFC1A45B2ACD9" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Npgsql, Version=4.1.14.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" "ScatterAssemblies" { - "_14F178F5FD5EFA4C1973A6B30514E332" + "_125834DE4128EDE3F82BFC1A45B2ACD9" { - "Name" = "8:System.Text.Json.dll" + "Name" = "8:Npgsql.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Text.Json.dll" + "SourcePath" = "8:Npgsql.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -903,20 +807,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1FC10E99927FDE0DB378759FE2A2C1DD" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_16723AF5DFDEF26FC6A07BEB7D389737" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:zxing.presentation, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" "ScatterAssemblies" { - "_1FC10E99927FDE0DB378759FE2A2C1DD" + "_16723AF5DFDEF26FC6A07BEB7D389737" { - "Name" = "8:System.Buffers.dll" + "Name" = "8:zxing.presentation.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Buffers.dll" + "SourcePath" = "8:zxing.presentation.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -934,20 +838,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2DC89B818FE015B8ED93A73216EFCCE7" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_17ABCA3C569C9181F3FE3A46B8638164" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:HarfBuzzSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2DC89B818FE015B8ED93A73216EFCCE7" + "_17ABCA3C569C9181F3FE3A46B8638164" { - "Name" = "8:System.ValueTuple.dll" + "Name" = "8:HarfBuzzSharp.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.ValueTuple.dll" + "SourcePath" = "8:HarfBuzzSharp.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -965,20 +869,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3518CDF283287B9BB382E0C864B0B344" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1B916DE951F447CD3C62E7AEBE228A3F" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_3518CDF283287B9BB382E0C864B0B344" + "_1B916DE951F447CD3C62E7AEBE228A3F" { - "Name" = "8:Microsoft.Bcl.AsyncInterfaces.dll" + "Name" = "8:Microsoft.Bcl.HashCode.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Microsoft.Bcl.AsyncInterfaces.dll" + "SourcePath" = "8:Microsoft.Bcl.HashCode.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -996,14 +900,14 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_361CD6DDAD5DAD87766154F455EA61CE" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2DE2024BE0845063AAE50C820ED805AE" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:Spire.Barcode, Version=7.4.1.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL" "ScatterAssemblies" { - "_361CD6DDAD5DAD87766154F455EA61CE" + "_2DE2024BE0845063AAE50C820ED805AE" { "Name" = "8:Spire.Barcode.dll" "Attributes" = "3:512" @@ -1047,14 +951,14 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_404BC92A271981651469C5BBB22AFBC1" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4C0EEC06451FEA61E39F79681578838C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_404BC92A271981651469C5BBB22AFBC1" + "_4C0EEC06451FEA61E39F79681578838C" { "Name" = "8:System.Runtime.CompilerServices.Unsafe.dll" "Attributes" = "3:512" @@ -1078,51 +982,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_415A4FE801E6F28929188A3C06EEAEBB" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4E92FDDD15B89BB89053E8A65FA73EAA" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Polly.Core, Version=8.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_415A4FE801E6F28929188A3C06EEAEBB" + "_4E92FDDD15B89BB89053E8A65FA73EAA" { - "Name" = "8:Polly.Core.dll" + "Name" = "8:System.Text.Encodings.Web.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Polly.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FCAEBB85B559E3350E3A4912FADA0F0" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_4FCAEBB85B559E3350E3A4912FADA0F0" - { - "Name" = "8:AForge.Video.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:AForge.Video.dll" + "SourcePath" = "8:System.Text.Encodings.Web.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1191,20 +1064,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5DDEB1FF3DD78281FF3203E5E9933C19" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_65845AF9470C67B4E2216A46EFF4246C" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:zxing, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" "ScatterAssemblies" { - "_5DDEB1FF3DD78281FF3203E5E9933C19" + "_65845AF9470C67B4E2216A46EFF4246C" { - "Name" = "8:System.Threading.Tasks.Extensions.dll" + "Name" = "8:zxing.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.Tasks.Extensions.dll" + "SourcePath" = "8:zxing.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1222,82 +1095,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5E4D6952244F4AAC64F327394623EE57" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_65AC8F9F13B5E0ADCA662A6618010328" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Npgsql, Version=4.1.14.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_5E4D6952244F4AAC64F327394623EE57" + "_65AC8F9F13B5E0ADCA662A6618010328" { - "Name" = "8:Npgsql.dll" + "Name" = "8:System.ValueTuple.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Npgsql.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_601349A5165EA7E437FA222E90548041" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_601349A5165EA7E437FA222E90548041" - { - "Name" = "8:AForge.Video.DirectShow.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:AForge.Video.DirectShow.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_66BBFB81F226D85D4DFF46362404CBA9" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_66BBFB81F226D85D4DFF46362404CBA9" - { - "Name" = "8:System.ComponentModel.Annotations.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.ComponentModel.Annotations.dll" + "SourcePath" = "8:System.ValueTuple.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1346,20 +1157,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_719473B495FBAC457431A4E48A1F4B17" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_70C791195E1E3B637AE8CB0DE5BB4EFB" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:ObjectListView, Version=2.9.3.0, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL" "ScatterAssemblies" { - "_719473B495FBAC457431A4E48A1F4B17" + "_70C791195E1E3B637AE8CB0DE5BB4EFB" { - "Name" = "8:ObjectListView.dll" + "Name" = "8:AForge.Video.DirectShow.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:ObjectListView.dll" + "SourcePath" = "8:AForge.Video.DirectShow.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1377,20 +1188,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8A99731973E81EB05A1847C294F0CECC" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8208B2126E1B253A2E427D55D4E5F13A" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:zxing.presentation, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8A99731973E81EB05A1847C294F0CECC" + "_8208B2126E1B253A2E427D55D4E5F13A" { - "Name" = "8:zxing.presentation.dll" + "Name" = "8:AForge.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:zxing.presentation.dll" + "SourcePath" = "8:AForge.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1408,20 +1219,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9C2D77065F590227E595BA5087763024" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8A953E0634B8757038749C9F77062056" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_9C2D77065F590227E595BA5087763024" + "_8A953E0634B8757038749C9F77062056" { - "Name" = "8:System.Threading.Channels.dll" + "Name" = "8:System.Threading.Tasks.Extensions.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Threading.Channels.dll" + "SourcePath" = "8:System.Threading.Tasks.Extensions.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1439,20 +1250,51 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A00008624800CAF367880713AFB719F2" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8E444A9D7B7F9420CF44964B1EAE9AAA" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A00008624800CAF367880713AFB719F2" + "_8E444A9D7B7F9420CF44964B1EAE9AAA" { - "Name" = "8:System.Diagnostics.DiagnosticSource.dll" + "Name" = "8:System.IO.Pipelines.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.Diagnostics.DiagnosticSource.dll" + "SourcePath" = "8:System.IO.Pipelines.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_99A1851DAB14095B2C6FFF6100D312B7" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_99A1851DAB14095B2C6FFF6100D312B7" + { + "Name" = "8:Microsoft.Extensions.Logging.Abstractions.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.Extensions.Logging.Abstractions.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1501,20 +1343,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A90E24C686315EC9D9B0BA1C76886A15" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A41FC3BFD0E1CE905FCB1693E99348B8" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A90E24C686315EC9D9B0BA1C76886A15" + "_A41FC3BFD0E1CE905FCB1693E99348B8" { - "Name" = "8:System.IO.Pipelines.dll" + "Name" = "8:System.Diagnostics.DiagnosticSource.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:System.IO.Pipelines.dll" + "SourcePath" = "8:System.Diagnostics.DiagnosticSource.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1532,14 +1374,169 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AB17FAEB828C8765351F17BFC0E97F98" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BDDC042CD8ACEF57F35D002490214D33" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:ObjectListView, Version=2.9.3.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_BDDC042CD8ACEF57F35D002490214D33" + { + "Name" = "8:ObjectListView.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:ObjectListView.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C025D526FF076AA8036CB8B1A2BD888E" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C025D526FF076AA8036CB8B1A2BD888E" + { + "Name" = "8:System.Buffers.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Buffers.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C2D67A4770D262B66069252CF1E903CF" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C2D67A4770D262B66069252CF1E903CF" + { + "Name" = "8:Microsoft.Bcl.AsyncInterfaces.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.Bcl.AsyncInterfaces.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C92C21BE3984A4EC1BCD3A988C56652E" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_C92C21BE3984A4EC1BCD3A988C56652E" + { + "Name" = "8:System.Collections.Immutable.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Collections.Immutable.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_D3E738B1E9D7C3C737CDD91DCC4DC37B" + { + "Name" = "8:System.Threading.Channels.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Threading.Channels.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E637243CDA02D043DD2BAED063790F80" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_AB17FAEB828C8765351F17BFC0E97F98" + "_E637243CDA02D043DD2BAED063790F80" { "Name" = "8:System.Numerics.Vectors.dll" "Attributes" = "3:512" @@ -1563,237 +1560,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AF0561A39DB2C2DCAF31DD5BAA282B37" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_EF6D58F917144384701E1DBDFB979BD8" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Polly, Version=8.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_AF0561A39DB2C2DCAF31DD5BAA282B37" + "_EF6D58F917144384701E1DBDFB979BD8" { - "Name" = "8:Polly.dll" + "Name" = "8:System.Text.Json.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Polly.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BA8B9295763872FA6F6B706A524178AD" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_BA8B9295763872FA6F6B706A524178AD" - { - "Name" = "8:Microsoft.Bcl.HashCode.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.Bcl.HashCode.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF71649AE43FBD7A416893054714CE91" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:HarfBuzzSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_BF71649AE43FBD7A416893054714CE91" - { - "Name" = "8:HarfBuzzSharp.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:HarfBuzzSharp.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_C718F2556CAE414E1E99F6C2E428F264" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.TimeProvider, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_C718F2556CAE414E1E99F6C2E428F264" - { - "Name" = "8:Microsoft.Bcl.TimeProvider.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.Bcl.TimeProvider.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CC6E1B525578AF50C3DD3123399882F3" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_CC6E1B525578AF50C3DD3123399882F3" - { - "Name" = "8:System.Text.Encodings.Web.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Text.Encodings.Web.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0CD318B00C3EBC6018E7287D1C5C964" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_E0CD318B00C3EBC6018E7287D1C5C964" - { - "Name" = "8:Microsoft.Extensions.Logging.Abstractions.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.Extensions.Logging.Abstractions.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E73BA90E452C02520292C6FF727EB5AC" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_E73BA90E452C02520292C6FF727EB5AC" - { - "Name" = "8:System.Memory.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Memory.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FD8164C4BBFD975FAFD2A4D86340E915" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_FD8164C4BBFD975FAFD2A4D86340E915" - { - "Name" = "8:System.Collections.Immutable.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:System.Collections.Immutable.dll" + "SourcePath" = "8:System.Text.Json.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C848DFB5E4D140A7A7F5E1F129613626" @@ -1867,15 +1647,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:SetupVerwaltung" - "ProductCode" = "8:{2E803877-B3F2-470E-BB5C-2C0190319E33}" - "PackageCode" = "8:{45D39284-D030-4020-8642-9CD8A0718E93}" + "ProductCode" = "8:{3BB07EE2-9EBF-4B07-8A40-74BA0F6D4828}" + "PackageCode" = "8:{3DE58A5F-B6C8-43C9-830C-D48FDAC85C22}" "UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.85" + "ProductVersion" = "8:1.0.86" "Manufacturer" = "8:Kilian Wirl GmbH" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -1891,7 +1671,7 @@ "UseSystemSearchPath" = "11:TRUE" "TargetPlatform" = "3:0" "PreBuildEvent" = "8:" - "PostBuildEvent" = "8:powershell -NoProfile -ExecutionPolicy Bypass -Command \"$asm = gci 'C:\\\\Users\\\\KilianWirl\\\\source\\\\repos\\\\Programm_Wirl\\\\bin\\\\Debug\\\\*.exe' | select -first 1; $v = [System.Reflection.Assembly]::LoadFile($asm.FullName).GetName().Version; $oldMsi = 'C:\\\\Users\\\\KilianWirl\\\\Source\\\\Repos\\\\Programm_Wirl\\\\SetupVerwaltung\\\\Debug\\\\SetupVerwaltung.msi'; $newMsi = 'C:\\\\Users\\\\KilianWirl\\\\Source\\\\Repos\\\\Programm_Wirl\\\\SetupVerwaltung\\\\Debug\\\\SetupVerwaltung' + $v.ToString() + '.msi'; Move-Item $oldMsi $newMsi; Write-Host 'FERTIG: SetupVerwaltung.msi'\"\r\n" + "PostBuildEvent" = "8:powershell -NoProfile -ExecutionPolicy Bypass -Command \"$asm = gci 'C:\\\\Users\\\\kilia\\\\source\\\\repos\\\\Programm_Wirl\\\\bin\\\\Debug\\\\*.exe' | select -first 1; $v = [System.Reflection.Assembly]::LoadFile($asm.FullName).GetName().Version; $oldMsi = 'C:\\\\Users\\\\Kilia\\\\Source\\\\Repos\\\\Programm_Wirl\\\\SetupVerwaltung\\\\Debug\\\\SetupVerwaltung.msi'; $newMsi = 'C:\\\\Users\\\\Kilia\\\\Source\\\\Repos\\\\Programm_Wirl\\\\SetupVerwaltung\\\\Debug\\\\SetupVerwaltung' + $v.ToString() + '.msi'; Move-Item $oldMsi $newMsi; Write-Host 'FERTIG: SetupVerwaltung.msi'\"\r\n" "RunPostBuildEvent" = "3:0" } "Registry" diff --git a/Verwaltung_ReadMe.txt b/Verwaltung_ReadMe.txt index ac3ff4b..adf840e 100644 --- a/Verwaltung_ReadMe.txt +++ b/Verwaltung_ReadMe.txt @@ -1,11 +1,11 @@ ===================================== -NEUIGKEITEN - Version 1.0.8.5 +NEUIGKEITEN - Version 1.0.8.6 ===================================== Build-Info: - Build-Typ: Release Build -- Erledigte TODOs: 16 -- Offene TODOs: 46 +- Erledigte TODOs: 18 +- Offene TODOs: 44 - Install-Reminders: 4 - Changes: 15 @@ -34,7 +34,7 @@ Build-Info: - ✨ Winter und Sommer wird getrennt geändert und gespeichert. [UCTabPageLKW.cs] -=== ✅ ERLEDIGTE TODOs (16) === +=== ✅ ERLEDIGTE TODOs (18) === - ✅ : Auftrag über FormListe holen und daraus den Kunden für Fehlmenge holen. [FormFehlmengeCount.cs] - ✅ : Auftragliste bei Fahrer anzeigen wenn Login. [FormMain.cs] - ✅ : Bei Transport wir ein Fach mit Aktuellem Auftrag erstellt. Das Alte wird bei Transport gespeichert. [FormAusschlager.cs] @@ -42,6 +42,8 @@ Build-Info: - ✅ : Container schmutzig bearbeitbar machen [FormAuftragDetail.cs] - ✅ : Feedback Button hinzufügen [FormAuftragDetail.cs] - ✅ : HILFE zeigt OnBoarding. [FormMain.cs] +- ✅ : Inventur freigeben nur für Admin oder Verwaltung. [UCInventur.cs] +- ✅ : Inventur für Expedit zugänglich machen. [UCInventur.cs] - ✅ : Korrigiere Bestand: Wenn -Zahl dann Stand - Zahl. [FormAuftragDetail.cs] - ✅ : Logik überlegen wie ein bearbeiteter Auftrag nicht doppelt gewählt werden kann. (Abteilungen zu Auftrag hinzufügen und bei Ausschlager Druck definieren?) [FormFehlmengeCount.cs] - ✅ : Mit AddFehler können Fehler aus try/chatch in Obsidian eingefügt werden. (Timestamp, PC-Name, Ex-Message) [Program.cs] @@ -53,7 +55,7 @@ Build-Info: - ✅ : Wenn RegAuftrag wird als augeliefert markiert, wird dieser automatisch neu erstellt laut hinterlegtem Rhythmus. [FormMain.cs] -=== 🔄 OFFENE TODOs (46) === +=== 🔄 OFFENE TODOs (44) === - 🔄 !!ÜBERLEGE!! DB-Query für Kundenanzahl und Containeranzahl Abgleich. (Aufträge haben TourID hinterlegt. So sollte alles vergleichbar sein.) [Tour.cs] - 🔄 !!ÜBERLEGE!! Tour Start und Ende automatisch erfassen. [Tour.cs] - 🔄 Alle Icons in einer Spalte anzeigen? I für Anmerkung und ! für Aufgabe?? [FormExpedit.cs] @@ -75,8 +77,6 @@ Build-Info: - 🔄 Funktioniert mehrere KundenControls auf einmal DragDrop? [FormTourenplanung.cs] - 🔄 Gesamt soll immer 100% sein. [Funktionen.cs] - 🔄 Hier Settings speichern mit UserSettingsManager Klasse. [FormEinstellung.cs] -- 🔄 Inventur freigeben nur für Admin oder Verwaltung. [UCInventur.cs] -- 🔄 Inventur für Expedit zugänglich machen. [UCInventur.cs] - 🔄 JSON nach angemeldeten Fahrer durchsuchen und Kundenliste des aktuellen Wochentag anzeigen. [FormMain.cs] - 🔄 Kundenanzahl bei Tourenliste erstellen vergleichen und anpassen. [Tour.cs] - 🔄 Liste vorher/nachher durchdenken [FormAuftragDetail.cs] @@ -101,5 +101,5 @@ Build-Info: - 🔄 Wenn Nachwäsche oder Müllwäsche alle Artikel anzeigen. [FormFehlmengeCount.cs] - 🔄 Zuweisung zu Fahrer muss geklärt werden. [Funktionen.cs] -Installation: 02.04.2026 09:58 +Installation: 08.04.2026 09:14 ===================================== From b846a7946220e7e4ee11cebdf62f1e1d9d1ce8c9 Mon Sep 17 00:00:00 2001 From: Kilian Wirl Date: Wed, 8 Apr 2026 12:20:06 +0200 Subject: [PATCH 2/2] =?UTF-8?q?UCI=20Probleme=20und=20Buttons=20in=20Auftr?= =?UTF-8?q?agDetail=20l=C3=B6sen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AA-Forms/FormAuftragDetail.cs | 6 +- AA-Forms/FormMain.Designer.cs | 479 +++++++++---------- AA-Forms/FormMain.resx | 30 +- App.config | 2 +- Properties/AssemblyInfo.cs | 4 +- SetupVerwaltung/SetupVerwaltung.vdproj | 6 +- UserControls/UCInventur.Designer.cs | 638 +++++++++++++------------ UserControls/UCInventur.cs | 21 +- UserControls/UCInventur.resx | 6 +- Verwaltung_ReadMe.txt | 14 +- 10 files changed, 607 insertions(+), 599 deletions(-) diff --git a/AA-Forms/FormAuftragDetail.cs b/AA-Forms/FormAuftragDetail.cs index cb2f2f0..25630d1 100644 --- a/AA-Forms/FormAuftragDetail.cs +++ b/AA-Forms/FormAuftragDetail.cs @@ -106,7 +106,11 @@ namespace Deckungsbeitrag this.comboBoxFahrer.SelectedValueChanged += comboBox_SelectedValueChanged; if (this.auftrag.Typ != AuftragTyp.Inventur || (this.auftrag.Typ == AuftragTyp.Inventur & this.auftrag.Status == AuftragStatus.Herrichten)) Load_OLV(); - else Load_UCInventur(this.auftrag); + else + { + if (this.auftrag.Status == AuftragStatus.Warten) buttonSpeichern.Visible = buttonFertig.Visible = buttonSWS.Visible = false; + Load_UCInventur(this.auftrag); + } this.ClientSize = new Size(this.oLVArtikel.Right + 10, this.ClientSize.Height); //WENN STATUS VORBEREITET BUTTON FERTIG ENABLEN diff --git a/AA-Forms/FormMain.Designer.cs b/AA-Forms/FormMain.Designer.cs index 2bdbe76..29635f3 100644 --- a/AA-Forms/FormMain.Designer.cs +++ b/AA-Forms/FormMain.Designer.cs @@ -49,6 +49,15 @@ namespace Deckungsbeitrag this.toolStripBeenden = new System.Windows.Forms.ToolStripButton(); this.panelMain = new System.Windows.Forms.Panel(); this.buttonTestInventur = new System.Windows.Forms.Button(); + this.groupBoxAuftrag = new System.Windows.Forms.GroupBox(); + this.objectListViewAuftrag = new BrightIdeasSoftware.ObjectListView(); + this.rBAufAbruf = new System.Windows.Forms.RadioButton(); + this.rBAusgeliefert = new System.Windows.Forms.RadioButton(); + this.rBFertig = new System.Windows.Forms.RadioButton(); + this.rBVorbereitet = new System.Windows.Forms.RadioButton(); + this.rBAlle = new System.Windows.Forms.RadioButton(); + this.buttonAufAbruf = new System.Windows.Forms.Button(); + this.buttonAusgeliefert = new System.Windows.Forms.Button(); this.buttonNeuerRegAuft = new System.Windows.Forms.Button(); this.panelProgress = new System.Windows.Forms.Panel(); this.buttonKundeArtikelUpdate = new System.Windows.Forms.Button(); @@ -83,15 +92,6 @@ namespace Deckungsbeitrag this.labelContZahl1 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); - this.groupBoxAuftrag = new System.Windows.Forms.GroupBox(); - this.objectListViewAuftrag = new BrightIdeasSoftware.ObjectListView(); - this.rBAufAbruf = new System.Windows.Forms.RadioButton(); - this.rBAusgeliefert = new System.Windows.Forms.RadioButton(); - this.rBFertig = new System.Windows.Forms.RadioButton(); - this.rBVorbereitet = new System.Windows.Forms.RadioButton(); - this.rBAlle = new System.Windows.Forms.RadioButton(); - this.buttonAufAbruf = new System.Windows.Forms.Button(); - this.buttonAusgeliefert = new System.Windows.Forms.Button(); this.groupBoxSaison = new System.Windows.Forms.GroupBox(); this.comboBoxSaison = new System.Windows.Forms.ComboBox(); this.buttonNeuerStand = new System.Windows.Forms.Button(); @@ -114,11 +114,11 @@ namespace Deckungsbeitrag this.labelScannTest = new System.Windows.Forms.Label(); this.toolStripMenu.SuspendLayout(); this.panelMain.SuspendLayout(); + this.groupBoxAuftrag.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).BeginInit(); this.panelProgress.SuspendLayout(); this.groupBoxContAnz.SuspendLayout(); this.tLPContAnz.SuspendLayout(); - this.groupBoxAuftrag.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).BeginInit(); this.groupBoxSaison.SuspendLayout(); this.groupBoxUpdate.SuspendLayout(); this.tableLayoutPanelUpdate.SuspendLayout(); @@ -519,6 +519,168 @@ namespace Deckungsbeitrag this.buttonTestInventur.Visible = false; this.buttonTestInventur.Click += new System.EventHandler(this.buttonTestInventur_Click); // + // groupBoxAuftrag + // + this.groupBoxAuftrag.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.groupBoxAuftrag.Controls.Add(this.objectListViewAuftrag); + this.groupBoxAuftrag.Controls.Add(this.rBAufAbruf); + this.groupBoxAuftrag.Controls.Add(this.rBAusgeliefert); + this.groupBoxAuftrag.Controls.Add(this.rBFertig); + this.groupBoxAuftrag.Controls.Add(this.rBVorbereitet); + this.groupBoxAuftrag.Controls.Add(this.rBAlle); + this.groupBoxAuftrag.Controls.Add(this.buttonAufAbruf); + this.groupBoxAuftrag.Controls.Add(this.buttonAusgeliefert); + this.groupBoxAuftrag.Enabled = false; + this.groupBoxAuftrag.Location = new System.Drawing.Point(1119, 80); + this.groupBoxAuftrag.Margin = new System.Windows.Forms.Padding(4); + this.groupBoxAuftrag.Name = "groupBoxAuftrag"; + this.groupBoxAuftrag.Padding = new System.Windows.Forms.Padding(4); + this.groupBoxAuftrag.Size = new System.Drawing.Size(1632, 607); + this.groupBoxAuftrag.TabIndex = 51; + this.groupBoxAuftrag.TabStop = false; + this.groupBoxAuftrag.Visible = false; + // + // objectListViewAuftrag + // + this.objectListViewAuftrag.AlternateRowBackColor = System.Drawing.Color.LightSteelBlue; + this.objectListViewAuftrag.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.objectListViewAuftrag.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.objectListViewAuftrag.CellEditUseWholeCell = false; + this.objectListViewAuftrag.CheckBoxes = true; + this.objectListViewAuftrag.Cursor = System.Windows.Forms.Cursors.Default; + this.objectListViewAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.objectListViewAuftrag.FullRowSelect = true; + this.objectListViewAuftrag.GridLines = true; + this.objectListViewAuftrag.HideSelection = false; + this.objectListViewAuftrag.Location = new System.Drawing.Point(220, 17); + this.objectListViewAuftrag.Margin = new System.Windows.Forms.Padding(4); + this.objectListViewAuftrag.Name = "objectListViewAuftrag"; + this.objectListViewAuftrag.Size = new System.Drawing.Size(1404, 582); + this.objectListViewAuftrag.TabIndex = 58; + this.objectListViewAuftrag.UseAlternatingBackColors = true; + this.objectListViewAuftrag.UseCompatibleStateImageBehavior = false; + this.objectListViewAuftrag.View = System.Windows.Forms.View.Details; + this.objectListViewAuftrag.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.objectListViewAuftrag_ItemChecked); + // + // rBAufAbruf + // + this.rBAufAbruf.AutoSize = true; + this.rBAufAbruf.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.rBAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rBAufAbruf.Location = new System.Drawing.Point(59, 167); + this.rBAufAbruf.Margin = new System.Windows.Forms.Padding(4); + this.rBAufAbruf.Name = "rBAufAbruf"; + this.rBAufAbruf.Size = new System.Drawing.Size(95, 24); + this.rBAufAbruf.TabIndex = 57; + this.rBAufAbruf.TabStop = true; + this.rBAufAbruf.Text = "Auf Abruf"; + this.rBAufAbruf.UseVisualStyleBackColor = true; + this.rBAufAbruf.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); + // + // rBAusgeliefert + // + this.rBAusgeliefert.AutoSize = true; + this.rBAusgeliefert.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.rBAusgeliefert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rBAusgeliefert.Location = new System.Drawing.Point(36, 130); + this.rBAusgeliefert.Margin = new System.Windows.Forms.Padding(4); + this.rBAusgeliefert.Name = "rBAusgeliefert"; + this.rBAusgeliefert.Size = new System.Drawing.Size(112, 24); + this.rBAusgeliefert.TabIndex = 54; + this.rBAusgeliefert.TabStop = true; + this.rBAusgeliefert.Text = "Ausgeliefert"; + this.rBAusgeliefert.UseVisualStyleBackColor = true; + this.rBAusgeliefert.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); + // + // rBFertig + // + this.rBFertig.AutoSize = true; + this.rBFertig.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.rBFertig.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rBFertig.Location = new System.Drawing.Point(95, 94); + this.rBFertig.Margin = new System.Windows.Forms.Padding(4); + this.rBFertig.Name = "rBFertig"; + this.rBFertig.Size = new System.Drawing.Size(68, 24); + this.rBFertig.TabIndex = 53; + this.rBFertig.TabStop = true; + this.rBFertig.Text = "Fertig"; + this.rBFertig.UseVisualStyleBackColor = true; + this.rBFertig.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); + // + // rBVorbereitet + // + this.rBVorbereitet.AutoSize = true; + this.rBVorbereitet.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.rBVorbereitet.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rBVorbereitet.Location = new System.Drawing.Point(44, 57); + this.rBVorbereitet.Margin = new System.Windows.Forms.Padding(4); + this.rBVorbereitet.Name = "rBVorbereitet"; + this.rBVorbereitet.Size = new System.Drawing.Size(106, 24); + this.rBVorbereitet.TabIndex = 52; + this.rBVorbereitet.TabStop = true; + this.rBVorbereitet.Text = "Vorbereitet"; + this.rBVorbereitet.UseVisualStyleBackColor = true; + this.rBVorbereitet.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); + // + // rBAlle + // + this.rBAlle.AutoSize = true; + this.rBAlle.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.rBAlle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rBAlle.Location = new System.Drawing.Point(115, 20); + this.rBAlle.Margin = new System.Windows.Forms.Padding(4); + this.rBAlle.Name = "rBAlle"; + this.rBAlle.Size = new System.Drawing.Size(53, 24); + this.rBAlle.TabIndex = 51; + this.rBAlle.TabStop = true; + this.rBAlle.Text = "Alle"; + this.rBAlle.UseVisualStyleBackColor = true; + this.rBAlle.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); + // + // buttonAufAbruf + // + this.buttonAufAbruf.BackColor = System.Drawing.Color.Red; + this.buttonAufAbruf.FlatAppearance.BorderColor = System.Drawing.Color.Red; + this.buttonAufAbruf.FlatAppearance.BorderSize = 0; + this.buttonAufAbruf.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonAufAbruf.ForeColor = System.Drawing.Color.White; + this.buttonAufAbruf.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.buttonAufAbruf.Location = new System.Drawing.Point(13, 265); + this.buttonAufAbruf.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonAufAbruf.Name = "buttonAufAbruf"; + this.buttonAufAbruf.Size = new System.Drawing.Size(200, 50); + this.buttonAufAbruf.TabIndex = 56; + this.buttonAufAbruf.Text = "AufAbruf"; + this.buttonAufAbruf.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.buttonAufAbruf.UseVisualStyleBackColor = false; + this.buttonAufAbruf.Visible = false; + this.buttonAufAbruf.Click += new System.EventHandler(this.buttonAufAbruf_Click); + // + // buttonAusgeliefert + // + this.buttonAusgeliefert.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonAusgeliefert.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.buttonAusgeliefert.FlatAppearance.BorderSize = 0; + this.buttonAusgeliefert.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonAusgeliefert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonAusgeliefert.ForeColor = System.Drawing.Color.White; + this.buttonAusgeliefert.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.buttonAusgeliefert.Location = new System.Drawing.Point(13, 209); + this.buttonAusgeliefert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonAusgeliefert.Name = "buttonAusgeliefert"; + this.buttonAusgeliefert.Size = new System.Drawing.Size(200, 50); + this.buttonAusgeliefert.TabIndex = 55; + this.buttonAusgeliefert.Text = "Ausgeliefert"; + this.buttonAusgeliefert.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.buttonAusgeliefert.UseVisualStyleBackColor = false; + this.buttonAusgeliefert.Visible = false; + this.buttonAusgeliefert.Click += new System.EventHandler(this.buttonAusgeliefert_Click); + // // buttonNeuerRegAuft // this.buttonNeuerRegAuft.BackColor = System.Drawing.Color.CadetBlue; @@ -677,10 +839,10 @@ namespace Deckungsbeitrag this.label14.Dock = System.Windows.Forms.DockStyle.Right; this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label14.ForeColor = System.Drawing.SystemColors.ControlText; - this.label14.Location = new System.Drawing.Point(417, 222); + this.label14.Location = new System.Drawing.Point(427, 222); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(54, 37); + this.label14.Size = new System.Drawing.Size(44, 37); this.label14.TabIndex = 29; this.label14.Text = "0,00"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -691,10 +853,10 @@ namespace Deckungsbeitrag this.label13.Dock = System.Windows.Forms.DockStyle.Right; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label13.ForeColor = System.Drawing.SystemColors.ControlText; - this.label13.Location = new System.Drawing.Point(244, 222); + this.label13.Location = new System.Drawing.Point(204, 222); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(54, 37); + this.label13.Size = new System.Drawing.Size(44, 37); this.label13.TabIndex = 28; this.label13.Text = "0,00"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -705,10 +867,10 @@ namespace Deckungsbeitrag this.labelContGes.Dock = System.Windows.Forms.DockStyle.Left; this.labelContGes.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContGes.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContGes.Location = new System.Drawing.Point(164, 222); + this.labelContGes.Location = new System.Drawing.Point(137, 222); this.labelContGes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContGes.Name = "labelContGes"; - this.labelContGes.Size = new System.Drawing.Size(72, 37); + this.labelContGes.Size = new System.Drawing.Size(59, 37); this.labelContGes.TabIndex = 27; this.labelContGes.Text = "Zahl 5"; this.labelContGes.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -722,7 +884,7 @@ namespace Deckungsbeitrag this.label9.Location = new System.Drawing.Point(4, 222); this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(86, 37); + this.label9.Size = new System.Drawing.Size(72, 37); this.label9.TabIndex = 25; this.label9.Text = "Gesamt"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -733,10 +895,10 @@ namespace Deckungsbeitrag this.label5.Dock = System.Windows.Forms.DockStyle.Right; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label5.ForeColor = System.Drawing.SystemColors.ControlText; - this.label5.Location = new System.Drawing.Point(421, 185); + this.label5.Location = new System.Drawing.Point(431, 185); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(50, 37); + this.label5.Size = new System.Drawing.Size(40, 37); this.label5.TabIndex = 23; this.label5.Text = "0,00"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -747,10 +909,10 @@ namespace Deckungsbeitrag this.label4.Dock = System.Windows.Forms.DockStyle.Right; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.SystemColors.ControlText; - this.label4.Location = new System.Drawing.Point(248, 185); + this.label4.Location = new System.Drawing.Point(208, 185); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(50, 37); + this.label4.Size = new System.Drawing.Size(40, 37); this.label4.TabIndex = 22; this.label4.Text = "0,00"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -761,10 +923,10 @@ namespace Deckungsbeitrag this.labelContZahl5.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl5.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl5.Location = new System.Drawing.Point(164, 185); + this.labelContZahl5.Location = new System.Drawing.Point(137, 185); this.labelContZahl5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl5.Name = "labelContZahl5"; - this.labelContZahl5.Size = new System.Drawing.Size(66, 37); + this.labelContZahl5.Size = new System.Drawing.Size(53, 37); this.labelContZahl5.TabIndex = 21; this.labelContZahl5.Text = "Zahl 5"; this.labelContZahl5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -778,7 +940,7 @@ namespace Deckungsbeitrag this.label2.Location = new System.Drawing.Point(4, 185); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(107, 37); + this.label2.Size = new System.Drawing.Size(90, 37); this.label2.TabIndex = 20; this.label2.Text = "Cont Rest"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -789,10 +951,10 @@ namespace Deckungsbeitrag this.labelZeit52.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit52.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit52.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit52.Location = new System.Drawing.Point(421, 148); + this.labelZeit52.Location = new System.Drawing.Point(431, 148); this.labelZeit52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit52.Name = "labelZeit52"; - this.labelZeit52.Size = new System.Drawing.Size(50, 37); + this.labelZeit52.Size = new System.Drawing.Size(40, 37); this.labelZeit52.TabIndex = 19; this.labelZeit52.Text = "0,00"; this.labelZeit52.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -803,10 +965,10 @@ namespace Deckungsbeitrag this.labelZeit42.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit42.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit42.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit42.Location = new System.Drawing.Point(421, 111); + this.labelZeit42.Location = new System.Drawing.Point(431, 111); this.labelZeit42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit42.Name = "labelZeit42"; - this.labelZeit42.Size = new System.Drawing.Size(50, 37); + this.labelZeit42.Size = new System.Drawing.Size(40, 37); this.labelZeit42.TabIndex = 18; this.labelZeit42.Text = "0,00"; this.labelZeit42.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -817,10 +979,10 @@ namespace Deckungsbeitrag this.labelZeit32.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit32.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit32.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit32.Location = new System.Drawing.Point(421, 74); + this.labelZeit32.Location = new System.Drawing.Point(431, 74); this.labelZeit32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit32.Name = "labelZeit32"; - this.labelZeit32.Size = new System.Drawing.Size(50, 37); + this.labelZeit32.Size = new System.Drawing.Size(40, 37); this.labelZeit32.TabIndex = 17; this.labelZeit32.Text = "0,00"; this.labelZeit32.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -831,10 +993,10 @@ namespace Deckungsbeitrag this.labelZeit22.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit22.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit22.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit22.Location = new System.Drawing.Point(421, 37); + this.labelZeit22.Location = new System.Drawing.Point(431, 37); this.labelZeit22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit22.Name = "labelZeit22"; - this.labelZeit22.Size = new System.Drawing.Size(50, 37); + this.labelZeit22.Size = new System.Drawing.Size(40, 37); this.labelZeit22.TabIndex = 16; this.labelZeit22.Text = "0,00"; this.labelZeit22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -845,10 +1007,10 @@ namespace Deckungsbeitrag this.labelZeit12.Dock = System.Windows.Forms.DockStyle.Fill; this.labelZeit12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit12.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit12.Location = new System.Drawing.Point(306, 0); + this.labelZeit12.Location = new System.Drawing.Point(256, 0); this.labelZeit12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit12.Name = "labelZeit12"; - this.labelZeit12.Size = new System.Drawing.Size(165, 37); + this.labelZeit12.Size = new System.Drawing.Size(215, 37); this.labelZeit12.TabIndex = 15; this.labelZeit12.Text = "2"; this.labelZeit12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -859,10 +1021,10 @@ namespace Deckungsbeitrag this.labelZeit5.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit5.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit5.Location = new System.Drawing.Point(248, 148); + this.labelZeit5.Location = new System.Drawing.Point(208, 148); this.labelZeit5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit5.Name = "labelZeit5"; - this.labelZeit5.Size = new System.Drawing.Size(50, 37); + this.labelZeit5.Size = new System.Drawing.Size(40, 37); this.labelZeit5.TabIndex = 14; this.labelZeit5.Text = "0,00"; this.labelZeit5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -873,10 +1035,10 @@ namespace Deckungsbeitrag this.labelZeit4.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit4.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit4.Location = new System.Drawing.Point(248, 111); + this.labelZeit4.Location = new System.Drawing.Point(208, 111); this.labelZeit4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit4.Name = "labelZeit4"; - this.labelZeit4.Size = new System.Drawing.Size(50, 37); + this.labelZeit4.Size = new System.Drawing.Size(40, 37); this.labelZeit4.TabIndex = 13; this.labelZeit4.Text = "0,00"; this.labelZeit4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -887,10 +1049,10 @@ namespace Deckungsbeitrag this.labelZeit3.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit3.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit3.Location = new System.Drawing.Point(248, 74); + this.labelZeit3.Location = new System.Drawing.Point(208, 74); this.labelZeit3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit3.Name = "labelZeit3"; - this.labelZeit3.Size = new System.Drawing.Size(50, 37); + this.labelZeit3.Size = new System.Drawing.Size(40, 37); this.labelZeit3.TabIndex = 12; this.labelZeit3.Text = "0,00"; this.labelZeit3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -901,10 +1063,10 @@ namespace Deckungsbeitrag this.labelZeit2.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit2.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit2.Location = new System.Drawing.Point(248, 37); + this.labelZeit2.Location = new System.Drawing.Point(208, 37); this.labelZeit2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit2.Name = "labelZeit2"; - this.labelZeit2.Size = new System.Drawing.Size(50, 37); + this.labelZeit2.Size = new System.Drawing.Size(40, 37); this.labelZeit2.TabIndex = 11; this.labelZeit2.Text = "0,00"; this.labelZeit2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -915,10 +1077,10 @@ namespace Deckungsbeitrag this.labelZeit1.Dock = System.Windows.Forms.DockStyle.Fill; this.labelZeit1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit1.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit1.Location = new System.Drawing.Point(244, 0); + this.labelZeit1.Location = new System.Drawing.Point(204, 0); this.labelZeit1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit1.Name = "labelZeit1"; - this.labelZeit1.Size = new System.Drawing.Size(54, 37); + this.labelZeit1.Size = new System.Drawing.Size(44, 37); this.labelZeit1.TabIndex = 10; this.labelZeit1.Text = "1"; this.labelZeit1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -929,10 +1091,10 @@ namespace Deckungsbeitrag this.labelContZahl4.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl4.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl4.Location = new System.Drawing.Point(164, 148); + this.labelContZahl4.Location = new System.Drawing.Point(137, 148); this.labelContZahl4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl4.Name = "labelContZahl4"; - this.labelContZahl4.Size = new System.Drawing.Size(66, 37); + this.labelContZahl4.Size = new System.Drawing.Size(53, 37); this.labelContZahl4.TabIndex = 9; this.labelContZahl4.Text = "Zahl 5"; this.labelContZahl4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -946,7 +1108,7 @@ namespace Deckungsbeitrag this.label1.Location = new System.Drawing.Point(4, 148); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(143, 37); + this.label1.Size = new System.Drawing.Size(118, 37); this.label1.TabIndex = 8; this.label1.Text = "Cont heute+3"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -957,10 +1119,10 @@ namespace Deckungsbeitrag this.labelContZahl3.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl3.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl3.Location = new System.Drawing.Point(164, 111); + this.labelContZahl3.Location = new System.Drawing.Point(137, 111); this.labelContZahl3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl3.Name = "labelContZahl3"; - this.labelContZahl3.Size = new System.Drawing.Size(66, 37); + this.labelContZahl3.Size = new System.Drawing.Size(53, 37); this.labelContZahl3.TabIndex = 7; this.labelContZahl3.Text = "Zahl 4"; this.labelContZahl3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -974,7 +1136,7 @@ namespace Deckungsbeitrag this.label6.Location = new System.Drawing.Point(4, 111); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(143, 37); + this.label6.Size = new System.Drawing.Size(118, 37); this.label6.TabIndex = 6; this.label6.Text = "Cont heute+2"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -985,10 +1147,10 @@ namespace Deckungsbeitrag this.labelContZahl2.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl2.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl2.Location = new System.Drawing.Point(164, 74); + this.labelContZahl2.Location = new System.Drawing.Point(137, 74); this.labelContZahl2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl2.Name = "labelContZahl2"; - this.labelContZahl2.Size = new System.Drawing.Size(66, 37); + this.labelContZahl2.Size = new System.Drawing.Size(53, 37); this.labelContZahl2.TabIndex = 5; this.labelContZahl2.Text = "Zahl 3"; this.labelContZahl2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1002,7 +1164,7 @@ namespace Deckungsbeitrag this.label8.Location = new System.Drawing.Point(4, 74); this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(143, 37); + this.label8.Size = new System.Drawing.Size(118, 37); this.label8.TabIndex = 4; this.label8.Text = "Cont heute+1"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1013,10 +1175,10 @@ namespace Deckungsbeitrag this.labelContZahl1.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl1.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl1.Location = new System.Drawing.Point(164, 37); + this.labelContZahl1.Location = new System.Drawing.Point(137, 37); this.labelContZahl1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl1.Name = "labelContZahl1"; - this.labelContZahl1.Size = new System.Drawing.Size(66, 37); + this.labelContZahl1.Size = new System.Drawing.Size(53, 37); this.labelContZahl1.TabIndex = 3; this.labelContZahl1.Text = "Zahl 2"; this.labelContZahl1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1030,7 +1192,7 @@ namespace Deckungsbeitrag this.label10.Location = new System.Drawing.Point(4, 37); this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(118, 37); + this.label10.Size = new System.Drawing.Size(98, 37); this.label10.TabIndex = 2; this.label10.Text = "Cont heute"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1044,173 +1206,11 @@ namespace Deckungsbeitrag this.label12.Location = new System.Drawing.Point(4, 0); this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(152, 37); + this.label12.Size = new System.Drawing.Size(125, 37); this.label12.TabIndex = 0; this.label12.Text = "Waschstraßen"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // groupBoxAuftrag - // - this.groupBoxAuftrag.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.groupBoxAuftrag.Controls.Add(this.objectListViewAuftrag); - this.groupBoxAuftrag.Controls.Add(this.rBAufAbruf); - this.groupBoxAuftrag.Controls.Add(this.rBAusgeliefert); - this.groupBoxAuftrag.Controls.Add(this.rBFertig); - this.groupBoxAuftrag.Controls.Add(this.rBVorbereitet); - this.groupBoxAuftrag.Controls.Add(this.rBAlle); - this.groupBoxAuftrag.Controls.Add(this.buttonAufAbruf); - this.groupBoxAuftrag.Controls.Add(this.buttonAusgeliefert); - this.groupBoxAuftrag.Enabled = false; - this.groupBoxAuftrag.Location = new System.Drawing.Point(1119, 80); - this.groupBoxAuftrag.Margin = new System.Windows.Forms.Padding(4); - this.groupBoxAuftrag.Name = "groupBoxAuftrag"; - this.groupBoxAuftrag.Padding = new System.Windows.Forms.Padding(4); - this.groupBoxAuftrag.Size = new System.Drawing.Size(1632, 607); - this.groupBoxAuftrag.TabIndex = 51; - this.groupBoxAuftrag.TabStop = false; - this.groupBoxAuftrag.Visible = false; - // - // objectListViewAuftrag - // - this.objectListViewAuftrag.AlternateRowBackColor = System.Drawing.Color.LightSteelBlue; - this.objectListViewAuftrag.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.objectListViewAuftrag.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.objectListViewAuftrag.CellEditUseWholeCell = false; - this.objectListViewAuftrag.CheckBoxes = true; - this.objectListViewAuftrag.Cursor = System.Windows.Forms.Cursors.Default; - this.objectListViewAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.objectListViewAuftrag.FullRowSelect = true; - this.objectListViewAuftrag.GridLines = true; - this.objectListViewAuftrag.HideSelection = false; - this.objectListViewAuftrag.Location = new System.Drawing.Point(220, 17); - this.objectListViewAuftrag.Margin = new System.Windows.Forms.Padding(4); - this.objectListViewAuftrag.Name = "objectListViewAuftrag"; - this.objectListViewAuftrag.Size = new System.Drawing.Size(1404, 582); - this.objectListViewAuftrag.TabIndex = 58; - this.objectListViewAuftrag.UseAlternatingBackColors = true; - this.objectListViewAuftrag.UseCompatibleStateImageBehavior = false; - this.objectListViewAuftrag.View = System.Windows.Forms.View.Details; - this.objectListViewAuftrag.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.objectListViewAuftrag_ItemChecked); - // - // rBAufAbruf - // - this.rBAufAbruf.AutoSize = true; - this.rBAufAbruf.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.rBAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBAufAbruf.Location = new System.Drawing.Point(59, 167); - this.rBAufAbruf.Margin = new System.Windows.Forms.Padding(4); - this.rBAufAbruf.Name = "rBAufAbruf"; - this.rBAufAbruf.Size = new System.Drawing.Size(115, 29); - this.rBAufAbruf.TabIndex = 57; - this.rBAufAbruf.TabStop = true; - this.rBAufAbruf.Text = "Auf Abruf"; - this.rBAufAbruf.UseVisualStyleBackColor = true; - this.rBAufAbruf.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); - // - // rBAusgeliefert - // - this.rBAusgeliefert.AutoSize = true; - this.rBAusgeliefert.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.rBAusgeliefert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBAusgeliefert.Location = new System.Drawing.Point(36, 130); - this.rBAusgeliefert.Margin = new System.Windows.Forms.Padding(4); - this.rBAusgeliefert.Name = "rBAusgeliefert"; - this.rBAusgeliefert.Size = new System.Drawing.Size(136, 29); - this.rBAusgeliefert.TabIndex = 54; - this.rBAusgeliefert.TabStop = true; - this.rBAusgeliefert.Text = "Ausgeliefert"; - this.rBAusgeliefert.UseVisualStyleBackColor = true; - this.rBAusgeliefert.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); - // - // rBFertig - // - this.rBFertig.AutoSize = true; - this.rBFertig.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.rBFertig.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBFertig.Location = new System.Drawing.Point(95, 94); - this.rBFertig.Margin = new System.Windows.Forms.Padding(4); - this.rBFertig.Name = "rBFertig"; - this.rBFertig.Size = new System.Drawing.Size(82, 29); - this.rBFertig.TabIndex = 53; - this.rBFertig.TabStop = true; - this.rBFertig.Text = "Fertig"; - this.rBFertig.UseVisualStyleBackColor = true; - this.rBFertig.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); - // - // rBVorbereitet - // - this.rBVorbereitet.AutoSize = true; - this.rBVorbereitet.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.rBVorbereitet.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBVorbereitet.Location = new System.Drawing.Point(44, 57); - this.rBVorbereitet.Margin = new System.Windows.Forms.Padding(4); - this.rBVorbereitet.Name = "rBVorbereitet"; - this.rBVorbereitet.Size = new System.Drawing.Size(128, 29); - this.rBVorbereitet.TabIndex = 52; - this.rBVorbereitet.TabStop = true; - this.rBVorbereitet.Text = "Vorbereitet"; - this.rBVorbereitet.UseVisualStyleBackColor = true; - this.rBVorbereitet.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); - // - // rBAlle - // - this.rBAlle.AutoSize = true; - this.rBAlle.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.rBAlle.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rBAlle.Location = new System.Drawing.Point(115, 20); - this.rBAlle.Margin = new System.Windows.Forms.Padding(4); - this.rBAlle.Name = "rBAlle"; - this.rBAlle.Size = new System.Drawing.Size(66, 29); - this.rBAlle.TabIndex = 51; - this.rBAlle.TabStop = true; - this.rBAlle.Text = "Alle"; - this.rBAlle.UseVisualStyleBackColor = true; - this.rBAlle.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged); - // - // buttonAufAbruf - // - this.buttonAufAbruf.BackColor = System.Drawing.Color.Red; - this.buttonAufAbruf.FlatAppearance.BorderColor = System.Drawing.Color.Red; - this.buttonAufAbruf.FlatAppearance.BorderSize = 0; - this.buttonAufAbruf.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonAufAbruf.ForeColor = System.Drawing.Color.White; - this.buttonAufAbruf.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonAufAbruf.Location = new System.Drawing.Point(13, 265); - this.buttonAufAbruf.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonAufAbruf.Name = "buttonAufAbruf"; - this.buttonAufAbruf.Size = new System.Drawing.Size(200, 50); - this.buttonAufAbruf.TabIndex = 56; - this.buttonAufAbruf.Text = "AufAbruf"; - this.buttonAufAbruf.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.buttonAufAbruf.UseVisualStyleBackColor = false; - this.buttonAufAbruf.Visible = false; - this.buttonAufAbruf.Click += new System.EventHandler(this.buttonAufAbruf_Click); - // - // buttonAusgeliefert - // - this.buttonAusgeliefert.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.buttonAusgeliefert.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.buttonAusgeliefert.FlatAppearance.BorderSize = 0; - this.buttonAusgeliefert.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonAusgeliefert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonAusgeliefert.ForeColor = System.Drawing.Color.White; - this.buttonAusgeliefert.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.buttonAusgeliefert.Location = new System.Drawing.Point(13, 209); - this.buttonAusgeliefert.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonAusgeliefert.Name = "buttonAusgeliefert"; - this.buttonAusgeliefert.Size = new System.Drawing.Size(200, 50); - this.buttonAusgeliefert.TabIndex = 55; - this.buttonAusgeliefert.Text = "Ausgeliefert"; - this.buttonAusgeliefert.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; - this.buttonAusgeliefert.UseVisualStyleBackColor = false; - this.buttonAusgeliefert.Visible = false; - this.buttonAusgeliefert.Click += new System.EventHandler(this.buttonAusgeliefert_Click); - // // groupBoxSaison // this.groupBoxSaison.Controls.Add(this.comboBoxSaison); @@ -1236,7 +1236,7 @@ namespace Deckungsbeitrag this.comboBoxSaison.Location = new System.Drawing.Point(11, 23); this.comboBoxSaison.Margin = new System.Windows.Forms.Padding(4); this.comboBoxSaison.Name = "comboBoxSaison"; - this.comboBoxSaison.Size = new System.Drawing.Size(352, 33); + this.comboBoxSaison.Size = new System.Drawing.Size(352, 28); this.comboBoxSaison.TabIndex = 66; this.comboBoxSaison.SelectedIndexChanged += new System.EventHandler(this.comboBoxSaison_SelectedIndexChanged); // @@ -1375,14 +1375,14 @@ namespace Deckungsbeitrag this.tableLayoutPanelUpdate.Controls.Add(this.labelKundenDatum, 1, 0); this.tableLayoutPanelUpdate.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanelUpdate.ForeColor = System.Drawing.Color.Black; - this.tableLayoutPanelUpdate.Location = new System.Drawing.Point(4, 19); + this.tableLayoutPanelUpdate.Location = new System.Drawing.Point(4, 23); this.tableLayoutPanelUpdate.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanelUpdate.Name = "tableLayoutPanelUpdate"; this.tableLayoutPanelUpdate.RowCount = 3; this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanelUpdate.Size = new System.Drawing.Size(783, 112); + this.tableLayoutPanelUpdate.Size = new System.Drawing.Size(783, 108); this.tableLayoutPanelUpdate.TabIndex = 0; // // labelSoftwareDatum @@ -1390,10 +1390,10 @@ namespace Deckungsbeitrag this.labelSoftwareDatum.AutoSize = true; this.labelSoftwareDatum.Dock = System.Windows.Forms.DockStyle.Fill; this.labelSoftwareDatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelSoftwareDatum.Location = new System.Drawing.Point(101, 74); + this.labelSoftwareDatum.Location = new System.Drawing.Point(83, 72); this.labelSoftwareDatum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelSoftwareDatum.Name = "labelSoftwareDatum"; - this.labelSoftwareDatum.Size = new System.Drawing.Size(678, 38); + this.labelSoftwareDatum.Size = new System.Drawing.Size(696, 36); this.labelSoftwareDatum.TabIndex = 7; this.labelSoftwareDatum.Text = "label17"; this.labelSoftwareDatum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1403,10 +1403,10 @@ namespace Deckungsbeitrag this.labelArtikelDatum.AutoSize = true; this.labelArtikelDatum.Dock = System.Windows.Forms.DockStyle.Fill; this.labelArtikelDatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelArtikelDatum.Location = new System.Drawing.Point(101, 37); + this.labelArtikelDatum.Location = new System.Drawing.Point(83, 36); this.labelArtikelDatum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelArtikelDatum.Name = "labelArtikelDatum"; - this.labelArtikelDatum.Size = new System.Drawing.Size(678, 37); + this.labelArtikelDatum.Size = new System.Drawing.Size(696, 36); this.labelArtikelDatum.TabIndex = 6; this.labelArtikelDatum.Text = "label15"; this.labelArtikelDatum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1416,10 +1416,10 @@ namespace Deckungsbeitrag this.label16.AutoSize = true; this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(4, 74); + this.label16.Location = new System.Drawing.Point(4, 72); this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(89, 38); + this.label16.Size = new System.Drawing.Size(71, 36); this.label16.TabIndex = 4; this.label16.Text = "Software:"; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1429,10 +1429,10 @@ namespace Deckungsbeitrag this.label11.AutoSize = true; this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(4, 37); + this.label11.Location = new System.Drawing.Point(4, 36); this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(89, 37); + this.label11.Size = new System.Drawing.Size(71, 36); this.label11.TabIndex = 2; this.label11.Text = "Artikel:"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1445,7 +1445,7 @@ namespace Deckungsbeitrag this.label3.Location = new System.Drawing.Point(4, 0); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(89, 37); + this.label3.Size = new System.Drawing.Size(71, 36); this.label3.TabIndex = 0; this.label3.Text = "Kunden:"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1455,10 +1455,10 @@ namespace Deckungsbeitrag this.labelKundenDatum.AutoSize = true; this.labelKundenDatum.Dock = System.Windows.Forms.DockStyle.Fill; this.labelKundenDatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelKundenDatum.Location = new System.Drawing.Point(101, 0); + this.labelKundenDatum.Location = new System.Drawing.Point(83, 0); this.labelKundenDatum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelKundenDatum.Name = "labelKundenDatum"; - this.labelKundenDatum.Size = new System.Drawing.Size(678, 37); + this.labelKundenDatum.Size = new System.Drawing.Size(696, 36); this.labelKundenDatum.TabIndex = 5; this.labelKundenDatum.Text = "label7"; this.labelKundenDatum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1497,7 +1497,7 @@ namespace Deckungsbeitrag this.textBoxScannTest.Location = new System.Drawing.Point(8, 217); this.textBoxScannTest.Margin = new System.Windows.Forms.Padding(4); this.textBoxScannTest.Name = "textBoxScannTest"; - this.textBoxScannTest.Size = new System.Drawing.Size(171, 30); + this.textBoxScannTest.Size = new System.Drawing.Size(171, 26); this.textBoxScannTest.TabIndex = 13; this.textBoxScannTest.TextChanged += new System.EventHandler(this.textBoxScannTest_TextChanged); // @@ -1519,7 +1519,7 @@ namespace Deckungsbeitrag this.labelScannTest.Location = new System.Drawing.Point(8, 288); this.labelScannTest.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelScannTest.Name = "labelScannTest"; - this.labelScannTest.Size = new System.Drawing.Size(79, 29); + this.labelScannTest.Size = new System.Drawing.Size(60, 24); this.labelScannTest.TabIndex = 11; this.labelScannTest.Text = "label1"; // @@ -1533,7 +1533,6 @@ namespace Deckungsbeitrag this.HelpButton = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(200, 200); this.Name = "FormMain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -1549,14 +1548,14 @@ namespace Deckungsbeitrag this.toolStripMenu.PerformLayout(); this.panelMain.ResumeLayout(false); this.panelMain.PerformLayout(); + this.groupBoxAuftrag.ResumeLayout(false); + this.groupBoxAuftrag.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).EndInit(); this.panelProgress.ResumeLayout(false); this.groupBoxContAnz.ResumeLayout(false); this.groupBoxContAnz.PerformLayout(); this.tLPContAnz.ResumeLayout(false); this.tLPContAnz.PerformLayout(); - this.groupBoxAuftrag.ResumeLayout(false); - this.groupBoxAuftrag.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.objectListViewAuftrag)).EndInit(); this.groupBoxSaison.ResumeLayout(false); this.groupBoxUpdate.ResumeLayout(false); this.tableLayoutPanelUpdate.ResumeLayout(false); diff --git a/AA-Forms/FormMain.resx b/AA-Forms/FormMain.resx index cf40d7c..39c5225 100644 --- a/AA-Forms/FormMain.resx +++ b/AA-Forms/FormMain.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -146,7 +146,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -157,7 +157,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 ukspqFrrORPnH3UNRYTVJ8C+HUm/AYxAcd8CGGUaaQRYikR71BKANtXuMmBk1/VebVMWoDZpm28L6IN6 afQmMGV3A9pTYJcFcEj76dd7EaAX+ebuXbw2E3cbfftvjPBKL5kAAAAASUVORK5CYII= @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 ukspqFrrORPnH3UNRYTVJ8C+HUm/AYxAcd8CGGUaaQRYikR71BKANtXuMmBk1/VebVMWoDZpm28L6IN6 afQmMGV3A9pTYJcFcEj76dd7EaAX+ebuXbw2E3cbfftvjPBKL5kAAAAASUVORK5CYII= @@ -173,7 +173,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -184,7 +184,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL K5WtGpmnmIhaegrBvM8vP9P0q5xzIcn9UJHRe88ahojZOVcBQxCc/lcSmSpJdBo8axYC8JEsNYAeRO+J GIBEhFgpGsARGV+sPmcC3q9PVQihpJRqmlOANm/bnfcIQn0CxRi51wXIdb7MddpyXZpeF4AJSLTWPROg Ic/HXtb1xqK1NotRdPgVzsRG/IFGJf4vZOpFEVHH2lgAAAAASUVORK5CYII= @@ -193,7 +193,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL K5WtGpmnmIhaegrBvM8vP9P0q5xzIcn9UJHRe88ahojZOVcBQxCc/lcSmSpJdBo8axYC8JEsNYAeRO+J GIBEhFgpGsARGV+sPmcC3q9PVQihpJRqmlOANm/bnfcIQn0CxRi51wXIdb7MddpyXZpeF4AJSLTWPROg Ic/HXtb1xqK1NotRdPgVzsRG/IFGJf4vZOpFEVHH2lgAAAAASUVORK5CYII= @@ -418,7 +418,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -429,7 +429,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -440,7 +440,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -451,7 +451,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -466,7 +466,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi DkBPT09BSbORsCkneqM1yUxQtNLG0pdG/va3x+M5nT5p27adVbVVVRehhYvjA1PVapomV5alS9PUJUni wRkfHDFxnjeIcRx9cJZlrmkaNwyDB2d8cIcitAZhleZ5vonIBT/gjK+qKtf3PQI/67p+PVdvSaQKgQH5 ayLyvSzLXiQQYUgQXdc5qh0kXwBJds08zx/FEGBY3Pdo0vB1Xe8oisLHm8hnBP57hX2ILxN+iARDDIYd @@ -477,7 +477,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi DkBPT09BSbORsCkneqM1yUxQtNLG0pdG/va3x+M5nT5p27adVbVVVRehhYvjA1PVapomV5alS9PUJUni wRkfHDFxnjeIcRx9cJZlrmkaNwyDB2d8cIcitAZhleZ5vonIBT/gjK+qKtf3PQI/67p+PVdvSaQKgQH5 ayLyvSzLXiQQYUgQXdc5qh0kXwBJds08zx/FEGBY3Pdo0vB1Xe8oisLHm8hnBP57hX2ILxN+iARDDIYd @@ -488,7 +488,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi DkBPT09BSbORsCkneqM1yUxQtNLG0pdG/va3x+M5nT5p27adVbVVVRehhYvjA1PVapomV5alS9PUJUni wRkfHDFxnjeIcRx9cJZlrmkaNwyDB2d8cIcitAZhleZ5vonIBT/gjK+qKtf3PQI/67p+PVdvSaQKgQH5 ayLyvSzLXiQQYUgQXdc5qh0kXwBJds08zx/FEGBY3Pdo0vB1Xe8oisLHm8hnBP57hX2ILxN+iARDDIYd diff --git a/App.config b/App.config index 6484ec4..a3ca776 100644 --- a/App.config +++ b/App.config @@ -6,7 +6,7 @@ - + diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 4b9aca2..c16035c 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: -[assembly: AssemblyVersion("1.0.8.6")] -[assembly: AssemblyFileVersion("1.0.8.6")] +[assembly: AssemblyVersion("1.0.8.7")] +[assembly: AssemblyFileVersion("1.0.8.7")] diff --git a/SetupVerwaltung/SetupVerwaltung.vdproj b/SetupVerwaltung/SetupVerwaltung.vdproj index cb4880a..de64bde 100644 --- a/SetupVerwaltung/SetupVerwaltung.vdproj +++ b/SetupVerwaltung/SetupVerwaltung.vdproj @@ -1647,15 +1647,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:SetupVerwaltung" - "ProductCode" = "8:{3BB07EE2-9EBF-4B07-8A40-74BA0F6D4828}" - "PackageCode" = "8:{3DE58A5F-B6C8-43C9-830C-D48FDAC85C22}" + "ProductCode" = "8:{6F6112FC-3235-4EEB-B559-4888422FA848}" + "PackageCode" = "8:{95806CD0-B3FC-4849-AD4A-9FC47499F90E}" "UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.86" + "ProductVersion" = "8:1.0.87" "Manufacturer" = "8:Kilian Wirl GmbH" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/UserControls/UCInventur.Designer.cs b/UserControls/UCInventur.Designer.cs index d0a4c4c..7e57f79 100644 --- a/UserControls/UCInventur.Designer.cs +++ b/UserControls/UCInventur.Designer.cs @@ -28,138 +28,145 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UCInventur)); - this.groupBoxInventur = new System.Windows.Forms.GroupBox(); - this.labelLieferDat = new System.Windows.Forms.Label(); - this.dTPLieferDat = new System.Windows.Forms.DateTimePicker(); - this.labelInvDat = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.pictureBoxClose = new System.Windows.Forms.PictureBox(); - this.dTPInvDatum = new System.Windows.Forms.DateTimePicker(); - this.pictureBoxPlus = new System.Windows.Forms.PictureBox(); - this.dGArtikel = new System.Windows.Forms.DataGridView(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.buttonFreigeben = new System.Windows.Forms.Button(); - this.panelButtons = new System.Windows.Forms.Panel(); - this.buttonSpeichern = new System.Windows.Forms.Button(); - this.labelInvText = new System.Windows.Forms.Label(); - this.buttonAbbrechen = new System.Windows.Forms.Button(); - this.groupBoxInventur.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxClose)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).BeginInit(); - this.panelButtons.SuspendLayout(); - this.SuspendLayout(); - // - // groupBoxInventur - // - this.groupBoxInventur.Controls.Add(this.labelLieferDat); - this.groupBoxInventur.Controls.Add(this.dTPLieferDat); - this.groupBoxInventur.Controls.Add(this.labelInvDat); - this.groupBoxInventur.Controls.Add(this.label1); - this.groupBoxInventur.Controls.Add(this.pictureBoxClose); - this.groupBoxInventur.Controls.Add(this.dTPInvDatum); - this.groupBoxInventur.Controls.Add(this.pictureBoxPlus); - this.groupBoxInventur.Controls.Add(this.dGArtikel); - this.groupBoxInventur.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBoxInventur.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBoxInventur.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.groupBoxInventur.Location = new System.Drawing.Point(3, 3); - this.groupBoxInventur.Name = "groupBoxInventur"; - this.groupBoxInventur.Padding = new System.Windows.Forms.Padding(5); - this.groupBoxInventur.Size = new System.Drawing.Size(983, 485); - this.groupBoxInventur.TabIndex = 0; - this.groupBoxInventur.TabStop = false; - this.groupBoxInventur.Text = "Inventur 000000 Kundename"; - this.groupBoxInventur.Paint += new System.Windows.Forms.PaintEventHandler(this.groupBoxInventur_Paint); - // - // labelLieferDat - // - this.labelLieferDat.AutoSize = true; - this.labelLieferDat.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelLieferDat.Location = new System.Drawing.Point(319, 46); - this.labelLieferDat.Name = "labelLieferDat"; - this.labelLieferDat.Size = new System.Drawing.Size(115, 20); - this.labelLieferDat.TabIndex = 46; - this.labelLieferDat.Text = "Lieferdatum:"; - this.labelLieferDat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // dTPLieferDat - // - this.dTPLieferDat.CalendarForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.dTPLieferDat.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dTPLieferDat.Location = new System.Drawing.Point(440, 37); - this.dTPLieferDat.Name = "dTPLieferDat"; - this.dTPLieferDat.Size = new System.Drawing.Size(161, 30); - this.dTPLieferDat.TabIndex = 45; - // - // labelInvDat - // - this.labelInvDat.AutoSize = true; - this.labelInvDat.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelInvDat.Location = new System.Drawing.Point(3, 46); - this.labelInvDat.Name = "labelInvDat"; - this.labelInvDat.Size = new System.Drawing.Size(133, 20); - this.labelInvDat.TabIndex = 44; - this.labelInvDat.Text = "Inventurdatum:"; - this.labelInvDat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(697, 46); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(245, 20); - this.label1.TabIndex = 43; - this.label1.Text = "Lager/Lieferung hinzufügen:"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // pictureBoxClose - // - this.pictureBoxClose.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBoxClose.ErrorImage"))); - this.pictureBoxClose.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxClose.Image"))); - this.pictureBoxClose.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBoxClose.InitialImage"))); - this.pictureBoxClose.Location = new System.Drawing.Point(948, 7); - this.pictureBoxClose.Name = "pictureBoxClose"; - this.pictureBoxClose.Size = new System.Drawing.Size(25, 25); - this.pictureBoxClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBoxClose.TabIndex = 42; - this.pictureBoxClose.TabStop = false; - this.pictureBoxClose.Click += new System.EventHandler(this.pictureBoxClose_Click); - // - // dTPInvDatum - // - this.dTPInvDatum.CalendarForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.dTPInvDatum.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dTPInvDatum.Location = new System.Drawing.Point(142, 37); - this.dTPInvDatum.Name = "dTPInvDatum"; - this.dTPInvDatum.Size = new System.Drawing.Size(161, 30); - this.dTPInvDatum.TabIndex = 41; - // - // pictureBoxPlus - // - this.pictureBoxPlus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); - this.pictureBoxPlus.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxPlus.Image"))); - this.pictureBoxPlus.Location = new System.Drawing.Point(948, 37); - this.pictureBoxPlus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.pictureBoxPlus.Name = "pictureBoxPlus"; - this.pictureBoxPlus.Size = new System.Drawing.Size(30, 30); - this.pictureBoxPlus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBoxPlus.TabIndex = 40; - this.pictureBoxPlus.TabStop = false; - this.pictureBoxPlus.Click += new System.EventHandler(this.pictureBoxPlus_Click); - // - // dGArtikel - // - this.dGArtikel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dGArtikel.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UCInventur)); + this.groupBoxInventur = new System.Windows.Forms.GroupBox(); + this.labelLieferDat = new System.Windows.Forms.Label(); + this.dTPLieferDat = new System.Windows.Forms.DateTimePicker(); + this.labelInvDat = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.pictureBoxClose = new System.Windows.Forms.PictureBox(); + this.dTPInvDatum = new System.Windows.Forms.DateTimePicker(); + this.pictureBoxPlus = new System.Windows.Forms.PictureBox(); + this.dGArtikel = new System.Windows.Forms.DataGridView(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonFreigeben = new System.Windows.Forms.Button(); + this.panelButtons = new System.Windows.Forms.Panel(); + this.buttonAbbrechen = new System.Windows.Forms.Button(); + this.buttonSpeichern = new System.Windows.Forms.Button(); + this.labelInvText = new System.Windows.Forms.Label(); + this.groupBoxInventur.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxClose)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).BeginInit(); + this.panelButtons.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxInventur + // + this.groupBoxInventur.Controls.Add(this.labelLieferDat); + this.groupBoxInventur.Controls.Add(this.dTPLieferDat); + this.groupBoxInventur.Controls.Add(this.labelInvDat); + this.groupBoxInventur.Controls.Add(this.label1); + this.groupBoxInventur.Controls.Add(this.pictureBoxClose); + this.groupBoxInventur.Controls.Add(this.dTPInvDatum); + this.groupBoxInventur.Controls.Add(this.pictureBoxPlus); + this.groupBoxInventur.Controls.Add(this.dGArtikel); + this.groupBoxInventur.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBoxInventur.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.groupBoxInventur.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.groupBoxInventur.Location = new System.Drawing.Point(3, 4); + this.groupBoxInventur.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBoxInventur.Name = "groupBoxInventur"; + this.groupBoxInventur.Padding = new System.Windows.Forms.Padding(6); + this.groupBoxInventur.Size = new System.Drawing.Size(1106, 563); + this.groupBoxInventur.TabIndex = 0; + this.groupBoxInventur.TabStop = false; + this.groupBoxInventur.Text = "Inventur 000000 Kundename"; + this.groupBoxInventur.Paint += new System.Windows.Forms.PaintEventHandler(this.groupBoxInventur_Paint); + // + // labelLieferDat + // + this.labelLieferDat.AutoSize = true; + this.labelLieferDat.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelLieferDat.Location = new System.Drawing.Point(359, 58); + this.labelLieferDat.Name = "labelLieferDat"; + this.labelLieferDat.Size = new System.Drawing.Size(99, 17); + this.labelLieferDat.TabIndex = 46; + this.labelLieferDat.Text = "Lieferdatum:"; + this.labelLieferDat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // dTPLieferDat + // + this.dTPLieferDat.CalendarForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.dTPLieferDat.Format = System.Windows.Forms.DateTimePickerFormat.Short; + this.dTPLieferDat.Location = new System.Drawing.Point(495, 46); + this.dTPLieferDat.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.dTPLieferDat.Name = "dTPLieferDat"; + this.dTPLieferDat.Size = new System.Drawing.Size(181, 26); + this.dTPLieferDat.TabIndex = 45; + // + // labelInvDat + // + this.labelInvDat.AutoSize = true; + this.labelInvDat.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelInvDat.Location = new System.Drawing.Point(3, 58); + this.labelInvDat.Name = "labelInvDat"; + this.labelInvDat.Size = new System.Drawing.Size(116, 17); + this.labelInvDat.TabIndex = 44; + this.labelInvDat.Text = "Inventurdatum:"; + this.labelInvDat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(784, 58); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(214, 17); + this.label1.TabIndex = 43; + this.label1.Text = "Lager/Lieferung hinzufügen:"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // pictureBoxClose + // + this.pictureBoxClose.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBoxClose.ErrorImage"))); + this.pictureBoxClose.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxClose.Image"))); + this.pictureBoxClose.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBoxClose.InitialImage"))); + this.pictureBoxClose.Location = new System.Drawing.Point(1066, 9); + this.pictureBoxClose.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.pictureBoxClose.Name = "pictureBoxClose"; + this.pictureBoxClose.Size = new System.Drawing.Size(28, 31); + this.pictureBoxClose.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBoxClose.TabIndex = 42; + this.pictureBoxClose.TabStop = false; + this.pictureBoxClose.Click += new System.EventHandler(this.pictureBoxClose_Click); + // + // dTPInvDatum + // + this.dTPInvDatum.CalendarForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.dTPInvDatum.Format = System.Windows.Forms.DateTimePickerFormat.Short; + this.dTPInvDatum.Location = new System.Drawing.Point(160, 46); + this.dTPInvDatum.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.dTPInvDatum.Name = "dTPInvDatum"; + this.dTPInvDatum.Size = new System.Drawing.Size(181, 26); + this.dTPInvDatum.TabIndex = 41; + // + // pictureBoxPlus + // + this.pictureBoxPlus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); + this.pictureBoxPlus.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxPlus.Image"))); + this.pictureBoxPlus.Location = new System.Drawing.Point(1066, 46); + this.pictureBoxPlus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBoxPlus.Name = "pictureBoxPlus"; + this.pictureBoxPlus.Size = new System.Drawing.Size(34, 38); + this.pictureBoxPlus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBoxPlus.TabIndex = 40; + this.pictureBoxPlus.TabStop = false; + this.pictureBoxPlus.Click += new System.EventHandler(this.pictureBoxPlus_Click); + // + // dGArtikel + // + this.dGArtikel.AllowUserToAddRows = false; + this.dGArtikel.AllowUserToResizeRows = false; + this.dGArtikel.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells; + this.dGArtikel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dGArtikel.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column1, this.Column2, this.Column3, @@ -167,192 +174,187 @@ this.Column5, this.Column6, this.Column7}); - this.dGArtikel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.dGArtikel.Location = new System.Drawing.Point(5, 96); - this.dGArtikel.Margin = new System.Windows.Forms.Padding(4); - this.dGArtikel.MinimumSize = new System.Drawing.Size(0, 350); - this.dGArtikel.Name = "dGArtikel"; - this.dGArtikel.RowHeadersVisible = false; - this.dGArtikel.RowHeadersWidth = 51; - this.dGArtikel.Size = new System.Drawing.Size(973, 384); - this.dGArtikel.TabIndex = 34; - this.dGArtikel.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dGArtikel_CellEndEdit); - this.dGArtikel.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dGArtikel_CellLeave); - this.dGArtikel.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dGArtikel_CellMouseDoubleClick); - this.dGArtikel.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dGArtikel_CellValueChanged); - this.dGArtikel.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dGArtikel_DataBindingComplete); - this.dGArtikel.Leave += new System.EventHandler(this.dGArtikel_Leave); - // - // Column1 - // - this.Column1.DataPropertyName = "ArtikelNR"; - this.Column1.HeaderText = "Art.Nr."; - this.Column1.MinimumWidth = 6; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Width = 103; - // - // Column2 - // - this.Column2.DataPropertyName = "ArtikelName"; - this.Column2.HeaderText = "Art.Name"; - this.Column2.MinimumWidth = 6; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.Width = 131; - // - // Column3 - // - this.Column3.DataPropertyName = "Stand"; - this.Column3.HeaderText = "Ist-Stand"; - this.Column3.MinimumWidth = 6; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - this.Column3.Width = 129; - // - // Column4 - // - this.Column4.DataPropertyName = "Reklamation"; - this.Column4.HeaderText = "Rekl."; - this.Column4.MinimumWidth = 6; - this.Column4.Name = "Column4"; - this.Column4.ReadOnly = true; - this.Column4.Width = 89; - // - // Column5 - // - this.Column5.DataPropertyName = "Fehlmenge"; - this.Column5.HeaderText = "NW"; - this.Column5.MinimumWidth = 6; - this.Column5.Name = "Column5"; - this.Column5.ReadOnly = true; - this.Column5.Width = 77; - // - // Column6 - // - this.Column6.HeaderText = "Schwund"; - this.Column6.MinimumWidth = 6; - this.Column6.Name = "Column6"; - this.Column6.ReadOnly = true; - this.Column6.Width = 130; - // - // Column7 - // - this.Column7.DataPropertyName = "Korrektur"; - this.Column7.HeaderText = "Inv.Ausgleich"; - this.Column7.MinimumWidth = 6; - this.Column7.Name = "Column7"; - this.Column7.ReadOnly = true; - this.Column7.Width = 125; - // - // buttonFreigeben - // - this.buttonFreigeben.AutoSize = true; - this.buttonFreigeben.BackColor = System.Drawing.Color.Gray; - this.buttonFreigeben.CausesValidation = false; - this.buttonFreigeben.Dock = System.Windows.Forms.DockStyle.Right; - this.buttonFreigeben.Enabled = false; - this.buttonFreigeben.FlatAppearance.BorderSize = 0; - this.buttonFreigeben.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonFreigeben.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonFreigeben.ForeColor = System.Drawing.Color.Black; - this.buttonFreigeben.Location = new System.Drawing.Point(776, 0); - this.buttonFreigeben.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonFreigeben.Name = "buttonFreigeben"; - this.buttonFreigeben.Size = new System.Drawing.Size(200, 48); - this.buttonFreigeben.TabIndex = 38; - this.buttonFreigeben.Text = "Inventur freigeben"; - this.buttonFreigeben.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.buttonFreigeben.UseVisualStyleBackColor = false; - this.buttonFreigeben.Click += new System.EventHandler(this.buttonFreigeben_Click); - // - // panelButtons - // - this.panelButtons.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panelButtons.Controls.Add(this.buttonAbbrechen); - this.panelButtons.Controls.Add(this.buttonSpeichern); - this.panelButtons.Controls.Add(this.labelInvText); - this.panelButtons.Controls.Add(this.buttonFreigeben); - this.panelButtons.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelButtons.Location = new System.Drawing.Point(3, 488); - this.panelButtons.Name = "panelButtons"; - this.panelButtons.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); - this.panelButtons.Size = new System.Drawing.Size(983, 50); - this.panelButtons.TabIndex = 43; - // - // buttonSpeichern - // - this.buttonSpeichern.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.buttonSpeichern.BackColor = System.Drawing.Color.Gray; - this.buttonSpeichern.CausesValidation = false; - this.buttonSpeichern.Enabled = false; - this.buttonSpeichern.FlatAppearance.BorderSize = 0; - this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonSpeichern.ForeColor = System.Drawing.Color.Black; - this.buttonSpeichern.Location = new System.Drawing.Point(569, 0); - this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(5, 2, 5, 2); - this.buttonSpeichern.MinimumSize = new System.Drawing.Size(150, 50); - this.buttonSpeichern.Name = "buttonSpeichern"; - this.buttonSpeichern.Size = new System.Drawing.Size(200, 50); - this.buttonSpeichern.TabIndex = 40; - this.buttonSpeichern.Text = "Speichern"; - this.buttonSpeichern.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; - this.buttonSpeichern.UseVisualStyleBackColor = false; - this.buttonSpeichern.Click += new System.EventHandler(this.buttonSpeichern_Click); - // - // labelInvText - // - this.labelInvText.AutoSize = true; - this.labelInvText.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelInvText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.labelInvText.Location = new System.Drawing.Point(8, 12); - this.labelInvText.Name = "labelInvText"; - this.labelInvText.Size = new System.Drawing.Size(70, 25); - this.labelInvText.TabIndex = 39; - this.labelInvText.Text = "label1"; - this.labelInvText.Visible = false; - this.labelInvText.Click += new System.EventHandler(this.labelInvText_Click); - // - // buttonAbbrechen - // - this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonAbbrechen.BackColor = System.Drawing.Color.Red; - this.buttonAbbrechen.FlatAppearance.BorderSize = 0; - this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonAbbrechen.ForeColor = System.Drawing.Color.Black; - this.buttonAbbrechen.Location = new System.Drawing.Point(361, -1); - this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonAbbrechen.Name = "buttonAbbrechen"; - this.buttonAbbrechen.Size = new System.Drawing.Size(200, 50); - this.buttonAbbrechen.TabIndex = 41; - this.buttonAbbrechen.Text = "Abbrechen"; - this.buttonAbbrechen.UseVisualStyleBackColor = false; - this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click); - // - // UCInventur - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.BackColor = System.Drawing.SystemColors.Control; - this.Controls.Add(this.panelButtons); - this.Controls.Add(this.groupBoxInventur); - this.Margin = new System.Windows.Forms.Padding(5); - this.Name = "UCInventur"; - this.Padding = new System.Windows.Forms.Padding(3); - this.Size = new System.Drawing.Size(989, 541); - this.Load += new System.EventHandler(this.UCInventur_Load); - this.SizeChanged += new System.EventHandler(this.UCInventur_SizeChanged); - this.groupBoxInventur.ResumeLayout(false); - this.groupBoxInventur.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxClose)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).EndInit(); - this.panelButtons.ResumeLayout(false); - this.panelButtons.PerformLayout(); - this.ResumeLayout(false); + this.dGArtikel.Location = new System.Drawing.Point(6, 100); + this.dGArtikel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dGArtikel.MinimumSize = new System.Drawing.Size(0, 438); + this.dGArtikel.Name = "dGArtikel"; + this.dGArtikel.RowHeadersVisible = false; + this.dGArtikel.RowHeadersWidth = 51; + this.dGArtikel.Size = new System.Drawing.Size(1094, 457); + this.dGArtikel.TabIndex = 34; + this.dGArtikel.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dGArtikel_CellEndEdit); + this.dGArtikel.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.dGArtikel_CellLeave); + this.dGArtikel.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dGArtikel_CellMouseDoubleClick); + this.dGArtikel.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dGArtikel_CellValueChanged); + this.dGArtikel.DataBindingComplete += new System.Windows.Forms.DataGridViewBindingCompleteEventHandler(this.dGArtikel_DataBindingComplete); + this.dGArtikel.Leave += new System.EventHandler(this.dGArtikel_Leave); + // + // Column1 + // + this.Column1.DataPropertyName = "ArtikelNR"; + this.Column1.HeaderText = "Art.Nr."; + this.Column1.MinimumWidth = 6; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + this.Column1.Width = 86; + // + // Column2 + // + this.Column2.DataPropertyName = "ArtikelName"; + this.Column2.HeaderText = "Art.Name"; + this.Column2.MinimumWidth = 6; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.Width = 109; + // + // Column3 + // + this.Column3.DataPropertyName = "Stand"; + this.Column3.HeaderText = "Ist-Stand"; + this.Column3.MinimumWidth = 6; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + this.Column3.Width = 109; + // + // Column4 + // + this.Column4.DataPropertyName = "Reklamation"; + this.Column4.HeaderText = "Rekl."; + this.Column4.MinimumWidth = 6; + this.Column4.Name = "Column4"; + this.Column4.ReadOnly = true; + this.Column4.Width = 75; + // + // Column5 + // + this.Column5.DataPropertyName = "Fehlmenge"; + this.Column5.HeaderText = "NW"; + this.Column5.MinimumWidth = 6; + this.Column5.Name = "Column5"; + this.Column5.ReadOnly = true; + this.Column5.Width = 62; + // + // Column6 + // + this.Column6.HeaderText = "Schwund"; + this.Column6.MinimumWidth = 6; + this.Column6.Name = "Column6"; + this.Column6.ReadOnly = true; + this.Column6.Width = 107; + // + // Column7 + // + this.Column7.DataPropertyName = "Korrektur"; + this.Column7.HeaderText = "Inv.Ausgleich"; + this.Column7.MinimumWidth = 6; + this.Column7.Name = "Column7"; + this.Column7.ReadOnly = true; + this.Column7.Width = 141; + // + // buttonFreigeben + // + this.buttonFreigeben.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonFreigeben.BackColor = System.Drawing.Color.Gray; + this.buttonFreigeben.CausesValidation = false; + this.buttonFreigeben.Enabled = false; + this.buttonFreigeben.FlatAppearance.BorderSize = 0; + this.buttonFreigeben.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonFreigeben.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonFreigeben.ForeColor = System.Drawing.Color.Black; + this.buttonFreigeben.Location = new System.Drawing.Point(899, 5); + this.buttonFreigeben.Margin = new System.Windows.Forms.Padding(0); + this.buttonFreigeben.Name = "buttonFreigeben"; + this.buttonFreigeben.Size = new System.Drawing.Size(200, 40); + this.buttonFreigeben.TabIndex = 38; + this.buttonFreigeben.Text = "Inventur freigeben"; + this.buttonFreigeben.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonFreigeben.UseVisualStyleBackColor = false; + this.buttonFreigeben.Click += new System.EventHandler(this.buttonFreigeben_Click); + // + // panelButtons + // + this.panelButtons.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panelButtons.Controls.Add(this.buttonAbbrechen); + this.panelButtons.Controls.Add(this.buttonSpeichern); + this.panelButtons.Controls.Add(this.labelInvText); + this.panelButtons.Controls.Add(this.buttonFreigeben); + this.panelButtons.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelButtons.Location = new System.Drawing.Point(3, 570); + this.panelButtons.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelButtons.Name = "panelButtons"; + this.panelButtons.Size = new System.Drawing.Size(1106, 52); + this.panelButtons.TabIndex = 43; + // + // buttonAbbrechen + // + this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonAbbrechen.BackColor = System.Drawing.Color.Red; + this.buttonAbbrechen.FlatAppearance.BorderSize = 0; + this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonAbbrechen.ForeColor = System.Drawing.Color.Black; + this.buttonAbbrechen.Location = new System.Drawing.Point(489, 5); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(0); + this.buttonAbbrechen.Name = "buttonAbbrechen"; + this.buttonAbbrechen.Size = new System.Drawing.Size(200, 40); + this.buttonAbbrechen.TabIndex = 41; + this.buttonAbbrechen.Text = "Abbrechen"; + this.buttonAbbrechen.UseVisualStyleBackColor = false; + this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click); + // + // buttonSpeichern + // + this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonSpeichern.BackColor = System.Drawing.Color.Gray; + this.buttonSpeichern.CausesValidation = false; + this.buttonSpeichern.Enabled = false; + this.buttonSpeichern.FlatAppearance.BorderSize = 0; + this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonSpeichern.ForeColor = System.Drawing.Color.Black; + this.buttonSpeichern.Location = new System.Drawing.Point(694, 5); + this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(5); + this.buttonSpeichern.Name = "buttonSpeichern"; + this.buttonSpeichern.Size = new System.Drawing.Size(200, 40); + this.buttonSpeichern.TabIndex = 40; + this.buttonSpeichern.Text = "Speichern"; + this.buttonSpeichern.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; + this.buttonSpeichern.UseVisualStyleBackColor = false; + this.buttonSpeichern.Click += new System.EventHandler(this.buttonSpeichern_Click); + // + // labelInvText + // + this.labelInvText.AutoSize = true; + this.labelInvText.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelInvText.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.labelInvText.Location = new System.Drawing.Point(3, 15); + this.labelInvText.Name = "labelInvText"; + this.labelInvText.Size = new System.Drawing.Size(57, 20); + this.labelInvText.TabIndex = 39; + this.labelInvText.Text = "label1"; + this.labelInvText.Visible = false; + this.labelInvText.Click += new System.EventHandler(this.labelInvText_Click); + // + // UCInventur + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.SystemColors.Control; + this.Controls.Add(this.panelButtons); + this.Controls.Add(this.groupBoxInventur); + this.Margin = new System.Windows.Forms.Padding(6); + this.Name = "UCInventur"; + this.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Size = new System.Drawing.Size(1112, 626); + this.Load += new System.EventHandler(this.UCInventur_Load); + this.SizeChanged += new System.EventHandler(this.UCInventur_SizeChanged); + this.groupBoxInventur.ResumeLayout(false); + this.groupBoxInventur.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxClose)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).EndInit(); + this.panelButtons.ResumeLayout(false); + this.panelButtons.PerformLayout(); + this.ResumeLayout(false); } diff --git a/UserControls/UCInventur.cs b/UserControls/UCInventur.cs index b82593a..2dda0c8 100644 --- a/UserControls/UCInventur.cs +++ b/UserControls/UCInventur.cs @@ -73,8 +73,10 @@ namespace Deckungsbeitrag.UserControls this.lines = lines; this.user = benutzer; this.Sender = sender; - this.kunde = Kunde.GetKunde(lines[1].Split(':')[1].Trim(), null, null); - this.auftrag = Auftrag.GetAuftrag(int.Parse(lines[3].Split(':')[1].Trim())); + string kndnr = lines[1].Split(':')[1].Trim(); + int auftragnr = int.Parse(lines[3].Split(':')[1].Trim()); + this.kunde = Kunde.GetKunde(kndnr, null, null); + this.auftrag = Auftrag.GetAuftrag(auftragnr); } private void UCInventur_Load(object sender, EventArgs e) @@ -89,11 +91,11 @@ namespace Deckungsbeitrag.UserControls Load_DGV(); if (lines != null & Sender is FormMain) pictureBoxClose_Click(sender, e); - if (Sender is FormAuftragDetail) + if (Sender is FormAuftragDetail formAuftragDetail) { - formAuftragDetail = sender as FormAuftragDetail; pictureBoxClose.Visible = pictureBoxClose.Enabled = false; pictureBoxPlus.Visible = pictureBoxPlus.Enabled = false; + buttonAbbrechen.Visible = buttonAbbrechen.Enabled = false; } formLoading = false; } @@ -105,6 +107,7 @@ namespace Deckungsbeitrag.UserControls artikelListe = KundeArtikel.GetInventurList(this.kunde.KundeID); //this.dGArtikel.DataSource = artikelListe; this.dGArtikel.AllowUserToAddRows = false; + this.dGArtikel.AllowUserToResizeColumns = true; this.dGArtikel.Rows.Clear(); if (lines != null) { @@ -299,7 +302,7 @@ namespace Deckungsbeitrag.UserControls csv.AppendLine(); csv.AppendLine(new string('=', 30)); csv.AppendLine($"Status;{cols}"); - //File.WriteAllText(csvPath, csv.ToString(), Encoding.UTF8); + File.WriteAllText(csvPath, csv.ToString(), Encoding.UTF8); } // NEUE Artikel ANHÄNGEN (ohne Header) var appendCsv = new StringBuilder(); @@ -371,7 +374,7 @@ namespace Deckungsbeitrag.UserControls totalHeight += dgv.ColumnHeadersHeight; dgv.ClientSize = new Size(totalWidth, totalHeight); - this.groupBoxInventur.ClientSize = new Size(dgv.ClientSize.Width, dgv.Height + pictureBoxPlus.Bottom + 10); + this.groupBoxInventur.ClientSize = new Size(dgv.Width + 10, dgv.Height + dgv.Top + 10); this.ClientSize = new Size(this.groupBoxInventur.ClientSize.Width + 10, this.groupBoxInventur.Height + panelButtons.Height + 10); } @@ -434,8 +437,8 @@ namespace Deckungsbeitrag.UserControls { int label_y = this.pictureBoxPlus.Location.Y + ((this.pictureBoxPlus.Height - this.label1.Height) / 2); int x = 0; - this.pictureBoxClose.Location = new Point(this.Width - pictureBoxClose.Width + this.Margin.All, 0); - this.pictureBoxPlus.Location = new Point(this.groupBoxInventur.Width - pictureBoxPlus.Width - this.groupBoxInventur.Margin.Right - this.Margin.Right, this.pictureBoxPlus.Location.Y); + this.pictureBoxClose.Location = new Point(this.groupBoxInventur.Right - pictureBoxClose.Width - 2, 0); + this.pictureBoxPlus.Location = new Point(this.dGArtikel.Right - pictureBoxPlus.Width, this.pictureBoxPlus.Location.Y); this.label1.Location = new Point(this.pictureBoxPlus.Left - this.label1.Width - 10, this.pictureBoxPlus.Location.Y + ((this.pictureBoxPlus.Height - this.label1.Height) / 2)); this.labelInvDat.Location = new Point(x = this.dGArtikel.Left, label_y); this.dTPInvDatum.Location = new Point(x = x + labelInvDat.Width, this.pictureBoxPlus.Location.Y); @@ -556,6 +559,6 @@ namespace Deckungsbeitrag.UserControls } } } -//TODO: CLick auf Inventur freigeben Dateiname von "Warten" auf "Herrichten" ändern. +//DONE: CLick auf Inventur freigeben Dateiname von "Warten" auf "Herrichten" ändern. //DONE: Inventur freigeben nur für Admin oder Verwaltung. //DONE: Inventur für Expedit zugänglich machen. diff --git a/UserControls/UCInventur.resx b/UserControls/UCInventur.resx index 7d79e65..594241e 100644 --- a/UserControls/UCInventur.resx +++ b/UserControls/UCInventur.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALtJREFUOE/tkTEKAjEQRdNbCJ7Eq+h2gngd9QwWyp5it/IoabRYQaKwvx35iyOT + vQAADr0BR/uQrQAAALtJREFUOE/tkTEKAjEQRdNbCJ7Eq+h2gngd9QwWyp5it/IoabRYQaKwvx35iyOT mE1p5cAnw8z/j5A4EXFUWgDO3f0pFPt0/8mVANP1Sag/4FcAAHMAnucYwHoiAAd9j7DctXLpwuNtjACc cVftW6FXIQrwi20jrjrIbFMrxBuA54w7eujlLLqBNfC83sIQptjbnd7y6w1SyGR1HDQWjgD6SBZiZcPZ X9DKQdJwEZBCcmFWEcBSSC7M0twLBeEEF8s9ZFEAAAAASUVORK5CYII= @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKxJREFUOE9j+P//PwM2/O3bN4Nv3759gGIDdHkYxhBA1hwzYd9/EMZnCIYAsmaG + vQAADr0BR/uQrQAAAKxJREFUOE9j+P//PwM2/O3bN4Nv3759gGIDdHkYxhBA1hwzYd9/EMZnCIYAsmaG 4DlgjM8QgpoJGUKUZnyG4NSMj41sCE7N3759g/NBbCzyYENABky4/uj1f77YheiSKAYgWwJSC9ID0gvz woIT15/+z551GG4yFgPALgWpAakF6UEPxAXIfkM3ADmsYJpRDIAqUEBiYxiArgbDADTDsBqAjjEEhpkB yBhdHoYBkN/zh5bcpfIAAAAASUVORK5CYII= @@ -139,7 +139,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKxJREFUOE9j+P//PwM2/O3bN4Nv3759gGIDdHkYxhBA1hwzYd9/EMZnCIYAsmaG + vQAADr0BR/uQrQAAAKxJREFUOE9j+P//PwM2/O3bN4Nv3759gGIDdHkYxhBA1hwzYd9/EMZnCIYAsmaG 4DlgjM8QgpoJGUKUZnyG4NSMj41sCE7N3759g/NBbCzyYENABky4/uj1f77YheiSKAYgWwJSC9ID0gvz woIT15/+z551GG4yFgPALgWpAakF6UEPxAXIfkM3ADmsYJpRDIAqUEBiYxiArgbDADTDsBqAjjEEhpkB yBhdHoYBkN/zh5bcpfIAAAAASUVORK5CYII= diff --git a/Verwaltung_ReadMe.txt b/Verwaltung_ReadMe.txt index adf840e..b612150 100644 --- a/Verwaltung_ReadMe.txt +++ b/Verwaltung_ReadMe.txt @@ -1,11 +1,11 @@ ===================================== -NEUIGKEITEN - Version 1.0.8.6 +NEUIGKEITEN - Version 1.0.8.7 ===================================== Build-Info: - Build-Typ: Release Build -- Erledigte TODOs: 18 -- Offene TODOs: 44 +- Erledigte TODOs: 19 +- Offene TODOs: 43 - Install-Reminders: 4 - Changes: 15 @@ -34,10 +34,11 @@ Build-Info: - ✨ Winter und Sommer wird getrennt geändert und gespeichert. [UCTabPageLKW.cs] -=== ✅ ERLEDIGTE TODOs (18) === +=== ✅ ERLEDIGTE TODOs (19) === - ✅ : Auftrag über FormListe holen und daraus den Kunden für Fehlmenge holen. [FormFehlmengeCount.cs] - ✅ : Auftragliste bei Fahrer anzeigen wenn Login. [FormMain.cs] - ✅ : Bei Transport wir ein Fach mit Aktuellem Auftrag erstellt. Das Alte wird bei Transport gespeichert. [FormAusschlager.cs] +- ✅ : CLick auf Inventur freigeben Dateiname von "Warten" auf "Herrichten" ändern. [UCInventur.cs] - ✅ : ComboBox Fahrer und Priorität implementieren [FormAuftragDetail.cs] - ✅ : Container schmutzig bearbeitbar machen [FormAuftragDetail.cs] - ✅ : Feedback Button hinzufügen [FormAuftragDetail.cs] @@ -55,7 +56,7 @@ Build-Info: - ✅ : Wenn RegAuftrag wird als augeliefert markiert, wird dieser automatisch neu erstellt laut hinterlegtem Rhythmus. [FormMain.cs] -=== 🔄 OFFENE TODOs (44) === +=== 🔄 OFFENE TODOs (43) === - 🔄 !!ÜBERLEGE!! DB-Query für Kundenanzahl und Containeranzahl Abgleich. (Aufträge haben TourID hinterlegt. So sollte alles vergleichbar sein.) [Tour.cs] - 🔄 !!ÜBERLEGE!! Tour Start und Ende automatisch erfassen. [Tour.cs] - 🔄 Alle Icons in einer Spalte anzeigen? I für Anmerkung und ! für Aufgabe?? [FormExpedit.cs] @@ -66,7 +67,6 @@ Build-Info: - 🔄 Aufträge zusammenführen wenn gleicher Kunde und Liefertag. [FormNeuerAuftrag.cs] - 🔄 Ausprobieren ob die Ausrichtung jetzt richtig ist. Sowohl beim ersten wie auch zweiten Mal. [Funktionen.cs] - 🔄 Bestand von allen Artikeln speichern und für Druck vorbereiten. [FormAuftragDetail.cs] -- 🔄 CLick auf Inventur freigeben Dateiname von "Warten" auf "Herrichten" ändern. [UCInventur.cs] - 🔄 Dateinamen aus Tikos anschauen. Eventuell Datum von letztem Import über Dateiname wählen? [FormMain.cs] - 🔄 Deaktivieren wenn SPS funktioniert. Transport wird simuliert. [FormWSVerfolgung.cs] - 🔄 Design des Controls anpassen. Eventuell im Designer erstellen. [UCKunde.cs] @@ -101,5 +101,5 @@ Build-Info: - 🔄 Wenn Nachwäsche oder Müllwäsche alle Artikel anzeigen. [FormFehlmengeCount.cs] - 🔄 Zuweisung zu Fahrer muss geklärt werden. [Funktionen.cs] -Installation: 08.04.2026 09:14 +Installation: 08.04.2026 12:16 =====================================