History

Revert "kconfig: qconf: Change title for the item window"

This reverts commit 5752ff07fd90d764d96e3c586cc95c09598abfdd. It added dead code to ConfigList:ConfigList(). The constructor of ConfigList has the initializer, mode(singleMode). if (mode == symbolMode) setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value"); else setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value"); ... always takes the else part. The change to ConfigList::updateSelection() is strange too. When you click the split view icon for the first time, the titles in both windows show "Option". After you click something in the right window, the title suddenly changes to "Item". ConfigList::updateSelection() is not the right place to do this, at least. It was not a good idea, I think.

Masahiro Yamada committed 6 years ago

Commit 97bebbc1 parent ce023971 file · +1 −9Browse files

Unified · Split

scripts/kconfig/qconf.cc+1−9
@@ -307,10 +307,7 @@ ConfigList::ConfigList(ConfigView* p, const char *name) · 306 unmodified lines
307307 setVerticalScrollMode(ScrollPerPixel);
308308 setHorizontalScrollMode(ScrollPerPixel);
309309
310− if (mode == symbolMode)
311− setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value");
312− else
313− setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
310+ setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
314311
315312 connect(this, SIGNAL(itemSelectionChanged(void)),
316313 SLOT(updateSelection(void)));
@@ -391,11 +388,6 @@ void ConfigList::updateSelection(void) · 74 unmodified lines
391388 struct menu *menu;
392389 enum prop_type type;
393390
394− if (mode == symbolMode)
395− setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value");
396− else
397− setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
398−
399391 if (selectedItems().count() == 0)
400392 return;
401393