diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 0b01de1..6c89a09 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -182,43 +182,68 @@ Public Class ClassInit USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")) USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") - Try - FORCE_LAYOUT_OVERVIEW = DT_CHECKUSER_MODULE.Rows(0).Item("PM_FORCE_LAYOUT_OVERVIEW") - Catch ex As Exception - FORCE_LAYOUT_OVERVIEW = False - End Try Try WORKING_MODE = DT_CHECKUSER_MODULE.Rows(0).Item("WORKING_MODE") Catch ex As Exception WORKING_MODE = "" End Try - LOGGER.Debug("User exists....") - 'Am System anmelden - Refresh_Licence() - 'Check_User_Exists_in_PMGroups() - - If ClassAllgemeineFunktionen.LoginOut("LOGIN") = True Then - USERCOUNT_LOGGED_IN += 1 + If WORKING_MODE.Contains("PM#FORCE_LAYOUT_OVERVIEW") Then + FORCE_LAYOUT_OVERVIEW = True + End If + If WORKING_MODE.Contains("PM#NO_CHARTS") Then + SHOW_CHARTS = False + Else + SHOW_CHARTS = True End If - 'sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Process-Manager') AND CLIENT_ID = {0}", 1) - ' USERCOUNT_LOGGED_IN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) - 'sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Process-Manager'" - 'ClassDatabase.Execute_non_Query(sql, True) - LOGGER.Debug("Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString) - If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then - MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") - LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Process Manager!") - If USER_IS_ADMIN = False Then - ClassAllgemeineFunktionen.LoginOut("LOGOUT") - LOGGER.Info(" - Wieder abgemeldet - START INCOMPLETE") - ERROR_STATE = "START INCOMPLETE" + + Try + USER_RIGHT1 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT1") + Catch ex As Exception + USER_RIGHT1 = False + End Try + Try + USER_RIGHT2 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT2") + Catch ex As Exception + USER_RIGHT2 = False + End Try + Try + USER_RIGHT3 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT3") + Catch ex As Exception + USER_RIGHT3 = False + End Try + Try + USER_RIGHT4 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT4") + Catch ex As Exception + USER_RIGHT4 = False + End Try + LOGGER.Debug("User exists....") + 'Am System anmelden + Refresh_Licence() + 'Check_User_Exists_in_PMGroups() + + If ClassAllgemeineFunktionen.LoginOut("LOGIN") = True Then + USERCOUNT_LOGGED_IN += 1 End If + + 'sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Process-Manager') AND CLIENT_ID = {0}", 1) + ' USERCOUNT_LOGGED_IN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + 'sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Process-Manager'" + 'ClassDatabase.Execute_non_Query(sql, True) + LOGGER.Debug("Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString) + If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then + MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") + LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Process Manager!") + If USER_IS_ADMIN = False Then + ClassAllgemeineFunktionen.LoginOut("LOGOUT") + LOGGER.Info(" - Wieder abgemeldet - START INCOMPLETE") + ERROR_STATE = "START INCOMPLETE" + End If + End If + 'Alles OK bis hierhin...nun die FolderwatchKonfig laden + LOGGER.Debug("Init Userlogin successfull completed....") End If - 'Alles OK bis hierhin...nun die FolderwatchKonfig laden - LOGGER.Debug("Init Userlogin successfull completed....") - End If Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Unexpected Error in InitUserLogin: " & ex.Message, True) diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 5dd964c..06ecd05 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -35,8 +35,14 @@ Module ModuleRuntimeVariables Public USER_EXISTS = False Public USER_IN_MODULE = False Public USER_RIGHT_FILE_DELETE As Boolean = False + Public USER_RIGHT1 As Boolean = False + Public USER_RIGHT2 As Boolean = False + Public USER_RIGHT3 As Boolean = False + Public USER_RIGHT4 As Boolean = False + Public FORCE_LAYOUT_OVERVIEW As Boolean = False + Public SHOW_CHARTS As Boolean = False Public WORKING_MODE As String = "" Public LICENSE_COUNT As Integer = 0 diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index d1e824a..8f06f2f 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -33,7 +33,6 @@ Partial Class frmAdministration Dim ADDED_WHENLabel As System.Windows.Forms.Label Dim CHANGED_WHOLabel As System.Windows.Forms.Label Dim CHANGED_WHENLabel As System.Windows.Forms.Label - Dim FINAL_TEXTLabel As System.Windows.Forms.Label Dim TITLELabel As System.Windows.Forms.Label Dim INTERVALL_CKECK_NO_OF_FILESLabel As System.Windows.Forms.Label Dim GEAENDERTWERLabel As System.Windows.Forms.Label @@ -44,13 +43,10 @@ Partial Class frmAdministration Dim EMAIL_PWLabel As System.Windows.Forms.Label Dim EMAIL_REMINDER_HEADERLabel As System.Windows.Forms.Label Dim EMAIL_REMINDER_FOOTERLabel As System.Windows.Forms.Label - Dim Label12 As System.Windows.Forms.Label - Dim Label7 As System.Windows.Forms.Label Dim VEKTOR_DELIMITERLabel As System.Windows.Forms.Label Dim WORK_HISTORY_ENTRYLabel As System.Windows.Forms.Label Dim SQL_VIEWLabel As System.Windows.Forms.Label Dim DISPLAY_MODELabel As System.Windows.Forms.Label - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.SplitContainer_Profilzuordnung2 = New System.Windows.Forms.SplitContainer() Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl() Me.TBPROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -117,10 +113,8 @@ Partial Class frmAdministration Me.tsbtndeleteProfil = New System.Windows.Forms.ToolStripButton() Me.Label2 = New System.Windows.Forms.Label() Me.cmbObjekttypen = New System.Windows.Forms.ComboBox() - Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.FINAL_PROFILECheckBox = New System.Windows.Forms.CheckBox() Me.FINAL_TEXTTextBox = New System.Windows.Forms.TextBox() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Label1 = New System.Windows.Forms.Label() Me.cmbType = New System.Windows.Forms.ComboBox() Me.TBPM_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -236,25 +230,6 @@ Partial Class frmAdministration Me.GEAENDERTWERTextBox = New System.Windows.Forms.TextBox() Me.GEAENDERTWANNTextBox = New System.Windows.Forms.TextBox() Me.btnSaveKonfig = New System.Windows.Forms.Button() - Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.TBPM_ERROR_LOGDataGridView = New System.Windows.Forms.DataGridView() - Me.DataGridViewTextBoxColumn17 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn22 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn23 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn24 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn25 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.TBPM_ERROR_LOGBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_ERROR_LOGBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components) - Me.BindingNavigatorCountItem3 = New System.Windows.Forms.ToolStripLabel() - Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveFirstItem3 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMovePreviousItem3 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator9 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorPositionItem3 = New System.Windows.Forms.ToolStripTextBox() - Me.BindingNavigatorSeparator10 = New System.Windows.Forms.ToolStripSeparator() - Me.BindingNavigatorMoveNextItem3 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorMoveLastItem3 = New System.Windows.Forms.ToolStripButton() - Me.BindingNavigatorSeparator11 = New System.Windows.Forms.ToolStripSeparator() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() @@ -263,7 +238,6 @@ Partial Class frmAdministration Me.TBDD_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter() Me.TBPM_KONFIGURATIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() Me.pnlMain = New System.Windows.Forms.Panel() - Me.TBPM_ERROR_LOGTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_ERROR_LOGTableAdapter() Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() @@ -273,6 +247,9 @@ Partial Class frmAdministration Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.FNPM_GET_FREE_USER_FOR_PROFILETableAdapter() Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_PM_WINDREAM.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() DESCRIPTIONLabel = New System.Windows.Forms.Label() @@ -282,7 +259,6 @@ Partial Class frmAdministration ADDED_WHENLabel = New System.Windows.Forms.Label() CHANGED_WHOLabel = New System.Windows.Forms.Label() CHANGED_WHENLabel = New System.Windows.Forms.Label() - FINAL_TEXTLabel = New System.Windows.Forms.Label() TITLELabel = New System.Windows.Forms.Label() INTERVALL_CKECK_NO_OF_FILESLabel = New System.Windows.Forms.Label() GEAENDERTWERLabel = New System.Windows.Forms.Label() @@ -293,8 +269,6 @@ Partial Class frmAdministration EMAIL_PWLabel = New System.Windows.Forms.Label() EMAIL_REMINDER_HEADERLabel = New System.Windows.Forms.Label() EMAIL_REMINDER_FOOTERLabel = New System.Windows.Forms.Label() - Label12 = New System.Windows.Forms.Label() - Label7 = New System.Windows.Forms.Label() VEKTOR_DELIMITERLabel = New System.Windows.Forms.Label() WORK_HISTORY_ENTRYLabel = New System.Windows.Forms.Label() SQL_VIEWLabel = New System.Windows.Forms.Label() @@ -328,8 +302,6 @@ Partial Class frmAdministration CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILEBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() Me.TBPM_PROFILEBindingNavigator.SuspendLayout() - Me.GroupBox4.SuspendLayout() - Me.GroupBox2.SuspendLayout() CType(Me.TBPM_TYPEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox3.SuspendLayout() CType(Me.PRIORITYNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() @@ -365,11 +337,6 @@ Partial Class frmAdministration Me.grpbxEmail.SuspendLayout() Me.GroupBox5.SuspendLayout() CType(Me.INTERVALL_CKECK_NO_OF_FILESNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabPage4.SuspendLayout() - CType(Me.TBPM_ERROR_LOGDataGridView, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_ERROR_LOGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_ERROR_LOGBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TBPM_ERROR_LOGBindingNavigator.SuspendLayout() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() @@ -718,11 +685,6 @@ Partial Class frmAdministration resources.ApplyResources(CHANGED_WHENLabel, "CHANGED_WHENLabel") CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" ' - 'FINAL_TEXTLabel - ' - resources.ApplyResources(FINAL_TEXTLabel, "FINAL_TEXTLabel") - FINAL_TEXTLabel.Name = "FINAL_TEXTLabel" - ' 'TITLELabel ' resources.ApplyResources(TITLELabel, "TITLELabel") @@ -773,16 +735,6 @@ Partial Class frmAdministration resources.ApplyResources(EMAIL_REMINDER_FOOTERLabel, "EMAIL_REMINDER_FOOTERLabel") EMAIL_REMINDER_FOOTERLabel.Name = "EMAIL_REMINDER_FOOTERLabel" ' - 'Label12 - ' - resources.ApplyResources(Label12, "Label12") - Label12.Name = "Label12" - ' - 'Label7 - ' - resources.ApplyResources(Label7, "Label7") - Label7.Name = "Label7" - ' 'VEKTOR_DELIMITERLabel ' resources.ApplyResources(VEKTOR_DELIMITERLabel, "VEKTOR_DELIMITERLabel") @@ -977,16 +929,6 @@ Partial Class frmAdministration Me.cmbObjekttypen.FormattingEnabled = True Me.cmbObjekttypen.Name = "cmbObjekttypen" ' - 'GroupBox4 - ' - Me.GroupBox4.Controls.Add(Me.FINAL_PROFILECheckBox) - Me.GroupBox4.Controls.Add(FINAL_TEXTLabel) - Me.GroupBox4.Controls.Add(Me.FINAL_TEXTTextBox) - resources.ApplyResources(Me.GroupBox4, "GroupBox4") - Me.GroupBox4.ForeColor = System.Drawing.Color.DarkRed - Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.TabStop = False - ' 'FINAL_PROFILECheckBox ' Me.FINAL_PROFILECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILEBindingSource, "FINAL_PROFILE", True)) @@ -1000,14 +942,6 @@ Partial Class frmAdministration resources.ApplyResources(Me.FINAL_TEXTTextBox, "FINAL_TEXTTextBox") Me.FINAL_TEXTTextBox.Name = "FINAL_TEXTTextBox" ' - 'GroupBox2 - ' - Me.GroupBox2.Controls.Add(Me.Label1) - Me.GroupBox2.Controls.Add(Me.cmbType) - resources.ApplyResources(Me.GroupBox2, "GroupBox2") - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.TabStop = False - ' 'Label1 ' resources.ApplyResources(Me.Label1, "Label1") @@ -1148,7 +1082,6 @@ Partial Class frmAdministration Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage2) Me.TabControl1.Controls.Add(Me.TabPage3) - Me.TabControl1.Controls.Add(Me.TabPage4) resources.ApplyResources(Me.TabControl1, "TabControl1") Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 @@ -1162,7 +1095,9 @@ Partial Class frmAdministration Me.TabPage1.Controls.Add(Me.TITLETextBox) Me.TabPage1.Controls.Add(Me.PROFILGUIDTextBox) Me.TabPage1.Controls.Add(Me.ACTIVECheckBox) + Me.TabPage1.Controls.Add(Me.GridControl1) Me.TabPage1.Controls.Add(NAMELabel) + Me.TabPage1.Controls.Add(Me.SORT_BY_LATESTCheckBox) Me.TabPage1.Controls.Add(Me.NAMETextBox) resources.ApplyResources(Me.TabPage1, "TabPage1") Me.TabPage1.Name = "TabPage1" @@ -1179,26 +1114,26 @@ Partial Class frmAdministration 'TabPage5 ' resources.ApplyResources(Me.TabPage5, "TabPage5") + Me.TabPage5.Controls.Add(Me.Label1) + Me.TabPage5.Controls.Add(Me.Label9) + Me.TabPage5.Controls.Add(Me.cmbType) + Me.TabPage5.Controls.Add(Me.Label4) + Me.TabPage5.Controls.Add(Me.FINAL_TEXTTextBox) + Me.TabPage5.Controls.Add(Me.FINAL_PROFILECheckBox) Me.TabPage5.Controls.Add(DISPLAY_MODELabel) Me.TabPage5.Controls.Add(Me.DISPLAY_MODEComboBox) - Me.TabPage5.Controls.Add(Me.GridControl1) Me.TabPage5.Controls.Add(Me.cmbLOGIndex) - Me.TabPage5.Controls.Add(Label7) Me.TabPage5.Controls.Add(Me.PM_VEKTOR_INDEXComboBox) - Me.TabPage5.Controls.Add(Label12) Me.TabPage5.Controls.Add(Me.Label2) - Me.TabPage5.Controls.Add(Me.SORT_BY_LATESTCheckBox) Me.TabPage5.Controls.Add(Me.DESCRIPTIONTextBox) Me.TabPage5.Controls.Add(DESCRIPTIONLabel) Me.TabPage5.Controls.Add(WD_SEARCHLabel) Me.TabPage5.Controls.Add(Me.cmbObjekttypen) Me.TabPage5.Controls.Add(Me.WD_SEARCHTextBox) Me.TabPage5.Controls.Add(PRIORITYLabel) - Me.TabPage5.Controls.Add(Me.GroupBox4) Me.TabPage5.Controls.Add(ADDED_WHOLabel) Me.TabPage5.Controls.Add(Me.CHANGED_WHENTextBox) Me.TabPage5.Controls.Add(Me.ADDED_WHOTextBox) - Me.TabPage5.Controls.Add(Me.GroupBox2) Me.TabPage5.Controls.Add(ADDED_WHENLabel) Me.TabPage5.Controls.Add(CHANGED_WHENLabel) Me.TabPage5.Controls.Add(Me.btnWDSuche) @@ -1852,138 +1787,6 @@ Partial Class frmAdministration Me.btnSaveKonfig.Name = "btnSaveKonfig" Me.btnSaveKonfig.UseVisualStyleBackColor = True ' - 'TabPage4 - ' - Me.TabPage4.Controls.Add(Me.TBPM_ERROR_LOGDataGridView) - Me.TabPage4.Controls.Add(Me.TBPM_ERROR_LOGBindingNavigator) - resources.ApplyResources(Me.TabPage4, "TabPage4") - Me.TabPage4.Name = "TabPage4" - Me.TabPage4.UseVisualStyleBackColor = True - ' - 'TBPM_ERROR_LOGDataGridView - ' - Me.TBPM_ERROR_LOGDataGridView.AllowUserToAddRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan - Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.TBPM_ERROR_LOGDataGridView.AutoGenerateColumns = False - Me.TBPM_ERROR_LOGDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.TBPM_ERROR_LOGDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn17, Me.DataGridViewTextBoxColumn22, Me.DataGridViewTextBoxColumn23, Me.DataGridViewTextBoxColumn24, Me.DataGridViewTextBoxColumn25}) - Me.TBPM_ERROR_LOGDataGridView.DataSource = Me.TBPM_ERROR_LOGBindingSource - resources.ApplyResources(Me.TBPM_ERROR_LOGDataGridView, "TBPM_ERROR_LOGDataGridView") - Me.TBPM_ERROR_LOGDataGridView.Name = "TBPM_ERROR_LOGDataGridView" - Me.TBPM_ERROR_LOGDataGridView.ReadOnly = True - ' - 'DataGridViewTextBoxColumn17 - ' - Me.DataGridViewTextBoxColumn17.DataPropertyName = "GUID" - resources.ApplyResources(Me.DataGridViewTextBoxColumn17, "DataGridViewTextBoxColumn17") - Me.DataGridViewTextBoxColumn17.Name = "DataGridViewTextBoxColumn17" - Me.DataGridViewTextBoxColumn17.ReadOnly = True - ' - 'DataGridViewTextBoxColumn22 - ' - Me.DataGridViewTextBoxColumn22.DataPropertyName = "PROFIL_ID" - resources.ApplyResources(Me.DataGridViewTextBoxColumn22, "DataGridViewTextBoxColumn22") - Me.DataGridViewTextBoxColumn22.Name = "DataGridViewTextBoxColumn22" - Me.DataGridViewTextBoxColumn22.ReadOnly = True - ' - 'DataGridViewTextBoxColumn23 - ' - Me.DataGridViewTextBoxColumn23.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.DataGridViewTextBoxColumn23.DataPropertyName = "ERROR_MSG" - resources.ApplyResources(Me.DataGridViewTextBoxColumn23, "DataGridViewTextBoxColumn23") - Me.DataGridViewTextBoxColumn23.Name = "DataGridViewTextBoxColumn23" - Me.DataGridViewTextBoxColumn23.ReadOnly = True - ' - 'DataGridViewTextBoxColumn24 - ' - Me.DataGridViewTextBoxColumn24.DataPropertyName = "ADDED_WHO" - resources.ApplyResources(Me.DataGridViewTextBoxColumn24, "DataGridViewTextBoxColumn24") - Me.DataGridViewTextBoxColumn24.Name = "DataGridViewTextBoxColumn24" - Me.DataGridViewTextBoxColumn24.ReadOnly = True - ' - 'DataGridViewTextBoxColumn25 - ' - Me.DataGridViewTextBoxColumn25.DataPropertyName = "ADDED_WHEN" - resources.ApplyResources(Me.DataGridViewTextBoxColumn25, "DataGridViewTextBoxColumn25") - Me.DataGridViewTextBoxColumn25.Name = "DataGridViewTextBoxColumn25" - Me.DataGridViewTextBoxColumn25.ReadOnly = True - ' - 'TBPM_ERROR_LOGBindingSource - ' - Me.TBPM_ERROR_LOGBindingSource.DataMember = "TBPM_ERROR_LOG" - Me.TBPM_ERROR_LOGBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'TBPM_ERROR_LOGBindingNavigator - ' - Me.TBPM_ERROR_LOGBindingNavigator.AddNewItem = Nothing - Me.TBPM_ERROR_LOGBindingNavigator.BindingSource = Me.TBPM_ERROR_LOGBindingSource - Me.TBPM_ERROR_LOGBindingNavigator.CountItem = Me.BindingNavigatorCountItem3 - Me.TBPM_ERROR_LOGBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem1 - Me.TBPM_ERROR_LOGBindingNavigator.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.TBPM_ERROR_LOGBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem3, Me.BindingNavigatorMovePreviousItem3, Me.BindingNavigatorSeparator9, Me.BindingNavigatorPositionItem3, Me.BindingNavigatorCountItem3, Me.BindingNavigatorSeparator10, Me.BindingNavigatorMoveNextItem3, Me.BindingNavigatorMoveLastItem3, Me.BindingNavigatorSeparator11, Me.BindingNavigatorDeleteItem1}) - resources.ApplyResources(Me.TBPM_ERROR_LOGBindingNavigator, "TBPM_ERROR_LOGBindingNavigator") - Me.TBPM_ERROR_LOGBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem3 - Me.TBPM_ERROR_LOGBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem3 - Me.TBPM_ERROR_LOGBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem3 - Me.TBPM_ERROR_LOGBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem3 - Me.TBPM_ERROR_LOGBindingNavigator.Name = "TBPM_ERROR_LOGBindingNavigator" - Me.TBPM_ERROR_LOGBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem3 - ' - 'BindingNavigatorCountItem3 - ' - Me.BindingNavigatorCountItem3.Name = "BindingNavigatorCountItem3" - resources.ApplyResources(Me.BindingNavigatorCountItem3, "BindingNavigatorCountItem3") - ' - 'BindingNavigatorDeleteItem1 - ' - resources.ApplyResources(Me.BindingNavigatorDeleteItem1, "BindingNavigatorDeleteItem1") - Me.BindingNavigatorDeleteItem1.Name = "BindingNavigatorDeleteItem1" - ' - 'BindingNavigatorMoveFirstItem3 - ' - Me.BindingNavigatorMoveFirstItem3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveFirstItem3, "BindingNavigatorMoveFirstItem3") - Me.BindingNavigatorMoveFirstItem3.Name = "BindingNavigatorMoveFirstItem3" - ' - 'BindingNavigatorMovePreviousItem3 - ' - Me.BindingNavigatorMovePreviousItem3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMovePreviousItem3, "BindingNavigatorMovePreviousItem3") - Me.BindingNavigatorMovePreviousItem3.Name = "BindingNavigatorMovePreviousItem3" - ' - 'BindingNavigatorSeparator9 - ' - Me.BindingNavigatorSeparator9.Name = "BindingNavigatorSeparator9" - resources.ApplyResources(Me.BindingNavigatorSeparator9, "BindingNavigatorSeparator9") - ' - 'BindingNavigatorPositionItem3 - ' - resources.ApplyResources(Me.BindingNavigatorPositionItem3, "BindingNavigatorPositionItem3") - Me.BindingNavigatorPositionItem3.Name = "BindingNavigatorPositionItem3" - ' - 'BindingNavigatorSeparator10 - ' - Me.BindingNavigatorSeparator10.Name = "BindingNavigatorSeparator10" - resources.ApplyResources(Me.BindingNavigatorSeparator10, "BindingNavigatorSeparator10") - ' - 'BindingNavigatorMoveNextItem3 - ' - Me.BindingNavigatorMoveNextItem3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveNextItem3, "BindingNavigatorMoveNextItem3") - Me.BindingNavigatorMoveNextItem3.Name = "BindingNavigatorMoveNextItem3" - ' - 'BindingNavigatorMoveLastItem3 - ' - Me.BindingNavigatorMoveLastItem3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.BindingNavigatorMoveLastItem3, "BindingNavigatorMoveLastItem3") - Me.BindingNavigatorMoveLastItem3.Name = "BindingNavigatorMoveLastItem3" - ' - 'BindingNavigatorSeparator11 - ' - Me.BindingNavigatorSeparator11.Name = "BindingNavigatorSeparator11" - resources.ApplyResources(Me.BindingNavigatorSeparator11, "BindingNavigatorSeparator11") - ' 'TBDD_CONNECTIONBindingSource ' Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" @@ -2025,10 +1828,6 @@ Partial Class frmAdministration resources.ApplyResources(Me.pnlMain, "pnlMain") Me.pnlMain.Name = "pnlMain" ' - 'TBPM_ERROR_LOGTableAdapter - ' - Me.TBPM_ERROR_LOGTableAdapter.ClearBeforeFill = True - ' 'TBPM_PROFILE_CONTROLSTableAdapter ' Me.TBPM_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True @@ -2066,6 +1865,16 @@ Partial Class frmAdministration ' Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.ClearBeforeFill = True ' + 'Label4 + ' + resources.ApplyResources(Me.Label4, "Label4") + Me.Label4.Name = "Label4" + ' + 'Label9 + ' + resources.ApplyResources(Me.Label9, "Label9") + Me.Label9.Name = "Label9" + ' 'frmAdministration ' resources.ApplyResources(Me, "$this") @@ -2103,10 +1912,6 @@ Partial Class frmAdministration CType(Me.TBPM_PROFILEBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() Me.TBPM_PROFILEBindingNavigator.ResumeLayout(False) Me.TBPM_PROFILEBindingNavigator.PerformLayout() - Me.GroupBox4.ResumeLayout(False) - Me.GroupBox4.PerformLayout() - Me.GroupBox2.ResumeLayout(False) - Me.GroupBox2.PerformLayout() CType(Me.TBPM_TYPEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.PerformLayout() @@ -2151,13 +1956,6 @@ Partial Class frmAdministration Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() CType(Me.INTERVALL_CKECK_NO_OF_FILESNumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() - Me.TabPage4.ResumeLayout(False) - Me.TabPage4.PerformLayout() - CType(Me.TBPM_ERROR_LOGDataGridView, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_ERROR_LOGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_ERROR_LOGBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit() - Me.TBPM_ERROR_LOGBindingNavigator.ResumeLayout(False) - Me.TBPM_ERROR_LOGBindingNavigator.PerformLayout() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.StatusStrip1.ResumeLayout(False) @@ -2210,9 +2008,7 @@ Partial Class frmAdministration Friend WithEvents btnmovetoFolderDialog As System.Windows.Forms.Button Friend WithEvents FolderBrowserDialog1 As System.Windows.Forms.FolderBrowserDialog Friend WithEvents MOVE2FOLDERTextBox As System.Windows.Forms.TextBox - Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents GroupBox4 As System.Windows.Forms.GroupBox Friend WithEvents cmbObjekttypen As System.Windows.Forms.ComboBox Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents TabControl1 As System.Windows.Forms.TabControl @@ -2238,21 +2034,6 @@ Partial Class frmAdministration Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents pnlMain As System.Windows.Forms.Panel Friend WithEvents SORT_BY_LATESTCheckBox As System.Windows.Forms.CheckBox - Friend WithEvents TabPage4 As System.Windows.Forms.TabPage - Friend WithEvents TBPM_ERROR_LOGBindingNavigator As System.Windows.Forms.BindingNavigator - Friend WithEvents BindingNavigatorCountItem3 As System.Windows.Forms.ToolStripLabel - Friend WithEvents BindingNavigatorDeleteItem1 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorMoveFirstItem3 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorMovePreviousItem3 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorSeparator9 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents BindingNavigatorPositionItem3 As System.Windows.Forms.ToolStripTextBox - Friend WithEvents BindingNavigatorSeparator10 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents BindingNavigatorMoveNextItem3 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorMoveLastItem3 As System.Windows.Forms.ToolStripButton - Friend WithEvents BindingNavigatorSeparator11 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents TBPM_ERROR_LOGBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_ERROR_LOGTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_ERROR_LOGTableAdapter - Friend WithEvents TBPM_ERROR_LOGDataGridView As System.Windows.Forms.DataGridView Friend WithEvents tabctrl_Profilkonfig As System.Windows.Forms.TabControl Friend WithEvents TabPage5 As System.Windows.Forms.TabPage Friend WithEvents TabPage6 As System.Windows.Forms.TabPage @@ -2283,11 +2064,6 @@ Partial Class frmAdministration Friend WithEvents btnConnections As System.Windows.Forms.Button Friend WithEvents cmbLOGIndex As System.Windows.Forms.ComboBox Friend WithEvents VEKTOR_DELIMITERTextBox As System.Windows.Forms.TextBox - Friend WithEvents DataGridViewTextBoxColumn17 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn22 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn23 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn24 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn25 As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents Label13 As System.Windows.Forms.Label Friend WithEvents DataGridViewCheckBoxColumn2 As System.Windows.Forms.DataGridViewCheckBoxColumn @@ -2391,4 +2167,7 @@ Partial Class frmAdministration Friend WithEvents colALLOW_NEW_VALUES As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents btnSQLProfilehome As Button Friend WithEvents DISPLAY_MODEComboBox As ComboBox + Friend WithEvents Label9 As Label + Friend WithEvents Label4 As Label + Friend WithEvents ToolTip1 As ToolTip End Class diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 7632de4..42ad94f 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -126,7 +126,7 @@ - 6, 28 + 285, 45 25, 16 @@ -163,7 +163,7 @@ True - 327, 95 + 922, 56 206, 17 @@ -264,24 +264,6 @@ 0 - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Benutzer: - - - MiddleLeft - Label20 @@ -334,7 +316,7 @@ True - 542, 212 + 17, 212 Fill @@ -432,24 +414,6 @@ 0 - - Left - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Benutzer: - - - MiddleLeft - Label19 @@ -519,6 +483,69 @@ 0 + + 206, 17 + + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Benutzer: + + + MiddleLeft + + + Label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + + + Left + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Benutzer: + + + MiddleLeft + + + Label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel2 + + + 0 + Fill @@ -532,7 +559,7 @@ True - 1161, 173 + 439, 173 Fill @@ -582,27 +609,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Zugeordnete Gruppen: - - - MiddleLeft - Label22 @@ -655,7 +661,7 @@ True - 739, 173 + 17, 173 Fill @@ -705,27 +711,6 @@ 0 - - Left - - - NoControl - - - 0, 0 - - - 194, 25 - - - 0 - - - Verfügbare Gruppen: - - - MiddleLeft - Label23 @@ -795,6 +780,72 @@ 0 + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Zugeordnete Gruppen: + + + MiddleLeft + + + Label22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel3 + + + 0 + + + Left + + + NoControl + + + 0, 0 + + + 194, 25 + + + 0 + + + Verfügbare Gruppen: + + + MiddleLeft + + + Label23 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel4 + + + 0 + False @@ -802,7 +853,7 @@ True - 50, 28 + 370, 45 80, 16 @@ -823,7 +874,7 @@ TabPage1 - 7 + 8 False @@ -835,7 +886,7 @@ Tahoma, 9.75pt - 277, 58 + 16, 75 89, 16 @@ -856,7 +907,7 @@ TabPage5 - 10 + 12 False @@ -868,16 +919,16 @@ Tahoma, 9.75pt - 277, 103 + 16, 99 - 112, 16 + 82, 16 8 - Windream-Suche: + Datei-Suche: WD_SEARCHLabel @@ -889,7 +940,7 @@ TabPage5 - 11 + 13 False @@ -901,7 +952,7 @@ Tahoma, 9.75pt - 971, 58 + 564, 15 58, 16 @@ -922,7 +973,7 @@ TabPage5 - 14 + 16 False @@ -934,7 +985,7 @@ Tahoma, 9.75pt - 277, 335 + 15, 265 78, 16 @@ -955,7 +1006,7 @@ TabPage5 - 16 + 17 False @@ -967,7 +1018,7 @@ Tahoma, 9.75pt - 444, 335 + 16, 294 87, 16 @@ -1000,7 +1051,7 @@ Tahoma, 9.75pt - 609, 335 + 16, 323 91, 16 @@ -1033,7 +1084,7 @@ Tahoma, 9.75pt - 775, 335 + 16, 352 100, 16 @@ -1056,39 +1107,6 @@ 21 - - False - - - True - - - Tahoma, 9.75pt - - - 12, 49 - - - 272, 16 - - - 26 - - - Finaler Bestätigungstext auf Abschluss-Button: - - - FINAL_TEXTLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - GroupBox4 - - - 1 - False @@ -1096,7 +1114,7 @@ True - 507, 29 + 370, 72 38, 16 @@ -1389,74 +1407,6 @@ 1 - - False - - - True - - - Tahoma, 9.75pt, style=Italic - - - 712, 151 - - - 409, 32 - - - 80 - - - Bitte wählen Sie hier den Vektor-Index den Sie für die Kennzeichnung -der PM-Indizes verwenden wollen: - - - Label12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 6 - - - False - - - True - - - Tahoma, 9.75pt, style=Italic - - - 712, 213 - - - 364, 32 - - - 82 - - - Bitte wählen Sie hier den Vektor-Index den Sie für das Loggen -der Wertänderungen nutzen wollen: - - - Label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 4 - False @@ -1557,7 +1507,7 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 702, 12 + 16, 45 77, 16 @@ -1578,10 +1528,10 @@ der Wertänderungen nutzen wollen: TabPage5 - 0 + 6 - 570, 56 + 727, 56 368, 17 @@ -1819,10 +1769,10 @@ der Wertänderungen nutzen wollen: MiddleRight - 3, 3 + 279, 3 - 1266, 27 + 990, 27 0 @@ -1849,7 +1799,7 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 277, 12 + 16, 15 67, 16 @@ -1870,16 +1820,16 @@ der Wertänderungen nutzen wollen: TabPage5 - 7 + 10 Tahoma, 9.75pt - 280, 31 + 202, 12 - 407, 24 + 345, 24 3 @@ -1894,22 +1844,22 @@ der Wertänderungen nutzen wollen: TabPage5 - 12 + 14 Tahoma, 9.75pt - 15, 22 + 19, 129 - 104, 24 + 188, 24 0 - Ja/Nein + Alternativer Abschlusstext? FINAL_PROFILECheckBox @@ -1918,19 +1868,19 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox4 + TabPage5 - 0 + 5 Tahoma, 9.75pt - 15, 71 + 202, 129 - 392, 23 + 546, 23 1 @@ -1942,55 +1892,28 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox4 - - - 2 - - - Tahoma, 9.75pt - - - 280, 151 - - - 420, 100 - - - 75 - - - Alternativer Abschlusstext: - - - GroupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage5 - - 15 + + 4 True - Tahoma, 9pt, style=Italic + Tahoma, 9.75pt - 6, 19 + 16, 221 - 156, 14 + 59, 16 72 - Definiert die Art des Profils: + Profiltyp: Label1 @@ -1999,22 +1922,22 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox2 + TabPage5 0 - 17, 56 + 174, 56 Tahoma, 9.75pt - 9, 41 + 202, 218 - 398, 24 + 345, 24 0 @@ -2026,37 +1949,64 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - GroupBox2 - - - 1 - - - Tahoma, 9.75pt - - - 280, 257 - - - 420, 71 - - - 74 - - - Type: - - - GroupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabPage5 - - 19 + + 2 + + + 174, 56 + + + MOVE2FOLDERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 0 + + + btnmovetoFolderDialog + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox3 + + + 1 + + + Segoe UI, 8.25pt, style=Bold + + + 9, 23 + + + 1007, 57 + + + 73 + + + Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: + + + GroupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage11 + + + 3 Segoe UI, 9pt @@ -2109,38 +2059,11 @@ der Wertänderungen nutzen wollen: 1 - - Segoe UI, 8.25pt, style=Bold - - - 9, 23 - - - 1007, 57 - - - 73 - - - Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreicher Indexierung verschoben werden soll: - - - GroupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage11 - - - 3 - Tahoma, 9.75pt - 974, 78 + 693, 12 55, 23 @@ -2167,7 +2090,7 @@ der Wertänderungen nutzen wollen: MiddleLeft - 1035, 122 + 791, 101 0, 0, 2, 2 @@ -2200,10 +2123,10 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 973, 122 + 754, 101 - 56, 23 + 31, 23 29 @@ -2224,10 +2147,10 @@ der Wertänderungen nutzen wollen: 22 - 510, 47 + 456, 69 - 468, 23 + 511, 23 1 @@ -2245,7 +2168,7 @@ der Wertänderungen nutzen wollen: 4 - 9, 47 + 326, 42 38, 23 @@ -2266,10 +2189,10 @@ der Wertänderungen nutzen wollen: 5 - 53, 47 + 456, 42 - 451, 23 + 511, 23 0 @@ -2284,16 +2207,16 @@ der Wertänderungen nutzen wollen: TabPage1 - 8 + 10 Tahoma, 9.75pt - 280, 77 + 202, 72 - 685, 23 + 546, 23 4 @@ -2308,16 +2231,16 @@ der Wertänderungen nutzen wollen: TabPage5 - 9 + 11 Tahoma, 9.75pt - 280, 122 + 202, 101 - 688, 23 + 546, 23 6 @@ -2332,10 +2255,10 @@ der Wertänderungen nutzen wollen: TabPage5 - 13 + 15 - 987, 46 + 973, 41 65, 24 @@ -2362,10 +2285,10 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 280, 354 + 202, 262 - 158, 23 + 345, 23 19 @@ -2380,16 +2303,16 @@ der Wertänderungen nutzen wollen: TabPage5 - 18 + 19 Tahoma, 9.75pt - 447, 354 + 202, 291 - 158, 23 + 345, 23 21 @@ -2410,10 +2333,10 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 611, 354 + 202, 320 - 161, 23 + 345, 23 23 @@ -2434,10 +2357,10 @@ der Wertänderungen nutzen wollen: Tahoma, 9.75pt - 778, 354 + 202, 349 - 161, 23 + 345, 23 25 @@ -2452,10 +2375,10 @@ der Wertänderungen nutzen wollen: TabPage5 - 17 + 18 - 1188, 17 + 17, 56 windream-Suche|*.wdf|Alle Dateien|*.* @@ -2464,10 +2387,10 @@ der Wertänderungen nutzen wollen: windream-Suche wählen - 211, 56 + 368, 56 - 399, 56 + 556, 56 Top, Bottom, Left, Right @@ -2475,26 +2398,29 @@ der Wertänderungen nutzen wollen: True - - Tahoma, 9.75pt + + Label9 - - Overview and Detail + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Overview + + TabPage5 - - Detail + + 1 - - 705, 31 + + Label4 - - 263, 24 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 85 + + TabPage5 + + + 3 DISPLAY_MODEComboBox @@ -2506,55 +2432,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 1 - - - 6, 12 - - - Cyan - - - Fuchsia - - - Profil-Name - - - True - - - 0 - - - 129 - - - 268, 367 - - - 84 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPage5 - - - 2 - - - 715, 248 - - - 230, 24 - - - 83 + 7 cmbLOGIndex @@ -2566,16 +2444,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 3 - - - 715, 186 - - - 230, 24 - - - 81 + 8 PM_VEKTOR_INDEXComboBox @@ -2587,34 +2456,7 @@ der Wertänderungen nutzen wollen: TabPage5 - 5 - - - Tahoma, 9.75pt - - - 985, 31 - - - 238, 24 - - - 78 - - - Neueste Dokumente zuerst anzeigen - - - SORT_BY_LATESTCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage5 - - - 8 + 9 Tahoma, 9.75pt, style=Bold @@ -2626,7 +2468,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1249, 480 + 970, 383 0 @@ -2650,10 +2492,10 @@ der Wertänderungen nutzen wollen: True - 625, 253 + 17, 251 - 1202, 212 + 677, 212 Fill @@ -2731,7 +2573,7 @@ der Wertänderungen nutzen wollen: 6 - 906, 269 + 627, 269 93 @@ -2755,7 +2597,7 @@ der Wertänderungen nutzen wollen: False - 906, 0 + 627, 0 323, 269 @@ -2779,10 +2621,10 @@ der Wertänderungen nutzen wollen: Bottom - 3, 173 + 3, 76 - 1229, 269 + 950, 269 94 @@ -2800,7 +2642,7 @@ der Wertänderungen nutzen wollen: 0 - 388, 212 + 1045, 173 True @@ -2812,7 +2654,7 @@ der Wertänderungen nutzen wollen: Neu hinzufügen - 128, 24 + 127, 24 von {0} finalen Indexen @@ -2978,7 +2820,7 @@ der Wertänderungen nutzen wollen: 9, 133 - 679, 27 + 678, 27 92 @@ -3095,7 +2937,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1235, 445 + 956, 348 0 @@ -3221,7 +3063,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1235, 448 + 956, 348 1 @@ -3248,7 +3090,7 @@ der Wertänderungen nutzen wollen: 3, 3 - 1243, 474 + 964, 377 92 @@ -3272,7 +3114,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1249, 480 + 970, 383 1 @@ -3293,10 +3135,10 @@ der Wertänderungen nutzen wollen: 1 - 9, 77 + 288, 98 - 1257, 509 + 978, 412 79 @@ -3313,6 +3155,75 @@ der Wertänderungen nutzen wollen: 0 + + Left + + + 3, 3 + + + Cyan + + + Fuchsia + + + Profil-Name + + + True + + + 0 + + + 129 + + + 276, 510 + + + 84 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPage1 + + + 7 + + + Tahoma, 9.75pt + + + 973, 68 + + + 238, 24 + + + 78 + + + Neueste Dokumente zuerst anzeigen + + + SORT_BY_LATESTCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage1 + + + 9 + 4, 25 @@ -3320,7 +3231,7 @@ der Wertänderungen nutzen wollen: 3, 3, 3, 3 - 1272, 592 + 1272, 516 0 @@ -3340,6 +3251,342 @@ der Wertänderungen nutzen wollen: 0 + + SplitContainerProfilzuordnung + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage2 + + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 592 + + + 1 + + + Profilzuordnung + + + TabPage2 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 1 + + + btnSQLProfilehome + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 0 + + + btnUserManager + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 1 + + + Button2 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 2 + + + VEKTOR_DELIMITERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 4 + + + btnConnections + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 5 + + + btnopen_SQLAdmin + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 6 + + + EMAIL_ACTIVECheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 7 + + + grpbxEmail + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + + + btnlicensemanager_open + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 9 + + + INTERVALL_CKECK_NO_OF_FILESNumericUpDown + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 11 + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 12 + + + GEAENDERTWERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 14 + + + GEAENDERTWANNTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 16 + + + btnSaveKonfig + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 17 + + + 4, 25 + + + 3, 3, 3, 3 + + + 1272, 592 + + + 2 + + + Grundeinstellungen + + + TabPage3 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl1 + + + 2 + + + Fill + + + 0, 0 + + + 1280, 545 + + + 3 + + + TabControl1 + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlMain + + + 0 + + + Tahoma, 9.75pt + + + Overview and Detail + + + Overview + + + Detail + + + 202, 42 + + + 345, 24 + + + 85 + + + DISPLAY_MODEComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 7 + + + 202, 188 + + + 345, 24 + + + 83 + + + cmbLOGIndex + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 8 + + + 202, 158 + + + 345, 24 + + + 81 + + + PM_VEKTOR_INDEXComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 9 + + + 677, 212 + Fill @@ -3436,21 +3683,6 @@ der Wertänderungen nutzen wollen: 0 - - 4, 25 - - - 3, 3, 3, 3 - - - 907, 557 - - - 0 - - - Benutzer - TabPage7 @@ -3463,21 +3695,6 @@ der Wertänderungen nutzen wollen: 0 - - 4, 25 - - - 3, 3, 3, 3 - - - 907, 557 - - - 1 - - - Gruppen - TabPage8 @@ -3547,31 +3764,58 @@ der Wertänderungen nutzen wollen: 0 - + 4, 25 - + 3, 3, 3, 3 - - 1272, 592 + + 907, 557 - - 1 + + 0 - - Profilzuordnung + + Benutzer - - TabPage2 + + TabPage7 - + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl1 + + TabControl3 - + + 0 + + + 4, 25 + + + 3, 3, 3, 3 + + + 907, 557 + + + 1 + + + Gruppen + + + TabPage8 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabControl3 + + 1 @@ -3671,7 +3915,7 @@ der Wertänderungen nutzen wollen: 2 - 767, 95 + 234, 95 182, 61 @@ -3694,6 +3938,9 @@ der Wertänderungen nutzen wollen: 4 + + 234, 95 + MiddleLeft @@ -3778,6 +4025,177 @@ der Wertänderungen nutzen wollen: 7 + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 0 + + + EMAIL_REMINDER_FOOTERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 2 + + + EMAIL_REMINDER_HEADERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 4 + + + EMAIL_PWTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 6 + + + EMAIL_USERTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 8 + + + EMAIL_SMTPTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 10 + + + EMAIL_FROMTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 12 + + + False + + + 21, 90 + + + 622, 324 + + + 1 + + + E-Mail Konfiguration + + + grpbxEmail + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage3 + + + 8 + + + txtemailEmpfaenger + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 0 + + + Label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 1 + + + btnTest_Email + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox5 + + + 2 + + + 307, 23 + + + 303, 87 + + + 21 + + + Email testen + + + GroupBox5 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxEmail + + + 0 + 112, 19 @@ -3859,30 +4277,6 @@ der Wertänderungen nutzen wollen: 2 - - 307, 23 - - - 303, 87 - - - 21 - - - Email testen - - - GroupBox5 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxEmail - - - 0 - 10, 258 @@ -4015,33 +4409,6 @@ der Wertänderungen nutzen wollen: 12 - - False - - - 21, 90 - - - 622, 324 - - - 1 - - - E-Mail Konfiguration - - - grpbxEmail - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage3 - - - 8 - MiddleLeft @@ -4192,300 +4559,17 @@ der Wertänderungen nutzen wollen: 17 - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 592 - - - 2 - - - Grundeinstellungen - - - TabPage3 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 2 - - - ID - - - Profil-ID - - - Error-Message - - - Wer - - - Wann - - - 17, 134 - - - Fill - - - 3, 30 - - - 1266, 559 - - - 1 - - - TBPM_ERROR_LOGDataGridView - - - System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage4 - - - 0 - - - 1092, 56 - - - 44, 24 - - - von {0} - - - Die Gesamtanzahl der Elemente. - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - True - - - 161, 24 - - - Alle Logeinträge löschen - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - True - - - 24, 24 - - - Erste verschieben - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - True - - - 24, 24 - - - Vorherige verschieben - - - 6, 27 - - - Position - - - False - - - 50, 23 - - - 0 - - - Aktuelle Position - - - 6, 27 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - True - - - 24, 24 - - - Nächste verschieben - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - True - - - 24, 24 - - - Letzte verschieben - - - 6, 27 - - - 3, 3 - - - 1266, 27 - - - 0 - - - BindingNavigator1 - - - TBPM_ERROR_LOGBindingNavigator - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPage4 - - - 1 - - - 4, 25 - - - 3, 3, 3, 3 - - - 1272, 592 - - - 3 - - - Log - - - TabPage4 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabControl1 - - - 3 - - - Fill - - - 0, 0 - - - 1280, 621 - - - 3 - - - TabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlMain - - - 0 - - 257, 173 + 775, 134 - 479, 134 + 871, 95 - 1287, 95 + 754, 95 - - 20, 20 - - - False - - 0, 621 + 0, 545 1280, 22 @@ -4508,14 +4592,20 @@ der Wertänderungen nutzen wollen: 1 + + 20, 20 + + + False + - 550, 95 + 17, 95 17, 17 - 1030, 95 + 497, 95 Fill @@ -4524,7 +4614,7 @@ der Wertänderungen nutzen wollen: 0, 0 - 1280, 621 + 1280, 545 4 @@ -4541,35 +4631,95 @@ der Wertänderungen nutzen wollen: 0 - - 251, 134 - - 758, 134 + 17, 134 - 1031, 134 + 290, 134 - 17, 173 + 535, 134 - 501, 173 + 1019, 134 - 953, 173 + 231, 173 - 17, 212 + 674, 173 - 246, 212 + 903, 173 - 875, 212 + 350, 212 - 312, 251 + 826, 212 + + + True + + + Tahoma, 9.75pt + + + 16, 161 + + + 107, 16 + + + 86 + + + Vektor Metadata: + + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 3 + + + True + + + Tahoma, 9.75pt + + + 16, 191 + + + 136, 16 + + + 87 + + + Vektor Wertänderung: + + + Label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 1 + + + 327, 251 True @@ -4581,7 +4731,7 @@ der Wertänderungen nutzen wollen: 7, 16 - 1280, 643 + 1280, 567 Tahoma, 9.75pt @@ -5215,102 +5365,6 @@ der Wertänderungen nutzen wollen: System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DataGridViewTextBoxColumn17 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn22 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn23 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn24 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn25 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TBPM_ERROR_LOGBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorCountItem3 - - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorDeleteItem1 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveFirstItem3 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMovePreviousItem3 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator9 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorPositionItem3 - - - System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator10 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveNextItem3 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorMoveLastItem3 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - BindingNavigatorSeparator11 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TBDD_CONNECTIONBindingSource @@ -5347,12 +5401,6 @@ der Wertänderungen nutzen wollen: DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - TBPM_ERROR_LOGTableAdapter - - - DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_ERROR_LOGTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TBPM_PROFILE_CONTROLSTableAdapter @@ -5407,6 +5455,12 @@ der Wertänderungen nutzen wollen: DD_PM_WINDREAM.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + ToolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmAdministration diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 9a101f9..1632d35 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -28,7 +28,7 @@ Public Class frmAdministration TBPROFILE_USERTableAdapter.Connection.ConnectionString = CONNECTION_STRING TBPROFILE_GROUPTableAdapter.Connection.ConnectionString = CONNECTION_STRING TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_ERROR_LOGTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = CONNECTION_STRING TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING @@ -432,28 +432,8 @@ Public Class frmAdministration Else FillProfile_User(PROFILGUIDTextBox.Text) End If - Case 3 - Refresh_log() End Select End Sub - - Private Sub BindingNavigatorDeleteItem1_Click(sender As System.Object, e As System.EventArgs) Handles BindingNavigatorDeleteItem1.Click - Try - TBPM_ERROR_LOGTableAdapter.CmdDelete() - Refresh_log() - Catch ex As Exception - LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Delete Log:") - End Try - End Sub - Sub Refresh_log() - Try - Me.TBPM_ERROR_LOGTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_ERROR_LOG) - Catch ex As Exception - LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Refresh Error:") - End Try - End Sub 'Private Sub cmbIndexe_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) ' If cmbIndexe.SelectedIndex <> -1 Then ' 'MsgBox(_windreamPM.GetTypeOfIndex(cmbIndexe.Text)) @@ -1172,4 +1152,12 @@ Public Class frmAdministration LOGGER.Error(ex) End Try End Sub + + Private Sub PM_VEKTOR_INDEXComboBox_MouseHover(sender As Object, e As EventArgs) Handles PM_VEKTOR_INDEXComboBox.MouseHover + ToolTip1.Show("Bitte wählen Sie hier den Vektor-Index den Sie für die Kennzeichnung der PM-Indizes verwenden wollen:", PM_VEKTOR_INDEXComboBox) + End Sub + + Private Sub cmbLOGIndex_MouseHover(sender As Object, e As EventArgs) Handles cmbLOGIndex.MouseHover + ToolTip1.Show("Bitte wählen Sie hier den Vektor-Index den Sie für das Loggen der Wertänderungen nutzen wollen:", cmbLOGIndex) + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index f1e812b..e08c190 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -41,8 +41,6 @@ Partial Class frmMain Me.TBPM_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() - Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() @@ -94,6 +92,7 @@ Partial Class frmMain Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) + Me.Timer5Mins = New System.Windows.Forms.Timer(Me.components) CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -268,19 +267,9 @@ Partial Class frmMain ' resources.ApplyResources(Me.ToolStrip1, "ToolStrip1") Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton2, Me.ToolStripButton1, Me.ToolStripSeparator1, Me.tstrpbtn_Config, Me.tsbtnrefresh}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton2, Me.ToolStripButton1, Me.ToolStripSeparator1, Me.tstrpbtn_Config, Me.tsbtnrefresh}) Me.ToolStrip1.Name = "ToolStrip1" ' - 'ToolStripLabel1 - ' - resources.ApplyResources(Me.ToolStripLabel1, "ToolStripLabel1") - Me.ToolStripLabel1.Name = "ToolStripLabel1" - ' - 'ToolStripSeparator2 - ' - Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - resources.ApplyResources(Me.ToolStripSeparator2, "ToolStripSeparator2") - ' 'ToolStripButton2 ' Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right @@ -617,6 +606,11 @@ Partial Class frmMain 'TimerReminder ' ' + 'Timer5Mins + ' + Me.Timer5Mins.Enabled = True + Me.Timer5Mins.Interval = 350000 + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -673,7 +667,6 @@ Partial Class frmMain Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents ImageListProfile As System.Windows.Forms.ImageList Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip - Friend WithEvents ToolStripLabel1 As System.Windows.Forms.ToolStripLabel Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip Friend WithEvents tsstlblUser As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton @@ -685,7 +678,6 @@ Partial Class frmMain Friend WithEvents TBPM_USERTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_KONFIGURATIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter - Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator Friend WithEvents TBPM_PROFILE_FILESBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILE_FILESTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter Friend WithEvents tslblLicenses As System.Windows.Forms.ToolStripStatusLabel @@ -737,4 +729,5 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator4 As ToolStripSeparator Friend WithEvents ToolStripSeparator3 As ToolStripSeparator Friend WithEvents LayoutSpeichernToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Timer5Mins As Timer End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 9b0841e..76e15bc 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAATwBBAE8AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAUwBBAFMAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -547,42 +547,6 @@ Tahoma, 9pt - - 0, 0 - - - 1023, 27 - - - 2 - - - ToolStrip1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - - - Segoe UI, 9pt, style=Bold, Italic - - - 105, 24 - - - Übersicht-Profile - - - 6, 27 - Magenta @@ -628,36 +592,36 @@ Aktualisieren + + 0, 0 + + + 1023, 27 + + + 2 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 3 + 1015, 17 Tahoma, 9pt - - 0, 498 - - - 1023, 29 - - - 3 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 4 - 150, 24 @@ -695,17 +659,86 @@ No - 127, 24 + 43, 24 - Last Sync: NONE + ... 0, 24 + + 0, 498 + + + 1023, 29 + + + 3 + + + StatusStrip1 + + + StatusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 4 + 152, 95 + + 269, 26 + + + Validierung für Gruppe/Profil starten + + + 269, 26 + + + Validierung für Datei starten + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA + qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg + 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY + AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC + + + + 269, 26 + + + Massenabschluss markierte Dateien + + + 266, 6 + + + 269, 26 + + + Layout zurücksetzen + + + 269, 26 + + + Layout speichern + 270, 146 @@ -942,6 +975,12 @@ 301, 95 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -1166,57 +1205,6 @@ 2 - - 269, 26 - - - Validierung für Gruppe/Profil starten - - - 269, 26 - - - Validierung für Datei starten - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA - qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg - 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY - AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC - - - - 269, 26 - - - Massenabschluss markierte Dateien - - - 266, 6 - - - 269, 26 - - - Layout zurücksetzen - - - 269, 26 - - - Layout speichern - - - 219, 26 - - - Starte Validierung für Profil - 1132, 17 @@ -1416,6 +1404,9 @@ 17, 95 + + 1335, 95 + True @@ -1633,18 +1624,6 @@ DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - ToolStripLabel1 - - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator2 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ToolStripButton2 @@ -1909,6 +1888,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Timer5Mins + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 3fd1209..52ec7ab 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -8,6 +8,7 @@ Imports DevExpress.XtraNavBar Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraCharts Imports DevExpress.XtraGrid.Views.Base +Imports DevExpress.XtraEditors.Controls Public Class frmMain 'Private _windreamPM As ClassPMWindream @@ -123,8 +124,14 @@ Public Class frmMain tstrpbtn_Config.Visible = False End If 'Anzahl der eingeloggten User + If USER_LANGUAGE <> "de-DE" Then + tslblUserLoggedin.Text = "License Count: " & USERCOUNT_LOGGED_IN + Else + tslblUserLoggedin.Text = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN + End If + + - tslblUserLoggedin.Text = "Anzahl User eingeloggt: " & USERCOUNT_LOGGED_IN End If Catch ex As Exception LOGGER.Error(ex) @@ -141,20 +148,25 @@ Public Class frmMain If TimerRefresh.Enabled = False Then TimerRefresh.Start() End If + Timer5Mins.Start() Catch ex As Exception LOGGER.Error(ex) MsgBox("Unexpected Error in LoadForm - Step 4: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") End Try Load_Profile_items() Try - - Dim sql = "SELECT * FROM TBPM_CHART" - DT_CHARTS = ClassDatabase.Return_Datatable(sql) - If DT_CHARTS.Rows.Count = 0 Then - NavBarItemDashboard.Visible = False + If SHOW_CHARTS = True Then + Dim sql = "SELECT * FROM TBPM_CHART" + DT_CHARTS = ClassDatabase.Return_Datatable(sql) + If DT_CHARTS.Rows.Count = 0 Then + NavBarItemDashboard.Visible = False + Else + NavBarItemDashboard.Visible = True + End If Else - NavBarItemDashboard.Visible = True + NavBarItemDashboard.Visible = False End If + Catch ex As Exception LOGGER.Warn($"Could not load Charts: {ex.Message}") End Try @@ -320,9 +332,11 @@ Public Class frmMain Throw New Exception("Could not load Profiles. Datatable is empty") Exit Sub End If - + Dim oCountItems As Integer = 0 For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows If CInt(oProfileRow.Item("FILE_COUNT")) > 0 And (oProfileRow.Item("DISPLAY_MODE") = "Overview and Detail" Or oProfileRow.Item("DISPLAY_MODE") = "Detail") Then + + oCountItems += 1 Dim item1 As NavBarItem = NavBarControl1.Items.Add() item1.Caption = oProfileRow.Item("TITLE") item1.Hint = oProfileRow.Item("TITLE") @@ -338,9 +352,17 @@ Public Class frmMain AddHandler NavBarControl1.LinkClicked, AddressOf navBar_LinkClicked End If - - Next + If oCountItems > 0 Then + If NavBarControl1.Groups(1).Visible = False Then + NavBarControl1.Groups(1).Visible = True + End If + Else + If NavBarControl1.Groups(1).Visible = True Then + NavBarControl1.Groups(1).Visible = False + End If + End If + CurrGroup.Expanded = profileGroupOpen @@ -608,13 +630,10 @@ Public Class frmMain NO_WORKFLOWITEMS = False End If Create_Basic_View() - If InResetlayout = False Then - Dim Columns_Removed = GridView_CheckInvalidColumns() - End If RestoreLayout() - ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE - End If + ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE + End If Catch ex As Exception LOGGER.Error(ex) @@ -685,47 +704,58 @@ Public Class frmMain End Sub - Private Function GridView_CheckInvalidColumns() As Boolean - 'If FORCE_LAYOUT_OVERVIEW = True Then - ' Return False - 'End If - Dim Columns_Removed = False - GRID_INV_COL_REMOVED = False + Private Function GridLayoutChanged() As Boolean Try - For Each grid_column As GridColumn In GridView_Docs.Columns - Dim GridDXCaption = grid_column.Caption - Dim GridDXTextCaption = grid_column.GetTextCaption - Dim GridDXColumnEditName = grid_column.ColumnEditName - Dim GridDXFieldName = grid_column.FieldName - - Dim exists As Boolean = False - For Each col As DataColumn In CURR_DT_PROFILEGRID.Columns - - If col.Caption = GridDXTextCaption Then - exists = True - Exit For + For Each oViewColumn As DataColumn In CURR_DT_PROFILEGRID.Columns + If oViewColumn.Caption = "" Then + Continue For + End If + Dim oViewColumn_exists As Boolean = False + For Each oActGridColumn As GridColumn In GridView_Docs.Columns + Dim oGridDXFieldName = oActGridColumn.FieldName + Dim GridDXColumnEditName = oActGridColumn.ColumnEditName + Dim GridDXFieldName = oActGridColumn.FieldName + If oViewColumn.Caption = oGridDXFieldName Then + If oActGridColumn.Visible = False Then + If oViewColumn.Caption <> "GUID" And oViewColumn.Caption <> "TL_STATE" And oViewColumn.Caption <> "PROFILE_ID" And oViewColumn.Caption <> "DOC_ID" And + oViewColumn.Caption <> "FULL_FILE_PATH" And oViewColumn.Caption <> "GROUP_COLOR" And oViewColumn.Caption <> "GROUP_TEXT" Then + Console.WriteLine($"ViewColumn [{oViewColumn.Caption}] is invisible") + Else + oViewColumn_exists = True + End If + Else + oViewColumn_exists = True + End If End If Next - If exists = False Then - If grid_column.Visible = True Then - Try - grid_column.Dispose() - Columns_Removed = True - GRID_INV_COL_REMOVED = True - Catch ex As Exception - LOGGER.Error(ex) - - End Try - - End If + If oViewColumn_exists = False Then + LOGGER.Info($"Following ViewColumn no longer exists in the view: [{oViewColumn.Caption}]") + Return True + End If + Next + For Each oActGridColumn As GridColumn In GridView_Docs.Columns + If oActGridColumn.Caption = "" Then + Continue For + End If + Dim oGridColumn_exists As Boolean = False + Dim oGridDXFieldName = oActGridColumn.FieldName + For Each oViewColumn As DataColumn In CURR_DT_PROFILEGRID.Columns + If oViewColumn.Caption = oGridDXFieldName Then + oGridColumn_exists = True + End If + Next + If oGridColumn_exists = False Then + LOGGER.Info($"Following GridColumn no longer exists in the View: [{oGridDXFieldName}]") + Return True End If Next - Return Columns_Removed Catch ex As Exception LOGGER.Error(ex) - LOGGER.Info("Unexpected Error in GridView_CheckInvalidColumns: " & ex.Message) + LOGGER.Info("Unexpected Error in GridLayoutChanged: " & ex.Message) + Return False End Try End Function + 'Sub LoadProfile_PM() ' Try ' If Me.Visible = True And frmAdministration.Visible = False Then @@ -831,19 +861,15 @@ Public Class frmMain SaveGridLayout() Load_Profile_items() Decide_Load() - tsslblLastSysnc.Text = "Last Client-Sync: " & Now.ToLongTimeString - If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.LoadViewInfo() - Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) - Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql) - If DT_CHECKUSER_MODULE.Rows.Count = 1 Then - USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + 1 - If USER_LANGUAGE = "de-DE" Then - tslblUserLoggedin.Text = "User eingeloggt: " & USERCOUNT_LOGGED_IN - Else - tslblUserLoggedin.Text = "User logged in: " & USERCOUNT_LOGGED_IN - End If + If USER_LANGUAGE <> "de-DE" Then + tsslblLastSysnc.Text = "Last Client-Sync: " & Now.ToLongTimeString + Else + tsslblLastSysnc.Text = "Letzte Synchronisation: " & Now.ToLongTimeString End If + If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.LoadViewInfo() + + @@ -867,7 +893,7 @@ Public Class frmMain Load_single_Profile() End If If WORKING_MODE <> "" Then - If WORKING_MODE.Contains("PM NO MASS_VALIDATOR") Then + If WORKING_MODE.Contains("PM#NO_MASS_VALIDATOR") Then GridView_Docs.OptionsSelection.MultiSelect = False tsmiMarkedFilesFinish.Visible = False ToolStripSeparator4.Visible = False @@ -1185,6 +1211,11 @@ Public Class frmMain Load_Grid_Overview() RefreshHelper.LoadViewInfo() End Sub + Private Sub GridView1_PopupMenuShowing(ByVal sender As Object, ByVal e As DevExpress.XtraGrid.Views.Grid.PopupMenuShowingEventArgs) + Dim view As GridView = TryCast(sender, GridView) + MsgBox(e.MenuType.ToString) + + End Sub Sub Load_Grid_Overview() SplitContainerDashboard.Visible = False Layout_Single_Profile() @@ -1293,13 +1324,16 @@ Public Class frmMain GridControl_Docs.DataSource = bindsourcegrid ToolStripLabelViewTape.Text = "Gesamtübersicht" + 'GridControlDocRow.ForceInitialize() ' GridControl1.DataSource = CURR_DT_PROFILEGRID - If InResetlayout = False Then - Dim Columns_Removed = GridView_CheckInvalidColumns() + If FORCE_LAYOUT_OVERVIEW = True And GridLayoutChanged() = True Then + ResetLayout() + SaveGridLayout() + Else + RestoreLayout() End If - RestoreLayout() Try 'GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False @@ -1558,4 +1592,17 @@ Public Class frmMain Decide_Load() End Sub + + Private Sub Timer5Mins_Tick(sender As Object, e As EventArgs) Handles Timer5Mins.Tick + Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) + Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql) + If DT_CHECKUSER_MODULE.Rows.Count = 1 Then + USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + 1 + If USER_LANGUAGE = "de-DE" Then + tslblUserLoggedin.Text = "License Count: " & USERCOUNT_LOGGED_IN + Else + tslblUserLoggedin.Text = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN + End If + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 3d4e343..15c1c5e 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -22,11 +22,10 @@ Partial Class frmValidator 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmValidator)) - Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) - Me.BarAndDockingController2 = New DevExpress.XtraBars.BarAndDockingController(Me.components) - Me.BarAndDockingController1 = New DevExpress.XtraBars.BarAndDockingController(Me.components) + Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController() + Me.BarAndDockingController2 = New DevExpress.XtraBars.BarAndDockingController() + Me.BarAndDockingController1 = New DevExpress.XtraBars.BarAndDockingController() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tstrplblError = New System.Windows.Forms.ToolStripStatusLabel() Me.tstrlbl_Info = New System.Windows.Forms.ToolStripStatusLabel() @@ -44,17 +43,17 @@ Partial Class frmValidator Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TBPM_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() - Me.VWPM_CONTROL_INDEXBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.VWPM_CONTROL_INDEXBindingSource = New System.Windows.Forms.BindingSource() Me.VWPM_CONTROL_INDEXTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter() - Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource() + Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource() Me.pnlpdf = New System.Windows.Forms.Panel() Me.PdfViewer1 = New DevExpress.XtraPdfViewer.PdfViewer() - Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) + Me.BarManager1 = New DevExpress.XtraBars.BarManager() Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() @@ -131,8 +130,9 @@ Partial Class frmValidator Me.ToolStripButtonDeleteFile = New System.Windows.Forms.ToolStripButton() Me.ToolStripButtonAnnotation = New System.Windows.Forms.ToolStripButton() Me.FinalIndexDataSet = New DD_PM_WINDREAM.FinalIndexDataSet() - Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource() Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_PM_WINDREAM.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() + Me.ToolTip1 = New System.Windows.Forms.ToolTip() CType(Me.BarAndDockingController3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -992,4 +992,5 @@ Partial Class frmValidator Friend WithEvents InfoToolStripMenuItem As ToolStripMenuItem Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripButtonSearchesReload As ToolStripButton + Friend WithEvents ToolTip1 As ToolTip End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 6f1dcb5..5e71414 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -130,31 +130,6 @@ 608, 17 - - Segoe UI, 9pt, style=Bold - - - 22, 17 - - - sss - - - - False - - - 89, 17 - - - Anzahl Dateien: - - - 82, 17 - - - Document-ID: - 0, 621 @@ -165,6 +140,7 @@ 962, 22 + 4 @@ -183,6 +159,105 @@ 2 + + Segoe UI, 9pt, style=Bold + + + 22, 17 + + + sss + + + False + + + 89, 17 + + + Anzahl Dateien: + + + 82, 17 + + + Document-ID: + + + TITLELabel1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + + + btnSave + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + DESCRIPTIONLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 2 + + + pnldesigner + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 3 + + + Fill + + + 0, 0 + + + 3, 4, 3, 4 + + + 477, 593 + + + 24 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1.Panel1 + + + 0 + Top, Left, Right @@ -312,33 +387,6 @@ 3 - - Fill - - - 0, 0 - - - 3, 4, 3, 4 - - - 477, 593 - - - 24 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel1 - - - 0 - 725, 17 @@ -387,15 +435,102 @@ 17, 134 + + 690, 134 + Top, Right + + PdfViewer1 + + + DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + pnlpdf + + + 0 + + + StatusStrip2 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlpdf + + + 1 + + + RibbonControl1 + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + pnlpdf + + + 2 + + + 279, 119 + + + 3, 4, 3, 4 + + + 146, 362 + + + 26 + + + False + + + pnlpdf + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1.Panel2 + + + 1 + + + 955, 134 + Fill 0, 141 + + 146, 199 + + + 5 + + + PdfViewer1 + + + DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + pnlpdf + + + 0 + 955, 134 @@ -489,93 +624,15 @@ 251 + + 17, 173 + 7, 17 962, 643 - - 17, 173 - - - Segoe UI, 9.75pt - - - 156, 22 - - - Datei öffnen - - - 156, 22 - - - Info - - - 156, 22 - - - Eigenschaften - - - Magenta - - - 67, 22 - - - Datei - - - Magenta - - - 178, 22 - - - Zusätzliche Suchen reload - - - Magenta - - - 165, 22 - - - Datei überspringen (F4) - - - Magenta - - - 106, 22 - - - Datei löschen - - - Magenta - - - 105, 22 - - - Annotationen - - - 0, 0 - - - 962, 25 - - - 42 - - - ToolStrip1 - ToolStrip1 @@ -588,186 +645,6 @@ 0 - - Top, Bottom, Left, Right - - - 0, 28 - - - SplitContainer1.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1 - - - 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 - - - 1228, 134 - - - 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 - - - 29, 102 - - - 200, 100 - - - 33 - - - 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 - - - 26, 19 - - - 200, 57 - - - 31 - - - Betreff - - - False - - - grpBetreff - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel2 - - - 2 - - - SplitContainer1.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1 - - - 1 - - - 962, 593 - - - 477 - - - 37 - SplitContainer1 @@ -1483,6 +1360,12 @@ DD_PM_WINDREAM.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter, FinalIndexDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + ToolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmValidator @@ -1492,45 +1375,9 @@ BarButtonItem1 - - 146, 199 - - - 5 - - - PdfViewer1 - - - DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - pnlpdf - - - 0 - 690, 134 - - Segoe UI Semibold, 9pt, style=Bold, Italic - - - 139, 16 - - - ToolStripStatusLabel1 - - - Magenta - - - 153, 20 - - - Seitenansicht Minimal - 0, 340 @@ -1555,6 +1402,24 @@ 1 + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 139, 16 + + + ToolStripStatusLabel1 + + + Magenta + + + 153, 20 + + + Seitenansicht Minimal + 0, 0 @@ -1573,39 +1438,336 @@ 2 - - 279, 119 - - - 3, 4, 3, 4 - - - 146, 362 - - - 26 - - - False - - - pnlpdf - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel2 - - - 1 - 807, 134 1080, 134 + + 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 + + + 1228, 134 + + + 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 + + + 120, 17 + + + ToolStripStatusLabel1 + + + 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 + + + 26, 19 + + + 200, 57 + + + 31 + + + Betreff + + + False + + + grpBetreff + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1.Panel2 + + + 2 + + + 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 + + + Top, Bottom, Left, Right + + + 0, 28 + + + SplitContainer1.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1 + + + 0 + + + 1228, 134 + + + WebBrowser + + + System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxMailBody + + + 0 + + + StatusStrip3 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxMailBody + + + 1 + + + 29, 102 + + + 200, 100 + + + 33 + + + Body: + + + grpbxMailBody + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1.Panel2 + + + 0 + + + SplitContainer1.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1 + + + 1 + + + 962, 593 + + + 477 + + + 37 + + + SplitContainer1 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 17, 173 + + + Segoe UI, 9.75pt + + + 0, 0 + + + 962, 25 + + + 42 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + Magenta + + + 67, 22 + + + Datei + + + 156, 22 + + + Datei öffnen + + + 156, 22 + + + Info + + + 156, 22 + + + Eigenschaften + + + Magenta + + + 178, 22 + + + Zusätzliche Suchen reload + + + Magenta + + + 165, 22 + + + Datei überspringen (F4) + + + Magenta + + + 106, 22 + + + Datei löschen + + + Magenta + + + 105, 22 + + + Annotationen + 124, 173 @@ -1615,4 +1777,7 @@ 583, 173 + + 888, 173 + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 9772ddf..e32bd77 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -383,12 +383,12 @@ Public Class frmValidator Dim text As String = IIf(IsDBNull(dr.Item("FINAL_TEXT")), "", dr.Item("FINAL_TEXT")) If text <> "" Then - btnSave.Text = text & " (F1)" + btnSave.Text = text Else - btnSave.Text = "Validierung speichern - Nächstes Dokument" & " (F1)" + btnSave.Text = "Validierung speichern - Nächstes Dokument" End If Else - btnSave.Text = "Validierung speichern - Nächstes Dokument" & " (F1)" + btnSave.Text = "Validierung speichern - Nächstes Dokument" End If LOGGER.Debug("Final profile Text geladen") Catch ex As Exception @@ -3040,13 +3040,14 @@ Public Class frmValidator Return PM_String End Function - Private Function Indexiere_VektorfeldPM(input As String, NameVKTIndex As String, Optional PreventDuplicates As Boolean = False, Optional AllowAddNewValues As Boolean = True) + Private Function Indexiere_VektorfeldPM(input As String, NameVKTIndex As String, Optional PreventDuplicates As Boolean = False, Optional AllowAddNewValues As Boolean = True, Optional IndexBehaviour As String = "Add") Dim oOldValue As Object = CURRENT_WMFILE.GetVariableValue(NameVKTIndex) Dim oValueList As New List(Of Object) Dim oNewValue As Object() Dim oMissing As Boolean = False If oOldValue IsNot Nothing AndAlso TypeOf oOldValue Is Object Then + ' If new values are allowed, add the old values first If AllowAddNewValues Then oValueList = DirectCast(oOldValue, Object()).ToList() @@ -3977,13 +3978,14 @@ Public Class frmValidator End Sub Private Sub frmValidator_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp - If e.KeyCode = Keys.F1 Then + If (e.Control AndAlso e.KeyCode = Keys.S) Then btnSave.Enabled = False Abschluss() btnSave.Enabled = True ElseIf e.KeyCode = Keys.F4 Then Datei_ueberspringen() End If + End Sub Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButtonJumpFile.Click @@ -4052,4 +4054,16 @@ Public Class frmValidator Private Sub ToolStripButtonSearchesReload_Click(sender As Object, e As EventArgs) Handles ToolStripButtonSearchesReload.Click Load_Additional_Searches() End Sub + + Private Sub btnSave_MouseHover(sender As Object, e As EventArgs) Handles btnSave.MouseHover + Dim msg = "strg & s für speichern" + If USER_LANGUAGE <> "de-DE" Then + msg = "ctrl & s for saving" + End If + ToolTip1.Show(msg, btnSave) + End Sub + + Private Sub frmValidator_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown + + End Sub End Class \ No newline at end of file