diff options
author | Olli Werwolff <qt-info@nokia.com> | 2011-04-14 12:28:52 +0200 |
---|---|---|
committer | Olli Werwolff <qt-info@nokia.com> | 2011-04-14 12:28:52 +0200 |
commit | e8f6913d361188c4984e2ff0a630f3d2be325b04 (patch) | |
tree | c7978f9a305cd30c75701013a79c5fa702e61d02 | |
parent | eb87d8b4d6d09c40f9837647f012f88e95196bcf (diff) |
Load/save custom gesture start on startup/shutdowntouch
Task-number: QTSIM-77
-rw-r--r-- | src/ui/mainwindow.cpp | 14 | ||||
-rw-r--r-- | src/ui/mainwindow.h | 2 | ||||
-rw-r--r-- | src/ui/multipointtouchui.cpp | 19 | ||||
-rw-r--r-- | src/ui/multipointtouchui.h | 2 |
4 files changed, 31 insertions, 6 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index db37478..2598ee5 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -247,15 +247,16 @@ MainWindow::MainWindow(QWidget *parent) mobility->mNfcUi = nfcUi; config->addSimulateSubPage(nfcUi); - MultiPointTouchUi *mptUi = new MultiPointTouchUi(this); - mptUi->setGestureScriptPath(userResourcePath() + "/scripts/gestures"); - config->addSimulateSubPage(mptUi); - connect(mptUi, SIGNAL(inputModeChanged(MultiPointTouchUi::InputMode)), + mTouchUi = new MultiPointTouchUi(this); + mTouchUi->setGestureScriptPath(userResourcePath() + "/scripts/gestures"); + config->addSimulateSubPage(mTouchUi); + connect(mTouchUi, SIGNAL(inputModeChanged(MultiPointTouchUi::InputMode)), widgetManager, SLOT(setMouseInputMode(MultiPointTouchUi::InputMode))); connect(this, SIGNAL(mouseInputModeChanged(MultiPointTouchUi::InputMode)), - mptUi, SLOT(setInputMode(MultiPointTouchUi::InputMode))); - connect(mptUi, SIGNAL(customGesturePathChanged(QString)), + mTouchUi, SLOT(setInputMode(MultiPointTouchUi::InputMode))); + connect(mTouchUi, SIGNAL(customGesturePathChanged(QString)), widgetManager, SLOT(setCurrentGesturePath(QString))); + mTouchUi->readSettings(QCoreApplication::organizationName(), QCoreApplication::applicationName()); ScriptUi *scriptUi = new ScriptUi(scriptAdapter, this); FavoriteScriptButton *scriptButton = new FavoriteScriptButton(this); @@ -371,6 +372,7 @@ void MainWindow::closeEvent(QCloseEvent *event) if (!startupError) { writeSettings(); config->writeSettings(QCoreApplication::organizationName(), QCoreApplication::applicationName()); + mTouchUi->writeSettings(QCoreApplication::organizationName(), QCoreApplication::applicationName()); } } diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 292bbf9..c439468 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -97,6 +97,8 @@ private: ScriptAdapter *scriptAdapter; + MultiPointTouchUi *mTouchUi; + QWidget *debugWindow; bool startupError; diff --git a/src/ui/multipointtouchui.cpp b/src/ui/multipointtouchui.cpp index eb71125..dec633d 100644 --- a/src/ui/multipointtouchui.cpp +++ b/src/ui/multipointtouchui.cpp @@ -33,6 +33,7 @@ #include "multipointtouchui.h" +#include <QtCore/QSettings> #include <QtGui/QVBoxLayout> #include <QtGui/QButtonGroup> #include <QtGui/QRadioButton> @@ -133,3 +134,21 @@ void MultiPointTouchUi::setGestureScriptPath(const QString &path) { mGestureScriptPath = path; } + +void MultiPointTouchUi::writeSettings(const QString &vendor, const QString &name) const +{ + if (!QFile::exists(mCustomLineEdit->text())) + return; + + QSettings settings(vendor, name); + settings.beginGroup("MultiPointTouchUi"); + settings.setValue("customGesturePath", mCustomLineEdit->text()); +} + +void MultiPointTouchUi::readSettings(const QString &vendor, const QString &name) +{ + QSettings settings(vendor, name); + settings.beginGroup("MultiPointTouchUi"); + if (settings.contains("customGesturePath")) + mCustomLineEdit->setText(settings.value("customGesturePath").toString()); +} diff --git a/src/ui/multipointtouchui.h b/src/ui/multipointtouchui.h index 820aaa4..0fe3898 100644 --- a/src/ui/multipointtouchui.h +++ b/src/ui/multipointtouchui.h @@ -58,6 +58,8 @@ public: virtual ~MultiPointTouchUi(); void setGestureScriptPath(const QString &path); + void writeSettings(const QString &vendor, const QString &name) const; + void readSettings(const QString &vendor, const QString &name); signals: void inputModeChanged(MultiPointTouchUi::InputMode newMode); |