fix: Pop up windows: About, Accounts, Account, Settings - opening on

centr of parent
This commit is contained in:
antonpavanvo 2022-05-27 10:02:36 +04:00 committed by antonpavanvo
parent ea7dcc5f18
commit 1af20e27f2
8 changed files with 34 additions and 29 deletions

View File

@ -96,7 +96,7 @@ Squawk::~Squawk() {
void Squawk::onAccounts() void Squawk::onAccounts()
{ {
if (accounts == nullptr) { if (accounts == nullptr) {
accounts = new Accounts(rosterModel.accountsModel); accounts = new Accounts(rosterModel.accountsModel, this);
accounts->setAttribute(Qt::WA_DeleteOnClose); accounts->setAttribute(Qt::WA_DeleteOnClose);
connect(accounts, &Accounts::destroyed, this, &Squawk::onAccountsClosed); connect(accounts, &Accounts::destroyed, this, &Squawk::onAccountsClosed);
connect(accounts, &Accounts::newAccount, this, &Squawk::newAccountRequest); connect(accounts, &Accounts::newAccount, this, &Squawk::newAccountRequest);
@ -104,29 +104,23 @@ void Squawk::onAccounts()
connect(accounts, &Accounts::connectAccount, this, &Squawk::connectAccount); connect(accounts, &Accounts::connectAccount, this, &Squawk::connectAccount);
connect(accounts, &Accounts::disconnectAccount, this, &Squawk::disconnectAccount); connect(accounts, &Accounts::disconnectAccount, this, &Squawk::disconnectAccount);
connect(accounts, &Accounts::removeAccount, this, &Squawk::removeAccountRequest); connect(accounts, &Accounts::removeAccount, this, &Squawk::removeAccountRequest);
}
accounts->show();
} else {
accounts->show(); accounts->show();
accounts->raise(); accounts->raise();
accounts->activateWindow(); accounts->activateWindow();
}
} }
void Squawk::onPreferences() void Squawk::onPreferences()
{ {
if (preferences == nullptr) { if (preferences == nullptr) {
preferences = new Settings(); preferences = new Settings(this);
preferences->setAttribute(Qt::WA_DeleteOnClose); preferences->setAttribute(Qt::WA_DeleteOnClose);
connect(preferences, &Settings::destroyed, this, &Squawk::onPreferencesClosed); connect(preferences, &Settings::destroyed, this, &Squawk::onPreferencesClosed);
connect(preferences, &Settings::changeDownloadsPath, this, &Squawk::changeDownloadsPath); connect(preferences, &Settings::changeDownloadsPath, this, &Squawk::changeDownloadsPath);
}
preferences->show();
} else {
preferences->show(); preferences->show();
preferences->raise(); preferences->raise();
preferences->activateWindow(); preferences->activateWindow();
}
} }

View File

@ -38,10 +38,9 @@ About::About(QWidget* parent):
m_ui->qxmppBuiltAgainstVersion->setText(tr("(built against %1)").arg(QXMPP_VERSION_STRING)); m_ui->qxmppBuiltAgainstVersion->setText(tr("(built against %1)").arg(QXMPP_VERSION_STRING));
setWindowFlag(Qt::WindowStaysOnTopHint); setWindowFlag(Qt::WindowStaysOnTopHint);
move( if (parent)
parent->window()->frameGeometry().topLeft() + move(parent->window()->frameGeometry().topLeft() +
parent->window()->rect().center() - rect().center() parent->window()->rect().center() - rect().center());
);
connect(m_ui->licenceLink, &QLabel::linkActivated, this, &About::onLicenseActivated); connect(m_ui->licenceLink, &QLabel::linkActivated, this, &About::onLicenseActivated);
} }

View File

@ -19,8 +19,8 @@
#include "account.h" #include "account.h"
#include "ui_account.h" #include "ui_account.h"
Account::Account(): Account::Account(QWidget *parent):
QDialog(), QDialog(parent),
m_ui(new Ui::Account) m_ui(new Ui::Account)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
@ -38,6 +38,10 @@ Account::Account():
QStandardItem *item = model->item(static_cast<int>(Shared::AccountPassword::kwallet)); QStandardItem *item = model->item(static_cast<int>(Shared::AccountPassword::kwallet));
item->setFlags(item->flags() & ~Qt::ItemIsEnabled); item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
} }
if (parent)
move(parent->window()->frameGeometry().topLeft() +
parent->window()->rect().center() - rect().center());
} }
Account::~Account() Account::~Account()

View File

@ -38,7 +38,7 @@ class Account : public QDialog
Q_OBJECT Q_OBJECT
public: public:
Account(); Account(QWidget *parent = nullptr);
~Account(); ~Account();
QMap<QString, QVariant> value() const; QMap<QString, QVariant> value() const;

View File

@ -22,7 +22,7 @@
#include <QDebug> #include <QDebug>
Accounts::Accounts(Models::Accounts* p_model, QWidget *parent) : Accounts::Accounts(Models::Accounts* p_model, QWidget *parent) :
QWidget(parent), QDialog(parent),
m_ui(new Ui::Accounts), m_ui(new Ui::Accounts),
model(p_model), model(p_model),
editing(false), editing(false),
@ -38,13 +38,17 @@ Accounts::Accounts(Models::Accounts* p_model, QWidget *parent) :
connect(m_ui->tableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &Accounts::onSelectionChanged); connect(m_ui->tableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &Accounts::onSelectionChanged);
connect(p_model, &Models::Accounts::changed, this, &Accounts::updateConnectButton); connect(p_model, &Models::Accounts::changed, this, &Accounts::updateConnectButton);
connect(m_ui->tableView, &QTableView::doubleClicked, this, &Accounts::onEditButton); connect(m_ui->tableView, &QTableView::doubleClicked, this, &Accounts::onEditButton);
if (parent)
move(parent->window()->frameGeometry().topLeft() +
parent->window()->rect().center() - rect().center());
} }
Accounts::~Accounts() = default; Accounts::~Accounts() = default;
void Accounts::onAddButton() void Accounts::onAddButton()
{ {
Account* acc = new Account(); Account* acc = new Account(this);
connect(acc, &Account::accepted, this, &Accounts::onAccountAccepted); connect(acc, &Account::accepted, this, &Accounts::onAccountAccepted);
connect(acc, &Account::rejected, this, &Accounts::onAccountRejected); connect(acc, &Account::rejected, this, &Accounts::onAccountRejected);
acc->exec(); acc->exec();
@ -74,7 +78,7 @@ void Accounts::onAccountRejected()
void Accounts::onEditButton() void Accounts::onEditButton()
{ {
Account* acc = new Account(); Account* acc = new Account(this);
const Models::Account* mAcc = model->getAccount(m_ui->tableView->selectionModel()->selectedRows().at(0).row()); const Models::Account* mAcc = model->getAccount(m_ui->tableView->selectionModel()->selectedRows().at(0).row());
acc->setData({ acc->setData({

View File

@ -19,7 +19,7 @@
#ifndef ACCOUNTS_H #ifndef ACCOUNTS_H
#define ACCOUNTS_H #define ACCOUNTS_H
#include <QWidget> #include <QDialog>
#include <QScopedPointer> #include <QScopedPointer>
#include <QItemSelection> #include <QItemSelection>
@ -31,7 +31,7 @@ namespace Ui
class Accounts; class Accounts;
} }
class Accounts : public QWidget class Accounts : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:

View File

@ -20,7 +20,7 @@
#include "ui_settings.h" #include "ui_settings.h"
Settings::Settings(QWidget* parent): Settings::Settings(QWidget* parent):
QWidget(parent), QDialog(parent),
m_ui(new Ui::Settings()), m_ui(new Ui::Settings()),
modifiedSettings() modifiedSettings()
{ {
@ -34,6 +34,10 @@ Settings::Settings(QWidget* parent):
connect(m_ui->applyButton, &QPushButton::clicked, this, &Settings::apply); connect(m_ui->applyButton, &QPushButton::clicked, this, &Settings::apply);
connect(m_ui->okButton, &QPushButton::clicked, this, &Settings::confirm); connect(m_ui->okButton, &QPushButton::clicked, this, &Settings::confirm);
connect(m_ui->cancelButton, &QPushButton::clicked, this, &Settings::close); connect(m_ui->cancelButton, &QPushButton::clicked, this, &Settings::close);
if (parent)
move(parent->window()->frameGeometry().topLeft() +
parent->window()->rect().center() - rect().center());
} }
Settings::~Settings() Settings::~Settings()

View File

@ -19,7 +19,7 @@
#ifndef SETTINGS_H #ifndef SETTINGS_H
#define SETTINGS_H #define SETTINGS_H
#include <QWidget> #include <QDialog>
#include <QListWidgetItem> #include <QListWidgetItem>
#include <QScopedPointer> #include <QScopedPointer>
#include <QSettings> #include <QSettings>
@ -36,7 +36,7 @@ class Settings;
/** /**
* @todo write docs * @todo write docs
*/ */
class Settings : public QWidget class Settings : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public: