Merge branch 'savingsettings' into base

Conflicts:
	seascene.cpp

diff --cc seascene.cpp
index 7005071,084afd9..1d9f720
--- 1/seascene.cpp
--- 2/seascene.cpp
+++ b/seascene.cpp
@@@ -408,7 -411,21 +411,14 @@@ void SeaScene::handleScreenTapped(
  
      else if (pItem == pSettingsItem_)
      {
 -    //Temporary code for settings, likely to be turned into a QML dialog
 +        pVibrateAction_->toggle();
+           QSettings settings;
 -
 -          QMessageBox::StandardButton buttonpressed = QMessageBox::question(NULL,"Settings","Do you wish to have vibration effects enabled?", QMessageBox::Yes | QMessageBox::No);
 -
 -          if (buttonpressed == QMessageBox::Yes)
+           {
 -              pVibrateAction_->setChecked(true);
+               settings.setValue("vibration",true);
+           }
 -          if (buttonpressed == QMessageBox::No)
+           {
 -              pVibrateAction_->setChecked(false);
+               settings.setValue("vibration",false);
+           }
      }
  
      else if (pItem == pAboutItem_)