From ed993d08d7635cce87fbd7a419bb5e7bb5be8da9 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 20 Mar 2023 22:50:13 +0100 Subject: [PATCH] Buttons Hauptfenster --- Aviso/Aviso.vbproj | 12 +-- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmHauptfenster.Designer.vb | 166 ++++++++++++++++++------------ Aviso/frmHauptfenster.vb | 5 +- 4 files changed, 109 insertions(+), 78 deletions(-) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index e72b958..962a4cf 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -95,7 +95,7 @@ true - true + false false @@ -108,7 +108,7 @@ x64 - LME.pfx + Aviso_TemporaryKey.pfx @@ -324,10 +324,6 @@ ..\..\..\dll\ThoughtWorks.QRCode.dll - - False - ..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll - @@ -1437,6 +1433,10 @@ {289bcd77-bc00-4ba1-95ed-a79176d99525} SDL + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN + {110c923b-cb02-4fd0-af24-95e0f0eeeff5} Gemeinsames diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index e45c569..ead632f 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/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 680638c..18e4e43 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmHauptfenster 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -34,7 +35,7 @@ Partial Class frmHauptfenster Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() - Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip() + Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.conFertig = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() @@ -172,8 +173,7 @@ Partial Class frmHauptfenster Me.EinheitspapierToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CMRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Einheitspapier0735VersandverfahrenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.TIRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.CarnetTIRAltToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.CarnetTIRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BREXITToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GVMSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GVMSUKIMportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -226,6 +226,7 @@ Partial Class frmHauptfenster Me.lblFimaAviso = New System.Windows.Forms.Label() Me.Button11 = New System.Windows.Forms.Button() Me.btnMAVerzeichnis = New System.Windows.Forms.Button() + Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Button9 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() @@ -251,7 +252,7 @@ Partial Class frmHauptfenster Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.Timer1 = New System.Windows.Forms.Timer() + Me.Timer1 = New System.Windows.Forms.Timer(Me.components) Me.btnWichtige = New System.Windows.Forms.Button() Me.btnWichtigeStandort = New System.Windows.Forms.Button() Me.btnMinimieren = New System.Windows.Forms.Button() @@ -269,13 +270,13 @@ Partial Class frmHauptfenster Me.Label22 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.btnNeu = New System.Windows.Forms.Button() - Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip() + Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.pnl = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() - Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox() Me.btnColor = New System.Windows.Forms.Button() @@ -289,7 +290,7 @@ Partial Class frmHauptfenster Me.lblMySND_Anzeige = New System.Windows.Forms.Label() Me.lblAkte = New System.Windows.Forms.Label() Me.btnClose = New System.Windows.Forms.Button() - Me.TimerAkte = New System.Windows.Forms.Timer() + Me.TimerAkte = New System.Windows.Forms.Timer(Me.components) Me.tabVorgeschrieben = New System.Windows.Forms.TabPage() Me.tabFreigegeben = New System.Windows.Forms.TabPage() Me.tabNichtEingetroffen = New System.Windows.Forms.TabPage() @@ -306,7 +307,7 @@ Partial Class frmHauptfenster Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.pnlDetailsLinks = New System.Windows.Forms.Panel() Me.splitMain = New System.Windows.Forms.SplitContainer() - Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label10 = New System.Windows.Forms.Label() @@ -346,17 +347,17 @@ Partial Class frmHauptfenster Me.lblErwAuftraggeber = New System.Windows.Forms.Label() Me.cbxAlle = New System.Windows.Forms.CheckBox() Me.btnSmall = New System.Windows.Forms.Button() - Me.ToolTip1 = New System.Windows.Forms.ToolTip() + Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() - Me.timerStandzeit = New System.Windows.Forms.Timer() + Me.timerStandzeit = New System.Windows.Forms.Timer(Me.components) Me.Label9 = New System.Windows.Forms.Label() - Me.TimerUPDATE = New System.Windows.Forms.Timer() + Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components) Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.pnlOptionen = New System.Windows.Forms.Panel() Me.btnKasse_User = New System.Windows.Forms.Button() Me.btnKasse_LG = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() - Me.cntxt = New System.Windows.Forms.ContextMenuStrip() + Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZugelassenerAusführerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -365,15 +366,17 @@ Partial Class frmHauptfenster Me.BrexitToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.EmbargosLänderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.Timer_REFRESH = New System.Windows.Forms.Timer() + Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) Me.ColorDialog = New System.Windows.Forms.ColorDialog() - Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip() + Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ALLEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem() - Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.Panel3 = New System.Windows.Forms.Panel() + Me.Panel4 = New System.Windows.Forms.Panel() + Me.CarnetTIRALTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -412,6 +415,8 @@ Partial Class frmHauptfenster Me.pnlOptionen.SuspendLayout() Me.cntxt.SuspendLayout() Me.ctxtFarben.SuspendLayout() + Me.Panel3.SuspendLayout() + Me.Panel4.SuspendLayout() Me.SuspendLayout() ' 'mnuInfo @@ -505,11 +510,12 @@ Partial Class frmHauptfenster 'MenuStrip1 ' Me.MenuStrip1.BackColor = System.Drawing.Color.White + Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.Fill Me.MenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.FunktionenToolStripMenuItem, Me.StatistikToolStripMenuItem, Me.ToolStripFormulare, Me.BREXITToolStripMenuItem, Me.mnuFragezeichen}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(1372, 24) + Me.MenuStrip1.Size = New System.Drawing.Size(1372, 25) Me.MenuStrip1.TabIndex = 3 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -519,7 +525,7 @@ Partial Class frmHauptfenster Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AvisoTVToolStripMenuItem, Me.SecretAvisoToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.SpracheWechselnToolStripMenuItem, Me.StandarddruckerWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem}) Me.mnuProgramm.ForeColor = System.Drawing.Color.Black Me.mnuProgramm.Name = "mnuProgramm" - Me.mnuProgramm.Size = New System.Drawing.Size(78, 20) + Me.mnuProgramm.Size = New System.Drawing.Size(78, 21) Me.mnuProgramm.Text = "Verwaltung" ' 'mnuFirmen @@ -839,7 +845,7 @@ Partial Class frmHauptfenster ' Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.WarenorteToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" - Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 20) + Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 21) Me.FunktionenToolStripMenuItem.Text = "Funktionen" ' 'GenerelleGestellungenDurchsuchenToolStripMenuItem @@ -1044,7 +1050,7 @@ Partial Class frmHauptfenster Me.StatistikToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LKWBerichtToolStripMenuItem, Me.StatistikADMINToolStripMenuItem, Me.ToolStripSeparator8, Me.BürgschafrtsbuchungenFremdToolStripMenuItem, Me.LKWEingetroffenNachToolStripMenuItem, Me.ToolStripSeparator7, Me.SDLAuswertungenToolStripMenuItem, Me.SDLAuswertungenToolStripMenuItem1}) Me.StatistikToolStripMenuItem.ForeColor = System.Drawing.Color.Black Me.StatistikToolStripMenuItem.Name = "StatistikToolStripMenuItem" - Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(83, 20) + Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(83, 21) Me.StatistikToolStripMenuItem.Text = "Auswertung" ' 'LKWBerichtToolStripMenuItem @@ -1096,13 +1102,13 @@ Partial Class frmHauptfenster 'ToolStripFormulare ' Me.ToolStripFormulare.BackColor = System.Drawing.Color.White - Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.TIRToolStripMenuItem, Me.CarnetTIRAltToolStripMenuItem}) + Me.ToolStripFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem2, Me.ToolStripMenuItem7, Me.ToolStripMenuItem12, Me.ToolStripMenuItem15, Me.ToolStripMenuItem18, Me.AuftragÜberwachungsdokumentToolStripMenuItem, Me.toolVUB, Me.toolVPCreditreform, Me.ToolStripSeparator9, Me.VerzollungsunterlagenToolStripMenuItem, Me.ToolStripMenuItem11, Me.ToolStripSeparator6, Me.WAIDHAUSToolStripMenuItem, Me.ToolStripSeparator13, Me.EinheitspapierToolStripMenuItem, Me.CMRToolStripMenuItem, Me.Einheitspapier0735VersandverfahrenToolStripMenuItem, Me.CarnetTIRToolStripMenuItem, Me.CarnetTIRALTToolStripMenuItem}) Me.ToolStripFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripFormulare.ForeColor = System.Drawing.Color.Black Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight Me.ToolStripFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.ToolStripFormulare.Name = "ToolStripFormulare" - Me.ToolStripFormulare.Size = New System.Drawing.Size(73, 20) + Me.ToolStripFormulare.Size = New System.Drawing.Size(73, 21) Me.ToolStripFormulare.Text = "Formulare" ' 'MANAGERToolStripMenuItem @@ -1292,23 +1298,17 @@ Partial Class frmHauptfenster Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Size = New System.Drawing.Size(277, 22) Me.Einheitspapier0735VersandverfahrenToolStripMenuItem.Text = "Einheitspapier 0735 (Versandverfahren)" ' - 'TIRToolStripMenuItem + 'CarnetTIRToolStripMenuItem ' - Me.TIRToolStripMenuItem.Name = "TIRToolStripMenuItem" - Me.TIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) - Me.TIRToolStripMenuItem.Text = "Carnet TIR" - ' - 'CarnetTIRAltToolStripMenuItem - ' - Me.CarnetTIRAltToolStripMenuItem.Name = "CarnetTIRAltToolStripMenuItem" - Me.CarnetTIRAltToolStripMenuItem.Size = New System.Drawing.Size(277, 22) - Me.CarnetTIRAltToolStripMenuItem.Text = "Carnet TIR alt" + Me.CarnetTIRToolStripMenuItem.Name = "CarnetTIRToolStripMenuItem" + Me.CarnetTIRToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CarnetTIRToolStripMenuItem.Text = "Carnet TIR" ' 'BREXITToolStripMenuItem ' Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem}) Me.BREXITToolStripMenuItem.Name = "BREXITToolStripMenuItem" - Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(55, 20) + Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(55, 21) Me.BREXITToolStripMenuItem.Text = "BREXIT" Me.BREXITToolStripMenuItem.Visible = False ' @@ -1465,7 +1465,7 @@ Partial Class frmHauptfenster Me.mnuFragezeichen.ForeColor = System.Drawing.Color.Black Me.mnuFragezeichen.ImageTransparentColor = System.Drawing.Color.Brown Me.mnuFragezeichen.Name = "mnuFragezeichen" - Me.mnuFragezeichen.Size = New System.Drawing.Size(24, 20) + Me.mnuFragezeichen.Size = New System.Drawing.Size(24, 21) Me.mnuFragezeichen.Text = "?" ' 'VerfahrenshandbücherToolStripMenuItem @@ -1603,7 +1603,7 @@ Partial Class frmHauptfenster Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" - Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 599) + Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 598) Me.pnlDetailsRechts.TabIndex = 0 ' 'lblMitarbeiter @@ -1613,7 +1613,7 @@ Partial Class frmHauptfenster Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblMitarbeiter.Location = New System.Drawing.Point(366, 15) + Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -38) Me.lblMitarbeiter.Name = "lblMitarbeiter" Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) Me.lblMitarbeiter.TabIndex = 1 @@ -1647,6 +1647,7 @@ Partial Class frmHauptfenster Me.Top.Controls.Add(Me.lblFimaAviso) Me.Top.Controls.Add(Me.Button11) Me.Top.Controls.Add(Me.btnMAVerzeichnis) + Me.Top.Controls.Add(Me.btnMitarbeiterKonto) Me.Top.Controls.Add(Me.Button9) Me.Top.Controls.Add(Me.Button2) Me.Top.Controls.Add(Me.Button5) @@ -1661,7 +1662,7 @@ Partial Class frmHauptfenster Me.Top.Controls.Add(Me.btnKunden) Me.Top.Controls.Add(Me.btnSpedBuch) Me.Top.Dock = System.Windows.Forms.DockStyle.Top - Me.Top.Location = New System.Drawing.Point(0, 24) + Me.Top.Location = New System.Drawing.Point(0, 25) Me.Top.Name = "Top" Me.Top.Size = New System.Drawing.Size(1372, 52) Me.Top.TabIndex = 6 @@ -1719,6 +1720,24 @@ Partial Class frmHauptfenster Me.btnMAVerzeichnis.UseVisualStyleBackColor = True Me.btnMAVerzeichnis.Visible = False ' + 'btnMitarbeiterKonto + ' + Me.btnMitarbeiterKonto.allowBorder = False + Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White + Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 + Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 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(1109, -6) + Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" + Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) + Me.btnMitarbeiterKonto.TabIndex = 86 + Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" + Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False + ' 'Button9 ' Me.Button9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -2101,7 +2120,7 @@ Partial Class frmHauptfenster Me.btnMinimieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMinimieren.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnMinimieren.ForeColor = System.Drawing.Color.White - Me.btnMinimieren.Location = New System.Drawing.Point(1250, -1) + Me.btnMinimieren.Location = New System.Drawing.Point(48, 0) Me.btnMinimieren.Name = "btnMinimieren" Me.btnMinimieren.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.btnMinimieren.Size = New System.Drawing.Size(63, 25) @@ -2576,7 +2595,7 @@ Partial Class frmHauptfenster Me.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnClose.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnClose.ForeColor = System.Drawing.Color.White - Me.btnClose.Location = New System.Drawing.Point(1310, -1) + Me.btnClose.Location = New System.Drawing.Point(109, 0) Me.btnClose.Name = "btnClose" Me.btnClose.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.btnClose.Size = New System.Drawing.Size(63, 25) @@ -2752,7 +2771,7 @@ Partial Class frmHauptfenster 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(0, 76) + Me.SplitContainer1.Location = New System.Drawing.Point(0, 77) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -2765,7 +2784,7 @@ Partial Class frmHauptfenster Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall) Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts) Me.SplitContainer1.Panel2MinSize = 300 - Me.SplitContainer1.Size = New System.Drawing.Size(1372, 601) + Me.SplitContainer1.Size = New System.Drawing.Size(1372, 600) Me.SplitContainer1.SplitterDistance = 819 Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.TabIndex = 7 @@ -2779,7 +2798,7 @@ Partial Class frmHauptfenster 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(817, 599) + Me.pnlDetailsLinks.Size = New System.Drawing.Size(817, 598) Me.pnlDetailsLinks.TabIndex = 0 ' 'splitMain @@ -2803,8 +2822,8 @@ Partial Class frmHauptfenster ' Me.splitMain.Panel2.Controls.Add(Me.SplitContainer2) Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption) - Me.splitMain.Size = New System.Drawing.Size(815, 597) - Me.splitMain.SplitterDistance = 288 + Me.splitMain.Size = New System.Drawing.Size(815, 596) + Me.splitMain.SplitterDistance = 287 Me.splitMain.TabIndex = 0 ' 'gridAviso @@ -2857,7 +2876,7 @@ Partial Class frmHauptfenster Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridAviso.Size = New System.Drawing.Size(815, 68) + Me.gridAviso.Size = New System.Drawing.Size(815, 67) Me.gridAviso.TabIndex = 1 Me.gridAviso.TabStop = False ' @@ -3553,24 +3572,6 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22) Me.ToolStripMenuItem21.Text = "GELB" ' - 'btnMitarbeiterKonto - ' - Me.btnMitarbeiterKonto.allowBorder = False - Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White - Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 - Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat - 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(1109, 8) - Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" - Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) - Me.btnMitarbeiterKonto.TabIndex = 86 - Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" - Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False - ' 'UsrCntlTestsystem1 ' Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White @@ -3582,20 +3583,44 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' + 'Panel3 + ' + Me.Panel3.Controls.Add(Me.Panel4) + Me.Panel3.Controls.Add(Me.MenuStrip1) + Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel3.Location = New System.Drawing.Point(0, 0) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(1372, 25) + Me.Panel3.TabIndex = 87 + ' + 'Panel4 + ' + Me.Panel4.BackColor = System.Drawing.Color.White + Me.Panel4.Controls.Add(Me.btnClose) + Me.Panel4.Controls.Add(Me.btnMinimieren) + Me.Panel4.Dock = System.Windows.Forms.DockStyle.Right + Me.Panel4.Location = New System.Drawing.Point(1202, 0) + Me.Panel4.Name = "Panel4" + Me.Panel4.Size = New System.Drawing.Size(170, 25) + Me.Panel4.TabIndex = 4 + ' + 'CarnetTIRALTToolStripMenuItem + ' + Me.CarnetTIRALTToolStripMenuItem.Name = "CarnetTIRALTToolStripMenuItem" + Me.CarnetTIRALTToolStripMenuItem.Size = New System.Drawing.Size(277, 22) + Me.CarnetTIRALTToolStripMenuItem.Text = "Carnet TIR (ALT)" + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1372, 677) - Me.Controls.Add(Me.btnMitarbeiterKonto) Me.Controls.Add(Me.pnlOptionen) Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.UsrCntlTestsystem1) Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.Top) - Me.Controls.Add(Me.btnMinimieren) - Me.Controls.Add(Me.btnClose) - Me.Controls.Add(Me.MenuStrip1) + Me.Controls.Add(Me.Panel3) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True @@ -3650,6 +3675,9 @@ Partial Class frmHauptfenster Me.pnlOptionen.ResumeLayout(False) Me.cntxt.ResumeLayout(False) Me.ctxtFarben.ResumeLayout(False) + Me.Panel3.ResumeLayout(False) + Me.Panel3.PerformLayout() + Me.Panel4.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -3994,6 +4022,8 @@ Partial Class frmHauptfenster Friend WithEvents btnMitarbeiterKonto As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents lblUsrname As Label Friend WithEvents cbx_My_Brexit As CheckBox - Friend WithEvents TIRToolStripMenuItem As ToolStripMenuItem - Friend WithEvents CarnetTIRAltToolStripMenuItem As ToolStripMenuItem + Friend WithEvents CarnetTIRToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Panel3 As Panel + Friend WithEvents Panel4 As Panel + Friend WithEvents CarnetTIRALTToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 60404fd..6774f30 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4438,20 +4438,21 @@ Public Class frmHauptfenster - Private Sub CarnetTIRToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TIRToolStripMenuItem.Click + Private Sub CarnetTIRToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CarnetTIRToolStripMenuItem.Click Me.Cursor = Cursors.WaitCursor Dim eh As New SDL.frmTIR eh.Show() Me.Cursor = Cursors.Default End Sub - Private Sub CarnetTIRAltToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CarnetTIRAltToolStripMenuItem.Click + Private Sub CarnetTIRALTToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CarnetTIRALTToolStripMenuItem.Click Me.Cursor = Cursors.WaitCursor Dim eh As New SDL.frmTIR_alt eh.Show() Me.Cursor = Cursors.Default End Sub + End Class Public Class AvisoStatusFunctions