Fixes in backup configuration file (scorecard.conf). Backup works now.

Don't allow commas in club or course names.

diff --git a/maemo/scorecard.conf b/maemo/scorecard.conf
index 6ae4c42..03979be 100644 (file)
--- a/maemo/scorecard.conf
+++ b/maemo/scorecard.conf
@@ -1,8 +1,6 @@
 <backup-configuration>
   <locations>
-    <location type="file"
-              category="settings" auto="true">/home/user/.config/garage/ScoreCard.conf</location>
-    <location type="dir"
-              category="documents">/home/user/MyDocs/.scorecard</location>
+    <location type="file" category="settings" auto="true">$HOME/.config/garage/ScoreCard.conf</location>
+    <location type="dir" category="settings" auto="true">$HOME/MyDocs/.scorecard</location>
   </locations>
 </backup-configuration>

diff --git a/src/course-dialog.cpp b/src/course-dialog.cpp
index 5e81bf0..6621412 100644 (file)
--- a/src/course-dialog.cpp
+++ b/src/course-dialog.cpp
@@ -7,6 +7,9 @@
  */
 
 #include <QtGui>
+#ifdef Q_WS_MAEMO_5
+#include <QMaemo5InformationBox>
+#endif
 #include <QLayout>
 #include <QLineEdit>
 #include <QInputContext>
@@ -100,6 +103,15 @@ void CourseSelectDialog::createLayout(QWidget *parent)
     setLayout(mainLayout);
 }
 
+void CourseSelectDialog::showNote(QString msg)
+{
+#ifdef Q_WS_MAEMO_5
+    QMaemo5InformationBox::information(this, 
+                                       msg,
+                                       QMaemo5InformationBox::DefaultTimeout);
+#endif
+}
+
 void CourseSelectDialog::results(QString &club, 
                                 QString &course)
 {  
@@ -115,6 +127,9 @@ bool CourseSelectDialog::validate(void)
     if (str1.isEmpty() || str2.isEmpty())
         return false;
   
+    if (str1.contains(",") || str2.contains(","))
+        return false;
+
     return true;
 }
 
@@ -123,7 +138,7 @@ void CourseSelectDialog::next(void)
     if (validate())
         done(1);
     else {
-        qDebug() << "CourseDialog: invalid data, cancel or correct";
+        showNote(tr("Invalid club or course name"));
     }
 }
 

diff --git a/src/course-dialog.h b/src/course-dialog.h
index 35e7c8d..41d9535 100644 (file)
--- a/src/course-dialog.h
+++ b/src/course-dialog.h
@@ -53,6 +53,7 @@ private slots:
  private:
 
   void createLayout(QWidget *parent);
+  void showNote(QString msg);
   bool validate(void);
 
   QLineEdit    *lineEditClub;