luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[DEVELOPMENT ENVIRONMENT]

Browse source 
* NEW: Add support for ReportMargin


git-svn-id: svn://localhost/gambas/trunk@6833 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Fabien Bodard 2015-01-12 22:43:37 +00:00
parent 66bc237053
commit e1aa9e8ce1
6 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/gambas3/.src/Editor/Form/CControl.class
View file

@ -8,7 +8,7 @@ Static Public WasDefaultValue As Boolean
Static Public LastError As String Static Public LastError As String
Static Public COMPLEX_STRING_PROPERTIES As String[] = ["Font[", "Picture[", "Image.Load(", "SvgImage.Load(", "Connections[", "ReportPadding[", "ReportBorder[", "ReportBrush["] Static Public COMPLEX_STRING_PROPERTIES As String[] = ["Font[", "Picture[", "Image.Load(", "SvgImage.Load(", "Connections[", "ReportPadding[", "ReportMargin[", "ReportBorder[", "ReportBrush["]
Public Name As String Public Name As String
Public Parent As CControl Public Parent As CControl
@ -717,7 +717,7 @@ Private Function ConvertToString(vVal As Variant, hProp As CPropertyInfo) As Str
Return CStr(vVal) Return CStr(vVal)
Case "List", "Path", "Picture", "Font", "Table", "Menu", "Image", "SvgImage", "ReportCoord", "ReportPadding", "ReportBorder", "ReportBrush", "Field" Case "List", "Path", "Picture", "Font", "Table", "Menu", "Image", "SvgImage", "ReportCoord", "ReportPadding", "ReportMargin", "ReportBorder", "ReportBrush", "Field"
Return CStr(vVal) Return CStr(vVal)
@ -1636,6 +1636,9 @@ Public Function GetEachProperty(DX As Integer, DY As Integer, Optional bNoScale
Case "ReportPadding" Case "ReportPadding"
sLine &= "ReportPadding[" & Quote$(vVal) & "]" sLine &= "ReportPadding[" & Quote$(vVal) & "]"
Case "ReportMargin"
sLine &= "ReportMargin[" & Quote$(vVal) & "]"
Case "ReportBorder" Case "ReportBorder"
sLine &= "ReportBorder[" & Quote$(vVal) & "]" sLine &= "ReportBorder[" & Quote$(vVal) & "]"

15
app/src/gambas3/.src/Editor/Form/FProperty.class
View file

@ -26,7 +26,7 @@ Private $hWebView As WebView
Private $iHighlightColor As Integer Private $iHighlightColor As Integer
Static Private $aFieldUseDelete As String[] = ["Font", "Picture", "String[]", "Path", "Color", "Field", "Fields", "Field[]", Static Private $aFieldUseDelete As String[] = ["Font", "Picture", "String[]", "Path", "Color", "Field", "Fields", "Field[]",
"Image", "SvgImage", "ReportCoord", "ReportPadding", "ReportBorder", "ReportBrush", "Table"] "Image", "SvgImage", "ReportCoord", "ReportPadding", "ReportMargin", "ReportBorder", "ReportBrush", "Table"]
Private Const PADDING As Integer = 6 Private Const PADDING As Integer = 6
@ -408,7 +408,7 @@ Public Function SaveProperty() As Boolean
vVal = sVal vVal = sVal
Endif Endif
Case "s", "Font", "Picture", "Constant", "List", "Path", "Image", "SvgImage", "ReportCoord", "ReportPadding", "ReportBorder", "ReportBrush", "Field", "Menu", "Table" Case "s", "Font", "Picture", "Constant", "List", "Path", "Image", "SvgImage", "ReportCoord", "ReportPadding", "ReportMargin", "ReportBorder", "ReportBrush", "Field", "Menu", "Table"
vVal = sVal vVal = sVal
@ -687,7 +687,7 @@ Private Sub ShowProperty(Optional sFocus As String)
Case "s" Case "s"
bButton = True bButton = True
Case "String[]", "Fields", "Field[]", "ReportPadding", "ReportBorder", "ReportBrush" Case "String[]", "Fields", "Field[]", "ReportPadding", "ReportMargin", "ReportBorder", "ReportBrush"
bButton = True bButton = True
txtProperty.ReadOnly = True txtProperty.ReadOnly = True
@ -720,7 +720,7 @@ Private Sub ShowProperty(Optional sFocus As String)
hEditor = cmbProperty hEditor = cmbProperty
InitComboWith(["False", "True"]) InitComboWith(["False", "True"])
Case "Font", "Picture", "Path", "Color", "Image", "SvgImage", "ReportPadding", "ReportBorder", "ReportBrush" Case "Font", "Picture", "Path", "Color", "Image", "SvgImage", "ReportPadding", "ReportMargin", "ReportBorder", "ReportBrush"
bButton = True bButton = True
txtProperty.ReadOnly = True txtProperty.ReadOnly = True
@ -1023,7 +1023,12 @@ Public Sub btnProperty_Click()
If FReportPaddingChooser.Run($sOldVal) Then Goto _EXIT If FReportPaddingChooser.Run($sOldVal) Then Goto _EXIT
$hEditor.Text = FReportPaddingChooser.Value $hEditor.Text = FReportPaddingChooser.Value
Case "ReportMargin"
If FReportPaddingChooser.Run($sOldVal) Then Goto _EXIT
$hEditor.Text = FReportPaddingChooser.Value
Case "ReportBorder" Case "ReportBorder"
If FReportBorderChooser.Run($sOldVal) Then Goto _EXIT If FReportBorderChooser.Run($sOldVal) Then Goto _EXIT

2
app/src/gambas3/.src/Family/CFamilyReport.class
View file

@ -293,7 +293,7 @@ Public Sub DrawControl(hCtrl As CControl) As Boolean
Paint.Text(hCtrl["Text"], X, Y, W, H, Classes["Align"][hCtrl["Alignment"]].Value) Paint.Text(hCtrl["Text"], X, Y, W, H, Classes["Align"][hCtrl["Alignment"]].Value)
Else Else
Paint.Translate(X + W / 2, Y + H / 2) Paint.Translate(X + W / 2, Y + H / 2)
Paint.Rotate(Rad(hCtrl["Rotate"])) Try Paint.Rotate(Rad(hCtrl["Rotate"]))
Paint.Translate(- (X + W / 2), - (Y + H / 2)) Paint.Translate(- (X + W / 2), - (Y + H / 2))
Paint.Text(hCtrl["Text"], X, Y, W, H, Classes["Align"][hCtrl["Alignment"]].Value) Paint.Text(hCtrl["Text"], X, Y, W, H, Classes["Align"][hCtrl["Alignment"]].Value)
'Paint.Text(hCtrl["Text"], X, Y, W, H, Align.Center) 'Paint.Text(hCtrl["Text"], X, Y, W, H, Align.Center)

3
app/src/gambas3/.src/Help/FHelpBrowser.form
View file

@ -97,8 +97,9 @@
Sorted = True Sorted = True
Border = False Border = False
} }
{ webHelp HelpView { !webHelp HelpView
MoveScaled(22,2,28,16) MoveScaled(22,2,28,16)
#Public = True
} }
} }
{ movWaiting MovieBox { movWaiting MovieBox

6
app/src/gambas3/.src/Project/Patch/FPatch.class
View file

@ -121,7 +121,7 @@ Private Sub RefreshHunks()
If iInd Then sToFile = gvwHunks[iInd - 1, 1].Text If iInd Then sToFile = gvwHunks[iInd - 1, 1].Text
Endif Endif
gvwHunks[iInd, 1].Text = sToFile gvwHunks[iInd, 1].Text = sToFile
aScan = Scan(.LineInfo, "@@ -* +* @@") aScan = Scan(RTrim(.LineInfo), "@@ -* +* @@")
'sLineInfo = aScan[0] & "\t--> " & aScan[1] 'sLineInfo = aScan[0] & "\t--> " & aScan[1]
gvwHunks[iInd, 2].Text = aScan[0] gvwHunks[iInd, 2].Text = aScan[0]
gvwHunks[iInd, 3].Text = "--> " & aScan[1] gvwHunks[iInd, 3].Text = "--> " & aScan[1]
@ -208,8 +208,8 @@ Public Sub Parse(sFile As String)
$hPatch.Parse(sFile) $hPatch.Parse(sFile)
RefreshHunks() RefreshHunks()
Finally 'Finally
Dec Application.Busy 'Dec Application.Busy
End End

2
app/src/gambas3/.src/Welcome/FAbout.class
View file

@ -30,7 +30,7 @@ Public Sub Form_Open()
Dim Y As Integer Dim Y As Integer
Dim E As Float Dim E As Float
Me.Background = &H40FFFFFF& Me.Background = &HFFFFFFFF&
$hWelcome = New CWelcome(dwgWelcome) $hWelcome = New CWelcome(dwgWelcome)