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

Enhance size of description field

Browse Source 
Change "remains" in "balance"
Fix a bug in language settings
This commit is contained in:
Grégory Soutadé 2011-08-06 17:30:16 +02:00
parent 61f8912ad2
commit 90a6659a84
6 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ressources/po/french.mo
View File

Binary file not shown.

13
ressources/po/french.po
View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-04 20:23+0200\n"
"POT-Creation-Date: 2011-08-06 17:24+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Soutadé <soutade@gmail.com>\n"
"Language-Team: \n"
@ -147,6 +147,10 @@ msgstr "Croissant"
msgid "Background color"
msgstr "Couleur d'arrière plan"
#: src/view/AccountPanel.cpp:236
msgid "Balance"
msgstr "Solde"
#: src/view/PreferencesPanel.cpp:200
msgid "Blocked"
msgstr "Bloqué"
@ -650,10 +654,6 @@ msgstr "Quitter KissCount ?"
msgid "Real"
msgstr "Réel"
#: src/view/AccountPanel.cpp:236
msgid "Remains"
msgstr "Restant"
#: src/view/SearchPanel.cpp:61
msgid "Rename"
msgstr "Renommer"
@ -833,6 +833,9 @@ msgstr "octobre"
msgid "september"
msgstr "septembre"
#~ msgid "Remains"
#~ msgstr "Restant"
#~ msgid "Operating expense"
#~ msgstr "Fonctionnement"

10
ressources/po/kisscount.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-04 20:23+0200\n"
"POT-Creation-Date: 2011-08-06 17:24+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"
@ -133,6 +133,10 @@ msgstr ""
msgid "Background color"
msgstr ""
#: src/view/AccountPanel.cpp:236
msgid "Balance"
msgstr ""
#: src/view/PreferencesPanel.cpp:200
msgid "Blocked"
msgstr ""
@ -587,10 +591,6 @@ msgstr ""
msgid "Real"
msgstr ""
#: src/view/AccountPanel.cpp:236
msgid "Remains"
msgstr ""
#: src/view/SearchPanel.cpp:61
msgid "Rename"
msgstr ""

18
src/view/AccountPanel.cpp
View File

@ -20,7 +20,7 @@
#include "AccountPanel.h"
enum {ACCOUNT_NUMBER, ACCOUNT_NAME, ACCOUNT_INIT, ACCOUNT_CUR, ACCOUNT_FINAL, NUMBER_COLS_ACCOUNTS};
enum {CUR_CREDIT, CUR_DEBIT, TOTAL_CREDIT, TOTAL_DEBIT, REMAINS, STATS_ROW, CATS_STATS, NON_FIX};
enum {CUR_CREDIT, CUR_DEBIT, TOTAL_CREDIT, TOTAL_DEBIT, BALANCE, STATS_ROW, CATS_STATS, NON_FIX};
enum {CALENDAR_TREE_ID=1, OPS_GRID_ID, CALENDAR_ID, ACCOUNTS_GRID_ID, MENU_GENERATE_ID, MENU_DELETE_ID, DISPLAY_MODE_ID, GROUP_ID, UNGROUP_ID, UPDATE_NEXT_MONTHS_ID};
enum {VIRTUAL_MODE=0, REAL_MODE, CHECK_MODE};
@ -228,19 +228,19 @@ void AccountPanel::InitStatsGrid(User* user)
font.SetWeight(wxFONTWEIGHT_BOLD);
_statsGrid->SetCellFont(CUR_CREDIT, 0, font);
_statsGrid->SetCellFont(CUR_DEBIT, 0, font);
_statsGrid->SetCellFont(REMAINS, 0, font);
_statsGrid->SetCellFont(REMAINS, 1, font);
_statsGrid->SetCellFont(BALANCE, 0, font);
_statsGrid->SetCellFont(BALANCE, 1, font);
_statsGrid->SetCellValue(CUR_CREDIT, 0, _("Cur Credit"));
_statsGrid->SetCellValue(CUR_DEBIT, 0, _("Cur Debit"));
_statsGrid->SetCellValue(REMAINS, 0, _("Remains"));
_statsGrid->SetCellValue(BALANCE, 0, _("Balance"));
_statsGrid->SetCellValue(NON_FIX, 0, _("Non fix"));
_statsGrid->SetCellAlignment(CUR_DEBIT, 1, wxALIGN_RIGHT, wxALIGN_CENTRE);
_statsGrid->SetCellAlignment(CUR_CREDIT, 1, wxALIGN_RIGHT, wxALIGN_CENTRE);
_statsGrid->SetCellAlignment(TOTAL_DEBIT, 1, wxALIGN_RIGHT, wxALIGN_CENTRE);
_statsGrid->SetCellAlignment(TOTAL_CREDIT, 1, wxALIGN_RIGHT, wxALIGN_CENTRE);
_statsGrid->SetCellAlignment(REMAINS, 1, wxALIGN_RIGHT, wxALIGN_CENTRE);
_statsGrid->SetCellAlignment(BALANCE, 1, wxALIGN_RIGHT, wxALIGN_CENTRE);
_statsGrid->SetCellAlignment(NON_FIX, 1, wxALIGN_RIGHT, wxALIGN_CENTRE);
}
@ -447,7 +447,7 @@ void AccountPanel::UpdateStats()
int i;
User* user = _kiss->GetUser();
std::vector<Operation>::iterator it;
double curCredit, curDebit, totalCredit, totalDebit, remains, value, value2, percents;
double curCredit, curDebit, totalCredit, totalDebit, balance, value, value2, percents;
std::map<wxString, double> curAccountAmount, finalAccountAmount;
std::map<wxString, double>::iterator doubleIt;
std::map<wxString, int>::iterator intIt;
@ -623,14 +623,14 @@ void AccountPanel::UpdateStats()
}
}
remains = totalCredit - totalDebit;
balance = totalCredit - totalDebit;
_statsGrid->SetCellValue(CUR_CREDIT, 1, wxString::Format(wxT("%.2lf"), curCredit));
_statsGrid->SetCellValue(CUR_DEBIT, 1, wxString::Format(wxT("%.2lf"), curDebit));
_statsGrid->SetCellValue(TOTAL_CREDIT, 1, wxString::Format(wxT("%.2lf"), totalCredit));
_statsGrid->SetCellValue(TOTAL_DEBIT, 1, wxString::Format(wxT("%.2lf"), totalDebit));
_statsGrid->SetCellTextColour(REMAINS, 1, (remains >= 0) ? wxColor(0x00, 0xFF, 0x00) : wxColor(0xFF, 0x00, 0x00));
_statsGrid->SetCellValue(REMAINS, 1, wxString::Format(wxT("%.2lf"), remains));
_statsGrid->SetCellTextColour(BALANCE, 1, (balance >= 0) ? wxColor(0x00, 0xFF, 0x00) : wxColor(0xFF, 0x00, 0x00));
_statsGrid->SetCellValue(BALANCE, 1, wxString::Format(wxT("%.2lf"), balance));
for(i=0; i<user->GetCategoriesNumber()+1; i++)
{

2
src/view/grid/GridAccount.cpp
View File

@ -56,7 +56,7 @@ GridAccount::GridAccount(KissCount* kiss, wxWindow *parent, wxWindowID id,
SetColLabelSize(0);
SetRowLabelSize(0);
SetColSize (DESCRIPTION, GetColSize(DESCRIPTION)*3);
SetColSize (DESCRIPTION, GetColSize(DESCRIPTION)*5);
SetDefaultCellFont(font);
font.SetWeight(wxFONTWEIGHT_BOLD);

3
src/view/wxUI.cpp
View File

@ -188,11 +188,12 @@ void wxUI::LoadPanels()
void wxUI::LoadUser()
{
User* user = _kiss->GetUser();
LoadPanels();
if (user->_preferences[wxT("language")] != wxT(""))
SetLanguage(user->GetLanguage());
LoadPanels();
if (_panels.size())
ShowPanel(_panels[0]);
}