diff --git a/Global_Indexer/ClassConfig.vb b/Global_Indexer/ClassConfig.vb index bd68fda..a40be8e 100644 --- a/Global_Indexer/ClassConfig.vb +++ b/Global_Indexer/ClassConfig.vb @@ -9,7 +9,6 @@ Public Class ClassConfig Public Property FolderWatchScanStarted As Boolean = False ' PDF Viewer Settings - Public Property UniversalViewerPath As String = "" Public Property FilePreview As Boolean = True ' Misc Settings diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index ad1a726..e73e3b5 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -23,7 +23,6 @@ Public Class ClassInit MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString) LogErrorsOnly = CONFIG.Config.LogErrorsOnly 'myPreviewActive = CONFIG.Config.FilePreview - UniversalViewer_Path = CONFIG.Config.UniversalViewerPath FW_started = CONFIG.Config.FolderWatchStarted CURR_DELETE_ORIGIN = CONFIG.Config.DeleteOriginalFile End Sub diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index f3fff1e..31f3aa5 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -150,7 +150,8 @@ False - + + False ..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb index 106ce0d..344009c 100644 --- a/Global_Indexer/ModuleCURRENT.vb +++ b/Global_Indexer/ModuleCURRENT.vb @@ -74,6 +74,8 @@ Module ModuleCURRENT Public CURRENT_DT_REGEX As DataTable Public REGEX_CLEAN_FILENAME As String = "[?*^""<>|]" Public CURRENT_DROPTYPE + + Public VIEWER_LICENSE As String = "" End Module diff --git a/Global_Indexer/ModuleMySettings.vb b/Global_Indexer/ModuleMySettings.vb index 217cabe..78a579a 100644 --- a/Global_Indexer/ModuleMySettings.vb +++ b/Global_Indexer/ModuleMySettings.vb @@ -11,243 +11,5 @@ Module ModuleMySettings Public GI_withWindream As Boolean = False Public vWLaufwerk As String = "W" 'Public myPreviewActive As Boolean = True - Public UniversalViewer_Path As String Public FW_started As Boolean = False - 'Public FWSCAN_started As Boolean = False - - 'Public Function GetUserConfigPath() As String - ' Return Path.Combine(Application.UserAppDataPath(), USER_CONFIG_FILE) - 'End Function - - 'Public Function GetAllUsersConfigPath() As String - ' Return Path.Combine(Application.CommonAppDataPath(), COMPUTER_CONFIG_FILE) - 'End Function - - 'Public Function GetCurrentConfigPath() As String - ' If File.Exists(GetUserConfigPath()) Then - ' Return GetUserConfigPath() - ' Else - ' Return GetAllUsersConfigPath() - ' End If - 'End Function - - 'Public Function LoadMyConfig() - ' Dim rowresult As String = "" - ' Try - ' Dim oDatatable As DataTable - ' ''if file doesn't exist, create the file with its default xml table - ' 'If Not File.Exists(ConfigPath) Then - ' ' DT = CreateConfigTable() - ' ' DT.WriteXml(ConfigPath) - ' 'End If - ' 'DT = GetTablefromXML() - - ' ' if file in %APPDATA% doesn't exist, - ' ' check for file in %ALLUSERSPROFILE%, - ' ' otherwise create the file with its default xml table - ' If File.Exists(GetUserConfigPath()) Then - ' oDatatable = GetTablefromXML(GetUserConfigPath()) - ' ElseIf File.Exists(GetAllUsersConfigPath()) Then - ' oDatatable = GetTablefromXML(GetAllUsersConfigPath()) - ' Else - ' oDatatable = CreateConfigTable() - ' oDatatable.WriteXml(GetUserConfigPath()) - ' End If - - ' For Each Row As DataRow In oDatatable.Rows - ' rowresult &= Row.Item("ConfigName") - ' Select Case Row.Item("ConfigName") - ' Case "MyConnectionString" - ' Dim connstring As String - ' 'Den ConnectonString mit verschlüsseltem PW laden - ' Dim csb As New SqlClient.SqlConnectionStringBuilder - ' csb.ConnectionString = Row.Item("Value") - ' If csb.ConnectionString.Contains("Password=") Then - ' 'SA-Auth - ' 'Jetzt das Passwort entschlüsseln - ' Dim PWplainText As String - ' Dim wrapper As New ClassEncryption("!35452didalog=") - ' ' DecryptData throws if the wrong password is used. - ' Try - ' PWplainText = wrapper.DecryptData(csb.Password) - ' Catch ex As Exception - ' ClassLogger.Add("- the Password '" & csb.Password & "' could not be decrypted", False) - ' PWplainText = csb.Password - ' End Try - ' connstring = Row.Item("Value").ToString.Replace(csb.Password, PWplainText) - ' Else - ' 'Win-Auth - ' connstring = Row.Item("Value").ToString - ' End If - - ' MyConnectionString = connstring - ' Case "LogErrorsOnly" - ' LogErrorsOnly = CBool(Row.Item("Value")) - ' Case "Preview" - ' Preview = CBool(Row.Item("Value")) - ' Case "UniversalViewer" - ' UniversalViewer_Path = Row.Item("Value") - ' Case "FW_started" - ' FW_started = CBool(Row.Item("Value")) - ' Case "FWSCAN_started" - ' FWSCAN_started = CBool(Row.Item("Value")) - ' Case "Delete_OriginFile" - ' CURR_DELETE_ORIGIN = CBool(Row.Item("Value")) - ' End Select - - ' Next - ' 'update 1.1 - ' If rowresult.Contains("FW_started") = False Then - ' Dim newRow As DataRow = oDatatable.NewRow() - ' newRow("ConfigName") = "FW_started" - ' newRow("Value") = "False" - ' oDatatable.Rows.Add(newRow) - ' oDatatable.WriteXml(GetUserConfigPath()) - ' End If - ' 'update 1.6 - ' If rowresult.Contains("Delete_OriginFile") = False Then - ' Dim newRow As DataRow = oDatatable.NewRow() - ' newRow("ConfigName") = "Delete_OriginFile" - ' newRow("Value") = "False" - ' oDatatable.Rows.Add(newRow) - ' oDatatable.WriteXml(GetUserConfigPath()) - ' End If - ' If rowresult.Contains("FWSCAN_started") = False Then - ' Dim newRow As DataRow = oDatatable.NewRow() - ' newRow("ConfigName") = "FWSCAN_started" - ' newRow("Value") = "False" - ' oDatatable.Rows.Add(newRow) - ' oDatatable.WriteXml(GetUserConfigPath()) - ' End If - ' Catch ex As Exception - ' MsgBox("Error in MySettings-LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - ' Return False - ' End Try - ' Return True - - 'End Function - 'Private Function GetTablefromXML(ConfigPath As String) - ' Try - ' Dim DS As New DataSet - ' DS.ReadXml(ConfigPath) - ' Return DS.Tables(0) - ' Catch ex As Exception - ' MsgBox("Error in GetTablefromXML" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - ' Return Nothing - ' End Try - - 'End Function - 'Private Function CreateConfigTable() As DataTable - ' Try - ' ' Create sample Customers table, in order - ' ' to demonstrate the behavior of the DataTableReader. - ' Dim oTable As New DataTable - ' oTable.TableName = "MyConfig" - - ' ' Create two columns, ID and Name. - ' Dim oIdColumn As DataColumn = oTable.Columns.Add("ID", - ' GetType(System.Int32)) - - ' oIdColumn.AutoIncrement = True - ' oIdColumn.AutoIncrementSeed = 0 - ' oIdColumn.AutoIncrementStep = 1 - ' oTable.Columns.Add("ConfigName", GetType(System.String)) - ' oTable.Columns.Add("Value", GetType(System.String)) - ' 'Set the ID column as the primary key column. - ' oTable.PrimaryKey = New DataColumn() {oIdColumn} - ' Dim newRow As DataRow = oTable.NewRow() - ' newRow("ConfigName") = "MyConnectionString" - ' newRow("Value") = "" - ' oTable.Rows.Add(newRow) - ' Dim newRow1 As DataRow = oTable.NewRow() - ' newRow1("ConfigName") = "LogErrorsOnly" - ' newRow1("Value") = "True" - ' oTable.Rows.Add(newRow1) - ' Dim newRow2 As DataRow = oTable.NewRow() - ' newRow2("ConfigName") = "Preview" - ' newRow2("Value") = "True" - ' oTable.Rows.Add(newRow2) - ' Dim newRow3 As DataRow = oTable.NewRow() - ' newRow3("ConfigName") = "UniversalViewer" - ' newRow3("Value") = "" - ' oTable.Rows.Add(newRow3) - ' Dim newRow4 As DataRow = oTable.NewRow() - ' newRow4("ConfigName") = "FW_started" - ' newRow4("Value") = "False" - ' oTable.Rows.Add(newRow4) - ' Dim newRow5 As DataRow = oTable.NewRow() - ' newRow5("ConfigName") = "FWSCAN_started" - ' newRow5("Value") = "False" - ' oTable.Rows.Add(newRow5) - ' oTable.AcceptChanges() - ' Return oTable - ' Catch ex As Exception - ' MsgBox("Error in CreateConfigTable" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - ' Return Nothing - ' End Try - 'End Function - - '''' - '''' Save settings to user config, NOT to common config - '''' - 'Public Function SaveConfigValue(name As String, value As String) - ' Try - ' Dim oUserConfigPath = GetUserConfigPath() - ' Dim oCurrentConfigPath = GetCurrentConfigPath() - - ' Dim oDatatable As DataTable = GetTablefromXML(oCurrentConfigPath) - - ' For Each Row As DataRow In oDatatable.Rows - ' If Row.Item("ConfigName") = name Then - ' Row.Item("Value") = value - ' End If - ' Next - ' oDatatable.AcceptChanges() - ' oDatatable.WriteXml(oUserConfigPath) - - ' Return True - ' Catch ex As Exception - ' MsgBox("Error in SaveConfigValue" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - ' Return False - ' End Try - 'End Function - 'Public Function Load_BasicConfig() - ' Try - ' ClassDatabase.Init() - ' Dim sql As String = "select * from tbdd_Modules where NAME = 'Global-Indexer'" - ' Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) - ' If DT.Rows.Count = 1 Then - ' GI_withWindream = DT.Rows(0).Item("BIT1") - ' vWLaufwerk = DT.Rows(0).Item("STRING1") - ' Else - ' Return False - ' End If - ' Catch ex As Exception - ' MsgBox("Error in Load_BasicConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - ' Return False - ' End Try - ' Return True - 'End Function - - 'Private Function DecryptConnectionString(EncryptedConnectionString As String) As String - ' Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With { - ' .ConnectionString = EncryptedConnectionString - ' } - - ' If oBuilder.ConnectionString.Contains("Password=") Then - ' Dim oPlaintextPassword As String - ' Dim oDecryptor As New ClassEncryption("!35452didalog=") - - ' Try - ' oPlaintextPassword = oDecryptor.DecryptData(oBuilder.Password) - ' Catch ex As Exception - ' LOGGER.Error(ex) - ' LOGGER.Debug("Password {0} could not be decrypted. Assuming plaintext password.") - ' oPlaintextPassword = oBuilder.Password - ' End Try - ' Return EncryptedConnectionString.Replace(oBuilder.Password, oPlaintextPassword) - ' Else - ' Return EncryptedConnectionString - ' End If - 'End Function End Module diff --git a/Global_Indexer/ModuleUserSavings.vb b/Global_Indexer/ModuleUserSavings.vb index 49f89bb..2944515 100644 --- a/Global_Indexer/ModuleUserSavings.vb +++ b/Global_Indexer/ModuleUserSavings.vb @@ -14,7 +14,7 @@ Module ModuleUserSavings 'For Each Row As DataRow In DT.Rows ' rowresult &= Row.Item("FILE_CONTAIN") - ' Select Case Row.Item("FILE_CONTAIN") + ' Select Case Row.Item("FILE_^^CONTAIN") ' End Select diff --git a/Global_Indexer/My Project/licenses.licx b/Global_Indexer/My Project/licenses.licx index e69de29..ef23e17 100644 --- a/Global_Indexer/My Project/licenses.licx +++ b/Global_Indexer/My Project/licenses.licx @@ -0,0 +1,3 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 524b395..7ee8582 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -957,7 +957,7 @@ Partial Class frmAdministration ' 'XtraTabControl1 ' - Me.XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color) + Me.XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor = System.Drawing.Color.Fuchsia Me.XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color) Me.XtraTabControl1.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("XtraTabControl1.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font) Me.XtraTabControl1.AppearancePage.HeaderHotTracked.Options.UseBackColor = True @@ -1056,9 +1056,9 @@ Partial Class frmAdministration ' 'GridView1 ' - Me.GridView1.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBEZEICHNUNG}) Me.GridView1.GridControl = Me.GridControl1 @@ -1107,7 +1107,7 @@ Partial Class frmAdministration 'XtraTabControl2 ' resources.ApplyResources(Me.XtraTabControl2, "XtraTabControl2") - Me.XtraTabControl2.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("XtraTabControl2.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color) + Me.XtraTabControl2.AppearancePage.HeaderHotTracked.BackColor = System.Drawing.Color.Fuchsia Me.XtraTabControl2.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("XtraTabControl2.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color) Me.XtraTabControl2.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("XtraTabControl2.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font) Me.XtraTabControl2.AppearancePage.HeaderHotTracked.GradientMode = CType(resources.GetObject("XtraTabControl2.AppearancePage.HeaderHotTracked.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode) @@ -2418,9 +2418,9 @@ Partial Class frmAdministration ' 'GridView2 ' - Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True - Me.GridView2.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView2.Appearance.FocusedRow.BackColor"), System.Drawing.Color) + Me.GridView2.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia Me.GridView2.Appearance.FocusedRow.Options.UseBackColor = True Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colUSERNAME, Me.colNAME, Me.colEMAIL}) Me.GridView2.GridControl = Me.GridControl2 @@ -2476,7 +2476,7 @@ Partial Class frmAdministration 'XtraTabControl3 ' resources.ApplyResources(Me.XtraTabControl3, "XtraTabControl3") - Me.XtraTabControl3.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("XtraTabControl3.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color) + Me.XtraTabControl3.AppearancePage.HeaderHotTracked.BackColor = System.Drawing.Color.Fuchsia Me.XtraTabControl3.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("XtraTabControl3.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color) Me.XtraTabControl3.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("XtraTabControl3.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font) Me.XtraTabControl3.AppearancePage.HeaderHotTracked.Options.UseBackColor = True diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 86f7806..e167c1c 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -2586,9 +2586,6 @@ 1 - - Fuchsia - 255, 128, 255 @@ -2691,12 +2688,6 @@ 3, 29 - - Cyan - - - Fuchsia - Dokumentart @@ -2838,9 +2829,6 @@ Top, Bottom, Left, Right - - Fuchsia - 255, 192, 255 @@ -3601,7 +3589,7 @@ der Datei 0, 0 - 1009, 27 + 1013, 27 3 @@ -3646,7 +3634,7 @@ der Datei 32 - 1009, 406 + 1013, 409 manuelle Indexe @@ -4407,7 +4395,7 @@ der Datei 0, 0 - 1009, 27 + 1013, 27 4 @@ -4428,7 +4416,7 @@ der Datei 31 - 1009, 406 + 1013, 409 Nachbearbeitungsfunktionen manueller Index @@ -5136,7 +5124,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 1009, 27 + 1013, 27 4 @@ -5181,7 +5169,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 26 - 1009, 406 + 1013, 409 automatische/feste Indexe @@ -5430,7 +5418,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3 - 1009, 406 + 1013, 409 Zuordnung Dokumentenart-Gruppe @@ -5841,7 +5829,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0 - 1009, 406 + 1013, 409 Dynamischer Ordnerpfad @@ -6331,7 +6319,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 1290, 27 + 1294, 27 2 @@ -6622,7 +6610,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1290, 752 + 1294, 755 Dokumentarten @@ -6675,12 +6663,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 778, 35 - - Cyan - - - Fuchsia - Username @@ -6819,9 +6801,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Top, Bottom, Left, Right - - Fuchsia - 255, 128, 255 @@ -7063,7 +7042,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3 - 1035, 248 + 1039, 251 Gruppenzuordnung User @@ -7476,7 +7455,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 1035, 27 + 1039, 27 4 @@ -7497,7 +7476,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 14 - 1035, 248 + 1039, 251 Gruppenverwaltung @@ -7958,7 +7937,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 1290, 27 + 1294, 27 3 @@ -7982,7 +7961,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1290, 752 + 1294, 755 User-/Gruppenverwaltung @@ -8591,7 +8570,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 2 - 1290, 752 + 1294, 755 Andere Einstellungen @@ -8997,7 +8976,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 17 - 1284, 25 + 1288, 25 0 @@ -9024,7 +9003,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 1290, 263 + 1294, 263 0 @@ -9045,7 +9024,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0 - 1290, 752 + 1294, 755 RegEx diff --git a/Global_Indexer/frmConfig_Basic.designer.vb b/Global_Indexer/frmConfig_Basic.designer.vb index 2e747d0..f553657 100644 --- a/Global_Indexer/frmConfig_Basic.designer.vb +++ b/Global_Indexer/frmConfig_Basic.designer.vb @@ -46,9 +46,6 @@ Partial Class frmConfig_Basic Me.CheckBoxPreviewDocs = New System.Windows.Forms.CheckBox() Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.chkLogErrorsOnly = New System.Windows.Forms.CheckBox() - Me.btnaddUniversalViewer = New System.Windows.Forms.Button() - Me.txtuniversalViewer = New System.Windows.Forms.TextBox() - Me.lblUniversalViewer = New System.Windows.Forms.Label() Me.btnLogMail = New System.Windows.Forms.Button() Me.btnApplicationFolder = New System.Windows.Forms.Button() Me.btnopenlog = New System.Windows.Forms.Button() @@ -180,9 +177,6 @@ Partial Class frmConfig_Basic Me.TabPage2.Controls.Add(Me.CheckBoxPreviewDocs) Me.TabPage2.Controls.Add(Me.CheckBox2) Me.TabPage2.Controls.Add(Me.chkLogErrorsOnly) - Me.TabPage2.Controls.Add(Me.btnaddUniversalViewer) - Me.TabPage2.Controls.Add(Me.txtuniversalViewer) - Me.TabPage2.Controls.Add(Me.lblUniversalViewer) Me.TabPage2.Controls.Add(Me.btnLogMail) Me.TabPage2.Controls.Add(Me.btnApplicationFolder) Me.TabPage2.Controls.Add(Me.btnopenlog) @@ -237,22 +231,6 @@ Partial Class frmConfig_Basic Me.chkLogErrorsOnly.Name = "chkLogErrorsOnly" Me.chkLogErrorsOnly.UseVisualStyleBackColor = True ' - 'btnaddUniversalViewer - ' - resources.ApplyResources(Me.btnaddUniversalViewer, "btnaddUniversalViewer") - Me.btnaddUniversalViewer.Name = "btnaddUniversalViewer" - Me.btnaddUniversalViewer.UseVisualStyleBackColor = True - ' - 'txtuniversalViewer - ' - resources.ApplyResources(Me.txtuniversalViewer, "txtuniversalViewer") - Me.txtuniversalViewer.Name = "txtuniversalViewer" - ' - 'lblUniversalViewer - ' - resources.ApplyResources(Me.lblUniversalViewer, "lblUniversalViewer") - Me.lblUniversalViewer.Name = "lblUniversalViewer" - ' 'btnLogMail ' Me.btnLogMail.Image = Global.Global_Indexer.My.Resources.Resources.email @@ -411,9 +389,6 @@ Partial Class frmConfig_Basic Friend WithEvents txtPasswort As System.Windows.Forms.TextBox Friend WithEvents BtnConnect As System.Windows.Forms.Button Friend WithEvents TabPage2 As System.Windows.Forms.TabPage - Friend WithEvents btnaddUniversalViewer As System.Windows.Forms.Button - Friend WithEvents txtuniversalViewer As System.Windows.Forms.TextBox - Friend WithEvents lblUniversalViewer As System.Windows.Forms.Label Friend WithEvents OpenFileDialog1 As System.Windows.Forms.OpenFileDialog Friend WithEvents TabPage3 As System.Windows.Forms.TabPage Friend WithEvents Label6 As System.Windows.Forms.Label diff --git a/Global_Indexer/frmConfig_Basic.resx b/Global_Indexer/frmConfig_Basic.resx index 7371f3f..823408e 100644 --- a/Global_Indexer/frmConfig_Basic.resx +++ b/Global_Indexer/frmConfig_Basic.resx @@ -255,7 +255,7 @@ 255, 14 - 84, 13 + 83, 13 42 @@ -451,7 +451,7 @@ True - 224, 223 + 224, 178 153, 13 @@ -475,7 +475,7 @@ 0 - 197, 140 + 197, 95 134, 23 @@ -505,7 +505,7 @@ English - 11, 142 + 11, 97 180, 21 @@ -529,7 +529,7 @@ True - 8, 126 + 8, 81 96, 13 @@ -556,7 +556,7 @@ True - 11, 56 + 11, 11 220, 17 @@ -583,7 +583,7 @@ True - 242, 89 + 242, 44 230, 30 @@ -611,7 +611,7 @@ True - 11, 96 + 11, 51 146, 17 @@ -634,83 +634,11 @@ 6 - - 478, 26 - - - 30, 23 - - - 2 - - - ... - - - btnaddUniversalViewer - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 7 - - - 11, 28 - - - 461, 22 - - - 1 - - - txtuniversalViewer - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 8 - - - True - - - 8, 12 - - - 95, 13 - - - 0 - - - Universal Viewer: - - - lblUniversalViewer - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage2 - - - 9 - MiddleLeft - 11, 216 + 11, 171 180, 26 @@ -734,13 +662,13 @@ TabPage2 - 10 + 7 MiddleLeft - 11, 185 + 11, 140 180, 23 @@ -764,7 +692,7 @@ TabPage2 - 11 + 8 MiddleLeft @@ -773,7 +701,7 @@ NoControl - 197, 185 + 197, 140 180, 23 @@ -797,7 +725,7 @@ TabPage2 - 12 + 9 4, 22 diff --git a/Global_Indexer/frmConfig_Basic.vb b/Global_Indexer/frmConfig_Basic.vb index 52556d9..477043b 100644 --- a/Global_Indexer/frmConfig_Basic.vb +++ b/Global_Indexer/frmConfig_Basic.vb @@ -123,55 +123,11 @@ Public Class frmConfig_Basic Cursor = Cursors.Default End Sub - Private Sub frmConfig_Basic_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - 'SaveConfigValue("UniversalViewer", txtuniversalViewer.Text) - CONFIG.Config.UniversalViewerPath = txtuniversalViewer.Text - CONFIG.Save() - End Sub _ Private Sub frmConfig_Basic_Load(sender As Object, e As EventArgs) Handles MyBase.Load End Sub - _ - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnaddUniversalViewer.Click - Try - With OpenFileDialog1 - ' Do - If txtuniversalViewer.Text <> "" Then - Try - OpenFileDialog1.InitialDirectory = Path.GetDirectoryName(txtuniversalViewer.Text) - Catch ex As Exception - End Try - - End If - .Filter = "Viewer.Exe|*.exe" - .FilterIndex = 1 - - If USER_LANGUAGE = "de-DE" Then - .Title = "Pfad zu Universal Viewer.exe:" - Else - .Title = "Path to Universal Viewer.exe" - End If - - - If .ShowDialog() = DialogResult.OK Then - Me.txtuniversalViewer.Text = .FileName - 'SaveConfigValue("UniversalViewer", txtuniversalViewer.Text) - UniversalViewer_Path = txtuniversalViewer.Text - CONFIG.Config.UniversalViewerPath = txtuniversalViewer.Text - CONFIG.Save() - End If - End With - Catch ex As Exception - If ex.Message.Contains("aktuellen Thread muss der STA-Modus") Then - MsgBox("Diese Einstellung kann während des Starts nicht geändert werden!" & vbNewLine & "Schliessen Sie das Formular. Sie weren in Folge erneut aufgefordert den PFad zu UViewer einzugeben!", MsgBoxStyle.Information) - Else - MsgBox("Unexpected error in Add UViewer-Path:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End If - End Try - - End Sub Dim reload As Boolean = False Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged Select Case TabControl1.SelectedIndex @@ -432,19 +388,11 @@ Public Class frmConfig_Basic Me.txtActualConnection.Text = constr End If - Me.txtuniversalViewer.Text = UniversalViewer_Path - chkLogErrorsOnly.Checked = LogErrorsOnly - txtuniversalViewer.Enabled = True - btnaddUniversalViewer.Enabled = True If ERROR_STATE = "FAILED DBCONNECTION" Then Me.TabControl1.SelectedIndex = 0 ElseIf ERROR_STATE = "NO DB-CONNECTION" Then Me.TabControl1.SelectedIndex = 0 - txtuniversalViewer.Enabled = False - btnaddUniversalViewer.Enabled = False - ElseIf ERROR_STATE = "NO UV" Then - Me.TabControl1.SelectedIndex = 1 End If Catch ex As Exception MsgBox("Unexpected Error in Load_Basics:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb index 33372c4..174432d 100644 --- a/Global_Indexer/frmIndex.designer.vb +++ b/Global_Indexer/frmIndex.designer.vb @@ -40,45 +40,6 @@ Partial Class frmIndex Me.Label2 = New System.Windows.Forms.Label() Me.txtIndexfilepath = New System.Windows.Forms.TextBox() Me.btnOK = New System.Windows.Forms.Button() - Me.grpbxMailBody = New System.Windows.Forms.GroupBox() - Me.WebBrowser = New System.Windows.Forms.WebBrowser() - Me.StatusStrip3 = New System.Windows.Forms.StatusStrip() - Me.tslblWebbrowser = New System.Windows.Forms.ToolStripStatusLabel() - Me.grpBetreff = New System.Windows.Forms.GroupBox() - Me.txtBetreff = New System.Windows.Forms.TextBox() - Me.pnlPDF = New System.Windows.Forms.Panel() - Me.PdfViewer1 = New DevExpress.XtraPdfViewer.PdfViewer() - Me.StatusStrip2 = New System.Windows.Forms.StatusStrip() - Me.pdfstatuslblPageNumber = New System.Windows.Forms.ToolStripStatusLabel() - Me.ToolStripDropDownButton1 = New System.Windows.Forms.ToolStripDropDownButton() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.PdfFileOpenBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem() - Me.PdfFileSaveAsBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem() - Me.PdfFilePrintBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem() - Me.PdfPreviousPageBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem() - Me.PdfNextPageBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem() - Me.PdfFindTextBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem() - Me.PdfZoomOutBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem() - Me.PdfZoomInBarItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem() - Me.PdfExactZoomListBarSubItem1 = New DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem() - Me.PdfZoom10CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem() - Me.PdfZoom25CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem() - Me.PdfZoom50CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem() - Me.PdfZoom75CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem() - Me.PdfZoom100CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem() - Me.PdfZoom125CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem() - Me.PdfZoom150CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem() - Me.PdfZoom200CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem() - Me.PdfZoom400CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem() - Me.PdfZoom500CheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem() - Me.PdfSetActualSizeZoomModeCheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem() - Me.PdfSetPageLevelZoomModeCheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem() - Me.PdfSetFitWidthZoomModeCheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem() - Me.PdfSetFitVisibleZoomModeCheckItem1 = New DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem() - Me.PdfRibbonPage1 = New DevExpress.XtraPdfViewer.Bars.PdfRibbonPage() - Me.PdfFileRibbonPageGroup1 = New DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup() - Me.PdfNavigationRibbonPageGroup1 = New DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup() - Me.PdfZoomRibbonPageGroup1 = New DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.lblhinweis = New System.Windows.Forms.ToolStripStatusLabel() Me.tslblVorschau = New System.Windows.Forms.ToolStripStatusLabel() @@ -88,8 +49,9 @@ Partial Class frmIndex Me.TableAdapterManager = New Global_Indexer.MyDatasetTableAdapters.TableAdapterManager() Me.VWINDEX_AUTOMBindingSource1 = New System.Windows.Forms.BindingSource(Me.components) Me.VWINDEX_AUTOMTableAdapter = New Global_Indexer.MyDatasetTableAdapters.VWDDINDEX_AUTOMTableAdapter() - Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController() - Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController() + Me.PdfBarController1 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) + Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -97,12 +59,6 @@ Partial Class frmIndex Me.Panel1.SuspendLayout() Me.ToolStrip1.SuspendLayout() Me.Panel2.SuspendLayout() - Me.grpbxMailBody.SuspendLayout() - Me.StatusStrip3.SuspendLayout() - Me.grpBetreff.SuspendLayout() - Me.pnlPDF.SuspendLayout() - Me.StatusStrip2.SuspendLayout() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWDDINDEX_MANBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -124,9 +80,7 @@ Partial Class frmIndex ' 'SplitContainer1.Panel2 ' - Me.SplitContainer1.Panel2.Controls.Add(Me.grpbxMailBody) - Me.SplitContainer1.Panel2.Controls.Add(Me.grpBetreff) - Me.SplitContainer1.Panel2.Controls.Add(Me.pnlPDF) + Me.SplitContainer1.Panel2.Controls.Add(Me.DocumentViewer1) ' 'pnlIndex ' @@ -235,238 +189,6 @@ Partial Class frmIndex Me.btnOK.Image = Global.Global_Indexer.My.Resources.Resources.Go Me.btnOK.Name = "btnOK" ' - 'grpbxMailBody - ' - Me.grpbxMailBody.Controls.Add(Me.WebBrowser) - Me.grpbxMailBody.Controls.Add(Me.StatusStrip3) - resources.ApplyResources(Me.grpbxMailBody, "grpbxMailBody") - Me.grpbxMailBody.Name = "grpbxMailBody" - Me.grpbxMailBody.TabStop = False - ' - 'WebBrowser - ' - resources.ApplyResources(Me.WebBrowser, "WebBrowser") - Me.WebBrowser.Name = "WebBrowser" - ' - 'StatusStrip3 - ' - Me.StatusStrip3.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.StatusStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWebbrowser}) - resources.ApplyResources(Me.StatusStrip3, "StatusStrip3") - Me.StatusStrip3.Name = "StatusStrip3" - ' - 'tslblWebbrowser - ' - Me.tslblWebbrowser.Name = "tslblWebbrowser" - resources.ApplyResources(Me.tslblWebbrowser, "tslblWebbrowser") - ' - 'grpBetreff - ' - Me.grpBetreff.Controls.Add(Me.txtBetreff) - resources.ApplyResources(Me.grpBetreff, "grpBetreff") - Me.grpBetreff.Name = "grpBetreff" - Me.grpBetreff.TabStop = False - ' - 'txtBetreff - ' - Me.txtBetreff.BackColor = System.Drawing.SystemColors.Info - resources.ApplyResources(Me.txtBetreff, "txtBetreff") - Me.txtBetreff.Name = "txtBetreff" - Me.txtBetreff.ReadOnly = True - ' - 'pnlPDF - ' - - Me.pnlPDF.Controls.Add(Me.PdfViewer1) - Me.pnlPDF.Controls.Add(Me.StatusStrip2) - Me.pnlPDF.Controls.Add(Me.RibbonControl1) - resources.ApplyResources(Me.pnlPDF, "pnlPDF") - Me.pnlPDF.Name = "pnlPDF" - ' - - ' - 'PdfViewer1 - ' - Me.PdfViewer1.DetachStreamAfterLoadComplete = True - resources.ApplyResources(Me.PdfViewer1, "PdfViewer1") - Me.PdfViewer1.Name = "PdfViewer1" - ' - 'StatusStrip2 - ' - Me.StatusStrip2.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.StatusStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.pdfstatuslblPageNumber, Me.ToolStripDropDownButton1}) - resources.ApplyResources(Me.StatusStrip2, "StatusStrip2") - Me.StatusStrip2.Name = "StatusStrip2" - ' - 'pdfstatuslblPageNumber - ' - resources.ApplyResources(Me.pdfstatuslblPageNumber, "pdfstatuslblPageNumber") - Me.pdfstatuslblPageNumber.Image = Global.Global_Indexer.My.Resources.Resources.page_red - Me.pdfstatuslblPageNumber.Name = "pdfstatuslblPageNumber" - ' - 'ToolStripDropDownButton1 - ' - resources.ApplyResources(Me.ToolStripDropDownButton1, "ToolStripDropDownButton1") - Me.ToolStripDropDownButton1.Name = "ToolStripDropDownButton1" - ' - 'RibbonControl1 - ' - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.PdfFileOpenBarItem1, Me.PdfFileSaveAsBarItem1, Me.PdfFilePrintBarItem1, Me.PdfPreviousPageBarItem1, Me.PdfNextPageBarItem1, Me.PdfFindTextBarItem1, Me.PdfZoomOutBarItem1, Me.PdfZoomInBarItem1, Me.PdfExactZoomListBarSubItem1, Me.PdfZoom10CheckItem1, Me.PdfZoom25CheckItem1, Me.PdfZoom50CheckItem1, Me.PdfZoom75CheckItem1, Me.PdfZoom100CheckItem1, Me.PdfZoom125CheckItem1, Me.PdfZoom150CheckItem1, Me.PdfZoom200CheckItem1, Me.PdfZoom400CheckItem1, Me.PdfZoom500CheckItem1, Me.PdfSetActualSizeZoomModeCheckItem1, Me.PdfSetPageLevelZoomModeCheckItem1, Me.PdfSetFitWidthZoomModeCheckItem1, Me.PdfSetFitVisibleZoomModeCheckItem1}) - resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 24 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.PdfRibbonPage1}) - Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010 - Me.RibbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Above - ' - 'PdfFileOpenBarItem1 - ' - Me.PdfFileOpenBarItem1.Id = 1 - Me.PdfFileOpenBarItem1.ItemShortcut = New DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O)) - Me.PdfFileOpenBarItem1.Name = "PdfFileOpenBarItem1" - ' - 'PdfFileSaveAsBarItem1 - ' - Me.PdfFileSaveAsBarItem1.Id = 2 - Me.PdfFileSaveAsBarItem1.ItemShortcut = New DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S)) - Me.PdfFileSaveAsBarItem1.Name = "PdfFileSaveAsBarItem1" - ' - 'PdfFilePrintBarItem1 - ' - Me.PdfFilePrintBarItem1.Id = 3 - Me.PdfFilePrintBarItem1.ItemShortcut = New DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P)) - Me.PdfFilePrintBarItem1.Name = "PdfFilePrintBarItem1" - ' - 'PdfPreviousPageBarItem1 - ' - Me.PdfPreviousPageBarItem1.Id = 4 - Me.PdfPreviousPageBarItem1.Name = "PdfPreviousPageBarItem1" - ' - 'PdfNextPageBarItem1 - ' - Me.PdfNextPageBarItem1.Id = 5 - Me.PdfNextPageBarItem1.Name = "PdfNextPageBarItem1" - ' - 'PdfFindTextBarItem1 - ' - Me.PdfFindTextBarItem1.Id = 6 - Me.PdfFindTextBarItem1.ItemShortcut = New DevExpress.XtraBars.BarShortcut((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F)) - Me.PdfFindTextBarItem1.Name = "PdfFindTextBarItem1" - ' - 'PdfZoomOutBarItem1 - ' - Me.PdfZoomOutBarItem1.Id = 7 - Me.PdfZoomOutBarItem1.Name = "PdfZoomOutBarItem1" - ' - 'PdfZoomInBarItem1 - ' - Me.PdfZoomInBarItem1.Id = 8 - Me.PdfZoomInBarItem1.Name = "PdfZoomInBarItem1" - ' - 'PdfExactZoomListBarSubItem1 - ' - Me.PdfExactZoomListBarSubItem1.Id = 9 - Me.PdfExactZoomListBarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom10CheckItem1, True), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom25CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom50CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom75CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom100CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom125CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom150CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom200CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom400CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfZoom500CheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfSetActualSizeZoomModeCheckItem1, True), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfSetPageLevelZoomModeCheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfSetFitWidthZoomModeCheckItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.PdfSetFitVisibleZoomModeCheckItem1)}) - Me.PdfExactZoomListBarSubItem1.Name = "PdfExactZoomListBarSubItem1" - Me.PdfExactZoomListBarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionInMenu - ' - 'PdfZoom10CheckItem1 - ' - Me.PdfZoom10CheckItem1.Id = 10 - Me.PdfZoom10CheckItem1.Name = "PdfZoom10CheckItem1" - ' - 'PdfZoom25CheckItem1 - ' - Me.PdfZoom25CheckItem1.Id = 11 - Me.PdfZoom25CheckItem1.Name = "PdfZoom25CheckItem1" - ' - 'PdfZoom50CheckItem1 - ' - Me.PdfZoom50CheckItem1.Id = 12 - Me.PdfZoom50CheckItem1.Name = "PdfZoom50CheckItem1" - ' - 'PdfZoom75CheckItem1 - ' - Me.PdfZoom75CheckItem1.Id = 13 - Me.PdfZoom75CheckItem1.Name = "PdfZoom75CheckItem1" - ' - 'PdfZoom100CheckItem1 - ' - Me.PdfZoom100CheckItem1.Id = 14 - Me.PdfZoom100CheckItem1.Name = "PdfZoom100CheckItem1" - ' - 'PdfZoom125CheckItem1 - ' - Me.PdfZoom125CheckItem1.Id = 15 - Me.PdfZoom125CheckItem1.Name = "PdfZoom125CheckItem1" - ' - 'PdfZoom150CheckItem1 - ' - Me.PdfZoom150CheckItem1.Id = 16 - Me.PdfZoom150CheckItem1.Name = "PdfZoom150CheckItem1" - ' - 'PdfZoom200CheckItem1 - ' - Me.PdfZoom200CheckItem1.Id = 17 - Me.PdfZoom200CheckItem1.Name = "PdfZoom200CheckItem1" - ' - 'PdfZoom400CheckItem1 - ' - Me.PdfZoom400CheckItem1.Id = 18 - Me.PdfZoom400CheckItem1.Name = "PdfZoom400CheckItem1" - ' - 'PdfZoom500CheckItem1 - ' - Me.PdfZoom500CheckItem1.Id = 19 - Me.PdfZoom500CheckItem1.Name = "PdfZoom500CheckItem1" - ' - 'PdfSetActualSizeZoomModeCheckItem1 - ' - Me.PdfSetActualSizeZoomModeCheckItem1.Id = 20 - Me.PdfSetActualSizeZoomModeCheckItem1.Name = "PdfSetActualSizeZoomModeCheckItem1" - ' - 'PdfSetPageLevelZoomModeCheckItem1 - ' - Me.PdfSetPageLevelZoomModeCheckItem1.Id = 21 - Me.PdfSetPageLevelZoomModeCheckItem1.Name = "PdfSetPageLevelZoomModeCheckItem1" - ' - 'PdfSetFitWidthZoomModeCheckItem1 - ' - Me.PdfSetFitWidthZoomModeCheckItem1.Id = 22 - Me.PdfSetFitWidthZoomModeCheckItem1.Name = "PdfSetFitWidthZoomModeCheckItem1" - ' - 'PdfSetFitVisibleZoomModeCheckItem1 - ' - Me.PdfSetFitVisibleZoomModeCheckItem1.Id = 23 - Me.PdfSetFitVisibleZoomModeCheckItem1.Name = "PdfSetFitVisibleZoomModeCheckItem1" - ' - 'PdfRibbonPage1 - ' - Me.PdfRibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.PdfFileRibbonPageGroup1, Me.PdfNavigationRibbonPageGroup1, Me.PdfZoomRibbonPageGroup1}) - Me.PdfRibbonPage1.Name = "PdfRibbonPage1" - ' - 'PdfFileRibbonPageGroup1 - ' - Me.PdfFileRibbonPageGroup1.ItemLinks.Add(Me.PdfFileOpenBarItem1) - Me.PdfFileRibbonPageGroup1.ItemLinks.Add(Me.PdfFileSaveAsBarItem1) - Me.PdfFileRibbonPageGroup1.ItemLinks.Add(Me.PdfFilePrintBarItem1) - Me.PdfFileRibbonPageGroup1.Name = "PdfFileRibbonPageGroup1" - ' - 'PdfNavigationRibbonPageGroup1 - ' - Me.PdfNavigationRibbonPageGroup1.ItemLinks.Add(Me.PdfPreviousPageBarItem1) - Me.PdfNavigationRibbonPageGroup1.ItemLinks.Add(Me.PdfNextPageBarItem1) - Me.PdfNavigationRibbonPageGroup1.ItemLinks.Add(Me.PdfFindTextBarItem1) - Me.PdfNavigationRibbonPageGroup1.Name = "PdfNavigationRibbonPageGroup1" - ' - 'PdfZoomRibbonPageGroup1 - ' - Me.PdfZoomRibbonPageGroup1.ItemLinks.Add(Me.PdfZoomOutBarItem1) - Me.PdfZoomRibbonPageGroup1.ItemLinks.Add(Me.PdfZoomInBarItem1) - Me.PdfZoomRibbonPageGroup1.ItemLinks.Add(Me.PdfExactZoomListBarSubItem1) - Me.PdfZoomRibbonPageGroup1.Name = "PdfZoomRibbonPageGroup1" - ' 'StatusStrip1 ' Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) @@ -530,32 +252,10 @@ Partial Class frmIndex ' Me.VWINDEX_AUTOMTableAdapter.ClearBeforeFill = True ' - 'PdfBarController2 + 'DocumentViewer1 ' - Me.PdfBarController2.BarItems.Add(Me.PdfFileOpenBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfFileSaveAsBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfFilePrintBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfPreviousPageBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfNextPageBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfFindTextBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoomOutBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoomInBarItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfExactZoomListBarSubItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom10CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom25CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom50CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom75CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom100CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom125CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom150CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom200CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom400CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfZoom500CheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfSetActualSizeZoomModeCheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfSetPageLevelZoomModeCheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfSetFitWidthZoomModeCheckItem1) - Me.PdfBarController2.BarItems.Add(Me.PdfSetFitVisibleZoomModeCheckItem1) - Me.PdfBarController2.Control = Me.PdfViewer1 + resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") + Me.DocumentViewer1.Name = "DocumentViewer1" ' 'frmIndex ' @@ -578,17 +278,6 @@ Partial Class frmIndex Me.ToolStrip1.PerformLayout() Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() - Me.grpbxMailBody.ResumeLayout(False) - Me.grpbxMailBody.PerformLayout() - Me.StatusStrip3.ResumeLayout(False) - Me.StatusStrip3.PerformLayout() - Me.grpBetreff.ResumeLayout(False) - Me.grpBetreff.PerformLayout() - Me.pnlPDF.ResumeLayout(False) - Me.pnlPDF.PerformLayout() - Me.StatusStrip2.ResumeLayout(False) - Me.StatusStrip2.PerformLayout() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() @@ -630,51 +319,12 @@ Partial Class frmIndex Friend WithEvents chkdelete_origin As System.Windows.Forms.CheckBox Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer Friend WithEvents pnlIndex As System.Windows.Forms.Panel - Friend WithEvents pnlPDF As System.Windows.Forms.Panel Friend WithEvents PdfBarController1 As DevExpress.XtraPdfViewer.Bars.PdfBarController - Friend WithEvents PdfViewer1 As DevExpress.XtraPdfViewer.PdfViewer - Friend WithEvents StatusStrip2 As System.Windows.Forms.StatusStrip - Friend WithEvents pdfstatuslblPageNumber As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents ToolStripDropDownButton1 As System.Windows.Forms.ToolStripDropDownButton - Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents PdfFileOpenBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem - Friend WithEvents PdfFileSaveAsBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem - Friend WithEvents PdfFilePrintBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem - Friend WithEvents PdfPreviousPageBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem - Friend WithEvents PdfNextPageBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem - Friend WithEvents PdfFindTextBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem - Friend WithEvents PdfZoomOutBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem - Friend WithEvents PdfZoomInBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem - Friend WithEvents PdfExactZoomListBarSubItem1 As DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem - Friend WithEvents PdfZoom10CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem - Friend WithEvents PdfZoom25CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem - Friend WithEvents PdfZoom50CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem - Friend WithEvents PdfZoom75CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem - Friend WithEvents PdfZoom100CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem - Friend WithEvents PdfZoom125CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem - Friend WithEvents PdfZoom150CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem - Friend WithEvents PdfZoom200CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem - Friend WithEvents PdfZoom400CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem - Friend WithEvents PdfZoom500CheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem - Friend WithEvents PdfSetActualSizeZoomModeCheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem - Friend WithEvents PdfSetPageLevelZoomModeCheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem - Friend WithEvents PdfSetFitWidthZoomModeCheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem - Friend WithEvents PdfSetFitVisibleZoomModeCheckItem1 As DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem - Friend WithEvents PdfRibbonPage1 As DevExpress.XtraPdfViewer.Bars.PdfRibbonPage - Friend WithEvents PdfFileRibbonPageGroup1 As DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup - Friend WithEvents PdfNavigationRibbonPageGroup1 As DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup - Friend WithEvents PdfZoomRibbonPageGroup1 As DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup Friend WithEvents PdfBarController2 As DevExpress.XtraPdfViewer.Bars.PdfBarController - Friend WithEvents StatusStrip3 As System.Windows.Forms.StatusStrip - Friend WithEvents tslblWebbrowser As System.Windows.Forms.ToolStripStatusLabel - Friend WithEvents WebBrowser As System.Windows.Forms.WebBrowser Friend WithEvents chkMultiIndexer As System.Windows.Forms.CheckBox Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton - Friend WithEvents grpBetreff As System.Windows.Forms.GroupBox - Friend WithEvents txtBetreff As System.Windows.Forms.TextBox - Friend WithEvents grpbxMailBody As System.Windows.Forms.GroupBox Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents CheckBox1 As System.Windows.Forms.CheckBox - + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer End Class diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index 5d14027..35fe3d4 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -235,7 +235,7 @@ Magenta - 121, 24 + 120, 24 Top Most = False @@ -585,254 +585,32 @@ 0 - + Fill - - 3, 21 - - - 20, 20 - - - 194, 54 - - - 2 - - - WebBrowser - - - System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxMailBody - - - 0 - - - 657, 56 - - - 120, 17 - - - ToolStripStatusLabel1 - - - 3, 75 - - - 194, 22 - - - 0 - - - StatusStrip3 - - - StatusStrip3 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxMailBody - - - 1 - - - Segoe UI Semibold, 9.75pt, style=Bold, Italic - - - 58, 352 - - - 200, 100 - - - 5 - - - Mail-Body: - - - grpbxMailBody - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel2 - - - 0 - - - Fill - - - Segoe UI, 9.75pt, style=Italic - - - 3, 21 - - - 194, 25 - - - 0 - - - txtBetreff - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpBetreff - - - 0 - - - Segoe UI Semibold, 9.75pt, style=Bold, Italic - - - 20, 64 - - - 200, 58 - - - 4 - - - Betreff - - - grpBetreff - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel2 - - - 1 - - - Fill - - - 0, 141 - - - 314, 142 - - - 4 - - - PdfViewer1 - - - DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - pnlPDF - - - 1 - - - 392, 56 - - - Segoe UI Semibold, 9pt, style=Bold, Italic - - - 143, 20 - - - ToolStripStatusLabel1 - - - Magenta - - - 137, 23 - - - Seitenansicht Minimal - - - 0, 283 - - - 314, 25 - - - 3 - - - StatusStrip2 - - - StatusStrip2 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlPDF - - - 2 - - + 0, 0 - - 314, 141 + + 3, 4, 3, 4 - - RibbonControl1 + + 365, 493 - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 0 - - pnlPDF + + DocumentViewer1 - - 3 + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - 67, 25 - - - 314, 308 - - - 1 - - - pnlPDF - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + SplitContainer1.Panel2 - - 2 + + 0 SplitContainer1.Panel2 @@ -966,186 +744,6 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tslblWebbrowser - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pdfstatuslblPageNumber - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripDropDownButton1 - - - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - PdfFileOpenBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfFileSaveAsBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfFileSaveAsBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfFilePrintBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfFilePrintBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfPreviousPageBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfPreviousPageBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfNextPageBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfNextPageBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfFindTextBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfFindTextBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoomOutBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoomOutBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoomInBarItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoomInBarItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfExactZoomListBarSubItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfExactZoomListBarSubItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom10CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom10CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom25CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom25CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom50CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom50CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom75CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom75CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom100CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom100CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom125CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom125CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom150CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom150CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom200CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom200CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom400CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom400CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoom500CheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoom500CheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfSetActualSizeZoomModeCheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfSetActualSizeZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfSetPageLevelZoomModeCheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfSetPageLevelZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfSetFitWidthZoomModeCheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfSetFitWidthZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfSetFitVisibleZoomModeCheckItem1 - - - DevExpress.XtraPdfViewer.Bars.PdfSetFitVisibleZoomModeCheckItem, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfRibbonPage1 - - - DevExpress.XtraPdfViewer.Bars.PdfRibbonPage, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfFileRibbonPageGroup1 - - - DevExpress.XtraPdfViewer.Bars.PdfFileRibbonPageGroup, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfNavigationRibbonPageGroup1 - - - DevExpress.XtraPdfViewer.Bars.PdfNavigationRibbonPageGroup, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PdfZoomRibbonPageGroup1 - - - DevExpress.XtraPdfViewer.Bars.PdfZoomRibbonPageGroup, DevExpress.XtraPdfViewer.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - lblhinweis diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 1f180fc..87bee1f 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -1901,6 +1901,8 @@ Public Class frmIndex End Sub Private Sub frmIndex_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing Try + DocumentViewer1.Dispose() + ClassWindowLocation.SaveFormLocationSize(Me) CloseUniversalViewer() My.Settings.Save() @@ -1915,7 +1917,7 @@ Public Class frmIndex If Not workfile.EndsWith("msg") Then CURRENT_HTML_DOC = "" If workfile.EndsWith("pdf") Then - Me.PdfViewer1.DocumentFilePath = "" + DocumentViewer1.CloseFile() My.Settings.SplitterDistance_Viewer = SplitContainer1.SplitterDistance Else Dim pProcess() As Process = System.Diagnostics.Process.GetProcessesByName("Viewer") @@ -1950,7 +1952,12 @@ Public Class frmIndex CURRENT_ISATTACHMENT = False DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True) chkdelete_origin.Visible = False - 'DocumentViewer1.Init(LOGCONFIG, "21182889975216572111813147150675976632") + + 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) + CURRENT_DROPTYPE = DropType.Replace("|", "") If DropType = "|DROPFROMFSYSTEM|" Then chkdelete_origin.Visible = True @@ -2578,155 +2585,10 @@ Public Class frmIndex Sub PreviewFile() Try - Dim Proc As New System.Diagnostics.Process - Me.grpbxMailBody.Visible = False - Me.grpBetreff.Visible = False - Me.pnlPDF.Visible = False - CURRENT_HTML_DOC = "" - Dim workfile As String = CURRENT_WORKFILE.ToLower - 'DocumentViewer1.LoadFile(CURRENT_WORKFILE) - - If Not workfile.EndsWith("msg") Then - CURRENT_HTML_DOC = "" - If workfile.EndsWith("pdf") Then - Me.SplitContainer1.Panel2Collapsed = False - PdfViewer1.LoadDocument(CURRENT_WORKFILE) - PdfViewer1.ZoomMode = DevExpress.XtraPdfViewer.PdfZoomMode.FitToWidth - pnlPDF.Dock = DockStyle.Fill - SplitContainer1.SplitterDistance = My.Settings.SplitterDistance_Viewer - Me.pnlPDF.Visible = True - Else - Me.SplitContainer1.Panel2Collapsed = True - Select Case Path.GetExtension(CURRENT_WORKFILE) - Case ".docx" - Dim pProcess() As Process = System.Diagnostics.Process.GetProcessesByName("winword") - Dim filename As String = Path.GetFileNameWithoutExtension(CURRENT_WORKFILE) - For Each p As Process In pProcess - If p.MainWindowTitle.Contains(filename) Then - p.CloseMainWindow() - End If - Next - Case ".xlsx" - Dim pProcess() As Process = System.Diagnostics.Process.GetProcessesByName("excel") - Dim filename As String = Path.GetFileNameWithoutExtension(CURRENT_WORKFILE) - For Each p As Process In pProcess - If p.MainWindowTitle.Contains(filename) Then - p.CloseMainWindow() - End If - Next - Case Else - If My.Settings.DoNot_Show_Documents = False And UniversalViewer_Path <> "" Then - If File.Exists(UniversalViewer_Path) Then - Dim psi As New ProcessStartInfo(UniversalViewer_Path, """" & CURRENT_WORKFILE & """") - Proc.EnableRaisingEvents = True - Proc.StartInfo = psi - Proc.Start() - End If - End If - End Select - End If - - Else - Dim tempFilename = My.Computer.FileSystem.GetTempFileName() - Dim tempFilename1 = My.Computer.FileSystem.GetTempFileName() - Try - Me.grpBetreff.Dock = DockStyle.Top - Me.grpbxMailBody.Dock = DockStyle.Fill - - 'Dim msg_email As New Msg.Message(CURRENT_WORKFILE) - 'Dim foo As New Email.Mime.Message(CURRENT_WORKFILE) - Dim msg_email As New Msg.Message() - msg_email.Encoding = Encoding.UTF8 - msg_email.Open(CURRENT_WORKFILE) - - Dim headers As String = ClassEmailHeaderExtractor.getMessageHeaders(msg_email) - If LogErrorsOnly = False Then ClassLogger.Add(" EMAIL-HEADER: " & headers, False) - 'Eine tempfile generieren - Dim name = Path.GetFileNameWithoutExtension(tempFilename) - tempFilename = Path.Combine(Path.GetDirectoryName(tempFilename), name & ".html") - name = Path.GetFileNameWithoutExtension(tempFilename1) - tempFilename1 = Path.Combine(Path.GetDirectoryName(tempFilename1), name & ".msg") - msg_email.Save(tempFilename1) - Dim msg_email_unicode As New Msg.Message(tempFilename1) - TEMP_FILES.Add(tempFilename) - TEMP_FILES.Add(tempFilename1) - - If LogErrorsOnly = False Then ClassLogger.Add(" ...tempFilename: " & tempFilename, False) - If LogErrorsOnly = False Then ClassLogger.Add(" ...tempFilename1: " & tempFilename1, False) - 'tempfile löschen - If My.Computer.FileSystem.FileExists(tempFilename) Then - My.Computer.FileSystem.DeleteFile(tempFilename) - End If - - Dim codepage As Integer = Console.OutputEncoding.CodePage - Dim msg_email_subject As New Msg.Message() - msg_email_subject.Encoding = Encoding.GetEncoding(codepage) - msg_email_subject.Open(CURRENT_WORKFILE) - - If msg_email_subject.Subject = "" Then - Me.txtBetreff.Text = "!!No subject in email!!" - Else - If LogErrorsOnly = False Then ClassLogger.Add(" ...subject before converting: '" & msg_email_subject.Subject & "'", False) - Dim betreff = ClassHelper.encode_utf8(msg_email_subject.Subject) - If Not IsNothing(betreff) Then - If ClassHelper.CheckSpecialSigns(betreff) > 0 Then - - End If - - If LogErrorsOnly = False Then ClassLogger.Add(" ...subject after converting: " & betreff, False) - Me.txtBetreff.Text = betreff - Else - ClassLogger.Add(" ...subject could not be converted to utf8!", False) - Me.txtBetreff.Text = msg_email_subject.Subject - End If - End If - - 'Try - Dim wFile As System.IO.FileStream - Dim byteData() As Byte - byteData = msg_email_unicode.BodyHtml - If LogErrorsOnly = False Then ClassLogger.Add(" ...byteData HTML finished", False) - ' MsgBox(msg_email.InternetCodePage) - ' wFile = New FileStream(tempFilename, FileMode.Append) - ' wFile.Write(byteData, 0, byteData.Length) - ' wFile.Close() - 'Catch ex As IOException - ' MsgBox(ex.ToString) - 'End Try - If IsNothing(msg_email_unicode.BodyHtml) Then - File.WriteAllText(tempFilename, msg_email_unicode.Body, System.Text.Encoding.UTF8) - Else - Dim vOut As String = System.Text.Encoding.UTF8.GetString(msg_email_unicode.BodyHtml) - File.WriteAllText(tempFilename, vOut, System.Text.Encoding.UTF8) - End If - - If LogErrorsOnly = False Then ClassLogger.Add(" ...byteData and write to file finished.", False) - Catch ex As Exception - MsgBox("Unexpected Error in getHTML from Email: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - - CURRENT_HTML_DOC = tempFilename - Me.tslblWebbrowser.Text = CURRENT_HTML_DOC - WebBrowser.Navigate("file:///" & CURRENT_HTML_DOC) - Me.grpbxMailBody.Visible = True - Me.grpBetreff.Visible = True - Me.SplitContainer1.Panel2Collapsed = False - SplitContainer1.SplitterDistance = My.Settings.SplitterDistance_Viewer - End If - ' Dim psi1 As New ProcessStartInfo("""" & CURRENT_WORKFILE & """") - ' Proc.EnableRaisingEvents = True - ' Proc.StartInfo = psi1 - ' Proc.Start() - ' Me.tslblVorschau.Visible = True - 'Else - - - ' End If - + DocumentViewer1.LoadFile(CURRENT_WORKFILE) Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in PreviewFile:") End Try - End Sub Private Function UnicodeBytesToString(ByVal bytes() As Byte) As String Return System.Text.Encoding.UTF8.GetString(bytes) @@ -2783,7 +2645,7 @@ Public Class frmIndex ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then 'Die temporäre Datei löschen If CURRENT_WORKFILE.EndsWith("pdf") Then - Me.PdfViewer1.DocumentFilePath = "" + DocumentViewer1.CloseFile() End If DeleteFile() @@ -3016,31 +2878,6 @@ Public Class frmIndex End Try End Function - Private Sub PdfViewer1_ZoomChanged(sender As Object, e As DevExpress.XtraPdfViewer.PdfZoomChangedEventArgs) - If Not PdfViewer1.ZoomMode = DevExpress.XtraPdfViewer.PdfZoomMode.Custom Then - 'SaveMySettingsValue("PDFViewer_ZoomMode", PdfViewer1.ZoomMode) - 'PDFViewer_ZoomMode = PdfViewer1.ZoomMode - End If - End Sub - - Private Sub PdfViewer1_DocumentChanged(sender As Object, e As DevExpress.XtraPdfViewer.PdfDocumentChangedEventArgs) Handles PdfViewer1.DocumentChanged - PDF_Pagenumber() - End Sub - - Private Sub PdfViewer1_CurrentPageChanged(sender As Object, e As DevExpress.XtraPdfViewer.PdfCurrentPageChangedEventArgs) Handles PdfViewer1.CurrentPageChanged - PDF_Pagenumber() - End Sub - Sub PDF_Pagenumber() - Try - If USER_LANGUAGE = "de-DE" Then - pdfstatuslblPageNumber.Text = "Seite " & PdfViewer1.CurrentPageNumber & "/" & PdfViewer1.PageCount - Else - pdfstatuslblPageNumber.Text = "Page " & PdfViewer1.CurrentPageNumber & "/" & PdfViewer1.PageCount - End If - Catch ex As Exception - - End Try - End Sub Private Function CreateFolderForIndex(myDynamicFolder As String) Try Dim ORootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME) diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 06e3e9a..41a510d 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -724,12 +724,6 @@ Public Class frmStart Else TimerFolderWatch.Start() End If - If UniversalViewer_Path = String.Empty And My.Settings.DoNot_Show_Documents = False Then - ERROR_STATE = "NO UV" - Me.TopMost = False - frmConfig_Basic.ShowDialog() - Me.TopMost = True - End If loaded = True Opacity = 0.6