Maemo5 date picker button

diff --git a/scorecard.pro b/scorecard.pro
index 36a7b74..01ec878 100644 (file)
--- a/scorecard.pro
+++ b/scorecard.pro
@@ -8,7 +8,7 @@ QMAKE_CXXFLAGS += -Wno-return-type
 
 CONFIG  += qt debug
 TEMPLATE = app
-QT      += xml
+QT      += xml maemo5
 
 RESOURCES = scorecard.qrc
 

diff --git a/src/main-window.cpp b/src/main-window.cpp
index a7b1a88..49d973a 100644 (file)
--- a/src/main-window.cpp
+++ b/src/main-window.cpp
@@ -67,7 +67,7 @@ void MainWindow::loadSettings(void)
   // TODO: make via user option, automatic will never work
   external = false;
 
-#ifndef Q_WS_HILDON
+#ifndef Q_WS_MAEMO_5
   dataDir = "./" + dataDirName;
 #else
   if (external) {
@@ -174,7 +174,7 @@ void MainWindow::createActions()
 
 void MainWindow::createMenus()
 {
-#ifdef Q_WS_HILDON
+#ifdef Q_WS_MAEMO_5
   menu = menuBar()->addMenu("");
 #else
   menu = menuBar()->addMenu("Menu");

diff --git a/src/score-dialog.cpp b/src/score-dialog.cpp
index 4b42593..e02294c 100644 (file)
--- a/src/score-dialog.cpp
+++ b/src/score-dialog.cpp
@@ -23,19 +23,27 @@ SelectDialog::SelectDialog(QWidget *parent) : QDialog(parent)
 void SelectDialog::createLayout(QWidget *parent)
 {
   listClub = new QListWidget(parent);
-  lineEditDate = new QLineEdit;
   pushButtonNext = new QPushButton(tr("Next"));
 
-  QDate today(QDate::currentDate());
-  lineEditDate->setText(today.toString("yyyy-MM-dd"));
-  date = new QDateEdit;
-
   connect(pushButtonNext, SIGNAL(clicked()), this, SLOT(next()));
 
   leftLayout = new QVBoxLayout;
   leftLayout->addWidget(listClub);
-  //leftLayout->addWidget(date);
+
+#ifdef Q_WS_MAEMO_5
+  dateButton = new QMaemo5ValueButton();
+  dateButton->setValueLayout(QMaemo5ValueButton::ValueUnderText);
+  dateButton->setPickSelector(new QMaemo5DatePickSelector());
+  dateButton->setText(QString::fromUtf8("Date"));
+  leftLayout->addWidget(dateButton);
+#else
+  QDate today(QDate::currentDate());
+  lineEditDate = new QLineEdit;
+  lineEditDate->setText(today.toString("yyyy-MM-dd"));
+  date = new QDateEdit;
+  leftLayout->addWidget(date);
   leftLayout->addWidget(lineEditDate);
+#endif
 
   rightLayout = new QVBoxLayout;
   rightLayout->addStretch();
@@ -88,7 +96,14 @@ void SelectDialog::results(QString &club,
     QStringList stringList = tmp.split(",");
     club = stringList[0];
     course = stringList[1];
-    date   = lineEditDate->text();
+#ifdef Q_WS_MAEMO_5
+    QMaemo5DatePickSelector *sel = (QMaemo5DatePickSelector *)dateButton->pickSelector();
+    QDate d = sel->currentDate();
+    // TODO: change to QDate
+    date = d.toString(Qt::ISODate);
+#else
+    date = lineEditDate->text();
+#endif
   }
 }
 

diff --git a/src/score-dialog.h b/src/score-dialog.h
index b7dba33..fadc94f 100644 (file)
--- a/src/score-dialog.h
+++ b/src/score-dialog.h
@@ -17,6 +17,10 @@
 #include <QPushButton>
 #include <QDateEdit>
 #include <QLayout>
+#ifdef Q_WS_MAEMO_5
+#include <QtMaemo5/QMaemo5ValueButton>
+#include <QtMaemo5/QMaemo5DatePickSelector>
+#endif
 
 #include "data.h"
 
@@ -43,8 +47,12 @@ private slots:
 
   // Widgets
   QListWidget  *listClub;
+#ifdef Q_WS_MAEMO_5
+  QMaemo5ValueButton *dateButton;
+#else
   QLineEdit    *lineEditDate;
   QDateEdit    *date;
+#endif
   QLabel       *labelClub;
   QLabel       *labelCourse;
   QPushButton  *pushButtonNext;