# HG changeset patch
# User re...@rendy-e8400
# Date 1239178553 -7200
# Node ID 8f1b155d970c362415c3ff9d513bbfeff777a591
# Parent 7358dbcbb50a637143489677138d096b5fe1ec54
saving profiles with non-ascii characters
diff -r 7358dbcbb50a -r 8f1b155d970c
wengophone/src/presentation/qt/login/QtAddSIPAccount.cpp
--- a/wengophone/src/presentation/qt/login/QtAddSIPAccount.cpp Mon Apr 06
17:09:20 2009 +0200
+++ b/wengophone/src/presentation/qt/login/QtAddSIPAccount.cpp Wed Apr 08
10:15:53 2009 +0200
@@ -78,7 +78,7 @@
void QtAddSIPAccount::loginClicked() {
Config & config = ConfigManager::getInstance().getCurrentConfig();
- std::string accountname = _ui->accountname->text().toStdString();
+ std::string accountname(_ui->accountname->text().toLocal8Bit());
if (profileNameExists(accountname)) {
//checks if profile name exists
setErrorMessage(tr("Your profile name already exists!"));
@@ -88,7 +88,7 @@
std::string login = _ui->login->text().trimmed().toStdString();
std::string password = _ui->password->text().trimmed().toStdString();
std::string realm = _ui->realm->text().trimmed().toStdString();
- std::string displayname = _ui->displayname->text().toStdString();
+ std::string displayname(_ui->displayname->text().toLocal8Bit());
std::string registerServer =
_ui->registerServer->text().trimmed().toStdString();
int registerPort = config.getSipRegisterPort();
std::string proxyServer =
_ui->proxyServer->text().trimmed().toStdString();
@@ -175,12 +175,14 @@
_ui->login->setText(QString::fromStdString(sipAccount.getIdentity()));
_ui->password->setText(QString::fromStdString(sipAccount.getPassword()));
_ui->realm->setText(QString::fromStdString(sipAccount.getRealm()));
-
_ui->displayname->setText(QString::fromStdString(sipAccount.getDisplayName()));
+
//_ui->displayname->setText(QString::fromStdString(sipAccount.getDisplayName()));
+
_ui->displayname->setText(QString::fromLocal8Bit(sipAccount.getDisplayName().c_str()));
_ui->registerServer->setText(QString::fromStdString(sipAccount.getRegisterServerHostname()));
_ui->proxyServer->setText(QString::fromStdString(sipAccount.getSIPProxyServerHostname()));
//_ui->registerPort->setText(QString::number(sipAccount.getRegisterServerPort()));
_ui->proxyPort->setText(QString::number(sipAccount.getSIPProxyServerPort()));
-
_ui->accountname->setText(QString::fromStdString(sipAccount.getVisibleName()));
+
//_ui->accountname->setText(QString::fromStdString(sipAccount.getVisibleName()));
+
_ui->accountname->setText(QString::fromLocal8Bit(sipAccount.getVisibleName().c_str()));
_ui->activateSIMPLE->setChecked(sipAccount.isPIMEnabled());
_accountName = sipAccount.getFullIdentity();
_visibleName = sipAccount.getVisibleName();
@@ -204,12 +206,14 @@
_ui->login->setText(QString::fromStdString(sipAccount->getIdentity()));
_ui->password->setText(QString::fromStdString(sipAccount->getPassword()));
_ui->realm->setText(QString::fromStdString(sipAccount->getRealm()));
-
_ui->displayname->setText(QString::fromStdString(sipAccount->getDisplayName()));
+
//_ui->displayname->setText(QString::fromStdString(sipAccount->getDisplayName()));
+
_ui->displayname->setText(QString::fromLocal8Bit(sipAccount->getDisplayName().c_str()));
_ui->registerServer->setText(QString::fromStdString(sipAccount->getRegisterServerHostname()));
_ui->proxyServer->setText(QString::fromStdString(sipAccount->getSIPProxyServerHostname()));
//_ui->registerPort->setText(QString::number(sipAccount->getRegisterServerPort()));
_ui->proxyPort->setText(QString::number(sipAccount->getSIPProxyServerPort()));
-
_ui->accountname->setText(QString::fromStdString(sipAccount->getVisibleName()));
+
//_ui->accountname->setText(QString::fromStdString(sipAccount->getVisibleName()));
+
_ui->accountname->setText(QString::fromLocal8Bit(sipAccount->getVisibleName().c_str()));
_ui->activateSIMPLE->setChecked(sipAccount->isPIMEnabled());
_accountName = sipAccount->getFullIdentity();
_visibleName = sipAccount->getVisibleName();
diff -r 7358dbcbb50a -r 8f1b155d970c
wengophone/src/presentation/qt/login/QtLogAccount.cpp
--- a/wengophone/src/presentation/qt/login/QtLogAccount.cpp Mon Apr 06
17:09:20 2009 +0200
+++ b/wengophone/src/presentation/qt/login/QtLogAccount.cpp Wed Apr 08
10:15:53 2009 +0200
@@ -125,7 +125,7 @@
//finds and displays visible name,
saves real userprofile name
tmpname = sipaccount->getVisibleName();
profileMap[tmpname] = (*it);
-
_ui->accountComboBox->addItem(QString::fromStdString(tmpname));
+
_ui->accountComboBox->addItem(QString::fromLocal8Bit(tmpname.c_str()));
//finds last used index
if ((*it)==lastUsed) {
@@ -137,7 +137,7 @@
////
//default value
-
_ui->accountComboBox->setCurrentIndex(_ui->accountComboBox->findText(QString::fromStdString(lastUsedIndex)));
+
_ui->accountComboBox->setCurrentIndex(_ui->accountComboBox->findText(QString::fromLocal8Bit(lastUsedIndex.c_str())));
currentIndexChanged(QString::fromStdString(lastUsedIndex));
SAFE_CONNECT(_ui->accountComboBox,
SIGNAL(currentIndexChanged(const QString &)),
@@ -155,7 +155,7 @@
void QtLogAccount::currentIndexChanged(const QString & profileName) {
UserProfile userProfile;
- if
(_cUserProfileHandler.getUserProfileHandler().LoadUserProfileFromName(&userProfile,
profileMap[profileName.toStdString()])) {
+ if
(_cUserProfileHandler.getUserProfileHandler().LoadUserProfileFromName(&userProfile,
profileMap[std::string(profileName.toLocal8Bit())])) {
SipAccount * sipaccount = userProfile.getSipAccount();
if (sipaccount) {
if (sipaccount->isPasswordRemembered()) {
@@ -171,7 +171,7 @@
void QtLogAccount::loginClicked() {
- std::string login = profileMap[
_ui->accountComboBox->currentText().toStdString() ];
+ std::string login = profileMap[
std::string(_ui->accountComboBox->currentText().toLocal8Bit()) ];
/*** et le password !! ***/
if (!login.empty()) {
@@ -190,7 +190,7 @@
void QtLogAccount::modifyClicked() {
- std::string login = profileMap[
_ui->accountComboBox->currentText().toStdString() ];
+ std::string login = profileMap[
std::string(_ui->accountComboBox->currentText().toLocal8Bit()) ];
if (!login.empty()) {
@@ -218,7 +218,7 @@
}
void QtLogAccount::deleteClicked() {
- std::string login = profileMap[
_ui->accountComboBox->currentText().toStdString() ];
+ std::string login = profileMap[
std::string(_ui->accountComboBox->currentText().toLocal8Bit()) ];
if (!login.empty()){
if (_cUserProfileHandler.userProfileExists(login)){
diff -r 7358dbcbb50a -r 8f1b155d970c
wengophone/src/presentation/qt/profilebar/QtProfileBar.cpp
--- a/wengophone/src/presentation/qt/profilebar/QtProfileBar.cpp Mon Apr
06 17:09:20 2009 +0200
+++ b/wengophone/src/presentation/qt/profilebar/QtProfileBar.cpp Wed Apr
08 10:15:53 2009 +0200
@@ -467,7 +467,7 @@
void QtProfileBar::phoneLineCreatedEventSlot() {
if(_cUserProfile)
{
- _nicknameLabel->setText(" " +
QString::fromStdString(_cUserProfile->getUserProfile().getSipAccount()->getDisplayName()));
+ _nicknameLabel->setText(" " +
QString::fromLocal8Bit(_cUserProfile->getUserProfile().getSipAccount()->getDisplayName().c_str()));
}
}
_______________________________________________
QuteCom-dev mailing list
[email protected]
http://lists.qutecom.org/mailman/listinfo/qutecom-dev
