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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/settingsdialog.h

    r42 r56  
    2626
    2727#include "globals.h"
    28 #ifdef Q_OS_WINCE
    29         #include "ui_settingsdialog.ce.h"
    30 #else
    31         #include "ui_settingsdialog.h"
    32 #endif // Q_OS_WINCE
     28#include "ui_settingsdialog.h"
    3329
    3430class SettingsDialog: public QDialog, public Ui::SettingsDialog
     
    3733public:
    3834        SettingsDialog(QWidget *parent = 0);
     35        bool colorChanged() const;
    3936        bool fontChanged() const;
    40         bool colorChanged() const;
     37
     38#ifndef Q_OS_WINCE
     39        QCheckBox *cbSaveState;
     40        QLabel *imgIcon;
     41        QLabel *labelHint;
     42        QFrame *lineVertical;
     43#endif // Q_OS_WINCE
    4144
    4245private:
    43         QSettings *settings;
     46        QColor color;
    4447        QFont font;
    45         QColor color;
    4648        bool newFont;
    4749        bool newColor;
     50        QSettings *settings;
    4851#ifndef Q_OS_WINCE
    4952        bool event(QEvent *);
     
    5255private slots:
    5356        void accept();
     57        void buttonColorClicked();
     58        void buttonFontClicked();
    5459        void spinRandMinValueChanged(int val) { spinRandMax->setMinimum(val + 1); }
    55         void buttonFontClicked();
    56         void buttonColorClicked();
    5760};
    5861
Note: See TracChangeset for help on using the changeset viewer.