From 521596abd5c382f994666d3408c2a0c6a3be4d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Sat, 30 Oct 2010 20:52:53 +0200 Subject: [PATCH] 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) --- TODO | 1 - ressources/po/french.mo | Bin 6942 -> 7112 bytes ressources/po/french.po | 136 +++++++++++++++++++---------------- ressources/po/kisscount.pot | 104 +++++++++++++++------------ src/controller/KissCount.cpp | 6 +- src/controller/KissCount.h | 2 +- src/model/Database.cpp | 9 ++- src/model/Database.h | 4 +- src/view/AccountPanel.cpp | 8 +-- src/view/ButtonPanel.cpp | 2 +- src/view/SearchPanel.cpp | 22 ++++-- src/view/SearchPanel.h | 1 + 12 files changed, 170 insertions(+), 125 deletions(-) diff --git a/TODO b/TODO index 4e68eab..4bdadea 100644 --- a/TODO +++ b/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 diff --git a/ressources/po/french.mo b/ressources/po/french.mo index fa3a7b4793148d74209bece0276d26e937c902fd..36c8befa3eb7c93a255b4015b1431bc6d3a700d2 100644 GIT binary patch delta 2933 zcma*pe@xVM9LMnwi2M`~LxMs%vN#jvKokRiktSG@m0^NtNpQ#oa>N}7Xe!ZBWX?Ic4%wDwig?=z*2-WaiOu>&(1D-_<^qu|vM^uMbQ8T`Q zN+^yC-A_WzJRP+X4tt%0(OULADjH}ZGAUDvdawc=xX#}9p|&D`8elgnp}qF{5UO22 zYDEW82?Xu^k5P%7K|baSz5=&Uxj;pG`73Isk+hzMsiG*JKIR->TG>memH7pg&^6Qq{!V87o2VpmbsKh}w%`@y88d)N@EGzj$N5qM zpP>>sYp*9z?JlAQ{0WuV@2D;N6E(pbsOMr?R`rt_pmHmfOjN@K_J`%jv!)!CKox2R zo2_+L4=NEaYUMht>Q@8oMYVs~+K1}rFow?302MVHL^T*eEzxn@6k*IKs0TCIXeH!8 z?Rf!T+RIg_t=Wib=fO(!p|)ZS)&JM1L@%Qz`ZKa+0dt)SW0)vepM-IG|I?`Ga5zvM&O<#|j3ro# zI^8=^9q+ThA3!E&`cQ}MEmS`vs4e*rmFT$job>`K(MuRm2Un>$Fq-M<+KKv;y9BiY z)u@h}?foufGUio#eH67t<2VzqpaxD%4{z0U)P%B--8MP67E97ue;uxU+|bOsQ3D=A zC2|y3<0z7&iDw_Q_t~g3lZ%@9QdGyK$k?V5m0&Zf-xp8`96(K^57qyX4A$RI<$Z4O zF?0DNprtND{XMAUOEdAJ2H0+|_oMc<*ZLZ&-4JSkAoB8fSNwEca|{(c^HW_}1z zaZmY{S|6wX> zFoJ4u0@cw;)C`)5M~FFuN_&{lH@l)2C{#2Fl|_VyP?8T5C4@>Pq1RFe&q34>v(#J% zX9c0MkSHgzbwPQC*hoB1>>_-GPPWd1l64VUc5R)CW_S;A2k|uVETOWDs14POxep(- z^-%gNx#%Qz5Jf~jv56=k+=TW?he}07^-n*tYx^s)*rI6t7faM-((AwDq=Aa z`u87AE}?yXf>=)IEx4CZ(W|(g(23O{)SqGPT^FHK{v@HZaa0YdD~n3uHKpq zXE0%EcSLMqzGHrVNnt^7Amw0WY=ztBsCTz_28&YtQE@B1?QOL!ez&i8IQ_l<+jX!e H<4nZAQ-cd3 delta 2766 zcmYk;duWwq0LSs?xaoB2rfZvX)h?E|wAAU2Y1&F{GwtTIT4tt}Id55Mu4#5O$`qOv zBLy+LKuslWbh;pjVxlZC!ums`h%WSprbv+x8P)f@^9+1Azw>$D_q^|Of2SSecPCRn z6lA{{C>zK%Bs)8VHawrh7iCLs2wAul^RWf<@GUIF53w&E#a{R|*5R3Wy|Q-*-8mnH zR#}ZbaWeJ^Ar)#lu)^8#hegOIEa%G#o6wGJ!gAaluOG&KoOfUkJcHNbkLZ2>B7F#D zv|@w9(fX>8pTZ=}r~NR!^B{zV_(LQ5;2P|YDYT(C(1zZNzwbpW`~;nW!^q@?lkxf~ zbj07GGw@41Ka1A$JLb}U_=^L3ltnGxn2!}$gkDdgOE3j(pcd`W%y>QzeQqH-lS|N! zt&P_=q8-_ce8M)quEJfIat+%#aHPkv08hvBb4cI9Kj?kEsNIIk&|=k)T2|j5W8U`df#%i!_CMi zyvmnLw+o$-Hnb!A(T;zPQ?LU|v3Eb_-zgr#uUrdNXwRmg57hDHh#JriEQsez(C1d6 z4X#H!wi!F$7Ia`O=zTlUdOpAbcmRFwL@NGp3i*UHeA$6>=m;)GFGVk-9Z9fWPHoR< zf3$&8^!Y*2p=doL(T-K2&n40OQ#BkoMRhnY5yC9=#skbNZH14~wLXTf;c0Y9&ZEy= z#yQxXn>Y+}(FRtc9bJo#bOX9%TaYHgcBBKTu!jSus6BcJujjl2hvEgap(0v$>dMic zkH^7SgTrt!TF*AL!JX0f(GItx&mW1N#v)XvOtt#q-g< zvJ{=_W^}|aL|;Ki{yO^n4s-x-qkCd6THj~b!}tFS4kqH4=oDoaXDTj0D;j|GF_fX3 zY%E$)5*^u8w4wUw+~^{-qs!3e*I@;|7SG!;<)7B$95@3%qZMC5uXke_=u;?1&#Td; zsmC&GLL1(Wj&L{H;XTNzg^%zaJcjP6f|AV0i_!K5l`#MIteOkcaR$4K6J!~ z&WJkbvXI>G38g+m=N~mzvGd=7IDXbI{^Zhju@Cu=ae2z F{0}Hb+6w>x diff --git a/ressources/po/french.po b/ressources/po/french.po index aabc50f..a4d6f49 100644 --- a/ressources/po/french.po +++ b/ressources/po/french.po @@ -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é \n" "Language-Team: \n" @@ -20,20 +20,20 @@ msgstr "" # FIRST AUTHOR , 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" diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot index 17e1888..2aae4c7 100644 --- a/ressources/po/kisscount.pot +++ b/ressources/po/kisscount.pot @@ -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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp index 671c23b..8ff934c 100644 --- a/src/controller/KissCount.cpp +++ b/src/controller/KissCount.cpp @@ -376,10 +376,10 @@ void KissCount::SetOperationOrder(const wxString& order) std::vector* KissCount::Search(wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo, wxString* amountFrom, wxString* amountTo, - std::vector categories, std::vector accounts) + std::vector categories, int Fix, std::vector 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; diff --git a/src/controller/KissCount.h b/src/controller/KissCount.h index 093bfb9..b097985 100644 --- a/src/controller/KissCount.h +++ b/src/controller/KissCount.h @@ -82,7 +82,7 @@ public: std::vector* Search(wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo, wxString* amountFrom, wxString* amountTo, - std::vector categories, std::vector accounts); + std::vector categories, int Fix, std::vector accounts); bool SearchPreviousOperation(Operation* res, wxString& description, int month, int year); diff --git a/src/model/Database.cpp b/src/model/Database.cpp index fd6e0f4..6d970ca 100644 --- a/src/model/Database.cpp +++ b/src/model/Database.cpp @@ -1221,7 +1221,7 @@ void Database::UpdatePreference(User* user, const wxString& preference) std::vector* Database::Search(User* user, wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo, wxString* amountFrom, wxString* amountTo, - std::vector categories, std::vector accounts, bool wildcards) + std::vector categories, int Fix, std::vector accounts, bool wildcards) { wxSQLite3ResultSet set; wxString req; @@ -1310,6 +1310,13 @@ std::vector* 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 ('"); diff --git a/src/model/Database.h b/src/model/Database.h index 72b6ea6..10c175c 100644 --- a/src/model/Database.h +++ b/src/model/Database.h @@ -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* Search(User* user, wxString* description, wxDateTime* dateFrom, wxDateTime* dateTo, wxString* amountFrom, wxString* amountTo, - std::vector categories, std::vector accounts, bool wildcards); + std::vector categories, int Fix, std::vector accounts, bool wildcards); void GetStats(User* user, const wxString& monthFrom, const wxString& yearFrom, const wxString& monthTo, const wxString& yearTo, std::map > >* accountAmounts, diff --git a/src/view/AccountPanel.cpp b/src/view/AccountPanel.cpp index cf81de2..299bf34 100644 --- a/src/view/AccountPanel.cpp +++ b/src/view/AccountPanel.cpp @@ -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()); } diff --git a/src/view/ButtonPanel.cpp b/src/view/ButtonPanel.cpp index 7880dfe..8d396bb 100644 --- a/src/view/ButtonPanel.cpp +++ b/src/view/ButtonPanel.cpp @@ -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 ); } diff --git a/src/view/SearchPanel.cpp b/src/view/SearchPanel.cpp index 472b997..467ab32 100644 --- a/src/view/SearchPanel.cpp +++ b/src/view/SearchPanel.cpp @@ -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 categories, accounts; wxDateTime *dateFrom=NULL, *dateTo=NULL; User* user= _kiss->GetUser(); - int i; + int i, fix; std::vector::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; iGetAccountsNumber(); 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); diff --git a/src/view/SearchPanel.h b/src/view/SearchPanel.h index c643284..ca81378 100644 --- a/src/view/SearchPanel.h +++ b/src/view/SearchPanel.h @@ -59,6 +59,7 @@ private: wxCheckBox *_checkDateFrom, *_checkDateTo; wxTextCtrl* _description, *_amountFrom, *_amountTo; wxCheckListBox* _category, *_account; + wxRadioBox* _fix; wxButton* _searchButton; DECLARE_EVENT_TABLE(); };