diff options
| author | Loren Burkholder <computersemiexpert@outlook.com> | 2021-09-06 21:10:08 -0400 |
|---|---|---|
| committer | Loren Burkholder <computersemiexpert@outlook.com> | 2021-09-11 19:35:31 -0400 |
| commit | f14762e6a550e9b5c92e7a2e8348fff20fd12ea0 (patch) | |
| tree | 068cb8b610f4c40faec21dc10d20f4534801466b | |
| parent | 0e3f3f2b2014aa47a1075aac8075290ee5ed7ec5 (diff) | |
Always show jdenticon toggle (disable if no plugin)
| -rw-r--r-- | src/UserSettingsPage.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index d79cadbe..7b01b0b8 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -757,6 +757,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge trayToggle_ = new Toggle{this}; startInTrayToggle_ = new Toggle{this}; avatarCircles_ = new Toggle{this}; + useIdenticon_ = new Toggle{this}; decryptSidebar_ = new Toggle(this); privacyScreen_ = new Toggle{this}; onlyShareKeysWithVerifiedUsers_ = new Toggle(this); @@ -790,6 +791,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge trayToggle_->setChecked(settings_->tray()); startInTrayToggle_->setChecked(settings_->startInTray()); avatarCircles_->setChecked(settings_->avatarCircles()); + useIdenticon_->setChecked(settings_->useIdenticon()); decryptSidebar_->setChecked(settings_->decryptSidebar()); privacyScreen_->setChecked(settings_->privacyScreen()); onlyShareKeysWithVerifiedUsers_->setChecked(settings_->onlyShareKeysWithVerifiedUsers()); @@ -809,12 +811,6 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge useStunServer_->setChecked(settings_->useStunServer()); mobileMode_->setChecked(settings_->mobileMode()); - if (JdenticonProvider::isAvailable()) { - useIdenticon_ = new Toggle{this}; - useIdenticon_->setChecked(settings_->useIdenticon()); - } else - useIdenticon_ = nullptr; - if (!settings_->tray()) { startInTrayToggle_->setState(false); startInTrayToggle_->setDisabled(true); @@ -958,12 +954,9 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge boxWrap(tr("Circular Avatars"), avatarCircles_, tr("Change the appearance of user avatars in chats.\nOFF - square, ON - Circle.")); - if (JdenticonProvider::isAvailable()) - boxWrap( - tr("Use identicons"), - useIdenticon_, - tr( - "Display an identicon instead of a letter when a user has not set an avatar.")); + boxWrap(tr("Use identicons"), + useIdenticon_, + tr("Display an identicon instead of a letter when a user has not set an avatar.")); boxWrap(tr("Group's sidebar"), groupViewToggle_, tr("Show a column containing groups and tags next to the room list.")); @@ -1290,6 +1283,8 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge connect(useIdenticon_, &Toggle::toggled, this, [this](bool enabled) { settings_->setUseIdenticon(enabled); }); + else + useIdenticon_->setDisabled(true); connect(markdown_, &Toggle::toggled, this, [this](bool enabled) { settings_->setMarkdown(enabled); |