From a5bb70f53bc20f36f695ac5cd9f8b91163f694eb Mon Sep 17 00:00:00 2001 From: Eran Mizrahi Date: Wed, 13 Dec 2017 16:18:54 +0200 Subject: Wait for injected processes on MO close --- src/lockeddialog.cpp | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'src/lockeddialog.cpp') diff --git a/src/lockeddialog.cpp b/src/lockeddialog.cpp index 09538a0f..143d5838 100644 --- a/src/lockeddialog.cpp +++ b/src/lockeddialog.cpp @@ -26,10 +26,8 @@ along with Mod Organizer. If not, see . #include // for Qt::FramelessWindowHint, etc LockedDialog::LockedDialog(QWidget *parent, bool unlockByButton) - : QDialog(parent) + : LockedDialogBase(parent, !unlockByButton) , ui(new Ui::LockedDialog) - , m_Unlocked(false) - , m_allowClose(!unlockByButton) { ui->setupUi(this); @@ -38,7 +36,7 @@ LockedDialog::LockedDialog(QWidget *parent, bool unlockByButton) // seem to work. We will ignore pressing the close button if unlockByButton == true Qt::WindowFlags flags = this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint; - if (!unlockByButton) + if (m_allowClose) flags |= Qt::WindowCloseButtonHint; this->setWindowFlags(flags); @@ -48,13 +46,6 @@ LockedDialog::LockedDialog(QWidget *parent, bool unlockByButton) ui->verticalLayout->addItem( new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding)); } - - if (parent != nullptr) { - QPoint position = parent->mapToGlobal(QPoint(parent->width() / 2, parent->height() / 2)); - position.rx() -= this->width() / 2; - position.ry() -= this->height() / 2; - move(position); - } } LockedDialog::~LockedDialog() @@ -68,35 +59,13 @@ void LockedDialog::setProcessName(const QString &name) ui->processLabel->setText(name); } - -void LockedDialog::resizeEvent(QResizeEvent *event) -{ - QWidget *par = parentWidget(); - if (par != nullptr) { - QPoint position = par->mapToGlobal(QPoint(par->width() / 2, par->height() / 2)); - position.rx() -= event->size().width() / 2; - position.ry() -= event->size().height() / 2; - move(position); - } -} - void LockedDialog::on_unlockButton_clicked() { unlock(); } -void LockedDialog::reject() -{ - if (m_allowClose) - unlock(); -} - -bool LockedDialog::unlockForced() { - return m_Unlocked; -} - void LockedDialog::unlock() { - m_Unlocked = true; + LockedDialogBase::unlock(); ui->label->setText("unlocking may take a few seconds"); ui->unlockButton->setEnabled(false); } -- cgit v1.3.1