From ed52d91a7941b5ea4067382536b1ccea85e995b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 6 Jan 2011 18:19:33 +0100 Subject: [PATCH 1/7] Bug of new year --- src/model/Database.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/model/Database.cpp b/src/model/Database.cpp index 0b83830..53278ce 100644 --- a/src/model/Database.cpp +++ b/src/model/Database.cpp @@ -661,6 +661,10 @@ bool Database::LoadOperation(User* user, const wxString& id) op.transfert = set.GetAsString(wxT("transfert")); op.formula = set.GetAsString(wxT("formula")); op.meta = set.GetBool(wxT("meta")); + + if (!user->_operations[op.year]) + user->_operations[op.year] = new std::map >(); + for (it = (*user->_operations[op.year])[op.month].begin(); it != (*user->_operations[op.year])[op.month].end(); it++) From 585ed0ce18a46158dd4a75f84803a2b6c54be9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 6 Jan 2011 18:33:26 +0100 Subject: [PATCH 2/7] Update package.sh to take care of spaces in version number --- tools/package.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/package.sh b/tools/package.sh index fba1944..f4ec3bc 100755 --- a/tools/package.sh +++ b/tools/package.sh @@ -6,16 +6,16 @@ VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2` DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}" FILE="$DIR.tar.bz2" -rm -f $FILE -rm -rf $DIR +rm -f "$FILE" +rm -rf "$DIR" if [ "$1" == "clean" ] ; then make clean fi make || (echo "Compilation failed" ; exit 1) -mkdir -p $DIR/lib -cp -r lib/freechart/lib/*.so* lib/wxsqlite3-1.9.9/lib/*.so* $DIR/lib -cp -r kc init.sql ressources tools/launch_kc.sh TODO CONTRIBUTORS COPYING README README.fr www $DIR -find $DIR -type f -executable -exec strip \{\} \; -tar -jcf $FILE $DIR -rm -rf $DIR +mkdir -p "$DIR"/lib +cp -r lib/freechart/lib/*.so* lib/wxsqlite3-1.9.9/lib/*.so* "$DIR"/lib +cp -r kc init.sql ressources tools/launch_kc.sh TODO CONTRIBUTORS COPYING README README.fr www "$DIR" +find "$DIR" -type f -executable -exec strip \{\} \; +tar -jcf "$FILE" "$DIR" +rm -rf "$DIR" echo "Packaged !" \ No newline at end of file From ac96255b3c6f7e8166eb64d582f77fbc3f35e772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 6 Jan 2011 19:03:46 +0100 Subject: [PATCH 3/7] Better fix for previous bug --- src/model/Database.cpp | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/model/Database.cpp b/src/model/Database.cpp index 53278ce..3b6b754 100644 --- a/src/model/Database.cpp +++ b/src/model/Database.cpp @@ -662,33 +662,33 @@ bool Database::LoadOperation(User* user, const wxString& id) op.formula = set.GetAsString(wxT("formula")); op.meta = set.GetBool(wxT("meta")); - if (!user->_operations[op.year]) - user->_operations[op.year] = new std::map >(); - - for (it = (*user->_operations[op.year])[op.month].begin(); - it != (*user->_operations[op.year])[op.month].end(); - it++) + if (user->_operations[op.year]) { - if (!op.fix_cost && it->fix_cost) continue; - if (op.fix_cost && !it->fix_cost) + for (it = (*user->_operations[op.year])[op.month].begin(); + it != (*user->_operations[op.year])[op.month].end(); + it++) { - it--; - break; - } - if (it->day > op.day) - { - it--; - break; + if (!op.fix_cost && it->fix_cost) continue; + if (op.fix_cost && !it->fix_cost) + { + it--; + break; + } + if (it->day > op.day) + { + it--; + break; + } } + if (it == (*user->_operations[op.year])[op.month].end()) + (*user->_operations[op.year])[op.month].push_back(op); + else + (*user->_operations[op.year])[op.month].insert(it, op); + // if (op.fix_cost) + // else + // (*user->_operations[op.year])[op.month].push_back(op); + ret = true; } - if (it == (*user->_operations[op.year])[op.month].end()) - (*user->_operations[op.year])[op.month].push_back(op); - else - (*user->_operations[op.year])[op.month].insert(it, op); - // if (op.fix_cost) - // else - // (*user->_operations[op.year])[op.month].push_back(op); - ret = true; } set.Finalize(); From b30604fffe1474e6946cfcf2e3eede03fd8d2b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 6 Jan 2011 20:23:13 +0100 Subject: [PATCH 4/7] Bug on GenerateMonth with different years --- src/controller/KissCount.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp index 18203a5..4113bc4 100644 --- a/src/controller/KissCount.cpp +++ b/src/controller/KissCount.cpp @@ -296,8 +296,8 @@ void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int year } // Re Generate parents - for(it = (*_user->_operations[yearFrom])[monthTo].begin(); - it != (*_user->_operations[yearFrom])[monthTo].end(); + for(it = (*_user->_operations[yearTo])[monthTo].begin(); + it != (*_user->_operations[yearTo])[monthTo].end(); it++) { if (it->parent.Length()) @@ -305,8 +305,8 @@ void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int year it->parent = meta[it->parent]; UpdateOperation(*it); - for(it2 = (*_user->_operations[yearFrom])[monthTo].begin(); - it2 != (*_user->_operations[yearFrom])[monthTo].end(); + for(it2 = (*_user->_operations[yearTo])[monthTo].begin(); + it2 != (*_user->_operations[yearTo])[monthTo].end(); it2++) if (it2->id == it->parent) { From 63ccfc7f9727e7aac48d6577a9217d9ec59deae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Sat, 8 Jan 2011 12:35:04 +0100 Subject: [PATCH 5/7] Merge of d71f055dfc1f9b9d8f3ad8bbb8048f2d2bab9522 --- src/model/User.h | 5 +++++ src/view/StatsPanel.cpp | 41 +++++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/model/User.h b/src/model/User.h index 3e9b689..509186d 100644 --- a/src/model/User.h +++ b/src/model/User.h @@ -51,14 +51,19 @@ public: wxString GetCategoryName(wxString& catId); wxString GetCategoryId(wxString& catName); const wxFont GetCategoryFont(wxString& catId); + Account GetAccount(const wxString& accountId); wxString GetAccountName(const wxString& accountId); wxString GetAccountId(wxString& accountName); + int GetCategoriesNumber(); int GetAccountsNumber(); int GetOperationsNumber(int month, int year); + wxLanguage GetLanguage(); + void LinkOrUnlinkOperation(Operation& op); + void Group(const Operation& op); bool Group(std::vector* ops, const Operation& op); void UnGroup(const Operation& op); diff --git a/src/view/StatsPanel.cpp b/src/view/StatsPanel.cpp index 62ca913..f285d2f 100644 --- a/src/view/StatsPanel.cpp +++ b/src/view/StatsPanel.cpp @@ -54,10 +54,12 @@ StatsPanel::StatsPanel(KissCount* kiss, wxUI *parent) : wxPanel(&(*parent)), _ki _yearTo->Append(wxString::Format(wxT("%d"), it->first)); } - _monthFrom->Select(0); - _monthTo->Select(11); + if (i) i--; + _yearFrom->Select(i); _yearTo->Select(i); + _monthFrom->Select(0); + _monthTo->Select(11); wxStaticText* label = new wxStaticText(this, wxID_ANY, _("From")); hbox->Add(label); @@ -152,12 +154,11 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT std::map > > accountAmounts; std::map categories; std::map > operations; - std::map >::iterator accountIdIt2; + std::vector::iterator accountIt; std::map::iterator categoriesIt; - std::map > >::iterator accountIdIt; std::map >::iterator accountYearIt; double total; - int size, i, a, b, percents, account, nbDays; + int account, size, i, a, b, percents, nbDays; double *amounts; wxString value; User* user = _kiss->GetUser(); @@ -193,10 +194,10 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT dataset->AddSerie((double *) amounts, nbDays); delete[] amounts; - for (account = 0, i = 0, accountIdIt2 = operations.begin(); accountIdIt2 != operations.end(); - accountIdIt2++, i++, account++) + for (account = 0, i = 0, accountIt = user->_accounts.begin(); accountIt != user->_accounts.end(); + account++, accountIt++, i++) { - if (!((wxCheckListBox*)_account)->IsChecked(account)) + if (!_account->IsChecked(account)) { i-- ; continue; @@ -207,11 +208,11 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT for (a=0; afirst][a]; + amounts[a*2+1] = operations[accountIt->id][a]; } dataset->AddSerie((double *) amounts, nbDays); // set serie names to be displayed on legend - dataset->SetSerieName(i+1, user->GetAccountName(accountIdIt2->first)); + dataset->SetSerieName(i+1, user->GetAccountName(accountIt->id)); delete[] amounts; } } @@ -234,34 +235,34 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT dataset->AddSerie((double *) amounts, size); delete[] amounts; - for (account = 0, i = 0, accountIdIt = accountAmounts.begin(); accountIdIt != accountAmounts.end(); - accountIdIt++, i++, account++) + for (account = 0, i = 0, accountIt = user->_accounts.begin(); accountIt != user->_accounts.end(); + account++, accountIt++, i++) { - if (!((wxCheckListBox*)_account)->IsChecked(account)) + if (!_account->IsChecked(account)) { i-- ; continue; } - size = accountAmounts[accountIdIt->first].size(); + size = accountAmounts[accountIt->id].size(); amounts = new double[size*12*2]; size = 0; - for(a = 0, accountYearIt = accountAmounts[accountIdIt->first].begin(); - accountYearIt != accountAmounts[accountIdIt->first].end(); + for(a = 0, accountYearIt = accountAmounts[accountIt->id].begin(); + accountYearIt != accountAmounts[accountIt->id].end(); accountYearIt++, a++) { for(b = 0; b<12; b++) { - if (!accountAmounts[accountIdIt->first][accountYearIt->first].count(b)) + if (!accountAmounts[accountIt->id][accountYearIt->first].count(b)) continue; amounts[size*2+0] = a*12+b; - amounts[size*2+1] = accountAmounts[accountIdIt->first][accountYearIt->first][b]; + amounts[size*2+1] = accountAmounts[accountIt->id][accountYearIt->first][b]; size++; } } dataset->AddSerie((double *) amounts, size); // set serie names to be displayed on legend - dataset->SetSerieName(i+1, user->GetAccountName(accountIdIt->first)); + dataset->SetSerieName(i+1, user->GetAccountName(accountIt->id)); delete[] amounts; } } @@ -340,7 +341,7 @@ void StatsPanel::OnRangeChange(wxCommandEvent& event) monthTo = _monthTo->GetCurrentSelection(); _yearTo->GetStringSelection().ToLong(&yearTo); - if (yearTo > yearFrom || + if (yearTo < yearFrom || (yearFrom == yearTo && monthFrom > monthTo)) { wxMessageBox(_("Invalide date range"), _("KissCount"), wxICON_ERROR | wxOK); From c0591e981541c642ed913e671889988bed035a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 25 Jan 2011 20:26:29 +0100 Subject: [PATCH 6/7] Add cross compilation support --- ChangeLog | 3 ++- Makefile | 13 ++++++++----- tools/package.sh | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 422cb9e..a18d440 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -v0.2_dev (23/01/2011) +v0.2_dev (25/01/2011) ** User ** Better use of sizers (so better interface!) @@ -7,6 +7,7 @@ v0.2_dev (23/01/2011) ** Dev ** Use a factory to create panels (prepare for plug-in) + Better cross compilation support (Makefile and package.sh) ** Bugs ** Bug on GenerateMonth with different years diff --git a/Makefile b/Makefile index d753805..d110e41 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ -CXXFLAGS=`wx-config --cxxflags` -Wall -Isrc -ggdb +CXXFLAGS+=`wx-config --cxxflags` -Wall -Isrc -ggdb CXXFLAGS+=-I./lib/wxsqlite3-1.9.9/include CXXFLAGS+=-I./lib/freechart/include -LDFLAGS=`wx-config --libs` +LDFLAGS+=`wx-config --libs` LDFLAGS+=-L./lib/wxsqlite3-1.9.9/lib/ -lwxcode_gtk2u_wxsqlite3-2.8 LDFLAGS+=-L./lib/freechart/lib -lwxcode_gtk2u_freechart-2.8 -CXX=g++ +CXX=$(PREFIX)g++ SOURCES=$(wildcard src/model/*.cpp) SOURCES+=$(wildcard src/view/*.cpp) @@ -34,5 +34,8 @@ check: kc: $(OBJS) $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) -generate_locals: - ./generate_locales.sh +generate_locales: + ./tools/generate_locales.sh + +package: + ./tools/package.sh diff --git a/tools/package.sh b/tools/package.sh index f4ec3bc..b0685a5 100755 --- a/tools/package.sh +++ b/tools/package.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%d.%m.%Y` -ARCH=`uname -m` +ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1` VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2` DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}" FILE="$DIR.tar.bz2" @@ -15,7 +15,7 @@ make || (echo "Compilation failed" ; exit 1) mkdir -p "$DIR"/lib cp -r lib/freechart/lib/*.so* lib/wxsqlite3-1.9.9/lib/*.so* "$DIR"/lib cp -r kc init.sql ressources tools/launch_kc.sh TODO CONTRIBUTORS COPYING README README.fr www "$DIR" -find "$DIR" -type f -executable -exec strip \{\} \; +find "$DIR" -type f -executable -exec ${PREFIX}strip \{\} \; tar -jcf "$FILE" "$DIR" rm -rf "$DIR" -echo "Packaged !" \ No newline at end of file +echo "Packaged into $FILE !" \ No newline at end of file From d0d614beee440a306276db718a2f6dff2caf1aff Mon Sep 17 00:00:00 2001 From: www-data Date: Wed, 26 Jan 2011 11:58:32 +0100 Subject: [PATCH 7/7] Update version to avoid spaces for package.sh --- ressources/po/kisscount.pot | 219 +++++++++++++++++------------------- src/controller/KissCount.h | 2 +- 2 files changed, 104 insertions(+), 117 deletions(-) diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot index 7bd4551..078a06e 100644 --- a/ressources/po/kisscount.pot +++ b/ressources/po/kisscount.pot @@ -8,26 +8,25 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-02 19:11+0100\n" +"POT-Creation-Date: 2011-01-26 11:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/view/StatsPanel.cpp:327 src/view/PreferencesPanel.cpp:775 +#: src/view/StatsPanel.cpp:339 src/view/PreferencesPanel.cpp:790 msgid " - " msgstr "" -#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:456 -#: src/view/PreferencesPanel.cpp:476 src/view/PreferencesPanel.cpp:677 -#: src/view/PreferencesPanel.cpp:696 src/view/PreferencesPanel.cpp:733 +#: src/view/PreferencesPanel.cpp:470 src/view/PreferencesPanel.cpp:490 +#: src/view/PreferencesPanel.cpp:692 src/view/PreferencesPanel.cpp:711 +#: src/view/PreferencesPanel.cpp:748 src/view/UsersDialog.cpp:120 msgid " already exists" msgstr "" -#: src/view/SearchPanel.cpp:226 +#: src/view/SearchPanel.cpp:242 msgid " entries found" msgstr "" @@ -35,11 +34,11 @@ msgstr "" msgid " not found, aborting" msgstr "" -#: src/view/AccountPanel.cpp:742 +#: src/view/AccountPanel.cpp:757 msgid " operations ?" msgstr "" -#: src/view/PreferencesPanel.cpp:782 +#: src/view/PreferencesPanel.cpp:797 msgid " profil ?" msgstr "" @@ -47,19 +46,15 @@ msgstr "" msgid "!! Warning !! If there was a bug, the old database will be suppressed !" msgstr "" -#: src/view/SearchPanel.cpp:228 +#: src/view/SearchPanel.cpp:244 msgid "1 entry found" msgstr "" -#: src/view/ButtonPanel.cpp:74 -msgid "About" -msgstr "" - #: src/view/SearchPanel.cpp:90 src/view/grid/GridAccount.cpp:64 msgid "Account" msgstr "" -#: src/view/PreferencesPanel.cpp:456 src/view/PreferencesPanel.cpp:476 +#: src/view/PreferencesPanel.cpp:470 src/view/PreferencesPanel.cpp:490 msgid "Account " msgstr "" @@ -75,49 +70,49 @@ msgstr "" msgid "Account number" msgstr "" -#: src/view/StatsPanel.cpp:292 src/view/PreferencesPanel.cpp:59 +#: src/view/StatsPanel.cpp:304 src/view/PreferencesPanel.cpp:59 msgid "Accounts" msgstr "" -#: src/view/SearchPanel.cpp:87 +#: src/view/SearchPanel.cpp:86 msgid "Amount from" msgstr "" -#: src/view/SearchPanel.cpp:88 +#: src/view/SearchPanel.cpp:87 msgid "Amount to" msgstr "" -#: src/view/PreferencesPanel.cpp:408 src/view/PreferencesPanel.cpp:782 -#: src/view/AccountPanel.cpp:737 +#: src/view/AccountPanel.cpp:752 src/view/PreferencesPanel.cpp:422 +#: src/view/PreferencesPanel.cpp:797 msgid "Are you sure want to delete " msgstr "" -#: src/view/PreferencesPanel.cpp:657 src/view/grid/GridAccount.cpp:814 +#: src/view/PreferencesPanel.cpp:672 src/view/grid/GridAccount.cpp:825 msgid "Are you sure want to delete : \n" msgstr "" -#: src/view/PreferencesPanel.cpp:343 +#: src/view/PreferencesPanel.cpp:357 msgid "Ascending" msgstr "" -#: src/view/PreferencesPanel.cpp:267 +#: src/view/PreferencesPanel.cpp:281 msgid "Background color" msgstr "" -#: src/view/PreferencesPanel.cpp:187 +#: src/view/PreferencesPanel.cpp:195 msgid "Blocked" msgstr "" -#: src/view/UsersDialog.cpp:51 src/view/GenerateDialog.cpp:60 -#: src/view/PasswordDialog.cpp:56 +#: src/view/GenerateDialog.cpp:60 src/view/PasswordDialog.cpp:56 +#: src/view/UsersDialog.cpp:52 msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1245 src/view/grid/GridAccount.cpp:1252 +#: src/view/grid/GridAccount.cpp:1256 src/view/grid/GridAccount.cpp:1263 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1371 src/view/grid/GridAccount.cpp:1377 +#: src/view/grid/GridAccount.cpp:1382 src/view/grid/GridAccount.cpp:1388 msgid "Cannot ungroup these operations" msgstr "" @@ -125,11 +120,11 @@ msgstr "" msgid "Categories" msgstr "" -#: src/view/SearchPanel.cpp:89 src/view/grid/GridAccount.cpp:64 +#: src/view/SearchPanel.cpp:88 src/view/grid/GridAccount.cpp:64 msgid "Category" msgstr "" -#: src/view/PreferencesPanel.cpp:677 src/view/PreferencesPanel.cpp:696 +#: src/view/PreferencesPanel.cpp:692 src/view/PreferencesPanel.cpp:711 msgid "Category " msgstr "" @@ -145,10 +140,6 @@ msgstr "" msgid "Change password" msgstr "" -#: src/view/ButtonPanel.cpp:73 -msgid "Change user" -msgstr "" - #: src/view/AccountPanel.cpp:122 msgid "Check mode" msgstr "" @@ -161,7 +152,7 @@ msgstr "" msgid "Confirm password " msgstr "" -#: src/view/StatsPanel.cpp:130 src/view/AccountPanel.cpp:116 +#: src/view/AccountPanel.cpp:116 src/view/StatsPanel.cpp:128 msgid "Cost repartition" msgstr "" @@ -169,11 +160,11 @@ msgstr "" msgid "Credit" msgstr "" -#: src/view/AccountPanel.cpp:202 +#: src/view/AccountPanel.cpp:215 msgid "Cur Credit" msgstr "" -#: src/view/AccountPanel.cpp:203 +#: src/view/AccountPanel.cpp:216 msgid "Cur Debit" msgstr "" @@ -197,38 +188,38 @@ msgstr "" msgid "Debit" msgstr "" -#: src/view/PreferencesPanel.cpp:186 +#: src/view/PreferencesPanel.cpp:194 msgid "Default" msgstr "" -#: src/view/PreferencesPanel.cpp:188 src/view/PreferencesPanel.cpp:270 -#: src/view/AccountPanel.cpp:596 +#: src/view/AccountPanel.cpp:611 src/view/PreferencesPanel.cpp:196 +#: src/view/PreferencesPanel.cpp:284 msgid "Delete" msgstr "" -#: src/view/PreferencesPanel.cpp:344 +#: src/view/PreferencesPanel.cpp:358 msgid "Descending" msgstr "" -#: src/view/SearchPanel.cpp:86 src/view/grid/GridAccount.cpp:64 +#: src/view/SearchPanel.cpp:85 src/view/grid/GridAccount.cpp:64 msgid "Description" msgstr "" -#: src/view/UsersDialog.cpp:88 src/view/UsersDialog.cpp:118 -#: src/view/SearchPanel.cpp:141 src/view/SearchPanel.cpp:151 -#: src/view/SearchPanel.cpp:165 src/view/SearchPanel.cpp:176 -#: src/view/PreferencesPanel.cpp:404 src/view/PreferencesPanel.cpp:456 -#: src/view/PreferencesPanel.cpp:476 src/view/PreferencesPanel.cpp:677 -#: src/view/PreferencesPanel.cpp:696 src/view/PreferencesPanel.cpp:727 -#: src/view/PreferencesPanel.cpp:733 src/view/PasswordDialog.cpp:72 -#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:733 -#: src/view/grid/GridAccount.cpp:1245 src/view/grid/GridAccount.cpp:1252 -#: src/view/grid/GridAccount.cpp:1371 src/view/grid/GridAccount.cpp:1377 -#: 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 -#: src/model/Database.cpp:147 src/model/Database.cpp:155 -#: src/model/Database.cpp:176 +#: 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 src/model/Database.cpp:147 +#: src/model/Database.cpp:155 src/model/Database.cpp:176 +#: src/view/AccountPanel.cpp:748 src/view/PasswordDialog.cpp:72 +#: src/view/PasswordDialog.cpp:78 src/view/PreferencesPanel.cpp:418 +#: src/view/PreferencesPanel.cpp:470 src/view/PreferencesPanel.cpp:490 +#: src/view/PreferencesPanel.cpp:692 src/view/PreferencesPanel.cpp:711 +#: src/view/PreferencesPanel.cpp:742 src/view/PreferencesPanel.cpp:748 +#: src/view/SearchPanel.cpp:157 src/view/SearchPanel.cpp:167 +#: src/view/SearchPanel.cpp:181 src/view/SearchPanel.cpp:192 +#: src/view/UsersDialog.cpp:90 src/view/UsersDialog.cpp:120 +#: src/view/grid/GridAccount.cpp:1256 src/view/grid/GridAccount.cpp:1263 +#: src/view/grid/GridAccount.cpp:1382 src/view/grid/GridAccount.cpp:1388 +#: src/view/grid/wxGridCellFormulaEditor.cpp:69 msgid "Error" msgstr "" @@ -240,20 +231,20 @@ msgstr "" msgid "Final value" msgstr "" +#: src/controller/KissCount.cpp:359 src/model/Database.cpp:331 #: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:323 -#: src/model/Database.cpp:331 src/controller/KissCount.cpp:359 msgid "Fix" msgstr "" -#: src/view/PreferencesPanel.cpp:269 +#: src/view/PreferencesPanel.cpp:283 msgid "Font" msgstr "" -#: src/view/PreferencesPanel.cpp:268 +#: src/view/PreferencesPanel.cpp:282 msgid "Foreground color" msgstr "" -#: src/view/StatsPanel.cpp:62 +#: src/view/StatsPanel.cpp:64 msgid "From" msgstr "" @@ -261,7 +252,7 @@ msgstr "" msgid "From " msgstr "" -#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:593 +#: src/view/AccountPanel.cpp:608 src/view/GenerateDialog.cpp:31 msgid "Generate month" msgstr "" @@ -281,19 +272,19 @@ msgstr "" msgid "Initial value" msgstr "" -#: src/view/SearchPanel.cpp:151 +#: src/view/SearchPanel.cpp:167 msgid "Invalid amount from" msgstr "" -#: src/view/SearchPanel.cpp:176 +#: src/view/SearchPanel.cpp:192 msgid "Invalid amount range" msgstr "" -#: src/view/SearchPanel.cpp:165 +#: src/view/SearchPanel.cpp:181 msgid "Invalid amount to" msgstr "" -#: src/view/SearchPanel.cpp:141 +#: src/view/SearchPanel.cpp:157 msgid "Invalid date range" msgstr "" @@ -301,7 +292,7 @@ msgstr "" msgid "Invalid formula !" msgstr "" -#: src/view/PreferencesPanel.cpp:727 +#: src/view/PreferencesPanel.cpp:742 msgid "Invalid name" msgstr "" @@ -309,19 +300,19 @@ msgstr "" msgid "Invalid old password" msgstr "" -#: src/view/UsersDialog.cpp:88 +#: src/view/UsersDialog.cpp:90 msgid "Invalid password" msgstr "" -#: src/view/StatsPanel.cpp:346 +#: src/view/StatsPanel.cpp:358 msgid "Invalide date range" msgstr "" -#: src/view/PreferencesPanel.cpp:404 +#: src/view/PreferencesPanel.cpp:418 msgid "It must be at least one account !" msgstr "" -#: src/view/AccountPanel.cpp:733 +#: src/view/AccountPanel.cpp:748 msgid "It must be at least one month !" msgstr "" @@ -329,8 +320,8 @@ msgstr "" msgid "Kill me" msgstr "" -#: src/view/StatsPanel.cpp:346 src/view/PreferencesPanel.cpp:767 -#: src/view/PreferencesPanel.cpp:770 +#: src/view/StatsPanel.cpp:358 src/view/PreferencesPanel.cpp:782 +#: src/view/PreferencesPanel.cpp:785 msgid "KissCount" msgstr "" @@ -338,24 +329,24 @@ msgstr "" msgid "Language" msgstr "" -#: src/view/PreferencesPanel.cpp:770 +#: src/view/PreferencesPanel.cpp:785 msgid "Language not changed" msgstr "" -#: src/view/PreferencesPanel.cpp:767 +#: src/view/PreferencesPanel.cpp:782 msgid "Language successfully changed, please go to another panel" msgstr "" -#: src/view/PreferencesPanel.cpp:71 src/view/PreferencesPanel.cpp:184 -#: src/view/PreferencesPanel.cpp:266 +#: src/view/PreferencesPanel.cpp:71 src/view/PreferencesPanel.cpp:192 +#: src/view/PreferencesPanel.cpp:280 msgid "Name" msgstr "" -#: src/view/PreferencesPanel.cpp:739 +#: src/view/PreferencesPanel.cpp:754 msgid "Name changed" msgstr "" -#: src/view/UsersDialog.cpp:52 src/view/UsersDialog.cpp:107 +#: src/view/UsersDialog.cpp:53 src/view/UsersDialog.cpp:109 msgid "New User" msgstr "" @@ -369,7 +360,7 @@ msgid "" "\n" msgstr "" -#: src/view/SearchPanel.cpp:231 +#: src/view/SearchPanel.cpp:247 msgid "No entry found" msgstr "" @@ -381,12 +372,12 @@ msgstr "" msgid "Not checked" msgstr "" -#: src/view/PreferencesPanel.cpp:185 +#: src/view/PreferencesPanel.cpp:193 msgid "Number" msgstr "" -#: src/view/UsersDialog.cpp:50 src/view/GenerateDialog.cpp:59 -#: src/view/PasswordDialog.cpp:55 +#: src/view/GenerateDialog.cpp:59 src/view/PasswordDialog.cpp:55 +#: src/view/UsersDialog.cpp:51 msgid "OK" msgstr "" @@ -402,7 +393,7 @@ msgstr "" msgid "Operation order" msgstr "" -#: src/view/ButtonPanel.cpp:69 +#: src/view/AccountPanel.cpp:175 src/view/SearchPanel.cpp:89 msgid "Operations" msgstr "" @@ -410,7 +401,7 @@ msgstr "" msgid "Other" msgstr "" -#: src/view/UsersDialog.cpp:43 +#: src/view/UsersDialog.cpp:44 msgid "Password " msgstr "" @@ -418,7 +409,7 @@ msgstr "" msgid "Password changed" msgstr "" -#: src/view/ButtonPanel.cpp:105 +#: src/view/wxUI.cpp:243 msgid "" "Personal accounting software\n" "\n" @@ -433,8 +424,8 @@ msgstr "" msgid "Please retype new password" msgstr "" -#: src/view/PreferencesPanel.cpp:741 src/view/PreferencesPanel.cpp:775 -#: src/view/ButtonPanel.cpp:72 +#: src/view/PreferencesPanel.cpp:180 src/view/PreferencesPanel.cpp:756 +#: src/view/PreferencesPanel.cpp:790 msgid "Preferences" msgstr "" @@ -442,24 +433,20 @@ msgstr "" msgid "Query failed !\n" msgstr "" -#: src/view/ButtonPanel.cpp:75 -msgid "Quit" -msgstr "" - -#: src/view/ButtonPanel.cpp:112 +#: src/view/wxUI.cpp:250 msgid "Quit KissCount ?" msgstr "" -#: src/view/AccountPanel.cpp:204 +#: src/view/AccountPanel.cpp:217 msgid "Remains" msgstr "" -#: src/view/SearchPanel.cpp:84 src/view/SearchPanel.cpp:242 -#: src/view/ButtonPanel.cpp:71 +#: src/view/SearchPanel.cpp:83 src/view/SearchPanel.cpp:142 +#: src/view/SearchPanel.cpp:258 msgid "Search" msgstr "" -#: src/view/StatsPanel.cpp:122 src/view/AccountPanel.cpp:90 +#: src/view/AccountPanel.cpp:90 src/view/StatsPanel.cpp:120 msgid "Serie 1" msgstr "" @@ -467,7 +454,7 @@ msgstr "" msgid "Shared with" msgstr "" -#: src/view/StatsPanel.cpp:327 src/view/ButtonPanel.cpp:70 +#: src/view/StatsPanel.cpp:160 src/view/StatsPanel.cpp:339 msgid "Statistics" msgstr "" @@ -479,11 +466,11 @@ msgstr "" msgid "To " msgstr "" -#: src/view/AccountPanel.cpp:186 +#: src/view/AccountPanel.cpp:199 msgid "Total Credit" msgstr "" -#: src/view/AccountPanel.cpp:187 +#: src/view/AccountPanel.cpp:200 msgid "Total Debit" msgstr "" @@ -512,8 +499,8 @@ msgstr "" msgid "User" msgstr "" -#: src/view/UsersDialog.cpp:38 src/view/UsersDialog.cpp:118 -#: src/view/PreferencesPanel.cpp:733 +#: src/view/PreferencesPanel.cpp:748 src/view/UsersDialog.cpp:39 +#: src/view/UsersDialog.cpp:120 msgid "User " msgstr "" @@ -521,58 +508,58 @@ msgstr "" msgid "Users" msgstr "" -#: src/view/grid/GridAccount.cpp:1022 +#: src/view/grid/GridAccount.cpp:1033 msgid "Warning" msgstr "" -#: src/view/grid/GridAccount.cpp:1022 +#: src/view/grid/GridAccount.cpp:1033 msgid "You made a debit on a blocked account" msgstr "" -#: src/view/wxUI.cpp:110 +#: src/view/wxUI.cpp:123 msgid "april" msgstr "" -#: src/view/wxUI.cpp:114 +#: src/view/wxUI.cpp:127 msgid "august" msgstr "" -#: src/view/wxUI.cpp:118 +#: src/view/wxUI.cpp:131 msgid "december" msgstr "" -#: src/view/wxUI.cpp:108 +#: src/view/wxUI.cpp:121 msgid "february" msgstr "" -#: src/view/wxUI.cpp:107 +#: src/view/wxUI.cpp:120 msgid "january" msgstr "" -#: src/view/wxUI.cpp:113 +#: src/view/wxUI.cpp:126 msgid "july" msgstr "" -#: src/view/wxUI.cpp:112 +#: src/view/wxUI.cpp:125 msgid "june" msgstr "" -#: src/view/wxUI.cpp:109 +#: src/view/wxUI.cpp:122 msgid "march" msgstr "" -#: src/view/wxUI.cpp:111 +#: src/view/wxUI.cpp:124 msgid "may" msgstr "" -#: src/view/wxUI.cpp:117 +#: src/view/wxUI.cpp:130 msgid "november" msgstr "" -#: src/view/wxUI.cpp:116 +#: src/view/wxUI.cpp:129 msgid "october" msgstr "" -#: src/view/wxUI.cpp:115 +#: src/view/wxUI.cpp:128 msgid "september" msgstr "" diff --git a/src/controller/KissCount.h b/src/controller/KissCount.h index 0da2a31..8cb6f63 100644 --- a/src/controller/KissCount.h +++ b/src/controller/KissCount.h @@ -29,7 +29,7 @@ #include -#define APP_VERSION "v0.2 dev" +#define APP_VERSION "v0.2_dev" class wxUI; class Database;