From 518e0369f320290d9a35a78b979b4db28904ec2e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 28 Jun 2021 11:26:04 +0200 Subject: [PATCH] Finish Revamp of frmIndexFileList --- Global_Indexer/Global_Indexer.vbproj | 1 + .../My Project/Resources.Designer.vb | 10 + Global_Indexer/My Project/Resources.resx | 65 +-- Global_Indexer/Resources/itemtypechecked.svg | 30 ++ Global_Indexer/frmIndexFileList.Designer.vb | 28 +- Global_Indexer/frmIndexFileList.en-US.resx | 31 +- Global_Indexer/frmIndexFileList.resx | 443 +++++++----------- Global_Indexer/frmIndexFileList.vb | 28 +- 8 files changed, 297 insertions(+), 339 deletions(-) create mode 100644 Global_Indexer/Resources/itemtypechecked.svg diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 5f14a97..2ea5064 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -766,6 +766,7 @@ + diff --git a/Global_Indexer/My Project/Resources.Designer.vb b/Global_Indexer/My Project/Resources.Designer.vb index b6f3f07..86517cd 100644 --- a/Global_Indexer/My Project/Resources.Designer.vb +++ b/Global_Indexer/My Project/Resources.Designer.vb @@ -500,6 +500,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property itemtypechecked() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("itemtypechecked", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/Global_Indexer/My Project/Resources.resx b/Global_Indexer/My Project/Resources.resx index 933873c..0f8d4ac 100644 --- a/Global_Indexer/My Project/Resources.resx +++ b/Global_Indexer/My Project/Resources.resx @@ -121,6 +121,9 @@ ..\Resources\arrow_back_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_Up_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,23 +145,14 @@ ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\action_add_16xLG1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\arrow_Forward_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,20 +184,32 @@ ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\trackingchanges_next.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Save_6530.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -223,24 +229,18 @@ ..\Resources\Einstellungen5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\bullet_arrow_top.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CheckOutforEdit_13187_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_save1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Shortcut_8169_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -262,6 +262,9 @@ ..\Resources\Selectallrowsfrom_tableA__294.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\handdrawn_arrow_left_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -271,8 +274,8 @@ ..\Resources\DD_Icons_ICO_GLOBIX_128.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\handdrawn_arrow_left_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\delete2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,13 +283,13 @@ ..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Save_6530.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Shortcut_8169_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\trackingchanges_next.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/Global_Indexer/Resources/itemtypechecked.svg b/Global_Indexer/Resources/itemtypechecked.svg new file mode 100644 index 0000000..6f8b142 --- /dev/null +++ b/Global_Indexer/Resources/itemtypechecked.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/frmIndexFileList.Designer.vb b/Global_Indexer/frmIndexFileList.Designer.vb index 8178660..1d3af99 100644 --- a/Global_Indexer/frmIndexFileList.Designer.vb +++ b/Global_Indexer/frmIndexFileList.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmIndexFileList Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmIndexFileList 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. '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(frmIndexFileList)) @@ -29,24 +29,23 @@ Partial Class frmIndexFileList Me.Label1 = New System.Windows.Forms.Label() Me.CheckedListBoxControl1 = New DevExpress.XtraEditors.CheckedListBoxControl() Me.Button1 = New System.Windows.Forms.Button() - Me.TBGI_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.MyDataset1 = New Global_Indexer.MyDataset() Me.TBGI_FILES_USERTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBGI_FILES_USERTableAdapter() Me.TableAdapterManager = New Global_Indexer.MyDatasetTableAdapters.TableAdapterManager() Me.Button2 = New System.Windows.Forms.Button() Me.btnstartIndex = New System.Windows.Forms.Button() - Me.btnCancel = New System.Windows.Forms.Button() + Me.TBGI_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.Panel1.SuspendLayout() CType(Me.CheckedListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBGI_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MyDataset1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBGI_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Panel1 ' - resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Controls.Add(Me.Label2) Me.Panel1.Controls.Add(Me.Label1) + resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Name = "Panel1" ' 'Label2 @@ -115,26 +114,18 @@ Partial Class frmIndexFileList Me.btnstartIndex.Name = "btnstartIndex" Me.btnstartIndex.UseVisualStyleBackColor = True ' - 'btnCancel - ' - resources.ApplyResources(Me.btnCancel, "btnCancel") - Me.btnCancel.Image = Global.Global_Indexer.My.Resources.Resources.cancel - Me.btnCancel.Name = "btnCancel" - Me.btnCancel.UseVisualStyleBackColor = True - ' 'frmIndexFileList ' - resources.ApplyResources(Me, "$this") Me.Appearance.Options.UseFont = True + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ControlBox = False Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.CheckedListBoxControl1) - Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnstartIndex) Me.Controls.Add(Me.Panel1) Me.IconOptions.Icon = CType(resources.GetObject("frmIndexFileList.IconOptions.Icon"), System.Drawing.Icon) + Me.IconOptions.SvgImage = Global.Global_Indexer.My.Resources.Resources.itemtypechecked Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmIndexFileList" @@ -142,8 +133,8 @@ Partial Class frmIndexFileList Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.CheckedListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBGI_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MyDataset1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBGI_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -158,5 +149,4 @@ Partial Class frmIndexFileList Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents Label2 As Label - Friend WithEvents btnCancel As Button End Class diff --git a/Global_Indexer/frmIndexFileList.en-US.resx b/Global_Indexer/frmIndexFileList.en-US.resx index d080080..459c6c9 100644 --- a/Global_Indexer/frmIndexFileList.en-US.resx +++ b/Global_Indexer/frmIndexFileList.en-US.resx @@ -122,21 +122,31 @@ 3, 40 - 277, 17 + 0, 17 - - You can prevent indexing the selected files. + + + False + + Fill + NoControl + + 0, 0 + + + 10, 10, 10, 10 + - 208, 17 + 647, 57 The following files will be indexed! - +You can prevent indexing by unchecking files. NoControl @@ -150,15 +160,15 @@ Select None + + Cancel + NoControl Start Indexing - - Cancel - AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA @@ -211,7 +221,10 @@ AADAAAAAgAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAcAAEL/AAD//wAA + + NoControl + - Files to index: + Select Files to Index \ No newline at end of file diff --git a/Global_Indexer/frmIndexFileList.resx b/Global_Indexer/frmIndexFileList.resx index 312378e..1eab9eb 100644 --- a/Global_Indexer/frmIndexFileList.resx +++ b/Global_Indexer/frmIndexFileList.resx @@ -117,266 +117,236 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + - - 647, 392 + + Segoe UI, 9.75pt, style=Bold - - $this + + + NoControl - - 128, 255, 128 + + 3, 31 - - btnCancel + + 0, 17 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 Label2 - - Segoe UI, 9pt, style=Bold - - - Button1 - - - 115, 36 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Panel1 - - frmIndexFileList + + 0 - - - 3 + + Fill - - 12, 344 + + Segoe UI, 9.75pt - - 1 + + 0, 0 - - Alle abwählen + + 10, 10, 10, 10 - - Segoe UI, 9.75pt, style=Bold + + 647, 57 - + 0 - - - AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA - AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA - AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAP///////wAA93d3d3d/AAD3d3d3 - d38AAPd////3fwAA93////d/AAD3f///938AD/d////3fwD3eH////d/D3Zn////93/3ZmZ///d3f/Z2 - Z2//93fw9/Zvf3d3fwD/9m//d3fwAPD2bw///wAAAP//AAAAAAAAAAAAAAAAAPAAAADwAAAA8AAAAPAA - AADwAAAA8AAAAOAAAADAAAAAgAAAAAAAAAAAAQAAAAMAAAAHAABCDwAAw/8AAP//AAAoAAAAEAAAACAA - AAABAAgAAAAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgCcUwAAvpBcAIaGhgCzs7MA8e/wAPTz - 9AD29vYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAICAgICAgICAgICAgAAAAACAEBAQEB - AQEBAQEIAAAAAAgBAQEBAQEBAQEBCAAAAAAIAQEGBgYGBgYBAQgAAAAACAEBBgYGBgYGAQEIAAAAAAgB - AQYGBgYGBgEBCAAAAAgIAQEGBgYGBgYBAQgAAAgDAwUBBgYGBgYGAQEIAAgDAgIDCAYGBgYGBgEBCAgD - AgICAgMIBgYGAQEBBAgIAgMCAgMCCAYGBgEBBAgACAMIAgIIAwgBAQEBBAgAAAgICAICCAgIAQEBBAgA - AAAIAAgCAggACAgICAgAAAAAAAAICAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAA8AAAAPAA - AADwAAAA8AAAAPAAAADgAAAAwAAAAIAAAAAAAAAAAAEAAAADAAAABwAAQg8AAMP/AAD//wAAKAAAABAA - AAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/9vb2//b2 - 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAPb2 - 9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2/wAAAAAAAAAAAAAAAAAA - AAD29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b29v8AAAAAAAAAAAAA - AAAAAAAA9vb2/0JCQv9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JCQv/29vb/AAAAAAAA - AAAAAAAA9vb2MPb29v9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JCQv9CQkL/9vb2/wAA - AAAAAAAA9vb2MPb29u/29vb/QkJC/0JCQv/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P9CQkL/QkJC//b2 - 9v8AAAAA9vb2MPb29u++kFz/vpBc/7Ozs/9CQkL/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/QkJC/0JC - Qv/29vb/9vb2MPb29u++kFz/nFMA/5xTAP++kFz/9vb2//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/0JC - Qv9CQkL/9vb2//b29u++kFz/nFMA/5xTAP+cUwD/nFMA/76QXP/08/T/8e/w//Hv8P/x7/D/QkJC/0JC - Qv9CQkL/hoaG//b29u/29vb/nFMA/76QXP+cUwD/nFMA/76QXP+cUwD/9vb2//Hv8P/x7/D/8e/w/0JC - Qv9CQkL/hoaG//b29u/29vYw9vb2/76QXP/29vb/nFMA/5xTAP/29vb/vpBc//b29v9CQkL/QkJC/0JC - Qv9CQkL/hoaG//b29u/29vYwAAAAAPb29v/29vbv9vb2/5xTAP+cUwD/9vb2//b29u/29vb/QkJC/0JC - Qv9CQkL/hoaG//b29u/29vYwAAAAAAAAAAD29vbv9vb2MPb29v+cUwD/nFMA//b29v/29vYw9vb2//b2 - 9v/29vb/9vb2//b29u/29vYwAAAAAAAAAAAAAAAA9vb2MAAAAAD29vb/9vb2//b29v/29vb/AAAAAPb2 - 9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAA8AAAAPAAAADwAAAA8AAAAOAA - AADAAAAAgAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAcAAEL/AAD//wAA - + + Folgende Dateien werden zur Indexierung angeboten! +Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhindern. - - TBGI_FILES_USERBindingSource + + Label1 - - 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + Panel1 - + 1 - - 128, 255, 128 + + Top - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - Label1 + + 647, 57 - - - Top, Bottom, Left, Right + + 0 - - Alle auswählen + + Panel1 - + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 4 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Bottom, Left, Right - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 63 - - MyDataset1 + + 647, 261 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 8 - - Button2 + + CheckedListBoxControl1 - - 2 + + DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 7, 15 + + $this - - Bottom, Right + + 2 - - Top + + Bottom, Left - - 5 + + 12, 344 - - TBGI_FILES_USERTableAdapter + + 115, 36 - - 490, 344 + + 1 - - TableAdapterManager + + Alle auswählen - - $this + + Button1 - - 0, 63 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this - - 115, 36 + + 1 - - Segoe UI, 9pt + + 240, 17 + + + 357, 17 + + + 574, 17 + + + Bottom, Left - - 145, 36 + + 133, 344 - - Folgende Dateien werden zur Indexierung angeboten! + + 115, 36 - - DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 6 - - 8 + + Alle abwählen - - Bottom, Left + + Button2 - - 0, 0 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Panel1 + + $this - - 133, 344 + + 0 - - NoControl + + Bottom, Right + + + Segoe UI, 9pt, style=Bold MiddleLeft - - 289, 344 - - - Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + 490, 344 - - Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhindern. + + 145, 36 - - NoControl + + 3 - - 195, 36 + + Starte Indexierung - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + MiddleRight - - $this + + btnstartIndex - - 3 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + $this - + 3 - - 3, 9 + + 17, 17 + + + True + + + 7, 15 - - Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + 647, 392 - - MiddleLeft + + Segoe UI, 9pt - + AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA @@ -428,106 +398,37 @@ AADAAAAAgAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAcAAEL/AAD//wAA - - 3, 31 - - - Segoe UI, 9.75pt - - - Panel1 - - - 647, 57 - - - True - - - True - - - Starte Indexierung - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Zu indexierende Dateien: + Zu indexierende Dateien auswählen - - 6 - - - CheckedListBoxControl1 - - - 326, 17 - - - Panel1 - - - 647, 261 - - - btnstartIndex + + MyDataset1 - - Segoe UI, 9pt, style=Bold + + Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - MiddleRight + + TBGI_FILES_USERTableAdapter Global_Indexer.MyDatasetTableAdapters.TBGI_FILES_USERTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Indexierung Abbrechen - - - 1 - - - test - - - Bottom, Left - - - Bottom, Right + + TableAdapterManager - - 522, 17 + + Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - $this + + TBGI_FILES_USERBindingSource - - $this + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + frmIndexFileList - - DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 357, 17 - - - 574, 17 - - - en-US - - - True - - - 240, 17 - - - 17, 17 - \ No newline at end of file diff --git a/Global_Indexer/frmIndexFileList.vb b/Global_Indexer/frmIndexFileList.vb index 42e2ea1..79c0243 100644 --- a/Global_Indexer/frmIndexFileList.vb +++ b/Global_Indexer/frmIndexFileList.vb @@ -6,18 +6,20 @@ Public Class frmIndexFileList Private Sub frmIndexFileList_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try Me.TBGI_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString - 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset1.TBGI_FILES_USER". Sie können sie bei Bedarf verschieben oder entfernen. Me.TBGI_FILES_USERTableAdapter.Fill(Me.MyDataset1.TBGI_FILES_USER, Environment.UserName) + If MyDataset1.TBGI_FILES_USER.Rows.Count > 0 Then CheckedListBoxControl1.DataSource = MyDataset1.TBGI_FILES_USER CheckedListBoxControl1.DisplayMember = MyDataset1.TBGI_FILES_USER.Columns("FILENAME_ONLY").ColumnName CheckedListBoxControl1.ValueMember = MyDataset1.TBGI_FILES_USER.Columns(0).ColumnName End If + CheckedListBoxControl1.CheckAll() + Catch ex As Exception + LOGGER.Error(ex) MsgBox("Error in Load Form: " & ex.Message, MsgBoxStyle.Critical) End Try - End Sub Private Sub btnstartIndex_Click(sender As Object, e As EventArgs) Handles btnstartIndex.Click @@ -26,8 +28,9 @@ Public Class frmIndexFileList Dim oRow = MyDataset1.TBGI_FILES_USER.Item(index) Dim oChecked = CheckedListBoxControl1.GetItemChecked(index) - Dim oFilePath = oRow.Item(1) + Dim oFilePath = oRow.Item("FILENAME2WORK") Dim oHandletype As String = oRow.Item("HANDLE_TYPE") + Dim oGuid = oRow.Item("GUID") If oChecked = False Then If oHandletype = "|MSGONLY|" Or oHandletype = "|ATTMNTEXTRACTED|" Then @@ -38,10 +41,11 @@ Public Class frmIndexFileList End Try End If - ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE GUID = " & oRow.Item(0), True) + ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE GUID = " & oGuid, True) End If Next Catch ex As Exception + LOGGER.Error(ex) MsgBox("Unexpected Error in Clear Multiple Documents: " & ex.Message, MsgBoxStyle.Critical) End Try @@ -61,14 +65,20 @@ Public Class frmIndexFileList CheckedListBoxControl1.Focus() End Sub - Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click - ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) - Close() - End Sub - Private Sub CheckedListBoxControl1_DrawItem(sender As Object, e As DevExpress.XtraEditors.ListBoxDrawItemEventArgs) Handles CheckedListBoxControl1.DrawItem If e.State = DrawItemState.Checked Then e.Appearance.BackColor = Color.LightGreen End If End Sub + + Private Sub frmIndexFileList_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + If DialogResult = DialogResult.Cancel Then + Try + ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) + Catch ex As Exception + MsgBox("Error while deleting User Files: " & ex.Message, MsgBoxStyle.Critical, Text) + LOGGER.Error(ex) + End Try + End If + End Sub End Class \ No newline at end of file