From 4928d841fa81e4c58c6ad246da61a3d187f7e7c8 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 14 Aug 2017 10:18:04 +0200 Subject: [PATCH] ms --- Global_Indexer/frmAdministration.resx | 80 +- Global_Indexer/frmConfig_Basic.designer.vb | 15 +- Global_Indexer/frmConfig_Basic.resx | 895 ++++++++++++++------- Global_Indexer/frmConfig_Basic.vb | 8 + Global_Indexer/frmIndex.vb | 5 +- Global_Indexer/frmStart.vb | 2 +- 6 files changed, 676 insertions(+), 329 deletions(-) diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 0f75ee5..f31e1b4 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -825,7 +825,7 @@ 87, 35 - 56, 13 + 55, 13 5 @@ -1320,7 +1320,7 @@ 3, 98 - 122, 17 + 121, 17 9 @@ -2587,7 +2587,7 @@ GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage1 @@ -3448,7 +3448,7 @@ der Datei XtraTabPage3 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -4230,7 +4230,7 @@ der Datei XtraTabPage6 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -4983,7 +4983,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage4 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -5232,7 +5232,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage9 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -5610,7 +5610,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage10 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl2 @@ -5622,7 +5622,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabControl2 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage1 @@ -6398,7 +6398,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage1 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -6476,7 +6476,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei GridControl2 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage2 @@ -6818,7 +6818,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage7 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl3 @@ -7252,7 +7252,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage8 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl3 @@ -7264,7 +7264,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabControl3 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage2 @@ -7869,7 +7869,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage2 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -8478,7 +8478,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPage5 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -8490,7 +8490,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabControl1 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a $this @@ -8625,19 +8625,19 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei MyDataset - Global_Indexer.MyDataset, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null GridView1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colBEZEICHNUNG - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TBDD_INDEX_MANBindingSource @@ -9027,25 +9027,25 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei GridView2 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colUSERNAME - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colNAME - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colEMAIL - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a VWGI_USER_GROUPS_RELATIONBindingSource @@ -9237,85 +9237,85 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei TBDD_DOKUMENTARTTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_DOKUMENTARTTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_DOKUMENTARTTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_EINGANGSARTENTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_EINGANGSARTENTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_EINGANGSARTENTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_DOKART_MODULETableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_DOKART_MODULETableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_DOKART_MODULETableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_MODULESTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_MODULESTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_MODULESTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_INDEX_MANTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MANTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MANTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_USERTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_USERTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_USERTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBGI_CONFIGURATIONTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBGI_CONFIGURATIONTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBGI_CONFIGURATIONTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_INDEX_AUTOMTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_AUTOMTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_AUTOMTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBWHDD_INDEX_MANTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBWHDD_INDEX_MANTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBWHDD_INDEX_MANTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_USER_GROUPSTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_USER_GROUPSTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_USER_GROUPSTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null VWGI_USER_GROUPS_RELATIONTableAdapter - Global_Indexer.MyDatasetTableAdapters.VWGI_USER_GROUPS_RELATIONTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.VWGI_USER_GROUPS_RELATIONTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_GROUPS_USERBindingSource @@ -9327,13 +9327,13 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei TBDD_GROUPS_USERTableAdapter - Global_Indexer.MyDatasetTableAdapters.TBDD_GROUPS_USERTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.TBDD_GROUPS_USERTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null VWGI_DOCTYPE_GROUPTableAdapter - Global_Indexer.MyDatasetTableAdapters.VWGI_DOCTYPE_GROUPTableAdapter, MyDataset.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + Global_Indexer.MyDatasetTableAdapters.VWGI_DOCTYPE_GROUPTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null frmAdministration diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb index 26e8bf5..f1c20cc 100644 --- a/Global_Indexer/frmConfig_Basic.designer.vb +++ b/Global_Indexer/frmConfig_Basic.designer.vb @@ -22,8 +22,8 @@ Partial Class frmConfig_Basic 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic)) - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.chkbxUserAut = New System.Windows.Forms.CheckBox() @@ -67,6 +67,7 @@ Partial Class frmConfig_Basic Me.btnstartstop2 = New System.Windows.Forms.Button() Me.btnstartstop1 = New System.Windows.Forms.Button() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() + Me.chkdelete_origin = New System.Windows.Forms.CheckBox() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -173,6 +174,7 @@ Partial Class frmConfig_Basic ' 'TabPage2 ' + Me.TabPage2.Controls.Add(Me.chkdelete_origin) Me.TabPage2.Controls.Add(Me.LinkLabel1) Me.TabPage2.Controls.Add(Me.Button3) Me.TabPage2.Controls.Add(Me.cmbLanguage) @@ -300,8 +302,8 @@ Partial Class frmConfig_Basic ' 'DataGridView1 ' - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua - Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua + Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 resources.ApplyResources(Me.DataGridView1, "DataGridView1") Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView1.Name = "DataGridView1" @@ -377,6 +379,12 @@ Partial Class frmConfig_Basic ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" ' + 'chkdelete_origin + ' + resources.ApplyResources(Me.chkdelete_origin, "chkdelete_origin") + Me.chkdelete_origin.Name = "chkdelete_origin" + Me.chkdelete_origin.UseVisualStyleBackColor = True + ' 'frmConfig_Basic ' resources.ApplyResources(Me, "$this") @@ -439,4 +447,5 @@ Partial Class frmConfig_Basic Friend WithEvents Label9 As System.Windows.Forms.Label Friend WithEvents Button3 As System.Windows.Forms.Button Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel + Friend WithEvents chkdelete_origin As CheckBox End Class diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx index bad0dfb..9f0557c 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -117,23 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - - 255, 58 - - - 170, 17 - - - 47 - - - Windows-Authentifizierung - chkbxUserAut @@ -146,21 +129,6 @@ 0 - - True - - - 5, 115 - - - 150, 13 - - - 46 - - - Aktueller ConnectionString: - Label5 @@ -173,15 +141,6 @@ 1 - - 8, 78 - - - 244, 21 - - - 39 - cmbDatenbank @@ -194,21 +153,6 @@ 2 - - True - - - 5, 62 - - - 67, 13 - - - 44 - - - Datenbank: - Label4 @@ -221,21 +165,6 @@ 3 - - True - - - 5, 14 - - - 74, 13 - - - 41 - - - Server-Name: - Label1 @@ -248,21 +177,6 @@ 4 - - True - - - 255, 14 - - - 84, 13 - - - 42 - - - Benutzername: - Label2 @@ -275,21 +189,6 @@ 5 - - True - - - 379, 14 - - - 56, 13 - - - 43 - - - Passwort: - Label3 @@ -302,19 +201,6 @@ 6 - - - Top, Left, Right - - - 8, 131 - - - 370, 22 - - - 45 - txtActualConnection @@ -327,15 +213,6 @@ 7 - - 6, 30 - - - 246, 22 - - - 36 - txtServer @@ -348,15 +225,6 @@ 8 - - 255, 30 - - - 118, 22 - - - 37 - txtUser @@ -369,15 +237,6 @@ 9 - - 382, 30 - - - 64, 22 - - - 38 - txtPasswort @@ -390,24 +249,6 @@ 10 - - MiddleLeft - - - 255, 75 - - - 253, 25 - - - 40 - - - Verbindung zur Datenbank herstellen - - - MiddleRight - BtnConnect @@ -420,15 +261,18 @@ 11 + 4, 22 + 3, 3, 3, 3 582, 280 + 0 @@ -447,11 +291,38 @@ 0 + + True + + + 11, 79 + + + 202, 17 + + + 46 + + + Dateien nach Indexierung löschen + + + chkdelete_origin + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + True - 224, 223 + 224, 236 153, 13 @@ -472,10 +343,10 @@ TabPage2 - 0 + 1 - 197, 140 + 197, 153 134, 23 @@ -496,7 +367,7 @@ TabPage2 - 1 + 2 German @@ -505,7 +376,7 @@ English - 11, 142 + 11, 155 180, 21 @@ -523,13 +394,13 @@ TabPage2 - 2 + 3 True - 8, 126 + 8, 139 96, 13 @@ -550,7 +421,7 @@ TabPage2 - 3 + 4 True @@ -577,13 +448,13 @@ TabPage2 - 4 + 5 True - 242, 89 + 242, 102 230, 30 @@ -605,13 +476,13 @@ TabPage2 - 5 + 6 True - 11, 96 + 11, 109 146, 17 @@ -632,7 +503,7 @@ TabPage2 - 6 + 7 478, 26 @@ -656,7 +527,7 @@ TabPage2 - 7 + 8 11, 28 @@ -677,7 +548,7 @@ TabPage2 - 8 + 9 True @@ -704,13 +575,13 @@ TabPage2 - 9 + 10 MiddleLeft - 11, 216 + 11, 229 180, 26 @@ -734,13 +605,13 @@ TabPage2 - 10 + 11 MiddleLeft - 11, 185 + 11, 198 180, 23 @@ -764,7 +635,7 @@ TabPage2 - 11 + 12 MiddleLeft @@ -773,7 +644,7 @@ NoControl - 197, 185 + 197, 198 180, 23 @@ -797,7 +668,7 @@ TabPage2 - 12 + 13 4, 22 @@ -826,22 +697,6 @@ 1 - - True - - - 8, 197 - - - 453, 26 - - - 13 - - - Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung -ausgenommen werden sollen: - Label8 @@ -854,18 +709,6 @@ ausgenommen werden sollen: 0 - - Top, Bottom, Left - - - 11, 226 - - - 192, 100 - - - 11 - DataGridView1 @@ -878,18 +721,6 @@ ausgenommen werden sollen: 1 - - 495, 140 - - - 49, 22 - - - 10 - - - ... - Button2 @@ -902,15 +733,6 @@ ausgenommen werden sollen: 2 - - 11, 142 - - - 478, 22 - - - 8 - txtScanFolderWatch @@ -923,9 +745,565 @@ ausgenommen werden sollen: 3 - - True - + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 4 + + + btnsetFW_Folder + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 5 + + + btnFW_OwnFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 6 + + + btnFW_Desktop + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 7 + + + txtFolderWatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 9 + + + btnSaveExclusionFiles + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 10 + + + btnstartstop2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 11 + + + btnstartstop1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 12 + + + 4, 22 + + + 3, 3, 3, 3 + + + 582, 280 + + + 2 + + + Überwachte Ordner - Folderwatch + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 590, 306 + + + 0 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 255, 58 + + + 170, 17 + + + 47 + + + Windows-Authentifizierung + + + chkbxUserAut + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 0 + + + True + + + 5, 115 + + + 150, 13 + + + 46 + + + Aktueller ConnectionString: + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 1 + + + 8, 78 + + + 244, 21 + + + 39 + + + cmbDatenbank + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 2 + + + True + + + 5, 62 + + + 67, 13 + + + 44 + + + Datenbank: + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 3 + + + True + + + 5, 14 + + + 74, 13 + + + 41 + + + Server-Name: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 4 + + + True + + + 255, 14 + + + 84, 13 + + + 42 + + + Benutzername: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 5 + + + True + + + 379, 14 + + + 56, 13 + + + 43 + + + Passwort: + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 6 + + + Top, Left, Right + + + 8, 131 + + + 370, 22 + + + 45 + + + txtActualConnection + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 7 + + + 6, 30 + + + 246, 22 + + + 36 + + + txtServer + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 8 + + + 255, 30 + + + 118, 22 + + + 37 + + + txtUser + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 9 + + + 382, 30 + + + 64, 22 + + + 38 + + + txtPasswort + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 10 + + + MiddleLeft + + + 255, 75 + + + 253, 25 + + + 40 + + + Verbindung zur Datenbank herstellen + + + MiddleRight + + + BtnConnect + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 11 + + + True + + + 8, 197 + + + 453, 26 + + + 13 + + + Definieren Sie hier Inhalte von Dateinamen welche von der Folderwatch-Überwachung +ausgenommen werden sollen: + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 0 + + + Top, Bottom, Left + + + 11, 226 + + + 192, 100 + + + 11 + + + DataGridView1 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + 495, 140 + + + 49, 22 + + + 10 + + + ... + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 2 + + + 11, 142 + + + 478, 22 + + + 8 + + + txtScanFolderWatch + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 3 + + + True + 8, 126 @@ -1166,57 +1544,6 @@ ausgenommen werden sollen: 12 - - 4, 22 - - - 3, 3, 3, 3 - - - 582, 280 - - - 2 - - - Überwachte Ordner - Folderwatch - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - Fill - - - 0, 0 - - - 590, 306 - - - 0 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - 17, 17 diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index cd1432b..30913e2 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -173,6 +173,7 @@ Public Class frmConfig_Basic Else cmbLanguage.SelectedIndex = 1 End If + chkdelete_origin.Checked = CURR_DELETE_ORIGIN Case 2 If ERROR_STATE = "NO DB-CONNECTION" Then MsgBox("Configurations only editable after Application started completely!", MsgBoxStyle.Exclamation) @@ -538,4 +539,11 @@ Public Class frmConfig_Basic ' Navigate to a URL. System.Diagnostics.Process.Start("http://www.didalog.de/Support") End Sub + + Private Sub chkdelete_origin_CheckedChanged(sender As Object, e As EventArgs) Handles chkdelete_origin.CheckedChanged + If CURR_DELETE_ORIGIN <> chkdelete_origin.Checked Then + CURR_DELETE_ORIGIN = chkdelete_origin.Checked + SaveConfigValue("Delete_OriginFile", CURR_DELETE_ORIGIN) + End If + End Sub End Class \ No newline at end of file diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 51914fa..32d2cdb 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -2351,7 +2351,10 @@ Public Class frmIndex End Function Sub DeleteFile() Try - If CURR_DELETE_ORIGIN = False Then Exit Sub + If CURR_DELETE_ORIGIN = False Then + If LogErrorsOnly = False Then ClassLogger.Add(">> DeleteFile - CURR_DELETE_ORIGIN = False", False) + Exit Sub + End If File.Delete(CURRENT_WORKFILE) Catch ex As Exception MsgBox("Unexpeted Error in Delete Current Workfile:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index ca049f3..971ce60 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -607,7 +607,7 @@ Public Class frmStart Private Sub TimerFolderWatch_Tick(sender As Object, e As EventArgs) Handles TimerFolderWatch.Tick Try - If FW_started = True Then + If FW_started = True Or FWSCAN_started = True Then 'Prüfen ob alle Files abgearbeitet wurden Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')" DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)