Changeset 1babbd6ba3 in tspsg for src/settingsdialog.cpp

Timestamp:

Apr 8, 2010, 11:02:26 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

a23f4c292f

Parents:

394216e468

git-author:

Oleksii Serdiuk <contacts@…> (04/08/10 23:02:26)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:34:20)

Message:

+ Added Installation Guide.

• Updated translations.
• Updated documentaion.

File:

• src/settingsdialog.cpp (modified) (11 diffs)

src/settingsdialog.cpp

@@ -42 +42 @@
         buttonBox->button(QDialogButtonBox::Cancel)->setCursor(QCursor(Qt::PointingHandCursor));
 
-#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
+#ifdef HANDHELD
 QVBoxLayout *vbox1; // Layout helper
 
-#ifdef Q_OS_WINCE
+#ifdef Q_OS_WINCE_WM
         // On screens with small height when SIP is shown and the window is resized
         // there is not enought space for all elements.
-        //  So we show scrollbars to be able to access them.
+        // So we show the scrollbars to be able to access them.
 QScrollArea *scrollArea = new QScrollArea(this);
         scrollArea->setFrameShape(QFrame::NoFrame);
@@ -56 +56 @@
 #else
         buttons->insertStretch(buttons->indexOf(buttonHelp) + 1);
-#endif // Q_OS_WINCE
+#endif // Q_OS_WINCE_WM
 
         bgWhite->layout()->setMargin(0);
@@ -64 +64 @@
         vbox1->setMargin(0);
         vbox1->setSpacing(0);
-#ifdef Q_OS_WINCE
+#ifdef Q_OS_WINCE_WM
         vbox1->addWidget(scrollArea);
 #else
         vbox1->addWidget(bgWhite);
-#endif // Q_OS_WINCE
+#endif // Q_OS_WINCE_WM
         vbox1->addWidget(bgGrey);
         setLayout(vbox1);
-#else // Q_OS_WINCE || Q_OS_SYMBIAN
+#else // HANDHELD
         // Layout helper elements
 QVBoxLayout *vbox1, *vbox2;
@@ -147 +147 @@
         vbox2->addWidget(bgGrey);
         setLayout(vbox2);
-#endif // Q_OS_WINCE
-
-#ifdef Q_OS_WINCE
+#endif // HANDHELD
+
+#ifdef Q_OS_WINCE_WM
         // We need to react to SIP show/hide and resize the window appropriately
         connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(desktopResized(int)));
-#endif // Q_OS_WINCE
+#endif // Q_OS_WINCE_WM
         connect(spinRandMin,SIGNAL(valueChanged(int)),this,SLOT(spinRandMinValueChanged(int)));
         connect(buttonFont,SIGNAL(clicked()),this,SLOT(buttonFontClicked()));
         connect(buttonColor,SIGNAL(clicked()),this,SLOT(buttonColorClicked()));
         setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+#ifndef HANDHELD
         // Setting initial text of dialog hint label to own status tip text.
         labelHint->setText(labelHint->statusTip());
-#endif // Q_OS_WINCE
+#endif // HANDHELD
 
         settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "TSPSG", "tspsg", this);
@@ -171 +171 @@
                 cbUseTranslucency->setChecked(settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool());
 #endif // Q_OS_WIN32
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+#ifndef HANDHELD
         cbSaveState->setChecked(settings->value("SavePos", DEF_SAVEPOS).toBool());
-#endif // Q_OS_WINCE
+#endif // HANDHELD
 
         settings->beginGroup("Task");
@@ -198 +198 @@
         settings->endGroup();
 
-#ifndef Q_OS_WINCE
+#ifndef Q_OS_WINCE_WM
         adjustSize();
-#endif // Q_OS_WINCE
+#endif // Q_OS_WINCE_WM
 }
 
@@ -248 +248 @@
                         return;
         }
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+#ifndef HANDHELD
         settings->setValue("SavePos", cbSaveState->isChecked());
-#endif // Q_OS_WINCE
+#endif // HANDHELD
 #ifdef Q_OS_WIN32
         if (QtWin::isCompositionEnabled()) {
@@ -304 +304 @@
 }
 
-#ifdef Q_OS_WINCE
+#ifdef Q_OS_WINCE_WM
 void SettingsDialog::desktopResized(int screen)
 {
@@ -336 +336 @@
         QWidget::showEvent(ev);
 }
-#endif // Q_OS_WINCE
+#endif // Q_OS_WINCE_WM
 
 void SettingsDialog::spinRandMinValueChanged(int val) {
@@ -342 +342 @@
 }
 
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+#ifndef HANDHELD
 bool SettingsDialog::event(QEvent *ev)
 {
@@ -358 +358 @@
                 return QDialog::event(ev);
 }
-#endif // Q_OS_WINCE
+#endif // HANDHELD