changeset
Profile Styles now on the mainscreen.
Sun, 20 Mar 2022 21:24:13 +0100
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Sun, 20 Mar 2022 21:24:13 +0100
- changeset 76
- 93395c4d6c8d
- parent 75
- 5f953abbd73c
- child 77
- 86a3277a7317
Profile Styles now on the mainscreen.
| CMakeLists.txt | file | annotate | diff | comparison | revisions | |
| src/MainWindow.cpp | file | annotate | diff | comparison | revisions | |
| src/ProfileStyles.cpp | file | annotate | diff | comparison | revisions | |
| src/ProfileStyles.h | file | annotate | diff | comparison | revisions | |
| ui/ProfileStyles.ui | file | annotate | diff | comparison | revisions |
--- a/CMakeLists.txt Sun Mar 20 20:59:05 2022 +0100 +++ b/CMakeLists.txt Sun Mar 20 21:24:13 2022 +0100 @@ -175,7 +175,6 @@ ${UIDIR}/EditEquipment.ui ${UIDIR}/EditProfileWater.ui ${UIDIR}/EditProfileMash.ui - ${UIDIR}/ProfileStyles.ui ${UIDIR}/EditProfileStyle.ui ${UIDIR}/ProfileFerments.ui ${UIDIR}/EditProfileFerment.ui
--- a/src/MainWindow.cpp Sun Mar 20 20:59:05 2022 +0100 +++ b/src/MainWindow.cpp Sun Mar 20 21:24:13 2022 +0100 @@ -291,8 +291,11 @@ void MainWindow::fromProfileStyles() { qDebug() << Q_FUNC_INFO; + ui->mainStack->setCurrentIndex(-1); + ui->mainStack->removeWidget(ProfileStylesWindow); delete ProfileStylesWindow; - this->show(); + setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); + ui->menuBar->setVisible(true); } @@ -300,9 +303,11 @@ { qDebug() << Q_FUNC_INFO; ProfileStylesWindow = new ProfileStyles(this); - QObject::connect(ProfileStylesWindow, SIGNAL(firstWindow()), this, SLOT(fromProfileStyles())); - this->hide(); // Close the main window - ProfileStylesWindow->show(); // Show a second window + int index = ui->mainStack->count(); + ui->mainStack->addWidget(ProfileStylesWindow); + ui->mainStack->setCurrentIndex(index); + setWindowTitle(QString("BMSapp - %1 - Styles Profiles").arg(VERSIONSTRING)); + ui->menuBar->setVisible(false); }
--- a/src/ProfileStyles.cpp Sun Mar 20 20:59:05 2022 +0100 +++ b/src/ProfileStyles.cpp Sun Mar 20 21:24:13 2022 +0100 @@ -16,19 +16,58 @@ */ #include "ProfileStyles.h" #include "EditProfileStyle.h" -#include "../ui/ui_ProfileStyles.h" +#include "MainWindow.h" #include "config.h" #include "bmsapp.h" -ProfileStyles::ProfileStyles(QWidget *parent) : QDialog(parent), ui(new Ui::ProfileStyles) +ProfileStyles::ProfileStyles(QWidget *parent) : QDialog(parent) { qDebug() << "ProfileStyles start"; - ui->setupUi(this); + gridLayout = new QGridLayout(this); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + tableStyles = new QTableWidget(this); + tableStyles->setObjectName(QString::fromUtf8("tableStyles")); + tableStyles->setEnabled(true); + QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + tableStyles->setSizePolicy(sizePolicy); + tableStyles->setMinimumSize(QSize(1049, 0)); + gridLayout->addWidget(tableStyles, 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(fromProfileStyles())); + connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked())); emit refreshTable(); - - setWindowTitle( QString("BMSapp - %1 - Profile Styles").arg(VERSIONSTRING) ); } @@ -45,96 +84,95 @@ const QStringList labels({tr("Guide"), tr("Gr"), tr("Name"), tr("OG"), tr("OG"), tr("FG"), tr("FG"), tr("IBU"), tr("IBU"), tr("EBC"), tr("EBC"), tr("Co2"), tr("Co2"), tr("ABV"), tr("ABV"), tr("Edit")}); - ui->tableStyles->setColumnCount(16); - ui->tableStyles->setColumnWidth(0, 100); /* Guide */ - ui->tableStyles->setColumnWidth(1, 25); /* Group */ - ui->tableStyles->setColumnWidth(2, 300); /* Name */ - ui->tableStyles->setColumnWidth(3, 50); /* OG */ - ui->tableStyles->setColumnWidth(4, 50); - ui->tableStyles->setColumnWidth(5, 50); /* FG */ - ui->tableStyles->setColumnWidth(6, 50); - ui->tableStyles->setColumnWidth(7, 40); /* IBU */ - ui->tableStyles->setColumnWidth(8, 40); - ui->tableStyles->setColumnWidth(9, 40); /* EBC */ - ui->tableStyles->setColumnWidth(10, 40); - ui->tableStyles->setColumnWidth(11, 40); /* Co2 */ - ui->tableStyles->setColumnWidth(12, 40); - ui->tableStyles->setColumnWidth(13, 40); /* ABV */ - ui->tableStyles->setColumnWidth(14, 40); - ui->tableStyles->setColumnWidth(15, 80); /* Edit button */ - ui->tableStyles->setRowCount(query.size()); - ui->tableStyles->setHorizontalHeaderLabels(labels); - ui->tableStyles->verticalHeader()->hide(); - ui->tableStyles->setFixedSize(1025 + 24, 640); /* Even if this is too large, it works */ + this->tableStyles->setColumnCount(16); + this->tableStyles->setColumnWidth(0, 100); /* Guide */ + this->tableStyles->setColumnWidth(1, 25); /* Group */ + this->tableStyles->setColumnWidth(2, 300); /* Name */ + this->tableStyles->setColumnWidth(3, 50); /* OG */ + this->tableStyles->setColumnWidth(4, 50); + this->tableStyles->setColumnWidth(5, 50); /* FG */ + this->tableStyles->setColumnWidth(6, 50); + this->tableStyles->setColumnWidth(7, 40); /* IBU */ + this->tableStyles->setColumnWidth(8, 40); + this->tableStyles->setColumnWidth(9, 40); /* EBC */ + this->tableStyles->setColumnWidth(10, 40); + this->tableStyles->setColumnWidth(11, 40); /* Co2 */ + this->tableStyles->setColumnWidth(12, 40); + this->tableStyles->setColumnWidth(13, 40); /* ABV */ + this->tableStyles->setColumnWidth(14, 40); + this->tableStyles->setColumnWidth(15, 80); /* Edit button */ + this->tableStyles->setRowCount(query.size()); + this->tableStyles->setHorizontalHeaderLabels(labels); + this->tableStyles->verticalHeader()->hide(); QTableWidgetItem *rightitem = new QTableWidgetItem(); rightitem->setTextAlignment(Qt::AlignRight); query.first(); for (int ridx = 0 ; ridx < query.size() ; ridx++ ) { - ui->tableStyles->setItem(ridx, 0, new QTableWidgetItem(query.value(5).toString())); /* Guide */ - ui->tableStyles->setItem(ridx, 1, new QTableWidgetItem(query.value(4).toString())); /* Goup */ - ui->tableStyles->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString())); /* Name */ + this->tableStyles->setItem(ridx, 0, new QTableWidgetItem(query.value(5).toString())); /* Guide */ + this->tableStyles->setItem(ridx, 1, new QTableWidgetItem(query.value(4).toString())); /* Goup */ + this->tableStyles->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString())); /* Name */ w = QString("%1").arg(query.value(7).toDouble(), 4, 'f', 3, '0' ); /* OG */ QTableWidgetItem *item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 3, item); + this->tableStyles->setItem(ridx, 3, item); w = QString("%1").arg(query.value(8).toDouble(), 4, 'f', 3, '0' ); /* OG */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 4, item); + this->tableStyles->setItem(ridx, 4, item); w = QString("%1").arg(query.value(9).toDouble(), 4, 'f', 3, '0' ); /* FG */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 5, item); + this->tableStyles->setItem(ridx, 5, item); w = QString("%1").arg(query.value(10).toDouble(), 4, 'f', 3, '0' ); /* FG */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 6, item); + this->tableStyles->setItem(ridx, 6, item); w = QString("%1").arg(query.value(11).toDouble(), 1, 'f', 0, '0' ); /* IBU */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 7, item); + this->tableStyles->setItem(ridx, 7, item); w = QString("%1").arg(query.value(12).toDouble(), 1, 'f', 0, '0' ); /* IBU */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 8, item); + this->tableStyles->setItem(ridx, 8, item); w = QString("%1").arg(query.value(13).toDouble(), 1, 'f', 0, '0' ); /* EBC */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 9, item); + this->tableStyles->setItem(ridx, 9, item); w = QString("%1").arg(query.value(14).toDouble(), 1, 'f', 0, '0' ); /* EBC */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 10, item); + this->tableStyles->setItem(ridx, 10, item); w = QString("%1").arg(query.value(15).toDouble(), 2, 'f', 1, '0' ); /* Co2 */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 11, item); + this->tableStyles->setItem(ridx, 11, item); w = QString("%1").arg(query.value(16).toDouble(), 2, 'f', 1, '0' ); /* Co2 */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 12, item); + this->tableStyles->setItem(ridx, 12, item); w = QString("%1").arg(query.value(17).toDouble(), 2, 'f', 1, '0' ); /* ABV */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 13, item); + this->tableStyles->setItem(ridx, 13, item); w = QString("%1").arg(query.value(18).toDouble(), 2, 'f', 1, '0' ); /* ABV */ item = new QTableWidgetItem(w); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); - ui->tableStyles->setItem(ridx, 14, item); + this->tableStyles->setItem(ridx, 14, item); /* Add the Edit button */ pWidget = new QWidget(); @@ -146,25 +184,17 @@ pLayout->addWidget(btn_edit); pLayout->setContentsMargins(5, 0, 5, 0); pWidget->setLayout(pLayout); - ui->tableStyles->setCellWidget(ridx, 15, pWidget); + this->tableStyles->setCellWidget(ridx, 15, pWidget); query.next(); } - - setWindowTitle( QString("BMSapp - %1 - Profile Styles").arg(VERSIONSTRING) ); } -ProfileStyles::~ProfileStyles() -{ - qDebug() << "ProfileStyles done"; - delete ui; -} +ProfileStyles::~ProfileStyles() {} void ProfileStyles::edit(int recno) { - qDebug() << "ProfileStyles edit:" << recno; - EditProfileStyle dialog(recno, this); /* Signal from editor if a refresh is needed */ connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable())); @@ -177,20 +207,13 @@ { QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); int recno = pb->objectName().toInt(); - qDebug() << Q_FUNC_INFO << recno; edit(recno); } void ProfileStyles::on_insertButton_clicked() { - qDebug() << Q_FUNC_INFO; edit(-1); } -void ProfileStyles::on_quitButton_clicked() -{ - emit firstWindow(); -} -
--- a/src/ProfileStyles.h Sun Mar 20 20:59:05 2022 +0100 +++ b/src/ProfileStyles.h Sun Mar 20 21:24:13 2022 +0100 @@ -2,6 +2,12 @@ #define _PROFILESTYLES_H #include <QDialog> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QTableWidget> namespace Ui { class ProfileStyles; @@ -15,17 +21,19 @@ explicit ProfileStyles(QWidget *parent = nullptr); ~ProfileStyles(); -signals: - void firstWindow(); - private slots: - void on_quitButton_clicked(); void on_insertButton_clicked(); void on_editButton_clicked(); void refreshTable(void); private: - Ui::ProfileStyles *ui; + QGridLayout *gridLayout; + QTableWidget *tableStyles; + QGroupBox *groupBox; + QHBoxLayout *horizontalLayout; + QPushButton *quitButton; + QPushButton *insertButton; + void edit(int recno); };
--- a/ui/ProfileStyles.ui Sun Mar 20 20:59:05 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>ProfileStyles</class> - <widget class="QDialog" name="ProfileStyles"> - <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="tableStyles"> - <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>
