| -rw-r--r-- | scripts/kconfig/qconf.h | 20 |
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 @@ -100,12 +100,16 @@ public: } 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; @@ -120,14 +124,19 @@ 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); @@ -135,9 +144,9 @@ public: #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(); } @@ -169,8 +178,9 @@ public: ConfigItem* nextItem; struct menu *menu; bool visible; + bool goParent; }; class ConfigLineEdit : public QLineEdit { Q_OBJECT @@ -215,9 +225,11 @@ public slots: protected: void closeEvent(QCloseEvent *e); + ConfigView *menuView; ConfigList *menuList; + ConfigView *configView; ConfigList *configList; QTextView *helpText; QToolBar *toolBar; QAction *backAction; |