rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always show jdenticon toggle (disable if no plugin)

This commit is contained in:
Loren Burkholder 2021-09-06 21:10:08 -04:00
parent 0e3f3f2b20
commit f14762e6a5
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/UserSettingsPage.cpp
View File

@ -757,6 +757,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
trayToggle_ = new Toggle{this}; trayToggle_ = new Toggle{this};
startInTrayToggle_ = new Toggle{this}; startInTrayToggle_ = new Toggle{this};
avatarCircles_ = new Toggle{this}; avatarCircles_ = new Toggle{this};
useIdenticon_ = new Toggle{this};
decryptSidebar_ = new Toggle(this); decryptSidebar_ = new Toggle(this);
privacyScreen_ = new Toggle{this}; privacyScreen_ = new Toggle{this};
onlyShareKeysWithVerifiedUsers_ = new Toggle(this); onlyShareKeysWithVerifiedUsers_ = new Toggle(this);
@ -790,6 +791,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
trayToggle_->setChecked(settings_->tray()); trayToggle_->setChecked(settings_->tray());
startInTrayToggle_->setChecked(settings_->startInTray()); startInTrayToggle_->setChecked(settings_->startInTray());
avatarCircles_->setChecked(settings_->avatarCircles()); avatarCircles_->setChecked(settings_->avatarCircles());
useIdenticon_->setChecked(settings_->useIdenticon());
decryptSidebar_->setChecked(settings_->decryptSidebar()); decryptSidebar_->setChecked(settings_->decryptSidebar());
privacyScreen_->setChecked(settings_->privacyScreen()); privacyScreen_->setChecked(settings_->privacyScreen());
onlyShareKeysWithVerifiedUsers_->setChecked(settings_->onlyShareKeysWithVerifiedUsers()); onlyShareKeysWithVerifiedUsers_->setChecked(settings_->onlyShareKeysWithVerifiedUsers());
@ -809,12 +811,6 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
useStunServer_->setChecked(settings_->useStunServer()); useStunServer_->setChecked(settings_->useStunServer());
mobileMode_->setChecked(settings_->mobileMode()); mobileMode_->setChecked(settings_->mobileMode());
if (JdenticonProvider::isAvailable()) {
useIdenticon_ = new Toggle{this};
useIdenticon_->setChecked(settings_->useIdenticon());
} else
useIdenticon_ = nullptr;
if (!settings_->tray()) { if (!settings_->tray()) {
startInTrayToggle_->setState(false); startInTrayToggle_->setState(false);
startInTrayToggle_->setDisabled(true); startInTrayToggle_->setDisabled(true);
@ -958,12 +954,9 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
boxWrap(tr("Circular Avatars"), boxWrap(tr("Circular Avatars"),
avatarCircles_, avatarCircles_,
tr("Change the appearance of user avatars in chats.\nOFF - square, ON - Circle.")); tr("Change the appearance of user avatars in chats.\nOFF - square, ON - Circle."));
if (JdenticonProvider::isAvailable()) boxWrap(tr("Use identicons"),
boxWrap(
tr("Use identicons"),
useIdenticon_, useIdenticon_,
tr( tr("Display an identicon instead of a letter when a user has not set an avatar."));
"Display an identicon instead of a letter when a user has not set an avatar."));
boxWrap(tr("Group's sidebar"), boxWrap(tr("Group's sidebar"),
groupViewToggle_, groupViewToggle_,
tr("Show a column containing groups and tags next to the room list.")); 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) { connect(useIdenticon_, &Toggle::toggled, this, [this](bool enabled) {
settings_->setUseIdenticon(enabled); settings_->setUseIdenticon(enabled);
}); });
else
useIdenticon_->setDisabled(true);
connect(markdown_, &Toggle::toggled, this, [this](bool enabled) { connect(markdown_, &Toggle::toggled, this, [this](bool enabled) {
settings_->setMarkdown(enabled); settings_->setMarkdown(enabled);