From d3ed46eaced9f19e3c255824e1a14b91bad992f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Mon, 11 Apr 2011 23:35:48 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * NEW: Some error are ignored when using instant watch. git-svn-id: svn://localhost/gambas/trunk@3750 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.lang/.pot | 78 +++++++++---------- .../gambas3/.src/Editor/Code/FEditor.class | 1 + 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index 480e63de0..6e64b8254 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -290,11 +290,11 @@ msgstr "" msgid "Provides" msgstr "" -#: CInsertColor.class:103 FEditor.class:3689 FTextEditor.class:1011 +#: CInsertColor.class:103 FEditor.class:3690 FTextEditor.class:1011 msgid "Insert color" msgstr "" -#: CModule.class:28 FCreateFile.class:652 FEditor.class:3654 FForm.class:3728 +#: CModule.class:28 FCreateFile.class:652 FEditor.class:3655 FForm.class:3728 #: FInfo.class:89 msgid "Form" msgstr "" @@ -511,45 +511,45 @@ msgid "" msgstr "" #: FCommit.class:234 FConflict.class:325 FConnectionEditor.class:1874 -#: FEditor.class:3487 FForm.class:3558 FIconEditor.class:2176 +#: FEditor.class:3488 FForm.class:3558 FIconEditor.class:2176 #: FImageEditor.class:77 FMenu.class:971 FOutput.class:379 #: FTextEditor.class:784 msgid "Cut" msgstr "" #: FCommit.class:240 FConflict.class:331 FConnectionEditor.class:1651 -#: FEditor.class:3493 FForm.class:3565 FIconEditor.class:2184 +#: FEditor.class:3494 FForm.class:3565 FIconEditor.class:2184 #: FImageEditor.class:86 FMenu.class:977 FOutput.class:386 #: FTextEditor.class:791 msgid "Copy" msgstr "" #: FCommit.class:246 FConflict.class:337 FConnectionEditor.class:1895 -#: FEditor.class:3500 FForm.class:3578 FIconEditor.class:2192 +#: FEditor.class:3501 FForm.class:3578 FIconEditor.class:2192 #: FImageEditor.class:95 FMenu.class:983 FOutput.class:393 #: FPasteTable.class:331 FTextEditor.class:798 msgid "Paste" msgstr "" #: FCommit.class:252 FConflict.class:343 FConnectionEditor.class:1902 -#: FEditor.class:3471 FForm.class:3803 FIconEditor.class:2160 +#: FEditor.class:3472 FForm.class:3803 FIconEditor.class:2160 #: FImageEditor.class:105 FOption.class:1552 FOutput.class:362 #: FTextEditor.class:767 msgid "Undo" msgstr "" #: FCommit.class:258 FConflict.class:349 FConnectionEditor.class:1909 -#: FEditor.class:3478 FForm.class:3813 FImageEditor.class:113 +#: FEditor.class:3479 FForm.class:3813 FImageEditor.class:113 #: FOutput.class:369 FTextEditor.class:774 msgid "Redo" msgstr "" -#: FCommit.class:264 FConflict.class:355 FEditor.class:3715 FMenu.class:993 +#: FCommit.class:264 FConflict.class:355 FEditor.class:3716 FMenu.class:993 #: FTextEditor.class:970 msgid "Indent" msgstr "" -#: FCommit.class:270 FConflict.class:361 FEditor.class:3723 FMenu.class:999 +#: FCommit.class:270 FConflict.class:361 FEditor.class:3724 FMenu.class:999 #: FTextEditor.class:977 msgid "Unindent" msgstr "" @@ -697,7 +697,7 @@ msgstr "" msgid "The table '&1' has been modified. Do you want to save it?" msgstr "" -#: FConnectionEditor.class:284 FEditor.class:3605 FForm.class:3719 +#: FConnectionEditor.class:284 FEditor.class:3606 FForm.class:3719 #: FIconEditor.class:1426 FImageEditor.class:60 FTextEditor.class:889 msgid "Save" msgstr "" @@ -1295,119 +1295,119 @@ msgid "" "All your changes will be lost." msgstr "" -#: FEditor.class:2726 +#: FEditor.class:2727 msgid "(Declarations)" msgstr "" -#: FEditor.class:3407 +#: FEditor.class:3408 msgid "Go to" msgstr "" -#: FEditor.class:3412 FTextEditor.class:758 +#: FEditor.class:3413 FTextEditor.class:758 msgid "Go to line..." msgstr "" -#: FEditor.class:3418 +#: FEditor.class:3419 msgid "Find definition" msgstr "" -#: FEditor.class:3425 FHelpBrowser.class:329 +#: FEditor.class:3426 FHelpBrowser.class:329 msgid "Go back" msgstr "" -#: FEditor.class:3432 +#: FEditor.class:3433 msgid "Open form" msgstr "" -#: FEditor.class:3439 FForm.class:3490 FMain.class:2637 +#: FEditor.class:3440 FForm.class:3490 FMain.class:2637 msgid "&Startup class" msgstr "" -#: FEditor.class:3447 +#: FEditor.class:3448 msgid "Run &until current line" msgstr "" -#: FEditor.class:3454 +#: FEditor.class:3455 msgid "Toggle &breakpoint" msgstr "" -#: FEditor.class:3462 +#: FEditor.class:3463 msgid "&Watch expression" msgstr "" -#: FEditor.class:3507 +#: FEditor.class:3508 msgid "Paste special..." msgstr "" -#: FEditor.class:3513 FTextEditor.class:805 +#: FEditor.class:3514 FTextEditor.class:805 msgid "Insert color..." msgstr "" -#: FEditor.class:3522 FTextEditor.class:814 +#: FEditor.class:3523 FTextEditor.class:814 msgid "Select &All" msgstr "" -#: FEditor.class:3531 +#: FEditor.class:3532 msgid "Comment" msgstr "" -#: FEditor.class:3538 +#: FEditor.class:3539 msgid "Uncomment" msgstr "" -#: FEditor.class:3548 FOutput.class:410 FTextEditor.class:823 +#: FEditor.class:3549 FOutput.class:410 FTextEditor.class:823 msgid "Find next" msgstr "" -#: FEditor.class:3555 FOutput.class:417 FTextEditor.class:830 +#: FEditor.class:3556 FOutput.class:417 FTextEditor.class:830 msgid "Find previous" msgstr "" -#: FEditor.class:3564 FTextEditor.class:839 +#: FEditor.class:3565 FTextEditor.class:839 msgid "View" msgstr "" -#: FEditor.class:3568 FTextEditor.class:843 +#: FEditor.class:3569 FTextEditor.class:843 msgid "No split" msgstr "" -#: FEditor.class:3575 FTextEditor.class:850 +#: FEditor.class:3576 FTextEditor.class:850 msgid "Horizontal split" msgstr "" -#: FEditor.class:3582 FTextEditor.class:857 +#: FEditor.class:3583 FTextEditor.class:857 msgid "Vertical split" msgstr "" -#: FEditor.class:3593 +#: FEditor.class:3594 msgid "Make code pretty" msgstr "" -#: FEditor.class:3615 FPasteSpecial.class:253 +#: FEditor.class:3616 FPasteSpecial.class:253 msgid "Paste as string" msgstr "" -#: FEditor.class:3620 FPasteSpecial.class:258 +#: FEditor.class:3621 FPasteSpecial.class:258 msgid "Paste as multi-line string" msgstr "" -#: FEditor.class:3625 FPasteSpecial.class:243 +#: FEditor.class:3626 FPasteSpecial.class:243 msgid "Paste as comments" msgstr "" -#: FEditor.class:3632 FOption.class:1149 +#: FEditor.class:3633 FOption.class:1149 msgid "Editor" msgstr "" -#: FEditor.class:3782 +#: FEditor.class:3783 msgid "Toggle breakpoint" msgstr "" -#: FEditor.class:3791 +#: FEditor.class:3792 msgid "Watch expression" msgstr "" -#: FEditor.class:3804 +#: FEditor.class:3805 msgid "Procedure list" msgstr "" diff --git a/app/src/gambas3/.src/Editor/Code/FEditor.class b/app/src/gambas3/.src/Editor/Code/FEditor.class index b464d3aa6..52c10d88b 100644 --- a/app/src/gambas3/.src/Editor/Code/FEditor.class +++ b/app/src/gambas3/.src/Editor/Code/FEditor.class @@ -2590,6 +2590,7 @@ Public Sub ShowWatchResult(sStr As String, X As Integer, Y As Integer) If Left(sStr) = "!" Then sStr = Mid$(sStr, 2) If sStr = "Syntax error" Or If sStr = "Non terminated string" Or If sStr = "Unknown symbol" Then Return + If sStr Begins "Unexpected " Then Return sStr = Design.MakeErrorMessage(sStr) lblWatch.Background = Color.HSV(0, 64, 255) Else