X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fpreferences.cpp;h=83a180dbcfb71d52a02f8ace685ff90a3a3b7a34;hb=7903bfaabb569a181590d944a3491de03bd59265;hp=013c00504de3b00bafa58ae62975e7a6d65b4769;hpb=f0a3d52cbfc25dfd214c1758abaf4607d3f17430;p=presencevnc

diff --git a/src/preferences.cpp b/src/preferences.cpp
index 013c005..83a180d 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -31,9 +31,13 @@ void migrateConfiguration()
 {
 	QSettings settings;
 	int config_ver = settings.value("config_version", 0).toInt();
-	const int current_ver = 2;
+	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);
@@ -66,6 +70,20 @@ void migrateConfiguration()
 		
 		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();
@@ -81,7 +99,7 @@ Preferences::Preferences(QWidget *parent):
 	QVBoxLayout *layout2 = new QVBoxLayout();
 
 #ifdef Q_WS_MAEMO_5
-	QMaemo5ValueButton *rotation = new QMaemo5ValueButton(tr("Screen Rotation"), this);
+	QMaemo5ValueButton *rotation = new QMaemo5ValueButton(tr("Screen rotation"), this);
 	rotation_selector = new QMaemo5ListPickSelector(this);
 	QStandardItemModel *model = new QStandardItemModel(0, 1, this);
 	model->appendRow(new QStandardItem(tr("Automatic")));
@@ -93,23 +111,23 @@ Preferences::Preferences(QWidget *parent):
 	rotation->setValueLayout(QMaemo5ValueButton::ValueBesideText);
 	layout2->addWidget(rotation);
 
-	QMaemo5ValueButton *leftzoom = new QMaemo5ValueButton(tr("Left Zoom Button"), this);
+	QMaemo5ValueButton *leftzoom = new QMaemo5ValueButton(tr("Left zoom button"), this);
 	leftzoom_selector = new QMaemo5ListPickSelector(this);
 	QStandardItemModel *key_model = new QStandardItemModel(0, 1, this);
-	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")));
+	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);
 	leftzoom->setValueLayout(QMaemo5ValueButton::ValueBesideText);
 	layout2->addWidget(leftzoom);
 
-	QMaemo5ValueButton *rightzoom = new QMaemo5ValueButton(tr("Right Zoom Button"), this);
+	QMaemo5ValueButton *rightzoom = new QMaemo5ValueButton(tr("Right zoom button"), this);
 	rightzoom_selector = new QMaemo5ListPickSelector(this);
 	rightzoom_selector->setModel(key_model);
 	rightzoom_selector->setCurrentIndex(settings.value("right_zoom", 1).toInt());
@@ -118,7 +136,7 @@ Preferences::Preferences(QWidget *parent):
 	layout2->addWidget(rightzoom);
 
 	//useful if one only wants to click using the zoom buttons exclusively
-	disable_tapping = new QCheckBox(tr("Disable Tapping"), this);
+	disable_tapping = new QCheckBox(tr("Disable tapping"), this);
 	disable_tapping->setChecked(settings.value("disable_tapping", false).toBool());
 	layout2->addWidget(disable_tapping);
 #endif
@@ -127,6 +145,10 @@ Preferences::Preferences(QWidget *parent):
 	always_show_local_cursor->setChecked(settings.value("always_show_local_cursor", false).toBool());
 	layout2->addWidget(always_show_local_cursor);
 
+	zoom_to_cursor = new QCheckBox(tr("Zoom to cursor"), this);
+	zoom_to_cursor->setChecked(settings.value("zoom_to_cursor", true).toBool());
+	layout2->addWidget(zoom_to_cursor);
+
 	QPushButton *ok = new QPushButton(tr("Done"));
 	ok->setMaximumWidth(100);
 
@@ -150,6 +172,7 @@ void Preferences::save()
 	settings.setValue("disable_tapping", disable_tapping->isChecked());
 #endif
 	settings.setValue("always_show_local_cursor", always_show_local_cursor->isChecked());
+	settings.setValue("zoom_to_cursor", zoom_to_cursor->isChecked());
 
 	settings.sync();
 }