ui: rename QDialogBase to DialogBase (#29675)

rename QDialogBase to DialogBase
pull/30757/head
Dean Lee 2 years ago committed by GitHub
parent 5716dfc9b5
commit c36774dfba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      selfdrive/ui/qt/widgets/input.cc
  2. 10
      selfdrive/ui/qt/widgets/input.h
  3. 2
      selfdrive/ui/qt/widgets/prime.cc
  4. 2
      selfdrive/ui/qt/widgets/prime.h

@ -9,7 +9,7 @@
#include "selfdrive/ui/qt/widgets/scrollview.h" #include "selfdrive/ui/qt/widgets/scrollview.h"
QDialogBase::QDialogBase(QWidget *parent) : QDialog(parent) { DialogBase::DialogBase(QWidget *parent) : QDialog(parent) {
Q_ASSERT(parent != nullptr); Q_ASSERT(parent != nullptr);
parent->installEventFilter(this); parent->installEventFilter(this);
@ -19,7 +19,7 @@ QDialogBase::QDialogBase(QWidget *parent) : QDialog(parent) {
color: white; color: white;
font-family: Inter; font-family: Inter;
} }
QDialogBase { DialogBase {
background-color: black; background-color: black;
} }
QPushButton { QPushButton {
@ -36,19 +36,19 @@ QDialogBase::QDialogBase(QWidget *parent) : QDialog(parent) {
)"); )");
} }
bool QDialogBase::eventFilter(QObject *o, QEvent *e) { bool DialogBase::eventFilter(QObject *o, QEvent *e) {
if (o == parent() && e->type() == QEvent::Hide) { if (o == parent() && e->type() == QEvent::Hide) {
reject(); reject();
} }
return QDialog::eventFilter(o, e); return QDialog::eventFilter(o, e);
} }
int QDialogBase::exec() { int DialogBase::exec() {
setMainWindow(this); setMainWindow(this);
return QDialog::exec(); return QDialog::exec();
} }
InputDialog::InputDialog(const QString &title, QWidget *parent, const QString &subtitle, bool secret) : QDialogBase(parent) { InputDialog::InputDialog(const QString &title, QWidget *parent, const QString &subtitle, bool secret) : DialogBase(parent) {
main_layout = new QVBoxLayout(this); main_layout = new QVBoxLayout(this);
main_layout->setContentsMargins(50, 55, 50, 50); main_layout->setContentsMargins(50, 55, 50, 50);
main_layout->setSpacing(0); main_layout->setSpacing(0);
@ -188,7 +188,7 @@ void InputDialog::setMinLength(int length) {
// ConfirmationDialog // ConfirmationDialog
ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, const QString &cancel_text, ConfirmationDialog::ConfirmationDialog(const QString &prompt_text, const QString &confirm_text, const QString &cancel_text,
const bool rich, QWidget *parent) : QDialogBase(parent) { const bool rich, QWidget *parent) : DialogBase(parent) {
QFrame *container = new QFrame(this); QFrame *container = new QFrame(this);
container->setStyleSheet(R"( container->setStyleSheet(R"(
QFrame { background-color: #1B1B1B; color: #C9C9C9; } QFrame { background-color: #1B1B1B; color: #C9C9C9; }
@ -245,7 +245,7 @@ bool ConfirmationDialog::rich(const QString &prompt_text, QWidget *parent) {
// MultiOptionDialog // MultiOptionDialog
MultiOptionDialog::MultiOptionDialog(const QString &prompt_text, const QStringList &l, const QString &current, QWidget *parent) : QDialogBase(parent) { MultiOptionDialog::MultiOptionDialog(const QString &prompt_text, const QStringList &l, const QString &current, QWidget *parent) : DialogBase(parent) {
QFrame *container = new QFrame(this); QFrame *container = new QFrame(this);
container->setStyleSheet(R"( container->setStyleSheet(R"(
QFrame { background-color: #1B1B1B; } QFrame { background-color: #1B1B1B; }

@ -10,18 +10,18 @@
#include "selfdrive/ui/qt/widgets/keyboard.h" #include "selfdrive/ui/qt/widgets/keyboard.h"
class QDialogBase : public QDialog { class DialogBase : public QDialog {
Q_OBJECT Q_OBJECT
protected: protected:
QDialogBase(QWidget *parent); DialogBase(QWidget *parent);
bool eventFilter(QObject *o, QEvent *e) override; bool eventFilter(QObject *o, QEvent *e) override;
public slots: public slots:
int exec() override; int exec() override;
}; };
class InputDialog : public QDialogBase { class InputDialog : public DialogBase {
Q_OBJECT Q_OBJECT
public: public:
@ -50,7 +50,7 @@ signals:
void emitText(const QString &text); void emitText(const QString &text);
}; };
class ConfirmationDialog : public QDialogBase { class ConfirmationDialog : public DialogBase {
Q_OBJECT Q_OBJECT
public: public:
@ -61,7 +61,7 @@ public:
static bool rich(const QString &prompt_text, QWidget *parent); static bool rich(const QString &prompt_text, QWidget *parent);
}; };
class MultiOptionDialog : public QDialogBase { class MultiOptionDialog : public DialogBase {
Q_OBJECT Q_OBJECT
public: public:

@ -68,7 +68,7 @@ void PairingQRWidget::paintEvent(QPaintEvent *e) {
} }
PairingPopup::PairingPopup(QWidget *parent) : QDialogBase(parent) { PairingPopup::PairingPopup(QWidget *parent) : DialogBase(parent) {
QHBoxLayout *hlayout = new QHBoxLayout(this); QHBoxLayout *hlayout = new QHBoxLayout(this);
hlayout->setContentsMargins(0, 0, 0, 0); hlayout->setContentsMargins(0, 0, 0, 0);
hlayout->setSpacing(0); hlayout->setSpacing(0);

@ -28,7 +28,7 @@ private slots:
// pairing popup widget // pairing popup widget
class PairingPopup : public QDialogBase { class PairingPopup : public DialogBase {
Q_OBJECT Q_OBJECT
public: public:

Loading…
Cancel
Save