Changeset 56 in tspsg-svn for trunk/src

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.

Location:

trunk/src

Files:

• os.h (modified) (1 diff)
• settingsdialog.cpp (modified) (1 diff)
• settingsdialog.h (modified) (3 diffs)

trunk/src/os.h

@@ -43 +43 @@
 #endif // ARCH
 
+// Target OS detection. Done by Qt, so should work with any compiler.
 #ifdef Q_OS_AIX
         #define OS "AIX"ARCH

trunk/src/settingsdialog.cpp

@@ -28 +28 @@
 {
         setupUi(this);
+        // Laying out elements
+#ifdef Q_OS_WINCE
+        // Layout helper elements
+QVBoxLayout *vbox1, *vbox2;
+QHBoxLayout *hbox1, *hbox2;
+QSpacerItem *spacer;
+
+        labelRandMin->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
+        labelRandMax->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
+
+        // Top part (with white bg)
+        vbox2 = new QVBoxLayout(bgWhite);
+        vbox2->addWidget(groupRandomSettings);
+        vbox2->addWidget(groupOutputSettings);
+        spacer = new QSpacerItem(0,0,QSizePolicy::Minimum,QSizePolicy::Expanding);
+        vbox2->addItem(spacer);
+
+        // Output settings group
+        hbox1 = new QHBoxLayout(groupOutputSettings);
+        hbox1->addWidget(buttonFont);
+        hbox1->addWidget(buttonColor);
+
+        // Bottom part (with grey bg)
+        hbox2 = new QHBoxLayout(bgGrey);
+        hbox2->setMargin(6);
+        hbox2->setSpacing(6);
+        hbox2->addWidget(buttonHelp);
+        spacer = new QSpacerItem(0,0,QSizePolicy::Expanding);
+        hbox2->addItem(spacer);
+        hbox2->addWidget(buttonOK);
+        hbox2->addWidget(buttonCancel);
+
+        // Central layout
+        vbox1 = new QVBoxLayout(this);
+        vbox1->setMargin(0);
+        vbox1->setSpacing(0);
+        vbox1->addWidget(bgWhite);
+        vbox1->addWidget(lineHorizontal);
+        vbox1->addWidget(bgGrey);
+#else
+        // Layout helper elements
+QVBoxLayout *vbox1, *vbox2, *vbox3;
+QHBoxLayout *hbox1, *hbox2, *hbox3;
+QSpacerItem *spacer;
+
+        cbSaveState = new QCheckBox(bgWhite);
+        cbSaveState->setObjectName("cbSaveState");
+#ifndef QT_NO_STATUSTIP
+        cbSaveState->setStatusTip(trUtf8("Restore main window state and position on application restart"));
+#endif // QT_NO_STATUSTIP
+        cbSaveState->setText(trUtf8("Save main window state and position"));
+        cbSaveState->setCursor(QCursor(Qt::PointingHandCursor));
+
+        imgIcon = new QLabel(this);
+        imgIcon->setObjectName("imgIcon");
+        imgIcon->setFrameShape(QFrame::StyledPanel);
+        imgIcon->setLineWidth(0);
+        imgIcon->setPixmap(QPixmap(QString::fromUtf8(":/images/icons/preferences_system.png")));
+        imgIcon->setStyleSheet("background-color: #0080C0;");
+        imgIcon->setAlignment(Qt::AlignCenter);
+
+        labelHint = new QLabel(bgGrey);
+        labelHint->setObjectName("labelHint");
+        labelHint->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
+        labelHint->setMinimumSize(QSize(175,28));
+        labelHint->setMaximumSize(QSize(0xFFFFFF,28));
+        labelHint->setTextFormat(Qt::PlainText);
+//      labelHint->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        labelHint->setWordWrap(true);
+#ifndef QT_NO_STATUSTIP
+        labelHint->setStatusTip(trUtf8("Hover mouse pointer over dialog elements to get additional help"));
+#endif // QT_NO_STATUSTIP
+
+        lineVertical = new QFrame(this);
+        lineVertical->setObjectName("lineVertical");
+        lineVertical->setFrameShadow(QFrame::Plain);
+        lineVertical->setFrameShape(QFrame::VLine);
+        lineVertical->setLineWidth(2);
+
+        // Top line
+        hbox1 = new QHBoxLayout();
+        hbox1->addWidget(imgIcon);
+        hbox1->addWidget(lineVertical);
+        hbox1->addWidget(bgWhite);
+
+        // Output settings group
+        vbox3 = new QVBoxLayout(groupOutputSettings);
+        vbox3->addWidget(buttonFont);
+        vbox3->addWidget(buttonColor);
+
+        // Random and Output settings groups
+        hbox2 = new QHBoxLayout();
+        hbox2->addWidget(groupRandomSettings);
+        hbox2->addWidget(groupOutputSettings);
+        spacer = new QSpacerItem(0,0,QSizePolicy::Expanding);
+        hbox2->addItem(spacer);
+
+        // Top right part (with white bg)
+        vbox2 = new QVBoxLayout(bgWhite);
+        spacer = new QSpacerItem(0,0,QSizePolicy::Minimum,QSizePolicy::Expanding);
+        vbox2->addItem(spacer);
+        vbox2->addLayout(hbox2);
+        vbox2->addWidget(cbSaveState);
+        spacer = new QSpacerItem(0,0,QSizePolicy::Minimum,QSizePolicy::Expanding);
+        vbox2->addItem(spacer);
+
+        // Bottom part (with grey bg)
+        hbox3 = new QHBoxLayout(bgGrey);
+        hbox3->setMargin(6);
+        hbox3->setSpacing(6);
+        hbox3->addWidget(buttonHelp);
+        hbox3->addWidget(labelHint);
+        hbox3->addWidget(buttonOK);
+        hbox3->addWidget(buttonCancel);
+
+        // Central layout
+        vbox1 = new QVBoxLayout(this);
+        vbox1->setMargin(0);
+        vbox1->setSpacing(0);
+        vbox1->addLayout(hbox1);
+        vbox1->addWidget(lineHorizontal);
+        vbox1->addWidget(bgGrey);
+#endif // Q_OS_WINCE
         connect(buttonOK,SIGNAL(clicked()),this,SLOT(accept()));
         connect(buttonCancel,SIGNAL(clicked()),this,SLOT(reject()));

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();
 };