# HG changeset patch # User Michiel Broek # Date 1645354168 -3600 # Node ID b52978ee741250ce538069b96a633dac61c1909b # Parent 15e5879df8dc4fdd2ab0a350cc856d124ae233c5 Backport of the InventorySuppliers window. diff -r 15e5879df8dc -r b52978ee7412 src/InventorySuppliers.cpp --- a/src/InventorySuppliers.cpp Sun Feb 20 10:34:24 2022 +0100 +++ b/src/InventorySuppliers.cpp Sun Feb 20 11:49:28 2022 +0100 @@ -35,36 +35,31 @@ void InventorySuppliers::refreshTable() { - qDebug() << "slot" << Q_FUNC_INFO; + qDebug() << "InventorySuppliers reload"; QSqlQuery query("SELECT * FROM inventory_suppliers ORDER BY name"); - const QStringList labels({tr("Record"), tr("Name"), tr("Address"), tr("City"), tr("Country"), tr("Phone"), tr("Edit")}); + const QStringList labels({tr("Name"), tr("Address"), tr("City"), tr("Country"), tr("Phone"), tr("Edit")}); - ui->tableSuppliers->setColumnCount(7); - ui->tableSuppliers->setColumnWidth(0, 50); /* Record */ - ui->tableSuppliers->setColumnWidth(1, 250); /* Name */ - ui->tableSuppliers->setColumnWidth(2, 250); /* Address */ - ui->tableSuppliers->setColumnWidth(3, 200); /* City */ - ui->tableSuppliers->setColumnWidth(4, 120); /* Country */ - ui->tableSuppliers->setColumnWidth(5, 120); /* Phone */ - ui->tableSuppliers->setColumnWidth(6, 90); /* Edit button */ + ui->tableSuppliers->setColumnCount(6); + ui->tableSuppliers->setColumnWidth(0, 250); /* Name */ + ui->tableSuppliers->setColumnWidth(1, 250); /* Address */ + ui->tableSuppliers->setColumnWidth(2, 200); /* City */ + ui->tableSuppliers->setColumnWidth(3, 120); /* Country */ + ui->tableSuppliers->setColumnWidth(4, 120); /* Phone */ + ui->tableSuppliers->setColumnWidth(5, 90); /* Edit button */ ui->tableSuppliers->setRowCount(query.size()); ui->tableSuppliers->setHorizontalHeaderLabels(labels); ui->tableSuppliers->verticalHeader()->hide(); - ui->tableSuppliers->setFixedSize(1280, 640); /* Even if this is too large, it works */ + ui->tableSuppliers->setFixedSize(1030 + 24, 640); /* Even if this is too large, it works */ -// qDebug() << query.record().count() << query.size(); query.first(); for (int ridx = 0 ; ridx < query.size() ; ridx++ ) { - for (int cidx = 0 ; cidx < 4; cidx++) { - QTableWidgetItem* item = new QTableWidgetItem(query.value(cidx).toString()); - ui->tableSuppliers->setItem(ridx, cidx, item ); - } -// qDebug() << ridx << "record:" << query.value(0).toString() << " name:" << query.value(1).toString(); - QTableWidgetItem* item = new QTableWidgetItem(query.value(5).toString()); - ui->tableSuppliers->setItem(ridx, 4, item ); - item = new QTableWidgetItem(query.value(8).toString()); - ui->tableSuppliers->setItem(ridx, 5, item ); + ui->tableSuppliers->setItem(ridx, 0, new QTableWidgetItem(query.value(1).toString())); + ui->tableSuppliers->setItem(ridx, 1, new QTableWidgetItem(query.value(2).toString())); + ui->tableSuppliers->setItem(ridx, 2, new QTableWidgetItem(query.value(3).toString())); + ui->tableSuppliers->setItem(ridx, 3, new QTableWidgetItem(query.value(5).toString())); + ui->tableSuppliers->setItem(ridx, 4, new QTableWidgetItem(query.value(8).toString())); + /* Add the Edit button */ QWidget* pWidget = new QWidget(); QPushButton* btn_edit = new QPushButton(); @@ -73,10 +68,9 @@ connect(btn_edit, SIGNAL(clicked()), this, SLOT(on_editButton_clicked())); QHBoxLayout* pLayout = new QHBoxLayout(pWidget); pLayout->addWidget(btn_edit); -// pLayout->setAlignment(Qt::AlignCenter); pLayout->setContentsMargins(5, 0, 5, 0); pWidget->setLayout(pLayout); - ui->tableSuppliers->setCellWidget(ridx, 6, pWidget); + ui->tableSuppliers->setCellWidget(ridx, 5, pWidget); query.next(); }