diff --git a/AA-Forms/CustomInputBox.Designer.cs b/AA-Forms/CustomInputBox.Designer.cs index 7efaba2..2db0dde 100644 --- a/AA-Forms/CustomInputBox.Designer.cs +++ b/AA-Forms/CustomInputBox.Designer.cs @@ -189,6 +189,7 @@ this.Name = "CustomInputBox"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "CustomInputBox"; + this.Load += new System.EventHandler(this.CustomInputBox_Load); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.tableLayoutPanel2.ResumeLayout(false); diff --git a/AA-Forms/CustomInputBox.cs b/AA-Forms/CustomInputBox.cs index a0e56b4..5baf1ed 100644 --- a/AA-Forms/CustomInputBox.cs +++ b/AA-Forms/CustomInputBox.cs @@ -16,27 +16,98 @@ namespace Deckungsbeitrag.AA_Forms { private QwertzKeyboard keyboard; private readonly bool isNumeric; - //private readonly string frage; - //private readonly string title; - //private readonly string eingabe; + private bool isFallback = false; + private string title; + private string caption; + private string todo; + private string eingabe; + private string numeric; + public string text; - public CustomInputBox() + + private static string Title; + private static string Caption; + private static string Todo; + private static string Eingabe; + + + public CustomInputBox(string numeric) { InitializeComponent(); ControlBox = false; - } - public CustomInputBox(string Frage, string Title, string Eingabe, string numeric) : this() - { + if (numeric == "isNumeric") { this.textBoxText.AccessibleName = "isNumeric"; this.isNumeric = true; } if (numeric == "isAlpha") { this.textBoxText.AccessibleName = "isAlpha"; this.isNumeric = false; } if (numeric == "isCalc") { this.textBoxText.AccessibleName = "isClac"; this.isNumeric = true; } - this.labelFrage.Text = Frage; - this.labelEingabe.Text = Eingabe + ":"; - this.Text = Title; - if (isNumeric) this.textBoxText.Text = "1"; - else this.textBoxText.Text = string.Empty; + } + public CustomInputBox(string frage, string title, string eingabe, string numeric) : this(numeric) + { + Caption = frage; + Eingabe = eingabe; + Title = title; + } + + + /// + /// Aufrufen der CustomInputBox. Besser .Show verwenden. + /// + /// Key von BoxTitel + /// Key von Message-Text + /// Key von ToDo + /// Hinweis welche Eingabe erwartet wird + /// Eingabeformat für VirtuelKeyboard (isNumeric, isCalc oder isAlpha) + public CustomInputBox(string title, string caption, string todo, string eingabe, string Numeric) : this(Numeric) + { + this.title = title; + this.caption = caption; + this.todo = todo; + this.eingabe = eingabe; + } + + + + /// + /// Aufrufen der CustomInputBox. + /// + /// Key von BoxTitel + /// Key von Message-Text + /// Key von ToDo + /// Hinweis welche Eingabe erwartet wird + /// Eingabeformat für VirtuelKeyboard (isNumeric, isCalc oder isAlpha) + public static DialogResult Show(string title, string caption, string todo, string eingabe, string numeric) + { + CustomInputBox inputBox = new CustomInputBox(title, caption, todo, eingabe, numeric); + return inputBox.ShowDialog(); + } + + private void CustomInputBox_Load(object sender, EventArgs e) + { + GetTranslation(title, caption, todo, eingabe); this.buttonOK.Text = TranslationService.T("Button.Ok"); this.buttonAbbrechen.Text = TranslationService.T("Button.Abbrechen"); + + this.Text = Title; + this.labelFrage.Text = Caption + " "; + this.labelFrage.Text += !string.IsNullOrWhiteSpace(Todo) ? Todo : string.Empty; + this.labelEingabe.Text = !string.IsNullOrWhiteSpace(Eingabe) ? Eingabe + ":" : string.Empty; + + if (isNumeric) this.textBoxText.Text = "1"; + else this.textBoxText.Text = string.Empty; + } + + /// + /// Die strings werden aus der translation.json ausgelesen und übersetzt. + /// + /// + /// + /// + /// + private static void GetTranslation(string title, string caption, string todo, string eingabe) + { + if (title != null) Title = TranslationService.T(title); + if (caption != null) Caption = TranslationService.T(caption); + if (todo != null) Todo = TranslationService.T(todo); + if (eingabe != null) Eingabe = TranslationService.T(eingabe); } private void TextBoxText_Click(object sender, EventArgs e) @@ -84,7 +155,7 @@ namespace Deckungsbeitrag.AA_Forms if (int.TryParse(textBoxText.Text, out int value)) this.text = textBoxText.Text; else { - MessageBox.Show("Bitte nur ganze Zahlen eingeben.", "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error); + CustomMessageBox.Show("Titel.Fehler", "Text.Fehler.NurZahlen", null, new string[] { "Ok" }); e.Cancel = true; this.textBoxText.Clear(); } @@ -94,5 +165,29 @@ namespace Deckungsbeitrag.AA_Forms this.text = textBoxText.Text; } } + + + + /// + /// Tastendruck wird erkannt und verarbeitet. + /// + /// + /// + protected override bool ProcessDialogKey(Keys keyData) + { + // Taste T löst Übersetzung in FallbackLanguage aus bzw. setzt die Übersetzung wieder auf CurrentLanguage zurück. + if (Form.ModifierKeys == Keys.None && keyData == Keys.T) + { + if (!isFallback) TranslationService.SetLanguage(TranslationService.FallbackLanguage); + else TranslationService.SetLanguage(Program._settings.Culture); + + isFallback = !isFallback; + CustomInputBox_Load(this, null); + return true; + } + + return base.ProcessDialogKey(keyData); + } + } } diff --git a/AA-Forms/CustomMessageBox.Designer.cs b/AA-Forms/CustomMessageBox.Designer.cs index bb0d2c9..821cbcc 100644 --- a/AA-Forms/CustomMessageBox.Designer.cs +++ b/AA-Forms/CustomMessageBox.Designer.cs @@ -35,8 +35,8 @@ this.tLPButtons = new System.Windows.Forms.TableLayoutPanel(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.buttonOK = new System.Windows.Forms.Button(); - this.buttonAbbrechen = new System.Windows.Forms.Button(); this.buttonAlternativ = new System.Windows.Forms.Button(); + this.buttonAbbrechen = new System.Windows.Forms.Button(); this.tableLayoutPanel1.SuspendLayout(); this.tLPButtons.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); @@ -99,8 +99,8 @@ this.tLPButtons.Name = "tLPButtons"; this.tLPButtons.RowCount = 1; this.tLPButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tLPButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tLPButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tLPButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); + this.tLPButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); this.tLPButtons.Size = new System.Drawing.Size(647, 60); this.tLPButtons.TabIndex = 10; // @@ -127,7 +127,7 @@ this.buttonOK.FlatAppearance.BorderSize = 0; this.buttonOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonOK.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonOK.ForeColor = System.Drawing.Color.White; + this.buttonOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); this.buttonOK.Location = new System.Drawing.Point(5, 5); this.buttonOK.Margin = new System.Windows.Forms.Padding(5); this.buttonOK.Name = "buttonOK"; @@ -138,26 +138,6 @@ this.buttonOK.UseVisualStyleBackColor = false; this.buttonOK.Click += new System.EventHandler(this.Button_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.CausesValidation = false; - this.buttonAbbrechen.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonAbbrechen.FlatAppearance.BorderColor = 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.White; - this.buttonAbbrechen.Location = new System.Drawing.Point(425, 5); - this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(5); - this.buttonAbbrechen.Name = "buttonAbbrechen"; - this.buttonAbbrechen.Size = new System.Drawing.Size(200, 50); - this.buttonAbbrechen.TabIndex = 5; - this.buttonAbbrechen.Text = "Abbrechen"; - this.buttonAbbrechen.UseVisualStyleBackColor = false; - this.buttonAbbrechen.Click += new System.EventHandler(this.Button_Click); - // // buttonAlternativ // this.buttonAlternativ.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -168,7 +148,7 @@ this.buttonAlternativ.FlatAppearance.BorderSize = 0; this.buttonAlternativ.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonAlternativ.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonAlternativ.ForeColor = System.Drawing.Color.White; + this.buttonAlternativ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); this.buttonAlternativ.Location = new System.Drawing.Point(215, 5); this.buttonAlternativ.Margin = new System.Windows.Forms.Padding(5); this.buttonAlternativ.Name = "buttonAlternativ"; @@ -179,6 +159,26 @@ this.buttonAlternativ.Visible = false; this.buttonAlternativ.Click += new System.EventHandler(this.Button_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.CausesValidation = false; + this.buttonAbbrechen.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonAbbrechen.FlatAppearance.BorderColor = 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.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.buttonAbbrechen.Location = new System.Drawing.Point(425, 5); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(5); + this.buttonAbbrechen.Name = "buttonAbbrechen"; + this.buttonAbbrechen.Size = new System.Drawing.Size(200, 50); + this.buttonAbbrechen.TabIndex = 5; + this.buttonAbbrechen.Text = "Abbrechen"; + this.buttonAbbrechen.UseVisualStyleBackColor = false; + this.buttonAbbrechen.Click += new System.EventHandler(this.Button_Click); + // // CustomMessageBox // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); diff --git a/AA-Forms/CustomMessageBox.cs b/AA-Forms/CustomMessageBox.cs index 8bcfd16..7c25bdb 100644 --- a/AA-Forms/CustomMessageBox.cs +++ b/AA-Forms/CustomMessageBox.cs @@ -23,11 +23,26 @@ namespace Deckungsbeitrag.AA_Forms private string todo; private string[] buttons; + private static string[] Inputs; private static string Title; private static string Caption; private static string Todo; private static string[] Buttons; + /// + /// Ist die Übersetzung in FallbackLanguage oder nicht. + /// + private bool isFallback = false; + + + + /// + /// Aufrufen der CustomMessageBox. Besser .Show verwenden. + /// + /// + /// + /// + /// public CustomMessageBox(string title, string caption, string todo, string[] buttons) { InitializeComponent(); @@ -35,37 +50,64 @@ namespace Deckungsbeitrag.AA_Forms this.title = title; this.caption = caption; this.todo = todo; + this.buttons = buttons; } + + /// /// Aufrufen der CustomMessageBox. /// - /// FormTitel - /// Message-Text - /// ToDo - /// Welche Buttonnamen [0]=Button OK, [1]=Button Abbrechen, [2]=Button Alternative - public static DialogResult Show(string title, string caption, string todo, string[] buttons) + /// Key von FormTitel + /// Key von Message-Text + /// Key von ToDo + /// Buttonnamen [0]=Button OK, [1]=Button Abbrechen, [2]=Button Alternative (werden nachträglich in Key generiert) + /// Infotexte die in der Message angezeigt werden sollen. Nur wenn todo = NULL + public static DialogResult Show(string title, string caption, string todo, string[] buttons, string[] inputs = null) { + if (inputs != null) Inputs = inputs; + CustomMessageBox messageBox = new CustomMessageBox(title, caption, todo, buttons); return messageBox.ShowDialog(); } - + + + + /// + /// Beim Laden der Box wird die Übersetzung geholt sowie die Texte in den Controls gesetzt und die Buttons aktualisiert. + /// + /// + /// private void CustomMessageBox_Load(object sender, EventArgs e) { GetTranslation(title, caption, todo); - Buttons = buttons; + Buttons = this.buttons; this.labelText.Text = Caption; this.Text = Title; + if (Todo == null) { - this.labelToDo.Visible = false; + if (Inputs != null) + { + this.labelToDo.Text = string.Empty; + foreach (string s in Inputs) this.labelToDo.Text += s + "\n"; + } + else this.labelToDo.Visible = false; } else this.labelToDo.Text = Todo; + GetButtons(); } + + + + + /// + /// Die Buttons werden entsprechend mit übersetztem Text und AccessibleName aktualisiert. + /// private void GetButtons() { if (Buttons.Length == 1) @@ -78,7 +120,7 @@ namespace Deckungsbeitrag.AA_Forms { this.buttonAbbrechen.Visible = true; this.buttonOK.Text = TranslationService.T($"Button.{Buttons[0]}"); - this.buttonAbbrechen.Text = TranslationService.T($"button.{Buttons[1]}"); + this.buttonAbbrechen.Text = TranslationService.T($"Button.{Buttons[1]}"); this.buttonOK.AccessibleName = Buttons[0]; this.buttonAbbrechen.AccessibleName = Buttons[1]; } @@ -93,13 +135,29 @@ namespace Deckungsbeitrag.AA_Forms this.buttonAlternativ.AccessibleName = Buttons[2]; } } + + + + /// + /// Die strings werden aus der translation.json ausgelesen und übersetzt. + /// + /// + /// + /// private static void GetTranslation(string title, string caption, string todo) { Title = TranslationService.T(title); Caption = TranslationService.T(caption); - Todo = TranslationService.T(todo); + if (todo != null) Todo = TranslationService.T(todo); } + + + /// + /// Wenn Button geklickt wird, wird nach AccessibleName der DialogStatus gesetzt. Danach wird die Box geschlossen. + /// + /// + /// private void Button_Click(object sender, EventArgs e) { Button btn = sender as Button; @@ -119,12 +177,23 @@ namespace Deckungsbeitrag.AA_Forms this.Close(); } + + + /// + /// Tastendruck wird erkannt und verarbeitet. + /// + /// + /// protected override bool ProcessDialogKey(Keys keyData) { - // Taste T löst Übersetzung aus. + // Taste T löst Übersetzung in FallbackLanguage aus bzw. setzt die Übersetzung wieder auf CurrentLanguage zurück. if (Form.ModifierKeys == Keys.None && keyData == Keys.T) { - this.Close(); + if (!isFallback) TranslationService.SetLanguage(TranslationService.FallbackLanguage); + else TranslationService.SetLanguage(Program._settings.Culture); + + isFallback = !isFallback; + CustomMessageBox_Load(this, null); return true; } diff --git a/AA-Forms/FormArtikelVW.cs b/AA-Forms/FormArtikelVW.cs index b317192..4d16a29 100644 --- a/AA-Forms/FormArtikelVW.cs +++ b/AA-Forms/FormArtikelVW.cs @@ -1,5 +1,6 @@ using BrightIdeasSoftware; using DatenDB; +using Deckungsbeitrag.AA_Forms; using Deckungsbeitrag.AA_Klassen; using Deckungsbeitrag.UserControls; //using HarfBuzzSharp; @@ -268,7 +269,7 @@ namespace Deckungsbeitrag } } } - else { MessageBox.Show("Bitte nur ganze Zahlen eingeben.", "ACHTUNG", MessageBoxButtons.OK, MessageBoxIcon.Error); e.Cancel = true; } + else { CustomMessageBox.Show("Titel.Fehler", "Text.Fehler.NurZahlen", null, new string[] { "Ok" }); e.Cancel = true; } this.objectListViewArtikel.RefreshObject(e.RowObject); } diff --git a/AA-Forms/FormAufleger.cs b/AA-Forms/FormAufleger.cs index 102edbb..9b05b73 100644 --- a/AA-Forms/FormAufleger.cs +++ b/AA-Forms/FormAufleger.cs @@ -1,5 +1,6 @@ using BrightIdeasSoftware; using DatenDB; +using Deckungsbeitrag.AA_Forms; using Npgsql; using System; using System.CodeDom; @@ -354,10 +355,10 @@ namespace Deckungsbeitrag else _kunde = Kunde.GetKunde(null, null, text.ToLower()); // Wenn kein Auftrag gefunden muss der Zettel zum Expedit gebracht werden. ÜBERGANGSZEIT FALLS AUFTRAG NICHT VON FAHRER ERFASST. - if (_kunde == null) { MessageBox.Show("Der Auftrag konnte nicht gefunden werden. Bring die Karte zur Mirka.", "ACHTUNG", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } + if (_kunde == null) { CustomMessageBox.Show("Titel.Achtung", "Text.Achtung.AuftragNotFound", null, new string[] { "Ok" }); ; return; } List auftList = Auftrag.FindeAuftragVonKunde(_kunde, zusatz, null, (DateTime?)null); - if (auftList.Count == 0) { meldung.GetFehler(this, "Es konnte kein Auftrag zugewünschten Kunden gefunden werden.\nBitte Informiere deinen Vorgesetzten."); return; } + if (auftList.Count == 0) { CustomMessageBox.Show("Titel.Achtung", "Text.Achtung.AuftragNotFound", "Todo.VorgesetzenInformieren", new string[] { "Ok" }); return; } // Alten Auftrag Speichern (Status Gewaschen) wenn neuer Auftrag gefunden wurde. if (auftrag != null) diff --git a/AA-Forms/FormAuftragAuswahl.cs b/AA-Forms/FormAuftragAuswahl.cs index 38e50ac..bd6ad8a 100644 --- a/AA-Forms/FormAuftragAuswahl.cs +++ b/AA-Forms/FormAuftragAuswahl.cs @@ -127,7 +127,7 @@ namespace Deckungsbeitrag.AA_Forms if (e.Button == MouseButtons.Right) { - if (MessageBox.Show($"Möchtest du den Auftrag vom Kunde {exAuftrag.KundeName} mit Liefertag {exAuftrag.Liefertag:d} auswählen?", "FRAGE", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return; + if (CustomMessageBox.Show("Titel.Frage", "Text.Frage.AuswahlBestaetigen", null, new string[] { "Ja", "Nein" }, new string[] { $"{exAuftrag.KundeName}", $"{exAuftrag.Liefertag:d}" }) == DialogResult.No) return; } this.kunde = Kunde.GetKunde(null, exAuftrag.KundeID, null); diff --git a/AA-Forms/FormEinstellung.cs b/AA-Forms/FormEinstellung.cs index ccb4442..06bd4e6 100644 --- a/AA-Forms/FormEinstellung.cs +++ b/AA-Forms/FormEinstellung.cs @@ -148,7 +148,7 @@ namespace Deckungsbeitrag { var cultures = new [] { - new { Code = "de-DE", Name = "Deutsch" }, + new { Code = "de-AT", Name = "Deutsch" }, new { Code = "en-US", Name = "English (United States) -> Englisch" }, new { Code = "bs-BA", Name = "Bosanski (Bosna) -> Bosnisch" }, new { Code = "bg-BG", Name = "български (България) -> Bulgarisch" }, diff --git a/AA-Forms/FormExpedit.cs b/AA-Forms/FormExpedit.cs index 7e9adbe..1904112 100644 --- a/AA-Forms/FormExpedit.cs +++ b/AA-Forms/FormExpedit.cs @@ -225,9 +225,8 @@ namespace Deckungsbeitrag private async void ButtonNeuerAuftrag_Click(object sender, EventArgs e) { AuftragTyp? auftragTyp = null; - string[] buttons = { "Geschäft", "Abbrechen", "Standart" }; - CustomMessageBox messageBox = new CustomMessageBox($"{TranslationService.T("Titel.Auswahl")}", $"{TranslationService.T("Text.Auswahl.Auftrag")}", null, buttons); + CustomMessageBox messageBox = new CustomMessageBox("Titel.Auswahl", "Text.Auswahl.Auftrag", null, new string[] { "Geschäft", "Abbrechen", "Standart" }); if (messageBox.ShowDialog() == DialogResult.Ignore) { auftragTyp = (AuftragTyp?)Enum.Parse(typeof(AuftragTyp), messageBox.buttontext); @@ -886,11 +885,7 @@ namespace Deckungsbeitrag private void HandleBatchAbschliessen(ObjectListView olv) { var count = olv.CheckedItems.Count; - Program.title = TranslationService.T("Titel.Frage"); - Program.caption = TranslationService.T("Text.Frage.BatchAbschließen"); - Program.todo = null; - Program.buttons = new string[] { TranslationService.T("Button.Ja"), TranslationService.T("Button.Nein") }; - var result = CustomMessageBox.Show(Program.title, Program.caption, Program.todo, Program.buttons); + var result = CustomMessageBox.Show("Titel.Frage", "Text.Frage.BatchAbschließen", null, new string[] { "Ja", "Nein" }); if (result == DialogResult.No) return; @@ -965,11 +960,7 @@ namespace Deckungsbeitrag if (this.auftrag.ContainerClean > 10) { - Program.title = TranslationService.T("Titel.Frage"); - Program.caption = TranslationService.T("Text.Frage.EtikettContainer"); - Program.todo = null; - Program.buttons = new string[] { TranslationService.T("Button.Ja"), TranslationService.T("Button.Nein") }; - var res = CustomMessageBox.Show(Program.title, Program.caption, Program.todo, Program.buttons); + var res = CustomMessageBox.Show("Titel.Frage", "Text.Frage.EtikettContainer", null, new string[] { "Ja", "Nein" }); nocont = (res == DialogResult.No); } @@ -980,11 +971,7 @@ namespace Deckungsbeitrag } catch (Exception ex) { - Program.title = TranslationService.T("Titel.Fehler"); - Program.caption = TranslationService.T("Text.Fehler.Drucken"); - Program.todo = TranslationService.T("ToDo.DruckFehler"); - Program.buttons = new string[] { TranslationService.T("Button.Ok") }; - CustomMessageBox.Show(Program.title, Program.caption, Program.todo, Program.buttons); + CustomMessageBox.Show("Titel.Fehler", "Text.Fehler.Drucken", "ToDo.DruckFehler", new string[] { "Ok" }); Program.AddFehler(this.benutzer, ex.Message, ex.StackTrace, null); return false; @@ -1025,8 +1012,7 @@ namespace Deckungsbeitrag if (this.auftrag.ContainerClean == 0) { - string[] buttons = { "Ja", "Nein", "Abbrechen" }; - CustomMessageBox messageBox = new CustomMessageBox($"{TranslationService.T("Titel.Frage")}", $"{TranslationService.T("Text.Frage.ContainerSauberNull")}", null, buttons); + CustomMessageBox messageBox = new CustomMessageBox("Titel.Frage", "Text.Frage.ContainerSauberNull", null, new string[] { "Ja", "Nein", "Abbrechen" }); rslt = messageBox.ShowDialog(); } @@ -1064,7 +1050,7 @@ namespace Deckungsbeitrag letzterLiefertag = this.auftrag.Liefertag; return; } - CustomInputBox inputBox = new CustomInputBox($"{TranslationService.T("Text.Frage.ContainerAnzahl")}\n{TranslationService.T("ToDo.ContainerAnzahl")}", $"{TranslationService.T("Titel.Frage")}", $"{TranslationService.T("Containeranzahl")}", "isNumeric"); + CustomInputBox inputBox = new CustomInputBox("Titel.Frage", "Text.Frage.ContainerAnzahl", "ToDo.ContainerAnzahl", "Containeranzahl", "isNumeric"); if (inputBox.ShowDialog() == DialogResult.OK) { eingabe = inputBox.text; @@ -1189,11 +1175,7 @@ namespace Deckungsbeitrag if (this.auftrag.Status == AuftragStatus.Vorbereitet) { - Program.title = TranslationService.T("Titel.Frage"); - Program.caption = TranslationService.T("Text.Frage.ContainerSauberChanged"); - Program.todo = null; - Program.buttons = new string[] { TranslationService.T("Button.Ja"), TranslationService.T("Button.Nein") }; - if (CustomMessageBox.Show(Program.title, Program.caption, Program.todo, Program.buttons) == DialogResult.Yes) + if (CustomMessageBox.Show("Titel.Frage", "Text.Frage.ContainerSauberChanged", null, new string[] { "Ja", "Nein" }) == DialogResult.Yes) { Funktionen.Etikett_Drucken(this.auftrag, nocont); } @@ -1233,12 +1215,8 @@ namespace Deckungsbeitrag MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } - Program.title = TranslationService.T("Titel.Frage"); - Program.caption = TranslationService.T("Text.Frage.TrelloKarteErstellen"); - Program.todo = null; - Program.buttons = new string[] { TranslationService.T("Button.Ja"), TranslationService.T("Button.Nein") }; - if (CustomMessageBox.Show(Program.title, Program.caption, Program.todo, Program.buttons) == DialogResult.No) { TrelloKarte = false; goto default; } + if (CustomMessageBox.Show("Titel.Frage", "Text.Frage.TrelloKarteErstellen", null, new string[] { "Ja", "Nein" }) == DialogResult.No) { TrelloKarte = false; goto default; } try { diff --git a/AA-Forms/FormFehlmengeCount.cs b/AA-Forms/FormFehlmengeCount.cs index a9994f8..c106825 100644 --- a/AA-Forms/FormFehlmengeCount.cs +++ b/AA-Forms/FormFehlmengeCount.cs @@ -530,7 +530,7 @@ namespace Deckungsbeitrag } private void EtikettDrucken() { - if (MessageBox.Show("Möchtest du JETZT Etiketten für die erfolgten Änderung drucken?", "FRAGE", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (CustomMessageBox.Show("Titel.Frage", "Text.Frage.EtiketteDrucken", null, new string[] { "Ja", "Nein" }) == DialogResult.Yes) { if (Funktionen.SonderEtikett_Drucken((int)this.kunde.KundeID, auftragDictionary, auftrag) == DialogResult.OK) { @@ -686,7 +686,7 @@ namespace Deckungsbeitrag { if (auftrag != null) { - if (nwClicked) if (MessageBox.Show("ZAHLEN VERWERFEN?", "ABBRECHEN", MessageBoxButtons.OKCancel) == DialogResult.Cancel) { nwClicked = false; return; } + if (nwClicked) if (CustomMessageBox.Show("Titel.Frage", "Text.Frage.Verwerfen", null, new string[] { "Ja", "Nein" }) == DialogResult.No) { nwClicked = false; return; } if (this.benutzer == null | (userid != null && !userid.Contains("reklamation"))) { // AbteilungsStatus Begonnen wird hier gesetzt. diff --git a/AA-Forms/FormListe.Designer.cs b/AA-Forms/FormListe.Designer.cs index ebf54e6..bde0df4 100644 --- a/AA-Forms/FormListe.Designer.cs +++ b/AA-Forms/FormListe.Designer.cs @@ -95,12 +95,12 @@ namespace Deckungsbeitrag this.textBoxKunde.Location = new System.Drawing.Point(12, 16); this.textBoxKunde.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxKunde.Name = "textBoxKunde"; - this.textBoxKunde.Size = new System.Drawing.Size(393, 32); + this.textBoxKunde.Size = new System.Drawing.Size(393, 38); this.textBoxKunde.TabIndex = 0; this.textBoxKunde.Text = "Hier eingeben"; this.textBoxKunde.Click += new System.EventHandler(this.TextBoxKunde_Click); this.textBoxKunde.TextChanged += new System.EventHandler(this.TextBoxKunde_TextChanged); - this.textBoxKunde.Leave += new System.EventHandler(this.TextBoxKunde_Leave); + this.textBoxKunde.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxKunde_KeyDown); // // label1 // diff --git a/AA-Forms/FormListe.cs b/AA-Forms/FormListe.cs index ac715ff..7bb39a3 100644 --- a/AA-Forms/FormListe.cs +++ b/AA-Forms/FormListe.cs @@ -367,7 +367,7 @@ namespace Deckungsbeitrag private void TextBoxKunde_TextChanged(object sender, EventArgs e) { TextBox textbox = (TextBox)sender; - if (!textbox.Text.StartsWith("SCAN") && textbox.Text.Length >= 4) + if ((!textbox.Text.StartsWith("SCAN") && textbox.Text.Length >= 4) || textbox.Text.StartsWith("?")) { // TextChanged tritt nur ein wenn x Sekunden keine Eingabe erfolgt. Logik befindet sich in Timer_Tick timer.Stop(); // Alten Timer beenden @@ -377,56 +377,7 @@ namespace Deckungsbeitrag private async void Timer_Tick(object sender, EventArgs e) { timer.Stop(); // Timer stoppen - - if (textBoxKunde.ForeColor != Color.Black & !this.textBoxKunde.Text.ToLower().StartsWith("https")) { return; } - else - { - if (string.IsNullOrEmpty(textBoxKunde.Text) || this.textBoxKunde.Text == "Hier eingeben") { return; } - - // Wenn kein Fragezeichen am Anfang wird Kundenliste erstellt. - if (!textBoxKunde.Text.StartsWith("?")) - { - string text; - if (textBoxKunde.Text.StartsWith("SCAN")) - { - if (textBoxKunde.Text.ToLower().StartsWith("scanhttps")) - { - int index = 1; - index += textBoxKunde.Text.IndexOf("=", index); - int i = textBoxKunde.Text.IndexOf("%", index); - text = textBoxKunde.Text.Substring(index, i - index); - textBoxKunde.Text = text; - } - else text = this.textBoxKunde.Text.Substring(4); - } - else text = this.textBoxKunde.Text; - - if (kategorie == 0) - { - this.Kundenliste = Kunde.GetTmpList(text, this.kndService); - ListViewKunde_Load(); - } - else - { - List _allÍtems = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Gewaschen, typFilter: AuftragTyp.Standart, kategorie: kategorie, undFertig: true); - string term = text.Trim().ToLower(); - if (!string.IsNullOrWhiteSpace(term)) - { - var filtered = string.IsNullOrWhiteSpace(term) ? _allÍtems : _allÍtems.Where(x => x.KundeName != null && x.KundeName.ToLower().Contains(term)).ToList(); - FillListView(filtered); - } - else FillListView(_allÍtems); - } - return; - } - else - { - this.listViewKunde.Visible = this.listViewKunde.Enabled = false; - this.buttonOK.Visible = this.buttonOK.Enabled = true; - this.Height = this.buttonOK.Bottom + 100; - } // Wenn Fragezeichen am Anfang wird OK-Button aktiviert. - } - + TextBoxKunde_Leave(sender, e); } private void ListViewKunde_MouseClick(object sender, MouseEventArgs e) { @@ -561,6 +512,13 @@ namespace Deckungsbeitrag } return; } + else + { + this.listViewKunde.Visible = this.listViewKunde.Enabled = false; + this.buttonOK.Visible = this.buttonOK.Enabled = true; + this.Height = this.buttonOK.Bottom + 100; + } // Wenn Fragezeichen am Anfang wird OK-Button aktiviert. + } private void ButtonNeuerAuftrag_Click(object sender, EventArgs e) { @@ -574,5 +532,19 @@ namespace Deckungsbeitrag { if (keyboard != null) keyboard.Close(); } + private void TextBoxKunde_KeyDown(object sender, KeyEventArgs e) + { + TextBox txtScan = (TextBox)sender; + if (e.KeyCode == Keys.Enter) + { + e.SuppressKeyPress = true; + string code = txtScan.Text.Trim(); + //txtScan.Clear(); + + if (!string.IsNullOrEmpty(code)) + TextBoxKunde_Leave(txtScan, null); + } + } + } } diff --git a/App.config b/App.config index a3ca776..626699c 100644 --- a/App.config +++ b/App.config @@ -6,7 +6,7 @@ - + diff --git a/Program.cs b/Program.cs index 18631d9..09e7223 100644 --- a/Program.cs +++ b/Program.cs @@ -161,17 +161,13 @@ namespace Deckungsbeitrag _settings.Load(); // Laden der Translation.json - //ConvertTranslationJson(); + ConvertTranslationJson(); // Check, Install und Update wenn Update vorhanden. if (CheckAndInstallUpdate()) { - title = TranslationService.T("Titel.Achtung"); - caption = TranslationService.T("Text.Achtung.UpdateFertig"); - todo = TranslationService.T("ToDo.UpdateFertig"); - buttons = new string[] { TranslationService.T("Button.Ok") }; - CustomMessageBox.Show(title, caption, todo, buttons); + CustomMessageBox.Show("Titel.Achtung", "Text.Achtung.UpdateFertig", "ToDo.UpdateFertig", new string[] { "Ok" }); Software_Updated = true; Settings.Default.LastSoftwareUpdate = DateTime.Now; @@ -222,8 +218,8 @@ namespace Deckungsbeitrag if (userid.StartsWith("ms") | userid.StartsWith("ps")) { - //FormShowUserControl showControl = new FormShowUserControl("Sprache"); - //showControl.ShowDialog(); + FormShowUserControl showControl = new FormShowUserControl("Sprache"); + showControl.ShowDialog(); Maschine maschine = Maschine.GetMaschine(null, userid); if (maschine == null) @@ -308,10 +304,9 @@ namespace Deckungsbeitrag private static void ConvertTranslationJson() { //TODO: Pfad anpassen wenn LIVE. - TranslationService.Convert( - @"N:\TECHNIK\Software\Wirl-Verwaltung\Test\TranslationExcel.xlsx", - @"N:\TECHNIK\Software\Wirl-Verwaltung\Test\translations.json", - "Sheet1"); + TranslationService.Convert(@"N:\TECHNIK\Software\Wirl-Verwaltung\Test\TranslationExcel.xlsx", @"N:\TECHNIK\Software\Wirl-Verwaltung\Test\translations.json", "Sheet1"); + + if (_settings.Culture == null) { _settings.Culture = "de-AT"; } TranslationService.Load(); TranslationService.SetLanguage(_settings.Culture); @@ -642,18 +637,7 @@ namespace Deckungsbeitrag // Prüfen ob neue Version ist größer als aktuelle Version. if (new Version(newVersion).CompareTo(new Version(currentVersion)) > 0) { - title = TranslationService.T("Titel.Achtung"); - caption = TranslationService.T("Text.Achtung.Update"); - todo = TranslationService.T("ToDo.Update"); - buttons = new string[] { TranslationService.T("Button.Ok") }; - DialogResult result = CustomMessageBox.Show(title, caption, todo, buttons); - - //DialogResult result = DialogResult.Yes; - //DialogResult result = MessageBox.Show( - // $"Ein Update wird durchgeführt. Schließe es ab um weiter zu kommen.", - // "ACHTUNG UPDATE", - // MessageBoxButtons.OK, - // MessageBoxIcon.Exclamation); + DialogResult result = CustomMessageBox.Show("Titel.Achtung", "Text.Achtung.Update", "ToDo.Update", new string[] { "Ok" }); string msiPath = Path.Combine(updatePath, $"SetupVerwaltung{newVersion}.msi"); @@ -685,7 +669,7 @@ namespace Deckungsbeitrag string csvPath = Path.Combine(updatePath, "Install_Historie.txt"); if (File.Exists(csvPath)) { - File.AppendAllText(csvPath, $"{DateTime.Now} {userid} hat Version: {newVersion} erfolgreich installiert.\n", Encoding.UTF8); + File.AppendAllText(csvPath, $"\n{DateTime.Now} {userid} hat Version: {newVersion} erfolgreich installiert.\n", Encoding.UTF8); } return true; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index f0b6fc7..d0899cf 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.1.8.3")] -[assembly: AssemblyFileVersion("1.1.8.3")] +[assembly: AssemblyVersion("1.1.8.8")] +[assembly: AssemblyFileVersion("1.1.8.8")] diff --git a/SetupVerwaltung/SetupVerwaltung.vdproj b/SetupVerwaltung/SetupVerwaltung.vdproj index b85d55d..2d3fee3 100644 --- a/SetupVerwaltung/SetupVerwaltung.vdproj +++ b/SetupVerwaltung/SetupVerwaltung.vdproj @@ -34,49 +34,13 @@ "Entry" { "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "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" + "OwnerKey" = "8:_BBAE5B70F4F07F3C952504748F123D60" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -88,13 +52,49 @@ "Entry" { "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_BBAE5B70F4F07F3C952504748F123D60" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -106,7 +106,7 @@ "Entry" { "MsmKey" = "8:_0D744816F564FE427F44AA4666AEADFB" - "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" + "OwnerKey" = "8:_BBAE5B70F4F07F3C952504748F123D60" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -118,7 +118,7 @@ "Entry" { "MsmKey" = "8:_0D744816F564FE427F44AA4666AEADFB" - "OwnerKey" = "8:_BBAE5B70F4F07F3C952504748F123D60" + "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -196,37 +196,7 @@ "Entry" { "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -238,7 +208,37 @@ "Entry" { "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -292,13 +292,13 @@ "Entry" { "MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -352,19 +352,7 @@ "Entry" { "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -376,7 +364,19 @@ "Entry" { "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" - "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_8A953E0634B8757038749C9F77062056" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -478,49 +478,7 @@ "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:_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:_17ABCA3C569C9181F3FE3A46B8638164" + "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -532,7 +490,49 @@ "Entry" { "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" + "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -544,7 +544,7 @@ "Entry" { "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" - "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -556,7 +556,7 @@ "Entry" { "MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -592,13 +592,13 @@ "Entry" { "MsmKey" = "8:_DF4D21D4DDA708B9BAED547B3875E2A7" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_BBAE5B70F4F07F3C952504748F123D60" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_DF4D21D4DDA708B9BAED547B3875E2A7" - "OwnerKey" = "8:_BBAE5B70F4F07F3C952504748F123D60" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -610,7 +610,7 @@ "Entry" { "MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80" - "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" + "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -622,7 +622,7 @@ "Entry" { "MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80" - "OwnerKey" = "8:_8C268BD116FA9F128550773CBD5623AA" + "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -658,223 +658,19 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C4F0AE1FF76EA5992BF0DDDAB3BDC840" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_848FCB2438E4DBC274C4D124CEB9562C" + "OwnerKey" = "8:_C4F0AE1FF76EA5992BF0DDDAB3BDC840" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EEA0FC277F3C1BC119E28ABD40FA3C76" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_16723AF5DFDEF26FC6A07BEB7D389737" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_65845AF9470C67B4E2216A46EFF4246C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2DE2024BE0845063AAE50C820ED805AE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BDDC042CD8ACEF57F35D002490214D33" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BADE08A39EA4FDFF5B06E2E3870A16BB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_12BD2862584B10C21E90296EACBA4137" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_FCF26D4279605BAC73171B37334D989A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DF4D21D4DDA708B9BAED547B3875E2A7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4C0EEC06451FEA61E39F79681578838C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E637243CDA02D043DD2BAED063790F80" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0D744816F564FE427F44AA4666AEADFB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_80583A3C5B2D18642458F5860032BECC" + "OwnerKey" = "8:_317FB6B808222918FBAD53D6BFC5F51E" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -886,7 +682,211 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_317FB6B808222918FBAD53D6BFC5F51E" + "OwnerKey" = "8:_80583A3C5B2D18642458F5860032BECC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0D744816F564FE427F44AA4666AEADFB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E637243CDA02D043DD2BAED063790F80" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4C0EEC06451FEA61E39F79681578838C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_DF4D21D4DDA708B9BAED547B3875E2A7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_FCF26D4279605BAC73171B37334D989A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_12BD2862584B10C21E90296EACBA4137" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BADE08A39EA4FDFF5B06E2E3870A16BB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8A953E0634B8757038749C9F77062056" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_BDDC042CD8ACEF57F35D002490214D33" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2DE2024BE0845063AAE50C820ED805AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_65845AF9470C67B4E2216A46EFF4246C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_16723AF5DFDEF26FC6A07BEB7D389737" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_EEA0FC277F3C1BC119E28ABD40FA3C76" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_848FCB2438E4DBC274C4D124CEB9562C" "MsmSig" = "8:_UNDEFINED" } } @@ -991,11 +991,6 @@ "AssemblyAsmDisplayName" = "8:AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0014568666DC36A67BD4258FEDAE4805" - { - "Name" = "8:AForge.Video.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:AForge.Video.dll" "TargetName" = "8:" @@ -1022,11 +1017,6 @@ "AssemblyAsmDisplayName" = "8:System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0B016AD02A79C43C243D615B3AD40570" - { - "Name" = "8:System.Memory.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Memory.dll" "TargetName" = "8:" @@ -1053,11 +1043,6 @@ "AssemblyAsmDisplayName" = "8:netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" "ScatterAssemblies" { - "_0D744816F564FE427F44AA4666AEADFB" - { - "Name" = "8:netstandard.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:netstandard.dll" "TargetName" = "8:" @@ -1084,11 +1069,6 @@ "AssemblyAsmDisplayName" = "8:Npgsql, Version=4.1.14.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL" "ScatterAssemblies" { - "_125834DE4128EDE3F82BFC1A45B2ACD9" - { - "Name" = "8:Npgsql.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Npgsql.dll" "TargetName" = "8:" @@ -1115,11 +1095,6 @@ "AssemblyAsmDisplayName" = "8:ExcelNumberFormat, Version=1.1.0.0, Culture=neutral, PublicKeyToken=23c6f5d73be07eca, processorArchitecture=MSIL" "ScatterAssemblies" { - "_12BD2862584B10C21E90296EACBA4137" - { - "Name" = "8:ExcelNumberFormat.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:ExcelNumberFormat.dll" "TargetName" = "8:" @@ -1146,11 +1121,6 @@ "AssemblyAsmDisplayName" = "8:zxing.presentation, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" "ScatterAssemblies" { - "_16723AF5DFDEF26FC6A07BEB7D389737" - { - "Name" = "8:zxing.presentation.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:zxing.presentation.dll" "TargetName" = "8:" @@ -1177,11 +1147,6 @@ "AssemblyAsmDisplayName" = "8:HarfBuzzSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" "ScatterAssemblies" { - "_17ABCA3C569C9181F3FE3A46B8638164" - { - "Name" = "8:HarfBuzzSharp.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:HarfBuzzSharp.dll" "TargetName" = "8:" @@ -1208,11 +1173,6 @@ "AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_1B916DE951F447CD3C62E7AEBE228A3F" - { - "Name" = "8:Microsoft.Bcl.HashCode.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Microsoft.Bcl.HashCode.dll" "TargetName" = "8:" @@ -1239,11 +1199,6 @@ "AssemblyAsmDisplayName" = "8:Spire.Barcode, Version=7.4.1.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2DE2024BE0845063AAE50C820ED805AE" - { - "Name" = "8:Spire.Barcode.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Spire.Barcode.dll" "TargetName" = "8:" @@ -1321,11 +1276,6 @@ "AssemblyAsmDisplayName" = "8:System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_4C0EEC06451FEA61E39F79681578838C" - { - "Name" = "8:System.Runtime.CompilerServices.Unsafe.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Runtime.CompilerServices.Unsafe.dll" "TargetName" = "8:" @@ -1352,11 +1302,6 @@ "AssemblyAsmDisplayName" = "8:System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_4E92FDDD15B89BB89053E8A65FA73EAA" - { - "Name" = "8:System.Text.Encodings.Web.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Text.Encodings.Web.dll" "TargetName" = "8:" @@ -1403,11 +1348,6 @@ "AssemblyAsmDisplayName" = "8:System.Net.Sockets, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_5CDE0A18B0E8657CBCF9143673DB464A" - { - "Name" = "8:System.Net.Sockets.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Net.Sockets.dll" "TargetName" = "8:" @@ -1434,11 +1374,6 @@ "AssemblyAsmDisplayName" = "8:zxing, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL" "ScatterAssemblies" { - "_65845AF9470C67B4E2216A46EFF4246C" - { - "Name" = "8:zxing.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:zxing.dll" "TargetName" = "8:" @@ -1465,11 +1400,6 @@ "AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_65AC8F9F13B5E0ADCA662A6618010328" - { - "Name" = "8:System.ValueTuple.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.ValueTuple.dll" "TargetName" = "8:" @@ -1496,11 +1426,6 @@ "AssemblyAsmDisplayName" = "8:System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_6A4E9AB7C92A8099AD635862468BFCBE" - { - "Name" = "8:System.Runtime.InteropServices.RuntimeInformation.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Runtime.InteropServices.RuntimeInformation.dll" "TargetName" = "8:" @@ -1527,11 +1452,6 @@ "AssemblyAsmDisplayName" = "8:AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL" "ScatterAssemblies" { - "_70C791195E1E3B637AE8CB0DE5BB4EFB" - { - "Name" = "8:AForge.Video.DirectShow.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:AForge.Video.DirectShow.dll" "TargetName" = "8:" @@ -1589,11 +1509,6 @@ "AssemblyAsmDisplayName" = "8:AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8208B2126E1B253A2E427D55D4E5F13A" - { - "Name" = "8:AForge.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:AForge.dll" "TargetName" = "8:" @@ -1620,11 +1535,6 @@ "AssemblyAsmDisplayName" = "8:VirtualKeyboard, Version=1.0.2.7, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_848FCB2438E4DBC274C4D124CEB9562C" - { - "Name" = "8:VirtualKeyboard.exe" - "Attributes" = "3:512" - } } "SourcePath" = "8:VirtualKeyboard.exe" "TargetName" = "8:" @@ -1651,11 +1561,6 @@ "AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8A953E0634B8757038749C9F77062056" - { - "Name" = "8:System.Threading.Tasks.Extensions.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Threading.Tasks.Extensions.dll" "TargetName" = "8:" @@ -1682,11 +1587,6 @@ "AssemblyAsmDisplayName" = "8:SixLabors.Fonts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8C268BD116FA9F128550773CBD5623AA" - { - "Name" = "8:SixLabors.Fonts.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:SixLabors.Fonts.dll" "TargetName" = "8:" @@ -1713,11 +1613,6 @@ "AssemblyAsmDisplayName" = "8:System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_8E444A9D7B7F9420CF44964B1EAE9AAA" - { - "Name" = "8:System.IO.Pipelines.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.IO.Pipelines.dll" "TargetName" = "8:" @@ -1744,11 +1639,6 @@ "AssemblyAsmDisplayName" = "8:ClosedXML.Parser, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d5f7376574c51ec, processorArchitecture=MSIL" "ScatterAssemblies" { - "_98DC67D37E05424E981C039B354892DE" - { - "Name" = "8:ClosedXML.Parser.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:ClosedXML.Parser.dll" "TargetName" = "8:" @@ -1775,11 +1665,6 @@ "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:" @@ -1806,11 +1691,6 @@ "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_A2FA7AC58F6A16AB132434F8A00EA507" - { - "Name" = "8:System.Net.Http.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Net.Http.dll" "TargetName" = "8:" @@ -1837,11 +1717,6 @@ "AssemblyAsmDisplayName" = "8:System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_A41FC3BFD0E1CE905FCB1693E99348B8" - { - "Name" = "8:System.Diagnostics.DiagnosticSource.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Diagnostics.DiagnosticSource.dll" "TargetName" = "8:" @@ -1868,11 +1743,6 @@ "AssemblyAsmDisplayName" = "8:RBush, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c77e27b81f4d0187, processorArchitecture=MSIL" "ScatterAssemblies" { - "_BADE08A39EA4FDFF5B06E2E3870A16BB" - { - "Name" = "8:RBush.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:RBush.dll" "TargetName" = "8:" @@ -1899,11 +1769,6 @@ "AssemblyAsmDisplayName" = "8:ClosedXML, Version=0.105.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL" "ScatterAssemblies" { - "_BBAE5B70F4F07F3C952504748F123D60" - { - "Name" = "8:ClosedXML.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:ClosedXML.dll" "TargetName" = "8:" @@ -1930,11 +1795,6 @@ "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:" @@ -1961,11 +1821,6 @@ "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:" @@ -1992,11 +1847,6 @@ "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:" @@ -2054,11 +1904,6 @@ "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:" @@ -2085,11 +1930,6 @@ "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:" @@ -2147,11 +1987,6 @@ "AssemblyAsmDisplayName" = "8:DocumentFormat.OpenXml.Framework, Version=3.1.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DF4D21D4DDA708B9BAED547B3875E2A7" - { - "Name" = "8:DocumentFormat.OpenXml.Framework.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:DocumentFormat.OpenXml.Framework.dll" "TargetName" = "8:" @@ -2178,11 +2013,6 @@ "AssemblyAsmDisplayName" = "8:System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_E637243CDA02D043DD2BAED063790F80" - { - "Name" = "8:System.Numerics.Vectors.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Numerics.Vectors.dll" "TargetName" = "8:" @@ -2209,11 +2039,6 @@ "AssemblyAsmDisplayName" = "8:TrelloIntegration, Version=1.0.0.2, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EEA0FC277F3C1BC119E28ABD40FA3C76" - { - "Name" = "8:TrelloIntegration.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:TrelloIntegration.dll" "TargetName" = "8:" @@ -2240,11 +2065,6 @@ "AssemblyAsmDisplayName" = "8:System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" "ScatterAssemblies" { - "_EF6D58F917144384701E1DBDFB979BD8" - { - "Name" = "8:System.Text.Json.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:System.Text.Json.dll" "TargetName" = "8:" @@ -2271,11 +2091,6 @@ "AssemblyAsmDisplayName" = "8:DocumentFormat.OpenXml, Version=3.1.1.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL" "ScatterAssemblies" { - "_FCF26D4279605BAC73171B37334D989A" - { - "Name" = "8:DocumentFormat.OpenXml.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:DocumentFormat.OpenXml.dll" "TargetName" = "8:" @@ -2351,15 +2166,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:SetupVerwaltung" - "ProductCode" = "8:{82442300-0223-486E-A769-EAECDC38D4F3}" - "PackageCode" = "8:{9C884399-0A3F-4F4A-BC98-5884781B1819}" + "ProductCode" = "8:{69268508-5331-497B-B886-A83CB594A533}" + "PackageCode" = "8:{2D116B6E-B08D-4063-B312-DFD6393CCCF6}" "UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.83" + "ProductVersion" = "8:1.1.88" "Manufacturer" = "8:Kilian Wirl GmbH" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/Verwaltung_ReadMe.txt b/Verwaltung_ReadMe.txt index 91c0195..2d2f2bc 100644 --- a/Verwaltung_ReadMe.txt +++ b/Verwaltung_ReadMe.txt @@ -1,5 +1,5 @@ ===================================== -NEUIGKEITEN - Version 1.1.8.3 +NEUIGKEITEN - Version 1.1.8.8 ===================================== Build-Info: @@ -73,5 +73,5 @@ Build-Info: Keine Install-Reminder vorhanden ✅ -Installation: 01.07.2026 13:04 +Installation: 02.07.2026 13:56 =====================================