Menu
▾
▴
sharedaemon-cvs — ShareDaemon CVS Updates
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(102) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(38) |
Feb
(16) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ma...@us...> - 2003-12-23 23:38:29
|
Update of /cvsroot/sharedaemon/ui-wx/src/lang In directory sc8-pr-cvs1:/tmp/cvs-serv15291/src/lang Added Files: French.po Log Message: French translation by Nicolas Lussier. --- NEW FILE: French.po --- # French translation for ShareDaemon wxInterface # Copyright (C) 2003 ShareDaemon wxInterface # This file is distributed under the same license as the ShareDaemon wxInterface package. # Nicolas Lussier <n.l...@fr...>, 2003. # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2003-12-01 22:36+0200\n" "PO-Revision-Date: 2003-12-23 14:53+0100\n" "Last-Translator: Nicolas Lussier\n" "Language-Team: French <n.l...@fr...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #: DownloadListCtrl.cpp:52 #: SharedFilesListCtrl.cpp:52 msgid "File Name" msgstr "Nom de fichier" #: DownloadListCtrl.cpp:52 #: SearchListCtrl.cpp:56 #: SharedFilesListCtrl.cpp:52 msgid "Size" msgstr "Taille" #: DownloadListCtrl.cpp:52 #: UploadListCtrl.cpp:52 #: wxInterface_wdr.cpp:380 #: wxInterface_wdr.cpp:428 msgid "Transferred" msgstr "Transféré" #: DownloadListCtrl.cpp:52 msgid "Completed" msgstr "Complété" #: DownloadListCtrl.cpp:53 #: UploadListCtrl.cpp:52 msgid "Speed" msgstr "Vitesse" #: DownloadListCtrl.cpp:53 msgid "Progress" msgstr "Progression" #: DownloadListCtrl.cpp:53 #: SearchListCtrl.cpp:56 msgid "Sources" msgstr "Sources" #: DownloadListCtrl.cpp:53 #: SharedFilesListCtrl.cpp:53 msgid "Priority" msgstr "Priorité" #: DownloadListCtrl.cpp:54 #: UploadListCtrl.cpp:53 msgid "Status" msgstr "Statut" #: DownloadListCtrl.cpp:54 msgid "Remaining" msgstr "Restant" #: DownloadListCtrl.cpp:54 msgid "Last Seen Complete" msgstr "Vu complet la dernière fois" #: DownloadListCtrl.cpp:55 msgid "Last Reception" msgstr "Dernière reception" #: DownloadListCtrl.cpp:55 msgid "Category" msgstr "catégorie" #: GUISettingsDlg.cpp:312 #: GUISettingsDlg.cpp:402 msgid "Add new language" msgstr "Ajouter un nouveau langage" #: GUISettingsDlg.cpp:328 #, c-format msgid "" "Are you sure you wish to remove language \t\t%s from the list of languages?\n" "\t\tThe actual language files will not be deleted." msgstr "" "Etes-vous sur de vouloir enlever \t\t%s de la liste des langues?\n" "\t\t Le fichier de la langue courante ne sera pas effacé." #: GUISettingsDlg.cpp:333 msgid "Confirm remove language" msgstr "Valider la suppression de la langue" #: GUISettingsDlg.cpp:346 #: GUISettingsDlg.cpp:439 msgid "Add new iconset" msgstr "Ajouter un thème d'icones" #: GUISettingsDlg.cpp:362 #, c-format msgid "" "Are you sure you wish to remove iconset \t\t%s from the list of iconsets?\n" "\t\tThe actual iconset files will not be deleted." msgstr "" "Etes-vous sur de vouloir enlever le thème d'icones \t\t%s de la liste ?\n" "\t\t Le fichier du thème d'icones courant ne sera pas effacé." #: GUISettingsDlg.cpp:368 msgid "Confirm remove iconset" msgstr "Valider la suppression du thème d'icones" #: GUISettingsDlg.cpp:381 msgid "Language" msgstr "Langue" #: GUISettingsDlg.cpp:390 msgid "Change the language of the interface. Requires interface \t\trestart to take effect" msgstr "Changer la langue de l'interface. Nécessite un re-démarrage de l'interface" #: GUISettingsDlg.cpp:398 #: GUISettingsDlg.cpp:435 msgid "Add" msgstr "Ajouter" #: GUISettingsDlg.cpp:407 #: GUISettingsDlg.cpp:444 msgid "Remove" msgstr "Enlever" #: GUISettingsDlg.cpp:411 msgid "Remove currently selected language" msgstr "Enlever la langue courante " #: GUISettingsDlg.cpp:419 msgid "Icon set" msgstr "Thème d'icones" #: GUISettingsDlg.cpp:428 msgid "Change the iconet the interface should use." msgstr "Changer le thème d'icones de l'interface" #: GUISettingsDlg.cpp:448 msgid "Remove currently selected iconset" msgstr "Enlever le thème d'icones courant" #: GUISettingsDlg.cpp:460 msgid "Font" msgstr "Police" #: GUISettingsDlg.cpp:464 msgid "Default" msgstr "Default" #: GUISettingsDlg.cpp:471 msgid "Change the font" msgstr "Changer la police" #: GUISettingsDlg.cpp:476 msgid "Font Test :)" msgstr "Test de police :)" #: GUISettingsDlg.cpp:483 msgid "Startup page" msgstr "Page de démarrage" #: GUISettingsDlg.cpp:487 #: wxInterface_wdr.cpp:158 msgid "Server" msgstr "Serveur" #: GUISettingsDlg.cpp:488 #: Images.cpp:293 #: MainDlg.cpp:278 #: MainDlg.cpp:420 #: MainDlg.cpp:427 msgid "Transfer" msgstr "Transfert" #: GUISettingsDlg.cpp:489 #: Images.cpp:291 #: MainDlg.cpp:272 #: MainDlg.cpp:419 #: MainDlg.cpp:426 #: wxInterface_wdr.cpp:136 msgid "Search" msgstr "Recherche" #: GUISettingsDlg.cpp:490 #: Images.cpp:295 #: MainDlg.cpp:284 #: MainDlg.cpp:421 #: MainDlg.cpp:428 #: wxInterface_wdr.cpp:350 msgid "Shared Files" msgstr "Fichiers partagés" #: GUISettingsDlg.cpp:491 #: MainDlg.cpp:290 #: MainDlg.cpp:422 #: MainDlg.cpp:429 #: wxInterface_wdr.cpp:497 msgid "Messages" msgstr "Messages" #: GUISettingsDlg.cpp:492 #: Images.cpp:299 #: MainDlg.cpp:296 #: MainDlg.cpp:423 #: MainDlg.cpp:430 #: wxInterface_wdr.cpp:358 msgid "Statistics" msgstr "Statistiques" #: GUISettingsDlg.cpp:500 msgid "Set which page will be displayed on program startup" msgstr "Sélectionner la page à afficher au démarrage du programme" #: GUISettingsDlg.cpp:506 msgid "Remember last" msgstr "Conserver le dernier" #: GUISettingsDlg.cpp:511 msgid "Automatically remember which page was \t\topen between sessions" msgstr "Se souvenir automatiquement de l'onglet \t\tentre les sessions" #: GUISettingsDlg.cpp:523 msgid "Show splashscreen" msgstr "Montrer le logo au démarrage" #: GUISettingsDlg.cpp:529 msgid "Toggle wether splashscreen should be shown on program \t\tstartup or not. Speeds up application starting if turned off. \t\tDefault: On" msgstr "Sélectionner si l'ecran de démarrage doit etre montré ou non. \t\tAugmente le démarage si désactivé. \t\tDefult : Oui" #: GUISettingsDlg.cpp:537 msgid "Prompt on exit" msgstr "Afficher a la sortie" #: GUISettingsDlg.cpp:542 msgid "Toggle wether confirmation is requested \t\twhen closing program." msgstr "Sélectionner si la confirmation est demandée \t\tquand on sort du programme" #: GUISettingsDlg.cpp:554 #: MainDlg.cpp:438 msgid "Show ToolBar" msgstr "Montrer la barre d'outils" #: GUISettingsDlg.cpp:559 msgid "Toggle wether toolbar is shown or not." msgstr "Sélectionner si la barre d'outil doit etre montrée ou non." #: GUISettingsDlg.cpp:567 #: MainDlg.cpp:445 #: MainDlg.cpp:459 msgid "Horizontal" msgstr "Horizontal" #: GUISettingsDlg.cpp:568 #: MainDlg.cpp:448 #: MainDlg.cpp:460 msgid "Vertical" msgstr "Vertical" #: GUISettingsDlg.cpp:576 msgid "Horizontal tooltip is shown on top of window (default),\t\tvertical is shown on the left side of window." msgstr "Aide pop-up horizontale est affichée en haut de la fenêtre (default),\t\tvertical est affiché sur la gauche de la fenêtre." #: GUISettingsDlg.cpp:587 #: MainDlg.cpp:434 msgid "Show MenuBar" msgstr "Afficher barre de menu" #: GUISettingsDlg.cpp:592 msgid "Toggle wether menubar (file/view etc) \t\tshould be shown or not." msgstr "Sélectionner si la barre de menu (Fichiers/Edition etc) \t\t doit etre affichée ou non." #: GUISettingsDlg.cpp:606 #: wxInterface_wdr.cpp:796 #: wxInterface_wdr.cpp:838 msgid "OK" msgstr "OK" #: GUISettingsDlg.cpp:610 msgid "Save settings and close dialog" msgstr "Sauvegarder les paramètres et fermer la fenêtre" #: GUISettingsDlg.cpp:615 #: wxInterface_wdr.cpp:274 #: wxInterface_wdr.cpp:800 #: wxInterface_wdr.cpp:842 msgid "Cancel" msgstr "Annuler" #: GUISettingsDlg.cpp:619 msgid "Abort changes and close dialog" msgstr "Annuler les changements et fermer la fenêtre" #: GUISettingsDlg.cpp:666 msgid "" "You need to enter the name for your new language!\n" "\t\t\tIf you no longer wish to add a language, click\t\t\t'Cancel'" msgstr "" "Vous devez rentrer le nom de votre nouvelle langue !\n" "\t\tSi vous ne voulez plus ajouter de nouvelle langue, cliquer sur \t\t\t'Annuler'" #: GUISettingsDlg.cpp:669 msgid "Missing information" msgstr "Information manquante" #: GUISettingsDlg.cpp:681 #, c-format msgid "The file %s does not exist.\n" msgstr "Le fichier %s n'existe pas. \n" #: GUISettingsDlg.cpp:683 msgid "" "Please make sure you specified correct name, and\t\t\t the\n" "translated and compiled .mo file exists in\t\t\t lang subdir." msgstr "" "Veuillez vérifier que vous avez spécifié un nom correct, et\t\t\t que\n" "le fichier traduit et compilé .mo existe dans \t\t\t le sous-dossier lang." #: GUISettingsDlg.cpp:686 msgid "File not found" msgstr "Fichier non trouvé" #: GUISettingsDlg.cpp:697 #, c-format msgid "New language %s added.\n" msgstr "Nouvelle langue %s ajouté.\n" #: GUISettingsDlg.cpp:698 msgid "Please restart the interface to test your new language!" msgstr "Veuillez redémarrer l'interface pour tester votre nouvelle langue!" #: GUISettingsDlg.cpp:699 msgid "Success!" msgstr "Succès!" #: Images.cpp:287 #: MainDlg.cpp:259 #: MainDlg.cpp:408 msgid "Connect" msgstr "Connecter" #: Images.cpp:289 #: MainDlg.cpp:266 #: MainDlg.cpp:418 #: MainDlg.cpp:425 msgid "Servers" msgstr "Serveurs" #: Images.cpp:297 msgid "Messaging" msgstr "Messagerie" #: Images.cpp:301 #: MainDlg.cpp:303 #: MainDlg.cpp:352 #: MainDlg.cpp:413 msgid "Preferences" msgstr "Préférences" #: KnownListCtrl.cpp:53 #: QueueListCtrl.cpp:52 #: UploadListCtrl.cpp:52 msgid "Username" msgstr "Nom d'utilisateur" #: KnownListCtrl.cpp:53 msgid "Upload Status" msgstr "Etat de l'upload" #: KnownListCtrl.cpp:53 msgid "Transferred Up" msgstr "Transféré" #: KnownListCtrl.cpp:54 msgid "Download Status" msgstr "Etat du download" #: KnownListCtrl.cpp:54 msgid "Client Software" msgstr "Logiciel client" #: KnownListCtrl.cpp:54 msgid "Connected" msgstr "Connecté" #: KnownListCtrl.cpp:55 msgid "Userhash" msgstr "Userhash" #: MainDlg.cpp:262 msgid "Connect to any server" msgstr "Se connecter à n'importe quel serveur" #: MainDlg.cpp:269 msgid "Server list" msgstr "Liste des serveurs" #: MainDlg.cpp:275 msgid "Search files" msgstr "Rechercher fichiers" #: MainDlg.cpp:281 msgid "File Transfer" msgstr "Transfert de fichier" #: MainDlg.cpp:287 msgid "Show shared files" msgstr "Afficher les fichiers partagés" #: MainDlg.cpp:293 msgid "Chatting" msgstr "Discuter" #: MainDlg.cpp:299 msgid "Show live statistics" msgstr "Montrer les statistiques en direct" #: MainDlg.cpp:306 msgid "Modify settings" msgstr "Modifier les paramètres" #: MainDlg.cpp:328 msgid "Close ShareDaemon wxInterface?" msgstr "Fermer l'interface wx de ShareDaemon ?" #: MainDlg.cpp:329 msgid "Question" msgstr "Question" #: MainDlg.cpp:409 #: SysTray.cpp:70 msgid "Quit" msgstr "Sortir" #: MainDlg.cpp:463 msgid "ToolBar Alignment" msgstr "Alignement de la barre d'outil" #: MainDlg.cpp:467 #: MainDlg.cpp:474 #: SysTray.cpp:69 msgid "Help" msgstr "Aide" #: MainDlg.cpp:468 msgid "About..." msgstr "A propos..." #: MainDlg.cpp:471 #: QueueListCtrl.cpp:52 #: UploadListCtrl.cpp:52 msgid "File" msgstr "Fichier" #: MainDlg.cpp:472 msgid "Edit" msgstr "Edition" #: MainDlg.cpp:473 msgid "View" msgstr "Voir" #: QueueListCtrl.cpp:52 msgid "File Priority" msgstr "Prioritée du fichier" #: QueueListCtrl.cpp:52 msgid "Rating" msgstr "Estimation" #: QueueListCtrl.cpp:53 msgid "Score" msgstr "Score" #: QueueListCtrl.cpp:53 msgid "Asked" msgstr "Demande" #: QueueListCtrl.cpp:53 msgid "Last Seen" msgstr "Vu le" #: QueueListCtrl.cpp:53 msgid "Entered Queue" msgstr "Entre dans la file" #: QueueListCtrl.cpp:54 msgid "Banned" msgstr "Bannis" #: QueueListCtrl.cpp:54 #: SharedFilesListCtrl.cpp:54 #: UploadListCtrl.cpp:53 msgid "Obtained Parts" msgstr "Parties obtenues" #: SearchListCtrl.cpp:56 #: ServerWnd.cpp:561 #: wxInterface_wdr.cpp:139 msgid "Name" msgstr "Nom" #: SearchListCtrl.cpp:56 #: SharedFilesListCtrl.cpp:52 #: wxInterface_wdr.cpp:150 msgid "Type" msgstr "Type" #: SearchListCtrl.cpp:56 #: SharedFilesListCtrl.cpp:53 msgid "Hash" msgstr "Hash" #: ServerListCtrl.cpp:53 msgid "Server Name" msgstr "Nom du serveur" #: ServerListCtrl.cpp:53 msgid "IP" msgstr "IP" #: ServerListCtrl.cpp:53 msgid "Description" msgstr "Description" #: ServerListCtrl.cpp:54 msgid "Ping" msgstr "Ping" #: ServerListCtrl.cpp:54 msgid "Users" msgstr "Utilisateurs" #: ServerListCtrl.cpp:54 msgid "Max Users" msgstr "Utilisateurs maximum" #: ServerListCtrl.cpp:55 msgid "Files" msgstr "Fichiers" #: ServerListCtrl.cpp:55 msgid "Preference" msgstr "Préférence" #: ServerListCtrl.cpp:55 msgid "Failed" msgstr "Echoué" #: ServerListCtrl.cpp:56 #: ServerWnd.cpp:418 msgid "Static" msgstr "Statique" #: ServerListCtrl.cpp:56 msgid "Soft File Limit" msgstr "Limite soft du fichier" #: ServerListCtrl.cpp:56 msgid "Hard File Limit" msgstr "Limite Hard du fichier" #: ServerListCtrl.cpp:57 msgid "Version" msgstr "Version" #: ServerWnd.cpp:220 msgid "Add new server" msgstr "Ajoute un nouveau serveur" #: ServerWnd.cpp:234 msgid "Update from URL" msgstr "Metre à jour depuis l'URL" #: ServerWnd.cpp:242 msgid "Server settings" msgstr "Paramètres du serveur" #: ServerWnd.cpp:250 msgid "Port settings" msgstr "Paramètres du port" #: ServerWnd.cpp:258 msgid "Log options" msgstr "Options du Log" #: ServerWnd.cpp:364 msgid "Autoconnect" msgstr "Connexion automatique" #: ServerWnd.cpp:369 msgid "Toggle wether application should automatically connect \t\tto any server on startup" msgstr "Sélectionner si le core doit se connecter automatiquement \t\tà un serveur au démarage" #: ServerWnd.cpp:378 msgid "To static only" msgstr "Seulement au statique" #: ServerWnd.cpp:383 msgid "Toggle wether application should connect \t\tto servers marked as \"static\" only" msgstr "Sélectionner si le core doit se connecter aux \t\tserveurs marqués comme \"statique\" uniquement" #: ServerWnd.cpp:423 msgid "Set server static. Static servers are not \t\tremoved from list if they do not respond" msgstr "Mettre le serveur en statique. Les serveurs statiques ne sont pas retirés s'ils ne reponde pas" #: ServerWnd.cpp:434 msgid "Priority:" msgstr "Prioritée:" #: ServerWnd.cpp:440 msgid "High" msgstr "Haute" #: ServerWnd.cpp:441 msgid "Normal" msgstr "Normal" #: ServerWnd.cpp:442 msgid "Low" msgstr "Basse" #: ServerWnd.cpp:449 msgid "Change server priority" msgstr "Changer la priorité du serveur" #: ServerWnd.cpp:482 msgid "Line limit" msgstr "Limite line" #: ServerWnd.cpp:487 msgid "Toggle wether there should be a line limit \t\tfor log boxes (saves memory)" msgstr "Sélectionner il doit y avoir une limite de ligne \t\t pour le journal (economie de mémoire)" #: ServerWnd.cpp:498 msgid "Maximum number of lines in log boxes" msgstr "Nombre maximum de lignes dans les journaux" #: ServerWnd.cpp:505 msgid "Save to disk" msgstr "Enregistrer sur le disque" #: ServerWnd.cpp:509 msgid "Save logs to disc also" msgstr "Sauvegarder aussi le journal sur le disque" #: ServerWnd.cpp:514 msgid "Clear" msgstr "Effacer" #: ServerWnd.cpp:518 msgid "Clear all logs" msgstr "Effacer tout les logs" #: ServerWnd.cpp:543 msgid "IP address:Port" msgstr "Adresse IP:Port" #: ServerWnd.cpp:554 msgid "Type in the ip address and port of the new \t\tserver, separated by `:`" msgstr "Rentrer ici l'adresse ip et le port du nouveau \t\tserver, séparé par ':'" #: ServerWnd.cpp:571 msgid "Optional: Enter the name of the new server" msgstr "Optionnel: Entrer le nom du nouveau serveur" #: ServerWnd.cpp:578 msgid "Add to List" msgstr "Ajouter à la liste" #: ServerWnd.cpp:582 msgid "Add the server to list" msgstr "Ajouter à la liste des serveurs" #: ServerWnd.cpp:619 msgid "Update" msgstr "Mettre à jour" #: ServerWnd.cpp:666 msgid "Enter the TCP port for connections (default: 4662)" msgstr "Entrer le port TCP pour les connexions (default : 4662)" #: ServerWnd.cpp:677 msgid "Enter the UDP port for connections (default: 4672)" msgstr "Entrer le port UDP pour les connexions (default : 4672)" #: ServerWnd.cpp:689 msgid "Disable" msgstr "Désactiver" #: ServerWnd.cpp:694 msgid "Disable UDP port. This can somewhat lower traffic, \t\tbut also results in less sources as client<->client source \t\texchange is done via UDP" msgstr "Désactiver le prot UDP. Cela peut entrainer moins de traffique, \t\tmais aussi moins de sources car les sources client<->client \t\tson echangées par UDP" #: ServerWnd.cpp:706 msgid "Apply changes" msgstr "Appliquer les changements" #: SharedFilesListCtrl.cpp:52 msgid "Accepted Requests" msgstr "Requettes acceptées" #: SharedFilesListCtrl.cpp:53 msgid "Permission" msgstr "Permission" #: SharedFilesListCtrl.cpp:53 #: wxInterface_wdr.cpp:374 #: wxInterface_wdr.cpp:422 msgid "Requests" msgstr "Requettes" #: SharedFilesListCtrl.cpp:54 msgid "Transferred Data" msgstr "Données transferées" #: SharedFilesListCtrl.cpp:54 msgid "Folder" msgstr "Dossier" #: SysTray.cpp:67 msgid "Hide/Show Interface" msgstr "Cacher/Afficher interface" #: SysTray.cpp:68 #: SysTray.cpp:86 msgid "Settings" msgstr "Paramètres" #: TransferWnd.cpp:144 msgid "Client on Queue:" msgstr "Client en attente :" #: TransferWnd.cpp:187 msgid "Downloads" msgstr "Downloads" #: TransferWnd.cpp:208 #: wxInterface_wdr.cpp:300 msgid "All" msgstr "Tous" #: TransferWnd.cpp:251 msgid "Uploads" msgstr "Uploads" #: TransferWnd.cpp:294 msgid "On Queue" msgstr "En attente" #: TransferWnd.cpp:334 msgid "Known Clients" msgstr "Clients connus" #: UploadListCtrl.cpp:53 msgid "Waited" msgstr "Attente" #: UploadListCtrl.cpp:53 msgid "Upload Time" msgstr "Temps d'upload" #: wxInterface_wdr.cpp:147 msgid "Method" msgstr "Méthode" #: wxInterface_wdr.cpp:157 msgid "Global" msgstr "Global" #: wxInterface_wdr.cpp:165 msgid "Any" msgstr "Tous" #: wxInterface_wdr.cpp:166 msgid "Video" msgstr "Video" #: wxInterface_wdr.cpp:167 msgid "Audio" msgstr "Audio" #: wxInterface_wdr.cpp:168 msgid "Archive" msgstr "Archive" #: wxInterface_wdr.cpp:169 msgid "Text" msgstr "Texte" #: wxInterface_wdr.cpp:170 msgid "Image" msgstr "Image" #: wxInterface_wdr.cpp:175 msgid "Reset" msgstr "Annuler" #: wxInterface_wdr.cpp:182 msgid "Filter" msgstr "Filtre" #: wxInterface_wdr.cpp:189 msgid "min Size" msgstr "Taille Min." #: wxInterface_wdr.cpp:202 msgid "max Size" msgstr "Taille Max." #: wxInterface_wdr.cpp:219 msgid "Availability" msgstr "Disponibilité" #: wxInterface_wdr.cpp:231 msgid "Extension" msgstr "Extension" #: wxInterface_wdr.cpp:243 msgid "Direct Download" msgstr "Download directe" #: wxInterface_wdr.cpp:246 msgid "ED2K Link(s)" msgstr "Lien(s) ED2K" #: wxInterface_wdr.cpp:264 msgid "Search Results" msgstr "Resultats de la recherche" #: wxInterface_wdr.cpp:271 msgid "Start" msgstr "Démarrer" #: wxInterface_wdr.cpp:290 msgid "Download Selected" msgstr "Télécharger la selection" #: wxInterface_wdr.cpp:367 msgid "Current Session" msgstr "Session courante" #: wxInterface_wdr.cpp:377 #: wxInterface_wdr.cpp:425 msgid "Accepted Uploads" msgstr "Upload acceptés" #: wxInterface_wdr.cpp:415 msgid "Total" msgstr "Totale" #: wxInterface_wdr.cpp:478 msgid "Friends" msgstr "Amis" #: wxInterface_wdr.cpp:506 msgid "Page" msgstr "Page" #: wxInterface_wdr.cpp:517 msgid "Send" msgstr "Envoyer" #: wxInterface_wdr.cpp:521 msgid "Close" msgstr "Fermer" #: wxInterface_wdr.cpp:556 msgid "Statistics last reset: Unknown" msgstr "Derniere remise à zéro des statistiques: Inconnue" #: wxInterface_wdr.cpp:569 msgid "Connection Statistics" msgstr "Statistiques de connexion" #: wxInterface_wdr.cpp:578 msgid "active downloads" msgstr "Download actif" #: wxInterface_wdr.cpp:593 msgid "active connections (1:3)" msgstr "Connexion active (1:3)" #: wxInterface_wdr.cpp:604 msgid "active uploads" msgstr "Upload actif" #: wxInterface_wdr.cpp:628 msgid "Download-Speed" msgstr "Vitesse de téléchargement" #: wxInterface_wdr.cpp:637 #: wxInterface_wdr.cpp:690 msgid "session average" msgstr "Moyenne de la session" #: wxInterface_wdr.cpp:653 #: wxInterface_wdr.cpp:706 msgid "current" msgstr "courrant" #: wxInterface_wdr.cpp:664 #: wxInterface_wdr.cpp:717 msgid "average (5 mins)" msgstr "moyenne (5 min)" #: wxInterface_wdr.cpp:681 msgid "Upload-Speed" msgstr "Vitesse d'upload" #: wxInterface_wdr.cpp:757 msgid "Log" msgstr "Journal" #: wxInterface_wdr.cpp:761 msgid "Debug Log" msgstr "Journal debug" #: wxInterface_wdr.cpp:784 msgid "" "Please speciy the name for your new language. \n" "File with this name and extension .mo must exist \n" "in lang/ subdirectory. To create that file, refer to\n" "the TRANSLATION file in the package directory." msgstr "" "Spécifiez, s'il vous plait, le nom du la nouvelle lngue. \n" "Le fichier avec ce nom et l'extension .mo n'existe pas\n" "dans le sous-dossier lang/. Pour créer ce fichier, ce référer au\n" "fichier TRANSLATION dans le répertoire du package." #: wxInterface_wdr.cpp:824 msgid "" "Please enter the name of your new icon set in the box below.\n" "The iconset files must be in PNG format and filenames must\n" "match what they are in other sets. The files are looked for\n" "in the images/youriconsetname (lowercased!). So if your\n" "iconset name is MyNewIconSet, it will be looked for in\n" "images/mynewiconset dir." msgstr "" "Veuillez, s'il vous plait, entrez le nom de votre thème d'icones dans la boite dessous.\n" "Le thème d'icones doit etre au format PNG et le nom des fichiers doit correspondre\n" "à ceux des autres thèmes. Les fichiers sont recherchés dans images/lenomdevotretheme \n" " (minuscules!). Donc si votre thème s'appele MomThemeIcones, il sera rechercher dans \n" "le répertoire images/momthemeicones" #: wxInterface_wdr.cpp:871 msgid "ShareDaemon wxInterface ready!" msgstr "L'interface wx de ShareDeamon est prête!" #: wxInterface_wdr.cpp:907 msgid "0 kb/s" msgstr "0 Ko/s" #: wxInterface_wdr.cpp:916 msgid "Disconnected" msgstr "Déconnecter" |
|
From: <ma...@us...> - 2003-12-23 23:38:29
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15291/src
Modified Files:
wxInterface.cpp
Log Message:
French translation by Nicolas Lussier.
Index: wxInterface.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/wxInterface.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wxInterface.cpp 20 Dec 2003 03:37:26 -0000 1.11
+++ wxInterface.cpp 23 Dec 2003 23:38:25 -0000 1.12
@@ -167,6 +167,7 @@
supportedlangs.Add(wxT("Default"));
supportedlangs.Add(wxT("German"));
supportedlangs.Add(wxT("Estonian"));
+ supportedlangs.Add(wxT("French"));
supportedlangs.Add(wxT("Spanish"));
m_config->SetPath(wxT("/General/Lang"));
@@ -268,6 +269,8 @@
return wxLANGUAGE_ESTONIAN;
} else if (lang == wxT("Spanish")) {
return wxLANGUAGE_SPANISH;
+ } else if (lang == wxT("French")) {
+ return wxLANGUAGE_FRENCH;
} else {
return wxLANGUAGE_DEFAULT;
}
|
|
From: <ma...@us...> - 2003-12-23 23:38:29
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv15291 Modified Files: Changelog Log Message: French translation by Nicolas Lussier. Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- Changelog 22 Dec 2003 22:10:58 -0000 1.112 +++ Changelog 23 Dec 2003 23:38:25 -0000 1.113 @@ -25,6 +25,9 @@ # This also helps in backtracking changes, or reviewing development history. # ############################################################################### +2003/12/24 Alo Sarv + * French translation by Nicolas Lussier. + 2003/12/23 Alo Sarv * Avoid crash when requesting non-existent image from CImages. * Avoid crash on shutdown when there are no dialog pages. |
|
From: <ma...@us...> - 2003-12-23 00:59:24
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21253
Modified Files:
MMultiButton.cpp
Log Message:
Fixes layout issues on toolbar after frame resizing.
Index: MMultiButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MMultiButton.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MMultiButton.cpp 22 Dec 2003 12:06:23 -0000 1.3
+++ MMultiButton.cpp 23 Dec 2003 00:59:20 -0000 1.4
@@ -122,6 +122,5 @@
/******************************************************************************/
void MMultiButton::OnPaint(wxPaintEvent &event) {
SetBackgroundColour(GetParent()->GetBackgroundColour());
- Fit();
event.Skip();
}
|
|
From: <ma...@us...> - 2003-12-23 00:41:43
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18411
Modified Files:
MBitmapButton.cpp MBitmapButton.h
Log Message:
Fixes stuff
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MBitmapButton.cpp 22 Dec 2003 12:06:23 -0000 1.5
+++ MBitmapButton.cpp 23 Dec 2003 00:41:40 -0000 1.6
@@ -146,6 +146,7 @@
tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
#endif
SetBitmapLabel(*tmp);
+ orig_img = *tmp;
SetSize(wxSize(tmp->GetWidth()+10, tmp->GetHeight()+5));
delete tmp;
}
@@ -172,7 +173,7 @@
mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID));
#endif
mdc.DrawRectangle(0, 0, tmp.GetWidth(), tmp.GetHeight());
- mdc.DrawBitmap(GetBitmapLabel(), 0, 0, true);
+ mdc.DrawBitmap(orig_img, 0, 0, true);
#ifndef __WXMSW__
tmp.SetMask(new wxMask(tmp, wxColour(0, 0, 0)));
#endif
Index: MBitmapButton.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MBitmapButton.h 22 Dec 2003 11:56:02 -0000 1.2
+++ MBitmapButton.h 23 Dec 2003 00:41:40 -0000 1.3
@@ -81,6 +81,7 @@
DECLARE_EVENT_TABLE()
void OnClick(wxCommandEvent &event){ event.Skip(); } /* Skips events */
void OnSize(wxSizeEvent &event); /* Updates image */
+ wxBitmap orig_img; /* Original generated image */
};
#endif // ___WXMSW__
|
|
From: <ma...@us...> - 2003-12-23 00:40:53
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18275
Modified Files:
MainDlg.cpp MainDlg.h
Log Message:
Moved class descriptions to header.
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- MainDlg.cpp 22 Dec 2003 22:00:10 -0000 1.35
+++ MainDlg.cpp 23 Dec 2003 00:40:50 -0000 1.36
@@ -43,12 +43,6 @@
class CStatusBar *statusbar;
class CToolBar *toolbar;
-/***************************** MyToolBar class ********************************/
-/* This class is derived from wxToolBar and is used for main frame */
-/* toolbar. The main purpose for this class is catching mouse right- */
-/* click events, and sending them to mainframe. Can't do it from */
-/* mainframe, so we'll do it here. */
-/******************************************************************************/
BEGIN_EVENT_TABLE(MyToolBar, wxToolBar)
EVT_RIGHT_DOWN(MyToolBar::RightClick) /* Toolbar Right-click */
END_EVENT_TABLE()
@@ -70,12 +64,6 @@
mainframe->ShowToolPopupMenu();
}
-/**************************** DetachedFrame class *****************************/
-/* This class is derived from wxFrame and provides minimal frame support */
-/* for displaying some dialog page. It is used mainly for detaching */
-/* pages from main frame and dumping here. When this frame is closed, */
-/* it passes the contents back to main frame. */
-/******************************************************************************/
BEGIN_EVENT_TABLE(DetachedFrame, wxFrame)
EVT_CLOSE(DetachedFrame::OnClose)
END_EVENT_TABLE()
@@ -116,25 +104,6 @@
Destroy();
}
-/************************** CMainDlg class ************************************/
-/* This is the MAIN frame of the entire interface. It servers as host */
-/* a number of controls, most importantly the following: */
-/* * Dialog Pages. These are wxPanel-derived classes with the actual */
-/* contents. "Server Page", "Search Page", "Transfer Page" are */
-/* examples of Dialog Pages. The number of possible dialog pages */
-/* is pretty much infinite. */
-/* * ToolBar. This is created using MyToolBar class, and contains main */
-/* navigation controls. The images for toolbar are generated */
-/* manually from image+text since toolbar texts are not */
-/* supported on wxMac. */
-/* * Menubar. This is a pretty much standard menubar that contains the */
-/* usual File/Edit/View/Help sections. By default, it is hidden, */
-/* but can be turned on from Preferences. */
-/* * StatusBar. This is NOT, as the name might suggest, derived from */
-/* wxStatusBar, simply because wxStatusBar doesn't give enough */
-/* functionality for what we need to do (on some platforms, */
-/* native statusbar is thinner, thus our images won't fit there) */
-/******************************************************************************/
BEGIN_EVENT_TABLE(CMainDlg, wxFrame)
EVT_CLOSE(CMainDlg::OnCloseWindow) /* Shutdown event */
EVT_TOOL(-1, CMainDlg::MenuOrToolEvent) /* Menu/Toolbar events */
Index: MainDlg.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- MainDlg.h 22 Dec 2003 05:04:15 -0000 1.15
+++ MainDlg.h 23 Dec 2003 00:40:50 -0000 1.16
@@ -56,10 +56,12 @@
wxWindowID id;
};
-/**
- * This class is only needed for catching some specific events (see the event
- * table. Actual event handling is still done in CMainDlg.
- */
+/***************************** MyToolBar class ********************************/
+/* This class is derived from wxToolBar and is used for main frame */
+/* toolbar. The main purpose for this class is catching mouse right- */
+/* click events, and sending them to mainframe. Can't do it from */
+/* mainframe, so we'll do it here. */
+/******************************************************************************/
class MyToolBar : public wxToolBar {
public:
MyToolBar(wxWindow *parent, wxWindowID id = -1,
@@ -72,7 +74,12 @@
void RightClick(wxMouseEvent &event); /* Right mouse clicks events */
};
-/* This very small class usually shows a frame with one dialog page as content*/
+/**************************** DetachedFrame class *****************************/
+/* This class is derived from wxFrame and provides minimal frame support */
+/* for displaying some dialog page. It is used mainly for detaching */
+/* pages from main frame and dumping here. When this frame is closed, */
+/* it passes the contents back to main frame. */
+/******************************************************************************/
class DetachedFrame : public wxFrame {
public:
DetachedFrame(
@@ -87,12 +94,27 @@
Page *cnt; /* Contents of the frame */
};
+/************************** CMainDlg class ************************************/
+/* This is the MAIN frame of the entire interface. It servers as host */
+/* a number of controls, most importantly the following: */
+/* * Dialog Pages. These are wxPanel-derived classes with the actual */
+/* contents. "Server Page", "Search Page", "Transfer Page" are */
+/* examples of Dialog Pages. The number of possible dialog pages */
+/* is pretty much infinite. */
+/* * ToolBar. This is created using MyToolBar class, and contains main */
+/* navigation controls. The images for toolbar are generated */
+/* manually from image+text since toolbar texts are not */
+/* supported on wxMac. */
+/* * Menubar. This is a pretty much standard menubar that contains the */
+/* usual File/Edit/View/Help sections. By default, it is hidden, */
+/* but can be turned on from Preferences. */
+/* * StatusBar. This is NOT, as the name might suggest, derived from */
+/* wxStatusBar, simply because wxStatusBar doesn't give enough */
+/* functionality for what we need to do (on some platforms, */
+/* native statusbar is thinner, thus our images won't fit there) */
+/******************************************************************************/
WX_DECLARE_LIST(Page, PageList);
-/**
- * MainDlg class. The main dialog functions like Toolbar and Statusbar
- * stuff go in here.
- */
extern class CMainDlg *mainframe;
class CMainDlg: public wxFrame {
friend class MyToolBar;
|
|
From: <ma...@us...> - 2003-12-22 22:12:03
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv23265 Modified Files: TODO Log Message: page detaching leak was fixed Index: TODO =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/TODO,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- TODO 21 Dec 2003 05:41:43 -0000 1.11 +++ TODO 22 Dec 2003 22:12:00 -0000 1.12 @@ -29,8 +29,6 @@ - Selection of graphs to display * Find out what's the leaking `non-object data` that debug wx detects * Splitter windows don't resize correct after switching to fullscreen -* Page detaching engine loses few wxMask/wxObject type objects during - the process, probably the toolbar buttons images. * Hack wxToolBar to trigger EVT_LEFT_DOWN mouse events and use those for changing pages instead of EVT_LEFT_CLICK - makes it seem faster. |
|
From: <ma...@us...> - 2003-12-22 22:11:02
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv23023 Modified Files: Changelog Log Message: rephrased Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- Changelog 22 Dec 2003 22:08:57 -0000 1.111 +++ Changelog 22 Dec 2003 22:10:58 -0000 1.112 @@ -34,6 +34,7 @@ * Implemented button-with-text-and-image and multi-button controls. * Populated toolbar with the above controls, now looks real cool :) * Sidebar section buttons now also have images :) + * Improved flat-look under wxGTK. 2003/12/19 Alo Sarv * Imported Hetfield's GTK systray. @@ -56,7 +57,7 @@ accessed before splashscreen disappears. 2003/12/06 Alo Sarv - * Sidebar memory and speed optimizations. + * Sidebar engine memory and speed optimizations. 2003/12/05 Alo Sarv * Hide main frame before shutdown (workaround for shutdown delay |
|
From: <ma...@us...> - 2003-12-22 22:09:00
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv22568 Modified Files: Changelog Log Message: 3 fixes Index: Changelog =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/Changelog,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- Changelog 22 Dec 2003 05:32:04 -0000 1.110 +++ Changelog 22 Dec 2003 22:08:57 -0000 1.111 @@ -25,6 +25,11 @@ # This also helps in backtracking changes, or reviewing development history. # ############################################################################### +2003/12/23 Alo Sarv + * Avoid crash when requesting non-existent image from CImages. + * Avoid crash on shutdown when there are no dialog pages. + * Fixed minor memory leak in page detaching engine. + 2003/12/22 Alo Sarv * Implemented button-with-text-and-image and multi-button controls. * Populated toolbar with the above controls, now looks real cool :) |
|
From: <ma...@us...> - 2003-12-22 22:00:13
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20655
Modified Files:
MainDlg.cpp
Log Message:
Avoid crash on shutdown if there are no pages.
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- MainDlg.cpp 22 Dec 2003 20:54:45 -0000 1.34
+++ MainDlg.cpp 22 Dec 2003 22:00:10 -0000 1.35
@@ -239,7 +239,7 @@
m_config->SetPath(wxT("/General"));
m_config->Read(wxT("Remember last"), &remember_last, true);
- if (remember_last) {
+ if (remember_last && !pages.IsEmpty()) {
m_config->Write(wxT("Start Page"), GetCurPage()->short_title);
}
|
|
From: <ma...@us...> - 2003-12-22 21:54:19
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19736
Modified Files:
Images.cpp
Log Message:
Avoid crash if requested image is not found.
Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Images.cpp 22 Dec 2003 05:04:15 -0000 1.41
+++ Images.cpp 22 Dec 2003 21:54:16 -0000 1.42
@@ -59,8 +59,8 @@
images.DeleteContents(true);
images.Clear();
- path = MakePath();
-
+ path = MakePath();
+
images.Append(
wxT("friend"),
new wxBitmap(path+wxT("friend.png"), wxBITMAP_TYPE_ANY)
@@ -256,6 +256,7 @@
wxT("Requested image `%s` could not be found!"),
name.c_str()
));
+ return wxNullBitmap;
}
return *(tmp->GetData());
@@ -356,28 +357,28 @@
mdc.GetTextExtent(names.Item(i), &x, &y);
x+=6;
y+=36;
- x>tool_img_width ? tool_img_width=x : x=tool_img_width;
+ x>tool_img_width ? tool_img_width=x : x=tool_img_width;
y>tool_img_height ? tool_img_height=y : y=tool_img_width;
}
}
-
-/****************************************************************** MakePath */
-/* This method creates a platform-dependant path string for accessing images */
-/* from. Since various platforms use various standard locations for resouce */
-/* locations, this method handles it as follows: */
-/* Win32 @executable_path@/images/@iconsetname@/ */
-/* Linux @executable_path@/images/@iconsetname@/ */
-/* Mac OS X */
-/* CodeWarrior :@executable_path@::Resources:images:@iconsetname@ */
-/* GNU gcc @executable_path@/images/@iconsetname@/ */
-/* */
-/* TODO: Use /usr/share area on Linux */
-/* Check various locations, detect if images can be found. */
-/*****************************************************************************/
-wxString CImages::MakePath() {
- wxString path, apppath;
+
+/****************************************************************** MakePath */
+/* This method creates a platform-dependant path string for accessing images */
+/* from. Since various platforms use various standard locations for resouce */
+/* locations, this method handles it as follows: */
+/* Win32 @executable_path@/images/@iconsetname@/ */
+/* Linux @executable_path@/images/@iconsetname@/ */
+/* Mac OS X */
+/* CodeWarrior :@executable_path@::Resources:images:@iconsetname@ */
+/* GNU gcc @executable_path@/images/@iconsetname@/ */
+/* */
+/* TODO: Use /usr/share area on Linux */
+/* Check various locations, detect if images can be found. */
+/*****************************************************************************/
+wxString CImages::MakePath() {
+ wxString path, apppath;
wxChar sep;
-
+
/**
* We get the application binary path from argv[0], remove the binary
* name from it, and use it as base for our resources. Needed if
@@ -401,7 +402,7 @@
m_config->Read(
wxT("/General/IconSets/CurIconSet"), &path, wxT("Default")
);
- path.MakeLower();
+ path.MakeLower();
path = wxString::Format(
wxT("%simages/%s/"), apppath.c_str(), path.c_str()
);
@@ -415,7 +416,7 @@
path.Replace(wxT("/"), wxT(":"));
path.Prepend(wxT(":"));
path.Prepend(wxT("::Resources"));
- #endif
-
+ #endif
+
return path;
-}
+}
|
|
From: <ma...@us...> - 2003-12-22 20:54:49
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv7833 Modified Files: MainDlg.cpp Log Message: Fixed minor memory leak in page detaching engine. Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- MainDlg.cpp 22 Dec 2003 06:21:07 -0000 1.33 +++ MainDlg.cpp 22 Dec 2003 20:54:45 -0000 1.34 @@ -978,7 +978,8 @@ pages.DeleteObject(page); pages.DeleteContents(false); - GetToolBar()->RemoveTool(page->id); + delete GetToolBar()->RemoveTool(page->id); + GetToolBar()->Realize(); start_up = true; |
|
From: <ma...@us...> - 2003-12-22 12:06:29
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27488
Modified Files:
MBitmapButton.cpp MMultiButton.cpp SBPanel.cpp
Log Message:
Line length fix
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MBitmapButton.cpp 22 Dec 2003 11:56:02 -0000 1.4
+++ MBitmapButton.cpp 22 Dec 2003 12:06:23 -0000 1.5
@@ -132,10 +132,15 @@
#endif
mdc.DrawRectangle(0, 0, tmp->GetWidth(), tmp->GetHeight());
- mdc.DrawBitmap(image, 5, ((y-image.GetHeight())/2)+BITMAP_Y_POS_OFFSET, true);
+ mdc.DrawBitmap(
+ image, 5, ((y-image.GetHeight())/2)+BITMAP_Y_POS_OFFSET, true
+ );
mdc.SetTextForeground(wxColour(1, 1, 1));
- mdc.DrawText(name, image.GetWidth()+10, ((tmp->GetHeight()-GetCharHeight())/2)+TEXT_Y_POS_OFFSET);
+ mdc.DrawText(
+ name, image.GetWidth()+10,
+ ((tmp->GetHeight()-GetCharHeight())/2)+TEXT_Y_POS_OFFSET
+ );
#ifndef __WXMSW__
tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
Index: MMultiButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MMultiButton.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MMultiButton.cpp 22 Dec 2003 10:07:37 -0000 1.2
+++ MMultiButton.cpp 22 Dec 2003 12:06:23 -0000 1.3
@@ -52,8 +52,8 @@
/* @style Style flag - see wxWindow/wxControl style flags in wxHelp */
/******************************************************************************/
MMultiButton::MMultiButton(
- wxWindow *parent, wxWindowID id, size_t count, const wxArrayString &names,
- int ids[], const wxPoint &pos, const wxSize &size, long style
+ wxWindow *parent, wxWindowID id, size_t count, const wxArrayString
+ &names, int ids[], const wxPoint &pos, const wxSize &size, long style
) : wxControl(parent, id, pos, size, style) {
wxASSERT(count <= names.GetCount());
Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- SBPanel.cpp 22 Dec 2003 10:07:37 -0000 1.11
+++ SBPanel.cpp 22 Dec 2003 12:06:23 -0000 1.12
@@ -59,7 +59,8 @@
if (use_image) {
MBitmapButton *headerbmpbtn = new MBitmapButton(
- this, -1, title, image, wxDefaultPosition, wxDefaultSize, wxNO_BORDER
+ this, -1, title, image, wxDefaultPosition,
+ wxDefaultSize, wxNO_BORDER
);
headerbmpbtn->SetFont(
wxFont(SB_BTN_FONT_SIZE, wxROMAN, wxNORMAL, wxBOLD)
@@ -81,7 +82,7 @@
SetSizer(mainsizer);
mainsizer->Fit(this);
mainsizer->SetSizeHints(this);
-
+
shown = false;
}
|
|
From: <ma...@us...> - 2003-12-22 11:56:05
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25731
Modified Files:
MBitmapButton.cpp MBitmapButton.h
Log Message:
Fixed MBitmapButton GTK2 issues
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MBitmapButton.cpp 22 Dec 2003 10:07:37 -0000 1.3
+++ MBitmapButton.cpp 22 Dec 2003 11:56:02 -0000 1.4
@@ -113,12 +113,11 @@
wxMemoryDC mdc;
wxBitmap *tmp;
wxCoord x, y;
-
mdc.SelectObject(wxBitmap(100, 100));
mdc.SetFont(wxFont(BTN_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL));
mdc.GetTextExtent(name, &x, &y);
+ x+=image.GetWidth()+LABEL_WIDTH_ADDITION;
- x+=image.GetWidth()+10;
image.GetHeight() > y ? y = image.GetHeight()+5 : y+=5;
tmp = new wxBitmap(x, y);
@@ -133,10 +132,11 @@
#endif
mdc.DrawRectangle(0, 0, tmp->GetWidth(), tmp->GetHeight());
- mdc.DrawBitmap(image, 5, (y-image.GetHeight())/2, true);
+ mdc.DrawBitmap(image, 5, ((y-image.GetHeight())/2)+BITMAP_Y_POS_OFFSET, true);
mdc.SetTextForeground(wxColour(1, 1, 1));
- mdc.DrawText(name, image.GetWidth()+10, (tmp->GetHeight()-GetCharHeight())/2);
+ mdc.DrawText(name, image.GetWidth()+10, ((tmp->GetHeight()-GetCharHeight())/2)+TEXT_Y_POS_OFFSET);
+
#ifndef __WXMSW__
tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
#endif
@@ -154,8 +154,10 @@
void MBitmapButton::OnSize(wxSizeEvent &event) {
wxMemoryDC mdc;
- /* GTK adds 6 pixels between image and button - substract it. */
- wxBitmap tmp(GetSize().GetWidth()-6, GetSize().GetHeight()-6);
+ wxBitmap tmp(
+ GetSize().GetWidth()+LABEL_POS_OFFSET,
+ GetSize().GetHeight()+LABEL_POS_OFFSET
+ );
mdc.SelectObject(tmp);
#ifdef __WXMSW__ /* This gives transparent image on wxMSW */
Index: MBitmapButton.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MBitmapButton.h 22 Dec 2003 05:04:15 -0000 1.1
+++ MBitmapButton.h 22 Dec 2003 11:56:02 -0000 1.2
@@ -28,11 +28,21 @@
#include "wx/wx.h"
#endif
-#if defined(__WXMSW__) || defined(__GTK2__)
- #define BTN_FONT_SIZE 10
-#else
- #define BTN_FONT_SIZE 12
+/* Image/Text positioning/sizing constants */
+#if defined(__WXGTK__) && defined(__GTK2__)
+ #define BTN_FONT_SIZE 10 /* Button font size */
+ #define LABEL_WIDTH_ADDITION 40 /* Extra width */
+ #define BITMAP_Y_POS_OFFSET -2 /* Image Y positioning offset */
+ #define TEXT_Y_POS_OFFSET -5 /* Text Y positioning offset */
+ #define LABEL_POS_OFFSET -10 /* Pixels between image/button borders */
+#elif defined(__WXGTK__) && !defined(__GTK2__)
+ #define LABEL_WIDTH_ADDITION 10 /* Extra width */
+ #define BITMAP_Y_POS_OFFSET 0 /* Text Y positioning offset */
+ #define TEXT_Y_POS_OFFSET 0 /* Text Y positioning offset */
+ #define LABEL_POS_OFFSET -6 /* Pixels between image/button borders */
+ #define BTN_FONT_SIZE 12 /* Button font size */
#endif
+
#if defined(__WXMSW__) /* Need to use wxButton on MSW */
/******************************************************** class MBitmapButton */
|
|
From: <ma...@us...> - 2003-12-22 10:51:09
|
Update of /cvsroot/sharedaemon/ui-wx
In directory sc8-pr-cvs1:/tmp/cvs-serv15509
Modified Files:
configure
Log Message:
fixed gtk2/gtk1 detection
Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- configure 22 Dec 2003 09:05:30 -0000 1.13
+++ configure 22 Dec 2003 10:51:04 -0000 1.14
@@ -270,6 +270,7 @@
#
function check_gtkconfig() {
has_gtk=0;
+has_pkgconfig=0;
if $wxconfig --cppflags | grep -q 'gtk'; then
echo -e -n "checking for gtk-config...";
if test -x $gtkconfig; then
@@ -311,7 +312,7 @@
if test -x $pkgconfig; then
pkgconfig=$pkgconfig;
has_pkgconfig=1;
- elif test `which pkg-config 2>/dev/null`; then
+ elif test -x `which pkg-config 2>/dev/null`; then
pkgconfig=`which pkg-config 2>/dev/null`;
has_pkgconfig=1;
else
@@ -388,7 +389,7 @@
if test $has_gtk = 1; then
cppflags="$cppflags -D__HAS_GTK_CONFIG__";
tray_objs="TrayCoreEngine.o";
- if test [$gtk2 = 1] -a [$has_pkgconfig = 1]; then
+ if test $gtk2 = 1 -a $has_pkgconfig = 1; then
cflags="`$pkgconfig --cflags gtk+-2.0`";
cppflags="$cppflags `$pkgconfig --cflags gtk+-2.0`";
linkflags="$linkflags `$pkgconfig --libs gtk+-2.0`";
|
|
From: <ma...@us...> - 2003-12-22 10:48:06
|
Update of /cvsroot/sharedaemon/ui-wx/src/images/emule_inverted In directory sc8-pr-cvs1:/tmp/cvs-serv14907/emule_inverted Added Files: help.png options.png quit.png Log Message: Additional images for our new controls --- NEW FILE: help.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: options.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: quit.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ma...@us...> - 2003-12-22 10:48:05
|
Update of /cvsroot/sharedaemon/ui-wx/src/images/default In directory sc8-pr-cvs1:/tmp/cvs-serv14907/default Added Files: help.png options.png quit.png Log Message: Additional images for our new controls --- NEW FILE: help.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: options.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: quit.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ma...@us...> - 2003-12-22 10:48:05
|
Update of /cvsroot/sharedaemon/ui-wx/src/images/emule_greyscale In directory sc8-pr-cvs1:/tmp/cvs-serv14907/emule_greyscale Added Files: help.png options.png quit.png Log Message: Additional images for our new controls --- NEW FILE: help.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: options.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: quit.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ma...@us...> - 2003-12-22 10:45:36
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14509
Modified Files:
ServerWnd.cpp
Log Message:
Changed the ugly wxComboBox on serverpage to wxTextCtrl (wxComboBox doesnt have native look on wxGTK)
Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ServerWnd.cpp 22 Dec 2003 05:30:00 -0000 1.49
+++ ServerWnd.cpp 22 Dec 2003 10:45:32 -0000 1.50
@@ -217,7 +217,7 @@
/* Button to toggle sidebar on/off */
wxButton *toggler = new wxButton(
this, ID_BTN_TOGGLE_SIDEBAR, wxT("<"),
- wxDefaultPosition, wxSize(12, 100)
+ wxDefaultPosition, wxSize(12, 100), wxNO_BORDER
);
toggler->SetFont(wxFont(14, wxNORMAL, wxNORMAL, wxBOLD));
mainsizer->Add(toggler, 0, wxALIGN_CENTER, 5 );
@@ -245,27 +245,22 @@
wxFlexGridSizer *s_top_v = new wxFlexGridSizer(2);
s_top_v->AddGrowableCol(0);
- wxComboBox *c_url = new wxComboBox(top_panel, ID_SERVERLISTURL);
- c_url->Append(
+
+ wxTextCtrl *txt = new wxTextCtrl(
+ top_panel, ID_SERVERLISTURL,
wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/")
wxT("server.met?download/server-best.met")
);
- c_url->Append(
- wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/")
- wxT("server.met?download/server-good.met")
- );
- c_url->Append(
- wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/")
- wxT("server.met?download/server-max.met")
- );
- c_url->SetSelection(0);
#ifndef __WXX11__
- c_url->SetToolTip(
+ txt->SetToolTip(
_("Enter the URL or .met file location to update list from")
);
#endif
- s_top_v->Add(c_url, 0, wxGROW|wxEXPAND|wxALL, 0);
- wxButton *b_upd = new wxButton(top_panel, ID_UPDATE, _("Update"));
+ s_top_v->Add(txt, 0, wxGROW|wxEXPAND|wxALL, 0);
+ wxButton *b_upd = new wxButton(
+ top_panel, ID_UPDATE, _("Update"),
+ wxDefaultPosition, wxDefaultSize, wxNO_BORDER
+ );
s_top_v->Add(b_upd, 0, wxGROW|wxEXPAND|wxRIGHT, 5);
s_top->Add(s_top_v, 0, wxGROW|wxEXPAND|wxALL, 0);
|
|
From: <ma...@us...> - 2003-12-22 10:07:41
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8638
Modified Files:
MBitmapButton.cpp MMultiButton.cpp SBPanel.cpp
Log Message:
GUI fixed for wxGTK - looks awesome (imho) :P
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MBitmapButton.cpp 22 Dec 2003 09:52:58 -0000 1.2
+++ MBitmapButton.cpp 22 Dec 2003 10:07:37 -0000 1.3
@@ -141,7 +141,7 @@
tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
#endif
SetBitmapLabel(*tmp);
- SetSize(wxSize(tmp->GetWidth()+5, tmp->GetHeight()+5));
+ SetSize(wxSize(tmp->GetWidth()+10, tmp->GetHeight()+5));
delete tmp;
}
Index: MMultiButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MMultiButton.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MMultiButton.cpp 22 Dec 2003 05:04:15 -0000 1.1
+++ MMultiButton.cpp 22 Dec 2003 10:07:37 -0000 1.2
@@ -99,7 +99,10 @@
wxFlexGridSizer *s_main = new wxFlexGridSizer(1);
s_main->AddGrowableCol(0);
for (size_t i=0;i<count;i++) {
- btn = new MBitmapButton(this, ids[i], names[i], *(images.Item(i)->GetData()));
+ btn = new MBitmapButton(
+ this, ids[i], names[i], *(images.Item(i)->GetData()),
+ wxDefaultPosition, wxDefaultSize, style
+ );
s_main->Add(btn, 0, wxGROW, 0);
}
SetBackgroundColour(parent->GetBackgroundColour());
@@ -107,7 +110,6 @@
SetAutoLayout(true);
s_main->Fit(this);
s_main->SetSizeHints(this);
- Fit();
Layout();
}
Index: SBPanel.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SBPanel.cpp 22 Dec 2003 05:36:15 -0000 1.10
+++ SBPanel.cpp 22 Dec 2003 10:07:37 -0000 1.11
@@ -59,7 +59,7 @@
if (use_image) {
MBitmapButton *headerbmpbtn = new MBitmapButton(
- this, -1, title, image
+ this, -1, title, image, wxDefaultPosition, wxDefaultSize, wxNO_BORDER
);
headerbmpbtn->SetFont(
wxFont(SB_BTN_FONT_SIZE, wxROMAN, wxNORMAL, wxBOLD)
|
|
From: <ma...@us...> - 2003-12-22 09:53:02
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5388
Modified Files:
MBitmapButton.cpp
Log Message:
Fixes wxGTK sidebar buttons
Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MBitmapButton.cpp 22 Dec 2003 05:04:15 -0000 1.1
+++ MBitmapButton.cpp 22 Dec 2003 09:52:58 -0000 1.2
@@ -50,32 +50,32 @@
wxWindow *parent, wxWindowID id, const wxString &name, const wxBitmap
&image, const wxPoint &pos, const wxSize &size, long style
) : wxButton(parent, id, name, pos, size, style) {
-
- wxString imgname;
+
+ wxString imgname;
imgname.Format(wxT("%simg_%s"), imgname.c_str(), name.c_str());
-
+
wxFlexGridSizer *s_main = new wxFlexGridSizer(0, 0);
wxStaticBitmap *img = new wxStaticBitmap(
this, 1000, image, wxDefaultPosition,
wxSize(image.GetWidth(), image.GetHeight()), 5, imgname
);
- s_main->Add(img, 0, wxLEFT|wxALIGN_CENTER_VERTICAL|wxADJUST_MINSIZE, 5);
-
- /**
- * Dirty trick:
- * Create a hidden textctrl to force button take correct size.
+ s_main->Add(img, 0, wxLEFT|wxALIGN_CENTER_VERTICAL|wxADJUST_MINSIZE, 5);
+
+ /**
+ * Dirty trick:
+ * Create a hidden textctrl to force button take correct size.
*/
wxStaticText *txt = new wxStaticText(
this, -1, name, wxDefaultPosition,
wxDefaultSize, wxTRANSPARENT_WINDOW
- );
+ );
txt->Hide();
- s_main->Add(txt, 1, wxALL|wxADJUST_MINSIZE, 5);
-
+ s_main->Add(txt, 1, wxALL|wxADJUST_MINSIZE, 5);
+
SetSizer(s_main);
SetAutoLayout(true);
s_main->Fit(this);
- s_main->SetSizeHints(this);
+ s_main->SetSizeHints(this);
Layout();
}
@@ -113,36 +113,36 @@
wxMemoryDC mdc;
wxBitmap *tmp;
wxCoord x, y;
-
- mdc.SelectObject(wxBitmap(100, 100));
- mdc.SetFont(wxFont(BTN_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL));
- mdc.GetTextExtent(name, &x, &y);
-
- x+=image.GetWidth()+10;
- image.GetHeight() > y ? y = image.GetHeight()+5 : y+=5;
-
- tmp = new wxBitmap(x, y);
-
- mdc.SelectObject(*tmp);
-
-#ifdef __WXMSW__ /* This gives transparent image on wxMSW */
- mdc.SetPen(*wxTRANSPARENT_PEN);
- mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
-#else /* Elsewhere, it will be done with wxMask later */
- mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID));
-#endif
- mdc.DrawRectangle(0, 0, tmp->GetWidth(), tmp->GetHeight());
-
- mdc.DrawBitmap(image, 5, (y-image.GetHeight())/2, true);
-
- mdc.SetTextForeground(wxColour(1, 1, 1));
- mdc.DrawText(name, image.GetWidth()+10, (tmp->GetHeight()-GetCharHeight())/2);
-#ifndef __WXMSW__
- tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
-#endif
- SetBitmapLabel(*tmp);
- SetSize(wxSize(tmp->GetWidth()+5, tmp->GetHeight()+5));
- delete tmp;
+
+ mdc.SelectObject(wxBitmap(100, 100));
+ mdc.SetFont(wxFont(BTN_FONT_SIZE, wxDEFAULT, wxNORMAL, wxNORMAL));
+ mdc.GetTextExtent(name, &x, &y);
+
+ x+=image.GetWidth()+10;
+ image.GetHeight() > y ? y = image.GetHeight()+5 : y+=5;
+
+ tmp = new wxBitmap(x, y);
+
+ mdc.SelectObject(*tmp);
+
+#ifdef __WXMSW__ /* This gives transparent image on wxMSW */
+ mdc.SetPen(*wxTRANSPARENT_PEN);
+ mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
+#else /* Elsewhere, it will be done with wxMask later */
+ mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID));
+#endif
+ mdc.DrawRectangle(0, 0, tmp->GetWidth(), tmp->GetHeight());
+
+ mdc.DrawBitmap(image, 5, (y-image.GetHeight())/2, true);
+
+ mdc.SetTextForeground(wxColour(1, 1, 1));
+ mdc.DrawText(name, image.GetWidth()+10, (tmp->GetHeight()-GetCharHeight())/2);
+#ifndef __WXMSW__
+ tmp->SetMask(new wxMask(*tmp, wxColour(0, 0, 0)));
+#endif
+ SetBitmapLabel(*tmp);
+ SetSize(wxSize(tmp->GetWidth()+5, tmp->GetHeight()+5));
+ delete tmp;
}
/********************************************************************* OnSize */
@@ -152,24 +152,26 @@
/* after size change. */
/******************************************************************************/
void MBitmapButton::OnSize(wxSizeEvent &event) {
-wxMemoryDC mdc;
-
- wxBitmap tmp(GetSize().GetWidth(), GetSize().GetHeight());
- mdc.SelectObject(tmp);
-
-#ifdef __WXMSW__ /* This gives transparent image on wxMSW */
- mdc.SetPen(*wxTRANSPARENT_PEN);
- mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
-#else /* Elsewhere, it will be done with wxMask later */
- mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID));
-#endif
- mdc.DrawRectangle(0, 0, tmp.GetWidth(), tmp.GetHeight());
- mdc.DrawBitmap(GetBitmapLabel(), 0, 1, true);
-#ifndef __WXMSW__
- tmp.SetMask(new wxMask(tmp, wxColour(0, 0, 0)));
-#endif
- SetBitmapLabel(tmp);
- event.Skip();
+wxMemoryDC mdc;
+
+ /* GTK adds 6 pixels between image and button - substract it. */
+ wxBitmap tmp(GetSize().GetWidth()-6, GetSize().GetHeight()-6);
+ mdc.SelectObject(tmp);
+
+#ifdef __WXMSW__ /* This gives transparent image on wxMSW */
+ mdc.SetPen(*wxTRANSPARENT_PEN);
+ mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
+#else /* Elsewhere, it will be done with wxMask later */
+ mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID));
+#endif
+ mdc.DrawRectangle(0, 0, tmp.GetWidth(), tmp.GetHeight());
+ mdc.DrawBitmap(GetBitmapLabel(), 0, 0, true);
+#ifndef __WXMSW__
+ tmp.SetMask(new wxMask(tmp, wxColour(0, 0, 0)));
+#endif
+ SetBitmapLabel(tmp);
+
+ event.Skip();
}
#endif
|
|
From: <ma...@us...> - 2003-12-22 09:05:35
|
Update of /cvsroot/sharedaemon/ui-wx
In directory sc8-pr-cvs1:/tmp/cvs-serv30538
Modified Files:
configure
Log Message:
Another attempt to fix hetfields wierd 1024x768 issue
Index: configure
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- configure 22 Dec 2003 07:57:12 -0000 1.12
+++ configure 22 Dec 2003 09:05:30 -0000 1.13
@@ -260,6 +260,8 @@
function check_wxmsw() {
if $wxconfig --cppflags | grep -q 'msw'; then
res=wxInterface_private.res
+ else
+ res="";
fi;
}
|
|
From: <ma...@us...> - 2003-12-22 08:37:58
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv25192 Modified Files: Makefile.am Log Message: fixes strange behaviour (hopefully) ? Index: Makefile.am =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 22 Dec 2003 05:04:15 -0000 1.8 +++ Makefile.am 22 Dec 2003 08:37:55 -0000 1.9 @@ -25,7 +25,7 @@ UploadListCtrl.o \ wxInterface.o \ wxInterface_wdr.o\ - @RES@ \ + @RES@ all: $(PROGRAM) |
|
From: <ma...@us...> - 2003-12-22 07:57:15
|
Update of /cvsroot/sharedaemon/ui-wx In directory sc8-pr-cvs1:/tmp/cvs-serv18716 Modified Files: configure Log Message: fixed configure Index: configure =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/configure,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- configure 22 Dec 2003 02:09:21 -0000 1.11 +++ configure 22 Dec 2003 07:57:12 -0000 1.12 @@ -165,7 +165,7 @@ echo -n -e "checking for wx-config... \t\t\t"; if test -x $wxconfig; then wxconfig=$wxconfig; - elif `which wx-config 2>/dev/null`; then + elif test -x `which wx-config 2>/dev/null`; then wxconfig=`which wx-config 2>/dev/null`; elif test -x /usr/local/bin/wx-config; then wxconfig=/usr/local/bin/wx-config; @@ -386,7 +386,7 @@ if test $has_gtk = 1; then cppflags="$cppflags -D__HAS_GTK_CONFIG__"; tray_objs="TrayCoreEngine.o"; - if test $gtk2 = 1 -a $has_pkgconfig = 1; then + if test [$gtk2 = 1] -a [$has_pkgconfig = 1]; then cflags="`$pkgconfig --cflags gtk+-2.0`"; cppflags="$cppflags `$pkgconfig --cflags gtk+-2.0`"; linkflags="$linkflags `$pkgconfig --libs gtk+-2.0`"; |
|
From: <ma...@us...> - 2003-12-22 06:21:10
|
Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6552
Modified Files:
MainDlg.cpp
Log Message:
removed a block of unused code
Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- MainDlg.cpp 22 Dec 2003 05:04:15 -0000 1.32
+++ MainDlg.cpp 22 Dec 2003 06:21:07 -0000 1.33
@@ -460,7 +460,6 @@
/******************************************************************************/
void CMainDlg::LoadAndShowDialogPages() {
wxString start_page;
-long tmp;
serverwnd = new CServerWnd(this);
wxASSERT_MSG(serverwnd, wxT("Server Page creation failed."));
@@ -501,20 +500,6 @@
);
m_config->Read(wxT("/General/Start Page"), &start_page, wxT("Servers"));
- if (start_page.ToLong(&tmp)) { /* Old_style (<0.2.0) conf file */
- switch (tmp) {
- case 0: start_page = wxT("Servers"); break;
- case 1: start_page = wxT("Search"); break;
- case 2: start_page = wxT("Transfer"); break;
- case 3: start_page = wxT("Shared Files"); break;
- case 4: start_page = wxT("Messages"); break;
- case 5: start_page = wxT("Statistics"); break;
- default: start_page = wxT("Servers"); break;
- }
- } else if (start_page == wxT("")) { /* Windows registry returns "" if */
- start_page = wxT("Servers"); /* int was stored but wxString */
- } /* was read */
-
SetActivePage(start_page); /* Error-checking is done there */
}
|
