add num col to fx editor

Author: DSCaskey

src/libs/vtools/dialogs/support/edit_formula_dialog.cpp

@@ -102,7 +102,7 @@
 
 template <class T> class QSharedPointer;
 
-enum {ColumnName = 0, ColumnFullName};
+enum {ColumnNumber = 0, ColumnName, ColumnFullName};
 
 //---------------------------------------------------------------------------------------------------------------------
 EditFormulaDialog::EditFormulaDialog(const VContainer *data, const quint32 &toolId, const quint16 &source,
@@ -124,7 +124,7 @@ EditFormulaDialog::EditFormulaDialog(const VContainer *data, const quint32 &tool
     const QSize size = qApp->Settings()->GetFormulaWizardDialogSize();
     if (!size.isEmpty())
     {
-        // Block signals to prevent a resize event that will only save the size again. 
+        // Block signals to prevent a resize event that will only save the size again.
         blockSignals(true);
         resize(size);
         blockSignals(false);
@@ -162,7 +162,7 @@ EditFormulaDialog::EditFormulaDialog(const VContainer *data, const quint32 &tool
     }
 #endif
 
-    ui->tableWidget->setColumnCount(2);
+    ui->tableWidget->setColumnCount(3);
     ui->tableWidget->setEditTriggers(QTableWidget::NoEditTriggers);
     ui->tableWidget->verticalHeader()->hide();
     ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -570,6 +570,7 @@ void EditFormulaDialog::showVariable(const QMap<key, val> &var)
     ui->tableWidget->blockSignals(true);
     ui->tableWidget->clearContents();
     ui->tableWidget->setRowCount(0);
+    ui->tableWidget->setColumnHidden(ColumnNumber, true);
     ui->tableWidget->setColumnHidden(ColumnFullName, true);
     ui->description_Label->setText("");
 
@@ -602,6 +603,7 @@ void EditFormulaDialog::showMeasurements(const QMap<QString, QSharedPointer<Meas
     ui->tableWidget->blockSignals(true);
     ui->tableWidget->clearContents();
     ui->tableWidget->setRowCount(0);
+    ui->tableWidget->setColumnHidden(ColumnNumber, false);
     ui->tableWidget->setColumnHidden(ColumnFullName, false);
     ui->description_Label->setText("");
 
@@ -619,24 +621,32 @@ void EditFormulaDialog::showMeasurements(const QMap<QString, QSharedPointer<Meas
             QTableWidgetItem *itemName = new QTableWidgetItem(iMap.key());
             itemName->setToolTip(itemName->text());
 
+            QTableWidgetItem *itemNumber = new QTableWidgetItem();
+            itemNumber->setSizeHint(QSize(70, 20));
+            itemNumber->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
             QTableWidgetItem *itemFullName = new QTableWidgetItem();
             if (iMap.value()->isCustom())
             {
+                itemNumber->setText(QStringLiteral("na"));
                 itemFullName->setText(iMap.value()->getGuiText());
             }
             else
             {
+                itemNumber->setText(qApp->translateVariables()->MNumber(itemName->text()));
                 itemFullName->setText(qApp->translateVariables()->guiText(iMap.value()->GetName()));
             }
 
+            itemNumber->setToolTip(itemNumber->text());
             itemFullName->setToolTip(itemFullName->text());
+            ui->tableWidget->setItem(ui->tableWidget->rowCount()-1, ColumnNumber, itemNumber);
             ui->tableWidget->setItem(ui->tableWidget->rowCount()-1, ColumnName, itemName);
             ui->tableWidget->setItem(ui->tableWidget->rowCount()-1, ColumnFullName, itemFullName);
         }
     }
     ui->tableWidget->blockSignals(false);
+    ui->tableWidget->resizeColumnsToContents();
     ui->tableWidget->selectRow(0);
-    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -647,6 +657,7 @@ void EditFormulaDialog::showFunctions()
     ui->tableWidget->blockSignals(true);
     ui->tableWidget->clearContents();
     ui->tableWidget->setRowCount(0);
+    ui->tableWidget->setColumnHidden(ColumnNumber, true);
     ui->tableWidget->setColumnHidden(ColumnFullName, true);
     ui->description_Label->setText("");
 

src/libs/vtools/dialogs/support/edit_formula_dialog.ui

@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>750</width>
     <height>520</height>
    </rect>
   </property>
@@ -21,7 +21,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>440</width>
+    <width>750</width>
     <height>520</height>
    </size>
   </property>
@@ -685,12 +685,29 @@ QListWidget::item:selected {
               <property name="cornerButtonEnabled">
                <bool>false</bool>
               </property>
+              <property name="columnCount">
+               <number>3</number>
+              </property>
+              <attribute name="horizontalHeaderDefaultSectionSize">
+               <number>70</number>
+              </attribute>
+              <attribute name="horizontalHeaderStretchLastSection">
+               <bool>true</bool>
+              </attribute>
               <attribute name="verticalHeaderVisible">
                <bool>false</bool>
               </attribute>
               <attribute name="verticalHeaderHighlightSections">
                <bool>false</bool>
               </attribute>
+              <attribute name="verticalHeaderStretchLastSection">
+               <bool>false</bool>
+              </attribute>
+              <column>
+               <property name="text">
+                <string>Number</string>
+               </property>
+              </column>
               <column>
                <property name="text">
                 <string>Name</string>
@@ -809,8 +826,8 @@ QListWidget::item:selected {
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../../../vmisc/share/resources/icon.qrc"/>
   <include location="../../../vmisc/share/resources/theme.qrc"/>
+  <include location="../../../vmisc/share/resources/icon.qrc"/>
  </resources>
  <connections>
   <connection>