From b7becf31537e3d9f61a76c740772606a38a84ee7 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 28 Aug 2024 10:19:56 +0200 Subject: [PATCH] Kundendatenblatt, SDLUpdater, --- SDL.sln | 3 + SDL/frmMain.vb | 2 +- SDL/kunden/frmKundenblatt.Designer.vb | 306 +++++++----------- SDLUPDATER/App.config | 6 +- SDLUPDATER/My Project/Application.Designer.vb | 4 +- SDLUPDATER/My Project/Resources.Designer.vb | 2 +- SDLUPDATER/My Project/Settings.Designer.vb | 6 +- SDLUPDATER/SDLUPDATER.vbproj | 5 +- SDLUPDATER/UPDATERfrm.vb | 41 ++- 9 files changed, 161 insertions(+), 214 deletions(-) diff --git a/SDL.sln b/SDL.sln index 640f8375..e050aab4 100644 --- a/SDL.sln +++ b/SDL.sln @@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 17.0.31825.309 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDL", "SDL\SDL.vbproj", "{289BCD77-BC00-4BA1-95ED-A79176D99525}" + ProjectSection(ProjectDependencies) = postProject + {739BDC39-3580-4209-85DD-677A125618F4} = {739BDC39-3580-4209-85DD-677A125618F4} + EndProjectSection EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDLUPDATER", "SDLUPDATER\SDLUPDATER.vbproj", "{739BDC39-3580-4209-85DD-677A125618F4}" EndProject diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index 319b756b..91b428f2 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -335,7 +335,7 @@ Public Class frmMain Private Sub UpdateUpdater_Tick(sender As Object, e As EventArgs) Handles UpdateUpdater.Tick UpdateUpdater.Enabled = False Try - Dim aktVersion = "4.0" ' Aktuelle Updater Version + Dim aktVersion = "5.0" ' Aktuelle Updater Version Dim F = "\\share01\Programme\SDL_install\" Dim doUpdaterUpdate = False If File.Exists(AppDomain.CurrentDomain.BaseDirectory & "\SDLUPDATER_Version.txt") Then 'Updater muss auch existieren, sonst wird er auch beim Developer Rechner eingefügt... diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index e2189b04..fc55b1e7 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -40,12 +40,12 @@ Partial Class frmKundenblatt Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmKundenblatt)) Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() Me.tbFirmendaten = New System.Windows.Forms.TabPage() Me.Panel4 = New System.Windows.Forms.Panel() + Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() Me.btnReloadOP = New System.Windows.Forms.Button() @@ -127,8 +127,10 @@ Partial Class frmKundenblatt Me.lblLetzterSA_SDL = New System.Windows.Forms.Label() Me.rtbVermerke = New System.Windows.Forms.RichTextBox() Me.tbSDLKarten = New System.Windows.Forms.TabPage() + Me.usrcntlKarten = New SDL.usrCntlKartenDaten() Me.tbLKW = New System.Windows.Forms.TabPage() Me.pnlLKWRight = New System.Windows.Forms.Panel() + Me.UsrCntlLKW1 = New SDL.usrCntlLKW() Me.pnlLKW = New System.Windows.Forms.Panel() Me.dgvLKW = New System.Windows.Forms.DataGridView() Me.pnlLKWBottom = New System.Windows.Forms.Panel() @@ -159,6 +161,7 @@ Partial Class frmKundenblatt Me.scanVertragVeragKd = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.tbBesuchsberichte = New System.Windows.Forms.TabPage() Me.tbOfferte = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbUSTV = New System.Windows.Forms.TabPage() Me.tbcntrUSTV = New System.Windows.Forms.TabControl() Me.tbUSTVDokumente = New System.Windows.Forms.TabPage() @@ -169,6 +172,7 @@ Partial Class frmKundenblatt Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() + Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() @@ -194,11 +198,6 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() - Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() - Me.usrcntlKarten = New SDL.usrCntlKartenDaten() - Me.UsrCntlLKW1 = New SDL.usrCntlLKW() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -275,11 +274,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) -<<<<<<< HEAD Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 897) -======= - Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 1084) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -289,7 +284,6 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" -<<<<<<< HEAD Me.Panel4.Size = New System.Drawing.Size(1624, 891) Me.Panel4.TabIndex = 0 ' @@ -303,11 +297,6 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 891) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' -======= - Me.Panel4.Size = New System.Drawing.Size(1624, 1078) - Me.Panel4.TabIndex = 0 - ' ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d 'tbcntrMain ' Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons @@ -323,11 +312,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 -<<<<<<< HEAD - Me.tbcntrMain.Size = New System.Drawing.Size(1638, 926) -======= - Me.tbcntrMain.Size = New System.Drawing.Size(1638, 1113) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d + Me.tbcntrMain.Size = New System.Drawing.Size(1638, 943) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -367,11 +352,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) -<<<<<<< HEAD - Me.tbAllgemein.Size = New System.Drawing.Size(1630, 897) -======= - Me.tbAllgemein.Size = New System.Drawing.Size(1630, 1084) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d + Me.tbAllgemein.Size = New System.Drawing.Size(1630, 914) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -470,11 +451,7 @@ Partial Class frmKundenblatt Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvOffenePosten.RowHeadersVisible = False Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect -<<<<<<< HEAD - Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 298) -======= - Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 485) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d + Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 315) Me.dgvOffenePosten.TabIndex = 175 ' 'btnOP @@ -813,27 +790,8 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Location = New System.Drawing.Point(732, 36) Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True -<<<<<<< HEAD - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 - Me.dgvSperrliste.Size = New System.Drawing.Size(432, 853) -======= - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle10 - Me.dgvSperrliste.Size = New System.Drawing.Size(432, 1040) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d + Me.dgvSperrliste.Size = New System.Drawing.Size(432, 870) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -887,7 +845,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1630, 1084) + Me.tbZoll.Size = New System.Drawing.Size(1630, 897) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -899,7 +857,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 1078) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 891) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -907,7 +865,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 1052) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 865) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -918,11 +876,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) -<<<<<<< HEAD Me.tbMdm.Size = New System.Drawing.Size(1630, 897) -======= - Me.tbMdm.Size = New System.Drawing.Size(1630, 1084) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -940,11 +894,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 -<<<<<<< HEAD Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 891) -======= - Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 1078) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -956,11 +906,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) -<<<<<<< HEAD Me.tbSDL.Size = New System.Drawing.Size(1616, 865) -======= - Me.tbSDL.Size = New System.Drawing.Size(1616, 1052) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -969,44 +915,40 @@ Partial Class frmKundenblatt ' Me.dgvSDLLeistungenFull.AllowUserToAddRows = False Me.dgvSDLLeistungenFull.AllowUserToResizeRows = False - DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.dgvSDLLeistungenFull.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + Me.dgvSDLLeistungenFull.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 - Me.dgvSDLLeistungenFull.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle12 Me.dgvSDLLeistungenFull.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSDLLeistungenFull.Location = New System.Drawing.Point(3, 50) Me.dgvSDLLeistungenFull.Name = "dgvSDLLeistungenFull" Me.dgvSDLLeistungenFull.ReadOnly = True - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect -<<<<<<< HEAD Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 669) -======= - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 856) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -1110,11 +1052,7 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom -<<<<<<< HEAD Me.Panel5.Location = New System.Drawing.Point(3, 719) -======= - Me.Panel5.Location = New System.Drawing.Point(3, 906) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d Me.Panel5.Name = "Panel5" Me.Panel5.Size = New System.Drawing.Size(1610, 143) Me.Panel5.TabIndex = 177 @@ -1487,11 +1425,21 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(1616, 1052) + Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True ' + 'usrcntlKarten + ' + Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default + Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.usrcntlKarten.Name = "usrcntlKarten" + Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33) + Me.usrcntlKarten.TabIndex = 0 + ' 'tbLKW ' Me.tbLKW.Controls.Add(Me.pnlLKWRight) @@ -1499,7 +1447,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1616, 1052) + Me.tbLKW.Size = New System.Drawing.Size(178, 39) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1511,9 +1459,22 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1304, 1046) + Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) Me.pnlLKWRight.TabIndex = 2 ' + 'UsrCntlLKW1 + ' + Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White + Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) + Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) + Me.UsrCntlLKW1.Name = "UsrCntlLKW1" + Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) + Me.UsrCntlLKW1.TabIndex = 0 + ' 'pnlLKW ' Me.pnlLKW.Controls.Add(Me.dgvLKW) @@ -1522,48 +1483,48 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 1046) + Me.pnlLKW.Size = New System.Drawing.Size(306, 33) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW ' Me.dgvLKW.AllowUserToAddRows = False Me.dgvLKW.AllowUserToDeleteRows = False - DataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.dgvLKW.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 - Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle16 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvLKW.Location = New System.Drawing.Point(0, 62) Me.dgvLKW.Name = "dgvLKW" Me.dgvLKW.ReadOnly = True - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 872) + Me.dgvLKW.Size = New System.Drawing.Size(306, 0) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1575,7 +1536,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 934) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1716,7 +1677,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(1616, 1052) + Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1728,7 +1689,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1610, 1046) + Me.Panel3.Size = New System.Drawing.Size(172, 33) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -1746,7 +1707,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(1616, 1052) + Me.tbDokumente.Size = New System.Drawing.Size(178, 39) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -1944,7 +1905,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(1616, 1052) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -1955,17 +1916,27 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1630, 1084) + Me.tbOfferte.Size = New System.Drawing.Size(1630, 897) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 897) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbUSTV ' Me.tbUSTV.Controls.Add(Me.tbcntrUSTV) Me.tbUSTV.Location = New System.Drawing.Point(4, 25) Me.tbUSTV.Name = "tbUSTV" - Me.tbUSTV.Size = New System.Drawing.Size(1630, 1084) + Me.tbUSTV.Size = New System.Drawing.Size(1630, 897) Me.tbUSTV.TabIndex = 12 Me.tbUSTV.Text = "USTV" Me.tbUSTV.UseVisualStyleBackColor = True @@ -1979,7 +1950,7 @@ Partial Class frmKundenblatt Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrUSTV.Name = "tbcntrUSTV" Me.tbcntrUSTV.SelectedIndex = 0 - Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 1084) + Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 897) Me.tbcntrUSTV.TabIndex = 1 ' 'tbUSTVDokumente @@ -1992,7 +1963,7 @@ Partial Class frmKundenblatt Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten) Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22) Me.tbUSTVDokumente.Name = "tbUSTVDokumente" - Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 1058) + Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 871) Me.tbUSTVDokumente.TabIndex = 8 Me.tbUSTVDokumente.Text = "Dokumente" Me.tbUSTVDokumente.UseVisualStyleBackColor = True @@ -2090,11 +2061,19 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22) Me.tbUSTVAntrage.Name = "tbUSTVAntrage" Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3) - Me.tbUSTVAntrage.Size = New System.Drawing.Size(1622, 1058) + Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45) Me.tbUSTVAntrage.TabIndex = 9 Me.tbUSTVAntrage.Text = "USTV-Anträge" Me.tbUSTVAntrage.UseVisualStyleBackColor = True ' + 'UsrCntlUSTV + ' + Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlUSTV.Name = "UsrCntlUSTV" + Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39) + Me.UsrCntlUSTV.TabIndex = 0 + ' 'cntxtExcel ' Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -2371,68 +2350,13 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' - 'UsrcntlKundeBearbeitenFull1 - ' - Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White - Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 1078) - Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 - ' - 'usrcntlKarten - ' - Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default - Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1610, 1046) - Me.usrcntlKarten.TabIndex = 0 - ' - 'UsrCntlLKW1 - ' - Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White - Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0) - Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 1000) - Me.UsrCntlLKW1.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 1084) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrCntlUSTV - ' - Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlUSTV.Name = "UsrCntlUSTV" - Me.UsrCntlUSTV.Size = New System.Drawing.Size(1616, 1052) - Me.UsrCntlUSTV.TabIndex = 0 - ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White -<<<<<<< HEAD - Me.ClientSize = New System.Drawing.Size(1180, 1055) -======= - Me.ClientSize = New System.Drawing.Size(1180, 1242) ->>>>>>> 80e6330b0ab779c092e7d3cc6266b1601654630d + Me.ClientSize = New System.Drawing.Size(1180, 1072) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDLUPDATER/App.config b/SDLUPDATER/App.config index 910246ef..ade40453 100644 --- a/SDLUPDATER/App.config +++ b/SDLUPDATER/App.config @@ -1,9 +1,9 @@ - + - + - \ No newline at end of file + diff --git a/SDLUPDATER/My Project/Application.Designer.vb b/SDLUPDATER/My Project/Application.Designer.vb index 628f80f5..1c2d69b5 100644 --- a/SDLUPDATER/My Project/Application.Designer.vb +++ b/SDLUPDATER/My Project/Application.Designer.vb @@ -14,8 +14,8 @@ Option Explicit On Namespace My - 'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern - ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer. + 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten + ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. ' diff --git a/SDLUPDATER/My Project/Resources.Designer.vb b/SDLUPDATER/My Project/Resources.Designer.vb index a16039a7..343d659e 100644 --- a/SDLUPDATER/My Project/Resources.Designer.vb +++ b/SDLUPDATER/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/SDLUPDATER/My Project/Settings.Designer.vb b/SDLUPDATER/My Project/Settings.Designer.vb index 5469bc5f..97f3c0df 100644 --- a/SDLUPDATER/My Project/Settings.Designer.vb +++ b/SDLUPDATER/My Project/Settings.Designer.vb @@ -15,21 +15,21 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) -#Region "Funktion zum automatischen Speichern von My.Settings" +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/SDLUPDATER/SDLUPDATER.vbproj b/SDLUPDATER/SDLUPDATER.vbproj index 59b18e84..dad97429 100644 --- a/SDLUPDATER/SDLUPDATER.vbproj +++ b/SDLUPDATER/SDLUPDATER.vbproj @@ -11,8 +11,9 @@ SDLUPDATER 512 WindowsForms - v4.5 + v4.7 + false publish\ true Disk @@ -25,7 +26,6 @@ true 0 1.0.0.%2a - false false true @@ -95,6 +95,7 @@ True Application.myapp + True True diff --git a/SDLUPDATER/UPDATERfrm.vb b/SDLUPDATER/UPDATERfrm.vb index a9e06d0c..556b0c40 100644 --- a/SDLUPDATER/UPDATERfrm.vb +++ b/SDLUPDATER/UPDATERfrm.vb @@ -1,5 +1,7 @@ -Public Class UPDATERfrm +Imports VERAG_PROG_ALLGEMEIN +Public Class UPDATERfrm + Dim CopyIncremental = True Private Sub UPDATERfrm_Load(sender As Object, e As EventArgs) Handles Me.Load End Sub @@ -17,15 +19,26 @@ ' Dim F As String = "\\192.168.0.90\f\Programme\SDL\" 'DEVELOPER ' Dim F As String = "\\172.16.0.99\Daten\Programme\SDL\" ' ATILLA Public Sub Main() + + Dim PARAM = "" + Dim parameter() As String = Environment.GetCommandLineArgs().ToArray + If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist + PARAM = parameter(1) + End If + + If PARAM = "full" Then + CopyIncremental = False + End If + 'Falls Settings existiert, wird der Pfad daraus verwendet. F = System.IO.File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory & "SDLUPDATER_Settings.txt") If Not System.IO.Directory.Exists(F) Then MsgBox("ERROR_UPDATE_05: Es konnte keine Verbindung mit dem F:\ Laufwerk hergestellt werden." & vbNewLine & "Wenn Sie eine Remote-Sitzung verwenden, melden Sie sich mit dieser erneut an.", MsgBoxStyle.Critical, "ERROR") Environment.Exit(0) End If - writeLine(richtextbox, "3 Sekunden warten, um sicherzustellen, dass das Programm beendet wurde...") + writeLine(RichTextBox, "3 Sekunden warten, um sicherzustellen, dass das Programm beendet wurde...") Threading.Thread.Sleep(3000) 'Falls Programm gerade am Beenden - writeLine(richtextbox, "Starte Update...") + writeLine(RichTextBox, "Starte Update...") ' If Not My.Computer.FileSystem.DirectoryExists(F) Then 'MsgBox("ERROR_UPDATE_02: Update-Daten existieren nicht.", MsgBoxStyle.Critical, "ERROR") ' Else @@ -37,16 +50,22 @@ MsgBox("ERROR_UPDATE_06: SDL.exe konnte nicht gelöscht werden. Das Programm wird evtl. noch ausgeführt.", MsgBoxStyle.Critical, "ERROR") Environment.Exit(0) End If - delFiles() - FileCopier() + + If CopyIncremental Then 'CopyIncremental + cProgrammeUpdate.copyProgramLIST(F, AppDomain.CurrentDomain.BaseDirectory, {"SDLUPDATER", "NOT_DEL_"}) + Else + delFiles() + FileCopier() + End If + If Not System.IO.File.Exists(AppDomain.CurrentDomain.BaseDirectory & "SDL.exe") Then MsgBox("ERROR_UPDATE_03: SDL.exe konnte nicht gestartet werden.", MsgBoxStyle.Critical, "ERROR") End If - If Not System.IO.File.Exists(AppDomain.CurrentDomain.BaseDirectory & "upd.tmp") Then + If Not System.IO.File.Exists(AppDomain.CurrentDomain.BaseDirectory & "upd.tmp") Then ' System.IO.File.Create(AppDomain.CurrentDomain.BaseDirectory & "upd.tmp") End If - writeLine(richtextbox, "Erfolgreich abgeschlossen...") + writeLine(RichTextBox, "Erfolgreich abgeschlossen...") Process.Start("SDL.exe") Environment.Exit(0) End If @@ -196,13 +215,13 @@ ' Quelldatei ' Using nutzen - fsmsource = New IO.FileStream(SourceFile.FullName, _ - IO.FileMode.Open, _ + fsmsource = New IO.FileStream(SourceFile.FullName, + IO.FileMode.Open, IO.FileAccess.Read, IO.FileShare.Read) ' Zieldatei - fsmtarget = New IO.FileStream(IO.Path.Combine(TargetDir, _ - SourceFile.Name), _ + fsmtarget = New IO.FileStream(IO.Path.Combine(TargetDir, + SourceFile.Name), IO.FileMode.OpenOrCreate, IO.FileAccess.Write) ' Daten nach und nach einlesen und im Zielstream wieder