update to kconfig/lxdialog from 2.6.10; kconfig has a unified prefix (PTXCONF_) macro now. Patch by Thibaut Varene

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2203 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 27 insertions, 2 deletions

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index c548884b4..7c03927d4 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -4,17 +4,39 @@
  */
 
 #include <qlistview.h>
+#if QT_VERSION >= 300
+#include <qsettings.h>
+#else
+class QSettings { };
+#endif
 
 class ConfigList;
 class ConfigItem;
 class ConfigLineEdit;
 class ConfigMainWindow;
 
+
+class ConfigSettings : public QSettings {
+public:
+	ConfigSettings();
+
+#if QT_VERSION >= 300
+	void readListSettings();
+	QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok);
+	bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value);
+#endif
+
+	bool showAll;
+	bool showName;
+	bool showRange;
+	bool showData;
+};
+
 class ConfigView : public QVBox {
 	Q_OBJECT
 	typedef class QVBox Parent;
 public:
-	ConfigView(QWidget* parent, ConfigMainWindow* cview);
+	ConfigView(QWidget* parent, ConfigMainWindow* cview, ConfigSettings* configSettings);
 	~ConfigView(void);
 	static void updateList(ConfigItem* item);
 	static void updateListAll(void);
@@ -38,7 +60,7 @@ class ConfigList : public QListView {
 	Q_OBJECT
 	typedef class QListView Parent;
 public:
-	ConfigList(ConfigView* p, ConfigMainWindow* cview);
+	ConfigList(ConfigView* p, ConfigMainWindow* cview, ConfigSettings *configSettings);
 	void reinit(void);
 	ConfigView* parent(void) const
 	{
@@ -222,6 +244,7 @@ public slots:
 	void setShowData(bool);
 	void showIntro(void);
 	void showAbout(void);
+	void saveSettings(void);
 
 protected:
 	void closeEvent(QCloseEvent *e);
@@ -233,6 +256,8 @@ protected:
 	QTextView *helpText;
 	QToolBar *toolBar;
 	QAction *backAction;
+	QSplitter* split1;
+	QSplitter* split2;
 
 	bool showDebug;
 };