1 files changed, 42 insertions, 17 deletions

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index f8f3669..6f096b4 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -6,7 +6,25 @@
 #include <qlistview.h>
 
-class ConfigLineEdit;
+class ConfigList;
 class ConfigItem;
-class ConfigView;
+class ConfigLineEdit;
+class ConfigMainWindow;
+
+class ConfigView : public QVBox {
+	Q_OBJECT
+	typedef class QVBox Parent;
+public:
+	ConfigView(QWidget* parent, ConfigMainWindow* cview);
+	~ConfigView(void);
+	static void updateList(ConfigItem* item);
+	static void updateListAll(void);
+
+public:
+	ConfigList* list;
+	ConfigLineEdit* lineEdit;
+
+	static ConfigView* viewList;
+	ConfigView* nextView;
+};
 
 enum colIdx {
@@ -21,10 +39,13 @@ class ConfigList : public QListView {
 	typedef class QListView Parent;
 public:
-	ConfigList(QWidget* p, ConfigView* cview);
+	ConfigList(ConfigView* p, ConfigMainWindow* cview);
 	void reinit(void);
+	ConfigView* parent(void) const
+	{
+		return (ConfigView*)Parent::parent();
+	}
 
-	ConfigLineEdit* lineEdit;
 protected:
-	ConfigView* cview;
+	ConfigMainWindow* cview;
 
 	void keyPressEvent(QKeyEvent *e);
@@ -44,5 +65,4 @@ signals:
 	void menuSelected(struct menu *menu);
 	void parentSelected(void);
-	void symbolChanged(ConfigItem* item);
 	void gotFocus(void);
 
@@ -101,11 +121,11 @@ class ConfigItem : public QListViewItem {
 	typedef class QListViewItem Parent;
 public:
-	ConfigItem(QListView *parent, ConfigItem *after, struct menu *m)
-	: Parent(parent, after), menu(m)
+	ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v)
+	: Parent(parent, after), menu(m), visible(v)
 	{
 		init();
 	}
-	ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m)
-	: Parent(parent, after), menu(m)
+	ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v)
+	: Parent(parent, after), menu(m), visible(v)
 	{
 		init();
@@ -117,4 +137,5 @@ public:
 #endif
 	void updateMenu(void);
+	bool updateNeeded(void);
 	ConfigList* listView() const
 	{
@@ -147,7 +168,7 @@ public:
 	void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align);
 
+	ConfigItem* nextItem;
 	struct menu *menu;
 	bool visible;
-	bool doInit;
 };
 
@@ -156,11 +177,13 @@ class ConfigLineEdit : public QLineEdit {
 	typedef class QLineEdit Parent;
 public:
-	ConfigLineEdit(QWidget * parent)
-	: QLineEdit(parent)
+	ConfigLineEdit(ConfigView* parent)
+	: Parent(parent)
 	{ }
+	ConfigView* parent(void) const
+	{
+		return (ConfigView*)Parent::parent();
+	}
 	void show(ConfigItem *i);
 	void keyPressEvent(QKeyEvent *e);
-signals:
-	void lineChanged(ConfigItem *item);
 
 public:
@@ -168,8 +191,8 @@ public:
 };
 
-class ConfigView : public QMainWindow {
+class ConfigMainWindow : public QMainWindow {
 	Q_OBJECT
 public:
-	ConfigView(void);
+	ConfigMainWindow(void);
 public slots:
 	void setHelp(QListViewItem* item);
@@ -188,4 +211,6 @@ public slots:
 	void setShowName(bool);
 	void setShowData(bool);
+	void showIntro(void);
+	void showAbout(void);
 
 protected: