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

[DEVELOPMENT ENVIRONMENT]

Browse source 
* BUG: Display recursive error messages sent by the debugger correctly.

[GB.REPORT]
* BUG: Fix incorrect inheritances.


git-svn-id: svn://localhost/gambas/trunk@4017 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2011-08-20 01:31:42 +00:00
parent a86f7e8b15
commit da7d1f8305
11 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/gambas3/.lang/.pot
View file

@ -387,11 +387,11 @@ msgid ""
"the GNU General Public License." "the GNU General Public License."
msgstr "" msgstr ""
#: Design.module:219 Project.module:2007 #: Design.module:227 Project.module:2007
msgid "in &1:&2." msgid "in &1:&2."
msgstr "" msgstr ""
#: Design.module:324 #: Design.module:332
msgid "" msgid ""
"The program has stopped unexpectedly\n" "The program has stopped unexpectedly\n"
"by raising signal #&1.\n" "by raising signal #&1.\n"
@ -400,13 +400,13 @@ msgid ""
"gambas@users.sourceforge.net." "gambas@users.sourceforge.net."
msgstr "" msgstr ""
#: Design.module:328 #: Design.module:336
msgid "" msgid ""
"The program has returned\n" "The program has returned\n"
"the value: &1" "the value: &1"
msgstr "" msgstr ""
#: Design.module:386 FColorChooser.form:54 FCommit.form:223 #: Design.module:394 FColorChooser.form:54 FCommit.form:223
#: FConnectionEditor.class:441 FCreateFile.form:430 FFieldChooser.form:132 #: FConnectionEditor.class:441 FCreateFile.form:430 FFieldChooser.form:132
#: FFontChooser.form:34 FGotoLine.form:17 FList.form:115 FMain.form:1306 #: FFontChooser.form:34 FGotoLine.form:17 FList.form:115 FMain.form:1306
#: FMenu.form:369 FNewConnection.form:238 FNewTable.form:80 #: FMenu.form:369 FNewConnection.form:238 FNewTable.form:80
@ -419,11 +419,11 @@ msgstr ""
msgid "OK" msgid "OK"
msgstr "" msgstr ""
#: Design.module:776 #: Design.module:784
msgid "Output terminal" msgid "Output terminal"
msgstr "" msgstr ""
#: Design.module:803 #: Design.module:811
msgid "No terminal emulator found." msgid "No terminal emulator found."
msgstr "" msgstr ""

12
app/src/gambas3/.src/Debug/Design.module
View file

@ -132,10 +132,18 @@ End
Public Sub MakeErrorMessage(sErr As String) As String Public Sub MakeErrorMessage(sErr As String) As String
Dim aErr As String[] Dim aErr As String[]
Dim iInd As Integer
aErr = Split(sErr, "|") aErr = Split(sErr, "|")
aErr.Resize(5) aErr.Resize(aErr.Count + 4)
Return Subst(Tr$(aErr[0]), aErr[1], aErr[2], aErr[3], aErr[4])
For iInd = aErr.Max - 4 DownTo 0
If InStr(aErr[iInd], "&1") Then
aErr[iInd] = Subst(Tr$(aErr[iInd]), aErr[iInd + 1], aErr[iInd + 2], aErr[iInd + 3], aErr[iInd + 4])
Endif
Next
Return aErr[0]
End End

2
comp/src/gb.report/.component
View file

@ -1,6 +1,6 @@
[Component] [Component]
Key=gb.report Key=gb.report
Version=2.99.1 Version=2.99.2
State=2 State=2
Authors=Fabien Bodard Authors=Fabien Bodard
Needs=Form,ImageIO Needs=Form,ImageIO

10
comp/src/gb.report/.info
View file

@ -500,7 +500,7 @@ m
_SetChildGeometry _SetChildGeometry
m m
f
(X)f(Y)f(W)f(H)f(ContPage)i (X)f(Y)f(W)f(H)f(ContPage)i
_SetVerticalChildGeometry _SetVerticalChildGeometry
m m
@ -675,7 +675,7 @@ m
[(Parent)ReportContainer;] [(Parent)ReportContainer;]
_GetSizeHints _GetSizeHints
m m
i TSizeHint
(AvailableW)i(AvailableH)i(TotalWidth)i(TotalHeight)i (AvailableW)i(AvailableH)i(TotalWidth)i(TotalHeight)i
_PaintBefore _PaintBefore
m m
@ -699,7 +699,7 @@ m
(X)f(Y)f(W)f(H)f (X)f(Y)f(W)f(H)f
_SetChildGeometry _SetChildGeometry
m m
f
(X)f(Y)f(W)f(H)f(ContPage)i (X)f(Y)f(W)f(H)f(ContPage)i
_SetUnifiedValues _SetUnifiedValues
m m
@ -773,7 +773,7 @@ TSizeHint
(AvailableW)f(AvailableH)f(TotalWidth)f(TotalHeight)f (AvailableW)f(AvailableH)f(TotalWidth)f(TotalHeight)f
_SetChildGeometry _SetChildGeometry
m m
f
(X)f(Y)f(W)f(H)f(ContPage)i (X)f(Y)f(W)f(H)f(ContPage)i
#ReportImage #ReportImage
ReportFrame ReportFrame
@ -1009,7 +1009,7 @@ m
_SetChildGeometry _SetChildGeometry
m m
b
(X)f(Y)f(W)f(H)f(ContPage)i (X)f(Y)f(W)f(H)f(ContPage)i
_GetSizeHints _GetSizeHints
m m

5
comp/src/gb.report/.project
View file

@ -1,9 +1,9 @@
# Gambas Project File 3.0 # Gambas Project File 3.0
# Compiled with Gambas 2.99.1 # Compiled with Gambas 2.99.2
Title=Report designer Title=Report designer
Startup=myReport5 Startup=myReport5
Icon=printer1.png Icon=printer1.png
Version=2.99.1 Version=2.99.2
VersionProgram=gbx3 -V VersionProgram=gbx3 -V
Component=gb.image Component=gb.image
Component=gb.gui Component=gb.gui
@ -11,6 +11,7 @@ Component=gb.form
Component=gb.db Component=gb.db
Description="Report engine for gambas" Description="Report engine for gambas"
Authors="Fabien Bodard" Authors="Fabien Bodard"
Environment="GB_GUI=gb.gtk"
TabSize=2 TabSize=2
Translate=1 Translate=1
Language=fr Language=fr

5
comp/src/gb.report/.src/ReportContainer.class
View file

@ -237,7 +237,7 @@ Public Sub _GenerateClones()
End End
Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer) As Float Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer)
Dim hChildHints As TSizeHint Dim hChildHints As TSizeHint
Dim hChild As TControl Dim hChild As TControl
@ -261,7 +261,8 @@ Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float
If _Arrangement = Arrange.Vertical Then If _Arrangement = Arrange.Vertical Then
'************************************************* '*************************************************
Return _SetVerticalChildGeometry(X, Y, W, H, ContPage) _SetVerticalChildGeometry(X, Y, W, H, ContPage)
Return
' fSpc = IIf(Me._RelativeSpacing, H * Me._Spacing / 100, Me._Spacing) 'ME._Spacing ' fSpc = IIf(Me._RelativeSpacing, H * Me._Spacing / 100, Me._Spacing) 'ME._Spacing
' fPdg = Me._Padding ' fPdg = Me._Padding

4
comp/src/gb.report/.src/ReportControl.class
View file

@ -180,7 +180,7 @@ Private Sub Expand_Write(Value As Boolean)
End End
Public Sub _GetSizeHints(AvailableW As Integer, AvailableH As Integer, TotalWidth As Integer, TotalHeight As Integer) As Integer Public Sub _GetSizeHints(AvailableW As Integer, AvailableH As Integer, TotalWidth As Integer, TotalHeight As Integer) As TSizeHint
Error.Raise("Something goes wrong the _GetSizeHints is not correctly implemented") Error.Raise("Something goes wrong the _GetSizeHints is not correctly implemented")
@ -291,7 +291,7 @@ Private Function _Padding_Read() As Float
End End
Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer) As Float Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer)
End End

2
comp/src/gb.report/.src/ReportHBox.class
View file

@ -52,7 +52,7 @@ Public Sub _GetSizeHints(AvailableW As Float, AvailableH As Float, TotalWidth As
End End
Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer) As Float Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer)
Dim hChildHints As TSizeHint Dim hChildHints As TSizeHint
Dim hChild As ReportControl Dim hChild As ReportControl

4
comp/src/gb.report/.src/ReportVBox.class
View file

@ -16,7 +16,7 @@ Public Sub _Free()
End End
Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer) As Boolean Public Function _SetChildGeometry(X As Float, Y As Float, W As Float, H As Float, ContPage As Integer)
Dim hChildHints As TSizeHint Dim hChildHints As TSizeHint
Dim hChild As ReportControl Dim hChild As ReportControl
@ -169,7 +169,7 @@ If iNExp > 0 Then fSExp = (H - Y) / iNExp
Me._PageChildren[ContPage] = aPageItems Me._PageChildren[ContPage] = aPageItems
If bExitLoop Then Return True 'If bExitLoop Then Return True
End End

3
comp/src/gb.report/.src/Tests/myReport5.report
View file

@ -38,7 +38,7 @@
Background = ReportBrush["#DF6B00"] Background = ReportBrush["#DF6B00"]
} }
{ ReportVBox2 ReportVBox { ReportVBox2 ReportVBox
#MoveScaled(27,1,60,54) #MoveScaled(27,1,56,54)
Expand = True Expand = True
Border = ReportBorder["Left:1mm #000000"] Border = ReportBorder["Left:1mm #000000"]
Background = ReportBrush["#FFFFFF"] Background = ReportBrush["#FFFFFF"]
@ -56,6 +56,7 @@
Brush = ReportBrush["#FFFFFF"] Brush = ReportBrush["#FFFFFF"]
Fixed = True Fixed = True
Font = Font["Bold,+1"] Font = Font["Bold,+1"]
Padding = ReportPadding["Top:4mm;Bottom:4mm;Left:2mm;Right:2mm"]
Border = ReportBorder["Top:1mm #000000"] Border = ReportBorder["Top:1mm #000000"]
Background = ReportBrush["#3398C3"] Background = ReportBrush["#3398C3"]
Text = ("Page $PAGE on $NPAGE") Text = ("Page $PAGE on $NPAGE")

2
main/gbx/gbx_class.c
View file

@ -860,7 +860,7 @@ void CLASS_inheritance(CLASS *class, CLASS *parent)
} }
CATCH CATCH
{ {
THROW(E_CLASS, class->name, "Cannot load parent class ", parent->name); THROW(E_CLASS, class->name, "Cannot load parent class: ", STRING_new_temp_zero(ERROR_current->info.msg));
} }
END_TRY END_TRY