Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify code by removing dialog parent

This commit is contained in:
Martchus 2023-01-28 18:35:50 +01:00
parent a40ccb0265
commit 802937264b
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tray/gui/traywidget.cpp
View File

@ -57,7 +57,6 @@ using namespace std;
namespace QtGui {
QWidget *TrayWidget::s_dialogParent = nullptr;
SettingsDialog *TrayWidget::s_settingsDlg = nullptr;
Wizard *TrayWidget::s_wizard = nullptr;
QtUtilities::AboutDialog *TrayWidget::s_aboutDlg = nullptr;
@ -235,7 +234,8 @@ TrayWidget::~TrayWidget()
s_instances.erase(i);
}
if (s_instances.empty()) {
delete s_dialogParent;
delete s_settingsDlg;
delete s_aboutDlg;
QCoreApplication::quit();
} else if (s_instances.size() == 1) {
s_instances.front()->updateIconAndTooltip();
@ -244,11 +244,8 @@ TrayWidget::~TrayWidget()
SettingsDialog *TrayWidget::settingsDialog()
{
if (!s_dialogParent) {
s_dialogParent = new QWidget();
}
if (!s_settingsDlg) {
s_settingsDlg = new SettingsDialog(s_instances.size() < 2 ? &m_connection : nullptr, s_dialogParent);
s_settingsDlg = new SettingsDialog(s_instances.size() < 2 ? &m_connection : nullptr);
connect(s_settingsDlg, &SettingsDialog::wizardRequested, this, &TrayWidget::showWizard);
connect(s_settingsDlg, &SettingsDialog::applied, &TrayWidget::applySettingsOnAllInstances);
@ -328,12 +325,9 @@ void TrayWidget::applySettingsChangesFromWizard()
void TrayWidget::showAboutDialog()
{
if (!s_dialogParent) {
s_dialogParent = new QWidget();
}
if (!s_aboutDlg) {
s_aboutDlg = new AboutDialog(
s_dialogParent, QString(), aboutDialogAttribution(), QString(), {}, QStringLiteral(APP_URL), QString(), aboutDialogImage());
nullptr, QString(), aboutDialogAttribution(), QString(), {}, QStringLiteral(APP_URL), QString(), aboutDialogImage());
s_aboutDlg->setWindowTitle(tr("About") + QStringLiteral(" - " APP_NAME));
s_aboutDlg->setWindowIcon(QIcon(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg")));
}

1
tray/gui/traywidget.h
View File

@ -115,7 +115,6 @@ private Q_SLOTS:
private:
TrayMenu *m_menu;
std::unique_ptr<Ui::TrayWidget> m_ui;
static QWidget *s_dialogParent;
static SettingsDialog *s_settingsDlg;
static Wizard *s_wizard;
static QtUtilities::AboutDialog *s_aboutDlg;