Fix two bugs (Upper case in database avoiding accents, and cat/account with the same name during modification into PreferencesPanel)

Updating translations
This commit is contained in:
Grégory Soutadé 2010-07-16 18:38:13 +02:00
parent 5286926588
commit d9359b2f98
7 changed files with 395 additions and 259 deletions

Binary file not shown.

View File

@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-07-08 19:24+0200\n" "POT-Creation-Date: 2010-07-16 18:37+0200\n"
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
"Last-Translator: Soutadé <soutade@gmail.com>\n" "Last-Translator: Soutadé <soutade@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -18,235 +18,285 @@ msgstr ""
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#: src/view/PreferencesPanel.cpp:493 #: src/view/PreferencesPanel.cpp:530
msgid " - " msgid " - "
msgstr " - " msgstr " - "
#: src/view/PreferencesPanel.cpp:315 #: src/view/PreferencesPanel.cpp:324
#: src/view/PreferencesPanel.cpp:415 #: src/view/PreferencesPanel.cpp:343
#: src/view/PreferencesPanel.cpp:460 #: src/view/PreferencesPanel.cpp:433
#: src/view/UsersDialog.cpp:95 #: src/view/PreferencesPanel.cpp:452
#: src/view/PreferencesPanel.cpp:497
#: src/view/UsersDialog.cpp:114
msgid " already exists" msgid " already exists"
msgstr " existe déjà " msgstr " existe déjà "
#: src/model/Database.cpp:83 #: src/view/SearchPanel.cpp:204
msgid " entries found"
msgstr " entrées trouvées"
#: src/model/Database.cpp:102
msgid " not found, aborting" msgid " not found, aborting"
msgstr " non trouvé, arrêt" msgstr " non trouvé, arrêt"
#: src/view/AccountPanel.cpp:979 #: src/view/AccountPanel.cpp:909
msgid " operations ?" msgid " operations ?"
msgstr " opérations ?" msgstr " opérations ?"
#: src/view/PreferencesPanel.cpp:500 #: src/view/PreferencesPanel.cpp:537
msgid " profil ?" msgid " profil ?"
msgstr " profil ?" msgstr " profil ?"
#: src/view/ButtonPanel.cpp:31 #: src/view/SearchPanel.cpp:206
msgid "1 entry found"
msgstr "1 entrée trouvée"
#: src/view/ButtonPanel.cpp:51
msgid "About" msgid "About"
msgstr "A propos" msgstr "A propos"
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46
#: src/view/SearchPanel.cpp:78
msgid "Account" msgid "Account"
msgstr "Compte" msgstr "Compte"
#: src/view/PreferencesPanel.cpp:315 #: src/view/PreferencesPanel.cpp:324
#: src/view/PreferencesPanel.cpp:343
msgid "Account " msgid "Account "
msgstr "Compte" msgstr "Le compte "
#: src/view/AccountPanel.cpp:120 #: src/view/AccountPanel.cpp:113
msgid "Account name" msgid "Account name"
msgstr "Nom du compte" msgstr "Nom du compte"
#: src/view/AccountPanel.cpp:119 #: src/view/AccountPanel.cpp:112
msgid "Account number" msgid "Account number"
msgstr "Numéro de compte" msgstr "Numéro de compte"
#: src/view/PreferencesPanel.cpp:32 #: src/view/PreferencesPanel.cpp:51
msgid "Accounts" msgid "Accounts"
msgstr "Comptes" msgstr "Comptes"
#: src/view/PreferencesPanel.cpp:286 #: src/view/SearchPanel.cpp:75
#: src/view/PreferencesPanel.cpp:500 msgid "Amount from"
#: src/view/AccountPanel.cpp:974 msgstr "Montant min"
#: src/view/SearchPanel.cpp:76
msgid "Amount to"
msgstr "Montant max"
#: src/view/PreferencesPanel.cpp:305
#: src/view/PreferencesPanel.cpp:537
#: src/view/AccountPanel.cpp:904
msgid "Are you sure want to delete " msgid "Are you sure want to delete "
msgstr "Etes vous sûr de vouloir supprimer " msgstr "Etes vous sûr de vouloir supprimer "
#: src/view/PreferencesPanel.cpp:386 #: src/view/PreferencesPanel.cpp:414
#: src/view/AccountPanel.cpp:684 #: src/view/AccountPanel.cpp:614
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "Etes vous sûr de vouloir supprimer : \n" msgstr "Etes vous sûr de vouloir supprimer : \n"
#: src/view/PasswordDialog.cpp:37 #: src/view/PasswordDialog.cpp:56
#: src/view/GenerateDialog.cpp:41 #: src/view/GenerateDialog.cpp:60
#: src/view/UsersDialog.cpp:32 #: src/view/UsersDialog.cpp:51
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
#: src/view/PreferencesPanel.cpp:33 #: src/view/PreferencesPanel.cpp:52
msgid "Categories" msgid "Categories"
msgstr "Catégories" msgstr "Catégories"
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46
#: src/view/SearchPanel.cpp:77
msgid "Category" msgid "Category"
msgstr "Catégorie" msgstr "Catégorie"
#: src/view/PreferencesPanel.cpp:415 #: src/view/PreferencesPanel.cpp:433
#: src/view/PreferencesPanel.cpp:452
msgid "Category " msgid "Category "
msgstr "Catégorie" msgstr "Catégorie"
#: src/view/PreferencesPanel.cpp:48 #: src/view/PreferencesPanel.cpp:67
msgid "Change Name" msgid "Change Name"
msgstr "Changer de nom" msgstr "Changer de nom"
#: src/view/PreferencesPanel.cpp:49 #: src/view/PreferencesPanel.cpp:68
msgid "Change Password" msgid "Change Password"
msgstr "Changer le mot de passe" msgstr "Changer le mot de passe"
#: src/view/PasswordDialog.cpp:10 #: src/view/PasswordDialog.cpp:29
msgid "Change password" msgid "Change password"
msgstr "Changer le mot de passe" msgstr "Changer le mot de passe"
#: src/view/ButtonPanel.cpp:30 #: src/view/ButtonPanel.cpp:50
msgid "Change user" msgid "Change user"
msgstr "Changer d'utilisateur" msgstr "Changer d'utilisateur"
#: src/view/PreferencesPanel.cpp:164 #: src/view/PreferencesPanel.cpp:183
msgid "Color" msgid "Color"
msgstr "Couleur" msgstr "Couleur"
#: src/view/PasswordDialog.cpp:27 #: src/view/PasswordDialog.cpp:46
msgid "Confirm password " msgid "Confirm password "
msgstr "Confirmer le mot de passe" msgstr "Confirmer le mot de passe"
#: src/view/AccountPanel.cpp:130 #: src/view/AccountPanel.cpp:123
msgid "Cost repartition" msgid "Cost repartition"
msgstr "Répartition des coûts" msgstr "Répartition des coûts"
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46
msgid "Credit" msgid "Credit"
msgstr "Crédit" msgstr "Crédit"
#: src/view/AccountPanel.cpp:200 #: src/view/AccountPanel.cpp:193
msgid "Cur Credit" msgid "Cur Credit"
msgstr "Cur Crédit" msgstr "Cur Crédit"
#: src/view/AccountPanel.cpp:201 #: src/view/AccountPanel.cpp:194
msgid "Cur Debit" msgid "Cur Debit"
msgstr "Cur Débit" msgstr "Cur Débit"
#: src/view/AccountPanel.cpp:122 #: src/view/AccountPanel.cpp:115
msgid "Current value" msgid "Current value"
msgstr "Valeur courante" msgstr "Valeur courante"
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46
msgid "Date" msgid "Date"
msgstr "Date" msgstr "Date"
#: src/view/AccountPanel.cpp:8 #: src/view/SearchPanel.cpp:47
msgid "Date from"
msgstr "Date min"
#: src/view/SearchPanel.cpp:48
msgid "Date to"
msgstr "Date max"
#: src/view/GridAccount.cpp:46
msgid "Debit" msgid "Debit"
msgstr "Débit" msgstr "Débit"
#: src/view/PreferencesPanel.cpp:115 #: src/view/PreferencesPanel.cpp:134
msgid "Default" msgid "Default"
msgstr "Défaut" msgstr "Défaut"
#: src/view/PreferencesPanel.cpp:116 #: src/view/PreferencesPanel.cpp:135
#: src/view/PreferencesPanel.cpp:166 #: src/view/PreferencesPanel.cpp:185
#: src/view/AccountPanel.cpp:833 #: src/view/AccountPanel.cpp:763
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46
#: src/view/SearchPanel.cpp:74
msgid "Description" msgid "Description"
msgstr "Description" msgstr "Description"
#: src/model/Database.cpp:83 #: src/model/Database.cpp:102
#: src/model/Database.cpp:106 #: src/model/Database.cpp:125
#: src/view/PasswordDialog.cpp:53 #: src/view/PasswordDialog.cpp:72
#: src/view/PasswordDialog.cpp:59 #: src/view/PasswordDialog.cpp:78
#: src/view/PreferencesPanel.cpp:282 #: src/view/PreferencesPanel.cpp:301
#: src/view/PreferencesPanel.cpp:315 #: src/view/PreferencesPanel.cpp:324
#: src/view/PreferencesPanel.cpp:415 #: src/view/PreferencesPanel.cpp:343
#: src/view/PreferencesPanel.cpp:454 #: src/view/PreferencesPanel.cpp:433
#: src/view/PreferencesPanel.cpp:460 #: src/view/PreferencesPanel.cpp:452
#: src/view/AccountPanel.cpp:970 #: src/view/PreferencesPanel.cpp:491
#: src/view/UsersDialog.cpp:67 #: src/view/PreferencesPanel.cpp:497
#: src/view/UsersDialog.cpp:95 #: src/view/AccountPanel.cpp:900
#: src/view/UsersDialog.cpp:86
#: src/view/UsersDialog.cpp:114
#: src/view/SearchPanel.cpp:128
#: src/view/SearchPanel.cpp:138
#: src/view/SearchPanel.cpp:150
#: src/view/SearchPanel.cpp:159
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
#: src/model/Database.cpp:106 #: src/model/Database.cpp:125
msgid "Error creating original database" msgid "Error creating original database"
msgstr "Erreur durant la création de la base de données initiale" msgstr "Erreur durant la création de la base de données initiale"
#: src/view/AccountPanel.cpp:123 #: src/view/AccountPanel.cpp:116
msgid "Final value" msgid "Final value"
msgstr "Valeur finale" msgstr "Valeur finale"
#: src/controller/KissCount.cpp:239 #: src/model/Database.cpp:258
#: src/controller/KissCount.cpp:258
#: src/view/GridAccount.cpp:123
msgid "Fix" msgid "Fix"
msgstr "Fixe" msgstr "Fixe"
#: src/model/Database.cpp:239 #: src/view/PreferencesPanel.cpp:184
#: src/view/AccountPanel.cpp:406
msgid "Fixe"
msgstr "Fixe"
#: src/view/PreferencesPanel.cpp:165
msgid "Font" msgid "Font"
msgstr "Police" msgstr "Police"
#: src/view/GenerateDialog.cpp:26 #: src/view/GenerateDialog.cpp:45
msgid "From " msgid "From "
msgstr "De" msgstr "De"
#: src/view/GenerateDialog.cpp:12 #: src/view/GenerateDialog.cpp:31
#: src/view/AccountPanel.cpp:830 #: src/view/AccountPanel.cpp:760
msgid "Generate month" msgid "Generate month"
msgstr "Générer mois" msgstr "Générer mois"
#: src/controller/KissCount.cpp:241 #: src/controller/KissCount.cpp:260
msgid "Groceries" msgid "Groceries"
msgstr "Courses" msgstr "Courses"
#: src/controller/KissCount.cpp:243 #: src/controller/KissCount.cpp:262
msgid "Hobbies" msgid "Hobbies"
msgstr "Loisirs" msgstr "Loisirs"
#: src/view/AccountPanel.cpp:121 #: src/view/AccountPanel.cpp:114
msgid "Initial value" msgid "Initial value"
msgstr "Valeur initiale" msgstr "Valeur initiale"
#: src/view/PreferencesPanel.cpp:454 #: src/view/SearchPanel.cpp:138
msgid "Invalid amount from"
msgstr "Montant min invalide"
#: src/view/SearchPanel.cpp:159
msgid "Invalid amount range"
msgstr "Intervalle des montants invalide"
#: src/view/SearchPanel.cpp:150
msgid "Invalid amount to"
msgstr "Montant max invalide"
#: src/view/SearchPanel.cpp:128
msgid "Invalid date range"
msgstr "Intervalle des dates invalide"
#: src/view/PreferencesPanel.cpp:491
msgid "Invalid name" msgid "Invalid name"
msgstr "Nom invalide" msgstr "Nom invalide"
#: src/view/PasswordDialog.cpp:53 #: src/view/PasswordDialog.cpp:72
msgid "Invalid old password" msgid "Invalid old password"
msgstr "Ancien mot de passe invalide" msgstr "Ancien mot de passe invalide"
#: src/view/UsersDialog.cpp:67 #: src/view/UsersDialog.cpp:86
msgid "Invalid password" msgid "Invalid password"
msgstr "Mot de passe invalide" msgstr "Mot de passe invalide"
#: src/view/PreferencesPanel.cpp:282 #: src/view/PreferencesPanel.cpp:301
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "Il doit y avoir au moins un compte !" msgstr "Il doit y avoir au moins un compte !"
#: src/view/AccountPanel.cpp:970 #: src/view/AccountPanel.cpp:900
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "Il doit rester au mois un mois" msgstr "Il doit rester au mois un mois"
#: src/view/PreferencesPanel.cpp:50 #: src/view/PreferencesPanel.cpp:69
msgid "Kill me" msgid "Kill me"
msgstr "Kill me" msgstr "Kill me"
#: src/view/PreferencesPanel.cpp:484 #: src/view/PreferencesPanel.cpp:521
#: src/view/PreferencesPanel.cpp:487 #: src/view/PreferencesPanel.cpp:524
msgid "KissCount" msgid "KissCount"
msgstr "KissCount" msgstr "KissCount"
#: src/view/ButtonPanel.cpp:71 #: src/view/ButtonPanel.cpp:96
msgid "" msgid ""
"KissCount v0.1\n" "KissCount v0.1\n"
"\n" "\n"
@ -260,194 +310,203 @@ msgstr ""
"\n" "\n"
"Copyright (C) 2010 Grégory Soutadé" "Copyright (C) 2010 Grégory Soutadé"
#: src/view/PreferencesPanel.cpp:34 #: src/view/PreferencesPanel.cpp:53
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
#: src/view/PreferencesPanel.cpp:487 #: src/view/PreferencesPanel.cpp:524
msgid "Language not changed" msgid "Language not changed"
msgstr "Langue non changée" msgstr "Langue non changée"
#: src/view/PreferencesPanel.cpp:484 #: src/view/PreferencesPanel.cpp:521
msgid "Language successfully changed, please go to another panel" msgid "Language successfully changed, please go to another panel"
msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif" msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif"
#: src/view/PreferencesPanel.cpp:42 #: src/view/PreferencesPanel.cpp:61
#: src/view/PreferencesPanel.cpp:112 #: src/view/PreferencesPanel.cpp:131
#: src/view/PreferencesPanel.cpp:163 #: src/view/PreferencesPanel.cpp:182
msgid "Name" msgid "Name"
msgstr "Nom" msgstr "Nom"
#: src/view/PreferencesPanel.cpp:466 #: src/view/PreferencesPanel.cpp:503
msgid "Name changed" msgid "Name changed"
msgstr "Nom changé" msgstr "Nom changé"
#: src/view/UsersDialog.cpp:33 #: src/view/UsersDialog.cpp:52
#: src/view/UsersDialog.cpp:84 #: src/view/UsersDialog.cpp:103
msgid "New User" msgid "New User"
msgstr "Nouvel utilisateur" msgstr "Nouvel utilisateur"
#: src/view/PasswordDialog.cpp:22 #: src/view/PasswordDialog.cpp:41
msgid "New password " msgid "New password "
msgstr "Nouveau mot de passe" msgstr "Nouveau mot de passe"
#: src/model/Database.cpp:77 #: src/model/Database.cpp:96
msgid "No database found, creating a new one" msgid "No database found, creating a new one"
msgstr "Aucune base de données trouvée, création d'une nouvelle" msgstr "Aucune base de données trouvée, création d'une nouvelle"
#: src/view/PreferencesPanel.cpp:113 #: src/view/SearchPanel.cpp:208
msgid "No entry found"
msgstr "Pas d'entrée trouvée"
#: src/view/PreferencesPanel.cpp:132
msgid "Number" msgid "Number"
msgstr "Numéro de compte" msgstr "Numéro de compte"
#: src/view/PasswordDialog.cpp:36 #: src/view/PasswordDialog.cpp:55
#: src/view/GenerateDialog.cpp:40 #: src/view/GenerateDialog.cpp:59
#: src/view/UsersDialog.cpp:31 #: src/view/UsersDialog.cpp:50
msgid "OK" msgid "OK"
msgstr "OK" msgstr "OK"
#: src/view/PasswordDialog.cpp:17 #: src/view/PasswordDialog.cpp:36
msgid "Old password " msgid "Old password "
msgstr "Ancien mot de passe" msgstr "Ancien mot de passe"
#: src/controller/KissCount.cpp:245 #: src/controller/KissCount.cpp:264
msgid "Operating exepense" msgid "Operating exepense"
msgstr "Frais de fonctionnement" msgstr "Frais de fonctionnement"
#: src/view/ButtonPanel.cpp:26 #: src/view/ButtonPanel.cpp:46
msgid "Operations" msgid "Operations"
msgstr "Opérations" msgstr "Opérations"
#: src/controller/KissCount.cpp:249 #: src/controller/KissCount.cpp:268
msgid "Other" msgid "Other"
msgstr "Autres" msgstr "Autres"
#: src/view/UsersDialog.cpp:24 #: src/view/UsersDialog.cpp:43
msgid "Password " msgid "Password "
msgstr "Mot de passe" msgstr "Mot de passe"
#: src/view/PasswordDialog.cpp:65 #: src/view/PasswordDialog.cpp:84
msgid "Password changed" msgid "Password changed"
msgstr "Mot de passe changé" msgstr "Mot de passe changé"
#: src/view/PasswordDialog.cpp:59 #: src/view/PasswordDialog.cpp:78
msgid "Please retype new password" msgid "Please retype new password"
msgstr "Re entrez le mot de passe" msgstr "Re entrez le mot de passe"
#: src/view/PreferencesPanel.cpp:468 #: src/view/PreferencesPanel.cpp:505
#: src/view/PreferencesPanel.cpp:493 #: src/view/PreferencesPanel.cpp:530
#: src/view/ButtonPanel.cpp:29 #: src/view/ButtonPanel.cpp:49
msgid "Preferences" msgid "Preferences"
msgstr "Préférences" msgstr "Préférences"
#: src/view/ButtonPanel.cpp:32 #: src/view/ButtonPanel.cpp:52
msgid "Quit" msgid "Quit"
msgstr "Quitter" msgstr "Quitter"
#: src/view/ButtonPanel.cpp:78 #: src/view/ButtonPanel.cpp:103
msgid "Quit KissCount ?" msgid "Quit KissCount ?"
msgstr "Quitter KissCount ?" msgstr "Quitter KissCount ?"
#: src/view/AccountPanel.cpp:202 #: src/view/AccountPanel.cpp:195
msgid "Remains" msgid "Remains"
msgstr "Restant" msgstr "Restant"
#: src/view/ButtonPanel.cpp:28 #: src/view/SearchPanel.cpp:72
#: src/view/SearchPanel.cpp:226
#: src/view/ButtonPanel.cpp:48
msgid "Search" msgid "Search"
msgstr "Chercher" msgstr "Chercher"
#: src/view/AccountPanel.cpp:83 #: src/view/AccountPanel.cpp:97
msgid "Serie 1" msgid "Serie 1"
msgstr "Série 1" msgstr "Série 1"
#: src/view/PreferencesPanel.cpp:114 #: src/view/PreferencesPanel.cpp:133
msgid "Shared" msgid "Shared"
msgstr "Partagé" msgstr "Partagé"
#: src/view/ButtonPanel.cpp:27 #: src/view/ButtonPanel.cpp:47
msgid "Statistics" msgid "Statistics"
msgstr "Statistiques" msgstr "Statistiques"
#: src/view/GenerateDialog.cpp:33 #: src/view/GenerateDialog.cpp:52
msgid "To " msgid "To "
msgstr "A" msgstr "A"
#: src/view/AccountPanel.cpp:184 #: src/view/AccountPanel.cpp:177
msgid "Total Credit" msgid "Total Credit"
msgstr "Total Crédit" msgstr "Total Crédit"
#: src/view/AccountPanel.cpp:185 #: src/view/AccountPanel.cpp:178
msgid "Total Debit" msgid "Total Debit"
msgstr "Total Débit" msgstr "Total Débit"
#: src/controller/KissCount.cpp:247 #: src/controller/KissCount.cpp:266
msgid "Unexpected" msgid "Unexpected"
msgstr "Exceptionnel" msgstr "Exceptionnel"
#: src/model/User.cpp:27 #: src/model/User.cpp:46
#: src/model/User.cpp:41 #: src/model/User.cpp:60
#: src/model/User.cpp:61 #: src/model/User.cpp:80
msgid "Unknown" msgid "Unknown"
msgstr "Inconnu" msgstr "Inconnu"
#: src/view/PreferencesPanel.cpp:31 #: src/view/PreferencesPanel.cpp:50
msgid "User" msgid "User"
msgstr "Utilisateur" msgstr "Utilisateur"
#: src/view/PreferencesPanel.cpp:460 #: src/view/PreferencesPanel.cpp:497
#: src/view/UsersDialog.cpp:19 #: src/view/UsersDialog.cpp:38
#: src/view/UsersDialog.cpp:95 #: src/view/UsersDialog.cpp:114
msgid "User " msgid "User "
msgstr "Utilisateur" msgstr "Utilisateur"
#: src/view/UsersDialog.cpp:11 #: src/view/UsersDialog.cpp:30
msgid "Users" msgid "Users"
msgstr "Utilisateurs" msgstr "Utilisateurs"
#: src/view/wxUI.cpp:77 #: src/view/wxUI.cpp:97
msgid "april" msgid "april"
msgstr "avril" msgstr "avril"
#: src/view/wxUI.cpp:81 #: src/view/wxUI.cpp:101
msgid "august" msgid "august"
msgstr "août" msgstr "août"
#: src/view/wxUI.cpp:85 #: src/view/wxUI.cpp:105
msgid "december" msgid "december"
msgstr "décembre" msgstr "décembre"
#: src/view/wxUI.cpp:75 #: src/view/wxUI.cpp:95
msgid "february" msgid "february"
msgstr "février" msgstr "février"
#: src/view/wxUI.cpp:74 #: src/view/wxUI.cpp:94
msgid "january" msgid "january"
msgstr "janvier" msgstr "janvier"
#: src/view/wxUI.cpp:80 #: src/view/wxUI.cpp:100
msgid "july" msgid "july"
msgstr "juillet" msgstr "juillet"
#: src/view/wxUI.cpp:79 #: src/view/wxUI.cpp:99
msgid "june" msgid "june"
msgstr "juin" msgstr "juin"
#: src/view/wxUI.cpp:76 #: src/view/wxUI.cpp:96
msgid "march" msgid "march"
msgstr "mars" msgstr "mars"
#: src/view/wxUI.cpp:78 #: src/view/wxUI.cpp:98
msgid "may" msgid "may"
msgstr "mai" msgstr "mai"
#: src/view/wxUI.cpp:84 #: src/view/wxUI.cpp:104
msgid "november" msgid "november"
msgstr "novembre" msgstr "novembre"
#: src/view/wxUI.cpp:83 #: src/view/wxUI.cpp:103
msgid "october" msgid "october"
msgstr "octobre" msgstr "octobre"
#: src/view/wxUI.cpp:82 #: src/view/wxUI.cpp:102
msgid "september" msgid "september"
msgstr "septembre" msgstr "septembre"
#~ msgid "Fixe"
#~ msgstr "Fixe"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-07-08 19:24+0200\n" "POT-Creation-Date: 2010-07-16 18:37+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -16,220 +16,261 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: src/view/PreferencesPanel.cpp:493 #: src/view/PreferencesPanel.cpp:530
msgid " - " msgid " - "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:315 src/view/PreferencesPanel.cpp:415 #: src/view/PreferencesPanel.cpp:324 src/view/PreferencesPanel.cpp:343
#: src/view/PreferencesPanel.cpp:460 src/view/UsersDialog.cpp:95 #: src/view/PreferencesPanel.cpp:433 src/view/PreferencesPanel.cpp:452
#: src/view/PreferencesPanel.cpp:497 src/view/UsersDialog.cpp:114
msgid " already exists" msgid " already exists"
msgstr "" msgstr ""
#: src/model/Database.cpp:83 #: src/view/SearchPanel.cpp:204
msgid " entries found"
msgstr ""
#: src/model/Database.cpp:102
msgid " not found, aborting" msgid " not found, aborting"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:979 #: src/view/AccountPanel.cpp:909
msgid " operations ?" msgid " operations ?"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:500 #: src/view/PreferencesPanel.cpp:537
msgid " profil ?" msgid " profil ?"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:31 #: src/view/SearchPanel.cpp:206
msgid "1 entry found"
msgstr ""
#: src/view/ButtonPanel.cpp:51
msgid "About" msgid "About"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46 src/view/SearchPanel.cpp:78
msgid "Account" msgid "Account"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:315 #: src/view/PreferencesPanel.cpp:324 src/view/PreferencesPanel.cpp:343
msgid "Account " msgid "Account "
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:120 #: src/view/AccountPanel.cpp:113
msgid "Account name" msgid "Account name"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:119 #: src/view/AccountPanel.cpp:112
msgid "Account number" msgid "Account number"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:32 #: src/view/PreferencesPanel.cpp:51
msgid "Accounts" msgid "Accounts"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:286 src/view/PreferencesPanel.cpp:500 #: src/view/SearchPanel.cpp:75
#: src/view/AccountPanel.cpp:974 msgid "Amount from"
msgstr ""
#: src/view/SearchPanel.cpp:76
msgid "Amount to"
msgstr ""
#: src/view/PreferencesPanel.cpp:305 src/view/PreferencesPanel.cpp:537
#: src/view/AccountPanel.cpp:904
msgid "Are you sure want to delete " msgid "Are you sure want to delete "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:386 src/view/AccountPanel.cpp:684 #: src/view/PreferencesPanel.cpp:414 src/view/AccountPanel.cpp:614
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:37 src/view/GenerateDialog.cpp:41 #: src/view/PasswordDialog.cpp:56 src/view/GenerateDialog.cpp:60
#: src/view/UsersDialog.cpp:32 #: src/view/UsersDialog.cpp:51
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:33 #: src/view/PreferencesPanel.cpp:52
msgid "Categories" msgid "Categories"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46 src/view/SearchPanel.cpp:77
msgid "Category" msgid "Category"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:415 #: src/view/PreferencesPanel.cpp:433 src/view/PreferencesPanel.cpp:452
msgid "Category " msgid "Category "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:48 #: src/view/PreferencesPanel.cpp:67
msgid "Change Name" msgid "Change Name"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:49 #: src/view/PreferencesPanel.cpp:68
msgid "Change Password" msgid "Change Password"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:10 #: src/view/PasswordDialog.cpp:29
msgid "Change password" msgid "Change password"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:30 #: src/view/ButtonPanel.cpp:50
msgid "Change user" msgid "Change user"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:164 #: src/view/PreferencesPanel.cpp:183
msgid "Color" msgid "Color"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:27 #: src/view/PasswordDialog.cpp:46
msgid "Confirm password " msgid "Confirm password "
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:130 #: src/view/AccountPanel.cpp:123
msgid "Cost repartition" msgid "Cost repartition"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46
msgid "Credit" msgid "Credit"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:200 #: src/view/AccountPanel.cpp:193
msgid "Cur Credit" msgid "Cur Credit"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:201 #: src/view/AccountPanel.cpp:194
msgid "Cur Debit" msgid "Cur Debit"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:122 #: src/view/AccountPanel.cpp:115
msgid "Current value" msgid "Current value"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46
msgid "Date" msgid "Date"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:8 #: src/view/SearchPanel.cpp:47
msgid "Date from"
msgstr ""
#: src/view/SearchPanel.cpp:48
msgid "Date to"
msgstr ""
#: src/view/GridAccount.cpp:46
msgid "Debit" msgid "Debit"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:115 #: src/view/PreferencesPanel.cpp:134
msgid "Default" msgid "Default"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:116 src/view/PreferencesPanel.cpp:166 #: src/view/PreferencesPanel.cpp:135 src/view/PreferencesPanel.cpp:185
#: src/view/AccountPanel.cpp:833 #: src/view/AccountPanel.cpp:763
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:8 #: src/view/GridAccount.cpp:46 src/view/SearchPanel.cpp:74
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: src/model/Database.cpp:83 src/model/Database.cpp:106 #: src/model/Database.cpp:102 src/model/Database.cpp:125
#: src/view/PasswordDialog.cpp:53 src/view/PasswordDialog.cpp:59 #: src/view/PasswordDialog.cpp:72 src/view/PasswordDialog.cpp:78
#: src/view/PreferencesPanel.cpp:282 src/view/PreferencesPanel.cpp:315 #: src/view/PreferencesPanel.cpp:301 src/view/PreferencesPanel.cpp:324
#: src/view/PreferencesPanel.cpp:415 src/view/PreferencesPanel.cpp:454 #: src/view/PreferencesPanel.cpp:343 src/view/PreferencesPanel.cpp:433
#: src/view/PreferencesPanel.cpp:460 src/view/AccountPanel.cpp:970 #: src/view/PreferencesPanel.cpp:452 src/view/PreferencesPanel.cpp:491
#: src/view/UsersDialog.cpp:67 src/view/UsersDialog.cpp:95 #: src/view/PreferencesPanel.cpp:497 src/view/AccountPanel.cpp:900
#: src/view/UsersDialog.cpp:86 src/view/UsersDialog.cpp:114
#: src/view/SearchPanel.cpp:128 src/view/SearchPanel.cpp:138
#: src/view/SearchPanel.cpp:150 src/view/SearchPanel.cpp:159
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: src/model/Database.cpp:106 #: src/model/Database.cpp:125
msgid "Error creating original database" msgid "Error creating original database"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:123 #: src/view/AccountPanel.cpp:116
msgid "Final value" msgid "Final value"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:239 #: src/model/Database.cpp:258 src/controller/KissCount.cpp:258
#: src/view/GridAccount.cpp:123
msgid "Fix" msgid "Fix"
msgstr "" msgstr ""
#: src/model/Database.cpp:239 src/view/AccountPanel.cpp:406 #: src/view/PreferencesPanel.cpp:184
msgid "Fixe"
msgstr ""
#: src/view/PreferencesPanel.cpp:165
msgid "Font" msgid "Font"
msgstr "" msgstr ""
#: src/view/GenerateDialog.cpp:26 #: src/view/GenerateDialog.cpp:45
msgid "From " msgid "From "
msgstr "" msgstr ""
#: src/view/GenerateDialog.cpp:12 src/view/AccountPanel.cpp:830 #: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:760
msgid "Generate month" msgid "Generate month"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:241 #: src/controller/KissCount.cpp:260
msgid "Groceries" msgid "Groceries"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:243 #: src/controller/KissCount.cpp:262
msgid "Hobbies" msgid "Hobbies"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:121 #: src/view/AccountPanel.cpp:114
msgid "Initial value" msgid "Initial value"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:454 #: src/view/SearchPanel.cpp:138
msgid "Invalid amount from"
msgstr ""
#: src/view/SearchPanel.cpp:159
msgid "Invalid amount range"
msgstr ""
#: src/view/SearchPanel.cpp:150
msgid "Invalid amount to"
msgstr ""
#: src/view/SearchPanel.cpp:128
msgid "Invalid date range"
msgstr ""
#: src/view/PreferencesPanel.cpp:491
msgid "Invalid name" msgid "Invalid name"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:53 #: src/view/PasswordDialog.cpp:72
msgid "Invalid old password" msgid "Invalid old password"
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:67 #: src/view/UsersDialog.cpp:86
msgid "Invalid password" msgid "Invalid password"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:282 #: src/view/PreferencesPanel.cpp:301
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:970 #: src/view/AccountPanel.cpp:900
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:50 #: src/view/PreferencesPanel.cpp:69
msgid "Kill me" msgid "Kill me"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:484 src/view/PreferencesPanel.cpp:487 #: src/view/PreferencesPanel.cpp:521 src/view/PreferencesPanel.cpp:524
msgid "KissCount" msgid "KissCount"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:71 #: src/view/ButtonPanel.cpp:96
msgid "" msgid ""
"KissCount v0.1\n" "KissCount v0.1\n"
"\n" "\n"
@ -238,186 +279,191 @@ msgid ""
"Copyright (C) 2010 Grégory Soutadé" "Copyright (C) 2010 Grégory Soutadé"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:34 #: src/view/PreferencesPanel.cpp:53
msgid "Language" msgid "Language"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:487 #: src/view/PreferencesPanel.cpp:524
msgid "Language not changed" msgid "Language not changed"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:484 #: src/view/PreferencesPanel.cpp:521
msgid "Language successfully changed, please go to another panel" msgid "Language successfully changed, please go to another panel"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:42 src/view/PreferencesPanel.cpp:112 #: src/view/PreferencesPanel.cpp:61 src/view/PreferencesPanel.cpp:131
#: src/view/PreferencesPanel.cpp:163 #: src/view/PreferencesPanel.cpp:182
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:466 #: src/view/PreferencesPanel.cpp:503
msgid "Name changed" msgid "Name changed"
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:33 src/view/UsersDialog.cpp:84 #: src/view/UsersDialog.cpp:52 src/view/UsersDialog.cpp:103
msgid "New User" msgid "New User"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:22 #: src/view/PasswordDialog.cpp:41
msgid "New password " msgid "New password "
msgstr "" msgstr ""
#: src/model/Database.cpp:77 #: src/model/Database.cpp:96
msgid "No database found, creating a new one" msgid "No database found, creating a new one"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:113 #: src/view/SearchPanel.cpp:208
msgid "No entry found"
msgstr ""
#: src/view/PreferencesPanel.cpp:132
msgid "Number" msgid "Number"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:36 src/view/GenerateDialog.cpp:40 #: src/view/PasswordDialog.cpp:55 src/view/GenerateDialog.cpp:59
#: src/view/UsersDialog.cpp:31 #: src/view/UsersDialog.cpp:50
msgid "OK" msgid "OK"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:17 #: src/view/PasswordDialog.cpp:36
msgid "Old password " msgid "Old password "
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:245 #: src/controller/KissCount.cpp:264
msgid "Operating exepense" msgid "Operating exepense"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:26 #: src/view/ButtonPanel.cpp:46
msgid "Operations" msgid "Operations"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:249 #: src/controller/KissCount.cpp:268
msgid "Other" msgid "Other"
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:24 #: src/view/UsersDialog.cpp:43
msgid "Password " msgid "Password "
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:65 #: src/view/PasswordDialog.cpp:84
msgid "Password changed" msgid "Password changed"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:59 #: src/view/PasswordDialog.cpp:78
msgid "Please retype new password" msgid "Please retype new password"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:468 src/view/PreferencesPanel.cpp:493 #: src/view/PreferencesPanel.cpp:505 src/view/PreferencesPanel.cpp:530
#: src/view/ButtonPanel.cpp:29 #: src/view/ButtonPanel.cpp:49
msgid "Preferences" msgid "Preferences"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:32 #: src/view/ButtonPanel.cpp:52
msgid "Quit" msgid "Quit"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:78 #: src/view/ButtonPanel.cpp:103
msgid "Quit KissCount ?" msgid "Quit KissCount ?"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:202 #: src/view/AccountPanel.cpp:195
msgid "Remains" msgid "Remains"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:28 #: src/view/SearchPanel.cpp:72 src/view/SearchPanel.cpp:226
#: src/view/ButtonPanel.cpp:48
msgid "Search" msgid "Search"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:83 #: src/view/AccountPanel.cpp:97
msgid "Serie 1" msgid "Serie 1"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:114 #: src/view/PreferencesPanel.cpp:133
msgid "Shared" msgid "Shared"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:27 #: src/view/ButtonPanel.cpp:47
msgid "Statistics" msgid "Statistics"
msgstr "" msgstr ""
#: src/view/GenerateDialog.cpp:33 #: src/view/GenerateDialog.cpp:52
msgid "To " msgid "To "
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:184 #: src/view/AccountPanel.cpp:177
msgid "Total Credit" msgid "Total Credit"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:185 #: src/view/AccountPanel.cpp:178
msgid "Total Debit" msgid "Total Debit"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:247 #: src/controller/KissCount.cpp:266
msgid "Unexpected" msgid "Unexpected"
msgstr "" msgstr ""
#: src/model/User.cpp:27 src/model/User.cpp:41 src/model/User.cpp:61 #: src/model/User.cpp:46 src/model/User.cpp:60 src/model/User.cpp:80
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:31 #: src/view/PreferencesPanel.cpp:50
msgid "User" msgid "User"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:460 src/view/UsersDialog.cpp:19 #: src/view/PreferencesPanel.cpp:497 src/view/UsersDialog.cpp:38
#: src/view/UsersDialog.cpp:95 #: src/view/UsersDialog.cpp:114
msgid "User " msgid "User "
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:11 #: src/view/UsersDialog.cpp:30
msgid "Users" msgid "Users"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:77 #: src/view/wxUI.cpp:97
msgid "april" msgid "april"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:81 #: src/view/wxUI.cpp:101
msgid "august" msgid "august"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:85 #: src/view/wxUI.cpp:105
msgid "december" msgid "december"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:75 #: src/view/wxUI.cpp:95
msgid "february" msgid "february"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:74 #: src/view/wxUI.cpp:94
msgid "january" msgid "january"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:80 #: src/view/wxUI.cpp:100
msgid "july" msgid "july"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:79 #: src/view/wxUI.cpp:99
msgid "june" msgid "june"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:76 #: src/view/wxUI.cpp:96
msgid "march" msgid "march"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:78 #: src/view/wxUI.cpp:98
msgid "may" msgid "may"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:84 #: src/view/wxUI.cpp:104
msgid "november" msgid "november"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:83 #: src/view/wxUI.cpp:103
msgid "october" msgid "october"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:82 #: src/view/wxUI.cpp:102
msgid "september" msgid "september"
msgstr "" msgstr ""

View File

@ -926,7 +926,7 @@ std::vector<Operation>* Database::Search(User* user, wxString* description, wxDa
if (description) if (description)
{ {
req += wxT("UPPER(description) LIKE '%") + description->MakeUpper() + wxT("%'"); req += wxT("description LIKE '%") + *description + wxT("%'");
firstCond = true; firstCond = true;
} }

View File

@ -318,6 +318,15 @@ void PreferencesPanel::OnAccountModified(wxGridEvent& event)
_wxUI->NeedReload(); _wxUI->NeedReload();
return; return;
} }
if (user->GetAccountId(new_account.name) != new_account.id)
{
wxMessageBox(_("Account ")+new_account.name+_(" already exists"), _("Error"), wxICON_ERROR | wxOK );
_accountsGrid->SetCellValue(row, ACCOUNT_NAME, user->_accounts[row].name);
inModification = false;
return ;
}
_kiss->UpdateAccount(new_account); _kiss->UpdateAccount(new_account);
} }
// New account // New account
@ -418,6 +427,15 @@ void PreferencesPanel::OnCategoryModified(wxGridEvent& event)
inModification = false; inModification = false;
return; return;
} }
if (user->GetCategoryId(new_cat.name) != new_cat.id)
{
wxMessageBox(_("Category ")+new_cat.name+_(" already exists"), _("Error"), wxICON_ERROR | wxOK );
_categoriesGrid->SetCellValue(row, CATEGORY_NAME, user->_categories[row].name);
inModification = false;
return ;
}
_kiss->UpdateCategory(new_cat); _kiss->UpdateCategory(new_cat);
} }
// New category // New category

View File

@ -19,11 +19,13 @@ along with KissCount. If not, see <http://www.gnu.org/licenses/>.
#include "AccountPanel.h" #include "AccountPanel.h"
enum {SEARCH_ID, GRID_ID}; enum {SEARCH_ID, GRID_ID, CALENDAR_FROM_ID, CALENDAR_TO_ID};
BEGIN_EVENT_TABLE(SearchPanel, wxPanel) BEGIN_EVENT_TABLE(SearchPanel, wxPanel)
EVT_BUTTON(SEARCH_ID, SearchPanel::OnButtonSearch) EVT_BUTTON(SEARCH_ID, SearchPanel::OnButtonSearch)
EVT_SHOW(SearchPanel::OnShow) EVT_SHOW(SearchPanel::OnShow)
EVT_CALENDAR_SEL_CHANGED(CALENDAR_FROM_ID, SearchPanel::OnCalendarFromChange)
EVT_CALENDAR_SEL_CHANGED(CALENDAR_TO_ID, SearchPanel::OnCalendarToChange)
END_EVENT_TABLE() END_EVENT_TABLE()
#define SET_ROW_COLOR(row, color) for(int i=0; i<NUMBER_COLS_OPS; i++) \ #define SET_ROW_COLOR(row, color) for(int i=0; i<NUMBER_COLS_OPS; i++) \
@ -47,9 +49,9 @@ SearchPanel::SearchPanel(KissCount* kiss, wxUI *parent) : wxScrolledWindow(&(*pa
wxGridBagSizer *gridBagSizer = new wxGridBagSizer(3, 9); wxGridBagSizer *gridBagSizer = new wxGridBagSizer(3, 9);
_calendarFrom = new wxCalendarCtrl(this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, _calendarFrom = new wxCalendarCtrl(this, CALENDAR_FROM_ID, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize,
wxCAL_MONDAY_FIRST); wxCAL_MONDAY_FIRST);
_calendarTo = new wxCalendarCtrl(this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, _calendarTo = new wxCalendarCtrl(this, CALENDAR_TO_ID, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize,
wxCAL_MONDAY_FIRST); wxCAL_MONDAY_FIRST);
@ -123,7 +125,7 @@ void SearchPanel::OnButtonSearch(wxCommandEvent& event)
if (_calendarFrom->GetDate() > _calendarTo->GetDate()) if (_calendarFrom->GetDate() > _calendarTo->GetDate())
{ {
wxMessageBox(_("Invalide date range"), _("Error"), wxICON_ERROR | wxOK); wxMessageBox(_("Invalid date range"), _("Error"), wxICON_ERROR | wxOK);
return; return;
} }
@ -133,7 +135,7 @@ void SearchPanel::OnButtonSearch(wxCommandEvent& event)
*amountFrom = _amountFrom->GetLineText(0); *amountFrom = _amountFrom->GetLineText(0);
if (!amountFrom->ToDouble(&af)) if (!amountFrom->ToDouble(&af))
{ {
wxMessageBox(_("Invalide amount from"), _("Error"), wxICON_ERROR | wxOK); wxMessageBox(_("Invalid amount from"), _("Error"), wxICON_ERROR | wxOK);
delete amountFrom; delete amountFrom;
return; return;
} }
@ -145,7 +147,7 @@ void SearchPanel::OnButtonSearch(wxCommandEvent& event)
*amountTo = _amountTo->GetLineText(0); *amountTo = _amountTo->GetLineText(0);
if (!amountTo->ToDouble(&at)) if (!amountTo->ToDouble(&at))
{ {
wxMessageBox(_("Invalide amount to"), _("Error"), wxICON_ERROR | wxOK); wxMessageBox(_("Invalid amount to"), _("Error"), wxICON_ERROR | wxOK);
delete amountFrom; delete amountFrom;
delete amountTo; delete amountTo;
return; return;
@ -154,7 +156,7 @@ void SearchPanel::OnButtonSearch(wxCommandEvent& event)
if (amountFrom && amountTo && af > at) if (amountFrom && amountTo && af > at)
{ {
wxMessageBox(_("Invalide amount range"), _("Error"), wxICON_ERROR | wxOK); wxMessageBox(_("Invalid amount range"), _("Error"), wxICON_ERROR | wxOK);
delete amountFrom; delete amountFrom;
delete amountTo; delete amountTo;
return; return;
@ -224,3 +226,12 @@ void SearchPanel::OnShow(wxShowEvent& event)
_wxUI->SetTitle(_kiss->GetUser()->_name + wxT(" - ") + _("Search")); _wxUI->SetTitle(_kiss->GetUser()->_name + wxT(" - ") + _("Search"));
} }
void SearchPanel::OnCalendarFromChange(wxCalendarEvent& event)
{
_checkDateFrom->SetValue(true);
}
void SearchPanel::OnCalendarToChange(wxCalendarEvent& event)
{
_checkDateTo->SetValue(true);
}

View File

@ -46,6 +46,8 @@ class SearchPanel: public wxScrolledWindow
void OnButtonSearch(wxCommandEvent& event); void OnButtonSearch(wxCommandEvent& event);
void OnShow(wxShowEvent& event); void OnShow(wxShowEvent& event);
void OnCalendarFromChange(wxCalendarEvent& event);
void OnCalendarToChange(wxCalendarEvent& event);
private: private:
KissCount* _kiss; KissCount* _kiss;