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

Merge pull request #344 from Kirillpt/fix/togglebutton_using

Browse Source 
Fix toggles in the remaining dialogues
This commit is contained in:
DeepBlueV7.X 2020-11-26 23:05:31 +01:00 committed by GitHub
commit 4d29116922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dialogs/CreateRoom.cpp
View File

@ -80,7 +80,7 @@ CreateRoom::CreateRoom(QWidget *parent)
directToggle_ = new Toggle(this); directToggle_ = new Toggle(this);
directToggle_->setActiveColor(QColor("#38A3D8")); directToggle_->setActiveColor(QColor("#38A3D8"));
directToggle_->setInactiveColor(QColor("gray")); directToggle_->setInactiveColor(QColor("gray"));
directToggle_->setState(true); directToggle_->setState(false);
auto directLayout = new QHBoxLayout; auto directLayout = new QHBoxLayout;
directLayout->setContentsMargins(0, 10, 0, 10); directLayout->setContentsMargins(0, 10, 0, 10);
@ -133,8 +133,8 @@ CreateRoom::CreateRoom(QWidget *parent)
} }
}); });
connect(directToggle_, &Toggle::toggled, this, [this](bool isDisabled) { connect(directToggle_, &Toggle::toggled, this, [this](bool isEnabled) {
request_.is_direct = !isDisabled; request_.is_direct = isEnabled;
}); });
} }

74
src/dialogs/RoomSettings.cpp
View File

@ -1,3 +1,4 @@
#include "dialogs/RoomSettings.h"
#include <QApplication> #include <QApplication>
#include <QComboBox> #include <QComboBox>
#include <QEvent> #include <QEvent>
@ -15,8 +16,6 @@
#include <QStandardPaths> #include <QStandardPaths>
#include <QStyleOption> #include <QStyleOption>
#include <QVBoxLayout> #include <QVBoxLayout>
#include "dialogs/RoomSettings.h"
#include <mtx/responses/common.hpp> #include <mtx/responses/common.hpp>
#include <mtx/responses/media.hpp> #include <mtx/responses/media.hpp>
@ -405,34 +404,6 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
auto encryptionLabel = new QLabel(tr("Encryption"), this); auto encryptionLabel = new QLabel(tr("Encryption"), this);
encryptionToggle_ = new Toggle(this); encryptionToggle_ = new Toggle(this);
connect(encryptionToggle_, &Toggle::toggled, this, [this](bool isOn) {
if (isOn)
return;
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Question);
msgBox.setWindowTitle(tr("End-to-End Encryption"));
msgBox.setText(tr(
"Encryption is currently experimental and things might break unexpectedly. <br>"
"Please take note that it can't be disabled afterwards."));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Save);
int ret = msgBox.exec();
switch (ret) {
case QMessageBox::Ok: {
encryptionToggle_->setState(false);
encryptionToggle_->setEnabled(false);
enableEncryption();
break;
}
default: {
encryptionToggle_->setState(true);
encryptionToggle_->setEnabled(true);
break;
}
}
});
auto encryptionOptionLayout = new QHBoxLayout; auto encryptionOptionLayout = new QHBoxLayout;
encryptionOptionLayout->setMargin(0); encryptionOptionLayout->setMargin(0);
@ -447,7 +418,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
" E2E implementation until device verification is completed.")); " E2E implementation until device verification is completed."));
keyRequestsToggle_ = new Toggle(this); keyRequestsToggle_ = new Toggle(this);
connect(keyRequestsToggle_, &Toggle::toggled, this, [this](bool isOn) { connect(keyRequestsToggle_, &Toggle::toggled, this, [this](bool isOn) {
utils::setKeyRequestsPreference(room_id_, !isOn); utils::setKeyRequestsPreference(room_id_, isOn);
}); });
auto keyRequestsLayout = new QHBoxLayout; auto keyRequestsLayout = new QHBoxLayout;
@ -456,14 +427,43 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
keyRequestsLayout->addWidget(keyRequestsLabel, Qt::AlignBottom | Qt::AlignLeft); keyRequestsLayout->addWidget(keyRequestsLabel, Qt::AlignBottom | Qt::AlignLeft);
keyRequestsLayout->addWidget(keyRequestsToggle_, 0, Qt::AlignBottom | Qt::AlignRight); keyRequestsLayout->addWidget(keyRequestsToggle_, 0, Qt::AlignBottom | Qt::AlignRight);
connect(encryptionToggle_, &Toggle::toggled, this, [this, keyRequestsLabel](bool isOn) {
if (!isOn || usesEncryption_)
return;
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Question);
msgBox.setWindowTitle(tr("End-to-End Encryption"));
msgBox.setText(tr(
"Encryption is currently experimental and things might break unexpectedly. <br>"
"Please take note that it can't be disabled afterwards."));
msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Save);
int ret = msgBox.exec();
switch (ret) {
case QMessageBox::Ok: {
encryptionToggle_->setState(true);
encryptionToggle_->setEnabled(false);
enableEncryption();
keyRequestsToggle_->show();
keyRequestsLabel->show();
break;
}
default: {
break;
}
}
});
// Disable encryption button. // Disable encryption button.
if (usesEncryption_) { if (usesEncryption_) {
encryptionToggle_->setState(false); encryptionToggle_->setState(true);
encryptionToggle_->setEnabled(false); encryptionToggle_->setEnabled(false);
keyRequestsToggle_->setState(!utils::respondsToKeyRequests(room_id_)); keyRequestsToggle_->setState(utils::respondsToKeyRequests(room_id_));
} else { } else {
encryptionToggle_->setState(true); encryptionToggle_->setState(false);
keyRequestsLabel->hide(); keyRequestsLabel->hide();
keyRequestsToggle_->hide(); keyRequestsToggle_->hide();
@ -543,8 +543,10 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
layout->addStretch(1); layout->addStretch(1);
connect(this, &RoomSettings::enableEncryptionError, this, [this](const QString &msg) { connect(this, &RoomSettings::enableEncryptionError, this, [this](const QString &msg) {
encryptionToggle_->setState(true); encryptionToggle_->setState(false);
encryptionToggle_->setEnabled(true); keyRequestsToggle_->setState(false);
keyRequestsToggle_->setEnabled(false);
keyRequestsToggle_->hide();
emit ChatPage::instance()->showNotification(msg); emit ChatPage::instance()->showNotification(msg);
}); });

1
src/ui/ToggleButton.cpp
View File

@ -22,6 +22,7 @@ Toggle::Toggle(QWidget *parent)
void void
Toggle::setState(bool isEnabled) Toggle::setState(bool isEnabled)
{ {
setChecked(isEnabled);
thumb_->setShift(isEnabled ? Position::Left : Position::Right); thumb_->setShift(isEnabled ? Position::Left : Position::Right);
setupProperties(); setupProperties();
} }