diff --git a/callwidget.cpp b/callwidget.cpp index 34e23705d1d0eb0ceeb0fcc34b1644cb6ac4e270..ee4dd34097c47e5a5cb2fc0779cf94cfa0c6ad8e 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 112c9a8bcd7c8047cb7ee29a5b1ba49579644084..5f73ef65b90983aae1e63d8b4a23ed875f6c2df6 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);