diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb index 5ca92aa..47cecf4 100644 --- a/app/DD-Record-Organiser/ClassControlBuilder.vb +++ b/app/DD-Record-Organiser/ClassControlBuilder.vb @@ -587,10 +587,11 @@ Public Class ClassControlBuilder control.Cursor = Cursors.Hand End If - If Not read_only Then + If Not read_only Or _designMode Then Me.SetEventHandlers(control) End If + Me.CurrentControl = DirectCast(control, TextBox) If Not IsNothing(parent) Then control.Parent = parent @@ -932,7 +933,7 @@ Public Class ClassControlBuilder control.Size = New Size(vwidth, vheight) End If - If Not read_only Then + If Not read_only Or _designMode Then Me.SetEventHandlers(control) End If @@ -973,6 +974,8 @@ Public Class ClassControlBuilder control.Parent = _master_panel control.ReadOnly = read_only + + column.HeaderText = "" column.Name = "column1" control.Columns.Add(column) diff --git a/app/DD-Record-Organiser/frmSQLEditor.Designer.vb b/app/DD-Record-Organiser/frmSQLEditor.Designer.vb index ddd2c2c..16b1040 100644 --- a/app/DD-Record-Organiser/frmSQLEditor.Designer.vb +++ b/app/DD-Record-Organiser/frmSQLEditor.Designer.vb @@ -22,17 +22,16 @@ Partial Class frmSQLEditor 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Button1 = New System.Windows.Forms.Button() Me.txtValue = New System.Windows.Forms.TextBox() Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource() Me.TBDD_CONNECTIONTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.cmbConnection = New System.Windows.Forms.ComboBox() @@ -62,6 +61,7 @@ Partial Class frmSQLEditor Me.txtCondition = New System.Windows.Forms.TextBox() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() + Me.lbResultsCount = New System.Windows.Forms.Label() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() @@ -75,10 +75,10 @@ Partial Class frmSQLEditor 'Button1 ' Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Button1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button1.Location = New System.Drawing.Point(960, 700) + Me.Button1.Location = New System.Drawing.Point(954, 680) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(266, 25) Me.Button1.TabIndex = 1 @@ -113,6 +113,7 @@ Partial Class frmSQLEditor 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Me.TBDD_CONNECTIONTableAdapter Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Nothing @@ -120,7 +121,6 @@ Partial Class frmSQLEditor Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Me.TBDD_CONNECTIONTableAdapter Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing @@ -132,6 +132,9 @@ Partial Class frmSQLEditor Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WORKFLOW_FORMTableAdapter = Nothing @@ -142,7 +145,7 @@ Partial Class frmSQLEditor 'cmbConnection ' Me.cmbConnection.DataSource = Me.TBDD_CONNECTIONBindingSource - Me.cmbConnection.DisplayMember = "DESCRIPTION" + Me.cmbConnection.DisplayMember = "BEZEICHNUNG" Me.cmbConnection.FormattingEnabled = True Me.cmbConnection.Location = New System.Drawing.Point(6, 19) Me.cmbConnection.Name = "cmbConnection" @@ -163,12 +166,12 @@ Partial Class frmSQLEditor ' 'btnTestSQL ' - 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), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnTestSQL.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnTestSQL.Image = Global.DD_Record_Organiser.My.Resources.Resources.Go Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTestSQL.Location = New System.Drawing.Point(954, 413) + Me.btnTestSQL.Location = New System.Drawing.Point(368, 680) Me.btnTestSQL.Name = "btnTestSQL" - Me.btnTestSQL.Size = New System.Drawing.Size(266, 29) + Me.btnTestSQL.Size = New System.Drawing.Size(266, 25) Me.btnTestSQL.TabIndex = 7 Me.btnTestSQL.Text = "SQL Befehl testen" Me.btnTestSQL.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -207,28 +210,28 @@ Partial Class frmSQLEditor ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle7.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle8.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvPlaceholders.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle13.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle14.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvPlaceholders.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle14 Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle9.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvPlaceholders.DefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle15.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvPlaceholders.DefaultCellStyle = DataGridViewCellStyle15 Me.dgvPlaceholders.Enabled = False - Me.dgvPlaceholders.Location = New System.Drawing.Point(9, 458) + Me.dgvPlaceholders.Location = New System.Drawing.Point(12, 438) Me.dgvPlaceholders.Name = "dgvPlaceholders" Me.dgvPlaceholders.Size = New System.Drawing.Size(350, 236) Me.dgvPlaceholders.TabIndex = 16 @@ -248,36 +251,36 @@ Partial Class frmSQLEditor ' Me.dgvResult.AllowUserToAddRows = False Me.dgvResult.AllowUserToDeleteRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.Cyan - Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvResult.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle16.BackColor = System.Drawing.Color.Cyan + Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle17.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvResult.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle12.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvResult.DefaultCellStyle = DataGridViewCellStyle12 - Me.dgvResult.Location = New System.Drawing.Point(365, 458) + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle18.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvResult.DefaultCellStyle = DataGridViewCellStyle18 + Me.dgvResult.Location = New System.Drawing.Point(368, 438) Me.dgvResult.Name = "dgvResult" Me.dgvResult.ReadOnly = True - Me.dgvResult.Size = New System.Drawing.Size(855, 236) + Me.dgvResult.Size = New System.Drawing.Size(852, 236) Me.dgvResult.TabIndex = 17 ' 'Label5 ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.Label5.Location = New System.Drawing.Point(362, 440) + Me.Label5.Location = New System.Drawing.Point(365, 420) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(55, 15) Me.Label5.TabIndex = 18 @@ -441,7 +444,7 @@ Partial Class frmSQLEditor ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.Label1.Location = New System.Drawing.Point(6, 440) + Me.Label1.Location = New System.Drawing.Point(9, 420) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(132, 15) Me.Label1.TabIndex = 32 @@ -457,11 +460,22 @@ Partial Class frmSQLEditor Me.Label2.TabIndex = 33 Me.Label2.Text = "SQL-Befehl:" ' + 'lbResultsCount + ' + Me.lbResultsCount.AutoSize = True + Me.lbResultsCount.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lbResultsCount.Location = New System.Drawing.Point(640, 684) + Me.lbResultsCount.Name = "lbResultsCount" + Me.lbResultsCount.Size = New System.Drawing.Size(110, 17) + Me.lbResultsCount.TabIndex = 34 + Me.lbResultsCount.Text = "Keine Ergebnisse" + ' 'frmSQLEditor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1238, 737) + Me.ClientSize = New System.Drawing.Size(1238, 717) + Me.Controls.Add(Me.lbResultsCount) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.GroupBox4) @@ -523,4 +537,5 @@ Partial Class frmSQLEditor Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents txtCondition As System.Windows.Forms.TextBox Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents lbResultsCount As System.Windows.Forms.Label End Class diff --git a/app/DD-Record-Organiser/frmSQLEditor.resx b/app/DD-Record-Organiser/frmSQLEditor.resx index abd246b..2d39941 100644 --- a/app/DD-Record-Organiser/frmSQLEditor.resx +++ b/app/DD-Record-Organiser/frmSQLEditor.resx @@ -118,16 +118,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 499, 17 + + 17, 17 - - 160, 17 - - - 414, 17 + + 261, 17 - 662, 17 + 642, 17 True diff --git a/app/DD-Record-Organiser/frmSQLEditor.vb b/app/DD-Record-Organiser/frmSQLEditor.vb index 7f78861..ba8d879 100644 --- a/app/DD-Record-Organiser/frmSQLEditor.vb +++ b/app/DD-Record-Organiser/frmSQLEditor.vb @@ -97,6 +97,7 @@ Public Class frmSQLEditor Dim ds As DataSet = ExecuteWithConnection(cmbConnection.SelectedValue, query) If ds IsNot Nothing Then + lbResultsCount.Text = ds.Tables(0).Rows.Count.ToString & " Ergebnisse" dgvResult.DataSource = ds.Tables(0) End If