From cfcb766e9356ea5c3e671b3c386c69bfbd3b19c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Fri, 30 Aug 2013 14:23:33 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * BUG: New menu are translatable by default. * BUG: Image editor: Pasting does not crash anymore. git-svn-id: svn://localhost/gambas/trunk@5821 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.lang/.pot | 20 ++- app/src/gambas3/.lang/fr.mo | Bin 114538 -> 114798 bytes app/src/gambas3/.lang/fr.po | 151 ++++++++++-------- app/src/gambas3/.src/Editor/Form/FMenu.class | 1 + .../.src/Editor/Image/FImageEditor.class | 6 +- .../.src/Editor/Image/FImageEditor.form | 28 ++-- app/src/gambas3/img/draw/grid.png | Bin 0 -> 138 bytes 7 files changed, 118 insertions(+), 88 deletions(-) create mode 100644 app/src/gambas3/img/draw/grid.png diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index cecc0bf82..fe74c2e61 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -2117,6 +2117,22 @@ msgstr "" msgid "Zoom fit" msgstr "" +#: FImageEditor.form:345 +msgid "Save as JPEG" +msgstr "" + +#: FImageEditor.form:351 +msgid "Save as PNG" +msgstr "" + +#: FImageEditor.form:356 +msgid "Save as BMP" +msgstr "" + +#: FImageEditor.form:363 +msgid "Save as TIFF" +msgstr "" + #: FImageEditor.form:370 msgid "Image editor" msgstr "" @@ -3447,11 +3463,11 @@ msgstr "" msgid "Bad group name !" msgstr "" -#: FMenu.class:588 +#: FMenu.class:589 msgid "This menu is too deep !" msgstr "" -#: FMenu.class:958 Project.module:5170 +#: FMenu.class:959 Project.module:5170 msgid "modified" msgstr "" diff --git a/app/src/gambas3/.lang/fr.mo b/app/src/gambas3/.lang/fr.mo index 58046ec7e7a002a713780e020c7db3b1c8270a01..3068e32aeaf0360bbd2d6750f4c68ca08b0e187f 100644 GIT binary patch delta 33784 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 YN=-EU|0dhT|C?%Oo99kVI^OvI1EqWEhX4Qo delta 33544 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 Y^O!472W|hNanPPz+ZT-rI#&9B0QPjmRsaA1 diff --git a/app/src/gambas3/.lang/fr.po b/app/src/gambas3/.lang/fr.po index 381d9c9f5..b3c3ce149 100644 --- a/app/src/gambas3/.lang/fr.po +++ b/app/src/gambas3/.lang/fr.po @@ -255,87 +255,87 @@ msgstr "Signet précédent" msgid "Next bookmark" msgstr "Signet suivant" -#: CClassInfo.class:557 FMain.form:1421 FProperty.form:23 +#: CClassInfo.class:571 FMain.form:1421 FProperty.form:23 msgid "Properties" msgstr "Propriétés" -#: CClassInfo.class:558 +#: CClassInfo.class:572 msgid "Variables" msgstr "Variables" -#: CClassInfo.class:559 +#: CClassInfo.class:573 msgid "Methods" msgstr "Méthodes" -#: CClassInfo.class:560 +#: CClassInfo.class:574 msgid "Events" msgstr "Evènements" -#: CClassInfo.class:588 +#: CClassInfo.class:602 msgid "This class is static." msgstr "Cette classe est statique." -#: CClassInfo.class:590 +#: CClassInfo.class:604 msgid "This class can be used like an object by creating an hidden instance on demand." msgstr "Cette classe peut être utilisée comme un objet en créant une instance cachée à la demande." -#: CClassInfo.class:594 +#: CClassInfo.class:608 msgid "This class is &1." msgstr "Cette class est &1." -#: CClassInfo.class:594 +#: CClassInfo.class:608 msgid "creatable" msgstr "instanciable" -#: CClassInfo.class:603 +#: CClassInfo.class:617 msgid "This class can be used as a &1." msgstr "Cette classe peut être utilisée comme &1." -#: CClassInfo.class:603 +#: CClassInfo.class:617 msgid "function" msgstr "fonction" -#: CClassInfo.class:608 +#: CClassInfo.class:622 msgid "This class acts like a &1 / &2 array." msgstr "Cette classe se comporte comme un tableau accessible en &1 / &2." -#: CClassInfo.class:608 +#: CClassInfo.class:622 msgid "read" msgstr "lecture" -#: CClassInfo.class:608 +#: CClassInfo.class:622 msgid "write" msgstr "écriture" -#: CClassInfo.class:610 +#: CClassInfo.class:624 msgid "This class acts like a &1 array." msgstr "Cette classe se comporte comme un tableau accessible en &1." -#: CClassInfo.class:610 +#: CClassInfo.class:624 msgid "write-only" msgstr "écriture seule" -#: CClassInfo.class:613 Project.module:1630 +#: CClassInfo.class:627 Project.module:1630 msgid "read-only" msgstr "lecture seule" -#: CClassInfo.class:618 +#: CClassInfo.class:632 msgid "This class is &1 with the FOR EACH keyword." msgstr "Cette classe est &1 à l'aide du mot-clef FOR EACH." -#: CClassInfo.class:618 +#: CClassInfo.class:632 msgid "enumerable" msgstr "énumérable" -#: CClassInfo.class:643 +#: CClassInfo.class:657 msgid "This class inherits &1." msgstr "Cette class hérite de &1." -#: CClassInfo.class:658 MTheme.module:6 +#: CClassInfo.class:672 MTheme.module:6 msgid "Symbols" msgstr "Symboles" -#: CClassInfo.class:659 +#: CClassInfo.class:673 msgid "Constants" msgstr "Constantes" @@ -982,31 +982,31 @@ msgid "Open" msgstr "Ouvrir" #: FConflict.form:53 FConnectionEditor.form:358 FEditor.form:144 -#: FForm.form:239 FImageEditor.form:118 FMenu.form:105 FOutput.form:58 +#: FForm.form:239 FImageEditor.form:123 FMenu.form:105 FOutput.form:58 #: FProjectVersion.form:234 FTextEditor.form:108 msgid "Cut" msgstr "Couper" #: FConflict.form:59 FConnectionEditor.form:147 FEditor.form:150 -#: FForm.form:246 FImageEditor.form:126 FMenu.form:111 FOutput.form:65 +#: FForm.form:246 FImageEditor.form:131 FMenu.form:111 FOutput.form:65 #: FProjectVersion.form:240 FTextEditor.form:115 msgid "Copy" msgstr "Copier" #: FConflict.form:65 FConnectionEditor.form:379 FEditor.form:157 -#: FForm.form:259 FImageEditor.form:133 FMenu.form:117 FOutput.form:72 +#: FForm.form:259 FImageEditor.form:138 FMenu.form:117 FOutput.form:72 #: FPasteTable.form:101 FProjectVersion.form:246 FTextEditor.form:122 msgid "Paste" msgstr "Coller" #: FConflict.form:71 FConnectionEditor.form:386 FEditor.form:128 -#: FForm.form:222 FImageEditor.form:99 FOption.form:561 FOutput.form:41 +#: FForm.form:222 FImageEditor.form:104 FOption.form:561 FOutput.form:41 #: FProjectVersion.form:252 FTextEditor.form:91 msgid "Undo" msgstr "Annuler" #: FConflict.form:77 FConnectionEditor.form:393 FEditor.form:135 -#: FForm.form:229 FImageEditor.form:107 FOutput.form:48 +#: FForm.form:229 FImageEditor.form:112 FOutput.form:48 #: FProjectVersion.form:258 FTextEditor.form:98 msgid "Redo" msgstr "Rétablir" @@ -1051,7 +1051,7 @@ msgid "Sol&ve" msgstr "&Résoudre" #: FConflict.form:184 FDebugInfo.form:270 FEditor.form:310 -#: FFileProperty.form:75 FForm.form:408 FImageEditor.form:330 +#: FFileProperty.form:75 FForm.form:408 FImageEditor.form:335 #: FImportTable.form:222 FProjectVersion.form:323 FSystemInfo.form:83 #: FTextEditor.form:244 FTips.form:83 msgid "Close" @@ -1207,12 +1207,12 @@ msgid "Connection editor" msgstr "Editeur de connexion" #: FConnectionEditor.form:100 FEditor.form:323 FForm.form:421 -#: FImageEditor.form:323 FMenu.class:68 FTextEditor.form:237 +#: FImageEditor.form:328 FMenu.class:68 FTextEditor.form:237 msgid "Save" msgstr "Enregistrer" #: FConnectionEditor.form:108 FEditor.form:317 FForm.form:415 -#: FHelpBrowser.form:67 FImageEditor.form:316 FTextEditor.form:231 +#: FHelpBrowser.form:67 FImageEditor.form:321 FTextEditor.form:231 #: FTranslate.class:650 msgid "Reload" msgstr "Recharger" @@ -1572,7 +1572,7 @@ msgstr "Expression" msgid "Function" msgstr "Fonction" -#: FDebugInfo.class:55 FImageEditor.form:489 FImportTable.class:56 +#: FDebugInfo.class:55 FImageEditor.form:522 FImportTable.class:56 #: FOption.form:642 msgid "Line" msgstr "Ligne" @@ -1597,7 +1597,7 @@ msgstr "Message" msgid "native code" msgstr "code natif" -#: FDebugInfo.class:570 FImageEditor.form:576 FList.class:153 +#: FDebugInfo.class:570 FImageEditor.form:609 FList.class:153 #: FOption.class:675 FOutput.form:79 msgid "Clear" msgstr "Effacer" @@ -1744,7 +1744,7 @@ msgstr "Ouvrir le formulaire" msgid "&Startup class" msgstr "Cla&sse de démarrage" -#: FEditor.form:167 FImageEditor.form:143 FTextEditor.form:132 +#: FEditor.form:167 FImageEditor.form:148 FTextEditor.form:132 msgid "Select &All" msgstr "&Tout sélectionner" @@ -1808,7 +1808,7 @@ msgstr "Formater le code" msgid "Sort procedures..." msgstr "Trier les procédures..." -#: FEditor.form:281 FImageEditor.form:276 FTextEditor.form:202 +#: FEditor.form:281 FImageEditor.form:281 FTextEditor.form:202 msgid "View" msgstr "Affichage" @@ -2265,11 +2265,11 @@ msgstr "Aller en avant" msgid "Show help tree" msgstr "Afficher l'arborescence de l'aide" -#: FHelpBrowser.form:85 FImageEditor.form:281 +#: FHelpBrowser.form:85 FImageEditor.form:286 msgid "Zoom in" msgstr "Zoom avant" -#: FHelpBrowser.form:91 FImageEditor.form:289 +#: FHelpBrowser.form:91 FImageEditor.form:294 msgid "Zoom out" msgstr "Zoom arrière" @@ -2285,119 +2285,135 @@ msgstr "Imprimer" msgid "Modify documentation..." msgstr "Modifier la documentation..." -#: FImageEditor.form:149 +#: FImageEditor.form:154 msgid "Hide selection" msgstr "Cacher le sélection" -#: FImageEditor.form:154 MTheme.module:6 +#: FImageEditor.form:159 MTheme.module:6 msgid "Selection" msgstr "Sélection" -#: FImageEditor.form:159 +#: FImageEditor.form:164 msgid "Invert selection" msgstr "Inverser la sélection" -#: FImageEditor.form:167 +#: FImageEditor.form:172 msgid "Duplicate selection" msgstr "Dupliquer la sélection" -#: FImageEditor.form:175 FImageOffsetSelection.form:12 +#: FImageEditor.form:180 FImageOffsetSelection.form:12 msgid "Offset selection" msgstr "Agrandir ou rétrécir la sélection" -#: FImageEditor.form:182 +#: FImageEditor.form:187 msgid "Shape grid" msgstr "Grille de la forme" -#: FImageEditor.form:220 +#: FImageEditor.form:225 msgid "Action" msgstr "Action" -#: FImageEditor.form:225 +#: FImageEditor.form:230 msgid "Crop" msgstr "Découper" -#: FImageEditor.form:233 FImageProperty.form:279 +#: FImageEditor.form:238 FImageProperty.form:279 msgid "Horizontal flip" msgstr "Miroir horizontal" -#: FImageEditor.form:240 FImageProperty.form:273 +#: FImageEditor.form:245 FImageProperty.form:273 msgid "Vertical flip" msgstr "Miroir vertical" -#: FImageEditor.form:247 FImageProperty.form:267 +#: FImageEditor.form:252 FImageProperty.form:267 msgid "Rotate counter-clockwise" msgstr "Rotation de 90° vers la gauche" -#: FImageEditor.form:255 FImageProperty.form:261 +#: FImageEditor.form:260 FImageProperty.form:261 msgid "Rotate clockwise" msgstr "Rotation de 90° vers la droite" -#: FImageEditor.form:263 +#: FImageEditor.form:268 msgid "Resize..." msgstr "Redimensionner..." -#: FImageEditor.form:270 +#: FImageEditor.form:275 msgid "Rotate..." msgstr "Rotation..." -#: FImageEditor.form:297 +#: FImageEditor.form:302 msgid "Zoom normal" msgstr "Zoom normal" -#: FImageEditor.form:305 +#: FImageEditor.form:310 msgid "Zoom fit" msgstr "Zoom ajusté" -#: FImageEditor.form:339 +#: FImageEditor.form:345 +msgid "Save as JPEG" +msgstr "Enregistrer comme JPEG" + +#: FImageEditor.form:351 +msgid "Save as PNG" +msgstr "Enregistrer comme PNG" + +#: FImageEditor.form:356 +msgid "Save as BMP" +msgstr "Enregistrer comme BMP" + +#: FImageEditor.form:363 +msgid "Save as TIFF" +msgstr "Enregistrer comme TIFF" + +#: FImageEditor.form:370 msgid "Image editor" msgstr "Editeur d'image" -#: FImageEditor.form:439 +#: FImageEditor.form:472 msgid "Drawing grid" msgstr "Grille de dessin" -#: FImageEditor.form:454 +#: FImageEditor.form:487 msgid "Move" msgstr "Déplacer" -#: FImageEditor.form:465 +#: FImageEditor.form:498 msgid "Draw" msgstr "Dessiner" -#: FImageEditor.form:475 +#: FImageEditor.form:508 msgid "Erase" msgstr "Gommer" -#: FImageEditor.form:499 +#: FImageEditor.form:532 msgid "Rectangle" msgstr "Rectangle" -#: FImageEditor.form:509 +#: FImageEditor.form:542 msgid "Ellipse" msgstr "Ellipse" -#: FImageEditor.form:519 +#: FImageEditor.form:552 msgid "Magic wand" msgstr "Baguette magique" -#: FImageEditor.form:529 +#: FImageEditor.form:562 msgid "Edit selection" msgstr "Modifier la sélection" -#: FImageEditor.form:562 +#: FImageEditor.form:595 msgid "Stroke" msgstr "Tracer" -#: FImageEditor.form:569 +#: FImageEditor.form:602 msgid "Fill" msgstr "Remplir" -#: FImageEditor.form:625 +#: FImageEditor.form:658 msgid "Resize or stretch image" msgstr "Redimensionner ou étirer l'image" -#: FImageEditor.form:634 FImageRotate.form:11 +#: FImageEditor.form:667 FImageRotate.form:11 msgid "Rotate image" msgstr "Rotation de l'image" @@ -3669,11 +3685,11 @@ msgstr "Nom de menu incorrect !" msgid "Bad group name !" msgstr "Nom de groupe incorrect !" -#: FMenu.class:588 +#: FMenu.class:589 msgid "This menu is too deep !" msgstr "Ce menu est trop profond !" -#: FMenu.class:958 Project.module:5170 +#: FMenu.class:959 Project.module:5170 msgid "modified" msgstr "modifié" @@ -5194,9 +5210,8 @@ msgid "Irish (Ireland)" msgstr "Irlandais (Irlande)" #: Language.module:66 -#, fuzzy msgid "Icelandic (Iceland)" -msgstr "Irlandais (Irlande)" +msgstr "Islandais (Islande)" #: Language.module:68 msgid "Italian (Italy)" diff --git a/app/src/gambas3/.src/Editor/Form/FMenu.class b/app/src/gambas3/.src/Editor/Form/FMenu.class index f499a5310..ea26eda26 100644 --- a/app/src/gambas3/.src/Editor/Form/FMenu.class +++ b/app/src/gambas3/.src/Editor/Form/FMenu.class @@ -455,6 +455,7 @@ Public Sub btnInsert_Click() hCMenu = New CMenu hCMenu.Name = GetName() hCMenu.Caption = hCMenu.Name + hCMenu.Translate = True If iIndex > 0 Then hCMenu.Level = $aMenu[iIndex - 1].Level $cName[hCMenu.Name] = True diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.class b/app/src/gambas3/.src/Editor/Image/FImageEditor.class index ed8b537f0..4370b2d38 100644 --- a/app/src/gambas3/.src/Editor/Image/FImageEditor.class +++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.class @@ -1254,8 +1254,10 @@ Public Sub imvImage_MouseUp() SetMagnet(Null) Case "paste" - $hPasteCurrent = $hPasteSelect.Copy() - $hChangeRect = $hPasteCurrent.GetExtents() + If $hPaste Then + $hPasteCurrent = $hPasteSelect.Copy() + $hChangeRect = $hPasteCurrent.GetExtents() + Endif End Select diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.form b/app/src/gambas3/.src/Editor/Image/FImageEditor.form index 5eb19614d..09aa60c89 100644 --- a/app/src/gambas3/.src/Editor/Image/FImageEditor.form +++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.form @@ -217,26 +217,22 @@ #Translate = False { mnuFormatJPEG Menu mnuSaveAs Name = "mnuFormatJPEG" - #Translate = False - Text = "Save as JPEG" + Text = ("Save as JPEG") Tag = "jpeg" } { mnuFormatPNG Menu mnuSaveAs Name = "mnuFormatPNG" - #Translate = False - Text = "Save as PNG" + Text = ("Save as PNG") Tag = "png" } { mnuFormatBMP Menu - #Translate = False - Text = "Save as BMP" + Text = ("Save as BMP") Tag = "bmp" } { mnuFormatTIFF Menu mnuSaveAs Name = "mnuFormatTIFF" - #Translate = False Action = "tiff" - Text = "Save as TIFF" + Text = ("Save as TIFF") } } { panToolBar ToolBar @@ -331,9 +327,9 @@ { btnGrid ToolButton MoveScaled(49,0,4,4) ToolTip = ("Drawing grid") - Action = ".grid" + Action = ".draw-grid" AutoResize = True - Picture = Picture["icon:/small/grid"] + Picture = Picture["img/draw/grid.png"] Toggle = True } { Separator2 Separator @@ -562,6 +558,10 @@ Shortcut = "Ctrl+X" Picture = "icon:/small/cut" } + { Action draw-grid + Text = "Drawing grid" + Picture = "img/draw/grid.png" + } { Action duplicate Text = "Duplicate selection" Shortcut = "Ctrl+D" @@ -581,10 +581,6 @@ Shortcut = "" Picture = "img/draw/vflip.png" } - { Action grid - Text = "Drawing grid" - Picture = "icon:/small/grid" - } { Action hide-selection Text = "Hide selection" Shortcut = "Esc" @@ -729,7 +725,7 @@ { Toolbars { Toolbar image Text = "Image editor" - List = "save,reload,undo,redo,copy,cut,tool-paste,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,grid,tool-move,tool-draw,tool-erase,tool-line,tool-rectangle,tool-ellipse,tool-magic,tool-change,invert,duplicate,offset,stroke,fill,clear,crop,flip-h,flip-v,rotate-r,rotate-l,resize,rotate" - Default = "save,reload,undo,redo,|,copy,cut,tool-paste,|,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,grid,|,tool-move,tool-draw,tool-erase,|,tool-line,tool-rectangle,tool-ellipse,tool-magic,tool-change,invert,duplicate,offset,|,stroke,fill,clear,|,rotate-r,rotate-l,resize,rotate" + List = "save,reload,undo,redo,copy,cut,tool-paste,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,draw-grid,tool-move,tool-draw,tool-erase,tool-line,tool-rectangle,tool-ellipse,tool-magic,tool-change,invert,duplicate,offset,stroke,fill,clear,crop,flip-h,flip-v,rotate-r,rotate-l,resize,rotate" + Default = "save,reload,undo,redo,|,copy,cut,tool-paste,|,zoom-in,zoom,zoom-out,zoom-normal,zoom-fit,draw-grid,|,tool-move,tool-draw,tool-erase,|,tool-line,tool-rectangle,tool-ellipse,tool-magic,tool-change,invert,duplicate,offset,|,stroke,fill,clear,|,rotate-r,rotate-l,resize,rotate" } } diff --git a/app/src/gambas3/img/draw/grid.png b/app/src/gambas3/img/draw/grid.png new file mode 100644 index 0000000000000000000000000000000000000000..0dd91ced7420774e7b08b1b9cae2b8b29c3dab2c GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m+8SPZ!4!i{9h}2WDPg-v1YmemH6PFvv$oqJmlC