diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp index e807d0c..4e122da 100644 --- a/src/controller/KissCount.cpp +++ b/src/controller/KissCount.cpp @@ -30,8 +30,7 @@ std::vector * KissCount::_exportEngines; KissCount::KissCount(int& argc, char** argv) : QApplication(argc, argv), _user(0) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf8")); - QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8")); + QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf8")); _wxUI = new wxUI(this, "KissCount"); @@ -417,7 +416,7 @@ void KissCount::KillMe() void KissCount::SetLanguage(QString language) { - _user->_preferences["language"] = language; + _user->SetLanguage(language); _db->UpdatePreference(_user, "language"); } diff --git a/src/model/User.cpp b/src/model/User.cpp index 804687a..f1a7982 100644 --- a/src/model/User.cpp +++ b/src/model/User.cpp @@ -312,6 +312,21 @@ QString User::GetLanguage() // return (wxLanguage)val; } +void User::SetLanguage(QString language) +{ + _preferences["language"] = language; +} + +int User::GetDefaultCurrency() +{ + return _preferences["defaultCurrency"].toInt(); +} + +void User::SetDefaultCurrency(int currency) +{ + _preferences["defaultCurrency"] = QString(currency); +} + void User::LinkOrUnlinkOperation(Operation& op) { std::vector::iterator it; diff --git a/src/model/User.hpp b/src/model/User.hpp index a1886e4..d6abf3d 100644 --- a/src/model/User.hpp +++ b/src/model/User.hpp @@ -88,7 +88,11 @@ public: int GetOperationsNumber(int month, int year); QString GetLanguage(); + void SetLanguage(QString language); + int GetDefaultCurrency(); + void SetDefaultCurrency(int currency); + void LinkOrUnlinkOperation(Operation& op); void Group(const Operation& op); diff --git a/src/view/wxUI.cpp b/src/view/wxUI.cpp index 0a25f9f..e43a24e 100644 --- a/src/view/wxUI.cpp +++ b/src/view/wxUI.cpp @@ -240,7 +240,7 @@ void wxUI::LoadUser() User* user = _kiss->GetUser(); int i; - if (user->_preferences["language"].size()) + if (user->GetLanguage().size()) SetLanguage(user->GetLanguage()); else SetLanguage(SupportedLanguages::languages[0].name);