diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index 4959537..edeacf6 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -327,9 +327,23 @@ Public Class ClassControlCreator 'End Function - Public Shared Function CreateExistingTextbox(oControlRow As DataRow, designMode As Boolean) As TextEdit + Public Shared Function CreateExistingTextbox(oControlRow As DataRow, designMode As Boolean) As BaseEdit Try - Dim oControl As TextEdit = CreateBaseControl(New TextEdit(), oControlRow, designMode) + Dim oHeight = oControlRow.ItemEx("HEIGHT", 0) + Dim oWidth = oControlRow.ItemEx("WIDTH", 0) + Dim oReadOnly = oControlRow.ItemEx("READ_ONLY", False) + Dim oFormatString = oControlRow.ItemEx("FORMAT_STRING", String.Empty) + Dim oBackColorIf = oControlRow.ItemEx("CTRL_BACKCOLOR_IF", String.Empty) + + Dim oControl As BaseEdit = Nothing + + If oHeight > 27 Then + oControl = CreateBaseControl(New MemoEdit(), oControlRow, designMode) + Else + oControl = CreateBaseControl(New TextEdit(), oControlRow, designMode) + End If + + 'Dim oControl As TextEdit = CreateBaseControl(New TextEdit(), oControlRow, designMode) Dim oMeta As ControlMetadata = oControl.Tag oControl.BackColor = Color.White @@ -340,12 +354,6 @@ Public Class ClassControlCreator ' control.Multiline = True 'End If - Dim oHeight = oControlRow.ItemEx("HEIGHT", 0) - Dim oWidth = oControlRow.ItemEx("WIDTH", 0) - Dim oReadOnly = oControlRow.ItemEx("READ_ONLY", False) - Dim oFormatString = oControlRow.ItemEx("FORMAT_STRING", String.Empty) - Dim oBackColorIf = oControlRow.ItemEx("CTRL_BACKCOLOR_IF", String.Empty) - oControl.Height = oHeight oControl.Width = oWidth @@ -1067,7 +1075,7 @@ Public Class ClassControlCreator End If End Function - Public Shared Sub GridTables_HandleControlValueChange(pControlPanel As Panel, pColumnsWithSqlAndControlPlaceholders As DataTable) + Public Shared Sub GridTables_HandleControlValueChange(pControlPanel As XtraScrollableControl, pColumnsWithSqlAndControlPlaceholders As DataTable) If Not IsNothing(pColumnsWithSqlAndControlPlaceholders) AndAlso pColumnsWithSqlAndControlPlaceholders.Rows.Count > 0 Then For Each oRow As DataRow In pColumnsWithSqlAndControlPlaceholders.Rows Try diff --git a/app/TaskFlow/ClassValidator.vb b/app/TaskFlow/ClassValidator.vb new file mode 100644 index 0000000..84faee0 --- /dev/null +++ b/app/TaskFlow/ClassValidator.vb @@ -0,0 +1,3 @@ +Public Class ClassValidator + +End Class diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index ea1e4c0..f155a49 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -143,12 +143,6 @@ False - - ..\..\..\DDMonorepo\Controls.ChatControl\bin\Debug\DigitalData.Controls.ChatControl.dll - - - ..\..\..\DDMonorepo\Controls.ChatNewConv\bin\Debug\DigitalData.Controls.ChatNewConv.dll - False ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll @@ -283,6 +277,7 @@ + @@ -330,12 +325,6 @@ Form - - frmChat_NewConversation.vb - - - Form - frmClientLogin.vb @@ -569,9 +558,6 @@ frmAnnotations.vb - - frmChat_NewConversation.vb - frmClientLogin.vb diff --git a/app/TaskFlow/clsPatterns.vb b/app/TaskFlow/clsPatterns.vb index 59c2563..6690a7a 100644 --- a/app/TaskFlow/clsPatterns.vb +++ b/app/TaskFlow/clsPatterns.vb @@ -67,7 +67,7 @@ Public Class clsPatterns Return New Pattern(type, value).ToString End Function - Public Shared Function ReplaceAllValues(input As String, panel As Panel, is_SQL As Boolean) As String + Public Shared Function ReplaceAllValues(input As String, panel As DevExpress.XtraEditors.XtraScrollableControl, is_SQL As Boolean) As String Try Dim result = input @@ -176,7 +176,7 @@ Public Class clsPatterns End Try End Function - Public Shared Function ReplaceControlValues(pInput As String, oPanel As Panel, oIsSQL As Boolean) As String + Public Shared Function ReplaceControlValues(pInput As String, oPanel As DevExpress.XtraEditors.XtraScrollableControl, oIsSQL As Boolean) As String Dim oResult = pInput Try diff --git a/app/TaskFlow/frmChat_NewConversation.Designer.vb b/app/TaskFlow/frmChat_NewConversation.Designer.vb deleted file mode 100644 index af5005d..0000000 --- a/app/TaskFlow/frmChat_NewConversation.Designer.vb +++ /dev/null @@ -1,52 +0,0 @@ - _ -Partial Class frmChat_NewConversation - 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.ChatNewConv1 = New DigitalData.Controls.ChatNewConv.ChatNewConv() - Me.SuspendLayout() - ' - 'ChatNewConv1 - ' - Me.ChatNewConv1.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ChatNewConv1.Location = New System.Drawing.Point(2, 1) - Me.ChatNewConv1.Name = "ChatNewConv1" - Me.ChatNewConv1.Size = New System.Drawing.Size(463, 472) - Me.ChatNewConv1.TabIndex = 0 - ' - 'frmChat_NewConversation - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(474, 480) - Me.Controls.Add(Me.ChatNewConv1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "frmChat_NewConversation" - Me.Text = "Neue Konversation" - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents ChatNewConv1 As DigitalData.Controls.ChatNewConv.ChatNewConv -End Class diff --git a/app/TaskFlow/frmChat_NewConversation.resx b/app/TaskFlow/frmChat_NewConversation.resx deleted file mode 100644 index 1af7de1..0000000 --- a/app/TaskFlow/frmChat_NewConversation.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/app/TaskFlow/frmChat_NewConversation.vb b/app/TaskFlow/frmChat_NewConversation.vb deleted file mode 100644 index 0d06026..0000000 --- a/app/TaskFlow/frmChat_NewConversation.vb +++ /dev/null @@ -1,24 +0,0 @@ -Public Class frmChat_NewConversation - Public Property NewConversation() As String - Get - Return oNewConversation - End Get - Set(value As String) - oNewConversation = value - End Set - End Property - Public oNewConversation As Long - Public Sub New(oDTUsers As DataTable, oDTGroups As DataTable) - - ' Dieser Aufruf ist für den Designer erforderlich. - InitializeComponent() - - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - ChatNewConv1.Init(LOGCONFIG, CONNECTION_STRING_IDB, CURRENT_DOC_ID, USER_ID, USER_USERNAME, USER_LANGUAGE, oDTUsers, oDTGroups) - AddHandler ChatNewConv1.Conversation_Created, AddressOf onConversationCreated - End Sub - Sub onConversationCreated() - CURRENT_CONVERSATION_NEW = ChatNewConv1.NewConversation - Me.Close() - End Sub -End Class \ No newline at end of file diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 77d5a2d..f6f6ec1 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -262,7 +262,7 @@ Public Class frmFormDesigner pnldesigner.Controls.Add(txt) SetMovementHandlers(txt) - Case "LBL" + Case ClassControlCreator.PREFIX_LABEL Dim lbl = ClassControlCreator.CreateExistingLabel(row, True) pnldesigner.Controls.Add(lbl) SetMovementHandlers(lbl) @@ -342,21 +342,21 @@ Public Class frmFormDesigner Dim oMetadata = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata) If oMetadata.ReadOnly = False Then - Dim Type As String = oControl.GetType.ToString - Select Case Type - Case "DevExpress.XtraEditors.TextEdit" + + Select Case oControl.GetType() + Case GetType(TextEdit) oControl.BackColor = Color.White - Case "System.Windows.Forms.ComboBox" + Case GetType(System.Windows.Forms.ComboBox) oControl.BackColor = Color.White - Case "System.Windows.Forms.Label" + Case GetType(System.Windows.Forms.Label) oControl.BackColor = Color.Transparent - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) oControl.BackColor = Color.Transparent - Case "DD_ProcessManager.ClassControlCreator+LineLabel" + Case GetType(DD_ProcessManager.ClassControlCreator.LineLabel) oControl.BackColor = oControl.ForeColor - Case "DigitalData.Controls.LookupGrid.LookupControl3" + Case GetType(DigitalData.Controls.LookupGrid.LookupControl3) oControl.BackColor = Color.White - Case "System.Windows.Forms.Button" + Case GetType(System.Windows.Forms.Button) oControl.BackColor = SystemColors.Control End Select End If @@ -666,7 +666,7 @@ Public Class frmFormDesigner checkProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), "")) props = checkProps ElseIf TypeOf sender Is TextEdit Then - Dim txt As TextEdit = sender + 'Dim txt As TextEdit = sender Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, oRow, Source_AllIndicies) txtProps.Regex = NotNull(oRow.Item("REGEX_MATCH"), String.Empty) txtProps.RegexMessage = NotNull(oRow.Item("REGEX_MESSAGE_DE"), String.Empty) diff --git a/app/TaskFlow/frmMassValidator.Designer.vb b/app/TaskFlow/frmMassValidator.Designer.vb index 88410d1..b728346 100644 --- a/app/TaskFlow/frmMassValidator.Designer.vb +++ b/app/TaskFlow/frmMassValidator.Designer.vb @@ -1,4 +1,6 @@ - +Imports DevExpress.XtraEditors + + Partial Class frmMassValidator Inherits System.Windows.Forms.Form @@ -27,13 +29,14 @@ Partial Class frmMassValidator Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblCountDocs = New System.Windows.Forms.ToolStripStatusLabel() Me.TITLELabel1 = New System.Windows.Forms.Label() - Me.pnldesigner = New System.Windows.Forms.Panel() Me.btnSave = New System.Windows.Forms.Button() Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.pnldesigner = New DevExpress.XtraEditors.PanelControl() Me.StatusStrip1.SuspendLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.pnldesigner, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ToolStrip1 @@ -56,7 +59,7 @@ Partial Class frmMassValidator 'tslblCountDocs ' Me.tslblCountDocs.Name = "tslblCountDocs" - Me.tslblCountDocs.Size = New System.Drawing.Size(120, 17) + Me.tslblCountDocs.Size = New System.Drawing.Size(119, 17) Me.tslblCountDocs.Text = "ToolStripStatusLabel1" ' 'TITLELabel1 @@ -73,20 +76,6 @@ Partial Class frmMassValidator Me.TITLELabel1.Text = "Label1" Me.TITLELabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' - 'pnldesigner - ' - Me.pnldesigner.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.pnldesigner.AutoScroll = True - Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnldesigner.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.pnldesigner.Location = New System.Drawing.Point(15, 125) - Me.pnldesigner.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.pnldesigner.Name = "pnldesigner" - Me.pnldesigner.Size = New System.Drawing.Size(559, 331) - Me.pnldesigner.TabIndex = 21 - ' 'btnSave ' Me.btnSave.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ @@ -105,11 +94,13 @@ Partial Class frmMassValidator ' 'DESCRIPTIONLabel ' + Me.DESCRIPTIONLabel.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.DESCRIPTIONLabel.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.DESCRIPTIONLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.DESCRIPTIONLabel.Location = New System.Drawing.Point(12, 54) Me.DESCRIPTIONLabel.Name = "DESCRIPTIONLabel" - Me.DESCRIPTIONLabel.Size = New System.Drawing.Size(725, 67) + Me.DESCRIPTIONLabel.Size = New System.Drawing.Size(562, 67) Me.DESCRIPTIONLabel.TabIndex = 20 Me.DESCRIPTIONLabel.Text = "Label3" ' @@ -121,10 +112,12 @@ Partial Class frmMassValidator 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.Connection = Nothing Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing @@ -134,15 +127,25 @@ Partial Class frmMassValidator Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' + 'pnldesigner + ' + Me.pnldesigner.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.pnldesigner.Location = New System.Drawing.Point(15, 125) + Me.pnldesigner.Name = "pnldesigner" + Me.pnldesigner.Size = New System.Drawing.Size(559, 332) + Me.pnldesigner.TabIndex = 23 + ' 'frmMassValidator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(586, 540) + Me.Controls.Add(Me.pnldesigner) Me.Controls.Add(Me.btnSave) Me.Controls.Add(Me.TITLELabel1) Me.Controls.Add(Me.DESCRIPTIONLabel) - Me.Controls.Add(Me.pnldesigner) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.ToolStrip1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -153,6 +156,7 @@ Partial Class frmMassValidator Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.pnldesigner, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -161,10 +165,10 @@ Partial Class frmMassValidator Friend WithEvents ToolStrip1 As ToolStrip Friend WithEvents StatusStrip1 As StatusStrip Friend WithEvents TITLELabel1 As Label - Friend WithEvents pnldesigner As Panel Friend WithEvents btnSave As Button Friend WithEvents tslblCountDocs As ToolStripStatusLabel Friend WithEvents DESCRIPTIONLabel As Label Friend WithEvents DD_DMSLiteDataSet As DD_DMSLiteDataSet Friend WithEvents TableAdapterManager As DD_DMSLiteDataSetTableAdapters.TableAdapterManager + Friend WithEvents pnldesigner As PanelControl End Class diff --git a/app/TaskFlow/frmMassValidator.vb b/app/TaskFlow/frmMassValidator.vb index cce05de..1f4ad84 100644 --- a/app/TaskFlow/frmMassValidator.vb +++ b/app/TaskFlow/frmMassValidator.vb @@ -473,8 +473,8 @@ Public Class frmMassValidator Dim LoadIDX As Boolean = controlRow.Item("LOAD_IDX_VALUE") LOGGER.Debug("INDEX: " & idxname & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & LoadIDX.ToString) Dim wertWD - Select Case Type - Case "DevExpress.XtraEditors.TextEdit" + Select Case oControl.GetType + Case GetType(DevExpress.XtraEditors.TextEdit) Try controltype = "Textbox" If idxname = "" Then @@ -508,7 +508,7 @@ Public Class frmMassValidator Exit Sub End Try - Case "System.Windows.Forms.ComboBox" + Case GetType(System.Windows.Forms.ComboBox) controltype = "ComboBox" Dim cmb As Windows.Forms.ComboBox = oControl If idxname = "" Then @@ -537,7 +537,7 @@ Public Class frmMassValidator cmb.SelectedIndex = cmb.FindStringExact(wertWD) End If End If - Case "System.Windows.Forms.DataGridView" + Case GetType(System.Windows.Forms.DataGridView) controltype = "DataGridView" Dim dgv As DataGridView = oControl If idxname = "" Then @@ -608,7 +608,7 @@ Public Class frmMassValidator End If End If - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) controltype = "CheckBox" If idxname = "" Then MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) @@ -675,14 +675,14 @@ Public Class frmMassValidator End If End If - Case "System.Windows.Forms.DateTimePicker" + Case GetType(System.Windows.Forms.DateTimePicker) controltype = "DateTimePicker" Dim DTP As DateTimePicker = oControl If idxname = "" Then MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) Exit For End If - Case "DigitalData.Controls.LookupGrid.LookupControl3" + Case GetType(DigitalData.Controls.LookupGrid.LookupControl3) Try Dim oLookup As LookupControl3 = oControl Dim oWindreamValue = GetWM_Value_Multiple_Docs(idxname) @@ -727,11 +727,7 @@ Public Class frmMassValidator LOGGER.Info(">> Unexpected Error in FillIndexValues(MIs: " & ex.Message, True) LOGGER.Info(">> Controltype: " & controltype) LOGGER.Info(">> Indexname windream: " & indexname) - - End Try - - End Sub Private Function GetWM_Value_Multiple_Docs(idxname As String) Try @@ -1222,9 +1218,8 @@ Public Class frmMassValidator End If If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = CTRL_ID Then '###### - Dim Type As String = oControl.GetType.ToString - Select Case Type - Case "DevExpress.XtraEditors.TextEdit" + Select Case oControl.GetType + Case GetType(DevExpress.XtraEditors.TextEdit) Try value_from_control = oControl.Text Catch ex As Exception @@ -1232,7 +1227,7 @@ Public Class frmMassValidator value_from_control = String.Empty End Try - Case "System.Windows.Forms.ComboBox" + Case GetType(System.Windows.Forms.ComboBox) Dim cmb As ComboBox = oControl Try value_from_control = cmb.Text @@ -1240,7 +1235,7 @@ Public Class frmMassValidator LOGGER.Error(ex) value_from_control = String.Empty End Try - Case "System.Windows.Forms.DateTimePicker" + Case GetType(System.Windows.Forms.DateTimePicker) Dim dtp As DateTimePicker = oControl Try value_from_control = dtp.Value.ToString @@ -1249,7 +1244,7 @@ Public Class frmMassValidator value_from_control = String.Empty End Try - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) Dim chk As CheckBox = oControl Try value_from_control = chk.Checked @@ -1434,9 +1429,8 @@ Public Class frmMassValidator LOGGER.Info(" >> Indexname is unexpected empty.") Continue For End If - Dim Type As String = oControl.GetType.ToString - Select Case Type - Case "DigitalData.Controls.LookupGrid.LookupControl3" + Select Case oControl.GetType + Case GetType(DigitalData.Controls.LookupGrid.LookupControl3) Try Dim myLookup As LookupControl3 = oControl @@ -1522,7 +1516,7 @@ Public Class frmMassValidator Catch ex As Exception LOGGER.Error(ex) End Try - Case "DevExpress.XtraEditors.TextEdit" + Case GetType(DevExpress.XtraEditors.TextEdit) Try 'Als erstes überprüfen ob überhaupt etwas eingetragen worden ist If Check_Missing(oControl, "txt") = True And _MUSSEINGABE = True Then 'NICHTS EINGETRAGEN @@ -1576,7 +1570,7 @@ Public Class frmMassValidator End Try - Case "System.Windows.Forms.DateTimePicker" + Case GetType(System.Windows.Forms.DateTimePicker) Dim dtp As DateTimePicker = oControl 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss If _MUSSEINGABE = True And dtp.Value.ToString = String.Empty Then @@ -1616,7 +1610,7 @@ Public Class frmMassValidator Else LOGGER.Debug("DateValue is 01.01.0001 00:00:00") End If - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) Dim chk As CheckBox = oControl oMyControlInput = chk.Checked.ToString @@ -1663,7 +1657,7 @@ Public Class frmMassValidator End If End If - Case "System.Windows.Forms.DataGridView" + Case GetType(System.Windows.Forms.DataGridView) Dim dgv As DataGridView = oControl Dim Zeilen As Integer = 0 @@ -1953,18 +1947,4 @@ Public Class frmMassValidator FORM_Shown = True End Sub - Private Sub frmMassValidator_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - 'If Viewer = "docview" Then - ' CloseWDDocview() - 'End If - - 'If vpdfviewer = "system" Then - ' Kill_PDFAcrobat() - 'Else - ' If pdfxchange = True Or sumatra = True Then - ' Close_PDF_Viewer(Document_Path) - ' End If - ' KillU_Viewer() - 'End If - End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index 3abee05..8e5bbd0 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -24,15 +24,12 @@ Partial Class frmValidator Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmValidator)) - Me.SplitContainer2_DV_Chat = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.TITLELabel1 = New System.Windows.Forms.Label() - Me.btnSave = New System.Windows.Forms.Button() - Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() - Me.PanelValidatorControl = New System.Windows.Forms.Panel() + Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() + Me.btnSave = New DevExpress.XtraEditors.SimpleButton() + Me.DESCRIPTIONLabel = New DevExpress.XtraEditors.LabelControl() + Me.TITLELabel1 = New DevExpress.XtraEditors.LabelControl() Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer() - Me.ChatControl1 = New DigitalData.Controls.ChatControl.ChatControl() Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController2 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController1 = New DevExpress.XtraBars.BarAndDockingController(Me.components) @@ -86,44 +83,34 @@ Partial Class frmValidator Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarLinkContainerItem1 = New DevExpress.XtraBars.BarLinkContainerItem() Me.btnitemConversationEnd = New DevExpress.XtraBars.BarButtonItem() - Me.bbtnitem_ConversationNew = New DevExpress.XtraBars.BarButtonItem() Me.BarLinkContainerItem2 = New DevExpress.XtraBars.BarLinkContainerItem() Me.BarEditItem1 = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.BarEditItem2 = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemComboBox2 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() - Me.BarEditItem3 = New DevExpress.XtraBars.BarEditItem() - Me.RepositoryItemComboBox3 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() - Me.btnitemConversation_reload = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.Attmt_bbtnitmShow = New DevExpress.XtraBars.BarButtonItem() Me.barbtnitmExport = New DevExpress.XtraBars.BarButtonItem() Me.ToggleSwitchItemLoadonClick = New DevExpress.XtraBars.BarToggleSwitchItem() Me.Attmnt_bbtnitm_LoadonClick = New DevExpress.XtraBars.BarCheckItem() Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPageConversations = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() - Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroupConv1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroupConv_Change = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageFile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupCustom = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RepositoryItemComboBox3 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog() - CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainer2_DV_Chat.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainer2_DV_Chat.Panel1.SuspendLayout() - CType(Me.SplitContainer2_DV_Chat.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainer2_DV_Chat.Panel2.SuspendLayout() - Me.SplitContainer2_DV_Chat.SuspendLayout() + Me.PanelValidatorControl = New DevExpress.XtraEditors.XtraScrollableControl() + Me.PanelValidatorControlBorder = New DevExpress.XtraEditors.PanelControl() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() - Me.Panel1.SuspendLayout() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelControl1.SuspendLayout() CType(Me.BarAndDockingController3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -134,26 +121,10 @@ Partial Class frmValidator CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemComboBox3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PanelValidatorControlBorder, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelValidatorControlBorder.SuspendLayout() Me.SuspendLayout() ' - 'SplitContainer2_DV_Chat - ' - Me.SplitContainer2_DV_Chat.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 - resources.ApplyResources(Me.SplitContainer2_DV_Chat, "SplitContainer2_DV_Chat") - Me.SplitContainer2_DV_Chat.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.None - Me.SplitContainer2_DV_Chat.Name = "SplitContainer2_DV_Chat" - ' - 'SplitContainer2_DV_Chat.Panel1 - ' - Me.SplitContainer2_DV_Chat.Panel1.Controls.Add(Me.SplitContainer1) - resources.ApplyResources(Me.SplitContainer2_DV_Chat.Panel1, "SplitContainer2_DV_Chat.Panel1") - ' - 'SplitContainer2_DV_Chat.Panel2 - ' - resources.ApplyResources(Me.SplitContainer2_DV_Chat.Panel2, "SplitContainer2_DV_Chat.Panel2") - Me.SplitContainer2_DV_Chat.Panel2.Controls.Add(Me.ChatControl1) - Me.SplitContainer2_DV_Chat.SplitterPosition = 919 - ' 'SplitContainer1 ' resources.ApplyResources(Me.SplitContainer1, "SplitContainer1") @@ -161,46 +132,52 @@ Partial Class frmValidator ' 'SplitContainer1.Panel1 ' - Me.SplitContainer1.Panel1.Controls.Add(Me.Panel1) + Me.SplitContainer1.Panel1.Controls.Add(Me.PanelControl1) ' 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.DocumentViewerValidator) Me.SplitContainer1.TabStop = False ' - 'Panel1 + 'PanelControl1 ' - Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLight - Me.Panel1.Controls.Add(Me.TITLELabel1) - Me.Panel1.Controls.Add(Me.btnSave) - Me.Panel1.Controls.Add(Me.DESCRIPTIONLabel) - Me.Panel1.Controls.Add(Me.PanelValidatorControl) - resources.ApplyResources(Me.Panel1, "Panel1") - Me.Panel1.Name = "Panel1" - ' - 'TITLELabel1 - ' - resources.ApplyResources(Me.TITLELabel1, "TITLELabel1") - Me.TITLELabel1.Name = "TITLELabel1" + Me.PanelControl1.Controls.Add(Me.PanelValidatorControlBorder) + Me.PanelControl1.Controls.Add(Me.btnSave) + Me.PanelControl1.Controls.Add(Me.DESCRIPTIONLabel) + Me.PanelControl1.Controls.Add(Me.TITLELabel1) + resources.ApplyResources(Me.PanelControl1, "PanelControl1") + Me.PanelControl1.Name = "PanelControl1" ' 'btnSave ' resources.ApplyResources(Me.btnSave, "btnSave") - Me.btnSave.Image = Global.DD_ProcessManager.My.Resources.Resources.flag_pink + Me.btnSave.Appearance.Font = CType(resources.GetObject("btnSave.Appearance.Font"), System.Drawing.Font) + Me.btnSave.Appearance.Options.UseFont = True + Me.btnSave.Appearance.Options.UseTextOptions = True + Me.btnSave.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap + Me.btnSave.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.RightCenter + Me.btnSave.ImageOptions.SvgImage = CType(resources.GetObject("btnSave.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.btnSave.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25) Me.btnSave.Name = "btnSave" - Me.btnSave.TabStop = False - Me.btnSave.UseVisualStyleBackColor = True ' 'DESCRIPTIONLabel ' resources.ApplyResources(Me.DESCRIPTIONLabel, "DESCRIPTIONLabel") + Me.DESCRIPTIONLabel.Appearance.Font = CType(resources.GetObject("DESCRIPTIONLabel.Appearance.Font"), System.Drawing.Font) + Me.DESCRIPTIONLabel.Appearance.Options.UseFont = True + Me.DESCRIPTIONLabel.Appearance.Options.UseTextOptions = True + Me.DESCRIPTIONLabel.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top + Me.DESCRIPTIONLabel.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap Me.DESCRIPTIONLabel.Name = "DESCRIPTIONLabel" ' - 'PanelValidatorControl + 'TITLELabel1 ' - resources.ApplyResources(Me.PanelValidatorControl, "PanelValidatorControl") - Me.PanelValidatorControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.PanelValidatorControl.Name = "PanelValidatorControl" + resources.ApplyResources(Me.TITLELabel1, "TITLELabel1") + Me.TITLELabel1.Appearance.Font = CType(resources.GetObject("TITLELabel1.Appearance.Font"), System.Drawing.Font) + Me.TITLELabel1.Appearance.Options.UseFont = True + Me.TITLELabel1.Appearance.Options.UseTextOptions = True + Me.TITLELabel1.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap + Me.TITLELabel1.Name = "TITLELabel1" ' 'DocumentViewerValidator ' @@ -208,11 +185,6 @@ Partial Class frmValidator Me.DocumentViewerValidator.FileLoaded = False Me.DocumentViewerValidator.Name = "DocumentViewerValidator" ' - 'ChatControl1 - ' - resources.ApplyResources(Me.ChatControl1, "ChatControl1") - Me.ChatControl1.Name = "ChatControl1" - ' 'BarAndDockingController3 ' Me.BarAndDockingController3.PropertiesBar.AllowLinkLighting = False @@ -465,11 +437,10 @@ Partial Class frmValidator 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.btnitemConversation_reload, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.BarButtonItem6}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick, Me.BarButtonItem6}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 33 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageConversations}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemComboBox2, Me.RepositoryItemComboBox3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -619,13 +590,6 @@ Partial Class frmValidator Me.btnitemConversationEnd.ImageOptions.SvgImage = CType(resources.GetObject("btnitemConversationEnd.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.btnitemConversationEnd.Name = "btnitemConversationEnd" ' - 'bbtnitem_ConversationNew - ' - resources.ApplyResources(Me.bbtnitem_ConversationNew, "bbtnitem_ConversationNew") - Me.bbtnitem_ConversationNew.Id = 20 - Me.bbtnitem_ConversationNew.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitem_ConversationNew.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.bbtnitem_ConversationNew.Name = "bbtnitem_ConversationNew" - ' 'BarLinkContainerItem2 ' resources.ApplyResources(Me.BarLinkContainerItem2, "BarLinkContainerItem2") @@ -658,27 +622,6 @@ Partial Class frmValidator Me.RepositoryItemComboBox2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox2.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) Me.RepositoryItemComboBox2.Name = "RepositoryItemComboBox2" ' - 'BarEditItem3 - ' - Me.BarEditItem3.Edit = Me.RepositoryItemComboBox3 - resources.ApplyResources(Me.BarEditItem3, "BarEditItem3") - Me.BarEditItem3.Id = 24 - Me.BarEditItem3.Name = "BarEditItem3" - Me.BarEditItem3.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large - ' - 'RepositoryItemComboBox3 - ' - resources.ApplyResources(Me.RepositoryItemComboBox3, "RepositoryItemComboBox3") - Me.RepositoryItemComboBox3.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox3.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.RepositoryItemComboBox3.Name = "RepositoryItemComboBox3" - ' - 'btnitemConversation_reload - ' - resources.ApplyResources(Me.btnitemConversation_reload, "btnitemConversation_reload") - Me.btnitemConversation_reload.Id = 25 - Me.btnitemConversation_reload.ImageOptions.SvgImage = CType(resources.GetObject("btnitemConversation_reload.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.btnitemConversation_reload.Name = "btnitemConversation_reload" - ' 'BarButtonItem5 ' Me.BarButtonItem5.Id = 26 @@ -733,31 +676,6 @@ Partial Class frmValidator Me.BarButtonItem6.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large Me.BarButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' - 'RibbonPageConversations - ' - Me.RibbonPageConversations.Name = "RibbonPageConversations" - Me.RibbonPageConversations.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage3}) - resources.ApplyResources(Me.RibbonPageConversations, "RibbonPageConversations") - ' - 'RibbonPage3 - ' - Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupConv1, Me.RibbonPageGroupConv_Change}) - Me.RibbonPage3.Name = "RibbonPage3" - resources.ApplyResources(Me.RibbonPage3, "RibbonPage3") - ' - 'RibbonPageGroupConv1 - ' - Me.RibbonPageGroupConv1.ItemLinks.Add(Me.bbtnitem_ConversationNew) - Me.RibbonPageGroupConv1.ItemLinks.Add(Me.btnitemConversation_reload) - Me.RibbonPageGroupConv1.Name = "RibbonPageGroupConv1" - resources.ApplyResources(Me.RibbonPageGroupConv1, "RibbonPageGroupConv1") - ' - 'RibbonPageGroupConv_Change - ' - Me.RibbonPageGroupConv_Change.ItemLinks.Add(Me.BarEditItem3) - Me.RibbonPageGroupConv_Change.Name = "RibbonPageGroupConv_Change" - resources.ApplyResources(Me.RibbonPageGroupConv_Change, "RibbonPageGroupConv_Change") - ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroupCustom, Me.RibbonPageGroup2}) @@ -805,6 +723,12 @@ Partial Class frmValidator resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") Me.RibbonPageGroup2.Visible = False ' + 'RepositoryItemComboBox3 + ' + resources.ApplyResources(Me.RepositoryItemComboBox3, "RepositoryItemComboBox3") + Me.RepositoryItemComboBox3.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox3.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemComboBox3.Name = "RepositoryItemComboBox3" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiError) @@ -819,12 +743,28 @@ Partial Class frmValidator Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' + 'PanelValidatorControl + ' + Me.PanelValidatorControl.Appearance.BackColor = System.Drawing.Color.WhiteSmoke + Me.PanelValidatorControl.Appearance.Options.UseBackColor = True + resources.ApplyResources(Me.PanelValidatorControl, "PanelValidatorControl") + Me.PanelValidatorControl.Name = "PanelValidatorControl" + ' + 'PanelValidatorControlBorder + ' + resources.ApplyResources(Me.PanelValidatorControlBorder, "PanelValidatorControlBorder") + Me.PanelValidatorControlBorder.Appearance.BorderColor = System.Drawing.Color.Black + Me.PanelValidatorControlBorder.Appearance.Options.UseBorderColor = True + Me.PanelValidatorControlBorder.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple + Me.PanelValidatorControlBorder.Controls.Add(Me.PanelValidatorControl) + Me.PanelValidatorControlBorder.Name = "PanelValidatorControlBorder" + ' 'frmValidator ' Me.Appearance.Options.UseFont = True resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.SplitContainer2_DV_Chat) + Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.RibbonControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.barDockControlLeft) @@ -832,22 +772,17 @@ Partial Class frmValidator Me.Controls.Add(Me.barDockControlBottom) Me.Controls.Add(Me.barDockControlTop) Me.IconOptions.Icon = CType(resources.GetObject("frmValidator.IconOptions.Icon"), System.Drawing.Icon) - Me.IconOptions.LargeImage = CType(resources.GetObject("frmValidator.IconOptions.LargeImage"), System.Drawing.Image) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmValidator.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.KeyPreview = True Me.Name = "frmValidator" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - CType(Me.SplitContainer2_DV_Chat.Panel1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer2_DV_Chat.Panel1.ResumeLayout(False) - CType(Me.SplitContainer2_DV_Chat.Panel2, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer2_DV_Chat.Panel2.ResumeLayout(False) - CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer2_DV_Chat.ResumeLayout(False) Me.SplitContainer1.Panel1.ResumeLayout(False) Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) - Me.Panel1.ResumeLayout(False) + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelControl1.ResumeLayout(False) CType(Me.BarAndDockingController3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarAndDockingController2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).EndInit() @@ -858,14 +793,12 @@ Partial Class frmValidator CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemComboBox3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PanelValidatorControlBorder, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelValidatorControlBorder.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents TITLELabel1 As System.Windows.Forms.Label - Friend WithEvents btnSave As System.Windows.Forms.Button - Friend WithEvents DESCRIPTIONLabel As System.Windows.Forms.Label - Friend WithEvents PanelValidatorControl As System.Windows.Forms.Panel Friend WithEvents PdfBarController1 As DevExpress.XtraPdfViewer.Bars.PdfBarController Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager Friend WithEvents PdfFileOpenBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem @@ -925,24 +858,14 @@ Partial Class frmValidator Friend WithEvents DocumentViewerValidator As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BbtnitmSave As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents Panel1 As Panel - Friend WithEvents SplitContainer2_DV_Chat As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents BarLinkContainerItem1 As DevExpress.XtraBars.BarLinkContainerItem Friend WithEvents btnitemConversationEnd As DevExpress.XtraBars.BarButtonItem - Friend WithEvents bbtnitem_ConversationNew As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageConversations As DevExpress.XtraBars.Ribbon.RibbonPageCategory - Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroupConv1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarLinkContainerItem2 As DevExpress.XtraBars.BarLinkContainerItem Friend WithEvents BarEditItem1 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents BarEditItem2 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox - Friend WithEvents RibbonPageGroupConv_Change As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarEditItem3 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox3 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox - Friend WithEvents ChatControl1 As DigitalData.Controls.ChatControl.ChatControl - Friend WithEvents btnitemConversation_reload As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem Friend WithEvents Attmt_bbtnitmShow As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroupCustom As DevExpress.XtraBars.Ribbon.RibbonPageGroup @@ -951,4 +874,10 @@ Partial Class frmValidator Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents Attmnt_bbtnitm_LoadonClick As DevExpress.XtraBars.BarCheckItem Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl + Friend WithEvents btnSave As DevExpress.XtraEditors.SimpleButton + Friend WithEvents DESCRIPTIONLabel As DevExpress.XtraEditors.LabelControl + Friend WithEvents TITLELabel1 As DevExpress.XtraEditors.LabelControl + Friend WithEvents PanelValidatorControl As DevExpress.XtraEditors.XtraScrollableControl + Friend WithEvents PanelValidatorControlBorder As DevExpress.XtraEditors.PanelControl End Class diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index 21c4481..3438a59 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -118,88 +118,106 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill - - - - 0, 158 - Fill + - 0, 0 + 0, 158 - - Top, Left, Right + + Top, Bottom, Left, Right - - Segoe UI Symbol, 12pt, style=Bold + + Fill - - 3, 4 + + 2, 2 - - No - - - 433, 29 + + 520, 368 - - 1 + + 3 - - Label1 + + PanelValidatorControl - - MiddleLeft + + DevExpress.XtraEditors.XtraScrollableControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - TITLELabel1 + + PanelValidatorControlBorder - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - Panel1 + + 5, 85 - + + 524, 372 + + + 44 + + + PanelValidatorControlBorder + + + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + 0 Bottom, Left, Right - - Tahoma, 9.75pt + + Segoe UI, 9.75pt - - MiddleLeft + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADUCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlNlbmQiPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMiwy + MCA4LDIyLjQgMjQsMTAgMTIsMjQgMTIsMzAgMTYuMywyNS43IDIyLDI4IDMwLDIgICIgY2xhc3M9IkJs + dWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + - 7, 446 - - - 3, 4, 3, 4 + 5, 463 - 445, 50 + 524, 52 - 11 + 2 - Validierung speichern - Nächstes Dokument + Validierung speichern - Nächstes Dokument btnSave - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - Panel1 + PanelControl1 1 @@ -207,85 +225,92 @@ Top, Left, Right + + Segoe UI, 9.75pt + + + + None + 5, 33 - 447, 48 + 524, 46 1 - Label3 + LabelControl1 DESCRIPTIONLabel - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - Panel1 + PanelControl1 2 - - Top, Bottom, Left, Right + + Top, Left, Right - - True + + Segoe UI, 12pt, style=Bold - - 8, 85 + + None - - 3, 4, 3, 4 + + 5, 5 - - 444, 353 + + 524, 28 - - 18 + + 1 - - PanelValidatorControl + + LabelControl1 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TITLELabel1 - - Panel1 + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + + PanelControl1 + + 3 - + Fill - + 0, 0 - - 3, 4, 3, 4 + + 534, 522 - - 455, 503 + + 25 - - 24 + + PanelControl1 - - Panel1 + + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + SplitContainer1.Panel1 - + 0 @@ -310,7 +335,7 @@ 3, 4, 3, 4 - 460, 503 + 418, 522 0 @@ -319,7 +344,7 @@ DocumentViewerValidator - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 @@ -340,10 +365,10 @@ 1 - 919, 503 + 956, 522 - 455 + 534 37 @@ -355,90 +380,9 @@ System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - SplitContainer2_DV_Chat.Panel1 - - - 0 - - - Panel1 - - - SplitContainer2_DV_Chat.Panel1 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainer2_DV_Chat - - - 0 - - - True - - - Fill - - - Tahoma, 9.75pt - - - 0, 0 - - - 3, 4, 3, 4 - - - 256, 503 - - - 0 - - - ChatControl1 - - - DigitalData.Controls.ChatControl.ChatControl, DigitalData.Controls.ChatControl, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - SplitContainer2_DV_Chat.Panel2 - - - 0 - - - Panel2 - - - SplitContainer2_DV_Chat.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainer2_DV_Chat - - - 1 - - - 1185, 503 - - - 44 - - - SplitContainer2_DV_Chat - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - $this - + 0 @@ -460,7 +404,7 @@ 0, 0 - 1185, 0 + 956, 0 barDockControlTop @@ -478,10 +422,10 @@ Bottom - 0, 683 + 0, 702 - 1185, 0 + 956, 0 barDockControlBottom @@ -502,7 +446,7 @@ 0, 0 - 0, 683 + 0, 702 barDockControlLeft @@ -520,10 +464,10 @@ Right - 1185, 0 + 956, 0 - 0, 683 + 0, 702 barDockControlRight @@ -547,7 +491,7 @@ 7, 17 - 1185, 683 + 956, 702 Tahoma, 8.25pt, style=Bold @@ -816,7 +760,6 @@ Beende Konversation - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -835,27 +778,6 @@ MS42LDgsMTYsOHogTTE2LDI0Yy0xLjUsMC0yLjgtMC40LTQtMS4xTDIyLjksMTJjMC43LDEuMiwxLjEs Mi41LDEuMSw0QzI0LDIwLjQsMjAuNCwyNCwxNiwyNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwv c3ZnPgs= - - - - Neue Konversation - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0 - QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0 - LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N - Cjwvc3ZnPgs= @@ -880,39 +802,6 @@ Combo - - False - - - Combo - - - 200 - - - Neu laden - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41 - LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs - NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3 - LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt - NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz - LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj - bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1061,18 +950,6 @@ 0, 0 - - Aktionen - - - Beendete Konversationen - - - Funktionen - - - Konversationen - Datei @@ -1101,14 +978,20 @@ Start + + False + + + Combo + - 1185, 158 + 956, 158 - 0, 661 + 0, 680 - 1185, 22 + 956, 22 RibbonStatusBar1 @@ -1303,51 +1186,36 @@ AAA= - + - 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 + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMgFAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJVc2VyIj4NCiAgICA8 + cGF0aCBkPSJNMTYuMiwyNkgydi0xLjVjMC03LjUsNS43LTUsOC04LjVjMC44LDEuNSwyLjEsNCw0LDRz + My4yLTIuNSw0LTRjMC43LDEsMS43LDEuNSwyLjcsMS45bDAsMCAgIGMtMC41LDAuOS0wLjcsMi0wLjcs + My4xYzAsMC40LDAsMC43LDAuMSwxLjFMMTYuMiwyNkwxNi4yLDI2eiBNOS4zLDEwLjljMCwwLDAsMC4x + LDAsMC4yYzAuNiwyLjMsMiw0LjksNC43LDQuOXM0LjItMi42LDQuNy00LjkgICBWMTFjMSwwLjEsMC42 + LTEuMSwwLjktMS42QzE5LjgsOC45LDIwLDguNSwxOS45LDhjLTAuMS0wLjQtMC40LTAuNC0wLjUtMC4z + QzIxLjIsMi44LDE4LjMsMywxOC4zLDNTMTgsMCwxMi44LDBDOCwwLDcuNCw0LDguNSw3LjYgICBDOC40 + LDcuNiw4LjEsNy43LDgsNy45QzcuOSw4LjQsOC4yLDguOCw4LjQsOS4zQzguNiw5LjgsOC4zLDExLDku + MywxMC45eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yNywxNmMtMi44LDAtNSwyLjIt + NSw1YzAsMC42LDAuMSwxLjIsMC4zLDEuN0wxNiwyOXYzaDR2LTJoMnYtMmgybDIuMS0yLjFDMjYuNCwy + NiwyNi43LDI2LDI3LDI2ICAgYzIuOCwwLDUtMi4yLDUtNVMyOS44LDE2LDI3LDE2eiBNMjcsMjJjLTAu + NiwwLTEtMC40LTEtMWMwLTAuNiwwLjQtMSwxLTFzMSwwLjQsMSwxQzI4LDIxLjYsMjcuNiwyMiwyNywy + MnoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDwvZz4NCjwvc3ZnPgs= @@ -1644,12 +1512,6 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - bbtnitem_ConversationNew - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - BarLinkContainerItem2 @@ -1680,24 +1542,6 @@ DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarEditItem3 - - - DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RepositoryItemComboBox3 - - - DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnitemConversation_reload - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - BarButtonItem5 @@ -1734,30 +1578,6 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageConversations - - - DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPage3 - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroupConv1 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroupConv_Change - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPage1 @@ -1788,6 +1608,12 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RepositoryItemComboBox3 + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage2 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index bc58b65..3a57176 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -349,72 +349,6 @@ Public Class frmValidator 'oErrMsgMissingInput = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.MissingInput") oErrMsgMissingInput = S.Bitte_validieren_Sie_die_rot_markierten_Felder_ - RibbonPageConversations.Visible = False - If IDB_ACTIVE Then - Dim oSQL = $"SELECT * FROM [dbo].[FNIDB_OBJECT_DYNAMIC_CONFIG] ({CURRENT_DOC_ID},{USER_ID})" - DTDYNAMIC_RIGHTS = DatabaseFallback.GetDatatableIDB(oSQL) ', CONNECTION_STRING_IDB, "FNIDB_OBJECT_DYNAMIC_CONFIG") - RibbonPageGroupConv1.Enabled = False - Dim oView As DataView = New DataView(DTDYNAMIC_RIGHTS) - oView.RowFilter = "CONF_TITLE like '%CONVERSATION_RIGHT%'" - Console.WriteLine(oView.Count, "oView after") - If oView.Count > 0 Then - LOGGER.Debug("CONVERSATION-RIGHTS EXISTING") - RibbonPageConversations.Visible = True - RibbonPageGroupConv1.Enabled = True - - 'ConversationQUDT_Delete = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.Conversation_Delete") - ConversationQUDT_Delete = Nothing - - oView = New DataView(DTDYNAMIC_RIGHTS) - oView.RowFilter = "CONF_TITLE = 'CONVERSATION_USER_ACTIVE'" - Conversation_initialized = Conversation_init() - - If oView.Count = 1 Then - Conversation_User_Active = True - - Else - SplitContainer2_DV_Chat.Collapsed = True - Conversation_User_Active = False - SplitContainer2_DV_Chat.Panel2.Visible = False - End If - - - Else - SplitContainer2_DV_Chat.Collapsed = True - RibbonPageConversations.Visible = False - End If - - - 'If Not IsNothing(DTConversations) Then - ' If DTConversations.Rows.Count >= 1 Then - - ' SplitContainerMain.Collapsed = False - ' Dim oConversations As List(Of String) - ' oConversations = ChatControl1.GetConversations(CURRENT_DOC_ID) - ' If oConversations.Count > 1 Then - ' RibbonPageGroupConv_Change.Visible = True - ' For Each oit As String In oConversations - ' ' Dim Coll As ComboBoxItemCollection = RepositoryItemComboBox3.Properties.Items - - ' BarEditItem2..Items.Add(oit) - ' Next - - - ' Else - ' RibbonPageGroupConv_Change.Visible = False - ' End If - ' Else - - ' End If - 'Else - ' SplitContainerMain.Collapsed = True - - 'End If - - Else - SplitContainer2_DV_Chat.Collapsed = True - End If - LOGGER.Debug("frmValidation_Load finished!") @@ -426,68 +360,8 @@ Public Class frmValidator End Try End Sub - Sub Conversations_Init_Rights() - RibbonPageConversations.Visible = True - bbtnitem_ConversationNew.Visibility = BarItemVisibility.Never - btnitemConversationEnd.Visibility = BarItemVisibility.Never - btnitemConversationEnd.Enabled = True - btnitemConversation_reload.Enabled = True - For Each oRow As DataRow In DTDYNAMIC_RIGHTS.Rows - If oRow.Item("CONF_TITLE").ToString = "CONVERSATION_RIGHT" Then - Select Case oRow.Item("CONF_VALUE") - Case "Admin" - bbtnitem_ConversationNew.Visibility = BarItemVisibility.Always - btnitemConversationEnd.Visibility = BarItemVisibility.Always - Right_Conversation_Add = True - Right_Conversation_Stop = True - Case "Start" - bbtnitem_ConversationNew.Visibility = BarItemVisibility.Always - Right_Conversation_Add = True - Case "Stop" - btnitemConversationEnd.Visibility = BarItemVisibility.Always - Right_Conversation_Stop = True - Case "AddMessage" - Right_Conversation_Message = True - End Select - 'ElseIf oRow.Item("CONF_TITLE").ToString = "CONVERSATION_USER_ACTIVE" Then - ' Conversation_User_Active = True - End If - Next - End Sub - Sub Conversations_load() - Dim oConversations As List(Of String) - oConversations = ChatControl1.GetConversations(CURRENT_DOC_ID) - RibbonPageGroupConv_Change.Visible = True - If oConversations.Count = 0 Then - - RibbonPageGroupConv_Change.Visible = False - End If - RepositoryItemComboBox3.Items.Clear() - Dim oActiveConv As Boolean = False - RibbonPageGroupConv_Change.Visible = True - For Each oconv As String In oConversations - If Not oconv.Contains("Started") Then - RepositoryItemComboBox3.Items.Add(oconv) - End If - If oconv.Contains("Started") Then - oActiveConv = True - End If - - Next - If oActiveConv = False Then - btnitemConversationEnd.Enabled = False - btnitemConversation_reload.Enabled = False - SplitContainer2_DV_Chat.Collapsed = True - Else - If SplitContainer2_DV_Chat.Panel2.Visible = False Then - SplitContainer2_DV_Chat.Panel2.Visible = True - End If - SplitContainer2_DV_Chat.Collapsed = False - End If - - End Sub Private Sub frmValidation_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing Try me_closing = True @@ -1178,18 +1052,18 @@ Public Class frmValidator Sub Clear_all_Input() For Each inctrl As Control In Me.PanelValidatorControl.Controls Dim Type As String = inctrl.GetType.ToString - Select Case Type - Case "DevExpress.XtraEditors.TextEdit" + Select Case inctrl.GetType + Case GetType(DevExpress.XtraEditors.TextEdit) inctrl.Text = "" - Case "System.Windows.Forms.ComboBox" + Case GetType(System.Windows.Forms.ComboBox) Dim cmb As ComboBox = inctrl cmb.SelectedIndex = -1 - Case "System.Windows.Forms.DataGridView" + Case GetType(System.Windows.Forms.DataGridView) Dim dgv As DataGridView = inctrl If dgv.Rows.Count > 0 Then dgv.Rows.Clear() End If - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) End Select Next @@ -3130,7 +3004,6 @@ Public Class frmValidator Select form Where form.Item("GUID") = oControlId).Single() - Dim oType As String = oControl.GetType.ToString Dim oTyp As String = oControlRow.Item("CTRL_TYPE") Dim oIDBTyp As String If IDB_ACTIVE Then @@ -3145,8 +3018,8 @@ Public Class frmValidator Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE") LOGGER.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString) - Select Case oType - Case "DevExpress.XtraEditors.TextEdit" + Select Case oControl.GetType() + Case GetType(DevExpress.XtraEditors.TextEdit) Try oControlType = "Textbox" Dim oTextBox As TextEdit = oControl @@ -3252,7 +3125,7 @@ Public Class frmValidator Exit Sub End Try - Case "System.Windows.Forms.ComboBox" + Case GetType(System.Windows.Forms.ComboBox) oControlType = "ComboBox" Dim oMyCombobox As Windows.Forms.ComboBox = oControl Try @@ -3333,7 +3206,7 @@ Public Class frmValidator End Try - Case "DevExpress.XtraGrid.GridControl" + Case GetType(DevExpress.XtraGrid.GridControl) oControlType = "DevExpress.XtraGrid.GridControl" Dim oMyGridControl As GridControl = oControl Dim oDTColumnsPerDevExGrid As DataTable = DT_COLUMNS_GRID.Clone() @@ -3533,7 +3406,7 @@ Public Class frmValidator LOGGER.Error(ex) End Try End If - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) LOGGER.Debug("Loading checkbox...") oControlType = "CheckBox" If oSourceIndexName = "" Then @@ -3637,7 +3510,7 @@ Public Class frmValidator End If End If - Case "DigitalData.Controls.LookupGrid.LookupControl3" + Case GetType(DigitalData.Controls.LookupGrid.LookupControl3) Try Dim oLookup As LookupControl3 = oControl oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) @@ -3686,7 +3559,7 @@ Public Class frmValidator MsgBox(ex.Message, MsgBoxStyle.Critical, "Unvorhergesehener Unexpected error in Add LookupControl3:") End Try - Case "System.Windows.Forms.DateTimePicker" + Case GetType(System.Windows.Forms.DateTimePicker) oControlType = "DateTimePicker" Dim DTP As DateTimePicker = oControl If oSourceIndexName = "" Then @@ -3950,7 +3823,7 @@ Public Class frmValidator LOGGER.Debug("frmValidation_Shown finished!") End Sub - Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click + Private Sub btnSave_Click(sender As Object, e As EventArgs) btnSave.Enabled = False ' TODO: Use when working on Validation @@ -4298,9 +4171,8 @@ Public Class frmValidator If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = CTRL_ID Then '###### - Dim Type As String = oControl.GetType.ToString - Select Case Type - Case "DevExpress.XtraEditors.TextEdit" + Select Case oControl.GetType + Case GetType(DevExpress.XtraEditors.TextEdit) Try value_from_control = oControl.Text Catch ex As Exception @@ -4308,7 +4180,7 @@ Public Class frmValidator value_from_control = String.Empty End Try - Case "System.Windows.Forms.ComboBox" + Case GetType(System.Windows.Forms.ComboBox) Dim cmb As ComboBox = oControl Try value_from_control = cmb.Text @@ -4316,7 +4188,7 @@ Public Class frmValidator LOGGER.Error(ex) value_from_control = String.Empty End Try - Case "System.Windows.Forms.DateTimePicker" + Case GetType(System.Windows.Forms.DateTimePicker) Dim dtp As DateTimePicker = oControl Try value_from_control = dtp.Value.ToString @@ -4325,7 +4197,7 @@ Public Class frmValidator value_from_control = String.Empty End Try - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) Dim chk As CheckBox = oControl Try value_from_control = chk.Checked @@ -4595,9 +4467,8 @@ Public Class frmValidator LOGGER.Info(" >> Indexname is unexpected empty.") Continue For End If - Dim Type As String = oControl.GetType.ToString - Select Case Type - Case "DigitalData.Controls.LookupGrid.LookupControl3" + Select Case oControl.GetType + Case GetType(DigitalData.Controls.LookupGrid.LookupControl3) Try Dim lookup As LookupControl3 = oControl If lookup.Properties.SelectedValues.Count = 0 And oIsRequired = True Then @@ -4782,7 +4653,7 @@ Public Class frmValidator End Try - Case "DevExpress.XtraEditors.TextEdit" + Case GetType(DevExpress.XtraEditors.TextEdit) Try 'Dim oWrongInputMessage = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.WrongInputControl") Dim oWrongInputMessage = S.Falsche_Eingabe @@ -4904,7 +4775,7 @@ Public Class frmValidator Return False End Try - Case "System.Windows.Forms.ComboBox" + Case GetType(System.Windows.Forms.ComboBox) Try LOGGER.Debug($"Working on Combobox...") Dim cmb As Windows.Forms.ComboBox = oControl @@ -5021,7 +4892,7 @@ Public Class frmValidator Return False End Try - Case "System.Windows.Forms.DateTimePicker" + Case GetType(System.Windows.Forms.DateTimePicker) Try Dim dtp As DateTimePicker = oControl 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss @@ -5095,7 +4966,7 @@ Public Class frmValidator LOGGER.Error(ex) End Try - Case "System.Windows.Forms.CheckBox" + Case GetType(System.Windows.Forms.CheckBox) Try Dim chk As CheckBox = oControl oMyInput = chk.Checked.ToString @@ -5191,7 +5062,7 @@ Public Class frmValidator LOGGER.Error(ex) End Try - Case "System.Windows.Forms.DataGridView" + Case GetType(System.Windows.Forms.DataGridView) Try Dim dgv As DataGridView = oControl @@ -5272,11 +5143,11 @@ Public Class frmValidator LOGGER.Error(ex) End Try - Case "DevExpress.XtraGrid.GridControl" + Case GetType(DevExpress.XtraGrid.GridControl) Dim oGrid As GridControl = oControl Dim oSettings = New ControlSettings() With { .IndexName = oIndexName, - .ControlType = Type, + .ControlType = GetType(DevExpress.XtraGrid.GridControl).ToString, .Name = oControlName, .IsRequired = oIsRequired, .IDBAttributeType = oIDBTyp @@ -5756,7 +5627,7 @@ Public Class frmValidator End If My.Settings.Save() End Sub - Private Sub btnSave_MouseHover(sender As Object, e As EventArgs) Handles btnSave.MouseHover + Private Sub btnSave_MouseHover(sender As Object, e As EventArgs) 'Dim oMsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("F2forSave") ToolTip1.Show(S.F2_für_Speichern, btnSave) End Sub @@ -5772,8 +5643,10 @@ Public Class frmValidator bsiInformation.Caption = infotext & " " & Now.ToString If pColor <> String.Empty Then bsiInformation.ItemAppearance.Normal.BackColor = Color.FromName(pColor) + bsiInformation.ItemAppearance.Normal.ForeColor = GraphicsEx.GetContrastedColor(Color.FromName(pColor)) Else bsiInformation.ItemAppearance.Normal.BackColor = Color.Transparent + bsiInformation.ItemAppearance.Normal.ForeColor = Color.Black End If End Sub @@ -5907,102 +5780,6 @@ Public Class frmValidator Dim Filename As String = String.Format($"DevExpressValidatorGridControl_{pProfilID}-{pControlID}.xml") Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename) End Function - Private Function Conversation_init() - Try - Dim oResult = ChatControl1.Init(LOGCONFIG, CONNECTION_STRING_IDB, IIf(CONV_IDENTIFICATION = "Email", USER_EMAIL, USER_USERNAME), USER_ID, USER_USERNAME, USER_LANGUAGE, ConversationQUDT_Delete, DTDYNAMIC_RIGHTS) - If oResult = True Then - Conversations_Init_Rights() - Conversations_load() - AddHandler ChatControl1.Conversation_Ended, AddressOf onConversationEnded - AddHandler ChatControl1.Conversation_UsersAdded_Success, AddressOf ConversationUsersAdded - End If - - Return oResult - Catch ex As Exception - Return False - End Try - - End Function - Private Sub bbtnitem_ConversationNew_ItemClick(sender As Object, e As ItemClickEventArgs) Handles bbtnitem_ConversationNew.ItemClick - Dim oDTUSER As DataTable - For Each oRow As DataRow In DTDYNAMIC_RIGHTS.Rows - If oRow.Item("CONF_TITLE") = "NEW_CONVERSATION_USER_SELECT" Then - Dim oSQL = oRow.Item("CONF_VALUE") - oDTUSER = DatabaseFallback.GetDatatableIDB(oSQL) - End If - Next - If Not IsNothing(oDTUSER) Then - CURRENT_CONVERSATION_NEW = 0 - Dim oForm As New frmChat_NewConversation(oDTUSER, Nothing) - Dim oResult = oForm.ShowDialog() - - If CURRENT_CONVERSATION_NEW <> 0 Then - If Not Conversation_initialized Then - Conversation_init() - End If - Conversations_Init_Rights() - Conversations_load() - End If - - End If - - - End Sub - - Private Sub bbtnitem_ConversationEnd_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnitemConversationEnd.ItemClick - If ChatControl1.CurrentConversationID <> 0 Then - Dim result As MsgBoxResult - result = MessageBox.Show(S.Wollen_Sie_die_Konversation_beenden_, Text, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) - If result = MsgBoxResult.Yes Then - Dim oSQL = $"EXEC PRIDB_END_CONVERSATION {ChatControl1.CurrentConversationID}, '{USER_USERNAME}', '{USER_LANGUAGE}'" - If DatabaseFallback.ExecuteNonQueryIDB(oSQL) = True Then - btnitemConversationEnd.Enabled = False - SplitContainer2_DV_Chat.Collapsed = True - btnitemConversationEnd.Enabled = True - Else - MsgBox("Unexpected error in PRIDB_END_CONVERSATION - Check Your log!", MsgBoxStyle.Exclamation) - End If - End If - End If - End Sub - - Private Sub BarEditItem3_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarEditItem3.ItemClick - Dim o = BarEditItem3.EditValue - End Sub - - Private Sub RepositoryItemComboBox3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles RepositoryItemComboBox3.SelectedIndexChanged - Try - Dim cBox As DevExpress.XtraEditors.ComboBoxEdit = sender - Dim item = cBox.EditValue - Dim oSplit() = item.ToString.Split("|") - Dim oConvID = oSplit(0) - ChatControl1.LoadConversation(oConvID) - btnitemConversationEnd.Enabled = False - If SplitContainer2_DV_Chat.IsPanelCollapsed Then - SplitContainer2_DV_Chat.Collapsed = False - If SplitContainer2_DV_Chat.Panel2.Visible = False Then - SplitContainer2_DV_Chat.Panel2.Visible = True - End If - End If - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) - End Try - - End Sub - - Private Sub BarButtonItem5_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnitemConversation_reload.ItemClick - Conversations_Init_Rights() - Conversations_load() - End Sub - Sub onConversationEnded() - Conversations_load() - btnitemConversationEnd.Enabled = False - SplitContainer2_DV_Chat.Collapsed = True - btnitemConversation_reload.Enabled = False - End Sub - Sub ConversationUsersAdded() - Conversations_load() - End Sub Private Sub BarButtonItem5_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem5.ItemClick MsgBox("Versioning not configured! (Reasons: RightManagement, Displaying)", MsgBoxStyle.Information)