From 348d50a578eb0a326b7ddc4c67b048d619eaf34b Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 27 Feb 2020 11:05:00 +0100 Subject: [PATCH] MS --- .gitignore | 1 + .vs/Global_Indexer/DesignTimeBuild/.dtbcache | Bin 196 -> 196 bytes Global_Indexer/ClassInit.vb | 8 +- Global_Indexer/Form1.Designer.vb | 60 ++++ Global_Indexer/Form1.resx | 120 +++++++ Global_Indexer/Form1.vb | 8 + Global_Indexer/Global_Indexer.vbproj | 9 + Global_Indexer/frmIndex.designer.vb | 10 +- Global_Indexer/frmIndex.resx | 72 +++- Global_Indexer/frmIndex.vb | 52 ++- Global_Indexer/frmStart.Designer.vb | 25 +- Global_Indexer/frmStart.resx | 140 ++++---- Global_Indexer/frmStart.vb | 326 +++++++++---------- SetupWix/Product.wxs | 3 +- 14 files changed, 558 insertions(+), 276 deletions(-) create mode 100644 Global_Indexer/Form1.Designer.vb create mode 100644 Global_Indexer/Form1.resx create mode 100644 Global_Indexer/Form1.vb diff --git a/.gitignore b/.gitignore index 86ec716..2589f76 100644 --- a/.gitignore +++ b/.gitignore @@ -155,3 +155,4 @@ $RECYCLE.BIN/ # Mac desktop service store files .DS_Store /.vs/Global_Indexer/v15/Server/sqlite3 +/.vs/Global_Indexer/v16/Server/sqlite3 diff --git a/.vs/Global_Indexer/DesignTimeBuild/.dtbcache b/.vs/Global_Indexer/DesignTimeBuild/.dtbcache index 623da36c1941399be6b41fd8feaee9fdab274bae..5c6a9ff87862297a1da9db3907fe0405ae55d3d0 100644 GIT binary patch delta 46 zcmX@Yc!Y6+h-@$e1A{Ar6+;X|Fhep!215};Dnlki5|Aun@SUis$n41wGSM|30O>vo A9smFU delta 51 zcmX@Yc!Y6+h^RLM1A{Ar6+;Yz7egvT9uTH7cuh1^oEViQP{2^ckk63Ca7Vr_5QG6U C9}PPI diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index e73e3b5..ee3aafb 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -230,16 +230,14 @@ Public Class ClassInit Exit Sub End If If DT_CHECKUSER_MODULE.Rows.Count = 1 Then - USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS") + USER_IN_MODULE = CBool(DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")) If USER_IN_MODULE = False Then - ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False) + ClassLogger.Add($" - User: {Environment.UserName } nicht für Modul freigegben! [{DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")}]", False) START_INCOMPLETE = True - Throw New Exception("Your user is not allowed to use this module." & vbNewLine & "Please contact the system administrator!") - Exit Sub End If - USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") + USER_IS_ADMIN = CBool(DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")) ClassLicence.Refresh_Licence() diff --git a/Global_Indexer/Form1.Designer.vb b/Global_Indexer/Form1.Designer.vb new file mode 100644 index 0000000..6db1b80 --- /dev/null +++ b/Global_Indexer/Form1.Designer.vb @@ -0,0 +1,60 @@ + _ +Partial Class Form1 + Inherits System.Windows.Forms.Form + + '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 + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + '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.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.Button1 = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'DocumentViewer1 + ' + Me.DocumentViewer1.Location = New System.Drawing.Point(24, 39) + Me.DocumentViewer1.Name = "DocumentViewer1" + Me.DocumentViewer1.Size = New System.Drawing.Size(493, 387) + Me.DocumentViewer1.TabIndex = 0 + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(566, 150) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 1 + Me.Button1.Text = "Button1" + Me.Button1.UseVisualStyleBackColor = True + ' + 'Form1 + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.DocumentViewer1) + Me.Name = "Form1" + Me.Text = "Form1" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents Button1 As Button +End Class diff --git a/Global_Indexer/Form1.resx b/Global_Indexer/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Global_Indexer/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Global_Indexer/Form1.vb b/Global_Indexer/Form1.vb new file mode 100644 index 0000000..1c83873 --- /dev/null +++ b/Global_Indexer/Form1.vb @@ -0,0 +1,8 @@ +Public Class Form1 + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE) + '\\dd-sto01\DD-DFSR01\SharedObjects\Public\Projekte\2.JPG + '\\dd-gan.local.digitaldata.works\DD-DFSR01\SharedObjects\Public\Projekte\2.JPG + DocumentViewer1.LoadFile("\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\SimpleIndexer\File1.pdf") + End Sub +End Class \ No newline at end of file diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index 31f3aa5..32ebad9 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -246,6 +246,12 @@ + + Form1.vb + + + Form + frmAdministration.vb @@ -408,6 +414,9 @@ AboutBox1.vb + + Form1.vb + frmAdministration.vb diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb index 174432d..4c29872 100644 --- a/Global_Indexer/frmIndex.designer.vb +++ b/Global_Indexer/frmIndex.designer.vb @@ -51,6 +51,7 @@ Partial Class frmIndex Me.VWINDEX_AUTOMTableAdapter = New Global_Indexer.MyDatasetTableAdapters.VWDDINDEX_AUTOMTableAdapter() Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) + Me.Button2 = New System.Windows.Forms.Button() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() @@ -91,6 +92,7 @@ Partial Class frmIndex 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight + Me.Panel1.Controls.Add(Me.Button2) Me.Panel1.Controls.Add(Me.CheckBox1) Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Controls.Add(Me.ToolStrip1) @@ -252,6 +254,12 @@ Partial Class frmIndex ' Me.VWINDEX_AUTOMTableAdapter.ClearBeforeFill = True ' + 'Button2 + ' + resources.ApplyResources(Me.Button2, "Button2") + Me.Button2.Name = "Button2" + Me.Button2.UseVisualStyleBackColor = True + ' 'DocumentViewer1 ' resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") @@ -264,7 +272,6 @@ Partial Class frmIndex Me.ControlBox = False Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.StatusStrip1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmIndex" @@ -327,4 +334,5 @@ Partial Class frmIndex Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents CheckBox1 As System.Windows.Forms.CheckBox Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents Button2 As Button End Class diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index 35fe3d4..f014d9c 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -156,6 +156,33 @@ 0 + + NoControl + + + 306, 71 + + + 75, 23 + + + 13 + + + Button2 + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + Bottom, Right @@ -165,6 +192,9 @@ MiddleRight + + NoControl + 408, 76 @@ -190,7 +220,7 @@ Panel1 - 0 + 1 Bottom, Right @@ -201,6 +231,9 @@ MiddleLeft + + NoControl + 398, 40 @@ -226,16 +259,16 @@ Panel1 - 1 + 2 - 774, 56 + 540, 56 Magenta - 120, 24 + 121, 24 Top Most = False @@ -262,7 +295,7 @@ Panel1 - 2 + 3 True @@ -270,6 +303,9 @@ Verdana, 9.75pt + + NoControl + 4, 78 @@ -298,7 +334,7 @@ Panel1 - 3 + 4 Top, Left, Right @@ -322,11 +358,14 @@ Panel1 - 4 + 5 True + + NoControl + 3, 25 @@ -349,7 +388,7 @@ Panel1 - 5 + 6 Top @@ -384,6 +423,9 @@ Verdana, 9.75pt, style=Bold, Italic + + NoControl + 3, 39 @@ -414,6 +456,9 @@ Verdana, 9.75pt + + NoControl + 3, 13 @@ -447,6 +492,9 @@ Verdana, 8.25pt + + NoControl + 0, 62 @@ -516,6 +564,9 @@ MiddleLeft + + NoControl + 378, 6 @@ -715,7 +766,7 @@ 244, 56 - 509, 56 + 392, 56 True @@ -732,6 +783,9 @@ Segoe UI, 9.75pt + + NoControl + 3, 4, 3, 4 diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 63cc71a..10c5d62 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -33,15 +33,15 @@ Public Class frmIndex 'Dim DocView 'Dim viewer_string As String - Public Shared Function Instance() As frmIndex - If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then - _Instance = New frmIndex - End If - _Instance.BringToFront() - _Instance.TopMost = True - _Instance.Focus() - Return _Instance - End Function + 'Public Shared Function Instance() As frmIndex + ' If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then + ' _Instance = New frmIndex + ' End If + ' _Instance.BringToFront() + ' _Instance.TopMost = True + ' _Instance.Focus() + ' Return _Instance + 'End Function #End Region '#Region "+++++ Allgemeine Funktionen ++++++" Sub ShowError(text As String) @@ -1902,14 +1902,13 @@ Public Class frmIndex Private Sub frmIndex_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing Try ' This prevents the thread issue when the form containing the viewer is opened via ShowDialog. - DocumentViewer1.CloseFile() - DocumentViewer1.Dispose() + DocumentViewer1.Done() ClassWindowLocation.SaveFormLocationSize(Me) My.Settings.Save() Catch ex As Exception - ClassLogger.Add(" - Unexpected error in Schliessen des Formulares - Fehler: " & vbNewLine & ex.Message) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Schliessen des Formulares:") + ClassLogger.Add(" - Unexpected error in FormClosing: " & vbNewLine & ex.Message) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in FormClosing:") End Try End Sub @@ -1925,7 +1924,7 @@ Public Class frmIndex VIEWER_LICENSE = ClassDatabase.Execute_Scalar("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'", MyConnectionString) 'TODO: Load License from DB - DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE) + 'DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE) CURRENT_DROPTYPE = DropType.Replace("|", "") If DropType = "|DROPFROMFSYSTEM|" Then @@ -1980,7 +1979,7 @@ Public Class frmIndex ClassWindowLocation.LoadFormLocationSize(Me) If CONFIG.Config.FilePreview = True Then SplitContainer1.Panel2Collapsed = False - PreviewFile() + 'PreviewFile() Me.tslblVorschau.Visible = True Else SplitContainer1.Panel2Collapsed = True @@ -2020,17 +2019,9 @@ Public Class frmIndex MsgBox("Unexpected error in Speichern der Verbindung: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) End Try End Sub - - Private Sub frmIndex_LocationChanged(sender As Object, e As EventArgs) Handles Me.LocationChanged - - End Sub - - Private Sub frmIndex_LostFocus(sender As Object, e As EventArgs) Handles Me.LostFocus - - End Sub Private Sub frmIndex_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown 'Me.TopMost = True - Me.BringToFront() + 'Me.BringToFront() Me.Focus() Me.Cursor = Cursors.Default Refresh_Dokart() @@ -2058,8 +2049,8 @@ Public Class frmIndex Catch ex As Exception ClassLogger.Add(" - Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message) End Try - Me.TopMost = True - Me.BringToFront() + ' Me.TopMost = True + ' Me.BringToFront() End Sub Sub Refresh_Dokart() @@ -2600,7 +2591,7 @@ Public Class frmIndex If Name_Generieren() = True Then If LogErrorsOnly = False Then ClassLogger.Add(" ...Name_Generieren durchlaufen", False) 'Dokumentenviewer ausblenden um keinen Zugriffsfehler zu produzieren - DocumentViewer1.CloseFile() + DocumentViewer1.Done() If LogErrorsOnly = False Then ClassLogger.Add(" ...Viewer geschlossen", False) 'Die Datei verschieben If Move_File2_Target() = True Then @@ -2614,7 +2605,7 @@ Public Class frmIndex ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then 'Die temporäre Datei löschen If CURRENT_WORKFILE.EndsWith("pdf") Then - DocumentViewer1.CloseFile() + DocumentViewer1.Done() End If DeleteFile() @@ -3105,4 +3096,9 @@ Public Class frmIndex End If End If End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE) + PreviewFile() + End Sub End Class diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 287e8d9..22e6d71 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -52,8 +52,11 @@ Partial Class frmStart Me.TBHOTKEY_USER_PROFILETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_USER_PROFILETableAdapter() Me.TableAdapterManager = New Global_Indexer.MyDatasetTableAdapters.TableAdapterManager() Me.btnChoosefiles = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() Me.MenuStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() + CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBHOTKEY_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'MenuStrip1 @@ -148,6 +151,7 @@ Partial Class frmStart ' Me.LabelControl1.AllowDrop = True Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) + Me.LabelControl1.Appearance.Options.UseFont = True resources.ApplyResources(Me.LabelControl1, "LabelControl1") Me.LabelControl1.Name = "LabelControl1" ' @@ -161,28 +165,29 @@ Partial Class frmStart resources.ApplyResources(Me.LabelMachine, "LabelMachine") Me.LabelMachine.Id = 3 Me.LabelMachine.Name = "LabelMachine" - Me.LabelMachine.TextAlignment = System.Drawing.StringAlignment.Near ' 'LabelUser ' resources.ApplyResources(Me.LabelUser, "LabelUser") Me.LabelUser.Id = 4 Me.LabelUser.Name = "LabelUser" - Me.LabelUser.TextAlignment = System.Drawing.StringAlignment.Near ' 'LabelLoggedIn ' resources.ApplyResources(Me.LabelLoggedIn, "LabelLoggedIn") Me.LabelLoggedIn.Id = 5 Me.LabelLoggedIn.Name = "LabelLoggedIn" - Me.LabelLoggedIn.TextAlignment = System.Drawing.StringAlignment.Near ' 'LabelVersion ' resources.ApplyResources(Me.LabelVersion, "LabelVersion") Me.LabelVersion.Id = 6 Me.LabelVersion.Name = "LabelVersion" - Me.LabelVersion.TextAlignment = System.Drawing.StringAlignment.Near + ' + 'MyDataset + ' + Me.MyDataset.DataSetName = "MyDataset" + Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' 'TBHOTKEY_USER_PROFILETableAdapter ' @@ -202,6 +207,7 @@ Partial Class frmStart Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing + Me.TableAdapterManager.TBGI_REGEX_DOCTYPETableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing @@ -216,12 +222,19 @@ Partial Class frmStart Me.btnChoosefiles.Name = "btnChoosefiles" Me.btnChoosefiles.UseVisualStyleBackColor = True ' + 'Button1 + ' + resources.ApplyResources(Me.Button1, "Button1") + Me.Button1.Name = "Button1" + Me.Button1.UseVisualStyleBackColor = True + ' 'frmStart ' Me.AllowDrop = True resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.SystemColors.ControlLight + Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.btnChoosefiles) Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.StatusStrip1) @@ -230,11 +243,12 @@ Partial Class frmStart Me.MaximizeBox = False Me.Name = "frmStart" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide - Me.TopMost = True Me.MenuStrip1.ResumeLayout(False) Me.MenuStrip1.PerformLayout() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() + CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBHOTKEY_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -267,4 +281,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 Button1 As Button End Class diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 0a0dac7..a5c9ad5 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -118,46 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 17 + 400, 17 - - 0, 0 - - - 294, 24 - - - - 5 - - - MenuStrip1 - - - MenuStrip1 - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 108, 20 - - - Konfiguration - - - 220, 22 - - - Administration - 231, 22 @@ -170,6 +133,12 @@ Hotkey - Einstellungen + + 220, 22 + + + Administration + 217, 6 @@ -197,9 +166,49 @@ Info + + 108, 20 + + + Konfiguration + + + 0, 0 + + + 294, 24 + + + + 5 + + + MenuStrip1 + + + MenuStrip1 + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + - 132, 17 + 515, 17 + + 133, 17 + + + FolderWatch ist aktiv + + + False + 0, 128 @@ -222,25 +231,16 @@ $this - 2 - - - 133, 17 - - - FolderWatch ist aktiv - - - False + 3 1072, 17 - 1223, 17 + 17, 56 - 1386, 17 + 180, 56 @@ -533,7 +533,7 @@ GlobalIndexer - 1501, 17 + 295, 56 Tahoma, 12pt @@ -561,10 +561,10 @@ auf dieses Fenster oder... $this - 1 + 2 - 1689, 17 + 483, 56 StatusMachine @@ -579,7 +579,13 @@ auf dieses Fenster oder... StatusVersion - 17, 56 + 625, 56 + + + 17, 17 + + + 127, 17 632, 17 @@ -616,6 +622,30 @@ auf dieses Fenster oder... $this + 1 + + + 207, 52 + + + 75, 23 + + + 10 + + + Button1 + + + Button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 41a510d..bbabbd1 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -4,40 +4,13 @@ Imports Independentsoft Imports DLLLicenseManager Imports System.Text Imports System.Globalization -Imports System.Threading +'Imports System.Threading Imports System.Runtime.InteropServices Public Class frmStart Public _lizenzManager As ClassLicenseManager Dim loaded As Boolean = False - Dim WithEvents HotKey As New clsHotkey(Me) - 'Public Sub SetLanguage() - ' Dim de = System.Globalization.CultureInfo.CurrentUICulture - ' 'Neue Sprache festlegen und entfernen aller Controls - - - ' Thread.CurrentThread.CurrentUICulture = New CultureInfo(USER_LANGUAGE) - ' Me.Controls.Clear() - - ' 'Me.Events.Dispose() - - ' InitializeComponent() - ' tslblCultureInfo.Text = "Culture/Language: " & USER_LANGUAGE - ' Try - ' Dim Ic As Icon = New Icon(Application.StartupPath & "\DD_Icons_ICO_GLOBIX_128.ico") - ' If Not IsNothing(Ic) Then - ' Me.Icon = Ic - ' End If - - ' Catch ex As Exception - ' ClassLogger.Add(">> Icon file could not be read: " & ex.Message, False) - ' End Try - - ' 'Me.i() - ' 'Wiederherstellen der Fensterposition - ' 'Me.Size = sz - ' 'Me.Location = pt - 'End Sub + ' Dim WithEvents HotKey As New clsHotkey(Me) Private Const mSnapOffset As Integer = 35 Private Const WM_WINDOWPOSCHANGING As Integer = &H46 @@ -53,15 +26,15 @@ Public Class frmStart Public flags As Integer End Structure - Protected Overrides Sub WndProc(ByRef m As Message) - ' Listen for operating system messages - Select Case m.Msg - Case WM_WINDOWPOSCHANGING - SnapToDesktopBorder(Me, m.LParam, 0) - End Select + 'Protected Overrides Sub WndProc(ByRef m As Message) + ' ' Listen for operating system messages + ' Select Case m.Msg + ' Case WM_WINDOWPOSCHANGING + ' SnapToDesktopBorder(Me, m.LParam, 0) + ' End Select - MyBase.WndProc(m) - End Sub + ' MyBase.WndProc(m) + 'End Sub Public Shared Sub SnapToDesktopBorder(ByVal clientForm _ As Form, ByVal LParam As IntPtr, ByVal widthAdjustment As Integer) If clientForm Is Nothing Then @@ -162,60 +135,60 @@ Public Class frmStart TimerCheckDroppedFiles.Start() End If End Sub - Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles HotKey.HotKeyPressed - Dim CapTxt As String = ClassHotkey_Windream.GetCaption() - CURRENT_FOCUSES_WINDOWNAME = CapTxt - If CURRENT_FOCUSES_WINDOWNAME.ToUpper.StartsWith("GLOB") Then Exit Sub - If LogErrorsOnly = False Then ClassLogger.Add(" ...Focused window result: '" & CURRENT_FOCUSES_WINDOWNAME & "'", False) - - Me.Cursor = Cursors.WaitCursor - Me.NotifyIcon1.Visible = True - NotifyIcon1.ShowBalloonTip(1000, "Hotkey", "Hotkey wird ausgeführt!", ToolTipIcon.Info) - Try - Dim _focusedWindowfound As Boolean = False - Dim HK1 As String - Dim HK2 As String - 'Die Hotkeys definieren - Dim SQL As String = "SELECT * FROM TBHOTKEYTEMP_USER_HOTKEYS WHERE HOTKEY_ID = " & HotKeyID - Dim DTHOTKEYSTEMP As DataTable = ClassDatabase.Return_Datatable(SQL, True) - If Not IsNothing(DTHOTKEYSTEMP) Then - HK1 = DTHOTKEYSTEMP.Rows(0).Item("HOTKEY1") - HK2 = DTHOTKEYSTEMP.Rows(0).Item("HOTKEY2") - 'Alle Profile raussuchen die die Tastaturkombination enthalten - SQL = "select * from TBHOTKEY_USER_PROFILE where UPPER(HOTKEY1) = UPPER('" & HK1 & "') AND UPPER(HOTKEY2) = UPPER('" & HK2 & "') AND USER_ID = " & USER_ID - Dim DTHOTKEY_PROFILES As DataTable = ClassDatabase.Return_Datatable(SQL, True) - Dim Result As String = "" - If Not IsNothing(DTHOTKEY_PROFILES) Then - - 'Jedes Hotkeyprofil des Users durchlaufen um zu überprüfen ob das CURRENT_FOCUSES_WINDOWNAME = dem konfiguriertem ist - For Each row As DataRow In DTHOTKEY_PROFILES.Rows - SQL = "select WINDOW_NAME from TBHOTKEY_PROFILE where GUID = " & row.Item("HKPROFILE_ID") - 'Konfigurierte windows-String speichern - Dim windowconfigured = ClassDatabase.Execute_Scalar(SQL, MyConnectionString, True) - 'Focuses window enthalten?? - If CURRENT_FOCUSES_WINDOWNAME.ToUpper.Contains(windowconfigured.ToString.ToUpper) Or CURRENT_FOCUSES_WINDOWNAME.ToUpper = windowconfigured.ToString.ToUpper Then - 'Ja - also die windream-Suche ausführen - _focusedWindowfound = True - Result = ClassHotkey_Windream.RUN_WD_SEARCH(row.Item("GUID")) - End If - Next - If _focusedWindowfound = False Then - Result = "Focused Window not configured in hotkey" - End If - End If - - - If Result = "" Then - Me.NotifyIcon1.Visible = False - Else - NotifyIcon1.ShowBalloonTip(5000, "Hotkey-Fehler:", Result.ToString, ToolTipIcon.Warning) - End If - End If - Catch ex As Exception - MsgBox("Error in ReceiveHotKey: " & ex.Message, MsgBoxStyle.Critical) - End Try - Me.Cursor = Cursors.Default - End Sub + 'Private Sub ReceiveHotKey(ByVal HotKeyID As String) Handles HotKey.HotKeyPressed + ' Dim CapTxt As String = ClassHotkey_Windream.GetCaption() + ' CURRENT_FOCUSES_WINDOWNAME = CapTxt + ' If CURRENT_FOCUSES_WINDOWNAME.ToUpper.StartsWith("GLOB") Then Exit Sub + ' If LogErrorsOnly = False Then ClassLogger.Add(" ...Focused window result: '" & CURRENT_FOCUSES_WINDOWNAME & "'", False) + + ' Me.Cursor = Cursors.WaitCursor + ' Me.NotifyIcon1.Visible = True + ' NotifyIcon1.ShowBalloonTip(1000, "Hotkey", "Hotkey wird ausgeführt!", ToolTipIcon.Info) + ' Try + ' Dim _focusedWindowfound As Boolean = False + ' Dim HK1 As String + ' Dim HK2 As String + ' 'Die Hotkeys definieren + ' Dim SQL As String = "SELECT * FROM TBHOTKEYTEMP_USER_HOTKEYS WHERE HOTKEY_ID = " & HotKeyID + ' Dim DTHOTKEYSTEMP As DataTable = ClassDatabase.Return_Datatable(SQL, True) + ' If Not IsNothing(DTHOTKEYSTEMP) Then + ' HK1 = DTHOTKEYSTEMP.Rows(0).Item("HOTKEY1") + ' HK2 = DTHOTKEYSTEMP.Rows(0).Item("HOTKEY2") + ' 'Alle Profile raussuchen die die Tastaturkombination enthalten + ' SQL = "select * from TBHOTKEY_USER_PROFILE where UPPER(HOTKEY1) = UPPER('" & HK1 & "') AND UPPER(HOTKEY2) = UPPER('" & HK2 & "') AND USER_ID = " & USER_ID + ' Dim DTHOTKEY_PROFILES As DataTable = ClassDatabase.Return_Datatable(SQL, True) + ' Dim Result As String = "" + ' If Not IsNothing(DTHOTKEY_PROFILES) Then + + ' 'Jedes Hotkeyprofil des Users durchlaufen um zu überprüfen ob das CURRENT_FOCUSES_WINDOWNAME = dem konfiguriertem ist + ' For Each row As DataRow In DTHOTKEY_PROFILES.Rows + ' SQL = "select WINDOW_NAME from TBHOTKEY_PROFILE where GUID = " & row.Item("HKPROFILE_ID") + ' 'Konfigurierte windows-String speichern + ' Dim windowconfigured = ClassDatabase.Execute_Scalar(SQL, MyConnectionString, True) + ' 'Focuses window enthalten?? + ' If CURRENT_FOCUSES_WINDOWNAME.ToUpper.Contains(windowconfigured.ToString.ToUpper) Or CURRENT_FOCUSES_WINDOWNAME.ToUpper = windowconfigured.ToString.ToUpper Then + ' 'Ja - also die windream-Suche ausführen + ' _focusedWindowfound = True + ' Result = ClassHotkey_Windream.RUN_WD_SEARCH(row.Item("GUID")) + ' End If + ' Next + ' If _focusedWindowfound = False Then + ' Result = "Focused Window not configured in hotkey" + ' End If + ' End If + + + ' If Result = "" Then + ' Me.NotifyIcon1.Visible = False + ' Else + ' NotifyIcon1.ShowBalloonTip(5000, "Hotkey-Fehler:", Result.ToString, ToolTipIcon.Warning) + ' End If + ' End If + ' Catch ex As Exception + ' MsgBox("Error in ReceiveHotKey: " & ex.Message, MsgBoxStyle.Critical) + ' End Try + ' Me.Cursor = Cursors.Default + 'End Sub Private Sub frmMain_DragEnter(sender As Object, e As DragEventArgs) Handles Me.DragEnter Drag_Enter(sender, e) End Sub @@ -284,27 +257,21 @@ Public Class frmStart End Try Me.TopMost = True End Sub - Sub MyBackgroundThread() - - - Dim frmCollection = System.Windows.Forms.Application.OpenForms - Do While frmCollection.OfType(Of frmIndex).Any - - Loop - End Sub Sub Open_IndexDialog() Try - Me.Hide() - Me.TopMost = False - frmIndex.ShowDialog() + 'Me.Hide() + 'Me.TopMost = False + 'Unregister_Hotkeys() + frmIndex.Show() + 'Dim thread As New Thread(AddressOf MyBackgroundThread) 'thread.Start() 'Do While thread.IsAlive 'Loop - Me.Visible = True - Me.TopMost = True - Me.BringToFront() + 'Me.Visible = True + ' Me.TopMost = True + ' Me.BringToFront() Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical) End Try @@ -325,7 +292,7 @@ Public Class frmStart MsgBox("Unexpected Error in Closing Application: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try If USER_ID > 0 Then - Unregister_Hotkeys() + ' Unregister_Hotkeys() End If 'TempDateien löschen Try @@ -341,7 +308,7 @@ Public Class frmStart Public Sub New() Dim splash As New frmSplash() splash.ShowDialog() - Thread.CurrentThread.CurrentUICulture = New CultureInfo(USER_LANGUAGE) + 'Thread.CurrentThread.CurrentUICulture = New CultureInfo(USER_LANGUAGE) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -407,9 +374,10 @@ Public Class frmStart ToolStripSeparator1.Visible = False AdministrationToolStripMenuItem.Visible = False End If + VIEWER_LICENSE = ClassDatabase.Execute_Scalar("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'", MyConnectionString) ClassDatabase.Execute_non_Query("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", True) - Unregister_Hotkeys() - Load_Hotkeys() + ' Unregister_Hotkeys() + ' Load_Hotkeys() Me.Opacity = 30 Catch ex As Exception @@ -512,71 +480,71 @@ Public Class frmStart End If End Sub - Sub Unregister_Hotkeys() - Try - Dim sql As String = "Select * from TBHOTKEYTEMP_USER_HOTKEYS where [USER_ID] = " & USER_ID - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) - If Not IsNothing(DT) Then - For Each row As DataRow In DT.Rows - HotKey.RemoveHotKey(row.Item("HOTKEY_ID")) - Next - sql = "delete from TBHOTKEYTEMP_USER_HOTKEYS where [USER_ID] = " & USER_ID - ClassDatabase.Execute_non_Query(sql, True) - End If + 'Sub Unregister_Hotkeys() + ' Try + ' Dim sql As String = "Select * from TBHOTKEYTEMP_USER_HOTKEYS where [USER_ID] = " & USER_ID + ' Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) + ' If Not IsNothing(DT) Then + ' For Each row As DataRow In DT.Rows + ' HotKey.RemoveHotKey(row.Item("HOTKEY_ID")) + ' Next + ' sql = "delete from TBHOTKEYTEMP_USER_HOTKEYS where [USER_ID] = " & USER_ID + ' ClassDatabase.Execute_non_Query(sql, True) + ' End If - Catch ex As Exception - MsgBox("Error in Unregister_Hotkeys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - End Sub - Sub Load_Hotkeys() - Try - Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT HOTKEY1, HOTKEY2, ABS(CONVERT(INT, CONVERT(binary(4), NEWID()))) AS HOTKEY_ID FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & USER_ID & " GROUP BY HOTKEY1, HOTKEY2", True) - If DT.Rows.Count > 0 Then - If LogErrorsOnly = False Then ClassLogger.Add(" >> " & DT.Rows.Count & " Hotkey-Profile", False) - Dim i As Integer = 0 - For Each row As DataRow In DT.Rows - i += 1 - Dim sql As String = "INSERT INTO TBHOTKEYTEMP_USER_HOTKEYS (HOTKEY_ID,HOTKEY1,HOTKEY2,[USER_ID]) VALUES (" & row.Item("HOTKEY_ID") & ", '" & row.Item("HOTKEY1") & "', '" & row.Item("HOTKEY2") & "', " & USER_ID & ")" - ClassDatabase.Execute_non_Query(sql, True) - - Dim keyCode As Keys - Try - Dim kc As New KeysConverter - Dim obj As Object = kc.ConvertFromString(row.Item("HOTKEY2").ToString.ToUpper) - keyCode = CType(obj, Keys) - Catch ex As Exception - MsgBox("Error in Convert Key:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - Exit Sub - End Try - - Select Case row.Item("HOTKEY1") - Case "Strg" - If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Strg " & row.Item("HOTKEY2").ToString.ToUpper, False) - HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_CONTROL, row.Item("HOTKEY_ID")) - Case "Shift" - If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Shift " & row.Item("HOTKEY2").ToString.ToUpper, False) - HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_SHIFT, row.Item("HOTKEY_ID")) - Case "Alt" - If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Alt " & row.Item("HOTKEY2").ToString.ToUpper, False) - HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_ALT, row.Item("HOTKEY_ID")) - Case "win" - If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Win " & row.Item("HOTKEY2").ToString.ToUpper, False) - HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_WIN, row.Item("HOTKEY_ID")) - End Select - Next - Else - If LogErrorsOnly = False Then ClassLogger.Add(" >> Keine Hotkeys!", False) - End If - Catch ex As Exception - MsgBox("Error in Load_Hotkeys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - End Sub + ' Catch ex As Exception + ' MsgBox("Error in Unregister_Hotkeys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ' End Try + 'End Sub + 'Sub Load_Hotkeys() + ' Try + ' Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT HOTKEY1, HOTKEY2, ABS(CONVERT(INT, CONVERT(binary(4), NEWID()))) AS HOTKEY_ID FROM TBHOTKEY_USER_PROFILE WHERE USER_ID = " & USER_ID & " GROUP BY HOTKEY1, HOTKEY2", True) + ' If DT.Rows.Count > 0 Then + ' If LogErrorsOnly = False Then ClassLogger.Add(" >> " & DT.Rows.Count & " Hotkey-Profile", False) + ' Dim i As Integer = 0 + ' For Each row As DataRow In DT.Rows + ' i += 1 + ' Dim sql As String = "INSERT INTO TBHOTKEYTEMP_USER_HOTKEYS (HOTKEY_ID,HOTKEY1,HOTKEY2,[USER_ID]) VALUES (" & row.Item("HOTKEY_ID") & ", '" & row.Item("HOTKEY1") & "', '" & row.Item("HOTKEY2") & "', " & USER_ID & ")" + ' ClassDatabase.Execute_non_Query(sql, True) + + ' Dim keyCode As Keys + ' Try + ' Dim kc As New KeysConverter + ' Dim obj As Object = kc.ConvertFromString(row.Item("HOTKEY2").ToString.ToUpper) + ' keyCode = CType(obj, Keys) + ' Catch ex As Exception + ' MsgBox("Error in Convert Key:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ' Exit Sub + ' End Try + + ' Select Case row.Item("HOTKEY1") + ' Case "Strg" + ' If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Strg " & row.Item("HOTKEY2").ToString.ToUpper, False) + ' HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_CONTROL, row.Item("HOTKEY_ID")) + ' Case "Shift" + ' If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Shift " & row.Item("HOTKEY2").ToString.ToUpper, False) + ' HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_SHIFT, row.Item("HOTKEY_ID")) + ' Case "Alt" + ' If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Alt " & row.Item("HOTKEY2").ToString.ToUpper, False) + ' HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_ALT, row.Item("HOTKEY_ID")) + ' Case "win" + ' If LogErrorsOnly = False Then ClassLogger.Add(" >>" & i.ToString + "|Win " & row.Item("HOTKEY2").ToString.ToUpper, False) + ' HotKey.AddHotKey(keyCode, clsHotkey.MODKEY.MOD_WIN, row.Item("HOTKEY_ID")) + ' End Select + ' Next + ' Else + ' If LogErrorsOnly = False Then ClassLogger.Add(" >> Keine Hotkeys!", False) + ' End If + ' Catch ex As Exception + ' MsgBox("Error in Load_Hotkeys:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ' End Try + 'End Sub Private Sub HotkeyEisntellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles HotkeyEisntellungenToolStripMenuItem.Click If ClassLicence.license_is_Valid = True Then Me.Hide() - Unregister_Hotkeys() + 'Unregister_Hotkeys() frmHotKey_Add.ShowDialog() - Load_Hotkeys() + 'Load_Hotkeys() Me.Visible = True End If @@ -618,9 +586,9 @@ Public Class frmStart Private Sub FrmHotkeyAddToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FrmHotkeyAddToolStripMenuItem.Click If ClassLicence.license_is_Valid = True Then Me.Hide() - Unregister_Hotkeys() + 'Unregister_Hotkeys() frmHotkey_User.ShowDialog() - Load_Hotkeys() + 'Load_Hotkeys() Me.Visible = True End If @@ -668,7 +636,10 @@ Public Class frmStart CURRENT_WORKFILE = FileForWork CURRENT_FILENAME = FileForWork CURRENT_WORKFILE_GUID = row.Item("GUID") - Open_IndexDialog() + If Not Application.OpenForms().OfType(Of frmIndex).Any Then + 'Open_IndexDialog() + End If + Else ClassLogger.Add(">> File not existing - Row will be deleted!", False) Dim del = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID) @@ -792,4 +763,15 @@ Public Class frmStart End Try End Sub + + Private Sub KonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KonfigurationToolStripMenuItem.Click + + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + CURRENT_FILENAME = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\SimpleIndexer\Briefbogen_gbr.pdf" + CURRENT_WORKFILE_GUID = 515 + CURRENT_WORKFILE = CURRENT_FILENAME + Form1.Show() + End Sub End Class \ No newline at end of file diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs index f78fd93..1c4ff96 100644 --- a/SetupWix/Product.wxs +++ b/SetupWix/Product.wxs @@ -113,11 +113,12 @@ + - +