diff --git a/ChangeLog b/ChangeLog index 2788bd3..fb543ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.2 (30/04/2011) +v0.2 (28/05/2011) ** User ** Better use of sizers (so better interface!) @@ -16,6 +16,7 @@ v0.2 (30/04/2011) Add Debian's packages !! Add Import Panel, OFX and Grisbi imports Add update next months + Change charts and real/virtual mode position ** Dev ** Use a factory to create panels (prepare for plug-in) diff --git a/README b/README index 816937c..9d79853 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ KissCount is personnal account software delivered under GPL v3 licence terms. Current version is 0.2 -wxWidgets 2.8 and sqlite3 are needed +wxWidgets 2.8, sqlite3, libofx and libxml2 are needed A modified version of wxFreeChart is used : warning during recompilation, don't overwrite autotools files with ./configure diff --git a/README.fr b/README.fr index 9c2b61c..594c3d1 100644 --- a/README.fr +++ b/README.fr @@ -2,7 +2,7 @@ KissCount est un logiciel de gestion de comptes personnels délivré sous licenc La version actuelle est 0.2 -wxWidgets 2.8 et sqlite3 sont nécessaires +wxWidgets 2.8, sqlite3, libofx et libxml2 sont nécessaires Une version modifiée de wxFreeChart est utilisée : attention à lors de la recompilation à ne pas écraser les fichiers des autotools (pas de ./configure) diff --git a/src/view/AccountPanel.cpp b/src/view/AccountPanel.cpp index c9fe1a5..f0f5304 100644 --- a/src/view/AccountPanel.cpp +++ b/src/view/AccountPanel.cpp @@ -123,7 +123,7 @@ AccountPanel::AccountPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, pare chart->Fit(); chart->Layout(); chart->SetMinSize(// chart->GetSize() - wxSize(200,250)); + wxSize(200,300)); wxString modes[3] = {_("Virtual"), _("Real"), _("Check")}; _radioMode = new wxRadioBox(this, DISPLAY_MODE_ID, _("Mode"), wxDefaultPosition, wxDefaultSize, @@ -139,6 +139,7 @@ AccountPanel::AccountPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, pare vbox3->Add(buttonUpdateNextMonths, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 10); vbox3->Add(buttonGroup, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 10); vbox3->Add(buttonUnGroup, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 10); + vbox3->Add(_radioMode, 0, wxALIGN_CENTER_HORIZONTAL|wxUP, 50); hbox->Add(vbox3, 0, wxGROW|wxALL, 2); hbox2->Add(_accountsGrid, 0, wxGROW|wxALL, 2); @@ -148,7 +149,6 @@ AccountPanel::AccountPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, pare hbox->Add(vbox2, 0, wxGROW|wxALL, 2); vbox->Add(_statsGrid, 0, wxGROW); vbox->Add(chart, 0, wxALIGN_CENTER_HORIZONTAL|wxUP, 10); - vbox->Add(_radioMode, 0, wxALIGN_CENTER_HORIZONTAL|wxUP, 10); hbox->Add(vbox, 0, wxGROW|wxALL, 2); ChangeUser(); diff --git a/src/view/StatsPanel.cpp b/src/view/StatsPanel.cpp index 023642c..72b35f3 100644 --- a/src/view/StatsPanel.cpp +++ b/src/view/StatsPanel.cpp @@ -134,14 +134,14 @@ StatsPanel::StatsPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, parent), chart->SetMinSize(// chart->GetSize() wxSize(200,250)); - _vbox2->Add(chart, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW|wxALL, 10); - vbox->Add(hbox, 0, wxALIGN_CENTER_VERTICAL|wxGROW|wxALL, 5); vbox->Add(_hbox2, 0, wxGROW|wxALL, 5); wxCommandEvent event ; OnRangeChange(event); + _hbox2->Add(chart, 0, wxGROW|wxALL, 10); + Fit(); }