diff --git a/Makefile.am b/Makefile.am index 2f3a6df4d..89cad31a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,6 +55,6 @@ install-exec-local: echo ; \ fi @rm -f $(srcdir)/warnings.log - + dist-hook: @(cd $(distdir); rm -rf `find . -name ".gambas" -o -name ".lock" -o -name ".xvpics" -o -name "*~" -o -name "*.out" -o -name "*.pot" -o -name "*.gambas" -o -name "core.*" -o -name "vgcore.*" -o -name ".kdbg*" -o -name ".svn"`;) diff --git a/app/src/gambas3/.icon.png b/app/src/gambas3/.icon.png index 05f91df88..69ec1f0be 100644 Binary files a/app/src/gambas3/.icon.png and b/app/src/gambas3/.icon.png differ diff --git a/app/src/gambas3/.lang/fr.po b/app/src/gambas3/.lang/fr.po index a524fcdf4..0f7cce121 100644 --- a/app/src/gambas3/.lang/fr.po +++ b/app/src/gambas3/.lang/fr.po @@ -222,6 +222,7 @@ msgid "" msgstr "" "Project-Id-Version: gambas3 3.7.90\n" +"POT-Creation-Date: 2015-05-27 10:44 UTC\n" "PO-Revision-Date: 2015-05-14 21:27 UTC\n" "Last-Translator: Benoît Minisini \n" "Language: fr\n" @@ -769,14 +770,16 @@ msgstr "Gestion du XML" msgid "Loading information on component &1..." msgstr "Chargement des informations sur le composant &1..." -#: CComponent.class:1609 FFileProperty.class:165 FProjectProperty.class:958 +#: CComponent.class:1609 FFileProperty.class:166 FProjectProperty.class:958 msgid "Classes" msgstr "Classes" +#: CComponent.class:1658 FCreateFile.class:132 FDebugInfo.class:51 #: FMain.form:786 msgid "Class" msgstr "Classe" +#: CComponent.class:1660 FConnectionEditor.class:295 FMakeInstall.form:286 #: FProjectProperty.form:343 FPublish.form:125 FSoftwareFarm.form:304 msgid "Description" msgstr "Description" @@ -789,7 +792,7 @@ msgstr "Ce composant n'est pas encore stable." msgid "This component is deprecated." msgstr "Ce composant est déprécié." -#: CComponent.class:1698 FProjectVersion.class:285 +#: CComponent.class:1698 FProjectVersion.class:287 msgid "Author" msgstr "Auteur" @@ -809,7 +812,7 @@ msgstr "Nécessite" msgid "Excludes" msgstr "Exclut" -#: CInsertColor.class:118 FEditor.form:275 FTextEditor.form:212 +#: CInsertColor.class:118 FEditor.form:274 FTextEditor.form:225 msgid "Insert color" msgstr "Insérer une couleur" @@ -829,7 +832,7 @@ msgstr "ATTENTION ! Bibliothèque introuvable." msgid "Provides" msgstr "Fournit" -#: CModule.class:28 FEditor.form:400 FForm.form:442 FMain.form:793 +#: CModule.class:28 FEditor.form:399 FForm.form:442 FMain.form:793 msgid "Form" msgstr "Formulaire" @@ -885,6 +888,7 @@ msgstr "Les exemples sont stockés sur le serveur de la logithèque de Gambas. C msgid "here" msgstr "ici" +#: CProjectTree.class:285 FHelpShortcut.form:22 FMain.form:372 #: FSearch.class:97 FSelectIcon.form:31 Project.module:1807 msgid "Project" msgstr "Projet" @@ -953,7 +957,26 @@ msgstr "Impossible de générer l'exécutable." msgid "Unable to install source directory" msgstr "Impossible d'installer le répertoire source" -#: FTextEditor.class:683 FTranslate.class:562 Project.module:489 +#: CWaitingAnimation.class:56 FColorChooser.form:69 FComponentChooser.form:85 +#: FConflict.class:209 FConnectionEditor.class:431 FCrash.form:96 +#: FCreateFile.form:227 FDebugExpr.form:46 FDebugInfo.form:270 +#: FEditor.class:2222 FExportData.class:126 FFarmConfig.form:38 +#: FFarmLogin.form:126 FFarmRegister.form:141 FFarmRequest.form:43 +#: FFieldChooser.form:138 FFileProperty.class:142 FFontChooser.form:40 +#: FForm.class:3215 FGotoLine.form:23 FHelpBrowser.form:60 +#: FImageEditor.class:388 FImageOffsetSelection.form:33 FImageQuality.form:30 +#: FImageResize.form:49 FImageRotate.form:32 FList.form:121 FMain.class:214 +#: FMakeInstall.class:312 FMenu.form:404 FNewConnection.form:301 +#: FNewTable.form:86 FNewTranslation.form:21 FOption.class:721 +#: FPasteSpecial.form:86 FPasteTable.form:107 FProjectChooser.form:62 +#: FProjectProperty.form:1023 FProjectVersion.class:211 FProxy.form:57 +#: FPublish.class:271 FReportBorderChooser.form:48 +#: FReportBoxShadowChooser.form:27 FReportBrushChooser.form:36 +#: FReportCoordChooser.form:26 FReportPaddingChooser.form:75 FSave.form:28 +#: FSaveProjectAs.form:76 FSearch.class:887 FSelectComponent.form:51 +#: FSelectExtraFile.form:43 FSelectIcon.form:87 FSnippet.form:57 +#: FSoftwareFarm.class:450 FTableChooser.form:68 FText.form:41 +#: FTextEditor.class:675 FTranslate.class:562 Project.module:489 msgid "Cancel" msgstr "Annuler" @@ -982,9 +1005,24 @@ msgid "in &1:&2." msgstr "dans &1:&2." #: Design.module:392 -msgid "The program has returned\nthe value: &1" -msgstr "Le programme a retourné\nla valeur : &1" +msgid "" +"The program has returned\n" +"the value: &1" +msgstr "" +"Le programme a retourné\n" +"la valeur : &1" +#: Design.module:458 FColorChooser.form:63 FConnectionEditor.class:637 +#: FCrash.form:90 FCreateFile.form:233 FFarmConfig.form:33 FFarmLogin.form:121 +#: FFieldChooser.form:132 FFontChooser.form:34 FGotoLine.form:17 +#: FImageOffsetSelection.form:27 FImageQuality.form:24 FImageResize.form:103 +#: FImageRotate.form:26 FList.form:115 FMakeInstall.class:257 FMenu.form:399 +#: FNewConnection.form:295 FNewTable.form:80 FNewTranslation.form:15 +#: FPasteSpecial.form:80 FProjectProperty.form:1017 FProxy.form:63 +#: FReportBorderChooser.form:54 FReportBoxShadowChooser.form:33 +#: FReportBrushChooser.form:42 FReportCoordChooser.form:32 +#: FReportPaddingChooser.form:69 FSelectComponent.form:46 +#: FSelectExtraFile.form:37 FSelectIcon.form:82 FSnippet.form:51 #: FTableChooser.form:62 FText.form:35 msgid "OK" msgstr "OK" @@ -1010,11 +1048,20 @@ msgid "About Gambas" msgstr "À propos de Gambas" #: FAbout.form:48 -msgid "Gambas
\nAlmost
\nMeans
\nB A S I C !" +msgid "" +"Gambas
\n" +"Almost
\n" +"Means
\n" +"B A S I C !" msgstr "-" #: FAbout.form:61 -msgid "

Licence

\n\n

This program is FREE SOFTWARE; you can redistribute it AND/OR modify it under the terms of the GNU General Public License as published by the Free Software Foundation ; either version 2, or (at your option) any later version.

\n\n

This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

\n" +msgid "" +"

Licence

\n" +"\n" +"

This program is FREE SOFTWARE; you can redistribute it AND/OR modify it under the terms of the GNU General Public License as published by the Free Software Foundation ; either version 2, or (at your option) any later version.

\n" +"\n" +"

This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

\n" msgstr "

Licence

Ce programme est un LOGICIEL LIBRE. Vous pouvez le redistribuer ET/OU le modifier selon les termes de la Licence Publique Générale GNU telle qu'elle est publiée par la Free Software Foundation ; soit la version 2, ou bien n'importe quelle version ultérieure de votre choix.

Ce programme est distribué en espérant qu'il soit utile MAIS SANS GARANTIE D'AUCUNE SORTE ; y compris les garanties implicites de COMMERCIABILITÉ ET DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Se reporter à la Licence Publique Générale GNU pour plus d'information.

\n" #: FAbout.form:67 @@ -1025,7 +1072,7 @@ msgstr "

Auteurs

\n" msgid "Select a color" msgstr "Choisissez une couleur" -#: FColorChooser.form:27 +#: FColorChooser.form:27 FSoftwareFarm.class:48 msgid "System" msgstr "Système" @@ -1085,7 +1132,9 @@ msgstr "Le composant &1 nécessite le composant &2." msgid "Select a component" msgstr "Choisissez un composant" -#: FTextEditor.form:284 FTranslate.form:76 +#: FComponentChooser.form:91 FConnectionEditor.form:110 FEditor.form:335 +#: FForm.form:427 FHelpBrowser.form:66 FImageEditor.form:338 FMain.form:331 +#: FTextEditor.form:297 FTranslate.form:76 msgid "Reload" msgstr "Recharger" @@ -1106,97 +1155,135 @@ msgid "&Edit" msgstr "&Éditer" #: FConflict.class:23 -msgid "This file is in conflict with the revision #&1.\nYou must resolve the conflict in order to use the file." -msgstr "Ce fichier entre en conflit avec la révision #&1.\nVous devez résoudre le conflit pour pouvoir utiliser ce fichier de nouveau." +msgid "" +"This file is in conflict with the revision #&1.\n" +"You must resolve the conflict in order to use the file." +msgstr "" +"Ce fichier entre en conflit avec la révision #&1.\n" +"Vous devez résoudre le conflit pour pouvoir utiliser ce fichier de nouveau." -#: FConflict.class:116 +#: FConflict.class:109 msgid "Unable to load file:" msgstr "Impossible de charger le fichier :" -#: FConflict.class:158 FDebugInfo.class:70 FImageEditor.form:594 +#: FConflict.class:151 FDebugInfo.class:70 FImageEditor.form:594 msgid "Text" msgstr "Texte" +#: FConflict.class:153 FCreateFile.class:142 FMain.form:817 #: FReportBrushChooser.form:49 Project.module:219 msgid "Image" msgstr "Image" -#: FConflict.class:218 -msgid "The file has been modified.\nDo you really want to close the dialog?" -msgstr "Le fichier a été modifié.\nDésirez-vous réellement fermer la boite de dialogue ?" +#: FConflict.class:209 +msgid "" +"The file has been modified.\n" +"Do you really want to close the dialog?" +msgstr "" +"Le fichier a été modifié.\n" +"Désirez-vous réellement fermer la boite de dialogue ?" -#: FConflict.class:246 +#: FConflict.class:237 msgid "Some conflicts are not yet resolved." msgstr "Tous les conflits ne sont pas résolus." -#: FConflict.class:252 +#: FConflict.class:243 msgid "Unable to resolve the conflict." msgstr "Impossible de résoudre le conflit." -#: FConflict.class:281 -msgid "The file has been modified.\nDo you really want to open another file?" -msgstr "Le fichier a été modifié.\nDésirez-vous réellement ouvrir un autre fichier ?" +#: FConflict.class:271 +msgid "" +"The file has been modified.\n" +"Do you really want to open another file?" +msgstr "" +"Le fichier a été modifié.\n" +"Désirez-vous réellement ouvrir un autre fichier ?" -#: FConflict.class:289 +#: FConflict.class:279 msgid "Conflict files" msgstr "Fichiers en conflits" -#: FConflict.form:32 +#: FConflict.form:31 msgid "Version conflict" msgstr "Conflit de version" -#: FOutput.form:63 FProjectVersion.form:234 FTextEditor.form:126 +#: FConflict.form:70 FConnectionEditor.form:379 FEditor.form:157 +#: FForm.form:185 FImageEditor.form:128 FMain.form:902 FMenu.form:111 +#: FOutput.form:63 FProjectVersion.form:234 FTextEditor.form:132 msgid "Cut" msgstr "Couper" -#: FProjectVersion.form:240 FSystemInfo.form:63 FTextEditor.form:133 +#: FConflict.form:76 FConnectionEditor.form:149 FEditor.form:164 +#: FForm.form:192 FImageEditor.form:136 FList.form:92 FMain.form:909 +#: FMakeInstall.form:875 FMenu.form:117 FOutput.form:70 +#: FProjectVersion.form:240 FSystemInfo.form:63 FTextEditor.form:139 msgid "Copy" msgstr "Copier" -#: FProjectVersion.form:246 FTextEditor.form:140 +#: FConflict.form:82 FConnectionEditor.form:157 FEditor.form:171 +#: FForm.form:205 FImageEditor.form:143 FList.form:98 FMain.form:916 +#: FMenu.form:123 FOutput.form:77 FPasteTable.form:101 +#: FProjectVersion.form:246 FTextEditor.form:146 msgid "Paste" msgstr "Coller" -#: FTextEditor.form:109 +#: FConflict.form:88 FConnectionEditor.form:407 FEditor.form:140 +#: FFieldChooser.form:121 FForm.form:168 FImageEditor.form:109 FList.form:104 +#: FOption.form:870 FOutput.form:46 FProjectVersion.form:252 +#: FTextEditor.form:115 msgid "Undo" msgstr "Annuler" -#: FProjectVersion.form:258 FTextEditor.form:116 +#: FConflict.form:94 FConnectionEditor.form:414 FEditor.form:147 +#: FForm.form:175 FImageEditor.form:117 FOutput.form:53 +#: FProjectVersion.form:258 FTextEditor.form:122 msgid "Redo" msgstr "Rétablir" -#: FTextEditor.form:387 +#: FConflict.form:100 FEditor.form:495 FMenu.form:133 FProjectVersion.form:264 +#: FTextEditor.form:427 msgid "Indent" msgstr "Indenter" -#: FTextEditor.form:395 +#: FConflict.form:106 FEditor.form:503 FMenu.form:139 FProjectVersion.form:270 +#: FTextEditor.form:435 msgid "Unindent" msgstr "Désindenter" +#: FConflict.form:141 FMain.form:324 FOpenProject.form:35 #: FProjectChooser.form:75 msgid "Open" msgstr "Ouvrir" -#: FConflict.form:151 +#: FConflict.form:143 msgid "Open..." msgstr "Ouvrir..." -#: FSaveProjectAs.form:82 FTextEditor.form:290 +#: FConflict.form:149 FConnectionEditor.form:102 FEditor.form:341 +#: FForm.form:433 FImageEditor.form:345 FMain.form:340 FMenu.class:72 +#: FSaveProjectAs.form:82 FTextEditor.form:303 msgid "Save" msgstr "Enregistrer" -#: FConflict.form:168 +#: FConflict.form:160 msgid "Solve" msgstr "Résoudre" +#: FConflict.form:166 FDebugInfo.form:278 FEditor.form:328 +#: FFileProperty.form:75 FForm.form:420 FImageEditor.form:352 +#: FImportTable.form:222 FMain.form:357 FPatch.form:105 +#: FProjectVersion.form:322 FSystemInfo.form:69 FTextEditor.form:310 #: FTips.form:83 FTranslate.form:309 msgid "Close" msgstr "Fermer" +#: FConnectionEditor.class:46 FCreateFile.form:78 FDebugInfo.class:38 +#: FMakeInstall.form:203 FNewConnection.form:68 FNewTable.form:33 #: FOption.form:257 msgid "Name" msgstr "Nom" +#: FConnectionEditor.class:51 FCreateFile.form:129 FCreateProject.form:98 #: FDebugInfo.class:76 FNewConnection.form:82 FNewTable.form:48 FProxy.form:27 msgid "Type" msgstr "Type" @@ -1229,115 +1316,116 @@ msgstr "Champ" msgid "Unable to connect to database." msgstr "Impossible de se connecter à la base de données." -#: FConnectionEditor.class:432 FSave.form:35 +#: FConnectionEditor.class:431 FSave.form:35 msgid "Do not save" msgstr "Ne pas enregistrer" -#: FConnectionEditor.class:432 +#: FConnectionEditor.class:431 msgid "The table '&1' has been modified. Do you want to save it?" msgstr "La table « &1 » a été modifiée. Voulez-vous l'enregistrer ?" -#: FConnectionEditor.class:586 +#: FConnectionEditor.class:585 msgid "Unable to load table '&1'." msgstr "Impossible de charger la table « &1 »." -#: FConnectionEditor.class:645 +#: FConnectionEditor.class:644 msgid "Unable to run query." msgstr "Impossible d'exécuter la requête." -#: FConnectionEditor.class:677 +#: FConnectionEditor.class:676 msgid "unlimited" msgstr "illimité" -#: FConnectionEditor.class:764 MConnection.module:128 +#: FConnectionEditor.class:763 MConnection.module:128 msgid "Blob" msgstr "Blob" -#: FConnectionEditor.class:764 MConnection.module:122 MErrorMessage.module:46 +#: FConnectionEditor.class:763 MConnection.module:122 MErrorMessage.module:46 msgid "Boolean" msgstr "Booléen" +#: FConnectionEditor.class:763 FProjectVersion.class:290 #: MConnection.module:120 msgid "Date" msgstr "Date" -#: FConnectionEditor.class:764 MConnection.module:118 +#: FConnectionEditor.class:763 MConnection.module:118 msgid "Float" msgstr "Décimal" -#: FConnectionEditor.class:764 MConnection.module:114 +#: FConnectionEditor.class:763 MConnection.module:114 msgid "Integer" msgstr "Entier" -#: FConnectionEditor.class:764 MConnection.module:116 +#: FConnectionEditor.class:763 MConnection.module:116 msgid "Long" msgstr "Entier long" -#: FConnectionEditor.class:764 MConnection.module:126 +#: FConnectionEditor.class:763 MConnection.module:126 msgid "Serial" msgstr "Série" -#: FConnectionEditor.class:764 MConnection.module:124 MErrorMessage.module:155 +#: FConnectionEditor.class:763 MConnection.module:124 MErrorMessage.module:155 msgid "String" msgstr "Chaîne" -#: FConnectionEditor.class:853 +#: FConnectionEditor.class:852 msgid "This name is already in used." msgstr "Ce nom est déjà utilisé." -#: FConnectionEditor.class:878 +#: FConnectionEditor.class:877 msgid "Please enter a number." msgstr "Veuillez saisir un nombre." -#: FConnectionEditor.class:883 +#: FConnectionEditor.class:882 msgid "The length must be greater than 1 and lower than 255." msgstr "La longueur doit être comprise entre 1 et 255." -#: FConnectionEditor.class:907 +#: FConnectionEditor.class:906 msgid "Type mismatch." msgstr "Type de données incorrect." -#: FConnectionEditor.class:959 +#: FConnectionEditor.class:958 msgid "This name already exists." msgstr "Ce nom existe déjà." -#: FConnectionEditor.class:1047 +#: FConnectionEditor.class:1046 msgid "This field is used in an index." msgstr "Le champ est utilisé dans un index." -#: FConnectionEditor.class:1398 +#: FConnectionEditor.class:1397 msgid "The table '&1' has no primary key." msgstr "La table « &1 » n'a pas de clef primaire." -#: FConnectionEditor.class:1530 +#: FConnectionEditor.class:1529 msgid "Cannot write table '&1'." msgstr "Impossible d'écrire la table « &1 »." -#: FConnectionEditor.class:1642 +#: FConnectionEditor.class:1641 msgid "Do you really want to delete table '&1'?" msgstr "Voulez-vous vraiment supprimer la table « &1 » ?" -#: FConnectionEditor.class:1654 +#: FConnectionEditor.class:1653 msgid "Cannot delete table '&1'." msgstr "Impossible de supprimer la table « &1 »." -#: FConnectionEditor.class:1690 +#: FConnectionEditor.class:1689 msgid "Select the CSV file to import" msgstr "Choisissez le fichier CSV à importer" -#: FConnectionEditor.class:1691 FSearch.form:172 FTranslate.class:1215 +#: FConnectionEditor.class:1690 FSearch.form:172 FTranslate.class:1215 msgid "All files" msgstr "Tous les fichiers" -#: FConnectionEditor.class:1691 FExportData.class:21 +#: FConnectionEditor.class:1690 FExportData.class:21 msgid "CSV files" msgstr "Fichiers CSV" -#: FConnectionEditor.class:1714 +#: FConnectionEditor.class:1713 msgid "Do you really want to remove the selected rows?" msgstr "Voulez-vous vraiment supprimer les lignes sélectionnées ?" -#: FConnectionEditor.class:1875 +#: FConnectionEditor.class:1874 msgid "Do you really want to remove this query?" msgstr "Voulez-vous vraiment supprimer cette requête ?" @@ -1357,6 +1445,8 @@ msgstr "Nouvelle table" msgid "Delete table" msgstr "Supprimer la table" +#: FConnectionEditor.form:133 FMain.form:1034 FMakeInstall.form:735 +#: FOption.form:1267 FProjectProperty.form:550 FPublish.form:268 #: FSoftwareFarm.form:394 msgid "Remove" msgstr "Supprimer" @@ -1381,6 +1471,7 @@ msgstr "Copier la table" msgid "Import text file" msgstr "Importer un fichier texte" +#: FConnectionEditor.form:165 FImportTable.form:215 FOption.form:1275 #: FTranslate.form:329 msgid "Import" msgstr "Importer" @@ -1393,14 +1484,17 @@ msgstr "Requêtes SQL" msgid "Fields" msgstr "Champs" -#: FOption.form:1310 FProjectProperty.form:666 FPublish.form:158 +#: FConnectionEditor.form:233 FMain.class:2091 FMakeInstall.form:729 +#: FOption.form:1315 FProjectProperty.form:666 FPublish.form:158 msgid "Add" msgstr "Ajouter" +#: FConnectionEditor.form:247 FList.form:76 FMakeInstall.form:747 #: FPublish.form:280 msgid "Down" msgstr "Descendre" +#: FConnectionEditor.form:254 FList.form:70 FMakeInstall.form:741 #: FPublish.form:274 msgid "Up" msgstr "Monter" @@ -1425,7 +1519,8 @@ msgstr "Exécuter la requête" msgid "New query" msgstr "Nouvelle requête" -#: FOption.form:1248 FTranslate.form:71 +#: FConnectionEditor.form:365 FCreateFile.form:53 FMain.form:761 +#: FOption.form:1253 FTranslate.form:71 msgid "New" msgstr "Nouveau" @@ -1433,7 +1528,8 @@ msgstr "Nouveau" msgid "Remove query" msgstr "Supprimer la requête" -#: FForm.form:164 FImageEditor.form:104 FOption.form:1255 FTextEditor.form:105 +#: FConnectionEditor.form:452 FDebugExpr.form:28 FEditor.form:136 +#: FForm.form:164 FImageEditor.form:104 FOption.form:1260 FTextEditor.form:111 msgid "Edit" msgstr "Éditer" @@ -1445,7 +1541,9 @@ msgstr "Exporter vers un fichier CSV" msgid "Export" msgstr "Exporter" -#: FSoftwareFarm.class:544 FTranslate.form:81 +#: FConnectionEditor.form:485 FForm.form:212 FList.form:64 FMain.form:930 +#: FMenu.form:101 FNewConnection.class:349 FOption.class:886 +#: FSoftwareFarm.class:547 FTranslate.form:81 msgid "Delete" msgstr "Supprimer" @@ -1537,6 +1635,7 @@ msgstr "Impossible d'ajouter le fichier." msgid "New file" msgstr "Nouveau fichier" +#: FCreateFile.form:88 FCreateProject.form:274 FImportTable.form:57 #: FMakePatch.form:66 FProjectProperty.form:773 FSearch.form:100 msgid "Options" msgstr "Options" @@ -1622,8 +1721,12 @@ msgid "CGI Web application" msgstr "Application Web CGI" #: FCreateProject.form:259 -msgid "Application stored in a\nSubversion repository" -msgstr "Application stockée dans un\nréférentiel Subversion" +msgid "" +"Application stored in a\n" +"Subversion repository" +msgstr "" +"Application stockée dans un\n" +"référentiel Subversion" #: FCreateProject.form:288 msgid "Internationalization" @@ -1733,11 +1836,11 @@ msgstr "Aucun élément" msgid "Expression" msgstr "Expression" -#: FDebugInfo.class:53 FProfile.class:629 +#: FDebugInfo.class:53 FProfile.class:633 msgid "Function" msgstr "Fonction" -#: FOption.form:648 +#: FDebugInfo.class:55 FImageEditor.form:564 FImportTable.class:56 msgid "Line" msgstr "Ligne" @@ -1761,7 +1864,8 @@ msgstr "Message" msgid "native code" msgstr "code natif" -#: FMakeInstall.form:754 FOption.class:721 FOutput.form:84 FPublish.form:170 +#: FDebugInfo.class:560 FImageProperty.form:379 FList.form:86 +#: FMakeInstall.form:753 FOption.class:721 FOutput.form:84 FPublish.form:170 msgid "Clear" msgstr "Effacer" @@ -1781,7 +1885,7 @@ msgstr "Avertissements" msgid "Debug" msgstr "Débogage" -#: FDebugInfo.form:62 FMain.form:639 FOption.form:448 FSearch.class:93 +#: FDebugInfo.form:62 FMain.form:639 FOption.form:594 FSearch.class:93 msgid "Console" msgstr "Console" @@ -1869,139 +1973,146 @@ msgstr "La chaîne recherchée est introuvable." msgid "Stack backtrace" msgstr "Pile des appels" -#: FTextEditor.class:683 -msgid "The file has been modified.\n\nAll your changes will be lost." -msgstr "Le fichier a été modifié.\n\nToutes les modifications seront perdues." +#: FEditor.class:2222 FImageEditor.class:388 FMain.class:2577 +#: FTextEditor.class:675 +msgid "" +"The file has been modified.\n" +"\n" +"All your changes will be lost." +msgstr "" +"Le fichier a été modifié.\n" +"\n" +"Toutes les modifications seront perdues." -#: FEditor.class:2755 FTextEditor.class:1094 +#: FEditor.class:2678 FTextEditor.class:1086 msgid "(Declarations)" msgstr "(Déclarations)" -#: FEditor.form:99 +#: FEditor.form:98 msgid "Go to" msgstr "Aller à" -#: FEditor.form:104 FGotoLine.form:12 FTextEditor.form:86 +#: FEditor.form:103 FGotoLine.form:12 FTextEditor.form:92 msgid "Go to line" msgstr "Aller à la ligne" -#: FEditor.form:109 FTextEditor.form:91 +#: FEditor.form:108 FTextEditor.form:97 msgid "Bookmarks" msgstr "Signets" -#: FEditor.form:114 +#: FEditor.form:113 msgid "Find definition" msgstr "Trouver la définition" -#: FEditor.form:121 +#: FEditor.form:120 msgid "Open form" msgstr "Ouvrir le formulaire" -#: FEditor.form:128 FMain.form:956 +#: FEditor.form:127 FMain.form:956 msgid "Run this class" msgstr "Exécuter cette classe" -#: FEditor.form:182 FImageEditor.form:153 FTextEditor.form:150 +#: FEditor.form:181 FImageEditor.form:153 FTextEditor.form:156 msgid "Select All" msgstr "Tout sélectionner" -#: FEditor.form:192 FOutput.form:94 FTextEditor.form:160 +#: FEditor.form:191 FOutput.form:94 FTextEditor.form:166 msgid "Find next" msgstr "Poursuivre la recherche" -#: FEditor.form:199 FOutput.form:101 FTextEditor.form:167 +#: FEditor.form:198 FOutput.form:101 FTextEditor.form:173 msgid "Find previous" msgstr "Recherche en arrière" -#: FEditor.form:208 FMain.form:1366 +#: FEditor.form:207 FMain.form:1366 msgid "Run until current line" msgstr "Exécuter jusqu'à la ligne courante" -#: FEditor.form:215 +#: FEditor.form:214 msgid "Toggle breakpoint" msgstr "Basculer un point d'arrêt" -#: FEditor.form:222 +#: FEditor.form:221 msgid "Watch expression" msgstr "Surveiller des expressions" -#: FEditor.form:230 FTextEditor.form:176 +#: FEditor.form:229 FTextEditor.form:182 msgid "Advanced" msgstr "Avancé" -#: FEditor.form:234 FTextEditor.form:187 +#: FEditor.form:233 FTextEditor.form:193 msgid "Lower case" msgstr "Minuscules" -#: FEditor.form:241 FTextEditor.form:180 +#: FEditor.form:240 FTextEditor.form:186 msgid "Upper case" msgstr "Majuscules" -#: FEditor.form:251 +#: FEditor.form:250 msgid "Comment" msgstr "Mettre en commentaire" -#: FEditor.form:258 +#: FEditor.form:257 msgid "Uncomment" msgstr "Retirer les commentaires" -#: FEditor.form:268 FPasteSpecial.form:19 +#: FEditor.form:267 FPasteSpecial.form:19 FTextEditor.form:218 msgid "Paste special" msgstr "Collage spécial" -#: FEditor.form:281 +#: FEditor.form:280 msgid "Format code" msgstr "Formater le code" -#: FEditor.form:287 +#: FEditor.form:286 msgid "Sort procedures" msgstr "Trier les procédures" -#: FEditor.form:294 FImageEditor.form:291 FMain.form:616 FTextEditor.form:249 +#: FEditor.form:293 FImageEditor.form:291 FMain.form:616 FTextEditor.form:262 msgid "View" msgstr "Affichage" -#: FEditor.form:298 FTextEditor.form:253 +#: FEditor.form:297 FTextEditor.form:266 msgid "No split" msgstr "Affichage complet" -#: FEditor.form:304 FTextEditor.form:259 +#: FEditor.form:303 FTextEditor.form:272 msgid "Horizontal split" msgstr "Séparation horizontale" -#: FEditor.form:311 FTextEditor.form:266 +#: FEditor.form:310 FTextEditor.form:279 msgid "Vertical split" msgstr "Séparation verticale" -#: FEditor.form:322 FForm.form:413 FImageEditor.form:330 FTextEditor.form:277 +#: FEditor.form:321 FForm.form:413 FImageEditor.form:330 FTextEditor.form:290 msgid "Locked" msgstr "Verrouillé" -#: FEditor.form:352 FPasteSpecial.form:51 +#: FEditor.form:351 FPasteSpecial.form:60 FTextEditor.form:320 msgid "Paste as string" msgstr "Coller comme chaîne" -#: FEditor.form:357 FPasteSpecial.form:56 +#: FEditor.form:356 FPasteSpecial.form:65 FTextEditor.form:325 msgid "Paste as multi-line string" msgstr "Coller comme chaîne sur plusieurs lignes" -#: FEditor.form:362 FPasteSpecial.form:41 +#: FEditor.form:361 FPasteSpecial.form:50 FTextEditor.form:330 msgid "Paste as comments" msgstr "Coller comme commentaires" -#: FEditor.form:378 FHelpShortcut.form:24 FOption.form:432 +#: FEditor.form:377 FHelpShortcut.form:24 FOption.form:578 msgid "Editor" msgstr "Éditeur" -#: FEditor.form:407 FImageEditor.form:408 FTextEditor.form:335 +#: FEditor.form:406 FImageEditor.form:408 FTextEditor.form:375 msgid "Lock / unlock file" msgstr "Vérrouiller / déverrouiller le fichier" -#: FEditor.form:529 +#: FEditor.form:528 msgid "Make code pretty" msgstr "Réindenter le code" -#: FEditor.form:594 FTextEditor.form:477 +#: FEditor.form:593 FTextEditor.form:517 msgid "Procedure list" msgstr "Liste des procédures" @@ -2014,8 +2125,14 @@ msgid "&Overwrite" msgstr "&Remplacer" #: FExportData.class:126 -msgid "This file already exists.\n\nDo you want to overwrite it?" -msgstr "Ce fichier existe déjà.\n\nDésirez-vous le remplacer ?" +msgid "" +"This file already exists.\n" +"\n" +"Do you want to overwrite it?" +msgstr "" +"Ce fichier existe déjà.\n" +"\n" +"Désirez-vous le remplacer ?" #: FExportData.form:31 FImportTable.form:100 msgid "Delimiter character" @@ -2049,10 +2166,12 @@ msgstr "S'identifier" msgid "Server" msgstr "Serveur" +#: FFarmLogin.form:59 FFarmRegister.form:61 FNewConnection.form:141 #: FProjectVersion.form:127 FProxy.form:42 msgid "User" msgstr "Utilisateur" +#: FFarmLogin.form:74 FFarmRegister.form:76 FNewConnection.form:155 #: FProjectVersion.form:142 FProxy.form:47 msgid "Password" msgstr "Mot de passe" @@ -2078,8 +2197,14 @@ msgid "Unable to register user." msgstr "Impossible d'enregistrer l'utilisateur." #: FFarmRegister.class:40 -msgid "You have been successfully registered.\n\nYou will receive a confirmation e-mail soon." -msgstr "Vous avez été enregistré avec succès.\n\nVous recevrez un courriel de confirmation bientôt." +msgid "" +"You have been successfully registered.\n" +"\n" +"You will receive a confirmation e-mail soon." +msgstr "" +"Vous avez été enregistré avec succès.\n" +"\n" +"Vous recevrez un courriel de confirmation bientôt." #: FFarmRegister.form:28 FPublish.form:319 FSoftwareFarm.form:115 msgid "Register" @@ -2089,13 +2214,19 @@ msgstr "S'enregistrer" msgid "Confirm password" msgstr "Confirmer le mot de passe" -#: FFarmRegister.form:108 FMakeInstall.form:220 FOption.form:273 +#: FFarmRegister.form:108 FMakeInstall.form:219 FOption.form:273 msgid "E-mail" msgstr "E-mail" #: FFarmRegister.form:121 -msgid "A confirmation mail will be sent to the specified e-mail address. Click on the link included in that mail to activate your account.\n

\nYour e-mail will not be stored on the publishing server." -msgstr "Un mail de confirmation sera envoyé à l'adresse spécifiée. Cliquez sur le lien contenu dans ce mail pour activer votre compte.\n

\nVotre e-mail ne sera pas stocké sur le serveur de publication." +msgid "" +"A confirmation mail will be sent to the specified e-mail address. Click on the link included in that mail to activate your account.\n" +"

\n" +"Your e-mail will not be stored on the publishing server." +msgstr "" +"Un mail de confirmation sera envoyé à l'adresse spécifiée. Cliquez sur le lien contenu dans ce mail pour activer votre compte.\n" +"

\n" +"Votre e-mail ne sera pas stocké sur le serveur de publication." #: FFieldChooser.class:54 FTableChooser.class:66 msgid "Unable to open connection." @@ -2145,35 +2276,36 @@ msgstr "Suivi" msgid "Statistics" msgstr "Statistiques" -#: FFileProperty.class:124 +#: FFileProperty.class:125 msgid "This file is locked, and will be deleted on the next commit." msgstr "Le fichier est verrouillé, et sera supprimé au prochain envoi." -#: FFileProperty.class:126 +#: FFileProperty.class:127 msgid "This file is not versioned, and must be added to the repository." msgstr "Le fichier n'est pas versionné, et doit être ajouté au référentiel." -#: FFileProperty.class:129 +#: FFileProperty.class:130 msgid "This file has not been modified since the last commit." msgstr "Ce fichier est inchangé depuis le dernier envoi vers le réferentiel." +#: FFileProperty.class:142 FMakeInstall.class:312 FProjectVersion.class:211 #: FSave.form:21 Project.module:3495 msgid "Continue" msgstr "Continuer" -#: FFileProperty.class:141 FProjectVersion.class:209 +#: FFileProperty.class:142 FProjectVersion.class:211 msgid "You are going to cancel your changes!" msgstr "Tous les changements vont être annulés !" -#: FFileProperty.class:164 FProjectProperty.class:957 +#: FFileProperty.class:165 FProjectProperty.class:957 msgid "Modules" msgstr "Modules" -#: FFileProperty.class:169 FProjectProperty.class:965 +#: FFileProperty.class:170 FProjectProperty.class:965 msgid "Lines of code" msgstr "Lignes de code" -#: FFileProperty.form:65 FPatch.form:93 FProjectVersion.form:83 +#: FFileProperty.form:64 FPatch.form:93 FProjectVersion.form:83 msgid "Revert" msgstr "Revenir" @@ -2198,8 +2330,14 @@ msgid "Cannot paste data." msgstr "Impossible de coller les données." #: FForm.class:3215 -msgid "The form has been modified.\n\nAll your changes will be lost." -msgstr "Le formulaire a été modifié.\n\nTous vos changements seront perdus." +msgid "" +"The form has been modified.\n" +"\n" +"All your changes will be lost." +msgstr "" +"Le formulaire a été modifié.\n" +"\n" +"Tous vos changements seront perdus." #: FForm.form:131 msgid "Select" @@ -2213,7 +2351,7 @@ msgstr "Evènement" msgid "Change into" msgstr "Transformer en" -#: FForm.form:148 FMain.form:869 FTextEditor.form:96 +#: FForm.form:148 FMain.form:869 FTextEditor.form:102 msgid "Open code" msgstr "Ouvrir le code" @@ -2337,7 +2475,7 @@ msgstr "Même hauteur" msgid "Menu editor" msgstr "Éditeur de menu" -#: FForm.form:464 FTextEditor.form:328 +#: FForm.form:464 FTextEditor.form:368 msgid "Code" msgstr "Code" @@ -2385,11 +2523,11 @@ msgstr "Police plus grande" msgid "Smaller font" msgstr "Police plus petite" -#: FForm.form:747 FOption.form:372 +#: FForm.form:747 FOption.form:518 msgid "Default font" msgstr "Police par défaut" -#: FForm.form:755 FOption.form:648 MTheme.module:6 +#: FForm.form:755 FOption.form:887 MTheme.module:6 msgid "Background" msgstr "Arrière-plan" @@ -2733,7 +2871,7 @@ msgstr "Flou" msgid "Preview" msgstr "Aperçu" -#: FImageProperty.form:655 FOption.form:1324 FProjectProperty.form:595 +#: FImageProperty.form:655 FOption.form:1329 FProjectProperty.form:595 msgid "Reset" msgstr "Réinitialiser" @@ -2861,7 +2999,7 @@ msgstr "Source" msgid "Charset" msgstr "Jeu de caractères" -#: FImportTable.form:88 FTextEditor.form:230 +#: FImportTable.form:88 FTextEditor.form:243 msgid "End of line" msgstr "Fin de ligne" @@ -2954,8 +3092,14 @@ msgid "New folder" msgstr "Nouveau dossier" #: FMain.class:949 -msgid "The GNU translation tools are not installed on your system.\n\nPlease install them to be able to do the translation." -msgstr "Les outils de traduction GNU ne sont pas installés sur votre système.\n\nVeuillez les installer pour pouvoir effectuer la traduction." +msgid "" +"The GNU translation tools are not installed on your system.\n" +"\n" +"Please install them to be able to do the translation." +msgstr "" +"Les outils de traduction GNU ne sont pas installés sur votre système.\n" +"\n" +"Veuillez les installer pour pouvoir effectuer la traduction." #: FMain.class:1653 msgid "Unable to drop file into the project." @@ -2981,7 +3125,7 @@ msgstr "Choisissez un profilage" msgid "Profile for &1 project" msgstr "Profilage pour le projet &1" -#: FMain.class:2449 FProperty.class:987 +#: FMain.class:2449 FProperty.class:995 msgid "Select a file" msgstr "Choisissez un fichier" @@ -3017,7 +3161,7 @@ msgstr "Enregistrer le projet" msgid "Save project as" msgstr "Enregistrer le projet sous" -#: FMain.form:311 FMakeInstall.class:254 FSave.class:28 FWelcome.class:74 +#: FMain.form:311 FMakeInstall.class:257 FSave.class:28 FWelcome.class:74 msgid "Quit" msgstr "Quitter" @@ -3189,7 +3333,7 @@ msgstr "Mettre à-jour tous les formulaires" msgid "Software farm" msgstr "Logithèque" -#: FMain.form:744 FOption.form:774 +#: FMain.form:744 FOption.form:796 msgid "Shortcuts" msgstr "Raccourcis" @@ -3269,7 +3413,7 @@ msgstr "Tout ajouter au référentiel" msgid "New connection" msgstr "Nouvelle connexion" -#: FMain.form:1088 FOutput.form:205 +#: FMain.form:1088 FOutput.form:204 msgid "?" msgstr "?" @@ -3305,7 +3449,7 @@ msgstr "Générer l'exécutable" msgid "Make source archive" msgstr "Générer une archive des sources" -#: FMain.form:1243 FMakeInstall.form:127 +#: FMain.form:1243 FMakeInstall.form:126 msgid "Make installation package" msgstr "Créer un paquet d'installation" @@ -3401,215 +3545,223 @@ msgstr "Version max." msgid "File or directory" msgstr "Fichier ou répertoire" -#: FMakeInstall.class:254 Package.module:195 +#: FMakeInstall.class:257 Package.module:195 msgid "The packages have been successfully created." msgstr "Les paquets ont été créés avec succès." -#: FMakeInstall.class:290 +#: FMakeInstall.class:293 msgid "Please enter your name." msgstr "Veuillez saisir votre nom." -#: FMakeInstall.class:295 +#: FMakeInstall.class:298 msgid "Please enter your e-mail address." msgstr "Veuillez saisir votre adresse e-mail." -#: FMakeInstall.class:309 +#: FMakeInstall.class:312 msgid "There is no CHANGELOG entry for this release." msgstr "Il n'y aucune information de changement pour cette version." -#: FMakeInstall.class:316 +#: FMakeInstall.class:319 msgid "Please enter the first CHANGELOG entry." msgstr "Veuillez saisir la première entrée du CHANGELOG." -#: FMakeInstall.class:327 +#: FMakeInstall.class:330 msgid "Please choose at least one target distribution." msgstr "Veuillez sélectionner au moins une distribution cible." -#: FMakeInstall.class:365 +#: FMakeInstall.class:368 msgid "Please choose the package group for each target distribution." msgstr "Veuillez sélectionner un groupe de paquet pour chaque distribution cible." -#: FMakeInstall.class:367 +#: FMakeInstall.class:370 msgid "Please choose a package group." msgstr "Veuillez sélectionner un groupe de paquet." -#: FMakeInstall.class:377 +#: FMakeInstall.class:380 msgid "Please choose the menu location for each target distribution." msgstr "Veuillez sélectionner un emplacement de menu pour chaque distribution cible." -#: FMakeInstall.class:379 +#: FMakeInstall.class:382 msgid "Please choose a menu location." msgstr "Veuillez sélectionner un emplacement de menu." -#: FMakeInstall.class:398 +#: FMakeInstall.class:401 msgid "Cannot found extra file: &1" msgstr "Impossible de trouver le fichier supplémentaire : &1" -#: FMakeInstall.class:404 +#: FMakeInstall.class:407 msgid "Please choose a target directory for each extra file." msgstr "Veuillez choisir un répertoire de destination pour chaque fichier supplémentaire." -#: FMakeInstall.class:412 +#: FMakeInstall.class:415 msgid "Debian packaging system cannot handle spaces in file names." msgstr "Le système de gestion de paquets de Debian ne peut gérer les noms de fichiers contenant un caractère d'espacement." -#: FMakeInstall.class:418 +#: FMakeInstall.class:421 msgid "Debian packaging system cannot handle spaces in directories." msgstr "Le système de gestion de paquets de Debian ne peut gérer les noms de répertoires contenant un caractère d'espacement." -#: FMakeInstall.class:434 +#: FMakeInstall.class:437 msgid "The package cannot be stored inside the project directory." msgstr "Le paquet ne peut être créé à l'intérieur du répertoire du projet." -#: FMakeInstall.class:472 +#: FMakeInstall.class:475 msgid "Initial release" msgstr "Version initiale" -#: FMakeInstall.class:726 +#: FMakeInstall.class:729 msgid "Menus" msgstr "Menus" -#: FMakeInstall.class:794 +#: FMakeInstall.class:797 msgid "Groups" msgstr "Groupes" -#: FMakeInstall.class:912 +#: FMakeInstall.class:915 msgid "Incorrect characters" msgstr "Caractères incorrects" -#: FMakeInstall.class:985 +#: FMakeInstall.class:988 msgid "Do you really want to remove all extra dependencies?" msgstr "Voulez-vous vraiment retirer toutes les dépendances supplémentaires ?" -#: FMakeInstall.class:1084 +#: FMakeInstall.class:1087 msgid "Do you really want to remove all extra files?" msgstr "Voulez-vous vraiment retirer tous les fichiers supplémentaires ?" -#: FMakeInstall.class:1132 +#: FMakeInstall.class:1135 msgid "Select the destination directory" msgstr "Sélectionnez le répertoire destination" -#: FMakeInstall.form:140 +#: FMakeInstall.form:139 msgid "Create package" msgstr "Création du paquet" -#: FMakeInstall.form:144 +#: FMakeInstall.form:143 msgid "Package information" msgstr "Information sur le paquet" -#: FMakeInstall.form:150 +#: FMakeInstall.form:149 msgid "Package name" msgstr "Nom du paquet" -#: FMakeInstall.form:171 FOption.form:345 +#: FMakeInstall.form:170 FOption.form:345 msgid "Prefix package name with the vendor name" msgstr "Préfixer le nom du paquet avec le nom du fournisseur" -#: FMakeInstall.form:178 +#: FMakeInstall.form:177 msgid "Package version" msgstr "Version du paquet" -#: FMakeInstall.form:193 +#: FMakeInstall.form:192 msgid "Maintainer information" msgstr "Informations sur le mainteneur" -#: FMakeInstall.form:236 FOption.form:295 FPublish.form:83 +#: FMakeInstall.form:235 FOption.form:295 FPublish.form:83 msgid "Vendor name" msgstr "Nom du fournisseur" -#: FMakeInstall.form:252 FOption.form:329 +#: FMakeInstall.form:251 FOption.form:329 msgid "URL" msgstr "URL" -#: FMakeInstall.form:273 +#: FMakeInstall.form:272 msgid "Sign package" msgstr "Signer le paquet" -#: FMakeInstall.form:305 +#: FMakeInstall.form:304 msgid "License" msgstr "Licence" -#: FMakeInstall.form:316 +#: FMakeInstall.form:315 msgid "Changelog" msgstr "Liste des changements" -#: FMakeInstall.form:336 +#: FMakeInstall.form:335 msgid "Target distribution" msgstr "Distribution cible" -#: FMakeInstall.form:602 +#: FMakeInstall.form:601 msgid "Self-extractible" msgstr "Auto-extractible" -#: FMakeInstall.form:607 +#: FMakeInstall.form:606 msgid "Package group" msgstr "Groupe de paquet" -#: FMakeInstall.form:627 +#: FMakeInstall.form:626 msgid "Menu entry" msgstr "Entrée de menu" -#: FMakeInstall.form:649 +#: FMakeInstall.form:648 msgid "Categories" msgstr "Catégories" -#: FMakeInstall.form:658 +#: FMakeInstall.form:657 msgid "Desktop configuration file" msgstr "Fichier de configuration du bureau" -#: FMakeInstall.form:664 +#: FMakeInstall.form:663 msgid "Mimetypes" msgstr "Types MIME" -#: FMakeInstall.form:672 -msgid "Enter the mimetypes handled by your application there.\nPlease enter one mimetype by line.\n" -msgstr "Saisissez les types MIME gérés par votre application.\nVeuillez saisir un type MIME par ligne.\n" +#: FMakeInstall.form:671 +msgid "" +"Enter the mimetypes handled by your application there.\n" +"Please enter one mimetype by line.\n" +msgstr "" +"Saisissez les types MIME gérés par votre application.\n" +"Veuillez saisir un type MIME par ligne.\n" -#: FMakeInstall.form:684 +#: FMakeInstall.form:683 msgid "Additional configuration" msgstr "Configuration additionnelle" -#: FMakeInstall.form:692 +#: FMakeInstall.form:691 msgid "The following will be added to the end of the desktop configuration file." msgstr "Le texte suivant sera ajouté à la fin du fichier de configuration du bureau." -#: FMakeInstall.form:700 +#: FMakeInstall.form:699 msgid "Extra dependencies" msgstr "Dépendances supplémentaires" -#: FMakeInstall.form:704 +#: FMakeInstall.form:703 msgid "Same dependencies for all targets" msgstr "Mêmes dépendances pour toutes les cibles" -#: FMakeInstall.form:760 +#: FMakeInstall.form:759 msgid "Extra files" msgstr "Fichiers supplémentaires" -#: FMakeInstall.form:764 +#: FMakeInstall.form:763 msgid "Same files for all targets" msgstr "Mêmes fichiers pour toutes les cibles" -#: FMakeInstall.form:777 +#: FMakeInstall.form:776 msgid "Extra files must be located in the Project folder of the current project, i.e. the .hidden directory of the project on the disk." msgstr "Les fichiers supplémentaires doivent être situés dans le dossier Projet du projet en cours, correspondant au répertoire .hidden du projet sur le disque." -#: FMakeInstall.form:835 +#: FMakeInstall.form:834 msgid "Extra autoconf tests" msgstr "Tests autoconf supplémentaires" -#: FMakeInstall.form:841 -msgid "Add extra tests for the configuration process.\n

Leave this blank if you don't need it, or if you don't know anything about autoconf scripts." -msgstr "Ajout de tests supplémentaires au processus de configuration.\n

Laissez ce champ vide si vous n'en avez pas besoin, ou si vous ne connaissez rien aux scripts autoconf." +#: FMakeInstall.form:840 +msgid "" +"Add extra tests for the configuration process.\n" +"

Leave this blank if you don't need it, or if you don't know anything about autoconf scripts." +msgstr "" +"Ajout de tests supplémentaires au processus de configuration.\n" +"

Laissez ce champ vide si vous n'en avez pas besoin, ou si vous ne connaissez rien aux scripts autoconf." -#: FMakeInstall.form:849 +#: FMakeInstall.form:848 msgid "Destination directory" msgstr "Répertoire de destination" -#: FMakeInstall.form:858 +#: FMakeInstall.form:857 msgid "Create directories for each distribution" msgstr "Créer des répertoires pour chaque distribution" -#: FMakeInstall.form:870 +#: FMakeInstall.form:869 msgid "Commands output" msgstr "Sortie des commandes" @@ -3905,43 +4057,43 @@ msgstr "Impossible de vider le cache de la documentation." msgid "Do you really want to delete this snippet?" msgstr "Voulez-vous vraiment supprimer ce fragment ?" -#: FOption.class:1067 +#: FOption.class:1070 msgid "Do you really want to reset the list to its default value?" msgstr "Voulez-vous vraiment réinitialiser la liste à sa valeur par défaut ?" -#: FOption.class:1140 +#: FOption.class:1143 msgid "Do you really want to install the Gambas font to your personal font directory?" msgstr "Voulez-vous vraiment installer la police Gambas dans votre répertoire personnel de polices ?" -#: FOption.class:1140 FSoftwareFarm.form:366 +#: FOption.class:1143 FSoftwareFarm.form:366 msgid "Install" msgstr "Installer" -#: FOption.class:1248 +#: FOption.class:1251 msgid "Unable to download documentation." msgstr "Impossible de télécharger la documentation." -#: FOption.class:1255 +#: FOption.class:1258 msgid "Unable to uncompress documentation." msgstr "Impossible de décompresser la documentation." -#: FOption.class:1280 +#: FOption.class:1283 msgid "Network is not available." msgstr "Le réseau est indisponible." -#: FOption.class:1285 +#: FOption.class:1288 msgid "Documentation is up to date." msgstr "La documentation est à-jour." -#: FOption.class:1290 +#: FOption.class:1293 msgid "'wget' is not found." msgstr "'wget' est introuvable." -#: FOption.class:1295 +#: FOption.class:1298 msgid "A new documentation is available!" msgstr "Une nouvelle documentation est disponible !" -#: FOption.class:1300 MHelp.module:876 +#: FOption.class:1303 MHelp.module:877 msgid "Documentation is not available." msgstr "La documentation n'est pas disponible." @@ -3977,239 +4129,227 @@ msgstr "Oui" msgid "Interface" msgstr "Interface" -#: FOption.form:361 -msgid "Fonts" -msgstr "Polices" - -#: FOption.form:388 -msgid "Global size" -msgstr "Taille globale" - -#: FOption.form:410 -msgid "Title size" -msgstr "Taille des titres" - -#: FOption.form:464 -msgid "Install Gambas font for code edition" -msgstr "Installer la police Gambas dédiée à l'édition de code" - -#: FOption.form:471 Project.module:220 -msgid "Miscellaneous" -msgstr "Divers" - -#: FOption.form:482 +#: FOption.form:372 msgid "Sort properties" msgstr "Trier les propriétés" -#: FOption.form:499 +#: FOption.form:389 msgid "Minimize at runtime" msgstr "Minimiser à l'exécution" -#: FOption.form:516 +#: FOption.form:406 msgid "Use utility windows" msgstr "Utiliser des fenêtres utilitaires" -#: FOption.form:533 +#: FOption.form:423 msgid "Toolbox size" msgstr "Taille de la boîte à outils" -#: FOption.form:539 FProjectProperty.form:292 +#: FOption.form:429 FProjectProperty.form:292 msgid "Normal" msgstr "Normal" -#: FOption.form:539 +#: FOption.form:429 msgid "Small" msgstr "Petite" -#: FOption.form:551 +#: FOption.form:441 msgid "Restore files when loading a project" msgstr "Restaurer les fichiers à l'ouverture du projet" -#: FOption.form:568 +#: FOption.form:458 msgid "Show tooltips" msgstr "Afficher les bulles d'aide" -#: FOption.form:585 +#: FOption.form:475 msgid "Show file name in window title" msgstr "Afficher le nom de fichier dans le titre de la fenêtre" -#: FOption.form:611 -msgid "Default tab size" -msgstr "Tabulation par défaut" - -#: FOption.form:629 FProjectProperty.form:806 -msgid "space(s)" -msgstr "espace(s)" - -#: FOption.form:642 -msgid "Procedure separation" -msgstr "Séparation des procédures" - -#: FOption.form:648 -msgid "Blend" -msgstr "Dégradé" - -#: FOption.form:648 FProperty.class:781 -msgid "None" -msgstr "Aucun" - -#: FOption.form:660 -msgid "Highlight current line" -msgstr "Surligner la ligne courante" - -#: FOption.form:677 -msgid "Highlight modified lines" -msgstr "Indiquer les lignes modifiées" - -#: FOption.form:694 -msgid "Show line numbers" -msgstr "Afficher les numéros de lignes" - -#: FOption.form:711 -msgid "Show spaces at end of line with dots" -msgstr "Afficher les espaces en fin de ligne avec des points" - -#: FOption.form:728 -msgid "Procedure folding" -msgstr "Repliage des procédures" - -#: FOption.form:745 -msgid "Fold procedures by default" -msgstr "Replier les procédures par défaut" - -#: FOption.form:762 -msgid "Keywords in upper case" -msgstr "Mots-clefs en majuscule" - -#: FOption.form:784 -msgid "Configure shortcuts" -msgstr "Configurer les raccourcis..." - -#: FOption.form:789 -msgid "Theme" -msgstr "Thème" - -#: FOption.form:806 -msgid "Icon theme" -msgstr "Thème d'icône" - -#: FOption.form:822 -msgid "Color theme" -msgstr "Thème de couleurs" - -#: FOption.form:836 -msgid "Import theme" -msgstr "Importer un thème" - -#: FOption.form:842 -msgid "Export theme" -msgstr "Exporter le thème" - -#: FOption.form:888 -msgid "Help & applications" -msgstr "Aide et applications" - -#: FOption.form:894 MTheme.module:6 -msgid "Help" -msgstr "Aide" - -#: FOption.form:905 -msgid "Display property help" -msgstr "Afficher l'aide des propriétés" - -#: FOption.form:922 -msgid "Show documentation in popups" -msgstr "Afficher la documentation dans les popups" - -#: FOption.form:939 -msgid "Always display optional messages" -msgstr "Toujours afficher les messages optionnels" - -#: FOption.form:956 -msgid "Use offline help" -msgstr "Utiliser l'aide en mode déconnecté" - -#: FOption.form:974 -msgid "Download documentation" -msgstr "Télécharger la documentation" - -#: FOption.form:992 -msgid "Clear documentation cache" -msgstr "Vider le cache de la documentation" - -#: FOption.form:1004 FProxy.form:20 -msgid "Proxy configuration" -msgstr "Configuration du proxy" - -#: FOption.form:1012 -msgid "Applications" -msgstr "Applications" - -#: FOption.form:1023 -msgid "Browser" -msgstr "Navigateur" - -#: FOption.form:1040 -msgid "Terminal" -msgstr "Terminal" - -#: FOption.form:1057 +#: FOption.form:492 msgid "Quiet external commands" msgstr "Commandes externes silencieuses" -#: FOption.form:1066 +#: FOption.form:501 +msgid "Fonts" +msgstr "Polices" + +#: FOption.form:534 +msgid "Global size" +msgstr "Taille globale" + +#: FOption.form:556 +msgid "Title size" +msgstr "Taille des titres" + +#: FOption.form:610 +msgid "Install Gambas font for code edition" +msgstr "Installer la police Gambas dédiée à l'édition de code" + +#: FOption.form:631 +msgid "Default tab size" +msgstr "Tabulation par défaut" + +#: FOption.form:649 FProjectProperty.form:806 +msgid "space(s)" +msgstr "espace(s)" + +#: FOption.form:662 +msgid "Procedure separation" +msgstr "Séparation des procédures" + +#: FOption.form:679 +msgid "Highlight current line" +msgstr "Surligner la ligne courante" + +#: FOption.form:696 +msgid "Highlight modified lines" +msgstr "Indiquer les lignes modifiées" + +#: FOption.form:713 +msgid "Show line numbers" +msgstr "Afficher les numéros de lignes" + +#: FOption.form:731 +msgid "Show spaces at end of line with dots" +msgstr "Afficher les espaces en fin de ligne avec des points" + +#: FOption.form:748 +msgid "Procedure folding" +msgstr "Repliage des procédures" + +#: FOption.form:766 +msgid "Fold procedures by default" +msgstr "Replier les procédures par défaut" + +#: FOption.form:784 +msgid "Keywords in upper case" +msgstr "Mots-clefs en majuscule" + +#: FOption.form:806 +msgid "Configure shortcuts" +msgstr "Configurer les raccourcis..." + +#: FOption.form:811 +msgid "Theme" +msgstr "Thème" + +#: FOption.form:828 +msgid "Icon theme" +msgstr "Thème d'icône" + +#: FOption.form:844 +msgid "Color theme" +msgstr "Thème de couleurs" + +#: FOption.form:858 +msgid "Import theme" +msgstr "Importer un thème" + +#: FOption.form:864 +msgid "Export theme" +msgstr "Exporter le thème" + +#: FOption.form:910 +msgid "Help & applications" +msgstr "Aide et applications" + +#: FOption.form:916 MTheme.module:6 +msgid "Help" +msgstr "Aide" + +#: FOption.form:927 +msgid "Display property help" +msgstr "Afficher l'aide des propriétés" + +#: FOption.form:944 +msgid "Show documentation in popups" +msgstr "Afficher la documentation dans les popups" + +#: FOption.form:961 +msgid "Always display optional messages" +msgstr "Toujours afficher les messages optionnels" + +#: FOption.form:978 +msgid "Use offline help" +msgstr "Utiliser l'aide en mode déconnecté" + +#: FOption.form:996 +msgid "Download documentation" +msgstr "Télécharger la documentation" + +#: FOption.form:1014 +msgid "Clear documentation cache" +msgstr "Vider le cache de la documentation" + +#: FOption.form:1026 FProxy.form:20 +msgid "Proxy configuration" +msgstr "Configuration du proxy" + +#: FOption.form:1034 +msgid "Applications" +msgstr "Applications" + +#: FOption.form:1045 +msgid "Browser" +msgstr "Navigateur" + +#: FOption.form:1062 +msgid "Terminal" +msgstr "Terminal" + +#: FOption.form:1071 msgid "Code formatting" msgstr "Formatage du code" -#: FOption.form:1072 +#: FOption.form:1077 msgid "Automatic formatting" msgstr "Formatage automatique" -#: FOption.form:1083 +#: FOption.form:1088 msgid "Control structure automatic completion" msgstr "Compléter les structures de contrôle" -#: FOption.form:1100 +#: FOption.form:1105 msgid "Local variable automatic declaration" msgstr "Déclaration automatique des variables locales" -#: FOption.form:1117 +#: FOption.form:1122 msgid "Comments automatic insertion" msgstr "Insertion automatique des commentaires" -#: FOption.form:1129 +#: FOption.form:1134 msgid "Explicit formating" msgstr "Formatage explicite" -#: FOption.form:1140 +#: FOption.form:1145 msgid "Format on load & save" msgstr "Formater au chargement et à l'enregistrement" -#: FOption.form:1157 +#: FOption.form:1162 msgid "Indent local variable declaration" msgstr "Indenter les déclarations de variables locales" -#: FOption.form:1174 +#: FOption.form:1179 msgid "Remove useless spaces at end of line" msgstr "Supprimer les espaces inutiles en fin de ligne" -#: FOption.form:1191 +#: FOption.form:1196 msgid "Keep successive void lines" msgstr "Conserver les lignes vides successives" -#: FOption.form:1200 +#: FOption.form:1205 msgid "Code snippets" msgstr "Fragments de code" -#: FOption.form:1216 +#: FOption.form:1221 msgid "Activate code snippets" msgstr "Activer les fragments de code" -#: FOption.form:1277 +#: FOption.form:1282 msgid "Source archives" msgstr "Archives sources" -#: FOption.form:1290 +#: FOption.form:1295 msgid "These files will be ignored when making source archives." msgstr "Ces fichiers seront ignorés lors de la génération d'une archive des sources." @@ -4245,18 +4385,18 @@ msgstr "Utiliser le jeu de caractères du système" msgid "Unable to paste text." msgstr "Impossible de coller le texte." -#: FPasteSpecial.form:35 +#: FPasteSpecial.form:31 +msgid "Clipboard contents" +msgstr "Contenu du presse-papiers" + +#: FPasteSpecial.form:44 msgid "Paste normally" msgstr "Coller normalement" -#: FPasteSpecial.form:46 +#: FPasteSpecial.form:55 msgid "Paste with PRINT" msgstr "Coller avec PRINT" -#: FPasteSpecial.form:85 -msgid "Clipboard contents" -msgstr "Contenu du presse-papiers" - #: FPasteTable.class:57 msgid "Please enter a table name." msgstr "Veuillez entrer le nom de la table." @@ -4297,27 +4437,27 @@ msgstr "Durée totale &1 μs" msgid "Unable to load profile file: &1" msgstr "Impossible de charger le fichier de profilage : &1" -#: FProfile.class:631 +#: FProfile.class:635 msgid "Calls" msgstr "Appels" -#: FProfile.class:634 +#: FProfile.class:638 msgid "Duration" msgstr "Durée" -#: FProfile.class:637 +#: FProfile.class:641 msgid "Self" msgstr "Propre" -#: FProfile.class:640 +#: FProfile.class:644 msgid "Average" msgstr "Moyenne" -#: FProfile.class:1023 +#: FProfile.class:1029 msgid "Profile files" msgstr "Fichiers de profilage" -#: FProfile.class:1030 +#: FProfile.class:1036 msgid "Unable to save profile." msgstr "Impossible d'enregistrer le profilage." @@ -4533,27 +4673,27 @@ msgstr "Local" msgid "Remote" msgstr "Distant" -#: FProjectVersion.class:92 +#: FProjectVersion.class:94 msgid "Please enter a user name." msgstr "Veuillez saisir un nom d'utilisateur." -#: FProjectVersion.class:103 +#: FProjectVersion.class:105 msgid "Please enter the journal." msgstr "Veuillez saisir le journal." -#: FProjectVersion.class:114 +#: FProjectVersion.class:116 msgid "The project could not be committed." msgstr "Le projet n'a pu être envoyé." -#: FProjectVersion.class:194 +#: FProjectVersion.class:196 msgid "Unable to update project from repository." msgstr "Impossible de mettre à-jour le projet à partir du référentiel." -#: FProjectVersion.class:196 +#: FProjectVersion.class:198 msgid "Project has been updated from repository successfully." msgstr "Le projet a été mis à-jour depuis le référentiel avec succès." -#: FProjectVersion.class:282 +#: FProjectVersion.class:284 msgid "Revision" msgstr "Révision" @@ -4633,6 +4773,10 @@ msgstr "Si la propriété Text doit être traduite." msgid "This property is virtual: it is only implemented in the IDE, and has no existence at runtime." msgstr "Cette propriété est virtuelle: elle est implémentée par l'environnement de développement uniquement, et n'a pas d'existence pendant l'exécution du programme." +#: FProperty.class:789 +msgid "None" +msgstr "Aucun" + #: FProperty.form:47 msgid "Lock property" msgstr "Verrouiller la propriété" @@ -4961,83 +5105,93 @@ msgstr "Vidéo" msgid "Office" msgstr "Bureautique" -#: FSoftwareFarm.class:49 +#: FSoftwareFarm.class:46 +#, fuzzy +msgid "Accessories" +msgstr "Accès interdit" + +#: FSoftwareFarm.class:47 +#, fuzzy +msgid "Internet" +msgstr "Interface" + +#: FSoftwareFarm.class:52 msgid "All software" msgstr "Tous les logiciels" -#: FSoftwareFarm.class:148 +#: FSoftwareFarm.class:151 msgid "No software found." msgstr "Aucun logiciel n'a été trouvé." -#: FSoftwareFarm.class:167 +#: FSoftwareFarm.class:170 msgid "Request cancelled." msgstr "Requête annulée." -#: FSoftwareFarm.class:303 +#: FSoftwareFarm.class:306 msgid "Cancel my vote" msgstr "Annuler mon vote" -#: FSoftwareFarm.class:310 +#: FSoftwareFarm.class:313 msgid "Upgrade" msgstr "Mettre à-jour" -#: FSoftwareFarm.class:314 +#: FSoftwareFarm.class:317 msgid "Uninstall" msgstr "Désinstaller" -#: FSoftwareFarm.class:447 +#: FSoftwareFarm.class:450 msgid "Do you really want to download &1?" msgstr "Voulez-vous vraiment télécharger &1 ?" -#: FSoftwareFarm.class:450 +#: FSoftwareFarm.class:453 msgid "Unable to download &1:" msgstr "Impossible de télécharger &1 :" -#: FSoftwareFarm.class:452 +#: FSoftwareFarm.class:455 msgid "&1 has been successfully downloaded." msgstr "&1 a été téléchargé avec succès." -#: FSoftwareFarm.class:467 +#: FSoftwareFarm.class:470 msgid "Do you really want to upgrade to &1?" msgstr "Voulez-vous vraiment mettre à-jour vers &1 ?" -#: FSoftwareFarm.class:470 +#: FSoftwareFarm.class:473 msgid "Unable to upgrade to &1:" msgstr "Impossible de mettre à-jour vers &1 :" -#: FSoftwareFarm.class:477 +#: FSoftwareFarm.class:480 msgid "Do you really want to uninstall &1?" msgstr "Voulez-vous vraiment désinstaller &1 ?" -#: FSoftwareFarm.class:480 +#: FSoftwareFarm.class:483 msgid "Unable to remove &1:" msgstr "Impossible de supprimer &1 :" -#: FSoftwareFarm.class:482 +#: FSoftwareFarm.class:485 msgid "&1 has been successfully removed." msgstr "&1 a été supprimé avec succès." -#: FSoftwareFarm.class:488 +#: FSoftwareFarm.class:491 msgid "Do you really want to install &1?" msgstr "Voulez-vous vraiment installer &1 ?" -#: FSoftwareFarm.class:491 +#: FSoftwareFarm.class:494 msgid "Unable to install &1:" msgstr "Impossible d'installer &1 :" -#: FSoftwareFarm.class:493 +#: FSoftwareFarm.class:496 msgid "&1 has been successfully installed." msgstr "&1 a été installé avec succès." -#: FSoftwareFarm.class:513 +#: FSoftwareFarm.class:516 msgid "Unable to modify your vote." msgstr "Impossible de modifier votre vote." -#: FSoftwareFarm.class:544 +#: FSoftwareFarm.class:547 msgid "Do you really want to delete &1 from the farm server?" msgstr "Désirez-vous vraiment supprimer &1 du serveur de publication ?" -#: FSoftwareFarm.class:548 +#: FSoftwareFarm.class:551 msgid "Unable to remove &1:" msgstr "Impossible de désinstaller &1 :" @@ -5101,47 +5255,47 @@ msgstr "Editer les propriétés de texte" msgid "Use a fixed font" msgstr "Utiliser une police non proportionnelle" -#: FTextEditor.class:895 +#: FTextEditor.class:888 msgid "Original file has been saved in the Project folder." msgstr "Le fichier d'origine a été sauvegardé dans le répertoire Projet." -#: FTextEditor.class:895 +#: FTextEditor.class:888 msgid "The file has been compressed from &1 to &2 bytes (&3)." msgstr "La taille du fichier a été réduite de &1 à &2 octets (&3)." -#: FTextEditor.class:901 +#: FTextEditor.class:894 msgid "Unable to compress file." msgstr "Impossible de compresser le fichier." -#: FTextEditor.form:197 +#: FTextEditor.form:203 msgid "Sort ascent" msgstr "Tri ascendant" -#: FTextEditor.form:203 +#: FTextEditor.form:209 msgid "Sort descent" msgstr "Tri descendant" -#: FTextEditor.form:218 +#: FTextEditor.form:231 msgid "Compress file" msgstr "Compresser le fichier" -#: FTextEditor.form:224 +#: FTextEditor.form:237 msgid "Uncompress file" msgstr "Décompresser le fichier" -#: FTextEditor.form:233 +#: FTextEditor.form:246 msgid "Unix" msgstr "-" -#: FTextEditor.form:238 +#: FTextEditor.form:251 msgid "Windows" msgstr "-" -#: FTextEditor.form:243 +#: FTextEditor.form:256 msgid "MAC" msgstr "-" -#: FTextEditor.form:306 +#: FTextEditor.form:346 msgid "Text editor" msgstr "Éditeur de texte" @@ -6629,11 +6783,11 @@ msgstr "impossible de connecter la sortie standard et la sortie d'erreur: " msgid "cannot run executable: " msgstr "impossible de démarrer l'exécutable: " -#: MHelp.module:292 +#: MHelp.module:293 msgid "No help found." msgstr "Aide introuvable." -#: MHelp.module:955 Wiki.module:797 +#: MHelp.module:956 Wiki.module:797 msgid "This page does not exist." msgstr "Cette page n'existe pas." @@ -6777,11 +6931,11 @@ msgstr "Création du paquet des sources." msgid "Creating .spec file." msgstr "Creation du fichier .spec." -#: Package.module:1420 +#: Package.module:1428 msgid "'rpmbuild' has returned the following error code:" msgstr "'rpmbuild' a retourné le code d'erreur suivant :" -#: Package.module:1816 +#: Package.module:1824 msgid "'tar' has returned the following error code:" msgstr "'tar' a retourné le code d'erreur suivant:" @@ -6809,6 +6963,10 @@ msgstr "Exemples de base" msgid "Drawing" msgstr "Dessin" +#: Project.module:220 +msgid "Miscellaneous" +msgstr "Divers" + #: Project.module:221 msgid "Networking" msgstr "Programmation réseau" @@ -6846,8 +7004,14 @@ msgid "This project does not exist." msgstr "Ce projet n'existe pas." #: Project.module:470 -msgid "Unable to find Gambas IDE executable in directory:\n\n&1" -msgstr "Impossible de trouver l'exécutable de l'EDI Gambas dans le répertoire :\n\n&1" +msgid "" +"Unable to find Gambas IDE executable in directory:\n" +"\n" +"&1" +msgstr "" +"Impossible de trouver l'exécutable de l'EDI Gambas dans le répertoire :\n" +"\n" +"&1" #: Project.module:483 msgid "This is not a Gambas project." @@ -6862,8 +7026,14 @@ msgid "Convert" msgstr "Convertir" #: Project.module:489 -msgid "This is a Gambas 2.0 project.\n\nDo you want to convert it?" -msgstr "Ceci est un projet Gambas 2.0.\n\nDésirez-vous le convertir ?" +msgid "" +"This is a Gambas 2.0 project.\n" +"\n" +"Do you want to convert it?" +msgstr "" +"Ceci est un projet Gambas 2.0.\n" +"\n" +"Désirez-vous le convertir ?" #: Project.module:507 msgid "Do not open" @@ -6874,8 +7044,14 @@ msgid "Open after all" msgstr "Ouvrir malgré tout" #: Project.module:507 -msgid "This project seems to be already opened.\n\nOpening the same project twice can lead to data loss." -msgstr "Il semble que ce projet soit déjà ouvert.\n\nOuvrir le même projet deux fois peut provoquer des pertes de données." +msgid "" +"This project seems to be already opened.\n" +"\n" +"Opening the same project twice can lead to data loss." +msgstr "" +"Il semble que ce projet soit déjà ouvert.\n" +"\n" +"Ouvrir le même projet deux fois peut provoquer des pertes de données." #: Project.module:513 msgid "It cannot be converted." @@ -6954,8 +7130,12 @@ msgid "in &1." msgstr "dans &1." #: Project.module:2513 -msgid "Some project source files are in conflict.\nPlease solve them if you want to compile the project." -msgstr "Certains fichiers sources du projet sont en conflit.\nVeuillez résoudre ces conflits pour pouvoir compiler le projet." +msgid "" +"Some project source files are in conflict.\n" +"Please solve them if you want to compile the project." +msgstr "" +"Certains fichiers sources du projet sont en conflit.\n" +"Veuillez résoudre ces conflits pour pouvoir compiler le projet." #: Project.module:2517 msgid "Compiling project" @@ -7165,3 +7345,5 @@ msgstr "Cette classe n'existe pas." msgid "This symbol does not exist." msgstr "Ce symbole n'existe pas." +#~ msgid "Blend" +#~ msgstr "Dégradé" diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project index 5eb362b49..2bcb82568 100644 --- a/app/src/gambas3/.project +++ b/app/src/gambas3/.project @@ -6,7 +6,7 @@ Icon=img/logo/logo-ide.png Version=3.7.90 VersionFile=1 Component=gb.image -Component=gb.qt5 +Component=gb.gui.qt Component=gb.form Component=gb.clipper Component=gb.db @@ -21,10 +21,10 @@ Component=gb.form.editor Component=gb.settings Component=gb.form.mdi Component=gb.form.stock +Component=gb.gui.qt.webkit Component=gb.net Component=gb.net.curl Component=gb.markdown -Component=gb.qt5.webkit Description="Integrated Development Environment for Gambas" Authors="Benoît Minisini\nFabien Bodard\nCharlie Reinl\nJosé Luis Redrejo\nRobert Rowe\nTobias Boege" TabSize=2 diff --git a/app/src/gambas3/.src/Component/CComponent.class b/app/src/gambas3/.src/Component/CComponent.class index 978b527a3..f832384ff 100644 --- a/app/src/gambas3/.src/Component/CComponent.class +++ b/app/src/gambas3/.src/Component/CComponent.class @@ -117,6 +117,8 @@ Static Private Sub InitComponentNames() $cName["gb.gtk3"] = ("GTK+3 toolkit") $cName["gb.gui"] = ("QT/GTK+ switcher component") $cName["gb.gui.opengl"] = ("OpenGL with QT/GTK+ switcher component") + $cName["gb.gui.qt"] = ("QT4/QT5 switcher component") + $cName["gb.gui.qt.webkit"] = ("QT4/QT5 WebKit switcher component") $cName["gb.httpd"] = ("Embedded HTTP server") $cName["gb.image"] = ("Image management") $cName["gb.image.effect"] = ("Image filtering component") diff --git a/app/src/gambas3/.src/Project/FProjectProperty.form b/app/src/gambas3/.src/Project/FProjectProperty.form index 4a1f3c64b..b5a2fc609 100644 --- a/app/src/gambas3/.src/Project/FProjectProperty.form +++ b/app/src/gambas3/.src/Project/FProjectProperty.form @@ -8,12 +8,18 @@ Resizable = False Arrangement = Arrange.Vertical { mnuInsertEnv Menu - { Menu1 Menu mnuInsertEnv - Name = "Menu1" + { Menu17 Menu mnuInsertEnv + Name = "Menu17" #Translate = False Text = "GB_GUI=gb.qt4" Tag = "GB_GUI=gb.qt4" } + { Menu1 Menu mnuInsertEnv + Name = "Menu1" + #Translate = False + Text = "GB_GUI=gb.qt5" + Tag = "GB_GUI=gb.qt5" + } { Menu2 Menu mnuInsertEnv Name = "Menu2" #Translate = False diff --git a/app/src/gambas3/.src/Welcome/FSystemInfo.form b/app/src/gambas3/.src/Welcome/FSystemInfo.form index b6ef86026..fcf9145b6 100644 --- a/app/src/gambas3/.src/Welcome/FSystemInfo.form +++ b/app/src/gambas3/.src/Welcome/FSystemInfo.form @@ -4,7 +4,7 @@ MoveScaled(0,0,68,75) Background = Color.TextBackground Text = ("System information") - Icon = Picture["icon:/16/system"] + Icon = Picture["icon:/large/system"] Resizable = False Arrangement = Arrange.Vertical Spacing = True diff --git a/app/src/gambas3/img/16/delete-container.png b/app/src/gambas3/img/16/delete-container.png index feb42c60b..35e48d210 100644 Binary files a/app/src/gambas3/img/16/delete-container.png and b/app/src/gambas3/img/16/delete-container.png differ diff --git a/app/src/gambas3/img/16/embed-container.png b/app/src/gambas3/img/16/embed-container.png index 7a7bc06fa..96ffb81d3 100644 Binary files a/app/src/gambas3/img/16/embed-container.png and b/app/src/gambas3/img/16/embed-container.png differ diff --git a/app/src/gambas3/img/16/lower.png b/app/src/gambas3/img/16/lower.png index 927f8b852..b21cfbc70 100644 Binary files a/app/src/gambas3/img/16/lower.png and b/app/src/gambas3/img/16/lower.png differ diff --git a/app/src/gambas3/img/16/lower_gnome.png b/app/src/gambas3/img/16/lower_gnome.png deleted file mode 100644 index 769a76aab..000000000 Binary files a/app/src/gambas3/img/16/lower_gnome.png and /dev/null differ diff --git a/app/src/gambas3/img/16/raise.png b/app/src/gambas3/img/16/raise.png index c47171405..02fcdd9ef 100644 Binary files a/app/src/gambas3/img/16/raise.png and b/app/src/gambas3/img/16/raise.png differ diff --git a/app/src/gambas3/img/16/raise_gnome.png b/app/src/gambas3/img/16/raise_gnome.png deleted file mode 100644 index 0998559f2..000000000 Binary files a/app/src/gambas3/img/16/raise_gnome.png and /dev/null differ diff --git a/app/src/gambas3/img/16/remove-from-container.png b/app/src/gambas3/img/16/remove-from-container.png index 8780e1e2e..345ae419c 100644 Binary files a/app/src/gambas3/img/16/remove-from-container.png and b/app/src/gambas3/img/16/remove-from-container.png differ diff --git a/comp/src/gb.db.form/.info b/comp/src/gb.db.form/.info index 149d283a4..f2b4250d5 100644 --- a/comp/src/gb.db.form/.info +++ b/comp/src/gb.db.form/.info @@ -56,11 +56,11 @@ b _Properties C s -*,Control=True,CanCreate=True,CanDelete=True,Columns{Field[]},Labels,Editable,Header=True,Grid,Orientation{Align.Bottom;Left;Right;Top}=Bottom,Border=True +"*,Control=True,CanCreate=True,CanDelete=True,Columns{Field[]},Labels,Editable,Header=True,Grid,Orientation{Align.Bottom;Left;Right;Top}=Bottom,Border=True" _Group C s -Data +"Data" _new m @@ -107,15 +107,15 @@ s _Properties C s -*,Text,Field{Field} +"*,Text,Field{Field}" _Group C s -Data +"Data" _DrawWith C s -CheckBox +"CheckBox" _new m @@ -178,19 +178,19 @@ s _Properties C s -*,ReadOnly,Field{Field},Table{Table},Filter,Display{Field:Table},All +"*,ReadOnly,Field{Field},Table{Table},Filter,Display{Field:Table},All" _Group C s -Data +"Data" _DrawWith C s -ComboBox +"ComboBox" _Event C s -Click +"Click" _new m @@ -225,23 +225,23 @@ C _Properties C s -*,Table{Table},Field{Field},Filter,Header,Grid,Highlight=True,Columns{Field[]:Table} +"*,Table{Table},Field{Field},Filter,Header,Grid,Highlight=True,Columns{Field[]:Table}" _DefaultEvent C s -Change +"Change" _DefaultSize C s -20,4 +"20,4" _DrawWith C s -MenuButton +"MenuButton" _Group C s -Data +"Data" Table p s @@ -368,15 +368,15 @@ Control _Properties C s -*,Field{Field} +"*,Field{Field}" _Group C s -Data +"Data" _DrawWith C s -TextBox +"TextBox" _new m @@ -455,11 +455,11 @@ b _Properties C s -*,Connection{Connection},Table{Table},Filter,ReadOnly +"*,Connection{Connection},Table{Table},Filter,ReadOnly" _Group C s -Data +"Data" _new m @@ -566,15 +566,15 @@ C _Properties C s -*,Mode{Select.None;Single;Multiple}=None,Editable,Header{TableView.None;Horizontal;Vertical;Both}=Both,Grid,Highlight=True,Columns{Field[]},Labels,Border=True,Sorted=True +"*,Mode{Select.None;Single;Multiple}=None,Editable,Header{TableView.None;Horizontal;Vertical;Both}=Both,Grid,Highlight=True,Columns{Field[]},Labels,Border=True,Sorted=True" _DrawWith C s -GridView +"GridView" _Group C s -Data +"Data" :Activate : diff --git a/comp/src/gb.form.stock/.component b/comp/src/gb.form.stock/.component index affe7139b..e84e0e1b7 100644 --- a/comp/src/gb.form.stock/.component +++ b/comp/src/gb.form.stock/.component @@ -1,4 +1,4 @@ [Component] Key=gb.form.stock -Version=3.7.0 +Version=3.7.90 Requires=gb.form diff --git a/comp/src/gb.form.stock/.project b/comp/src/gb.form.stock/.project index 9ecb4de04..33e7ab9dd 100644 --- a/comp/src/gb.form.stock/.project +++ b/comp/src/gb.form.stock/.project @@ -1,8 +1,8 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.7.0 +# Compiled with Gambas 3.7.90 Title=Default stock icons Startup=Main -Version=3.7.0 +Version=3.7.90 VersionFile=1 Component=gb.image Component=gb.gui diff --git a/comp/src/gb.form.stock/.src/Main.module b/comp/src/gb.form.stock/.src/Main.module index cc5bef86b..0dc4d33a8 100644 --- a/comp/src/gb.form.stock/.src/Main.module +++ b/comp/src/gb.form.stock/.src/Main.module @@ -35,6 +35,8 @@ Private Sub MakeStock() Dim bOK As Boolean Dim bFound As Boolean Dim sTest As String + Dim aPath As String[] + Dim I As Integer hFile = Open "~/gambas/3.0/trunk/comp/src/gb.form/map/icon.map" @@ -52,9 +54,13 @@ Private Sub MakeStock() If Left(sIcon) = ";" Then Continue sPath = Trim(aLine[1]) If Not sPath Then Continue - sPath = Split(sPath, ";")[0] - If sPath Begins "[elementary]" Then sPath = Mid$(sPath, InStr(sPath, "]") + 1) + aPath = Split(sPath, ";") + For I = 0 To aPath.Max + sPath = aPath[I] + If sPath Begins "[elementary]" Then Break + If Left(sPath) <> "[" Then Break + Next Print sIcon;; sPath If sIcon = "favorite" Then Stop diff --git a/comp/src/gb.form.stock/stock/16/access.png b/comp/src/gb.form.stock/stock/16/access.png index 65a3a09b3..8aea1ebb5 100644 Binary files a/comp/src/gb.form.stock/stock/16/access.png and b/comp/src/gb.form.stock/stock/16/access.png differ diff --git a/comp/src/gb.form.stock/stock/16/add.png b/comp/src/gb.form.stock/stock/16/add.png index 0d68eac10..053798b8c 100644 Binary files a/comp/src/gb.form.stock/stock/16/add.png and b/comp/src/gb.form.stock/stock/16/add.png differ diff --git a/comp/src/gb.form.stock/stock/16/apply.png b/comp/src/gb.form.stock/stock/16/apply.png index 278c42715..9f62fc67d 100644 Binary files a/comp/src/gb.form.stock/stock/16/apply.png and b/comp/src/gb.form.stock/stock/16/apply.png differ diff --git a/comp/src/gb.form.stock/stock/16/archive.png b/comp/src/gb.form.stock/stock/16/archive.png index d0136624c..e91f16866 100644 Binary files a/comp/src/gb.form.stock/stock/16/archive.png and b/comp/src/gb.form.stock/stock/16/archive.png differ diff --git a/comp/src/gb.form.stock/stock/16/audio.png b/comp/src/gb.form.stock/stock/16/audio.png index 7db7833c1..2056e52cb 100644 Binary files a/comp/src/gb.form.stock/stock/16/audio.png and b/comp/src/gb.form.stock/stock/16/audio.png differ diff --git a/comp/src/gb.form.stock/stock/16/battery.png b/comp/src/gb.form.stock/stock/16/battery.png index d4e64eb3f..dba3ac417 100644 Binary files a/comp/src/gb.form.stock/stock/16/battery.png and b/comp/src/gb.form.stock/stock/16/battery.png differ diff --git a/comp/src/gb.form.stock/stock/16/book.png b/comp/src/gb.form.stock/stock/16/book.png index 26f2a2838..a01b8d903 100644 Binary files a/comp/src/gb.form.stock/stock/16/book.png and b/comp/src/gb.form.stock/stock/16/book.png differ diff --git a/comp/src/gb.form.stock/stock/16/bottom.png b/comp/src/gb.form.stock/stock/16/bottom.png index ef9ae0535..80fa2df22 100644 Binary files a/comp/src/gb.form.stock/stock/16/bottom.png and b/comp/src/gb.form.stock/stock/16/bottom.png differ diff --git a/comp/src/gb.form.stock/stock/16/calculator.png b/comp/src/gb.form.stock/stock/16/calculator.png index d2997cc96..7a8bc5519 100644 Binary files a/comp/src/gb.form.stock/stock/16/calculator.png and b/comp/src/gb.form.stock/stock/16/calculator.png differ diff --git a/comp/src/gb.form.stock/stock/16/camera.png b/comp/src/gb.form.stock/stock/16/camera.png index f4bbb4a8c..ddaf79c0d 100644 Binary files a/comp/src/gb.form.stock/stock/16/camera.png and b/comp/src/gb.form.stock/stock/16/camera.png differ diff --git a/comp/src/gb.form.stock/stock/16/cancel.png b/comp/src/gb.form.stock/stock/16/cancel.png index 18f943957..5430bc644 100644 Binary files a/comp/src/gb.form.stock/stock/16/cancel.png and b/comp/src/gb.form.stock/stock/16/cancel.png differ diff --git a/comp/src/gb.form.stock/stock/16/cdrom.png b/comp/src/gb.form.stock/stock/16/cdrom.png index cfd00ed5d..f34125560 100644 Binary files a/comp/src/gb.form.stock/stock/16/cdrom.png and b/comp/src/gb.form.stock/stock/16/cdrom.png differ diff --git a/comp/src/gb.form.stock/stock/16/clear.png b/comp/src/gb.form.stock/stock/16/clear.png index 78ca879d6..6a0022e6c 100644 Binary files a/comp/src/gb.form.stock/stock/16/clear.png and b/comp/src/gb.form.stock/stock/16/clear.png differ diff --git a/comp/src/gb.form.stock/stock/16/clock.png b/comp/src/gb.form.stock/stock/16/clock.png index 8b4264165..1c8aa1cf5 100644 Binary files a/comp/src/gb.form.stock/stock/16/clock.png and b/comp/src/gb.form.stock/stock/16/clock.png differ diff --git a/comp/src/gb.form.stock/stock/16/close.png b/comp/src/gb.form.stock/stock/16/close.png index 18f943957..5430bc644 100644 Binary files a/comp/src/gb.form.stock/stock/16/close.png and b/comp/src/gb.form.stock/stock/16/close.png differ diff --git a/comp/src/gb.form.stock/stock/16/color.png b/comp/src/gb.form.stock/stock/16/color.png index a1deeb27b..3254ffe4f 100644 Binary files a/comp/src/gb.form.stock/stock/16/color.png and b/comp/src/gb.form.stock/stock/16/color.png differ diff --git a/comp/src/gb.form.stock/stock/16/component.png b/comp/src/gb.form.stock/stock/16/component.png index 8ea4564f9..bc25f6fb6 100644 Binary files a/comp/src/gb.form.stock/stock/16/component.png and b/comp/src/gb.form.stock/stock/16/component.png differ diff --git a/comp/src/gb.form.stock/stock/16/computer.png b/comp/src/gb.form.stock/stock/16/computer.png index 0f998134a..346edf7bd 100644 Binary files a/comp/src/gb.form.stock/stock/16/computer.png and b/comp/src/gb.form.stock/stock/16/computer.png differ diff --git a/comp/src/gb.form.stock/stock/16/copy.png b/comp/src/gb.form.stock/stock/16/copy.png index 4df5f6641..f7edcf058 100644 Binary files a/comp/src/gb.form.stock/stock/16/copy.png and b/comp/src/gb.form.stock/stock/16/copy.png differ diff --git a/comp/src/gb.form.stock/stock/16/cut.png b/comp/src/gb.form.stock/stock/16/cut.png index 45001ece3..cc9eba2f6 100644 Binary files a/comp/src/gb.form.stock/stock/16/cut.png and b/comp/src/gb.form.stock/stock/16/cut.png differ diff --git a/comp/src/gb.form.stock/stock/16/delete.png b/comp/src/gb.form.stock/stock/16/delete.png index 915ee8119..94c9c0c9e 100644 Binary files a/comp/src/gb.form.stock/stock/16/delete.png and b/comp/src/gb.form.stock/stock/16/delete.png differ diff --git a/comp/src/gb.form.stock/stock/16/desktop.png b/comp/src/gb.form.stock/stock/16/desktop.png index b936ceca4..2fa671b80 100644 Binary files a/comp/src/gb.form.stock/stock/16/desktop.png and b/comp/src/gb.form.stock/stock/16/desktop.png differ diff --git a/comp/src/gb.form.stock/stock/16/development.png b/comp/src/gb.form.stock/stock/16/development.png index 1e56d409b..0e3d697e1 100644 Binary files a/comp/src/gb.form.stock/stock/16/development.png and b/comp/src/gb.form.stock/stock/16/development.png differ diff --git a/comp/src/gb.form.stock/stock/16/directory.png b/comp/src/gb.form.stock/stock/16/directory.png index af0b52c1b..f13d9c290 100644 Binary files a/comp/src/gb.form.stock/stock/16/directory.png and b/comp/src/gb.form.stock/stock/16/directory.png differ diff --git a/comp/src/gb.form.stock/stock/16/down.png b/comp/src/gb.form.stock/stock/16/down.png index ba70012da..2db1b4c47 100644 Binary files a/comp/src/gb.form.stock/stock/16/down.png and b/comp/src/gb.form.stock/stock/16/down.png differ diff --git a/comp/src/gb.form.stock/stock/16/eject.png b/comp/src/gb.form.stock/stock/16/eject.png index 59c7b8d04..271c709ef 100644 Binary files a/comp/src/gb.form.stock/stock/16/eject.png and b/comp/src/gb.form.stock/stock/16/eject.png differ diff --git a/comp/src/gb.form.stock/stock/16/end.png b/comp/src/gb.form.stock/stock/16/end.png index a56985690..af8fde41d 100644 Binary files a/comp/src/gb.form.stock/stock/16/end.png and b/comp/src/gb.form.stock/stock/16/end.png differ diff --git a/comp/src/gb.form.stock/stock/16/error.png b/comp/src/gb.form.stock/stock/16/error.png index b120e68fb..2bbd942c9 100644 Binary files a/comp/src/gb.form.stock/stock/16/error.png and b/comp/src/gb.form.stock/stock/16/error.png differ diff --git a/comp/src/gb.form.stock/stock/16/exec.png b/comp/src/gb.form.stock/stock/16/exec.png index 489451f95..e6e937075 100644 Binary files a/comp/src/gb.form.stock/stock/16/exec.png and b/comp/src/gb.form.stock/stock/16/exec.png differ diff --git a/comp/src/gb.form.stock/stock/16/file-manager.png b/comp/src/gb.form.stock/stock/16/file-manager.png index 3de6ec069..42fa4ff68 100644 Binary files a/comp/src/gb.form.stock/stock/16/file-manager.png and b/comp/src/gb.form.stock/stock/16/file-manager.png differ diff --git a/comp/src/gb.form.stock/stock/16/file.png b/comp/src/gb.form.stock/stock/16/file.png index 32563acca..2698b758f 100644 Binary files a/comp/src/gb.form.stock/stock/16/file.png and b/comp/src/gb.form.stock/stock/16/file.png differ diff --git a/comp/src/gb.form.stock/stock/16/find.png b/comp/src/gb.form.stock/stock/16/find.png index fda0ae946..b16cd2c2f 100644 Binary files a/comp/src/gb.form.stock/stock/16/find.png and b/comp/src/gb.form.stock/stock/16/find.png differ diff --git a/comp/src/gb.form.stock/stock/16/first.png b/comp/src/gb.form.stock/stock/16/first.png index 32ab116cc..0b957a87c 100644 Binary files a/comp/src/gb.form.stock/stock/16/first.png and b/comp/src/gb.form.stock/stock/16/first.png differ diff --git a/comp/src/gb.form.stock/stock/16/flip-h.png b/comp/src/gb.form.stock/stock/16/flip-h.png index b9323e778..a786a9dbc 100644 Binary files a/comp/src/gb.form.stock/stock/16/flip-h.png and b/comp/src/gb.form.stock/stock/16/flip-h.png differ diff --git a/comp/src/gb.form.stock/stock/16/flip-v.png b/comp/src/gb.form.stock/stock/16/flip-v.png index 9bf0d77d7..e5a1a42ab 100644 Binary files a/comp/src/gb.form.stock/stock/16/flip-v.png and b/comp/src/gb.form.stock/stock/16/flip-v.png differ diff --git a/comp/src/gb.form.stock/stock/16/floppy.png b/comp/src/gb.form.stock/stock/16/floppy.png index ea86afe88..0b848baf4 100644 Binary files a/comp/src/gb.form.stock/stock/16/floppy.png and b/comp/src/gb.form.stock/stock/16/floppy.png differ diff --git a/comp/src/gb.form.stock/stock/16/forward.png b/comp/src/gb.form.stock/stock/16/forward.png index c321165c8..bf1726fa0 100644 Binary files a/comp/src/gb.form.stock/stock/16/forward.png and b/comp/src/gb.form.stock/stock/16/forward.png differ diff --git a/comp/src/gb.form.stock/stock/16/fullscreen.png b/comp/src/gb.form.stock/stock/16/fullscreen.png index f82a9196e..dad5c92d3 100644 Binary files a/comp/src/gb.form.stock/stock/16/fullscreen.png and b/comp/src/gb.form.stock/stock/16/fullscreen.png differ diff --git a/comp/src/gb.form.stock/stock/16/game.png b/comp/src/gb.form.stock/stock/16/game.png index 0fd416515..430b405ce 100644 Binary files a/comp/src/gb.form.stock/stock/16/game.png and b/comp/src/gb.form.stock/stock/16/game.png differ diff --git a/comp/src/gb.form.stock/stock/16/group.png b/comp/src/gb.form.stock/stock/16/group.png new file mode 100644 index 000000000..0e0fa8fdf Binary files /dev/null and b/comp/src/gb.form.stock/stock/16/group.png differ diff --git a/comp/src/gb.form.stock/stock/16/halt.png b/comp/src/gb.form.stock/stock/16/halt.png index b83062d2d..47699319b 100644 Binary files a/comp/src/gb.form.stock/stock/16/halt.png and b/comp/src/gb.form.stock/stock/16/halt.png differ diff --git a/comp/src/gb.form.stock/stock/16/harddisk.png b/comp/src/gb.form.stock/stock/16/harddisk.png index 7dddb9dd0..97dac50e6 100644 Binary files a/comp/src/gb.form.stock/stock/16/harddisk.png and b/comp/src/gb.form.stock/stock/16/harddisk.png differ diff --git a/comp/src/gb.form.stock/stock/16/help.png b/comp/src/gb.form.stock/stock/16/help.png index b94b7d9dc..10490645d 100644 Binary files a/comp/src/gb.form.stock/stock/16/help.png and b/comp/src/gb.form.stock/stock/16/help.png differ diff --git a/comp/src/gb.form.stock/stock/16/home.png b/comp/src/gb.form.stock/stock/16/home.png index f9529b0ce..e339b9945 100644 Binary files a/comp/src/gb.form.stock/stock/16/home.png and b/comp/src/gb.form.stock/stock/16/home.png differ diff --git a/comp/src/gb.form.stock/stock/16/html.png b/comp/src/gb.form.stock/stock/16/html.png index efa08f114..930c4836a 100644 Binary files a/comp/src/gb.form.stock/stock/16/html.png and b/comp/src/gb.form.stock/stock/16/html.png differ diff --git a/comp/src/gb.form.stock/stock/16/identity.png b/comp/src/gb.form.stock/stock/16/identity.png index 77511bd88..7bbb7d580 100644 Binary files a/comp/src/gb.form.stock/stock/16/identity.png and b/comp/src/gb.form.stock/stock/16/identity.png differ diff --git a/comp/src/gb.form.stock/stock/16/image.png b/comp/src/gb.form.stock/stock/16/image.png index 5fedc55a9..f234d7a44 100644 Binary files a/comp/src/gb.form.stock/stock/16/image.png and b/comp/src/gb.form.stock/stock/16/image.png differ diff --git a/comp/src/gb.form.stock/stock/16/important.png b/comp/src/gb.form.stock/stock/16/important.png index a42ea7237..65affd62b 100644 Binary files a/comp/src/gb.form.stock/stock/16/important.png and b/comp/src/gb.form.stock/stock/16/important.png differ diff --git a/comp/src/gb.form.stock/stock/16/info.png b/comp/src/gb.form.stock/stock/16/info.png index 626a6dfbc..881a2aa43 100644 Binary files a/comp/src/gb.form.stock/stock/16/info.png and b/comp/src/gb.form.stock/stock/16/info.png differ diff --git a/comp/src/gb.form.stock/stock/16/internet.png b/comp/src/gb.form.stock/stock/16/internet.png index 5a4c23efa..fc8c16ad9 100644 Binary files a/comp/src/gb.form.stock/stock/16/internet.png and b/comp/src/gb.form.stock/stock/16/internet.png differ diff --git a/comp/src/gb.form.stock/stock/16/jump.png b/comp/src/gb.form.stock/stock/16/jump.png index 2f459f347..f90ca1f06 100644 Binary files a/comp/src/gb.form.stock/stock/16/jump.png and b/comp/src/gb.form.stock/stock/16/jump.png differ diff --git a/comp/src/gb.form.stock/stock/16/keyboard.png b/comp/src/gb.form.stock/stock/16/keyboard.png index 8acf9c4d0..68870ff42 100644 Binary files a/comp/src/gb.form.stock/stock/16/keyboard.png and b/comp/src/gb.form.stock/stock/16/keyboard.png differ diff --git a/comp/src/gb.form.stock/stock/16/lamp.png b/comp/src/gb.form.stock/stock/16/lamp.png index bbf67b69e..1552b35b6 100644 Binary files a/comp/src/gb.form.stock/stock/16/lamp.png and b/comp/src/gb.form.stock/stock/16/lamp.png differ diff --git a/comp/src/gb.form.stock/stock/16/language.png b/comp/src/gb.form.stock/stock/16/language.png index fd5c16a10..3ec3ef704 100644 Binary files a/comp/src/gb.form.stock/stock/16/language.png and b/comp/src/gb.form.stock/stock/16/language.png differ diff --git a/comp/src/gb.form.stock/stock/16/last.png b/comp/src/gb.form.stock/stock/16/last.png index 50663084f..0aa487232 100644 Binary files a/comp/src/gb.form.stock/stock/16/last.png and b/comp/src/gb.form.stock/stock/16/last.png differ diff --git a/comp/src/gb.form.stock/stock/16/left.png b/comp/src/gb.form.stock/stock/16/left.png index 101f26af7..f006ca1e5 100644 Binary files a/comp/src/gb.form.stock/stock/16/left.png and b/comp/src/gb.form.stock/stock/16/left.png differ diff --git a/comp/src/gb.form.stock/stock/16/link.png b/comp/src/gb.form.stock/stock/16/link.png index ab599228a..e224d7882 100644 Binary files a/comp/src/gb.form.stock/stock/16/link.png and b/comp/src/gb.form.stock/stock/16/link.png differ diff --git a/comp/src/gb.form.stock/stock/16/mail.png b/comp/src/gb.form.stock/stock/16/mail.png index 1a701a8a9..9918c00ab 100644 Binary files a/comp/src/gb.form.stock/stock/16/mail.png and b/comp/src/gb.form.stock/stock/16/mail.png differ diff --git a/comp/src/gb.form.stock/stock/16/media-player.png b/comp/src/gb.form.stock/stock/16/media-player.png index 952994b83..5ee8c3e8c 100644 Binary files a/comp/src/gb.form.stock/stock/16/media-player.png and b/comp/src/gb.form.stock/stock/16/media-player.png differ diff --git a/comp/src/gb.form.stock/stock/16/menu.png b/comp/src/gb.form.stock/stock/16/menu.png index cb72a870f..22ff58195 100644 Binary files a/comp/src/gb.form.stock/stock/16/menu.png and b/comp/src/gb.form.stock/stock/16/menu.png differ diff --git a/comp/src/gb.form.stock/stock/16/microphone.png b/comp/src/gb.form.stock/stock/16/microphone.png index 74bd81260..a1165da46 100644 Binary files a/comp/src/gb.form.stock/stock/16/microphone.png and b/comp/src/gb.form.stock/stock/16/microphone.png differ diff --git a/comp/src/gb.form.stock/stock/16/monitor.png b/comp/src/gb.form.stock/stock/16/monitor.png index 7ea994224..3b351d0ae 100644 Binary files a/comp/src/gb.form.stock/stock/16/monitor.png and b/comp/src/gb.form.stock/stock/16/monitor.png differ diff --git a/comp/src/gb.form.stock/stock/16/mouse.png b/comp/src/gb.form.stock/stock/16/mouse.png index 30ae3f9ed..35a03d905 100644 Binary files a/comp/src/gb.form.stock/stock/16/mouse.png and b/comp/src/gb.form.stock/stock/16/mouse.png differ diff --git a/comp/src/gb.form.stock/stock/16/multimedia.png b/comp/src/gb.form.stock/stock/16/multimedia.png index 3786719cd..28a5f753d 100644 Binary files a/comp/src/gb.form.stock/stock/16/multimedia.png and b/comp/src/gb.form.stock/stock/16/multimedia.png differ diff --git a/comp/src/gb.form.stock/stock/16/muted.png b/comp/src/gb.form.stock/stock/16/muted.png index 195b102a8..b1b737cab 100644 Binary files a/comp/src/gb.form.stock/stock/16/muted.png and b/comp/src/gb.form.stock/stock/16/muted.png differ diff --git a/comp/src/gb.form.stock/stock/16/new-dir.png b/comp/src/gb.form.stock/stock/16/new-dir.png index 7e410ce54..3da22d299 100644 Binary files a/comp/src/gb.form.stock/stock/16/new-dir.png and b/comp/src/gb.form.stock/stock/16/new-dir.png differ diff --git a/comp/src/gb.form.stock/stock/16/new-window.png b/comp/src/gb.form.stock/stock/16/new-window.png index 81d3b9ade..66517b09a 100644 Binary files a/comp/src/gb.form.stock/stock/16/new-window.png and b/comp/src/gb.form.stock/stock/16/new-window.png differ diff --git a/comp/src/gb.form.stock/stock/16/new.png b/comp/src/gb.form.stock/stock/16/new.png index 29df49c05..3fe390e01 100644 Binary files a/comp/src/gb.form.stock/stock/16/new.png and b/comp/src/gb.form.stock/stock/16/new.png differ diff --git a/comp/src/gb.form.stock/stock/16/next.png b/comp/src/gb.form.stock/stock/16/next.png index 5d3cbe74d..3770d305b 100644 Binary files a/comp/src/gb.form.stock/stock/16/next.png and b/comp/src/gb.form.stock/stock/16/next.png differ diff --git a/comp/src/gb.form.stock/stock/16/ok.png b/comp/src/gb.form.stock/stock/16/ok.png index 278c42715..9f62fc67d 100644 Binary files a/comp/src/gb.form.stock/stock/16/ok.png and b/comp/src/gb.form.stock/stock/16/ok.png differ diff --git a/comp/src/gb.form.stock/stock/16/open-recent.png b/comp/src/gb.form.stock/stock/16/open-recent.png index 4cc9fbb71..dbeebdc08 100644 Binary files a/comp/src/gb.form.stock/stock/16/open-recent.png and b/comp/src/gb.form.stock/stock/16/open-recent.png differ diff --git a/comp/src/gb.form.stock/stock/16/open.png b/comp/src/gb.form.stock/stock/16/open.png index 3be37ac62..8fb98cb75 100644 Binary files a/comp/src/gb.form.stock/stock/16/open.png and b/comp/src/gb.form.stock/stock/16/open.png differ diff --git a/comp/src/gb.form.stock/stock/16/options.png b/comp/src/gb.form.stock/stock/16/options.png index 7f86a99d7..c61342f6f 100644 Binary files a/comp/src/gb.form.stock/stock/16/options.png and b/comp/src/gb.form.stock/stock/16/options.png differ diff --git a/comp/src/gb.form.stock/stock/16/package.png b/comp/src/gb.form.stock/stock/16/package.png index 5d7c84788..499ababa1 100644 Binary files a/comp/src/gb.form.stock/stock/16/package.png and b/comp/src/gb.form.stock/stock/16/package.png differ diff --git a/comp/src/gb.form.stock/stock/16/paste.png b/comp/src/gb.form.stock/stock/16/paste.png index 9c81220e7..09205c4e7 100644 Binary files a/comp/src/gb.form.stock/stock/16/paste.png and b/comp/src/gb.form.stock/stock/16/paste.png differ diff --git a/comp/src/gb.form.stock/stock/16/pause.png b/comp/src/gb.form.stock/stock/16/pause.png index c7eaf313a..016c40adc 100644 Binary files a/comp/src/gb.form.stock/stock/16/pause.png and b/comp/src/gb.form.stock/stock/16/pause.png differ diff --git a/comp/src/gb.form.stock/stock/16/pda.png b/comp/src/gb.form.stock/stock/16/pda.png index 82bac8e77..dddf8dda4 100644 Binary files a/comp/src/gb.form.stock/stock/16/pda.png and b/comp/src/gb.form.stock/stock/16/pda.png differ diff --git a/comp/src/gb.form.stock/stock/16/pdf.png b/comp/src/gb.form.stock/stock/16/pdf.png index 3817ff7e6..27535079f 100644 Binary files a/comp/src/gb.form.stock/stock/16/pdf.png and b/comp/src/gb.form.stock/stock/16/pdf.png differ diff --git a/comp/src/gb.form.stock/stock/16/people.png b/comp/src/gb.form.stock/stock/16/people.png index 2442c0d5c..0e0fa8fdf 100644 Binary files a/comp/src/gb.form.stock/stock/16/people.png and b/comp/src/gb.form.stock/stock/16/people.png differ diff --git a/comp/src/gb.form.stock/stock/16/phone.png b/comp/src/gb.form.stock/stock/16/phone.png index 1be9999e0..f7d4ab17b 100644 Binary files a/comp/src/gb.form.stock/stock/16/phone.png and b/comp/src/gb.form.stock/stock/16/phone.png differ diff --git a/comp/src/gb.form.stock/stock/16/play.png b/comp/src/gb.form.stock/stock/16/play.png index 0b64cc5a9..d388dab1a 100644 Binary files a/comp/src/gb.form.stock/stock/16/play.png and b/comp/src/gb.form.stock/stock/16/play.png differ diff --git a/comp/src/gb.form.stock/stock/16/previous.png b/comp/src/gb.form.stock/stock/16/previous.png index 101f26af7..f006ca1e5 100644 Binary files a/comp/src/gb.form.stock/stock/16/previous.png and b/comp/src/gb.form.stock/stock/16/previous.png differ diff --git a/comp/src/gb.form.stock/stock/16/print.png b/comp/src/gb.form.stock/stock/16/print.png index bcec3e4d7..6b21dc864 100644 Binary files a/comp/src/gb.form.stock/stock/16/print.png and b/comp/src/gb.form.stock/stock/16/print.png differ diff --git a/comp/src/gb.form.stock/stock/16/printer.png b/comp/src/gb.form.stock/stock/16/printer.png index e64864ec1..b67f76d97 100644 Binary files a/comp/src/gb.form.stock/stock/16/printer.png and b/comp/src/gb.form.stock/stock/16/printer.png differ diff --git a/comp/src/gb.form.stock/stock/16/program.png b/comp/src/gb.form.stock/stock/16/program.png index 01ee2422c..6067a7e06 100644 Binary files a/comp/src/gb.form.stock/stock/16/program.png and b/comp/src/gb.form.stock/stock/16/program.png differ diff --git a/comp/src/gb.form.stock/stock/16/properties.png b/comp/src/gb.form.stock/stock/16/properties.png index 7f86a99d7..c61342f6f 100644 Binary files a/comp/src/gb.form.stock/stock/16/properties.png and b/comp/src/gb.form.stock/stock/16/properties.png differ diff --git a/comp/src/gb.form.stock/stock/16/question.png b/comp/src/gb.form.stock/stock/16/question.png index b94b7d9dc..10490645d 100644 Binary files a/comp/src/gb.form.stock/stock/16/question.png and b/comp/src/gb.form.stock/stock/16/question.png differ diff --git a/comp/src/gb.form.stock/stock/16/quit.png b/comp/src/gb.form.stock/stock/16/quit.png index 231c8e7a6..8d0194593 100644 Binary files a/comp/src/gb.form.stock/stock/16/quit.png and b/comp/src/gb.form.stock/stock/16/quit.png differ diff --git a/comp/src/gb.form.stock/stock/16/recent.png b/comp/src/gb.form.stock/stock/16/recent.png index 4cc9fbb71..dbeebdc08 100644 Binary files a/comp/src/gb.form.stock/stock/16/recent.png and b/comp/src/gb.form.stock/stock/16/recent.png differ diff --git a/comp/src/gb.form.stock/stock/16/record.png b/comp/src/gb.form.stock/stock/16/record.png index 634b25731..71870f5f4 100644 Binary files a/comp/src/gb.form.stock/stock/16/record.png and b/comp/src/gb.form.stock/stock/16/record.png differ diff --git a/comp/src/gb.form.stock/stock/16/redo.png b/comp/src/gb.form.stock/stock/16/redo.png index 266897945..24fd0b286 100644 Binary files a/comp/src/gb.form.stock/stock/16/redo.png and b/comp/src/gb.form.stock/stock/16/redo.png differ diff --git a/comp/src/gb.form.stock/stock/16/refresh.png b/comp/src/gb.form.stock/stock/16/refresh.png index c2b82e5cc..b28e041ae 100644 Binary files a/comp/src/gb.form.stock/stock/16/refresh.png and b/comp/src/gb.form.stock/stock/16/refresh.png differ diff --git a/comp/src/gb.form.stock/stock/16/remove.png b/comp/src/gb.form.stock/stock/16/remove.png index 915ee8119..94c9c0c9e 100644 Binary files a/comp/src/gb.form.stock/stock/16/remove.png and b/comp/src/gb.form.stock/stock/16/remove.png differ diff --git a/comp/src/gb.form.stock/stock/16/replace.png b/comp/src/gb.form.stock/stock/16/replace.png index 444847577..89345ca3e 100644 Binary files a/comp/src/gb.form.stock/stock/16/replace.png and b/comp/src/gb.form.stock/stock/16/replace.png differ diff --git a/comp/src/gb.form.stock/stock/16/revert.png b/comp/src/gb.form.stock/stock/16/revert.png index c2b82e5cc..b28e041ae 100644 Binary files a/comp/src/gb.form.stock/stock/16/revert.png and b/comp/src/gb.form.stock/stock/16/revert.png differ diff --git a/comp/src/gb.form.stock/stock/16/rewind.png b/comp/src/gb.form.stock/stock/16/rewind.png index 9f0cbf6c1..a22033101 100644 Binary files a/comp/src/gb.form.stock/stock/16/rewind.png and b/comp/src/gb.form.stock/stock/16/rewind.png differ diff --git a/comp/src/gb.form.stock/stock/16/right.png b/comp/src/gb.form.stock/stock/16/right.png index 5d3cbe74d..3770d305b 100644 Binary files a/comp/src/gb.form.stock/stock/16/right.png and b/comp/src/gb.form.stock/stock/16/right.png differ diff --git a/comp/src/gb.form.stock/stock/16/rotate-left.png b/comp/src/gb.form.stock/stock/16/rotate-left.png index 7f0642e80..fb5e47ea2 100644 Binary files a/comp/src/gb.form.stock/stock/16/rotate-left.png and b/comp/src/gb.form.stock/stock/16/rotate-left.png differ diff --git a/comp/src/gb.form.stock/stock/16/rotate-right.png b/comp/src/gb.form.stock/stock/16/rotate-right.png index 23a372483..c9af61aa8 100644 Binary files a/comp/src/gb.form.stock/stock/16/rotate-right.png and b/comp/src/gb.form.stock/stock/16/rotate-right.png differ diff --git a/comp/src/gb.form.stock/stock/16/save-as.png b/comp/src/gb.form.stock/stock/16/save-as.png index 71c69a667..3b224e9ff 100644 Binary files a/comp/src/gb.form.stock/stock/16/save-as.png and b/comp/src/gb.form.stock/stock/16/save-as.png differ diff --git a/comp/src/gb.form.stock/stock/16/save.png b/comp/src/gb.form.stock/stock/16/save.png index 7098d5788..f4c46fa04 100644 Binary files a/comp/src/gb.form.stock/stock/16/save.png and b/comp/src/gb.form.stock/stock/16/save.png differ diff --git a/comp/src/gb.form.stock/stock/16/science.png b/comp/src/gb.form.stock/stock/16/science.png index 6b5843edb..6fcda4dd3 100644 Binary files a/comp/src/gb.form.stock/stock/16/science.png and b/comp/src/gb.form.stock/stock/16/science.png differ diff --git a/comp/src/gb.form.stock/stock/16/screen.png b/comp/src/gb.form.stock/stock/16/screen.png index 0f998134a..346edf7bd 100644 Binary files a/comp/src/gb.form.stock/stock/16/screen.png and b/comp/src/gb.form.stock/stock/16/screen.png differ diff --git a/comp/src/gb.form.stock/stock/16/script.png b/comp/src/gb.form.stock/stock/16/script.png index c9ada10a6..377c5bf25 100644 Binary files a/comp/src/gb.form.stock/stock/16/script.png and b/comp/src/gb.form.stock/stock/16/script.png differ diff --git a/comp/src/gb.form.stock/stock/16/select-all.png b/comp/src/gb.form.stock/stock/16/select-all.png index ad05bbd97..c32e0622e 100644 Binary files a/comp/src/gb.form.stock/stock/16/select-all.png and b/comp/src/gb.form.stock/stock/16/select-all.png differ diff --git a/comp/src/gb.form.stock/stock/16/server.png b/comp/src/gb.form.stock/stock/16/server.png index 26cbb9eca..0ae4eea70 100644 Binary files a/comp/src/gb.form.stock/stock/16/server.png and b/comp/src/gb.form.stock/stock/16/server.png differ diff --git a/comp/src/gb.form.stock/stock/16/start.png b/comp/src/gb.form.stock/stock/16/start.png index 2f89d29a2..312e6f0a4 100644 Binary files a/comp/src/gb.form.stock/stock/16/start.png and b/comp/src/gb.form.stock/stock/16/start.png differ diff --git a/comp/src/gb.form.stock/stock/16/stop.png b/comp/src/gb.form.stock/stock/16/stop.png index 9645bf5a7..21a2fa9ae 100644 Binary files a/comp/src/gb.form.stock/stock/16/stop.png and b/comp/src/gb.form.stock/stock/16/stop.png differ diff --git a/comp/src/gb.form.stock/stock/16/sun.png b/comp/src/gb.form.stock/stock/16/sun.png index 757d4ca26..28a5e10cf 100644 Binary files a/comp/src/gb.form.stock/stock/16/sun.png and b/comp/src/gb.form.stock/stock/16/sun.png differ diff --git a/comp/src/gb.form.stock/stock/16/system.png b/comp/src/gb.form.stock/stock/16/system.png index 0f998134a..346edf7bd 100644 Binary files a/comp/src/gb.form.stock/stock/16/system.png and b/comp/src/gb.form.stock/stock/16/system.png differ diff --git a/comp/src/gb.form.stock/stock/16/terminal.png b/comp/src/gb.form.stock/stock/16/terminal.png index da55a8bd3..7b0864fc9 100644 Binary files a/comp/src/gb.form.stock/stock/16/terminal.png and b/comp/src/gb.form.stock/stock/16/terminal.png differ diff --git a/comp/src/gb.form.stock/stock/16/text.png b/comp/src/gb.form.stock/stock/16/text.png index eafdaa6f3..af4d84713 100644 Binary files a/comp/src/gb.form.stock/stock/16/text.png and b/comp/src/gb.form.stock/stock/16/text.png differ diff --git a/comp/src/gb.form.stock/stock/16/top.png b/comp/src/gb.form.stock/stock/16/top.png index ad8437caf..be9bdbb14 100644 Binary files a/comp/src/gb.form.stock/stock/16/top.png and b/comp/src/gb.form.stock/stock/16/top.png differ diff --git a/comp/src/gb.form.stock/stock/16/trash.png b/comp/src/gb.form.stock/stock/16/trash.png index 9831ea3df..a9c89267b 100644 Binary files a/comp/src/gb.form.stock/stock/16/trash.png and b/comp/src/gb.form.stock/stock/16/trash.png differ diff --git a/comp/src/gb.form.stock/stock/16/undo.png b/comp/src/gb.form.stock/stock/16/undo.png index 87fe16b7d..ab69b0bb6 100644 Binary files a/comp/src/gb.form.stock/stock/16/undo.png and b/comp/src/gb.form.stock/stock/16/undo.png differ diff --git a/comp/src/gb.form.stock/stock/16/up.png b/comp/src/gb.form.stock/stock/16/up.png index f94051fe6..d6b0df26e 100644 Binary files a/comp/src/gb.form.stock/stock/16/up.png and b/comp/src/gb.form.stock/stock/16/up.png differ diff --git a/comp/src/gb.form.stock/stock/16/user.png b/comp/src/gb.form.stock/stock/16/user.png new file mode 100644 index 000000000..e1a5e80d4 Binary files /dev/null and b/comp/src/gb.form.stock/stock/16/user.png differ diff --git a/comp/src/gb.form.stock/stock/16/video.png b/comp/src/gb.form.stock/stock/16/video.png index 272e34b86..b43fbd233 100644 Binary files a/comp/src/gb.form.stock/stock/16/video.png and b/comp/src/gb.form.stock/stock/16/video.png differ diff --git a/comp/src/gb.form.stock/stock/16/volume.png b/comp/src/gb.form.stock/stock/16/volume.png index fa9f51c1b..8c769d9fd 100644 Binary files a/comp/src/gb.form.stock/stock/16/volume.png and b/comp/src/gb.form.stock/stock/16/volume.png differ diff --git a/comp/src/gb.form.stock/stock/16/warning.png b/comp/src/gb.form.stock/stock/16/warning.png index a42ea7237..65affd62b 100644 Binary files a/comp/src/gb.form.stock/stock/16/warning.png and b/comp/src/gb.form.stock/stock/16/warning.png differ diff --git a/comp/src/gb.form.stock/stock/16/webcam.png b/comp/src/gb.form.stock/stock/16/webcam.png index 4d5a4f5e5..802c4c1fe 100644 Binary files a/comp/src/gb.form.stock/stock/16/webcam.png and b/comp/src/gb.form.stock/stock/16/webcam.png differ diff --git a/comp/src/gb.form.stock/stock/22/access.png b/comp/src/gb.form.stock/stock/22/access.png index cbd833b49..025dd6c4a 100644 Binary files a/comp/src/gb.form.stock/stock/22/access.png and b/comp/src/gb.form.stock/stock/22/access.png differ diff --git a/comp/src/gb.form.stock/stock/22/add.png b/comp/src/gb.form.stock/stock/22/add.png index 0d0524cbd..2e4bf2d54 100644 Binary files a/comp/src/gb.form.stock/stock/22/add.png and b/comp/src/gb.form.stock/stock/22/add.png differ diff --git a/comp/src/gb.form.stock/stock/22/apply.png b/comp/src/gb.form.stock/stock/22/apply.png index 9edd00063..930ec429b 100644 Binary files a/comp/src/gb.form.stock/stock/22/apply.png and b/comp/src/gb.form.stock/stock/22/apply.png differ diff --git a/comp/src/gb.form.stock/stock/22/archive.png b/comp/src/gb.form.stock/stock/22/archive.png index 55495bc22..8cba8dc62 100644 Binary files a/comp/src/gb.form.stock/stock/22/archive.png and b/comp/src/gb.form.stock/stock/22/archive.png differ diff --git a/comp/src/gb.form.stock/stock/22/audio.png b/comp/src/gb.form.stock/stock/22/audio.png index c9e4819c0..21689b4e2 100644 Binary files a/comp/src/gb.form.stock/stock/22/audio.png and b/comp/src/gb.form.stock/stock/22/audio.png differ diff --git a/comp/src/gb.form.stock/stock/22/battery.png b/comp/src/gb.form.stock/stock/22/battery.png index 75c7fd1ef..e84dcc6da 100644 Binary files a/comp/src/gb.form.stock/stock/22/battery.png and b/comp/src/gb.form.stock/stock/22/battery.png differ diff --git a/comp/src/gb.form.stock/stock/22/book.png b/comp/src/gb.form.stock/stock/22/book.png index 741cf1a0e..604758b4b 100644 Binary files a/comp/src/gb.form.stock/stock/22/book.png and b/comp/src/gb.form.stock/stock/22/book.png differ diff --git a/comp/src/gb.form.stock/stock/22/bottom.png b/comp/src/gb.form.stock/stock/22/bottom.png index aee19aa64..dbfb07082 100644 Binary files a/comp/src/gb.form.stock/stock/22/bottom.png and b/comp/src/gb.form.stock/stock/22/bottom.png differ diff --git a/comp/src/gb.form.stock/stock/22/calculator.png b/comp/src/gb.form.stock/stock/22/calculator.png index 9db825c9c..de9eb1acf 100644 Binary files a/comp/src/gb.form.stock/stock/22/calculator.png and b/comp/src/gb.form.stock/stock/22/calculator.png differ diff --git a/comp/src/gb.form.stock/stock/22/camera.png b/comp/src/gb.form.stock/stock/22/camera.png index d683d8e4a..a4c27b5c8 100644 Binary files a/comp/src/gb.form.stock/stock/22/camera.png and b/comp/src/gb.form.stock/stock/22/camera.png differ diff --git a/comp/src/gb.form.stock/stock/22/cancel.png b/comp/src/gb.form.stock/stock/22/cancel.png index 8e8e2eee3..761937c2f 100644 Binary files a/comp/src/gb.form.stock/stock/22/cancel.png and b/comp/src/gb.form.stock/stock/22/cancel.png differ diff --git a/comp/src/gb.form.stock/stock/22/cdrom.png b/comp/src/gb.form.stock/stock/22/cdrom.png index f991308a3..3af680b87 100644 Binary files a/comp/src/gb.form.stock/stock/22/cdrom.png and b/comp/src/gb.form.stock/stock/22/cdrom.png differ diff --git a/comp/src/gb.form.stock/stock/22/clear.png b/comp/src/gb.form.stock/stock/22/clear.png index d11d46755..56d69f1cb 100644 Binary files a/comp/src/gb.form.stock/stock/22/clear.png and b/comp/src/gb.form.stock/stock/22/clear.png differ diff --git a/comp/src/gb.form.stock/stock/22/clock.png b/comp/src/gb.form.stock/stock/22/clock.png index 3c2ea7939..90afc3182 100644 Binary files a/comp/src/gb.form.stock/stock/22/clock.png and b/comp/src/gb.form.stock/stock/22/clock.png differ diff --git a/comp/src/gb.form.stock/stock/22/close.png b/comp/src/gb.form.stock/stock/22/close.png index 8e8e2eee3..761937c2f 100644 Binary files a/comp/src/gb.form.stock/stock/22/close.png and b/comp/src/gb.form.stock/stock/22/close.png differ diff --git a/comp/src/gb.form.stock/stock/22/color.png b/comp/src/gb.form.stock/stock/22/color.png index ba7fa8872..65916935d 100644 Binary files a/comp/src/gb.form.stock/stock/22/color.png and b/comp/src/gb.form.stock/stock/22/color.png differ diff --git a/comp/src/gb.form.stock/stock/22/component.png b/comp/src/gb.form.stock/stock/22/component.png index 2eb5e947d..69459fe85 100644 Binary files a/comp/src/gb.form.stock/stock/22/component.png and b/comp/src/gb.form.stock/stock/22/component.png differ diff --git a/comp/src/gb.form.stock/stock/22/computer.png b/comp/src/gb.form.stock/stock/22/computer.png index 2316896f5..b61a61f27 100644 Binary files a/comp/src/gb.form.stock/stock/22/computer.png and b/comp/src/gb.form.stock/stock/22/computer.png differ diff --git a/comp/src/gb.form.stock/stock/22/copy.png b/comp/src/gb.form.stock/stock/22/copy.png index e7b07f565..933419bdd 100644 Binary files a/comp/src/gb.form.stock/stock/22/copy.png and b/comp/src/gb.form.stock/stock/22/copy.png differ diff --git a/comp/src/gb.form.stock/stock/22/cut.png b/comp/src/gb.form.stock/stock/22/cut.png index 541c51e83..b1141c23f 100644 Binary files a/comp/src/gb.form.stock/stock/22/cut.png and b/comp/src/gb.form.stock/stock/22/cut.png differ diff --git a/comp/src/gb.form.stock/stock/22/delete.png b/comp/src/gb.form.stock/stock/22/delete.png index 9b3a32fc0..d0e9e400b 100644 Binary files a/comp/src/gb.form.stock/stock/22/delete.png and b/comp/src/gb.form.stock/stock/22/delete.png differ diff --git a/comp/src/gb.form.stock/stock/22/desktop.png b/comp/src/gb.form.stock/stock/22/desktop.png index 98ef14840..1bd9fbfdf 100644 Binary files a/comp/src/gb.form.stock/stock/22/desktop.png and b/comp/src/gb.form.stock/stock/22/desktop.png differ diff --git a/comp/src/gb.form.stock/stock/22/development.png b/comp/src/gb.form.stock/stock/22/development.png index 604a1c799..777a05376 100644 Binary files a/comp/src/gb.form.stock/stock/22/development.png and b/comp/src/gb.form.stock/stock/22/development.png differ diff --git a/comp/src/gb.form.stock/stock/22/directory.png b/comp/src/gb.form.stock/stock/22/directory.png index 39a7b2052..5c6ed0933 100644 Binary files a/comp/src/gb.form.stock/stock/22/directory.png and b/comp/src/gb.form.stock/stock/22/directory.png differ diff --git a/comp/src/gb.form.stock/stock/22/down.png b/comp/src/gb.form.stock/stock/22/down.png index 48a35c05b..5ce3bb8af 100644 Binary files a/comp/src/gb.form.stock/stock/22/down.png and b/comp/src/gb.form.stock/stock/22/down.png differ diff --git a/comp/src/gb.form.stock/stock/22/eject.png b/comp/src/gb.form.stock/stock/22/eject.png index 61ef2ba5b..a21425f75 100644 Binary files a/comp/src/gb.form.stock/stock/22/eject.png and b/comp/src/gb.form.stock/stock/22/eject.png differ diff --git a/comp/src/gb.form.stock/stock/22/end.png b/comp/src/gb.form.stock/stock/22/end.png index c653feca3..ddf09ede3 100644 Binary files a/comp/src/gb.form.stock/stock/22/end.png and b/comp/src/gb.form.stock/stock/22/end.png differ diff --git a/comp/src/gb.form.stock/stock/22/error.png b/comp/src/gb.form.stock/stock/22/error.png index 4d968af8b..8fb9fcf40 100644 Binary files a/comp/src/gb.form.stock/stock/22/error.png and b/comp/src/gb.form.stock/stock/22/error.png differ diff --git a/comp/src/gb.form.stock/stock/22/exec.png b/comp/src/gb.form.stock/stock/22/exec.png index 6a4e47f18..2c978d90f 100644 Binary files a/comp/src/gb.form.stock/stock/22/exec.png and b/comp/src/gb.form.stock/stock/22/exec.png differ diff --git a/comp/src/gb.form.stock/stock/22/file-manager.png b/comp/src/gb.form.stock/stock/22/file-manager.png index 66846d950..1d9082afd 100644 Binary files a/comp/src/gb.form.stock/stock/22/file-manager.png and b/comp/src/gb.form.stock/stock/22/file-manager.png differ diff --git a/comp/src/gb.form.stock/stock/22/file.png b/comp/src/gb.form.stock/stock/22/file.png index 312fee932..66f4b16bc 100644 Binary files a/comp/src/gb.form.stock/stock/22/file.png and b/comp/src/gb.form.stock/stock/22/file.png differ diff --git a/comp/src/gb.form.stock/stock/22/find.png b/comp/src/gb.form.stock/stock/22/find.png index d476a0cb2..bcf35f11f 100644 Binary files a/comp/src/gb.form.stock/stock/22/find.png and b/comp/src/gb.form.stock/stock/22/find.png differ diff --git a/comp/src/gb.form.stock/stock/22/first.png b/comp/src/gb.form.stock/stock/22/first.png index c3e9343b7..7adcab9f5 100644 Binary files a/comp/src/gb.form.stock/stock/22/first.png and b/comp/src/gb.form.stock/stock/22/first.png differ diff --git a/comp/src/gb.form.stock/stock/22/flip-h.png b/comp/src/gb.form.stock/stock/22/flip-h.png index 481989320..ab76c55cb 100644 Binary files a/comp/src/gb.form.stock/stock/22/flip-h.png and b/comp/src/gb.form.stock/stock/22/flip-h.png differ diff --git a/comp/src/gb.form.stock/stock/22/flip-v.png b/comp/src/gb.form.stock/stock/22/flip-v.png index 3b48aba27..53d43cbd1 100644 Binary files a/comp/src/gb.form.stock/stock/22/flip-v.png and b/comp/src/gb.form.stock/stock/22/flip-v.png differ diff --git a/comp/src/gb.form.stock/stock/22/floppy.png b/comp/src/gb.form.stock/stock/22/floppy.png index 9de8eef98..4919f8e11 100644 Binary files a/comp/src/gb.form.stock/stock/22/floppy.png and b/comp/src/gb.form.stock/stock/22/floppy.png differ diff --git a/comp/src/gb.form.stock/stock/22/forward.png b/comp/src/gb.form.stock/stock/22/forward.png index d18b323f2..1219649d9 100644 Binary files a/comp/src/gb.form.stock/stock/22/forward.png and b/comp/src/gb.form.stock/stock/22/forward.png differ diff --git a/comp/src/gb.form.stock/stock/22/fullscreen.png b/comp/src/gb.form.stock/stock/22/fullscreen.png index 5c6dbe8a0..72c61502e 100644 Binary files a/comp/src/gb.form.stock/stock/22/fullscreen.png and b/comp/src/gb.form.stock/stock/22/fullscreen.png differ diff --git a/comp/src/gb.form.stock/stock/22/game.png b/comp/src/gb.form.stock/stock/22/game.png index c6616cb82..6e5d893f6 100644 Binary files a/comp/src/gb.form.stock/stock/22/game.png and b/comp/src/gb.form.stock/stock/22/game.png differ diff --git a/comp/src/gb.form.stock/stock/22/group.png b/comp/src/gb.form.stock/stock/22/group.png new file mode 100644 index 000000000..cd765e052 Binary files /dev/null and b/comp/src/gb.form.stock/stock/22/group.png differ diff --git a/comp/src/gb.form.stock/stock/22/halt.png b/comp/src/gb.form.stock/stock/22/halt.png index 8e617b172..dbe65d041 100644 Binary files a/comp/src/gb.form.stock/stock/22/halt.png and b/comp/src/gb.form.stock/stock/22/halt.png differ diff --git a/comp/src/gb.form.stock/stock/22/harddisk.png b/comp/src/gb.form.stock/stock/22/harddisk.png index 9302edd03..91e288e3b 100644 Binary files a/comp/src/gb.form.stock/stock/22/harddisk.png and b/comp/src/gb.form.stock/stock/22/harddisk.png differ diff --git a/comp/src/gb.form.stock/stock/22/help.png b/comp/src/gb.form.stock/stock/22/help.png index dcbf507cd..2e2335b26 100644 Binary files a/comp/src/gb.form.stock/stock/22/help.png and b/comp/src/gb.form.stock/stock/22/help.png differ diff --git a/comp/src/gb.form.stock/stock/22/home.png b/comp/src/gb.form.stock/stock/22/home.png index aa3a559a4..0d74e4c48 100644 Binary files a/comp/src/gb.form.stock/stock/22/home.png and b/comp/src/gb.form.stock/stock/22/home.png differ diff --git a/comp/src/gb.form.stock/stock/22/html.png b/comp/src/gb.form.stock/stock/22/html.png index 7bf665dff..f7d40fead 100644 Binary files a/comp/src/gb.form.stock/stock/22/html.png and b/comp/src/gb.form.stock/stock/22/html.png differ diff --git a/comp/src/gb.form.stock/stock/22/identity.png b/comp/src/gb.form.stock/stock/22/identity.png index 309546714..8c09200a2 100644 Binary files a/comp/src/gb.form.stock/stock/22/identity.png and b/comp/src/gb.form.stock/stock/22/identity.png differ diff --git a/comp/src/gb.form.stock/stock/22/image.png b/comp/src/gb.form.stock/stock/22/image.png index 783ef453b..0a3f0f639 100644 Binary files a/comp/src/gb.form.stock/stock/22/image.png and b/comp/src/gb.form.stock/stock/22/image.png differ diff --git a/comp/src/gb.form.stock/stock/22/important.png b/comp/src/gb.form.stock/stock/22/important.png index 0639f0733..487ac08de 100644 Binary files a/comp/src/gb.form.stock/stock/22/important.png and b/comp/src/gb.form.stock/stock/22/important.png differ diff --git a/comp/src/gb.form.stock/stock/22/info.png b/comp/src/gb.form.stock/stock/22/info.png index a6e18d53f..10d9ce446 100644 Binary files a/comp/src/gb.form.stock/stock/22/info.png and b/comp/src/gb.form.stock/stock/22/info.png differ diff --git a/comp/src/gb.form.stock/stock/22/internet.png b/comp/src/gb.form.stock/stock/22/internet.png index e54f1a31d..931d9cfb0 100644 Binary files a/comp/src/gb.form.stock/stock/22/internet.png and b/comp/src/gb.form.stock/stock/22/internet.png differ diff --git a/comp/src/gb.form.stock/stock/22/jump.png b/comp/src/gb.form.stock/stock/22/jump.png index 2854dc0d6..98421d83c 100644 Binary files a/comp/src/gb.form.stock/stock/22/jump.png and b/comp/src/gb.form.stock/stock/22/jump.png differ diff --git a/comp/src/gb.form.stock/stock/22/keyboard.png b/comp/src/gb.form.stock/stock/22/keyboard.png index b68c3a567..d8db50fbd 100644 Binary files a/comp/src/gb.form.stock/stock/22/keyboard.png and b/comp/src/gb.form.stock/stock/22/keyboard.png differ diff --git a/comp/src/gb.form.stock/stock/22/lamp.png b/comp/src/gb.form.stock/stock/22/lamp.png index 3e02ceaa3..3acf5b066 100644 Binary files a/comp/src/gb.form.stock/stock/22/lamp.png and b/comp/src/gb.form.stock/stock/22/lamp.png differ diff --git a/comp/src/gb.form.stock/stock/22/language.png b/comp/src/gb.form.stock/stock/22/language.png index 3c6a25710..d6fccd0ec 100644 Binary files a/comp/src/gb.form.stock/stock/22/language.png and b/comp/src/gb.form.stock/stock/22/language.png differ diff --git a/comp/src/gb.form.stock/stock/22/last.png b/comp/src/gb.form.stock/stock/22/last.png index f157fa670..baddba118 100644 Binary files a/comp/src/gb.form.stock/stock/22/last.png and b/comp/src/gb.form.stock/stock/22/last.png differ diff --git a/comp/src/gb.form.stock/stock/22/left.png b/comp/src/gb.form.stock/stock/22/left.png index e601f2350..08e0ea584 100644 Binary files a/comp/src/gb.form.stock/stock/22/left.png and b/comp/src/gb.form.stock/stock/22/left.png differ diff --git a/comp/src/gb.form.stock/stock/22/link.png b/comp/src/gb.form.stock/stock/22/link.png index 0ce7bf314..3efae6963 100644 Binary files a/comp/src/gb.form.stock/stock/22/link.png and b/comp/src/gb.form.stock/stock/22/link.png differ diff --git a/comp/src/gb.form.stock/stock/22/mail.png b/comp/src/gb.form.stock/stock/22/mail.png index 304afb42d..fce8cec8a 100644 Binary files a/comp/src/gb.form.stock/stock/22/mail.png and b/comp/src/gb.form.stock/stock/22/mail.png differ diff --git a/comp/src/gb.form.stock/stock/22/media-player.png b/comp/src/gb.form.stock/stock/22/media-player.png index 7ab0eec3c..62c8ed0a7 100644 Binary files a/comp/src/gb.form.stock/stock/22/media-player.png and b/comp/src/gb.form.stock/stock/22/media-player.png differ diff --git a/comp/src/gb.form.stock/stock/22/menu.png b/comp/src/gb.form.stock/stock/22/menu.png index 3d2078b51..905ad9e9c 100644 Binary files a/comp/src/gb.form.stock/stock/22/menu.png and b/comp/src/gb.form.stock/stock/22/menu.png differ diff --git a/comp/src/gb.form.stock/stock/22/microphone.png b/comp/src/gb.form.stock/stock/22/microphone.png index 1f5e82e3b..008b7ca73 100644 Binary files a/comp/src/gb.form.stock/stock/22/microphone.png and b/comp/src/gb.form.stock/stock/22/microphone.png differ diff --git a/comp/src/gb.form.stock/stock/22/monitor.png b/comp/src/gb.form.stock/stock/22/monitor.png index 7f1ff1fc1..e12ff7dbd 100644 Binary files a/comp/src/gb.form.stock/stock/22/monitor.png and b/comp/src/gb.form.stock/stock/22/monitor.png differ diff --git a/comp/src/gb.form.stock/stock/22/mouse.png b/comp/src/gb.form.stock/stock/22/mouse.png index 7e0b0142c..63a6a4f58 100644 Binary files a/comp/src/gb.form.stock/stock/22/mouse.png and b/comp/src/gb.form.stock/stock/22/mouse.png differ diff --git a/comp/src/gb.form.stock/stock/22/multimedia.png b/comp/src/gb.form.stock/stock/22/multimedia.png index 851234b60..06124105e 100644 Binary files a/comp/src/gb.form.stock/stock/22/multimedia.png and b/comp/src/gb.form.stock/stock/22/multimedia.png differ diff --git a/comp/src/gb.form.stock/stock/22/muted.png b/comp/src/gb.form.stock/stock/22/muted.png index de5d6db35..5208aff52 100644 Binary files a/comp/src/gb.form.stock/stock/22/muted.png and b/comp/src/gb.form.stock/stock/22/muted.png differ diff --git a/comp/src/gb.form.stock/stock/22/new-dir.png b/comp/src/gb.form.stock/stock/22/new-dir.png index 71f6315ff..c65346a1b 100644 Binary files a/comp/src/gb.form.stock/stock/22/new-dir.png and b/comp/src/gb.form.stock/stock/22/new-dir.png differ diff --git a/comp/src/gb.form.stock/stock/22/new-window.png b/comp/src/gb.form.stock/stock/22/new-window.png index 956222c81..7a4f8388b 100644 Binary files a/comp/src/gb.form.stock/stock/22/new-window.png and b/comp/src/gb.form.stock/stock/22/new-window.png differ diff --git a/comp/src/gb.form.stock/stock/22/new.png b/comp/src/gb.form.stock/stock/22/new.png index d4277f4a2..f2493a4a8 100644 Binary files a/comp/src/gb.form.stock/stock/22/new.png and b/comp/src/gb.form.stock/stock/22/new.png differ diff --git a/comp/src/gb.form.stock/stock/22/next.png b/comp/src/gb.form.stock/stock/22/next.png index c3ed53ac6..9c28ff2cf 100644 Binary files a/comp/src/gb.form.stock/stock/22/next.png and b/comp/src/gb.form.stock/stock/22/next.png differ diff --git a/comp/src/gb.form.stock/stock/22/ok.png b/comp/src/gb.form.stock/stock/22/ok.png index 9edd00063..930ec429b 100644 Binary files a/comp/src/gb.form.stock/stock/22/ok.png and b/comp/src/gb.form.stock/stock/22/ok.png differ diff --git a/comp/src/gb.form.stock/stock/22/open-recent.png b/comp/src/gb.form.stock/stock/22/open-recent.png index 9acc46efe..a8704074d 100644 Binary files a/comp/src/gb.form.stock/stock/22/open-recent.png and b/comp/src/gb.form.stock/stock/22/open-recent.png differ diff --git a/comp/src/gb.form.stock/stock/22/open.png b/comp/src/gb.form.stock/stock/22/open.png index a13c61763..428d10815 100644 Binary files a/comp/src/gb.form.stock/stock/22/open.png and b/comp/src/gb.form.stock/stock/22/open.png differ diff --git a/comp/src/gb.form.stock/stock/22/options.png b/comp/src/gb.form.stock/stock/22/options.png index 92839350a..624e5754e 100644 Binary files a/comp/src/gb.form.stock/stock/22/options.png and b/comp/src/gb.form.stock/stock/22/options.png differ diff --git a/comp/src/gb.form.stock/stock/22/package.png b/comp/src/gb.form.stock/stock/22/package.png index 6d72ade3e..2a2096216 100644 Binary files a/comp/src/gb.form.stock/stock/22/package.png and b/comp/src/gb.form.stock/stock/22/package.png differ diff --git a/comp/src/gb.form.stock/stock/22/paste.png b/comp/src/gb.form.stock/stock/22/paste.png index 46ff24942..fa92196f7 100644 Binary files a/comp/src/gb.form.stock/stock/22/paste.png and b/comp/src/gb.form.stock/stock/22/paste.png differ diff --git a/comp/src/gb.form.stock/stock/22/pause.png b/comp/src/gb.form.stock/stock/22/pause.png index 3a59255ce..fdd17c027 100644 Binary files a/comp/src/gb.form.stock/stock/22/pause.png and b/comp/src/gb.form.stock/stock/22/pause.png differ diff --git a/comp/src/gb.form.stock/stock/22/pda.png b/comp/src/gb.form.stock/stock/22/pda.png index e98a89867..6a4b881dd 100644 Binary files a/comp/src/gb.form.stock/stock/22/pda.png and b/comp/src/gb.form.stock/stock/22/pda.png differ diff --git a/comp/src/gb.form.stock/stock/22/pdf.png b/comp/src/gb.form.stock/stock/22/pdf.png index a1ce87f1d..b2945a2d2 100644 Binary files a/comp/src/gb.form.stock/stock/22/pdf.png and b/comp/src/gb.form.stock/stock/22/pdf.png differ diff --git a/comp/src/gb.form.stock/stock/22/people.png b/comp/src/gb.form.stock/stock/22/people.png index b92ce15e3..cd765e052 100644 Binary files a/comp/src/gb.form.stock/stock/22/people.png and b/comp/src/gb.form.stock/stock/22/people.png differ diff --git a/comp/src/gb.form.stock/stock/22/phone.png b/comp/src/gb.form.stock/stock/22/phone.png index 42f74ed59..2a8ed8461 100644 Binary files a/comp/src/gb.form.stock/stock/22/phone.png and b/comp/src/gb.form.stock/stock/22/phone.png differ diff --git a/comp/src/gb.form.stock/stock/22/play.png b/comp/src/gb.form.stock/stock/22/play.png index eeef86015..7c59f37f4 100644 Binary files a/comp/src/gb.form.stock/stock/22/play.png and b/comp/src/gb.form.stock/stock/22/play.png differ diff --git a/comp/src/gb.form.stock/stock/22/previous.png b/comp/src/gb.form.stock/stock/22/previous.png index e601f2350..08e0ea584 100644 Binary files a/comp/src/gb.form.stock/stock/22/previous.png and b/comp/src/gb.form.stock/stock/22/previous.png differ diff --git a/comp/src/gb.form.stock/stock/22/print.png b/comp/src/gb.form.stock/stock/22/print.png index 5c3488d89..bd2d98394 100644 Binary files a/comp/src/gb.form.stock/stock/22/print.png and b/comp/src/gb.form.stock/stock/22/print.png differ diff --git a/comp/src/gb.form.stock/stock/22/printer.png b/comp/src/gb.form.stock/stock/22/printer.png index b297e7247..6c33ef63f 100644 Binary files a/comp/src/gb.form.stock/stock/22/printer.png and b/comp/src/gb.form.stock/stock/22/printer.png differ diff --git a/comp/src/gb.form.stock/stock/22/program.png b/comp/src/gb.form.stock/stock/22/program.png index c6148fa90..0d4a81450 100644 Binary files a/comp/src/gb.form.stock/stock/22/program.png and b/comp/src/gb.form.stock/stock/22/program.png differ diff --git a/comp/src/gb.form.stock/stock/22/properties.png b/comp/src/gb.form.stock/stock/22/properties.png index 92839350a..624e5754e 100644 Binary files a/comp/src/gb.form.stock/stock/22/properties.png and b/comp/src/gb.form.stock/stock/22/properties.png differ diff --git a/comp/src/gb.form.stock/stock/22/question.png b/comp/src/gb.form.stock/stock/22/question.png index dcbf507cd..2e2335b26 100644 Binary files a/comp/src/gb.form.stock/stock/22/question.png and b/comp/src/gb.form.stock/stock/22/question.png differ diff --git a/comp/src/gb.form.stock/stock/22/quit.png b/comp/src/gb.form.stock/stock/22/quit.png index 8defd575d..c5fb3780f 100644 Binary files a/comp/src/gb.form.stock/stock/22/quit.png and b/comp/src/gb.form.stock/stock/22/quit.png differ diff --git a/comp/src/gb.form.stock/stock/22/recent.png b/comp/src/gb.form.stock/stock/22/recent.png index 9acc46efe..a8704074d 100644 Binary files a/comp/src/gb.form.stock/stock/22/recent.png and b/comp/src/gb.form.stock/stock/22/recent.png differ diff --git a/comp/src/gb.form.stock/stock/22/record.png b/comp/src/gb.form.stock/stock/22/record.png index 14fdf9ef8..30df8a215 100644 Binary files a/comp/src/gb.form.stock/stock/22/record.png and b/comp/src/gb.form.stock/stock/22/record.png differ diff --git a/comp/src/gb.form.stock/stock/22/redo.png b/comp/src/gb.form.stock/stock/22/redo.png index 7e4d8b505..959f0828f 100644 Binary files a/comp/src/gb.form.stock/stock/22/redo.png and b/comp/src/gb.form.stock/stock/22/redo.png differ diff --git a/comp/src/gb.form.stock/stock/22/refresh.png b/comp/src/gb.form.stock/stock/22/refresh.png index 06f1ff0c3..eed2719dd 100644 Binary files a/comp/src/gb.form.stock/stock/22/refresh.png and b/comp/src/gb.form.stock/stock/22/refresh.png differ diff --git a/comp/src/gb.form.stock/stock/22/remove.png b/comp/src/gb.form.stock/stock/22/remove.png index 9b3a32fc0..d0e9e400b 100644 Binary files a/comp/src/gb.form.stock/stock/22/remove.png and b/comp/src/gb.form.stock/stock/22/remove.png differ diff --git a/comp/src/gb.form.stock/stock/22/replace.png b/comp/src/gb.form.stock/stock/22/replace.png index f749b94ec..e9a7c2ed7 100644 Binary files a/comp/src/gb.form.stock/stock/22/replace.png and b/comp/src/gb.form.stock/stock/22/replace.png differ diff --git a/comp/src/gb.form.stock/stock/22/revert.png b/comp/src/gb.form.stock/stock/22/revert.png index 47f9320be..83b608f64 100644 Binary files a/comp/src/gb.form.stock/stock/22/revert.png and b/comp/src/gb.form.stock/stock/22/revert.png differ diff --git a/comp/src/gb.form.stock/stock/22/rewind.png b/comp/src/gb.form.stock/stock/22/rewind.png index d4552d7f7..fecb7ea94 100644 Binary files a/comp/src/gb.form.stock/stock/22/rewind.png and b/comp/src/gb.form.stock/stock/22/rewind.png differ diff --git a/comp/src/gb.form.stock/stock/22/right.png b/comp/src/gb.form.stock/stock/22/right.png index c3ed53ac6..9c28ff2cf 100644 Binary files a/comp/src/gb.form.stock/stock/22/right.png and b/comp/src/gb.form.stock/stock/22/right.png differ diff --git a/comp/src/gb.form.stock/stock/22/rotate-left.png b/comp/src/gb.form.stock/stock/22/rotate-left.png index 6680511ae..55ec0296f 100644 Binary files a/comp/src/gb.form.stock/stock/22/rotate-left.png and b/comp/src/gb.form.stock/stock/22/rotate-left.png differ diff --git a/comp/src/gb.form.stock/stock/22/rotate-right.png b/comp/src/gb.form.stock/stock/22/rotate-right.png index ada19d33d..c3d211ac2 100644 Binary files a/comp/src/gb.form.stock/stock/22/rotate-right.png and b/comp/src/gb.form.stock/stock/22/rotate-right.png differ diff --git a/comp/src/gb.form.stock/stock/22/save-as.png b/comp/src/gb.form.stock/stock/22/save-as.png index aa66c2ce2..016a7c0db 100644 Binary files a/comp/src/gb.form.stock/stock/22/save-as.png and b/comp/src/gb.form.stock/stock/22/save-as.png differ diff --git a/comp/src/gb.form.stock/stock/22/save.png b/comp/src/gb.form.stock/stock/22/save.png index 9dac23cbd..26c3b39bc 100644 Binary files a/comp/src/gb.form.stock/stock/22/save.png and b/comp/src/gb.form.stock/stock/22/save.png differ diff --git a/comp/src/gb.form.stock/stock/22/science.png b/comp/src/gb.form.stock/stock/22/science.png index 3a1cb1c44..7d29f4d52 100644 Binary files a/comp/src/gb.form.stock/stock/22/science.png and b/comp/src/gb.form.stock/stock/22/science.png differ diff --git a/comp/src/gb.form.stock/stock/22/screen.png b/comp/src/gb.form.stock/stock/22/screen.png index 2316896f5..b61a61f27 100644 Binary files a/comp/src/gb.form.stock/stock/22/screen.png and b/comp/src/gb.form.stock/stock/22/screen.png differ diff --git a/comp/src/gb.form.stock/stock/22/script.png b/comp/src/gb.form.stock/stock/22/script.png index 5a5f15461..76d3bf535 100644 Binary files a/comp/src/gb.form.stock/stock/22/script.png and b/comp/src/gb.form.stock/stock/22/script.png differ diff --git a/comp/src/gb.form.stock/stock/22/select-all.png b/comp/src/gb.form.stock/stock/22/select-all.png index 638b31acb..1110804b2 100644 Binary files a/comp/src/gb.form.stock/stock/22/select-all.png and b/comp/src/gb.form.stock/stock/22/select-all.png differ diff --git a/comp/src/gb.form.stock/stock/22/server.png b/comp/src/gb.form.stock/stock/22/server.png index e226f63cb..29cff4142 100644 Binary files a/comp/src/gb.form.stock/stock/22/server.png and b/comp/src/gb.form.stock/stock/22/server.png differ diff --git a/comp/src/gb.form.stock/stock/22/start.png b/comp/src/gb.form.stock/stock/22/start.png index b4ae7099a..4399c687e 100644 Binary files a/comp/src/gb.form.stock/stock/22/start.png and b/comp/src/gb.form.stock/stock/22/start.png differ diff --git a/comp/src/gb.form.stock/stock/22/stop.png b/comp/src/gb.form.stock/stock/22/stop.png index e283b311e..f4ee565c0 100644 Binary files a/comp/src/gb.form.stock/stock/22/stop.png and b/comp/src/gb.form.stock/stock/22/stop.png differ diff --git a/comp/src/gb.form.stock/stock/22/sun.png b/comp/src/gb.form.stock/stock/22/sun.png index 7e9864a63..752e1f1a0 100644 Binary files a/comp/src/gb.form.stock/stock/22/sun.png and b/comp/src/gb.form.stock/stock/22/sun.png differ diff --git a/comp/src/gb.form.stock/stock/22/system.png b/comp/src/gb.form.stock/stock/22/system.png index 2316896f5..b61a61f27 100644 Binary files a/comp/src/gb.form.stock/stock/22/system.png and b/comp/src/gb.form.stock/stock/22/system.png differ diff --git a/comp/src/gb.form.stock/stock/22/terminal.png b/comp/src/gb.form.stock/stock/22/terminal.png index 682bb9684..282f0c17a 100644 Binary files a/comp/src/gb.form.stock/stock/22/terminal.png and b/comp/src/gb.form.stock/stock/22/terminal.png differ diff --git a/comp/src/gb.form.stock/stock/22/text.png b/comp/src/gb.form.stock/stock/22/text.png index c82d0698d..8d1a5b2cc 100644 Binary files a/comp/src/gb.form.stock/stock/22/text.png and b/comp/src/gb.form.stock/stock/22/text.png differ diff --git a/comp/src/gb.form.stock/stock/22/top.png b/comp/src/gb.form.stock/stock/22/top.png index cb913b7c1..415177417 100644 Binary files a/comp/src/gb.form.stock/stock/22/top.png and b/comp/src/gb.form.stock/stock/22/top.png differ diff --git a/comp/src/gb.form.stock/stock/22/trash.png b/comp/src/gb.form.stock/stock/22/trash.png index 57da0779e..67b868840 100644 Binary files a/comp/src/gb.form.stock/stock/22/trash.png and b/comp/src/gb.form.stock/stock/22/trash.png differ diff --git a/comp/src/gb.form.stock/stock/22/undo.png b/comp/src/gb.form.stock/stock/22/undo.png index a82fac4be..9cb3b8911 100644 Binary files a/comp/src/gb.form.stock/stock/22/undo.png and b/comp/src/gb.form.stock/stock/22/undo.png differ diff --git a/comp/src/gb.form.stock/stock/22/up.png b/comp/src/gb.form.stock/stock/22/up.png index 5bf915e2f..22cc30709 100644 Binary files a/comp/src/gb.form.stock/stock/22/up.png and b/comp/src/gb.form.stock/stock/22/up.png differ diff --git a/comp/src/gb.form.stock/stock/22/user.png b/comp/src/gb.form.stock/stock/22/user.png new file mode 100644 index 000000000..7b6991f80 Binary files /dev/null and b/comp/src/gb.form.stock/stock/22/user.png differ diff --git a/comp/src/gb.form.stock/stock/22/video.png b/comp/src/gb.form.stock/stock/22/video.png index cb3215d81..28c956ff3 100644 Binary files a/comp/src/gb.form.stock/stock/22/video.png and b/comp/src/gb.form.stock/stock/22/video.png differ diff --git a/comp/src/gb.form.stock/stock/22/volume.png b/comp/src/gb.form.stock/stock/22/volume.png index ae15b1cd9..7cd3f68ba 100644 Binary files a/comp/src/gb.form.stock/stock/22/volume.png and b/comp/src/gb.form.stock/stock/22/volume.png differ diff --git a/comp/src/gb.form.stock/stock/22/warning.png b/comp/src/gb.form.stock/stock/22/warning.png index 0639f0733..487ac08de 100644 Binary files a/comp/src/gb.form.stock/stock/22/warning.png and b/comp/src/gb.form.stock/stock/22/warning.png differ diff --git a/comp/src/gb.form.stock/stock/22/webcam.png b/comp/src/gb.form.stock/stock/22/webcam.png index e8a6a10c6..823f30297 100644 Binary files a/comp/src/gb.form.stock/stock/22/webcam.png and b/comp/src/gb.form.stock/stock/22/webcam.png differ diff --git a/comp/src/gb.form.stock/stock/32/access.png b/comp/src/gb.form.stock/stock/32/access.png index 3cfbef84f..5f9a892b8 100644 Binary files a/comp/src/gb.form.stock/stock/32/access.png and b/comp/src/gb.form.stock/stock/32/access.png differ diff --git a/comp/src/gb.form.stock/stock/32/add.png b/comp/src/gb.form.stock/stock/32/add.png index 0562620f2..c4cc951f7 100644 Binary files a/comp/src/gb.form.stock/stock/32/add.png and b/comp/src/gb.form.stock/stock/32/add.png differ diff --git a/comp/src/gb.form.stock/stock/32/apply.png b/comp/src/gb.form.stock/stock/32/apply.png index a1d059105..8190dc83b 100644 Binary files a/comp/src/gb.form.stock/stock/32/apply.png and b/comp/src/gb.form.stock/stock/32/apply.png differ diff --git a/comp/src/gb.form.stock/stock/32/archive.png b/comp/src/gb.form.stock/stock/32/archive.png index c5cbec094..23c560b37 100644 Binary files a/comp/src/gb.form.stock/stock/32/archive.png and b/comp/src/gb.form.stock/stock/32/archive.png differ diff --git a/comp/src/gb.form.stock/stock/32/audio.png b/comp/src/gb.form.stock/stock/32/audio.png index facf65183..f5c63f41e 100644 Binary files a/comp/src/gb.form.stock/stock/32/audio.png and b/comp/src/gb.form.stock/stock/32/audio.png differ diff --git a/comp/src/gb.form.stock/stock/32/battery.png b/comp/src/gb.form.stock/stock/32/battery.png index 0b26367e0..9ac61c45b 100644 Binary files a/comp/src/gb.form.stock/stock/32/battery.png and b/comp/src/gb.form.stock/stock/32/battery.png differ diff --git a/comp/src/gb.form.stock/stock/32/book.png b/comp/src/gb.form.stock/stock/32/book.png index f5bdbf7c7..71c3a958a 100644 Binary files a/comp/src/gb.form.stock/stock/32/book.png and b/comp/src/gb.form.stock/stock/32/book.png differ diff --git a/comp/src/gb.form.stock/stock/32/bottom.png b/comp/src/gb.form.stock/stock/32/bottom.png index b5de65a23..198a3f776 100644 Binary files a/comp/src/gb.form.stock/stock/32/bottom.png and b/comp/src/gb.form.stock/stock/32/bottom.png differ diff --git a/comp/src/gb.form.stock/stock/32/calculator.png b/comp/src/gb.form.stock/stock/32/calculator.png index c262cd7e1..020918f4c 100644 Binary files a/comp/src/gb.form.stock/stock/32/calculator.png and b/comp/src/gb.form.stock/stock/32/calculator.png differ diff --git a/comp/src/gb.form.stock/stock/32/camera.png b/comp/src/gb.form.stock/stock/32/camera.png index d99087552..b3bfe8039 100644 Binary files a/comp/src/gb.form.stock/stock/32/camera.png and b/comp/src/gb.form.stock/stock/32/camera.png differ diff --git a/comp/src/gb.form.stock/stock/32/cancel.png b/comp/src/gb.form.stock/stock/32/cancel.png index 02b060e9c..e9267e3d2 100644 Binary files a/comp/src/gb.form.stock/stock/32/cancel.png and b/comp/src/gb.form.stock/stock/32/cancel.png differ diff --git a/comp/src/gb.form.stock/stock/32/cdrom.png b/comp/src/gb.form.stock/stock/32/cdrom.png index ce82dcd7b..c18781ce0 100644 Binary files a/comp/src/gb.form.stock/stock/32/cdrom.png and b/comp/src/gb.form.stock/stock/32/cdrom.png differ diff --git a/comp/src/gb.form.stock/stock/32/clear.png b/comp/src/gb.form.stock/stock/32/clear.png index 0da671444..adf1372fa 100644 Binary files a/comp/src/gb.form.stock/stock/32/clear.png and b/comp/src/gb.form.stock/stock/32/clear.png differ diff --git a/comp/src/gb.form.stock/stock/32/clock.png b/comp/src/gb.form.stock/stock/32/clock.png index 958d3993e..5988ab3b8 100644 Binary files a/comp/src/gb.form.stock/stock/32/clock.png and b/comp/src/gb.form.stock/stock/32/clock.png differ diff --git a/comp/src/gb.form.stock/stock/32/close.png b/comp/src/gb.form.stock/stock/32/close.png index 02b060e9c..e9267e3d2 100644 Binary files a/comp/src/gb.form.stock/stock/32/close.png and b/comp/src/gb.form.stock/stock/32/close.png differ diff --git a/comp/src/gb.form.stock/stock/32/color.png b/comp/src/gb.form.stock/stock/32/color.png index 6046fc99e..45e021832 100644 Binary files a/comp/src/gb.form.stock/stock/32/color.png and b/comp/src/gb.form.stock/stock/32/color.png differ diff --git a/comp/src/gb.form.stock/stock/32/component.png b/comp/src/gb.form.stock/stock/32/component.png index 9da97f284..fdc1308e7 100644 Binary files a/comp/src/gb.form.stock/stock/32/component.png and b/comp/src/gb.form.stock/stock/32/component.png differ diff --git a/comp/src/gb.form.stock/stock/32/computer.png b/comp/src/gb.form.stock/stock/32/computer.png index 4f7ac4729..de741fb9d 100644 Binary files a/comp/src/gb.form.stock/stock/32/computer.png and b/comp/src/gb.form.stock/stock/32/computer.png differ diff --git a/comp/src/gb.form.stock/stock/32/copy.png b/comp/src/gb.form.stock/stock/32/copy.png index 129d93eae..b9516d32e 100644 Binary files a/comp/src/gb.form.stock/stock/32/copy.png and b/comp/src/gb.form.stock/stock/32/copy.png differ diff --git a/comp/src/gb.form.stock/stock/32/cut.png b/comp/src/gb.form.stock/stock/32/cut.png index d04d01487..8d94d0dda 100644 Binary files a/comp/src/gb.form.stock/stock/32/cut.png and b/comp/src/gb.form.stock/stock/32/cut.png differ diff --git a/comp/src/gb.form.stock/stock/32/delete.png b/comp/src/gb.form.stock/stock/32/delete.png index c8acb85db..b0523da5d 100644 Binary files a/comp/src/gb.form.stock/stock/32/delete.png and b/comp/src/gb.form.stock/stock/32/delete.png differ diff --git a/comp/src/gb.form.stock/stock/32/desktop.png b/comp/src/gb.form.stock/stock/32/desktop.png index 4a4d8515f..6a7b6d2fb 100644 Binary files a/comp/src/gb.form.stock/stock/32/desktop.png and b/comp/src/gb.form.stock/stock/32/desktop.png differ diff --git a/comp/src/gb.form.stock/stock/32/development.png b/comp/src/gb.form.stock/stock/32/development.png index 19ad39d0d..746668d99 100644 Binary files a/comp/src/gb.form.stock/stock/32/development.png and b/comp/src/gb.form.stock/stock/32/development.png differ diff --git a/comp/src/gb.form.stock/stock/32/directory.png b/comp/src/gb.form.stock/stock/32/directory.png index f81eb2fe6..bd26bddf8 100644 Binary files a/comp/src/gb.form.stock/stock/32/directory.png and b/comp/src/gb.form.stock/stock/32/directory.png differ diff --git a/comp/src/gb.form.stock/stock/32/down.png b/comp/src/gb.form.stock/stock/32/down.png index 0b652c6a8..107f7b286 100644 Binary files a/comp/src/gb.form.stock/stock/32/down.png and b/comp/src/gb.form.stock/stock/32/down.png differ diff --git a/comp/src/gb.form.stock/stock/32/eject.png b/comp/src/gb.form.stock/stock/32/eject.png index 541aa0bb5..971c17f1e 100644 Binary files a/comp/src/gb.form.stock/stock/32/eject.png and b/comp/src/gb.form.stock/stock/32/eject.png differ diff --git a/comp/src/gb.form.stock/stock/32/end.png b/comp/src/gb.form.stock/stock/32/end.png index eaf8d6fbf..2425d6fb5 100644 Binary files a/comp/src/gb.form.stock/stock/32/end.png and b/comp/src/gb.form.stock/stock/32/end.png differ diff --git a/comp/src/gb.form.stock/stock/32/error.png b/comp/src/gb.form.stock/stock/32/error.png index 6691ad7c7..2c6a610b4 100644 Binary files a/comp/src/gb.form.stock/stock/32/error.png and b/comp/src/gb.form.stock/stock/32/error.png differ diff --git a/comp/src/gb.form.stock/stock/32/exec.png b/comp/src/gb.form.stock/stock/32/exec.png index 197e5d97c..f884c31bc 100644 Binary files a/comp/src/gb.form.stock/stock/32/exec.png and b/comp/src/gb.form.stock/stock/32/exec.png differ diff --git a/comp/src/gb.form.stock/stock/32/file-manager.png b/comp/src/gb.form.stock/stock/32/file-manager.png index f3ab0d42a..20a3e5074 100644 Binary files a/comp/src/gb.form.stock/stock/32/file-manager.png and b/comp/src/gb.form.stock/stock/32/file-manager.png differ diff --git a/comp/src/gb.form.stock/stock/32/file.png b/comp/src/gb.form.stock/stock/32/file.png index fa9f99125..609a18b43 100644 Binary files a/comp/src/gb.form.stock/stock/32/file.png and b/comp/src/gb.form.stock/stock/32/file.png differ diff --git a/comp/src/gb.form.stock/stock/32/find.png b/comp/src/gb.form.stock/stock/32/find.png index 50700b68e..757d2128c 100644 Binary files a/comp/src/gb.form.stock/stock/32/find.png and b/comp/src/gb.form.stock/stock/32/find.png differ diff --git a/comp/src/gb.form.stock/stock/32/first.png b/comp/src/gb.form.stock/stock/32/first.png index 093b14d30..67263c49f 100644 Binary files a/comp/src/gb.form.stock/stock/32/first.png and b/comp/src/gb.form.stock/stock/32/first.png differ diff --git a/comp/src/gb.form.stock/stock/32/flip-h.png b/comp/src/gb.form.stock/stock/32/flip-h.png index 6faf964fc..f35f02574 100644 Binary files a/comp/src/gb.form.stock/stock/32/flip-h.png and b/comp/src/gb.form.stock/stock/32/flip-h.png differ diff --git a/comp/src/gb.form.stock/stock/32/flip-v.png b/comp/src/gb.form.stock/stock/32/flip-v.png index 232d3bb6a..a7e4ca907 100644 Binary files a/comp/src/gb.form.stock/stock/32/flip-v.png and b/comp/src/gb.form.stock/stock/32/flip-v.png differ diff --git a/comp/src/gb.form.stock/stock/32/floppy.png b/comp/src/gb.form.stock/stock/32/floppy.png index b24f66eb4..cd5fe62ee 100644 Binary files a/comp/src/gb.form.stock/stock/32/floppy.png and b/comp/src/gb.form.stock/stock/32/floppy.png differ diff --git a/comp/src/gb.form.stock/stock/32/forward.png b/comp/src/gb.form.stock/stock/32/forward.png index 83cadecc2..eb2b8699b 100644 Binary files a/comp/src/gb.form.stock/stock/32/forward.png and b/comp/src/gb.form.stock/stock/32/forward.png differ diff --git a/comp/src/gb.form.stock/stock/32/fullscreen.png b/comp/src/gb.form.stock/stock/32/fullscreen.png index 711edad9a..c100ab5ad 100644 Binary files a/comp/src/gb.form.stock/stock/32/fullscreen.png and b/comp/src/gb.form.stock/stock/32/fullscreen.png differ diff --git a/comp/src/gb.form.stock/stock/32/game.png b/comp/src/gb.form.stock/stock/32/game.png index 644b5934a..7327bfb54 100644 Binary files a/comp/src/gb.form.stock/stock/32/game.png and b/comp/src/gb.form.stock/stock/32/game.png differ diff --git a/comp/src/gb.form.stock/stock/32/group.png b/comp/src/gb.form.stock/stock/32/group.png new file mode 100644 index 000000000..177813b4d Binary files /dev/null and b/comp/src/gb.form.stock/stock/32/group.png differ diff --git a/comp/src/gb.form.stock/stock/32/halt.png b/comp/src/gb.form.stock/stock/32/halt.png index 726c1b723..91a305be0 100644 Binary files a/comp/src/gb.form.stock/stock/32/halt.png and b/comp/src/gb.form.stock/stock/32/halt.png differ diff --git a/comp/src/gb.form.stock/stock/32/harddisk.png b/comp/src/gb.form.stock/stock/32/harddisk.png index 5eadeb469..d1945cadd 100644 Binary files a/comp/src/gb.form.stock/stock/32/harddisk.png and b/comp/src/gb.form.stock/stock/32/harddisk.png differ diff --git a/comp/src/gb.form.stock/stock/32/help.png b/comp/src/gb.form.stock/stock/32/help.png index 068fd0916..bd23352a1 100644 Binary files a/comp/src/gb.form.stock/stock/32/help.png and b/comp/src/gb.form.stock/stock/32/help.png differ diff --git a/comp/src/gb.form.stock/stock/32/home.png b/comp/src/gb.form.stock/stock/32/home.png index b32892fa9..ff7a7e6ab 100644 Binary files a/comp/src/gb.form.stock/stock/32/home.png and b/comp/src/gb.form.stock/stock/32/home.png differ diff --git a/comp/src/gb.form.stock/stock/32/html.png b/comp/src/gb.form.stock/stock/32/html.png index fb7f4d93a..434ded105 100644 Binary files a/comp/src/gb.form.stock/stock/32/html.png and b/comp/src/gb.form.stock/stock/32/html.png differ diff --git a/comp/src/gb.form.stock/stock/32/identity.png b/comp/src/gb.form.stock/stock/32/identity.png index a30403f4e..1d72c107a 100644 Binary files a/comp/src/gb.form.stock/stock/32/identity.png and b/comp/src/gb.form.stock/stock/32/identity.png differ diff --git a/comp/src/gb.form.stock/stock/32/image.png b/comp/src/gb.form.stock/stock/32/image.png index e48dd4297..5151dac95 100644 Binary files a/comp/src/gb.form.stock/stock/32/image.png and b/comp/src/gb.form.stock/stock/32/image.png differ diff --git a/comp/src/gb.form.stock/stock/32/important.png b/comp/src/gb.form.stock/stock/32/important.png index 68d4a4ae4..06cb54a9e 100644 Binary files a/comp/src/gb.form.stock/stock/32/important.png and b/comp/src/gb.form.stock/stock/32/important.png differ diff --git a/comp/src/gb.form.stock/stock/32/info.png b/comp/src/gb.form.stock/stock/32/info.png index 6b7711c03..a8096a970 100644 Binary files a/comp/src/gb.form.stock/stock/32/info.png and b/comp/src/gb.form.stock/stock/32/info.png differ diff --git a/comp/src/gb.form.stock/stock/32/internet.png b/comp/src/gb.form.stock/stock/32/internet.png index b19875a75..100b5b202 100644 Binary files a/comp/src/gb.form.stock/stock/32/internet.png and b/comp/src/gb.form.stock/stock/32/internet.png differ diff --git a/comp/src/gb.form.stock/stock/32/jump.png b/comp/src/gb.form.stock/stock/32/jump.png index bf6fab4ea..19047d661 100644 Binary files a/comp/src/gb.form.stock/stock/32/jump.png and b/comp/src/gb.form.stock/stock/32/jump.png differ diff --git a/comp/src/gb.form.stock/stock/32/keyboard.png b/comp/src/gb.form.stock/stock/32/keyboard.png index eed119abe..8f37811e0 100644 Binary files a/comp/src/gb.form.stock/stock/32/keyboard.png and b/comp/src/gb.form.stock/stock/32/keyboard.png differ diff --git a/comp/src/gb.form.stock/stock/32/lamp.png b/comp/src/gb.form.stock/stock/32/lamp.png index 2bbe42191..924a729a4 100644 Binary files a/comp/src/gb.form.stock/stock/32/lamp.png and b/comp/src/gb.form.stock/stock/32/lamp.png differ diff --git a/comp/src/gb.form.stock/stock/32/language.png b/comp/src/gb.form.stock/stock/32/language.png index 8088ec82b..8b270b941 100644 Binary files a/comp/src/gb.form.stock/stock/32/language.png and b/comp/src/gb.form.stock/stock/32/language.png differ diff --git a/comp/src/gb.form.stock/stock/32/last.png b/comp/src/gb.form.stock/stock/32/last.png index 8b95039b6..97ee5a706 100644 Binary files a/comp/src/gb.form.stock/stock/32/last.png and b/comp/src/gb.form.stock/stock/32/last.png differ diff --git a/comp/src/gb.form.stock/stock/32/left.png b/comp/src/gb.form.stock/stock/32/left.png index 064fc9bec..9aed9e30c 100644 Binary files a/comp/src/gb.form.stock/stock/32/left.png and b/comp/src/gb.form.stock/stock/32/left.png differ diff --git a/comp/src/gb.form.stock/stock/32/link.png b/comp/src/gb.form.stock/stock/32/link.png index 289ed7c81..7cd3cab3a 100644 Binary files a/comp/src/gb.form.stock/stock/32/link.png and b/comp/src/gb.form.stock/stock/32/link.png differ diff --git a/comp/src/gb.form.stock/stock/32/mail.png b/comp/src/gb.form.stock/stock/32/mail.png index 622b7ae9b..6b1a9a357 100644 Binary files a/comp/src/gb.form.stock/stock/32/mail.png and b/comp/src/gb.form.stock/stock/32/mail.png differ diff --git a/comp/src/gb.form.stock/stock/32/media-player.png b/comp/src/gb.form.stock/stock/32/media-player.png index c09fe0778..83b33d50f 100644 Binary files a/comp/src/gb.form.stock/stock/32/media-player.png and b/comp/src/gb.form.stock/stock/32/media-player.png differ diff --git a/comp/src/gb.form.stock/stock/32/microphone.png b/comp/src/gb.form.stock/stock/32/microphone.png index 0685481e3..a7fb17ed0 100644 Binary files a/comp/src/gb.form.stock/stock/32/microphone.png and b/comp/src/gb.form.stock/stock/32/microphone.png differ diff --git a/comp/src/gb.form.stock/stock/32/monitor.png b/comp/src/gb.form.stock/stock/32/monitor.png index afd4d8f01..01bded48d 100644 Binary files a/comp/src/gb.form.stock/stock/32/monitor.png and b/comp/src/gb.form.stock/stock/32/monitor.png differ diff --git a/comp/src/gb.form.stock/stock/32/mouse.png b/comp/src/gb.form.stock/stock/32/mouse.png index 6f1f8a3c1..651ebecd3 100644 Binary files a/comp/src/gb.form.stock/stock/32/mouse.png and b/comp/src/gb.form.stock/stock/32/mouse.png differ diff --git a/comp/src/gb.form.stock/stock/32/multimedia.png b/comp/src/gb.form.stock/stock/32/multimedia.png index a6ebbbc24..3a986e3ad 100644 Binary files a/comp/src/gb.form.stock/stock/32/multimedia.png and b/comp/src/gb.form.stock/stock/32/multimedia.png differ diff --git a/comp/src/gb.form.stock/stock/32/muted.png b/comp/src/gb.form.stock/stock/32/muted.png index 4f9866ab3..2c6592b13 100644 Binary files a/comp/src/gb.form.stock/stock/32/muted.png and b/comp/src/gb.form.stock/stock/32/muted.png differ diff --git a/comp/src/gb.form.stock/stock/32/new-dir.png b/comp/src/gb.form.stock/stock/32/new-dir.png index 0c1deb241..1c7a9ae81 100644 Binary files a/comp/src/gb.form.stock/stock/32/new-dir.png and b/comp/src/gb.form.stock/stock/32/new-dir.png differ diff --git a/comp/src/gb.form.stock/stock/32/new-window.png b/comp/src/gb.form.stock/stock/32/new-window.png index 5251e3779..1df12efa9 100644 Binary files a/comp/src/gb.form.stock/stock/32/new-window.png and b/comp/src/gb.form.stock/stock/32/new-window.png differ diff --git a/comp/src/gb.form.stock/stock/32/new.png b/comp/src/gb.form.stock/stock/32/new.png index f19bdf8f0..4073658d7 100644 Binary files a/comp/src/gb.form.stock/stock/32/new.png and b/comp/src/gb.form.stock/stock/32/new.png differ diff --git a/comp/src/gb.form.stock/stock/32/next.png b/comp/src/gb.form.stock/stock/32/next.png index 47f0a64ea..5560ef5bb 100644 Binary files a/comp/src/gb.form.stock/stock/32/next.png and b/comp/src/gb.form.stock/stock/32/next.png differ diff --git a/comp/src/gb.form.stock/stock/32/ok.png b/comp/src/gb.form.stock/stock/32/ok.png index a1d059105..8190dc83b 100644 Binary files a/comp/src/gb.form.stock/stock/32/ok.png and b/comp/src/gb.form.stock/stock/32/ok.png differ diff --git a/comp/src/gb.form.stock/stock/32/open-recent.png b/comp/src/gb.form.stock/stock/32/open-recent.png index eb7985a82..740afd640 100644 Binary files a/comp/src/gb.form.stock/stock/32/open-recent.png and b/comp/src/gb.form.stock/stock/32/open-recent.png differ diff --git a/comp/src/gb.form.stock/stock/32/open.png b/comp/src/gb.form.stock/stock/32/open.png index d4d1f6c25..13eff4792 100644 Binary files a/comp/src/gb.form.stock/stock/32/open.png and b/comp/src/gb.form.stock/stock/32/open.png differ diff --git a/comp/src/gb.form.stock/stock/32/options.png b/comp/src/gb.form.stock/stock/32/options.png index 927a66cbd..51fdf7237 100644 Binary files a/comp/src/gb.form.stock/stock/32/options.png and b/comp/src/gb.form.stock/stock/32/options.png differ diff --git a/comp/src/gb.form.stock/stock/32/package.png b/comp/src/gb.form.stock/stock/32/package.png index 36e852010..ee4e3aaed 100644 Binary files a/comp/src/gb.form.stock/stock/32/package.png and b/comp/src/gb.form.stock/stock/32/package.png differ diff --git a/comp/src/gb.form.stock/stock/32/paste.png b/comp/src/gb.form.stock/stock/32/paste.png index 9ca9ec575..799dad0ac 100644 Binary files a/comp/src/gb.form.stock/stock/32/paste.png and b/comp/src/gb.form.stock/stock/32/paste.png differ diff --git a/comp/src/gb.form.stock/stock/32/pause.png b/comp/src/gb.form.stock/stock/32/pause.png index d64fbd750..754665b72 100644 Binary files a/comp/src/gb.form.stock/stock/32/pause.png and b/comp/src/gb.form.stock/stock/32/pause.png differ diff --git a/comp/src/gb.form.stock/stock/32/pda.png b/comp/src/gb.form.stock/stock/32/pda.png index 5003917e9..5d906e24b 100644 Binary files a/comp/src/gb.form.stock/stock/32/pda.png and b/comp/src/gb.form.stock/stock/32/pda.png differ diff --git a/comp/src/gb.form.stock/stock/32/pdf.png b/comp/src/gb.form.stock/stock/32/pdf.png index 443692b94..609a18b43 100644 Binary files a/comp/src/gb.form.stock/stock/32/pdf.png and b/comp/src/gb.form.stock/stock/32/pdf.png differ diff --git a/comp/src/gb.form.stock/stock/32/people.png b/comp/src/gb.form.stock/stock/32/people.png index ca1c1ddb1..177813b4d 100644 Binary files a/comp/src/gb.form.stock/stock/32/people.png and b/comp/src/gb.form.stock/stock/32/people.png differ diff --git a/comp/src/gb.form.stock/stock/32/phone.png b/comp/src/gb.form.stock/stock/32/phone.png index 30063210e..cef3d65b6 100644 Binary files a/comp/src/gb.form.stock/stock/32/phone.png and b/comp/src/gb.form.stock/stock/32/phone.png differ diff --git a/comp/src/gb.form.stock/stock/32/play.png b/comp/src/gb.form.stock/stock/32/play.png index 468c6ab4f..9b9b9b4e0 100644 Binary files a/comp/src/gb.form.stock/stock/32/play.png and b/comp/src/gb.form.stock/stock/32/play.png differ diff --git a/comp/src/gb.form.stock/stock/32/previous.png b/comp/src/gb.form.stock/stock/32/previous.png index 064fc9bec..9aed9e30c 100644 Binary files a/comp/src/gb.form.stock/stock/32/previous.png and b/comp/src/gb.form.stock/stock/32/previous.png differ diff --git a/comp/src/gb.form.stock/stock/32/print.png b/comp/src/gb.form.stock/stock/32/print.png index a541817d7..a959c8e55 100644 Binary files a/comp/src/gb.form.stock/stock/32/print.png and b/comp/src/gb.form.stock/stock/32/print.png differ diff --git a/comp/src/gb.form.stock/stock/32/printer.png b/comp/src/gb.form.stock/stock/32/printer.png index 9542c7524..8b9c2e6a0 100644 Binary files a/comp/src/gb.form.stock/stock/32/printer.png and b/comp/src/gb.form.stock/stock/32/printer.png differ diff --git a/comp/src/gb.form.stock/stock/32/program.png b/comp/src/gb.form.stock/stock/32/program.png index ed7bc7348..5e873f182 100644 Binary files a/comp/src/gb.form.stock/stock/32/program.png and b/comp/src/gb.form.stock/stock/32/program.png differ diff --git a/comp/src/gb.form.stock/stock/32/properties.png b/comp/src/gb.form.stock/stock/32/properties.png index 927a66cbd..51fdf7237 100644 Binary files a/comp/src/gb.form.stock/stock/32/properties.png and b/comp/src/gb.form.stock/stock/32/properties.png differ diff --git a/comp/src/gb.form.stock/stock/32/question.png b/comp/src/gb.form.stock/stock/32/question.png index 068fd0916..bd23352a1 100644 Binary files a/comp/src/gb.form.stock/stock/32/question.png and b/comp/src/gb.form.stock/stock/32/question.png differ diff --git a/comp/src/gb.form.stock/stock/32/quit.png b/comp/src/gb.form.stock/stock/32/quit.png index 5918b8988..1196797e9 100644 Binary files a/comp/src/gb.form.stock/stock/32/quit.png and b/comp/src/gb.form.stock/stock/32/quit.png differ diff --git a/comp/src/gb.form.stock/stock/32/recent.png b/comp/src/gb.form.stock/stock/32/recent.png index eb7985a82..740afd640 100644 Binary files a/comp/src/gb.form.stock/stock/32/recent.png and b/comp/src/gb.form.stock/stock/32/recent.png differ diff --git a/comp/src/gb.form.stock/stock/32/record.png b/comp/src/gb.form.stock/stock/32/record.png index 555304d4a..1b8e9b979 100644 Binary files a/comp/src/gb.form.stock/stock/32/record.png and b/comp/src/gb.form.stock/stock/32/record.png differ diff --git a/comp/src/gb.form.stock/stock/32/redo.png b/comp/src/gb.form.stock/stock/32/redo.png index 0bb0804a6..e1473f66a 100644 Binary files a/comp/src/gb.form.stock/stock/32/redo.png and b/comp/src/gb.form.stock/stock/32/redo.png differ diff --git a/comp/src/gb.form.stock/stock/32/refresh.png b/comp/src/gb.form.stock/stock/32/refresh.png index d6042874a..7d4dbf674 100644 Binary files a/comp/src/gb.form.stock/stock/32/refresh.png and b/comp/src/gb.form.stock/stock/32/refresh.png differ diff --git a/comp/src/gb.form.stock/stock/32/remove.png b/comp/src/gb.form.stock/stock/32/remove.png index c8acb85db..b0523da5d 100644 Binary files a/comp/src/gb.form.stock/stock/32/remove.png and b/comp/src/gb.form.stock/stock/32/remove.png differ diff --git a/comp/src/gb.form.stock/stock/32/replace.png b/comp/src/gb.form.stock/stock/32/replace.png index 28e8555df..0e307aa4b 100644 Binary files a/comp/src/gb.form.stock/stock/32/replace.png and b/comp/src/gb.form.stock/stock/32/replace.png differ diff --git a/comp/src/gb.form.stock/stock/32/revert.png b/comp/src/gb.form.stock/stock/32/revert.png index 1afc9a3f9..9b3ada76c 100644 Binary files a/comp/src/gb.form.stock/stock/32/revert.png and b/comp/src/gb.form.stock/stock/32/revert.png differ diff --git a/comp/src/gb.form.stock/stock/32/rewind.png b/comp/src/gb.form.stock/stock/32/rewind.png index 269088813..9abe8c75d 100644 Binary files a/comp/src/gb.form.stock/stock/32/rewind.png and b/comp/src/gb.form.stock/stock/32/rewind.png differ diff --git a/comp/src/gb.form.stock/stock/32/right.png b/comp/src/gb.form.stock/stock/32/right.png index 47f0a64ea..5560ef5bb 100644 Binary files a/comp/src/gb.form.stock/stock/32/right.png and b/comp/src/gb.form.stock/stock/32/right.png differ diff --git a/comp/src/gb.form.stock/stock/32/rotate-left.png b/comp/src/gb.form.stock/stock/32/rotate-left.png index 7c428bb07..1e787c48b 100644 Binary files a/comp/src/gb.form.stock/stock/32/rotate-left.png and b/comp/src/gb.form.stock/stock/32/rotate-left.png differ diff --git a/comp/src/gb.form.stock/stock/32/rotate-right.png b/comp/src/gb.form.stock/stock/32/rotate-right.png index 52e061067..fe37d6086 100644 Binary files a/comp/src/gb.form.stock/stock/32/rotate-right.png and b/comp/src/gb.form.stock/stock/32/rotate-right.png differ diff --git a/comp/src/gb.form.stock/stock/32/save-as.png b/comp/src/gb.form.stock/stock/32/save-as.png index dd230fad8..8353a2383 100644 Binary files a/comp/src/gb.form.stock/stock/32/save-as.png and b/comp/src/gb.form.stock/stock/32/save-as.png differ diff --git a/comp/src/gb.form.stock/stock/32/save.png b/comp/src/gb.form.stock/stock/32/save.png index a42073732..869ff5c3c 100644 Binary files a/comp/src/gb.form.stock/stock/32/save.png and b/comp/src/gb.form.stock/stock/32/save.png differ diff --git a/comp/src/gb.form.stock/stock/32/science.png b/comp/src/gb.form.stock/stock/32/science.png index d0387eab0..fa2acd655 100644 Binary files a/comp/src/gb.form.stock/stock/32/science.png and b/comp/src/gb.form.stock/stock/32/science.png differ diff --git a/comp/src/gb.form.stock/stock/32/screen.png b/comp/src/gb.form.stock/stock/32/screen.png index 4f7ac4729..de741fb9d 100644 Binary files a/comp/src/gb.form.stock/stock/32/screen.png and b/comp/src/gb.form.stock/stock/32/screen.png differ diff --git a/comp/src/gb.form.stock/stock/32/script.png b/comp/src/gb.form.stock/stock/32/script.png index 5757b49ac..014c72934 100644 Binary files a/comp/src/gb.form.stock/stock/32/script.png and b/comp/src/gb.form.stock/stock/32/script.png differ diff --git a/comp/src/gb.form.stock/stock/32/select-all.png b/comp/src/gb.form.stock/stock/32/select-all.png index 312ef5b49..eee64c8b2 100644 Binary files a/comp/src/gb.form.stock/stock/32/select-all.png and b/comp/src/gb.form.stock/stock/32/select-all.png differ diff --git a/comp/src/gb.form.stock/stock/32/server.png b/comp/src/gb.form.stock/stock/32/server.png index 9b317ffb0..e9a0b3462 100644 Binary files a/comp/src/gb.form.stock/stock/32/server.png and b/comp/src/gb.form.stock/stock/32/server.png differ diff --git a/comp/src/gb.form.stock/stock/32/start.png b/comp/src/gb.form.stock/stock/32/start.png index e8d685363..105123b4b 100644 Binary files a/comp/src/gb.form.stock/stock/32/start.png and b/comp/src/gb.form.stock/stock/32/start.png differ diff --git a/comp/src/gb.form.stock/stock/32/stop.png b/comp/src/gb.form.stock/stock/32/stop.png index 87175f632..9a47cb745 100644 Binary files a/comp/src/gb.form.stock/stock/32/stop.png and b/comp/src/gb.form.stock/stock/32/stop.png differ diff --git a/comp/src/gb.form.stock/stock/32/sun.png b/comp/src/gb.form.stock/stock/32/sun.png index 108eaa444..056bee869 100644 Binary files a/comp/src/gb.form.stock/stock/32/sun.png and b/comp/src/gb.form.stock/stock/32/sun.png differ diff --git a/comp/src/gb.form.stock/stock/32/system.png b/comp/src/gb.form.stock/stock/32/system.png index 4f7ac4729..de741fb9d 100644 Binary files a/comp/src/gb.form.stock/stock/32/system.png and b/comp/src/gb.form.stock/stock/32/system.png differ diff --git a/comp/src/gb.form.stock/stock/32/terminal.png b/comp/src/gb.form.stock/stock/32/terminal.png index df877d482..c472efbfe 100644 Binary files a/comp/src/gb.form.stock/stock/32/terminal.png and b/comp/src/gb.form.stock/stock/32/terminal.png differ diff --git a/comp/src/gb.form.stock/stock/32/text.png b/comp/src/gb.form.stock/stock/32/text.png index 12f1201c5..014c72934 100644 Binary files a/comp/src/gb.form.stock/stock/32/text.png and b/comp/src/gb.form.stock/stock/32/text.png differ diff --git a/comp/src/gb.form.stock/stock/32/top.png b/comp/src/gb.form.stock/stock/32/top.png index efc94c8cb..a6c1f060f 100644 Binary files a/comp/src/gb.form.stock/stock/32/top.png and b/comp/src/gb.form.stock/stock/32/top.png differ diff --git a/comp/src/gb.form.stock/stock/32/trash.png b/comp/src/gb.form.stock/stock/32/trash.png index cce6f5148..fb9f22780 100644 Binary files a/comp/src/gb.form.stock/stock/32/trash.png and b/comp/src/gb.form.stock/stock/32/trash.png differ diff --git a/comp/src/gb.form.stock/stock/32/undo.png b/comp/src/gb.form.stock/stock/32/undo.png index eb7e528c5..d5144962d 100644 Binary files a/comp/src/gb.form.stock/stock/32/undo.png and b/comp/src/gb.form.stock/stock/32/undo.png differ diff --git a/comp/src/gb.form.stock/stock/32/up.png b/comp/src/gb.form.stock/stock/32/up.png index 977940087..7da802a3d 100644 Binary files a/comp/src/gb.form.stock/stock/32/up.png and b/comp/src/gb.form.stock/stock/32/up.png differ diff --git a/comp/src/gb.form.stock/stock/32/user.png b/comp/src/gb.form.stock/stock/32/user.png new file mode 100644 index 000000000..c8f453c11 Binary files /dev/null and b/comp/src/gb.form.stock/stock/32/user.png differ diff --git a/comp/src/gb.form.stock/stock/32/video.png b/comp/src/gb.form.stock/stock/32/video.png index 1350b4b47..9b4c9ed60 100644 Binary files a/comp/src/gb.form.stock/stock/32/video.png and b/comp/src/gb.form.stock/stock/32/video.png differ diff --git a/comp/src/gb.form.stock/stock/32/volume.png b/comp/src/gb.form.stock/stock/32/volume.png index abe067a03..8efee6575 100644 Binary files a/comp/src/gb.form.stock/stock/32/volume.png and b/comp/src/gb.form.stock/stock/32/volume.png differ diff --git a/comp/src/gb.form.stock/stock/32/warning.png b/comp/src/gb.form.stock/stock/32/warning.png index 68d4a4ae4..06cb54a9e 100644 Binary files a/comp/src/gb.form.stock/stock/32/warning.png and b/comp/src/gb.form.stock/stock/32/warning.png differ diff --git a/comp/src/gb.form.stock/stock/32/webcam.png b/comp/src/gb.form.stock/stock/32/webcam.png index 7deb440f3..1e2a05dad 100644 Binary files a/comp/src/gb.form.stock/stock/32/webcam.png and b/comp/src/gb.form.stock/stock/32/webcam.png differ diff --git a/comp/src/gb.form.stock/stock/scalable/group.svg b/comp/src/gb.form.stock/stock/scalable/group.svg new file mode 100644 index 000000000..a16601b3d --- /dev/null +++ b/comp/src/gb.form.stock/stock/scalable/group.svg @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/comp/src/gb.form.stock/stock/scalable/user.svg b/comp/src/gb.form.stock/stock/scalable/user.svg new file mode 100644 index 000000000..4cbdb1f7c --- /dev/null +++ b/comp/src/gb.form.stock/stock/scalable/user.svg @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project index db15efe14..cf1e522e0 100644 --- a/comp/src/gb.form/.project +++ b/comp/src/gb.form/.project @@ -1,7 +1,7 @@ # Gambas Project File 3.0 # Compiled with Gambas 3.7.90 Title=More controls for graphical components -Startup=FTestCompletion +Startup=Main Version=3.7.90 VersionFile=1 Component=gb.image diff --git a/comp/src/gb.form/.src/Main.module b/comp/src/gb.form/.src/Main.module index d82cfbc38..644609c48 100644 --- a/comp/src/gb.form/.src/Main.module +++ b/comp/src/gb.form/.src/Main.module @@ -197,6 +197,6 @@ Public Sub Main() 'Application.Theme = "kde5" - hPict = Picture["icon:/48/recent"] + hPict = Picture["icon:/48/book"] End diff --git a/comp/src/gb.form/.src/Stock.class b/comp/src/gb.form/.src/Stock.class index 94f0ebbd9..b73db2b46 100644 --- a/comp/src/gb.form/.src/Stock.class +++ b/comp/src/gb.form/.src/Stock.class @@ -381,38 +381,53 @@ Static Private Sub DoLoadIcon(sPath As String, iSize As Integer, iRealSize As In sName = File.Name(sPath) sDir = File.Dir(sPath) + 'Error "{";; sPath + 'If $bDebugLoad Then Error "-> "; sDir &/ sName If iRealSize Then sName = sName & ".svg" 'File.SetExt(sName, "svg") 'Warning this change is for files than have a point in the name Try hPict = PictureFromSvg(SvgImage.Load(sDir &/ sName), iRealSize) - If Not Error Then Return hPict + If Not Error Then Goto RETURN_PICT sName = File.SetExt(sName, "svgz") Try hPict = PictureFromSvg(SvgImage.Load(sDir &/ sName), iRealSize) - If Not Error Then Return hPict + If Not Error Then Goto RETURN_PICT sName = File.SetExt(sName, "png") Try hImage = Image.Load(sDir &/ sName) - If Not Error Then Return hImage.Stretch(iRealSize, iRealSize).Picture + If Not Error Then + hPict = hImage.Stretch(iRealSize, iRealSize).Picture + Goto RETURN_PICT + Endif Else sName = sName & ".png" 'File.SetExt(sName, "png") 'Warning this change is for files than have a point in the name Try hImage = Image.Load(sDir &/ sName) - If Not Error Then Return hImage.Picture + If Not Error Then + hPict = hImage.Picture + Goto RETURN_PICT + Endif sName = File.SetExt(sName, "svg") Try hPict = PictureFromSvg(SvgImage.Load(sDir &/ sName), iSize) - If Not Error Then Return hPict + If Not Error Then Goto RETURN_PICT sName = File.SetExt(sName, "svgz") Try hPict = PictureFromSvg(SvgImage.Load(sDir &/ sName), iSize) - If Not Error Then Return hPict + If Not Error Then Goto RETURN_PICT Endif + hPict = Null + +RETURN_PICT: + + 'Error "}" + Return hPict + End @@ -421,38 +436,11 @@ Static Private Sub LoadIcon(sTemplate As String, sFile As String, iSize As Integ Dim hPict As Picture Dim sPath As String Dim sTest As String - Dim bFound As Boolean Dim iPos As Integer Dim sTheme As String Dim sDir As String Dim sSubDir As String - - If sFile Begins "$(mime)/" Then - - 'Debug sTemplate;; sFile;; iSize;; iRealSize - - If sTemplate Ends "/*" Then - sPath = File.Dir(sTemplate) &/ "mimetypes/file-types-small" - sFile = Replace(sFile, "$(mime)", "mimetypes/file-types-small") - bFound = IsDir(sPath) - Else - For Each sTest In ["mimetypes", "mimes"] - sPath = Subst(sTemplate, CStr(iSize), sTest) - If Exist(sPath) Then - sFile = Replace(sFile, "$(mime)", sTest) - 'Debug "FOUND "; sFile - bFound = True - Break - Endif - Next - Endif - - If Not bFound Then - 'Debug "NOT FOUND" - Return - Endif - - Endif + Dim sMime As String For Each sFile In Split(sFile, ";") @@ -460,6 +448,13 @@ Static Private Sub LoadIcon(sTemplate As String, sFile As String, iSize As Integ iPos = InStr(sFile, "]") If iPos Then sTheme = LCase(Mid$(sFile, 2, iPos - 2)) + If sTheme Begins "+" Then + If iSize <= 32 Then Continue + sTheme = Mid$(sTheme, 2) + Else If sTheme Begins "-" Then + If iSize > 32 Then Continue + sTheme = Mid$(sTheme, 2) + Endif If File.Name(File.Dir(sTemplate)) Not Like sTheme Then Continue sFile = Mid$(sFile, iPos + 1) Endif @@ -473,10 +468,36 @@ Static Private Sub LoadIcon(sTemplate As String, sFile As String, iSize As Integ Endif Endif + If sFile Begins "$(mime)/" Then + + 'Debug sTemplate;; sFile;; iSize;; iRealSize + + If Not sMime Then + + For Each sTest In ["mimetypes", "mimes"] + If sTemplate Ends "/*" Then + sPath = File.Dir(sTemplate) &/ sTest + Else + sPath = Subst(sTemplate, CStr(iSize), sTest) + Endif + If IsDir(sPath) Then + sMime = sTest + Break + Endif + Next + + If Not sMime Then Return + + Endif + + sFile = sMime &/ Mid$(sFile, 9) + + Endif + If sTemplate Ends "/*" Then sDir = File.Dir(sTemplate) &/ File.Dir(sFile) If IsDir(sDir) Then - For Each sSubDir In Dir(sDir, "*", gb.Directory) + For Each sSubDir In Dir(sDir, "*", gb.Directory).Sort() sPath = sDir &/ sSubDir &/ File.Name(sFile) hPict = DoLoadIcon(sPath, iSize, iRealSize) If hPict Then Return hPict @@ -593,6 +614,8 @@ Static Public Function _get((Key) As String, Optional {Default} As String) As Pi hPict = LoadIcon(GetScalablePath(sTemplate), sFile, iSize) If hPict Then Goto __RETURN + If sFile Ends ";#" Then Continue + For Each iTry In $aSizeInc If iTry < iSize Then Continue hPict = LoadIcon(sTemplate, sFile, iTry, iSize) diff --git a/comp/src/gb.form/map/icon.map b/comp/src/gb.form/map/icon.map index 7366ff094..df3793fe9 100644 --- a/comp/src/gb.form/map/icon.map +++ b/comp/src/gb.form/map/icon.map @@ -1,32 +1,32 @@ access apps/preferences-desktop-accessibility add actions/list-add apply actions/dialog-apply;actions/dialog-ok-apply -archive $(mime)/package-x-generic;apps/utilities-file-archiver +archive [-breeze*]$(mime)/file-types-small/package-x-generic;$(mime)/package-x-generic;apps/utilities-file-archiver attach status/mail-attachment;actions/mail-attachment -audio $(mime)/audio-x-generic +audio [-breeze*]$(mime)/file-types-small/audio-x-generic;$(mime)/audio-x-generic battery devices/battery -book apps/accessories-dictionary -bookmark places/bookmarks;actions/bookmark-new;places/user-bookmarks +book [-breeze*]actions/address-book-new;apps/accessories-dictionary;# +bookmark [-breeze*]places/user-folders-small/bookmarks;places/bookmarks;actions/bookmark-new;places/user-bookmarks bottom actions/go-bottom calculator apps/accessories-calculator calendar actions/office-calendar;apps/evolution-calendar;actions/view-pim-calendar camera devices/camera-photo cancel actions/dialog-cancel -cdrom devices/media-optical +cdrom [-breeze*]devices/sidebars/media-optical;devices/media-optical clear actions/edit-clear-locationbar-rtl;actions/edit-clear clock apps/clock;actions/chronometer close actions/window-close -color categories/applications-graphics +color [-breeze*]actions/color-picker-grey;[breeze*]apps/preferences-desktop-color;categories/applications-graphics color-picker actions/color-picker -component categories/applications-utilities;apps/nepomuk +component [-breeze*]actions/document-share;categories/applications-utilities;apps/nepomuk computer devices/computer connect actions/network-connect copy actions/edit-copy cut actions/edit-cut delete actions/edit-delete -desktop places/user-desktop +desktop [-breeze*]places/user-folders-small/user-desktop;places/user-desktop development categories/applications-development -directory places/folder +directory [-breeze*]places/user-folders-small/folder;places/folder disconnect actions/network-disconnect down actions/go-down download [elementary]actions/media-import-audio-cd;emblems/emblem-downloads;actions/download @@ -36,8 +36,8 @@ end actions/media-skip-forward erase actions/draw-eraser error status/dialog-error exec actions/system-run -file $(mime)/empty;$(mime)/application-x-zerosize -file-manager apps/system-file-manager +file [-breeze*]$(mime)/file-types-small/application-x-zerosize;$(mime)/empty;$(mime)/application-x-zerosize +file-manager [-breeze*]apps/toolbar/system-file-manager;apps/system-file-manager fill actions/fill-color filter actions/view-filter find actions/edit-find @@ -46,32 +46,33 @@ flag actions/flag-red flip-h actions/object-flip-horizontal flip-v actions/object-flip-vertical floppy devices/media-floppy -font apps/preferences-desktop-font +font [-breeze*]actions/format-text-superscript;apps/preferences-desktop-font forward actions/media-seek-forward fullscreen actions/view-fullscreen gambas # game categories/applications-games;apps/preferences-desktop-gaming gnu # grid actions/view-grid;actions/games-config-board +group [-breeze*]actions/user-group-new;apps/system-users halt actions/process-stop -harddisk devices/drive-harddisk +harddisk [-breeze*]devices/sidebars/drive-harddisk;devices/drive-harddisk hardware devices/audio-card -help [breeze*]apps/toolbar/system-help;apps/help-browser +help [-breeze*]apps/toolbar/system-help;apps/help-browser home actions/go-home -html $(mime)/text-html +html [-breeze*]$(mime)/file-types-small/text-html;$(mime)/text-html identity apps/user-info;apps/preferences-desktop-user -image $(mime)/image-x-generic +image [-breeze*]$(mime)/file-types-small/image-x-generic;$(mime)/image-x-generic important emblems/emblem-important indent actions/format-indent-more info status/dialog-information insert-image actions/insert-image insert-link actions/insert-link insert-text actions/insert-text -internet categories/applications-internet +internet [-breeze*]places/folder-html;categories/applications-internet jump actions/go-jump keyboard apps/preferences-desktop-keyboard lamp actions/help-hint -language apps/preferences-desktop-locale +language [-breeze*]actions/im-google-talk;apps/preferences-desktop-locale last actions/go-last left actions/go-previous link emblems/emblem-symbolic-link @@ -83,9 +84,9 @@ make-all actions/arrow-down-double media-player devices/multimedia-player menu apps/alacarte;apps/kmenuedit;actions/application-menu microphone devices/audio-input-microphone -monitor apps/utilities-system-monitor +monitor [-breeze*]actions/view-statistics;apps/utilities-system-monitor mouse devices/input-mouse -multimedia [breeze]apps/categories/applications-multimedia;categories/applications-multimedia +multimedia [breeze*]apps/categories/applications-multimedia;categories/applications-multimedia muted status/audio-volume-muted network status/network-connect;places/network-workgroup new actions/document-new @@ -95,25 +96,25 @@ next actions/go-next;actions/go-next-view office [elementary]categories/applications-other;categories/applications-office ok actions/dialog-ok open actions/document-open -open-recent [breeze*]actions/toolbar/document-open-recent;actions/document-open-recent +open-recent [-breeze*]actions/toolbar/document-open-recent;actions/document-open-recent options categories/preferences-system;actions/configure package apps/system-software-install;apps/preferences-desktop-default-applications paste actions/edit-paste pause actions/media-playback-pause pda devices/pda -pdf $(mime)/application-pdf +pdf [-breeze*]$(mime)/file-types-small/application-pdf;$(mime)/application-pdf pen actions/draw-freehand people apps/system-users -phone devices/phone +phone [-breeze*]devices/smartphone;devices/phone play actions/media-playback-start previous actions/go-previous;actions/go-previous-view print actions/document-print printer devices/printer -program $(mime)/application-x-executable +program [-breeze*]$(mime)/file-types-small/application-x-executable;$(mime)/application-x-executable properties actions/document-properties question status/dialog-question;actions/svn-status;# quit actions/application-exit -recent [breeze]actions/appointment-new;actions/document-open-recent +recent [breeze*]actions/appointment-new;actions/document-open-recent record actions/media-record redo actions/edit-redo refresh actions/view-refresh @@ -128,11 +129,11 @@ save actions/document-save save-as actions/document-save-as science categories/applications-science screen devices/video-display -script $(mime)/text-x-script +script [-breeze*]$(mime)/file-types-small/text-x-script;$(mime)/text-x-script security status/security-medium select actions/select-rectangular select-all actions/edit-select-all -server places/network-server +server [-breeze*]places/user-folders-small/network-server;places/network-server shortcut apps/accessories-character-map sort-ascent actions/view-sort-ascending sort-descent actions/view-sort-descending @@ -143,7 +144,7 @@ sun status/weather-clear system devices/computer tablet devices/input-tablet terminal [breeze*]apps/toolbar/utilities-terminal;apps/utilities-terminal -text $(mime)/text-x-generic;$(mime)/text-plain +text [-breeze*]$(mime)/file-types-small/text-x-generic;$(mime)/text-x-generic;$(mime)/text-plain text-bold actions/format-text-bold text-center actions/format-justify-center text-fill actions/format-justify-fill @@ -152,14 +153,15 @@ text-left actions/format-justify-left text-right actions/format-justify-right text-strike actions/format-text-strikethrough text-underline actions/format-text-underline -tools [elementary]categories/applications-developmenent;actions/applications-system;categories/applications-system +tools [elementary]categories/applications-developmenent;[+breeze*]categories/applications-system;actions/applications-system;categories/applications-system top actions/go-top -trash places/user-trash +trash [-breeze*]places/user-folders-small/user-trash;places/user-trash undo actions/edit-undo unindent actions/format-indent-less unlock actions/object-unlocked up actions/go-up -video $(mime)/video-x-generic +user [breeze*]actions/user-identity;stock/stock_person;status/avatar-default +video [-breeze*]$(mime)/file-types-small/video-x-generic;$(mime)/video-x-generic view-detail actions/view-list-details view-icon actions/view-list-icons view-normal actions/view-close diff --git a/comp/src/gb.gui.base/.info b/comp/src/gb.gui.base/.info index 7acf7a943..eabeb8f19 100644 --- a/comp/src/gb.gui.base/.info +++ b/comp/src/gb.gui.base/.info @@ -258,23 +258,23 @@ C _Properties C s -*,Mode{Select.*}=Single,Sorted,Editable,Header=True,Resizable=False,AutoResize=True,Border=True,ScrollBar{Scroll.*}=Both +"*,Mode{Select.*}=Single,Sorted,Editable,Header=True,Resizable=False,AutoResize=True,Border=True,ScrollBar{Scroll.*}=Both" _Group C s -View +"View" _DefaultEvent C s -Click +"Click" _DefaultSize C s -16,16 +"16,16" _Similar C s -ListView +"ListView" Header p b @@ -579,15 +579,15 @@ C _Properties C s -*,Border=True,Mode{Select.None;Single;Multiple}=None,Grid=True,Padding{Range:0;63}=2,ShowCursor=False,Header{GridView.None;Horizontal;Vertical;Both}=None,ScrollBar{Scroll.*}=Both,AutoResize=True,Resizable=True,Sorted +"*,Border=True,Mode{Select.None;Single;Multiple}=None,Grid=True,Padding{Range:0;63}=2,ShowCursor=False,Header{GridView.None;Horizontal;Vertical;Both}=None,ScrollBar{Scroll.*}=Both,AutoResize=True,Resizable=True,Sorted" _Group C s -View +"View" _DefaultEvent C s -Click +"Click" None C i @@ -1006,19 +1006,19 @@ C _Properties C s -*,-Margin,-Padding,-Arrangement,-AutoResize,-Indent,Border=True +"*,-Margin,-Padding,-Arrangement,-AutoResize,-Indent,Border=True" _DefaultArrangement C s -H +"H" _DefaultEvent C s -Resize +"Resize" _Similar C s -Panel +"Panel" _new m @@ -1029,19 +1029,19 @@ C _Properties C s -*,Picture,Mode{Select.*}=Single,Orientation{Arrange.Horizontal;Vertical}=Vertical,Sorted,Editable,GridSize{Range:0;128},IconLines{Range:1;8}=2,Border=True,ScrollBar{Scroll.*}=Both +"*,Picture,Mode{Select.*}=Single,Orientation{Arrange.Horizontal;Vertical}=Vertical,Sorted,Editable,GridSize{Range:0;128},IconLines{Range:1;8}=2,Border=True,ScrollBar{Scroll.*}=Both" _Group C s -View +"View" _DefaultEvent C s -Click +"Click" _Similar C s -ListView +"ListView" Mode p i @@ -1347,23 +1347,23 @@ C _Properties C s -*,List,Border=True,Mode{Select.*}=Single,ScrollBar{Scroll.*}=Vertical,Sorted +"*,List,Border=True,Mode{Select.*}=Single,ScrollBar{Scroll.*}=Vertical,Sorted" _Group C s -View +"View" _DefaultEvent C s -Click +"Click" _DefaultSize C s -16,16 +"16,16" _Similar C s -ListView +"ListView" Count r i @@ -1522,23 +1522,23 @@ C _Properties C s -*,Mode{Select.*}=Single,Sorted,Editable,Border=True,ScrollBar{Scroll.*}=Both +"*,Mode{Select.*}=Single,Sorted,Editable,Border=True,ScrollBar{Scroll.*}=Both" _Group C s -View +"View" _DefaultEvent C s -Click +"Click" _DefaultSize C s -16,16 +"16,16" _Similar C s -ListView +"ListView" Add m _TreeView_Item @@ -1568,19 +1568,19 @@ C _Properties C s -*,Action,Label=True,Border=True,Pulse +"*,Action,Label=True,Border=True,Pulse" _Group C s -Form +"Form" _DefaultEvent C s -MouseDown +"MouseDown" _DefaultSize C s -24,4 +"24,4" Label p b @@ -1615,19 +1615,19 @@ C _Properties C s -*,Border=True,ScrollBar{Scroll.*}=Both,Focus,NoBackground,Tablet +"*,Border=True,ScrollBar{Scroll.*}=Both,Focus,NoBackground,Tablet" _DefaultEvent C s -Draw +"Draw" _DefaultSize C s -24,24 +"24,24" _Similar C s -DrawingArea,ScrollView +"DrawingArea,ScrollView" ScrollX p i @@ -1829,23 +1829,23 @@ C _Properties C s -*,Mode{Select.*}=Single,Sorted,Editable,Border=True,ScrollBar{Scroll.*}=Both +"*,Mode{Select.*}=Single,Sorted,Editable,Border=True,ScrollBar{Scroll.*}=Both" _Group C s -View +"View" _DefaultEvent C s -Click +"Click" _DefaultSize C s -16,16 +"16,16" _Similar C s -ListView +"ListView" Add m _TreeView_Item @@ -1856,19 +1856,19 @@ C _Properties C s -*,-Margin,-Padding,-Arrangement,-AutoResize,-Indent,Border=True +"*,-Margin,-Padding,-Arrangement,-AutoResize,-Indent,Border=True" _DefaultArrangement C s -V +"V" _DefaultEvent C s -Resize +"Resize" _Similar C s -Panel +"Panel" _new m diff --git a/comp/src/gb.logging/.info b/comp/src/gb.logging/.info index df5e8a1f4..ad4d483cc 100644 --- a/comp/src/gb.logging/.info +++ b/comp/src/gb.logging/.info @@ -174,7 +174,7 @@ s DefaultFormat C s -[$(now)] [$(levelname)] [$(callLocation)] $(message) +"[$(now)] [$(levelname)] [$(callLocation)] $(message)" Critical C i @@ -203,11 +203,11 @@ i Stdout C s -:stdout +":stdout" Stderr C s -:stderr +":stderr" _new m diff --git a/comp/src/gb.map/.info b/comp/src/gb.map/.info index 9b5166479..183daf1cc 100644 --- a/comp/src/gb.map/.info +++ b/comp/src/gb.map/.info @@ -300,11 +300,11 @@ C _Properties C s -*,Border{Border.*},AllowEffect=true,ShowControls=true +"*,Border{Border.*},AllowEffect=true,ShowControls=true" _Group C s -View +"View" Lock p b diff --git a/comp/src/gb.media.form/.info b/comp/src/gb.media.form/.info index 71ebb59d6..2224a3dda 100644 --- a/comp/src/gb.media.form/.info +++ b/comp/src/gb.media.form/.info @@ -8,11 +8,11 @@ T _Group C s -Media +"Media" _Properties C s -*,Border=True,ShowControl=True,URL{Path} +"*,Border=True,ShowControl=True,URL{Path}" URL p s diff --git a/comp/src/gb.mysql/.info b/comp/src/gb.mysql/.info index 516b42015..e37f868b5 100644 --- a/comp/src/gb.mysql/.info +++ b/comp/src/gb.mysql/.info @@ -73,95 +73,95 @@ CA UnsignedTinyInt C s -TINYINT UNSIGNED +"TINYINT UNSIGNED" SignedTinyInt C s -TINYINT +"TINYINT" Bool C s -BOOL +"BOOL" Boolean C s -BOOLEAN +"BOOLEAN" SignedSmallInt C s -SMALLINT +"SMALLINT" UnsignedSmallInt C s -SMALLINT UNSIGNED +"SMALLINT UNSIGNED" SignedMediumInt C s -MEDIUMINT +"MEDIUMINT" UnsignedMediumInt C s -MEDIUMINT UNSIGNED +"MEDIUMINT UNSIGNED" SignedInt C s -INT +"INT" UnsignedInt C s -INT UNSIGNED +"INT UNSIGNED" SignedInteger C s -INTEGER +"INTEGER" UnsignedInteger C s -INTEGER UNSIGNED +"INTEGER UNSIGNED" SignedBigInt C s -BIGINT +"BIGINT" UnsignedBigInt C s -BIGINT UNSIGNED +"BIGINT UNSIGNED" Serial C s -BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE +"BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" Date C s -DATE +"DATE" DateTime C s -DATETIME +"DATETIME" TimeStamp C s -TIMESTAMP +"TIMESTAMP" Time C s -TIME +"TIME" TinyBlob C s -TINYBLOB +"TINYBLOB" MediumBlob C s -MEDIUMBLOB +"MEDIUMBLOB" LongBlob C s -LONGBLOB +"LONGBLOB" Null C s -NULL +"NULL" Bit m s diff --git a/comp/src/gb.net.pop3/.info b/comp/src/gb.net.pop3/.info index 2376eabcf..1d0828dd5 100644 --- a/comp/src/gb.net.pop3/.info +++ b/comp/src/gb.net.pop3/.info @@ -23,11 +23,11 @@ T _Group C s -Network +"Network" _Properties C s -Host,Port,User,Password,Encrypt{Net.None;SSL},Debug +"Host,Port,User,Password,Encrypt{Net.None;SSL},Debug" Encrypt p i diff --git a/comp/src/gb.net.smtp/.info b/comp/src/gb.net.smtp/.info index bc81d8654..c6ce797a3 100644 --- a/comp/src/gb.net.smtp/.info +++ b/comp/src/gb.net.smtp/.info @@ -27,11 +27,11 @@ T _Group C s -Network +"Network" _Properties C s -Host,Port,User,Password,Encrypt{Net.None;SSL;TLS}=None +"Host,Port,User,Password,Encrypt{Net.None;SSL;TLS}=None" Debug p b diff --git a/comp/src/gb.report/.info b/comp/src/gb.report/.info index 7ae0a93ca..24007681c 100644 --- a/comp/src/gb.report/.info +++ b/comp/src/gb.report/.info @@ -117,11 +117,11 @@ i _Properties C s -*,-Left,-Top,-Width,-Height,Count{Range:1;256}=1,Index,Text,Paper{Printer.A3;A4;A5;B5;Letter;Executive;Legal;Custom}=A4,Orientation{Printer.Portrait;Landscape}=Portrait +"*,-Left,-Top,-Width,-Height,Count{Range:1;256}=1,Index,Text,Paper{Printer.A3;A4;A5;B5;Letter;Executive;Legal;Custom}=A4,Orientation{Printer.Portrait;Landscape}=Portrait" _HiddenControls C s -Report,ReportControl,ReportContainer,ReportFrame,ReportSection +"Report,ReportControl,ReportContainer,ReportFrame,ReportSection" _IsForm C b @@ -137,11 +137,11 @@ T _DrawWith C s -TabPanel +"TabPanel" _DefaultEvent C s -Open +"Open" _LayoutNotFinished v b @@ -466,11 +466,11 @@ T _Group C s -Container +"Container" _Properties C s -*,Spacing{ReportCoord},OnePiece,ForceNewPage +"*,Spacing{ReportCoord},OnePiece,ForceNewPage" _CurItem p i @@ -577,11 +577,11 @@ b _Properties C s -Left{ReportCoord},Top{ReportCoord},Width{ReportCoord},Height{ReportCoord},Brush{ReportBrush},Visible=True,Fixed,Font,Padding,Ignore,Expand,AutoResize,Tag,Range +"Left{ReportCoord},Top{ReportCoord},Width{ReportCoord},Height{ReportCoord},Brush{ReportBrush},Visible=True,Fixed,Font,Padding,Ignore,Expand,AutoResize,Tag,Range" _Family C s -Report +"Report" _SizeInt v TSizeHint @@ -801,15 +801,15 @@ C _Properties C s -*,Cached +"*,Cached" _Similar C s -ReportImage +"ReportImage" _DefaultEvent C s -Draw +"Draw" Cached p b @@ -832,7 +832,7 @@ ReportControl _Properties C s -*,Border,Background{ReportBrush} +"*,Border,Background{ReportBrush}" Border p ReportBorder @@ -875,15 +875,15 @@ C _Properties C s -* +"*" _Similar C s -ReportTextLabel +"ReportTextLabel" _DefaultEvent C s -Data +"Data" Columns r _ReportGridViewColumns @@ -918,15 +918,15 @@ C _Properties C s -* +"*" _Similar C s -ReportVBox +"ReportVBox" _DefaultArrangement C s -H +"H" _new m @@ -941,15 +941,15 @@ C _Properties C s -*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{Image} +"*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{Image}" _Similar C s -ReportTextLabel +"ReportTextLabel" _DefaultEvent C s -Data +"Data" Image p Image @@ -984,15 +984,15 @@ C _Properties C s -*,Text,Format,Alignment{Align.*},Rotate{Angle:Degrees},UseField +"*,Text,Format,Alignment{Align.*},Rotate{Angle:Degrees},UseField" _Similar C s -ReportTextLabel +"ReportTextLabel" _DefaultEvent C s -Data +"Data" Text p s @@ -1039,11 +1039,11 @@ C _Properties C s -*,Direction{Align.TopLeft;Top;TopRight;Left;Right;BottomLeft;Bottom;BottomRight}=BottomRight,LineWidth{ReportCoord}=2 px +"*,Direction{Align.TopLeft;Top;TopRight;Left;Right;BottomLeft;Bottom;BottomRight}=BottomRight,LineWidth{ReportCoord}=2 px" _Similar C s -ReportTextLabel +"ReportTextLabel" Direction p i @@ -1125,18 +1125,18 @@ C _Properties C s --* +"-*" #ReportPanel ReportContainer C _Properties C s -*,Arrangement{Arrange.None;Vertical;Horizontal;Column;Fill}=Vertical +"*,Arrangement{Arrange.None;Vertical;Horizontal;Column;Fill}=Vertical" _Similar C s -ReportVBox +"ReportVBox" Arrangement p i @@ -1151,7 +1151,7 @@ C _Properties C s -*,Text +"*,Text" Text p s @@ -1166,11 +1166,11 @@ C _Properties C s -*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{SvgImage} +"*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{SvgImage}" _Similar C s -ReportTextLabel +"ReportTextLabel" Data v SvgImage @@ -1205,15 +1205,15 @@ C _Properties C s -*,Text,Alignment{Align.*} +"*,Text,Alignment{Align.*}" _Similar C s -ReportControl +"ReportControl" _DefaultEvent C s -Data +"Data" Text p s @@ -1283,15 +1283,15 @@ C _Properties C s -*,ForceNewPage +"*,ForceNewPage" _Similar C s -ReportVBox +"ReportVBox" _DefaultArrangement C s -V +"V" _new m @@ -1306,11 +1306,11 @@ C _Properties C s -* +"*" _Similar C s -ReportVBox +"ReportVBox" _new m diff --git a/comp/src/gb.report2/.info b/comp/src/gb.report2/.info index 139267db3..bba789f35 100644 --- a/comp/src/gb.report2/.info +++ b/comp/src/gb.report2/.info @@ -117,11 +117,11 @@ i _Properties C s -*,-Left,-Top,-Width,-Height,Count{Range:1;256}=1,Index,Text,Paper{Printer.A3;A4;A5;B5;Letter;Executive;Legal;Custom}=A4,Orientation{Printer.Portrait;Landscape}=Portrait +"*,-Left,-Top,-Width,-Height,Count{Range:1;256}=1,Index,Text,Paper{Printer.A3;A4;A5;B5;Letter;Executive;Legal;Custom}=A4,Orientation{Printer.Portrait;Landscape}=Portrait" _HiddenControls C s -Report,ReportControl,ReportContainer,ReportFrame,ReportSection +"Report,ReportControl,ReportContainer,ReportFrame,ReportSection" _IsForm C b @@ -137,11 +137,11 @@ T _DrawWith C s -TabPanel +"TabPanel" _DefaultEvent C s -Open +"Open" AllowedUnits V String[] @@ -498,11 +498,11 @@ T _Group C s -Container +"Container" _Properties C s -*,Spacing{ReportCoord},OnePiece,ForceNewPage +"*,Spacing{ReportCoord},OnePiece,ForceNewPage" _CurItem p i @@ -613,11 +613,11 @@ b _Properties C s -Left{ReportCoord},Top{ReportCoord},Width{ReportCoord},Height{ReportCoord},Brush{ReportBrush},Visible=True,Fixed,Font,Padding,Margin,Ignore,Expand,AutoResize,Tag,Range +"Left{ReportCoord},Top{ReportCoord},Width{ReportCoord},Height{ReportCoord},Brush{ReportBrush},Visible=True,Fixed,Font,Padding,Margin,Ignore,Expand,AutoResize,Tag,Range" _Family C s -Report +"Report" _SizeInt v ReportSizeHints @@ -844,15 +844,15 @@ C _Properties C s -*,Cached +"*,Cached" _Similar C s -ReportImage +"ReportImage" _DefaultEvent C s -Draw +"Draw" SizeHints v ReportSizeHints @@ -883,7 +883,7 @@ ReportControl _Properties C s -*,Border,Background{ReportBrush},BoxShadow +"*,Border,Background{ReportBrush},BoxShadow" Border p ReportBorder @@ -930,15 +930,15 @@ C _Properties C s -* +"*" _Similar C s -ReportVBox +"ReportVBox" _DefaultArrangement C s -H +"H" _new m @@ -953,15 +953,15 @@ C _Properties C s -*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{Image} +"*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{Image}" _Similar C s -ReportTextLabel +"ReportTextLabel" _DefaultEvent C s -Data +"Data" Image p Image @@ -996,15 +996,15 @@ C _Properties C s -*,Text,Format,Alignment{Align.*},Rotate{Angle:Degrees},UseField +"*,Text,Format,Alignment{Align.*},Rotate{Angle:Degrees},UseField" _Similar C s -ReportTextLabel +"ReportTextLabel" _DefaultEvent C s -Data +"Data" Data v s @@ -1047,11 +1047,11 @@ C _Properties C s -*,Direction{Align.TopLeft;Top;TopRight;Left;Right;BottomLeft;Bottom;BottomRight}=BottomRight,LineWidth{ReportCoord}=2 px +"*,Direction{Align.TopLeft;Top;TopRight;Left;Right;BottomLeft;Bottom;BottomRight}=BottomRight,LineWidth{ReportCoord}=2 px" _Similar C s -ReportTextLabel +"ReportTextLabel" Direction p i @@ -1148,14 +1148,14 @@ C _Properties C s --* +"-*" #ReportPanel ReportContainer C _Properties C s -*,Arrangement{Arrange.None;Vertical;Horizontal}=None +"*,Arrangement{Arrange.None;Vertical;Horizontal}=None" Arrangement p i @@ -1170,7 +1170,7 @@ C _Properties C s -*,Text +"*,Text" Text p s @@ -1208,11 +1208,11 @@ C _Properties C s -*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{SvgImage} +"*,Stretch{Report.None;Proportional;Fill}=Proportional,Alignment{Align.*},Image{SvgImage}" _Similar C s -ReportTextLabel +"ReportTextLabel" Data v SvgImage @@ -1247,15 +1247,15 @@ C _Properties C s -*,Text,Alignment{Align.*} +"*,Text,Alignment{Align.*}" _Similar C s -ReportTextLabel +"ReportTextLabel" _DefaultEvent C s -Data +"Data" Data v s @@ -1286,15 +1286,15 @@ C _Properties C s -*,ForceNewPage +"*,ForceNewPage" _Similar C s -ReportVBox +"ReportVBox" _DefaultArrangement C s -V +"V" _new m diff --git a/configure.ac b/configure.ac index 613354262..37fa65043 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ dnl ---- Initialization m4_include([version.m4]) AC_INIT(gambas3, GB_VERSION, GB_MAIL, [], GB_URL) AC_CONFIG_MACRO_DIR([m4]) +AC_PROG_LN_S AC_CONFIG_SUBDIRS(main) diff --git a/gb.qt4/src/CStyle.cpp b/gb.qt4/src/CStyle.cpp index 1da09ba2a..59dfeaf06 100644 --- a/gb.qt4/src/CStyle.cpp +++ b/gb.qt4/src/CStyle.cpp @@ -304,8 +304,6 @@ BEGIN_PROPERTY(Style_Name) const char *name = qApp->style()->metaObject()->className(); int len = strlen(name); - fprintf(stderr, "Style_Name: %s\n", name); - if (len >= 6 && strncasecmp(&name[len - 5], "style", 5) == 0) len -= 5; if (len >= 3 && strncmp(&name[len - 2], "::", 2) == 0) diff --git a/gb.qt4/src/CWidget.cpp b/gb.qt4/src/CWidget.cpp index 877d5e986..30fabb9a4 100644 --- a/gb.qt4/src/CWidget.cpp +++ b/gb.qt4/src/CWidget.cpp @@ -2322,6 +2322,9 @@ static void post_focus_change(void *) { CWIDGET *current, *control; + if (!_focus_change) + return; + //qDebug("post_focus_change"); for(;;) @@ -2360,6 +2363,11 @@ static void handle_focus_change() GB.Post((void (*)())post_focus_change, NULL); } +void CWIDGET_finish_focus(void) +{ + post_focus_change(NULL); +} + void CWIDGET_handle_focus(CWIDGET *control, bool on) { if (on == (CWIDGET_active_control == control)) diff --git a/gb.qt4/src/CWidget.h b/gb.qt4/src/CWidget.h index 4c8251e13..4d7b6cdb9 100644 --- a/gb.qt4/src/CWidget.h +++ b/gb.qt4/src/CWidget.h @@ -213,6 +213,7 @@ void CWIDGET_move_cached(void *_object, int x, int y); void CWIDGET_resize_cached(void *_object, int w, int h); void CWIDGET_move_resize_cached(void *_object, int x, int y, int w, int h); void CWIDGET_handle_focus(CWIDGET *control, bool on); +void CWIDGET_finish_focus(void); void CWIDGET_register_proxy(void *_object, void *proxy); bool CWIDGET_container_for(void *_object, void *container_for); void *CWIDGET_enter_popup(); diff --git a/gb.qt4/src/CWindow.cpp b/gb.qt4/src/CWindow.cpp index 31a0614a0..929ecedb4 100644 --- a/gb.qt4/src/CWindow.cpp +++ b/gb.qt4/src/CWindow.cpp @@ -1612,8 +1612,8 @@ void MyMainWindow::initProperties(int which) X11_window_change_end(); } - if (which == PROP_ALL) - X11_set_window_type(effectiveWinId(), _type); + //if (which == PROP_ALL) + // X11_set_window_type(effectiveWinId(), _type); if (which & PROP_BORDER) X11_set_window_decorated(effectiveWinId(), _border); @@ -1638,7 +1638,7 @@ void MyMainWindow::activateLater() activateWindow(); } -void MyMainWindow::present() +void MyMainWindow::present(QWidget *parent) { if (!isVisible()) { @@ -1666,23 +1666,6 @@ void MyMainWindow::present() else show(); - - if (isUtility() && _resizable) - setSizeGrip(true); - else - setSizeGrip(false); - - if (hasBorder() && !THIS->noTakeFocus) - { - //MAIN_process_events(); - //usleep(50000); - //_activate = TRUE; - //if (isToolbar()) - //QTimer::singleShot(50, this, SLOT(activateLater())); - //else - activateWindow(); - } - #if QT5 //qDebug("createWinId: %p", (void *)effectiveWinId()); initProperties(PROP_ALL); @@ -1690,8 +1673,10 @@ void MyMainWindow::present() X11_window_set_user_time(effectiveWinId(), 0); #endif - if (THIS->stacking == 1) - raise(); + if (isUtility() && _resizable) + setSizeGrip(true); + else + setSizeGrip(false); } else { @@ -1702,11 +1687,14 @@ void MyMainWindow::present() setState(windowState() & ~Qt::WindowMinimized); //qDebug("_activate set #2"); } - - raise(); - if (hasBorder()) - activateWindow(); } + + if (parent || (hasBorder() && !THIS->noTakeFocus)) + activateWindow(); + if (parent) + X11_set_transient_for(effectiveWinId(), parent->effectiveWinId()); + if (parent || THIS->stacking == 1) + raise(); } void MyMainWindow::showActivate(QWidget *transient) @@ -1789,6 +1777,8 @@ void MyMainWindow::showModal(void) if (isModal()) return; + CWIDGET_finish_focus(); + info.that = this; info.old = MyApplication::eventLoop; info.save = CWINDOW_Current; @@ -1805,17 +1795,9 @@ void MyMainWindow::showModal(void) _enterLoop = false; // Do not call exitLoop() if we do not entered the loop yet! - present(); + present(CWINDOW_Active ? CWidget::getTopLevel((CWIDGET *)CWINDOW_Active)->widget.widget : 0); afterShow(); - #ifndef NO_X_WINDOW - if (CWINDOW_Active) - { - //qDebug("Active = %p X11_set_transient_for(0x%08x, 0x%08x)", CWINDOW_Active, effectiveWinId(), CWINDOW_Active->widget.widget->effectiveWinId()); - X11_set_transient_for(effectiveWinId(), CWidget::getTopLevel((CWIDGET *)CWINDOW_Active)->widget.widget->effectiveWinId()); - } - #endif - THIS->loopLevel++; CWINDOW_Current = THIS; @@ -2604,8 +2586,6 @@ void CWINDOW_activate(CWIDGET *ob) { CWINDOW *active; - //qDebug("CWINDOW_activate: %s", ob ? ob->name : "NULL"); - if (ob) { active = CWidget::getWindow(ob); diff --git a/gb.qt4/src/CWindow.h b/gb.qt4/src/CWindow.h index 8598c7568..df38db38a 100644 --- a/gb.qt4/src/CWindow.h +++ b/gb.qt4/src/CWindow.h @@ -209,7 +209,7 @@ public: ~MyMainWindow(); void initProperties(int which); - void present(); + void present(QWidget *parent = 0); void showActivate(QWidget *parent = 0); //void activateLater() { _activate = true; } void showModal(); diff --git a/main/configure.ac b/main/configure.ac index 602a4c6c5..b632f6014 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -117,6 +117,8 @@ lib/geom/Makefile \ lib/draw/Makefile \ lib/gui/Makefile \ lib/gui.opengl/Makefile \ +lib/gui.qt/Makefile \ +lib/gui.qt.webkit/Makefile \ lib/image/Makefile \ lib/image.effect/Makefile \ lib/signal/Makefile \ diff --git a/main/gbx/gbx_component.c b/main/gbx/gbx_component.c index 4bdbbd193..318c57443 100644 --- a/main/gbx/gbx_component.c +++ b/main/gbx/gbx_component.c @@ -55,8 +55,8 @@ #include "gbx_component.h" -//#define DEBUG_COMP -/*#define DEBUG_PRELOAD*/ +//#define DEBUG_COMP 1 +//#define DEBUG_PRELOAD COMPONENT *COMPONENT_current = NULL; COMPONENT *COMPONENT_main; @@ -137,6 +137,7 @@ void COMPONENT_load_all(void) _load_all = FALSE; } + void COMPONENT_load_all_finish(void) { COMPONENT *comp; @@ -221,7 +222,7 @@ COMPONENT *COMPONENT_create(const char *name) //fprintf(stderr, "COMPONENT_create: %s\n", path); if (FILE_exist(path)) - comp->library = LIBRARY_create(name); + comp->library = LIBRARY_create(comp->name); if (can_archive) { @@ -229,7 +230,7 @@ COMPONENT *COMPONENT_create(const char *name) sprintf(path, ARCH_PATTERN, COMPONENT_path, name); if (FILE_exist(path)) - comp->archive = ARCHIVE_create(name, NULL); + comp->archive = ARCHIVE_create(comp->name, NULL); } } @@ -237,11 +238,29 @@ COMPONENT *COMPONENT_create(const char *name) LIST_insert(&_component_list, comp, &comp->list); COMPONENT_count++; +#if 0 if (!comp->library && !comp->archive && !same_name_as_project) { COMPONENT_delete(comp); + + // If gb.qt5 components are not present, automatically switch to gb.qt4 components + + if (strncmp(name, "gb.qt5", 6) == 0 && (name[6] == 0 || name[6] == '.')) + { + char new_name[strlen(name) + 1]; + + if (name[6] == 0) + ERROR_warning("gb.qt5 not found, using gb.qt4 instead."); + + strcpy(new_name, "gb.qt4"); + strcat(new_name, &name[6]); + + return COMPONENT_create(new_name); + } + THROW(E_LIBRARY, name, "cannot find component"); } +#endif return comp; } diff --git a/main/lib/Makefile.am b/main/lib/Makefile.am index dc3cab6f3..6d445ee3e 100644 --- a/main/lib/Makefile.am +++ b/main/lib/Makefile.am @@ -1,4 +1,2 @@ -SUBDIRS = debug eval db compress vb option geom draw image gui gui.opengl \ - image.effect signal complex data clipper @INOTIFY_DIR@ - +SUBDIRS = debug eval db compress vb option geom draw image gui gui.opengl gui.qt gui.qt.webkit image.effect signal complex data clipper @INOTIFY_DIR@ EXTRA_DIST = gb.component \ No newline at end of file diff --git a/main/lib/gui.qt/Makefile.am b/main/lib/gui.qt/Makefile.am new file mode 100644 index 000000000..60ffed3dd --- /dev/null +++ b/main/lib/gui.qt/Makefile.am @@ -0,0 +1,12 @@ +COMPONENT = gb.gui.qt +include $(top_srcdir)/component.am + +gblib_LTLIBRARIES = gb.gui.qt.la + +gb_gui_qt_la_LIBADD = +gb_gui_qt_la_LDFLAGS = -module @LD_FLAGS@ +gb_gui_qt_la_CFLAGS = -I$(top_srcdir)/share -I$(top_srcdir)/gbx @INCLTDL@ $(AM_CFLAGS) + +gb_gui_qt_la_SOURCES = \ + main.h main.c + diff --git a/main/lib/gui.qt/gb.gui.qt.component b/main/lib/gui.qt/gb.gui.qt.component new file mode 100644 index 000000000..fdcc7adef --- /dev/null +++ b/main/lib/gui.qt/gb.gui.qt.component @@ -0,0 +1,6 @@ +[Component] +Author=Benoît Minisini +Implements=Form,EventLoop,ImageIO +Requires=gb.image +Type=Form +State=Finished \ No newline at end of file diff --git a/main/lib/gui.qt/main.c b/main/lib/gui.qt/main.c new file mode 100644 index 000000000..6e85964ba --- /dev/null +++ b/main/lib/gui.qt/main.c @@ -0,0 +1,106 @@ +/*************************************************************************** + + main.c + + (c) 2015 Benoît Minisini + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA. + +***************************************************************************/ + +#define __MAIN_C + +#include "main.h" + +enum { USE_NOTHING, USE_GB_QT4, USE_GB_QT5 }; + +GB_INTERFACE GB EXPORT; + +// Prevents gbi3 from complaining + +GB_DESC *GB_CLASSES[] EXPORT = +{ + NULL +}; + +char *GB_INCLUDE EXPORT = "gb.qt4"; + +int EXPORT GB_INIT(void) +{ + int use = USE_NOTHING; + char *env; + const char *comp; + const char *comp2; + + env = getenv("GB_GUI"); + if (env) + { + if (strcmp(env, "gb.qt4") == 0) + use = USE_GB_QT4; + else if (strcmp(env, "gb.qt5") == 0) + use = USE_GB_QT5; + } + + if (use == USE_NOTHING) + { + use = USE_GB_QT4; + + env = getenv("KDE_FULL_SESSION"); + + if (env && !strcmp(env, "true")) + { + env = getenv("KDE_SESSION_VERSION"); + if (env) + { + if (strcmp(env, "4") == 0) + use = USE_GB_QT4; + else if (strcmp(env, "5") == 0) + use = USE_GB_QT5; + } + } + } + + switch (use) + { + case USE_GB_QT4: comp = "gb.qt4"; break; + case USE_GB_QT5: comp = "gb.qt5"; break; + default: comp = "gb.qt5"; break; + } + + if (GB.Component.Load(comp)) + { + comp2 = use == USE_GB_QT5 ? "gb.qt4" : "gb.qt5"; + + if (GB.Component.Load(comp2)) + { + fprintf(stderr, "gb.gui.qt: error: unable to find any QT component\n"); + exit(1); + } + + fprintf(stderr, "gb.gui: warning: '%s' component not found, using '%s' instead\n", comp, comp2); + comp = comp2; + } + + setenv("GB_GUI", comp, TRUE); + + return 0; +} + +void EXPORT GB_EXIT() +{ +} + + diff --git a/main/lib/gui.qt/main.h b/main/lib/gui.qt/main.h new file mode 100644 index 000000000..518ee96dc --- /dev/null +++ b/main/lib/gui.qt/main.h @@ -0,0 +1,34 @@ +/*************************************************************************** + + main.h + + (c) 2015 Benoît Minisini + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA. + +***************************************************************************/ + +#ifndef __MAIN_H +#define __MAIN_H + +#include "gambas.h" +#include "gb_common.h" + +#ifndef __MAIN_C +extern GB_INTERFACE GB; +#endif + +#endif diff --git a/main/lib/gui/gb.gui.component b/main/lib/gui/gb.gui.component index 1ad7e75cc..45c1ae57a 100644 --- a/main/lib/gui/gb.gui.component +++ b/main/lib/gui/gb.gui.component @@ -1,29 +1,6 @@ [Component] -Key=gb.gui Author=Benoît Minisini Implements=Form,EventLoop,ImageIO Requires=gb.image Type=Form -Hidden=Control,Form,Menu - -[Form] -Control=Label,TextLabel,Separator,PictureBox,MovieBox,ProgressBar -Control=Button,CheckBox,RadioButton,ToggleButton,ToolButton,Slider,ScrollBar -Control=ListBox,ComboBox,TextBox,SpinBox,TextArea -Control=ListView,TreeView,IconView,ColumnView,GridView - -[Container] -Container=HBox,VBox,HPanel,VPanel,HSplit,VSplit,Panel,Frame,ScrollView,DrawingArea -MultiContainer=TabStrip - -[Special] -Control=Embedder -Virtual=TrayIcon,Printer - -[Change] -Label=TextLabel -Button=ToggleButton,ToolButton -Slider=ScrollBar,SpinBox -TextBox=SpinBox,TextArea -ListView=TreeView,ColumnView -Panel=HBox,VBox,HPanel,VPanel,Frame,ScrollView +State=Finished