let the parent window set the dialog title
This commit is contained in:
parent
4e536a6f1e
commit
170eb40f50
|
@ -1,18 +1,14 @@
|
|||
#include "adduniversedialog.h"
|
||||
#include "ui_adduniversedialog.h"
|
||||
|
||||
AddUniverseDialog::AddUniverseDialog(QWidget *parent, uint16_t universe,
|
||||
QString title)
|
||||
AddUniverseDialog::AddUniverseDialog(QWidget *parent, uint16_t universe)
|
||||
: QDialog(parent)
|
||||
, ui(new Ui::AddUniverseDialog)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->spinBox->setValue(universe);
|
||||
|
||||
setWindowTitle(title.isEmpty() ? tr("Add Universe") : title);
|
||||
|
||||
connect(this, &QDialog::accepted,
|
||||
this, [this](){ emit additionRequested(ui->spinBox->value());});
|
||||
this, [this](){emit additionRequested(ui->spinBox->value());});
|
||||
}
|
||||
|
||||
AddUniverseDialog::~AddUniverseDialog()
|
||||
|
|
|
@ -13,12 +13,11 @@ class AddUniverseDialog : public QDialog
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AddUniverseDialog(QWidget *parent = nullptr, uint16_t universe = 1,
|
||||
QString title = "");
|
||||
explicit AddUniverseDialog(QWidget *parent = nullptr, uint16_t universe = 1);
|
||||
virtual ~AddUniverseDialog();
|
||||
|
||||
signals:
|
||||
void additionRequested(int universe);
|
||||
void additionRequested(uint16_t universe);
|
||||
|
||||
private:
|
||||
Ui::AddUniverseDialog *ui;
|
||||
|
|
|
@ -66,9 +66,10 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
|
|||
|
||||
connect(ui->actionCreate, &QAction::triggered,
|
||||
this, [this, node]() {
|
||||
auto dialog = new AddUniverseDialog(this, 1, tr("Create Universe"));
|
||||
auto dialog = new AddUniverseDialog(this, 1);
|
||||
connect(dialog, &AddUniverseDialog::additionRequested,
|
||||
node, &QSacnNode::create);
|
||||
dialog->setWindowTitle(tr("Create"));
|
||||
dialog->setAttribute(Qt::WA_DeleteOnClose);
|
||||
dialog->open();
|
||||
});
|
||||
|
@ -95,10 +96,10 @@ MultiverseWindow::MultiverseWindow(QWidget *parent, QSacnNode *node)
|
|||
auto item = static_cast<MultiverseItem*>(actual.internalPointer());
|
||||
val = item->data(MultiverseModel::Column::Universe, Qt::DisplayRole);
|
||||
}
|
||||
auto dialog = new AddUniverseDialog(this, val.toInt(),
|
||||
tr("Subscribe to Universe"));
|
||||
auto dialog = new AddUniverseDialog(this, val.toInt());
|
||||
connect(dialog, &AddUniverseDialog::additionRequested,
|
||||
node, &QSacnNode::subscribe);
|
||||
dialog->setWindowTitle(tr("Subscribe"));
|
||||
dialog->setAttribute(Qt::WA_DeleteOnClose);
|
||||
dialog->open();
|
||||
});
|
||||
|
@ -228,10 +229,10 @@ void MultiverseWindow::createEditor(const QModelIndex &index)
|
|||
qMetaTypeId<sACN::EXTENDED::DISCOVERY::discoveredUniverse*>())
|
||||
{
|
||||
auto disc = data.value<sACN::EXTENDED::DISCOVERY::discoveredUniverse*>();
|
||||
auto dialog = new AddUniverseDialog(this, disc->universe,
|
||||
tr("Subscribe to Universe"));
|
||||
auto dialog = new AddUniverseDialog(this, disc->universe);
|
||||
connect(dialog, &AddUniverseDialog::additionRequested,
|
||||
node, &QSacnNode::subscribe);
|
||||
dialog->setWindowTitle(tr("Create"));
|
||||
dialog->setAttribute(Qt::WA_DeleteOnClose);
|
||||
dialog->open();
|
||||
return;
|
||||
|
|
Loading…
Reference in New Issue