diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index b62655d05..c3d318daf 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 1e114f503..90f30099a 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 5fbbd51ce..e88e7d8ab 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index b62655d05..c3d318daf 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index 1e114f503..90f30099a 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 11bd0cd18..349cf9cc2 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -515,7 +515,7 @@ namespace OnDoc.UICintrols // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.Location = new System.Drawing.Point(0, 188); - this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(4); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -542,7 +542,7 @@ namespace OnDoc.UICintrols this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill; this.sfDataGrid1.ExpanderColumnWidth = 288D; this.sfDataGrid1.Location = new System.Drawing.Point(0, 0); - this.sfDataGrid1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.sfDataGrid1.Margin = new System.Windows.Forms.Padding(4); this.sfDataGrid1.Name = "sfDataGrid1"; this.sfDataGrid1.PreviewRowHeight = 35; this.sfDataGrid1.RowHeight = 30; @@ -567,7 +567,7 @@ namespace OnDoc.UICintrols this.docPreview1.BackColor = System.Drawing.SystemColors.Control; this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; this.docPreview1.Location = new System.Drawing.Point(0, 0); - this.docPreview1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.docPreview1.Margin = new System.Windows.Forms.Padding(5); this.docPreview1.Name = "docPreview1"; this.docPreview1.Size = new System.Drawing.Size(2279, 430); this.docPreview1.TabIndex = 0; @@ -580,7 +580,7 @@ namespace OnDoc.UICintrols this.panel2.Controls.Add(this.lblTitel); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 161); - this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel2.Margin = new System.Windows.Forms.Padding(4); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(2279, 27); this.panel2.TabIndex = 3; @@ -612,7 +612,7 @@ namespace OnDoc.UICintrols this.ribbon2.Cursor = System.Windows.Forms.Cursors.Default; this.ribbon2.Font = new System.Drawing.Font("Segoe UI", 9F); this.ribbon2.Location = new System.Drawing.Point(0, 0); - this.ribbon2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ribbon2.Margin = new System.Windows.Forms.Padding(4); this.ribbon2.Minimized = false; this.ribbon2.Name = "ribbon2"; // @@ -1629,7 +1629,7 @@ namespace OnDoc.UICintrols // this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right; this.dokwerte1.Location = new System.Drawing.Point(2279, 188); - this.dokwerte1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); + this.dokwerte1.Margin = new System.Windows.Forms.Padding(5); this.dokwerte1.Name = "dokwerte1"; this.dokwerte1.Size = new System.Drawing.Size(0, 854); this.dokwerte1.TabIndex = 7; @@ -1642,7 +1642,7 @@ namespace OnDoc.UICintrols this.Controls.Add(this.dokwerte1); this.Controls.Add(this.panel2); this.Controls.Add(this.ribbon2); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "DokList"; this.Size = new System.Drawing.Size(2279, 1042); this.Load += new System.EventHandler(this.DokList_Load); diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 8e219c348..49f5cd914 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -2141,6 +2141,11 @@ namespace OnDoc.UICintrols vs.Location = new System.Drawing.Point( screen.WorkingArea.Left + 50, screen.WorkingArea.Top + 50); + if (screen.WorkingArea.Width==1280) + { + vs.WindowState = FormWindowState.Maximized; + } + vs.Show(this); AppParams.versandstrassewindows_open = true; vs.BringToFront(); @@ -2153,11 +2158,18 @@ namespace OnDoc.UICintrols vs = new OnDoc.Versandstrasse.Versandstrasse(versandpakete); Screen screen = Screen.FromControl(this); + vs.StartPosition = FormStartPosition.Manual; vs.Location = new System.Drawing.Point( screen.WorkingArea.Left + 50, screen.WorkingArea.Top + 50); + + if (screen.WorkingArea.Width==1280) + { + vs.WindowState = FormWindowState.Maximized; + } + vs.Show(this); AppParams.versandstrassewindows_open = true; this.zumVersandpaketHinzufügenToolStripMenuItem.Visible = true; diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index 1eb73f4ec..6aab52b2e 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -117,12 +117,8 @@ namespace OnDoc.Versandstrasse } private void Versandstrasse_Load(object sender, EventArgs e) { - Screen screen = Screen.FromControl(this); - if (this.Width > screen.WorkingArea.Width || this.Height > screen.WorkingArea.Height) - { - this.WindowState = FormWindowState.Maximized; - } - + + if (Properties.Settings.Default.GASSize == "True") { this.label5.Visible = false; @@ -196,7 +192,7 @@ namespace OnDoc.Versandstrasse lblprueftextsb2.MaximumSize = new Size(panelVerify.Width - 10, 50); //try //{ - // Screen screen = Screen.FromControl(this); + // //Screen screen = Screen.FromControl(this); // if (this.Width > screen.WorkingArea.Width || this.Height > screen.WorkingArea.Height) // { // this.WindowState = FormWindowState.Maximized; @@ -205,7 +201,7 @@ namespace OnDoc.Versandstrasse //catch { } - + } private void Reload_Tree() diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 36a4ecefb..4ea8fc070 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index ee81a5bf6..3da08b23d 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 7c08571a3..eb0d4d6a8 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 663bab480..489fd055a 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 0cb048a48..4719012f7 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 311b5c9e4..9d1c6f025 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 36a4ecefb..4ea8fc070 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index ee81a5bf6..3da08b23d 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 663bab480..489fd055a 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 8a247ee59..d60c1ba09 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 8d8bfe979..090a76145 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache index 4c7523845..e3fa9ef71 100644 Binary files a/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache and b/Versandstrasse/obj/Debug/Versandstrasse.csproj.AssemblyReference.cache differ