1 files changed, 16 insertions, 4 deletions

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 6f096b4..c548884 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -98,16 +98,20 @@ public:
                         colRevMap[col] = colMap[idx] = -1;
                 }
         }
         void setAllOpen(bool open);
         void setParentMenu(void);
 
+        template <class P>
+        void ConfigList::updateMenuList(P*, struct menu*);
+
         bool updateAll;
 
         QPixmap symbolYesPix, symbolModPix, symbolNoPix;
-        QPixmap choiceYesPix, choiceNoPix, menuPix, menuInvPix;
+        QPixmap choiceYesPix, choiceNoPix;
+        QPixmap menuPix, menuInvPix, menuBackPix, voidPix;
 
         bool showAll, showName, showRange, showData;
         enum listMode mode;
         struct menu *rootEntry;
         QColorGroup disabledColorGroup;
         QColorGroup inactivedColorGroup;
@@ -118,28 +122,33 @@ private:
 };
 
 class ConfigItem : public QListViewItem {
         typedef class QListViewItem Parent;
 public:
         ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v)
-        : Parent(parent, after), menu(m), visible(v)
+        : Parent(parent, after), menu(m), visible(v), goParent(false)
         {
                 init();
         }
         ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v)
-        : Parent(parent, after), menu(m), visible(v)
+        : Parent(parent, after), menu(m), visible(v), goParent(false)
+        {
+                init();
+        }
+        ConfigItem(QListView *parent, ConfigItem *after, bool v)
+        : Parent(parent, after), menu(0), visible(v), goParent(true)
         {
                 init();
         }
         ~ConfigItem(void);
         void init(void);
 #if QT_VERSION >= 300
         void okRename(int col);
 #endif
         void updateMenu(void);
-        bool updateNeeded(void);
+        void testUpdateMenu(bool v);
         ConfigList* listView() const
         {
                 return (ConfigList*)Parent::listView();
         }
         ConfigItem* firstChild() const
         {
@@ -167,12 +176,13 @@ public:
         }
         void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align);
 
         ConfigItem* nextItem;
         struct menu *menu;
         bool visible;
+        bool goParent;
 };
 
 class ConfigLineEdit : public QLineEdit {
         Q_OBJECT
         typedef class QLineEdit Parent;
 public:
@@ -213,13 +223,15 @@ public slots:
         void showIntro(void);
         void showAbout(void);
 
 protected:
         void closeEvent(QCloseEvent *e);
 
+        ConfigView *menuView;
         ConfigList *menuList;
+        ConfigView *configView;
         ConfigList *configList;
         QTextView *helpText;
         QToolBar *toolBar;
         QAction *backAction;
 
         bool showDebug;