mirror of
https://github.com/kiwix/kiwix-desktop.git
synced 2025-09-23 12:07:00 -04:00
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!
This commit is contained in:
parent
40461d72b3
commit
3eeb14ed44
@ -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 \
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include "node.h"
|
||||
#include "rownode.h"
|
||||
#include "descriptionnode.h"
|
||||
#include "kiwixconfirmbox.h"
|
||||
#include "kiwixmessagebox.h"
|
||||
#include <QtConcurrent/QtConcurrentRun>
|
||||
#include "contentmanagerheader.h"
|
||||
#include <QDesktopServices>
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "downloadmanagement.h"
|
||||
|
||||
#include "kiwixapp.h"
|
||||
#include "kiwixconfirmbox.h"
|
||||
#include "kiwixmessagebox.h"
|
||||
|
||||
#include <QStorageInfo>
|
||||
#include <QThread>
|
||||
|
@ -1,11 +1,11 @@
|
||||
#include "kiwixconfirmbox.h"
|
||||
#include "ui_kiwixconfirmbox.h"
|
||||
#include "kiwixmessagebox.h"
|
||||
#include "ui_kiwixmessagebox.h"
|
||||
#include <QFile>
|
||||
#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();
|
||||
});
|
||||
}
|
@ -1,21 +1,21 @@
|
||||
#ifndef KIWIXCONFIRMBOX_H
|
||||
#define KIWIXCONFIRMBOX_H
|
||||
#ifndef KIWIXMESSAGEBOX_H
|
||||
#define KIWIXMESSAGEBOX_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
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<class YesAction>
|
||||
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
|
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>kiwixconfirmbox</class>
|
||||
<widget class="QDialog" name="kiwixconfirmbox">
|
||||
<class>kiwixmessagebox</class>
|
||||
<widget class="QDialog" name="kiwixmessagebox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
Loading…
x
Reference in New Issue
Block a user