-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 | |||
@@ -96,52 +96,61 @@ public: | |||
96 | if (col >= 0) { | 96 | if (col >= 0) { |
97 | Parent::removeColumn(col); | 97 | Parent::removeColumn(col); |
98 | colRevMap[col] = colMap[idx] = -1; | 98 | colRevMap[col] = colMap[idx] = -1; |
99 | } | 99 | } |
100 | } | 100 | } |
101 | void setAllOpen(bool open); | 101 | void setAllOpen(bool open); |
102 | void setParentMenu(void); | 102 | void setParentMenu(void); |
103 | 103 | ||
104 | template <class P> | ||
105 | void ConfigList::updateMenuList(P*, struct menu*); | ||
106 | |||
104 | bool updateAll; | 107 | bool updateAll; |
105 | 108 | ||
106 | QPixmap symbolYesPix, symbolModPix, symbolNoPix; | 109 | QPixmap symbolYesPix, symbolModPix, symbolNoPix; |
107 | QPixmap choiceYesPix, choiceNoPix, menuPix, menuInvPix; | 110 | QPixmap choiceYesPix, choiceNoPix; |
111 | QPixmap menuPix, menuInvPix, menuBackPix, voidPix; | ||
108 | 112 | ||
109 | bool showAll, showName, showRange, showData; | 113 | bool showAll, showName, showRange, showData; |
110 | enum listMode mode; | 114 | enum listMode mode; |
111 | struct menu *rootEntry; | 115 | struct menu *rootEntry; |
112 | QColorGroup disabledColorGroup; | 116 | QColorGroup disabledColorGroup; |
113 | QColorGroup inactivedColorGroup; | 117 | QColorGroup inactivedColorGroup; |
114 | 118 | ||
115 | private: | 119 | private: |
116 | int colMap[colNr]; | 120 | int colMap[colNr]; |
117 | int colRevMap[colNr]; | 121 | int colRevMap[colNr]; |
118 | }; | 122 | }; |
119 | 123 | ||
120 | class ConfigItem : public QListViewItem { | 124 | class ConfigItem : public QListViewItem { |
121 | typedef class QListViewItem Parent; | 125 | typedef class QListViewItem Parent; |
122 | public: | 126 | public: |
123 | ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v) | 127 | ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v) |
124 | : Parent(parent, after), menu(m), visible(v) | 128 | : Parent(parent, after), menu(m), visible(v), goParent(false) |
125 | { | 129 | { |
126 | init(); | 130 | init(); |
127 | } | 131 | } |
128 | ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v) | 132 | ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v) |
129 | : Parent(parent, after), menu(m), visible(v) | 133 | : Parent(parent, after), menu(m), visible(v), goParent(false) |
134 | { | ||
135 | init(); | ||
136 | } | ||
137 | ConfigItem(QListView *parent, ConfigItem *after, bool v) | ||
138 | : Parent(parent, after), menu(0), visible(v), goParent(true) | ||
130 | { | 139 | { |
131 | init(); | 140 | init(); |
132 | } | 141 | } |
133 | ~ConfigItem(void); | 142 | ~ConfigItem(void); |
134 | void init(void); | 143 | void init(void); |
135 | #if QT_VERSION >= 300 | 144 | #if QT_VERSION >= 300 |
136 | void okRename(int col); | 145 | void okRename(int col); |
137 | #endif | 146 | #endif |
138 | void updateMenu(void); | 147 | void updateMenu(void); |
139 | bool updateNeeded(void); | 148 | void testUpdateMenu(bool v); |
140 | ConfigList* listView() const | 149 | ConfigList* listView() const |
141 | { | 150 | { |
142 | return (ConfigList*)Parent::listView(); | 151 | return (ConfigList*)Parent::listView(); |
143 | } | 152 | } |
144 | ConfigItem* firstChild() const | 153 | ConfigItem* firstChild() const |
145 | { | 154 | { |
146 | return (ConfigItem *)Parent::firstChild(); | 155 | return (ConfigItem *)Parent::firstChild(); |
147 | } | 156 | } |
@@ -165,16 +174,17 @@ public: | |||
165 | { | 174 | { |
166 | return Parent::pixmap(listView()->mapIdx(idx)); | 175 | return Parent::pixmap(listView()->mapIdx(idx)); |
167 | } | 176 | } |
168 | void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align); | 177 | void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align); |
169 | 178 | ||
170 | ConfigItem* nextItem; | 179 | ConfigItem* nextItem; |
171 | struct menu *menu; | 180 | struct menu *menu; |
172 | bool visible; | 181 | bool visible; |
182 | bool goParent; | ||
173 | }; | 183 | }; |
174 | 184 | ||
175 | class ConfigLineEdit : public QLineEdit { | 185 | class ConfigLineEdit : public QLineEdit { |
176 | Q_OBJECT | 186 | Q_OBJECT |
177 | typedef class QLineEdit Parent; | 187 | typedef class QLineEdit Parent; |
178 | public: | 188 | public: |
179 | ConfigLineEdit(ConfigView* parent) | 189 | ConfigLineEdit(ConfigView* parent) |
180 | : Parent(parent) | 190 | : Parent(parent) |
@@ -211,16 +221,18 @@ public slots: | |||
211 | void setShowName(bool); | 221 | void setShowName(bool); |
212 | void setShowData(bool); | 222 | void setShowData(bool); |
213 | void showIntro(void); | 223 | void showIntro(void); |
214 | void showAbout(void); | 224 | void showAbout(void); |
215 | 225 | ||
216 | protected: | 226 | protected: |
217 | void closeEvent(QCloseEvent *e); | 227 | void closeEvent(QCloseEvent *e); |
218 | 228 | ||
229 | ConfigView *menuView; | ||
219 | ConfigList *menuList; | 230 | ConfigList *menuList; |
231 | ConfigView *configView; | ||
220 | ConfigList *configList; | 232 | ConfigList *configList; |
221 | QTextView *helpText; | 233 | QTextView *helpText; |
222 | QToolBar *toolBar; | 234 | QToolBar *toolBar; |
223 | QAction *backAction; | 235 | QAction *backAction; |
224 | 236 | ||
225 | bool showDebug; | 237 | bool showDebug; |
226 | }; | 238 | }; |