Skip to content
Snippets Groups Projects
Commit 36e9b93a authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Andreas Traczyk
Browse files

client-windows: remove std::string to adapt new lrc 

Change-Id: I511c0b7bf3ef4a576303beca1c42d46ad76bc0fb
parent 5404caf6
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 244 additions and 259 deletions
src/accountlistmodel.cpp
+ 3
− 3
View file @ 36e9b93a
...@@ -60,9 +60,9 @@ QVariant AccountListModel::data(const QModelIndex &index, int role) const ...@@ -60,9 +60,9 @@ QVariant AccountListModel::data(const QModelIndex &index, int role) const
switch (role) { switch (role) {
case Role::Alias: case Role::Alias:
case Qt::DisplayRole: case Qt::DisplayRole:
return QVariant(QString::fromStdString(Utils::bestNameForAccount(accountInfo))); return QVariant(Utils::bestNameForAccount(accountInfo));
case Role::Username: case Role::Username:
return QVariant(QString::fromStdString(Utils::secondBestNameForAccount(accountInfo))); return QVariant(Utils::secondBestNameForAccount(accountInfo));
case Role::Type: case Role::Type:
return QVariant(Utils::toUnderlyingValue<lrc::api::profile::Type>(accountInfo.profileInfo.type)); return QVariant(Utils::toUnderlyingValue<lrc::api::profile::Type>(accountInfo.profileInfo.type));
case Role::Status: case Role::Status:
...@@ -71,7 +71,7 @@ QVariant AccountListModel::data(const QModelIndex &index, int role) const ...@@ -71,7 +71,7 @@ QVariant AccountListModel::data(const QModelIndex &index, int role) const
case Qt::DecorationRole: case Qt::DecorationRole:
return Utils::accountPhoto(accountInfo); return Utils::accountPhoto(accountInfo);
case Role::ID: case Role::ID:
return QVariant(QString::fromStdString(accountInfo.id)); return QVariant(accountInfo.id);
} }
return QVariant(); return QVariant();
} }
... ...
......
src/accountmigrationdialog.cpp
+ 9
− 9
View file @ 36e9b93a
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <QTimer> #include <QTimer>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const std::string& accountId) : AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const QString& accountId) :
QDialog(parent), QDialog(parent),
ui(new Ui::AccountMigrationDialog), ui(new Ui::AccountMigrationDialog),
accountId_(accountId) accountId_(accountId)
...@@ -32,10 +32,10 @@ AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const std::strin ...@@ -32,10 +32,10 @@ AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const std::strin
auto& avatarInfo = LRCInstance::accountModel().getAccountInfo(accountId_); auto& avatarInfo = LRCInstance::accountModel().getAccountInfo(accountId_);
auto managerUsername = QString::fromStdString(avatarInfo.confProperties.managerUsername); auto managerUsername = avatarInfo.confProperties.managerUsername;
auto managerUri = QString::fromStdString(avatarInfo.confProperties.managerUri); auto managerUri = avatarInfo.confProperties.managerUri;
auto username = QString::fromStdString(avatarInfo.confProperties.username); auto username = avatarInfo.confProperties.username;
auto alias = QString::fromStdString(LRCInstance::accountModel().getAccountInfo(accountId_).profileInfo.alias); auto alias = LRCInstance::accountModel().getAccountInfo(accountId_).profileInfo.alias;
// manager uri // manager uri
if (!managerUri.isEmpty()) { if (!managerUri.isEmpty()) {
...@@ -51,7 +51,7 @@ AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const std::strin ...@@ -51,7 +51,7 @@ AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const std::strin
if (!username.isEmpty()) { if (!username.isEmpty()) {
ui->usernameInputLabel->setText(username); ui->usernameInputLabel->setText(username);
} else { } else {
if (avatarInfo.confProperties.managerUsername.empty()) { if (avatarInfo.confProperties.managerUsername.isEmpty()) {
ui->usernameLabel->hide(); ui->usernameLabel->hide();
ui->usernameInputLabel->hide(); ui->usernameInputLabel->hide();
ui->gridLayout->removeWidget(ui->usernameInputLabel); ui->gridLayout->removeWidget(ui->usernameInputLabel);
...@@ -85,7 +85,7 @@ AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const std::strin ...@@ -85,7 +85,7 @@ AccountMigrationDialog::AccountMigrationDialog(QWidget *parent, const std::strin
} else { } else {
ui->migrationPushButton->setDisabled(false); ui->migrationPushButton->setDisabled(false);
} }
password_ = text.toStdString(); password_ = text;
}); });
ui->migrationPushButton->setDisabled(true); ui->migrationPushButton->setDisabled(true);
...@@ -104,7 +104,7 @@ AccountMigrationDialog::~AccountMigrationDialog() ...@@ -104,7 +104,7 @@ AccountMigrationDialog::~AccountMigrationDialog()
void void
AccountMigrationDialog::slotPasswordEditingFinished() AccountMigrationDialog::slotPasswordEditingFinished()
{ {
password_ = ui->passwordInputLineEdit->text().toStdString(); password_ = ui->passwordInputLineEdit->text();
} }
void void
...@@ -121,7 +121,7 @@ AccountMigrationDialog::slotMigrationButtonClicked() ...@@ -121,7 +121,7 @@ AccountMigrationDialog::slotMigrationButtonClicked()
migrationSpinnerMovie_->start(); migrationSpinnerMovie_->start();
connect(&LRCInstance::accountModel(), &lrc::api::NewAccountModel::migrationEnded, connect(&LRCInstance::accountModel(), &lrc::api::NewAccountModel::migrationEnded,
[this](const std::string& accountId, bool ok) { [this](const QString& accountId, bool ok) {
if (accountId_ != accountId) { if (accountId_ != accountId) {
return; return;
} }
... ...
......
src/accountmigrationdialog.h
+ 3
− 3
View file @ 36e9b93a
...@@ -34,14 +34,14 @@ class AccountMigrationDialog : public QDialog ...@@ -34,14 +34,14 @@ class AccountMigrationDialog : public QDialog
public: public:
explicit AccountMigrationDialog(QWidget *parent = 0, const std::string& accountId = {}); explicit AccountMigrationDialog(QWidget *parent = 0, const QString& accountId = {});
~AccountMigrationDialog(); ~AccountMigrationDialog();
private: private:
Ui::AccountMigrationDialog *ui; Ui::AccountMigrationDialog *ui;
std::string accountId_; QString accountId_;
std::string password_; QString password_;
QMovie* migrationSpinnerMovie_; QMovie* migrationSpinnerMovie_;
private slots: private slots:
... ...
......
src/advancedsettingswidget.cpp
+ 35
− 35
View file @ 36e9b93a
...@@ -113,26 +113,26 @@ AdvancedSettingsWidget::updateAdvancedSettings() ...@@ -113,26 +113,26 @@ AdvancedSettingsWidget::updateAdvancedSettings()
ui->checkBoxCustomRingtone->setChecked(config.Ringtone.ringtoneEnabled); ui->checkBoxCustomRingtone->setChecked(config.Ringtone.ringtoneEnabled);
// Name Server // Name Server
ui->lineEditNameServer->setText(QString::fromStdString(config.RingNS.uri)); ui->lineEditNameServer->setText(config.RingNS.uri);
//OpenDHT Config //OpenDHT Config
ui->checkBoxEnableProxy->setChecked(config.proxyEnabled); ui->checkBoxEnableProxy->setChecked(config.proxyEnabled);
ui->lineEditProxy->setText(QString::fromStdString(config.proxyServer)); ui->lineEditProxy->setText(config.proxyServer);
ui->lineEditBootstrap->setText(QString::fromStdString(config.hostname)); ui->lineEditBootstrap->setText(config.hostname);
// Security // Security
ui->btnCACert->setText(QFileInfo(QString::fromStdString(LRCInstance::getCurrAccConfig().TLS.certificateListFile)).fileName()); ui->btnCACert->setText(QFileInfo(LRCInstance::getCurrAccConfig().TLS.certificateListFile).fileName());
ui->btnUserCert->setText(QFileInfo(QString::fromStdString(LRCInstance::getCurrAccConfig().TLS.certificateFile)).fileName()); ui->btnUserCert->setText(QFileInfo(LRCInstance::getCurrAccConfig().TLS.certificateFile).fileName());
ui->btnPrivateKey->setText(QFileInfo(QString::fromStdString(LRCInstance::getCurrAccConfig().TLS.privateKeyFile)).fileName()); ui->btnPrivateKey->setText(QFileInfo(LRCInstance::getCurrAccConfig().TLS.privateKeyFile).fileName());
// Connectivity // Connectivity
ui->checkBoxUPnP->setChecked(config.upnpEnabled); ui->checkBoxUPnP->setChecked(config.upnpEnabled);
ui->checkBoxTurnEnable->setChecked(config.TURN.enable); ui->checkBoxTurnEnable->setChecked(config.TURN.enable);
ui->lineEditTurnAddress->setText(QString::fromStdString(config.TURN.server)); ui->lineEditTurnAddress->setText(config.TURN.server);
ui->lineEditTurnUsername->setText(QString::fromStdString(config.TURN.username)); ui->lineEditTurnUsername->setText(config.TURN.username);
ui->lineEditTurnPassword->setText(QString::fromStdString(config.TURN.password)); ui->lineEditTurnPassword->setText(config.TURN.password);
ui->checkBoxSTUNEnable->setChecked(config.STUN.enable); ui->checkBoxSTUNEnable->setChecked(config.STUN.enable);
ui->lineEditSTUNAddress->setText(QString::fromStdString(config.STUN.server)); ui->lineEditSTUNAddress->setText(config.STUN.server);
// codecs // codecs
ui->videoCheckBox->setChecked(config.Video.videoEnabled); ui->videoCheckBox->setChecked(config.Video.videoEnabled);
...@@ -144,7 +144,7 @@ AdvancedSettingsWidget::updateAdvancedSettings() ...@@ -144,7 +144,7 @@ AdvancedSettingsWidget::updateAdvancedSettings()
connect(ui->videoListWidget, &QListWidget::itemChanged, this, &AdvancedSettingsWidget::videoCodecsStateChange); connect(ui->videoListWidget, &QListWidget::itemChanged, this, &AdvancedSettingsWidget::videoCodecsStateChange);
ui->btnRingtone->setEnabled(LRCInstance::getCurrAccConfig().Ringtone.ringtoneEnabled); ui->btnRingtone->setEnabled(LRCInstance::getCurrAccConfig().Ringtone.ringtoneEnabled);
ui->btnRingtone->setText(QFileInfo(QString::fromStdString(LRCInstance::getCurrAccConfig().Ringtone.ringtonePath)).fileName()); ui->btnRingtone->setText(QFileInfo(LRCInstance::getCurrAccConfig().Ringtone.ringtonePath).fileName());
ui->lineEditProxy->setEnabled(LRCInstance::getCurrAccConfig().proxyEnabled); ui->lineEditProxy->setEnabled(LRCInstance::getCurrAccConfig().proxyEnabled);
ui->lineEditSTUNAddress->setEnabled(LRCInstance::getCurrAccConfig().STUN.enable); ui->lineEditSTUNAddress->setEnabled(LRCInstance::getCurrAccConfig().STUN.enable);
} }
...@@ -176,12 +176,12 @@ void ...@@ -176,12 +176,12 @@ void
AdvancedSettingsWidget::openFileCustomRingtone() AdvancedSettingsWidget::openFileCustomRingtone()
{ {
QString fileUrl; QString fileUrl;
auto oldPath = QString::fromStdString(LRCInstance::getCurrAccConfig().Ringtone.ringtonePath); auto oldPath = LRCInstance::getCurrAccConfig().Ringtone.ringtonePath;
auto openPath = oldPath.isEmpty() ? QDir::currentPath() + QString("/ringtones/") : QFileInfo(oldPath).absolutePath(); auto openPath = oldPath.isEmpty() ? QDir::currentPath() + QString("/ringtones/") : QFileInfo(oldPath).absolutePath();
fileUrl = QFileDialog::getOpenFileName(this, QString("Select a new ringtone"), openPath, tr("Audio Files") + " (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)"); fileUrl = QFileDialog::getOpenFileName(this, QString("Select a new ringtone"), openPath, tr("Audio Files") + " (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)");
if (!fileUrl.isEmpty()) { if (!fileUrl.isEmpty()) {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.Ringtone.ringtonePath = fileUrl.toStdString(); confProps.Ringtone.ringtonePath = fileUrl;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
ui->btnRingtone->setText(QFileInfo(fileUrl).fileName()); ui->btnRingtone->setText(QFileInfo(fileUrl).fileName());
} else if (oldPath.isEmpty()) { } else if (oldPath.isEmpty()) {
...@@ -195,7 +195,7 @@ AdvancedSettingsWidget::setNameServer() ...@@ -195,7 +195,7 @@ AdvancedSettingsWidget::setNameServer()
{ {
auto text = ui->lineEditNameServer->text(); auto text = ui->lineEditNameServer->text();
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.RingNS.uri = text.toStdString(); confProps.RingNS.uri = text;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
...@@ -214,7 +214,7 @@ AdvancedSettingsWidget::setProxyAddress() ...@@ -214,7 +214,7 @@ AdvancedSettingsWidget::setProxyAddress()
{ {
auto text = ui->lineEditProxy->text(); auto text = ui->lineEditProxy->text();
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.proxyServer = text.toStdString(); confProps.proxyServer = text;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
void void
...@@ -222,7 +222,7 @@ AdvancedSettingsWidget::setBootstrapAddress() ...@@ -222,7 +222,7 @@ AdvancedSettingsWidget::setBootstrapAddress()
{ {
auto text = ui->lineEditBootstrap->text(); auto text = ui->lineEditBootstrap->text();
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.hostname = text.toStdString(); confProps.hostname = text;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
...@@ -258,7 +258,7 @@ AdvancedSettingsWidget::setTURNAddress() ...@@ -258,7 +258,7 @@ AdvancedSettingsWidget::setTURNAddress()
{ {
auto text = ui->lineEditTurnAddress->text(); auto text = ui->lineEditTurnAddress->text();
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TURN.server = text.toStdString(); confProps.TURN.server = text;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
void void
...@@ -266,7 +266,7 @@ AdvancedSettingsWidget::setTURNUsername() ...@@ -266,7 +266,7 @@ AdvancedSettingsWidget::setTURNUsername()
{ {
auto text = ui->lineEditTurnUsername->text(); auto text = ui->lineEditTurnUsername->text();
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TURN.username = text.toStdString(); confProps.TURN.username = text;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
void void
...@@ -274,7 +274,7 @@ AdvancedSettingsWidget::setTURNPassword() ...@@ -274,7 +274,7 @@ AdvancedSettingsWidget::setTURNPassword()
{ {
auto text = ui->lineEditTurnPassword->text(); auto text = ui->lineEditTurnPassword->text();
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TURN.password = text.toStdString(); confProps.TURN.password = text;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
void void
...@@ -282,7 +282,7 @@ AdvancedSettingsWidget::setSTUNAddress() ...@@ -282,7 +282,7 @@ AdvancedSettingsWidget::setSTUNAddress()
{ {
auto text = ui->lineEditSTUNAddress->text(); auto text = ui->lineEditSTUNAddress->text();
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.STUN.server = text.toStdString(); confProps.STUN.server = text;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
...@@ -291,13 +291,13 @@ AdvancedSettingsWidget::openFileCACert() ...@@ -291,13 +291,13 @@ AdvancedSettingsWidget::openFileCACert()
{ {
QString fileUrl; QString fileUrl;
fileUrl = QFileDialog::getOpenFileName(this, QString("Select a CA certificate"), QDir::homePath() fileUrl = QFileDialog::getOpenFileName(this, QString("Select a CA certificate"), QDir::homePath()
+ QString("/.local/share/ring/") + QString::fromStdString(LRCInstance::getCurrentAccountInfo().id)); + QString("/.local/share/ring/") + LRCInstance::getCurrentAccountInfo().id);
if (!fileUrl.isEmpty()) { if (!fileUrl.isEmpty()) {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TLS.certificateListFile = fileUrl.toStdString(); confProps.TLS.certificateListFile = fileUrl;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
ui->btnCACert->setText(QFileInfo(QString::fromStdString(LRCInstance::getCurrAccConfig().TLS.certificateListFile)).fileName()); ui->btnCACert->setText(QFileInfo(LRCInstance::getCurrAccConfig().TLS.certificateListFile).fileName());
} }
void void
...@@ -305,13 +305,13 @@ AdvancedSettingsWidget::openFileUserCert() ...@@ -305,13 +305,13 @@ AdvancedSettingsWidget::openFileUserCert()
{ {
QString fileUrl; QString fileUrl;
fileUrl = QFileDialog::getOpenFileName(this, QString("Select a user certificate"), QDir::homePath() fileUrl = QFileDialog::getOpenFileName(this, QString("Select a user certificate"), QDir::homePath()
+ QString("/.local/share/ring/") + QString::fromStdString(LRCInstance::getCurrentAccountInfo().id)); + QString("/.local/share/ring/") + LRCInstance::getCurrentAccountInfo().id);
if (!fileUrl.isEmpty()) { if (!fileUrl.isEmpty()) {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TLS.certificateFile = fileUrl.toStdString(); confProps.TLS.certificateFile = fileUrl;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
ui->btnUserCert->setText(QFileInfo(QString::fromStdString(LRCInstance::getCurrAccConfig().TLS.certificateFile)).fileName()); ui->btnUserCert->setText(QFileInfo(LRCInstance::getCurrAccConfig().TLS.certificateFile).fileName());
} }
void void
...@@ -319,13 +319,13 @@ AdvancedSettingsWidget::openFilePrivateKey() ...@@ -319,13 +319,13 @@ AdvancedSettingsWidget::openFilePrivateKey()
{ {
QString fileUrl; QString fileUrl;
fileUrl = QFileDialog::getOpenFileName(this, QString("Select a private key"), QDir::homePath() fileUrl = QFileDialog::getOpenFileName(this, QString("Select a private key"), QDir::homePath()
+ QString("/.local/share/ring/") + QString::fromStdString(LRCInstance::getCurrentAccountInfo().id)); + QString("/.local/share/ring/") + LRCInstance::getCurrentAccountInfo().id);
if (!fileUrl.isEmpty()) { if (!fileUrl.isEmpty()) {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TLS.privateKeyFile = fileUrl.toStdString(); confProps.TLS.privateKeyFile = fileUrl;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
ui->btnPrivateKey->setText(QFileInfo(QString::fromStdString(LRCInstance::getCurrAccConfig().TLS.privateKeyFile)).fileName()); ui->btnPrivateKey->setText(QFileInfo(LRCInstance::getCurrAccConfig().TLS.privateKeyFile).fileName());
} }
void void
...@@ -339,7 +339,7 @@ AdvancedSettingsWidget::updateAudioCodecs() ...@@ -339,7 +339,7 @@ AdvancedSettingsWidget::updateAudioCodecs()
QListWidgetItem* audioItem = new QListWidgetItem(ui->audioListWidget); QListWidgetItem* audioItem = new QListWidgetItem(ui->audioListWidget);
audioItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); audioItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
audioItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked); audioItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked);
audioItem->setData(Qt::DisplayRole, QString::fromStdString(it->name) + " " + QString::fromStdString(it->samplerate) + " Hz"); audioItem->setData(Qt::DisplayRole, it->name + " " + it->samplerate + " Hz");
ui->audioListWidget->addItem(audioItem); ui->audioListWidget->addItem(audioItem);
} }
...@@ -356,7 +356,7 @@ AdvancedSettingsWidget::updateVideoCodecs() ...@@ -356,7 +356,7 @@ AdvancedSettingsWidget::updateVideoCodecs()
QListWidgetItem* videoItem = new QListWidgetItem(ui->videoListWidget); QListWidgetItem* videoItem = new QListWidgetItem(ui->videoListWidget);
videoItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); videoItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
videoItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked); videoItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked);
videoItem->setData(Qt::DisplayRole, QString::fromStdString(it->name)); videoItem->setData(Qt::DisplayRole, it->name);
ui->audioListWidget->addItem(videoItem); ui->audioListWidget->addItem(videoItem);
} }
} }
...@@ -390,7 +390,7 @@ AdvancedSettingsWidget::decreaseAudioCodecPriority() ...@@ -390,7 +390,7 @@ AdvancedSettingsWidget::decreaseAudioCodecPriority()
auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs(); auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs();
auto it = audioCodecList.begin(); auto it = audioCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, false); LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, false);
// swap current item down // swap current item down
...@@ -404,7 +404,7 @@ AdvancedSettingsWidget::increaseAudioCodecPriority() ...@@ -404,7 +404,7 @@ AdvancedSettingsWidget::increaseAudioCodecPriority()
auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs(); auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs();
auto it = audioCodecList.begin(); auto it = audioCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, false); LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, false);
// swap current item up // swap current item up
...@@ -418,7 +418,7 @@ AdvancedSettingsWidget::decreaseVideoCodecPriority() ...@@ -418,7 +418,7 @@ AdvancedSettingsWidget::decreaseVideoCodecPriority()
auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs(); auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs();
auto it = videoCodecList.begin(); auto it = videoCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, true); LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, true);
// swap current item down // swap current item down
...@@ -432,7 +432,7 @@ AdvancedSettingsWidget::increaseVideoCodecPriority() ...@@ -432,7 +432,7 @@ AdvancedSettingsWidget::increaseVideoCodecPriority()
auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs(); auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs();
auto it = videoCodecList.begin(); auto it = videoCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, true); LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, true);
// swap current item up // swap current item up
... ...
......
src/advancedsipsettingwidget.cpp
+ 34
− 34
View file @ 36e9b93a
...@@ -173,10 +173,10 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings() ...@@ -173,10 +173,10 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
ui->enableSDESToggle->setEnabled(config.SRTP.enable); ui->enableSDESToggle->setEnabled(config.SRTP.enable);
ui->fallbackRTPToggle->setEnabled(config.SRTP.enable); ui->fallbackRTPToggle->setEnabled(config.SRTP.enable);
ui->btnSIPCACert->setText(QFileInfo(QString::fromStdString(config.TLS.certificateListFile)).fileName()); ui->btnSIPCACert->setText(QFileInfo(config.TLS.certificateListFile).fileName());
ui->btnSIPUserCert->setText(QFileInfo(QString::fromStdString(config.TLS.certificateFile)).fileName()); ui->btnSIPUserCert->setText(QFileInfo(config.TLS.certificateFile).fileName());
ui->btnSIPPrivateKey->setText(QFileInfo(QString::fromStdString(config.TLS.privateKeyFile)).fileName()); ui->btnSIPPrivateKey->setText(QFileInfo(config.TLS.privateKeyFile).fileName());
ui->lineEditSIPCertPassword->setText(QString::fromStdString(config.TLS.password)); ui->lineEditSIPCertPassword->setText(config.TLS.password);
ui->encryptMediaStreamsToggle->setChecked(config.SRTP.enable); ui->encryptMediaStreamsToggle->setChecked(config.SRTP.enable);
ui->enableSDESToggle->setChecked(config.SRTP.keyExchange == lrc::api::account::KeyExchangeProtocol::SDES); ui->enableSDESToggle->setChecked(config.SRTP.keyExchange == lrc::api::account::KeyExchangeProtocol::SDES);
...@@ -190,7 +190,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings() ...@@ -190,7 +190,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
ui->tlsProtocolComboBox->setCurrentIndex(static_cast<int>(method)); ui->tlsProtocolComboBox->setCurrentIndex(static_cast<int>(method));
connect(ui->tlsProtocolComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &AdvancedSIPSettingsWidget::tlsProtocolComboBoxIndexChanged); connect(ui->tlsProtocolComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &AdvancedSIPSettingsWidget::tlsProtocolComboBoxIndexChanged);
ui->outgoingTLSServerNameLineEdit->setText(QString::fromStdString(config.TLS.serverName)); ui->outgoingTLSServerNameLineEdit->setText(config.TLS.serverName);
ui->negotiationTimeoutSpinBox->setValue(config.TLS.negotiationTimeoutSec); ui->negotiationTimeoutSpinBox->setValue(config.TLS.negotiationTimeoutSec);
connect(ui->negotiationTimeoutSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::negotiationTimeoutSpinBoxValueChanged); connect(ui->negotiationTimeoutSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::negotiationTimeoutSpinBoxValueChanged);
...@@ -198,17 +198,17 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings() ...@@ -198,17 +198,17 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
// Connectivity // Connectivity
ui->checkBoxUPnPSIP->setChecked(config.upnpEnabled); ui->checkBoxUPnPSIP->setChecked(config.upnpEnabled);
ui->checkBoxTurnEnableSIP->setChecked(config.TURN.enable); ui->checkBoxTurnEnableSIP->setChecked(config.TURN.enable);
ui->lineEditTurnAddressSIP->setText(QString::fromStdString(config.TURN.server)); ui->lineEditTurnAddressSIP->setText(config.TURN.server);
ui->lineEditTurnUsernameSIP->setText(QString::fromStdString(config.TURN.username)); ui->lineEditTurnUsernameSIP->setText(config.TURN.username);
ui->lineEditTurnPsswdSIP->setText(QString::fromStdString(config.TURN.password)); ui->lineEditTurnPsswdSIP->setText(config.TURN.password);
ui->lineEditTurnRealmSIP->setText(QString::fromStdString(config.TURN.realm)); ui->lineEditTurnRealmSIP->setText(config.TURN.realm);
ui->lineEditTurnAddressSIP->setEnabled(config.TURN.enable); ui->lineEditTurnAddressSIP->setEnabled(config.TURN.enable);
ui->lineEditTurnUsernameSIP->setEnabled(config.TURN.enable); ui->lineEditTurnUsernameSIP->setEnabled(config.TURN.enable);
ui->lineEditTurnPsswdSIP->setEnabled(config.TURN.enable); ui->lineEditTurnPsswdSIP->setEnabled(config.TURN.enable);
ui->lineEditTurnRealmSIP->setEnabled(config.TURN.enable); ui->lineEditTurnRealmSIP->setEnabled(config.TURN.enable);
ui->checkBoxSTUNEnableSIP->setChecked(config.STUN.enable); ui->checkBoxSTUNEnableSIP->setChecked(config.STUN.enable);
ui->lineEditSTUNAddressSIP->setText(QString::fromStdString(config.STUN.server)); ui->lineEditSTUNAddressSIP->setText(config.STUN.server);
ui->lineEditSTUNAddressSIP->setEnabled(config.STUN.enable); ui->lineEditSTUNAddressSIP->setEnabled(config.STUN.enable);
ui->registrationExpireTimeoutSpinBox->setValue(config.Registration.expire); ui->registrationExpireTimeoutSpinBox->setValue(config.Registration.expire);
...@@ -218,7 +218,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings() ...@@ -218,7 +218,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
// published address // published address
ui->checkBoxCustomAddressPort->setChecked(config.publishedSameAsLocal); ui->checkBoxCustomAddressPort->setChecked(config.publishedSameAsLocal);
ui->lineEditSIPCustomAddress->setText(QString::fromStdString(config.publishedAddress)); ui->lineEditSIPCustomAddress->setText(config.publishedAddress);
ui->customPortSIPSpinBox->setValue(config.publishedPort); ui->customPortSIPSpinBox->setValue(config.publishedPort);
connect(ui->customPortSIPSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::customPortSIPSpinBoxValueChanged); connect(ui->customPortSIPSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::customPortSIPSpinBoxValueChanged);
...@@ -233,7 +233,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings() ...@@ -233,7 +233,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
connect(ui->videoListWidgetSIP, &QListWidget::itemChanged, this, &AdvancedSIPSettingsWidget::videoCodecsStateChange); connect(ui->videoListWidgetSIP, &QListWidget::itemChanged, this, &AdvancedSIPSettingsWidget::videoCodecsStateChange);
ui->btnRingtoneSIP->setEnabled(config.Ringtone.ringtoneEnabled); ui->btnRingtoneSIP->setEnabled(config.Ringtone.ringtoneEnabled);
ui->btnRingtoneSIP->setText(QFileInfo(QString::fromStdString(config.Ringtone.ringtonePath)).fileName()); ui->btnRingtoneSIP->setText(QFileInfo(config.Ringtone.ringtonePath).fileName());
ui->lineEditSTUNAddressSIP->setEnabled(config.STUN.enable); ui->lineEditSTUNAddressSIP->setEnabled(config.STUN.enable);
// SDP session negotiation ports // SDP session negotiation ports
...@@ -248,7 +248,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings() ...@@ -248,7 +248,7 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
connect(ui->videoRTPMaxPortSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::videoRTPMaxPortSpinBoxEditFinished); connect(ui->videoRTPMaxPortSpinBox, &QSpinBox::editingFinished, this, &AdvancedSIPSettingsWidget::videoRTPMaxPortSpinBoxEditFinished);
// voicemail // voicemail
ui->lineEditVoiceMailDialCode->setText(QString::fromStdString(config.mailbox)); ui->lineEditVoiceMailDialCode->setText(config.mailbox);
} }
// call settings // call settings
...@@ -268,13 +268,13 @@ void AdvancedSIPSettingsWidget::setEnableRingtone(bool state) ...@@ -268,13 +268,13 @@ void AdvancedSIPSettingsWidget::setEnableRingtone(bool state)
void AdvancedSIPSettingsWidget::openFileCustomRingtone() void AdvancedSIPSettingsWidget::openFileCustomRingtone()
{ {
QString fileUrl; QString fileUrl;
auto oldPath = QString::fromStdString(LRCInstance::getCurrAccConfig().Ringtone.ringtonePath); auto oldPath = LRCInstance::getCurrAccConfig().Ringtone.ringtonePath;
auto openPath = oldPath.isEmpty() ? QDir::currentPath() + QString("/ringtones/") : QFileInfo(oldPath).absolutePath(); auto openPath = oldPath.isEmpty() ? QDir::currentPath() + QString("/ringtones/") : QFileInfo(oldPath).absolutePath();
fileUrl = QFileDialog::getOpenFileName(this, tr("Select a new ringtone"), openPath, tr("Audio Files") + " (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)"); fileUrl = QFileDialog::getOpenFileName(this, tr("Select a new ringtone"), openPath, tr("Audio Files") + " (*.wav *.ogg *.opus *.mp3 *.aiff *.wma)");
if (!fileUrl.isEmpty()) { if (!fileUrl.isEmpty()) {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.Ringtone.ringtonePath = fileUrl.toStdString(); confProps.Ringtone.ringtonePath = fileUrl;
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
ui->btnRingtoneSIP->setText(QFileInfo(fileUrl).fileName()); ui->btnRingtoneSIP->setText(QFileInfo(fileUrl).fileName());
...@@ -308,21 +308,21 @@ void AdvancedSIPSettingsWidget::setUseSTUN(bool state) ...@@ -308,21 +308,21 @@ void AdvancedSIPSettingsWidget::setUseSTUN(bool state)
void AdvancedSIPSettingsWidget::setTURNAddress() void AdvancedSIPSettingsWidget::setTURNAddress()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TURN.server = ui->lineEditTurnAddressSIP->text().toStdString(); confProps.TURN.server = ui->lineEditTurnAddressSIP->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
void AdvancedSIPSettingsWidget::setTURNUsername() void AdvancedSIPSettingsWidget::setTURNUsername()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TURN.username = ui->lineEditTurnUsernameSIP->text().toStdString(); confProps.TURN.username = ui->lineEditTurnUsernameSIP->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
void AdvancedSIPSettingsWidget::setTURNPassword() void AdvancedSIPSettingsWidget::setTURNPassword()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TURN.password = ui->lineEditTurnPsswdSIP->text().toStdString(); confProps.TURN.password = ui->lineEditTurnPsswdSIP->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
...@@ -330,14 +330,14 @@ void ...@@ -330,14 +330,14 @@ void
AdvancedSIPSettingsWidget::setTURNRealm() AdvancedSIPSettingsWidget::setTURNRealm()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TURN.realm = ui->lineEditTurnRealmSIP->text().toStdString(); confProps.TURN.realm = ui->lineEditTurnRealmSIP->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
void AdvancedSIPSettingsWidget::setSTUNAddress() void AdvancedSIPSettingsWidget::setSTUNAddress()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.STUN.server = ui->lineEditSTUNAddressSIP->text().toStdString(); confProps.STUN.server = ui->lineEditSTUNAddressSIP->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
...@@ -352,7 +352,7 @@ void AdvancedSIPSettingsWidget::updateAudioCodecs() ...@@ -352,7 +352,7 @@ void AdvancedSIPSettingsWidget::updateAudioCodecs()
QListWidgetItem* audioItem = new QListWidgetItem(ui->audioListWidgetSIP); QListWidgetItem* audioItem = new QListWidgetItem(ui->audioListWidgetSIP);
audioItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); audioItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
audioItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked); audioItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked);
audioItem->setData(Qt::DisplayRole, QString::fromStdString(it->name) + " " + QString::fromStdString(it->samplerate) + " Hz"); audioItem->setData(Qt::DisplayRole, it->name + " " + it->samplerate + " Hz");
ui->audioListWidgetSIP->addItem(audioItem); ui->audioListWidgetSIP->addItem(audioItem);
} }
...@@ -370,7 +370,7 @@ void AdvancedSIPSettingsWidget::updateVideoCodecs() ...@@ -370,7 +370,7 @@ void AdvancedSIPSettingsWidget::updateVideoCodecs()
QListWidgetItem* videoItem = new QListWidgetItem(ui->videoListWidgetSIP); QListWidgetItem* videoItem = new QListWidgetItem(ui->videoListWidgetSIP);
videoItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); videoItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
videoItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked); videoItem->setCheckState(it->enabled ? Qt::Checked : Qt::Unchecked);
videoItem->setData(Qt::DisplayRole, QString::fromStdString(it->name) + "\n"); videoItem->setData(Qt::DisplayRole, it->name + "\n");
ui->audioListWidgetSIP->addItem(videoItem); ui->audioListWidgetSIP->addItem(videoItem);
} }
} }
...@@ -401,7 +401,7 @@ void AdvancedSIPSettingsWidget::decreaseAudioCodecPriority() ...@@ -401,7 +401,7 @@ void AdvancedSIPSettingsWidget::decreaseAudioCodecPriority()
auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs(); auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs();
auto it = audioCodecList.begin(); auto it = audioCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, false); LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, false);
// swap current item down // swap current item down
...@@ -414,7 +414,7 @@ void AdvancedSIPSettingsWidget::increaseAudioCodecPriority() ...@@ -414,7 +414,7 @@ void AdvancedSIPSettingsWidget::increaseAudioCodecPriority()
auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs(); auto audioCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getAudioCodecs();
auto it = audioCodecList.begin(); auto it = audioCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, false); LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, false);
updateAudioCodecs(); updateAudioCodecs();
...@@ -428,7 +428,7 @@ void AdvancedSIPSettingsWidget::decreaseVideoCodecPriority() ...@@ -428,7 +428,7 @@ void AdvancedSIPSettingsWidget::decreaseVideoCodecPriority()
auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs(); auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs();
auto it = videoCodecList.begin(); auto it = videoCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, true); LRCInstance::getCurrentAccountInfo().codecModel->decreasePriority(it->id, true);
// swap current item down // swap current item down
...@@ -441,7 +441,7 @@ void AdvancedSIPSettingsWidget::increaseVideoCodecPriority() ...@@ -441,7 +441,7 @@ void AdvancedSIPSettingsWidget::increaseVideoCodecPriority()
auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs(); auto videoCodecList = LRCInstance::getCurrentAccountInfo().codecModel->getVideoCodecs();
auto it = videoCodecList.begin(); auto it = videoCodecList.begin();
advance(it, selectedRow); std::advance(it, selectedRow);
LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, true); LRCInstance::getCurrentAccountInfo().codecModel->increasePriority(it->id, true);
// swap current item up // swap current item up
...@@ -515,7 +515,7 @@ void ...@@ -515,7 +515,7 @@ void
AdvancedSIPSettingsWidget::outgoingTLSServerNameLineEditTextChanged() AdvancedSIPSettingsWidget::outgoingTLSServerNameLineEditTextChanged()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TLS.serverName = ui->outgoingTLSServerNameLineEdit->text().toStdString(); confProps.TLS.serverName = ui->outgoingTLSServerNameLineEdit->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
...@@ -583,19 +583,19 @@ void ...@@ -583,19 +583,19 @@ void
AdvancedSIPSettingsWidget::lineEditSIPCertPasswordLineEditTextChanged() AdvancedSIPSettingsWidget::lineEditSIPCertPasswordLineEditTextChanged()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.TLS.password = ui->lineEditSIPCertPassword->text().toStdString(); confProps.TLS.password = ui->lineEditSIPCertPassword->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
std::string QString
AdvancedSIPSettingsWidget::openButtonFilePath(const std::string& accConfigFilePath, AdvancedSIPSettingsWidget::openButtonFilePath(const QString& accConfigFilePath,
const char* windowTitle, const char* windowTitle,
const char* fileTypeDesp, const char* fileTypeDesp,
const QString& fileTypeFilter, const QString& fileTypeFilter,
QPushButton* button) QPushButton* button)
{ {
QString fileUrl; QString fileUrl;
auto oldPath = QString::fromStdString(accConfigFilePath); auto oldPath = accConfigFilePath;
auto openPath = oldPath.isEmpty() ? QDir::currentPath() : QFileInfo(oldPath).absolutePath(); auto openPath = oldPath.isEmpty() ? QDir::currentPath() : QFileInfo(oldPath).absolutePath();
fileUrl = QFileDialog::getOpenFileName(this, tr(windowTitle), openPath, tr(fileTypeDesp) + fileTypeFilter); fileUrl = QFileDialog::getOpenFileName(this, tr(windowTitle), openPath, tr(fileTypeDesp) + fileTypeFilter);
if (!fileUrl.isEmpty()) { if (!fileUrl.isEmpty()) {
...@@ -603,7 +603,7 @@ AdvancedSIPSettingsWidget::openButtonFilePath(const std::string& accConfigFilePa ...@@ -603,7 +603,7 @@ AdvancedSIPSettingsWidget::openButtonFilePath(const std::string& accConfigFilePa
} else { } else {
button->setText(""); button->setText("");
} }
return fileUrl.toStdString(); return fileUrl;
} }
void void
...@@ -634,7 +634,7 @@ void ...@@ -634,7 +634,7 @@ void
AdvancedSIPSettingsWidget::lineEditSIPCustomAddressLineEditTextChanged() AdvancedSIPSettingsWidget::lineEditSIPCustomAddressLineEditTextChanged()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.publishedAddress = ui->lineEditSIPCustomAddress->text().toStdString(); confProps.publishedAddress = ui->lineEditSIPCustomAddress->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
...@@ -698,7 +698,7 @@ void ...@@ -698,7 +698,7 @@ void
AdvancedSIPSettingsWidget::lineEditVoiceMailDialCodeEditFinished() AdvancedSIPSettingsWidget::lineEditVoiceMailDialCodeEditFinished()
{ {
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.mailbox = ui->lineEditVoiceMailDialCode->text().toStdString(); confProps.mailbox = ui->lineEditVoiceMailDialCode->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
... ...
......
src/advancedsipsettingwidget.h
+ 1
− 1
View file @ 36e9b93a
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
~AdvancedSIPSettingsWidget(); ~AdvancedSIPSettingsWidget();
void updateAdvancedSIPSettings(); void updateAdvancedSIPSettings();
std::string openButtonFilePath(const std::string& accConfigFilePath, QString openButtonFilePath(const QString& accConfigFilePath,
const char* windowTitle, const char* windowTitle,
const char* fileTypeDesp, const char* fileTypeDesp,
const QString& fileTypeFilter, const QString& fileTypeFilter,
... ...
......
src/callaudioonlyavataroverlay.cpp
+ 4
− 4
View file @ 36e9b93a
...@@ -47,11 +47,11 @@ CallAudioOnlyAvatarOverlay::writeAvatarOverlay(const lrc::api::conversation::Inf ...@@ -47,11 +47,11 @@ CallAudioOnlyAvatarOverlay::writeAvatarOverlay(const lrc::api::conversation::Inf
ui->avatarLabel->setPixmap(QPixmap::fromImage(Utils::conversationPhoto(convInfo.uid, LRCInstance::getCurrentAccountInfo()))); ui->avatarLabel->setPixmap(QPixmap::fromImage(Utils::conversationPhoto(convInfo.uid, LRCInstance::getCurrentAccountInfo())));
if (contact.profileInfo.type == lrc::api::profile::Type::SIP) { if (contact.profileInfo.type == lrc::api::profile::Type::SIP) {
ui->nameLabel->setText(QString::fromStdString(contact.profileInfo.uri)); ui->nameLabel->setText(contact.profileInfo.uri);
} else { } else {
std::string name = contact.profileInfo.alias; QString name = contact.profileInfo.alias;
std::string id = contact.registeredName; QString id = contact.registeredName;
ui->nameLabel->setText(QString::fromStdString(name + "\n" + id)); ui->nameLabel->setText(name + "\n" + id);
} }
} }
... ...
......
src/callwidget.cpp
+ 103
− 117
View file @ 36e9b93a
This diff is collapsed.
src/callwidget.h
+ 14
− 14
View file @ 36e9b93a
...@@ -69,7 +69,7 @@ private slots: ...@@ -69,7 +69,7 @@ private slots:
void on_ringContactLineEdit_returnPressed(); void on_ringContactLineEdit_returnPressed();
void settingsButtonClicked(); void settingsButtonClicked();
void showChatView(const QModelIndex& nodeIdx); void showChatView(const QModelIndex& nodeIdx);
void showChatView(const std::string & accountId, const lrc::api::conversation::Info & convInfo); void showChatView(const QString& accountId, const lrc::api::conversation::Info & convInfo);
void setConversationProfileData(const lrc::api::conversation::Info & convInfo); void setConversationProfileData(const lrc::api::conversation::Info & convInfo);
void setupChatView(const lrc::api::conversation::Info& convInfo); void setupChatView(const lrc::api::conversation::Info& convInfo);
void slotAcceptInviteClicked(const QModelIndex& index); void slotAcceptInviteClicked(const QModelIndex& index);
...@@ -77,10 +77,10 @@ private slots: ...@@ -77,10 +77,10 @@ private slots:
void slotIgnoreInviteClicked(const QModelIndex& index); void slotIgnoreInviteClicked(const QModelIndex& index);
void slotCustomContextMenuRequested(const QPoint & pos); void slotCustomContextMenuRequested(const QPoint & pos);
void slotAccountChanged(int index); void slotAccountChanged(int index);
void slotShowCallView(const std::string & accountId, const lrc::api::conversation::Info & convInfo); void slotShowCallView(const QString & accountId, const lrc::api::conversation::Info & convInfo);
void slotShowIncomingCallView(const std::string & accountId, const lrc::api::conversation::Info & convInfo); void slotShowIncomingCallView(const QString & accountId, const lrc::api::conversation::Info & convInfo);
void slotShowChatView(const std::string & accountId, const lrc::api::conversation::Info & convInfo); void slotShowChatView(const QString & accountId, const lrc::api::conversation::Info & convInfo);
void slotNewTrustRequest(const std::string& accountId, const std::string& contactUri); void slotNewTrustRequest(const QString& accountId, const QString& contactUri);
void slotToggleFullScreenClicked(); void slotToggleFullScreenClicked();
void update(); void update();
void ShowContextMenu(const QPoint& pos); void ShowContextMenu(const QPoint& pos);
...@@ -104,8 +104,8 @@ private slots: ...@@ -104,8 +104,8 @@ private slots:
void slotVideoDeviceListChanged(); void slotVideoDeviceListChanged();
private: private:
void callTerminating(const std::string& callid); void callTerminating(const QString& callid);
void onNewInteraction(const std::string& accountId, const std::string& convUid, void onNewInteraction(const QString& accountId, const QString& convUid,
uint64_t interactionId, const lrc::api::interaction::Info& interaction); uint64_t interactionId, const lrc::api::interaction::Info& interaction);
void conversationsButtonClicked(); void conversationsButtonClicked();
void invitationsButtonClicked(); void invitationsButtonClicked();
...@@ -116,20 +116,20 @@ private: ...@@ -116,20 +116,20 @@ private:
bool selectConversation(const lrc::api::conversation::Info& item); bool selectConversation(const lrc::api::conversation::Info& item);
void deselectConversation(); void deselectConversation();
bool connectConversationModel(); bool connectConversationModel();
void updateConversationView(const std::string& convUid); void updateConversationView(const QString& convUid);
void showConversationView(); void showConversationView();
bool selectSmartlistItem(const std::string& convUid); bool selectSmartlistItem(const QString& convUid);
QImage imageForConv(const std::string & convUid); QImage imageForConv(const QString & convUid);
void processContactLineEdit(); void processContactLineEdit();
void hideMiniSpinner(); void hideMiniSpinner();
void updateConversationForNewContact(const std::string& convUid); void updateConversationForNewContact(const QString& convUid);
void updateSmartList(); void updateSmartList();
void setSelectedAccount(const std::string & accountId); void setSelectedAccount(const QString & accountId);
void setConversationFilter(const QString& filter); void setConversationFilter(const QString& filter);
void setConversationFilter(lrc::api::profile::Type filter); void setConversationFilter(lrc::api::profile::Type filter);
void updateConversationsFilterWidget(); void updateConversationsFilterWidget();
void updateComboBox(); void updateComboBox();
void connectAccount(const std::string& accId); void connectAccount(const QString& accId);
void setCallPanelVisibility(bool visible); void setCallPanelVisibility(bool visible);
void updateChatviewFrame(); void updateChatviewFrame();
void registerShortCuts(); void registerShortCuts();
...@@ -142,7 +142,7 @@ private: ...@@ -142,7 +142,7 @@ private:
constexpr static int qrSize_ = 200; constexpr static int qrSize_ = 200;
std::string lastConvUid_ {}; QString lastConvUid_ {};
lrc::api::profile::Type currentTypeFilter_{}; lrc::api::profile::Type currentTypeFilter_{};
std::unique_ptr<SmartListModel> smartListModel_; std::unique_ptr<SmartListModel> smartListModel_;
... ...
......
src/contactpicker.cpp
+ 6
− 6
View file @ 36e9b93a
...@@ -66,20 +66,20 @@ ContactPicker::accept() ...@@ -66,20 +66,20 @@ ContactPicker::accept()
smartListModel_->toggleSection(sectionName); smartListModel_->toggleSection(sectionName);
return; return;
} }
auto convUid = index.data(SmartListModel::Role::UID).value<QString>().toStdString(); auto convUid = index.data(SmartListModel::Role::UID).value<QString>();
auto accId = index.data(SmartListModel::Role::AccountId).value<QString>().toStdString(); auto accId = index.data(SmartListModel::Role::AccountId).value<QString>();
auto callId = LRCInstance::getCallIdForConversationUid(convUid, accId); auto callId = LRCInstance::getCallIdForConversationUid(convUid, accId);
if (!callId.empty()) { if (!callId.isEmpty()) {
emit callWillJoinConference(callId); emit callWillJoinConference(callId);
} else { } else {
auto contactUri = index.data(SmartListModel::Role::URI).value<QString>().toStdString(); auto contactUri = index.data(SmartListModel::Role::URI).value<QString>();
emit contactWillJoinConference(contactUri); emit contactWillJoinConference(contactUri);
} }
} }
break; break;
case SmartListModel::Type::TRANSFER: case SmartListModel::Type::TRANSFER:
{ {
auto contactUri = index.data(SmartListModel::Role::URI).value<QString>().toStdString(); auto contactUri = index.data(SmartListModel::Role::URI).value<QString>();
emit contactWillDoTransfer(contactUri); emit contactWillDoTransfer(contactUri);
} }
break; break;
...@@ -95,7 +95,7 @@ void ...@@ -95,7 +95,7 @@ void
ContactPicker::on_ringContactLineEdit_textChanged(const QString &arg1) ContactPicker::on_ringContactLineEdit_textChanged(const QString &arg1)
{ {
if (listModeltype_ == SmartListModel::Type::CONFERENCE) { if (listModeltype_ == SmartListModel::Type::CONFERENCE) {
smartListModel_->setConferenceableFilter(arg1.toStdString()); smartListModel_->setConferenceableFilter(arg1);
} }
selectableProxyModel_->setFilterRegExp(QRegExp(arg1, Qt::CaseInsensitive, QRegExp::FixedString)); selectableProxyModel_->setFilterRegExp(QRegExp(arg1, Qt::CaseInsensitive, QRegExp::FixedString));
} }
... ...
......
src/contactpicker.h
+ 3
− 3
View file @ 36e9b93a
...@@ -70,9 +70,9 @@ public: ...@@ -70,9 +70,9 @@ public:
void setCurrentCalleeDisplayName(const QString& CalleeDisplayName); void setCurrentCalleeDisplayName(const QString& CalleeDisplayName);
signals: signals:
void contactWillJoinConference(const std::string& contactUri); void contactWillJoinConference(const QString& contactUri);
void callWillJoinConference(const std::string& callId); void callWillJoinConference(const QString& callId);
void contactWillDoTransfer(const std::string& contactUri); void contactWillDoTransfer(const QString& contactUri);
protected slots: protected slots:
void accept(); void accept();
... ...
......
src/conversationitemdelegate.cpp
+ 2
− 2
View file @ 36e9b93a
...@@ -80,9 +80,9 @@ ConversationItemDelegate::paint(QPainter* painter ...@@ -80,9 +80,9 @@ ConversationItemDelegate::paint(QPainter* painter
} else if (rowHighlight != highlightMap_.end() && (*rowHighlight).second) { } else if (rowHighlight != highlightMap_.end() && (*rowHighlight).second) {
painter->fillRect(option.rect, RingTheme::smartlistHighlight_); painter->fillRect(option.rect, RingTheme::smartlistHighlight_);
} }
auto convUid = index.data(static_cast<int>(SmartListModel::Role::UID)).value<QString>().toStdString(); auto convUid = index.data(static_cast<int>(SmartListModel::Role::UID)).value<QString>();
auto conversation = LRCInstance::getConversationFromConvUid(convUid); auto conversation = LRCInstance::getConversationFromConvUid(convUid);
if (conversation.uid.empty()) return; if (conversation.uid.isEmpty()) return;
if (LRCInstance::getCurrentCallModel()->hasCall(conversation.callId)) { if (LRCInstance::getCurrentCallModel()->hasCall(conversation.callId)) {
auto color = QColor(RingTheme::blue_.lighter(180)); auto color = QColor(RingTheme::blue_.lighter(180));
color.setAlpha(128); color.setAlpha(128);
... ...
......
src/currentaccountcombobox.cpp
+ 7
− 7
View file @ 36e9b93a
...@@ -55,7 +55,7 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent) ...@@ -55,7 +55,7 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent)
// account added to combobox // account added to combobox
connect(&LRCInstance::accountModel(), connect(&LRCInstance::accountModel(),
&lrc::api::NewAccountModel::accountAdded, &lrc::api::NewAccountModel::accountAdded,
[this](const std::string& accountId) { [this](const QString& accountId) {
auto accountList = LRCInstance::accountModel().getAccountList(); auto accountList = LRCInstance::accountModel().getAccountList();
auto it = std::find(accountList.begin(), accountList.end(), accountId); auto it = std::find(accountList.begin(), accountList.end(), accountId);
if (it != accountList.end()) { if (it != accountList.end()) {
...@@ -81,8 +81,8 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent) ...@@ -81,8 +81,8 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent)
auto confProps = LRCInstance::accountModel().getAccountConfig(currentAccountId); auto confProps = LRCInstance::accountModel().getAccountConfig(currentAccountId);
auto possibleConv = LRCInstance::getConversationFromPeerUri(confProps.mailbox); auto possibleConv = LRCInstance::getConversationFromPeerUri(confProps.mailbox);
if (possibleConv.uid.empty()) { if (possibleConv.uid.isEmpty()) {
if (confProps.mailbox.empty()) { if (confProps.mailbox.isEmpty()) {
QMessageBox::information(0, "Voicemail", "Voicemail dial code is empty"); QMessageBox::information(0, "Voicemail", "Voicemail dial code is empty");
} }
// construct new contact // construct new contact
...@@ -90,7 +90,7 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent) ...@@ -90,7 +90,7 @@ CurrentAccountComboBox::CurrentAccountComboBox(QWidget* parent)
lrc::api::contact::Info contactInfo{ {{confProps.mailbox}, {} , {"Voicemail"}, type }, {} }; lrc::api::contact::Info contactInfo{ {{confProps.mailbox}, {} , {"Voicemail"}, type }, {} };
Utils::oneShotConnect(this, &CurrentAccountComboBox::placeAudioOnlyCall, Utils::oneShotConnect(this, &CurrentAccountComboBox::placeAudioOnlyCall,
[this, conversationModel] (const std::string& convUid) { [this, conversationModel] (const QString& convUid) {
conversationModel->placeAudioOnlyCall(convUid); conversationModel->placeAudioOnlyCall(convUid);
}); });
accInfo.contactModel->addContact(contactInfo); accInfo.contactModel->addContact(contactInfo);
...@@ -165,14 +165,14 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e) ...@@ -165,14 +165,14 @@ CurrentAccountComboBox::paintEvent(QPaintEvent* e)
avatarSize_ - 10); // [screen awareness] avatarSize_ - 10); // [screen awareness]
// write primary and secondary account identifiers to combobox label // write primary and secondary account identifiers to combobox label
QString primaryAccountID = QString::fromStdString(Utils::bestNameForAccount(accInfo)); QString primaryAccountID = Utils::bestNameForAccount(accInfo);
painter.setFont(fontPrimary); painter.setFont(fontPrimary);
painter.setPen(RingTheme::lightBlack_); painter.setPen(RingTheme::lightBlack_);
primaryAccountID = fontMetricPrimary.elidedText(primaryAccountID, Qt::ElideRight, primaryAccountID = fontMetricPrimary.elidedText(primaryAccountID, Qt::ElideRight,
comboBoxRect.width() - elidConst - (popupPresent ? 0 : 2 * gearSize_ + 2 * voicemailSize_)); comboBoxRect.width() - elidConst - (popupPresent ? 0 : 2 * gearSize_ + 2 * voicemailSize_));
painter.drawText(comboBoxRect, Qt::AlignLeft, primaryAccountID); painter.drawText(comboBoxRect, Qt::AlignLeft, primaryAccountID);
QString secondaryAccountID = QString::fromStdString(Utils::secondBestNameForAccount(accInfo)); QString secondaryAccountID = Utils::secondBestNameForAccount(accInfo);
secondaryAccountID = fontMetricSecondary.elidedText(secondaryAccountID, Qt::ElideRight, secondaryAccountID = fontMetricSecondary.elidedText(secondaryAccountID, Qt::ElideRight,
comboBoxRect.width() - elidConst - 2 - (popupPresent ? 0 : 2 * gearSize_ + 2 * voicemailSize_)); // [screen awareness] comboBoxRect.width() - elidConst - 2 - (popupPresent ? 0 : 2 * gearSize_ + 2 * voicemailSize_)); // [screen awareness]
...@@ -221,7 +221,7 @@ void ...@@ -221,7 +221,7 @@ void
CurrentAccountComboBox::connectVoiceMail() CurrentAccountComboBox::connectVoiceMail()
{ {
connect(LRCInstance::getCurrentCallModel(), &lrc::api::NewCallModel::voiceMailNotify, connect(LRCInstance::getCurrentCallModel(), &lrc::api::NewCallModel::voiceMailNotify,
[this](const std::string& accountId, int newCount, int oldCount, int urgentCount) { [this](const QString& accountId, int newCount, int oldCount, int urgentCount) {
Q_UNUSED(urgentCount); Q_UNUSED(urgentCount);
voicemailMap_[accountId] = std::make_pair(newCount, oldCount); voicemailMap_[accountId] = std::make_pair(newCount, oldCount);
if (LRCInstance::accountModel().getAccountList()[currentIndex()] == accountId) { if (LRCInstance::accountModel().getAccountList()[currentIndex()] == accountId) {
... ...
......
src/currentaccountcombobox.h
+ 3
− 3
View file @ 36e9b93a
...@@ -42,14 +42,14 @@ public: ...@@ -42,14 +42,14 @@ public:
void accountListUpdate(); void accountListUpdate();
void setCurrentIndex(int index); void setCurrentIndex(int index);
void updateComboBoxDisplay(); void updateComboBoxDisplay();
void canPlaceAudioOnlyCall(const std::string& convUid) { emit placeAudioOnlyCall(convUid); } void canPlaceAudioOnlyCall(const QString& convUid) { emit placeAudioOnlyCall(convUid); }
void activateComboBox() { showPopup(); } void activateComboBox() { showPopup(); }
void deactivateComboBox() { hidePopup(); } void deactivateComboBox() { hidePopup(); }
signals: signals:
void settingsButtonClicked(); void settingsButtonClicked();
void newAccountClicked(); void newAccountClicked();
void placeAudioOnlyCall(const std::string& convUid); void placeAudioOnlyCall(const QString& convUid);
protected: protected:
void paintEvent(QPaintEvent* e); void paintEvent(QPaintEvent* e);
...@@ -85,5 +85,5 @@ private: ...@@ -85,5 +85,5 @@ private:
const int voicemailBorder_ = 4; const int voicemailBorder_ = 4;
const int voicemailSize_ = 24; const int voicemailSize_ = 24;
std::map<std::string,std::pair<int,int>> voicemailMap_; std::map<QString, std::pair<int,int>> voicemailMap_;
}; };
src/deleteaccountdialog.cpp
+ 2
− 2
View file @ 36e9b93a
...@@ -29,8 +29,8 @@ DeleteAccountDialog::DeleteAccountDialog(QWidget *parent) : ...@@ -29,8 +29,8 @@ DeleteAccountDialog::DeleteAccountDialog(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
if (LRCInstance::getCurrentAccountInfo().profileInfo.type == lrc::api::profile::Type::RING){ if (LRCInstance::getCurrentAccountInfo().profileInfo.type == lrc::api::profile::Type::RING){
ui->labelBestId->setText(QString::fromStdString(Utils::bestNameForAccount(LRCInstance::getCurrentAccountInfo()))); ui->labelBestId->setText(Utils::bestNameForAccount(LRCInstance::getCurrentAccountInfo()));
ui->labelAccountHash->setText(QString::fromStdString(LRCInstance::getCurrentAccountInfo().profileInfo.uri)); ui->labelAccountHash->setText(LRCInstance::getCurrentAccountInfo().profileInfo.uri);
} else { } else {
ui->labelWarning->hide(); ui->labelWarning->hide();
} }
... ...
......
src/deviceitemwidget.cpp
+ 1
− 1
View file @ 36e9b93a
...@@ -84,7 +84,7 @@ DeviceItemWidget::toggleEditable() ...@@ -84,7 +84,7 @@ DeviceItemWidget::toggleEditable()
ui->btnEditDevice->setIcon(QIcon(":/images/icons/round-edit-24px.svg")); ui->btnEditDevice->setIcon(QIcon(":/images/icons/round-edit-24px.svg"));
ui->btnEditDevice->setToolTip(QObject::tr("Edit Device Name")); ui->btnEditDevice->setToolTip(QObject::tr("Edit Device Name"));
auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId()); auto confProps = LRCInstance::accountModel().getAccountConfig(LRCInstance::getCurrAccId());
confProps.deviceName = ui->editDeviceName->text().toStdString(); confProps.deviceName = ui->editDeviceName->text();
LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps); LRCInstance::accountModel().setAccountConfig(LRCInstance::getCurrAccId(), confProps);
} }
editable_ = !editable_; editable_ = !editable_;
... ...
......
src/distantwidget.cpp
+ 3
− 3
View file @ 36e9b93a
...@@ -25,11 +25,11 @@ DistantWidget::DistantWidget(QWidget* parent) ...@@ -25,11 +25,11 @@ DistantWidget::DistantWidget(QWidget* parent)
: VideoWidgetBase(Qt::black, parent) : VideoWidgetBase(Qt::black, parent)
{ {
connect(LRCInstance::renderer(), &RenderManager::distantFrameUpdated, connect(LRCInstance::renderer(), &RenderManager::distantFrameUpdated,
[this](const std::string& id) { [this](const QString& id) {
if (id_ == id) repaint(); if (id_ == id) repaint();
}); });
connect(LRCInstance::renderer(), &RenderManager::distantRenderingStopped, connect(LRCInstance::renderer(), &RenderManager::distantRenderingStopped,
[this](const std::string& id) { [this](const QString& id) {
if (id_ == id) repaint(); if (id_ == id) repaint();
}); });
} }
...@@ -68,7 +68,7 @@ DistantWidget::paintBackground(QPainter* painter) ...@@ -68,7 +68,7 @@ DistantWidget::paintBackground(QPainter* painter)
} }
void void
DistantWidget::setRendererId(const std::string& id) DistantWidget::setRendererId(const QString& id)
{ {
id_ = id; id_ = id;
update(); update();
... ...
......
src/distantwidget.h
+ 2
− 3
View file @ 36e9b93a
...@@ -30,7 +30,7 @@ public: ...@@ -30,7 +30,7 @@ public:
explicit DistantWidget(QWidget* parent = 0); explicit DistantWidget(QWidget* parent = 0);
~DistantWidget(); ~DistantWidget();
void setRendererId(const std::string& id); void setRendererId(const QString& id);
protected: protected:
void paintEvent(QPaintEvent* e); void paintEvent(QPaintEvent* e);
...@@ -38,6 +38,5 @@ protected: ...@@ -38,6 +38,5 @@ protected:
void paintBackground(QPainter* painter) override; void paintBackground(QPainter* painter) override;
private: private:
std::string id_; QString id_;
}; };
src/linkdevicedialog.cpp
+ 7
− 7
View file @ 36e9b93a
...@@ -57,9 +57,9 @@ void ...@@ -57,9 +57,9 @@ void
LinkDeviceDialog::setGeneratingPage() LinkDeviceDialog::setGeneratingPage()
{ {
if (ui->passwordEdit->text().isEmpty() && LRCInstance::getCurrAccConfig().archiveHasPassword) { if (ui->passwordEdit->text().isEmpty() && LRCInstance::getCurrAccConfig().archiveHasPassword) {
setExportPage(std::string(), setExportPage(QString(),
lrc::api::account::ExportOnRingStatus::WRONG_PASSWORD, lrc::api::account::ExportOnRingStatus::WRONG_PASSWORD,
std::string()); QString());
return; return;
} }
...@@ -75,17 +75,17 @@ LinkDeviceDialog::setGeneratingPage() ...@@ -75,17 +75,17 @@ LinkDeviceDialog::setGeneratingPage()
timeout_->setSingleShot(true); timeout_->setSingleShot(true);
connect(timeout_, &QTimer::timeout, this, connect(timeout_, &QTimer::timeout, this,
[this]() { [this]() {
setExportPage(std::string(), setExportPage(QString(),
lrc::api::account::ExportOnRingStatus::NETWORK_ERROR, lrc::api::account::ExportOnRingStatus::NETWORK_ERROR,
std::string()); QString());
}); });
timeout_->start(); timeout_->start();
LRCInstance::accountModel().exportOnRing(LRCInstance::getCurrAccId(), ui->passwordEdit->text().toStdString()); LRCInstance::accountModel().exportOnRing(LRCInstance::getCurrAccId(), ui->passwordEdit->text());
} }
void void
LinkDeviceDialog::setExportPage(const std::string& accountId, lrc::api::account::ExportOnRingStatus status, const std::string& pin) LinkDeviceDialog::setExportPage(const QString& accountId, lrc::api::account::ExportOnRingStatus status, const QString& pin)
{ {
Q_UNUSED(accountId); Q_UNUSED(accountId);
timeout_->stop(); timeout_->stop();
...@@ -100,7 +100,7 @@ LinkDeviceDialog::setExportPage(const std::string& accountId, lrc::api::account: ...@@ -100,7 +100,7 @@ LinkDeviceDialog::setExportPage(const std::string& accountId, lrc::api::account:
case lrc::api::account::ExportOnRingStatus::SUCCESS: case lrc::api::account::ExportOnRingStatus::SUCCESS:
ui->infoLabel->setStyleSheet("color: #2b5084;border: 1px solid lightgray;background-color: whitesmoke;padding: 8px;border-radius: 15px;"); ui->infoLabel->setStyleSheet("color: #2b5084;border: 1px solid lightgray;background-color: whitesmoke;padding: 8px;border-radius: 15px;");
ui->exportedPIN->setText(QString::fromStdString(pin)); ui->exportedPIN->setText(pin);
break; break;
case lrc::api::account::ExportOnRingStatus::NETWORK_ERROR: case lrc::api::account::ExportOnRingStatus::NETWORK_ERROR:
... ...
......
src/linkdevicedialog.h
+ 2
− 2
View file @ 36e9b93a
...@@ -41,7 +41,7 @@ private: ...@@ -41,7 +41,7 @@ private:
private slots: private slots:
void setGeneratingPage(); void setGeneratingPage();
void setExportPage(const std::string& accountId, void setExportPage(const QString& accountId,
lrc::api::account::ExportOnRingStatus status, lrc::api::account::ExportOnRingStatus status,
const std::string& pin); const QString& pin);
}; };
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment