From 4f452d5815e14043f3c0977673bf338491032520 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 15 Mar 2014 14:18:29 +0100 Subject: [PATCH] Add a timer for clicking away the notification dialog --- CMakeLists.txt | 3 ++ gui/MainWindow.cpp | 23 ++------ gui/dialogs/NotificationDialog.cpp | 84 +++++++++++++++++++++++++++++ gui/dialogs/NotificationDialog.h | 44 ++++++++++++++++ gui/dialogs/NotificationDialog.ui | 85 ++++++++++++++++++++++++++++++ 5 files changed, 219 insertions(+), 20 deletions(-) create mode 100644 gui/dialogs/NotificationDialog.cpp create mode 100644 gui/dialogs/NotificationDialog.h create mode 100644 gui/dialogs/NotificationDialog.ui diff --git a/CMakeLists.txt b/CMakeLists.txt index d9279bcb7..c4574ce04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -311,6 +311,8 @@ gui/dialogs/UpdateDialog.h gui/dialogs/UpdateDialog.cpp gui/dialogs/ScreenshotDialog.h gui/dialogs/ScreenshotDialog.cpp +gui/dialogs/NotificationDialog.h +gui/dialogs/NotificationDialog.cpp # GUI - widgets gui/widgets/Common.h @@ -565,6 +567,7 @@ gui/dialogs/AccountSelectDialog.ui gui/dialogs/EditAccountDialog.ui gui/dialogs/UpdateDialog.ui gui/dialogs/ScreenshotDialog.ui +gui/dialogs/NotificationDialog.ui # Widgets/other gui/widgets/MCModInfoFrame.ui diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 17d4630b4..65db066b1 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -62,6 +62,7 @@ #include "gui/dialogs/UpdateDialog.h" #include "gui/dialogs/EditAccountDialog.h" #include "gui/dialogs/ScreenshotDialog.h" +#include "gui/dialogs/NotificationDialog.h" #include "gui/ConsoleWindow.h" @@ -673,26 +674,8 @@ void MainWindow::notificationsChanged() NotificationChecker::NotificationEntry entry = *it; if (!shownNotifications.contains(entry.id) && entry.applies()) { - QMessageBox::Icon icon; - switch (entry.type) - { - case NotificationChecker::NotificationEntry::Critical: - icon = QMessageBox::Critical; - break; - case NotificationChecker::NotificationEntry::Warning: - icon = QMessageBox::Warning; - break; - case NotificationChecker::NotificationEntry::Information: - icon = QMessageBox::Information; - break; - } - - QMessageBox box(icon, tr("Notification"), entry.message, QMessageBox::Close, this); - QPushButton *dontShowAgainButton = - box.addButton(tr("Don't show again"), QMessageBox::AcceptRole); - box.setDefaultButton(QMessageBox::Close); - box.exec(); - if (box.clickedButton() == dontShowAgainButton) + NotificationDialog dialog(entry, this); + if (dialog.exec() == NotificationDialog::DontShowAgain) { shownNotifications.append(entry.id); } diff --git a/gui/dialogs/NotificationDialog.cpp b/gui/dialogs/NotificationDialog.cpp new file mode 100644 index 000000000..8f9203719 --- /dev/null +++ b/gui/dialogs/NotificationDialog.cpp @@ -0,0 +1,84 @@ +#include "NotificationDialog.h" +#include "ui_NotificationDialog.h" + +#include + +NotificationDialog::NotificationDialog(const NotificationChecker::NotificationEntry &entry, QWidget *parent) : + QDialog(parent, Qt::MSWindowsFixedSizeDialogHint | Qt::WindowTitleHint | Qt::CustomizeWindowHint), + ui(new Ui::NotificationDialog) +{ + ui->setupUi(this); + + QStyle::StandardPixmap icon; + switch (entry.type) + { + case NotificationChecker::NotificationEntry::Critical: + icon = QStyle::SP_MessageBoxCritical; + break; + case NotificationChecker::NotificationEntry::Warning: + icon = QStyle::SP_MessageBoxWarning; + break; + case NotificationChecker::NotificationEntry::Information: + icon = QStyle::SP_MessageBoxInformation; + break; + } + ui->iconLabel->setPixmap(style()->standardPixmap(icon, 0, this)); + ui->messageLabel->setText(entry.message); + + m_dontShowAgainText = tr("Don't show again"); + m_closeText = tr("Close"); + + ui->dontShowAgainBtn->setText(m_dontShowAgainText + QString(" (%1)").arg(m_dontShowAgainTime)); + ui->closeBtn->setText(m_closeText + QString(" (%1)").arg(m_closeTime)); + + startTimer(1000); +} + +NotificationDialog::~NotificationDialog() +{ + delete ui; +} + +void NotificationDialog::timerEvent(QTimerEvent *event) +{ + if (m_dontShowAgainTime > 0) + { + m_dontShowAgainTime--; + if (m_dontShowAgainTime == 0) + { + ui->dontShowAgainBtn->setText(m_dontShowAgainText); + ui->dontShowAgainBtn->setEnabled(true); + } + else + { + ui->dontShowAgainBtn->setText(m_dontShowAgainText + QString(" (%1)").arg(m_dontShowAgainTime)); + } + } + if (m_closeTime > 0) + { + m_closeTime--; + if (m_closeTime == 0) + { + ui->closeBtn->setText(m_closeText); + ui->closeBtn->setEnabled(true); + } + else + { + ui->closeBtn->setText(m_closeText + QString(" (%1)").arg(m_closeTime)); + } + } + + if (m_closeTime == 0 && m_dontShowAgainTime == 0) + { + killTimer(event->timerId()); + } +} + +void NotificationDialog::on_dontShowAgainBtn_clicked() +{ + done(DontShowAgain); +} +void NotificationDialog::on_closeBtn_clicked() +{ + done(Normal); +} diff --git a/gui/dialogs/NotificationDialog.h b/gui/dialogs/NotificationDialog.h new file mode 100644 index 000000000..b7980a989 --- /dev/null +++ b/gui/dialogs/NotificationDialog.h @@ -0,0 +1,44 @@ +#ifndef NOTIFICATIONDIALOG_H +#define NOTIFICATIONDIALOG_H + +#include + +#include "logic/updater/NotificationChecker.h" + +namespace Ui { +class NotificationDialog; +} + +class NotificationDialog : public QDialog +{ + Q_OBJECT + +public: + explicit NotificationDialog(const NotificationChecker::NotificationEntry &entry, QWidget *parent = 0); + ~NotificationDialog(); + + enum ExitCode + { + Normal, + DontShowAgain + }; + +protected: + void timerEvent(QTimerEvent *event); + +private: + Ui::NotificationDialog *ui; + + int m_dontShowAgainTime = 10; + int m_closeTime = 5; + + QString m_dontShowAgainText; + QString m_closeText; + +private +slots: + void on_dontShowAgainBtn_clicked(); + void on_closeBtn_clicked(); +}; + +#endif // NOTIFICATIONDIALOG_H diff --git a/gui/dialogs/NotificationDialog.ui b/gui/dialogs/NotificationDialog.ui new file mode 100644 index 000000000..a2a276e9c --- /dev/null +++ b/gui/dialogs/NotificationDialog.ui @@ -0,0 +1,85 @@ + + + NotificationDialog + + + + 0 + 0 + 320 + 240 + + + + Dialog + + + + + + + + TextLabel + + + + + + + TextLabel + + + true + + + true + + + Qt::TextBrowserInteraction + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + Don't show again + + + + + + + false + + + Close + + + + + + + + + +