diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index 73bddb499..12b21574a 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -433,7 +433,7 @@ msgstr "" #: FColorChooser.class:207 FCommit.class:397 FConflict.class:191 #: FConnectionEditor.class:261 FCreateFile.class:929 FDebugInfo.class:490 -#: FEditor.class:2137 FFindList.class:195 FFind.class:114 +#: FEditor.class:2138 FFindList.class:195 FFind.class:114 #: FFontChooser.class:85 FForm.class:2798 FGotoLine.class:63 #: FHelpBrowser.class:273 FIconEditor.class:1393 FImportTable.class:38 #: FList.class:155 FMain.class:205 FMakeExecutable.class:144 @@ -496,7 +496,7 @@ msgstr "" #: FCommit.class:255 FConflict.class:348 FConnectionEditor.class:1848 #: FEditor.class:3204 FForm.class:3578 FIconEditor.class:2150 -#: FImageEditor.class:104 FOption.class:1314 FOutput.class:459 +#: FImageEditor.class:104 FOption.class:1315 FOutput.class:459 #: FTextEditor.class:642 msgid "Undo" msgstr "" @@ -780,7 +780,7 @@ msgstr "" msgid "Connection editor" msgstr "" -#: FConnectionEditor.class:1573 FEditor.class:2137 FForm.class:2798 +#: FConnectionEditor.class:1573 FEditor.class:2138 FForm.class:2798 #: FHelpBrowser.class:280 FIconEditor.class:2032 FImageEditor.class:68 #: FTextEditor.class:462 FTranslate.class:711 msgid "Reload" @@ -1205,14 +1205,14 @@ msgstr "" msgid "Stack backtrace" msgstr "" -#: FEditor.class:2137 FIconEditor.class:2032 FTextEditor.class:462 +#: FEditor.class:2138 FIconEditor.class:2032 FTextEditor.class:462 msgid "" "The file has been modified.\n" "\n" "All your changes will be lost." msgstr "" -#: FEditor.class:2534 +#: FEditor.class:2535 msgid "(Declarations)" msgstr "" @@ -3123,15 +3123,15 @@ msgstr "" msgid "Fonts" msgstr "" -#: FOption.class:1284 +#: FOption.class:1285 msgid "Theme" msgstr "" -#: FOption.class:1302 +#: FOption.class:1303 msgid "Import theme" msgstr "" -#: FOption.class:1308 +#: FOption.class:1309 msgid "Export theme" msgstr "" @@ -4782,51 +4782,51 @@ msgstr "" msgid "Saving CHANGELOG file." msgstr "" -#: Package.module:394 +#: Package.module:396 msgid "Creating package for &1." msgstr "" -#: Package.module:419 +#: Package.module:421 msgid "The package build has failed." msgstr "" -#: Package.module:449 +#: Package.module:451 msgid "Making build directory." msgstr "" -#: Package.module:470 +#: Package.module:472 msgid "Creating desktop file..." msgstr "" -#: Package.module:500 +#: Package.module:502 msgid "Sources are being debianizated." msgstr "" -#: Package.module:644 +#: Package.module:646 msgid "Creating package..." msgstr "" -#: Package.module:647 +#: Package.module:649 msgid "'dpkg-buildpackage' has failed." msgstr "" -#: Package.module:739 +#: Package.module:741 msgid "Initializing ~/RPM directory." msgstr "" -#: Package.module:759 +#: Package.module:761 msgid "Creating source package." msgstr "" -#: Package.module:783 +#: Package.module:785 msgid "Creating .spec file." msgstr "" -#: Package.module:1065 +#: Package.module:1067 msgid "'rpmbuild' has returned the following error code:" msgstr "" -#: Package.module:1298 +#: Package.module:1300 msgid "'tar' has returned the following error code:" msgstr "" diff --git a/app/src/gambas3/.src/Editor/Code/FEditor.class b/app/src/gambas3/.src/Editor/Code/FEditor.class index 26bd86178..214e80ba3 100644 --- a/app/src/gambas3/.src/Editor/Code/FEditor.class +++ b/app/src/gambas3/.src/Editor/Code/FEditor.class @@ -171,6 +171,7 @@ Public Sub ReadConfig() $bShowPopupHelp = Settings["/Editor/ShowPopupHelp", True] panProc.Font.Grade = - Settings["/GlobalFont", 0] + gvwProc.Rows.H = panProc.Font.Height() + 1 End @@ -2906,7 +2907,6 @@ Public Sub btnProc_MouseDown() gvwProc.Rows.Count = $aProc.Count gvwProc.Rows.Unselect gvwProc.Columns.Count = 1 - gvwProc.Rows.H = gvwProc.Font.Height() + 1 panProc.Move(btnProc.ScreenX - panProc.Parent.ScreenX, btnProc.ScreenY - panProc.Parent.ScreenY + btnProc.H) ResizeProcList diff --git a/app/src/gambas3/.src/FOption.form b/app/src/gambas3/.src/FOption.form index 0c5949e4f..e01061baf 100644 --- a/app/src/gambas3/.src/FOption.form +++ b/app/src/gambas3/.src/FOption.form @@ -451,6 +451,7 @@ } { txtConsoleFont ButtonBox MoveScaled(19,0,46,4) + ReadOnly = True } } { Label27 Label diff --git a/app/src/gambas3/.src/Packager/Package.module b/app/src/gambas3/.src/Packager/Package.module index 4725ca733..6ef0aec50 100644 --- a/app/src/gambas3/.src/Packager/Package.module +++ b/app/src/gambas3/.src/Packager/Package.module @@ -201,7 +201,7 @@ Private Function IsConsoleProject() As Boolean Dim sLib As String For Each sLib In Project.Libraries - If CComponent.All[sLib].Faimily = "Form" Then Return False + If CComponent.All[sLib].Family = "Form" Then Return False Next Return True @@ -343,9 +343,11 @@ End Else aMinVersion[1] = CStr(CInt(aMinVersion[1]) - 1) Endif + aMinVersion.Resize(3) aMinVersion[2] = "0" aMaxVersion = Split(sVersion, ".") + aMaxVersion.Resize(3) aMaxVersion[2] = "90" Return [aMinVersion.Join("."), aMaxVersion.Join(".")] @@ -572,7 +574,7 @@ Private Function MakeDebPackage(sSys As String) Print #hFile Print #hFile, "Package: "; $sPackageName Print #hFile, "Architecture: all" - Print #hFile, "Depends: gambas2-runtime (>= "; MIN_VERSION; "), gambas2-runtime (<< "; MAX_VERSION; ")"; + Print #hFile, "Depends: gambas"; System.Version; "-runtime (>= "; MIN_VERSION; "), gambas"; System.Version; "-runtime (<< "; MAX_VERSION; ")"; If Not Project.CreateComponent Then For Each sLib In GetDependencies() aVer = GetComponentMinMaxVersion(sLib) @@ -802,7 +804,7 @@ Private Function MakeRpmPackage(sSys As String) 'PRINT #hFile, "BuildRequires: gambas2-ide" Print #hFile, "BuildArch: noarch" - Print #hFile, "Requires: gambas2-runtime >= "; MIN_VERSION; ",gambas2-runtime < "; MAX_VERSION; + Print #hFile, "Requires: gambas"; System.Version; "-runtime >= "; MIN_VERSION; ",gambas"; System.Version; "-runtime < "; MAX_VERSION; If Not Project.CreateComponent Then @@ -1260,8 +1262,8 @@ Private Sub MakeTgzPackage(sSys As String) hFile = Open sBuildDir &/ "/install/slack-required" For Create - Print #hFile, "gambas2-runtime >= "; MIN_VERSION - Print #hFile, "gambas2-runtime < "; MAX_VERSION + Print #hFile, "gambas"; System.Version; "-runtime >= "; MIN_VERSION + Print #hFile, "gambas"; System.Version; "-runtime < "; MAX_VERSION If Not Project.CreateComponent Then