From 40323d19f7971bf94f1db2eca08277bd2c578d34 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Fri, 29 Dec 2017 12:37:40 +0100 Subject: [PATCH] Fixed #53 --- plugins/absenceplugin/absencedialog.ui | 2 +- plugins/advancedviewplugin/advancedviewdialog.cpp | 8 +------- plugins/advancedviewplugin/advancedviewdialog.h | 4 ++-- plugins/advancedviewplugin/dialogs/bookingdialog.cpp | 8 +------- plugins/advancedviewplugin/dialogs/bookingdialog.h | 5 +++-- .../advancedviewplugin/dialogs/timeassignmentdialog.cpp | 8 +------- plugins/advancedviewplugin/dialogs/timeassignmentdialog.h | 5 +++-- plugins/devtoolsplugin/logdialog.cpp | 8 +------- plugins/devtoolsplugin/logdialog.h | 4 ++-- plugins/lunchmealplugin/lunchmealdialog.cpp | 8 +------- plugins/lunchmealplugin/lunchmealdialog.h | 4 ++-- plugins/profileplugin/profiledialog.cpp | 8 +------- plugins/profileplugin/profiledialog.h | 5 ++--- plugins/updaterplugin/updaterdialog.cpp | 8 +------- plugins/updaterplugin/updaterdialog.h | 5 +++-- plugins/webradioplugin/webradiodialog.cpp | 8 +------- plugins/webradioplugin/webradiodialog.h | 5 +++-- zeiterfassungguilib/dialogs/authenticationdialog.cpp | 8 +------- zeiterfassungguilib/dialogs/authenticationdialog.h | 5 ++--- zeiterfassungguilib/dialogs/languageselectiondialog.cpp | 8 +------- zeiterfassungguilib/dialogs/languageselectiondialog.h | 4 ++-- zeiterfassungguilib/dialogs/settingsdialog.cpp | 8 +------- zeiterfassungguilib/dialogs/settingsdialog.h | 5 ++--- 23 files changed, 38 insertions(+), 103 deletions(-) diff --git a/plugins/absenceplugin/absencedialog.ui b/plugins/absenceplugin/absencedialog.ui index 718d0b2..eb6a823 100644 --- a/plugins/absenceplugin/absencedialog.ui +++ b/plugins/absenceplugin/absencedialog.ui @@ -1,7 +1,7 @@ AbsenceDialog - + 0 diff --git a/plugins/advancedviewplugin/advancedviewdialog.cpp b/plugins/advancedviewplugin/advancedviewdialog.cpp index f147ab5..7eb5ef4 100644 --- a/plugins/advancedviewplugin/advancedviewdialog.cpp +++ b/plugins/advancedviewplugin/advancedviewdialog.cpp @@ -22,7 +22,7 @@ #include "models/timeassignmentsmodel.h" AdvancedViewDialog::AdvancedViewDialog(StripsWidget &stripsWidget, QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::AdvancedViewDialog), m_stripsWidget(stripsWidget), m_bookingsModel(new BookingsModel(stripsWidget, this)), @@ -30,12 +30,6 @@ AdvancedViewDialog::AdvancedViewDialog(StripsWidget &stripsWidget, QWidget *pare { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - ui->bookingsView->setModel(m_bookingsModel); ui->bookingsView->setEnabled(m_bookingsModel->enabled()); connect(m_bookingsModel, &BookingsModel::enabledChanged, ui->bookingsView, &QWidget::setEnabled); diff --git a/plugins/advancedviewplugin/advancedviewdialog.h b/plugins/advancedviewplugin/advancedviewdialog.h index 5f29b89..9a0c223 100644 --- a/plugins/advancedviewplugin/advancedviewdialog.h +++ b/plugins/advancedviewplugin/advancedviewdialog.h @@ -1,13 +1,13 @@ #pragma once -#include +#include "zeiterfassungdialog.h" namespace Ui { class AdvancedViewDialog; } class StripsWidget; class BookingsModel; class TimeAssignmentsModel; -class AdvancedViewDialog : public QDialog +class AdvancedViewDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/plugins/advancedviewplugin/dialogs/bookingdialog.cpp b/plugins/advancedviewplugin/dialogs/bookingdialog.cpp index 556839f..a2d42df 100644 --- a/plugins/advancedviewplugin/dialogs/bookingdialog.cpp +++ b/plugins/advancedviewplugin/dialogs/bookingdialog.cpp @@ -2,16 +2,10 @@ #include "ui_bookingdialog.h" BookingDialog::BookingDialog(QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::BookingDialog) { ui->setupUi(this); - -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif } BookingDialog::~BookingDialog() diff --git a/plugins/advancedviewplugin/dialogs/bookingdialog.h b/plugins/advancedviewplugin/dialogs/bookingdialog.h index 6f16b7d..841a0db 100644 --- a/plugins/advancedviewplugin/dialogs/bookingdialog.h +++ b/plugins/advancedviewplugin/dialogs/bookingdialog.h @@ -1,11 +1,12 @@ #pragma once -#include #include +#include "zeiterfassungdialog.h" + namespace Ui { class BookingDialog; } -class BookingDialog : public QDialog +class BookingDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/plugins/advancedviewplugin/dialogs/timeassignmentdialog.cpp b/plugins/advancedviewplugin/dialogs/timeassignmentdialog.cpp index 575d2ca..35d074a 100644 --- a/plugins/advancedviewplugin/dialogs/timeassignmentdialog.cpp +++ b/plugins/advancedviewplugin/dialogs/timeassignmentdialog.cpp @@ -9,17 +9,11 @@ TimeAssignmentDialog::TimeAssignmentDialog(const QMap &projects, const ZeiterfassungSettings &settings, QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::TimeAssignmentDialog) { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - { for(const auto &preferedProject : settings.projects()) { diff --git a/plugins/advancedviewplugin/dialogs/timeassignmentdialog.h b/plugins/advancedviewplugin/dialogs/timeassignmentdialog.h index 032a53f..916fd09 100644 --- a/plugins/advancedviewplugin/dialogs/timeassignmentdialog.h +++ b/plugins/advancedviewplugin/dialogs/timeassignmentdialog.h @@ -1,15 +1,16 @@ #pragma once -#include #include +#include "zeiterfassungdialog.h" + template class QMap; class ZeiterfassungSettings; namespace Ui { class TimeAssignmentDialog; } -class TimeAssignmentDialog : public QDialog +class TimeAssignmentDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/plugins/devtoolsplugin/logdialog.cpp b/plugins/devtoolsplugin/logdialog.cpp index f401579..6c4a34c 100644 --- a/plugins/devtoolsplugin/logdialog.cpp +++ b/plugins/devtoolsplugin/logdialog.cpp @@ -2,16 +2,10 @@ #include "ui_logdialog.h" LogDialog::LogDialog(QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::LogDialog) { ui->setupUi(this); - -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif } LogDialog::~LogDialog() diff --git a/plugins/devtoolsplugin/logdialog.h b/plugins/devtoolsplugin/logdialog.h index 1ccd7bf..aea06e9 100644 --- a/plugins/devtoolsplugin/logdialog.h +++ b/plugins/devtoolsplugin/logdialog.h @@ -1,12 +1,12 @@ #pragma once -#include +#include "zeiterfassungdialog.h" class QAbstractItemModel; namespace Ui { class LogDialog; } -class LogDialog : public QDialog +class LogDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/plugins/lunchmealplugin/lunchmealdialog.cpp b/plugins/lunchmealplugin/lunchmealdialog.cpp index 2897bc1..972de57 100644 --- a/plugins/lunchmealplugin/lunchmealdialog.cpp +++ b/plugins/lunchmealplugin/lunchmealdialog.cpp @@ -4,17 +4,11 @@ #include LunchMealDialog::LunchMealDialog(const QDate &date, const QString &content, QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::LunchMealDialog) { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - ui->labelTitle->setText(tr("Lunch meal for %0").arg(date.toString(tr("dd.MM.yyyy")))); ui->labelLunchMeal->setText(content); } diff --git a/plugins/lunchmealplugin/lunchmealdialog.h b/plugins/lunchmealplugin/lunchmealdialog.h index c0191ee..f20ceb8 100644 --- a/plugins/lunchmealplugin/lunchmealdialog.h +++ b/plugins/lunchmealplugin/lunchmealdialog.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "zeiterfassungdialog.h" class QDate; @@ -8,7 +8,7 @@ class StripsWidget; namespace Ui { class LunchMealDialog; } -class LunchMealDialog : public QDialog +class LunchMealDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/plugins/profileplugin/profiledialog.cpp b/plugins/profileplugin/profiledialog.cpp index fae2c94..92bddae 100644 --- a/plugins/profileplugin/profiledialog.cpp +++ b/plugins/profileplugin/profiledialog.cpp @@ -2,17 +2,11 @@ #include "ui_profiledialog.h" ProfileDialog::ProfileDialog(const GetUserInfoReply::UserInfo &userInfo, QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::ProfileDialog) { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - ui->spinBoxUserId->setValue(userInfo.userId); ui->lineEditEmail->setText(userInfo.email); ui->lineEditLongUsername->setText(userInfo.longUsername); diff --git a/plugins/profileplugin/profiledialog.h b/plugins/profileplugin/profiledialog.h index c3ea218..3725fd7 100644 --- a/plugins/profileplugin/profiledialog.h +++ b/plugins/profileplugin/profiledialog.h @@ -1,12 +1,11 @@ #pragma once -#include - +#include "zeiterfassungdialog.h" #include "replies/getuserinforeply.h" namespace Ui { class ProfileDialog; } -class ProfileDialog : public QDialog +class ProfileDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/plugins/updaterplugin/updaterdialog.cpp b/plugins/updaterplugin/updaterdialog.cpp index b890a90..61b3b62 100644 --- a/plugins/updaterplugin/updaterdialog.cpp +++ b/plugins/updaterplugin/updaterdialog.cpp @@ -19,18 +19,12 @@ #include "zeiterfassungapi.h" UpdaterDialog::UpdaterDialog(MainWindow &mainWindow) : - QDialog(&mainWindow), + ZeiterfassungDialog(&mainWindow), ui(new Ui::UpdaterDialog), m_mainWindow(mainWindow) { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - setAttribute(Qt::WA_DeleteOnClose); connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &UpdaterDialog::acceptedSlot); diff --git a/plugins/updaterplugin/updaterdialog.h b/plugins/updaterplugin/updaterdialog.h index ba3b40a..2ea7560 100644 --- a/plugins/updaterplugin/updaterdialog.h +++ b/plugins/updaterplugin/updaterdialog.h @@ -1,14 +1,15 @@ #pragma once -#include #include +#include "zeiterfassungdialog.h" + class QNetworkReply; namespace Ui { class UpdaterDialog; } class MainWindow; -class UpdaterDialog : public QDialog +class UpdaterDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/plugins/webradioplugin/webradiodialog.cpp b/plugins/webradioplugin/webradiodialog.cpp index 0614825..fd5e855 100644 --- a/plugins/webradioplugin/webradiodialog.cpp +++ b/plugins/webradioplugin/webradiodialog.cpp @@ -5,18 +5,12 @@ #include "zeiterfassungsettings.h" WebRadioDialog::WebRadioDialog(MainWindow &mainWindow) : - QDialog(&mainWindow), + ZeiterfassungDialog(&mainWindow), ui(new Ui::WebRadioDialog), m_mainWindow(mainWindow) { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - m_player = new QMediaPlayer(this); connect(m_player, &QMediaPlayer::stateChanged, this, &WebRadioDialog::stateChanged); connect(m_player, &QMediaPlayer::stateChanged, this, &WebRadioDialog::updateWidgets); diff --git a/plugins/webradioplugin/webradiodialog.h b/plugins/webradioplugin/webradiodialog.h index 5529756..6dbda8d 100644 --- a/plugins/webradioplugin/webradiodialog.h +++ b/plugins/webradioplugin/webradiodialog.h @@ -1,13 +1,14 @@ #pragma once -#include #include +#include "zeiterfassungdialog.h" + class MainWindow; namespace Ui { class WebRadioDialog; } -class WebRadioDialog : public QDialog +class WebRadioDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/zeiterfassungguilib/dialogs/authenticationdialog.cpp b/zeiterfassungguilib/dialogs/authenticationdialog.cpp index d705e31..d4dbfd2 100644 --- a/zeiterfassungguilib/dialogs/authenticationdialog.cpp +++ b/zeiterfassungguilib/dialogs/authenticationdialog.cpp @@ -2,16 +2,10 @@ #include "ui_authenticationdialog.h" AuthenticationDialog::AuthenticationDialog(QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::AuthenticationDialog) { ui->setupUi(this); - -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif } AuthenticationDialog::~AuthenticationDialog() diff --git a/zeiterfassungguilib/dialogs/authenticationdialog.h b/zeiterfassungguilib/dialogs/authenticationdialog.h index 128b25b..af0e49f 100644 --- a/zeiterfassungguilib/dialogs/authenticationdialog.h +++ b/zeiterfassungguilib/dialogs/authenticationdialog.h @@ -1,12 +1,11 @@ #pragma once -#include - #include "zeiterfassungguilib_global.h" +#include "zeiterfassungdialog.h" namespace Ui { class AuthenticationDialog; } -class ZEITERFASSUNGGUILIBSHARED_EXPORT AuthenticationDialog : public QDialog +class ZEITERFASSUNGGUILIBSHARED_EXPORT AuthenticationDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/zeiterfassungguilib/dialogs/languageselectiondialog.cpp b/zeiterfassungguilib/dialogs/languageselectiondialog.cpp index 86a3e6b..c39f5bc 100644 --- a/zeiterfassungguilib/dialogs/languageselectiondialog.cpp +++ b/zeiterfassungguilib/dialogs/languageselectiondialog.cpp @@ -2,17 +2,11 @@ #include "ui_languageselectiondialog.h" LanguageSelectionDialog::LanguageSelectionDialog(QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::LanguageSelectionDialog) { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - ui->comboBoxLanguage->addItem(tr("English"), QLocale::English); ui->comboBoxLanguage->addItem(tr("German"), QLocale::German); } diff --git a/zeiterfassungguilib/dialogs/languageselectiondialog.h b/zeiterfassungguilib/dialogs/languageselectiondialog.h index 121e177..f2d01c9 100644 --- a/zeiterfassungguilib/dialogs/languageselectiondialog.h +++ b/zeiterfassungguilib/dialogs/languageselectiondialog.h @@ -1,13 +1,13 @@ #pragma once -#include #include #include "zeiterfassungguilib_global.h" +#include "zeiterfassungdialog.h" namespace Ui { class LanguageSelectionDialog; } -class ZEITERFASSUNGGUILIBSHARED_EXPORT LanguageSelectionDialog : public QDialog +class ZEITERFASSUNGGUILIBSHARED_EXPORT LanguageSelectionDialog : public ZeiterfassungDialog { Q_OBJECT diff --git a/zeiterfassungguilib/dialogs/settingsdialog.cpp b/zeiterfassungguilib/dialogs/settingsdialog.cpp index f9e5c66..ea84650 100644 --- a/zeiterfassungguilib/dialogs/settingsdialog.cpp +++ b/zeiterfassungguilib/dialogs/settingsdialog.cpp @@ -11,18 +11,12 @@ #include "zeiterfassungsettings.h" SettingsDialog::SettingsDialog(ZeiterfassungSettings &settings, QWidget *parent) : - QDialog(parent), + ZeiterfassungDialog(parent), ui(new Ui::SettingsDialog), m_settings(settings) { ui->setupUi(this); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - setWindowFlag(Qt::WindowContextHelpButtonHint, false); -#else - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); -#endif - ui->comboBoxLanguage->addItem(tr("English"), QLocale::English); ui->comboBoxLanguage->addItem(tr("German"), QLocale::German); diff --git a/zeiterfassungguilib/dialogs/settingsdialog.h b/zeiterfassungguilib/dialogs/settingsdialog.h index bec947a..3315276 100644 --- a/zeiterfassungguilib/dialogs/settingsdialog.h +++ b/zeiterfassungguilib/dialogs/settingsdialog.h @@ -1,13 +1,12 @@ #pragma once -#include - #include "zeiterfassungguilib_global.h" +#include "zeiterfassungdialog.h" class ZeiterfassungSettings; namespace Ui { class SettingsDialog; } -class ZEITERFASSUNGGUILIBSHARED_EXPORT SettingsDialog : public QDialog +class ZEITERFASSUNGGUILIBSHARED_EXPORT SettingsDialog : public ZeiterfassungDialog { Q_OBJECT