From 3eeb14ed447f07163c7e6987f91d702135444abe Mon Sep 17 00:00:00 2001 From: Nikhil Tanwar <2002nikhiltanwar@gmail.com> Date: Mon, 3 Jun 2024 19:08:20 +0530 Subject: [PATCH] KiwixConfirmBox is now KiwixMessageBox It started as a simple yes/no box but is now being used as an InfoBox, ConfirmBox and a customized MessageBox (in further commits) - this sounds better! --- kiwix-desktop.pro | 6 ++--- src/contentmanager.cpp | 2 +- src/downloadmanagement.cpp | 2 +- ...iwixconfirmbox.cpp => kiwixmessagebox.cpp} | 14 ++++++------ src/{kiwixconfirmbox.h => kiwixmessagebox.h} | 22 +++++++++---------- ui/{kiwixconfirmbox.ui => kiwixmessagebox.ui} | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) rename src/{kiwixconfirmbox.cpp => kiwixmessagebox.cpp} (77%) rename src/{kiwixconfirmbox.h => kiwixmessagebox.h} (71%) rename ui/{kiwixconfirmbox.ui => kiwixmessagebox.ui} (97%) diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro index 934f09d..23b741d 100644 --- a/kiwix-desktop.pro +++ b/kiwix-desktop.pro @@ -56,7 +56,7 @@ SOURCES += \ src/findinpagebar.cpp \ src/flowlayout.cpp \ src/kiwixchoicebox.cpp \ - src/kiwixconfirmbox.cpp \ + src/kiwixmessagebox.cpp \ src/kiwixlineedit.cpp \ src/kiwixlistwidget.cpp \ src/kiwixloader.cpp \ @@ -109,7 +109,7 @@ HEADERS += \ src/findinpagebar.h \ src/flowlayout.h \ src/kiwixchoicebox.h \ - src/kiwixconfirmbox.h \ + src/kiwixmessagebox.h \ src/kiwixlineedit.h \ src/kiwixlistwidget.h \ src/kiwixloader.h \ @@ -159,7 +159,7 @@ FORMS += \ src/contentmanagerview.ui \ src/findinpagebar.ui \ ui/kiwixchoicebox.ui \ - ui/kiwixconfirmbox.ui \ + ui/kiwixmessagebox.ui \ ui/mainwindow.ui \ ui/about.ui \ src/contentmanagerside.ui \ diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp index 2fc6d3a..b682c67 100644 --- a/src/contentmanager.cpp +++ b/src/contentmanager.cpp @@ -17,7 +17,7 @@ #include "node.h" #include "rownode.h" #include "descriptionnode.h" -#include "kiwixconfirmbox.h" +#include "kiwixmessagebox.h" #include #include "contentmanagerheader.h" #include diff --git a/src/downloadmanagement.cpp b/src/downloadmanagement.cpp index 52b4e20..16a4f7c 100644 --- a/src/downloadmanagement.cpp +++ b/src/downloadmanagement.cpp @@ -1,7 +1,7 @@ #include "downloadmanagement.h" #include "kiwixapp.h" -#include "kiwixconfirmbox.h" +#include "kiwixmessagebox.h" #include #include diff --git a/src/kiwixconfirmbox.cpp b/src/kiwixmessagebox.cpp similarity index 77% rename from src/kiwixconfirmbox.cpp rename to src/kiwixmessagebox.cpp index 8811bc6..0b1719b 100644 --- a/src/kiwixconfirmbox.cpp +++ b/src/kiwixmessagebox.cpp @@ -1,11 +1,11 @@ -#include "kiwixconfirmbox.h" -#include "ui_kiwixconfirmbox.h" +#include "kiwixmessagebox.h" +#include "ui_kiwixmessagebox.h" #include #include "kiwixapp.h" -KiwixConfirmBox::KiwixConfirmBox(QString confirmTitle, QString confirmText, bool okDialog, QWidget *parent) : +KiwixMessageBox::KiwixMessageBox(QString confirmTitle, QString confirmText, bool okDialog, QWidget *parent) : QDialog(parent), m_confirmTitle(confirmTitle), m_confirmText(confirmText), - ui(new Ui::kiwixconfirmbox) + ui(new Ui::kiwixmessagebox) { ui->setupUi(this); setWindowFlag(Qt::FramelessWindowHint, true); @@ -32,16 +32,16 @@ KiwixConfirmBox::KiwixConfirmBox(QString confirmTitle, QString confirmText, bool } } -KiwixConfirmBox::~KiwixConfirmBox() +KiwixMessageBox::~KiwixMessageBox() { delete ui; } void showInfoBox(QString title, QString text, QWidget *parent) { - KiwixConfirmBox *dialog = new KiwixConfirmBox(title, text, true, parent); + KiwixMessageBox *dialog = new KiwixMessageBox(title, text, true, parent); dialog->show(); - QObject::connect(dialog, &KiwixConfirmBox::okClicked, [=]() { + QObject::connect(dialog, &KiwixMessageBox::okClicked, [=]() { dialog->deleteLater(); }); } diff --git a/src/kiwixconfirmbox.h b/src/kiwixmessagebox.h similarity index 71% rename from src/kiwixconfirmbox.h rename to src/kiwixmessagebox.h index f8f35c4..41e195a 100644 --- a/src/kiwixconfirmbox.h +++ b/src/kiwixmessagebox.h @@ -1,21 +1,21 @@ -#ifndef KIWIXCONFIRMBOX_H -#define KIWIXCONFIRMBOX_H +#ifndef KIWIXMESSAGEBOX_H +#define KIWIXMESSAGEBOX_H #include #include namespace Ui { -class kiwixconfirmbox; +class kiwixmessagebox; } -class KiwixConfirmBox : public QDialog +class KiwixMessageBox : public QDialog { Q_OBJECT public: - KiwixConfirmBox(QString confirmTitle, QString confirmText, bool okDialog, QWidget *parent = nullptr); - ~KiwixConfirmBox(); + KiwixMessageBox(QString confirmTitle, QString confirmText, bool okDialog, QWidget *parent = nullptr); + ~KiwixMessageBox(); signals: void yesClicked(); @@ -25,7 +25,7 @@ signals: private: QString m_confirmTitle; QString m_confirmText; - Ui::kiwixconfirmbox *ui; + Ui::kiwixmessagebox *ui; }; @@ -35,13 +35,13 @@ template void showConfirmBox(QString title, QString text, QWidget *parent, YesAction yesAction) { - KiwixConfirmBox *dialog = new KiwixConfirmBox(title, text, false, parent); + KiwixMessageBox *dialog = new KiwixMessageBox(title, text, false, parent); dialog->show(); - QObject::connect(dialog, &KiwixConfirmBox::yesClicked, [=]() { + QObject::connect(dialog, &KiwixMessageBox::yesClicked, [=]() { yesAction(); dialog->deleteLater(); }); - QObject::connect(dialog, &KiwixConfirmBox::noClicked, [=]() { + QObject::connect(dialog, &KiwixMessageBox::noClicked, [=]() { dialog->deleteLater(); }); } @@ -66,4 +66,4 @@ inline void showErrorBox(const KiwixAppError& err, QWidget *parent = nullptr) showInfoBox(err.summary(), err.details(), parent); } -#endif // KIWIXCONFIRMBOX_H +#endif // KIWIXMESSAGEBOX_H diff --git a/ui/kiwixconfirmbox.ui b/ui/kiwixmessagebox.ui similarity index 97% rename from ui/kiwixconfirmbox.ui rename to ui/kiwixmessagebox.ui index a561970..d2e9a2d 100644 --- a/ui/kiwixconfirmbox.ui +++ b/ui/kiwixmessagebox.ui @@ -1,7 +1,7 @@ - kiwixconfirmbox - + kiwixmessagebox + 0