diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index e2320f3ce..2d40d43af 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -387,11 +387,11 @@ msgid "" "the GNU General Public License." msgstr "" -#: Design.module:219 Project.module:2007 +#: Design.module:227 Project.module:2007 msgid "in &1:&2." msgstr "" -#: Design.module:324 +#: Design.module:332 msgid "" "The program has stopped unexpectedly\n" "by raising signal #&1.\n" @@ -400,13 +400,13 @@ msgid "" "gambas@users.sourceforge.net." msgstr "" -#: Design.module:328 +#: Design.module:336 msgid "" "The program has returned\n" "the value: &1" 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 #: FFontChooser.form:34 FGotoLine.form:17 FList.form:115 FMain.form:1306 #: FMenu.form:369 FNewConnection.form:238 FNewTable.form:80 @@ -419,11 +419,11 @@ msgstr "" msgid "OK" msgstr "" -#: Design.module:776 +#: Design.module:784 msgid "Output terminal" msgstr "" -#: Design.module:803 +#: Design.module:811 msgid "No terminal emulator found." msgstr "" diff --git a/app/src/gambas3/.src/Debug/Design.module b/app/src/gambas3/.src/Debug/Design.module index 6c4ff4ce4..859004e41 100644 --- a/app/src/gambas3/.src/Debug/Design.module +++ b/app/src/gambas3/.src/Debug/Design.module @@ -132,10 +132,18 @@ End Public Sub MakeErrorMessage(sErr As String) As String Dim aErr As String[] + Dim iInd As Integer aErr = Split(sErr, "|") - aErr.Resize(5) - Return Subst(Tr$(aErr[0]), aErr[1], aErr[2], aErr[3], aErr[4]) + aErr.Resize(aErr.Count + 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 diff --git a/comp/src/gb.report/.component b/comp/src/gb.report/.component index 8f2eaa083..a76ba1855 100644 --- a/comp/src/gb.report/.component +++ b/comp/src/gb.report/.component @@ -1,6 +1,6 @@ [Component] Key=gb.report -Version=2.99.1 +Version=2.99.2 State=2 Authors=Fabien Bodard Needs=Form,ImageIO diff --git a/comp/src/gb.report/.info b/comp/src/gb.report/.info index b126d83eb..126f6588f 100644 --- a/comp/src/gb.report/.info +++ b/comp/src/gb.report/.info @@ -500,7 +500,7 @@ m _SetChildGeometry m -f + (X)f(Y)f(W)f(H)f(ContPage)i _SetVerticalChildGeometry m @@ -675,7 +675,7 @@ m [(Parent)ReportContainer;] _GetSizeHints m -i +TSizeHint (AvailableW)i(AvailableH)i(TotalWidth)i(TotalHeight)i _PaintBefore m @@ -699,7 +699,7 @@ m (X)f(Y)f(W)f(H)f _SetChildGeometry m -f + (X)f(Y)f(W)f(H)f(ContPage)i _SetUnifiedValues m @@ -773,7 +773,7 @@ TSizeHint (AvailableW)f(AvailableH)f(TotalWidth)f(TotalHeight)f _SetChildGeometry m -f + (X)f(Y)f(W)f(H)f(ContPage)i #ReportImage ReportFrame @@ -1009,7 +1009,7 @@ m _SetChildGeometry m -b + (X)f(Y)f(W)f(H)f(ContPage)i _GetSizeHints m diff --git a/comp/src/gb.report/.project b/comp/src/gb.report/.project index 2acee067a..edcf435c5 100644 --- a/comp/src/gb.report/.project +++ b/comp/src/gb.report/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 2.99.1 +# Compiled with Gambas 2.99.2 Title=Report designer Startup=myReport5 Icon=printer1.png -Version=2.99.1 +Version=2.99.2 VersionProgram=gbx3 -V Component=gb.image Component=gb.gui @@ -11,6 +11,7 @@ Component=gb.form Component=gb.db Description="Report engine for gambas" Authors="Fabien Bodard" +Environment="GB_GUI=gb.gtk" TabSize=2 Translate=1 Language=fr diff --git a/comp/src/gb.report/.src/ReportContainer.class b/comp/src/gb.report/.src/ReportContainer.class index 1b4e7a6d3..602d336df 100644 --- a/comp/src/gb.report/.src/ReportContainer.class +++ b/comp/src/gb.report/.src/ReportContainer.class @@ -237,7 +237,7 @@ Public Sub _GenerateClones() 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 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 '************************************************* - 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 ' fPdg = Me._Padding diff --git a/comp/src/gb.report/.src/ReportControl.class b/comp/src/gb.report/.src/ReportControl.class index 19a81bd75..82c6b5a70 100644 --- a/comp/src/gb.report/.src/ReportControl.class +++ b/comp/src/gb.report/.src/ReportControl.class @@ -180,7 +180,7 @@ Private Sub Expand_Write(Value As Boolean) 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") @@ -291,7 +291,7 @@ Private Function _Padding_Read() As Float 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 diff --git a/comp/src/gb.report/.src/ReportHBox.class b/comp/src/gb.report/.src/ReportHBox.class index da421baf4..1a756fb8c 100644 --- a/comp/src/gb.report/.src/ReportHBox.class +++ b/comp/src/gb.report/.src/ReportHBox.class @@ -52,7 +52,7 @@ Public Sub _GetSizeHints(AvailableW As Float, AvailableH As Float, TotalWidth As 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 hChild As ReportControl diff --git a/comp/src/gb.report/.src/ReportVBox.class b/comp/src/gb.report/.src/ReportVBox.class index 33b98062f..af5dd7af1 100644 --- a/comp/src/gb.report/.src/ReportVBox.class +++ b/comp/src/gb.report/.src/ReportVBox.class @@ -16,7 +16,7 @@ Public Sub _Free() 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 hChild As ReportControl @@ -169,7 +169,7 @@ If iNExp > 0 Then fSExp = (H - Y) / iNExp Me._PageChildren[ContPage] = aPageItems - If bExitLoop Then Return True + 'If bExitLoop Then Return True End diff --git a/comp/src/gb.report/.src/Tests/myReport5.report b/comp/src/gb.report/.src/Tests/myReport5.report index 945424421..68f917925 100644 --- a/comp/src/gb.report/.src/Tests/myReport5.report +++ b/comp/src/gb.report/.src/Tests/myReport5.report @@ -38,7 +38,7 @@ Background = ReportBrush["#DF6B00"] } { ReportVBox2 ReportVBox - #MoveScaled(27,1,60,54) + #MoveScaled(27,1,56,54) Expand = True Border = ReportBorder["Left:1mm #000000"] Background = ReportBrush["#FFFFFF"] @@ -56,6 +56,7 @@ Brush = ReportBrush["#FFFFFF"] Fixed = True Font = Font["Bold,+1"] + Padding = ReportPadding["Top:4mm;Bottom:4mm;Left:2mm;Right:2mm"] Border = ReportBorder["Top:1mm #000000"] Background = ReportBrush["#3398C3"] Text = ("Page $PAGE on $NPAGE") diff --git a/main/gbx/gbx_class.c b/main/gbx/gbx_class.c index 933969078..53e202e75 100644 --- a/main/gbx/gbx_class.c +++ b/main/gbx/gbx_class.c @@ -860,7 +860,7 @@ void CLASS_inheritance(CLASS *class, CLASS *parent) } 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