Merge branch 'settings' into harmattan

The game settings chosen in the new game dialog are saved (separately
for each time control).

Conflicts:
	chessclock.pro
	main.cpp
	qml/NewGameDialogPage.qml

diff --cc chessclock.pro
index f05273d,3930fa2..abdf75b
--- 1/chessclock.pro
--- 2/chessclock.pro
+++ b/chessclock.pro
@@@ -29,16 -28,25 +29,17 @@@ SOURCES += main.cpp 
      classes/chessclock.cpp \
      classes/chessclockwidget.cpp \
      classes/clockswidget.cpp \
 -    classes/welcomescreenwidget.cpp \
 -    classes/timecontrol/basicdialog.cpp \
 -    classes/timecontrol/notimecontrol.cpp \
 -    classes/startwidget.cpp \
 -    classes/timecontrol/fischertimecontrol.cpp \
      classes/timecontrol/fischerclock.cpp \
      classes/timecontrol/fischerafterclock.cpp \
 -    classes/timecontrol/fischeraftertimecontrol.cpp \
      classes/timecontrol/delayclock.cpp \
 -    classes/timecontrol/delaytimecontrol.cpp \
      classes/timecontrol/delayafterclock.cpp \
 -    classes/timecontrol/delayaftertimecontrol.cpp \
      classes/timecontrol/hourglassclock.cpp \
 -    classes/timecontrol/hourglasstimecontrol.cpp \
      classes/screenlitkeeper.cpp \
      classes/wrappedclockswidget.cpp \
-     chessclockview.cpp
++    chessclockview.cpp \
+     classes/settings.cpp
  
 -HEADERS  += chessclockwindow.h \
 +HEADERS  += \
      classes/turninformation.h \
      classes/chessclock.h \
      classes/chessclockwidget.h \
@@@ -50,7 -66,9 +51,8 @@@
      classes/timecontrol/hourglassclock.h \
      classes/screenlitkeeper.h \
      classes/wrappedclockswidget.h \
-     chessclockview.h
++    chessclockview.h \
+     classes/settings.h
  
  
  OTHER_FILES += \

diff --cc main.cpp
index 65889fe,b708993..394c7f4
--- 1/main.cpp
--- 2/main.cpp
+++ b/main.cpp
@@@ -22,19 -22,23 +22,25 @@@
  #include <QtGui/QApplication>
  #include <QtDeclarative>
  #include "classes/wrappedclockswidget.h"
 +#include "chessclockview.h"
+ #include "classes/settings.h"
  
  
 -int main(int argc, char *argv[])
 +Q_DECL_EXPORT int main(int argc, char *argv[])
  {
      QApplication app(argc, argv);
+ 
+     app.setApplicationName("Chess Clock");
+     app.setOrganizationName("Chess Clock");
+ 
      app.setStyleSheet("* {color: white}");
  
      qmlRegisterType<WrappedClocksWidget>("ChessClocks", 1, 0, "WrappedClocksWidget");
+     qmlRegisterType<Settings>("ChessClocks", 1, 0, "Settings");
  
 -    QDeclarativeView view;
 +    ChessClockView view;
      view.setSource(QUrl("qrc:/qml/main.qml"));
 +
      view.showFullScreen();
      return app.exec();
  }

diff --cc qml/NewGameDialogPage.qml
Simple merge