jj: add line in designer and constructor

2018-04-04 14:14:07 +02:00 · 2018-04-04 14:14:07 +02:00 · 6755ce60ea
commit 6755ce60ea
parent fd2dc4bf99
7 changed files with 164 additions and 46 deletions
--- a/app/DD-Record-Organizer/ClassControlBuilder.vb
+++ b/app/DD-Record-Organizer/ClassControlBuilder.vb
@ -1513,6 +1513,8 @@ Public Class ClassControlBuilder
            .Name = name
        }
        line.Name = name
+        line.AutoSize = False
+        line.BackColor = IntToColor(color)

        If _new Then
            line.Location = GetCursorPosition()
@ -1525,6 +1527,8 @@ Public Class ClassControlBuilder
        CurrentControl = line

        line.Parent = _master_panel
+
+        SetEventHandlers(line)
        AddToPanel(line)
    End Sub

--- a/app/DD-Record-Organizer/ClassControlCommands.vb
+++ b/app/DD-Record-Organizer/ClassControlCommands.vb
@ -10,6 +10,8 @@
        Dim CurrentType As String = control.GetType.ToString.ToUpper

        Select Case True
+            Case CurrentType.Contains("LineLabel".ToUpper)
+                Return 15
            Case CurrentType.Contains("Label".ToUpper)
                Return 1
            Case CurrentType.Contains("TextBox".ToUpper)
@ -42,8 +44,7 @@
                Return 12
            Case CurrentType.Contains("ListBoxControl".ToUpper)
                Return 13
-            Case CurrentType.Contains("LineLabel")
-                Return 14
+                ' Id 14 ist DataGridView Checkable - nicht verwendet
            Case Else
                Return -1
        End Select
@ -103,12 +104,7 @@
            ' SQL Befehl für CONTROL TABELLE
            ' SQL_COMMAND_1 auf leeren String setzen

-            SQL = $"""
-                INSERT INTO TBPMO_CONTROL
-                    (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1)
-                VALUES
-                    ({CURRENT_ENTITY_ID}, {CONTROL_TYPE_ID}, '', '{NAME}', '{NAME}', {PARENT_CONTROL_ID}, '')
-            """
+            SQL = $"INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES ({CURRENT_ENTITY_ID}, {CONTROL_TYPE_ID}, '', '{NAME}', '{NAME}', {PARENT_CONTROL_ID}, '')"

            'If LogErrorsOnly = False Then ClassLogger.Add(SQL, True)
            If ClassDatabase.Execute_non_Query(SQL) = True Then
--- a/app/DD-Record-Organizer/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organizer/ClassControlCommandsUI.vb
@ -306,6 +306,19 @@ Public Class ClassControlCommandsUI
                                            dr.Item("CONTROL_COL_NAME"),
                                            parent)
                    control = "DataGridViewCheckable - " & dr.Item("CONTROL_ID")
+                Case 15 ' Line
+                    _CtrlBuilder.AddLine(dr.Item("CONTROL_ID"),
+                                         dr.Item("CONTROL_NAME"),
+                                         dr.Item("CTRLSCR_X_LOC"),
+                                         dr.Item("CTRLSCR_Y_LOC"),
+                                         dr.Item("CTRLSCR_FONT_COLOR"),
+                                         dr.Item("CTRLSCR_WIDTH"),
+                                         dr.Item("CTRLSCR_HEIGHT"),
+                                         False,
+                                         parent)
+
+                    control = "Line - " & dr.Item("CONTROL_ID")
+
            End Select


--- a/app/DD-Record-Organizer/ClassControlProperties.vb
+++ b/app/DD-Record-Organizer/ClassControlProperties.vb
@ -328,6 +328,34 @@ Module ClassControlProperties
        End Property
    End Class

+    Public Class LineProperties
+        Inherits CommonProperties
+
+        <Browsable(False)>
+        <LocalizedCategoryAttribute("category_view")>
+        <LocalizedDescriptionAttribute("desc_col_title")>
+        Public Overloads Property ColumnTitle() As String
+            Get
+                Return ""
+            End Get
+            Set(value As String)
+                '_column_title = value
+            End Set
+        End Property
+
+        <Browsable(False)>
+        <LocalizedCategoryAttribute("category_other")>
+        <LocalizedDescriptionAttribute("desc_tree_view")>
+        Public Overloads Property TreeView() As Boolean
+            Get
+                Return False
+            End Get
+            Set(value As Boolean)
+                '_tree_view = value
+            End Set
+        End Property
+    End Class
+
    Public Class TextBoxProperties
        Inherits InputControlProperties

@ -631,7 +659,7 @@ Module ClassControlProperties

    ' +++++ FUNCTION CLASSES +++++

-    Public Class FunctionAddAppointment
+    Public Class FunctionAddAppointmentProperties
        Inherits BaseProperties

        Private _caption As String
@ -722,7 +750,7 @@ Module ClassControlProperties
        End Property
    End Class

-    Public Class FunctionAddFormData
+    Public Class FunctionAddFormDataProperties
        Inherits BaseProperties

        Private _caption As String
--- a/app/DD-Record-Organizer/frmLevel_Designer.Designer.vb
+++ b/app/DD-Record-Organizer/frmLevel_Designer.Designer.vb
@ -25,6 +25,7 @@ Partial Class frmLevel_Designer
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLevel_Designer))
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
+        Me.pnlDesigner = New DD_Record_Organizer.ClassSnapPanel()
        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
        Me.lblFormName = New System.Windows.Forms.ToolStripLabel()
        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
@ -57,7 +58,7 @@ Partial Class frmLevel_Designer
        Me.btnlabel = New System.Windows.Forms.Button()
        Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog()
        Me.ttTooltip = New System.Windows.Forms.ToolTip(Me.components)
-        Me.pnlDesigner = New ClassSnapPanel()
+        Me.btnLine = New System.Windows.Forms.Button()
        CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer1.Panel1.SuspendLayout()
        Me.SplitContainer1.Panel2.SuspendLayout()
@ -88,6 +89,16 @@ Partial Class frmLevel_Designer
        '
        Me.SplitContainer1.Panel2.Controls.Add(Me.TabControl1)
        '
+        'pnlDesigner
+        '
+        Me.pnlDesigner.AllowDrop = True
+        Me.pnlDesigner.BackColor = System.Drawing.SystemColors.ControlLight
+        Me.pnlDesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        resources.ApplyResources(Me.pnlDesigner, "pnlDesigner")
+        Me.pnlDesigner.GridSize = 8
+        Me.pnlDesigner.Name = "pnlDesigner"
+        Me.pnlDesigner.ShowGrid = True
+        '
        'ToolStrip1
        '
        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
@ -209,6 +220,7 @@ Partial Class frmLevel_Designer
        'GroupBox1
        '
        Me.GroupBox1.Controls.Add(Me.btnTableCheckable)
+        Me.GroupBox1.Controls.Add(Me.btnLine)
        Me.GroupBox1.Controls.Add(Me.btnListBox)
        Me.GroupBox1.Controls.Add(Me.btnListBoxCheckable)
        Me.GroupBox1.Controls.Add(Me.btnRadioButton)
@ -334,15 +346,12 @@ Partial Class frmLevel_Designer
        resources.ApplyResources(Me.OFDWindreamsuche, "OFDWindreamsuche")
        Me.OFDWindreamsuche.RestoreDirectory = True
        '
-        'pnlDesigner
+        'btnLine
        '
-        Me.pnlDesigner.AllowDrop = True
-        Me.pnlDesigner.BackColor = System.Drawing.SystemColors.ControlLight
-        Me.pnlDesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        resources.ApplyResources(Me.pnlDesigner, "pnlDesigner")
-        Me.pnlDesigner.GridSize = 8
-        Me.pnlDesigner.Name = "pnlDesigner"
-        Me.pnlDesigner.ShowGrid = True
+        resources.ApplyResources(Me.btnLine, "btnLine")
+        Me.btnLine.Name = "btnLine"
+        Me.btnLine.Tag = "line"
+        Me.btnLine.UseVisualStyleBackColor = True
        '
        'frmLevel_Designer
        '
@ -406,4 +415,5 @@ Partial Class frmLevel_Designer
    Friend WithEvents pgControlProperties As System.Windows.Forms.PropertyGrid
    Friend WithEvents pnlDesigner As ClassSnapPanel
    Friend WithEvents btnTableCheckable As System.Windows.Forms.Button
+    Friend WithEvents btnLine As Button
 End Class
--- a/app/DD-Record-Organizer/frmLevel_Designer.resx
+++ b/app/DD-Record-Organizer/frmLevel_Designer.resx
@ -142,7 +142,7 @@
    <value>pnlDesigner</value>
  </data>
  <data name="&gt;&gt;pnlDesigner.Type" xml:space="preserve">
-    <value>SnapPanelControl.SnapPanel, SnapPanelControl, Version=1.0.5989.19477, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organizer.ClassSnapPanel, DD-Record-Organizer, Version=2.4.9.7, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;pnlDesigner.Parent" xml:space="preserve">
    <value>SplitContainer1.Panel1</value>
@ -196,7 +196,7 @@
    <value>17, 17</value>
  </metadata>
  <data name="tsstatus.Size" type="System.Drawing.Size, System.Drawing">
-    <value>137, 17</value>
+    <value>136, 17</value>
  </data>
  <data name="tsstatus.Text" xml:space="preserve">
    <value>ToolStripStatusLabel1</value>
@ -448,7 +448,7 @@
    <value>Segoe UI, 9.75pt, style=Bold</value>
  </data>
  <data name="GroupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 249</value>
+    <value>6, 296</value>
  </data>
  <data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
    <value>274, 71</value>
@ -507,6 +507,50 @@
  <data name="&gt;&gt;btnTableCheckable.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
+  <data name="btnLine.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 8.25pt, style=Bold</value>
+  </data>
+  <data name="btnLine.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA0SURBVEhLYxgF
+        o2AUEAe8gDiICpgbiFHACyD+TwWsCMQoIA2IC6iA+YF4FIyCUTAAgIEBAJUPH6VVzyeQAAAAAElFTkSu
+        QmCC
+</value>
+  </data>
+  <data name="btnLine.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="btnLine.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnLine.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 237</value>
+  </data>
+  <data name="btnLine.Size" type="System.Drawing.Size, System.Drawing">
+    <value>122, 31</value>
+  </data>
+  <data name="btnLine.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="btnLine.Text" xml:space="preserve">
+    <value>Linie</value>
+  </data>
+  <data name="btnLine.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
+  <data name="&gt;&gt;btnLine.Name" xml:space="preserve">
+    <value>btnLine</value>
+  </data>
+  <data name="&gt;&gt;btnLine.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnLine.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnLine.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
  <data name="btnListBox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
  </data>
@ -541,7 +585,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnListBox.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
  </data>
  <data name="btnListBoxCheckable.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -577,7 +621,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnListBoxCheckable.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
  </data>
  <data name="btnRadioButton.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -613,7 +657,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnRadioButton.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
  </data>
  <data name="btngb.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -649,7 +693,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btngb.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
  </data>
  <data name="btnpb.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -685,7 +729,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnpb.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
  </data>
  <data name="btnTabelle.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -721,7 +765,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnTabelle.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
  </data>
  <data name="btnCheckbox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -757,7 +801,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnCheckbox.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
  </data>
  <data name="btndtp.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -793,7 +837,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btndtp.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
  </data>
  <data name="btncmb.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -829,7 +873,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btncmb.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
  </data>
  <data name="btntextbox.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -865,7 +909,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btntextbox.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
  </data>
  <data name="btnlabel.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold</value>
@ -901,7 +945,7 @@
    <value>GroupBox1</value>
  </data>
  <data name="&gt;&gt;btnlabel.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
  </data>
  <data name="GroupBox1.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9.75pt, style=Bold</value>
@ -910,7 +954,7 @@
    <value>6, 6</value>
  </data>
  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>274, 237</value>
+    <value>274, 284</value>
  </data>
  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@ -1041,9 +1085,6 @@
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
  </data>
-  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
  <data name="$this.Text" xml:space="preserve">
    <value>frmLevel_Designer</value>
  </data>
--- a/app/DD-Record-Organizer/frmLevel_Designer.vb
+++ b/app/DD-Record-Organizer/frmLevel_Designer.vb
@ -27,7 +27,7 @@

    Public Sub ControlDragDrop(type As String, Parent As GroupBox)
        Try
-            Dim r As New System.Random()
+            Dim r As New Random()
            Dim def_font_family As String = DefaultFont.Name
            Dim def_font_color As Integer = DefaultForeColor.ToArgb
            Dim def_font_style As Integer = 0
@ -50,6 +50,10 @@
                    DesignerCtrlBuilder.AddLabel(0, "lbl" & random, defaultCaption, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, "", True, Parent)
                    ' Aktuelles Control in die Datenbank speichern
                    ClassControlCommands.InsertControl(DesignerCtrlBuilder.CurrentControl)
+                Case "line"
+                    DesignerCtrlBuilder.AddLine(0, "line" & random, 0, 0, 0, 0, 0, True, Nothing, True)
+                    ' Aktuelles Control in die Datenbank speichern
+                    ClassControlCommands.InsertControl(DesignerCtrlBuilder.CurrentControl)
                Case "txt"
                    DesignerCtrlBuilder.AddTextBox(0, "txt" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, False, False, False, "String", False, True, Parent)
                    ' Aktuelles Control in die Datenbank speichern
@ -478,6 +482,19 @@
                                            dr.Item("CONTROL_COL_NAME"),
                                            parent,
                                            True)
+                Case 15 ' Line
+                    DesignerCtrlBuilder.AddLine(
+                        dr.Item("CONTROL_ID"),
+                        dr.Item("CONTROL_NAME"),
+                        dr.Item("CTRLSCR_X_LOC"),
+                        dr.Item("CTRLSCR_Y_LOC"),
+                        dr.Item("CTRLSCR_FONT_COLOR"),
+                        dr.Item("CTRLSCR_WIDTH"),
+                        dr.Item("CTRLSCR_HEIGHT"),
+                        False,
+                        parent,
+                        True
+                    )
            End Select
        Next
    End Sub
@ -497,11 +514,8 @@
        CURRENT_CONTROL_ID = ClassControlCommands.GetControlGuid(DesignerCtrlBuilder.CurrentControl.Name)

        ' Control Eigenschaften laden
-        'frmTool_ControlProperties.Instance.pgControlProperties.Enabled = True
        pgControlProperties.Enabled = True

-        'frmTool_ControlProperties.Instance.LoadControlProperties(CtrlBuilder.CurrentControl)
-        'frmTool_ControlProperties.Instance.LoadControlPropertiesNeu(CtrlBuilder.CurrentControl)
        LoadControlPropertiesNeu(DesignerCtrlBuilder.CurrentControl)
    End Sub

@ -530,7 +544,7 @@
                                                                                btnRadioButton.MouseDown,
                                                                                btnListBoxCheckable.MouseDown,
                                                                                btnListBox.MouseDown,
-                                                                                btnTableCheckable.MouseDown
+                                                                                btnTableCheckable.MouseDown, btnLine.MouseDown
        Mouse_Down = True
    End Sub

@ -546,7 +560,7 @@
                                                                            btnRadioButton.MouseMove,
                                                                            btnListBoxCheckable.MouseMove,
                                                                            btnListBox.MouseMove,
-                                                                            btnTableCheckable.MouseMove
+                                                                            btnTableCheckable.MouseMove, btnLine.MouseMove

        If Mouse_Down Then
            Dim ctrl As Button = DirectCast(sender, Button)
@ -705,8 +719,9 @@
                Case "ListBox" : props = New ComboBoxProperties()
                Case "CheckedListBox" : props = New ComboBoxProperties()
                Case "DatagridviewCheckable" : props = New ComboBoxProperties()
-                Case "F_AddAppointment" : props = New FunctionAddAppointment()
-                Case "F_AddFormData" : props = New FunctionAddFormData()
+                Case "F_AddAppointment" : props = New FunctionAddAppointmentProperties()
+                Case "F_AddFormData" : props = New FunctionAddFormDataProperties()
+                Case "Line" : props = New LineProperties()
            End Select

            'Generische Properties laden
@ -738,6 +753,13 @@
                    props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))

+
+                Case "Line"
+                    props.ControlType = "Line"
+                    props.FontColor = IntToColor(r.Item("CTRLSCR_FONT_COLOR"))
+                    props.SQLCommand = New SQLValue(NotNull(r.Item("CONTROL_SQLCOMMAND_1"), ""))
+                    props.TreeView = CBool(r.Item("CONTROL_TREE_VIEW"))
+
                Case "Textbox"
                    props.ControlType = "TextBox"
                    props.FontColor = IntToColor(r.Item("CTRLSCR_FONT_COLOR"))
@ -1056,7 +1078,11 @@
            Case "Font"
                ctrl.Font = newValue
            Case "FontColor"
+                If TypeOf ctrl Is ClassControlBuilder.LineLabel Then
+                    ctrl.BackColor = newValue
+                Else
                    ctrl.ForeColor = newValue
+                End If
            Case "BackColor"
                ctrl.BackColor = newValue
        End Select