Merge branch 'master' of /opt/src/sb1/qt/scorecard

diff --git a/images/scorecard-icon-48x48.png b/images/scorecard-icon-48x48.png
index a5ae284..80cb702 100644 (file)
Binary files a/images/scorecard-icon-48x48.png and b/images/scorecard-icon-48x48.png differ

diff --git a/maemo/scorecard.conf b/maemo/scorecard.conf
new file mode 100644 (file)
index 0000000..3371696
--- /dev/null
+++ b/maemo/scorecard.conf
@@ -0,0 +1,8 @@
+<backup-configuration>
+  <locations>
+    <location type="file"
+              category="settings" auto="true">/home/user/.config/garage/ScoreCard.conf</location>
+    <location type="dir"
+              category="documents">/home/user/.scorecard</location>
+  </locations>
+</backup-configuration>

diff --git a/scorecard.pro b/scorecard.pro
index a87b279..9c84851 100644 (file)
--- a/scorecard.pro
+++ b/scorecard.pro
@@ -45,11 +45,12 @@ unix {
     DATADIR = $$PREFIX/data
     IMGDIR = /usr/share/icons/hicolor
     MAEMODIR = /usr/share/applications/hildon
+    BACKUPDIR = /etc/osso-backup/applications
 
     DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
 
     #MAKE INSTALL    
-    INSTALLS += target data desktop icon48
+    INSTALLS += target data desktop backup icon48
 
     target.path =$$BINDIR
 
@@ -59,6 +60,9 @@ unix {
     desktop.path = $$MAEMODIR
     desktop.files += maemo/scorecard.desktop
 
+    backup.path = $$BACKUPDIR
+    backup.files += maemo/scorecard.conf
+
     iconxpm.path = /usr/share/pixmap
     iconxpm.files += images/scorecard.xpm 
 

diff --git a/src/main-window.cpp b/src/main-window.cpp
index 0b53fd4..6cd05d3 100644 (file)
--- a/src/main-window.cpp
+++ b/src/main-window.cpp
@@ -233,7 +233,8 @@ void MainWindow::loadSettings(void)
     }
 #endif
 
-    userDataDir = QDir::homePath() + "/." + appName;
+    // Use MyDoc directory to get automatic backup/restore 
+    userDataDir = QDir::homePath() + "/MyDocs/." + appName;
     QDir dir(userDataDir);
     if (!dir.exists())
         if (!dir.mkpath(userDataDir)) {