X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=dialogday.cpp;h=2f170ff9639992237b627158730ae895034a0501;hb=fe73f8dd48c9c722525bf15641abf9920fbd7f99;hp=13ad4a856dcafc88b703767ec67e2d1944e31e99;hpb=36b9813a470601d816d2c837b0a32f51a40ae1a7;p=badge

diff --git a/dialogday.cpp b/dialogday.cpp
index 13ad4a8..2f170ff 100644
--- a/dialogday.cpp
+++ b/dialogday.cpp
@@ -181,29 +181,29 @@ void DialogDay::enableSecond(bool enable)
 
 TimeTable DialogDay::getTimes(TimeTable timetable)
 {
-    qDebug () << "ENT " << timetable.entrance.toString("hh:mm") << endl;
-    timeEditEntrance->setValueText(timetable.entrance.toString("hh:mm") + ":00");
-    timeEditExit->setValueText(timetable.exit.toString("hh:mm") + ":00");
-    timeEditFBegin->setValueText(timetable.firstPause.toString("hh:mm") + ":00" );
-    timeEditEndF->setValueText(timetable.endFirstPause.toString("hh:mm") + ":00" );
-    timeEditSBegin->setValueText(timetable.secondPause.toString("hh:mm") + ":00");
-    timeEditEndS->setValueText(timetable.endSecondPause.toString("hh:mm") + ":00");
+    //qDebug () << "ENT " << timetable.entrance.toString("hh:mm") << endl;
+    timeEditEntrance->setValueText(timetable.entrance.toString("hh:mm") /*+ ":00"*/);
+    timeEditExit->setValueText(timetable.exit.toString("hh:mm")/* + ":00"*/);
+    timeEditFBegin->setValueText(timetable.firstPause.toString("hh:mm") /*+ ":00" */);
+    timeEditEndF->setValueText(timetable.endFirstPause.toString("hh:mm")/* + ":00"*/ );
+    timeEditSBegin->setValueText(timetable.secondPause.toString("hh:mm") /*+ ":00"*/);
+    timeEditEndS->setValueText(timetable.endSecondPause.toString("hh:mm")/* + ":00"*/);
 
     checkBoxFirst->setChecked(false);
     checkBoxSecond->setChecked(false);
 
     if (timetable.firstPause != timetable.endFirstPause) {
         checkBoxFirst->setChecked(true);
-        timeEditFBegin->setValueText(timetable.firstPause.toString("hh:mm") + ":00");
+        timeEditFBegin->setValueText(timetable.firstPause.toString("hh:mm")/* + ":00"*/);
         timeEditFBegin->setEnabled(true);
-        timeEditEndF->setValueText(timetable.endFirstPause.toString("hh:mm") + ":00");
+        timeEditEndF->setValueText(timetable.endFirstPause.toString("hh:mm") /*+ ":00"*/);
         timeEditEndF->setEnabled(true);
     }
     if (timetable.secondPause != timetable.endSecondPause) {
         checkBoxSecond->setChecked(true);
-        timeEditSBegin->setValueText(timetable.secondPause.toString("hh:mm") + ":00");
+        timeEditSBegin->setValueText(timetable.secondPause.toString("hh:mm") /*+ ":00"*/);
         timeEditSBegin->setEnabled(true);
-        timeEditEndS->setValueText(timetable.endSecondPause.toString("hh:mm") + ":00");
+        timeEditEndS->setValueText(timetable.endSecondPause.toString("hh:mm")/* + ":00"*/);
         timeEditEndS->setEnabled(true);
     }
 
@@ -211,16 +211,16 @@ TimeTable DialogDay::getTimes(TimeTable timetable)
     if (this->exec() == QDialog::Accepted) {
 
 
-        timetable.entrance =  QTime::fromString(timeEditEntrance->valueText(), "hh:mm:ss");
-        timetable.exit =  QTime::fromString(timeEditExit->valueText(), "hh:mm:ss");
+        timetable.entrance =  QTime::fromString(timeEditEntrance->valueText(), "hh:mm");
+        timetable.exit =  QTime::fromString(timeEditExit->valueText(), "hh:mm");
         if (checkBoxFirst->isChecked()) {
 
-            timetable.firstPause = QTime::fromString(timeEditFBegin->valueText(), "hh:mm:ss");
-            timetable.endFirstPause = QTime::fromString(timeEditEndF->valueText(), "hh:mm:ss");
+            timetable.firstPause = QTime::fromString(timeEditFBegin->valueText(), "hh:mm");
+            timetable.endFirstPause = QTime::fromString(timeEditEndF->valueText(), "hh:mm");
         }
         if (checkBoxSecond->isChecked()) {
-            timetable.secondPause = QTime::fromString(timeEditSBegin->valueText(), "hh:mm:ss");
-            timetable.endSecondPause = QTime::fromString(timeEditEndS->valueText(), "hh:mm:ss");
+            timetable.secondPause = QTime::fromString(timeEditSBegin->valueText(), "hh:mm");
+            timetable.endSecondPause = QTime::fromString(timeEditEndS->valueText(), "hh:mm");
         }
         return timetable;
     }