Changeset 56 in tspsg-svn for trunk/src/settingsdialog.h

Timestamp:

Aug 21, 2009, 2:28:30 AM (15 years ago)

Author:

laleppa

Message:

Unified settingsdialog.ui and settingsdialog.ce.ui into settingsdialog.ui. Differences between WinCE and non-WinCE versions are now generated in the constructor.

File:

• trunk/src/settingsdialog.h (modified) (3 diffs)

trunk/src/settingsdialog.h

@@ -26 +26 @@
 
 #include "globals.h"
-#ifdef Q_OS_WINCE
-        #include "ui_settingsdialog.ce.h"
-#else
-        #include "ui_settingsdialog.h"
-#endif // Q_OS_WINCE
+#include "ui_settingsdialog.h"
 
 class SettingsDialog: public QDialog, public Ui::SettingsDialog
@@ -37 +33 @@
 public:
         SettingsDialog(QWidget *parent = 0);
+        bool colorChanged() const;
         bool fontChanged() const;
-        bool colorChanged() const;
+
+#ifndef Q_OS_WINCE
+        QCheckBox *cbSaveState;
+        QLabel *imgIcon;
+        QLabel *labelHint;
+        QFrame *lineVertical;
+#endif // Q_OS_WINCE
 
 private:
-        QSettings *settings;
+        QColor color;
         QFont font;
-        QColor color;
         bool newFont;
         bool newColor;
+        QSettings *settings;
 #ifndef Q_OS_WINCE
         bool event(QEvent *);
@@ -52 +55 @@
 private slots:
         void accept();
+        void buttonColorClicked();
+        void buttonFontClicked();
         void spinRandMinValueChanged(int val) { spinRandMax->setMinimum(val + 1); }
-        void buttonFontClicked();
-        void buttonColorClicked();
 };