From: nicola Date: Tue, 2 Mar 2010 11:45:54 +0000 (+0100) Subject: fix search date X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=36b9813a470601d816d2c837b0a32f51a40ae1a7;hp=2347a11374a55949083817964e13350e3d2de19f;p=badge fix search date --- diff --git a/dialogsearch.cpp b/dialogsearch.cpp index 9a07bbe..c47a79e 100644 --- a/dialogsearch.cpp +++ b/dialogsearch.cpp @@ -4,6 +4,10 @@ #include #include "badgedata.h" #include +#include +#include + + DialogSearch::DialogSearch(QWidget *parent) : QDialog(parent)/*, @@ -117,11 +121,20 @@ void DialogSearch::changeEvent(QEvent *e) QTime DialogSearch::totalHours(bool &ok) { + if (this->exec() == QDialog::Accepted) { BadgeData data; + QLocale locale; + QString begin = pushButtonStart->valueText(); + QString end = pushButtonEnd->valueText(); + + begin.replace(QString(" "), QString(" ")); + end.replace(QString(" "), QString(" ")); + ok = true; - qDebug() << "S " << pushButtonStart->valueText() << " E " << pushButtonEnd->valueText() << endl; - return data.totalTime(QDate::fromString(pushButtonStart->valueText(), "yyyy-M-d"), QDate::fromString(pushButtonEnd->valueText(), "yyyy-M-d")); + //qDebug() << "FORM " << locale.dateFormat(QLocale::LongFormat) << endl; + //qDebug() << "STR " << pushButtonStart->valueText() << " DATE " << QDate::fromString(begin, "dddd d MMMM yyyy").toString() << endl; + return data.totalTime(QDate::fromString(begin, "dddd d MMMM yyyy"), QDate::fromString(end, "dddd d MMMM yyyy")); } ok = false;