diff -r 5bd0d7be0167 -r 7992c686e349 src/InventoryWaters.cpp
--- a/src/InventoryWaters.cpp	Sun Mar 20 17:22:27 2022 +0100
+++ b/src/InventoryWaters.cpp	Sun Mar 20 17:33:18 2022 +0100
@@ -21,14 +21,73 @@
 #include "bmsapp.h"
 
 
-InventoryWaters::InventoryWaters(QWidget *parent) : QDialog(parent), ui(new Ui::InventoryWaters)
+InventoryWaters::InventoryWaters(QWidget *parent) : QDialog(parent)
 {
     qDebug() << "InventoryWaters start";
 
-    ui->setupUi(this);
+    gridLayout = new QGridLayout(this);
+    gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+    tableWaters = new QTableWidget(this);
+    tableWaters->setObjectName(QString::fromUtf8("tableWaters"));
+    tableWaters->setEnabled(true);
+    QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    tableWaters->setSizePolicy(sizePolicy);
+    tableWaters->setMinimumSize(QSize(954, 0));
+    gridLayout->addWidget(tableWaters, 0, 0, 1, 1);
+
+    groupBox = new QGroupBox(this);
+    groupBox->setObjectName(QString::fromUtf8("groupBox"));
+    groupBox->setEnabled(true);
+    groupBox->setFlat(false);
+    horizontalLayout = new QHBoxLayout(groupBox);
+    horizontalLayout->setSpacing(6);
+    horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
+
+    quitButton = new QPushButton(groupBox);
+    quitButton->setObjectName(QString::fromUtf8("quitButton"));
+    quitButton->setMinimumSize(QSize(80, 24));
+    quitButton->setText(tr("Quit"));
+    QIcon icon;
+    icon.addFile(QString::fromUtf8(":icons/silk/door_out.png"), QSize(), QIcon::Normal, QIcon::Off);
+    quitButton->setIcon(icon);
+    horizontalLayout->addWidget(quitButton, 0, Qt::AlignLeft);
+
+    exportButton = new QPushButton(groupBox);
+    exportButton->setObjectName(QString::fromUtf8("exportButton"));
+    exportButton->setMinimumSize(QSize(80, 24));
+    exportButton->setText(tr("Export"));
+    QIcon icon1;
+    icon1.addFile(QString::fromUtf8(":/icons/silk/database_save.png"), QSize(), QIcon::Normal, QIcon::Off);
+    exportButton->setIcon(icon1);
+    horizontalLayout->addWidget(exportButton, 0, Qt::AlignRight);
+
+    importButton = new QPushButton(groupBox);
+    importButton->setObjectName(QString::fromUtf8("importButton"));
+    importButton->setMinimumSize(QSize(80, 24));
+    importButton->setText(tr("Import"));
+    QIcon icon2;
+    icon2.addFile(QString::fromUtf8(":/icons/silk/database_add.png"), QSize(), QIcon::Normal, QIcon::Off);
+    importButton->setIcon(icon2);
+    horizontalLayout->addWidget(importButton, 0, Qt::AlignRight);
+
+    insertButton = new QPushButton(groupBox);
+    insertButton->setObjectName(QString::fromUtf8("insertButton"));
+    insertButton->setMinimumSize(QSize(80, 24));
+    insertButton->setText(tr("New"));
+    QIcon icon3;
+    icon3.addFile(QString::fromUtf8(":icons/silk/table_row_insert.png"), QSize(), QIcon::Normal, QIcon::Off);
+    insertButton->setIcon(icon3);
+    horizontalLayout->addWidget(insertButton, 0, Qt::AlignRight);
+    gridLayout->addWidget(groupBox, 1, 0, 1, 1);
+
+    connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromInventoryWaters()));
+    connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked()));
+    connect(exportButton, SIGNAL(clicked()), this, SLOT(on_exportButton_clicked()));
+//    connect(importButton, SIGNAL(clicked()), this, SLOT(on_importButton_clicked()));
     emit refreshTable();
-
-    setWindowTitle( QString("BMSapp - %1 - Inventory Waters").arg(VERSIONSTRING) );
 }
 
 
@@ -44,24 +103,23 @@
     QSqlQuery query("SELECT * FROM inventory_waters ORDER BY name");
     const QStringList labels({tr("Name"), tr("Notes"), tr("Unlimited"), tr("Stock"), tr("Edit")});
 
-    ui->tableWaters->setColumnCount(5);
-    ui->tableWaters->setColumnWidth(0, 200);	/* Name		*/
-    ui->tableWaters->setColumnWidth(1, 500);	/* Notes	*/
-    ui->tableWaters->setColumnWidth(2,  75);	/* Unlimited	*/
-    ui->tableWaters->setColumnWidth(3,  75);	/* Stock	*/
-    ui->tableWaters->setColumnWidth(4,  80);	/* Edit button	*/
-    ui->tableWaters->setRowCount(query.size());
-    ui->tableWaters->setHorizontalHeaderLabels(labels);
-    ui->tableWaters->verticalHeader()->hide();
-    ui->tableWaters->setFixedSize(930 + 24, 640);	/* Even if this is too large, it works */
+    this->tableWaters->setColumnCount(5);
+    this->tableWaters->setColumnWidth(0, 200);	/* Name		*/
+    this->tableWaters->setColumnWidth(1, 500);	/* Notes	*/
+    this->tableWaters->setColumnWidth(2,  75);	/* Unlimited	*/
+    this->tableWaters->setColumnWidth(3,  75);	/* Stock	*/
+    this->tableWaters->setColumnWidth(4,  80);	/* Edit button	*/
+    this->tableWaters->setRowCount(query.size());
+    this->tableWaters->setHorizontalHeaderLabels(labels);
+    this->tableWaters->verticalHeader()->hide();
 
     QTableWidgetItem *rightitem = new QTableWidgetItem();
     rightitem->setTextAlignment(Qt::AlignRight);
 
     query.first();
     for (int ridx = 0 ; ridx < query.size() ; ridx++ ) {
-	ui->tableWaters->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString()));	/* Name */
-	ui->tableWaters->setItem(ridx, 1, new QTableWidgetItem(query.value(10).toString()));	/* Notes */
+	this->tableWaters->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString()));	/* Name */
+	this->tableWaters->setItem(ridx, 1, new QTableWidgetItem(query.value(10).toString()));	/* Notes */
 	if (query.value(2).toInt()) {
             pWidget = new QWidget();
             label = new QLabel;
@@ -71,9 +129,9 @@
             pLayout->setAlignment(Qt::AlignCenter);
             pLayout->setContentsMargins(0, 0, 0, 0);
             pWidget->setLayout(pLayout);
-            ui->tableWaters->setCellWidget(ridx, 2, pWidget);
+            this->tableWaters->setCellWidget(ridx, 2, pWidget);
         } else {
-	    ui->tableWaters->removeCellWidget(ridx, 2);
+	    this->tableWaters->removeCellWidget(ridx, 2);
 	}
 
 	w = QString("");
@@ -82,7 +140,7 @@
         }
         QTableWidgetItem *item = new QTableWidgetItem(w);
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
-        ui->tableWaters->setItem(ridx, 3, item);
+        this->tableWaters->setItem(ridx, 3, item);
 
 	/* Add the Edit button */
 	pWidget = new QWidget();
@@ -94,25 +152,17 @@
 	pLayout->addWidget(btn_edit);
 	pLayout->setContentsMargins(5, 0, 5, 0);
 	pWidget->setLayout(pLayout);
-	ui->tableWaters->setCellWidget(ridx, 4, pWidget);
+	this->tableWaters->setCellWidget(ridx, 4, pWidget);
 	query.next();
     }
-
-    setWindowTitle( QString("BMSapp - %1 - Inventory Waters").arg(VERSIONSTRING) );
 }
 
 
-InventoryWaters::~InventoryWaters()
-{
-    qDebug() << "InventoryWaters done";
-    delete ui;
-}
+InventoryWaters::~InventoryWaters() {}
 
 
 void InventoryWaters::edit(int recno)
 {
-    qDebug() << "InventoryWaters edit:" << recno;
-
     EditWater dialog(recno, this);
     /* Signal from editor if a refresh is needed */
     connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable()));
@@ -125,14 +175,12 @@
 {
     QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender());
     int recno = pb->objectName().toInt();
-    qDebug() << Q_FUNC_INFO << recno;
     edit(recno);
 }
 
 
 void InventoryWaters::on_insertButton_clicked()
 {
-    qDebug() << Q_FUNC_INFO;
     edit(-1);
 }
 
@@ -187,8 +235,3 @@
 }
 
 
-void InventoryWaters::on_quitButton_clicked()
-{
-    emit firstWindow();
-}
-