diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index b92c1bfc3..cde5c2fd6 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -34,7 +34,7 @@ msgstr "" msgid "Next bookmark" msgstr "" -#: CClassInfo.class:571 FMain.form:1421 FProperty.form:23 +#: CClassInfo.class:571 FMain.form:1429 FProperty.form:23 msgid "Properties" msgstr "" @@ -469,7 +469,7 @@ msgstr "" msgid "Requires" msgstr "" -#: CModule.class:28 FCreateFile.form:150 FEditor.form:372 FForm.form:430 +#: CModule.class:28 FCreateFile.form:153 FEditor.form:372 FForm.form:430 msgid "Form" msgstr "" @@ -481,7 +481,7 @@ msgstr "" msgid "Gambas forms" msgstr "" -#: CModule.class:29 FCreateFile.form:171 +#: CModule.class:29 FCreateFile.form:174 msgid "WebPage" msgstr "" @@ -493,7 +493,7 @@ msgstr "" msgid "Gambas web pages" msgstr "" -#: CModule.class:30 FCreateFile.form:192 +#: CModule.class:30 FCreateFile.form:195 msgid "Report" msgstr "" @@ -513,7 +513,7 @@ msgstr "" msgid "Event loop" msgstr "" -#: CProjectTree.class:285 FMain.form:1079 FSearch.class:97 FSelectIcon.form:31 +#: CProjectTree.class:285 FMain.form:1087 FSearch.class:97 FSelectIcon.form:31 #: Project.module:1732 msgid "Project" msgstr "" @@ -555,21 +555,22 @@ msgid "This month" msgstr "" #: CWaitingAnimation.class:56 FColorChooser.form:60 FConflict.class:185 -#: FConnectionEditor.class:297 FCreateFile.form:437 FDebugInfo.form:263 +#: FConnectionEditor.class:302 FCreateFile.form:461 FDebugInfo.form:263 #: FEditor.class:2379 FExportData.class:126 FFieldChooser.form:138 #: FFileProperty.class:140 FFontChooser.form:40 FForm.class:3141 #: FGotoLine.form:23 FHelpBrowser.form:61 FImageEditor.class:347 -#: FImageOffsetSelection.form:33 FImageResize.form:49 FImageRotate.form:32 -#: FInfo.class:263 FList.form:121 FMain.class:212 FMakeInstall.class:350 -#: FMenu.form:365 FNewConnection.form:255 FNewTable.form:86 -#: FNewTranslation.form:21 FOpenProject.form:158 FOption.class:675 -#: FPasteSpecial.form:77 FPasteTable.form:107 FProjectProperty.form:761 -#: FProjectVersion.class:201 FPropertyComponent.form:267 FProxy.form:57 -#: FReportBorderChooser.form:48 FReportBrushChooser.form:36 -#: FReportCoordChooser.form:26 FReportPaddingChooser.form:75 FSave.form:28 -#: FSaveProjectAs.form:76 FSearch.class:869 FSelectExtraFile.form:43 -#: FSelectIcon.form:87 FSnippet.form:57 FTableChooser.form:68 FText.form:41 -#: FTextEditor.class:599 FTranslate.class:554 Project.module:505 +#: FImageOffsetSelection.form:33 FImageQuality.form:30 FImageResize.form:49 +#: FImageRotate.form:32 FInfo.class:263 FList.form:121 FMain.class:212 +#: FMakeInstall.class:350 FMenu.form:365 FNewConnection.form:277 +#: FNewTable.form:86 FNewTranslation.form:21 FOpenProject.form:158 +#: FOption.class:675 FPasteSpecial.form:77 FPasteTable.form:107 +#: FProjectProperty.form:761 FProjectVersion.class:201 +#: FPropertyComponent.form:267 FProxy.form:57 FReportBorderChooser.form:48 +#: FReportBrushChooser.form:36 FReportCoordChooser.form:26 +#: FReportPaddingChooser.form:75 FSave.form:28 FSaveProjectAs.form:76 +#: FSearch.class:869 FSelectExtraFile.form:43 FSelectIcon.form:87 +#: FSnippet.form:57 FTableChooser.form:68 FText.form:41 FTextEditor.class:599 +#: FTranslate.class:554 Project.module:505 msgid "Cancel" msgstr "" @@ -657,17 +658,17 @@ msgid "" "the value: &1" msgstr "" -#: Design.module:428 FColorChooser.form:54 FConnectionEditor.class:473 -#: FCreateFile.form:443 FFieldChooser.form:132 FFontChooser.form:34 -#: FGotoLine.form:17 FImageOffsetSelection.form:27 FImageResize.form:103 -#: FImageRotate.form:26 FInfo.form:181 FList.form:115 FMain.class:1841 -#: FMakeInstall.class:299 FMenu.form:360 FNewConnection.form:249 -#: FNewTable.form:80 FNewTranslation.form:15 FOpenProject.form:152 -#: FPasteSpecial.form:71 FProjectProperty.form:755 FPropertyComponent.form:261 -#: FProxy.form:63 FReportBorderChooser.form:54 FReportBrushChooser.form:42 -#: FReportCoordChooser.form:32 FReportPaddingChooser.form:69 -#: FSelectExtraFile.form:37 FSelectIcon.form:82 FSnippet.form:51 -#: FTableChooser.form:62 FText.form:35 +#: Design.module:428 FColorChooser.form:54 FConnectionEditor.class:480 +#: FCreateFile.form:467 FFieldChooser.form:132 FFontChooser.form:34 +#: FGotoLine.form:17 FImageOffsetSelection.form:27 FImageQuality.form:24 +#: FImageResize.form:103 FImageRotate.form:26 FInfo.form:181 FList.form:115 +#: FMain.class:1841 FMakeInstall.class:299 FMenu.form:360 +#: FNewConnection.form:271 FNewTable.form:80 FNewTranslation.form:15 +#: FOpenProject.form:152 FPasteSpecial.form:71 FProjectProperty.form:755 +#: FPropertyComponent.form:261 FProxy.form:63 FReportBorderChooser.form:54 +#: FReportBrushChooser.form:42 FReportCoordChooser.form:32 +#: FReportPaddingChooser.form:69 FSelectExtraFile.form:37 FSelectIcon.form:82 +#: FSnippet.form:51 FTableChooser.form:62 FText.form:35 msgid "OK" msgstr "" @@ -770,11 +771,11 @@ msgstr "" msgid "Unindent" msgstr "" -#: FConflict.form:112 FCreateFile.form:234 FDebugInfo.class:70 +#: FConflict.form:112 FCreateFile.form:237 FDebugInfo.class:70 msgid "Text" msgstr "" -#: FConflict.form:120 FCreateFile.form:213 FReportBrushChooser.form:49 +#: FConflict.form:120 FCreateFile.form:216 FReportBrushChooser.form:49 #: Project.module:199 msgid "Image" msgstr "" @@ -812,7 +813,7 @@ msgid "" "You must resolve the conflict in order to use the file." msgstr "" -#: FConflict.class:24 FMain.form:713 +#: FConflict.class:24 FMain.form:721 msgid "&Edit" msgstr "" @@ -952,18 +953,18 @@ msgid "Export..." msgstr "" #: FConnectionEditor.form:460 FForm.form:266 FMain.class:212 -#: FNewConnection.class:325 FOption.class:858 FTranslate.class:554 +#: FNewConnection.class:327 FOption.class:858 FTranslate.class:554 msgid "Delete" msgstr "" -#: FConnectionEditor.class:37 FCreateFile.form:289 FDebugInfo.class:38 -#: FMakeInstall.form:162 FNewConnection.form:60 FNewTable.form:33 +#: FConnectionEditor.class:37 FCreateFile.form:313 FDebugInfo.class:38 +#: FMakeInstall.form:162 FNewConnection.form:64 FNewTable.form:33 #: FOption.form:1038 msgid "Name" msgstr "" -#: FConnectionEditor.class:42 FCreateFile.form:340 FCreateProject.form:97 -#: FDebugInfo.class:76 FInfo.form:84 FNewConnection.form:74 FNewTable.form:48 +#: FConnectionEditor.class:42 FCreateFile.form:364 FCreateProject.form:97 +#: FDebugInfo.class:76 FInfo.form:84 FNewConnection.form:78 FNewTable.form:48 #: FProxy.form:27 msgid "Type" msgstr "" @@ -976,132 +977,132 @@ msgstr "" msgid "Default value" msgstr "" -#: FConnectionEditor.class:58 FMakeInstall.form:229 FProjectProperty.form:259 -msgid "Description" -msgstr "" - -#: FConnectionEditor.class:70 FDebugExpr.class:470 FHelpBrowser.form:53 +#: FConnectionEditor.class:63 FDebugExpr.class:470 FHelpBrowser.form:53 msgid "Index" msgstr "" -#: FConnectionEditor.class:75 +#: FConnectionEditor.class:68 msgid "Unique" msgstr "" -#: FConnectionEditor.class:80 FImportTable.class:357 +#: FConnectionEditor.class:73 FImportTable.class:357 msgid "Field" msgstr "" -#: FConnectionEditor.class:207 +#: FConnectionEditor.class:194 FMakeInstall.form:229 FProjectProperty.form:259 +msgid "Description" +msgstr "" + +#: FConnectionEditor.class:212 msgid "Unable to connect to database." msgstr "" -#: FConnectionEditor.class:297 +#: FConnectionEditor.class:302 msgid "The table '&1' has been modified. Do you want to save it?" msgstr "" -#: FConnectionEditor.class:297 +#: FConnectionEditor.class:302 msgid "Do not save" msgstr "" -#: FConnectionEditor.class:432 +#: FConnectionEditor.class:439 msgid "Unable to load table '&1'." msgstr "" -#: FConnectionEditor.class:480 +#: FConnectionEditor.class:487 msgid "Unable to run query." msgstr "" -#: FConnectionEditor.class:512 +#: FConnectionEditor.class:519 msgid "unlimited" msgstr "" -#: FConnectionEditor.class:594 MConnection.module:115 MErrorMessage.module:47 +#: FConnectionEditor.class:601 MConnection.module:115 MErrorMessage.module:47 msgid "Boolean" msgstr "" -#: FConnectionEditor.class:594 MConnection.module:107 +#: FConnectionEditor.class:601 MConnection.module:107 msgid "Integer" msgstr "" -#: FConnectionEditor.class:594 MConnection.module:109 +#: FConnectionEditor.class:601 MConnection.module:109 msgid "Long" msgstr "" -#: FConnectionEditor.class:594 MConnection.module:119 +#: FConnectionEditor.class:601 MConnection.module:119 msgid "Serial" msgstr "" -#: FConnectionEditor.class:594 MConnection.module:111 +#: FConnectionEditor.class:601 MConnection.module:111 msgid "Float" msgstr "" -#: FConnectionEditor.class:594 MConnection.module:117 MErrorMessage.module:155 +#: FConnectionEditor.class:601 MConnection.module:117 MErrorMessage.module:155 msgid "String" msgstr "" -#: FConnectionEditor.class:594 FProjectVersion.class:280 +#: FConnectionEditor.class:601 FProjectVersion.class:280 #: MConnection.module:113 msgid "Date" msgstr "" -#: FConnectionEditor.class:594 MConnection.module:121 +#: FConnectionEditor.class:601 MConnection.module:121 msgid "Blob" msgstr "" -#: FConnectionEditor.class:674 +#: FConnectionEditor.class:681 msgid "This name is already in used." msgstr "" -#: FConnectionEditor.class:699 +#: FConnectionEditor.class:706 msgid "Please enter a number." msgstr "" -#: FConnectionEditor.class:704 +#: FConnectionEditor.class:711 msgid "The length must be greater than 1 and lower than 255." msgstr "" -#: FConnectionEditor.class:728 +#: FConnectionEditor.class:735 msgid "Type mismatch." msgstr "" -#: FConnectionEditor.class:771 +#: FConnectionEditor.class:778 msgid "This name already exists." msgstr "" -#: FConnectionEditor.class:851 +#: FConnectionEditor.class:858 msgid "This field is used in an index." msgstr "" -#: FConnectionEditor.class:1198 +#: FConnectionEditor.class:1205 msgid "The table '&1' has no primary key." msgstr "" -#: FConnectionEditor.class:1298 +#: FConnectionEditor.class:1305 msgid "Cannot write table '&1'." msgstr "" -#: FConnectionEditor.class:1410 +#: FConnectionEditor.class:1417 msgid "Do you really want to delete table '&1'?" msgstr "" -#: FConnectionEditor.class:1421 +#: FConnectionEditor.class:1428 msgid "Cannot delete table '&1'." msgstr "" -#: FConnectionEditor.class:1457 +#: FConnectionEditor.class:1464 msgid "Select the CSV file to import" msgstr "" -#: FConnectionEditor.class:1458 FExportData.class:21 +#: FConnectionEditor.class:1465 FExportData.class:21 msgid "CSV files" msgstr "" -#: FConnectionEditor.class:1458 FTranslate.class:1198 +#: FConnectionEditor.class:1465 FTranslate.class:1198 msgid "All files" msgstr "" -#: FConnectionEditor.class:1481 +#: FConnectionEditor.class:1488 msgid "Do you really want to remove the selected rows?" msgstr "" @@ -1109,65 +1110,69 @@ msgstr "" msgid "Gambas 3 project conversion" msgstr "" -#: FCreateFile.form:66 +#: FCreateFile.form:69 msgid "New file" msgstr "" -#: FCreateFile.form:79 FMain.form:617 +#: FCreateFile.form:82 FMain.form:618 msgid "New" msgstr "" -#: FCreateFile.form:108 +#: FCreateFile.form:111 msgid "Module" msgstr "" -#: FCreateFile.form:129 FDebugInfo.class:51 +#: FCreateFile.form:132 FDebugInfo.class:51 msgid "Class" msgstr "" -#: FCreateFile.form:255 FInfo.class:104 +#: FCreateFile.form:258 FInfo.class:104 msgid "HTML file" msgstr "" -#: FCreateFile.form:276 +#: FCreateFile.form:279 msgid "Style sheet" msgstr "" -#: FCreateFile.form:299 FCreateProject.form:273 FImportTable.form:57 +#: FCreateFile.form:300 FInfo.class:113 +msgid "Javascript file" +msgstr "" + +#: FCreateFile.form:323 FCreateProject.form:273 FImportTable.form:57 #: FMakePatch.form:63 FProjectProperty.form:281 FPropertyComponent.form:63 #: FSearch.form:100 msgid "Options" msgstr "" -#: FCreateFile.form:308 FImageResize.form:32 +#: FCreateFile.form:332 FImageResize.form:32 msgid "Width" msgstr "" -#: FCreateFile.form:321 FImageResize.form:44 +#: FCreateFile.form:345 FImageResize.form:44 msgid "Height" msgstr "" -#: FCreateFile.form:366 +#: FCreateFile.form:390 msgid "Dialog box management" msgstr "" -#: FCreateFile.form:376 +#: FCreateFile.form:400 msgid "Parent class" msgstr "" -#: FCreateFile.form:386 +#: FCreateFile.form:410 msgid "Exported" msgstr "" -#: FCreateFile.form:396 +#: FCreateFile.form:420 msgid "Automatic extension" msgstr "" -#: FCreateFile.form:403 +#: FCreateFile.form:427 msgid "Existing" msgstr "" -#: FCreateFile.form:424 +#: FCreateFile.form:448 msgid "Create a symbolic link" msgstr "" @@ -1191,15 +1196,19 @@ msgstr "" msgid "Cascading style sheets" msgstr "" +#: FCreateFile.class:119 +msgid "Javascript files" +msgstr "" + #: FCreateFile.class:138 msgid "(No parent)" msgstr "" -#: FCreateFile.class:450 +#: FCreateFile.class:459 msgid "Cannot add file." msgstr "" -#: FCreateProject.form:66 FMain.form:966 +#: FCreateProject.form:66 FMain.form:974 msgid "New project" msgstr "" @@ -1353,11 +1362,11 @@ msgstr "" msgid "Symbol" msgstr "" -#: FDebugInfo.form:49 FMain.form:1410 +#: FDebugInfo.form:49 FMain.form:1418 msgid "Debug" msgstr "" -#: FDebugInfo.form:60 FMain.form:1107 FOption.form:346 FSearch.class:93 +#: FDebugInfo.form:60 FMain.form:1115 FOption.form:346 FSearch.class:93 msgid "Console" msgstr "" @@ -1515,7 +1524,7 @@ msgstr "" msgid "Open form" msgstr "" -#: FEditor.form:118 FForm.form:153 FMain.form:792 +#: FEditor.form:118 FForm.form:153 FMain.form:800 msgid "&Startup class" msgstr "" @@ -1997,7 +2006,7 @@ msgid "" "All your changes will be lost." msgstr "" -#: FFormStack.form:15 FMain.form:1448 +#: FFormStack.form:15 FMain.form:1456 msgid "Hierarchy" msgstr "" @@ -2025,15 +2034,15 @@ msgstr "" msgid "Go to line" msgstr "" -#: FHelpBrowser.form:30 FMain.form:1125 +#: FHelpBrowser.form:30 FMain.form:1133 msgid "Help browser" msgstr "" -#: FHelpBrowser.form:41 FMain.form:537 FProfile.form:48 +#: FHelpBrowser.form:41 FMain.form:538 FProfile.form:48 msgid "Go back" msgstr "" -#: FHelpBrowser.form:47 FMain.form:544 FProfile.form:54 +#: FHelpBrowser.form:47 FMain.form:545 FProfile.form:54 msgid "Go forward" msgstr "" @@ -2338,6 +2347,10 @@ msgstr "" msgid "Hexagon" msgstr "" +#: FImageQuality.form:10 +msgid "Image quality" +msgstr "" + #: FImageResize.form:25 msgid "Resize image" msgstr "" @@ -2510,10 +2523,6 @@ msgstr "" msgid "XML file" msgstr "" -#: FInfo.class:113 -msgid "Javascript file" -msgstr "" - #: FInfo.class:117 msgid "ChangeLog" msgstr "" @@ -2546,11 +2555,11 @@ msgstr "" msgid "Cl&ear" msgstr "" -#: FList.form:92 FMain.form:752 FSystemInfo.form:77 +#: FList.form:92 FMain.form:760 FSystemInfo.form:77 msgid "&Copy" msgstr "" -#: FList.form:98 FMain.form:759 +#: FList.form:98 FMain.form:767 msgid "&Paste" msgstr "" @@ -2562,456 +2571,460 @@ msgstr "" msgid "Do you really want to clear the list?" msgstr "" -#: FMain.form:222 +#: FMain.form:223 msgid "&File" msgstr "" -#: FMain.form:226 +#: FMain.form:227 msgid "&New project..." msgstr "" -#: FMain.form:233 +#: FMain.form:234 msgid "&Open project..." msgstr "" -#: FMain.form:239 +#: FMain.form:240 msgid "Open &recent" msgstr "" -#: FMain.form:246 +#: FMain.form:247 msgid "Open &example" msgstr "" -#: FMain.form:257 +#: FMain.form:258 msgid "&Save project" msgstr "" -#: FMain.form:265 +#: FMain.form:266 msgid "Save project &as..." msgstr "" -#: FMain.form:276 +#: FMain.form:277 msgid "&Quit" msgstr "" -#: FMain.form:283 +#: FMain.form:284 msgid "&Project" msgstr "" -#: FMain.form:288 +#: FMain.form:289 msgid "&Compile" msgstr "" -#: FMain.form:295 +#: FMain.form:296 msgid "Compile &All" msgstr "" -#: FMain.form:305 +#: FMain.form:306 msgid "&Translate..." msgstr "" -#: FMain.form:314 +#: FMain.form:315 msgid "Make" msgstr "" -#: FMain.form:318 +#: FMain.form:319 msgid "E&xecutable..." msgstr "" -#: FMain.form:325 +#: FMain.form:326 msgid "&Source archive..." msgstr "" -#: FMain.form:332 +#: FMain.form:333 msgid "&Installation package..." msgstr "" -#: FMain.form:339 +#: FMain.form:340 msgid "Patch" msgstr "" -#: FMain.form:342 +#: FMain.form:343 msgid "&Create..." msgstr "" -#: FMain.form:347 +#: FMain.form:348 msgid "&Apply..." msgstr "" -#: FMain.form:357 +#: FMain.form:358 msgid "&Clean up" msgstr "" -#: FMain.form:363 +#: FMain.form:364 msgid "&Refresh" msgstr "" -#: FMain.form:369 +#: FMain.form:370 msgid "Put on &version control" msgstr "" -#: FMain.form:379 +#: FMain.form:380 msgid "&Properties..." msgstr "" -#: FMain.form:386 FPropertyComponent.form:44 +#: FMain.form:387 FPropertyComponent.form:44 msgid "Component properties" msgstr "" -#: FMain.form:394 +#: FMain.form:395 msgid "&Version control..." msgstr "" -#: FMain.form:400 +#: FMain.form:401 msgid "&Debug" msgstr "" -#: FMain.form:405 +#: FMain.form:406 msgid "&Run" msgstr "" -#: FMain.form:412 +#: FMain.form:413 msgid "Use &terminal emulator" msgstr "" -#: FMain.form:418 FProjectProperty.form:470 +#: FMain.form:419 FProjectProperty.form:470 msgid "Use embedded HTTP server" msgstr "" -#: FMain.form:424 +#: FMain.form:425 msgid "Activate profilin&g" msgstr "" -#: FMain.form:433 +#: FMain.form:434 msgid "&Pause" msgstr "" -#: FMain.form:440 +#: FMain.form:441 msgid "&Stop" msgstr "" -#: FMain.form:447 +#: FMain.form:448 msgid "St&ep" msgstr "" -#: FMain.form:454 +#: FMain.form:455 msgid "&Forward" msgstr "" -#: FMain.form:461 +#: FMain.form:462 msgid "Finis&h" msgstr "" -#: FMain.form:471 +#: FMain.form:472 msgid "&Open profile..." msgstr "" -#: FMain.form:477 +#: FMain.form:478 msgid "Clear &all breakpoints" msgstr "" -#: FMain.form:482 +#: FMain.form:483 msgid "Close all &debug windows" msgstr "" -#: FMain.form:487 +#: FMain.form:488 msgid "&View" msgstr "" -#: FMain.form:492 +#: FMain.form:493 msgid "Pro&ject" msgstr "" -#: FMain.form:501 +#: FMain.form:502 msgid "&Properties" msgstr "" -#: FMain.form:510 +#: FMain.form:511 msgid "&Console" msgstr "" -#: FMain.form:520 +#: FMain.form:521 msgid "Status bar" msgstr "" -#: FMain.form:528 +#: FMain.form:529 msgid "Hide menubar" msgstr "" -#: FMain.form:551 +#: FMain.form:552 msgid "Close &all windows" msgstr "" -#: FMain.form:557 +#: FMain.form:558 msgid "&Tools" msgstr "" -#: FMain.form:561 +#: FMain.form:562 msgid "&Find..." msgstr "" -#: FMain.form:567 +#: FMain.form:568 msgid "&Replace..." msgstr "" -#: FMain.form:577 +#: FMain.form:578 msgid "&Browse project..." msgstr "" -#: FMain.form:584 +#: FMain.form:585 msgid "&Open a terminal..." msgstr "" -#: FMain.form:591 +#: FMain.form:592 msgid "Send project by &mail..." msgstr "" -#: FMain.form:600 +#: FMain.form:601 msgid "&Shortcuts..." msgstr "" -#: FMain.form:606 +#: FMain.form:607 msgid "&Preferences..." msgstr "" -#: FMain.form:621 +#: FMain.form:622 msgid "&Directory" msgstr "" -#: FMain.form:627 +#: FMain.form:628 msgid "&Project link..." msgstr "" -#: FMain.form:638 +#: FMain.form:639 msgid "&Module..." msgstr "" -#: FMain.form:646 +#: FMain.form:647 msgid "&Class..." msgstr "" -#: FMain.form:654 +#: FMain.form:655 msgid "&Form..." msgstr "" -#: FMain.form:662 +#: FMain.form:663 msgid "&WebPage..." msgstr "" -#: FMain.form:670 +#: FMain.form:671 msgid "&Report..." msgstr "" -#: FMain.form:681 +#: FMain.form:682 msgid "&Image..." msgstr "" -#: FMain.form:688 +#: FMain.form:689 msgid "&HTML file..." msgstr "" -#: FMain.form:695 +#: FMain.form:696 msgid "&Style sheet..." msgstr "" #: FMain.form:703 +msgid "&Javascript file..." +msgstr "" + +#: FMain.form:711 msgid "&Other..." msgstr "" -#: FMain.form:718 +#: FMain.form:726 msgid "Edit &code" msgstr "" -#: FMain.form:722 +#: FMain.form:730 msgid "Open with" msgstr "" -#: FMain.form:730 +#: FMain.form:738 msgid "Compress all" msgstr "" -#: FMain.form:736 +#: FMain.form:744 msgid "Uncompress all" msgstr "" -#: FMain.form:745 +#: FMain.form:753 msgid "&Cut" msgstr "" -#: FMain.form:766 +#: FMain.form:774 msgid "&Rename..." msgstr "" -#: FMain.form:773 +#: FMain.form:781 msgid "&Delete..." msgstr "" -#: FMain.form:783 +#: FMain.form:791 msgid "Copy file pat&h" msgstr "" -#: FMain.form:801 +#: FMain.form:809 msgid "&Add to repository" msgstr "" -#: FMain.form:826 +#: FMain.form:834 msgid "&New connection..." msgstr "" -#: FMain.form:834 +#: FMain.form:842 msgid "&Open" msgstr "" -#: FMain.form:840 FMakeInstall.form:595 FOption.form:991 +#: FMain.form:848 FMakeInstall.form:595 FOption.form:991 #: FProjectProperty.form:516 FPropertyComponent.form:236 msgid "&Remove" msgstr "" -#: FMain.form:894 +#: FMain.form:902 msgid "&?" msgstr "" -#: FMain.form:903 +#: FMain.form:911 msgid "&Help browser" msgstr "" -#: FMain.form:911 +#: FMain.form:919 msgid "&Tips of the day" msgstr "" -#: FMain.form:919 +#: FMain.form:927 msgid "&System informations..." msgstr "" -#: FMain.form:925 +#: FMain.form:933 msgid "&About Gambas..." msgstr "" -#: FMain.form:939 +#: FMain.form:947 msgid "Show exported classes" msgstr "" -#: FMain.form:944 +#: FMain.form:952 msgid "Show added files" msgstr "" -#: FMain.form:950 +#: FMain.form:958 msgid "Show all" msgstr "" -#: FMain.form:973 +#: FMain.form:981 msgid "Open project" msgstr "" -#: FMain.form:982 +#: FMain.form:990 msgid "Save project" msgstr "" -#: FMain.form:989 FSaveProjectAs.form:18 +#: FMain.form:997 FSaveProjectAs.form:18 msgid "Save project as" msgstr "" -#: FMain.form:996 FProjectProperty.form:116 +#: FMain.form:1004 FProjectProperty.form:116 msgid "Project properties" msgstr "" -#: FMain.form:1003 +#: FMain.form:1011 msgid "Project version control" msgstr "" -#: FMain.form:1017 +#: FMain.form:1025 msgid "Refresh project" msgstr "" -#: FMain.form:1024 FOption.form:203 +#: FMain.form:1032 FOption.form:203 msgid "Preferences" msgstr "" -#: FMain.form:1033 +#: FMain.form:1041 msgid "Shortcuts" msgstr "" -#: FMain.form:1044 FMakeExecutable.form:15 +#: FMain.form:1052 FMakeExecutable.form:15 msgid "Make executable" msgstr "" -#: FMain.form:1051 +#: FMain.form:1059 msgid "Translate" msgstr "" -#: FMain.form:1059 +#: FMain.form:1067 msgid "Make source archive" msgstr "" -#: FMain.form:1067 FMakeInstall.form:106 +#: FMain.form:1075 FMakeInstall.form:106 msgid "Make installation package" msgstr "" -#: FMain.form:1089 +#: FMain.form:1097 msgid "Properties sheet" msgstr "" -#: FMain.form:1098 +#: FMain.form:1106 msgid "Toolbox" msgstr "" -#: FMain.form:1116 FSearch.form:62 +#: FMain.form:1124 FSearch.form:62 msgid "Search" msgstr "" -#: FMain.form:1133 +#: FMain.form:1141 msgid "Compile" msgstr "" -#: FMain.form:1140 +#: FMain.form:1148 msgid "Compile all" msgstr "" -#: FMain.form:1147 +#: FMain.form:1155 msgid "Run" msgstr "" -#: FMain.form:1154 +#: FMain.form:1162 msgid "Pause" msgstr "" -#: FMain.form:1161 +#: FMain.form:1169 msgid "Stop" msgstr "" -#: FMain.form:1168 +#: FMain.form:1176 msgid "Step" msgstr "" -#: FMain.form:1175 +#: FMain.form:1183 msgid "Forward" msgstr "" -#: FMain.form:1182 +#: FMain.form:1190 msgid "Finish current function" msgstr "" -#: FMain.form:1190 +#: FMain.form:1198 msgid "Run until current line" msgstr "" -#: FMain.form:1201 +#: FMain.form:1209 msgid "Browse project..." msgstr "" -#: FMain.form:1226 +#: FMain.form:1234 msgid "Browse project" msgstr "" -#: FMain.form:1234 +#: FMain.form:1242 msgid "Open a terminal" msgstr "" -#: FMain.form:1242 +#: FMain.form:1250 msgid "Send project by mail" msgstr "" -#: FMain.form:1354 FProjectProperty.form:607 +#: FMain.form:1362 FProjectProperty.form:607 msgid "Reset filter" msgstr "" @@ -3479,71 +3492,75 @@ msgstr "" msgid "modified" msgstr "" -#: FNewConnection.form:90 FProxy.form:32 +#: FNewConnection.form:94 FProxy.form:32 msgid "Host" msgstr "" -#: FNewConnection.form:115 +#: FNewConnection.form:119 msgid "Path" msgstr "" -#: FNewConnection.form:133 FProjectVersion.form:127 FProxy.form:42 +#: FNewConnection.form:137 FProjectVersion.form:127 FProxy.form:42 msgid "User" msgstr "" -#: FNewConnection.form:147 FProjectVersion.form:142 FProxy.form:47 +#: FNewConnection.form:151 FProjectVersion.form:142 FProxy.form:47 msgid "Password" msgstr "" -#: FNewConnection.form:167 FProjectVersion.form:155 +#: FNewConnection.form:171 FProjectVersion.form:155 msgid "Remember password" msgstr "" -#: FNewConnection.form:177 Project.module:196 +#: FNewConnection.form:181 Project.module:196 msgid "Database" msgstr "" -#: FNewConnection.form:234 +#: FNewConnection.form:238 msgid "Ignore database charset" msgstr "" -#: FNewConnection.class:86 +#: FNewConnection.form:252 +msgid "Display metadata" +msgstr "" + +#: FNewConnection.class:88 msgid "Please enter the name of the database." msgstr "" -#: FNewConnection.class:127 +#: FNewConnection.class:129 msgid "Please enter password" msgstr "" -#: FNewConnection.class:129 +#: FNewConnection.class:131 msgid "Connection properties" msgstr "" -#: FNewConnection.class:141 +#: FNewConnection.class:143 msgid "New connection" msgstr "" -#: FNewConnection.class:160 +#: FNewConnection.class:162 msgid "Select a directory" msgstr "" -#: FNewConnection.class:195 +#: FNewConnection.class:197 msgid "&Create database '&1'" msgstr "" -#: FNewConnection.class:199 +#: FNewConnection.class:201 msgid "&Delete database '&1'" msgstr "" -#: FNewConnection.class:316 +#: FNewConnection.class:318 msgid "Unable to create database." msgstr "" -#: FNewConnection.class:325 +#: FNewConnection.class:327 msgid "Do you really want to delete the database '&1'?" msgstr "" -#: FNewConnection.class:336 +#: FNewConnection.class:338 msgid "Unable to delete database." msgstr "" diff --git a/app/src/gambas3/.src/Connection/FNewConnection.class b/app/src/gambas3/.src/Connection/FNewConnection.class index c8d134480..d0b7b3128 100644 --- a/app/src/gambas3/.src/Connection/FNewConnection.class +++ b/app/src/gambas3/.src/Connection/FNewConnection.class @@ -28,6 +28,7 @@ Private Sub LoadConnection() txtPath.Text = hConfig["Connection/Path"] chkRememberPassword.Value = If(hConfig["Connection/RememberPassword"], 1, 0) chkIgnoreCharset.Value = If(hConfig["Connection/IgnoreCharset"], 1, 0) + chkDisplayMetadata.Value = If(hConfig["Connection/DisplayMetadata"], 1, 0) For iInd = 0 To cmbType.Count - 1 If LCase(cmbType[iInd].Text) = sType Then @@ -52,6 +53,7 @@ Private Sub FillConfig(hConfig As Object) hConfig["Connection/Path"] = txtPath.Text hConfig["Connection/RememberPassword"] = CBool(chkRememberPassword.Value) hConfig["Connection/IgnoreCharset"] = CBool(chkIgnoreCharset.Value) + hConfig["Connection/DisplayMetadata"] = CBool(chkDisplayMetadata.Value) hConfig["Connection/Database"] = txtDatabase.Text End diff --git a/app/src/gambas3/.src/Connection/FNewConnection.form b/app/src/gambas3/.src/Connection/FNewConnection.form index 054299ff6..4127575f1 100644 --- a/app/src/gambas3/.src/Connection/FNewConnection.form +++ b/app/src/gambas3/.src/Connection/FNewConnection.form @@ -1,7 +1,7 @@ # Gambas Form File 3.0 { Form Form - MoveScaled(0,0,70,69) + MoveScaled(0,0,70,75) Icon = Picture["img/16/database.png"] Resizable = False Arrangement = Arrange.Vertical @@ -156,8 +156,22 @@ Text = ("Ignore database charset") } } + { HBox8 HBox + MoveScaled(1,64,68,3) + { Label12 Label + MoveScaled(0,0,18,3) + } + { chkDisplayMetadata CheckBox + MoveScaled(27,0,24,3) + Expand = True + Text = ("Display metadata") + } + } + { Panel2 Panel + MoveScaled(38,68,6,1) + } { HBox1 HBox - MoveScaled(1,64,68,4) + MoveScaled(1,70,68,4) Spacing = True { Panel1 Panel MoveScaled(4,0,4,4) diff --git a/app/src/gambas3/.src/Connection/MConnection.module b/app/src/gambas3/.src/Connection/MConnection.module index 2f95643ef..743c955af 100644 --- a/app/src/gambas3/.src/Connection/MConnection.module +++ b/app/src/gambas3/.src/Connection/MConnection.module @@ -1,7 +1,7 @@ ' Gambas module file Public Password As New Collection -Public Const InfoTableName As String = "_gbFieldDesc" +Public Const METADATA_TABLE_NAME As String = "__gb_metadata" Private $bError As Boolean @@ -335,13 +335,12 @@ Public Sub FillViewWithTables(lvwTable As TreeView, hConn As Connection, bShowSy 'lvwTable.Add("$", ("SQL request"), Picture["img/16/sql.png"]) For Each hTable In hConn.Tables - If hTable.System And If Not bShowSystem Then Continue + If Not bShowSystem Then + If hTable.System Or If hTable.Name = METADATA_TABLE_NAME Then Continue + Endif sName = hTable.Name - 'NOTE: FABIEN: Mask the Gambas Infos table - If sName = InfoTableName Then Continue - iPos = InStr(sName, ".") If iPos Then sParent = ">" & Left(sName, iPos - 1) diff --git a/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class b/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class index 8736fb157..45ed30a77 100644 --- a/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class +++ b/app/src/gambas3/.src/Editor/Connection/FConnectionEditor.class @@ -17,7 +17,7 @@ Private $cFieldName As New Collection Private $aIndexField As New CIndexField[] Private $cFieldInfo As New Collection -Private $bAllowDesc As Boolean = False +Private $bMetadata As Boolean Public Sub _new(sPath As String) @@ -26,7 +26,7 @@ Public Sub _new(sPath As String) With tbvField - .Columns.Count = IIf($bAllowDesc, 6, 5) + .Columns.Count = 5 With tbvField.Columns[0] .Text = " " @@ -53,13 +53,6 @@ Public Sub _new(sPath As String) .Width = Desktop.Scale * 24 End With - If $bAllowDesc Then - With tbvField.Columns[5] - .Text = ("Description") - .Width = Desktop.Scale * 24 - End With - Endif - End With With tbvIndex @@ -193,6 +186,18 @@ Public Sub Reload() As Boolean datData.Connection = $hConn datRequest.Connection = $hConn + $bMetadata = hConfig["Connection/DisplayMetadata"] + + If $bMetadata Then + tbvField.Columns.Count = 6 + With tbvField.Columns[5] + .Text = ("Description") + .Width = Desktop.Scale * 24 + End With + Else + tbvField.Columns.Count = 5 + Endif + LoadList($sTable) DrawTitle @@ -329,17 +334,19 @@ Private Sub ReloadTable() $aIndexField.Clear $cFieldInfo.Clear - If $bAllowDesc Then + If $bMetadata Then 'create the info table if not exist - If Not $hConn.Tables.Exist(MConnection.InfoTableName) Then - hTable = $hConn.Tables.Add(MConnection.InfoTableName) - hTable.Fields.Add("field", db.String) - hTable.Fields.Add("desc", db.String) + If Not $hConn.Tables.Exist(MConnection.METADATA_TABLE_NAME) Then + hTable = $hConn.Tables.Add(MConnection.METADATA_TABLE_NAME) + hTable.Fields.Add("type", db.Integer) + hTable.Fields.Add("key", db.String) + hTable.Fields.Add("value", db.String) + hTable.PrimaryKey = ["type", "key"] hTable.Update Endif 'Loading bdd infos - hResult = $hConn.Find(MConnection.InfoTableName, "field like &1", $sTable &/ "%") + hResult = $hConn.Find(MConnection.METADATA_TABLE_NAME, "field like &1", $sTable &/ "%") If hResult.Available Then For Each hResult @@ -1258,12 +1265,12 @@ Private Sub WriteTable(Optional sOldTable As String) As Boolean Endif - If $bAllowDesc Then + If $bMetadata Then 'Save the field Desc - $hConn.Delete(MConnection.InfoTableName, "field like &1", $sTable &/ "%") + $hConn.Delete(MConnection.METADATA_TABLE_NAME, "field like &1", $sTable &/ "%") $hConn.Begin For Each s In $cFieldInfo - rInfo = $hConn.Create(MConnection.InfoTableName) + rInfo = $hConn.Create(MConnection.METADATA_TABLE_NAME) rInfo!field = $cFieldInfo.Key rInfo!desc = s rInfo.Update diff --git a/app/src/gambas3/.src/Editor/Image/FImageEditor.class b/app/src/gambas3/.src/Editor/Image/FImageEditor.class index 4c1690f87..1a0f2469e 100644 --- a/app/src/gambas3/.src/Editor/Image/FImageEditor.class +++ b/app/src/gambas3/.src/Editor/Image/FImageEditor.class @@ -2703,6 +2703,12 @@ Public Sub mnuFormat_Show() hMenu.Checked = hMenu.Tag = sFormat Next + ' If sFormat = "jpeg" Or If sFormat = "png" Then + ' mnuQuality.Enabled = True + ' Else + ' mnuQuality.Enabled = False + ' Endif + End diff --git a/app/src/gambas3/.src/Editor/Image/FImageQuality.class b/app/src/gambas3/.src/Editor/Image/FImageQuality.class new file mode 100644 index 000000000..3d5092b22 --- /dev/null +++ b/app/src/gambas3/.src/Editor/Image/FImageQuality.class @@ -0,0 +1,20 @@ +' Gambas class file + +Public Sub Run() As Boolean + + Return Not Me.ShowModal() + +End + +Public Sub btnOK_Click() + + Me.Close(TRUE) + +End + +Public Sub btnCancel_Click() + + Me.Close + +End + diff --git a/app/src/gambas3/.src/Editor/Image/FImageQuality.form b/app/src/gambas3/.src/Editor/Image/FImageQuality.form new file mode 100644 index 000000000..ade561fb7 --- /dev/null +++ b/app/src/gambas3/.src/Editor/Image/FImageQuality.form @@ -0,0 +1,25 @@ +# Gambas Form File 3.0 + +{ Form Form + MoveScaled(0,0,55,12) + Text = ("Image quality") + Resizable = False + Arrangement = Arrange.Vertical + Spacing = True + Margin = True + { sldQuality SliderBox + MoveScaled(1,1,53,4) + Step = 10 + Value = 80 + } + { btnOK Button + MoveScaled(21,7,16,4) + Text = ("OK") + Default = True + } + { btnCancel Button + MoveScaled(38,7,16,4) + Text = ("Cancel") + Cancel = True + } +} diff --git a/app/src/gambas3/.src/FMain.form b/app/src/gambas3/.src/FMain.form index 162b919c3..72ea17b99 100644 --- a/app/src/gambas3/.src/FMain.form +++ b/app/src/gambas3/.src/FMain.form @@ -400,6 +400,12 @@ Picture = Picture["icon:/small/html"] Tag = "css" } + { mnuNewJS Menu mnuNewFile + Name = "mnuNewJS" + Text = ("&Javascript file...") + Picture = Picture["icon:/small/script"] + Tag = "js" + } { mnuNewFile Menu mnuNewFile Name = "mnuNewFile" Action = "new-other" diff --git a/app/src/gambas3/.src/Project/FCreateFile.class b/app/src/gambas3/.src/Project/FCreateFile.class index 2ee42c923..b39cc8464 100644 --- a/app/src/gambas3/.src/Project/FCreateFile.class +++ b/app/src/gambas3/.src/Project/FCreateFile.class @@ -46,7 +46,7 @@ Public Sub lstType_Click() sPrefix = UCase(Left(sPrefix)) & Mid(sPrefix, 2) Object.Lock(txtName) Select Case LCase(sPrefix) - Case "text", "image", "html", "css" + Case "text", "image", "html", "css", "js" txtName.Text = Project.GetNewName(sPrefix, $sDir) Case Else txtName.Text = Project.GetNewName(sPrefix) @@ -115,8 +115,8 @@ Public Sub Form_Open() Else - $aFilterType = ["image", "html", "css", "text"] - $aFilter = ["*.png;*.jpg;*.jpeg;*.xpm;*.gif", ("Picture files"), "*.htm;*.html", ("HTML files"), "*.css", ("Cascading style sheets")] + $aFilterType = ["image", "html", "css", "js", "text"] + $aFilter = ["*.png;*.jpg;*.jpeg;*.xpm;*.gif", ("Picture files"), "*.htm;*.html", ("HTML files"), "*.css", ("Cascading style sheets"), "*.js", ("Javascript files")] Endif @@ -184,12 +184,12 @@ Private Sub CreateFile() As Boolean Select Case sType - Case "text", "image", "html", "css" + Case "text", "image", "html", "css", "js" If sName And If chkExt.Value Then If sType = "image" Then sName = File.SetExt(sName, LCase(cmbImageType.Text)) - Else If sType = "html" Or sType = "css" Then + Else If sType = "html" Or If sType = "css" Or If sType = "js" Then sName = File.SetExt(sName, sType) Endif Endif @@ -261,19 +261,19 @@ Private Sub CreateFile() As Boolean " Spacing = True\n" " Margin = True\n" sTemp &= "{ HBox1 HBox\n" - " MoveScaled(1,59,66,4)\n" + " MoveScaled(1,59,62,4)\n" " Spacing = True\n" " { Panel1 Panel\n" " MoveScaled(4,0,4,4)\n" " Expand = True\n" " }\n" " { btnOK Button\n" - " MoveScaled(31,0,16,4)\n" + " MoveScaled(29,0,16,4)\n" " Text = (\"OK\")\n" " Default = True\n" " }\n" " { btnCancel Button\n" - " MoveScaled(48,0,16,4)\n" + " MoveScaled(46,0,16,4)\n" " Text = (\"Cancel\")\n" " Cancel = True\n" " }\n" @@ -302,7 +302,7 @@ Private Sub CreateFile() As Boolean Case "html" - File.Save($sDir &/ sName, "\n\n\n\n") + File.Save($sDir &/ sName, "\n\n\n\n\n\n\n\n\n") Project.InsertFile(sName, $sDir) Case "css" @@ -310,10 +310,19 @@ Private Sub CreateFile() As Boolean File.Save($sDir &/ sName, "BODY\n{\n}\n") Project.InsertFile(sName, $sDir) + Case "js" + + File.Save($sDir &/ sName, "// " & sName & "\n\nfunction foo()\n{\n}\n") + Project.InsertFile(sName, $sDir) + Case "image" hImage = New Image(txtWidth.Value, txtHeight.Value) - hImage.Fill(Color.Transparent) + If cmbImageType.Text = "JPEG" Then + hImage.Fill(Color.White) + Else + hImage.Fill(Color.Transparent) + Endif hImage.Save($sDir &/ sName) Project.InsertFile(sName, $sDir) diff --git a/app/src/gambas3/.src/Project/FCreateFile.form b/app/src/gambas3/.src/Project/FCreateFile.form index 0593747fa..1c8e2d3f2 100644 --- a/app/src/gambas3/.src/Project/FCreateFile.form +++ b/app/src/gambas3/.src/Project/FCreateFile.form @@ -21,7 +21,7 @@ Spacing = True Margin = True { lstType ListContainer - MoveScaled(1,1,32,52) + MoveScaled(1,1,32,54) Mouse = Mouse.Pointing { panModule HBox panType Name = "panModule" @@ -185,6 +185,24 @@ Text = ("Style sheet") } } + { HBox8 HBox panType + Name = "HBox8" + MoveScaled(0,47,31,5) + Tag = "js" + Spacing = True + Margin = True + Padding = 4 + { PictureBox10 PictureBox + MoveScaled(1,1,3,3) + Picture = Picture["icon:/large/script"] + Stretch = True + Alignment = Align.Center + } + { Label17 Label + MoveScaled(5,1,25,3) + Text = ("Javascript file") + } + } } { panOption VBox MoveScaled(34,1,42,52) @@ -241,7 +259,7 @@ MoveScaled(13,10,17,4) #Translate = False ReadOnly = True - List = ["PNG", "XPM", "GIF"] + List = ["PNG", "JPEG", "XPM", "GIF"] } { Label13 Label MoveScaled(23,0,4,4) @@ -280,7 +298,7 @@ } { Panel3 Panel MoveScaled(0,44,41,4) - Tag = "image,html,css" + Tag = "image,html,css,js" { chkExt CheckBox MoveScaled(1,0,36,4) Text = ("Automatic extension") diff --git a/app/src/gambas3/.src/Project/FProjectProperty.form b/app/src/gambas3/.src/Project/FProjectProperty.form index 1e03acfbf..17e2e466c 100644 --- a/app/src/gambas3/.src/Project/FProjectProperty.form +++ b/app/src/gambas3/.src/Project/FProjectProperty.form @@ -123,7 +123,7 @@ Text = ("Description") } { txtDesc TextArea - MoveScaled(18,15,60,18) + MoveScaled(18,15,60,17) Expand = True Wrap = True } @@ -133,7 +133,7 @@ Text = ("Author(s)") } { txtAuthor TextArea - MoveScaled(18,34,57,16) + MoveScaled(18,33,57,17) Expand = True Wrap = True }