merge noncore/apps/* except

 - advancedfm (ljp, please...)
 - odict (tille, please...)

1 files changed, 17 insertions, 1 deletions

diff --git a/noncore/apps/checkbook/configuration.h b/noncore/apps/checkbook/configuration.h
index 9a8de02..5893502 100644
--- a/noncore/apps/checkbook/configuration.h
+++ b/noncore/apps/checkbook/configuration.h
@@ -32,2 +32,3 @@
 #include <qdialog.h>
+#include "cfg.h"
 
@@ -36,2 +37,4 @@ class QLineEdit;
 class QString;
+class QTabWidget;
+class ListEdit;
 
@@ -42,3 +45,4 @@ class Configuration : public QDialog
         public:
-                Configuration( QWidget * = 0x0, const QString & = "$", bool = FALSE, bool = FALSE );
+        // Constructor
+                Configuration( QWidget *, Cfg &cfg);
                 ~Configuration();
@@ -48,2 +52,14 @@ class Configuration : public QDialog
                 QCheckBox *balCB;
+        QCheckBox *openLastBookCB;
+        QCheckBox *lastTabCB;
+        QTabWidget *_mainWidget;
+        ListEdit *_listEditTypes;
+        ListEdit *_listEditCategories;
+
+        // saves settings in config struct
+        void saveConfig(Cfg &cfg);
+
+   protected:
+        // creates settings tap from configuration
+        QWidget *initSettings(Cfg &cfg);
 };