diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index c134a57..3ea99a1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -9367,7 +9367,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnSkonto = New Global.System.Data.DataColumn("Skonto", GetType(Decimal), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnSkonto) Me.columnKRED_NAME.AllowDBNull = false - Me.columnKRED_NAME.MaxLength = 9 + Me.columnKRED_NAME.MaxLength = 250 Me.columnANZ_BELEG.AllowDBNull = false End Sub diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index fa53444..e2e8cdd 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -2052,7 +2052,7 @@ ORDER BY Netto DESC - + @@ -2112,7 +2112,7 @@ ORDER BY Netto DESC - + @@ -2208,7 +2208,7 @@ ORDER BY Netto DESC - + @@ -2273,7 +2273,7 @@ ORDER BY Netto DESC - + @@ -2303,7 +2303,7 @@ ORDER BY Netto DESC - + @@ -2326,7 +2326,7 @@ ORDER BY Netto DESC - + @@ -2400,7 +2400,7 @@ ORDER BY Netto DESC - + @@ -2449,7 +2449,7 @@ ORDER BY Netto DESC - + @@ -2464,7 +2464,7 @@ ORDER BY Netto DESC - + @@ -2586,7 +2586,7 @@ ORDER BY Netto DESC - + @@ -2659,7 +2659,7 @@ ORDER BY Netto DESC - + @@ -2710,7 +2710,7 @@ ORDER BY Netto DESC - + @@ -2848,7 +2848,7 @@ ORDER BY Netto DESC - + @@ -2926,7 +2926,7 @@ ORDER BY Netto DESC - + @@ -2967,7 +2967,7 @@ ORDER BY Netto DESC - + @@ -3005,7 +3005,7 @@ ORDER BY Netto DESC - + @@ -3062,7 +3062,7 @@ ORDER BY Netto DESC - + @@ -3120,7 +3120,7 @@ ORDER BY Netto DESC - + @@ -3221,7 +3221,7 @@ ORDER BY Netto DESC - + @@ -3274,7 +3274,7 @@ ORDER BY Netto DESC - + @@ -3290,13 +3290,13 @@ ORDER BY Netto DESC - + - + @@ -3387,11 +3387,11 @@ ORDER BY Netto DESC - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index a27318d..c686965 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -25,8 +25,8 @@ - + diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index d8df6ef..e30baee 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -62,18 +62,21 @@ Partial Class frmFormDesigner Me.pnldesigner = New DD_ProcessManager.ClassSnapPanel() Me.Label1 = New System.Windows.Forms.Label() Me.lblhintergrund = New System.Windows.Forms.Label() + Me.Panel1 = New System.Windows.Forms.Panel() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.bbtnItemFinishSQL = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() - Me.Panel1 = New System.Windows.Forms.Panel() + Me.RPGControlFunction = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.GroupBox1.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() Me.pageProperties.SuspendLayout() @@ -90,8 +93,8 @@ Partial Class frmFormDesigner Me.SplitContainerDesigner.Panel2.SuspendLayout() Me.SplitContainerDesigner.SuspendLayout() Me.pnldesigner.SuspendLayout() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 @@ -110,7 +113,7 @@ Partial Class frmFormDesigner Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.GroupBox1.Size = New System.Drawing.Size(373, 112) + Me.GroupBox1.Size = New System.Drawing.Size(373, 133) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -120,10 +123,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(219, 17) + Me.btnButton.Location = New System.Drawing.Point(228, 28) Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(100, 24) + Me.btnButton.Size = New System.Drawing.Size(100, 25) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -134,10 +137,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(219, 76) + Me.btnLine.Location = New System.Drawing.Point(228, 87) Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(100, 24) + Me.btnLine.Size = New System.Drawing.Size(100, 25) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -148,10 +151,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(113, 20) + Me.btnTabelle.Location = New System.Drawing.Point(122, 29) Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(100, 24) + Me.btnTabelle.Size = New System.Drawing.Size(100, 25) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -162,10 +165,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(113, 76) + Me.btnCheckbox.Location = New System.Drawing.Point(122, 87) Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(100, 24) + Me.btnCheckbox.Size = New System.Drawing.Size(100, 25) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -176,10 +179,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(7, 76) + Me.btnVektor.Location = New System.Drawing.Point(16, 87) Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(100, 24) + Me.btnVektor.Size = New System.Drawing.Size(100, 25) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -190,10 +193,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(113, 48) + Me.btndtp.Location = New System.Drawing.Point(122, 58) Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(100, 24) + Me.btndtp.Size = New System.Drawing.Size(100, 25) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -204,10 +207,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(7, 48) + Me.btntextbox.Location = New System.Drawing.Point(16, 58) Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(100, 24) + Me.btntextbox.Size = New System.Drawing.Size(100, 25) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -218,10 +221,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(7, 20) + Me.btnlabel.Location = New System.Drawing.Point(16, 28) Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(100, 24) + Me.btnlabel.Size = New System.Drawing.Size(100, 25) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -237,7 +240,7 @@ Partial Class frmFormDesigner 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(373, 308) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(373, 287) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties @@ -247,7 +250,7 @@ Partial Class frmFormDesigner 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, 2, 3, 2) - Me.pageProperties.Size = New System.Drawing.Size(365, 279) + Me.pageProperties.Size = New System.Drawing.Size(365, 258) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -259,7 +262,7 @@ Partial Class frmFormDesigner 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(359, 275) + Me.pgControls.Size = New System.Drawing.Size(359, 254) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -275,7 +278,7 @@ Partial Class frmFormDesigner 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, 2, 3, 2) - Me.pageFormat.Size = New System.Drawing.Size(365, 279) + Me.pageFormat.Size = New System.Drawing.Size(365, 258) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -285,10 +288,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(116, 64) + Me.btnheight_minus.Location = New System.Drawing.Point(118, 74) 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(100, 24) + Me.btnheight_minus.Size = New System.Drawing.Size(100, 25) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -299,10 +302,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(10, 64) + Me.btnheight_plus.Location = New System.Drawing.Point(12, 74) 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(100, 24) + Me.btnheight_plus.Size = New System.Drawing.Size(100, 25) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -311,7 +314,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(10, 46) + Me.Label3.Location = New System.Drawing.Point(13, 56) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -320,7 +323,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(6, 2) + Me.Label2.Location = New System.Drawing.Point(9, 11) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -331,10 +334,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(116, 20) + Me.btnwidth_minus.Location = New System.Drawing.Point(118, 29) 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(100, 24) + Me.btnwidth_minus.Size = New System.Drawing.Size(100, 25) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -345,10 +348,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(10, 20) + Me.btnwidth_plus.Location = New System.Drawing.Point(12, 29) 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(100, 24) + Me.btnwidth_plus.Size = New System.Drawing.Size(100, 25) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -496,12 +499,22 @@ Partial Class frmFormDesigner Me.lblhintergrund.TabIndex = 1 Me.lblhintergrund.Text = "Validierungsbereich" ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.TabControlEigenschaften) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 133) + Me.Panel1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(373, 287) + Me.Panel1.TabIndex = 23 + ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 6 + Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Size = New System.Drawing.Size(1199, 146) @@ -539,12 +552,44 @@ Partial Class frmFormDesigner Me.BarButtonItem3.ItemAppearance.Normal.Options.UseFont = True Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Caption = "Locked" + Me.BarStaticItem1.Id = 5 + Me.BarStaticItem1.ItemAppearance.Normal.Font = New System.Drawing.Font("Tahoma", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.BarStaticItem1.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.BarStaticItem1.ItemAppearance.Normal.Options.UseFont = True + Me.BarStaticItem1.ItemAppearance.Normal.Options.UseForeColor = True + Me.BarStaticItem1.Name = "BarStaticItem1" + Me.BarStaticItem1.TextAlignment = System.Drawing.StringAlignment.Center + ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "BarButtonItem4" + Me.BarButtonItem4.Id = 6 + Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' + 'BarButtonItem5 + ' + Me.BarButtonItem5.Caption = "BarButtonItem5" + Me.BarButtonItem5.Id = 7 + Me.BarButtonItem5.Name = "BarButtonItem5" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Hintergrundfunktionen" ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.Enabled = False + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "Control-Funktionen" + ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnItemFinishSQL) @@ -564,32 +609,10 @@ Partial Class frmFormDesigner Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'RibbonPageGroup2 + 'RPGControlFunction ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Control-Funktionen" - ' - 'BarStaticItem1 - ' - Me.BarStaticItem1.Caption = "Locked" - Me.BarStaticItem1.Id = 5 - Me.BarStaticItem1.ItemAppearance.Normal.Font = New System.Drawing.Font("Tahoma", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.BarStaticItem1.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.BarStaticItem1.ItemAppearance.Normal.Options.UseFont = True - Me.BarStaticItem1.ItemAppearance.Normal.Options.UseForeColor = True - Me.BarStaticItem1.Name = "BarStaticItem1" - Me.BarStaticItem1.TextAlignment = System.Drawing.StringAlignment.Center - ' - 'Panel1 - ' - Me.Panel1.Controls.Add(Me.TabControlEigenschaften) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel1.Location = New System.Drawing.Point(0, 112) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(373, 308) - Me.Panel1.TabIndex = 23 + Me.RPGControlFunction.Name = "RPGControlFunction" + Me.RPGControlFunction.Text = "Control-Funktionen" ' 'frmFormDesigner ' @@ -628,8 +651,8 @@ Partial Class frmFormDesigner Me.SplitContainerDesigner.ResumeLayout(False) Me.pnldesigner.ResumeLayout(False) Me.pnldesigner.PerformLayout() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -683,5 +706,8 @@ Partial Class frmFormDesigner Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents Panel1 As Panel Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RPGControlFunction As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 260a379..9f5238d 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 @@ -269,6 +266,27 @@ MS40LTEtMS40LTEuOWMwLTEuMSwwLjktMiwyLTJzMiwwLjksMiwyYzAsMC45LTAuNiwxLjYtMS40LDEu OUwxOCwyNHogTTEyLDEwICAgVjhjMC0yLjIsMS44LTQsNC00czQsMS44LDQsNHYySDEyeiIgY2xhc3M9 IlllbGxvdyIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N + CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu + NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w + LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt + MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks + Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 + LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index e645203..b9f151b 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -295,6 +295,9 @@ Public Class frmFormDesigner End Sub Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, btnTabelle.MouseDown, btnCheckbox.MouseDown, btnLine.MouseDown, btnButton.MouseDown + If Designer_Locked Then + Exit Sub + End If Mouse_IsPressed = True CurrentControl = Nothing @@ -671,7 +674,7 @@ Public Class frmFormDesigner CurrentControl = sender Mouse_BeginLocation = e.Location sender.BringToFront() - + RibbonPageGroup3.Enabled = True Mouse_IsPressed = True Console.WriteLine("CURRENT_CONTROL:" & CurrentControl.Name) diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 816e660..dc02873 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -172,6 +172,8 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem17 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem18 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() Me.PrintPreviewBarCheckItem19 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem() + Me.OutOfRangePMFixierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() @@ -452,7 +454,7 @@ Partial Class frmMain ' 'ContextMenuNotifyIcon ' - Me.ContextMenuNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PopupErinnerungInaktivierenToolStripMenuItem, Me.AnzeigenToolStripMenuItem}) + Me.ContextMenuNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PopupErinnerungInaktivierenToolStripMenuItem, Me.ToolStripSeparator1, Me.AnzeigenToolStripMenuItem, Me.OutOfRangePMFixierenToolStripMenuItem}) Me.ContextMenuNotifyIcon.Name = "ContextMenuNotifyIcon" resources.ApplyResources(Me.ContextMenuNotifyIcon, "ContextMenuNotifyIcon") ' @@ -1317,6 +1319,16 @@ Partial Class frmMain Me.PrintPreviewBarCheckItem19.Id = 58 Me.PrintPreviewBarCheckItem19.Name = "PrintPreviewBarCheckItem19" ' + 'OutOfRangePMFixierenToolStripMenuItem + ' + Me.OutOfRangePMFixierenToolStripMenuItem.Name = "OutOfRangePMFixierenToolStripMenuItem" + resources.ApplyResources(Me.OutOfRangePMFixierenToolStripMenuItem, "OutOfRangePMFixierenToolStripMenuItem") + ' + 'ToolStripSeparator1 + ' + Me.ToolStripSeparator1.Name = "ToolStripSeparator1" + resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") + ' 'frmMain ' Me.Appearance.Options.UseFont = True @@ -1510,4 +1522,6 @@ Partial Class frmMain Friend WithEvents Panel1 As Panel Friend WithEvents bbtnitDashboardInv As DevExpress.XtraBars.BarButtonItem Friend WithEvents bsiGeneralInfo As DevExpress.XtraBars.BarStaticItem + Friend WithEvents OutOfRangePMFixierenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator1 As ToolStripSeparator End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 7a17c3f..60ed061 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAUQBBgFEAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAUwBBgFMAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -178,10 +178,114 @@ 597, 17 + + 17, 134 + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + + + BindingNavigator1 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + NavBarControl1 + + + DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 2 + + + + Fill + + + + Tahoma, 9pt + + + 0, 146 + + + 1347, 360 + + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 392, 95 - + + 270, 198 + + + ContextMenuGrid + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + 233, 27 + + + 1114, 333 + + + 8 + + + False + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + 269, 26 @@ -210,7 +314,6 @@ Metadaten Datei anzeigen - False @@ -263,43 +366,6 @@ Layout speichern - - 270, 198 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Fill - - - 233, 27 - - - 1114, 333 - - - 8 - - - False - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - 17, 134 @@ -506,12 +572,6 @@ 541, 95 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -665,32 +725,11 @@ 2 - - Fill + + 219, 26 - - Tahoma, 9pt - - - 0, 146 - - - 1347, 360 - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 + + Starte Validierung für Profil 908, 17 @@ -704,14 +743,23 @@ Popup Erinnerung inaktivieren + + 231, 6 + 234, 22 - Monitor anzeigen + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren - 235, 48 + 235, 98 ContextMenuNotifyIcon @@ -1261,18 +1309,6 @@ 0, 0 - - Allgemein - - - Funktionen - - - Verwaltung - - - Grundeinstellungen - Funktionen @@ -1309,6 +1345,18 @@ 5 + + Allgemein + + + Funktionen + + + Verwaltung + + + Grundeinstellungen + RibbonPage2 @@ -2414,6 +2462,18 @@ DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + OutOfRangePMFixierenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain @@ -2626,6 +2686,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -2638,9 +2701,6 @@ Bars - - &Hintergrund - PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index d7d2c78..2931fba 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -244,32 +244,78 @@ Public Class frmMain If My.Settings.frmMainPosition.IsEmpty = False Then If My.Settings.frmMainPosition.X > 0 And My.Settings.frmMainPosition.Y > 0 Then - ' Gespeicherte Werte verwenden - Me.Location = Screen.AllScreens(UBound(Screen.AllScreens)).Bounds.Location + My.Settings.frmMainPosition + If Not My.Settings.frmMainSize.IsEmpty Then + If My.Settings.frmMainWindowState = "Normal" Then + Dim oisonscreen = IsOnScreen(My.Settings.frmMainPosition, My.Settings.frmMainSize) + If oisonscreen = False Then + Me.StartPosition = FormStartPosition.CenterScreen + Exit Sub + Else + ' Gespeicherte Werte verwenden + Me.Location = Screen.AllScreens(UBound(Screen.AllScreens)).Bounds.Location + My.Settings.frmMainPosition + End If + Else + Me.WindowState = FormWindowState.Maximized + End If + End If + Else + LOGGER.Info("FormPosition is out of range!..Standard will be loaded!") + If My.Settings.frmMainWindowState = "Normal" Then + Me.StartPosition = FormStartPosition.CenterScreen + Else + Me.WindowState = FormWindowState.Maximized + End If End If - Me.Location = Screen.AllScreens(UBound(Screen.AllScreens)).Bounds.Location + My.Settings.frmMainPosition End If 'Sind Werte hinterlegt? - If Not My.Settings.frmMainSize.IsEmpty Then - If My.Settings.frmMainWindowState = "Normal" Then - ' Gespeicherte Werte verwenden - Try - Me.Size = My.Settings.frmMainSize - Catch ex As Exception + 'If Not My.Settings.frmMainSize.IsEmpty Then + ' If My.Settings.frmMainWindowState = "Normal" Then + ' Dim oisonscreen = IsOnScreen(My.Settings.frmMainPosition, My.Settings.frmMainSize) - End Try - Else - Me.WindowState = FormWindowState.Maximized - End If + ' If oisonscreen = False Then + ' Me.StartPosition = FormStartPosition.CenterScreen + ' Exit Sub + ' End If + ' ' Gespeicherte Werte verwenden + ' Try + ' Me.Size = My.Settings.frmMainSize + ' Catch ex As Exception + + ' End Try + ' Else + ' Me.WindowState = FormWindowState.Maximized + ' End If - End If + 'End If Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Error in Load FormLayout: " & ex.Message) End Try End Sub + Function IsOnScreen(ByVal RecLocation As System.Drawing.Point, ByVal RecSize As System.Drawing.Size, Optional MinPercentOnScreen As Double = 0.2) + Try + Dim PixelsVisible As Double = 0 + Dim Rec As System.Drawing.Rectangle = New System.Drawing.Rectangle(RecLocation, RecSize) + For Each Scrn As Screen In Screen.AllScreens + Dim r As System.Drawing.Rectangle = System.Drawing.Rectangle.Intersect(Rec, Scrn.WorkingArea) + 'intersect rectangle with screen + If (r.Width <> 0 And r.Height <> 0) Then + PixelsVisible += (r.Width * r.Height) + 'tally visible pixels + End If + + Next + Return PixelsVisible >= (Rec.Width * Rec.Height) * MinPercentOnScreen + Catch ex As Exception + Return False + End Try + + End Function + + + Function Refresh_ConnectionString() Try TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING @@ -669,10 +715,10 @@ Public Class frmMain Private Sub NotifyIcon1_MouseDoubleClick(sender As System.Object, e As MouseEventArgs) Handles NotifyIcon1.MouseDoubleClick - ShowMonitor() + BringMonitor2Front() End Sub - Sub ShowMonitor() - BringToFront() + Sub BringMonitor2Front() + Me.BringToFront() Visible = True End Sub Private Sub Timer_Tick(sender As System.Object, e As EventArgs) Handles TimerRefresh.Tick @@ -735,7 +781,7 @@ Public Class frmMain End Sub Private Sub NotifyIcon1_Click(sender As System.Object, e As EventArgs) Handles NotifyIcon1.Click - ShowMonitor() + BringMonitor2Front() End Sub Private Sub Decide_Load() Try @@ -1704,7 +1750,7 @@ Public Class frmMain End If End Sub Private Sub AnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnzeigenToolStripMenuItem.Click - ShowMonitor() + BringMonitor2Front() End Sub Private Sub frmMain_Resize(sender As Object, e As EventArgs) Handles Me.Resize @@ -1832,4 +1878,11 @@ Public Class frmMain frmInvDashboard.Show() End Sub + + Private Sub OutOfRangePMFixierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OutOfRangePMFixierenToolStripMenuItem.Click + + Dim myPoint As Point = New Point(50, 50) + Me.Location = Screen.AllScreens(UBound(Screen.AllScreens)).Bounds.Location + myPoint + BringMonitor2Front() + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index c3f5818..4549f26 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -188,11 +188,13 @@ Partial Class frmValidator 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing + Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 5d749d5..98c2326 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -125,154 +125,6 @@ 0, 146 - - TITLELabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - btnSave - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - DESCRIPTIONLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - pnldesigner - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - - - Fill - - - 0, 0 - - - 3, 4, 3, 4 - - - 477, 476 - - - - 24 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel1 - - - 0 - - - SplitContainer1.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1 - - - 0 - - - Fill - - - 0, 0 - - - 3, 4, 3, 4 - - - 481, 476 - - - 0 - - - DocumentViewerValidator - - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - SplitContainer1.Panel2 - - - 0 - - - SplitContainer1.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1 - - - 1 - - - 962, 476 - - - 477 - - - 37 - - - SplitContainer1 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - Top, Left, Right @@ -286,8 +138,9 @@ No - 455, 29 + 549, 29 + 1 @@ -325,7 +178,7 @@ 3, 4, 3, 4 - 467, 50 + 561, 50 11 @@ -352,7 +205,7 @@ 5, 33 - 469, 48 + 563, 48 1 @@ -385,7 +238,7 @@ 3, 4, 3, 4 - 466, 326 + 560, 326 18 @@ -402,6 +255,105 @@ 3 + + Fill + + + 0, 0 + + + 3, 4, 3, 4 + + + 571, 476 + + + 24 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1.Panel1 + + + 0 + + + SplitContainer1.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1 + + + 0 + + + Fill + + + 0, 0 + + + 3, 4, 3, 4 + + + 577, 476 + + + 0 + + + DocumentViewerValidator + + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + SplitContainer1.Panel2 + + + 0 + + + SplitContainer1.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainer1 + + + 1 + + + 1152, 476 + + + 571 + + + 37 + + + SplitContainer1 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 17, 17 @@ -433,7 +385,7 @@ 0, 0 - 962, 0 + 1152, 0 barDockControlTop @@ -454,7 +406,7 @@ 0, 643 - 962, 0 + 1152, 0 barDockControlBottom @@ -493,7 +445,7 @@ Right - 962, 0 + 1152, 0 0, 643 @@ -520,7 +472,7 @@ 7, 17 - 962, 643 + 1152, 643 Tahoma, 8.25pt, style=Bold @@ -893,17 +845,39 @@ 0, 0 + + Datei + + + Aktionen + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF + l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw + DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ + k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 + XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR + Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng + kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg + gg== + + + + Information + Menü - 962, 146 + 1152, 146 0, 622 - 962, 21 + 1152, 21 RibbonStatusBar1 @@ -1725,39 +1699,6 @@ Zoom - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu - My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE - ZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4zLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi - bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s - VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw - BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh - bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl - bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF - eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA - Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs - dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz - cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z - CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN - QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs - b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT - eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp - b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg - Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k - ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E - cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO - AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL - - 10% @@ -1800,6 +1741,39 @@ sichtbare einpassen + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu + My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE + ZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4zLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi + bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s + VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw + BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh + bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl + bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF + eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA + Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs + dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz + cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z + CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA + AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN + QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs + b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT + eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp + b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg + Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ + dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k + ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E + cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO + AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL + + BarButtonItem1 @@ -1821,28 +1795,6 @@ 1054, 56 - - Datei - - - Aktionen - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF - l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw - DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ - k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 - XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR - Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng - kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg - gg== - - - - Information - RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 645c059..22af81c 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2705,6 +2705,7 @@ Public Class frmValidator Next Else If omytype = "System.String" Then + MsgBox($"IDB Fill Grid [{oControl.Name}] with String") oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter) Select Case oColValuesfromSource.Length Case 2 @@ -2716,9 +2717,11 @@ Public Class frmValidator End Select ElseIf omytype = "System.Data.DataTable" Then Dim oMyDatatable As DataTable = oValueFromSource + MsgBox($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count) For Each oRow As DataRow In oMyDatatable.Rows LOGGER.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...") oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter) + MsgBox($"IDB ROW Vector {oRow.Item(0).ToString}...") Select Case oColValuesfromSource.Length Case 1