diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 95494d3..92c36b3 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -488,6 +488,8 @@ Partial Class frmMain ' resources.ApplyResources(Me.bsiMessage, "bsiMessage") Me.bsiMessage.Id = 14 + Me.bsiMessage.ItemAppearance.Normal.Font = CType(resources.GetObject("bsiMessage.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.bsiMessage.ItemAppearance.Normal.Options.UseFont = True Me.bsiMessage.Name = "bsiMessage" ' 'bbtniMetadataFile diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index aaa6ac1..04c5ce6 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAWwBCAFsAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAXQBCAF0AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -958,6 +958,9 @@ BarStaticItem1 + + Tahoma, 8.25pt, style=Bold + Metadaten Datei diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index ce2dc64..2909966 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1585,7 +1585,11 @@ Public Class frmMain If BASEDATA_DT_VW_PROFILE_USER.Rows.Count = 0 Then LOGGER.Info("no profiles for user: '" & USER_USERNAME & "' configured!", False) NO_WORKFLOWITEMS = True - bsiMessage.Caption = "Keine Profile für Ihren User hinterlegt" + bsiMessage.Caption = "NO PROFILES FOR USER" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Red + If GridControl_Docs.Visible = True Then + GridControl_Docs.Visible = False + End If oStopWatch.Done() Exit Function End If @@ -1616,6 +1620,10 @@ Public Class frmMain If Not IsNothing(CURR_DT_OVERVIEW) Then LOGGER.Debug($"Datatable CURR_DT_OVERVIEW loaded: {CURR_DT_OVERVIEW.Rows.Count} rows") + If GridControl_Docs.Visible = False Then + GridControl_Docs.Visible = True + End If + Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW) Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW) Dim oCOUNT = CURR_DT_OVERVIEW.Rows.Count @@ -2253,6 +2261,7 @@ Public Class frmMain Private Async Sub bbtniRefresh_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniRefresh.ItemClick + Timer_Inactivity_Reset_Disable("OverviewRefreshClick") If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo() SaveGridLayout() @@ -2762,6 +2771,7 @@ Public Class frmMain Private Sub RibbonControl1_SelectedPageChanged(sender As Object, e As EventArgs) Handles RibbonControl1.SelectedPageChanged Dim ribbon As RibbonControl = TryCast(sender, RibbonControl) + Timer_Inactivity_Reset_Disable("RibbonControl1_SelectedPageChanged") If ribbon.SelectedPage Is RibbonPage4 Then Select Case GridViewItem_Clicked Case "GROUP" diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb index fe347fd..ce6fb36 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb @@ -24,7 +24,6 @@ Partial Class frmSQL_DESIGNER Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER)) Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() @@ -37,7 +36,6 @@ Partial Class frmSQL_DESIGNER Me.Label4 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() - Me.dgvResult = New System.Windows.Forms.DataGridView() Me.dgvPlaceholders = New System.Windows.Forms.DataGridView() Me.colPlaceholder = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colReplace = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -56,10 +54,13 @@ Partial Class frmSQL_DESIGNER Me.cmbUser = New System.Windows.Forms.ComboBox() Me.Label3 = New System.Windows.Forms.Label() Me.btnAddUser = New System.Windows.Forms.Button() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'DD_DMSLiteDataSet @@ -133,15 +134,12 @@ Partial Class frmSQL_DESIGNER ' Me.SQL_COMMANDTextBox.AcceptsReturn = True Me.SQL_COMMANDTextBox.AcceptsTab = True - Me.SQL_COMMANDTextBox.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.SQL_COMMANDTextBox.Font = New System.Drawing.Font("Courier New", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(15, 125) Me.SQL_COMMANDTextBox.Multiline = True Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox" Me.SQL_COMMANDTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(905, 186) + Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(973, 167) Me.SQL_COMMANDTextBox.TabIndex = 86 ' 'Label4 @@ -155,11 +153,10 @@ Partial Class frmSQL_DESIGNER ' 'Label1 ' - Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(13, 331) + Me.Label1.Location = New System.Drawing.Point(13, 316) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(65, 15) Me.Label1.TabIndex = 91 @@ -167,44 +164,27 @@ Partial Class frmSQL_DESIGNER ' 'Label5 ' - Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.Label5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label5.Location = New System.Drawing.Point(365, 331) + Me.Label5.Location = New System.Drawing.Point(304, 316) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(55, 15) Me.Label5.TabIndex = 90 Me.Label5.Text = "Ergebnis:" ' - 'dgvResult - ' - Me.dgvResult.AllowUserToAddRows = False - Me.dgvResult.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan - Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvResult.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvResult.Location = New System.Drawing.Point(368, 349) - Me.dgvResult.Name = "dgvResult" - Me.dgvResult.ReadOnly = True - Me.dgvResult.Size = New System.Drawing.Size(552, 134) - Me.dgvResult.TabIndex = 89 - ' 'dgvPlaceholders ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 - Me.dgvPlaceholders.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) Me.dgvPlaceholders.Enabled = False - Me.dgvPlaceholders.Location = New System.Drawing.Point(16, 349) + Me.dgvPlaceholders.Location = New System.Drawing.Point(15, 337) Me.dgvPlaceholders.Name = "dgvPlaceholders" - Me.dgvPlaceholders.Size = New System.Drawing.Size(338, 133) + Me.dgvPlaceholders.Size = New System.Drawing.Size(286, 133) Me.dgvPlaceholders.TabIndex = 88 ' 'colPlaceholder @@ -220,12 +200,11 @@ Partial Class frmSQL_DESIGNER ' 'btnTestSQL ' - Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnTestSQL.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle)) Me.btnTestSQL.Image = CType(resources.GetObject("btnTestSQL.Image"), System.Drawing.Image) Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnTestSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnTestSQL.Location = New System.Drawing.Point(752, 314) + Me.btnTestSQL.Location = New System.Drawing.Point(820, 302) Me.btnTestSQL.Name = "btnTestSQL" Me.btnTestSQL.Size = New System.Drawing.Size(168, 29) Me.btnTestSQL.TabIndex = 87 @@ -266,7 +245,7 @@ Partial Class frmSQL_DESIGNER Me.btnSaveSQLCommand.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnSaveSQLCommand.Image = CType(resources.GetObject("btnSaveSQLCommand.Image"), System.Drawing.Image) Me.btnSaveSQLCommand.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSaveSQLCommand.Location = New System.Drawing.Point(825, 489) + Me.btnSaveSQLCommand.Location = New System.Drawing.Point(893, 662) Me.btnSaveSQLCommand.Name = "btnSaveSQLCommand" Me.btnSaveSQLCommand.Size = New System.Drawing.Size(95, 30) Me.btnSaveSQLCommand.TabIndex = 95 @@ -279,7 +258,7 @@ Partial Class frmSQL_DESIGNER Me.lblSaveFinalIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.lblSaveFinalIndex.AutoSize = True Me.lblSaveFinalIndex.BackColor = System.Drawing.Color.Yellow - Me.lblSaveFinalIndex.Location = New System.Drawing.Point(367, 489) + Me.lblSaveFinalIndex.Location = New System.Drawing.Point(304, 662) Me.lblSaveFinalIndex.Name = "lblSaveFinalIndex" Me.lblSaveFinalIndex.Size = New System.Drawing.Size(38, 13) Me.lblSaveFinalIndex.TabIndex = 96 @@ -369,11 +348,29 @@ Partial Class frmSQL_DESIGNER Me.btnAddUser.TabIndex = 99 Me.btnAddUser.UseVisualStyleBackColor = True ' + 'GridControl1 + ' + Me.GridControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GridControl1.Location = New System.Drawing.Point(307, 337) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(681, 322) + Me.GridControl1.TabIndex = 100 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' 'frmSQL_DESIGNER ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(930, 523) + Me.ClientSize = New System.Drawing.Size(998, 696) + Me.Controls.Add(Me.GridControl1) Me.Controls.Add(Me.btnAddUser) Me.Controls.Add(Me.btnAddStatic) Me.Controls.Add(Me.btnAddControl) @@ -390,7 +387,6 @@ Partial Class frmSQL_DESIGNER Me.Controls.Add(Me.cmbIndexe) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.dgvResult) Me.Controls.Add(Me.dgvPlaceholders) Me.Controls.Add(Me.btnTestSQL) Me.Controls.Add(Me.SQL_COMMANDTextBox) @@ -400,7 +396,6 @@ Partial Class frmSQL_DESIGNER Me.Controls.Add(Me.cmbConnection) Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.MaximizeBox = False Me.MinimizeBox = False Me.MinimumSize = New System.Drawing.Size(937, 392) Me.Name = "frmSQL_DESIGNER" @@ -408,8 +403,9 @@ Partial Class frmSQL_DESIGNER Me.Text = "SQL - Designer" CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -425,7 +421,6 @@ Partial Class frmSQL_DESIGNER Friend WithEvents Label4 As System.Windows.Forms.Label Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents dgvResult As System.Windows.Forms.DataGridView Friend WithEvents dgvPlaceholders As System.Windows.Forms.DataGridView Friend WithEvents colPlaceholder As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents colReplace As System.Windows.Forms.DataGridViewTextBoxColumn @@ -444,4 +439,6 @@ Partial Class frmSQL_DESIGNER Friend WithEvents cmbUser As ComboBox Friend WithEvents Label3 As Label Friend WithEvents btnAddUser As Button + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView End Class diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index fe3121a..8a451d6 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -157,7 +157,7 @@ Public Class frmSQL_DESIGNER Dim ds As DataSet = ExecuteWithConnection(cmbConnection.SelectedValue, query) If ds IsNot Nothing Then - dgvResult.DataSource = ds.Tables(0) + GridControl1.DataSource = ds.Tables(0) End If End Sub @@ -290,4 +290,8 @@ Public Class frmSQL_DESIGNER Private Sub cmbConnection_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbConnection.SelectedIndexChanged End Sub + + Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click + + End Sub End Class \ No newline at end of file