From 0a659f3a9d72c8251820436a988b4cf8dbbe0477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 4 Sep 2010 13:21:11 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * BUG: Fix the help browser for classes whose name begins with an underscore. * BUG: Fix project loading when there are breakpoints set on non-existing classes. [INTERPRETER] * BUG: Fix the behaviour of Eval() when the expression cannot be compiled. * BUG: Error.Text does not crash anymore when the error message is void. [COMPILER] * BUG: Fix the parser behaviour when a non-terminated string is located at the end of the file. [GB.EVAL] * BUG: Fix the parser behaviour when a non-terminated string is located at the end of the expression. [GB.GTK] * BUG: Fix the behaviour of Label with AutoResize set. [GB.QT4] * BUG: Fix the behaviour of Label with AutoResize set. git-svn-id: svn://localhost/gambas/trunk@3178 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- TODO | 3 +- app/src/gambas3/.lang/.pot | 16 +- app/src/gambas3/.lang/fr.po | 528 +++++++++--------- app/src/gambas3/.src/Debug/Design.module | 5 +- app/src/gambas3/.src/FWelcome.form | 2 +- app/src/gambas3/.src/Help/MHelp.module | 2 +- .../gambas3/.src/Project/FOpenProject.class | 12 +- .../gambas3/.src/Project/FOpenProject.form | 18 +- comp/src/gb.form/.project | 2 +- gb.dbus/src/gb.dbus/.settings | 2 +- gb.gtk/src/glabel.cpp | 9 +- gb.qt4/src/CLabel.cpp | 6 +- main/gbc/gbc_read.c | 2 +- main/gbx/gbx_c_error.c | 2 +- main/gbx/gbx_exec.c | 1 - main/gbx/gbx_string.c | 10 +- main/gbx/gbx_subr_misc.c | 6 + main/lib/eval/eval_read.c | 2 +- 18 files changed, 327 insertions(+), 301 deletions(-) diff --git a/TODO b/TODO index 40eddc29b..d4dffabb2 100644 --- a/TODO +++ b/TODO @@ -24,12 +24,13 @@ INTERPRETER - Sorting two or more arrays at the same time. - MOD with floats. - Make the error information associated with the current stack frame. +- Collection.Copy(). +- Timer.TimeLeft. DEVELOPMENT ENVIRONMENT - Bookmarks in editor. - Manage Object properties in IDE. -- Put a language code in comments, and hide them as needed by the user. - Make a visual control clipboard. - Generates an index control->component to suggest components for missing controls. - Be able to open a .tar.gz project, and compress it back when the project is closed. diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index dc698a7d1..84f4a3250 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -385,7 +385,7 @@ msgstr "" #: FConnectionEditor.class:411 FCreateFile.class:922 FFontChooser.class:79 #: FGotoLine.class:57 FList.class:331 FMain.class:1573 FMenu.class:1197 #: FNewConnection.class:573 FNewTable.class:159 FNewTranslation.class:64 -#: FOpenProject.class:490 FPasteSpecial.class:273 FPropertyProject.class:258 +#: FOpenProject.class:496 FPasteSpecial.class:273 FPropertyProject.class:258 #: FReportBorderChooser.class:213 FReportCoordChooser.class:120 #: FSelectExtraFile.class:72 FSelectIcon.class:268 FSnippet.class:136 #: FTableChooser.class:138 FText.class:100 @@ -469,7 +469,7 @@ msgstr "" #: FGotoLine.class:63 FHelpBrowser.class:341 FIconEditor.class:1396 #: FImportTable.class:38 FList.class:155 FMain.class:204 #: FMakeInstall.class:318 FMenu.class:1202 FNewConnection.class:317 -#: FNewTable.class:165 FNewTranslation.class:70 FOpenProject.class:496 +#: FNewTable.class:165 FNewTranslation.class:70 FOpenProject.class:502 #: FOption.class:593 FPasteSpecial.class:279 FPropertyProject.class:1017 #: FReportBorderChooser.class:207 FReportCoordChooser.class:114 #: FSave.class:118 FSearch.class:504 FSelectExtraFile.class:78 @@ -619,7 +619,7 @@ msgid "" "Do you really want to open another file?" msgstr "" -#: FConflict.class:254 FOpenProject.class:402 Project.module:392 +#: FConflict.class:254 FOpenProject.class:408 Project.module:392 msgid "Open" msgstr "" @@ -1092,7 +1092,7 @@ msgstr "" msgid "Title" msgstr "" -#: FCreateProject.class:659 FOpenProject.class:480 +#: FCreateProject.class:659 FOpenProject.class:491 msgid "Open in another window" msgstr "" @@ -2846,19 +2846,19 @@ msgstr "" msgid "New translation" msgstr "" -#: FOpenProject.class:388 +#: FOpenProject.class:394 msgid "Select a project" msgstr "" -#: FOpenProject.class:448 +#: FOpenProject.class:454 msgid "Recent" msgstr "" -#: FOpenProject.class:456 FWelcome.class:528 +#: FOpenProject.class:462 FWelcome.class:528 msgid "Sort by path" msgstr "" -#: FOpenProject.class:465 FWelcome.class:52 +#: FOpenProject.class:471 FWelcome.class:52 msgid "Examples" msgstr "" diff --git a/app/src/gambas3/.lang/fr.po b/app/src/gambas3/.lang/fr.po index 4afb9f9b7..038b85aa3 100644 --- a/app/src/gambas3/.lang/fr.po +++ b/app/src/gambas3/.lang/fr.po @@ -506,7 +506,7 @@ msgstr "Implémente" msgid "Provides" msgstr "Fournit" -#: CInsertColor.class:103 FEditor.class:3582 FTextEditor.class:912 +#: CInsertColor.class:102 FEditor.class:3582 FTextEditor.class:919 msgid "Insert color" msgstr "Insérer une couleur" @@ -547,7 +547,7 @@ msgstr "État" msgid "Reports" msgstr "États" -#: CProjectTree.class:290 FMain.class:2713 FSearch.class:97 +#: CProjectTree.class:290 FMain.class:2731 FSearch.class:97 #: FSelectIcon.class:216 Project.module:1370 msgid "Project" msgstr "Projet" @@ -592,7 +592,7 @@ msgstr "" "Ce programme est publié sous\n" "la License Publique Générale GNU" -#: Design.module:216 Project.module:1828 +#: Design.module:216 Project.module:1832 msgid "In class &1 at line &2." msgstr "Dans la classe &1 à la ligne &2." @@ -620,7 +620,7 @@ msgstr "" #: Design.module:381 FColorChooser.class:209 FCommit.class:380 #: FConnectionEditor.class:411 FCreateFile.class:922 FFontChooser.class:79 -#: FGotoLine.class:57 FList.class:331 FMain.class:3045 FMenu.class:1197 +#: FGotoLine.class:57 FList.class:331 FMain.class:1573 FMenu.class:1197 #: FNewConnection.class:573 FNewTable.class:159 FNewTranslation.class:64 #: FOpenProject.class:490 FPasteSpecial.class:273 FPropertyProject.class:258 #: FReportBorderChooser.class:213 FReportCoordChooser.class:120 @@ -678,7 +678,7 @@ msgstr "Temple de la renommée" msgid "System information" msgstr "Informations système" -#: FAbout.class:621 FList.class:308 FMain.class:2456 +#: FAbout.class:621 FList.class:308 FMain.class:2475 msgid "&Copy" msgstr "&Copier" @@ -701,7 +701,7 @@ msgstr "Libre" #: FImportTable.class:38 FList.class:155 FMain.class:204 #: FMakeInstall.class:318 FMenu.class:1202 FNewConnection.class:317 #: FNewTable.class:165 FNewTranslation.class:70 FOpenProject.class:496 -#: FOption.class:600 FPasteSpecial.class:279 FPropertyProject.class:1017 +#: FOption.class:593 FPasteSpecial.class:279 FPropertyProject.class:1017 #: FReportBorderChooser.class:207 FReportCoordChooser.class:114 #: FSave.class:118 FSearch.class:504 FSelectExtraFile.class:78 #: FSelectIcon.class:273 FSnippet.class:142 FTableChooser.class:144 @@ -741,44 +741,44 @@ msgstr "Certains fichiers ne sont pas versionnés et doivent être ajoutés manu #: FCommit.class:234 FConflict.class:325 FConnectionEditor.class:1808 #: FEditor.class:3380 FForm.class:3534 FIconEditor.class:2165 #: FImageEditor.class:77 FMenu.class:948 FOutput.class:377 -#: FTextEditor.class:706 +#: FTextEditor.class:707 msgid "Cut" msgstr "Couper" #: FCommit.class:240 FConflict.class:331 FConnectionEditor.class:1708 #: FEditor.class:3386 FForm.class:3541 FIconEditor.class:2173 #: FImageEditor.class:86 FMenu.class:954 FOutput.class:384 -#: FTextEditor.class:713 +#: FTextEditor.class:714 msgid "Copy" msgstr "Copier" #: FCommit.class:246 FConflict.class:337 FConnectionEditor.class:1829 #: FEditor.class:3393 FForm.class:3554 FIconEditor.class:2181 #: FImageEditor.class:95 FMenu.class:960 FOutput.class:391 -#: FTextEditor.class:720 +#: FTextEditor.class:721 msgid "Paste" msgstr "Coller" #: FCommit.class:252 FConflict.class:343 FConnectionEditor.class:1836 #: FEditor.class:3364 FForm.class:3779 FIconEditor.class:2149 -#: FImageEditor.class:104 FOption.class:1494 FOutput.class:360 -#: FTextEditor.class:689 +#: FImageEditor.class:104 FOption.class:1487 FOutput.class:360 +#: FTextEditor.class:690 msgid "Undo" msgstr "Annuler" #: FCommit.class:258 FConflict.class:349 FConnectionEditor.class:1843 #: FEditor.class:3371 FForm.class:3789 FImageEditor.class:112 -#: FOutput.class:367 FTextEditor.class:696 +#: FOutput.class:367 FTextEditor.class:697 msgid "Redo" msgstr "Rétablir" #: FCommit.class:264 FConflict.class:355 FEditor.class:3608 FMenu.class:970 -#: FTextEditor.class:871 +#: FTextEditor.class:878 msgid "Indent" msgstr "Indenter" #: FCommit.class:270 FConflict.class:361 FEditor.class:3616 FMenu.class:976 -#: FTextEditor.class:878 +#: FTextEditor.class:885 msgid "Unindent" msgstr "Désindenter" @@ -810,7 +810,7 @@ msgstr "Se souvenir du mot de passe" msgid "Changes" msgstr "Modifications" -#: FConflict.class:25 FMain.class:2429 +#: FConflict.class:25 FMain.class:2448 msgid "&Edit" msgstr "&Éditer" @@ -930,7 +930,7 @@ msgid "Do not save" msgstr "Ne pas enregistrer" #: FConnectionEditor.class:261 FEditor.class:3498 FForm.class:3695 -#: FIconEditor.class:1415 FImageEditor.class:60 FTextEditor.class:790 +#: FIconEditor.class:1415 FImageEditor.class:60 FTextEditor.class:797 msgid "Save" msgstr "Enregistrer" @@ -1015,7 +1015,7 @@ msgid "Cannot write table '&1'." msgstr "Impossible d'écrire la table « &1 »." #: FConnectionEditor.class:1330 FForm.class:3561 FMain.class:204 -#: FNewConnection.class:317 FOption.class:747 FTranslate.class:617 +#: FNewConnection.class:317 FOption.class:740 FTranslate.class:617 msgid "Delete" msgstr "Supprimer" @@ -1089,7 +1089,7 @@ msgstr "Requête SQL" msgid "Fields" msgstr "Champs" -#: FConnectionEditor.class:1681 FMain.class:1661 +#: FConnectionEditor.class:1681 FMain.class:1674 msgid "Add" msgstr "Ajouter" @@ -1153,7 +1153,7 @@ msgstr "Impossible d'ajouter le fichier." msgid "New file" msgstr "Nouveau fichier" -#: FCreateFile.class:582 FMain.class:2334 +#: FCreateFile.class:582 FMain.class:2353 msgid "New" msgstr "Nouveau" @@ -1242,7 +1242,7 @@ msgstr "Veuillez saisir l'emplacement du référentiel." msgid "The project has been successfully created." msgstr "Le projet a été créé avec succès." -#: FCreateProject.class:337 FMain.class:2615 +#: FCreateProject.class:337 FMain.class:2633 msgid "New project" msgstr "Nouveau projet" @@ -1380,7 +1380,7 @@ msgstr "Expression" msgid "Function" msgstr "Fonction" -#: FDebugInfo.class:51 FIconEditor.class:2262 FOption.class:1158 +#: FDebugInfo.class:51 FIconEditor.class:2262 FOption.class:1151 #: FSearch.class:38 msgid "Line" msgstr "Ligne" @@ -1390,7 +1390,7 @@ msgid "native code" msgstr "code natif" #: FDebugInfo.class:496 FIconEditor.class:1396 FList.class:155 -#: FOption.class:600 FOutput.class:398 +#: FOption.class:593 FOutput.class:398 msgid "Clear" msgstr "Effacer" @@ -1406,11 +1406,11 @@ msgstr "Variables dynamiques" msgid "Static variables" msgstr "Variables statiques" -#: FDebugInfo.class:980 FMain.class:2929 +#: FDebugInfo.class:980 FMain.class:3000 msgid "Debug" msgstr "Débogage" -#: FDebugInfo.class:993 FMain.class:2741 FOption.class:1452 FSearch.class:93 +#: FDebugInfo.class:993 FMain.class:2759 FOption.class:1445 FSearch.class:93 msgid "Console" msgstr "Console" @@ -1450,8 +1450,8 @@ msgstr "&Ajouter" msgid "Remove current expression" msgstr "Supprimer l'expression sélectionnée" -#: FDebugInfo.class:1092 FMain.class:2543 FMakeInstall.class:1605 -#: FOption.class:1554 FPropertyProject.class:1867 +#: FDebugInfo.class:1092 FMain.class:2562 FMakeInstall.class:1605 +#: FOption.class:1547 FPropertyProject.class:1867 msgid "&Remove" msgstr "&Supprimer" @@ -1497,7 +1497,7 @@ msgstr "(Déclarations)" msgid "Go to" msgstr "Aller à" -#: FEditor.class:3305 FTextEditor.class:680 +#: FEditor.class:3305 FTextEditor.class:681 msgid "Go to line..." msgstr "Aller à la ligne..." @@ -1513,7 +1513,7 @@ msgstr "Revenir en arrière" msgid "Open form" msgstr "Ouvrir le formulaire" -#: FEditor.class:3332 FForm.class:3466 FMain.class:2496 +#: FEditor.class:3332 FForm.class:3466 FMain.class:2515 msgid "&Startup class" msgstr "Cla&sse de démarrage" @@ -1533,11 +1533,11 @@ msgstr "&Surveiller une expression" msgid "Paste special..." msgstr "Collage spécial..." -#: FEditor.class:3406 FTextEditor.class:727 +#: FEditor.class:3406 FTextEditor.class:728 msgid "Insert color..." msgstr "Insérer une couleur..." -#: FEditor.class:3415 FTextEditor.class:736 +#: FEditor.class:3415 FTextEditor.class:737 msgid "Select &All" msgstr "&Tout sélectionner" @@ -1549,27 +1549,27 @@ msgstr "Mettre en commentaire" msgid "Uncomment" msgstr "Retirer les commentaires" -#: FEditor.class:3441 FOutput.class:408 FTextEditor.class:745 +#: FEditor.class:3441 FOutput.class:408 FTextEditor.class:746 msgid "Find next" msgstr "Poursuivre la recherche" -#: FEditor.class:3448 FOutput.class:415 FTextEditor.class:752 +#: FEditor.class:3448 FOutput.class:415 FTextEditor.class:753 msgid "Find previous" msgstr "Recherche en arrière" -#: FEditor.class:3457 FTextEditor.class:761 +#: FEditor.class:3457 FTextEditor.class:762 msgid "View" msgstr "Affichage" -#: FEditor.class:3461 FTextEditor.class:765 +#: FEditor.class:3461 FTextEditor.class:766 msgid "No split" msgstr "Affichage complet" -#: FEditor.class:3468 FTextEditor.class:772 +#: FEditor.class:3468 FTextEditor.class:773 msgid "Horizontal split" msgstr "Séparation horizontale" -#: FEditor.class:3475 FTextEditor.class:779 +#: FEditor.class:3475 FTextEditor.class:780 msgid "Vertical split" msgstr "Séparation verticale" @@ -1589,7 +1589,7 @@ msgstr "Coller comme chaîne sur plusieurs lignes" msgid "Paste as comments" msgstr "Coller comme commentaires" -#: FEditor.class:3525 FOption.class:1118 +#: FEditor.class:3525 FOption.class:1111 msgid "Editor" msgstr "Éditeur" @@ -1651,11 +1651,11 @@ msgstr "Déplacer l'onglet" msgid "&First" msgstr "&Début" -#: FForm.class:3494 FSearch.class:972 FTips.class:228 +#: FForm.class:3494 FSearch.class:973 FTips.class:228 msgid "&Previous" msgstr "&Précédent" -#: FForm.class:3501 FMenu.class:931 FSearch.class:966 FTips.class:234 +#: FForm.class:3501 FMenu.class:931 FSearch.class:967 FTips.class:234 msgid "&Next" msgstr "&Suivant" @@ -1743,7 +1743,7 @@ msgstr "Même hau&teur" msgid "Menu editor..." msgstr "Editeur de menu..." -#: FForm.class:3725 FTextEditor.class:821 +#: FForm.class:3725 FTextEditor.class:828 msgid "Code" msgstr "Code" @@ -1799,7 +1799,7 @@ msgstr "Déplacer l'onglet à droite" msgid "Move tab last" msgstr "Déplacer l'onglet à la fin" -#: FFormStack.class:293 FMain.class:2957 +#: FFormStack.class:293 FMain.class:3028 msgid "Hierarchy" msgstr "Hiérarchie" @@ -1831,7 +1831,7 @@ msgstr "Aller à la ligne" msgid "Default language" msgstr "Langage par défaut" -#: FHelpBrowser.class:309 FMain.class:2750 +#: FHelpBrowser.class:309 FMain.class:2777 msgid "Help browser" msgstr "Navigateur d'aide" @@ -1955,7 +1955,7 @@ msgstr "Echanger les couleurs" msgid "Pick a color" msgstr "Pipette" -#: FImageEditor.class:54 FTextEditor.class:799 +#: FImageEditor.class:54 FTextEditor.class:806 msgid "Text editor" msgstr "Éditeur de texte" @@ -2167,7 +2167,7 @@ msgstr "Le fichier n'est pas versionné, et doit être ajouté au référentiel. msgid "This file has not been modified since the last commit." msgstr "Ce fichier est inchangé depuis le dernier envoi vers le réferentiel." -#: FInfo.class:304 FOption.class:944 FPropertyProject.class:1506 +#: FInfo.class:304 FOption.class:937 FPropertyProject.class:1506 msgid "General" msgstr "Général" @@ -2219,7 +2219,7 @@ msgstr "&Descendre" msgid "Cl&ear" msgstr "&Effacer" -#: FList.class:314 FMain.class:2463 +#: FList.class:314 FMain.class:2482 msgid "&Paste" msgstr "&Coller" @@ -2281,399 +2281,391 @@ msgstr "Les fichiers de sauvegarde et les fichiers générés du projet vont êt msgid "Clean" msgstr "Nettoyer" -#: FMain.class:1661 +#: FMain.class:1573 +msgid "To show the menu bar again, hit the following keys:

&1" +msgstr "" + +#: FMain.class:1674 msgid "Do you really want to add this file to the repository?" msgstr "Désirez-vous réellement ajouter ce fichier au référentiel ?" -#: FMain.class:1974 +#: FMain.class:1993 msgid "&File" msgstr "&Fichier" -#: FMain.class:1978 +#: FMain.class:1997 msgid "&New project..." msgstr "&Nouveau projet..." -#: FMain.class:1985 +#: FMain.class:2004 msgid "&Open project..." msgstr "&Ouvrir un projet..." -#: FMain.class:1991 +#: FMain.class:2010 msgid "Open &recent" msgstr "Ouvrir un projet &récent" -#: FMain.class:1998 +#: FMain.class:2017 msgid "Open &example" msgstr "Ouvrir un &exemple" -#: FMain.class:2009 +#: FMain.class:2028 msgid "&Save project" msgstr "&Enregistrer le projet" -#: FMain.class:2016 +#: FMain.class:2035 msgid "Save project &as..." msgstr "Enregistrer le projet &sous..." -#: FMain.class:2026 +#: FMain.class:2045 msgid "&Quit" msgstr "&Quitter" -#: FMain.class:2033 +#: FMain.class:2052 msgid "&Project" msgstr "&Projet" -#: FMain.class:2037 +#: FMain.class:2056 msgid "&Compile" msgstr "&Compiler" -#: FMain.class:2044 +#: FMain.class:2063 msgid "Compile &All" msgstr "&Tout Compiler" -#: FMain.class:2054 +#: FMain.class:2073 msgid "&Translate..." msgstr "&Traduire..." -#: FMain.class:2063 +#: FMain.class:2082 msgid "Make" msgstr "Générer" -#: FMain.class:2067 +#: FMain.class:2086 msgid "E&xecutable..." msgstr "E&xécutable..." -#: FMain.class:2074 +#: FMain.class:2093 msgid "&Source archive..." msgstr "Archive des fichiers &source..." -#: FMain.class:2081 +#: FMain.class:2100 msgid "&Installation package..." msgstr "Paquetage d'&installation..." -#: FMain.class:2092 +#: FMain.class:2111 msgid "&Clean up" msgstr "&Nettoyer" -#: FMain.class:2098 +#: FMain.class:2117 msgid "&Refresh" msgstr "&Rafraîchir" -#: FMain.class:2104 +#: FMain.class:2123 msgid "Put on &version control" msgstr "Mettre sous contrôle de &version" -#: FMain.class:2114 +#: FMain.class:2133 msgid "&Properties..." msgstr "&Propriétés..." -#: FMain.class:2121 +#: FMain.class:2140 msgid "&Debug" msgstr "&Débogage" -#: FMain.class:2125 +#: FMain.class:2144 msgid "&Run" msgstr "Déma&rrer" -#: FMain.class:2135 +#: FMain.class:2154 msgid "&Pause" msgstr "&Pause" -#: FMain.class:2142 +#: FMain.class:2161 msgid "&Stop" msgstr "&Stop" -#: FMain.class:2149 +#: FMain.class:2168 msgid "St&ep" msgstr "P&as-à-pas" -#: FMain.class:2156 +#: FMain.class:2175 msgid "&Forward" msgstr "&Avancer" -#: FMain.class:2163 +#: FMain.class:2182 msgid "Finis&h" msgstr "&Terminer" -#: FMain.class:2170 +#: FMain.class:2189 msgid "Run &until" msgstr "Exécuter &jusqu'à la ligne courante" -#: FMain.class:2180 +#: FMain.class:2199 msgid "Clear &all breakpoints" msgstr "Effacer &tous les points d'arrêts" -#: FMain.class:2185 +#: FMain.class:2204 msgid "Close all &debug windows" msgstr "Fermer toutes les fenêtres de &débogage" -#: FMain.class:2190 +#: FMain.class:2209 msgid "&View" msgstr "&Affichage" -#: FMain.class:2194 +#: FMain.class:2213 msgid "Pro&ject" msgstr "Pro&jet" -#: FMain.class:2203 +#: FMain.class:2222 msgid "&Properties" msgstr "&Propriétés" -#: FMain.class:2211 +#: FMain.class:2230 msgid "&Toolbox" msgstr "&Boîte à outils" -#: FMain.class:2219 +#: FMain.class:2238 msgid "&Console" msgstr "&Console" -#: FMain.class:2229 +#: FMain.class:2248 msgid "Status bar" msgstr "Barre d'état" -#: FMain.class:2236 +#: FMain.class:2255 msgid "Hide menubar" msgstr "Cacher la barre de menus" -#: FMain.class:2242 +#: FMain.class:2261 msgid "Close &all windows" msgstr "Fermer &toutes les fenêtres" -#: FMain.class:2248 +#: FMain.class:2267 msgid "&Tools" msgstr "&Outils" -#: FMain.class:2251 +#: FMain.class:2270 msgid "&Find..." msgstr "&Rechercher..." -#: FMain.class:2257 +#: FMain.class:2276 msgid "&Replace..." msgstr "&Remplacer..." -#: FMain.class:2267 +#: FMain.class:2286 msgid "&Browse project..." msgstr "&Parcourir le projet..." -#: FMain.class:2274 +#: FMain.class:2293 msgid "&Open a terminal..." msgstr "&Ouvrir un terminal..." -#: FMain.class:2281 +#: FMain.class:2300 msgid "&Update all forms" msgstr "&Mettre à jour tous les formulaires" -#: FMain.class:2290 +#: FMain.class:2309 msgid "&Shortcuts..." msgstr "&Raccourcis..." -#: FMain.class:2296 +#: FMain.class:2315 msgid "&Preferences..." msgstr "&Préférences..." -#: FMain.class:2304 +#: FMain.class:2323 msgid "&?" msgstr "-" -#: FMain.class:2308 +#: FMain.class:2327 msgid "&Help browser" msgstr "&Navigateur d'aide" -#: FMain.class:2316 +#: FMain.class:2335 msgid "&Tips of the day" msgstr "&Astuces du jour" -#: FMain.class:2325 +#: FMain.class:2344 msgid "&About Gambas..." msgstr "&A propos de Gambas..." -#: FMain.class:2338 +#: FMain.class:2357 msgid "&Directory" msgstr "&Répertoire" -#: FMain.class:2344 +#: FMain.class:2363 msgid "&Project link..." msgstr "Lien vers un &projet..." -#: FMain.class:2354 +#: FMain.class:2373 msgid "&Module..." msgstr "&Module..." -#: FMain.class:2362 +#: FMain.class:2381 msgid "&Class..." msgstr "&Classe..." -#: FMain.class:2370 +#: FMain.class:2389 msgid "&Form..." msgstr "&Formulaire..." -#: FMain.class:2378 +#: FMain.class:2397 msgid "&WebPage..." msgstr "&Page Web..." -#: FMain.class:2386 +#: FMain.class:2405 msgid "&Report..." msgstr "&État..." -#: FMain.class:2397 +#: FMain.class:2416 msgid "&Image..." msgstr "&Image..." -#: FMain.class:2404 +#: FMain.class:2423 msgid "&HTML file..." msgstr "Fichiers &HTML..." -#: FMain.class:2411 +#: FMain.class:2430 msgid "&Style sheet..." msgstr "&Feuille de style..." -#: FMain.class:2419 +#: FMain.class:2438 msgid "&Other..." msgstr "&Autre..." -#: FMain.class:2434 +#: FMain.class:2453 msgid "Edit &code" msgstr "Editer le &code" -#: FMain.class:2438 +#: FMain.class:2457 msgid "Edit with" msgstr "Éditer avec" -#: FMain.class:2449 +#: FMain.class:2468 msgid "&Cut" msgstr "&Couper" -#: FMain.class:2470 +#: FMain.class:2489 msgid "&Rename..." msgstr "&Renommer..." -#: FMain.class:2477 +#: FMain.class:2496 msgid "&Delete..." msgstr "&Supprimer..." -#: FMain.class:2487 +#: FMain.class:2506 msgid "Copy file pat&h" msgstr "Copier le c&hemin du fichier" -#: FMain.class:2504 +#: FMain.class:2523 msgid "&Add to repository" msgstr "&Ajouter au référentiel" -#: FMain.class:2529 +#: FMain.class:2548 msgid "&New connection..." msgstr "&Nouvelle connexion..." -#: FMain.class:2537 +#: FMain.class:2556 msgid "&Open" msgstr "&Ouvrir" -#: FMain.class:2622 +#: FMain.class:2640 msgid "Open project" msgstr "Ouvrir un projet" -#: FMain.class:2629 +#: FMain.class:2647 msgid "Save project" msgstr "Enregistrer le projet" -#: FMain.class:2636 Project.module:2117 +#: FMain.class:2654 Project.module:2121 msgid "Save project as" msgstr "Enregistrer le projet sous" -#: FMain.class:2643 FPropertyProject.class:54 +#: FMain.class:2661 FPropertyProject.class:54 msgid "Project properties" msgstr "Propriétés du projet" -#: FMain.class:2651 +#: FMain.class:2669 msgid "Refresh project" msgstr "Rafraîchir le projet" -#: FMain.class:2658 FOption.class:903 +#: FMain.class:2676 FOption.class:896 msgid "Preferences" msgstr "Préférences" -#: FMain.class:2667 +#: FMain.class:2685 msgid "Shortcuts" msgstr "Raccourcis" -#: FMain.class:2678 +#: FMain.class:2696 msgid "Translate" msgstr "Traduire" -#: FMain.class:2686 +#: FMain.class:2704 msgid "Make source archive" msgstr "Générer une archive des sources" -#: FMain.class:2693 FMakeExecutable.class:76 +#: FMain.class:2711 FMakeExecutable.class:76 msgid "Make executable" msgstr "Générer l'exécutable" -#: FMain.class:2701 FMakeInstall.class:1183 +#: FMain.class:2719 FMakeInstall.class:1183 msgid "Make installation package" msgstr "Créer un paquetage d'installation" -#: FMain.class:2723 +#: FMain.class:2741 msgid "Properties sheet" msgstr "Feuille de propriétés" -#: FMain.class:2732 +#: FMain.class:2750 msgid "Toolbox" msgstr "Boîte à outils" -#: FMain.class:2758 +#: FMain.class:2768 FSearch.class:867 +msgid "Search" +msgstr "Rechercher" + +#: FMain.class:2785 msgid "Compile" msgstr "Compiler" -#: FMain.class:2765 +#: FMain.class:2792 msgid "Compile all" msgstr "Tout compiler" -#: FMain.class:2772 +#: FMain.class:2799 msgid "Run" msgstr "Démarrer" -#: FMain.class:2779 +#: FMain.class:2806 msgid "Pause" msgstr "Pause" -#: FMain.class:2786 +#: FMain.class:2813 msgid "Stop" msgstr "Arrêter" -#: FMain.class:2793 +#: FMain.class:2820 msgid "Step" msgstr "Pas-à-pas" -#: FMain.class:2800 +#: FMain.class:2827 msgid "Forward" msgstr "Avancer" -#: FMain.class:2807 +#: FMain.class:2834 msgid "Finish current function" msgstr "Terminer la fonction courante" -#: FMain.class:2815 +#: FMain.class:2842 msgid "Run until current line" msgstr "Exécuter jusqu'à la ligne courante" -#: FMain.class:2826 -msgid "Search string" -msgstr "Chaîne de recherche" - -#: FMain.class:2832 -msgid "Search in project" -msgstr "Rechercher dans tout le projet" - -#: FMain.class:2839 -msgid "Search & replace" -msgstr "Rechercher & remplacer" - -#: FMain.class:2853 -msgid "Show menu bar" -msgstr "Afficher la barre de menus" - -#: FMain.class:2882 +#: FMain.class:2953 msgid "Reset filter" msgstr "Réinitialiser le filtre" -#: FMain.class:2938 FProperty.class:1146 MHelp.module:583 +#: FMain.class:3009 FProperty.class:1146 MHelp.module:583 msgid "Properties" msgstr "Propriétés" @@ -2734,7 +2726,7 @@ msgid "Please enter your e-mail address." msgstr "Veuillez saisir votre adresse e-mail." #: FMakeInstall.class:318 FPropertyProject.class:1017 FSave.class:111 -#: Project.module:2822 +#: Project.module:2826 msgid "Continue" msgstr "Continuer" @@ -3190,215 +3182,215 @@ msgstr "Exporter un fichier thème" msgid "Select a theme file" msgstr "Choisissez un fichier thème" -#: FOption.class:323 +#: FOption.class:316 msgid "You need to restart the application to see your changes." msgstr "Vous devez redémarrer l'application pour que vos changements prennent effet." -#: FOption.class:600 +#: FOption.class:593 msgid "Do you really want to clear the documentation cache?" msgstr "Désirez-vous réellement vider le cache de la documentation ?" -#: FOption.class:747 +#: FOption.class:740 msgid "Do you really want to delete this snippet?" msgstr "Voulez-vous vraiment supprimer ce fragment ?" -#: FOption.class:914 +#: FOption.class:907 msgid "Foreground color..." msgstr "Avant-plan..." -#: FOption.class:918 +#: FOption.class:911 msgid "Background color..." msgstr "Arrière-plan..." -#: FOption.class:925 +#: FOption.class:918 msgid "Bold" msgstr "Gras" -#: FOption.class:929 +#: FOption.class:922 msgid "Italic" msgstr "Italique" -#: FOption.class:933 +#: FOption.class:926 msgid "Underline" msgstr "Souligné" -#: FOption.class:957 +#: FOption.class:950 msgid "Interface" msgstr "Interface" -#: FOption.class:967 +#: FOption.class:960 msgid "Font size" msgstr "Taille de police" -#: FOption.class:973 +#: FOption.class:966 msgid "Normal" msgstr "Normal" -#: FOption.class:973 +#: FOption.class:966 msgid "Small" msgstr "Petite" -#: FOption.class:973 +#: FOption.class:966 msgid "Tiny" msgstr "Très petite" -#: FOption.class:984 +#: FOption.class:977 msgid "Tabstrip font size" msgstr "Taille des titres d'onglets" -#: FOption.class:1001 +#: FOption.class:994 msgid "Toolbox size" msgstr "Taille de la boîte à outils" -#: FOption.class:1018 +#: FOption.class:1011 msgid "Sort properties" msgstr "Trier les propriétés" -#: FOption.class:1024 FPropertyProject.class:1648 +#: FOption.class:1017 FPropertyProject.class:1648 msgid "No" msgstr "Non" -#: FOption.class:1024 FPropertyProject.class:1648 +#: FOption.class:1017 FPropertyProject.class:1648 msgid "Yes" msgstr "Oui" -#: FOption.class:1039 +#: FOption.class:1032 msgid "Minimize at runtime" msgstr "Minimiser à l'exécution" -#: FOption.class:1060 +#: FOption.class:1053 msgid "Icon theme" msgstr "Thème d'icône" -#: FOption.class:1077 +#: FOption.class:1070 msgid "Quiet external commands" msgstr "Commandes externes silencieuses" -#: FOption.class:1098 +#: FOption.class:1091 msgid "Use utility windows" msgstr "Utiliser des fenêtres utilitaires" -#: FOption.class:1129 +#: FOption.class:1122 msgid "Default tab size" msgstr "Tabulation par défaut" -#: FOption.class:1141 FPropertyProject.class:1623 +#: FOption.class:1134 FPropertyProject.class:1623 msgid "space(s)" msgstr "espace(s)" -#: FOption.class:1152 +#: FOption.class:1145 msgid "Procedure separation" msgstr "Séparation des procédures" -#: FOption.class:1158 +#: FOption.class:1151 msgid "Blend" msgstr "Dégradé" -#: FOption.class:1158 FProperty.class:743 +#: FOption.class:1151 FProperty.class:743 msgid "None" msgstr "Aucun" -#: FOption.class:1169 +#: FOption.class:1162 msgid "Highlight current line" msgstr "Surligner la ligne courante" -#: FOption.class:1190 +#: FOption.class:1183 msgid "Highlight modified lines" msgstr "Indiquer les lignes modifiées" -#: FOption.class:1211 +#: FOption.class:1204 msgid "Show line numbers" msgstr "Afficher les numéros de lignes" -#: FOption.class:1232 +#: FOption.class:1225 msgid "Fold procedures by default" msgstr "Replier les procedures par défaut" -#: FOption.class:1253 +#: FOption.class:1246 msgid "Keywords in upper case" msgstr "Mots-clefs en majuscule" -#: FOption.class:1273 +#: FOption.class:1266 msgid "Applications" msgstr "Applications" -#: FOption.class:1284 +#: FOption.class:1277 msgid "Browser" msgstr "Navigateur" -#: FOption.class:1301 +#: FOption.class:1294 msgid "Terminal" msgstr "Terminal" -#: FOption.class:1318 +#: FOption.class:1311 msgid "Image editor" msgstr "Éditeur d'images" -#: FOption.class:1334 MTheme.module:6 +#: FOption.class:1327 MTheme.module:6 msgid "Help" msgstr "Aide" -#: FOption.class:1345 +#: FOption.class:1338 msgid "Display property help" msgstr "Afficher l'aide des propriétés" -#: FOption.class:1366 +#: FOption.class:1359 msgid "Show tooltips" msgstr "Afficher les bulles d'aide" -#: FOption.class:1387 +#: FOption.class:1380 msgid "Show documentation in popups" msgstr "Afficher la documentation dans les popups" -#: FOption.class:1408 +#: FOption.class:1401 msgid "Clear documentation cache" msgstr "Vider le cache de la documentation" -#: FOption.class:1415 +#: FOption.class:1408 msgid "Style" msgstr "Style" -#: FOption.class:1424 +#: FOption.class:1417 msgid "Fonts" msgstr "Polices" -#: FOption.class:1464 +#: FOption.class:1457 msgid "Theme" msgstr "Thème" -#: FOption.class:1482 +#: FOption.class:1475 msgid "Import theme" msgstr "Importer un thème" -#: FOption.class:1488 +#: FOption.class:1481 msgid "Export theme" msgstr "Exporter le thème" -#: FOption.class:1510 +#: FOption.class:1503 msgid "Code snippets" msgstr "Fragments de code" -#: FOption.class:1518 +#: FOption.class:1511 msgid "Activate code snippets" msgstr "Activer les fragments de code" -#: FOption.class:1540 FTranslate.class:1714 +#: FOption.class:1533 FTranslate.class:1714 msgid "&New..." msgstr "&Nouveau..." -#: FOption.class:1547 +#: FOption.class:1540 msgid "&Edit..." msgstr "&Éditer..." -#: FOption.class:1562 +#: FOption.class:1555 msgid "Re&set" msgstr "Réini&tialiser" -#: FOption.class:1570 +#: FOption.class:1563 msgid "E&xport..." msgstr "E&xporter..." -#: FOption.class:1578 +#: FOption.class:1571 msgid "&Import..." msgstr "&Importer..." @@ -3780,55 +3772,51 @@ msgstr "La chaîne de caractères recherchée à été remplacée une fois." msgid "Search string replaced &1 times." msgstr "La chaîne de caractères a été remplacée &1 fois." -#: FSearch.class:866 -msgid "Search" -msgstr "Rechercher" - -#: FSearch.class:892 +#: FSearch.class:893 msgid "Replace" msgstr "Remplacer" -#: FSearch.class:915 +#: FSearch.class:916 msgid "&Case sensitive" msgstr "Tenir compte de la &casse" -#: FSearch.class:920 +#: FSearch.class:921 msgid "&Words only" msgstr "&Mots seulements" -#: FSearch.class:925 +#: FSearch.class:926 msgid "Regular e&xpression" msgstr "E&xpression rationnelle" -#: FSearch.class:930 +#: FSearch.class:931 msgid "&Highlight result" msgstr "&Surligner le résultat" -#: FSearch.class:940 +#: FSearch.class:941 msgid "&Ignore strings" msgstr "&Ignorer les chaînes" -#: FSearch.class:945 +#: FSearch.class:946 msgid "I&gnore comments" msgstr "I&gnorer les commentaires" -#: FSearch.class:950 +#: FSearch.class:951 msgid "C&urrent procedure" msgstr "Procedure co&urante" -#: FSearch.class:978 +#: FSearch.class:979 msgid "&Replace" msgstr "&Remplacer" -#: FSearch.class:984 +#: FSearch.class:985 msgid "Replace &all" msgstr "&Tout remplacer" -#: FSearch.class:990 +#: FSearch.class:991 msgid "&Browse" msgstr "P&arcourir" -#: FSearch.class:1006 +#: FSearch.class:1007 msgid "Browse" msgstr "Parcourir" @@ -5384,11 +5372,11 @@ msgstr "troisième" msgid "&1th" msgstr "&1ème" -#: Project.module:1824 +#: Project.module:1828 msgid "in form definition" msgstr "dans la définition du formulaire" -#: Project.module:1975 +#: Project.module:1979 msgid "" "Some project source files are in conflict.\n" "Please solve them if you want to compile the project." @@ -5396,147 +5384,147 @@ msgstr "" "Certains fichiers sources du projet sont en conflit.\n" "Veuillez résoudre ces conflits pour pouvoir compiler le projet." -#: Project.module:1979 +#: Project.module:1983 msgid "Compiling project" msgstr "Compilation du projet" -#: Project.module:1991 +#: Project.module:1995 msgid "Nothing to do." msgstr "Rien à faire." -#: Project.module:2123 +#: Project.module:2127 msgid "This project already exists." msgstr "Ce projet existe déjà." -#: Project.module:2136 +#: Project.module:2140 msgid "Unable to save the project." msgstr "Impossible d'enregistrer le projet." -#: Project.module:2206 +#: Project.module:2210 msgid "File already exists." msgstr "Ce fichier existe déja." -#: Project.module:2239 +#: Project.module:2243 msgid "Directory already exists." msgstr "Le répertoire existe déja." -#: Project.module:2251 +#: Project.module:2255 msgid "Cannot link template file." msgstr "Impossible de créer le lien vers le fichier modèle." -#: Project.module:2257 +#: Project.module:2261 msgid "Cannot copy template file." msgstr "Impossible de copier le fichier modèle." -#: Project.module:2432 +#: Project.module:2436 msgid "Making executable..." msgstr "Génération de l'exécutable..." -#: Project.module:2476 +#: Project.module:2480 msgid "Cannot make executable." msgstr "Impossible de créer l'exécutable." -#: Project.module:2821 +#: Project.module:2825 msgid "Some components are missing: &1" msgstr "Certains composants ne sont pas installés: &1" -#: Project.module:3027 +#: Project.module:3031 msgid "Cannot write project file." msgstr "Impossible d'écrire le fichier projet." -#: Project.module:3059 +#: Project.module:3063 msgid "Unable to create desktop shortcut." msgstr "Imposible de créer le raccourci sur le bureau." -#: Project.module:3315 +#: Project.module:3319 msgid "The directory will be removed at the next commit." msgstr "Le répertoire sera supprimé au prochain 'commit'." -#: Project.module:3332 +#: Project.module:3336 msgid "You must define a startup class or form!" msgstr "Vous devez définir une classe ou un formulaire de démarrage !" -#: Project.module:3363 +#: Project.module:3367 msgid "Please type a name." msgstr "Veuillez saisir un nom." -#: Project.module:3367 +#: Project.module:3371 msgid "This name contains a forbidden character:" msgstr "Ce nom contient un caractère interdit:" -#: Project.module:3371 +#: Project.module:3375 msgid "The name cannot begins with a dot." msgstr "Le nom ne peut pas commencer par un point." -#: Project.module:3375 +#: Project.module:3379 msgid "This name is already used. Choose another one." msgstr "Ce nom est déjà utilisé. Choisissez-en un autre." -#: Project.module:3405 +#: Project.module:3409 msgid "A class name must begin with a letter or an underscore, followed by any letter or digit." msgstr "Un nom de classe doit commencer par une lettre ou un caractère '_', et être suivi par des lettres ou des chiffres. " -#: Project.module:3452 +#: Project.module:3456 msgid "Destination already exists" msgstr "La destination existe déjà." -#: Project.module:3652 +#: Project.module:3656 msgid "Unable to rename '&1'" msgstr "Impossible de renommer « &1 »" -#: Project.module:3767 +#: Project.module:3771 msgid "Please type a project name." msgstr "Veuillez saisir un nom de projet." -#: Project.module:3775 +#: Project.module:3779 msgid "The project name cannot begin with a dot." msgstr "Un nom de projet ne peut commencer par un point." -#: Project.module:3778 +#: Project.module:3782 msgid "Non-ASCII characters are forbidden in a project name." msgstr "Un nom de projet ne peut contenir que des caractères ASCII." -#: Project.module:3779 +#: Project.module:3783 msgid "The following characters are forbidden in a project name: ? * / \\ SPACE" msgstr "Les caractères suivants sont interdits dans un nom de projet : ? * / \\ ESPACE" -#: Project.module:3789 +#: Project.module:3793 msgid "The project directory already exists." msgstr "Le répertoire du projet existe déjà." -#: Project.module:3791 +#: Project.module:3795 msgid "The project directory cannot be created because a file with the same name already exists." msgstr "Le répertoire du projet ne peut être créé car un fichier avec le même nom existe déjà." -#: Project.module:3836 +#: Project.module:3840 msgid "Create source package" msgstr "Générer un package des sources du projet" -#: Project.module:3837 +#: Project.module:3841 msgid "Source packages" msgstr "Paquetages sources" -#: Project.module:4106 +#: Project.module:4110 msgid "Cannot copy file &1." msgstr "Impossible de copier le fichier &1." -#: Project.module:4155 +#: Project.module:4159 msgid "Cannot create link &1." msgstr "Impossible de créer le lien &1." -#: Project.module:4172 +#: Project.module:4176 msgid "Cannot move a directory inside itself." msgstr "Impossible de déplacer un répertoire à l'intérieur de lui-même." -#: Project.module:4236 +#: Project.module:4240 msgid "Cannot move file &1." msgstr "Impossible de déplacer le fichier &1." -#: Project.module:4774 +#: Project.module:4778 msgid "modified" msgstr "modifié" -#: Project.module:4852 +#: Project.module:4856 msgid "Unable to update all forms." msgstr "Impossible de mettre à jour tous les formulaires." @@ -5547,3 +5535,15 @@ msgstr "Auteur" #: Save.module:39 msgid "Cannot save file !" msgstr "Impossible d'enregistrer le fichier !" + +#~ msgid "Show menu bar" +#~ msgstr "Afficher la barre de menus" + +#~ msgid "Search & replace" +#~ msgstr "Rechercher & remplacer" + +#~ msgid "Search in project" +#~ msgstr "Rechercher dans tout le projet" + +#~ msgid "Search string" +#~ msgstr "Chaîne de recherche" diff --git a/app/src/gambas3/.src/Debug/Design.module b/app/src/gambas3/.src/Debug/Design.module index 218c37955..f922baa2e 100644 --- a/app/src/gambas3/.src/Debug/Design.module +++ b/app/src/gambas3/.src/Debug/Design.module @@ -1030,13 +1030,16 @@ End Public Sub SetBreakpoint(sClass As String, iLine As Integer, bOn As Boolean) Dim hEditor As FEditor + Dim sPath As String 'Debug sClass; "."; iLine;; bOn If $iState = STATE_RUNNING Then Return ' Update editor - hEditor = Project.LoadFile(Project.FindPath(sClass)) + sPath = Project.FindPath(sClass) + If Not sPath Then Return + Try hEditor = Project.LoadFile(sPath) If Not hEditor Then Return If hEditor.SetBreakpoint(iLine, bOn) Then Return diff --git a/app/src/gambas3/.src/FWelcome.form b/app/src/gambas3/.src/FWelcome.form index d98672cfe..57f48433b 100644 --- a/app/src/gambas3/.src/FWelcome.form +++ b/app/src/gambas3/.src/FWelcome.form @@ -1,7 +1,7 @@ # Gambas Form File 3.0 { Form Form - MoveScaled(0,2,71,74) + MoveScaled(0,2,83,74) Background = Color.TextBackground Foreground = Color.TextForeground Text = ("Welcome to Gambas 3") diff --git a/app/src/gambas3/.src/Help/MHelp.module b/app/src/gambas3/.src/Help/MHelp.module index 0bd182309..7ecd595ee 100644 --- a/app/src/gambas3/.src/Help/MHelp.module +++ b/app/src/gambas3/.src/Help/MHelp.module @@ -304,7 +304,7 @@ Public Sub GetSymbolURL(sComponent As String, sClass As String, Optional sSymbol 'If sComp = "gb.qt4" Or If sComp = "gb.gtk" Or If sComp = "gb.gui" Then sComp = "gb.qt" 'If sComp = "gb.qt4.ext" Then sComp = "gb.qt.ext" sPath &/= LCase(sComp) - sPath &/= Replace(LCase(sClass), "_", ".") + sPath &/= LCase(Left(sClass) & Replace(Mid(sClass, 2), "_", ".")) If sSymbol Then sName = LCase(sSymbol) diff --git a/app/src/gambas3/.src/Project/FOpenProject.class b/app/src/gambas3/.src/Project/FOpenProject.class index 1db0436d5..08d11d24d 100644 --- a/app/src/gambas3/.src/Project/FOpenProject.class +++ b/app/src/gambas3/.src/Project/FOpenProject.class @@ -68,7 +68,6 @@ Public Sub btnOK_Click() 'Settings["/FOpenProject/Path"] = $sPath 'tabProject.Index = 0 lstRecent.Clear - InAnotherWindow = chkOther.Value Me.Close(True) @@ -92,9 +91,8 @@ Public Sub Form_Open() dchProject_Change tabProject_Click - chkOther.Value = False InAnotherWindow = False - chkOther.Visible = $bAnother + btnOther.Visible = $bAnother chkSortRecent.Value = Settings["/FOpenProjet/SortRecent", False] End @@ -358,3 +356,11 @@ Public Sub splProject_Resize() panProjectTitle.H = $hProjectItem.IdealHeight + panProjectTitle.Padding * 2 End + +Public Sub btnOther_Click() + + InAnotherWindow = True + btnOK_Click + + +End diff --git a/app/src/gambas3/.src/Project/FOpenProject.form b/app/src/gambas3/.src/Project/FOpenProject.form index 7116fcc48..1c07e9c05 100644 --- a/app/src/gambas3/.src/Project/FOpenProject.form +++ b/app/src/gambas3/.src/Project/FOpenProject.form @@ -75,24 +75,24 @@ Index = 0 } { HBox1 HBox - MoveScaled(1,71,87,4) + MoveScaled(1,71,112,4) Spacing = True - { chkOther CheckBox - MoveScaled(1,0,43,4) + { Panel1 Panel + MoveScaled(31,0,3,4) Expand = True + } + { btnOther Button + MoveScaled(49,0,27,4) + AutoResize = True Text = ("Open in another window") } - { Panel1 Panel - MoveScaled(45,0,3,4) - Expand = True - } { btnOK Button - MoveScaled(48,0,15,4) + MoveScaled(78,0,15,4) Text = ("OK") Default = True } { btnCancel Button - MoveScaled(65,0,15,4) + MoveScaled(95,0,15,4) Text = ("Cancel") Cancel = True } diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project index 3e1622ebd..0805ceb12 100644 --- a/comp/src/gb.form/.project +++ b/comp/src/gb.form/.project @@ -9,7 +9,7 @@ Component=gb.gui Component=gb.form Component=gb.settings Authors="Benoît Minisini" -Environment="GB_GUI=gb.gtk" +Environment="GB_GUI=gb.qt4" TabSize=2 Translate=1 Language=en diff --git a/gb.dbus/src/gb.dbus/.settings b/gb.dbus/src/gb.dbus/.settings index ca0644aa3..00bd68ccd 100644 --- a/gb.dbus/src/gb.dbus/.settings +++ b/gb.dbus/src/gb.dbus/.settings @@ -36,9 +36,9 @@ SearchComment=False SearchString=True [OpenFile] -Active=1 File[1]=".src/MMain.module:37.3" File[2]=".src/DBusApplication.class:55.51" +Active=3 File[3]=".src/DBus.class:9.0" File[4]=".src/DBusProxy.class:22.2" File[5]=".src/DBusObject.class:360.2" diff --git a/gb.gtk/src/glabel.cpp b/gb.gtk/src/glabel.cpp index c2bf69211..133604960 100644 --- a/gb.gtk/src/glabel.cpp +++ b/gb.gtk/src/glabel.cpp @@ -198,8 +198,15 @@ void gLabel::updateSize(bool adjust, bool noresize) pango_layout_get_pixel_size(layout, &w, &h); //fprintf(stderr, "gLabel::updateSize: %s (%d %d) -> (%d %d)\n", name(), width(), height(), w + fw * 2, h + fw * 2); + + w += fw * 2; + h += fw * 2; + + if ((align == ALIGN_CENTER || align == ALIGN_LEFT || align == ALIGN_NORMAL || align == ALIGN_RIGHT) && h < height()) + h = height(); + _locked = true; - resize(width(), h + fw * 2); + resize(w, h); _locked = false; } diff --git a/gb.qt4/src/CLabel.cpp b/gb.qt4/src/CLabel.cpp index a6508807e..38826547d 100644 --- a/gb.qt4/src/CLabel.cpp +++ b/gb.qt4/src/CLabel.cpp @@ -281,12 +281,14 @@ void MyLabel::calcMinimumHeight(bool adjust) br = fm.boundingRect(0, 0, QWIDGETSIZE_MAX, QWIDGETSIZE_MAX, alignment(), text()); nw = br.width(); nh = br.height(); - if (alignment() & Qt::AlignVCenter && (nh + f * 2) < height()) - nh = height() - f * 2; } w = nw + f * 2; h = nh + f * 2; + + if (alignment() & Qt::AlignVCenter && nh < height()) + nh = height(); + locked = true; CWIDGET_resize(THIS, w, h); locked = false; diff --git a/main/gbc/gbc_read.c b/main/gbc/gbc_read.c index 2e0a7b052..51a22d717 100644 --- a/main/gbc/gbc_read.c +++ b/main/gbc/gbc_read.c @@ -836,7 +836,7 @@ static void add_string() newline++; else if (car == '"') jump = FALSE; - else if (!isspace(car)) + else if (!car || !isspace(car)) break; } else diff --git a/main/gbx/gbx_c_error.c b/main/gbx/gbx_c_error.c index 6e41c92fa..269a74a5d 100644 --- a/main/gbx/gbx_c_error.c +++ b/main/gbx/gbx_c_error.c @@ -59,7 +59,7 @@ static void get_subst(int np, char **str, int *len) BEGIN_PROPERTY(CERROR_text) - if (ERROR_last.code) + if (ERROR_last.code && ERROR_last.msg) { if (EXEC_debug) { diff --git a/main/gbx/gbx_exec.c b/main/gbx/gbx_exec.c index abddb9760..bf56fbeaf 100644 --- a/main/gbx/gbx_exec.c +++ b/main/gbx/gbx_exec.c @@ -1839,7 +1839,6 @@ void EXEC_new(void) void *object; char *name = NULL; char *cname = NULL; - char *save_name; np = *PC & 0xFF; event = np & CODE_NEW_EVENT; diff --git a/main/gbx/gbx_string.c b/main/gbx/gbx_string.c index 55b71a01f..20a131287 100644 --- a/main/gbx/gbx_string.c +++ b/main/gbx/gbx_string.c @@ -41,6 +41,8 @@ #include "gbx_string.h" +//#define DEBUG_ME + #if DEBUG_STRING #define DEBUG_ME #endif @@ -130,8 +132,8 @@ static int _pool_count[POOL_SIZE] = { 0 }; #ifdef DEBUG_ME -#define alloc_string(_len) \ -({ \ +static STRING *alloc_string(_len) \ +{ \ STRING *str; \ int size = REAL_SIZE((_len) + 1 + sizeof(STRING)); \ int pool = (size / SIZE_INC) - 1; \ @@ -153,8 +155,8 @@ static int _pool_count[POOL_SIZE] = { 0 }; } \ str->len = (_len); \ str->ref = 1; \ - str; \ -}) + return str; \ +} #else diff --git a/main/gbx/gbx_subr_misc.c b/main/gbx/gbx_subr_misc.c index 7cc770d84..cc3c1c5d3 100644 --- a/main/gbx/gbx_subr_misc.c +++ b/main/gbx/gbx_subr_misc.c @@ -233,7 +233,10 @@ void EVAL_string(char *expr) EVAL.New((void **)(void *)&eval, expr, len); if (EVAL.Compile(eval, FALSE)) + { + GB_Error(eval->error); goto _ERROR; + } if (!EVAL.Run(eval, get_value)) goto _ERROR; @@ -275,7 +278,10 @@ void SUBR_eval(ushort code) EVAL.New((void **)(void *)&eval, expr, len); if (EVAL.Compile(eval, FALSE)) + { + GB_Error(eval->error); goto _ERROR; + } if (!EVAL.Run(eval, get_value)) goto _ERROR; diff --git a/main/lib/eval/eval_read.c b/main/lib/eval/eval_read.c index 520070ccd..a0f116206 100644 --- a/main/lib/eval/eval_read.c +++ b/main/lib/eval/eval_read.c @@ -934,7 +934,7 @@ static void add_string() newline++; else if (car == '"') jump = FALSE; - else if (!isspace(car)) + else if (!car || !isspace(car)) break; } else