diff --git a/.vs/DD_PM_WINDREAM/v15/.suo b/.vs/DD_PM_WINDREAM/v15/.suo index 6ad8718..4ba2188 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/DD_PM_WINDREAM.vbproj b/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 2324920..dfb2f25 100644 --- a/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -73,7 +73,6 @@ False P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll diff --git a/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 06fc476..750e87c 100644 --- a/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -19,4 +19,6 @@ Public CURRENT_SQL_COMAMND As String Public CURRENT_DT_SQL_CONFIG_TABLE As DataTable + Public CURRENT_CONTROL_ID As Integer + End Module diff --git a/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.exe b/DD_PM_WINDREAM/bin/Debug/DD_PM_WINDREAM.exe index d08cc74..dc0ec83 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 7b2e1dc..3e4db14 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/bin/Debug/Interop.WINDREAMLib.dll b/DD_PM_WINDREAM/bin/Debug/Interop.WINDREAMLib.dll index aac85b8..2eb9932 100644 Binary files a/DD_PM_WINDREAM/bin/Debug/Interop.WINDREAMLib.dll and b/DD_PM_WINDREAM/bin/Debug/Interop.WINDREAMLib.dll differ diff --git a/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index acd382e..ba3e6a1 100644 --- a/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -29,6 +29,7 @@ Partial Class frmFormDesigner Dim CHANGED_WHENLabel As System.Windows.Forms.Label Dim HEIGHTLabel As System.Windows.Forms.Label Dim WIDTHLabel As System.Windows.Forms.Label + Dim GUIDLabel As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFormDesigner)) Me.Panel1 = New System.Windows.Forms.Panel() Me.lblDesign = New System.Windows.Forms.Label() @@ -73,9 +74,9 @@ Partial Class frmFormDesigner Me.Label2 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.pnlAuswahlliste = New System.Windows.Forms.Panel() + Me.btnEditor = New System.Windows.Forms.Button() Me.btnShowConnections = New System.Windows.Forms.Button() - Me.SQL_UEBERPRUEFUNGTextBox = New System.Windows.Forms.TextBox() - Me.btnTestSQL = New System.Windows.Forms.Button() + Me.SQL_CommandTextBox = New System.Windows.Forms.TextBox() Me.Label5 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() Me.cmbConnection = New System.Windows.Forms.ComboBox() @@ -99,12 +100,14 @@ Partial Class frmFormDesigner Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() Me.btnrefresh = New System.Windows.Forms.Button() + Me.GUIDTextBox = New System.Windows.Forms.TextBox() X_LOCLabel = New System.Windows.Forms.Label() Y_LOCLabel = New System.Windows.Forms.Label() CHANGED_WHOLabel = New System.Windows.Forms.Label() CHANGED_WHENLabel = New System.Windows.Forms.Label() HEIGHTLabel = New System.Windows.Forms.Label() WIDTHLabel = New System.Windows.Forms.Label() + GUIDLabel = New System.Windows.Forms.Label() Me.Panel1.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() @@ -126,7 +129,7 @@ Partial Class frmFormDesigner ' X_LOCLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) X_LOCLabel.AutoSize = True - X_LOCLabel.Location = New System.Drawing.Point(12, 397) + X_LOCLabel.Location = New System.Drawing.Point(12, 412) X_LOCLabel.Name = "X_LOCLabel" X_LOCLabel.Size = New System.Drawing.Size(72, 16) X_LOCLabel.TabIndex = 14 @@ -136,7 +139,7 @@ Partial Class frmFormDesigner ' Y_LOCLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Y_LOCLabel.AutoSize = True - Y_LOCLabel.Location = New System.Drawing.Point(134, 397) + Y_LOCLabel.Location = New System.Drawing.Point(134, 412) Y_LOCLabel.Name = "Y_LOCLabel" Y_LOCLabel.Size = New System.Drawing.Size(71, 16) Y_LOCLabel.TabIndex = 16 @@ -146,7 +149,7 @@ Partial Class frmFormDesigner ' CHANGED_WHOLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) CHANGED_WHOLabel.AutoSize = True - CHANGED_WHOLabel.Location = New System.Drawing.Point(12, 449) + CHANGED_WHOLabel.Location = New System.Drawing.Point(12, 464) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" CHANGED_WHOLabel.Size = New System.Drawing.Size(91, 16) CHANGED_WHOLabel.TabIndex = 18 @@ -156,7 +159,7 @@ Partial Class frmFormDesigner ' CHANGED_WHENLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) CHANGED_WHENLabel.AutoSize = True - CHANGED_WHENLabel.Location = New System.Drawing.Point(250, 449) + CHANGED_WHENLabel.Location = New System.Drawing.Point(250, 464) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" CHANGED_WHENLabel.Size = New System.Drawing.Size(98, 16) CHANGED_WHENLabel.TabIndex = 20 @@ -166,7 +169,7 @@ Partial Class frmFormDesigner ' HEIGHTLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) HEIGHTLabel.AutoSize = True - HEIGHTLabel.Location = New System.Drawing.Point(250, 397) + HEIGHTLabel.Location = New System.Drawing.Point(250, 412) HEIGHTLabel.Name = "HEIGHTLabel" HEIGHTLabel.Size = New System.Drawing.Size(49, 16) HEIGHTLabel.TabIndex = 21 @@ -176,12 +179,21 @@ Partial Class frmFormDesigner ' WIDTHLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) WIDTHLabel.AutoSize = True - WIDTHLabel.Location = New System.Drawing.Point(328, 397) + WIDTHLabel.Location = New System.Drawing.Point(328, 412) WIDTHLabel.Name = "WIDTHLabel" WIDTHLabel.Size = New System.Drawing.Size(46, 16) WIDTHLabel.TabIndex = 22 WIDTHLabel.Text = "Width:" ' + 'GUIDLabel + ' + GUIDLabel.AutoSize = True + GUIDLabel.Location = New System.Drawing.Point(12, 515) + GUIDLabel.Name = "GUIDLabel" + GUIDLabel.Size = New System.Drawing.Size(25, 16) + GUIDLabel.TabIndex = 24 + GUIDLabel.Text = "ID:" + ' 'Panel1 ' Me.Panel1.Controls.Add(Me.lblDesign) @@ -189,7 +201,7 @@ Partial Class frmFormDesigner Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(987, 34) + Me.Panel1.Size = New System.Drawing.Size(995, 34) Me.Panel1.TabIndex = 1 ' 'lblDesign @@ -216,7 +228,7 @@ Partial Class frmFormDesigner Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox1.Location = New System.Drawing.Point(507, 70) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(468, 129) + Me.GroupBox1.Size = New System.Drawing.Size(476, 129) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -323,7 +335,7 @@ Partial Class frmFormDesigner Me.pnldesigner.Controls.Add(Me.lblhintergrund) Me.pnldesigner.Location = New System.Drawing.Point(15, 72) Me.pnldesigner.Name = "pnldesigner" - Me.pnldesigner.Size = New System.Drawing.Size(481, 322) + Me.pnldesigner.Size = New System.Drawing.Size(481, 337) Me.pnldesigner.TabIndex = 3 ' 'Label1 @@ -358,7 +370,7 @@ Partial Class frmFormDesigner 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(468, 317) + 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:" @@ -375,7 +387,7 @@ Partial Class frmFormDesigner Me.TabControlEigenschaften.Location = New System.Drawing.Point(12, 22) Me.TabControlEigenschaften.Name = "TabControlEigenschaften" Me.TabControlEigenschaften.SelectedIndex = 0 - Me.TabControlEigenschaften.Size = New System.Drawing.Size(447, 248) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(455, 263) Me.TabControlEigenschaften.TabIndex = 22 ' 'TabPage1 @@ -402,7 +414,7 @@ Partial Class frmFormDesigner Me.TabPage1.Location = New System.Drawing.Point(4, 25) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(439, 219) + Me.TabPage1.Size = New System.Drawing.Size(447, 234) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Allgemein" ' @@ -542,7 +554,7 @@ Partial Class frmFormDesigner Me.cmbIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True)) Me.cmbIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cmbIndex.FormattingEnabled = True - Me.cmbIndex.Location = New System.Drawing.Point(9, 103) + Me.cmbIndex.Location = New System.Drawing.Point(6, 103) Me.cmbIndex.Name = "cmbIndex" Me.cmbIndex.Size = New System.Drawing.Size(178, 24) Me.cmbIndex.TabIndex = 5 @@ -582,7 +594,7 @@ Partial Class frmFormDesigner ' 'INDEX_NAMETextBox ' - Me.INDEX_NAMETextBox.Location = New System.Drawing.Point(9, 104) + Me.INDEX_NAMETextBox.Location = New System.Drawing.Point(6, 104) Me.INDEX_NAMETextBox.Name = "INDEX_NAMETextBox" Me.INDEX_NAMETextBox.Size = New System.Drawing.Size(319, 23) Me.INDEX_NAMETextBox.TabIndex = 16 @@ -600,7 +612,7 @@ Partial Class frmFormDesigner Me.TabPage2.Location = New System.Drawing.Point(4, 25) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(439, 219) + Me.TabPage2.Size = New System.Drawing.Size(447, 234) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Format" Me.TabPage2.UseVisualStyleBackColor = True @@ -681,7 +693,7 @@ Partial Class frmFormDesigner Me.TabPage3.Location = New System.Drawing.Point(4, 25) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(439, 219) + Me.TabPage3.Size = New System.Drawing.Size(447, 234) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "SQL-Liste" Me.TabPage3.UseVisualStyleBackColor = True @@ -689,18 +701,32 @@ Partial Class frmFormDesigner 'pnlAuswahlliste ' Me.pnlAuswahlliste.AutoScroll = True + Me.pnlAuswahlliste.Controls.Add(Me.btnEditor) Me.pnlAuswahlliste.Controls.Add(Me.btnShowConnections) - Me.pnlAuswahlliste.Controls.Add(Me.SQL_UEBERPRUEFUNGTextBox) - Me.pnlAuswahlliste.Controls.Add(Me.btnTestSQL) + Me.pnlAuswahlliste.Controls.Add(Me.SQL_CommandTextBox) Me.pnlAuswahlliste.Controls.Add(Me.Label5) Me.pnlAuswahlliste.Controls.Add(Me.Label4) Me.pnlAuswahlliste.Controls.Add(Me.cmbConnection) Me.pnlAuswahlliste.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlAuswahlliste.Location = New System.Drawing.Point(3, 3) Me.pnlAuswahlliste.Name = "pnlAuswahlliste" - Me.pnlAuswahlliste.Size = New System.Drawing.Size(433, 213) + Me.pnlAuswahlliste.Size = New System.Drawing.Size(441, 228) Me.pnlAuswahlliste.TabIndex = 2 ' + 'btnEditor + ' + Me.btnEditor.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btnEditor.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnEditor.Image = CType(resources.GetObject("btnEditor.Image"), System.Drawing.Image) + Me.btnEditor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnEditor.Location = New System.Drawing.Point(6, 197) + Me.btnEditor.Name = "btnEditor" + Me.btnEditor.Size = New System.Drawing.Size(114, 28) + Me.btnEditor.TabIndex = 81 + Me.btnEditor.Text = "Editor Detail" + Me.btnEditor.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnEditor.UseVisualStyleBackColor = True + ' 'btnShowConnections ' Me.btnShowConnections.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -714,31 +740,18 @@ Partial Class frmFormDesigner Me.btnShowConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnShowConnections.UseVisualStyleBackColor = True ' - 'SQL_UEBERPRUEFUNGTextBox + 'SQL_CommandTextBox ' - Me.SQL_UEBERPRUEFUNGTextBox.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + 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_UEBERPRUEFUNGTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "SQL_UEBERPRUEFUNG", True)) - Me.SQL_UEBERPRUEFUNGTextBox.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SQL_UEBERPRUEFUNGTextBox.Location = New System.Drawing.Point(5, 76) - Me.SQL_UEBERPRUEFUNGTextBox.Multiline = True - Me.SQL_UEBERPRUEFUNGTextBox.Name = "SQL_UEBERPRUEFUNGTextBox" - Me.SQL_UEBERPRUEFUNGTextBox.Size = New System.Drawing.Size(425, 100) - Me.SQL_UEBERPRUEFUNGTextBox.TabIndex = 5 - ' - 'btnTestSQL - ' - Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnTestSQL.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.database_go1 - Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTestSQL.Location = New System.Drawing.Point(6, 182) - Me.btnTestSQL.Name = "btnTestSQL" - Me.btnTestSQL.Size = New System.Drawing.Size(166, 28) - Me.btnTestSQL.TabIndex = 4 - Me.btnTestSQL.Text = "Teste SQL" - Me.btnTestSQL.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnTestSQL.UseVisualStyleBackColor = True + Me.SQL_CommandTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "SQL_UEBERPRUEFUNG", True)) + Me.SQL_CommandTextBox.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SQL_CommandTextBox.Location = New System.Drawing.Point(5, 76) + Me.SQL_CommandTextBox.Multiline = True + Me.SQL_CommandTextBox.Name = "SQL_CommandTextBox" + Me.SQL_CommandTextBox.Size = New System.Drawing.Size(433, 115) + Me.SQL_CommandTextBox.TabIndex = 5 ' 'Label5 ' @@ -783,7 +796,7 @@ Partial Class frmFormDesigner Me.btndelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btndelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12 Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndelete.Location = New System.Drawing.Point(13, 280) + Me.btndelete.Location = New System.Drawing.Point(13, 295) Me.btndelete.Name = "btndelete" Me.btndelete.Size = New System.Drawing.Size(178, 23) Me.btndelete.TabIndex = 1 @@ -796,7 +809,7 @@ Partial Class frmFormDesigner Me.btnsave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnsave.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.save Me.btnsave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnsave.Location = New System.Drawing.Point(271, 279) + Me.btnsave.Location = New System.Drawing.Point(279, 294) Me.btnsave.Name = "btnsave" Me.btnsave.Size = New System.Drawing.Size(188, 24) Me.btnsave.TabIndex = 5 @@ -809,7 +822,7 @@ Partial Class frmFormDesigner ' Me.X_LOCTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.X_LOCTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "X_LOC", True)) - Me.X_LOCTextBox.Location = New System.Drawing.Point(15, 416) + Me.X_LOCTextBox.Location = New System.Drawing.Point(15, 431) Me.X_LOCTextBox.Name = "X_LOCTextBox" Me.X_LOCTextBox.ReadOnly = True Me.X_LOCTextBox.Size = New System.Drawing.Size(100, 23) @@ -819,7 +832,7 @@ Partial Class frmFormDesigner ' Me.Y_LOCTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Y_LOCTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "Y_LOC", True)) - Me.Y_LOCTextBox.Location = New System.Drawing.Point(137, 416) + Me.Y_LOCTextBox.Location = New System.Drawing.Point(137, 431) Me.Y_LOCTextBox.Name = "Y_LOCTextBox" Me.Y_LOCTextBox.ReadOnly = True Me.Y_LOCTextBox.Size = New System.Drawing.Size(100, 23) @@ -829,7 +842,7 @@ Partial Class frmFormDesigner ' Me.CHANGED_WHOTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 468) + Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 483) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(222, 23) Me.CHANGED_WHOTextBox.TabIndex = 19 @@ -857,9 +870,9 @@ Partial Class frmFormDesigner 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 541) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 556) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(987, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(995, 22) Me.StatusStrip1.TabIndex = 20 Me.StatusStrip1.Text = "StatusStrip1" ' @@ -875,7 +888,7 @@ Partial Class frmFormDesigner ' Me.CHANGED_WHENTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHEN", True)) - Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(253, 468) + Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(253, 483) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(159, 23) Me.CHANGED_WHENTextBox.TabIndex = 21 @@ -884,7 +897,7 @@ Partial Class frmFormDesigner ' Me.HEIGHTTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.HEIGHTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "HEIGHT", True)) - Me.HEIGHTTextBox.Location = New System.Drawing.Point(253, 416) + Me.HEIGHTTextBox.Location = New System.Drawing.Point(253, 431) Me.HEIGHTTextBox.Name = "HEIGHTTextBox" Me.HEIGHTTextBox.ReadOnly = True Me.HEIGHTTextBox.Size = New System.Drawing.Size(71, 23) @@ -894,7 +907,7 @@ Partial Class frmFormDesigner ' Me.WIDTHTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.WIDTHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "WIDTH", True)) - Me.WIDTHTextBox.Location = New System.Drawing.Point(331, 416) + Me.WIDTHTextBox.Location = New System.Drawing.Point(331, 431) Me.WIDTHTextBox.Name = "WIDTHTextBox" Me.WIDTHTextBox.ReadOnly = True Me.WIDTHTextBox.Size = New System.Drawing.Size(81, 23) @@ -934,11 +947,22 @@ Partial Class frmFormDesigner Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnrefresh.UseVisualStyleBackColor = True ' + 'GUIDTextBox + ' + Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "GUID", True)) + Me.GUIDTextBox.Location = New System.Drawing.Point(43, 512) + Me.GUIDTextBox.Name = "GUIDTextBox" + Me.GUIDTextBox.ReadOnly = True + Me.GUIDTextBox.Size = New System.Drawing.Size(72, 23) + Me.GUIDTextBox.TabIndex = 25 + ' 'frmFormDesigner ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(987, 563) + Me.ClientSize = New System.Drawing.Size(995, 578) + Me.Controls.Add(GUIDLabel) + Me.Controls.Add(Me.GUIDTextBox) Me.Controls.Add(Me.btnrefresh) Me.Controls.Add(WIDTHLabel) Me.Controls.Add(Me.WIDTHTextBox) @@ -1041,8 +1065,7 @@ Partial Class frmFormDesigner Friend WithEvents Label4 As System.Windows.Forms.Label Friend WithEvents cmbConnection As System.Windows.Forms.ComboBox Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents btnTestSQL As System.Windows.Forms.Button - Friend WithEvents SQL_UEBERPRUEFUNGTextBox As System.Windows.Forms.TextBox + Friend WithEvents SQL_CommandTextBox As System.Windows.Forms.TextBox Friend WithEvents btnCheckbox As System.Windows.Forms.Button Friend WithEvents rbVektor As System.Windows.Forms.RadioButton Friend WithEvents rbIndex As System.Windows.Forms.RadioButton @@ -1058,4 +1081,6 @@ Partial Class frmFormDesigner Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter Friend WithEvents btnrefresh As System.Windows.Forms.Button Friend WithEvents btnShowConnections As System.Windows.Forms.Button + Friend WithEvents btnEditor As Button + Friend WithEvents GUIDTextBox As TextBox End Class diff --git a/DD_PM_WINDREAM/frmFormDesigner.resx b/DD_PM_WINDREAM/frmFormDesigner.resx index 4681a7a..622521c 100644 --- a/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/DD_PM_WINDREAM/frmFormDesigner.resx @@ -135,6 +135,9 @@ False + + False + 179, 17 @@ -144,6 +147,17 @@ 898, 56 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAANtJREFUOE+tkzsSgjAURbMEl+TQswDWg8M2LKSWggW4DrWhUBuKaAGUTw5DMASU + z5iZw0zeu/cmmRDljqqqtmVZJjW6Rhx0URR7NK38M7TWm7p5yrJMoiiSIAjE87we1OihQYuntStFIU1T + 8X1f4kMsl/NVnvrVgxo9NGjxNGaS8jxvGvfbY2B0QcOOONZ/AhhMKM49wteAJTQBfKYYMwO9yZVnB7jn + BSOyTTaDgOSYdM1VAVxPGO66uREZg8sggCsihJ2sCnAxIttk6H7lXyuA3R99TAgW4Dxnpd6OS61yelZ6 + QAAAAABJRU5ErkJggg== + + 1021, 17 @@ -174,7 +188,6 @@ 25 - AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAALzAAAAEA diff --git a/DD_PM_WINDREAM/frmFormDesigner.vb b/DD_PM_WINDREAM/frmFormDesigner.vb index bec9378..a96c7d3 100644 --- a/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/DD_PM_WINDREAM/frmFormDesigner.vb @@ -1,7 +1,6 @@ Public Class frmFormDesigner Private _windreamPM As ClassPMWindream Dim CursorPosition As Point - Private CONTROL_GUID Private COLUMN_GUID Private MouseIsDown As Boolean = False ' Used by the MoveMove event handler to show that the @@ -17,32 +16,32 @@ Private idxdtp As Integer = 0 Private idxdgv As Integer = 0 Private idxchk As Integer = 0 - Private akt_ctrl As Control Private _loading As Boolean = False Dim frmTableColumn As New frmControl_Detail + Private CURRENT_CONTROL As Control Private Sub frmFormDesigner_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - Try - If CURRENT_ProfilGUID > 0 Then - Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBWH_CHECK_PROFILE_CONTROLS, CURRENT_ProfilGUID) - Dim DT As DataTable = DD_DMSLiteDataSet.TBWH_CHECK_PROFILE_CONTROLS - gbx_CTRL.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 - End If - Next - End If - If Application.OpenForms().OfType(Of frmControl_Detail).Any Then + ' + '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 + 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 + End If + Next + End If + If Application.OpenForms().OfType(Of frmControl_Detail).Any Then frmControl_Detail.Close() End If - ' MessageBox.Show("Opened") - Catch ex As Exception - MsgBox("Fehler bei FormClosing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - End Try + ' MessageBox.Show("Opened") + 'Catch ex As Exception + ' MsgBox("Fehler bei FormClosing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") + 'End Try End Sub '' Used to store the current cursor shape when we start @@ -125,14 +124,20 @@ MsgBox("Fehler bei Indexe Volltext eintragen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try End Sub - Sub Load_Control() + Sub Load_Control(Optional ID As Integer = 0) _loading = True Try TabControlEigenschaften.SelectedIndex = 0 Me.cmbIndex.Visible = False Me.INDEX_NAMETextBox.Visible = False - If CONTROL_GUID Is Nothing = False Then - TBPM_PROFILE_CONTROLSTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CONTROL_GUID) + If ID = 0 Then + CURRENT_CONTROL_ID = CURRENT_CONTROL.Tag + Else + CURRENT_CONTROL_ID = ID + End If + + If CURRENT_CONTROL_ID <> 0 Then + 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) If dr Is Nothing = False Then @@ -148,7 +153,7 @@ Me.rbVektor.Checked = False Me.INDEX_NAMETextBox.Visible = False Me.cmbIndex.Visible = True - IDX_CMB(akt_ctrl.Name) + IDX_CMB(CURRENT_CONTROL.Name) End If Try If CheckBoxAuswahlliste.Visible = False Then @@ -164,7 +169,11 @@ End Try End If + Else + tslblAenderungen.Visible = True + tslblAenderungen.Text = "Konte das aktuelle Control nicht wählen!!" End If + btnsave.Visible = True Catch ex As Exception If Not ex.Message.Contains("Data Reader") Then MsgBox("Fehler bei Laden des Controls: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") @@ -183,19 +192,19 @@ For Each dr As DataRow In dt.Rows Select Case dr.Item("CTRL_TYPE") Case "TXT" - add_exisiting_textbox(dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) + add_exisiting_textbox(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) Case "LBL" - add_existing_label(dr.Item("NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) + add_existing_label(dr.Item("GUID"), dr.Item("NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) Case "CMB" - add_exisiting_Combobox(dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) + add_exisiting_Combobox(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) Case "DTP" - add_exisiting_DTP(dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) + add_exisiting_DTP(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) Case "DGV" - add_exisitingDGV(dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) + add_exisitingDGV(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) Case "CHK" - add_exisiting_Checkbox(dr.Item("NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) + add_exisiting_Checkbox(dr.Item("GUID"), dr.Item("NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) Case "TABLE" - add_exisitingTABLE(dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) + add_exisitingTABLE(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT"))) End Select Next Catch ex As Exception @@ -203,13 +212,13 @@ End Try End Sub - Private Sub btnlabel_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseDown + 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() End Sub - Private Sub btntextbox_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btntextbox.MouseDown - MouseIsDown = True - End Sub Private Sub btnlabel_MouseMove(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseMove If MouseIsDown Then @@ -267,8 +276,8 @@ End Sub Private Function GetControlGUID(control_name As String) Try - CONTROL_GUID = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, control_name) - Return CONTROL_GUID + CURRENT_CONTROL_ID = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, control_name) + Return CURRENT_CONTROL_ID Catch ex As Exception MsgBox("Fehler bei GetControlGUID: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") Return 0 @@ -285,22 +294,23 @@ Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position) lbl.Location = New Point(clientPosition) pnldesigner.Controls.Add(lbl) - akt_ctrl = lbl + CURRENT_CONTROL = lbl AddHandler lbl.Click, AddressOf OnlblClick AddHandler lbl.MouseDown, AddressOf MovableLabel_MouseDown AddHandler lbl.MouseUp, AddressOf MovableCtrl_MouseUp AddHandler lbl.MouseMove, AddressOf Control_MouseMove 'MovableLabel_MouseMove TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, lbl.Name, "LBL", lblname, lbl.Location.X, lbl.Location.Y, Environment.UserName, 16, 200) - 'GetControlGUID(lbl.Name) + CURRENT_CONTROL.Tag = GetLastID() 'Load_Control() btnsave.Visible = True Catch ex As Exception MsgBox("Fehler bei Anlegen Label: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Function - Function add_existing_label(lblname As String, text As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) + Function add_existing_label(ID As Integer, lblname As String, text As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) Dim lbl As New Label + lbl.Tag = ID lbl.Name = lblname lbl.Text = text lbl.AutoSize = True @@ -314,6 +324,10 @@ AddHandler lbl.MouseMove, AddressOf Control_MouseMove 'MovableLabel_MouseMove End Function + Private Function GetLastID() + Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", CURRENT_ProfilGUID) + Return ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + End Function Function add_newtextbox(txtname As String) Try Dim txt As New TextBox @@ -325,13 +339,14 @@ txt.Location = New Point(clientPosition) txt.BackColor = Color.White pnldesigner.Controls.Add(txt) - akt_ctrl = txt + CURRENT_CONTROL = txt AddHandler txt.Click, AddressOf OntxtClick AddHandler txt.MouseDown, AddressOf MovableText_MouseDown AddHandler txt.MouseUp, AddressOf MovableCtrl_MouseUp AddHandler txt.MouseMove, AddressOf Control_MouseMove 'MovableText_MouseMove TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, txt.Name, "TXT", txtname, txt.Location.X, txt.Location.Y, Environment.UserName, 27, 200) + CURRENT_CONTROL.Tag = GetLastID() 'GetControlGUID(txt.Name) 'Load_Control() btnsave.Visible = True @@ -339,8 +354,9 @@ MsgBox("Fehler bei Anlegen TextBox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Function - Function add_exisiting_textbox(txtname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) + Function add_exisiting_textbox(ID As Integer, txtname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) Dim txt As New TextBox + txt.Tag = ID txt.Name = txtname If vheight > 27 Then txt.Multiline = True @@ -373,22 +389,23 @@ Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position) chk.Location = New Point(clientPosition) pnldesigner.Controls.Add(chk) - akt_ctrl = chk + CURRENT_CONTROL = chk AddHandler chk.Click, AddressOf OnchkboxClick AddHandler chk.MouseDown, AddressOf MovableChk_MouseDown AddHandler chk.MouseUp, AddressOf MovableCtrl_MouseUp AddHandler chk.MouseMove, AddressOf Control_MouseMove 'MovableChk_MouseMove TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, chk.Name, "CHK", chkname, chk.Location.X, chk.Location.Y, Environment.UserName, 27, 200) - GetControlGUID(chk.Name) + CURRENT_CONTROL.Tag = GetLastID() Load_Control() btnsave.Visible = True Catch ex As Exception MsgBox("Fehler bei Anlegen Checkbox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Function - Function add_exisiting_Checkbox(chkname As String, text As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) + Function add_exisiting_Checkbox(ID As Integer, chkname As String, text As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) Dim chk As New CheckBox + chk.Tag = ID chk.Name = chkname chk.AutoSize = True 'chk.Size = New Size(vwidth, vheight) @@ -411,22 +428,23 @@ Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position) cmb.Location = New Point(clientPosition) pnldesigner.Controls.Add(cmb) - akt_ctrl = cmb + CURRENT_CONTROL = cmb AddHandler cmb.Click, AddressOf OncmbClick AddHandler cmb.MouseDown, AddressOf Movablecmb_MouseDown AddHandler cmb.MouseUp, AddressOf MovableCtrl_MouseUp AddHandler cmb.MouseMove, AddressOf Control_MouseMove 'Movablecmb_MouseMove TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, cmb.Name, "CMB", cmbname, cmb.Location.X, cmb.Location.Y, Environment.UserName, 24, 180) - GetControlGUID(cmb.Name) + CURRENT_CONTROL.Tag = GetLastID() Load_Control() btnsave.Visible = True Catch ex As Exception MsgBox("Fehler bei Anlegen Combobox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Function - Function add_exisiting_Combobox(cmbname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) + Function add_exisiting_Combobox(ID As Integer, cmbname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) Dim cmb As New ComboBox + cmb.Tag = ID cmb.Name = cmbname cmb.Size = New Size(vwidth, vheight) cmb.Cursor = Cursors.Hand @@ -438,8 +456,9 @@ AddHandler cmb.MouseMove, AddressOf Control_MouseMove 'Movablecmb_MouseMove btnsave.Visible = True End Function - Function add_exisiting_DTP(dtpname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) + Function add_exisiting_DTP(ID As Integer, dtpname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) Dim dtp As New DateTimePicker + dtp.Tag = ID dtp.Name = dtpname dtp.Size = New Size(vwidth, vheight) dtp.Cursor = Cursors.Hand @@ -463,21 +482,22 @@ Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position) dtp.Location = New Point(clientPosition) pnldesigner.Controls.Add(dtp) - akt_ctrl = dtp + CURRENT_CONTROL = dtp AddHandler dtp.Click, AddressOf OndtpClick AddHandler dtp.MouseDown, AddressOf Movabledtp_MouseDown AddHandler dtp.MouseUp, AddressOf MovableCtrl_MouseUp AddHandler dtp.MouseMove, AddressOf Control_MouseMove 'Movabledtp_MouseMove TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dtp.Name, "DTP", dtpname, dtp.Location.X, dtp.Location.Y, Environment.UserName, 24, 180) - GetControlGUID(dtp.Name) + CURRENT_CONTROL.Tag = GetLastID() Load_Control() - btnsave.Visible = True + Catch ex As Exception MsgBox("Fehler bei Anlegen DatetimePicker: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Function - Function add_exisitingDGV(dtpname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) + Function add_exisitingDGV(ID As Integer, dtpname As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) Dim dgv As New DataGridView + dgv.Tag = ID dgv.Name = dtpname dgv.Size = New Size(vwidth, vheight) dgv.Cursor = Cursors.Hand @@ -520,16 +540,15 @@ col.Name = "column1" dgv.Columns.Add(col) pnldesigner.Controls.Add(dgv) - akt_ctrl = dgv + CURRENT_CONTROL = dgv AddHandler dgv.Click, AddressOf OndgvClick AddHandler dgv.MouseDown, AddressOf MovableDGV_MouseDown AddHandler dgv.MouseUp, AddressOf MovableCtrl_MouseUp AddHandler dgv.MouseMove, AddressOf dgv_MouseMove TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dgv.Name, "DGV", dgvName, dgv.Location.X, dgv.Location.Y, Environment.UserName, 130, 150) - GetControlGUID(dgv.Name) + CURRENT_CONTROL.Tag = GetLastID() Load_Control() - btnsave.Visible = True Catch ex As Exception MsgBox("Fehler bei Anlegen DGV: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -556,7 +575,7 @@ col2.Name = "column2" table.Columns.Add(col2) pnldesigner.Controls.Add(table) - akt_ctrl = table + CURRENT_CONTROL = table AddHandler table.Click, AddressOf OndgvClick AddHandler table.MouseDown, AddressOf MovableDGV_MouseDown @@ -564,19 +583,17 @@ AddHandler table.MouseMove, AddressOf dgv_MouseMove AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, table.Name, "TABLE", tableName, table.Location.X, table.Location.Y, Environment.UserName, 130, 150) - Dim c_ID = GetControlGUID(table.Name) - If c_ID > 0 Then - TBPM_CONTROL_TABLETableAdapter.Insert(c_ID, "column1", "Column1", 95, Environment.UserName) - TBPM_CONTROL_TABLETableAdapter.Insert(c_ID, "column2", "Column2", 95, Environment.UserName) - End If + CURRENT_CONTROL.Tag = GetLastID() + TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column1", "Column1", 95, Environment.UserName) + TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column2", "Column2", 95, Environment.UserName) Load_Control() - btnsave.Visible = True Catch ex As Exception MsgBox("Fehler bei Anlegen Tabelle: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Function - Function add_exisitingTABLE(tableName As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) + Function add_exisitingTABLE(ID As Integer, tableName As String, x As Integer, y As Integer, vwidth As Integer, vheight As Integer) Dim table As New DataGridView + table.Tag = ID table.Name = tableName table.Size = New Size(vwidth, vheight) table.Cursor = Cursors.Hand @@ -585,12 +602,10 @@ table.AllowUserToDeleteRows = False table.AllowUserToResizeColumns = True table.AllowUserToResizeRows = False - + CURRENT_CONTROL = table 'Columns laden - Dim cID = GetControlGUID(tableName) - If cID > 0 Then - TBPM_CONTROL_TABLETableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE, cID) - Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE + 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 @@ -600,7 +615,7 @@ table.Columns.Add(col) Next End If - End If + ' table.AutoResizeColumns() pnldesigner.Controls.Add(table) @@ -614,9 +629,9 @@ btnsave.Visible = True End Function Sub Set_Active_Color() - akt_ctrl.BackColor = Color.DarkOrange + CURRENT_CONTROL.BackColor = Color.DarkOrange For Each inctrl As Control In Me.pnldesigner.Controls - If inctrl.Name <> akt_ctrl.Name Then + If inctrl.Name <> CURRENT_CONTROL.Name Then Dim Type As String = inctrl.GetType.ToString Select Case Type Case "System.Windows.Forms.TextBox" @@ -630,10 +645,10 @@ Next End Sub Public Sub OnlblClick(sender As System.Object, e As System.EventArgs) - akt_ctrl = sender + CURRENT_CONTROL = sender Set_Active_Color() Dim lbl As Label = sender - GetControlGUID(lbl.Name) + CURRENT_CONTROL = lbl Load_Control() Me.lblBeschriftung.Visible = True Me.CTRL_TEXTTextBox.Visible = True @@ -656,10 +671,11 @@ INDEX_NAMETextBox.Visible = False End Sub Public Sub OntxtClick(sender As System.Object, e As System.EventArgs) - akt_ctrl = sender + CURRENT_CONTROL = sender Dim txt As TextBox = sender Set_Active_Color() - GetControlGUID(txt.Name) + CURRENT_CONTROL = txt + Load_indexe() Load_Control() Me.lblBeschriftung.Visible = False @@ -681,10 +697,10 @@ Me.LOAD_IDX_VALUECheckBox.Visible = True End Sub Public Sub OnchkboxClick(sender As System.Object, e As System.EventArgs) - akt_ctrl = sender + CURRENT_CONTROL = sender Dim chk As CheckBox = sender Set_Active_Color() - GetControlGUID(chk.Name) + CURRENT_CONTROL = chk Load_indexe() Load_Control() Me.lblBeschriftung.Visible = True @@ -703,11 +719,12 @@ Me.LOAD_IDX_VALUECheckBox.Visible = True End Sub Public Sub OncmbClick(sender As System.Object, e As System.EventArgs) - akt_ctrl = sender + CURRENT_CONTROL = sender Dim cmb As ComboBox = sender Set_Active_Color() - GetControlGUID(cmb.Name) + CURRENT_CONTROL = cmb + Load_indexe() Load_Control() Me.lblBeschriftung.Visible = False @@ -731,9 +748,9 @@ End Sub Public Sub OndtpClick(sender As System.Object, e As System.EventArgs) - akt_ctrl = sender + CURRENT_CONTROL = sender Dim dtp As DateTimePicker = sender - GetControlGUID(dtp.Name) + CURRENT_CONTROL = dtp Load_indexe() Load_Control() Me.lblBeschriftung.Visible = False @@ -752,16 +769,16 @@ Me.LOAD_IDX_VALUECheckBox.Visible = True End Sub Public Sub OndgvClick(sender As System.Object, e As System.EventArgs) - akt_ctrl = sender + CURRENT_CONTROL = sender Dim dgv As DataGridView = sender - GetControlGUID(dgv.Name) + CURRENT_CONTROL = dgv If dgv.ColumnCount > 1 Then Me.rbVektor.Visible = False Load_Indexe_Vektor() Dim selectedColumnCount As Integer = dgv.Columns.GetColumnCount(DataGridViewElementStates.Selected) If selectedColumnCount > 0 Then - COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CONTROL_GUID, dgv.SelectedColumns(selectedColumnCount).Name) + COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgv.SelectedColumns(selectedColumnCount).Name) End If Else Load_indexe() @@ -790,14 +807,14 @@ Me.LOAD_IDX_VALUECheckBox.Visible = True End Sub Public Sub table_ColumnHeaderMouseClick(sender As System.Object, e As DataGridViewCellMouseEventArgs) - akt_ctrl = sender + CURRENT_CONTROL = sender Dim dgv As DataGridView = sender - GetControlGUID(dgv.Name) + CURRENT_CONTROL = dgv Me.rbVektor.Visible = False Dim dgvColumn As DataGridViewColumn = dgv.Columns(e.ColumnIndex) - COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CONTROL_GUID, dgvColumn.Name) + COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgvColumn.Name) If Application.OpenForms().OfType(Of frmControl_Detail).Any Then ' MessageBox.Show("Opened") Else @@ -860,12 +877,23 @@ Public Function GetCursorPosition() As Point Return pnldesigner.PointToClient(Cursor.Position) End Function + Sub Clear_control_Details() + Try + CURRENT_CONTROL = Nothing + TBPM_PROFILE_CONTROLSBindingSource.Clear() + Catch ex As Exception + + End Try + End Sub Private Sub MovableLabel_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown ' Check to see if the correct button has been pressed If e.Button = Windows.Forms.MouseButtons.Left Then + Clear_control_Details() + ' MsgBox(ex.Message) + Dim lbl As Label = DirectCast(sender, Label) - akt_ctrl = sender + CURRENT_CONTROL = sender begin_location = e.Location lbl.BringToFront() ' Set the mode flag to signal the MouseMove event handler that it @@ -876,10 +904,10 @@ Private Sub MovableText_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown ' Check to see if the correct button has been pressed If e.Button = Windows.Forms.MouseButtons.Left Then - Dim txt As TextBox = DirectCast(sender, TextBox) - akt_ctrl = sender - GetControlGUID(akt_ctrl.Name) + Clear_control_Details() + Dim txt As TextBox = DirectCast(sender, TextBox) + CURRENT_CONTROL = sender begin_location = e.Location txt.BringToFront() ' Set the mode flag to signal the MouseMove event handler that it @@ -890,9 +918,9 @@ Private Sub MovableChk_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown ' Check to see if the correct button has been pressed If e.Button = Windows.Forms.MouseButtons.Left Then + Clear_control_Details() Dim txt As CheckBox = DirectCast(sender, CheckBox) - akt_ctrl = sender - GetControlGUID(akt_ctrl.Name) + CURRENT_CONTROL = sender begin_location = e.Location txt.BringToFront() ' Set the mode flag to signal the MouseMove event handler that it @@ -903,9 +931,9 @@ Private Sub Movablecmb_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown ' Check to see if the correct button has been pressed If e.Button = Windows.Forms.MouseButtons.Left Then + Clear_control_Details() Dim cmb As ComboBox = DirectCast(sender, ComboBox) - akt_ctrl = sender - GetControlGUID(akt_ctrl.Name) + CURRENT_CONTROL = sender begin_location = e.Location cmb.BringToFront() @@ -917,9 +945,10 @@ Private Sub Movabledtp_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown ' Check to see if the correct button has been pressed If e.Button = Windows.Forms.MouseButtons.Left Then + Clear_control_Details() Dim dtp As DateTimePicker = DirectCast(sender, DateTimePicker) - akt_ctrl = sender - GetControlGUID(akt_ctrl.Name) + CURRENT_CONTROL = sender + 'Console.WriteLine("X: " & cursor.X & ";Y=" & cursor.Y) begin_location = e.Location 'begin_location = New Point(cursor.X - Parent.Location.X, @@ -938,6 +967,7 @@ Private Sub MovableDGV_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown ' Check to see if the correct button has been pressed If e.Button = Windows.Forms.MouseButtons.Left And Cursor = Cursors.Default Then + Clear_control_Details() Dim dgv As DataGridView = DirectCast(sender, DataGridView) Dim relativeMousePosition As Point = dgv.PointToClient(Cursor.Position) Dim hit As DataGridView.HitTestInfo = dgv.HitTest(relativeMousePosition.X, relativeMousePosition.Y) @@ -945,36 +975,34 @@ Exit Sub End If - akt_ctrl = sender + CURRENT_CONTROL = sender begin_location = e.Location - akt_ctrl.Tag = New clsDragInfo(Form.MousePosition, sender.Location) + CURRENT_CONTROL.Tag = New clsDragInfo(Form.MousePosition, sender.Location) dgv.BringToFront() ' Set the mode flag to signal the MouseMove event handler that it ' needs to now calculate new positions for our control m_Moving = True - akt_ctrl = sender - GetControlGUID(akt_ctrl.Name) - GetControlGUID(dgv.Name) + CURRENT_CONTROL = sender + 'Jetzt Controleigenschaften laden Set_Active_Color() - GetControlGUID(dgv.Name) Load_Control() gbx_CTRL.Visible = True End If End Sub Private Sub MovableCtrl_MouseUp(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Me.MouseUp - akt_ctrl.Tag = Nothing + CURRENT_CONTROL.Tag = Nothing ' The button was released, so we're going back to Static mode. If m_Moving = True Then m_Moving = False end_location = e.Location If X_LOCTextBox.Text <> String.Empty Then - If akt_ctrl.Location.X <> X_LOCTextBox.Text Or akt_ctrl.Location.Y <> Y_LOCTextBox.Text Then - X_LOCTextBox.Text = akt_ctrl.Location.X - Y_LOCTextBox.Text = akt_ctrl.Location.Y + If CURRENT_CONTROL.Location.X <> X_LOCTextBox.Text Or CURRENT_CONTROL.Location.Y <> Y_LOCTextBox.Text Then + X_LOCTextBox.Text = CURRENT_CONTROL.Location.X + Y_LOCTextBox.Text = CURRENT_CONTROL.Location.Y Save_Control() End If End If @@ -988,7 +1016,7 @@ End Sub Private Sub Control_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseMove Try - If akt_ctrl Is Nothing Then + If CURRENT_CONTROL Is Nothing Then Exit Sub End If 'Check which mode we're in. If we're supposed to be moving @@ -1001,7 +1029,7 @@ ' get the screen position of the mouse pointer and map it ' to the position relative to the top-left corner of our If Point.op_Inequality(NowCursor, begin_location) Then - akt_ctrl.Location = New System.Drawing.Point(NowCursor.X - begin_location.X, + CURRENT_CONTROL.Location = New System.Drawing.Point(NowCursor.X - begin_location.X, NowCursor.Y - begin_location.Y) End If End If @@ -1013,12 +1041,12 @@ End Sub Private Sub MovableLabel_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseMove Try - If akt_ctrl Is Nothing Then + If CURRENT_CONTROL Is Nothing Then Exit Sub End If 'Check which mode we're in. If we're supposed to be moving 'our control - If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And akt_ctrl.GetType.ToString = "System.Windows.Forms.Label" Then + If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And CURRENT_CONTROL.GetType.ToString = "System.Windows.Forms.Label" Then Me.Cursor = Cursors.Hand Me.Refresh() @@ -1041,11 +1069,11 @@ Private Sub MovableText_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseMove 'Check which mode we're in. If we're supposed to be moving 'our control - If akt_ctrl Is Nothing Then + If CURRENT_CONTROL Is Nothing Then Exit Sub End If Try - If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And akt_ctrl.GetType.ToString = "System.Windows.Forms.TextBox" Then + If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And CURRENT_CONTROL.GetType.ToString = "System.Windows.Forms.TextBox" Then Me.Cursor = Cursors.Hand Me.Refresh() @@ -1071,11 +1099,11 @@ Private Sub MovableChk_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseMove 'Check which mode we're in. If we're supposed to be moving 'our control - If akt_ctrl Is Nothing Then + If CURRENT_CONTROL Is Nothing Then Exit Sub End If Try - If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And akt_ctrl.GetType.ToString = "System.Windows.Forms.CheckBox" Then + If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And CURRENT_CONTROL.GetType.ToString = "System.Windows.Forms.CheckBox" Then Me.Cursor = Cursors.Hand Me.Refresh() @@ -1097,11 +1125,11 @@ Private Sub Movablecmb_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseMove 'Check which mode we're in. If we're supposed to be moving 'our control - If akt_ctrl Is Nothing Then + If CURRENT_CONTROL Is Nothing Then Exit Sub End If Try - If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And akt_ctrl.GetType.ToString = "System.Windows.Forms.ComboBox" Then + If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And CURRENT_CONTROL.GetType.ToString = "System.Windows.Forms.ComboBox" Then Me.Cursor = Cursors.Hand Me.Refresh() @@ -1125,11 +1153,11 @@ 'Private Sub Movabledtp_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseMove ' 'Check which mode we're in. If we're supposed to be moving ' 'our control - ' If akt_ctrl Is Nothing Then + ' If CURRENT_CONTROL Is Nothing Then ' Exit Sub ' End If ' Try - ' If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And akt_ctrl.GetType.ToString = "System.Windows.Forms.DateTimePicker" Then + ' If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And CURRENT_CONTROL.GetType.ToString = "System.Windows.Forms.DateTimePicker" Then ' Me.Cursor = Cursors.Hand ' Me.Refresh() @@ -1158,11 +1186,11 @@ Private Sub dgv_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseMove 'Check which mode we're in. If we're supposed to be moving 'our control - If akt_ctrl Is Nothing Then + If CURRENT_CONTROL Is Nothing Then Exit Sub End If Try - If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And akt_ctrl.GetType.ToString = "System.Windows.Forms.DataGridView" Then + If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And CURRENT_CONTROL.GetType.ToString = "System.Windows.Forms.DataGridView" Then Me.Cursor = Cursors.Hand Me.Refresh() @@ -1189,18 +1217,18 @@ ' 'our control ' Try - ' If akt_ctrl.Tag IsNot Nothing Then + ' If CURRENT_CONTROL.Tag IsNot Nothing Then ' Dim info As clsDragInfo = CType(Panel1.Tag, clsDragInfo) ' Dim newLoc As Point = info.NewLocation(Form.MousePosition) - ' If Me.ClientRectangle.Contains(New Rectangle(newLoc, akt_ctrl.Size)) Then akt_ctrl.Location = newLoc + ' If Me.ClientRectangle.Contains(New Rectangle(newLoc, CURRENT_CONTROL.Size)) Then CURRENT_CONTROL.Location = newLoc ' End If ' 'If m_Moving = True Then - ' ' ListBox1.Items.Add(sender.ToString & "-" & akt_ctrl.GetType.ToString) + ' ' ListBox1.Items.Add(sender.ToString & "-" & CURRENT_CONTROL.GetType.ToString) ' 'End If - ' 'If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And akt_ctrl.GetType.ToString = "System.Windows.Forms.DateTimePicker" Then + ' 'If m_Moving = True And sender.ToString <> "DD_PM_WINDREAM.frmFormDesigner, Text: Validation-Designer" And CURRENT_CONTROL.GetType.ToString = "System.Windows.Forms.DateTimePicker" Then ' ' Me.Cursor = Cursors.Hand ' ' Me.Refresh() @@ -1248,9 +1276,9 @@ tslblAenderungen.Visible = False End If 'Wenn Datagridview dann Speichern - Dim type As String = akt_ctrl.GetType.ToString + Dim type As String = CURRENT_CONTROL.GetType.ToString If type.Contains("DataGridView") Then - Dim dgv As DataGridView = DirectCast(akt_ctrl, DataGridView) + Dim dgv As DataGridView = DirectCast(CURRENT_CONTROL, DataGridView) If dgv.ColumnCount > 1 Then 'For Each col As DataColumn In dgv.Columns ' MsgBox(col.ColumnName) @@ -1286,11 +1314,6 @@ End If End If End Sub - - Private Sub btncmb_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btncmb.MouseDown - MouseIsDown = True - End Sub - Private Sub btncmb_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btncmb.MouseMove If MouseIsDown Then ' Initiate dragging. @@ -1311,89 +1334,85 @@ Private Sub btndelete_Click(sender As System.Object, e As System.EventArgs) Handles btndelete.Click - If akt_ctrl Is Nothing = False Then - delete_Control(akt_ctrl.Name) + If CURRENT_CONTROL Is Nothing = False Then + delete_Control(CURRENT_CONTROL.Name) End If End Sub Private Sub CTRL_TEXTTextBox_LostFocus(sender As Object, e As System.EventArgs) Handles CTRL_TEXTTextBox.LostFocus Try - Dim type As String = akt_ctrl.GetType.ToString + Dim type As String = CURRENT_CONTROL.GetType.ToString If type.Contains("Label") Then TBPM_PROFILE_CONTROLSBindingSource.EndEdit() End If Catch ex As Exception MsgBox("Fehler bei CTRL_TEXTTextBox.LostFocus:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - If akt_ctrl.Text <> CTRL_TEXTTextBox.Text Then - akt_ctrl.Text = CTRL_TEXTTextBox.Text - CTRL_TEXTTextBox.Text = akt_ctrl.Text + If CURRENT_CONTROL.Text <> CTRL_TEXTTextBox.Text Then + CURRENT_CONTROL.Text = CTRL_TEXTTextBox.Text + CTRL_TEXTTextBox.Text = CURRENT_CONTROL.Text Save_Control() End If End Sub Private Sub NAMETextBox_LostFocus(sender As Object, e As System.EventArgs) Handles NAMETextBox.LostFocus Try - Dim type As String = akt_ctrl.GetType.ToString + Dim type As String = CURRENT_CONTROL.GetType.ToString If type.Contains("TextBox") Then TBPM_PROFILE_CONTROLSBindingSource.EndEdit() End If Catch ex As Exception MsgBox("Fehler bei NAMETextBox.LostFocus:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - If akt_ctrl.Name <> NAMETextBox.Text Then + If CURRENT_CONTROL.Name <> NAMETextBox.Text Then Save_Control() End If End Sub Private Sub btnwidth_plus_Click(sender As System.Object, e As System.EventArgs) Handles btnwidth_plus.Click - If akt_ctrl Is Nothing = False Then - akt_ctrl.Size = New Size(akt_ctrl.Width + 5, akt_ctrl.Height) - WIDTHTextBox.Text = akt_ctrl.Size.Width + If CURRENT_CONTROL Is Nothing = False Then + CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width + 5, CURRENT_CONTROL.Height) + WIDTHTextBox.Text = CURRENT_CONTROL.Size.Width Save_Control() End If End Sub Private Sub btnwidth_minus_Click(sender As System.Object, e As System.EventArgs) Handles btnwidth_minus.Click - If akt_ctrl Is Nothing = False Then - akt_ctrl.Size = New Size(akt_ctrl.Width - 5, akt_ctrl.Height) - WIDTHTextBox.Text = akt_ctrl.Size.Width + If CURRENT_CONTROL Is Nothing = False Then + CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width - 5, CURRENT_CONTROL.Height) + WIDTHTextBox.Text = CURRENT_CONTROL.Size.Width Save_Control() End If End Sub Private Sub btnheight_plus_Click(sender As System.Object, e As System.EventArgs) Handles btnheight_plus.Click - If akt_ctrl Is Nothing = False Then - Dim height As Integer = akt_ctrl.Height + If CURRENT_CONTROL Is Nothing = False Then + Dim height As Integer = CURRENT_CONTROL.Height height += 5 If height > 21 Then - Dim txt As TextBox = DirectCast(akt_ctrl, TextBox) + Dim txt As TextBox = DirectCast(CURRENT_CONTROL, TextBox) txt.Multiline = True End If - akt_ctrl.Size = New Size(akt_ctrl.Width, height) + CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width, height) HEIGHTTextBox.Text = height Save_Control() End If End Sub Private Sub btnheight_minus_Click(sender As System.Object, e As System.EventArgs) Handles btnheight_minus.Click - If akt_ctrl Is Nothing = False Then - Dim height As Integer = akt_ctrl.Height + If CURRENT_CONTROL Is Nothing = False Then + Dim height As Integer = CURRENT_CONTROL.Height height -= 5 If height < 22 Then - Dim txt As TextBox = DirectCast(akt_ctrl, TextBox) + Dim txt As TextBox = DirectCast(CURRENT_CONTROL, TextBox) txt.Multiline = False End If - akt_ctrl.Size = New Size(akt_ctrl.Width, height) + CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width, height) HEIGHTTextBox.Text = height Save_Control() End If End Sub - Private Sub Button2_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btndtp.MouseDown - MouseIsDown = True - End Sub - Private Sub Button2_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btndtp.MouseMove If MouseIsDown Then 'Initiate dragging. @@ -1402,9 +1421,7 @@ MouseIsDown = False End Sub - Private Sub btnVektor_MouseDown(sender As Object, e As MouseEventArgs) Handles btnVektor.MouseDown - MouseIsDown = True - End Sub + Private Sub btnVektor_MouseMove(sender As Object, e As MouseEventArgs) Handles btnVektor.MouseMove If MouseIsDown Then @@ -1413,10 +1430,6 @@ End If MouseIsDown = False End Sub - Private Sub btnTabelle_MouseDown(sender As Object, e As MouseEventArgs) Handles btnTabelle.MouseDown - MouseIsDown = True - End Sub - Private Sub btnTabelle_MouseMove(sender As Object, e As MouseEventArgs) Handles btnTabelle.MouseMove If MouseIsDown Then 'Initiate dragging. @@ -1424,86 +1437,6 @@ End If MouseIsDown = False End Sub - Private Sub btnTestSQL_Click(sender As Object, e As EventArgs) Handles btnTestSQL.Click - TestSQL(cmbConnection.SelectedValue, SQL_UEBERPRUEFUNGTextBox.Text) - End Sub - Private Sub TestSQL(conid As Integer, sql_Vorschlag As String) - Try - Dim connectionString As String - Dim sqlCnn As SqlClient.SqlConnection - Dim sqlCmd As SqlClient.SqlCommand - Dim adapter As New SqlClient.SqlDataAdapter - Dim NewDataset As New DataSet - Dim i As Integer - Dim sql As String - - connectionString = GetConnectionString(conid) - If connectionString Is Nothing = False Then - sql = sql_Vorschlag - sqlCnn = New SqlClient.SqlConnection(connectionString) - ' Try - sqlCnn.Open() - sqlCmd = New SqlClient.SqlCommand(sql, sqlCnn) - adapter.SelectCommand = sqlCmd - adapter.Fill(NewDataset) - Dim msg As String - For i = 0 To NewDataset.Tables(0).Rows.Count - 1 - msg &= NewDataset.Tables(0).Rows(i).Item(0) & vbNewLine - If i = 30 Then - Exit For - End If - Next - adapter.Dispose() - sqlCmd.Dispose() - sqlCnn.Close() - MsgBox("Folgende Daten wurden erfolgreich abgerufen: " & vbNewLine & vbNewLine & msg & vbNewLine & vbNewLine & "Das Ergebnis wurd auf 30 Zeilen eingeschränkt!", MsgBoxStyle.Information) - End If - - Catch ex As Exception - ClassLogger.Add(" - Unvorhergesehener Fehler bei TestSQL - Fehler: " & vbNewLine & ex.Message) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei TestSQL:") - End Try - End Sub - Function GetConnectionString(id As Integer) - Try - Me.TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBPM_CONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBPM_CONNECTION, id) - Dim connectionString As String - Dim DTConnection As DataTable - DTConnection = Me.DD_DMSLiteDataSet.TBPM_CONNECTION - Dim drConnection As DataRow - For Each drConnection In DTConnection.Rows - Select Case drConnection.Item("SQL_PROVIDER").ToString.ToLower - Case "ms-sql" - If drConnection.Item("USERNAME") = "WINAUTH" Then - connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Initial Catalog=" & drConnection.Item("DATENBANK") & ";Trusted_Connection=True;" - Else - connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Initial Catalog= " & drConnection.Item("DATENBANK") & ";User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";" - End If - If LogErrorsOnly = False Then ClassLogger.Add("## ConnString Sql-Server: " & connectionString) - - Return connectionString - Case "Oracle" - 'Data Source=MyOracleDB;User Id=myUsername;Password=myPassword;Integrated Security=no; - connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Persist Security Info=True;User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";Unicode=True" - Return connectionString - Case Else - ClassLogger.Add(" - ConnectionType nicht integriert", False) - MsgBox("ConnectionType '" & drConnection.Item("SQL_PROVIDER") & "' nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!") - Return "" - End Select - Next - Catch ex As Exception - ClassLogger.Add(" - Unvorhergesehener Fehler bei GetConnectionString - Fehler: " & vbNewLine & ex.Message) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetConnectionString:") - Return "" - End Try - End Function - - Private Sub Button1_MouseDown(sender As Object, e As MouseEventArgs) Handles btnCheckbox.MouseDown - MouseIsDown = True - End Sub - Private Sub Button1_MouseMove(sender As Object, e As MouseEventArgs) Handles btnCheckbox.MouseMove If MouseIsDown Then 'Initiate dragging. @@ -1537,8 +1470,8 @@ End Sub Private Sub INDEX_NAMETextBox_Leave(sender As Object, e As EventArgs) Handles INDEX_NAMETextBox.Leave - If INDEX_NAMETextBox.Text <> "" And CONTROL_GUID Is Nothing = False Then - TBPM_PROFILE_CONTROLSTableAdapter.cmdUpdateIndexname("[%VKT" & INDEX_NAMETextBox.Text, Environment.UserName, CONTROL_GUID) + If INDEX_NAMETextBox.Text <> "" And CURRENT_CONTROL_ID <> 0 Then + TBPM_PROFILE_CONTROLSTableAdapter.cmdUpdateIndexname("[%VKT" & INDEX_NAMETextBox.Text, Environment.UserName, CURRENT_CONTROL_ID) End If End Sub @@ -1552,18 +1485,6 @@ Controls_laden() End Sub - Private Sub TabControlEigenschaften_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControlEigenschaften.SelectedIndexChanged - Select Case TabControlEigenschaften.SelectedIndex - 'Case 2 - ' Try - ' Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONNECTION) - ' Catch ex As Exception - ' ClassLogger.Add(ex.Message) - ' End Try - - End Select - End Sub - Private Sub btnShowConnections_Click(sender As Object, e As EventArgs) Handles btnShowConnections.Click frmConnection.ShowDialog() Try @@ -1572,4 +1493,31 @@ ClassLogger.Add(ex.Message) End Try End Sub + + Private Sub btnEditor_Click(sender As Object, e As EventArgs) Handles btnEditor.Click + Dim CONID = 0 + If cmbConnection.SelectedValue > 0 Then + CONID = cmbConnection.SelectedValue + End If + TBPM_PROFILE_CONTROLSBindingSource.EndEdit() + If DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS.GetChanges Is Nothing = False Then + Me.CHANGED_WHOTextBox.Text = Environment.UserName + TBPM_PROFILE_CONTROLSBindingSource.EndEdit() + TBPM_PROFILE_CONTROLSTableAdapter.Update(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS) + End If + If CURRENT_CONTROL_ID <> 0 Then + Dim sql = "SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBPM_CONNECTION T1 WHERE " & + "T.CONNECTION_ID = T1.GUID AND T.GUID = " & CURRENT_CONTROL_ID + CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(sql, True) + CURRENT_INDEX_ID = CURRENT_CONTROL_ID + CURRENT_DESIGN_TYPE = "INPUT_INDEX" + CURRENT_SQL_COMAMND = SQL_CommandTextBox.Text + CURRENT_SQL_CON = CONID + frmSQL_DESIGNER.ShowDialog() + + Load_Control(CURRENT_CONTROL_ID) + TabControlEigenschaften.SelectedIndex = 2 + End If + + End Sub End Class \ No newline at end of file diff --git a/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb b/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb index 2dca3ab..e880b4b 100644 --- a/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb +++ b/DD_PM_WINDREAM/frmProfileDesigner.Designer.vb @@ -57,10 +57,10 @@ Partial Class frmProfileDesigner Dim CHANGED_WHOLabel1 As System.Windows.Forms.Label Dim CHANGED_WHENLabel1 As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmProfileDesigner)) - Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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 DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -608,7 +608,7 @@ Partial Class frmProfileDesigner Label12.Name = "Label12" Label12.Size = New System.Drawing.Size(409, 32) Label12.TabIndex = 80 - Label12.Text = "Bitte wählen Sie hier den Vektor-Index den Sie für die Kennzeichnung " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "der PM-Ind" & _ + Label12.Text = "Bitte wählen Sie hier den Vektor-Index den Sie für die Kennzeichnung " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "der PM-Ind" & "izes verwenden wollen:" ' 'Label7 @@ -619,7 +619,7 @@ Partial Class frmProfileDesigner Label7.Name = "Label7" Label7.Size = New System.Drawing.Size(364, 32) Label7.TabIndex = 82 - Label7.Text = "Bitte wählen Sie hier den Vektor-Index den Sie für das Loggen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "der Wertänderungen" & _ + Label7.Text = "Bitte wählen Sie hier den Vektor-Index den Sie für das Loggen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "der Wertänderungen" & " nutzen wollen:" ' 'VEKTOR_DELIMITERLabel @@ -1041,7 +1041,7 @@ Partial Class frmProfileDesigner Me.GroupBox3.Size = New System.Drawing.Size(1007, 57) Me.GroupBox3.TabIndex = 73 Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreiche" & _ + Me.GroupBox3.Text = "Wählen Sie hier einen Ordner in windream, in welchen die Datei, nach erfolgreiche" & "r Indexierung verschoben werden soll:" ' 'MOVE2FOLDERTextBox @@ -1279,7 +1279,7 @@ Partial Class frmProfileDesigner Me.TabPage5.Location = New System.Drawing.Point(4, 25) Me.TabPage5.Name = "TabPage5" Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage5.Size = New System.Drawing.Size(1216, 441) + Me.TabPage5.Size = New System.Drawing.Size(1227, 445) Me.TabPage5.TabIndex = 0 Me.TabPage5.Text = "Allgemeine Profilangaben:" Me.TabPage5.UseVisualStyleBackColor = True @@ -1311,6 +1311,7 @@ Partial Class frmProfileDesigner Me.GridView1.OptionsView.ColumnAutoWidth = False Me.GridView1.OptionsView.EnableAppearanceEvenRow = True Me.GridView1.OptionsView.ShowAutoFilterRow = True + Me.GridView1.OptionsView.ShowDetailButtons = False Me.GridView1.OptionsView.ShowGroupPanel = False ' 'colNAME @@ -1415,7 +1416,7 @@ Partial Class frmProfileDesigner Me.TabControlFinalIndices.Location = New System.Drawing.Point(674, 166) Me.TabControlFinalIndices.Name = "TabControlFinalIndices" Me.TabControlFinalIndices.SelectedIndex = 0 - Me.TabControlFinalIndices.Size = New System.Drawing.Size(553, 279) + Me.TabControlFinalIndices.Size = New System.Drawing.Size(553, 282) Me.TabControlFinalIndices.TabIndex = 90 ' 'TabPage9 @@ -1436,7 +1437,7 @@ Partial Class frmProfileDesigner Me.TabPage9.Location = New System.Drawing.Point(4, 25) Me.TabPage9.Name = "TabPage9" Me.TabPage9.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage9.Size = New System.Drawing.Size(531, 264) + Me.TabPage9.Size = New System.Drawing.Size(545, 253) Me.TabPage9.TabIndex = 0 Me.TabPage9.Text = "Fester Wert" Me.TabPage9.UseVisualStyleBackColor = True @@ -1605,7 +1606,7 @@ Partial Class frmProfileDesigner Me.TabPage10.Location = New System.Drawing.Point(4, 25) Me.TabPage10.Name = "TabPage10" Me.TabPage10.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage10.Size = New System.Drawing.Size(545, 250) + Me.TabPage10.Size = New System.Drawing.Size(545, 253) Me.TabPage10.TabIndex = 1 Me.TabPage10.Text = "Dynamisches SQL" Me.TabPage10.UseVisualStyleBackColor = True @@ -1725,7 +1726,7 @@ Partial Class frmProfileDesigner Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(497, 17) Me.Label13.TabIndex = 79 - Me.Label13.Text = "Definieren Sie hier Aktionen welche nach erfolgreicher Indexierung durchgeführt w" & _ + Me.Label13.Text = "Definieren Sie hier Aktionen welche nach erfolgreicher Indexierung durchgeführt w" & "erden:" ' 'TBPM_PROFILE_FINAL_INDEXINGBindingNavigator @@ -1855,7 +1856,7 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView.Location = New System.Drawing.Point(15, 166) Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView.MultiSelect = False Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView.Name = "TBPM_PROFILE_FINAL_INDEXINGDataGridView" - Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView.Size = New System.Drawing.Size(653, 297) + Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView.Size = New System.Drawing.Size(653, 300) Me.TBPM_PROFILE_FINAL_INDEXINGDataGridView.TabIndex = 75 ' 'GUID @@ -1900,7 +1901,7 @@ Partial Class frmProfileDesigner Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(583, 17) Me.Label6.TabIndex = 75 - Me.Label6.Text = "Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierte" & _ + Me.Label6.Text = "Diese Indexe werden nach erfolgreicher Indexierung automatisch bei dem indexierte" & "n Dokument gesetzt." ' 'Label5 @@ -1919,7 +1920,7 @@ Partial Class frmProfileDesigner Me.TabPage2.Location = New System.Drawing.Point(4, 25) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1239, 553) + Me.TabPage2.Size = New System.Drawing.Size(1250, 557) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Profilzuordnung und Userverwaltung" Me.TabPage2.UseVisualStyleBackColor = True @@ -1938,8 +1939,8 @@ Partial Class frmProfileDesigner 'SplitContainerProfilzuordnung.Panel2 ' Me.SplitContainerProfilzuordnung.Panel2.Controls.Add(Me.SplitContainer_Profilzuordnung2) - Me.SplitContainerProfilzuordnung.Size = New System.Drawing.Size(1233, 547) - Me.SplitContainerProfilzuordnung.SplitterDistance = 339 + Me.SplitContainerProfilzuordnung.Size = New System.Drawing.Size(1244, 551) + Me.SplitContainerProfilzuordnung.SplitterDistance = 342 Me.SplitContainerProfilzuordnung.TabIndex = 0 ' 'TBPM_PROFILE_ZuordnungDataGridView @@ -1947,8 +1948,8 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_ZuordnungDataGridView.AllowUserToAddRows = False Me.TBPM_PROFILE_ZuordnungDataGridView.AllowUserToDeleteRows = False Me.TBPM_PROFILE_ZuordnungDataGridView.AllowUserToOrderColumns = True - DataGridViewCellStyle25.BackColor = System.Drawing.Color.Cyan - Me.TBPM_PROFILE_ZuordnungDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan + Me.TBPM_PROFILE_ZuordnungDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.TBPM_PROFILE_ZuordnungDataGridView.AutoGenerateColumns = False Me.TBPM_PROFILE_ZuordnungDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.TBPM_PROFILE_ZuordnungDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.DataGridViewTextBoxColumn2}) @@ -1958,7 +1959,7 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_ZuordnungDataGridView.MultiSelect = False Me.TBPM_PROFILE_ZuordnungDataGridView.Name = "TBPM_PROFILE_ZuordnungDataGridView" Me.TBPM_PROFILE_ZuordnungDataGridView.ReadOnly = True - Me.TBPM_PROFILE_ZuordnungDataGridView.Size = New System.Drawing.Size(339, 522) + Me.TBPM_PROFILE_ZuordnungDataGridView.Size = New System.Drawing.Size(342, 526) Me.TBPM_PROFILE_ZuordnungDataGridView.TabIndex = 1 ' 'DataGridViewTextBoxColumn1 @@ -1992,7 +1993,7 @@ Partial Class frmProfileDesigner Me.TBPM_PROFILE_ZuordnungBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem1 Me.TBPM_PROFILE_ZuordnungBindingNavigator.Name = "TBPM_PROFILE_ZuordnungBindingNavigator" Me.TBPM_PROFILE_ZuordnungBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem1 - Me.TBPM_PROFILE_ZuordnungBindingNavigator.Size = New System.Drawing.Size(339, 25) + Me.TBPM_PROFILE_ZuordnungBindingNavigator.Size = New System.Drawing.Size(342, 25) Me.TBPM_PROFILE_ZuordnungBindingNavigator.TabIndex = 0 Me.TBPM_PROFILE_ZuordnungBindingNavigator.Text = "BindingNavigator1" ' @@ -2081,8 +2082,8 @@ Partial Class frmProfileDesigner Me.SplitContainer_Profilzuordnung2.Panel2.AutoScroll = True Me.SplitContainer_Profilzuordnung2.Panel2.Controls.Add(Me.TabControlUser) Me.SplitContainer_Profilzuordnung2.Panel2.Controls.Add(Me.TBPM_USERBindingNavigator) - Me.SplitContainer_Profilzuordnung2.Size = New System.Drawing.Size(890, 547) - Me.SplitContainer_Profilzuordnung2.SplitterDistance = 292 + Me.SplitContainer_Profilzuordnung2.Size = New System.Drawing.Size(898, 551) + Me.SplitContainer_Profilzuordnung2.SplitterDistance = 294 Me.SplitContainer_Profilzuordnung2.TabIndex = 0 ' 'TBPROFILE_USERDataGridView @@ -2090,8 +2091,8 @@ Partial Class frmProfileDesigner Me.TBPROFILE_USERDataGridView.AllowDrop = True Me.TBPROFILE_USERDataGridView.AllowUserToAddRows = False Me.TBPROFILE_USERDataGridView.AllowUserToDeleteRows = False - DataGridViewCellStyle26.BackColor = System.Drawing.Color.Yellow - Me.TBPROFILE_USERDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Yellow + Me.TBPROFILE_USERDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.TBPROFILE_USERDataGridView.AutoGenerateColumns = False Me.TBPROFILE_USERDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.TBPROFILE_USERDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn4, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.DataGridViewTextBoxColumn7, Me.DataGridViewTextBoxColumn8, Me.DataGridViewTextBoxColumn9}) @@ -2101,7 +2102,7 @@ Partial Class frmProfileDesigner Me.TBPROFILE_USERDataGridView.MultiSelect = False Me.TBPROFILE_USERDataGridView.Name = "TBPROFILE_USERDataGridView" Me.TBPROFILE_USERDataGridView.ReadOnly = True - Me.TBPROFILE_USERDataGridView.Size = New System.Drawing.Size(890, 267) + Me.TBPROFILE_USERDataGridView.Size = New System.Drawing.Size(898, 269) Me.TBPROFILE_USERDataGridView.TabIndex = 2 ' 'DataGridViewTextBoxColumn4 @@ -2168,7 +2169,7 @@ Partial Class frmProfileDesigner Me.TBPROFILE_USERBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem2 Me.TBPROFILE_USERBindingNavigator.Name = "TBPROFILE_USERBindingNavigator" Me.TBPROFILE_USERBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem2 - Me.TBPROFILE_USERBindingNavigator.Size = New System.Drawing.Size(890, 25) + Me.TBPROFILE_USERBindingNavigator.Size = New System.Drawing.Size(898, 25) Me.TBPROFILE_USERBindingNavigator.TabIndex = 2 Me.TBPROFILE_USERBindingNavigator.Text = "BindingNavigator2" ' @@ -2268,7 +2269,7 @@ Partial Class frmProfileDesigner Me.TabControlUser.Location = New System.Drawing.Point(0, 25) Me.TabControlUser.Name = "TabControlUser" Me.TabControlUser.SelectedIndex = 0 - Me.TabControlUser.Size = New System.Drawing.Size(890, 226) + Me.TabControlUser.Size = New System.Drawing.Size(898, 228) Me.TabControlUser.TabIndex = 4 ' 'TabPage7 @@ -2277,7 +2278,7 @@ Partial Class frmProfileDesigner Me.TabPage7.Location = New System.Drawing.Point(4, 25) Me.TabPage7.Name = "TabPage7" Me.TabPage7.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage7.Size = New System.Drawing.Size(882, 197) + Me.TabPage7.Size = New System.Drawing.Size(890, 199) Me.TabPage7.TabIndex = 0 Me.TabPage7.Text = "User -Übersicht" Me.TabPage7.UseVisualStyleBackColor = True @@ -2286,8 +2287,8 @@ Partial Class frmProfileDesigner ' Me.TBPM_USERDataGridView.AllowUserToAddRows = False Me.TBPM_USERDataGridView.AllowUserToDeleteRows = False - DataGridViewCellStyle27.BackColor = System.Drawing.Color.Aqua - Me.TBPM_USERDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27 + DataGridViewCellStyle3.BackColor = System.Drawing.Color.Aqua + Me.TBPM_USERDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 Me.TBPM_USERDataGridView.AutoGenerateColumns = False Me.TBPM_USERDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.TBPM_USERDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn10, Me.DataGridViewTextBoxColumn11, Me.DataGridViewTextBoxColumn12, Me.DataGridViewTextBoxColumn13, Me.DataGridViewCheckBoxColumn2, Me.DataGridViewTextBoxColumn18, Me.DataGridViewTextBoxColumn19, Me.DataGridViewTextBoxColumn20, Me.DataGridViewTextBoxColumn21}) @@ -2297,7 +2298,7 @@ Partial Class frmProfileDesigner Me.TBPM_USERDataGridView.MultiSelect = False Me.TBPM_USERDataGridView.Name = "TBPM_USERDataGridView" Me.TBPM_USERDataGridView.ReadOnly = True - Me.TBPM_USERDataGridView.Size = New System.Drawing.Size(876, 191) + Me.TBPM_USERDataGridView.Size = New System.Drawing.Size(884, 193) Me.TBPM_USERDataGridView.TabIndex = 3 ' 'DataGridViewTextBoxColumn3 @@ -2549,7 +2550,7 @@ Partial Class frmProfileDesigner Me.TBPM_USERBindingNavigator.MovePreviousItem = Me.ToolStripButton8 Me.TBPM_USERBindingNavigator.Name = "TBPM_USERBindingNavigator" Me.TBPM_USERBindingNavigator.PositionItem = Me.ToolStripTextBox2 - Me.TBPM_USERBindingNavigator.Size = New System.Drawing.Size(890, 25) + Me.TBPM_USERBindingNavigator.Size = New System.Drawing.Size(898, 25) Me.TBPM_USERBindingNavigator.TabIndex = 3 Me.TBPM_USERBindingNavigator.Text = "BindingNavigator3" ' @@ -2688,7 +2689,7 @@ Partial Class frmProfileDesigner Me.TabPage3.Location = New System.Drawing.Point(4, 25) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(1239, 553) + Me.TabPage3.Size = New System.Drawing.Size(1250, 557) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Grundeinstellungen" Me.TabPage3.UseVisualStyleBackColor = True @@ -2937,7 +2938,7 @@ Partial Class frmProfileDesigner Me.TabPage4.Location = New System.Drawing.Point(4, 25) Me.TabPage4.Name = "TabPage4" Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(1239, 553) + Me.TabPage4.Size = New System.Drawing.Size(1250, 557) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Log" Me.TabPage4.UseVisualStyleBackColor = True @@ -2945,8 +2946,8 @@ Partial Class frmProfileDesigner 'TBPM_ERROR_LOGDataGridView ' Me.TBPM_ERROR_LOGDataGridView.AllowUserToAddRows = False - DataGridViewCellStyle28.BackColor = System.Drawing.Color.Cyan - Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan + Me.TBPM_ERROR_LOGDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 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}) @@ -2955,7 +2956,7 @@ Partial Class frmProfileDesigner Me.TBPM_ERROR_LOGDataGridView.Location = New System.Drawing.Point(3, 28) Me.TBPM_ERROR_LOGDataGridView.Name = "TBPM_ERROR_LOGDataGridView" Me.TBPM_ERROR_LOGDataGridView.ReadOnly = True - Me.TBPM_ERROR_LOGDataGridView.Size = New System.Drawing.Size(1233, 522) + Me.TBPM_ERROR_LOGDataGridView.Size = New System.Drawing.Size(1244, 526) Me.TBPM_ERROR_LOGDataGridView.TabIndex = 1 ' 'DataGridViewTextBoxColumn17 @@ -3013,7 +3014,7 @@ Partial Class frmProfileDesigner Me.TBPM_ERROR_LOGBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem3 Me.TBPM_ERROR_LOGBindingNavigator.Name = "TBPM_ERROR_LOGBindingNavigator" Me.TBPM_ERROR_LOGBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem3 - Me.TBPM_ERROR_LOGBindingNavigator.Size = New System.Drawing.Size(1233, 25) + Me.TBPM_ERROR_LOGBindingNavigator.Size = New System.Drawing.Size(1244, 25) Me.TBPM_ERROR_LOGBindingNavigator.TabIndex = 0 Me.TBPM_ERROR_LOGBindingNavigator.Text = "BindingNavigator1" ' diff --git a/DD_PM_WINDREAM/frmProfileDesigner.resx b/DD_PM_WINDREAM/frmProfileDesigner.resx index 2a8bc41..6b803e2 100644 --- a/DD_PM_WINDREAM/frmProfileDesigner.resx +++ b/DD_PM_WINDREAM/frmProfileDesigner.resx @@ -305,9 +305,6 @@ 1156, 17 - - 1156, 17 - 999, 17 @@ -347,9 +344,6 @@ 17, 134 - - 17, 134 - 257, 173 @@ -399,12 +393,6 @@ True - - 844, 58 - - - True - 400, 56 @@ -506,6 +494,9 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + 1374, 56 + 188, 56 @@ -521,9 +512,6 @@ rkJggg== - - 1374, 56 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -579,9 +567,6 @@ 207, 95 - - 207, 95 - 998, 95 diff --git a/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 9961b1a..21d81de 100644 --- a/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -3,24 +3,13 @@ Imports Oracle.ManagedDataAccess.Client Public Class frmSQL_DESIGNER Private _windreamPM As ClassPMWindream + Private Sub TBPM_PROFILE_FINAL_INDEXINGBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Me.Validate() Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource.EndEdit() Me.TableAdapterManager.UpdateAll(Me.DD_DMSLiteDataSet) End Sub - - Private Sub FillToolStripButton_Click(sender As Object, e As EventArgs) - Try - If CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then - Dim sql = "SELECT" - End If - Catch ex As System.Exception - System.Windows.Forms.MessageBox.Show(ex.Message) - End Try - - End Sub - Private Sub frmSQL_FINAL_INDICES_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try lblSaveFinalIndex.Visible = False @@ -50,7 +39,7 @@ Public Class frmSQL_DESIGNER Catch ex As Exception MsgBox("Unexpected Error while loading form: " & ex.Message, MsgBoxStyle.Critical) End Try - + End Sub Dim CurrentPosition As Integer = 0 Dim CurrentPlaceholders As New Placeholders() @@ -198,7 +187,18 @@ Public Class frmSQL_DESIGNER If CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then TBPM_PROFILE_FINAL_INDEXINGTableAdapter.cmdUpdateSQL(cmbConnection.SelectedValue, SQL_COMMANDTextBox.Text, Environment.UserName, CURRENT_INDEX_ID) lblSaveFinalIndex.Visible = True - lblSaveFinalIndex.Text = "SQL für finalen Index wurd erfolgreich gespeichert! " & Now.ToString + lblSaveFinalIndex.Text = "SQL für finalen Index wurde erfolgreich gespeichert! " & Now.ToString + ElseIf CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then + Dim command = SQL_COMMANDTextBox.Text + command = command.Replace("'", "''") + Dim upd As String = String.Format("UPDATE TBPM_PROFILE_CONTROLS SET CONNECTION_ID = {0} , SQL_UEBERPRUEFUNG = '{1}' WHERE GUID = {2}", cmbConnection.SelectedValue, command, CURRENT_CONTROL_ID) + If ClassDatabase.Execute_non_Query(upd, True) Then + lblSaveFinalIndex.Visible = True + lblSaveFinalIndex.Text = "SQL für Indexdisplay wurde erfolgreich gespeichert! " & Now.ToString + Else + lblSaveFinalIndex.Visible = False + End If + End If End Sub End Class \ No newline at end of file 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 d08cc74..dc0ec83 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.frmFormDesigner.resources b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.frmFormDesigner.resources index 4fdccb0..b4bec75 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.frmFormDesigner.resources and b/DD_PM_WINDREAM/obj/x86/Debug/DD_PM_WINDREAM.frmFormDesigner.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 7b2e1dc..3e4db14 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 59e68d3..6d7d6d9 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 41f7b77..322a71e 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/Interop.WINDREAMLib.dll b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WINDREAMLib.dll index aac85b8..2eb9932 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/Interop.WINDREAMLib.dll and b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WINDREAMLib.dll differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOBRWSLib.dll b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOBRWSLib.dll index 0e9cb86..fce105b 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOBRWSLib.dll and b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOBRWSLib.dll differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOSRCHLib.dll b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOSRCHLib.dll index dafb28a..4ef698e 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOSRCHLib.dll and b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOSRCHLib.dll differ diff --git a/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOTOOLLib.dll b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOTOOLLib.dll index c350e2c..7acef78 100644 Binary files a/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOTOOLLib.dll and b/DD_PM_WINDREAM/obj/x86/Debug/Interop.WMOTOOLLib.dll differ diff --git a/Setup/Product.wxs b/Setup/Product.wxs index ce20a2f..6852f60 100644 --- a/Setup/Product.wxs +++ b/Setup/Product.wxs @@ -1,7 +1,7 @@ - + @@ -79,61 +79,37 @@ - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + - - - - - - - - + @@ -160,13 +136,11 @@ - - 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 48a1d47..dcb74d3 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 e4f6fe4..0e18483 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 5746e9a..4256845 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.Charts.v15.2.CoreScheduler.Locales{84335DB2-F5D2-496B-9318-2BD1B1ACA391}LOCALE_DE0DevExpress.Charts.v15.2.Core.resourcesDDLibs{BA2979E3-3778-48B8-B0D8-4B77825B9293}INSTALLDIR0DLLLicenseManagerMicrosoft.Office{D600FF38-E549-4CBA-BB33-09B0BD0C8C26}INSTALLDIR0OfficeOracle{CF76DB5D-3263-450F-96C6-F02F5447A0A1}INSTALLDIR0Oracle.ManagedDataAccessProgramMenuDir{5200DF59-FED6-4C5A-8393-90B8ED526432}ProgramMenuDir4reg358870B9B7E9B3B188C6DDA8DDA0D0E8
WelcomeDlgNextNewDialogInstallDirDlg12InstallDirDlgBackNewDialogWelcomeDlg12
LOCALE_DEINSTALLDIRde-DEINSTALLDIRDDspkg2uxv|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.Charts.v15.2.CoreDevExpressLibso8sv37ar.dll|DevExpress.Charts.v15.2.Core.dll0512DevExpress.Data.v15.2DevExpressLibs5ruxi_qa.dll|DevExpress.Data.v15.2.dll0512DevExpress.DataAccess.v15.2DevExpressLibs7ahzkowx.dll|DevExpress.DataAccess.v15.2.dll0512DevExpress.DataAccess.v15.2.UI.dllDevExpressLibsk_dfwky4.dll|DevExpress.DataAccess.v15.2.UI.dll0512DevExpress.Office.v15.2.CoreDevExpressLibsqkxggz_k.dll|DevExpress.Office.v15.2.Core.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.Sparkline.v15.2.CoreDevExpressLibsfnklz3ff.dll|DevExpress.Sparkline.v15.2.Core.dll0512DevExpress.Spreadsheet.v15.2.CoreDevExpressLibsott3hrd2.dll|DevExpress.Spreadsheet.v15.2.Core.dll0512DevExpress.Utils.v15.2DevExpressLibsmovgkxdr.dll|DevExpress.Utils.v15.2.dll0512DevExpress.Utils.v15.2.UIDevExpressLibs8kkr6v6v.dll|DevExpress.Utils.v15.2.UI.dll0512DevExpress.XtraCharts.v15.2DevExpressLibs6q62iicg.dll|DevExpress.XtraCharts.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.XtraNavBar.v15.2DevExpressLibsslehg5ld.dll|DevExpress.XtraNavBar.v15.2.dll0512DevExpress.XtraPdfViewer.v15.2DevExpressLibst-_2qbns.dll|DevExpress.XtraPdfViewer.v15.2.dll0512DevExpress.XtraPrinting.v15.2DevExpressLibscsk00joa.dll|DevExpress.XtraPrinting.v15.2.dll0512DevExpress.XtraRichEdit.v15.2DevExpressLibs_xn0pe93.dll|DevExpress.XtraRichEdit.v15.2.dll0512DevExpress.XtraSpreadsheet.v15.2DevExpressLibsxvv449it.dll|DevExpress.XtraSpreadsheet.v15.2.dll0512DevExpress.XtraTreeList.v15.2DevExpressLibshbhwm4pt.dll|DevExpress.XtraTreeList.v15.2.dll0512DevExpress.Charts.v15.2.Core.resourcesScheduler.Localesbjnyabwu.dll|DevExpress.Charts.v15.2.Core.dll0512DevExpress.Data.v15.2.resourcesScheduler.Localeskiuvv3ed.dll|DevExpress.Data.v15.2.dll0512DevExpress.DataAccess.v15.2.resourcesScheduler.Locales_n-bzxub.dll|DevExpress.DataAccess.v15.2.dll0512DevExpress.DataAccess.v15.2..resourcesScheduler.Localesglgywgx6.dll|DevExpress.DataAccess.v15.2.UI.dll0512DevExpress.Office.v15.2.Core.resourcesScheduler.Localesvcqir9wf.dll|DevExpress.Office.v15.2.Core.dll0512DevExpress.Pdf.v15.2.Core.resourcesScheduler.Locales8ddrl9wa.dll|DevExpress.Pdf.v15.2.Core.dll0512DevExpress.Pdf.v15.2.Drawing.resourcesScheduler.Localesyzp-bhk4.dll|DevExpress.Pdf.v15.2.Drawing.dll0512DevExpress.Printing.v15.2.Core.resourcesScheduler.Locales0-uwezz1.dll|DevExpress.Printing.v15.2.Core.dll0512DevExpress.RichEdit.v15.2.Core.resourcesScheduler.Localesfergzpuq.dll|DevExpress.RichEdit.v15.2.Core.dll0512DevExpress.Sparkline.v15.2.Core.resourcesScheduler.Locales6bhwqlzv.dll|DevExpress.Sparkline.v15.2.Core.dll0512DevExpress.Spreadsheet.v15.2.Core.resourcesScheduler.Locales-8svhoed.dll|DevExpress.Spreadsheet.v15.2.Core.dll0512DevExpress.Utils.v15.2.resourcesScheduler.Localesa-5igsfs.dll|DevExpress.Utils.v15.2.dll0512DevExpress.Utils.v15.2.UI.resourcesScheduler.Localesrovxucjh.dll|DevExpress.Utils.v15.2.UI.dll0512DevExpress.XtraCharts.v15.2.resourcesScheduler.Locales7iexq52i.dll|DevExpress.XtraCharts.v15.2.dll0512DevExpress.XtraBars.v15.2.resourcesScheduler.Localesdbpgshgw.dll|DevExpress.XtraBars.v15.2.dll0512DevExpress.XtraEditors.v15.2.resourcesScheduler.Localeslqexexqs.dll|DevExpress.XtraEditors.v15.2.dll0512DevExpress.XtraGrid.v15.2.resourcesScheduler.Localesb7fhysr7.dll|DevExpress.XtraGrid.v15.2.dll0512DevExpress.XtraNavBar.v15.2.resourcesScheduler.Localesf4kcjpnp.dll|DevExpress.XtraNavBar.v15.2.dll0512DevExpress.XtraPdfViewer.v15.2.resourcesScheduler.Localesawvhtojd.dll|DevExpress.XtraPdfViewer.v15.2.dll0512DevExpress.XtraPrinting.v15.2.resourcesScheduler.Localescd-mupba.dll|DevExpress.XtraPrinting.v15.2.dll0512DevExpress.XtraRichEdit.v15.2.resourcesScheduler.Localesdeslp39p.dll|DevExpress.XtraRichEdit.v15.2.dll0512DevExpress.XtraSpreadsheet.v15.2.resourcesScheduler.Localesckv_gpvu.dll|DevExpress.XtraSpreadsheet.v15.2.dll0512DevExpress.XtraTreeList.v15.2.resourcesScheduler.Localesxman2ous.dll|DevExpress.XtraTreeList.v15.2.dll0512DLLLicenseManagerDDLibssvlnal_m.dll|DLLLicenseManager.dll0512OfficeMicrosoft.OfficeOffice.dll0512Microsoft.Office.Interop.OutlookMicrosoft.Officew82cm4oc.dll|Microsoft.Office.Interop.Outlook.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
Complete1MainExecutable10Complete1ReleaseNotes10Complete1WindreamLibs10Complete1DDLibs10Complete1IndependentsoftLibs10Complete1Microsoft.Office10Complete1Oracle10Complete1DevExpressLibs10Complete1ProgramMenuDir10Complete1RegistryEntries10Complete1ApplicationIco10Complete1Scheduler.Locales10*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.Charts.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll-110DevExpress.Data.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll-110DevExpress.DataAccess.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll-110DevExpress.DataAccess.v15.2.UI.dllINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll-110DevExpress.Office.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.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.Sparkline.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll-110DevExpress.Spreadsheet.v15.2.CoreINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll-110DevExpress.Utils.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll-110DevExpress.Utils.v15.2.UIINSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll-110DevExpress.XtraCharts.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.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.XtraNavBar.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.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-110DevExpress.XtraRichEdit.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll-110DevExpress.XtraSpreadsheet.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll-110DevExpress.XtraTreeList.v15.2INSTALLDIR1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll-110DevExpress.Charts.v15.2.Core.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll-110DevExpress.Data.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll-110DevExpress.DataAccess.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll-110DevExpress.DataAccess.v15.2..resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll-110DevExpress.Office.v15.2.Core.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.dll-110DevExpress.Pdf.v15.2.Core.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll-110DevExpress.Pdf.v15.2.Drawing.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll-110DevExpress.Printing.v15.2.Core.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll-110DevExpress.RichEdit.v15.2.Core.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll-110DevExpress.Sparkline.v15.2.Core.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll-110DevExpress.Spreadsheet.v15.2.Core.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll-110DevExpress.Utils.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll-110DevExpress.Utils.v15.2.UI.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll-110DevExpress.XtraCharts.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll-110DevExpress.XtraBars.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll-110DevExpress.XtraEditors.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll-110DevExpress.XtraGrid.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll-110DevExpress.XtraNavBar.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll-110DevExpress.XtraPdfViewer.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll-110DevExpress.XtraPrinting.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll-110DevExpress.XtraRichEdit.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll-110DevExpress.XtraSpreadsheet.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll-110DevExpress.XtraTreeList.v15.2.resourcesLOCALE_DE1D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll-110DLLLicenseManagerINSTALLDIR1E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll-110OfficeINSTALLDIR1C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll-100Microsoft.Office.Interop.OutlookINSTALLDIR1C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll-110Oracle.ManagedDataAccessINSTALLDIR1P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll-110
CompleteFeatureMainExecutableComponentCompleteFeatureReleaseNotesComponentCompleteFeatureWindreamLibsComponentCompleteFeatureDDLibsComponentCompleteFeatureIndependentsoftLibsComponentCompleteFeatureMicrosoft.OfficeComponentCompleteFeatureOracleComponentCompleteFeatureDevExpressLibsComponentCompleteFeatureProgramMenuDirComponentCompleteFeatureRegistryEntriesComponentCompleteFeatureApplicationIcoComponentCompleteFeatureScheduler.LocalesComponent*ProductCompleteFeature
PREVIOUSVERSIONSINSTALLED4
RemoveApplicationFolderMainExecutableAPPLICATIONFOLDER2
PropertyManufacturerPropertyProductCodePropertyProductLanguagePropertyProductNamePropertyProductVersionPropertyUpgradeCodePropertyDiskPromptWixActionInstallExecuteSequence/RemoveExistingProductsDirectoryProgramMenuDirIconDD_PM_WINDREAM.exeDirectoryDesktopFolderIconDD_PM_WINDREAM.exeMedia1CustomActionWixRemoveFoldersExMedia1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1Media1ComponentMainExecutableComponentReleaseNotesComponentWindreamLibsComponentDDLibsComponentIndependentsoftLibsComponentMicrosoft.OfficeComponentOracleComponentDevExpressLibsComponentProgramMenuDirComponentRegistryEntriesComponentApplicationIcoComponentScheduler.LocalesWixUIWixUI_InstallDirWixUIWixUI_ErrorProgressTextDialogWelcomeDlgDialogInstallDirDlgDialogInstallDirDlgDialogWelcomeDlg
ManufacturerDigital Data
ProductCode*
ProductLanguage1031
ProductNameProcess Manger Indexer
ProductVersion1.9.3.3
UpgradeCode{930076B5-9D2B-455F-920F-9718ED091D0C}
 \ No newline at end of file +
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 diff --git a/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt b/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt index 218b616..9e8ccf7 100644 --- a/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt +++ b/Setup/obj/Debug/Setup.wixproj.BindContentsFileListnull.txt @@ -1,55 +1,19 @@ S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_PM_128.ico -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.DataAccess.v15.2.UI.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Office.v15.2.Core.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.Core.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.RichEdit.v15.2.Core.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Sparkline.v15.2.Core.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Spreadsheet.v15.2.Core.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.UI.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraNavBar.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.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 -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraRichEdit.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraSpreadsheet.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll -D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.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 -C:\Windows\assembly\GAC_MSIL\Microsoft.Office.Interop.Outlook\15.0.0.0__71e9bce111e9429c\Microsoft.Office.Interop.Outlook.dll P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll -C:\Windows\assembly\GAC_MSIL\Office\15.0.0.0__71e9bce111e9429c\Office.dll P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_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 diff --git a/Setup/obj/Debug/Setup.wixproj.FileList.txt b/Setup/obj/Debug/Setup.wixproj.FileList.txt index c7f3dcf..c2fe3b0 100644 --- a/Setup/obj/Debug/Setup.wixproj.FileList.txt +++ b/Setup/obj/Debug/Setup.wixproj.FileList.txt @@ -1,6 +1,6 @@ -obj\Debug\Product.wixobj E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\ProcessManagerClient\Setup\bin\Debug\DD_PM_WINDREAM-x86-1.9.3.3.msi E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\ProcessManagerClient\Setup\bin\Debug\DD_PM_WINDREAM-x86-1.9.3.3.wixpdb +obj\Debug\Product.wixobj obj\Debug\Setup.wixproj.BindContentsFileListnull.txt obj\Debug\Setup.wixproj.BindOutputsFileListnull.txt obj\Debug\Setup.wixproj.BindBuiltOutputsFileListnull.txt