diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-08-21 17:00:49 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-09-01 12:26:49 +0200 |
| commit | 52a142a6314905422f14f05fccafdce35bea7f08 (patch) | |
| tree | 8eeda1ea9da4aade3e64d06306140f523c289700 /package/config/qconf.h | |
| parent | 7c524dd0b683e1e8fac4e4084ac7678576bfbe07 (diff) | |
Bump package/config to 2.6.36-rc1
The goal is to be able to use savedefconfig to generate minimal
defconfig files.
Four of our patches are removed since the modifications have been
merged upstream. The new nconf configuration utility has appeared.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/config/qconf.h')
| -rw-r--r-- | package/config/qconf.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/package/config/qconf.h b/package/config/qconf.h index b3b5657b6..636a74b23 100644 --- a/package/config/qconf.h +++ b/package/config/qconf.h @@ -44,6 +44,9 @@ enum colIdx { enum listMode { singleMode, menuMode, symbolMode, fullMode, listMode }; +enum optionMode { + normalOpt = 0, allOpt, promptOpt +}; class ConfigList : public QListView { Q_OBJECT @@ -115,6 +118,8 @@ public: void setAllOpen(bool open); void setParentMenu(void); + bool menuSkip(struct menu *); + template <class P> void updateMenuList(P*, struct menu*); @@ -124,8 +129,9 @@ public: QPixmap choiceYesPix, choiceNoPix; QPixmap menuPix, menuInvPix, menuBackPix, voidPix; - bool showAll, showName, showRange, showData; + bool showName, showRange, showData; enum listMode mode; + enum optionMode optMode; struct menu *rootEntry; QColorGroup disabledColorGroup; QColorGroup inactivedColorGroup; @@ -222,17 +228,15 @@ public: static void updateList(ConfigItem* item); static void updateListAll(void); - bool showAll(void) const { return list->showAll; } bool showName(void) const { return list->showName; } bool showRange(void) const { return list->showRange; } bool showData(void) const { return list->showData; } public slots: - void setShowAll(bool); void setShowName(bool); void setShowRange(bool); void setShowData(bool); + void setOptionMode(QAction *); signals: - void showAllChanged(bool); void showNameChanged(bool); void showRangeChanged(bool); void showDataChanged(bool); @@ -242,6 +246,10 @@ public: static ConfigView* viewList; ConfigView* nextView; + + static QAction *showNormalAction; + static QAction *showAllAction; + static QAction *showPromptAction; }; class ConfigInfoView : public QTextBrowser { @@ -254,7 +262,6 @@ public: public slots: void setInfo(struct menu *menu); void saveSettings(void); - void setSource(const QString& name); void setShowDebug(bool); signals: |