soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

* Add percents to month stats

Browse Source 
* Remove version from translation
* Update TODO
This commit is contained in:
Grégory Soutadé 2010-08-14 22:04:03 +02:00
parent 0336b6620e
commit 023b1def9d
9 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -2,6 +2,8 @@ KissCount is personnal account software delivered under GPL v3 licence terms.
Current version is 0.1 beta (trunk version) Current version is 0.1 beta (trunk version)
wxWidgets 2.8 is needed
A modified version of wxFreeChart is used : warning during recompilation, don't overwrite autotools files with ./configure A modified version of wxFreeChart is used : warning during recompilation, don't overwrite autotools files with ./configure
More information can be found at http://indefero.soutade.fr/p/kisscount More information can be found at http://indefero.soutade.fr/p/kisscount

2
README.fr
View File

@ -2,6 +2,8 @@ KissCount est un logiciel de gestion de comptes personnels délivré sous licenc
La version actuelle est 0.1 bêta (version du tronc) La version actuelle est 0.1 bêta (version du tronc)
wxWidgets 2.8 est nécessaire
Une version modifiée de wxFreeChart est utilisée : attention à lors de la recompilation à ne pas écraser les fichiers des autotools (pas de ./configure) Une version modifiée de wxFreeChart est utilisée : attention à lors de la recompilation à ne pas écraser les fichiers des autotools (pas de ./configure)
Plus d'informations peuvent être trouvé sur http://indefero.soutade.fr/p/kisscount Plus d'informations peuvent être trouvé sur http://indefero.soutade.fr/p/kisscount

2
TODO
View File

@ -8,9 +8,9 @@ Improve Scrolled Windows
Fix some bugs (especially when closing, and one when switching between SearchPanel and AccountPanel) Fix some bugs (especially when closing, and one when switching between SearchPanel and AccountPanel)
Can type a letter with a comboboxes Can type a letter with a comboboxes
Windows version Windows version
Need packaging
Better build system for wxFreeChart (hacked by me) Better build system for wxFreeChart (hacked by me)
Others translation Others translation
Remove program version from translation
Handle bad SQL return Handle bad SQL return
Category color/font Category color/font

BIN
ressources/po/french.mo
View File

Binary file not shown.

40
ressources/po/french.po
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-08-06 21:24+0200\n" "POT-Creation-Date: 2010-08-14 22:00+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"
@ -39,7 +39,7 @@ msgstr " entrées trouvées"
msgid " not found, aborting" msgid " not found, aborting"
msgstr " non trouvé, arrêt" msgstr " non trouvé, arrêt"
#: src/view/AccountPanel.cpp:931 #: src/view/AccountPanel.cpp:936
msgid " operations ?" msgid " operations ?"
msgstr " opérations ?" msgstr " opérations ?"
@ -87,12 +87,12 @@ msgstr "Montant max"
#: src/view/PreferencesPanel.cpp:340 #: src/view/PreferencesPanel.cpp:340
#: src/view/PreferencesPanel.cpp:581 #: src/view/PreferencesPanel.cpp:581
#: src/view/AccountPanel.cpp:926 #: src/view/AccountPanel.cpp:931
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:449 #: src/view/PreferencesPanel.cpp:449
#: src/view/AccountPanel.cpp:628 #: src/view/AccountPanel.cpp:633
#: src/view/SearchPanel.cpp:345 #: src/view/SearchPanel.cpp:345
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"
@ -187,7 +187,7 @@ msgstr "Défaut"
#: src/view/PreferencesPanel.cpp:159 #: src/view/PreferencesPanel.cpp:159
#: src/view/PreferencesPanel.cpp:209 #: src/view/PreferencesPanel.cpp:209
#: src/view/AccountPanel.cpp:785 #: src/view/AccountPanel.cpp:790
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
@ -211,7 +211,7 @@ msgstr "Description"
#: src/view/PreferencesPanel.cpp:487 #: src/view/PreferencesPanel.cpp:487
#: src/view/PreferencesPanel.cpp:526 #: src/view/PreferencesPanel.cpp:526
#: src/view/PreferencesPanel.cpp:532 #: src/view/PreferencesPanel.cpp:532
#: src/view/AccountPanel.cpp:922 #: src/view/AccountPanel.cpp:927
#: src/view/UsersDialog.cpp:86 #: src/view/UsersDialog.cpp:86
#: src/view/UsersDialog.cpp:114 #: src/view/UsersDialog.cpp:114
#: src/view/SearchPanel.cpp:134 #: src/view/SearchPanel.cpp:134
@ -244,7 +244,7 @@ msgid "From "
msgstr "De" msgstr "De"
#: src/view/GenerateDialog.cpp:31 #: src/view/GenerateDialog.cpp:31
#: src/view/AccountPanel.cpp:782 #: src/view/AccountPanel.cpp:787
msgid "Generate month" msgid "Generate month"
msgstr "Générer mois" msgstr "Générer mois"
@ -292,7 +292,7 @@ msgstr "Mot de passe invalide"
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:922 #: src/view/AccountPanel.cpp:927
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"
@ -305,20 +305,6 @@ msgstr "Kill me"
msgid "KissCount" msgid "KissCount"
msgstr "KissCount" msgstr "KissCount"
#: src/view/ButtonPanel.cpp:96
msgid ""
"KissCount v0.1\n"
"\n"
"Personal accounting software\n"
"\n"
"Copyright (C) 2010 Grégory Soutadé"
msgstr ""
"KissCount v0.1\n"
"\n"
"Logiciel de comptabilité personnelle\n"
"\n"
"Copyright (C) 2010 Grégory Soutadé"
#: src/view/PreferencesPanel.cpp:57 #: src/view/PreferencesPanel.cpp:57
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
@ -396,6 +382,16 @@ msgstr "Mot de passe"
msgid "Password changed" msgid "Password changed"
msgstr "Mot de passe changé" msgstr "Mot de passe changé"
#: src/view/ButtonPanel.cpp:96
msgid ""
"Personal accounting software\n"
"\n"
"Copyright (C) 2010 Grégory Soutadé"
msgstr ""
"Logiciel de comptabilité personnelle\n"
"\n"
"Copyright (C) 2010 Grégory Soutadé"
#: src/view/PasswordDialog.cpp:78 #: 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"

32
ressources/po/kisscount.pot
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-08-06 21:24+0200\n" "POT-Creation-Date: 2010-08-14 22:00+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"
@ -34,7 +34,7 @@ msgstr ""
msgid " not found, aborting" msgid " not found, aborting"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:931 #: src/view/AccountPanel.cpp:936
msgid " operations ?" msgid " operations ?"
msgstr "" msgstr ""
@ -79,11 +79,11 @@ msgid "Amount to"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:340 src/view/PreferencesPanel.cpp:581 #: src/view/PreferencesPanel.cpp:340 src/view/PreferencesPanel.cpp:581
#: src/view/AccountPanel.cpp:926 #: src/view/AccountPanel.cpp:931
msgid "Are you sure want to delete " msgid "Are you sure want to delete "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:449 src/view/AccountPanel.cpp:628 #: src/view/PreferencesPanel.cpp:449 src/view/AccountPanel.cpp:633
#: src/view/SearchPanel.cpp:345 #: src/view/SearchPanel.cpp:345
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "" msgstr ""
@ -174,7 +174,7 @@ msgid "Default"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:159 src/view/PreferencesPanel.cpp:209 #: src/view/PreferencesPanel.cpp:159 src/view/PreferencesPanel.cpp:209
#: src/view/AccountPanel.cpp:785 #: src/view/AccountPanel.cpp:790
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -191,7 +191,7 @@ msgstr ""
#: src/view/PreferencesPanel.cpp:336 src/view/PreferencesPanel.cpp:359 #: src/view/PreferencesPanel.cpp:336 src/view/PreferencesPanel.cpp:359
#: src/view/PreferencesPanel.cpp:378 src/view/PreferencesPanel.cpp:468 #: src/view/PreferencesPanel.cpp:378 src/view/PreferencesPanel.cpp:468
#: src/view/PreferencesPanel.cpp:487 src/view/PreferencesPanel.cpp:526 #: src/view/PreferencesPanel.cpp:487 src/view/PreferencesPanel.cpp:526
#: src/view/PreferencesPanel.cpp:532 src/view/AccountPanel.cpp:922 #: src/view/PreferencesPanel.cpp:532 src/view/AccountPanel.cpp:927
#: src/view/UsersDialog.cpp:86 src/view/UsersDialog.cpp:114 #: src/view/UsersDialog.cpp:86 src/view/UsersDialog.cpp:114
#: src/view/SearchPanel.cpp:134 src/view/SearchPanel.cpp:144 #: src/view/SearchPanel.cpp:134 src/view/SearchPanel.cpp:144
#: src/view/SearchPanel.cpp:158 src/view/SearchPanel.cpp:169 #: src/view/SearchPanel.cpp:158 src/view/SearchPanel.cpp:169
@ -219,7 +219,7 @@ msgstr ""
msgid "From " msgid "From "
msgstr "" msgstr ""
#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:782 #: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:787
msgid "Generate month" msgid "Generate month"
msgstr "" msgstr ""
@ -267,7 +267,7 @@ msgstr ""
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:922 #: src/view/AccountPanel.cpp:927
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "" msgstr ""
@ -279,15 +279,6 @@ msgstr ""
msgid "KissCount" msgid "KissCount"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:96
msgid ""
"KissCount v0.1\n"
"\n"
"Personal accounting software\n"
"\n"
"Copyright (C) 2010 Grégory Soutadé"
msgstr ""
#: src/view/PreferencesPanel.cpp:57 #: src/view/PreferencesPanel.cpp:57
msgid "Language" msgid "Language"
msgstr "" msgstr ""
@ -362,6 +353,13 @@ msgstr ""
msgid "Password changed" msgid "Password changed"
msgstr "" msgstr ""
#: src/view/ButtonPanel.cpp:96
msgid ""
"Personal accounting software\n"
"\n"
"Copyright (C) 2010 Grégory Soutadé"
msgstr ""
#: src/view/PasswordDialog.cpp:78 #: src/view/PasswordDialog.cpp:78
msgid "Please retype new password" msgid "Please retype new password"
msgstr "" msgstr ""

2
src/controller/KissCount.h
View File

@ -27,6 +27,8 @@ along with KissCount. If not, see <http://www.gnu.org/licenses/>.
#include <model/model.h> #include <model/model.h>
#include <view/wxUI.h> #include <view/wxUI.h>
#define APP_VERSION "v0.1 beta"
class wxUI; class wxUI;
class KissCount class KissCount
{ {

9
src/view/AccountPanel.cpp
View File

@ -449,7 +449,7 @@ void AccountPanel::UpdateStats()
int i; int i;
User* user = _kiss->GetUser(); User* user = _kiss->GetUser();
std::vector<Operation>::iterator it; std::vector<Operation>::iterator it;
double curCredit, curDebit, totalCredit, totalDebit, remains, value; double curCredit, curDebit, totalCredit, totalDebit, remains, value, percents;
std::map<wxString, double> curAccountAmount, finalAccountAmount; std::map<wxString, double> curAccountAmount, finalAccountAmount;
std::map<wxString, double>::iterator doubleIt; std::map<wxString, double>::iterator doubleIt;
std::map<wxString, int>::iterator intIt; std::map<wxString, int>::iterator intIt;
@ -503,7 +503,10 @@ void AccountPanel::UpdateStats()
_statsGrid->SetCellValue(REMAINS, 1, wxString::Format(wxT("%.2lf"), remains)); _statsGrid->SetCellValue(REMAINS, 1, wxString::Format(wxT("%.2lf"), remains));
for(i=0; i<user->GetCategoriesNumber()+1; i++) for(i=0; i<user->GetCategoriesNumber()+1; i++)
_statsGrid->SetCellValue(CATS_STATS+i, 1, wxString::Format(wxT("%.2lf"), _categoriesValues[i])); {
percents = ((double) (_categoriesValues[i]*100))/totalDebit;
_statsGrid->SetCellValue(CATS_STATS+i, 1, wxString::Format(wxT("%.2lf (%d %%)"), _categoriesValues[i], (int)percents));
}
for (i=0, accountIt=user->_accounts.begin(); accountIt!=user->_accounts.end(); accountIt++, i++) for (i=0, accountIt=user->_accounts.begin(); accountIt!=user->_accounts.end(); accountIt++, i++)
{ {
@ -514,6 +517,8 @@ void AccountPanel::UpdateStats()
_accountsGrid->SetCellValue(i, ACCOUNT_FINAL, wxString::Format(wxT("%.2lf"), value)); _accountsGrid->SetCellValue(i, ACCOUNT_FINAL, wxString::Format(wxT("%.2lf"), value));
} }
_statsGrid->AutoSizeColumn(1, true);
_pie->DatasetChanged(_dataset); _pie->DatasetChanged(_dataset);
} }

4
src/view/ButtonPanel.cpp
View File

@ -93,8 +93,8 @@ void ButtonPanel::OnButtonChangeUser(wxCommandEvent& event)
void ButtonPanel::OnButtonAbout(wxCommandEvent& event) void ButtonPanel::OnButtonAbout(wxCommandEvent& event)
{ {
wxMessageBox( _("KissCount v0.1\n\nPersonal accounting software\n\nCopyright (C) 2010 Grégory Soutadé"), wxMessageBox( _("Personal accounting software\n\nCopyright (C) 2010 Grégory Soutadé"),
wxT("KissCount"), wxT("KissCount " APP_VERSION "\n\n"),
wxOK | wxICON_INFORMATION, _wxUI ); wxOK | wxICON_INFORMATION, _wxUI );
} }