AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj 15.03 clean up

Browse Source
This commit is contained in:
JenneJ
2016-03-15 15:50:08 +01:00
parent 15b08db258
commit 052635e53a
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD-Record-Organiser/ClassControlBuilder.vb
View File

@@ -1280,7 +1280,7 @@ Public Class ClassControlBuilder
control.Name = name control.Name = name
control.Parent = _master_panel control.Parent = _master_panel
control.Text = Caption control.Text = Caption
control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle)) 'control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
control.ForeColor = IntToColor(fontcolor) control.ForeColor = IntToColor(fontcolor)
control.BackColor = IntToColor(backcolor) control.BackColor = IntToColor(backcolor)

2
app/DD-Record-Organiser/ClassControlCommands.vb
View File

@@ -321,7 +321,7 @@
HEIGHT = properties.Size.Height HEIGHT = properties.Size.Height
WIDTH = properties.Size.Width WIDTH = properties.Size.Width
If propExists(properties, "Font") Then If propExists(properties, "Font") AndAlso Not IsNothing(properties.Font) Then
Dim f As Font = properties.Font Dim f As Font = properties.Font
FONT_FAMILY = f.FontFamily.Name FONT_FAMILY = f.FontFamily.Name
FONT_SIZE = CType(f.Size, Integer) FONT_SIZE = CType(f.Size, Integer)

5
app/DD-Record-Organiser/ClassControlValues.vb
View File

@@ -449,6 +449,11 @@ Public Class ClassControlValues
Dim lb As DevExpress.XtraEditors.ListBoxControl = DirectCast(control, DevExpress.XtraEditors.ListBoxControl) Dim lb As DevExpress.XtraEditors.ListBoxControl = DirectCast(control, DevExpress.XtraEditors.ListBoxControl)
lb.SelectedIndex = -1 lb.SelectedIndex = -1
Case GetType(DataGridView)
Dim dgv As DataGridView = DirectCast(control, DataGridView)
dgv.Rows.Clear()
End Select End Select
End Sub End Sub
#End Region #End Region

12
app/DD-Record-Organiser/frmConstructor_Main.resx
View File

@@ -289,7 +289,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing"> <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>788, 270</value> <value>795, 270</value>
</data> </data>
<data name="GridControlMain.TabIndex" type="System.Int32, mscorlib"> <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@@ -361,7 +361,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing"> <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1069, 312</value> <value>1072, 316</value>
</data> </data>
<data name="pnlDetails.TabIndex" type="System.Int32, mscorlib"> <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@@ -379,7 +379,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing"> <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1069, 312</value> <value>1072, 316</value>
</data> </data>
<data name="TabDetails.Text" xml:space="preserve"> <data name="TabDetails.Text" xml:space="preserve">
<value>Detailansicht</value> <value>Detailansicht</value>
@@ -397,7 +397,7 @@
<value>0</value> <value>0</value>
</data> </data>
<data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing"> <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
<value>1071, 340</value> <value>1078, 347</value>
</data> </data>
<data name="TCDetails.TabIndex" type="System.Int32, mscorlib"> <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
<value>1</value> <value>1</value>
@@ -1367,7 +1367,7 @@
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="ToolStripEdit.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripEdit.Size" type="System.Drawing.Size, System.Drawing">
<value>1071, 25</value> <value>1078, 25</value>
</data> </data>
<data name="ToolStripEdit.TabIndex" type="System.Int32, mscorlib"> <data name="ToolStripEdit.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>
@@ -1472,7 +1472,7 @@
<value>Panel2</value> <value>Panel2</value>
</data> </data>
<data name="SplitContainerBottom.Size" type="System.Drawing.Size, System.Drawing"> <data name="SplitContainerBottom.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 365</value> <value>1083, 372</value>
</data> </data>
<data name="SplitContainerBottom.TabIndex" type="System.Int32, mscorlib"> <data name="SplitContainerBottom.TabIndex" type="System.Int32, mscorlib">
<value>0</value> <value>0</value>

1
app/DD-Record-Organiser/frmForm_Input.vb
View File

@@ -459,6 +459,7 @@ Public Class frmFormInput
Private Sub tsButtonAdd_Click(sender As Object, e As EventArgs) Handles tsButtonAdd.Click Private Sub tsButtonAdd_Click(sender As Object, e As EventArgs) Handles tsButtonAdd.Click
'CtrlCommandUI.LoadControls(thisformid) 'CtrlCommandUI.LoadControls(thisformid)
ClassControlValues.ClearControlValues(pnlView.Controls)
ClassControlValues.UnloadControlValuesList(SelectedRecordID, thisformid, pnlView.Controls) ClassControlValues.UnloadControlValuesList(SelectedRecordID, thisformid, pnlView.Controls)
ClassControlValues.LoadControlValuesList(thisformid, pnlView.Controls) ClassControlValues.LoadControlValuesList(thisformid, pnlView.Controls)
ClassControlValues.LoadDefaultValues(thisformid, SelectedRecordID, pnlView.Controls) ClassControlValues.LoadDefaultValues(thisformid, SelectedRecordID, pnlView.Controls)

4
app/DD-Record-Organiser/frmTool_ControlProperties.vb
View File

@@ -123,6 +123,10 @@
props.TabIndex = r.Item("CTRLSCR_TAB_INDEX") props.TabIndex = r.Item("CTRLSCR_TAB_INDEX")
Case "RadioButton" Case "RadioButton"
props.ColumnTitle = r.Item("CONTROL_COL_NAME")
props.Caption = r.Item("CTRLSCR_CAPTION")
props.IsRequired = r.Item("CONTROL_REQUIRED")
props.IsReadOnly = r.Item("CONTROL_READ_ONLY")
props.FontColor = IntToColor(r.Item("CTRLSCR_FONT_COLOR")) props.FontColor = IntToColor(r.Item("CTRLSCR_FONT_COLOR"))
props.Font = New Font(r.Item("CTRLSCR_FONT_FAMILY").ToString(), props.Font = New Font(r.Item("CTRLSCR_FONT_FAMILY").ToString(),
CType(r.Item("CTRLSCR_FONT_SIZE"), Single), CType(r.Item("CTRLSCR_FONT_SIZE"), Single),