From cb41df5f38cac41f1febf7757094f5729a38070b Mon Sep 17 00:00:00 2001 From: nicola Date: Tue, 8 Dec 2009 14:29:58 +0100 Subject: [PATCH] beta --- dialogsearch.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dialogsearch.cpp b/dialogsearch.cpp index 1c91603..23a9b91 100644 --- a/dialogsearch.cpp +++ b/dialogsearch.cpp @@ -2,12 +2,15 @@ #include "ui_dialogsearch.h" #include "dialogcalendar.h" #include +#include "badgedata.h" DialogSearch::DialogSearch(QWidget *parent) : QDialog(parent), ui(new Ui::DialogSearch) { ui->setupUi(this); + //move(, 0); + //showMaximized(); } DialogSearch::~DialogSearch() @@ -39,21 +42,24 @@ void DialogSearch::end() ui->dateEditEnd->setDate(cal.getDate(ui->dateEditEnd->date())); } -int DialogSearch::totalHours() +QTime DialogSearch::totalHours(bool &ok) { - if (this->exec() == QDialog::Accepted) { + if (this->exec() == QDialog::Accepted) { + BadgeData data; + ok = true; + return data.totalTime(ui->dateEditStart->date(), ui->dateEditEnd->date()); } + ok = false; - - return 0; + return QTime(0, 0, 0, 0); } void DialogSearch::accept() { if (ui->dateEditEnd->date() < ui->dateEditStart->date()) { - int ret = QMessageBox::warning(this, tr("Badge"), + QMessageBox::warning(this, tr("Badge"), tr("End date must to be major or equal of start date.\n")); } else -- 1.7.9.5