[DEVELOPMENT ENVIRONMENT]

* NEW: Add an "add everything to repository" menu entry.
* BUG: The user font config file is "~/config/fonts.conf", not 
  "~/config/.fonts.conf".

[GB.FORM]
* NEW: The Balloon background color is now the system tooltip background 
  color.

[GB.GTK]
* NEW: Ignore trailing spaces in font description elements: you can use 
  Font["Arial  , 12, Bold "] now.

[GB.OPENGL]
* BUG: Fix the missing "gl" prefix on two OepnGL calls.

[GB.QT4]
* NEW: Ignore trailing spaces in font description elements: you can use 
  Font["Arial  , 12, Bold "] now.



git-svn-id: svn://localhost/gambas/trunk@6209 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2014-03-29 18:21:56 +00:00
parent 29883d6239
commit 78440de68d
16 changed files with 220 additions and 236 deletions

View File

@ -42,12 +42,13 @@ File[3]="gambas.sourceforge.net/main.html:22.4"
File[4]="gambas.sourceforge.net/style-old.css:491.0"
File[5]=".src/MMain.module:300.0"
File[6]="gambas.sourceforge.net/architecture.html:37.42"
Active=7
File[7]="gambas.sourceforge.net/menu.html:1.60"
File[8]="gambas.sourceforge.net/style-rtl-old.css:294.3"
File[9]="gambas.sourceforge.net/style-rtl.css:638.7"
File[10]="gambas.sourceforge.net/main-rtl.html:0.0"
Count=10
Active=11
File[11]="authors.txt:17.26"
Count=11
[Watches]
Count=0

View File

@ -15,7 +15,7 @@ The <tt>gb.chart</tt> component
------------------------------------------
Nigel Gerrard
nigel@gerrard1123.freeserve.co.uk
nigel.dh.gerrard@gmail.com
United Kingdom
The <a href="http://mysql.com" target="_blank">MySQL database driver</a>
The <a href="http://www.trolltech.com" target="_blank">QT extended component</a>

View File

@ -2961,7 +2961,7 @@ Private Sub UndoPage()
Dim rPage As Result
Dim rArch As Result
Goto READ_ONLY
If $sUser <> "gambas" Then Goto READ_ONLY
rPage = DB.Edit("page", "sPath = &1 AND sLang = &2", $sPath, $sLang)
If rPage.Available Then
@ -2988,7 +2988,7 @@ Private Sub UndoPage()
Endif
Endif
READ_ONLY:
READ_ONLY:
Print "Content-type: text/html"
Print "Location: http://" & Application.Env["HTTP_HOST"] &/ "help" &/ $sUri
@ -3015,7 +3015,7 @@ Private Sub UpdatePage()
Dim bStop As Boolean
Dim sTitle As String
Goto READ_ONLY
If $sUser <> "gambas" Then Goto READ_ONLY
rPage = DB.Create("page")
rPage!sPath = $sPath
@ -3176,7 +3176,7 @@ Private Sub UpdatePage()
Endif
READ_ONLY:
READ_ONLY:
Print "Content-type: text/html"
Print "Location: http://" & Application.Env["HTTP_HOST"] &/ "help" &/ $sUri;
@ -3312,7 +3312,7 @@ Private Sub DoRenamePage()
Dim bKeep As Boolean
Dim sUri As String
Goto READ_ONLY
If $sUser <> "gambas" Then Goto READ_ONLY
cForm = GetForm()
sNewPath = cForm!sNewPath

View File

@ -473,7 +473,7 @@ Public Sub Main()
If Not Exist(sPath) Or If sData <> File.Load(sPath) Then
File.Save(sPath, sData)
Copy sPath To GetPagePath(True)
Main.Log(Main.Path)
Main.Log(Main.Path & " (" & Main.Lang & ")")
Endif
Redirect
Return
@ -484,7 +484,7 @@ Public Sub Main()
Try Kill sPath
Copy Request.Files["file"] To sPath
Copy sPath To GetPagePath(True)
Main.Log(Main.Path)
Main.Log(Main.Path & " (" & Main.Lang & ")")
Redirect
Return
Endif
@ -496,7 +496,7 @@ Public Sub Main()
LockPage
File.Save(sPath, "")
Copy sPath To GetPagePath(True)
Main.Log("Delete " & Main.Path)
Main.Log("Delete " & Main.Path & " (" & Main.Lang & ")")
Endif
Redirect
Return
@ -511,7 +511,7 @@ Public Sub Main()
Try Kill sDir &/ aPage[0]
Try Kill sPath
Try Copy sDir &/ aPage[1] To sPath
Main.Log("Undo " & Main.Path)
Main.Log("Undo " & Main.Path & " (" & Main.Lang & ")")
Endif
Redirect
Return
@ -981,13 +981,14 @@ Public Sub GetChanges() As String[]
Endif
aLine = Split(File.Load(Main.Root &/ "wiki.log"), "\n", "", True)
aLine.Reverse
If aLine.Count > 1000 Then aResult.Add("...")
For I = Max(aLine.Count - 1000, 0) To aLine.Max
For I = 0 To Min(999, aLine.Max)
aResult.Add(" " & aLine[I])
Next
If aLine.Count > 1000 Then aResult.Add("...")
Return aResult
End
@ -1011,7 +1012,7 @@ Public Sub Log(sText As String, Optional sUser As String)
Try hFile = Open sLog For Append
If hFile Then
For Each sText In Split(sText, "\n")
Print #hFile, Format(Now, "mm/dd/yyyy hh:nn:ss.uu"); " | "; sUser; " | "; sText
Print #hFile, Format(Now, "mm\\/dd\\/yyyy hh\\:nn\\:ss"); " | "; sUser; " | "; sText
Next
Close #hFile
Endif

Binary file not shown.

View File

@ -271,7 +271,7 @@ msgstr "Méthodes statiques"
msgid "Constants"
msgstr "Constantes"
#: CClassInfo.class:600 FMain.form:398 FProperty.form:24
#: CClassInfo.class:600 FMain.form:399 FProperty.form:24
msgid "Properties"
msgstr "Propriétés"
@ -711,7 +711,7 @@ msgstr "Fournit"
msgid "Requires"
msgstr "Nécessite"
#: FMain.form:722
#: FMain.form:723
msgid "Form"
msgstr "Formulaire"
@ -727,7 +727,7 @@ msgstr "Formulaires Gambas"
msgid "Gambas web pages"
msgstr "Pages web Gambas"
#: CModule.class:29 FCreateFile.form:174 FMain.form:730
#: CModule.class:29 FCreateFile.form:174 FMain.form:731
msgid "WebPage"
msgstr "Page Web"
@ -739,7 +739,7 @@ msgstr "Pages Web"
msgid "Gambas reports"
msgstr "États Gambas"
#: CModule.class:30 FCreateFile.form:195 FMain.form:738
#: CModule.class:30 FCreateFile.form:195 FMain.form:739
msgid "Report"
msgstr "État"
@ -775,7 +775,7 @@ msgstr "Public"
msgid "Data"
msgstr "Données"
#: CRecentFile.class:69 FMain.class:607
#: CRecentFile.class:69 FMain.class:617
msgid "Today"
msgstr "Aujourd'hui"
@ -991,7 +991,7 @@ msgstr "Indenter"
msgid "Unindent"
msgstr "Désindenter"
#: FConflict.form:149 FMain.form:788 FOpenProject.form:40
#: FConflict.form:149 FMain.form:789 FOpenProject.form:40
msgid "Open"
msgstr "Ouvrir"
@ -1187,7 +1187,7 @@ msgstr "Supprimer"
msgid "Rename table"
msgstr "Renommer la table"
#: FConnectionEditor.form:141 FMain.form:841
#: FConnectionEditor.form:141 FMain.form:842
msgid "Rename"
msgstr "Renommer"
@ -1335,23 +1335,23 @@ msgstr "Impossible d'ajouter le fichier."
msgid "New file"
msgstr "Nouveau fichier"
#: FCreateFile.form:111 FMain.form:706
#: FCreateFile.form:111 FMain.form:707
msgid "Module"
msgstr "Module"
#: FCreateFile.form:132 FDebugInfo.class:51 FMain.form:714
#: FCreateFile.form:132 FDebugInfo.class:51 FMain.form:715
msgid "Class"
msgstr "Classe"
#: FCreateFile.form:258 FMain.form:756
#: FCreateFile.form:258 FMain.form:757
msgid "HTML file"
msgstr "Fichier HTML"
#: FCreateFile.form:279 FMain.form:763
#: FCreateFile.form:279 FMain.form:764
msgid "Style sheet"
msgstr "Feuille de style"
#: FCreateFile.form:300 FMain.form:770
#: FCreateFile.form:300 FMain.form:771
msgid "Javascript file"
msgstr "Fichier Javascript"
@ -1407,7 +1407,7 @@ msgstr "Veuillez saisir l'emplacement du référentiel."
msgid "The project has been successfully created."
msgstr "Le projet a été créé avec succès."
#: FCreateProject.form:66 FMain.form:240
#: FCreateProject.form:66 FMain.form:241
msgid "New project"
msgstr "Nouveau projet"
@ -1555,7 +1555,7 @@ msgstr "Fonction"
msgid "Line"
msgstr "Ligne"
#: FDebugInfo.class:62 FMain.form:236 FTranslate.class:69
#: FDebugInfo.class:62 FMain.form:237 FTranslate.class:69
msgid "File"
msgstr "Fichier"
@ -1591,11 +1591,11 @@ msgstr "Variables dynamiques"
msgid "Warnings"
msgstr "Avertissements"
#: FDebugInfo.form:49 FMain.form:419
#: FDebugInfo.form:49 FMain.form:420
msgid "Debug"
msgstr "Débogage"
#: FDebugInfo.form:60 FMain.form:572 FOption.form:329 FSearch.class:93
#: FDebugInfo.form:60 FMain.form:573 FOption.form:329 FSearch.class:93
msgid "Console"
msgstr "Console"
@ -1719,7 +1719,7 @@ msgstr "Poursuivre la recherche"
msgid "Find previous"
msgstr "Recherche en arrière"
#: FEditor.form:186 FMain.form:1265
#: FEditor.form:186 FMain.form:1271
msgid "Run until current line"
msgstr "Exécuter jusqu'à la ligne courante"
@ -1767,7 +1767,7 @@ msgstr "Formater le code"
msgid "Sort procedures"
msgstr "Trier les procédures"
#: FEditor.form:275 FImageEditor.form:288 FMain.form:549 FTextEditor.form:203
#: FEditor.form:275 FImageEditor.form:288 FMain.form:550 FTextEditor.form:203
msgid "View"
msgstr "Affichage"
@ -1943,7 +1943,7 @@ msgstr "Evènement"
msgid "Change into"
msgstr "Transformer en"
#: FForm.form:147 FMain.form:793 FTextEditor.form:82
#: FForm.form:147 FMain.form:794 FTextEditor.form:82
msgid "Open code"
msgstr "Ouvrir le code"
@ -2123,7 +2123,7 @@ msgstr "Arrière-plan"
msgid "Foreground"
msgstr "Avant-plan"
#: FFormStack.form:15 FMain.form:1551
#: FFormStack.form:15 FMain.form:1557
msgid "Hierarchy"
msgstr "Hiérarchie"
@ -2151,15 +2151,15 @@ msgstr "Déplacer tout en bas"
msgid "Default language"
msgstr "Langage par défaut"
#: FHelpBrowser.form:30 FMain.form:997
#: FHelpBrowser.form:30 FMain.form:1003
msgid "Help browser"
msgstr "Navigateur d'aide"
#: FHelpBrowser.form:41 FMain.form:599 FProfile.form:48
#: FHelpBrowser.form:41 FMain.form:600 FProfile.form:48
msgid "Go back"
msgstr "Revenir en arrière"
#: FHelpBrowser.form:47 FMain.form:606 FProfile.form:54
#: FHelpBrowser.form:47 FMain.form:607 FProfile.form:54
msgid "Go forward"
msgstr "Aller en avant"
@ -2447,7 +2447,7 @@ msgstr "Aperçu"
msgid "Reset"
msgstr "Réinitialiser"
#: FImageProperty.form:564 FMain.form:366 FPatch.form:86
#: FImageProperty.form:564 FMain.form:367 FPatch.form:86
msgid "Apply"
msgstr "Appliquer"
@ -2627,419 +2627,423 @@ msgstr "Impossible de supprimer le fichier ou le répertoire"
msgid "File or directory does not exist anymore."
msgstr "Le fichier ou le répertoire n'existe plus."
#: FMain.class:628
#: FMain.class:638
msgid "Sort history"
msgstr "Trier l'historique"
#: FMain.class:632 FOpenProject.form:71 FWelcome.form:42
#: FMain.class:642 FOpenProject.form:71 FWelcome.form:42
msgid "Sort by date"
msgstr "Trier par date"
#: FMain.class:632 FOpenProject.form:80 FWelcome.form:49
#: FMain.class:642 FOpenProject.form:80 FWelcome.form:49
msgid "Sort by name"
msgstr "Trier par nom"
#: FMain.class:632 FOpenProject.form:88 FWelcome.form:55
#: FMain.class:642 FOpenProject.form:88 FWelcome.form:55
msgid "Sort by path"
msgstr "Trier dans l'ordre des chemins"
#: FMain.class:643
#: FMain.class:653
msgid "&Clear history"
msgstr "&Effacer l'historique"
#: FMain.class:809
#: FMain.class:819
msgid "New folder"
msgstr "Nouveau dossier"
#: FMain.class:880
#: FMain.class:890
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."
#: FMain.class:1118 FPropertyComponent.class:232
#: FMain.class:1128 FPropertyComponent.class:232
msgid "Library properties"
msgstr "Propriétés de la bibliothèque"
#: FMain.class:1553
#: FMain.class:1563
msgid "Unable to drop file into the project."
msgstr "Impossible de déposer le fichier à l'intérieur du projet."
#: FMain.class:1671
#: FMain.class:1681
msgid "All backup or generated files will be removed from the project directory."
msgstr "Les fichiers de sauvegarde et les fichiers générés du projet vont être supprimés."
#: FMain.class:1671
#: FMain.class:1681
msgid "Clean"
msgstr "Nettoyer"
#: FMain.class:1866
#: FMain.class:1876
msgid "To show the menu bar again, hit the following keys:<p><b>&1</b>"
msgstr "Pour afficher de nouveau la barre de menus, appuyez sur les touches suivantes&nbsp;:<p><b>&1</b>"
#: FMain.class:1968
msgid "Do you really want to add this file to the repository?"
msgstr "Voulez-vous réellement ajouter ce fichier au référentiel ?"
#: FMain.class:1990
msgid "Do you really want to add every file to the repository?"
msgstr ""
#: FMain.class:2100
#: FMain.class:2126
msgid "Choose a profile"
msgstr "Choisissez un profilage"
#: FMain.class:2101
#: FMain.class:2127
msgid "Profile for &1 project"
msgstr "Profilage pour le projet &1"
#: FMain.class:2317 FProperty.class:975
#: FMain.class:2343 FProperty.class:975
msgid "Select a file"
msgstr "Choisissez un fichier"
#: FMain.class:2321
#: FMain.class:2347
msgid "This file is located inside the project."
msgstr "Le fichier est situé à l'intérieur du projet."
#: FMain.form:247
#: FMain.form:248
msgid "Open project"
msgstr "Ouvrir un projet"
#: FMain.form:253
#: FMain.form:254
msgid "Open recent"
msgstr "Ouvrir un projet récent"
#: FMain.form:260
#: FMain.form:261
msgid "Open example"
msgstr "Ouvrir un exemple"
#: FMain.form:268
#: FMain.form:269
msgid "Open file"
msgstr "Ouvrir un fichier"
#: FMain.form:276
#: FMain.form:277
msgid "Save project"
msgstr "Enregistrer le projet"
#: FMain.form:284 FSaveProjectAs.form:18
#: FMain.form:285 FSaveProjectAs.form:18
msgid "Save project as"
msgstr "Enregistrer le projet sous"
#: FMain.form:295 FMakeInstall.class:306 FSave.class:28 FWelcome.class:58
#: FMain.form:296 FMakeInstall.class:306 FSave.class:28 FWelcome.class:58
msgid "Quit"
msgstr "Quitter"
#: FMain.form:307
#: FMain.form:308
msgid "Compile"
msgstr "Compiler"
#: FMain.form:314
#: FMain.form:315
msgid "Compile All"
msgstr "Tout compiler"
#: FMain.form:324
#: FMain.form:325
msgid "Translate"
msgstr "Traduire"
#: FMain.form:333
#: FMain.form:334
msgid "Make"
msgstr "Générer"
#: FMain.form:337
#: FMain.form:338
msgid "Executable"
msgstr "Exécutable"
#: FMain.form:344 FMakePatch.form:50
#: FMain.form:345 FMakePatch.form:50
msgid "Source archive"
msgstr "Archive source"
#: FMain.form:351
#: FMain.form:352
msgid "Installation package"
msgstr "Paquetage d'installation"
#: FMain.form:358
#: FMain.form:359
msgid "Patch"
msgstr "Patch"
#: FMain.form:361
#: FMain.form:362
msgid "Create"
msgstr "Créer"
#: FMain.form:376 FProjectVersion.form:95
#: FMain.form:377 FProjectVersion.form:95
msgid "Clean up"
msgstr "Nettoyer"
#: FMain.form:382
#: FMain.form:383
msgid "Refresh"
msgstr "Rafraîchir"
#: FMain.form:388
#: FMain.form:389
msgid "Put on version control"
msgstr "Mettre sous contrôle de version"
#: FMain.form:405 FPropertyComponent.form:44
#: FMain.form:406 FPropertyComponent.form:44
msgid "Component properties"
msgstr "Propriétés du composant"
#: FMain.form:413
#: FMain.form:414
msgid "Version control"
msgstr "Contrôle de version"
#: FMain.form:424
#: FMain.form:425
msgid "Run"
msgstr "Démarrer"
#: FMain.form:431
#: FMain.form:432
msgid "Use terminal emulator"
msgstr "Utiliser un émulateur de terminal"
#: FMain.form:437 FProjectProperty.form:502
#: FMain.form:438 FProjectProperty.form:502
msgid "Redirect standard error output"
msgstr "Rediriger la sortie erreur standard"
#: FMain.form:443 FProjectProperty.form:520
#: FMain.form:444 FProjectProperty.form:520
msgid "Use embedded HTTP server"
msgstr "Utiliser le serveur HTTP embarqué"
#: FMain.form:449 FProjectProperty.form:468
#: FMain.form:450 FProjectProperty.form:468
msgid "Activate profiling"
msgstr "Activer le profilage"
#: FMain.form:455
#: FMain.form:456
msgid "GUI component"
msgstr "Composant graphique"
#: FMain.form:459
#: FMain.form:460
msgid "Current desktop"
msgstr "Bureau courant"
#: FMain.form:489
#: FMain.form:490
msgid "Pause"
msgstr "Pause"
#: FMain.form:496
#: FMain.form:497
msgid "Stop"
msgstr "Arrêter"
#: FMain.form:503
#: FMain.form:504
msgid "Step"
msgstr "Pas-à-pas"
#: FMain.form:510
#: FMain.form:511
msgid "Forward"
msgstr "Avancer"
#: FMain.form:517
#: FMain.form:518
msgid "Finish"
msgstr "Terminer"
#: FMain.form:523
#: FMain.form:524
msgid "Break on each error"
msgstr "Arrêt sur chaque erreur"
#: FMain.form:533
#: FMain.form:534
msgid "Open profile"
msgstr "Ouvrir un profilage"
#: FMain.form:539
#: FMain.form:540
msgid "Clear all breakpoints"
msgstr "Effacer tous les points d'arrêts"
#: FMain.form:544
#: FMain.form:545
msgid "Close all debug windows"
msgstr "Fermer toutes les fenêtres de débogage"
#: FMain.form:582
#: FMain.form:583
msgid "Status bar"
msgstr "Barre d'état"
#: FMain.form:590
#: FMain.form:591
msgid "Hide menubar"
msgstr "Cacher la barre de menus"
#: FMain.form:613
#: FMain.form:614
msgid "Close all windows"
msgstr "Fermer toutes les fenêtres"
#: FMain.form:619
#: FMain.form:620
msgid "Tools"
msgstr "Outils"
#: FMain.form:623
#: FMain.form:624
msgid "Find"
msgstr "Rechercher"
#: FMain.form:629 FSearch.form:76
#: FMain.form:630 FSearch.form:76
msgid "Replace"
msgstr "Remplacer"
#: FMain.form:639
#: FMain.form:640
msgid "Browse project"
msgstr "Parcourir le projet"
#: FMain.form:646
#: FMain.form:647
msgid "Open a terminal"
msgstr "Ouvrir un terminal"
#: FMain.form:653
#: FMain.form:654
msgid "Send project by mail"
msgstr "Envoyer le projet par courriel"
#: FMain.form:659
#: FMain.form:660
msgid "Update all forms"
msgstr "Mettre à-jour tous les formulaires"
#: FMain.form:668
#: FMain.form:669
msgid "Shortcuts"
msgstr "Raccourcis"
#: FMain.form:674 FOption.form:186
#: FMain.form:675 FOption.form:186
msgid "Preferences"
msgstr "Préférences"
#: FMain.form:689
#: FMain.form:690
msgid "Directory"
msgstr "Répertoire"
#: FMain.form:695
#: FMain.form:696
msgid "Project link"
msgstr "Lien vers un projet"
#: FMain.form:778
#: FMain.form:779
msgid "Other"
msgstr "Autre"
#: FMain.form:797
#: FMain.form:798
msgid "Open with"
msgstr "Ouvrir avec"
#: FMain.form:805
#: FMain.form:806
msgid "Compress all"
msgstr "Tout compresser"
#: FMain.form:811
#: FMain.form:812
msgid "Uncompress all"
msgstr "Tout décompresser"
#: FMain.form:858
#: FMain.form:859
msgid "Copy file path"
msgstr "Copier le chemin du fichier"
#: FMain.form:867
#: FMain.form:868
msgid "Startup class"
msgstr "Classe de démarrage"
#: FMain.form:876
#: FMain.form:877
msgid "Add to repository"
msgstr "Ajouter au référentiel"
#: FMain.form:881
#: FMain.form:882
msgid "Filter"
msgstr "Filtrer"
#: FMain.form:884
#: FMain.form:885
msgid "Show exported classes"
msgstr "Afficher les classes exportées"
#: FMain.form:889
#: FMain.form:890
msgid "Show added files"
msgstr "Afficher les fichier ajoutés"
#: FMain.form:894
#: FMain.form:895
msgid "Show files in conflict"
msgstr "Afficher les fichiers en conflit"
#: FMain.form:903
#: FMain.form:904
msgid "Show all"
msgstr "Afficher tout"
#: FMain.form:920 FNewConnection.class:143
#: FMain.form:910
msgid "Add everything to repository"
msgstr "Tout ajouter au référentiel"
#: FMain.form:926 FNewConnection.class:143
msgid "New connection"
msgstr "Nouvelle connexion"
#: FMain.form:988
#: FMain.form:994
msgid "?"
msgstr "?"
#: FMain.form:1005 FTips.form:18
#: FMain.form:1011 FTips.form:18
msgid "Tips of the day"
msgstr "Astuces du jour"
#: FMain.form:1013
#: FMain.form:1019
msgid "System informations"
msgstr "Informations système"
#: FMain.form:1019
#: FMain.form:1025
msgid "About Gambas"
msgstr "À propos de Gambas"
#: FMain.form:1071 FProjectProperty.form:125
#: FMain.form:1077 FProjectProperty.form:125
msgid "Project properties"
msgstr "Propriétés du projet"
#: FMain.form:1078
#: FMain.form:1084
msgid "Project version control"
msgstr "Contrôle de version du projet"
#: FMain.form:1092
#: FMain.form:1098
msgid "Refresh project"
msgstr "Rafraîchir le projet"
#: FMain.form:1119 FMakeExecutable.form:15
#: FMain.form:1125 FMakeExecutable.form:15
msgid "Make executable"
msgstr "Générer l'exécutable"
#: FMain.form:1134
#: FMain.form:1140
msgid "Make source archive"
msgstr "Générer une archive des sources"
#: FMain.form:1142 FMakeInstall.form:112
#: FMain.form:1148 FMakeInstall.form:112
msgid "Make installation package"
msgstr "Créer un paquetage d'installation"
#: FMain.form:1164
#: FMain.form:1170
msgid "Properties sheet"
msgstr "Feuille de propriétés"
#: FMain.form:1173
#: FMain.form:1179
msgid "Toolbox"
msgstr "Boîte à outils"
#: FMain.form:1191 FOutput.form:151 FSearch.form:62
#: FMain.form:1197 FOutput.form:151 FSearch.form:62
msgid "Search"
msgstr "Rechercher"
#: FMain.form:1215
#: FMain.form:1221
msgid "Compile all"
msgstr "Tout compiler"
#: FMain.form:1257
#: FMain.form:1263
msgid "Finish current function"
msgstr "Terminer la fonction courante"
#: FMain.form:1285
#: FMain.form:1291
msgid "Browse project..."
msgstr "Parcourir le projet..."
#: FMain.form:1336
#: FMain.form:1342
msgid "&File"
msgstr "&Fichier"
#: FMain.form:1347
#: FMain.form:1353
msgid "&Project"
msgstr "&Projet"
#: FMain.form:1358
#: FMain.form:1364
msgid "&Debug"
msgstr "&Débogage"
#: FMain.form:1369
#: FMain.form:1375
msgid "&View"
msgstr "&Affichage"
#: FMain.form:1380
#: FMain.form:1386
msgid "&Tools"
msgstr "&Outils"
#: FMain.form:1391
#: FMain.form:1397
msgid "&?"
msgstr "&?"
#: FMain.form:1450 FProjectProperty.form:657
#: FMain.form:1456 FProjectProperty.form:657
msgid "Reset filter"
msgstr "Réinitialiser le filtre"

View File

@ -474,7 +474,17 @@ Public Sub mnuPopup_Show()
mnuAddVersion.Hide
Endif
mnuFilter.Visible = IsProject($sKey)
If IsProject($sKey)
mnuFilter.Show
If Project.AddedPaths And If Project.AddedPaths.Count > 0 Then
mnuAddVersionAll.Show
Else
mnuAddVersionAll.Hide
Endif
Else
mnuFilter.Hide
mnuAddVersionAll.Hide
Endif
End
@ -1965,7 +1975,7 @@ Public Sub mnuAddVersion_Click()
If Not Project.IsAdded($sKey, True) Then Return
If Message.Question(("Do you really want to add this file to the repository?"), ("Add"), ("Cancel")) = 2 Then Return
'If Message.Question(("Do you really want to add this file to the repository?"), ("Add"), ("Cancel")) = 2 Then Return
VersionControl.AddFile($sKey)
If Project.IsFormPath($sKey) Then VersionControl.AddFile(File.SetExt($sKey, "class"))
@ -1973,6 +1983,22 @@ Public Sub mnuAddVersion_Click()
End
Public Sub mnuAddVersionAll_Click()
Dim sPath As String
If Message.Question(("Do you really want to add every file to the repository?"), ("Add"), ("Cancel")) = 2 Then Return
For Each Project.AddedPaths
sPath = Project.AddedPaths.Key
VersionControl.AddFile(sPath)
If Project.IsFormPath(sPath) Then VersionControl.AddFile(File.SetExt(sPath, "class"))
Next
Project.Refresh
End
Public Sub panErrorFrame_Arrange()
btnClose.Move(panErrorFrame.Width - btnClose.Width, 0)

View File

@ -560,6 +560,10 @@
Picture = Picture["icon:/small/refresh"]
}
}
{ mnuAddVersionAll Menu
Text = ("Add everything to repository")
Picture = Picture["icon:/small/add"]
}
{ mnuInformation Menu
Action = "info"
Text = Shortcut(("Properties"), "P") & "..."

View File

@ -1120,8 +1120,8 @@ Public Sub btnInstallFont_Click()
Try Copy "font" &/ sFont To sDir &/ sFont
Next
sConf = "~/.config/fontconfig/.fonts.conf"
'If Not Exist(sConf) Then sConf = "~/.fonts.conf"
sConf = "~/.config/fontconfig/fonts.conf"
'If Not Exist(sConf) Then sConf = "~/.config/fontconfig/.fonts.conf"
If Not Exist(sConf) Then
Try Copy "font/font.conf" To sConf

View File

@ -1,7 +1,7 @@
# Gambas Project File 3.0
# Compiled with Gambas 3.5.90
Title=More controls for graphical components
Startup=Main
Startup=Form1
Version=3.5.90
VersionFile=1
Component=gb.image
@ -9,7 +9,7 @@ Component=gb.gui
Component=gb.form
Component=gb.settings
Authors="Benoît Minisini"
Environment="GB_GUI=gb.qt4"
Environment="GB_GUI=gb.gtk"
TabSize=2
Translate=1
Language=en

View File

@ -65,76 +65,8 @@ Private Sub GetTopLevel(hCtrl As Control) As Window
End
' Static Private Sub PaintRoundRect(x As Float, y As Float, w As Float, h As Float, Radius As Float)
'
' Dim ARC_TO_BEZIER As Float = 0.55228475
' Dim c1, c2 As Float
' Dim i As Integer
' Dim radius_x As Float[] = [Radius, Radius, Radius, Radius]
' Dim radius_y As Float[] = radius_x.Copy()
'
' For i = 0 To 3
' If radius_x[i] > w - radius_x[i] Then
' radius_x[i] = w / 2
' Endif
'
' If radius_y[i] > h - radius_y[i] Then
' radius_y[i] = h / 2
' Endif
'
' Next
' 'approximate(quite Close )the arc using a bezier curve
'
' ' A**********B
' ' H C
' ' * *
' ' * *
' ' G D
' ' F**********E
'
' '-->A
' Paint.MoveTo(x + radius_x[0], y)
'
' '-->B
' Paint.LineTo(x + w - radius_x[1], y)
'
' '-->C
' c1 = ARC_TO_BEZIER * radius_x[1]
' c2 = ARC_TO_BEZIER * radius_y[1]
' Paint.RelCurveTo(c1, 0.0, radius_x[1], c2, radius_x[1], radius_y[1])
'
' '-->D
' Paint.LineTo(x + w, y + h - radius_y[2])
'
' '-->E
' c1 = ARC_TO_BEZIER * radius_x[2]
' c2 = ARC_TO_BEZIER * radius_y[2]
' Paint.RelCurveTo(0.0, c2, c1 - radius_x[2], radius_y[2], - radius_x[2], radius_y[2])
'
' '-->F
' Paint.LineTo(x + radius_x[3], y + h)
'
' '-->G
' c1 = ARC_TO_BEZIER * radius_x[3]
' c2 = ARC_TO_BEZIER * radius_y[3]
' Paint.RelCurveTo(- c1, 0, - radius_x[3], - c2, - radius_x[3], - radius_y[3])
'
' '-->H
' Paint.LineTo(x, y + radius_y[0])
'
' '-->A
' c1 = ARC_TO_BEZIER * radius_x[0]
' c2 = ARC_TO_BEZIER * radius_y[0]
' Paint.relcurveto(0.0, - c2, radius_x[0] - c1, - radius_y[0], radius_x[0], - radius_y[0])
'
' 'Paint.closepath()
'
' End
Private Sub MakeBorder(Optional W As Integer, H As Integer)
Dim hPict As Picture
Dim hImage As Image
Dim SX, SY, CX, CY As Integer
Dim X, Y, X1, Y1, X2, Y2, X3, Y3, Y4 As Integer
@ -243,11 +175,12 @@ Private Sub MakeBorder(Optional W As Integer, H As Integer)
iColor = &H808080&
hPict = New Picture(Me.W, Me.H)
'hPict = New Picture(Me.W, Me.H)
hImage = New Image(Me.W, Me.H, Color.Transparent)
Draw.Begin(hPict)
Draw.Begin(hImage)
Draw.FillRect(0, 0, Draw.W, Draw.H, Color.White)
'Draw.FillRect(0, 0, Draw.W, Draw.H, Color.White)
DrawRoundRect(0, ARROW_HEIGHT, Me.W, Me.H - ARROW_HEIGHT * 2)
Draw.FillStyle = Fill.Solid
@ -257,7 +190,7 @@ Private Sub MakeBorder(Optional W As Integer, H As Integer)
'DrawInternalRect(0, ARROW_HEIGHT, ME.W, ME.H - ARROW_HEIGHT * 2)
Draw.Polygon([X1, Y1, X2, Y2, X3, Y3])
Draw.FillColor = Me.Background
Draw.FillColor = BACKGROUND_COLOR 'Me.Background
'DrawInternalRect(1, ARROW_HEIGHT + 1, ME.W - 2, ME.H - (ARROW_HEIGHT + 1) * 2)
Draw.Polygon([X1, Y1, X2, Y2, X3, Y3])
@ -268,21 +201,19 @@ Private Sub MakeBorder(Optional W As Integer, H As Integer)
Paint.LineTo(X1, Y1)
Paint.LineTo(X3, Y3)
Paint.Stroke
Paint.Background = Me.Background
Paint.Background = BACKGROUND_COLOR 'Me.Background
Paint.MoveTo(X2, Y2)
Paint.LineTo(X3, Y3)
Paint.Stroke
Draw.End
hImage = hPict.Image
'hImage = hPict.Image
'hImage = hImage.Erase()
hImage.Replace(BACKGROUND_COLOR, Me.Background)
hImage.Replace(Color.TextBackground, Color.Transparent)
hPict = hImage.Picture
'Wait
Me.Picture = hPict
Me.Picture = hImage.Picture
$sOld = sNew
@ -476,7 +407,10 @@ End
Public Sub _new()
Me.Background = Color.Merge(Color.TextBackground, Color.LightBackground)
If Color.TooltipBackground = Color.White Then
Me.Background = &HFFFFFE&
Else
Me.Background = Color.TooltipBackground
Endif
End

View File

@ -13,3 +13,9 @@ Public Sub _new()
Component.Load("gb.desktop")
End
Public Sub Button3_Click()
Balloon("Ceci n'est pas un ballon.\nMais une bulle !", Last)
End

View File

@ -6,7 +6,7 @@
Spacing = True
Margin = True
{ HBox1 HBox
MoveScaled(8,2,39,5)
MoveScaled(8,2,84,5)
#Translate = False
{ Button1 Button
MoveScaled(0,0,16,4)
@ -18,6 +18,10 @@
#Translate = False
Text = "Button2"
}
{ Button3 Button
MoveScaled(36,0,16,4)
Text = ("Balloon")
}
}
{ Panel1 HBox
MoveScaled(3,9,102,64)

View File

@ -32,7 +32,7 @@
static void set_font_from_string(gFont *font, const char *str)
{
gchar **tokens, **p;
gchar *elt;
gchar *copy, *elt;
int grade;
double size;
@ -51,7 +51,8 @@ static void set_font_from_string(gFont *font, const char *str)
p = tokens;
for(p = tokens; *p; p++)
{
elt = *p;
copy = g_strdup(*p);
elt = g_strstrip(copy);
if (!strcasecmp(elt, "bold"))
font->setBold(true);
@ -81,6 +82,8 @@ static void set_font_from_string(gFont *font, const char *str)
font->setName(elt);
}
}
g_free(copy);
}
g_strfreev(tokens);

View File

@ -105,7 +105,7 @@ END_METHOD
BEGIN_METHOD(GLGENERATEMIPMAPEXT, GB_INTEGER target)
GenerateMipmapEXT(VARG(target));
glGenerateMipmapEXT(VARG(target));
END_METHOD
@ -166,7 +166,7 @@ BEGIN_METHOD(GLGETRENDERBUFFERPARAMETERIVEXT, GB_INTEGER target; GB_INTEGER pnam
GB_ARRAY iArray;
GB.Array.New(&iArray , GB_T_INTEGER , 1);
GetRenderbufferParameterivEXT(VARG(target), VARG(pname), params);
glGetRenderbufferParameterivEXT(VARG(target), VARG(pname), params);
*((GLuint *)GB.Array.Get(iArray, 0)) = params[0];
GB.ReturnObject(iArray);

View File

@ -126,6 +126,7 @@ static void set_font_from_string(CFONT *_object, QString &str)
for (QStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
elt = (*it);
elt = elt.trimmed();
flag = elt.toUpper();
size = elt.toDouble(&number);