zoom into center of visible area

[presencevnc] / src / preferences.cpp

diff --git a/src/preferences.cpp b/src/preferences.cpp
index 9fe5718..ea1fe2e 100644 (file)
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -17,19 +17,88 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include <QtGui>
+
+#ifdef Q_WS_MAEMO_5
 #include <QMaemo5ValueButton>
 #include <QMaemo5ListPickSelector>
+#endif
 
 #include "preferences.h"
 
+#include <iostream>
+
+void migrateConfiguration()
+{
+       QSettings settings;
+       int config_ver = settings.value("config_version", 0).toInt();
+       const int current_ver = 3;
+       if(config_ver == current_ver) //config file up-to-date
+               return;
+       if(config_ver > current_ver) {
+               std::cout << "Warning: Config file was created by a newer version of Presence VNC. This may break things.\n";
+               return;
+       }
+       
+       if(settings.allKeys().isEmpty()) { //no config file
+               settings.setValue("config_version", current_ver);
+               settings.sync();
+               return;
+       }
+
+       std::cout << "Migrating from configuration ver. " << config_ver << "\n";
+
+       if(config_ver == 0) {
+               int left_zoom = settings.value("left_zoom", 0).toInt();
+               int right_zoom = settings.value("left_zoom", 0).toInt();
+               if(left_zoom >= 2)
+                       settings.setValue("left_zoom", left_zoom+1);
+               if(right_zoom >= 2)
+                       settings.setValue("left_zoom", right_zoom+1);
+               config_ver = 1;
+       }
+       if(config_ver == 1) {
+               QString last_hostname = settings.value("last_hostname", "").toString();
+               settings.remove("last_hostname");
+               if(!last_hostname.isEmpty()) {
+                       //make sure hostname is sane
+                       last_hostname.remove(QChar('/'));
+                       last_hostname.remove(QChar('\\'));
+                       last_hostname = last_hostname.toLower();
+
+                       settings.setValue(QString("hosts/%1/position").arg(last_hostname), 0);
+               }
+               
+               config_ver = 2;
+       }
+       if(config_ver == 2) {
+               bool rescale = settings.value("rescale", false).toBool();
+               settings.remove("rescale");
+
+               int zoomlevel;
+               if(rescale)
+                       zoomlevel = 0;
+               else
+                       zoomlevel = 95;
+
+               settings.setValue("zoomlevel", zoomlevel);
+               
+               config_ver = 3;
+       }
+       Q_ASSERT(config_ver == current_ver);
+       settings.setValue("config_version", config_ver);
+       settings.sync();
+}
+
+
 Preferences::Preferences(QWidget *parent):
        QDialog(parent)
 {
-       setWindowTitle("Preferences");
+       setWindowTitle(tr("Preferences"));
 
        QHBoxLayout *layout1 = new QHBoxLayout();
        QVBoxLayout *layout2 = new QVBoxLayout();
 
+#ifdef Q_WS_MAEMO_5
        QMaemo5ValueButton *rotation = new QMaemo5ValueButton(tr("Screen Rotation"), this);
        rotation_selector = new QMaemo5ListPickSelector(this);
        QStandardItemModel *model = new QStandardItemModel(0, 1, this);
@@ -45,12 +114,13 @@ Preferences::Preferences(QWidget *parent):
        QMaemo5ValueButton *leftzoom = new QMaemo5ValueButton(tr("Left Zoom Button"), this);
        leftzoom_selector = new QMaemo5ListPickSelector(this);
        QStandardItemModel *key_model = new QStandardItemModel(0, 1, this);
-       key_model->appendRow(new QStandardItem(tr("Left Click"))); //0
-       key_model->appendRow(new QStandardItem(tr("Right Click")));//1
-       key_model->appendRow(new QStandardItem(tr("Wheel Up")));//2
-       key_model->appendRow(new QStandardItem(tr("Wheel Down")));//3
-       key_model->appendRow(new QStandardItem(tr("Page Up")));//4
-       key_model->appendRow(new QStandardItem(tr("Page Down")));//5
+       key_model->insertRow(0, new QStandardItem(tr("Left Click")));
+       key_model->insertRow(1, new QStandardItem(tr("Right Click")));
+       key_model->insertRow(2, new QStandardItem(tr("Middle Click")));
+       key_model->insertRow(3, new QStandardItem(tr("Wheel Up")));
+       key_model->insertRow(4, new QStandardItem(tr("Wheel Down")));
+       key_model->insertRow(5, new QStandardItem(tr("Page Up")));
+       key_model->insertRow(6, new QStandardItem(tr("Page Down")));
        leftzoom_selector->setModel(key_model);
        leftzoom_selector->setCurrentIndex(settings.value("left_zoom", 0).toInt());
        leftzoom->setPickSelector(leftzoom_selector);
@@ -65,7 +135,18 @@ Preferences::Preferences(QWidget *parent):
        rightzoom->setValueLayout(QMaemo5ValueButton::ValueBesideText);
        layout2->addWidget(rightzoom);
 
-       QPushButton *ok = new QPushButton("OK");
+       //useful if one only wants to click using the zoom buttons exclusively
+       disable_tapping = new QCheckBox(tr("Disable Tapping"), this);
+       disable_tapping->setChecked(settings.value("disable_tapping", false).toBool());
+       layout2->addWidget(disable_tapping);
+#endif
+
+       always_show_local_cursor = new QCheckBox(tr("Always show local cursor"), this);
+       always_show_local_cursor->setChecked(settings.value("always_show_local_cursor", false).toBool());
+       layout2->addWidget(always_show_local_cursor);
+
+       QPushButton *ok = new QPushButton(tr("Done"));
+       ok->setMaximumWidth(100);
 
        layout1->addLayout(layout2);
        layout1->addWidget(ok);
@@ -78,16 +159,15 @@ Preferences::Preferences(QWidget *parent):
                this, SLOT(save()));
 }
 
-Preferences::~Preferences()
-{
-
-}
-
-
 void Preferences::save()
 {
+#ifdef Q_WS_MAEMO_5
        settings.setValue("screen_rotation", rotation_selector->currentIndex());
-       //TODO: save zoom stuf
+       settings.setValue("left_zoom", leftzoom_selector->currentIndex());
+       settings.setValue("right_zoom", rightzoom_selector->currentIndex());
+       settings.setValue("disable_tapping", disable_tapping->isChecked());
+#endif
+       settings.setValue("always_show_local_cursor", always_show_local_cursor->isChecked());
 
        settings.sync();
 }