Sun, 20 Mar 2022 20:45:58 +0100
Profile Waters now on the mainscreen.
CMakeLists.txt | file | annotate | diff | comparison | revisions | |
src/MainWindow.cpp | file | annotate | diff | comparison | revisions | |
src/MainWindow.h | file | annotate | diff | comparison | revisions | |
src/ProfileWaters.cpp | file | annotate | diff | comparison | revisions | |
src/ProfileWaters.h | file | annotate | diff | comparison | revisions | |
ui/ProfileWaters.ui | file | annotate | diff | comparison | revisions |
--- a/CMakeLists.txt Sun Mar 20 19:44:32 2022 +0100 +++ b/CMakeLists.txt Sun Mar 20 20:45:58 2022 +0100 @@ -173,7 +173,6 @@ ${UIDIR}/EditMisc.ui ${UIDIR}/EditWater.ui ${UIDIR}/EditEquipment.ui - ${UIDIR}/ProfileWaters.ui ${UIDIR}/EditProfileWater.ui ${UIDIR}/ProfileMashs.ui ${UIDIR}/EditProfileMash.ui
--- a/src/MainWindow.cpp Sun Mar 20 19:44:32 2022 +0100 +++ b/src/MainWindow.cpp Sun Mar 20 20:45:58 2022 +0100 @@ -245,8 +245,11 @@ void MainWindow::fromProfileWaters() { qDebug() << Q_FUNC_INFO; + ui->mainStack->setCurrentIndex(-1); + ui->mainStack->removeWidget(ProfileWatersWindow); delete ProfileWatersWindow; - this->show(); + setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); + ui->menuBar->setVisible(true); } @@ -254,9 +257,11 @@ { qDebug() << Q_FUNC_INFO; ProfileWatersWindow = new ProfileWaters(this); - QObject::connect(ProfileWatersWindow, SIGNAL(firstWindow()), this, SLOT(fromProfileWaters())); - this->hide(); // Close the main window - ProfileWatersWindow->show(); // Show a second window + int index = ui->mainStack->count(); + ui->mainStack->addWidget(ProfileWatersWindow); + ui->mainStack->setCurrentIndex(index); + setWindowTitle(QString("BMSapp - %1 - Profile Waters").arg(VERSIONSTRING)); +// ui->menuBar->setVisible(false); }
--- a/src/MainWindow.h Sun Mar 20 19:44:32 2022 +0100 +++ b/src/MainWindow.h Sun Mar 20 20:45:58 2022 +0100 @@ -39,6 +39,11 @@ InventoryMiscs *InventoryMiscsWindow; InventoryWaters *InventoryWatersWindow; InventoryEquipments *InventoryEquipmentsWindow; + ProfileWaters *ProfileWatersWindow; + ProfileMashs *ProfileMashsWindow; + ProfileStyles *ProfileStylesWindow; + ProfileFerments *ProfileFermentsWindow; + Setup *SetupWindow; private slots: void on_actionExit_triggered(); @@ -74,13 +79,6 @@ private: Ui::MainWindow *ui; - - // Keep pointers to new windows. - ProfileWaters *ProfileWatersWindow; - ProfileMashs *ProfileMashsWindow; - ProfileStyles *ProfileStylesWindow; - ProfileFerments *ProfileFermentsWindow; - Setup *SetupWindow; }; #endif
--- a/src/ProfileWaters.cpp Sun Mar 20 19:44:32 2022 +0100 +++ b/src/ProfileWaters.cpp Sun Mar 20 20:45:58 2022 +0100 @@ -16,19 +16,58 @@ */ #include "ProfileWaters.h" #include "EditProfileWater.h" -#include "../ui/ui_ProfileWaters.h" +#include "MainWindow.h" #include "config.h" #include "bmsapp.h" -ProfileWaters::ProfileWaters(QWidget *parent) : QDialog(parent), ui(new Ui::ProfileWaters) +ProfileWaters::ProfileWaters(QWidget *parent) : QDialog(parent) { qDebug() << "ProfileWaters 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(1154, 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); + + 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(fromProfileWaters())); + connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked())); emit refreshTable(); - - setWindowTitle( QString("BMSapp - %1 - Profile Waters").arg(VERSIONSTRING) ); } @@ -44,64 +83,63 @@ QSqlQuery query("SELECT * FROM profile_water ORDER BY name"); const QStringList labels({tr("Name"), tr("Notes"), tr("Ca"), tr("Mg"), tr("Na"), tr("CaCO3"), tr("Cl"), tr("SO4"), tr("pH"), tr("Edit")}); - ui->tableWaters->setColumnCount(10); - ui->tableWaters->setColumnWidth(0, 150); /* Name */ - ui->tableWaters->setColumnWidth(1, 375); /* Notes */ - ui->tableWaters->setColumnWidth(2, 75); /* Ca */ - ui->tableWaters->setColumnWidth(3, 75); /* Mg */ - ui->tableWaters->setColumnWidth(4, 75); /* Na */ - ui->tableWaters->setColumnWidth(5, 75); /* CaCO3 */ - ui->tableWaters->setColumnWidth(6, 75); /* Cl */ - ui->tableWaters->setColumnWidth(7, 75); /* SO4 */ - ui->tableWaters->setColumnWidth(8, 75); /* pH */ - ui->tableWaters->setColumnWidth(9, 80); /* Edit button */ - ui->tableWaters->setRowCount(query.size()); - ui->tableWaters->setHorizontalHeaderLabels(labels); - ui->tableWaters->verticalHeader()->hide(); - ui->tableWaters->setFixedSize(1130 + 24, 640); /* Even if this is too large, it works */ + this->tableWaters->setColumnCount(10); + this->tableWaters->setColumnWidth(0, 150); /* Name */ + this->tableWaters->setColumnWidth(1, 375); /* Notes */ + this->tableWaters->setColumnWidth(2, 75); /* Ca */ + this->tableWaters->setColumnWidth(3, 75); /* Mg */ + this->tableWaters->setColumnWidth(4, 75); /* Na */ + this->tableWaters->setColumnWidth(5, 75); /* CaCO3 */ + this->tableWaters->setColumnWidth(6, 75); /* Cl */ + this->tableWaters->setColumnWidth(7, 75); /* SO4 */ + this->tableWaters->setColumnWidth(8, 75); /* pH */ + this->tableWaters->setColumnWidth(9, 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(9).toString())); /* Notes */ + this->tableWaters->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString())); /* Name */ + this->tableWaters->setItem(ridx, 1, new QTableWidgetItem(query.value(9).toString())); /* Notes */ w = QString("%1").arg(query.value(2).toDouble(), 2, 'f', 1, '0' ); /* Ca */ QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableWaters->setItem(ridx, 2, item); + this->tableWaters->setItem(ridx, 2, item); w = QString("%1").arg(query.value(7).toDouble(), 2, 'f', 1, '0' ); /* Mg */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableWaters->setItem(ridx, 3, item); + this->tableWaters->setItem(ridx, 3, item); w = QString("%1").arg(query.value(6).toDouble(), 2, 'f', 1, '0' ); /* Na */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableWaters->setItem(ridx, 4, item); + this->tableWaters->setItem(ridx, 4, item); w = QString("%1").arg(query.value(10).toDouble(), 2, 'f', 1, '0' ); /* CaCO3 */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableWaters->setItem(ridx, 5, item); + this->tableWaters->setItem(ridx, 5, item); w = QString("%1").arg(query.value(5).toDouble(), 2, 'f', 1, '0' ); /* Cl */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableWaters->setItem(ridx, 6, item); + this->tableWaters->setItem(ridx, 6, item); w = QString("%1").arg(query.value(4).toDouble(), 2, 'f', 1, '0' ); /* SO4 */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableWaters->setItem(ridx, 7, item); + this->tableWaters->setItem(ridx, 7, item); w = QString("%1").arg(query.value(8).toDouble(), 2, 'f', 1, '0' ); /* pH */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableWaters->setItem(ridx, 8, item); + this->tableWaters->setItem(ridx, 8, item); /* Add the Edit button */ pWidget = new QWidget(); @@ -113,25 +151,17 @@ pLayout->addWidget(btn_edit); pLayout->setContentsMargins(5, 0, 5, 0); pWidget->setLayout(pLayout); - ui->tableWaters->setCellWidget(ridx, 9, pWidget); + this->tableWaters->setCellWidget(ridx, 9, pWidget); query.next(); } - - setWindowTitle( QString("BMSapp - %1 - Profile Waters").arg(VERSIONSTRING) ); } -ProfileWaters::~ProfileWaters() -{ - qDebug() << "ProfileWaters done"; - delete ui; -} +ProfileWaters::~ProfileWaters() {} void ProfileWaters::edit(int recno) { - qDebug() << "ProfileWaters edit:" << recno; - EditProfileWater dialog(recno, this); /* Signal from editor if a refresh is needed */ connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable())); @@ -144,20 +174,13 @@ { QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); int recno = pb->objectName().toInt(); - qDebug() << Q_FUNC_INFO << recno; edit(recno); } void ProfileWaters::on_insertButton_clicked() { - qDebug() << Q_FUNC_INFO; edit(-1); } -void ProfileWaters::on_quitButton_clicked() -{ - emit firstWindow(); -} -
--- a/src/ProfileWaters.h Sun Mar 20 19:44:32 2022 +0100 +++ b/src/ProfileWaters.h Sun Mar 20 20:45:58 2022 +0100 @@ -2,6 +2,12 @@ #define _PROFILEWATERS_H #include <QDialog> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QTableWidget> namespace Ui { class ProfileWaters; @@ -15,17 +21,19 @@ explicit ProfileWaters(QWidget *parent = nullptr); ~ProfileWaters(); -signals: - void firstWindow(); - private slots: - void on_quitButton_clicked(); void on_insertButton_clicked(); void on_editButton_clicked(); void refreshTable(void); private: - Ui::ProfileWaters *ui; + QGridLayout *gridLayout; + QTableWidget *tableWaters; + QGroupBox *groupBox; + QHBoxLayout *horizontalLayout; + QPushButton *quitButton; + QPushButton *insertButton; + void edit(int recno); };
--- a/ui/ProfileWaters.ui Sun Mar 20 19:44:32 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>ProfileWaters</class> - <widget class="QDialog" name="ProfileWaters"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>1280</width> - <height>640</height> - </rect> - </property> - <property name="windowTitle"> - <string>Dialog</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QTableWidget" name="tableWaters"> - <property name="enabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QGroupBox" name="groupBox"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="flat"> - <bool>false</bool> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item alignment="Qt::AlignLeft"> - <widget class="QPushButton" name="quitButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>80</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>Quit</string> - </property> - <property name="icon"> - <iconset> - <normaloff>:icons/silk/door_out.png</normaloff>:icons/silk/door_out.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="insertButton"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>80</width> - <height>24</height> - </size> - </property> - <property name="text"> - <string>New</string> - </property> - <property name="icon"> - <iconset> - <normaloff>:icons/silk/table_row_insert.png</normaloff>:icons/silk/table_row_insert.png</iconset> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <resources> - <include location="../../../../../../home/mbroek/MyProjects/bmsapp/resources/icons.qrc"/> - </resources> - <connections/> -</ui>