diff --git a/.vs/DD_PM_WINDREAM/v15/.suo b/.vs/DD_PM_WINDREAM/v15/.suo index e17d520..00baa41 100644 Binary files a/.vs/DD_PM_WINDREAM/v15/.suo and b/.vs/DD_PM_WINDREAM/v15/.suo differ diff --git a/DD_PM_WINDREAM/My Project/licenses.licx b/DD_PM_WINDREAM/My Project/licenses.licx index 8b13789..0f4250f 100644 --- a/DD_PM_WINDREAM/My Project/licenses.licx +++ b/DD_PM_WINDREAM/My Project/licenses.licx @@ -1 +1,4 @@ - +DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.exe b/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.exe index 849dda5..af27163 100644 Binary files a/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.exe and b/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.exe differ diff --git a/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.pdb b/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.pdb index 3d6627a..a894664 100644 Binary files a/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.pdb and b/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.pdb differ diff --git a/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index ba3e6a1..3b85c5f 100644 --- a/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -44,7 +44,7 @@ Partial Class frmFormDesigner Me.pnldesigner = New System.Windows.Forms.Panel() Me.Label1 = New System.Windows.Forms.Label() Me.lblhintergrund = New System.Windows.Forms.Label() - Me.gbx_CTRL = New System.Windows.Forms.GroupBox() + Me.gbxControl = New System.Windows.Forms.GroupBox() Me.TabControlEigenschaften = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.LOAD_IDX_VALUECheckBox = New System.Windows.Forms.CheckBox() @@ -111,7 +111,7 @@ Partial Class frmFormDesigner Me.Panel1.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() - Me.gbx_CTRL.SuspendLayout() + Me.gbxControl.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() Me.TabPage1.SuspendLayout() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -359,22 +359,22 @@ Partial Class frmFormDesigner Me.lblhintergrund.TabIndex = 1 Me.lblhintergrund.Text = "Validierungsbereich" ' - 'gbx_CTRL + 'gbxControl ' - Me.gbx_CTRL.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Me.gbxControl.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.gbx_CTRL.Controls.Add(Me.TabControlEigenschaften) - Me.gbx_CTRL.Controls.Add(Me.btndelete) - Me.gbx_CTRL.Controls.Add(Me.btnsave) - Me.gbx_CTRL.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.gbx_CTRL.Location = New System.Drawing.Point(507, 205) - Me.gbx_CTRL.Name = "gbx_CTRL" - Me.gbx_CTRL.Size = New System.Drawing.Size(476, 332) - Me.gbx_CTRL.TabIndex = 4 - Me.gbx_CTRL.TabStop = False - Me.gbx_CTRL.Text = "Controleigenschaften:" - Me.gbx_CTRL.Visible = False + Me.gbxControl.Controls.Add(Me.TabControlEigenschaften) + Me.gbxControl.Controls.Add(Me.btndelete) + Me.gbxControl.Controls.Add(Me.btnsave) + Me.gbxControl.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.gbxControl.Location = New System.Drawing.Point(507, 205) + Me.gbxControl.Name = "gbxControl" + Me.gbxControl.Size = New System.Drawing.Size(476, 332) + Me.gbxControl.TabIndex = 4 + Me.gbxControl.TabStop = False + Me.gbxControl.Text = "Controleigenschaften:" + Me.gbxControl.Visible = False ' 'TabControlEigenschaften ' @@ -977,7 +977,7 @@ Partial Class frmFormDesigner Me.Controls.Add(Me.Y_LOCTextBox) Me.Controls.Add(X_LOCLabel) Me.Controls.Add(Me.X_LOCTextBox) - Me.Controls.Add(Me.gbx_CTRL) + Me.Controls.Add(Me.gbxControl) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.pnldesigner) @@ -993,7 +993,7 @@ Partial Class frmFormDesigner Me.GroupBox1.ResumeLayout(False) Me.pnldesigner.ResumeLayout(False) Me.pnldesigner.PerformLayout() - Me.gbx_CTRL.ResumeLayout(False) + Me.gbxControl.ResumeLayout(False) Me.TabControlEigenschaften.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() @@ -1025,7 +1025,7 @@ Partial Class frmFormDesigner Friend WithEvents pnldesigner As System.Windows.Forms.Panel Friend WithEvents btndtp As System.Windows.Forms.Button Friend WithEvents btncmb As System.Windows.Forms.Button - Friend WithEvents gbx_CTRL As System.Windows.Forms.GroupBox + Friend WithEvents gbxControl As System.Windows.Forms.GroupBox Friend WithEvents lblBeschriftung As System.Windows.Forms.Label Friend WithEvents lblCtrlName As System.Windows.Forms.Label Friend WithEvents lblhintergrund As System.Windows.Forms.Label diff --git a/DD_PM_WINDREAM/frmFormDesigner.vb b/DD_PM_WINDREAM/frmFormDesigner.vb index a96c7d3..f0abd60 100644 --- a/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/DD_PM_WINDREAM/frmFormDesigner.vb @@ -26,18 +26,18 @@ 'Try If CURRENT_ProfilGUID > 0 Then Dim DT As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND (CTRL_TYPE <> 'LBL')", CURRENT_ProfilGUID), True) - gbx_CTRL.Visible = False + gbxControl.Visible = False For Each row As DataRow In DT.Rows If row.Item("INDEX_NAME").GetType.ToString.ToLower = "system.dbnull" Or row.Item("INDEX_NAME").ToString = "" Then MsgBox("Für das Control '" & row.Item("NAME") & "' wurde noch keine Indexdefintion hinterlegt!", MsgBoxStyle.Exclamation, "Unvollständige Konfiguration:") e.Cancel = True - gbx_CTRL.Visible = True + gbxControl.Visible = True End If Next End If If Application.OpenForms().OfType(Of frmControl_Detail).Any Then - frmControl_Detail.Close() - End If + frmControl_Detail.Close() + End If ' MessageBox.Show("Opened") 'Catch ex As Exception ' MsgBox("Fehler bei FormClosing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") @@ -131,12 +131,19 @@ Me.cmbIndex.Visible = False Me.INDEX_NAMETextBox.Visible = False If ID = 0 Then + If IsNothing(CURRENT_CONTROL.Tag) Then + Dim ID_CTRL = GetControlGUID(CURRENT_CONTROL.Name) + If ID_CTRL > 0 Then + CURRENT_CONTROL.Tag = ID_CTRL + End If + End If CURRENT_CONTROL_ID = CURRENT_CONTROL.Tag Else CURRENT_CONTROL_ID = ID End If If CURRENT_CONTROL_ID <> 0 Then + gbxControl.Enabled = True TBPM_PROFILE_CONTROLSTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_CONTROL_ID) Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS Dim dr As DataRow = dt.Rows(0) @@ -170,6 +177,7 @@ End If Else + gbxControl.Enabled = False tslblAenderungen.Visible = True tslblAenderungen.Text = "Konte das aktuelle Control nicht wählen!!" End If @@ -210,13 +218,18 @@ Catch ex As Exception MsgBox("Fehler bei Controls_laden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try - + End Sub Private Sub DragDropButtons_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, btnTabelle.MouseDown, btnCheckbox.MouseDown MouseIsDown = True CURRENT_CONTROL = Nothing - TBPM_PROFILE_CONTROLSBindingSource.Clear() + Try + TBPM_PROFILE_CONTROLSBindingSource.Clear() + Catch ex As Exception + + End Try + End Sub @@ -606,15 +619,15 @@ 'Columns laden TBPM_CONTROL_TABLETableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE, table.Tag) Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE - If DT.Rows.Count > 0 Then - For Each Row As DataRow In DT.Rows - Dim col As New DataGridViewTextBoxColumn - col.HeaderText = Row.Item("SPALTEN_HEADER") - col.Name = Row.Item("SPALTENNAME") - col.Width = Row.Item("SPALTENBREITE") - table.Columns.Add(col) - Next - End If + If DT.Rows.Count > 0 Then + For Each Row As DataRow In DT.Rows + Dim col As New DataGridViewTextBoxColumn + col.HeaderText = Row.Item("SPALTEN_HEADER") + col.Name = Row.Item("SPALTENNAME") + col.Width = Row.Item("SPALTENBREITE") + table.Columns.Add(col) + Next + End If ' table.AutoResizeColumns() @@ -662,7 +675,7 @@ Me.CheckBoxAuswahlliste.Visible = False Me.CHOICE_LISTTextBox.Visible = False Me.lblAuswahlliste.Visible = False - gbx_CTRL.Visible = True + gbxControl.Visible = True ' Me.pnlAuswahlliste.Enabled = False Me.READ_ONLYCheckBox.Visible = False @@ -674,7 +687,7 @@ CURRENT_CONTROL = sender Dim txt As TextBox = sender Set_Active_Color() - CURRENT_CONTROL = txt + Load_indexe() Load_Control() @@ -690,7 +703,7 @@ Me.CHOICE_LISTTextBox.Visible = False Me.lblAuswahlliste.Visible = False - gbx_CTRL.Visible = True + gbxControl.Visible = True ' Me.pnlAuswahlliste.Enabled = False Me.READ_ONLYCheckBox.Visible = True @@ -713,7 +726,7 @@ Me.CheckBoxAuswahlliste.Visible = False Me.CHOICE_LISTTextBox.Visible = False Me.lblAuswahlliste.Visible = False - gbx_CTRL.Visible = True + gbxControl.Visible = True ' Me.pnlAuswahlliste.Enabled = False Me.READ_ONLYCheckBox.Visible = True Me.LOAD_IDX_VALUECheckBox.Visible = True @@ -723,10 +736,7 @@ Dim cmb As ComboBox = sender Set_Active_Color() - CURRENT_CONTROL = cmb - Load_indexe() - Load_Control() Me.lblBeschriftung.Visible = False Me.CTRL_TEXTTextBox.Visible = False Me.lblIndex.Visible = True @@ -735,7 +745,7 @@ Me.rbVektor.Visible = True Me.CheckBoxAuswahlliste.Visible = True Me.VALIDATIONCheckBox.Visible = True - gbx_CTRL.Visible = True + gbxControl.Visible = True If CHOICE_LISTTextBox.Text <> "" Then CheckBoxAuswahlliste.Checked = True Else @@ -745,6 +755,8 @@ ' Me.pnlAuswahlliste.Enabled = True Me.READ_ONLYCheckBox.Visible = True Me.LOAD_IDX_VALUECheckBox.Visible = True + Load_Control() + End Sub Public Sub OndtpClick(sender As System.Object, e As System.EventArgs) @@ -762,7 +774,7 @@ Me.CheckBoxAuswahlliste.Visible = False Me.VALIDATIONCheckBox.Visible = True - gbx_CTRL.Visible = True + gbxControl.Visible = True CHOICE_LISTTextBox.Visible = False ' Me.pnlAuswahlliste.Enabled = False Me.READ_ONLYCheckBox.Visible = True @@ -793,14 +805,14 @@ Me.lblIndex.Visible = True Me.cmbIndex.Visible = True Me.rbIndex.Visible = True - + Me.CheckBoxAuswahlliste.Visible = False Me.CHOICE_LISTTextBox.Visible = False Me.lblAuswahlliste.Visible = False Me.VALIDATIONCheckBox.Visible = True - gbx_CTRL.Visible = True + gbxControl.Visible = True CHOICE_LISTTextBox.Visible = False 'Me.pnlAuswahlliste.Enabled = False Me.READ_ONLYCheckBox.Visible = True @@ -839,7 +851,7 @@ Me.VALIDATIONCheckBox.Visible = True - gbx_CTRL.Visible = True + gbxControl.Visible = True ' Me.pnlAuswahlliste.Enabled = False Me.READ_ONLYCheckBox.Visible = True Me.LOAD_IDX_VALUECheckBox.Visible = True @@ -990,7 +1002,7 @@ Set_Active_Color() Load_Control() - gbx_CTRL.Visible = True + gbxControl.Visible = True End If End Sub Private Sub MovableCtrl_MouseUp(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Me.MouseUp @@ -1517,6 +1529,8 @@ Load_Control(CURRENT_CONTROL_ID) TabControlEigenschaften.SelectedIndex = 2 + Else + MsgBox("Please choose a control!", MsgBoxStyle.Information) End If End Sub diff --git a/DD_PM_WINDREAM/frmProfileDesigner.vb b/DD_PM_WINDREAM/frmProfileDesigner.vb index 75d3a22..ec73898 100644 --- a/DD_PM_WINDREAM/frmProfileDesigner.vb +++ b/DD_PM_WINDREAM/frmProfileDesigner.vb @@ -885,6 +885,7 @@ Public Class frmProfileDesigner CURRENT_DESIGN_TYPE = "FINAL_INDEX" CURRENT_SQL_COMAMND = SQL_COMMANDTextBox.Text CURRENT_SQL_CON = CONID + CURRENT_ProfilGUID = PROFILGUIDTextBox.Text frmSQL_DESIGNER.ShowDialog() End If diff --git a/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb b/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb index 519b8ea..54531af 100644 --- a/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb +++ b/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb @@ -23,8 +23,8 @@ Partial Class frmSQL_DESIGNER _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 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_PM_WINDREAM.DD_DMSLiteDataSet() Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -46,9 +46,12 @@ Partial Class frmSQL_DESIGNER Me.btnTestSQL = New System.Windows.Forms.Button() Me.Label15 = New System.Windows.Forms.Label() Me.cmbIndexe = New System.Windows.Forms.ComboBox() - Me.Button1 = New System.Windows.Forms.Button() + Me.btnAddIndex = New System.Windows.Forms.Button() Me.btnSaveSQLCommand = New System.Windows.Forms.Button() Me.lblSaveFinalIndex = New System.Windows.Forms.Label() + Me.btnAddControl = New System.Windows.Forms.Button() + Me.lblControls = New System.Windows.Forms.Label() + Me.cmbControls = New System.Windows.Forms.ComboBox() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -176,8 +179,8 @@ Partial Class frmSQL_DESIGNER ' Me.dgvResult.AllowUserToAddRows = False Me.dgvResult.AllowUserToDeleteRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.Cyan - Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan + Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvResult.Location = New System.Drawing.Point(372, 373) Me.dgvResult.Name = "dgvResult" @@ -189,8 +192,8 @@ Partial Class frmSQL_DESIGNER ' Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle6.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan + Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 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 @@ -242,14 +245,14 @@ Partial Class frmSQL_DESIGNER Me.cmbIndexe.Size = New System.Drawing.Size(194, 21) Me.cmbIndexe.TabIndex = 92 ' - 'Button1 + 'btnAddIndex ' - Me.Button1.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.add - Me.Button1.Location = New System.Drawing.Point(881, 28) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(32, 23) - Me.Button1.TabIndex = 94 - Me.Button1.UseVisualStyleBackColor = True + Me.btnAddIndex.Image = CType(resources.GetObject("btnAddIndex.Image"), System.Drawing.Image) + Me.btnAddIndex.Location = New System.Drawing.Point(881, 28) + Me.btnAddIndex.Name = "btnAddIndex" + Me.btnAddIndex.Size = New System.Drawing.Size(32, 23) + Me.btnAddIndex.TabIndex = 94 + Me.btnAddIndex.UseVisualStyleBackColor = True ' 'btnSaveSQLCommand ' @@ -274,14 +277,44 @@ Partial Class frmSQL_DESIGNER Me.lblSaveFinalIndex.Text = "Label4" Me.lblSaveFinalIndex.Visible = False ' + 'btnAddControl + ' + Me.btnAddControl.Image = CType(resources.GetObject("btnAddControl.Image"), System.Drawing.Image) + Me.btnAddControl.Location = New System.Drawing.Point(645, 28) + Me.btnAddControl.Name = "btnAddControl" + Me.btnAddControl.Size = New System.Drawing.Size(32, 23) + Me.btnAddControl.TabIndex = 99 + Me.btnAddControl.UseVisualStyleBackColor = True + ' + 'lblControls + ' + Me.lblControls.AutoSize = True + Me.lblControls.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblControls.Location = New System.Drawing.Point(442, 9) + Me.lblControls.Name = "lblControls" + Me.lblControls.Size = New System.Drawing.Size(215, 16) + Me.lblControls.TabIndex = 98 + Me.lblControls.Text = "Controls (zur Laufzeit ausgewertet):" + ' + 'cmbControls + ' + Me.cmbControls.FormattingEnabled = True + Me.cmbControls.Location = New System.Drawing.Point(445, 28) + Me.cmbControls.Name = "cmbControls" + Me.cmbControls.Size = New System.Drawing.Size(194, 21) + Me.cmbControls.TabIndex = 97 + ' '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(923, 547) + Me.Controls.Add(Me.btnAddControl) + Me.Controls.Add(Me.lblControls) + Me.Controls.Add(Me.cmbControls) Me.Controls.Add(Me.lblSaveFinalIndex) Me.Controls.Add(Me.btnSaveSQLCommand) - Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.btnAddIndex) Me.Controls.Add(Me.Label15) Me.Controls.Add(Me.cmbIndexe) Me.Controls.Add(Me.Label1) @@ -330,7 +363,10 @@ Partial Class frmSQL_DESIGNER Friend WithEvents btnTestSQL As System.Windows.Forms.Button Friend WithEvents Label15 As System.Windows.Forms.Label Friend WithEvents cmbIndexe As System.Windows.Forms.ComboBox - Friend WithEvents Button1 As System.Windows.Forms.Button + Friend WithEvents btnAddIndex As System.Windows.Forms.Button Friend WithEvents btnSaveSQLCommand As System.Windows.Forms.Button Friend WithEvents lblSaveFinalIndex As System.Windows.Forms.Label + Friend WithEvents btnAddControl As Button + Friend WithEvents lblControls As Label + Friend WithEvents cmbControls As ComboBox End Class diff --git a/DD_PM_WINDREAM/frmSQL_DESIGNER.resx b/DD_PM_WINDREAM/frmSQL_DESIGNER.resx index 19f6636..abdf357 100644 --- a/DD_PM_WINDREAM/frmSQL_DESIGNER.resx +++ b/DD_PM_WINDREAM/frmSQL_DESIGNER.resx @@ -149,6 +149,14 @@ 5ku43W8eh7DWkmcxxhzFP2HB4bqnaZ7IS27OuU341BcW7E7bN5f7ebxNLGCG26QCENo0qQq01qSUIill kaIAV+Dz0lJMJkhr89BjeRZZCeIfh8UamcDzfbphQRoIMITKYFhQoykogUUQ1n7pFYTxPBDUaAp6+EwL 8QKzYQ6as7QBdAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAABcSURBVDhPzYxRCoAwDEN3tt7/PP2NWDrJaoRNYRh4H0uX + 1wB8QpYrjA+Ku6OSp8iUwMwu9gjOT0wVMH1zE/DoiZ8LmDpi+mYQcJQgT5E9gkqeIlLwBlmuIMt50A4j + RH5TZf96FwAAAABJRU5ErkJggg== @@ -156,6 +164,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO xAAADsQBlSsOGwAAAFRJREFUOE9j+P//P0UYTHz79u0/Cfg9EBswAAGKAU5OTnD84f1HOEYWA9FtbW1w Q8gyAIRhhpBtAAiD9BBlADJGVkNbA4jBowYMSgPIwXADyMf/GQC4A6rkpAjLjQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAABcSURBVDhPzYxRCoAwDEN3tt7/PP2NWDrJaoRNYRh4H0uX + 1wB8QpYrjA+Ku6OSp8iUwMwu9gjOT0wVMH1zE/DoiZ8LmDpi+mYQcJQgT5E9gkqeIlLwBlmuIMt50A4j + RH5TZf96FwAAAABJRU5ErkJggg== diff --git a/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 21d81de..0528830 100644 --- a/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -36,6 +36,19 @@ Public Class frmSQL_DESIGNER Next Me.cmbIndexe.SelectedIndex = -1 End If + If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then + Dim sql = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID) + Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True) + cmbControls.DataSource = DT + cmbControls.DisplayMember = DT.Columns(0).ColumnName + cmbControls.Visible = True + lblControls.Visible = True + btnAddControl.Visible = True + Else + cmbControls.Visible = False + lblControls.Visible = False + btnAddControl.Visible = False + End If Catch ex As Exception MsgBox("Unexpected Error while loading form: " & ex.Message, MsgBoxStyle.Critical) End Try @@ -173,14 +186,14 @@ Public Class frmSQL_DESIGNER End Try End Function - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndex.Click If cmbIndexe.SelectedIndex <> -1 Then Dim val As String = "[%" & cmbIndexe.Text & "]" Dim altePosition As Integer = Me.SQL_COMMANDTextBox.SelectionStart() Me.SQL_COMMANDTextBox.Text = Me.SQL_COMMANDTextBox.Text.Insert(altePosition, val) Me.SQL_COMMANDTextBox.SelectionStart = altePosition + val.Length End If - + End Sub Private Sub btnSaveSQLCommand_Click(sender As Object, e As EventArgs) Handles btnSaveSQLCommand.Click @@ -201,4 +214,13 @@ Public Class frmSQL_DESIGNER End If End Sub + + Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click + If cmbControls.SelectedIndex <> -1 Then + Dim val As String = "[%" & cmbControls.Text & "]" + Dim altePosition As Integer = Me.SQL_COMMANDTextBox.SelectionStart() + Me.SQL_COMMANDTextBox.Text = Me.SQL_COMMANDTextBox.Text.Insert(altePosition, val) + Me.SQL_COMMANDTextBox.SelectionStart = altePosition + val.Length + End If + End Sub End Class \ No newline at end of file diff --git a/DD_PM_WINDREAM/frmValidator.vb b/DD_PM_WINDREAM/frmValidator.vb index b2113a8..ad5a6d7 100644 --- a/DD_PM_WINDREAM/frmValidator.vb +++ b/DD_PM_WINDREAM/frmValidator.vb @@ -776,12 +776,8 @@ Public Class frmValidator Public Sub OnTextBoxKeyUp(sender As Object, e As KeyEventArgs) Dim box As TextBox = sender If box.Text <> String.Empty And me_closing = False And _Indexe_Loaded = True Then - 'If CheckValueExists(box) = False Then - ' box.Text = "" - ' box.Focus() - ' frmError.ShowDialog() - 'End If - If e.KeyCode = Keys.Return Or e.KeyCode = Keys.Tab Then + + If (e.KeyCode = Keys.Return) Or (e.KeyCode = Keys.Tab) Then Try Dim CONTROL_ID = VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, box.Name) Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, box.Name) @@ -816,7 +812,7 @@ Public Class frmValidator Catch ex As Exception ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message) End Try - + Next diff --git a/DD_PM_WINDREAM/obj/x86/Debug/CoreCompileInputs.cache b/DD_PM_WINDREAM/obj/x86/Debug/CoreCompileInputs.cache index 2d9c15c..2abf48b 100644 --- a/DD_PM_WINDREAM/obj/x86/Debug/CoreCompileInputs.cache +++ b/DD_PM_WINDREAM/obj/x86/Debug/CoreCompileInputs.cache @@ -1 +1 @@ -a28b93252062401d442bdadd50a17aabae2dfd1f +f02f886c5d02020d7c93a185c5202b3343db149e diff --git a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.exe b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.exe index 849dda5..af27163 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.exe and b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.exe differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.frmSQL_DESIGNER.resources b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.frmSQL_DESIGNER.resources index cad0904..b68ce90 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.frmSQL_DESIGNER.resources and b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.frmSQL_DESIGNER.resources differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.pdb b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.pdb index 3d6627a..a894664 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.pdb and b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.pdb differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.vbproj.GenerateResource.Cache b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.vbproj.GenerateResource.Cache index 6d7d6d9..7ee113b 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.vbproj.GenerateResource.Cache and b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.vbproj.GenerateResource.Cache differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/DD_PM_WINDREAM/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 322a71e..8bd48ae 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/DD_PM_WINDREAM/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/dd_pm_windream.exe.licenses b/DD_PM_WINDREAM/obj/x86/Debug/dd_pm_windream.exe.licenses index 2863501..96641cf 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/dd_pm_windream.exe.licenses and b/DD_PM_WINDREAM/obj/x86/Debug/dd_pm_windream.exe.licenses differ diff --git a/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.msi b/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.msi index 9c55175..1c2436e 100644 Binary files a/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.msi and b/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.msi differ diff --git a/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.wixpdb b/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.wixpdb index 8eba7fa..ea2207a 100644 Binary files a/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.wixpdb and b/Setup/bin/Debug/DD_PM_WINDREAM-x86-1.9.3.3.wixpdb differ diff --git a/Setup/obj/Debug/Product.wixobj b/Setup/obj/Debug/Product.wixobj index 4256845..4202fa7 100644 --- a/Setup/obj/Debug/Product.wixobj +++ b/Setup/obj/Debug/Product.wixobj @@ -1 +1 @@ -
112522Installation Database3Digital Data Process Manager Setup4Digital Data5Installer6Process Manager is a registered Trademark of Digital Data7Intel;10319*14100152192
APPLICATIONFOLDERAPPLICATIONFOLDER_REGSEARCH
RegistryEntries{57CCE36E-F152-4D17-81A0-CCAAEFA777A3}DD4reg4A543C0E0977BA441F7960CE7C89D310MainExecutable{EE8034F0-A2DE-4C38-A961-7F7668229416}INSTALLDIR0GIEXEReleaseNotes{D1496E4D-98C2-4849-9914-DB47D47CC6BE}INSTALLDIR0ReleaseNoteApplicationIco{5C2EEA18-0718-41E9-A8C6-38D3C622921B}INSTALLDIR0ApplicationIcoWindreamLibs{4D11FC99-50D9-4E54-B18A-8885C9112646}INSTALLDIR0WINDREAMLibDLLIndependentsoftLibs{C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B}INSTALLDIR0MSGLibDevExpressLibs{CB40DAAE-348E-4BD3-B275-9A526EB8F191}INSTALLDIR0DevExpress.Data.v15.2DDLibs{BA2979E3-3778-48B8-B0D8-4B77825B9293}INSTALLDIR0DLLLicenseManagerOracle{CF76DB5D-3263-450F-96C6-F02F5447A0A1}INSTALLDIR0Oracle.ManagedDataAccessProgramMenuDir{5200DF59-FED6-4C5A-8393-90B8ED526432}ProgramMenuDir4reg358870B9B7E9B3B188C6DDA8DDA0D0E8
WelcomeDlgNextNewDialogInstallDirDlg12InstallDirDlgBackNewDialogWelcomeDlg12
INSTALLDIRDDspkg2uxv|Process ManagerDDProgramFilesFolderraunfgza|Digital DataProgramFilesFolderTARGETDIRPfilesProgramMenuDirProgramMenuFolderuh1jbeqo|Process ManagerProgramMenuFolderTARGETDIRProgramsDesktopFolderTARGETDIRDesktopTARGETDIRSourceDir
Complete210
GIEXEMainExecutable8badenri.exe|DD_PM_WINDREAM.exe0512ReleaseNoteReleaseNotesw5almeg_.txt|Release Notes.txt0512ApplicationIcoApplicationIcomioar7oh.ico|DD_Icons_ICO_GLOBIX_128.ico0512WINDREAMLibDLLWindreamLibsawukenmy.dll|Interop.WINDREAMLib.dll0512WMOTOOLLibWindreamLibsrrtenuep.dll|Interop.WMOTOOLLib.dll0512MSGLibIndependentsoftLibsozanri_l.dll|Independentsoft.Msg.dll0512DevExpress.Data.v15.2DevExpressLibs5ruxi_qa.dll|DevExpress.Data.v15.2.dll0512DevExpress.Pdf.v15.2.CoreDevExpressLibs5kjd_9wd.dll|DevExpress.Pdf.v15.2.Core.dll0512DevExpress.Pdf.v15.2.DrawingDevExpressLibsofjp4oib.dll|DevExpress.Pdf.v15.2.Drawing.dll0512DevExpress.Printing.v15.2.CoreDevExpressLibsbles6gdp.dll|DevExpress.Printing.v15.2.Core.dll0512DevExpress.RichEdit.v15.2.CoreDevExpressLibsf9nvwbkv.dll|DevExpress.RichEdit.v15.2.Core.dll0512DevExpress.Utils.v15.2DevExpressLibsmovgkxdr.dll|DevExpress.Utils.v15.2.dll0512DevExpress.XtraBars.v15.2DevExpressLibsop1uogqd.dll|DevExpress.XtraBars.v15.2.dll0512DevExpress.XtraEditors.v15.2DevExpressLibsbfzpmyhr.dll|DevExpress.XtraEditors.v15.2.dll0512DevExpress.XtraGrid.v15.2DevExpressLibsmsgj0-l1.dll|DevExpress.XtraGrid.v15.2.dll0512DevExpress.XtraLayout.v15.2DevExpressLibs0qfhxals.dll|DevExpress.XtraLayout.v15.2.dll0512DevExpress.XtraPdfViewer.v15.2DevExpressLibst-_2qbns.dll|DevExpress.XtraPdfViewer.v15.2.dll0512DevExpress.XtraPrinting.v15.2DevExpressLibscsk00joa.dll|DevExpress.XtraPrinting.v15.2.dll0512DLLLicenseManagerDDLibssvlnal_m.dll|DLLLicenseManager.dll0512Oracle.ManagedDataAccessOraclekguromza.dll|Oracle.ManagedDataAccess.dll0512
DD_PM_WINDREAM.exeE:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe
NOT WIX_DOWNGRADE_DETECTEDEine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet.
10CD-ROM #1#Sample.cab
DiskPromptProcess Manager InstallPREVIOUSVERSIONSINSTALLEDARPPRODUCTICONDD_PM_WINDREAM.exeAPPLICATIONFOLDERWIXUI_INSTALLDIRINSTALLDIR
reg4A543C0E0977BA441F7960CE7C89D3101Software\[Manufacturer]\[ProductName]Path[INSTALLDIR]RegistryEntriesreg358870B9B7E9B3B188C6DDA8DDA0D0E8-1Software\[Manufacturer]\[ProductName]ProgramMenuDir
APPLICATIONFOLDER_REGSEARCH1Software\[Manufacturer]\[ProductName]Path2
ProgramMenuDirProgramMenuDirProgramMenuDir2
StartMenuShortcutProgramMenuDirjjyhaovs|Process ManagerMainExecutable{00000000-0000-0000-0000-000000000000}DD_PM_WINDREAM.exe0INSTALLDIRDesktopShortcutDesktopFoldergrxcvim8|Process ManagerMainExecutable{00000000-0000-0000-0000-000000000000}DD_PM_WINDREAM.exe0INSTALLDIR
{930076B5-9D2B-455F-920F-9718ED091D0C}1.9.3.31WIX_UPGRADE_DETECTED{930076B5-9D2B-455F-920F-9718ED091D0C}1.9.3.32WIX_DOWNGRADE_DETECTED{930076B5-9D2B-455F-920F-9718ED091D0C}1.0.099.0.0256PREVIOUSVERSIONSINSTALLED
InstallExecuteSequenceRemoveExistingProductsInstallValidate0
Complete1MainExecutable10Complete1ReleaseNotes10Complete1WindreamLibs10Complete1DDLibs10Complete1IndependentsoftLibs10Complete1Oracle10Complete1DevExpressLibs10Complete1ProgramMenuDir10Complete1RegistryEntries10Complete1ApplicationIco10*5Complete20
RemoveFile
GIEXEINSTALLDIR1E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe-110ReleaseNoteINSTALLDIR1P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt-110ApplicationIcoINSTALLDIR1S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_PM_128.ico-110WINDREAMLibDLLINSTALLDIR1E:\SchreiberM\Visual Studio\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll-110WMOTOOLLibINSTALLDIR1P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll-110MSGLibINSTALLDIR1P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll-110DevExpress.Data.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll-110DevExpress.Pdf.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll-110DevExpress.Pdf.v15.2.DrawingINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll-110DevExpress.Printing.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll-110DevExpress.RichEdit.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll-110DevExpress.Utils.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll-110DevExpress.XtraBars.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll-110DevExpress.XtraEditors.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll-110DevExpress.XtraGrid.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll-110DevExpress.XtraLayout.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll-110DevExpress.XtraPdfViewer.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll-110DevExpress.XtraPrinting.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll-110DLLLicenseManagerINSTALLDIR1E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll-110Oracle.ManagedDataAccessINSTALLDIR1P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll-110
CompleteFeatureMainExecutableComponentCompleteFeatureReleaseNotesComponentCompleteFeatureWindreamLibsComponentCompleteFeatureDDLibsComponentCompleteFeatureIndependentsoftLibsComponentCompleteFeatureOracleComponentCompleteFeatureDevExpressLibsComponentCompleteFeatureProgramMenuDirComponentCompleteFeatureRegistryEntriesComponentCompleteFeatureApplicationIcoComponent*ProductCompleteFeature
PREVIOUSVERSIONSINSTALLED4
RemoveApplicationFolderMainExecutableAPPLICATIONFOLDER2
PropertyManufacturerPropertyProductCodePropertyProductLanguagePropertyProductNamePropertyProductVersionPropertyUpgradeCodePropertyDiskPromptWixActionInstallExecuteSequence/RemoveExistingProductsDirectoryProgramMenuDirIconDD_PM_WINDREAM.exeDirectoryDesktopFolderIconDD_PM_WINDREAM.exeMedia1CustomActionWixRemoveFoldersExMedia1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1ComponentMainExecutableComponentReleaseNotesComponentWindreamLibsComponentDDLibsComponentIndependentsoftLibsComponentOracleComponentDevExpressLibsComponentProgramMenuDirComponentRegistryEntriesComponentApplicationIcoWixUIWixUI_InstallDirWixUIWixUI_ErrorProgressTextDialogWelcomeDlgDialogInstallDirDlgDialogInstallDirDlgDialogWelcomeDlg
ManufacturerDigital Data
ProductCode*
ProductLanguage1031
ProductNameProcess Manger
ProductVersion1.9.3.3
UpgradeCode{930076B5-9D2B-455F-920F-9718ED091D0C}
 \ No newline at end of file +
112522Installation Database3Beschreibung des Programms4Digital Data5Installer6Kommentar wie Copyright-Hinweis7Intel;10319*14100152192
APPLICATIONFOLDERAPPLICATIONFOLDER_REGSEARCH
MainApplicationExe{71B06048-F595-40CE-B429-79C2F2D6001B}INSTALLDIR0MainApplicationExeReleaseNotes{D1496E4D-98C2-4849-9914-DB47D47CC6BE}INSTALLDIR0ReleaseNoteWindreamLibs{4D11FC99-50D9-4E54-B18A-8885C9112646}INSTALLDIR0WINDREAMLibDLLIndependentsoftLibs{C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B}INSTALLDIR0MSGLibDDLibs{BA2979E3-3778-48B8-B0D8-4B77825B9293}INSTALLDIR0DLLLicenseManagerOracle{CF76DB5D-3263-450F-96C6-F02F5447A0A1}INSTALLDIR0Oracle.ManagedDataAccessDevExpressLibs{CB40DAAE-348E-4BD3-B275-9A526EB8F191}INSTALLDIR0DevExpress.Data.v15.2RegistryKeys{4503BF18-22F2-4DBF-B281-06DE039F52C8}INSTALLDIR4regCDF9EEA1538907D8FAC5C94AD3D2FAE7ProgramMenuDir{84FC82EA-EF4F-4246-A463-B076E878DF0A}ProgramMenuDir4reg358870B9B7E9B3B188C6DDA8DDA0D0E8
WelcomeDlgNextNewDialogInstallDirDlg12InstallDirDlgBackNewDialogWelcomeDlg12
INSTALLDIRDDDIReixauh41|Process ManagerDDDIRProgramFilesFolderraunfgza|Digital DataProgramFilesFolderTARGETDIR.TARGETDIRSourceDirProgramMenuDirProgramMenuFolderuh1jbeqo|Process ManagerProgramMenuFolderINSTALLDIRProgramsDesktopFolderINSTALLDIRDesktop
MainApplicationMain Application210
MainApplicationExeMainApplicationExee_hdoxlr.exe|DD_PM_WINDREAM.exe01536ReleaseNoteReleaseNotesw5almeg_.txt|Release Notes.txt0512WINDREAMLibDLLWindreamLibsawukenmy.dll|Interop.WINDREAMLib.dll0512WMOTOOLLibWindreamLibsrrtenuep.dll|Interop.WMOTOOLLib.dll0512MSGLibIndependentsoftLibsozanri_l.dll|Independentsoft.Msg.dll0512DLLLicenseManagerDDLibssvlnal_m.dll|DLLLicenseManager.dll0512Oracle.ManagedDataAccessOraclekguromza.dll|Oracle.ManagedDataAccess.dll0512DevExpress.Data.v15.2DevExpressLibs5ruxi_qa.dll|DevExpress.Data.v15.2.dll0512DevExpress.Pdf.v15.2.CoreDevExpressLibs5kjd_9wd.dll|DevExpress.Pdf.v15.2.Core.dll0512DevExpress.Pdf.v15.2.DrawingDevExpressLibsofjp4oib.dll|DevExpress.Pdf.v15.2.Drawing.dll0512DevExpress.Printing.v15.2.CoreDevExpressLibsbles6gdp.dll|DevExpress.Printing.v15.2.Core.dll0512DevExpress.RichEdit.v15.2.CoreDevExpressLibsf9nvwbkv.dll|DevExpress.RichEdit.v15.2.Core.dll0512DevExpress.Utils.v15.2DevExpressLibsmovgkxdr.dll|DevExpress.Utils.v15.2.dll0512DevExpress.XtraBars.v15.2DevExpressLibsop1uogqd.dll|DevExpress.XtraBars.v15.2.dll0512DevExpress.XtraEditors.v15.2DevExpressLibsbfzpmyhr.dll|DevExpress.XtraEditors.v15.2.dll0512DevExpress.XtraGrid.v15.2DevExpressLibsmsgj0-l1.dll|DevExpress.XtraGrid.v15.2.dll0512DevExpress.XtraLayout.v15.2DevExpressLibs0qfhxals.dll|DevExpress.XtraLayout.v15.2.dll0512DevExpress.XtraPdfViewer.v15.2DevExpressLibst-_2qbns.dll|DevExpress.XtraPdfViewer.v15.2.dll0512DevExpress.XtraPrinting.v15.2DevExpressLibscsk00joa.dll|DevExpress.XtraPrinting.v15.2.dll0512
AppIcon..\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe
NOT WIX_DOWNGRADE_DETECTEDEine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet.
10DD_PM_WINDREAM#DD_PM_WINDREAM.cab
ALLUSERS1APPLICATIONFOLDERDiskPromptDD_PM_WINDREAM InstallPREVIOUSVERSIONSINSTALLEDARPPRODUCTICONAppIconWIXUI_INSTALLDIRINSTALLDIR
regCDF9EEA1538907D8FAC5C94AD3D2FAE71Software\[Manufacturer]\[ProductName]Path[INSTALLDIR]RegistryKeysREGKEYINSTALLDIR1Software\[Manufacturer]\[ProductName]*RegistryKeysreg358870B9B7E9B3B188C6DDA8DDA0D0E8-1Software\[Manufacturer]\[ProductName]ProgramMenuDir
APPLICATIONFOLDER_REGSEARCH1Software\[Manufacturer]\[ProductName]Path2
ProgramMenuDirProgramMenuDirProgramMenuDir2
{21ECB2F2-574B-4F4C-8889-A1CA2CEB2455}1.9.3.31WIX_UPGRADE_DETECTED{21ECB2F2-574B-4F4C-8889-A1CA2CEB2455}1.9.3.32WIX_DOWNGRADE_DETECTED{21ECB2F2-574B-4F4C-8889-A1CA2CEB2455}1.0.0.099.0.0.0256PREVIOUSVERSIONSINSTALLED
InstallExecuteSequenceRemoveExistingProductsInstallValidate0
MainApplication1MainApplicationExe10MainApplication1RegistryKeys10MainApplication1ReleaseNotes10MainApplication1WindreamLibs10MainApplication1DDLibs10MainApplication1Oracle10MainApplication1IndependentsoftLibs10MainApplication1DevExpressLibs10MainApplication1ProgramMenuDir10*5MainApplication20
RemoveFile
MainApplicationExeINSTALLDIR1..\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe-110ReleaseNoteINSTALLDIR1P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt-110WINDREAMLibDLLINSTALLDIR1P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll-110WMOTOOLLibINSTALLDIR1P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll-110MSGLibINSTALLDIR1P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll-110DLLLicenseManagerINSTALLDIR1P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll-110Oracle.ManagedDataAccessINSTALLDIR1P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll-110DevExpress.Data.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll-110DevExpress.Pdf.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll-110DevExpress.Pdf.v15.2.DrawingINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll-110DevExpress.Printing.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll-110DevExpress.RichEdit.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll-110DevExpress.Utils.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll-110DevExpress.XtraBars.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll-110DevExpress.XtraEditors.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll-110DevExpress.XtraGrid.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll-110DevExpress.XtraLayout.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll-110DevExpress.XtraPdfViewer.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll-110DevExpress.XtraPrinting.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll-110
MainApplicationFeatureMainApplicationExeComponentMainApplicationFeatureRegistryKeysComponentMainApplicationFeatureReleaseNotesComponentMainApplicationFeatureWindreamLibsComponentMainApplicationFeatureDDLibsComponentMainApplicationFeatureOracleComponentMainApplicationFeatureIndependentsoftLibsComponentMainApplicationFeatureDevExpressLibsComponentMainApplicationFeatureProgramMenuDirComponent*ProductMainApplicationFeature
PREVIOUSVERSIONSINSTALLED4
RemoveApplicationFolderRegistryKeysAPPLICATIONFOLDER2
PropertyManufacturerPropertyProductCodePropertyProductLanguagePropertyProductNamePropertyProductVersionPropertyUpgradeCodePropertyDiskPromptWixActionInstallExecuteSequence/RemoveExistingProductsDirectoryINSTALLDIRMedia1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1CustomActionWixRemoveFoldersExComponentMainApplicationExeComponentRegistryKeysComponentReleaseNotesComponentWindreamLibsComponentDDLibsComponentOracleComponentIndependentsoftLibsComponentDevExpressLibsComponentProgramMenuDirWixUIWixUI_InstallDirWixUIWixUI_ErrorProgressTextDialogWelcomeDlgDialogInstallDirDlgDialogInstallDirDlgDialogWelcomeDlg
ManufacturerDigital Data
ProductCode*
ProductLanguage1031
ProductNameProcess Manager
ProductVersion1.9.3.3
UpgradeCode{21ECB2F2-574B-4F4C-8889-A1CA2CEB2455}
 \ No newline at end of file diff --git a/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt b/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt index 9e8ccf7..7f5d877 100644 --- a/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt +++ b/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt @@ -1,4 +1,3 @@ -S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_PM_128.ico D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll @@ -11,10 +10,10 @@ D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll -E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll -E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe +P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll +..\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll -P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll +P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt -E:\SchreiberM\Visual Studio\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll +P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll