kconfig: qconf: show data column all the time

The next commit will allow users to edit "int", "hex", "string"
menus in-place from the data column.

The data column should be always displayed.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 7cab996..3ba064a 100644 (file)
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -288,7 +288,7 @@ void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
 ConfigList::ConfigList(ConfigView* p, const char *name)
        : Parent(p),
          updateAll(false),
-         showName(false), showRange(false), showData(false), mode(singleMode), optMode(normalOpt),
+         showName(false), showRange(false), mode(singleMode), optMode(normalOpt),
          rootEntry(0), headerPopup(0)
 {
        setObjectName(name);
@@ -307,7 +307,6 @@ ConfigList::ConfigList(ConfigView* p, const char *name)
                configSettings->beginGroup(name);
                showName = configSettings->value("/showName", false).toBool();
                showRange = configSettings->value("/showRange", false).toBool();
-               showData = configSettings->value("/showData", false).toBool();
                optMode = (enum optionMode)configSettings->value("/optionMode", 0).toInt();
                configSettings->endGroup();
                connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings()));
@@ -338,7 +337,6 @@ bool ConfigList::menuSkip(struct menu *menu)
 
 void ConfigList::reinit(void)
 {
-       hideColumn(dataColIdx);
        hideColumn(yesColIdx);
        hideColumn(modColIdx);
        hideColumn(noColIdx);
@@ -351,8 +349,6 @@ void ConfigList::reinit(void)
                showColumn(modColIdx);
                showColumn(yesColIdx);
        }
-       if (showData)
-               showColumn(dataColIdx);
 
        updateListAll();
 }
@@ -375,7 +371,6 @@ void ConfigList::saveSettings(void)
                configSettings->beginGroup(objectName());
                configSettings->setValue("/showName", showName);
                configSettings->setValue("/showRange", showRange);
-               configSettings->setValue("/showData", showData);
                configSettings->setValue("/optionMode", (int)optMode);
                configSettings->endGroup();
        }
@@ -918,15 +913,6 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                        action, SLOT(setChecked(bool)));
                action->setChecked(showRange);
                headerPopup->addAction(action);
-
-               action = new QAction("Show Data", this);
-               action->setCheckable(true);
-               connect(action, SIGNAL(toggled(bool)),
-                       parent(), SLOT(setShowData(bool)));
-               connect(parent(), SIGNAL(showDataChanged(bool)),
-                       action, SLOT(setChecked(bool)));
-               action->setChecked(showData);
-               headerPopup->addAction(action);
        }
 
        headerPopup->exec(e->globalPos());
@@ -970,15 +956,6 @@ void ConfigView::setShowRange(bool b)
        }
 }
 
-void ConfigView::setShowData(bool b)
-{
-       if (list->showData != b) {
-               list->showData = b;
-               list->reinit();
-               emit showDataChanged(b);
-       }
-}
-
 void ConfigList::setAllOpen(bool open)
 {
        QTreeWidgetItemIterator it(this);
@@ -1475,9 +1452,6 @@ ConfigMainWindow::ConfigMainWindow(void)
        QAction *showRangeAction = new QAction("Show Range", this);
          showRangeAction->setCheckable(true);
          connect(showRangeAction, SIGNAL(toggled(bool)), configView, SLOT(setShowRange(bool)));
-       QAction *showDataAction = new QAction("Show Data", this);
-         showDataAction->setCheckable(true);
-         connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setShowData(bool)));
 
        QActionGroup *optGroup = new QActionGroup(this);
        optGroup->setExclusive(true);
@@ -1530,7 +1504,6 @@ ConfigMainWindow::ConfigMainWindow(void)
        menu = menuBar()->addMenu("&Option");
        menu->addAction(showNameAction);
        menu->addAction(showRangeAction);
-       menu->addAction(showDataAction);
        menu->addSeparator();
        menu->addActions(optGroup->actions());
        menu->addSeparator();

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 818e006..d01a6c6 100644 (file)
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -101,7 +101,7 @@ public:
 
        bool updateAll;
 
-       bool showName, showRange, showData;
+       bool showName, showRange;
        enum listMode mode;
        enum optionMode optMode;
        struct menu *rootEntry;
@@ -196,15 +196,12 @@ public:
 
        bool showName(void) const { return list->showName; }
        bool showRange(void) const { return list->showRange; }
-       bool showData(void) const { return list->showData; }
 public slots:
        void setShowName(bool);
        void setShowRange(bool);
-       void setShowData(bool);
 signals:
        void showNameChanged(bool);
        void showRangeChanged(bool);
-       void showDataChanged(bool);
 public:
        ConfigList* list;
        ConfigLineEdit* lineEdit;