Fix forward navigation control on Linux.

[dorian] / settingswindow.cpp

diff --git a/settingswindow.cpp b/settingswindow.cpp
index f09f9b2..a390363 100644 (file)
--- a/settingswindow.cpp
+++ b/settingswindow.cpp
@@ -42,16 +42,18 @@ SettingsWindow::SettingsWindow(QWidget *parent):  AdopterWindow(parent)
     QVBoxLayout *layout = new QVBoxLayout(contents);
     contents->setLayout(layout);
 
-#ifndef Q_OS_SYMBIAN
+#if defined(Q_WS_MAEMO_5)
     QCheckBox *backlight = new QCheckBox(tr("Keep backlight on"), contents);
     layout->addWidget(backlight);
     backlight->setChecked(settings->value("lightson", false).toBool());
 #endif
 
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
     QCheckBox *grabVolume =
             new QCheckBox(tr("Navigate with volume keys"), contents);
     layout->addWidget(grabVolume);
     grabVolume->setChecked(settings->value("usevolumekeys", false).toBool());
+#endif
 
     int zoom = settings->value("zoom", platform->defaultZoom()).toInt();
     if (zoom < ZOOM_MIN) {
@@ -71,7 +73,8 @@ SettingsWindow::SettingsWindow(QWidget *parent):  AdopterWindow(parent)
 
     QLabel *fontLabel = new QLabel(tr("Font:"), contents);
     layout->addWidget(fontLabel);
-    QString family = settings->value("font", platform->defaultFont()).toString();
+    QString family =
+            settings->value("font", platform->defaultFont()).toString();
     fontButton = new QFontComboBox(contents);
     fontButton->setCurrentFont(QFont(family));
     fontButton->setEditable(false);
@@ -81,43 +84,21 @@ SettingsWindow::SettingsWindow(QWidget *parent):  AdopterWindow(parent)
     layout->addWidget(colorLabel);
     ToolButtonBox *box = new ToolButtonBox(this);
     layout->addWidget(box);
-    box->addButton(SchemeDefault, tr("Default"),
-                   Platform::instance()->icon("style-default"));
+    box->addButton(SchemeDay, tr("Day"),
+                   Platform::instance()->icon("style-day"));
     box->addButton(SchemeNight, tr("Night"),
                    Platform::instance()->icon("style-night"));
-    box->addButton(SchemeDay, tr("Day"), Platform::instance()->icon("style-day"));
     box->addButton(SchemeSand, tr("Sand"),
                    Platform::instance()->icon("style-sand"));
     box->addStretch();
-    QString scheme = settings->value("scheme", "default").toString();
+    QString scheme = settings->value("scheme", "day").toString();
     if (scheme == "night") {
         box->toggle(SchemeNight);
-    } else if (scheme == "day") {
-        box->toggle(SchemeDay);
     } else if (scheme == "sand") {
         box->toggle(SchemeSand);
     } else {
-        box->toggle(SchemeDefault);
-    }
-
-#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
-    QLabel *orientationLabel = new QLabel(tr("Orientation:"), contents);
-    layout->addWidget(orientationLabel);
-    orientationBox = new ToolButtonBox(this);
-    layout->addWidget(orientationBox);
-    orientationBox->addButton(OrientationPortrait, tr("Portrait"),
-                              ":/icons/settings-portrait.png");
-    orientationBox->addButton(OrientationLandscape, tr("Landscape"),
-                              ":/icons/settings-landscape.png");
-    orientationBox->addStretch();
-    QString orientation =
-        settings->value("orientation", platform->defaultOrientation()).toString();
-    if (orientation == "portrait") {
-        orientationBox->toggle(OrientationPortrait);
-    } else {
-        orientationBox->toggle(OrientationLandscape);
+        box->toggle(SchemeDay);
     }
-#endif // defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
 
     layout->addStretch();
     scroller->setWidget(contents);
@@ -126,22 +107,20 @@ SettingsWindow::SettingsWindow(QWidget *parent):  AdopterWindow(parent)
 
     setCentralWidget(scroller);
 
-#ifndef Q_OS_SYMBIAN
+#if defined(Q_WS_MAEMO_5)
     connect(backlight, SIGNAL(toggled(bool)),
             this, SLOT(onLightsToggled(bool)));
 #endif
+#if defined(Q_WS_MAEMO_5) || defined(Q_OS_SYMBIAN)
     connect(grabVolume, SIGNAL(toggled(bool)),
             this, SLOT(onGrabVolumeToggled(bool)));
+#endif
     connect(zoomSlider, SIGNAL(valueChanged(int)),
             this, SLOT(onSliderValueChanged(int)));
     connect(fontButton, SIGNAL(currentFontChanged(const QFont &)),
             this, SLOT(onCurrentFontChanged(const QFont &)));
     connect(box, SIGNAL(buttonClicked(int)),
             this, SLOT(onSchemeButtonClicked(int)));
-#ifndef Q_OS_SYMBIAN
-    connect(orientationBox, SIGNAL(buttonClicked(int)),
-            this, SLOT(onOrientationButtonClicked(int)));
-#endif
 
 #ifdef Q_OS_SYMBIAN
     QAction *closeAction = new QAction(parent? tr("Back"): tr("Exit"), this);
@@ -159,21 +138,27 @@ void SettingsWindow::onSliderValueChanged(int value)
         return;
     }
     zoomLabel->setText(tr("Zoom level: %1%").arg(value));
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_OS_SYMBIAN)
+    Settings::instance()->setValue("zoom", zoomSlider->value());
+#endif
 }
 
 void SettingsWindow::onCurrentFontChanged(const QFont &font)
 {
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_OS_SYMBIAN)
+    Settings::instance()->setValue("font", font.family());
+#else
     Q_UNUSED(font);
+#endif
 }
 
 void SettingsWindow::onSchemeButtonClicked(int id)
 {
     QString scheme;
     switch (id) {
-    case SchemeDay: scheme = "day"; break;
     case SchemeNight: scheme = "night"; break;
     case SchemeSand: scheme = "sand"; break;
-    default: scheme = "default"; break;
+    default: scheme = "day"; break;
     }
     Settings::instance()->setValue("scheme", scheme);
 }
@@ -198,9 +183,6 @@ void SettingsWindow::closeEvent(QCloseEvent *e)
     Settings *settings = Settings::instance();
     settings->setValue("zoom", zoomSlider->value());
     settings->setValue("font", fontButton->currentFont().family());
-    settings->setValue("orientation",
-        (orientationBox->checkedId() == OrientationLandscape)?
-        "landscape": "portrait");
     e->accept();
 }