1
0
Fork 0

finish renaming the window

This commit is contained in:
Kevin Matz 2022-12-03 21:21:08 -05:00
parent 8c54793edd
commit 6e6b47edb5
6 changed files with 14 additions and 16 deletions

View File

@ -216,7 +216,7 @@ void MultiverseView::createEditor(const QModelIndex &index)
foreach (const auto & inspector, mInspectors)
if (inspector->universe() == univ)
return inspector->show();
auto view = new UniverseInspector(this, univ);
auto view = new UniverseWindow(this, univ);
mInspectors.insert(view);
connect(view, &QObject::destroyed, this, [this, view](){mInspectors.remove(view);});
connect(univ, &QObject::destroyed, view, &QMainWindow::close);

View File

@ -62,5 +62,5 @@ private:
QSacnNode * node;
MultiverseModel * model;
QSortFilterProxyModel *sortProxy;
QSet<UniverseInspector*> mInspectors;
QSet<UniverseWindow*> mInspectors;
};

View File

@ -7,7 +7,6 @@ class UniverseModel
: public QAbstractTableModel
{
Q_OBJECT
public:
explicit UniverseModel(QObject *parent = nullptr,
QSacnUniverse *universe = nullptr);

View File

@ -10,9 +10,9 @@
* @brief UniverseView::UniverseView
* @param parent
*/
UniverseInspector::UniverseInspector(QWidget *parent, QSacnUniverse *universe)
UniverseWindow::UniverseWindow(QWidget *parent, QSacnUniverse *universe)
: QMainWindow(parent)
, ui(new Ui::UniverseInspector())
, ui(new Ui::UniverseWindow())
, mUniverse(universe)
{
ui->setupUi(this);
@ -63,7 +63,7 @@ UniverseInspector::UniverseInspector(QWidget *parent, QSacnUniverse *universe)
/**
* @brief UniverseView::~UniverseView
*/
UniverseInspector::~UniverseInspector()
UniverseWindow::~UniverseWindow()
{
delete ui;
}
@ -72,7 +72,7 @@ UniverseInspector::~UniverseInspector()
/**
* @brief UniverseView::updateStatusBar
*/
void UniverseInspector::update_status_()
void UniverseWindow::update_status_()
{
// window title
this->setWindowTitle(QString("%1 '%2' : "+tr("Universe")+" %3").arg(

View File

@ -7,19 +7,18 @@
QT_BEGIN_NAMESPACE
namespace Ui {
class UniverseInspector;
class UniverseWindow;
}
QT_END_NAMESPACE
class UniverseInspector
class UniverseWindow
: public QMainWindow
{
Q_OBJECT
public:
explicit UniverseInspector(QWidget *parent = nullptr,
QSacnUniverse* universe = nullptr);
virtual ~UniverseInspector();
explicit UniverseWindow(QWidget *parent = nullptr,
QSacnUniverse* universe = nullptr);
virtual ~UniverseWindow();
/**
* @brief universe
@ -28,7 +27,7 @@ public:
QSacnUniverse * universe() { return mUniverse; }
private:
Ui::UniverseInspector *ui;
Ui::UniverseWindow *ui;
QSpinBox *prioritySpinBox;
QSacnUniverse *mUniverse;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UniverseInspector</class>
<widget class="QMainWindow" name="UniverseInspector">
<class>UniverseWindow</class>
<widget class="QMainWindow" name="UniverseWindow">
<property name="geometry">
<rect>
<x>0</x>