Update TODO
Add Documentation Add KissCount URL into about Add Fix, non fix, both criteria into search Fix a bug (modifying language and go to another panel than main)
This commit is contained in:
parent
6cb7b0ccf0
commit
521596abd5
1
TODO
1
TODO
|
|
@ -8,7 +8,6 @@ Can type a letter with a comboboxes
|
|||
Windows version
|
||||
Need packaging
|
||||
Better build system for wxFreeChart (hacked by me)
|
||||
Documentation (en)
|
||||
|
||||
Cool for 0.1:
|
||||
Database auto saving at startup
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,7 +2,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: \n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-10-24 16:03+0200\n"
|
||||
"POT-Creation-Date: 2010-10-30 20:31+0200\n"
|
||||
"PO-Revision-Date: \n"
|
||||
"Last-Translator: Soutadé <soutade@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
|
|
@ -20,20 +20,20 @@ msgstr ""
|
|||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#: src/view/StatsPanel.cpp:282
|
||||
#: src/view/PreferencesPanel.cpp:743
|
||||
#: src/view/PreferencesPanel.cpp:745
|
||||
msgid " - "
|
||||
msgstr " - "
|
||||
|
||||
#: src/view/UsersDialog.cpp:118
|
||||
#: src/view/PreferencesPanel.cpp:404
|
||||
#: src/view/PreferencesPanel.cpp:423
|
||||
#: src/view/PreferencesPanel.cpp:636
|
||||
#: src/view/PreferencesPanel.cpp:655
|
||||
#: src/view/PreferencesPanel.cpp:701
|
||||
#: src/view/PreferencesPanel.cpp:406
|
||||
#: src/view/PreferencesPanel.cpp:425
|
||||
#: src/view/PreferencesPanel.cpp:638
|
||||
#: src/view/PreferencesPanel.cpp:657
|
||||
#: src/view/PreferencesPanel.cpp:703
|
||||
msgid " already exists"
|
||||
msgstr " existe déjà "
|
||||
|
||||
#: src/view/SearchPanel.cpp:215
|
||||
#: src/view/SearchPanel.cpp:227
|
||||
msgid " entries found"
|
||||
msgstr " entrées trouvées"
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ msgstr " non trouvé, arrêt"
|
|||
msgid " operations ?"
|
||||
msgstr " opérations ?"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:750
|
||||
#: src/view/PreferencesPanel.cpp:752
|
||||
msgid " profil ?"
|
||||
msgstr " profil ?"
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ msgstr " profil ?"
|
|||
msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
|
||||
msgstr "!! Attention !! S'il y a eu un bug, l'ancienne base de donnée va être supprimée !"
|
||||
|
||||
#: src/view/SearchPanel.cpp:217
|
||||
#: src/view/SearchPanel.cpp:229
|
||||
msgid "1 entry found"
|
||||
msgstr "1 entrée trouvée"
|
||||
|
||||
|
|
@ -61,13 +61,13 @@ msgstr "1 entrée trouvée"
|
|||
msgid "About"
|
||||
msgstr "A propos"
|
||||
|
||||
#: src/view/SearchPanel.cpp:85
|
||||
#: src/view/SearchPanel.cpp:89
|
||||
#: src/view/grid/GridAccount.cpp:63
|
||||
msgid "Account"
|
||||
msgstr "Compte"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:404
|
||||
#: src/view/PreferencesPanel.cpp:423
|
||||
#: src/view/PreferencesPanel.cpp:406
|
||||
#: src/view/PreferencesPanel.cpp:425
|
||||
msgid "Account "
|
||||
msgstr "Le compte "
|
||||
|
||||
|
|
@ -84,26 +84,26 @@ msgstr "Numéro de compte"
|
|||
msgid "Accounts"
|
||||
msgstr "Comptes"
|
||||
|
||||
#: src/view/SearchPanel.cpp:82
|
||||
#: src/view/SearchPanel.cpp:86
|
||||
msgid "Amount from"
|
||||
msgstr "Montant min"
|
||||
|
||||
#: src/view/SearchPanel.cpp:83
|
||||
#: src/view/SearchPanel.cpp:87
|
||||
msgid "Amount to"
|
||||
msgstr "Montant max"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:385
|
||||
#: src/view/PreferencesPanel.cpp:750
|
||||
#: src/view/PreferencesPanel.cpp:387
|
||||
#: src/view/PreferencesPanel.cpp:752
|
||||
#: src/view/AccountPanel.cpp:704
|
||||
msgid "Are you sure want to delete "
|
||||
msgstr "Etes vous sûr de vouloir supprimer "
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:617
|
||||
#: src/view/grid/GridAccount.cpp:745
|
||||
#: src/view/PreferencesPanel.cpp:619
|
||||
#: src/view/grid/GridAccount.cpp:760
|
||||
msgid "Are you sure want to delete : \n"
|
||||
msgstr "Etes vous sûr de vouloir supprimer : \n"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:306
|
||||
#: src/view/PreferencesPanel.cpp:308
|
||||
msgid "Ascending"
|
||||
msgstr "Croissant"
|
||||
|
||||
|
|
@ -111,19 +111,23 @@ msgstr "Croissant"
|
|||
msgid "Background color"
|
||||
msgstr "Couleur d'arrière plan"
|
||||
|
||||
#: src/view/SearchPanel.cpp:76
|
||||
msgid "Both"
|
||||
msgstr "Les deux"
|
||||
|
||||
#: src/view/UsersDialog.cpp:51
|
||||
#: src/view/GenerateDialog.cpp:60
|
||||
#: src/view/PasswordDialog.cpp:56
|
||||
msgid "Cancel"
|
||||
msgstr "Annuler"
|
||||
|
||||
#: src/view/grid/GridAccount.cpp:1129
|
||||
#: src/view/grid/GridAccount.cpp:1136
|
||||
#: src/view/grid/GridAccount.cpp:1144
|
||||
#: src/view/grid/GridAccount.cpp:1151
|
||||
msgid "Cannot group these operations"
|
||||
msgstr "Impossible de grouper ces opérations"
|
||||
|
||||
#: src/view/grid/GridAccount.cpp:1263
|
||||
#: src/view/grid/GridAccount.cpp:1269
|
||||
#: src/view/grid/GridAccount.cpp:1280
|
||||
#: src/view/grid/GridAccount.cpp:1286
|
||||
msgid "Cannot ungroup these operations"
|
||||
msgstr "Impossible de dégrouper ces opérations"
|
||||
|
||||
|
|
@ -131,13 +135,13 @@ msgstr "Impossible de dégrouper ces opérations"
|
|||
msgid "Categories"
|
||||
msgstr "Catégories"
|
||||
|
||||
#: src/view/SearchPanel.cpp:84
|
||||
#: src/view/SearchPanel.cpp:88
|
||||
#: src/view/grid/GridAccount.cpp:63
|
||||
msgid "Category"
|
||||
msgstr "Catégorie"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:636
|
||||
#: src/view/PreferencesPanel.cpp:655
|
||||
#: src/view/PreferencesPanel.cpp:638
|
||||
#: src/view/PreferencesPanel.cpp:657
|
||||
msgid "Category "
|
||||
msgstr "Catégorie"
|
||||
|
||||
|
|
@ -212,35 +216,35 @@ msgstr "Défaut"
|
|||
msgid "Delete"
|
||||
msgstr "Supprimer"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:307
|
||||
#: src/view/PreferencesPanel.cpp:309
|
||||
msgid "Descending"
|
||||
msgstr "Décroissant"
|
||||
|
||||
#: src/view/SearchPanel.cpp:81
|
||||
#: src/view/SearchPanel.cpp:85
|
||||
#: src/view/grid/GridAccount.cpp:63
|
||||
msgid "Description"
|
||||
msgstr "Description"
|
||||
|
||||
#: src/view/UsersDialog.cpp:88
|
||||
#: src/view/UsersDialog.cpp:118
|
||||
#: src/view/SearchPanel.cpp:135
|
||||
#: src/view/SearchPanel.cpp:145
|
||||
#: src/view/SearchPanel.cpp:159
|
||||
#: src/view/SearchPanel.cpp:170
|
||||
#: src/view/PreferencesPanel.cpp:381
|
||||
#: src/view/PreferencesPanel.cpp:404
|
||||
#: src/view/PreferencesPanel.cpp:423
|
||||
#: src/view/PreferencesPanel.cpp:636
|
||||
#: src/view/PreferencesPanel.cpp:655
|
||||
#: src/view/PreferencesPanel.cpp:695
|
||||
#: src/view/PreferencesPanel.cpp:701
|
||||
#: src/view/SearchPanel.cpp:140
|
||||
#: src/view/SearchPanel.cpp:150
|
||||
#: src/view/SearchPanel.cpp:164
|
||||
#: src/view/SearchPanel.cpp:175
|
||||
#: src/view/PreferencesPanel.cpp:383
|
||||
#: src/view/PreferencesPanel.cpp:406
|
||||
#: src/view/PreferencesPanel.cpp:425
|
||||
#: src/view/PreferencesPanel.cpp:638
|
||||
#: src/view/PreferencesPanel.cpp:657
|
||||
#: src/view/PreferencesPanel.cpp:697
|
||||
#: src/view/PreferencesPanel.cpp:703
|
||||
#: src/view/PasswordDialog.cpp:72
|
||||
#: src/view/PasswordDialog.cpp:78
|
||||
#: src/view/AccountPanel.cpp:700
|
||||
#: src/view/grid/GridAccount.cpp:1129
|
||||
#: src/view/grid/GridAccount.cpp:1136
|
||||
#: src/view/grid/GridAccount.cpp:1263
|
||||
#: src/view/grid/GridAccount.cpp:1269
|
||||
#: src/view/grid/GridAccount.cpp:1144
|
||||
#: src/view/grid/GridAccount.cpp:1151
|
||||
#: src/view/grid/GridAccount.cpp:1280
|
||||
#: src/view/grid/GridAccount.cpp:1286
|
||||
#: src/view/grid/wxGridCellFormulaEditor.cpp:69
|
||||
#: src/model/Database.cpp:38
|
||||
#: src/model/Database.cpp:55
|
||||
|
|
@ -261,6 +265,7 @@ msgstr "Erreur durant la création de la base de données initiale"
|
|||
msgid "Final value"
|
||||
msgstr "Valeur finale"
|
||||
|
||||
#: src/view/SearchPanel.cpp:76
|
||||
#: src/view/grid/GridAccount.cpp:300
|
||||
#: src/model/Database.cpp:329
|
||||
#: src/controller/KissCount.cpp:335
|
||||
|
|
@ -304,19 +309,19 @@ msgstr "Loisirs"
|
|||
msgid "Initial value"
|
||||
msgstr "Valeur initiale"
|
||||
|
||||
#: src/view/SearchPanel.cpp:145
|
||||
#: src/view/SearchPanel.cpp:150
|
||||
msgid "Invalid amount from"
|
||||
msgstr "Montant min invalide"
|
||||
|
||||
#: src/view/SearchPanel.cpp:170
|
||||
#: src/view/SearchPanel.cpp:175
|
||||
msgid "Invalid amount range"
|
||||
msgstr "Intervalle des montants invalide"
|
||||
|
||||
#: src/view/SearchPanel.cpp:159
|
||||
#: src/view/SearchPanel.cpp:164
|
||||
msgid "Invalid amount to"
|
||||
msgstr "Montant max invalide"
|
||||
|
||||
#: src/view/SearchPanel.cpp:135
|
||||
#: src/view/SearchPanel.cpp:140
|
||||
msgid "Invalid date range"
|
||||
msgstr "Intervalle de temps invalide"
|
||||
|
||||
|
|
@ -324,7 +329,7 @@ msgstr "Intervalle de temps invalide"
|
|||
msgid "Invalid formula !"
|
||||
msgstr "Formule invalide !"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:695
|
||||
#: src/view/PreferencesPanel.cpp:697
|
||||
msgid "Invalid name"
|
||||
msgstr "Nom invalide"
|
||||
|
||||
|
|
@ -340,7 +345,7 @@ msgstr "Mot de passe invalide"
|
|||
msgid "Invalide date range"
|
||||
msgstr "Intervalle de temps invalide"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:381
|
||||
#: src/view/PreferencesPanel.cpp:383
|
||||
msgid "It must be at least one account !"
|
||||
msgstr "Il doit y avoir au moins un compte !"
|
||||
|
||||
|
|
@ -353,8 +358,8 @@ msgid "Kill me"
|
|||
msgstr "Kill me"
|
||||
|
||||
#: src/view/StatsPanel.cpp:302
|
||||
#: src/view/PreferencesPanel.cpp:735
|
||||
#: src/view/PreferencesPanel.cpp:738
|
||||
#: src/view/PreferencesPanel.cpp:737
|
||||
#: src/view/PreferencesPanel.cpp:740
|
||||
msgid "KissCount"
|
||||
msgstr "KissCount"
|
||||
|
||||
|
|
@ -362,11 +367,11 @@ msgstr "KissCount"
|
|||
msgid "Language"
|
||||
msgstr "Langue"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:738
|
||||
#: src/view/PreferencesPanel.cpp:740
|
||||
msgid "Language not changed"
|
||||
msgstr "Langue non changée"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:735
|
||||
#: src/view/PreferencesPanel.cpp:737
|
||||
msgid "Language successfully changed, please go to another panel"
|
||||
msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif"
|
||||
|
||||
|
|
@ -376,7 +381,7 @@ msgstr "Langue changée, allez sur un autre panneau pour rendre le changement ef
|
|||
msgid "Name"
|
||||
msgstr "Nom"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:707
|
||||
#: src/view/PreferencesPanel.cpp:709
|
||||
msgid "Name changed"
|
||||
msgstr "Nom changé"
|
||||
|
||||
|
|
@ -397,10 +402,14 @@ msgstr ""
|
|||
"Aucune base de données trouvée, voulez vous en créer une nouvelle ?\n"
|
||||
"\n"
|
||||
|
||||
#: src/view/SearchPanel.cpp:220
|
||||
#: src/view/SearchPanel.cpp:232
|
||||
msgid "No entry found"
|
||||
msgstr "Pas d'entrée trouvée"
|
||||
|
||||
#: src/view/SearchPanel.cpp:76
|
||||
msgid "Non fix"
|
||||
msgstr "Courantes"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:185
|
||||
msgid "Number"
|
||||
msgstr "Numéro de compte"
|
||||
|
|
@ -423,6 +432,7 @@ msgstr "Frais de fonctionnement"
|
|||
msgid "Operation order"
|
||||
msgstr "Ordre des opérations"
|
||||
|
||||
#: src/view/SearchPanel.cpp:77
|
||||
#: src/view/ButtonPanel.cpp:69
|
||||
msgid "Operations"
|
||||
msgstr "Opérations"
|
||||
|
|
@ -443,18 +453,22 @@ msgstr "Mot de passe changé"
|
|||
msgid ""
|
||||
"Personal accounting software\n"
|
||||
"\n"
|
||||
"http://indefero.soutade.fr/p/kisscount/\n"
|
||||
"\n"
|
||||
"Copyright (C) 2010 Grégory Soutadé"
|
||||
msgstr ""
|
||||
"Logiciel de comptabilité personnelle\n"
|
||||
"\n"
|
||||
"http://indefero.soutade.fr/p/kisscount/\n"
|
||||
"\n"
|
||||
"Copyright (C) 2010 Grégory Soutadé"
|
||||
|
||||
#: src/view/PasswordDialog.cpp:78
|
||||
msgid "Please retype new password"
|
||||
msgstr "Re entrez le mot de passe"
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:709
|
||||
#: src/view/PreferencesPanel.cpp:743
|
||||
#: src/view/PreferencesPanel.cpp:711
|
||||
#: src/view/PreferencesPanel.cpp:745
|
||||
#: src/view/ButtonPanel.cpp:72
|
||||
msgid "Preferences"
|
||||
msgstr "Préférences"
|
||||
|
|
@ -475,8 +489,8 @@ msgstr "Quitter KissCount ?"
|
|||
msgid "Remains"
|
||||
msgstr "Restant"
|
||||
|
||||
#: src/view/SearchPanel.cpp:79
|
||||
#: src/view/SearchPanel.cpp:231
|
||||
#: src/view/SearchPanel.cpp:83
|
||||
#: src/view/SearchPanel.cpp:243
|
||||
#: src/view/ButtonPanel.cpp:71
|
||||
msgid "Search"
|
||||
msgstr "Chercher"
|
||||
|
|
@ -542,7 +556,7 @@ msgstr "Utilisateur"
|
|||
|
||||
#: src/view/UsersDialog.cpp:38
|
||||
#: src/view/UsersDialog.cpp:118
|
||||
#: src/view/PreferencesPanel.cpp:701
|
||||
#: src/view/PreferencesPanel.cpp:703
|
||||
msgid "User "
|
||||
msgstr "Utilisateur"
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2010-10-24 16:03+0200\n"
|
||||
"POT-Creation-Date: 2010-10-30 20:52+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -17,17 +17,17 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: src/view/StatsPanel.cpp:282 src/view/PreferencesPanel.cpp:743
|
||||
#: src/view/StatsPanel.cpp:282 src/view/PreferencesPanel.cpp:745
|
||||
msgid " - "
|
||||
msgstr ""
|
||||
|
||||
#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:404
|
||||
#: src/view/PreferencesPanel.cpp:423 src/view/PreferencesPanel.cpp:636
|
||||
#: src/view/PreferencesPanel.cpp:655 src/view/PreferencesPanel.cpp:701
|
||||
#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:406
|
||||
#: src/view/PreferencesPanel.cpp:425 src/view/PreferencesPanel.cpp:638
|
||||
#: src/view/PreferencesPanel.cpp:657 src/view/PreferencesPanel.cpp:703
|
||||
msgid " already exists"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:215
|
||||
#: src/view/SearchPanel.cpp:227
|
||||
msgid " entries found"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ msgstr ""
|
|||
msgid " operations ?"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:750
|
||||
#: src/view/PreferencesPanel.cpp:752
|
||||
msgid " profil ?"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ msgstr ""
|
|||
msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:217
|
||||
#: src/view/SearchPanel.cpp:229
|
||||
msgid "1 entry found"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -55,11 +55,11 @@ msgstr ""
|
|||
msgid "About"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:85 src/view/grid/GridAccount.cpp:63
|
||||
#: src/view/SearchPanel.cpp:89 src/view/grid/GridAccount.cpp:63
|
||||
msgid "Account"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:404 src/view/PreferencesPanel.cpp:423
|
||||
#: src/view/PreferencesPanel.cpp:406 src/view/PreferencesPanel.cpp:425
|
||||
msgid "Account "
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -75,24 +75,24 @@ msgstr ""
|
|||
msgid "Accounts"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:82
|
||||
#: src/view/SearchPanel.cpp:86
|
||||
msgid "Amount from"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:83
|
||||
#: src/view/SearchPanel.cpp:87
|
||||
msgid "Amount to"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:385 src/view/PreferencesPanel.cpp:750
|
||||
#: src/view/PreferencesPanel.cpp:387 src/view/PreferencesPanel.cpp:752
|
||||
#: src/view/AccountPanel.cpp:704
|
||||
msgid "Are you sure want to delete "
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:617 src/view/grid/GridAccount.cpp:745
|
||||
#: src/view/PreferencesPanel.cpp:619 src/view/grid/GridAccount.cpp:760
|
||||
msgid "Are you sure want to delete : \n"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:306
|
||||
#: src/view/PreferencesPanel.cpp:308
|
||||
msgid "Ascending"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -100,16 +100,20 @@ msgstr ""
|
|||
msgid "Background color"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:76
|
||||
msgid "Both"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/UsersDialog.cpp:51 src/view/GenerateDialog.cpp:60
|
||||
#: src/view/PasswordDialog.cpp:56
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/grid/GridAccount.cpp:1129 src/view/grid/GridAccount.cpp:1136
|
||||
#: src/view/grid/GridAccount.cpp:1144 src/view/grid/GridAccount.cpp:1151
|
||||
msgid "Cannot group these operations"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/grid/GridAccount.cpp:1263 src/view/grid/GridAccount.cpp:1269
|
||||
#: src/view/grid/GridAccount.cpp:1280 src/view/grid/GridAccount.cpp:1286
|
||||
msgid "Cannot ungroup these operations"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -117,11 +121,11 @@ msgstr ""
|
|||
msgid "Categories"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:84 src/view/grid/GridAccount.cpp:63
|
||||
#: src/view/SearchPanel.cpp:88 src/view/grid/GridAccount.cpp:63
|
||||
msgid "Category"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:636 src/view/PreferencesPanel.cpp:655
|
||||
#: src/view/PreferencesPanel.cpp:638 src/view/PreferencesPanel.cpp:657
|
||||
msgid "Category "
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -194,24 +198,24 @@ msgstr ""
|
|||
msgid "Delete"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:307
|
||||
#: src/view/PreferencesPanel.cpp:309
|
||||
msgid "Descending"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:81 src/view/grid/GridAccount.cpp:63
|
||||
#: src/view/SearchPanel.cpp:85 src/view/grid/GridAccount.cpp:63
|
||||
msgid "Description"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/UsersDialog.cpp:88 src/view/UsersDialog.cpp:118
|
||||
#: src/view/SearchPanel.cpp:135 src/view/SearchPanel.cpp:145
|
||||
#: src/view/SearchPanel.cpp:159 src/view/SearchPanel.cpp:170
|
||||
#: src/view/PreferencesPanel.cpp:381 src/view/PreferencesPanel.cpp:404
|
||||
#: src/view/PreferencesPanel.cpp:423 src/view/PreferencesPanel.cpp:636
|
||||
#: src/view/PreferencesPanel.cpp:655 src/view/PreferencesPanel.cpp:695
|
||||
#: src/view/PreferencesPanel.cpp:701 src/view/PasswordDialog.cpp:72
|
||||
#: src/view/SearchPanel.cpp:140 src/view/SearchPanel.cpp:150
|
||||
#: src/view/SearchPanel.cpp:164 src/view/SearchPanel.cpp:175
|
||||
#: src/view/PreferencesPanel.cpp:383 src/view/PreferencesPanel.cpp:406
|
||||
#: src/view/PreferencesPanel.cpp:425 src/view/PreferencesPanel.cpp:638
|
||||
#: src/view/PreferencesPanel.cpp:657 src/view/PreferencesPanel.cpp:697
|
||||
#: src/view/PreferencesPanel.cpp:703 src/view/PasswordDialog.cpp:72
|
||||
#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:700
|
||||
#: src/view/grid/GridAccount.cpp:1129 src/view/grid/GridAccount.cpp:1136
|
||||
#: src/view/grid/GridAccount.cpp:1263 src/view/grid/GridAccount.cpp:1269
|
||||
#: src/view/grid/GridAccount.cpp:1144 src/view/grid/GridAccount.cpp:1151
|
||||
#: src/view/grid/GridAccount.cpp:1280 src/view/grid/GridAccount.cpp:1286
|
||||
#: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:38
|
||||
#: src/model/Database.cpp:55 src/model/Database.cpp:95
|
||||
#: src/model/Database.cpp:102 src/model/Database.cpp:120
|
||||
|
|
@ -228,8 +232,8 @@ msgstr ""
|
|||
msgid "Final value"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/grid/GridAccount.cpp:300 src/model/Database.cpp:329
|
||||
#: src/controller/KissCount.cpp:335
|
||||
#: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:300
|
||||
#: src/model/Database.cpp:329 src/controller/KissCount.cpp:335
|
||||
msgid "Fix"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -269,19 +273,19 @@ msgstr ""
|
|||
msgid "Initial value"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:145
|
||||
#: src/view/SearchPanel.cpp:150
|
||||
msgid "Invalid amount from"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:170
|
||||
#: src/view/SearchPanel.cpp:175
|
||||
msgid "Invalid amount range"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:159
|
||||
#: src/view/SearchPanel.cpp:164
|
||||
msgid "Invalid amount to"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:135
|
||||
#: src/view/SearchPanel.cpp:140
|
||||
msgid "Invalid date range"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -289,7 +293,7 @@ msgstr ""
|
|||
msgid "Invalid formula !"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:695
|
||||
#: src/view/PreferencesPanel.cpp:697
|
||||
msgid "Invalid name"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -305,7 +309,7 @@ msgstr ""
|
|||
msgid "Invalide date range"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:381
|
||||
#: src/view/PreferencesPanel.cpp:383
|
||||
msgid "It must be at least one account !"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -317,8 +321,8 @@ msgstr ""
|
|||
msgid "Kill me"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/StatsPanel.cpp:302 src/view/PreferencesPanel.cpp:735
|
||||
#: src/view/PreferencesPanel.cpp:738
|
||||
#: src/view/StatsPanel.cpp:302 src/view/PreferencesPanel.cpp:737
|
||||
#: src/view/PreferencesPanel.cpp:740
|
||||
msgid "KissCount"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -326,11 +330,11 @@ msgstr ""
|
|||
msgid "Language"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:738
|
||||
#: src/view/PreferencesPanel.cpp:740
|
||||
msgid "Language not changed"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:735
|
||||
#: src/view/PreferencesPanel.cpp:737
|
||||
msgid "Language successfully changed, please go to another panel"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -339,7 +343,7 @@ msgstr ""
|
|||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:707
|
||||
#: src/view/PreferencesPanel.cpp:709
|
||||
msgid "Name changed"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -357,10 +361,14 @@ msgid ""
|
|||
"\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:220
|
||||
#: src/view/SearchPanel.cpp:232
|
||||
msgid "No entry found"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:76
|
||||
msgid "Non fix"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:185
|
||||
msgid "Number"
|
||||
msgstr ""
|
||||
|
|
@ -382,7 +390,7 @@ msgstr ""
|
|||
msgid "Operation order"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/ButtonPanel.cpp:69
|
||||
#: src/view/SearchPanel.cpp:77 src/view/ButtonPanel.cpp:69
|
||||
msgid "Operations"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -402,6 +410,8 @@ msgstr ""
|
|||
msgid ""
|
||||
"Personal accounting software\n"
|
||||
"\n"
|
||||
"http://indefero.soutade.fr/p/kisscount/\n"
|
||||
"\n"
|
||||
"Copyright (C) 2010 Grégory Soutadé"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -409,7 +419,7 @@ msgstr ""
|
|||
msgid "Please retype new password"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/PreferencesPanel.cpp:709 src/view/PreferencesPanel.cpp:743
|
||||
#: src/view/PreferencesPanel.cpp:711 src/view/PreferencesPanel.cpp:745
|
||||
#: src/view/ButtonPanel.cpp:72
|
||||
msgid "Preferences"
|
||||
msgstr ""
|
||||
|
|
@ -430,7 +440,7 @@ msgstr ""
|
|||
msgid "Remains"
|
||||
msgstr ""
|
||||
|
||||
#: src/view/SearchPanel.cpp:79 src/view/SearchPanel.cpp:231
|
||||
#: src/view/SearchPanel.cpp:83 src/view/SearchPanel.cpp:243
|
||||
#: src/view/ButtonPanel.cpp:71
|
||||
msgid "Search"
|
||||
msgstr ""
|
||||
|
|
@ -489,7 +499,7 @@ msgid "User"
|
|||
msgstr ""
|
||||
|
||||
#: src/view/UsersDialog.cpp:38 src/view/UsersDialog.cpp:118
|
||||
#: src/view/PreferencesPanel.cpp:701
|
||||
#: src/view/PreferencesPanel.cpp:703
|
||||
msgid "User "
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -376,10 +376,10 @@ void KissCount::SetOperationOrder(const wxString& order)
|
|||
|
||||
std::vector<Operation>* KissCount::Search(wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo,
|
||||
wxString* amountFrom, wxString* amountTo,
|
||||
std::vector<wxString> categories, std::vector<wxString> accounts)
|
||||
std::vector<wxString> categories, int Fix, std::vector<wxString> accounts)
|
||||
{
|
||||
|
||||
return _db->Search(_user, description, dateFrom, dateTo, amountFrom, amountTo, categories, accounts, true);
|
||||
return _db->Search(_user, description, dateFrom, dateTo, amountFrom, amountTo, categories, Fix, accounts, true);
|
||||
}
|
||||
|
||||
bool KissCount::SearchPreviousOperation(Operation* res, wxString& description, int month, int year)
|
||||
|
|
@ -398,7 +398,7 @@ bool KissCount::SearchPreviousOperation(Operation* res, wxString& description, i
|
|||
|
||||
date = new wxDateTime(0, (wxDateTime::Month)month, year);
|
||||
|
||||
operations = _db->Search(_user, &description, date, NULL, NULL, NULL, v, v, false);
|
||||
operations = _db->Search(_user, &description, date, NULL, NULL, NULL, v, BOTH, v, false);
|
||||
|
||||
delete date;
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ public:
|
|||
|
||||
std::vector<Operation>* Search(wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo,
|
||||
wxString* amountFrom, wxString* amountTo,
|
||||
std::vector<wxString> categories, std::vector<wxString> accounts);
|
||||
std::vector<wxString> categories, int Fix, std::vector<wxString> accounts);
|
||||
|
||||
bool SearchPreviousOperation(Operation* res, wxString& description, int month, int year);
|
||||
|
||||
|
|
|
|||
|
|
@ -1221,7 +1221,7 @@ void Database::UpdatePreference(User* user, const wxString& preference)
|
|||
|
||||
std::vector<Operation>* Database::Search(User* user, wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo,
|
||||
wxString* amountFrom, wxString* amountTo,
|
||||
std::vector<wxString> categories, std::vector<wxString> accounts, bool wildcards)
|
||||
std::vector<wxString> categories, int Fix, std::vector<wxString> accounts, bool wildcards)
|
||||
{
|
||||
wxSQLite3ResultSet set;
|
||||
wxString req;
|
||||
|
|
@ -1310,6 +1310,13 @@ std::vector<Operation>* Database::Search(User* user, wxString* description, wxDa
|
|||
|
||||
if (firstCond) req += wxT(" AND ") ; else firstCond = true;
|
||||
|
||||
if (Fix == FIX_OP)
|
||||
req += wxT(" AND fix_cost='1'");
|
||||
else if (Fix == NON_FIX_OP)
|
||||
req += wxT(" AND fix_cost='0'");
|
||||
|
||||
if (firstCond) req += wxT(" AND ") ; else firstCond = true;
|
||||
|
||||
if (accounts.size())
|
||||
{
|
||||
req += wxT("(account IN ('");
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@
|
|||
#define BDD_FILE "kc.bdd"
|
||||
#define INIT_SCRIPT "init.sql"
|
||||
|
||||
enum {BOTH, FIX_OP, NON_FIX_OP};
|
||||
|
||||
class KissCount;
|
||||
class User;
|
||||
|
||||
|
|
@ -81,7 +83,7 @@ public:
|
|||
|
||||
std::vector<Operation>* Search(User* user, wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo,
|
||||
wxString* amountFrom, wxString* amountTo,
|
||||
std::vector<wxString> categories, std::vector<wxString> accounts, bool wildcards);
|
||||
std::vector<wxString> categories, int Fix, std::vector<wxString> accounts, bool wildcards);
|
||||
|
||||
void GetStats(User* user, const wxString& monthFrom, const wxString& yearFrom, const wxString& monthTo,
|
||||
const wxString& yearTo, std::map<wxString, std::map<int, std::map<int, double> > >* accountAmounts,
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ AccountPanel::AccountPanel(KissCount* kiss, wxUI *parent) : wxScrolledWindow(&(*
|
|||
|
||||
ChangeUser();
|
||||
|
||||
Fit();
|
||||
//Fit();
|
||||
|
||||
SetMinSize(wxSize(rect.width-rect.x, rect.height-rect.y-128));
|
||||
SetScrollbars(10, 10, 100/10, 100/10);
|
||||
|
|
@ -237,7 +237,7 @@ void AccountPanel::ChangeUser()
|
|||
else
|
||||
_tree.AppendItem(rootNode, wxString::Format(wxT("%d"), it->first));
|
||||
}
|
||||
Fit();
|
||||
//Fit();
|
||||
if (curYear != -1)
|
||||
{
|
||||
_tree.SelectItem(curNode, true);
|
||||
|
|
@ -280,7 +280,7 @@ void AccountPanel::LoadYear(int year, bool showMonth)
|
|||
}
|
||||
|
||||
_tree.Expand(parentNode);
|
||||
Fit();
|
||||
//Fit();
|
||||
if (showMonth)
|
||||
{
|
||||
_tree.SelectItem(curMonthNode, true);
|
||||
|
|
@ -356,7 +356,7 @@ void AccountPanel::ShowMonth(int month, int year)
|
|||
|
||||
UpdateStats();
|
||||
|
||||
Fit();
|
||||
//Fit();
|
||||
// SetMinSize(GetSize());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ void ButtonPanel::OnButtonChangeUser(wxCommandEvent& event)
|
|||
|
||||
void ButtonPanel::OnButtonAbout(wxCommandEvent& event)
|
||||
{
|
||||
wxMessageBox( _("Personal accounting software\n\nCopyright (C) 2010 Grégory Soutadé"),
|
||||
wxMessageBox( _("Personal accounting software\n\nhttp://indefero.soutade.fr/p/kisscount/\n\nCopyright (C) 2010 Grégory Soutadé"),
|
||||
wxT("KissCount " APP_VERSION "\n\n"),
|
||||
wxOK | wxICON_INFORMATION, _wxUI );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ SearchPanel::SearchPanel(KissCount* kiss, wxUI *parent) : wxScrolledWindow(&(*pa
|
|||
_checkDateFrom->SetValue(wxT("1"));
|
||||
_checkDateTo->SetValue(wxT("1"));
|
||||
|
||||
wxGridBagSizer *gridBagSizer = new wxGridBagSizer(3, 9);
|
||||
wxGridBagSizer *gridBagSizer = new wxGridBagSizer(3, 10);
|
||||
|
||||
firstOfMonth.SetToCurrent();
|
||||
firstOfMonth.SetDay(1);
|
||||
|
|
@ -72,6 +72,10 @@ SearchPanel::SearchPanel(KissCount* kiss, wxUI *parent) : wxScrolledWindow(&(*pa
|
|||
_category = new wxCheckListBox(this, wxID_ANY);
|
||||
for(categoryIt = user->_categories.begin(); categoryIt != user->_categories.end(); categoryIt++)
|
||||
_category->Append(categoryIt->name);
|
||||
|
||||
wxString fixop[] = {_("Both"), _("Fix"), _("Non fix")};
|
||||
_fix = new wxRadioBox(this, wxID_ANY, _("Operations"), wxDefaultPosition, wxDefaultSize, 3, fixop);
|
||||
|
||||
_account = new wxCheckListBox(this, wxID_ANY);
|
||||
for(accountIt = user->_accounts.begin(); accountIt != user->_accounts.end(); accountIt++)
|
||||
_account->Append(accountIt->name);
|
||||
|
|
@ -96,8 +100,9 @@ SearchPanel::SearchPanel(KissCount* kiss, wxUI *parent) : wxScrolledWindow(&(*pa
|
|||
gridBagSizer->Add(_amountTo, wxGBPosition(1, 4));
|
||||
gridBagSizer->Add(labelCategory, wxGBPosition(0, 5));
|
||||
gridBagSizer->Add(_category, wxGBPosition(1, 5));
|
||||
gridBagSizer->Add(labelAccount, wxGBPosition(0, 6));
|
||||
gridBagSizer->Add(_account, wxGBPosition(1, 6));
|
||||
gridBagSizer->Add(_fix, wxGBPosition(1, 6));
|
||||
gridBagSizer->Add(labelAccount, wxGBPosition(0, 7));
|
||||
gridBagSizer->Add(_account, wxGBPosition(1, 7));
|
||||
gridBagSizer->Add(_searchButton, wxGBPosition(2, 0));
|
||||
|
||||
vbox->Add(gridBagSizer);
|
||||
|
|
@ -126,7 +131,7 @@ void SearchPanel::OnButtonSearch(wxCommandEvent& event)
|
|||
std::vector<wxString> categories, accounts;
|
||||
wxDateTime *dateFrom=NULL, *dateTo=NULL;
|
||||
User* user= _kiss->GetUser();
|
||||
int i;
|
||||
int i, fix;
|
||||
std::vector<Operation>::iterator it;
|
||||
double af, at;
|
||||
|
||||
|
|
@ -202,6 +207,13 @@ void SearchPanel::OnButtonSearch(wxCommandEvent& event)
|
|||
if (_category->IsChecked(i))
|
||||
categories.push_back(user->_categories[i].id);
|
||||
|
||||
if (_fix->IsItemEnabled(FIX_OP))
|
||||
fix = FIX_OP;
|
||||
if (_fix->IsItemEnabled(NON_FIX_OP))
|
||||
fix = NON_FIX_OP;
|
||||
else
|
||||
fix = BOTH;
|
||||
|
||||
for(i=0; i<user->GetAccountsNumber(); i++)
|
||||
if (_account->IsChecked(i))
|
||||
accounts.push_back(user->_accounts[i].id);
|
||||
|
|
@ -209,7 +221,7 @@ void SearchPanel::OnButtonSearch(wxCommandEvent& event)
|
|||
if (_operations)
|
||||
delete _operations;
|
||||
|
||||
_operations = _kiss->Search(description, dateFrom, dateTo, amountFrom, amountTo, categories, accounts);
|
||||
_operations = _kiss->Search(description, dateFrom, dateTo, amountFrom, amountTo, categories,fix, accounts);
|
||||
|
||||
if (_operations->size() > 1)
|
||||
wxMessageBox(wxString::Format(wxT("%d"), _operations->size()) + _(" entries found"), wxT("KissCount"), wxICON_INFORMATION | wxOK);
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ private:
|
|||
wxCheckBox *_checkDateFrom, *_checkDateTo;
|
||||
wxTextCtrl* _description, *_amountFrom, *_amountTo;
|
||||
wxCheckListBox* _category, *_account;
|
||||
wxRadioBox* _fix;
|
||||
wxButton* _searchButton;
|
||||
DECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user