From a3e029a3f06e3846e275348f4ee0b9a870c0bd2c Mon Sep 17 00:00:00 2001 From: Kilian Wirl Date: Sun, 7 Dec 2025 12:30:58 +0100 Subject: [PATCH] Drucker,QrCodes,Einstellungen --- AA-Forms/FormEinstellung.Designer.cs | 153 ++++++++++++++++----------- AA-Forms/FormEinstellung.cs | 39 +++++-- AA-Forms/FormExpedit.Designer.cs | 25 ++++- AA-Forms/FormExpedit.cs | 5 + AA-Forms/FormListe.cs | 3 +- AA-Klassen/Funktionen.cs | 6 +- AA-Klassen/Kunde.cs | 12 ++- App.config | 5 +- Properties/Resources.Designer.cs | 10 ++ Properties/Resources.resx | 7 +- Properties/Settings.Designer.cs | 12 +++ Properties/Settings.settings | 3 + Resources/Monaco_Settings_16x.png | Bin 0 -> 291 bytes Verwaltung.csproj | 1 + 14 files changed, 201 insertions(+), 80 deletions(-) create mode 100644 Resources/Monaco_Settings_16x.png diff --git a/AA-Forms/FormEinstellung.Designer.cs b/AA-Forms/FormEinstellung.Designer.cs index 9d40af0..31cbf7c 100644 --- a/AA-Forms/FormEinstellung.Designer.cs +++ b/AA-Forms/FormEinstellung.Designer.cs @@ -73,16 +73,20 @@ this.buttonAuftBald = new System.Windows.Forms.Button(); this.buttonAuftAbgel = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); this.comboBoxSWSDrucker = new System.Windows.Forms.ComboBox(); this.comboBoxEtikettDrucker = new System.Windows.Forms.ComboBox(); + this.groupBoxDrucker = new System.Windows.Forms.GroupBox(); + this.label1 = new System.Windows.Forms.Label(); + this.numericUpDownSWSKopien = new System.Windows.Forms.NumericUpDown(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownMinWert)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownMaxWert)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownAnzahl)).BeginInit(); this.groupBox1.SuspendLayout(); this.groupBoxFarben.SuspendLayout(); + this.groupBoxDrucker.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSWSKopien)).BeginInit(); this.SuspendLayout(); // // buttonVarKost @@ -95,7 +99,7 @@ this.buttonVarKost.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonVarKost.ForeColor = System.Drawing.Color.White; this.buttonVarKost.Location = new System.Drawing.Point(9, 43); - this.buttonVarKost.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonVarKost.Margin = new System.Windows.Forms.Padding(2); this.buttonVarKost.Name = "buttonVarKost"; this.buttonVarKost.Size = new System.Drawing.Size(160, 24); this.buttonVarKost.TabIndex = 0; @@ -107,7 +111,7 @@ // this.textBoxVarKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxVarKosten.Location = new System.Drawing.Point(201, 43); - this.textBoxVarKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBoxVarKosten.Margin = new System.Windows.Forms.Padding(2); this.textBoxVarKosten.Name = "textBoxVarKosten"; this.textBoxVarKosten.Size = new System.Drawing.Size(234, 26); this.textBoxVarKosten.TabIndex = 1; @@ -120,7 +124,7 @@ this.buttonVarSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonVarSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonVarSpeichern.Image"))); this.buttonVarSpeichern.Location = new System.Drawing.Point(174, 43); - this.buttonVarSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonVarSpeichern.Margin = new System.Windows.Forms.Padding(2); this.buttonVarSpeichern.Name = "buttonVarSpeichern"; this.buttonVarSpeichern.Size = new System.Drawing.Size(22, 24); this.buttonVarSpeichern.TabIndex = 2; @@ -135,7 +139,7 @@ this.buttonFixLohnSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixLohnSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonFixLohnSpeichern.Image"))); this.buttonFixLohnSpeichern.Location = new System.Drawing.Point(174, 72); - this.buttonFixLohnSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonFixLohnSpeichern.Margin = new System.Windows.Forms.Padding(2); this.buttonFixLohnSpeichern.Name = "buttonFixLohnSpeichern"; this.buttonFixLohnSpeichern.Size = new System.Drawing.Size(22, 24); this.buttonFixLohnSpeichern.TabIndex = 5; @@ -147,7 +151,7 @@ // this.textBoxFixLohnKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxFixLohnKosten.Location = new System.Drawing.Point(201, 72); - this.textBoxFixLohnKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBoxFixLohnKosten.Margin = new System.Windows.Forms.Padding(2); this.textBoxFixLohnKosten.Name = "textBoxFixLohnKosten"; this.textBoxFixLohnKosten.Size = new System.Drawing.Size(234, 26); this.textBoxFixLohnKosten.TabIndex = 4; @@ -163,7 +167,7 @@ this.buttonFixLohnKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonFixLohnKosten.ForeColor = System.Drawing.Color.White; this.buttonFixLohnKosten.Location = new System.Drawing.Point(9, 72); - this.buttonFixLohnKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonFixLohnKosten.Margin = new System.Windows.Forms.Padding(2); this.buttonFixLohnKosten.Name = "buttonFixLohnKosten"; this.buttonFixLohnKosten.Size = new System.Drawing.Size(160, 24); this.buttonFixLohnKosten.TabIndex = 3; @@ -178,7 +182,7 @@ this.buttonFixMietSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixMietSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonFixMietSpeichern.Image"))); this.buttonFixMietSpeichern.Location = new System.Drawing.Point(174, 102); - this.buttonFixMietSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonFixMietSpeichern.Margin = new System.Windows.Forms.Padding(2); this.buttonFixMietSpeichern.Name = "buttonFixMietSpeichern"; this.buttonFixMietSpeichern.Size = new System.Drawing.Size(22, 24); this.buttonFixMietSpeichern.TabIndex = 8; @@ -190,7 +194,7 @@ // this.textBoxFixMietKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxFixMietKosten.Location = new System.Drawing.Point(201, 102); - this.textBoxFixMietKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBoxFixMietKosten.Margin = new System.Windows.Forms.Padding(2); this.textBoxFixMietKosten.Name = "textBoxFixMietKosten"; this.textBoxFixMietKosten.Size = new System.Drawing.Size(234, 26); this.textBoxFixMietKosten.TabIndex = 7; @@ -206,7 +210,7 @@ this.buttonFixMietKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonFixMietKosten.ForeColor = System.Drawing.Color.White; this.buttonFixMietKosten.Location = new System.Drawing.Point(9, 102); - this.buttonFixMietKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonFixMietKosten.Margin = new System.Windows.Forms.Padding(2); this.buttonFixMietKosten.Name = "buttonFixMietKosten"; this.buttonFixMietKosten.Size = new System.Drawing.Size(160, 24); this.buttonFixMietKosten.TabIndex = 6; @@ -224,7 +228,7 @@ this.buttonColNeg.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColNeg.ForeColor = System.Drawing.Color.White; this.buttonColNeg.Location = new System.Drawing.Point(4, 35); - this.buttonColNeg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonColNeg.Margin = new System.Windows.Forms.Padding(2); this.buttonColNeg.Name = "buttonColNeg"; this.buttonColNeg.Size = new System.Drawing.Size(160, 41); this.buttonColNeg.TabIndex = 9; @@ -242,7 +246,7 @@ this.buttonColPos.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColPos.ForeColor = System.Drawing.Color.White; this.buttonColPos.Location = new System.Drawing.Point(170, 35); - this.buttonColPos.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonColPos.Margin = new System.Windows.Forms.Padding(2); this.buttonColPos.Name = "buttonColPos"; this.buttonColPos.Size = new System.Drawing.Size(160, 41); this.buttonColPos.TabIndex = 10; @@ -260,7 +264,7 @@ this.buttonColEqu.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColEqu.ForeColor = System.Drawing.Color.White; this.buttonColEqu.Location = new System.Drawing.Point(334, 35); - this.buttonColEqu.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonColEqu.Margin = new System.Windows.Forms.Padding(2); this.buttonColEqu.Name = "buttonColEqu"; this.buttonColEqu.Size = new System.Drawing.Size(160, 41); this.buttonColEqu.TabIndex = 11; @@ -301,7 +305,7 @@ 0, 0}); this.numUpDownMinWert.Location = new System.Drawing.Point(9, 388); - this.numUpDownMinWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numUpDownMinWert.Margin = new System.Windows.Forms.Padding(2); this.numUpDownMinWert.Maximum = new decimal(new int[] { 1000000, 0, @@ -324,7 +328,7 @@ 0, 0}); this.numUpDownMaxWert.Location = new System.Drawing.Point(126, 388); - this.numUpDownMaxWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numUpDownMaxWert.Margin = new System.Windows.Forms.Padding(2); this.numUpDownMaxWert.Maximum = new decimal(new int[] { 1000000, 0, @@ -340,7 +344,7 @@ // this.numUpDownAnzahl.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.numUpDownAnzahl.Location = new System.Drawing.Point(243, 388); - this.numUpDownAnzahl.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numUpDownAnzahl.Margin = new System.Windows.Forms.Padding(2); this.numUpDownAnzahl.Maximum = new decimal(new int[] { 20, 0, @@ -367,7 +371,7 @@ this.checkBoxMinWert.AutoSize = true; this.checkBoxMinWert.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.checkBoxMinWert.Location = new System.Drawing.Point(9, 366); - this.checkBoxMinWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.checkBoxMinWert.Margin = new System.Windows.Forms.Padding(2); this.checkBoxMinWert.Name = "checkBoxMinWert"; this.checkBoxMinWert.Size = new System.Drawing.Size(87, 21); this.checkBoxMinWert.TabIndex = 21; @@ -380,7 +384,7 @@ this.checkBoxMaxWert.AutoSize = true; this.checkBoxMaxWert.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.checkBoxMaxWert.Location = new System.Drawing.Point(126, 366); - this.checkBoxMaxWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.checkBoxMaxWert.Margin = new System.Windows.Forms.Padding(2); this.checkBoxMaxWert.Name = "checkBoxMaxWert"; this.checkBoxMaxWert.Size = new System.Drawing.Size(90, 21); this.checkBoxMaxWert.TabIndex = 22; @@ -405,9 +409,9 @@ this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.label7); this.groupBox1.Location = new System.Drawing.Point(339, 328); - this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Margin = new System.Windows.Forms.Padding(2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Padding = new System.Windows.Forms.Padding(2); this.groupBox1.Size = new System.Drawing.Size(330, 84); this.groupBox1.TabIndex = 25; this.groupBox1.TabStop = false; @@ -478,7 +482,7 @@ // this.textBoxSortiment.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxSortiment.Location = new System.Drawing.Point(174, 461); - this.textBoxSortiment.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBoxSortiment.Margin = new System.Windows.Forms.Padding(2); this.textBoxSortiment.Name = "textBoxSortiment"; this.textBoxSortiment.Size = new System.Drawing.Size(422, 26); this.textBoxSortiment.TabIndex = 28; @@ -491,7 +495,7 @@ // this.textBoxRatingbild.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxRatingbild.Location = new System.Drawing.Point(174, 490); - this.textBoxRatingbild.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.textBoxRatingbild.Margin = new System.Windows.Forms.Padding(2); this.textBoxRatingbild.Name = "textBoxRatingbild"; this.textBoxRatingbild.Size = new System.Drawing.Size(422, 26); this.textBoxRatingbild.TabIndex = 30; @@ -510,7 +514,7 @@ this.buttonSortiment.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSortiment.ForeColor = System.Drawing.Color.White; this.buttonSortiment.Location = new System.Drawing.Point(9, 461); - this.buttonSortiment.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonSortiment.Margin = new System.Windows.Forms.Padding(2); this.buttonSortiment.Name = "buttonSortiment"; this.buttonSortiment.Size = new System.Drawing.Size(160, 24); this.buttonSortiment.TabIndex = 32; @@ -528,7 +532,7 @@ this.buttonRatingbild.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonRatingbild.ForeColor = System.Drawing.Color.White; this.buttonRatingbild.Location = new System.Drawing.Point(9, 490); - this.buttonRatingbild.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonRatingbild.Margin = new System.Windows.Forms.Padding(2); this.buttonRatingbild.Name = "buttonRatingbild"; this.buttonRatingbild.Size = new System.Drawing.Size(160, 24); this.buttonRatingbild.TabIndex = 33; @@ -547,7 +551,7 @@ this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSpeichern.ForeColor = System.Drawing.Color.White; this.buttonSpeichern.Location = new System.Drawing.Point(9, 639); - this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2); this.buttonSpeichern.Name = "buttonSpeichern"; this.buttonSpeichern.Size = new System.Drawing.Size(160, 28); this.buttonSpeichern.TabIndex = 34; @@ -567,7 +571,7 @@ this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAbbrechen.ForeColor = System.Drawing.Color.White; this.buttonAbbrechen.Location = new System.Drawing.Point(174, 639); - this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2); this.buttonAbbrechen.Name = "buttonAbbrechen"; this.buttonAbbrechen.Size = new System.Drawing.Size(160, 28); this.buttonAbbrechen.TabIndex = 35; @@ -585,7 +589,7 @@ this.buttonBeladeband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonBeladeband.ForeColor = System.Drawing.Color.White; this.buttonBeladeband.Location = new System.Drawing.Point(4, 80); - this.buttonBeladeband.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonBeladeband.Margin = new System.Windows.Forms.Padding(2); this.buttonBeladeband.Name = "buttonBeladeband"; this.buttonBeladeband.Size = new System.Drawing.Size(160, 41); this.buttonBeladeband.TabIndex = 36; @@ -603,7 +607,7 @@ this.buttonTrockner.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonTrockner.ForeColor = System.Drawing.Color.White; this.buttonTrockner.Location = new System.Drawing.Point(664, 80); - this.buttonTrockner.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonTrockner.Margin = new System.Windows.Forms.Padding(2); this.buttonTrockner.Name = "buttonTrockner"; this.buttonTrockner.Size = new System.Drawing.Size(160, 41); this.buttonTrockner.TabIndex = 37; @@ -621,7 +625,7 @@ this.buttonHubband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonHubband.ForeColor = System.Drawing.Color.White; this.buttonHubband.Location = new System.Drawing.Point(500, 80); - this.buttonHubband.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonHubband.Margin = new System.Windows.Forms.Padding(2); this.buttonHubband.Name = "buttonHubband"; this.buttonHubband.Size = new System.Drawing.Size(160, 41); this.buttonHubband.TabIndex = 38; @@ -639,7 +643,7 @@ this.buttonPresse.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonPresse.ForeColor = System.Drawing.Color.White; this.buttonPresse.Location = new System.Drawing.Point(334, 80); - this.buttonPresse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonPresse.Margin = new System.Windows.Forms.Padding(2); this.buttonPresse.Name = "buttonPresse"; this.buttonPresse.Size = new System.Drawing.Size(160, 41); this.buttonPresse.TabIndex = 39; @@ -657,7 +661,7 @@ this.buttonWaschstrasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonWaschstrasse.ForeColor = System.Drawing.Color.White; this.buttonWaschstrasse.Location = new System.Drawing.Point(170, 80); - this.buttonWaschstrasse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonWaschstrasse.Margin = new System.Windows.Forms.Padding(2); this.buttonWaschstrasse.Name = "buttonWaschstrasse"; this.buttonWaschstrasse.Size = new System.Drawing.Size(160, 41); this.buttonWaschstrasse.TabIndex = 40; @@ -675,7 +679,7 @@ this.buttonEntladeband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonEntladeband.ForeColor = System.Drawing.Color.White; this.buttonEntladeband.Location = new System.Drawing.Point(830, 80); - this.buttonEntladeband.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonEntladeband.Margin = new System.Windows.Forms.Padding(2); this.buttonEntladeband.Name = "buttonEntladeband"; this.buttonEntladeband.Size = new System.Drawing.Size(160, 41); this.buttonEntladeband.TabIndex = 41; @@ -699,9 +703,9 @@ this.groupBoxFarben.Controls.Add(this.buttonTrockner); this.groupBoxFarben.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.groupBoxFarben.Location = new System.Drawing.Point(9, 131); - this.groupBoxFarben.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBoxFarben.Margin = new System.Windows.Forms.Padding(2); this.groupBoxFarben.Name = "groupBoxFarben"; - this.groupBoxFarben.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBoxFarben.Padding = new System.Windows.Forms.Padding(2); this.groupBoxFarben.Size = new System.Drawing.Size(1043, 176); this.groupBoxFarben.TabIndex = 42; this.groupBoxFarben.TabStop = false; @@ -717,7 +721,7 @@ this.buttonAuftBald.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAuftBald.ForeColor = System.Drawing.Color.White; this.buttonAuftBald.Location = new System.Drawing.Point(170, 126); - this.buttonAuftBald.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonAuftBald.Margin = new System.Windows.Forms.Padding(2); this.buttonAuftBald.Name = "buttonAuftBald"; this.buttonAuftBald.Size = new System.Drawing.Size(160, 41); this.buttonAuftBald.TabIndex = 43; @@ -735,7 +739,7 @@ this.buttonAuftAbgel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAuftAbgel.ForeColor = System.Drawing.Color.White; this.buttonAuftAbgel.Location = new System.Drawing.Point(4, 126); - this.buttonAuftAbgel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonAuftAbgel.Margin = new System.Windows.Forms.Padding(2); this.buttonAuftAbgel.Name = "buttonAuftAbgel"; this.buttonAuftAbgel.Size = new System.Drawing.Size(160, 41); this.buttonAuftAbgel.TabIndex = 42; @@ -754,21 +758,11 @@ this.label4.TabIndex = 23; this.label4.Text = "Gibt an welche Farben verwendet werden."; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(4, 535); - this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(192, 26); - this.label1.TabIndex = 43; - this.label1.Text = "Standart Drucker"; - // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(6, 572); + this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label13.Location = new System.Drawing.Point(22, 37); this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(73, 13); @@ -778,7 +772,8 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(6, 598); + this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label14.Location = new System.Drawing.Point(22, 64); this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(78, 13); @@ -787,30 +782,63 @@ // // comboBoxSWSDrucker // + this.comboBoxSWSDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxSWSDrucker.FormattingEnabled = true; - this.comboBoxSWSDrucker.Location = new System.Drawing.Point(95, 564); + this.comboBoxSWSDrucker.Location = new System.Drawing.Point(123, 29); this.comboBoxSWSDrucker.Name = "comboBoxSWSDrucker"; - this.comboBoxSWSDrucker.Size = new System.Drawing.Size(121, 21); + this.comboBoxSWSDrucker.Size = new System.Drawing.Size(195, 21); this.comboBoxSWSDrucker.TabIndex = 46; // // comboBoxEtikettDrucker // + this.comboBoxEtikettDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBoxEtikettDrucker.FormattingEnabled = true; - this.comboBoxEtikettDrucker.Location = new System.Drawing.Point(95, 595); + this.comboBoxEtikettDrucker.Location = new System.Drawing.Point(123, 56); this.comboBoxEtikettDrucker.Name = "comboBoxEtikettDrucker"; - this.comboBoxEtikettDrucker.Size = new System.Drawing.Size(121, 21); + this.comboBoxEtikettDrucker.Size = new System.Drawing.Size(195, 21); this.comboBoxEtikettDrucker.TabIndex = 47; // + // groupBoxDrucker + // + this.groupBoxDrucker.Controls.Add(this.numericUpDownSWSKopien); + this.groupBoxDrucker.Controls.Add(this.label1); + this.groupBoxDrucker.Controls.Add(this.comboBoxSWSDrucker); + this.groupBoxDrucker.Controls.Add(this.comboBoxEtikettDrucker); + this.groupBoxDrucker.Controls.Add(this.label13); + this.groupBoxDrucker.Controls.Add(this.label14); + this.groupBoxDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.groupBoxDrucker.Location = new System.Drawing.Point(9, 533); + this.groupBoxDrucker.Name = "groupBoxDrucker"; + this.groupBoxDrucker.Size = new System.Drawing.Size(547, 90); + this.groupBoxDrucker.TabIndex = 48; + this.groupBoxDrucker.TabStop = false; + this.groupBoxDrucker.Text = "Standart Drucker"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(331, 37); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(68, 13); + this.label1.TabIndex = 48; + this.label1.Text = "SWS-Kopien"; + // + // numericUpDownSWSKopien + // + this.numericUpDownSWSKopien.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.numericUpDownSWSKopien.Location = new System.Drawing.Point(404, 30); + this.numericUpDownSWSKopien.Name = "numericUpDownSWSKopien"; + this.numericUpDownSWSKopien.Size = new System.Drawing.Size(47, 20); + this.numericUpDownSWSKopien.TabIndex = 49; + // // FormEinstellung // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1192, 678); - this.Controls.Add(this.comboBoxEtikettDrucker); - this.Controls.Add(this.comboBoxSWSDrucker); - this.Controls.Add(this.label14); - this.Controls.Add(this.label13); - this.Controls.Add(this.label1); + this.Controls.Add(this.groupBoxDrucker); this.Controls.Add(this.buttonAbbrechen); this.Controls.Add(this.buttonSpeichern); this.Controls.Add(this.buttonRatingbild); @@ -840,7 +868,7 @@ this.Controls.Add(this.buttonVarKost); this.Controls.Add(this.groupBoxFarben); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "FormEinstellung"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Einstellung"; @@ -852,6 +880,9 @@ this.groupBox1.PerformLayout(); this.groupBoxFarben.ResumeLayout(false); this.groupBoxFarben.PerformLayout(); + this.groupBoxDrucker.ResumeLayout(false); + this.groupBoxDrucker.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSWSKopien)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -903,10 +934,12 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.Button buttonAuftBald; private System.Windows.Forms.Button buttonAuftAbgel; - private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label13; private System.Windows.Forms.Label label14; private System.Windows.Forms.ComboBox comboBoxSWSDrucker; private System.Windows.Forms.ComboBox comboBoxEtikettDrucker; + private System.Windows.Forms.GroupBox groupBoxDrucker; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.NumericUpDown numericUpDownSWSKopien; } } \ No newline at end of file diff --git a/AA-Forms/FormEinstellung.cs b/AA-Forms/FormEinstellung.cs index 1783a0c..a18f025 100644 --- a/AA-Forms/FormEinstellung.cs +++ b/AA-Forms/FormEinstellung.cs @@ -26,9 +26,23 @@ namespace Deckungsbeitrag InitializeComponent(); } - public FormEinstellung(string v) : this() + public FormEinstellung(object x) : this() { - if (v == "Sortiment") { ButtonPfad_Click(buttonSortiment, null); this.textBoxSortiment.BackColor = Color.Red; } + if (x.GetType() == typeof(String)) + { + if (x.ToString() == "Sortiment") { ButtonPfad_Click(buttonSortiment, null); this.textBoxSortiment.BackColor = Color.Red; } + } + else + { + if (x.GetType() == typeof(FormExpedit)) + { + foreach(Control ctr in this.Controls) + { + if (ctr.Name.Contains("Drucker") || ctr.Name.Contains("Speichern") || ctr.Name.Contains("Abbrechen")) ctr.Enabled = true; + else ctr.Enabled = false; + } + } + } } private void FormEinstellung_Load(object sender, EventArgs e) @@ -56,8 +70,20 @@ namespace Deckungsbeitrag } } - this.comboBoxEtikettDrucker.DataSource = this.comboBoxSWSDrucker.DataSource = PrinterSettings.InstalledPrinters; - this.comboBoxEtikettDrucker.SelectedIndex = this.comboBoxSWSDrucker.SelectedIndex = -1; + // Standart Drucker und Kopieanzahl einstellen. + foreach (string printer in PrinterSettings.InstalledPrinters) + { + this.comboBoxEtikettDrucker.Items.Add(printer); + this.comboBoxSWSDrucker.Items.Add(printer); + } + + if (string.IsNullOrWhiteSpace(Settings.Default.Etikett_Drucker)) this.comboBoxEtikettDrucker.SelectedIndex = -1; + else this.comboBoxEtikettDrucker.SelectedText = Settings.Default.Etikett_Drucker; + if (string.IsNullOrWhiteSpace(Settings.Default.SWS_Drucker)) this.comboBoxSWSDrucker.SelectedIndex = -1; + else this.comboBoxSWSDrucker.SelectedItem = Settings.Default.SWS_Drucker; + + this.comboBoxSWSDrucker.DropDownStyle = this.comboBoxEtikettDrucker.DropDownStyle = ComboBoxStyle.DropDownList; + this.numericUpDownSWSKopien.Value = Settings.Default.SWS_Copies; } private void Save_Settings() { @@ -78,8 +104,9 @@ namespace Deckungsbeitrag if (this.checkBoxMinWert.Checked) Settings.Default.MinChecked = this.checkBoxMinWert.Checked; if (this.numUpDownMinWert.Enabled) Settings.Default.RatMin = (double)this.numUpDownMinWert.Value; if (this.numUpDownMaxWert.Enabled) Settings.Default.RatMax = (double)this.numUpDownMaxWert.Value; - if (this.comboBoxEtikettDrucker.SelectedIndex > -1) Settings.Default.Etikett_Drucker = this.comboBoxEtikettDrucker.SelectedText; - if (this.comboBoxSWSDrucker.SelectedIndex > -1) Settings.Default.Etikett_Drucker = this.comboBoxEtikettDrucker.SelectedText; + if (this.comboBoxEtikettDrucker.SelectedItem != null) Settings.Default.Etikett_Drucker = this.comboBoxEtikettDrucker.SelectedItem.ToString(); + if (this.comboBoxSWSDrucker.SelectedItem != null) { Settings.Default.SWS_Drucker = this.comboBoxSWSDrucker.SelectedItem.ToString(); Settings.Default.SWS_Copies = (int)this.numericUpDownSWSKopien.Value; } + Settings.Default.ZAnzahl = (int)this.numUpDownAnzahl.Value; diff --git a/AA-Forms/FormExpedit.Designer.cs b/AA-Forms/FormExpedit.Designer.cs index 102d84e..1520cf1 100644 --- a/AA-Forms/FormExpedit.Designer.cs +++ b/AA-Forms/FormExpedit.Designer.cs @@ -72,6 +72,7 @@ this.tabPageAll = new System.Windows.Forms.TabPage(); this.objectListViewAuftrag = new BrightIdeasSoftware.ObjectListView(); this.tabControlAuftragList = new System.Windows.Forms.TabControl(); + this.buttonEinstellung = new System.Windows.Forms.Button(); this.groupBoxEtikett.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMinus)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit(); @@ -413,7 +414,7 @@ this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(6, 743); + this.label2.Location = new System.Drawing.Point(6, 740); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(209, 25); this.label2.TabIndex = 36; @@ -425,7 +426,7 @@ this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(320, 743); + this.label3.Location = new System.Drawing.Point(320, 740); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(309, 25); this.label3.TabIndex = 37; @@ -437,7 +438,7 @@ this.labelauftragtag.AutoSize = true; this.labelauftragtag.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelauftragtag.ForeColor = System.Drawing.Color.White; - this.labelauftragtag.Location = new System.Drawing.Point(235, 736); + this.labelauftragtag.Location = new System.Drawing.Point(235, 733); this.labelauftragtag.Name = "labelauftragtag"; this.labelauftragtag.Size = new System.Drawing.Size(47, 33); this.labelauftragtag.TabIndex = 38; @@ -449,7 +450,7 @@ this.labelcontainertag.AutoSize = true; this.labelcontainertag.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelcontainertag.ForeColor = System.Drawing.Color.White; - this.labelcontainertag.Location = new System.Drawing.Point(650, 736); + this.labelcontainertag.Location = new System.Drawing.Point(650, 733); this.labelcontainertag.Name = "labelcontainertag"; this.labelcontainertag.Size = new System.Drawing.Size(47, 33); this.labelcontainertag.TabIndex = 39; @@ -678,12 +679,27 @@ this.tabControlAuftragList.SelectedIndexChanged += new System.EventHandler(this.tabControlAuftragList_SelectedIndexChanged); this.tabControlAuftragList.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControlAuftragList_Selected); // + // buttonEinstellung + // + this.buttonEinstellung.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonEinstellung.FlatAppearance.BorderColor = System.Drawing.Color.White; + this.buttonEinstellung.FlatAppearance.BorderSize = 3; + this.buttonEinstellung.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonEinstellung.Image = global::Deckungsbeitrag.Properties.Resources.Monaco_Settings_16x; + this.buttonEinstellung.Location = new System.Drawing.Point(1431, 9); + this.buttonEinstellung.Name = "buttonEinstellung"; + this.buttonEinstellung.Size = new System.Drawing.Size(41, 41); + this.buttonEinstellung.TabIndex = 45; + this.buttonEinstellung.UseVisualStyleBackColor = true; + this.buttonEinstellung.Click += new System.EventHandler(this.buttonEinstellung_Click); + // // FormExpedit // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); this.ClientSize = new System.Drawing.Size(1481, 777); + this.Controls.Add(this.buttonEinstellung); this.Controls.Add(this.dGArtikel); this.Controls.Add(this.buttonNeuerAuftrag); this.Controls.Add(this.label4); @@ -763,5 +779,6 @@ private System.Windows.Forms.TabPage tabPageAll; private BrightIdeasSoftware.ObjectListView objectListViewAuftrag; private System.Windows.Forms.TabControl tabControlAuftragList; + private System.Windows.Forms.Button buttonEinstellung; } } \ No newline at end of file diff --git a/AA-Forms/FormExpedit.cs b/AA-Forms/FormExpedit.cs index d9f6c03..d18d70b 100644 --- a/AA-Forms/FormExpedit.cs +++ b/AA-Forms/FormExpedit.cs @@ -662,5 +662,10 @@ namespace Deckungsbeitrag this.dGArtikel.Rows.Clear(); } + private void buttonEinstellung_Click(object sender, EventArgs e) + { + FormEinstellung einstellung = new FormEinstellung(this); + einstellung.ShowDialog(); + } } } diff --git a/AA-Forms/FormListe.cs b/AA-Forms/FormListe.cs index d0c0596..c249a13 100644 --- a/AA-Forms/FormListe.cs +++ b/AA-Forms/FormListe.cs @@ -187,7 +187,7 @@ namespace Deckungsbeitrag { this.textBoxKunde.ForeColor = Color.Black; - GetKeyboard(); + //GetKeyboard(); } private void GetKeyboard() @@ -202,6 +202,7 @@ namespace Deckungsbeitrag { if (!textBoxKunde.Text.StartsWith("?") && textBoxKunde.TextLength > 3) { + Kundenliste = Kunde.GetTmpList(this.textBoxKunde.Text); listViewKunde_Load(); } diff --git a/AA-Klassen/Funktionen.cs b/AA-Klassen/Funktionen.cs index 1338fa5..c82842a 100644 --- a/AA-Klassen/Funktionen.cs +++ b/AA-Klassen/Funktionen.cs @@ -710,8 +710,7 @@ namespace Deckungsbeitrag PrintDialog dialog = new PrintDialog(); foreach (string printer in PrinterSettings.InstalledPrinters) if (printer.Contains(Properties.Settings.Default.SWS_Drucker)) dialog.PrinterSettings.PrinterName = printer; - - + dialog.PrinterSettings.Copies = (short)Settings.Default.SWS_Copies; if (dialog.ShowDialog() == DialogResult.OK) { @@ -769,7 +768,8 @@ namespace Deckungsbeitrag g.DrawString($"{auftrag.Liefertag.ToString("ddd dd.MM.")}", font1, Brushes.Black, startpoint.X, startpoint.Y + height_font1 + 5 + height_font2 + 2 + size_Liefertag.Height + 2); if (!nocont) g.DrawString($"{auftrag.ContainerClean}", font4, Brushes.Black, startpoint.X + size_Liefertag.Width + size_container.Width + 10, startpoint.Y + height_font1); - //if (sender == null) bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone); + //TODO: Ausprobieren ob die Ausrichtung jetzt richtig ist. Sowohl beim ersten wie auch zweiten Mal. + if (sender == null) bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone); Image img = bitmap; return img; } diff --git a/AA-Klassen/Kunde.cs b/AA-Klassen/Kunde.cs index 08bdc79..6ce1b85 100644 --- a/AA-Klassen/Kunde.cs +++ b/AA-Klassen/Kunde.cs @@ -24,6 +24,7 @@ namespace DatenDB } // LEER public static List GetTmpList(string text) { + bool endsWithSpecial = !char.IsLetterOrDigit(text[text.Length-1]); DatenbankConnection.GetConnection().Open(); List resultList = new List(); using (NpgsqlCommand command = new NpgsqlCommand()) @@ -32,9 +33,14 @@ namespace DatenDB if (string.IsNullOrEmpty(text)) command.CommandText = $"select {COLUMNS} from {TABLE} where aktiv = {true}"; else { - if (int.TryParse(text, out _)) command.CommandText = $"select {COLUMNS} from {TABLE} where kunde_nr::varchar ~* '{text}'"; - else command.CommandText = $"select {COLUMNS} from {TABLE} where suchtext ~* '{text}'"; - } + if (!endsWithSpecial) + { + if (int.TryParse(text, out _)) command.CommandText = $"select {COLUMNS} from {TABLE} where kunde_nr::varchar ~* '{text}'"; + else command.CommandText = $"select {COLUMNS} from {TABLE} where suchtext ~* '{text}'"; + } + else if (int.TryParse(text, out _)) command.CommandText = $"select {COLUMNS} from {TABLE} where kunde_nr::varchar ~* '{text.Substring(0, 6)}'"; + //TODO: Testen ob SWS-QRCodes gelesen werden können. Nur notwendig bis alle SWS-QRCodes richtig gedruckt und gelesen werden. + } NpgsqlDataReader reader = command.ExecuteReader(); while (reader.Read()) resultList.Add(new Kunde(reader)); diff --git a/App.config b/App.config index d1d9290..e35248a 100644 --- a/App.config +++ b/App.config @@ -9,7 +9,7 @@ - + @@ -151,6 +151,9 @@ MFC-7440 + + 10 + diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index eb9be5f..01b9dc5 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -90,6 +90,16 @@ namespace Deckungsbeitrag.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Monaco_Settings_16x { + get { + object obj = ResourceManager.GetObject("Monaco_Settings_16x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 2b58089..b1e3aef 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Close_WhiteNoHalo_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Checkmark_blue_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -130,7 +133,7 @@ ..\Resources\Close_red_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Close_WhiteNoHalo_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Monaco_Settings_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 8781f2a..47573fb 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -290,5 +290,17 @@ namespace Deckungsbeitrag.Properties { this["SWS_Drucker"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("10")] + public int SWS_Copies { + get { + return ((int)(this["SWS_Copies"])); + } + set { + this["SWS_Copies"] = value; + } + } } } diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 6844eb8..5cadf72 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -71,5 +71,8 @@ MFC-7440 + + 10 + \ No newline at end of file diff --git a/Resources/Monaco_Settings_16x.png b/Resources/Monaco_Settings_16x.png new file mode 100644 index 0000000000000000000000000000000000000000..7bcdb3b916a00b66538286c1362eacf61504d07e GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAQ1Gg! zi(^Pd+|uB;oQE8E_FBt26mrEn{Rw|5vc2ib{n!Jtcb3RocX)@q=18CLg1fWzkZr|; zn8`76waL@EdSM>bJS^90a?44$rjF6*2UngA}{b2k70 literal 0 HcmV?d00001 diff --git a/Verwaltung.csproj b/Verwaltung.csproj index 6ab76fc..9202fb9 100644 --- a/Verwaltung.csproj +++ b/Verwaltung.csproj @@ -478,6 +478,7 @@ +