mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of QMessageBox

Browse Source 
Fixes: #7874
This commit is contained in:
Hannah von Reth 2020-05-26 11:51:35 +02:00 committed by Kevin Ottens
parent 11b9e3fa61
commit fa87b899fb
No known key found for this signature in database
GPG Key ID: 074BBBCB8DECC9E2
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/accountsettings.cpp
View File

@ -731,11 +731,11 @@ void AccountSettings::slotDisableVfsCurrentFolder()
"will become available again."
"\n\n"
"This action will abort any currently running synchronization."));
msgBox->addButton(tr("Disable support"), QMessageBox::AcceptRole);
auto acceptButton = msgBox->addButton(tr("Disable support"), QMessageBox::AcceptRole);
msgBox->addButton(tr("Cancel"), QMessageBox::RejectRole);
connect(msgBox, &QMessageBox::finished, msgBox, [this, msgBox, folder](int result) {
connect(msgBox, &QMessageBox::finished, msgBox, [this, msgBox, folder, acceptButton] {
msgBox->deleteLater();
if (result != QMessageBox::AcceptRole || !folder)
if (msgBox->clickedButton() == acceptButton|| !folder)
return;
// It is unsafe to switch off vfs while a sync is running - wait if necessary.

6
src/gui/generalsettings.cpp
View File

@ -320,11 +320,11 @@ void GeneralSettings::slotUpdateChannelChanged(const QString &channel)
"version."),
QMessageBox::NoButton,
this);
msgBox->addButton(tr("Change update channel"), QMessageBox::AcceptRole);
auto acceptButton = msgBox->addButton(tr("Change update channel"), QMessageBox::AcceptRole);
msgBox->addButton(tr("Cancel"), QMessageBox::RejectRole);
connect(msgBox, &QMessageBox::finished, msgBox, [this, channel, msgBox](int result) {
connect(msgBox, &QMessageBox::finished, msgBox, [this, channel, msgBox, acceptButton] {
msgBox->deleteLater();
if (result == QMessageBox::AcceptRole) {
if (msgBox->clickedButton() == acceptButton) {
ConfigFile().setUpdateChannel(channel);
if (auto updater = qobject_cast<OCUpdater *>(Updater::instance())) {
updater->setUpdateUrl(Updater::updateUrl());

13
src/gui/wizard/owncloudwizard.cpp
View File

@ -336,6 +336,7 @@ void OwncloudWizard::askExperimentalVirtualFilesFeature(QWidget *receiver, const
{
const auto bestVfsMode = bestAvailableVfsMode();
QMessageBox *msgBox = nullptr;
QPushButton *acceptButton = nullptr;
switch (bestVfsMode)
{
case Vfs::WindowsCfApi:
@ -350,7 +351,7 @@ void OwncloudWizard::askExperimentalVirtualFilesFeature(QWidget *receiver, const
"The virtual files mode is mutually exclusive with selective sync. "
"Currently unselected folders will be translated to online-only folders "
"and your selective sync settings will be reset."), QMessageBox::NoButton, receiver);
msgBox->addButton(tr("Enable virtual files"), QMessageBox::AcceptRole);
acceptButton = msgBox->addButton(tr("Enable virtual files"), QMessageBox::AcceptRole);
msgBox->addButton(tr("Continue to use selective sync"), QMessageBox::RejectRole);
break;
case Vfs::WithSuffix:
@ -370,19 +371,15 @@ void OwncloudWizard::askExperimentalVirtualFilesFeature(QWidget *receiver, const
"This is a new, experimental mode. If you decide to use it, please report any "
"issues that come up.")
.arg(APPLICATION_DOTVIRTUALFILE_SUFFIX), QMessageBox::NoButton, receiver);
msgBox->addButton(tr("Enable experimental placeholder mode"), QMessageBox::AcceptRole);
acceptButton = msgBox->addButton(tr("Enable experimental placeholder mode"), QMessageBox::AcceptRole);
msgBox->addButton(tr("Stay safe"), QMessageBox::RejectRole);
break;
case Vfs::Off:
Q_UNREACHABLE();
}
connect(msgBox, &QMessageBox::accepted, receiver, [callback, msgBox] {
callback(true);
msgBox->deleteLater();
});
connect(msgBox, &QMessageBox::reject, receiver, [callback, msgBox]{
callback(false);
connect(msgBox, &QMessageBox::accepted, receiver, [callback, msgBox, acceptButton] {
callback(msgBox->clickedButton() == acceptButton);
msgBox->deleteLater();
});
msgBox->open();