diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb index 033b774..bf8744b 100644 --- a/Global_Indexer/frmIndex.designer.vb +++ b/Global_Indexer/frmIndex.designer.vb @@ -66,6 +66,8 @@ Partial Class frmIndex Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -127,9 +129,9 @@ Partial Class frmIndex 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarToggleSwitchItem1, Me.BarToggleSwitchItem2, Me.checkItemTopMost, Me.checkItemDeleteSource, Me.checkItemPreselection, Me.labelError, Me.BarStaticItem1, Me.BarStaticItem2, Me.labelFilePath, Me.checkItemPreview, Me.labelNotice, Me.BarListItem1, Me.BarStaticItem4, Me.BarButtonItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarToggleSwitchItem1, Me.BarToggleSwitchItem2, Me.checkItemTopMost, Me.checkItemDeleteSource, Me.checkItemPreselection, Me.labelError, Me.BarStaticItem1, Me.BarStaticItem2, Me.labelFilePath, Me.checkItemPreview, Me.labelNotice, Me.BarListItem1, Me.BarStaticItem4, Me.BarButtonItem1, Me.BarButtonItem2}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 22 + Me.RibbonControl1.MaxItemId = 23 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -236,7 +238,7 @@ Partial Class frmIndex ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup2, Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -355,6 +357,18 @@ Partial Class frmIndex Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 22 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'frmIndex ' Me.Appearance.Options.UseFont = True @@ -429,4 +443,6 @@ Partial Class frmIndex Friend WithEvents ComboboxDoctype As DevExpress.XtraEditors.SearchLookUpEdit Friend WithEvents SearchLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index a6902e7..9c3b4c0 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -136,7 +136,7 @@ 0, 30 - 636, 431 + 636, 433 8 @@ -387,6 +387,9 @@ Zz4L + + BarButtonItem2 + 0, 0 @@ -396,6 +399,9 @@ Fenster + + RibbonPageGroup1 + Start @@ -403,10 +409,10 @@ 1076, 158 - 0, 675 + 0, 677 - 1076, 24 + 1076, 22 RibbonStatusBar1 @@ -439,7 +445,7 @@ Multi-Indexing - Alle nachfolgenden Dateien (0) identisch indexieren - 441, 20 + 441, 18 12 @@ -507,7 +513,7 @@ Bottom - 0, 461 + 0, 463 2, 3, 2, 3 @@ -619,7 +625,7 @@ 3, 4, 3, 4 - 436, 517 + 436, 519 0 @@ -628,7 +634,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.4.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.7.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 @@ -649,7 +655,7 @@ 1 - 1076, 517 + 1076, 519 636 @@ -885,6 +891,18 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmIndex diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 94047b6..c8692b2 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -69,7 +69,7 @@ Public Class frmIndex End If _Logger.Warn(oMessage) - _Logger.Error(Exception.Message) + _Logger.Error(Exception) MsgBox(oMessage, MsgBoxStyle.Critical, Text) End Sub @@ -84,6 +84,28 @@ Public Class frmIndex Localizer.Active = New LookupGridLocalizer() End Sub + Public Sub CloseViewer() + If DocumentViewer1 Is Nothing Then + LOGGER.Warn("DocumentViewer is already closed!") + End If + + Try + LOGGER.Debug("Calling CloseDocument on Viewer") + DocumentViewer1.CloseDocument() + Catch ex As Exception + LOGGER.Warn("Calling CloseDocument on Viewer FAILED") + LOGGER.Error(ex) + End Try + + Try + LOGGER.Debug("Calling Done on Viewer") + DocumentViewer1?.Done() + Catch ex As Exception + LOGGER.Warn("Calling Done on Viewer FAILED") + LOGGER.Error(ex) + End Try + End Sub + Public Sub DisposeViewer() DocumentViewer1.Dispose() End Sub @@ -1496,9 +1518,8 @@ Public Class frmIndex Try INDEXING_ACTIVE = False + CloseViewer() - DocumentViewer1.CloseDocument() - DocumentViewer1.Done() ClassWindowLocation.SaveFormLocationSize(Me) My.Settings.Save() Catch ex As Exception @@ -1515,8 +1536,7 @@ Public Class frmIndex Try INDEXING_ACTIVE = False - DocumentViewer1.CloseDocument() - DocumentViewer1.Done() + CloseViewer() ClassWindowLocation.SaveFormLocationSize(Me) My.Settings.Save() Catch ex As Exception @@ -1527,6 +1547,9 @@ Public Class frmIndex INDEXING_ACTIVE = False End If End Sub + + + Private Sub frmIndex_Load(sender As Object, e As System.EventArgs) Handles Me.Load ' Abbruchzähler zurücksetzen CancelAttempts = 0 @@ -2249,7 +2272,7 @@ Public Class frmIndex Sub PreviewFile() Try - DocumentViewer1.LoadFile(CURRENT_WORKFILE) + 'DocumentViewer1.LoadFile(CURRENT_WORKFILE) Catch ex As Exception ShowErrorMessage(ex, "PreviewFile") End Try @@ -2290,11 +2313,6 @@ Public Class frmIndex 'Den Zielnamen zusammenbauen If Name_Generieren() = True Then - 'Dokumentenviewer ausblenden um keinen Zugriffsfehler zu produzieren - DocumentViewer1.Done() - DocumentViewer1.CloseDocument() - - _Logger.Debug(" ...Viewer geschlossen") 'Die Datei verschieben If Move_File2_Target() = True Then _Logger.Debug(" ...Move_File2_Target durchlaufen") @@ -2303,10 +2321,15 @@ Public Class frmIndex Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID DATABASE_ECM.ExecuteNonQuery(oDEL) + 'Dokumentenviewer ausblenden um keinen Zugriffsfehler zu produzieren + CloseViewer() + _Logger.Debug(" ...Viewer geschlossen") + If CURR_DELETE_ORIGIN = True Then _Logger.Info("Datei [" & CURRENT_WORKFILE & "] wird gelöscht.") Try - System.IO.File.Delete(CURRENT_WORKFILE) + File.SetAttributes(CURRENT_WORKFILE, FileAttributes.Normal) + File.Delete(CURRENT_WORKFILE) Catch ex As Exception _Logger.Error(ex) End Try @@ -2777,8 +2800,7 @@ Public Class frmIndex MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success") End If - DocumentViewer1.CloseDocument() - DocumentViewer1.Done() + CloseViewer() CancelAttempts = 2 Me.Close() @@ -2796,8 +2818,7 @@ Public Class frmIndex End If End If - DocumentViewer1.CloseDocument() - DocumentViewer1.Done() + CloseViewer() CancelAttempts = 2 Me.Close() @@ -2852,7 +2873,18 @@ Public Class frmIndex CONFIG.Save() End Sub - Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Try + MsgBox($"Deleting [{CURRENT_WORKFILE}]", MsgBoxStyle.Information, Text) + + File.SetAttributes(CURRENT_WORKFILE, FileAttributes.Normal) + File.Delete(CURRENT_WORKFILE) + + 'IO.File.Delete(CURRENT_WORKFILE) + Catch ex As Exception + _Logger.Error(ex) + MsgBox(ex.Message) + End Try End Sub End Class diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 3a83bbe..fff3444 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -25,7 +25,14 @@ Partial Class frmStart Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart)) Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() + Me.KonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() + Me.GrundeinstellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.HistoryIndexierteDateienToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.tslblFW = New System.Windows.Forms.ToolStripStatusLabel() Me.TimerFolderWatch = New System.Windows.Forms.Timer(Me.components) Me.TimerClose3Minutes = New System.Windows.Forms.Timer(Me.components) Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) @@ -39,13 +46,7 @@ Partial Class frmStart Me.MyDataset = New Global_Indexer.MyDataset() Me.TableAdapterManager = New Global_Indexer.MyDatasetTableAdapters.TableAdapterManager() Me.btnChoosefiles = New System.Windows.Forms.Button() - Me.KonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.GrundeinstellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.HistoryIndexierteDateienToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.tslblFW = New System.Windows.Forms.ToolStripStatusLabel() + Me.TimerCheckDroppedFiles = New System.Windows.Forms.Timer(Me.components) Me.MenuStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,6 +58,40 @@ Partial Class frmStart resources.ApplyResources(Me.MenuStrip1, "MenuStrip1") Me.MenuStrip1.Name = "MenuStrip1" ' + 'KonfigurationToolStripMenuItem + ' + Me.KonfigurationToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.KonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator1, Me.GrundeinstellungenToolStripMenuItem, Me.HistoryIndexierteDateienToolStripMenuItem, Me.InfoToolStripMenuItem}) + Me.KonfigurationToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.gear_32xLG + Me.KonfigurationToolStripMenuItem.Name = "KonfigurationToolStripMenuItem" + resources.ApplyResources(Me.KonfigurationToolStripMenuItem, "KonfigurationToolStripMenuItem") + ' + 'AdministrationToolStripMenuItem + ' + Me.AdministrationToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.Einstellungen6 + Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem" + resources.ApplyResources(Me.AdministrationToolStripMenuItem, "AdministrationToolStripMenuItem") + ' + 'ToolStripSeparator1 + ' + Me.ToolStripSeparator1.Name = "ToolStripSeparator1" + resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") + ' + 'GrundeinstellungenToolStripMenuItem + ' + Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem" + resources.ApplyResources(Me.GrundeinstellungenToolStripMenuItem, "GrundeinstellungenToolStripMenuItem") + ' + 'HistoryIndexierteDateienToolStripMenuItem + ' + Me.HistoryIndexierteDateienToolStripMenuItem.Name = "HistoryIndexierteDateienToolStripMenuItem" + resources.ApplyResources(Me.HistoryIndexierteDateienToolStripMenuItem, "HistoryIndexierteDateienToolStripMenuItem") + ' + 'InfoToolStripMenuItem + ' + Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem" + resources.ApplyResources(Me.InfoToolStripMenuItem, "InfoToolStripMenuItem") + ' 'StatusStrip1 ' Me.StatusStrip1.AllowDrop = True @@ -65,6 +100,13 @@ Partial Class frmStart Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.SizingGrip = False ' + 'tslblFW + ' + Me.tslblFW.BackColor = System.Drawing.SystemColors.Control + Me.tslblFW.Image = Global.Global_Indexer.My.Resources.Resources.bell_go + Me.tslblFW.Name = "tslblFW" + resources.ApplyResources(Me.tslblFW, "tslblFW") + ' 'TimerFolderWatch ' Me.TimerFolderWatch.Interval = 2000 @@ -148,47 +190,6 @@ Partial Class frmStart Me.btnChoosefiles.Name = "btnChoosefiles" Me.btnChoosefiles.UseVisualStyleBackColor = True ' - 'KonfigurationToolStripMenuItem - ' - Me.KonfigurationToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.KonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator1, Me.GrundeinstellungenToolStripMenuItem, Me.HistoryIndexierteDateienToolStripMenuItem, Me.InfoToolStripMenuItem}) - Me.KonfigurationToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.gear_32xLG - Me.KonfigurationToolStripMenuItem.Name = "KonfigurationToolStripMenuItem" - resources.ApplyResources(Me.KonfigurationToolStripMenuItem, "KonfigurationToolStripMenuItem") - ' - 'AdministrationToolStripMenuItem - ' - Me.AdministrationToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.Einstellungen6 - Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem" - resources.ApplyResources(Me.AdministrationToolStripMenuItem, "AdministrationToolStripMenuItem") - ' - 'ToolStripSeparator1 - ' - Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") - ' - 'GrundeinstellungenToolStripMenuItem - ' - Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem" - resources.ApplyResources(Me.GrundeinstellungenToolStripMenuItem, "GrundeinstellungenToolStripMenuItem") - ' - 'HistoryIndexierteDateienToolStripMenuItem - ' - Me.HistoryIndexierteDateienToolStripMenuItem.Name = "HistoryIndexierteDateienToolStripMenuItem" - resources.ApplyResources(Me.HistoryIndexierteDateienToolStripMenuItem, "HistoryIndexierteDateienToolStripMenuItem") - ' - 'InfoToolStripMenuItem - ' - Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem" - resources.ApplyResources(Me.InfoToolStripMenuItem, "InfoToolStripMenuItem") - ' - 'tslblFW - ' - Me.tslblFW.BackColor = System.Drawing.SystemColors.Control - Me.tslblFW.Image = Global.Global_Indexer.My.Resources.Resources.bell_go - Me.tslblFW.Name = "tslblFW" - resources.ApplyResources(Me.tslblFW, "tslblFW") - ' 'frmStart ' Me.AllowDrop = True @@ -235,4 +236,5 @@ Partial Class frmStart Friend WithEvents LabelLoggedIn As DevExpress.XtraBars.BarStaticItem Friend WithEvents LabelVersion As DevExpress.XtraBars.BarStaticItem Friend WithEvents RibbonMiniToolbar1 As DevExpress.XtraBars.Ribbon.RibbonMiniToolbar + Friend WithEvents TimerCheckDroppedFiles As Timer End Class diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 0607663..59a6f6b 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -612,6 +612,9 @@ 0 + + 132, 56 + True @@ -878,9 +881,6 @@ //A= - - NoControl - 310, 200 @@ -890,6 +890,48 @@ File Flow + + KonfigurationToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AdministrationToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GrundeinstellungenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + HistoryIndexierteDateienToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InfoToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tslblFW + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TimerFolderWatch @@ -956,47 +998,11 @@ Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - KonfigurationToolStripMenuItem + + TimerCheckDroppedFiles - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - AdministrationToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GrundeinstellungenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - HistoryIndexierteDateienToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - InfoToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tslblFW - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 frmStart diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index e296718..b3c1606 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -15,6 +15,7 @@ Public Class frmStart Private IndexForm As frmIndex Private FileDrop As FileDrop + Private DroppedFiles As List(Of FileDrop.DroppedFile) 'Private DroppedFiles As List(Of FileDrop.DroppedFile) @@ -167,15 +168,16 @@ Public Class frmStart 'Erstmal alles löschen DATABASE_ECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") - Dim oDroppedFiles = FileDrop.GetFiles(e) - If oDroppedFiles.Count > 0 Then - Check_Dropped_Files(oDroppedFiles) + ' This timer prevents the cursor from hanging because all of the remaing functions will be called in the timer thread + DroppedFiles = FileDrop.GetFiles(e) + If DroppedFiles.Count > 0 Then + TimerCheckDroppedFiles.Start() End If + End Sub - ' TODO: REMOVE - 'If ClassFileDrop.Drop_File(e) = True Then - ' TimerCheckDroppedFiles.Start() - 'End If + Private Sub TimerCheckDroppedFiles_Tick(sender As Object, e As EventArgs) Handles TimerCheckDroppedFiles.Tick + TimerCheckDroppedFiles.Stop() + Check_Dropped_Files(DroppedFiles) End Sub Sub Drag_Enter(sender As Object, e As DragEventArgs) @@ -209,19 +211,6 @@ Public Class frmStart End If Next - 'For Each oFiledropString As String In ClassFileDrop.FilesDropped - ' If oFiledropString IsNot Nothing Then - ' LOGGER.Info(">> Check Drop-File: " & oFiledropString.ToString) - ' Dim oLastPipe = oFiledropString.LastIndexOf("|") - ' Dim oHandleType As String = oFiledropString.Substring(0, oLastPipe + 1) - ' Dim oFilename As String = oFiledropString.Substring(oLastPipe + 1) - - ' If ClassIndexFunctions.CheckDuplicateFiles(oFilename, "Manuelle Ablage", oHandleType) Then - ' ClassFilehandle.Decide_FileHandle(oFilename, oHandleType) - ' End If - ' End If - 'Next - Dim sql As String = $"SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')" DTACTUAL_FILES = Nothing DTACTUAL_FILES = DATABASE_ECM.GetDatatable(sql) @@ -291,11 +280,6 @@ Public Class frmStart End Try End Sub - 'Private Sub TimerCheckDroppedFiles_Tick(sender As Object, e As EventArgs) Handles TimerCheckDroppedFiles.Tick - ' TimerCheckDroppedFiles.Stop() - ' Check_Dropped_Files() - 'End Sub - Private Sub btnChoosefiles_Click(sender As Object, e As EventArgs) Handles btnChoosefiles.Click Try Dim oFileName As String