From 1c1af724c2f582e986373a29e04fa051acb5bfc1 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 23 Sep 2026 07:35:12 +0200 Subject: [PATCH] spedbuch auswert; ReadT1ATEZ,Greenpulse API --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmHauptfensterNew.Designer.vb | 102 +++++++++++------------ Aviso/frmHauptfensterNew.vb | 108 +++++++++++++++++++++++++ Aviso/usrCntlHauptfenster_Suche_SND.vb | 4 +- 4 files changed, 163 insertions(+), 55 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index a236cb8..b73c99a 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfensterNew.Designer.vb b/Aviso/frmHauptfensterNew.Designer.vb index 80d4a71..8919026 100644 --- a/Aviso/frmHauptfensterNew.Designer.vb +++ b/Aviso/frmHauptfensterNew.Designer.vb @@ -277,6 +277,7 @@ Partial Class frmHauptfensterNew Me.btnVIEW_CustControling = New System.Windows.Forms.Button() Me.btnDEFAULT_Selected = New System.Windows.Forms.Button() Me.btnDEFAULT_UnSelected = New System.Windows.Forms.Button() + Me.Button9 = New System.Windows.Forms.Button() Me.Panel6 = New System.Windows.Forms.Panel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.FlowLayoutPanel2 = New System.Windows.Forms.FlowLayoutPanel() @@ -328,7 +329,6 @@ Partial Class frmHauptfensterNew Me.Panel7 = New System.Windows.Forms.Panel() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.UidAbfrageService1 = New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService() - Me.Button9 = New System.Windows.Forms.Button() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -1643,7 +1643,7 @@ Partial Class frmHauptfensterNew Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(200, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" - Me.pnlDetailsRechts.Size = New System.Drawing.Size(297, 739) + Me.pnlDetailsRechts.Size = New System.Drawing.Size(299, 739) Me.pnlDetailsRechts.TabIndex = 0 ' 'lblMitarbeiter @@ -1685,7 +1685,7 @@ Partial Class frmHauptfensterNew Me.lblUsrname.BackColor = System.Drawing.Color.White Me.lblUsrname.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.lblUsrname.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblUsrname.Location = New System.Drawing.Point(283, 384) + Me.lblUsrname.Location = New System.Drawing.Point(275, 384) Me.lblUsrname.Name = "lblUsrname" Me.lblUsrname.Size = New System.Drawing.Size(75, 13) Me.lblUsrname.TabIndex = 86 @@ -1697,7 +1697,7 @@ Partial Class frmHauptfensterNew Me.lblFimaAviso.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblFimaAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblFimaAviso.ForeColor = System.Drawing.Color.Black - Me.lblFimaAviso.Location = New System.Drawing.Point(339, 371) + Me.lblFimaAviso.Location = New System.Drawing.Point(331, 371) Me.lblFimaAviso.Name = "lblFimaAviso" Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13) Me.lblFimaAviso.TabIndex = 11 @@ -1795,7 +1795,7 @@ Partial Class frmHauptfensterNew Me.lblGrenzstelle.BackColor = System.Drawing.Color.White Me.lblGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.lblGrenzstelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblGrenzstelle.Location = New System.Drawing.Point(342, 384) + Me.lblGrenzstelle.Location = New System.Drawing.Point(334, 384) Me.lblGrenzstelle.Name = "lblGrenzstelle" Me.lblGrenzstelle.Size = New System.Drawing.Size(60, 13) Me.lblGrenzstelle.TabIndex = 0 @@ -1807,7 +1807,7 @@ Partial Class frmHauptfensterNew Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblVersion.ForeColor = System.Drawing.Color.Black - Me.lblVersion.Location = New System.Drawing.Point(334, 399) + Me.lblVersion.Location = New System.Drawing.Point(326, 399) Me.lblVersion.Name = "lblVersion" Me.lblVersion.Size = New System.Drawing.Size(68, 13) Me.lblVersion.TabIndex = 6 @@ -2043,7 +2043,7 @@ Partial Class frmHauptfensterNew Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(172, 362) + Me.pic.Location = New System.Drawing.Point(164, 362) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(59, 50) Me.pic.TabIndex = 5 @@ -2072,7 +2072,7 @@ Partial Class frmHauptfensterNew Me.pnlAktOption.Dock = System.Windows.Forms.DockStyle.Top Me.pnlAktOption.Location = New System.Drawing.Point(0, 0) Me.pnlAktOption.Name = "pnlAktOption" - Me.pnlAktOption.Size = New System.Drawing.Size(774, 5) + Me.pnlAktOption.Size = New System.Drawing.Size(780, 5) Me.pnlAktOption.TabIndex = 1 ' 'Button8 @@ -2082,7 +2082,7 @@ Partial Class frmHauptfensterNew Me.Button8.ForeColor = System.Drawing.Color.Black Me.Button8.Image = CType(resources.GetObject("Button8.Image"), System.Drawing.Image) Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.Location = New System.Drawing.Point(1061, 214) + Me.Button8.Location = New System.Drawing.Point(1067, 214) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(89, 34) Me.Button8.TabIndex = 3 @@ -2099,7 +2099,7 @@ Partial Class frmHauptfensterNew Me.btnFertig.ForeColor = System.Drawing.Color.Black Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image) Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnFertig.Location = New System.Drawing.Point(1165, 214) + Me.btnFertig.Location = New System.Drawing.Point(1171, 214) Me.btnFertig.Name = "btnFertig" Me.btnFertig.Size = New System.Drawing.Size(102, 34) Me.btnFertig.TabIndex = 0 @@ -2113,7 +2113,7 @@ Partial Class frmHauptfensterNew Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainer1.IsSplitterFixed = True - Me.SplitContainer1.Location = New System.Drawing.Point(408, 30) + Me.SplitContainer1.Location = New System.Drawing.Point(400, 30) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -2126,8 +2126,8 @@ Partial Class frmHauptfensterNew Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall) Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts) Me.SplitContainer1.Panel2MinSize = 200 - Me.SplitContainer1.Size = New System.Drawing.Size(1249, 741) - Me.SplitContainer1.SplitterDistance = 949 + Me.SplitContainer1.Size = New System.Drawing.Size(1257, 741) + Me.SplitContainer1.SplitterDistance = 955 Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.TabIndex = 7 ' @@ -2140,7 +2140,7 @@ Partial Class frmHauptfensterNew Me.pnlDetailsLinks.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsLinks.MinimumSize = New System.Drawing.Size(324, 564) Me.pnlDetailsLinks.Name = "pnlDetailsLinks" - Me.pnlDetailsLinks.Size = New System.Drawing.Size(947, 739) + Me.pnlDetailsLinks.Size = New System.Drawing.Size(953, 739) Me.pnlDetailsLinks.TabIndex = 0 ' 'splitMain @@ -2167,7 +2167,7 @@ Partial Class frmHauptfensterNew Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption) Me.splitMain.Panel2.Controls.Add(Me.pnlOptionen) Me.splitMain.Panel2.Controls.Add(Me.Panel9) - Me.splitMain.Size = New System.Drawing.Size(945, 737) + Me.splitMain.Size = New System.Drawing.Size(951, 737) Me.splitMain.SplitterDistance = 576 Me.splitMain.TabIndex = 0 ' @@ -2187,7 +2187,7 @@ Partial Class frmHauptfensterNew 'splitMainWorkingView.Panel2 ' Me.splitMainWorkingView.Panel2.Controls.Add(Me.pnlMain_Bottom) - Me.splitMainWorkingView.Size = New System.Drawing.Size(945, 501) + Me.splitMainWorkingView.Size = New System.Drawing.Size(951, 501) Me.splitMainWorkingView.SplitterDistance = 350 Me.splitMainWorkingView.SplitterWidth = 15 Me.splitMainWorkingView.TabIndex = 9 @@ -2197,7 +2197,7 @@ Partial Class frmHauptfensterNew Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlMain.Location = New System.Drawing.Point(0, 0) Me.pnlMain.Name = "pnlMain" - Me.pnlMain.Size = New System.Drawing.Size(945, 350) + Me.pnlMain.Size = New System.Drawing.Size(951, 350) Me.pnlMain.TabIndex = 8 ' 'pnlMain_Bottom @@ -2205,7 +2205,7 @@ Partial Class frmHauptfensterNew Me.pnlMain_Bottom.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlMain_Bottom.Location = New System.Drawing.Point(0, 0) Me.pnlMain_Bottom.Name = "pnlMain_Bottom" - Me.pnlMain_Bottom.Size = New System.Drawing.Size(945, 136) + Me.pnlMain_Bottom.Size = New System.Drawing.Size(951, 136) Me.pnlMain_Bottom.TabIndex = 9 ' 'Panel1 @@ -2217,7 +2217,7 @@ Partial Class frmHauptfensterNew Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(945, 75) + Me.Panel1.Size = New System.Drawing.Size(951, 75) Me.Panel1.TabIndex = 2 ' 'Panel8 @@ -2226,7 +2226,7 @@ Partial Class frmHauptfensterNew Me.Panel8.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel8.Location = New System.Drawing.Point(0, 65) Me.Panel8.Name = "Panel8" - Me.Panel8.Size = New System.Drawing.Size(717, 10) + Me.Panel8.Size = New System.Drawing.Size(723, 10) Me.Panel8.TabIndex = 10 ' 'FlowLayoutPanel1 @@ -2245,7 +2245,7 @@ Partial Class frmHauptfensterNew Me.FlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(3, 3, 3, 0) Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1" - Me.FlowLayoutPanel1.Size = New System.Drawing.Size(717, 65) + Me.FlowLayoutPanel1.Size = New System.Drawing.Size(723, 65) Me.FlowLayoutPanel1.TabIndex = 6 ' 'btnVIEW_LKW @@ -2372,11 +2372,29 @@ Partial Class frmHauptfensterNew Me.btnDEFAULT_UnSelected.UseVisualStyleBackColor = False Me.btnDEFAULT_UnSelected.Visible = False ' + 'Button9 + ' + Me.Button9.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(80, Byte), Integer), CType(CType(150, Byte), Integer)) + Me.Button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.Button9.FlatAppearance.BorderSize = 0 + Me.Button9.Font = New System.Drawing.Font("Segoe UI", 10.0!) + Me.Button9.ForeColor = System.Drawing.Color.White + Me.Button9.Location = New System.Drawing.Point(338, 79) + Me.Button9.Margin = New System.Windows.Forms.Padding(3, 16, 3, 0) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(158, 47) + Me.Button9.TabIndex = 11 + Me.Button9.TabStop = False + Me.Button9.Text = "DISPO" + Me.ToolTip1.SetToolTip(Me.Button9, "Es werden alle LKWs mit Status Ankunft des aktiven Standorts angezeigt, absteigen" & + "d sortiert nach Dauer") + Me.Button9.UseVisualStyleBackColor = False + ' 'Panel6 ' Me.Panel6.Controls.Add(Me.PictureBox1) Me.Panel6.Dock = System.Windows.Forms.DockStyle.Right - Me.Panel6.Location = New System.Drawing.Point(717, 0) + Me.Panel6.Location = New System.Drawing.Point(723, 0) Me.Panel6.Name = "Panel6" Me.Panel6.Size = New System.Drawing.Size(228, 75) Me.Panel6.TabIndex = 9 @@ -2403,7 +2421,7 @@ Partial Class frmHauptfensterNew Me.FlowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Top Me.FlowLayoutPanel2.Location = New System.Drawing.Point(181, 70) Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2" - Me.FlowLayoutPanel2.Size = New System.Drawing.Size(593, 65) + Me.FlowLayoutPanel2.Size = New System.Drawing.Size(599, 65) Me.FlowLayoutPanel2.TabIndex = 86 ' 'MyFlowLayoutPanel1 @@ -2418,7 +2436,7 @@ Partial Class frmHauptfensterNew Me.MyFlowLayoutPanel1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(181, 5) Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(593, 65) + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(599, 65) Me.MyFlowLayoutPanel1.TabIndex = 85 ' 'btnKunden @@ -2579,7 +2597,7 @@ Partial Class frmHauptfensterNew Me.Panel9.Controls.Add(Me.Button6) Me.Panel9.Controls.Add(Me.btnDrucken) Me.Panel9.Dock = System.Windows.Forms.DockStyle.Right - Me.Panel9.Location = New System.Drawing.Point(774, 0) + Me.Panel9.Location = New System.Drawing.Point(780, 0) Me.Panel9.Name = "Panel9" Me.Panel9.Size = New System.Drawing.Size(171, 157) Me.Panel9.TabIndex = 88 @@ -2787,7 +2805,7 @@ Partial Class frmHauptfensterNew Me.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLeft.Location = New System.Drawing.Point(0, 30) Me.pnlLeft.Name = "pnlLeft" - Me.pnlLeft.Size = New System.Drawing.Size(408, 741) + Me.pnlLeft.Size = New System.Drawing.Size(400, 741) Me.pnlLeft.TabIndex = 88 ' 'UsrCntlBenachrichtigungen2 @@ -2795,7 +2813,7 @@ Partial Class frmHauptfensterNew Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 10) Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2" - Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(408, 315) + Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(400, 315) Me.UsrCntlBenachrichtigungen2.TabIndex = 5 ' 'Panel5 @@ -2816,7 +2834,7 @@ Partial Class frmHauptfensterNew Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel5.Location = New System.Drawing.Point(0, 325) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(408, 416) + Me.Panel5.Size = New System.Drawing.Size(400, 416) Me.Panel5.TabIndex = 3 ' 'cbxChartNurGelesen @@ -2849,7 +2867,7 @@ Partial Class frmHauptfensterNew Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(408, 301) + Me.TabControl1.Size = New System.Drawing.Size(400, 301) Me.TabControl1.TabIndex = 85 ' 'TabPage1 @@ -2858,7 +2876,7 @@ Partial Class frmHauptfensterNew Me.TabPage1.Location = New System.Drawing.Point(4, 25) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(400, 272) + Me.TabPage1.Size = New System.Drawing.Size(392, 272) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Chat" Me.TabPage1.UseVisualStyleBackColor = True @@ -2869,7 +2887,7 @@ Partial Class frmHauptfensterNew Me.UsrCntlMessenger_ListNewChats1.Location = New System.Drawing.Point(3, 3) Me.UsrCntlMessenger_ListNewChats1.Margin = New System.Windows.Forms.Padding(4) Me.UsrCntlMessenger_ListNewChats1.Name = "UsrCntlMessenger_ListNewChats1" - Me.UsrCntlMessenger_ListNewChats1.Size = New System.Drawing.Size(394, 266) + Me.UsrCntlMessenger_ListNewChats1.Size = New System.Drawing.Size(386, 266) Me.UsrCntlMessenger_ListNewChats1.TabIndex = 0 ' 'btnMitarbeiterKonto @@ -2882,7 +2900,7 @@ Partial Class frmHauptfensterNew Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black Me.btnMitarbeiterKonto.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(268, 307) + Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(260, 307) Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) Me.btnMitarbeiterKonto.TabIndex = 86 @@ -2896,7 +2914,7 @@ Partial Class frmHauptfensterNew Me.Panel7.Dock = System.Windows.Forms.DockStyle.Top Me.Panel7.Location = New System.Drawing.Point(0, 0) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(408, 10) + Me.Panel7.Size = New System.Drawing.Size(400, 10) Me.Panel7.TabIndex = 4 ' 'UsrCntlTestsystem1 @@ -2916,24 +2934,6 @@ Partial Class frmHauptfensterNew Me.UidAbfrageService1.Url = "https://finanzonline.bmf.gv.at/fon/ws/uidAbfrage/" Me.UidAbfrageService1.UseDefaultCredentials = False ' - 'Button9 - ' - Me.Button9.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(80, Byte), Integer), CType(CType(150, Byte), Integer)) - Me.Button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.Button9.FlatAppearance.BorderSize = 0 - Me.Button9.Font = New System.Drawing.Font("Segoe UI", 10.0!) - Me.Button9.ForeColor = System.Drawing.Color.White - Me.Button9.Location = New System.Drawing.Point(338, 79) - Me.Button9.Margin = New System.Windows.Forms.Padding(3, 16, 3, 0) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(158, 47) - Me.Button9.TabIndex = 11 - Me.Button9.TabStop = False - Me.Button9.Text = "DISPO" - Me.ToolTip1.SetToolTip(Me.Button9, "Es werden alle LKWs mit Status Ankunft des aktiven Standorts angezeigt, absteigen" & - "d sortiert nach Dauer") - Me.Button9.UseVisualStyleBackColor = False - ' 'frmHauptfensterNew ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/Aviso/frmHauptfensterNew.vb b/Aviso/frmHauptfensterNew.vb index 9ff9a66..4aede8c 100644 --- a/Aviso/frmHauptfensterNew.vb +++ b/Aviso/frmHauptfensterNew.vb @@ -87,6 +87,107 @@ Public Class frmHauptfensterNew End If End Sub + Private pnlLeftOriginalWidth As Integer + + + Private Class ButtonScaleInfo + Public OriginalWidth As Integer + Public OriginalHeight As Integer + Public OriginalFontSize As Single + End Class + + Private ReadOnly _buttonScaleInfos As New Dictionary(Of Button, ButtonScaleInfo) + Private Sub frmMain_Resize(sender As Object, e As EventArgs) Handles MyBase.ResizeEnd + + pnlLeftOriginalWidth = 400 + + Dim Panel6OriginalWidth As Integer = 228 + Dim screenWidth As Integer = Me.Width + + Dim schwelle1 As Integer = 1500 + Dim schwelle2 As Integer = 1920 + + If screenWidth <= schwelle1 Then + + pnlLeft.Width = CInt(pnlLeftOriginalWidth * 0.6) + Panel6.Width = CInt(Panel6OriginalWidth * 0.0) + + ElseIf screenWidth <= schwelle2 Then + + pnlLeft.Width = CInt(pnlLeftOriginalWidth * 0.75) + Panel6.Width = CInt(Panel6OriginalWidth * 0.5) + + Else + + pnlLeft.Width = pnlLeftOriginalWidth + Panel6.Width = Panel6OriginalWidth + + End If + + + 'Buttons skalieren + Dim buttonFaktor As Double + + If screenWidth <= schwelle1 Then + buttonFaktor = 0.7 + + ElseIf screenWidth <= schwelle2 Then + buttonFaktor = 0.8 + + Else + buttonFaktor = 1.0 + End If + + ScaleButtons(FlowLayoutPanel1, buttonFaktor) + ScaleButtons(splitMain.Panel2, buttonFaktor) + + End Sub + Private Sub ScaleButtons(parent As Control, buttonFaktor As Double) + + For Each ctrl As Control In parent.Controls + + If TypeOf ctrl Is Button Then + + Dim btn As Button = DirectCast(ctrl, Button) + + 'Originalwerte nur einmal speichern + If Not _buttonScaleInfos.ContainsKey(btn) Then + + _buttonScaleInfos.Add( + btn, + New ButtonScaleInfo With { + .OriginalWidth = btn.Width, + .OriginalHeight = btn.Height, + .OriginalFontSize = btn.Font.Size + } + ) + + End If + + Dim original As ButtonScaleInfo = _buttonScaleInfos(btn) + + 'Immer vom Original aus skalieren + btn.Width = CInt(original.OriginalWidth * buttonFaktor) + btn.Height = CInt(original.OriginalHeight * buttonFaktor) + + btn.Font = New Font( + btn.Font.FontFamily, + original.OriginalFontSize * CSng(buttonFaktor), + btn.Font.Style + ) + + End If + + 'Untergeordnete Controls ebenfalls durchsuchen + If ctrl.HasChildren Then + ScaleButtons(ctrl, buttonFaktor) + End If + + Next + + End Sub + + Private Sub frmHauptfenster_GotFocus(sender As Object, e As EventArgs) Handles MyBase.GotFocus Timer1_Tick(Timer1, New EventArgs) End Sub @@ -414,6 +515,8 @@ Public Class frmHauptfensterNew End If End If + pnlLeftOriginalWidth = pnlLeft.Width + 'MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) Me.AutoScaleMode = AutoScaleMode.Dpi hideErr.Interval = 3000 @@ -2014,6 +2117,8 @@ ELSE_ATILLA: Me.Size = Screen.PrimaryScreen.WorkingArea.Size ' MsgBox(Me.Size.Height) + + Details_aktiv = True ' If gridMyAviso.RowCount > 0 Then 'gridMyAviso.Rows(0).Selected = True @@ -2099,6 +2204,8 @@ ELSE_ATILLA: 'Evtl abhängign vom User machen: SWITCH_SEARCH("AVISO") + + End Sub Private Function getTbControlWidth(tbcntr) As Integer @@ -4218,6 +4325,7 @@ ELSE_ATILLA: Private Sub cbxChartNurGelesen_CheckedChanged(sender As Object, e As EventArgs) Handles cbxChartNurGelesen.CheckedChanged VERAG_PROG_ALLGEMEIN.cGlobal.CHAT_NurGelesen = cbxChartNurGelesen.Checked + UsrCntlMessenger_ListNewChats1.initFontSizeSmaller() UsrCntlMessenger_ListNewChats1.intiDGVChats() End Sub End Class diff --git a/Aviso/usrCntlHauptfenster_Suche_SND.vb b/Aviso/usrCntlHauptfenster_Suche_SND.vb index 9c37e96..f4b4c0d 100644 --- a/Aviso/usrCntlHauptfenster_Suche_SND.vb +++ b/Aviso/usrCntlHauptfenster_Suche_SND.vb @@ -624,7 +624,7 @@ Public Class usrCntlHauptfenster_Suche_SND Dim hSQLFirma = "" - hSQLFirma = " AND Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' " + hSQLFirma = " AND (Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) " hSQL = " SELECT " & top & " AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " & @@ -714,7 +714,7 @@ Public Class usrCntlHauptfenster_Suche_SND Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)) - MsgBox(hSQL) + ' MsgBox(hSQL) 'If hSort = "" Then 'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC" ' Else