From 68779c43c8d57cb784a41163f9250a409e25931a Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Thu, 9 Jul 2015 16:53:03 -0400
Subject: [PATCH] ring: set displayName for Ring account
Refs #77362
Change-Id: I87497043225d1c4f9fde3c6afe92ddc24bc19c5e
---
callwidget.cpp | 9 ++++++---
wizarddialog.cpp | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/callwidget.cpp b/callwidget.cpp
index 34e2370..ee4dd34 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -138,7 +138,7 @@ CallWidget::findRingAccount(QModelIndex idx1, QModelIndex idx2, QVector<int> vec
if ((Account::Protocol)protocol.toUInt() == Account::Protocol::RING) {
auto username = idx.data(static_cast<int>(Account::Role::Username));
ui->ringIdLabel->setText(
- "Your Ring ID: " + username.toString());
+ "Your Ring ID: " + username.toString());
found = true;
return;
}
@@ -203,9 +203,12 @@ CallWidget::findRingAccount()
auto idx = AccountModel::instance()->index(i, 0);
auto protocol = idx.data(static_cast<int>(Account::Role::Proto));
if ((Account::Protocol)protocol.toUInt() == Account::Protocol::RING) {
- auto username = idx.data(static_cast<int>(Account::Role::Username));
+ auto account = AccountModel::instance()->getAccountByModelIndex(idx);
+ if (account->displayName().isEmpty())
+ account->displayName() = account->alias();
+ auto username = account->username();
ui->ringIdLabel->setText(
- ui->ringIdLabel->text() + " " + username.toString());
+ "Your Ring ID: " + username);
found = true;
return;
}
diff --git a/wizarddialog.cpp b/wizarddialog.cpp
index 112c9a8..5f73ef6 100644
--- a/wizarddialog.cpp
+++ b/wizarddialog.cpp
@@ -67,6 +67,7 @@ WizardDialog::accept()
Utils::CreateStartupLink();
auto account = AccountModel::instance()->add(ui->usernameEdit->text(), Account::Protocol::RING);
+ account->setDisplayName(ui->usernameEdit->text());
AccountModel::instance()->ip2ip()->setRingtonePath(Utils::GetRingtonePath());
account->setRingtonePath(Utils::GetRingtonePath());
account->setUpnpEnabled(true);
--
GitLab