Fix a bug with passwords

Fix a bug in search (wildcards)
Fix a bug in wxUI (tooltips not translated)
Update translation
Update TODO
This commit is contained in:
2010-08-29 09:29:34 +02:00
parent ceb942e3ee
commit 41617afc10
10 changed files with 50 additions and 31 deletions

View File

@@ -44,14 +44,6 @@ ButtonPanel::ButtonPanel(KissCount* kiss, wxUI *parent) : wxPanel(&(*parent)), _
SetSizer(hbox);
_account->SetToolTip(_("Operations"));
_stats->SetToolTip(_("Statistics"));
_search->SetToolTip(_("Search"));
_prefs->SetToolTip(_("Preferences"));
_changeUser->SetToolTip(_("Change user"));
_about->SetToolTip(_("About"));
_quit->SetToolTip(_("Quit"));
hbox->Add(_account);
hbox->Add(_stats);
hbox->Add(_search);
@@ -72,6 +64,17 @@ ButtonPanel::~ButtonPanel()
delete _changeUser;
}
void ButtonPanel::SetToolTips()
{
_account->SetToolTip(_("Operations"));
_stats->SetToolTip(_("Statistics"));
_search->SetToolTip(_("Search"));
_prefs->SetToolTip(_("Preferences"));
_changeUser->SetToolTip(_("Change user"));
_about->SetToolTip(_("About"));
_quit->SetToolTip(_("Quit"));
}
void ButtonPanel::OnButtonAccount(wxCommandEvent& event)
{
_wxUI->ShowAccount();

View File

@@ -38,6 +38,8 @@ public:
ButtonPanel(KissCount* kiss, wxUI *parent);
~ButtonPanel();
void SetToolTips();
void OnButtonAccount(wxCommandEvent& event);
void OnButtonStats(wxCommandEvent& event);
void OnButtonSearch(wxCommandEvent& event);

View File

@@ -34,11 +34,11 @@ wxColour categoryColors[12] = {wxColour(0x00, 0x45, 0x86),
wxColour(0x00, 0x84, 0xD1)};
wxUI::wxUI(KissCount* kiss, const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame(NULL, wxID_ANY, title, pos, size), _kiss(kiss), _accountPanel(NULL), _statsPanel(NULL),
: wxFrame(NULL, wxID_ANY, title, pos, size), _kiss(kiss), _buttonPanel(NULL), _accountPanel(NULL), _statsPanel(NULL),
_searchPanel(NULL), _preferencesPanel(NULL), _curPanel(NULL), _locale(NULL), _needReload(false)
{
_hbox = new wxBoxSizer(wxVERTICAL);
ButtonPanel* buttons = new ButtonPanel(_kiss, this);
_buttonPanel = new ButtonPanel(_kiss, this);
// wxMenu *menuFile = new wxMenu;
// menuFile->Append( ID_About, wxT("&About...") );
@@ -55,7 +55,7 @@ wxUI::wxUI(KissCount* kiss, const wxString& title, const wxPoint& pos, const wxS
SetSizer(_hbox);
_hbox->Add(buttons);
_hbox->Add(_buttonPanel);
}
wxUI::~wxUI()
@@ -117,6 +117,9 @@ bool wxUI::SetLanguage(long language)
months[10] = _("november");
months[11] = _("december") ;
if (_buttonPanel)
_buttonPanel->SetToolTips();
return res;
}

View File

@@ -31,6 +31,7 @@
#include <controller/KissCount.h>
class KissCount;
class ButtonPanel;
class AccountPanel;
class PreferencesPanel;
class StatsPanel;
@@ -66,6 +67,7 @@ public:
private:
KissCount *_kiss;
wxBoxSizer *_hbox;
ButtonPanel *_buttonPanel;
AccountPanel *_accountPanel;
StatsPanel *_statsPanel;
SearchPanel *_searchPanel;