Merge pull request #427 from LibrePCB/414-sort-component-signal-dropdown

Device editor: Sort component signal dropdown by name
LibrePCB · Mar 13, 2019 · 4475d33 · 4475d33
2 parents efa95a2 + 44b520a
commit 4475d33
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/libs/librepcb/libraryeditor/dev/padsignalmapeditorwidget.cpp b/libs/librepcb/libraryeditor/dev/padsignalmapeditorwidget.cpp
@@ -233,10 +233,16 @@ void PadSignalMapEditorWidget::setTableRowContent(
   signalComboBox->setStyleSheet(
       "padding: 0px 3px 0px 3px;");  // reduce required space
   signalComboBox->setFixedHeight(cbxHeight);
-  signalComboBox->addItem(tr("(not connected)"));
   for (const ComponentSignal& sig : mSignals) {
     signalComboBox->addItem(*sig.getName(), sig.getUuid().toStr());
+    // Set display role to a QVariant to get numbers sorted by value and strings
+    // alphabetically.
+    signalComboBox->setItemData(
+        signalComboBox->count() - 1,
+        Toolbox::stringOrNumberToQVariant(*sig.getName()), Qt::DisplayRole);
   }
+  signalComboBox->model()->sort(0);
+  signalComboBox->insertItem(0, tr("(not connected)"));
   int currentIndex =
       signalUuid ? signalComboBox->findData(signalUuid->toStr(), Qt::UserRole)
                  : -1;