diff --git a/glabels/VariablesView.cpp b/glabels/VariablesView.cpp index 0546566..a54a43f 100644 --- a/glabels/VariablesView.cpp +++ b/glabels/VariablesView.cpp @@ -29,11 +29,13 @@ namespace { enum ICol { - I_COL_NAME = 0, - I_COL_TYPE = 1, - I_COL_VALUE = 2, - I_COL_INCREMENT = 3, - I_COL_STEP_SIZE = 4 + I_COL_NAME, + I_COL_TYPE, + I_COL_VALUE, + I_COL_INCREMENT, + I_COL_STEP_SIZE, + I_COL_DUMMY, + N_COLS }; } @@ -50,6 +52,33 @@ namespace glabels setupUi( this ); titleLabel->setText( QString( "%1" ).arg( tr("Variables") ) ); + + table->setColumnCount( N_COLS ); + + auto* nameHeaderItem = new QTableWidgetItem( tr("Name") ); + nameHeaderItem->setFlags( nameHeaderItem->flags() ^ Qt::ItemIsEditable ); + table->setHorizontalHeaderItem( I_COL_NAME, nameHeaderItem ); + + auto* typeHeaderItem = new QTableWidgetItem( tr("Type") ); + typeHeaderItem->setFlags( typeHeaderItem->flags() ^ Qt::ItemIsEditable ); + table->setHorizontalHeaderItem( I_COL_TYPE, typeHeaderItem ); + + auto* valueHeaderItem = new QTableWidgetItem( tr("Value") ); + valueHeaderItem->setFlags( valueHeaderItem->flags() ^ Qt::ItemIsEditable ); + table->setHorizontalHeaderItem( I_COL_VALUE, valueHeaderItem ); + + auto* incrementHeaderItem = new QTableWidgetItem( tr("Increment") ); + incrementHeaderItem->setFlags( incrementHeaderItem->flags() ^ Qt::ItemIsEditable ); + table->setHorizontalHeaderItem( I_COL_INCREMENT, incrementHeaderItem ); + + auto* stepSizeHeaderItem = new QTableWidgetItem( tr("Step Size") ); + stepSizeHeaderItem->setFlags( stepSizeHeaderItem->flags() ^ Qt::ItemIsEditable ); + table->setHorizontalHeaderItem( I_COL_STEP_SIZE, stepSizeHeaderItem ); + + auto* dummyHeaderItem = new QTableWidgetItem(); + dummyHeaderItem->setFlags( Qt::NoItemFlags ); + table->setHorizontalHeaderItem( I_COL_DUMMY, dummyHeaderItem ); + table->horizontalHeader()->setStretchLastSection( true ); } diff --git a/glabels/ui/VariablesView.ui b/glabels/ui/VariablesView.ui index 5758b63..a801498 100644 --- a/glabels/ui/VariablesView.ui +++ b/glabels/ui/VariablesView.ui @@ -39,7 +39,7 @@ QAbstractItemView::SelectRows - 5 + 0 false @@ -47,31 +47,6 @@ true - - - Name - - - - - Type - - - - - Value - - - - - Increment - - - - - Step Size - - diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts index 5708957..fb84528 100644 --- a/translations/glabels_C.ts +++ b/translations/glabels_C.ts @@ -1087,26 +1087,6 @@ VariablesView - - Name - - - - Type - - - - Value - - - - Increment - - - - Step Size - - <html><head/><body><p>Add variable</p></body></html> @@ -2153,6 +2133,26 @@ Edit Variable + + Name + + + + Type + + + + Value + + + + Increment + + + + Step Size + + glabels::barcode::Backends