From c20867509fbf5eb33f18cf0bcc3af5ac1055fad2 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 17 Mar 2020 15:16:30 +0100 Subject: [PATCH] MS --- app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 2 + .../frmFormDesigner.Designer.vb | 230 ++++++++++++------ app/DD_PM_WINDREAM/frmFormDesigner.resx | 30 ++- app/DD_PM_WINDREAM/frmFormDesigner.vb | 8 +- 4 files changed, 185 insertions(+), 85 deletions(-) diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index a994254..7d5b07e 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -52,6 +52,8 @@ Module ModuleRuntimeVariables Public USER_RIGHT3 As Boolean = False Public USER_RIGHT4 As Boolean = False Public USER_DEBUG_LOG As Boolean = False + Public CHANGES_IN_ADMINISTRATION As Boolean = False + Public FORCE_LAYOUT_OVERVIEW As Boolean = False diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index 8442184..c42559f 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -1,6 +1,6 @@  Partial Class frmFormDesigner - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -49,11 +49,9 @@ Partial Class frmFormDesigner Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.btndelete = New System.Windows.Forms.Button() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) - Me.btnrefresh = New System.Windows.Forms.Button() Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() @@ -64,6 +62,15 @@ Partial Class frmFormDesigner Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() @@ -80,12 +87,11 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 ' - Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox1.Controls.Add(Me.btnButton) Me.GroupBox1.Controls.Add(Me.btnLine) Me.GroupBox1.Controls.Add(Me.btnTabelle) @@ -94,10 +100,13 @@ Partial Class frmFormDesigner Me.GroupBox1.Controls.Add(Me.btndtp) Me.GroupBox1.Controls.Add(Me.btntextbox) Me.GroupBox1.Controls.Add(Me.btnlabel) + Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Top Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox1.Location = New System.Drawing.Point(7, 9) + Me.GroupBox1.Location = New System.Drawing.Point(0, 0) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(363, 129) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.GroupBox1.Size = New System.Drawing.Size(381, 137) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -107,9 +116,10 @@ Partial Class frmFormDesigner Me.btnButton.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnButton.Image = CType(resources.GetObject("btnButton.Image"), System.Drawing.Image) Me.btnButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnButton.Location = New System.Drawing.Point(290, 22) + Me.btnButton.Location = New System.Drawing.Point(249, 18) + Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(112, 27) + Me.btnButton.Size = New System.Drawing.Size(96, 32) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -120,9 +130,10 @@ Partial Class frmFormDesigner Me.btnLine.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnLine.Image = CType(resources.GetObject("btnLine.Image"), System.Drawing.Image) Me.btnLine.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnLine.Location = New System.Drawing.Point(290, 90) + Me.btnLine.Location = New System.Drawing.Point(249, 93) + Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(112, 27) + Me.btnLine.Size = New System.Drawing.Size(96, 34) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -133,9 +144,10 @@ Partial Class frmFormDesigner Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnTabelle.Image = Global.DD_ProcessManager.My.Resources.Resources.table_add Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTabelle.Location = New System.Drawing.Point(151, 22) + Me.btnTabelle.Location = New System.Drawing.Point(129, 18) + Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(133, 27) + Me.btnTabelle.Size = New System.Drawing.Size(114, 32) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -146,9 +158,10 @@ Partial Class frmFormDesigner Me.btnCheckbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnCheckbox.Image = Global.DD_ProcessManager.My.Resources.Resources.checkbox_16xLG Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCheckbox.Location = New System.Drawing.Point(151, 90) + Me.btnCheckbox.Location = New System.Drawing.Point(129, 93) + Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(133, 27) + Me.btnCheckbox.Size = New System.Drawing.Size(114, 34) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -159,9 +172,10 @@ Partial Class frmFormDesigner Me.btnVektor.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnVektor.Image = Global.DD_ProcessManager.My.Resources.Resources.ComboBox_16xLG Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVektor.Location = New System.Drawing.Point(13, 88) + Me.btnVektor.Location = New System.Drawing.Point(10, 93) + Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(133, 27) + Me.btnVektor.Size = New System.Drawing.Size(114, 34) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -172,9 +186,10 @@ Partial Class frmFormDesigner Me.btndtp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btndtp.Image = Global.DD_ProcessManager.My.Resources.Resources.DateOrTimePicker_675 Me.btndtp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndtp.Location = New System.Drawing.Point(151, 55) + Me.btndtp.Location = New System.Drawing.Point(130, 54) + Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(133, 27) + Me.btndtp.Size = New System.Drawing.Size(114, 35) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -185,9 +200,10 @@ Partial Class frmFormDesigner Me.btntextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btntextbox.Image = Global.DD_ProcessManager.My.Resources.Resources.TextBox_708 Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btntextbox.Location = New System.Drawing.Point(13, 55) + Me.btntextbox.Location = New System.Drawing.Point(10, 54) + Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(133, 27) + Me.btntextbox.Size = New System.Drawing.Size(114, 35) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -198,9 +214,10 @@ Partial Class frmFormDesigner Me.btnlabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnlabel.Image = Global.DD_ProcessManager.My.Resources.Resources.Label_684 Me.btnlabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnlabel.Location = New System.Drawing.Point(12, 22) + Me.btnlabel.Location = New System.Drawing.Point(10, 18) + Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(133, 27) + Me.btnlabel.Size = New System.Drawing.Size(113, 32) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -217,16 +234,17 @@ Partial Class frmFormDesigner Me.pnldesigner.Dock = System.Windows.Forms.DockStyle.Fill Me.pnldesigner.GridSize = 10 Me.pnldesigner.Location = New System.Drawing.Point(0, 0) + Me.pnldesigner.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pnldesigner.Name = "pnldesigner" Me.pnldesigner.ShowGrid = True - Me.pnldesigner.Size = New System.Drawing.Size(842, 650) + Me.pnldesigner.Size = New System.Drawing.Size(842, 483) Me.pnldesigner.TabIndex = 3 ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(91, 150) + Me.Label1.Location = New System.Drawing.Point(80, 120) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(347, 16) Me.Label1.TabIndex = 6 @@ -237,7 +255,7 @@ Partial Class frmFormDesigner Me.lblhintergrund.AutoSize = True Me.lblhintergrund.Font = New System.Drawing.Font("Tahoma", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblhintergrund.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.lblhintergrund.Location = New System.Drawing.Point(89, 111) + Me.lblhintergrund.Location = New System.Drawing.Point(80, 90) Me.lblhintergrund.Name = "lblhintergrund" Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) Me.lblhintergrund.TabIndex = 1 @@ -251,19 +269,21 @@ Partial Class frmFormDesigner Me.TabControlEigenschaften.Controls.Add(Me.pageProperties) Me.TabControlEigenschaften.Controls.Add(Me.pageFormat) Me.TabControlEigenschaften.Enabled = False - Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 144) + Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 141) + Me.TabControlEigenschaften.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.TabControlEigenschaften.Name = "TabControlEigenschaften" Me.TabControlEigenschaften.SelectedIndex = 0 - Me.TabControlEigenschaften.Size = New System.Drawing.Size(371, 465) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(372, 340) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties ' Me.pageProperties.Controls.Add(Me.pgControls) Me.pageProperties.Location = New System.Drawing.Point(4, 25) + Me.pageProperties.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageProperties.Name = "pageProperties" - Me.pageProperties.Padding = New System.Windows.Forms.Padding(3) - Me.pageProperties.Size = New System.Drawing.Size(363, 436) + Me.pageProperties.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.pageProperties.Size = New System.Drawing.Size(364, 311) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -272,9 +292,10 @@ Partial Class frmFormDesigner ' Me.pgControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pgControls.HelpVisible = False - Me.pgControls.Location = New System.Drawing.Point(3, 3) + Me.pgControls.Location = New System.Drawing.Point(3, 2) + Me.pgControls.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pgControls.Name = "pgControls" - Me.pgControls.Size = New System.Drawing.Size(357, 430) + Me.pgControls.Size = New System.Drawing.Size(358, 307) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -286,10 +307,11 @@ Partial Class frmFormDesigner Me.pageFormat.Controls.Add(Me.btnwidth_minus) Me.pageFormat.Controls.Add(Me.btnwidth_plus) Me.pageFormat.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.pageFormat.Location = New System.Drawing.Point(4, 22) + Me.pageFormat.Location = New System.Drawing.Point(4, 25) + Me.pageFormat.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageFormat.Name = "pageFormat" - Me.pageFormat.Padding = New System.Windows.Forms.Padding(3) - Me.pageFormat.Size = New System.Drawing.Size(363, 439) + Me.pageFormat.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.pageFormat.Size = New System.Drawing.Size(364, 311) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -299,9 +321,10 @@ Partial Class frmFormDesigner Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_minus.Location = New System.Drawing.Point(94, 69) + Me.btnheight_minus.Location = New System.Drawing.Point(93, 67) + Me.btnheight_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_minus.Name = "btnheight_minus" - Me.btnheight_minus.Size = New System.Drawing.Size(75, 25) + Me.btnheight_minus.Size = New System.Drawing.Size(76, 33) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -312,9 +335,10 @@ Partial Class frmFormDesigner Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_plus.Location = New System.Drawing.Point(13, 69) + Me.btnheight_plus.Location = New System.Drawing.Point(12, 67) + Me.btnheight_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_plus.Name = "btnheight_plus" - Me.btnheight_plus.Size = New System.Drawing.Size(75, 25) + Me.btnheight_plus.Size = New System.Drawing.Size(75, 33) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -323,7 +347,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(10, 50) + Me.Label3.Location = New System.Drawing.Point(9, 49) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -332,7 +356,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(10, 3) + Me.Label2.Location = New System.Drawing.Point(9, 2) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -343,9 +367,10 @@ Partial Class frmFormDesigner Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_minus.Location = New System.Drawing.Point(94, 22) + Me.btnwidth_minus.Location = New System.Drawing.Point(93, 18) + Me.btnwidth_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_minus.Name = "btnwidth_minus" - Me.btnwidth_minus.Size = New System.Drawing.Size(75, 25) + Me.btnwidth_minus.Size = New System.Drawing.Size(76, 29) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -356,9 +381,10 @@ Partial Class frmFormDesigner Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_plus.Location = New System.Drawing.Point(13, 22) + Me.btnwidth_plus.Location = New System.Drawing.Point(11, 18) + Me.btnwidth_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_plus.Name = "btnwidth_plus" - Me.btnwidth_plus.Size = New System.Drawing.Size(75, 25) + Me.btnwidth_plus.Size = New System.Drawing.Size(76, 29) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -379,23 +405,10 @@ Partial Class frmFormDesigner Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' - 'btndelete - ' - Me.btndelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btndelete.Image = Global.DD_ProcessManager.My.Resources.Resources.delete_12x12 - Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndelete.Location = New System.Drawing.Point(7, 624) - Me.btndelete.Name = "btndelete" - Me.btndelete.Size = New System.Drawing.Size(124, 23) - Me.btndelete.TabIndex = 1 - Me.btndelete.Text = "Control löschen" - Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btndelete.UseVisualStyleBackColor = True - ' 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 650) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 629) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.Size = New System.Drawing.Size(1227, 22) Me.StatusStrip1.TabIndex = 20 @@ -408,19 +421,6 @@ Partial Class frmFormDesigner Me.tslblAenderungen.Size = New System.Drawing.Size(152, 17) Me.tslblAenderungen.Text = "Noch keine Änderungen" ' - 'btnrefresh - ' - Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnrefresh.Image = Global.DD_ProcessManager.My.Resources.Resources.arrow_refresh - Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnrefresh.Location = New System.Drawing.Point(260, 624) - Me.btnrefresh.Name = "btnrefresh" - Me.btnrefresh.Size = New System.Drawing.Size(110, 23) - Me.btnrefresh.TabIndex = 24 - Me.btnrefresh.Text = "Refresh" - Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnrefresh.UseVisualStyleBackColor = True - ' 'TBPM_PROFILE_CONTROLSTableAdapter ' Me.TBPM_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True @@ -479,7 +479,7 @@ Partial Class frmFormDesigner 'SplitContainer1 ' Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer1.Location = New System.Drawing.Point(0, 0) + Me.SplitContainer1.Location = New System.Drawing.Point(0, 146) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -490,24 +490,88 @@ Partial Class frmFormDesigner ' Me.SplitContainer1.Panel2.Controls.Add(Me.GroupBox1) Me.SplitContainer1.Panel2.Controls.Add(Me.TabControlEigenschaften) - Me.SplitContainer1.Panel2.Controls.Add(Me.btnrefresh) - Me.SplitContainer1.Panel2.Controls.Add(Me.btndelete) - Me.SplitContainer1.Size = New System.Drawing.Size(1227, 650) + Me.SplitContainer1.Size = New System.Drawing.Size(1227, 483) Me.SplitContainer1.SplitterDistance = 842 Me.SplitContainer1.TabIndex = 25 ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(1227, 146) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 651) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1227, 21) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Button Abschluss CheckSQL" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "BarButtonItem2" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "BarButtonItem3" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'frmFormDesigner ' + Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1227, 672) Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.StatusStrip1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.IconOptions.Icon = CType(resources.GetObject("frmFormDesigner.IconOptions.Icon"), System.Drawing.Icon) Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.MinimizeBox = False Me.Name = "frmFormDesigner" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Validation-Designer" Me.GroupBox1.ResumeLayout(False) Me.pnldesigner.ResumeLayout(False) @@ -528,6 +592,7 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -542,7 +607,6 @@ Partial Class frmFormDesigner Friend WithEvents pnldesigner As DD_ProcessManager.ClassSnapPanel Friend WithEvents btndtp As System.Windows.Forms.Button Friend WithEvents lblhintergrund As System.Windows.Forms.Label - Friend WithEvents btndelete As System.Windows.Forms.Button Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel @@ -564,7 +628,6 @@ Partial Class frmFormDesigner Friend WithEvents btnTabelle As System.Windows.Forms.Button Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter - Friend WithEvents btnrefresh As System.Windows.Forms.Button Friend WithEvents pageProperties As TabPage Friend WithEvents pgControls As PropertyGrid Friend WithEvents btnLine As Button @@ -572,4 +635,13 @@ Partial Class frmFormDesigner Friend WithEvents MenuItemAddColumn As ToolStripMenuItem Friend WithEvents SplitContainer1 As SplitContainer Friend WithEvents btnButton As Button + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 3c86179..672d396 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx @@ -140,9 +140,6 @@ 206, 17 - - 206, 17 - 17, 56 @@ -176,10 +173,35 @@ 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAN4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iRmluaXNoTWVyZ2UiPg0KICAgIDxwYXRoIGQ9Ik0xMy4yLDE4Yy0wLjMsMC42LTAu + NiwxLjMtMC44LDJINnYtMkgxMy4yeiBNMTIuMSwyNEg0VjJoMTZ2MTAuNGMwLjYtMC4yLDEuMy0wLjMs + Mi0wLjRWMWMwLTAuNS0wLjUtMS0xLTEgICBIM0MyLjUsMCwyLDAuNSwyLDF2MjRjMCwwLjUsMC41LDEs + MSwxaDkuNEMxMi4yLDI1LjQsMTIuMSwyNC43LDEyLjEsMjR6IE02LDE2aDguNWMwLjYtMC44LDEuNC0x + LjQsMi4yLTJINlYxNnogTTYsOGgxMlY2SDZWOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cmVjdCB4 + PSI2IiB5PSIxMCIgd2lkdGg9IjEyIiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IlllbGxv + dyIgLz4NCiAgICA8cGF0aCBkPSJNMjMsMTRjLTUsMC05LDQtOSw5YzAsNSw0LDksOSw5czktNCw5LTlD + MzIsMTgsMjgsMTQsMjMsMTR6IE0yMiwyOGwtNS01bDItMmwzLDNsNS01bDIsMkwyMiwyOHoiIGNsYXNz + PSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 213 - + AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAALzAAAAEA CACoDgAADgsAACAgAAABAAgAqAgAALYZAAAQEAAAAQAIAGgFAABeIgAALzAAAAEAIADoJAAAxicAACAg diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 3728b39..b3352d7 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -581,7 +581,7 @@ Public Class frmFormDesigner Return pnldesigner.PointToClient(Cursor.Position) End Function - Private Sub btndelete_Click(sender As System.Object, e As EventArgs) Handles btndelete.Click + Private Sub btndelete_Click(sender As System.Object, e As EventArgs) If CurrentControl Is Nothing = False Then DeleteControl(CurrentControl.Name) TabControlEigenschaften.Enabled = False @@ -640,7 +640,7 @@ Public Class frmFormDesigner End If End Sub - Private Sub btnrefresh_Click(sender As Object, e As EventArgs) Handles btnrefresh.Click + Private Sub btnrefresh_Click(sender As Object, e As EventArgs) LoadControls() End Sub @@ -1130,4 +1130,8 @@ Public Class frmFormDesigner LOGGER.Error(ex) End Try End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + + End Sub End Class \ No newline at end of file