[svn-upgrade] Integrating new upstream version, teleschorsch (0.0.9)

diff --git a/ChangeLog b/ChangeLog
index 8b115fc92026297088066652187d0f24e3f84c18..657d49d3e5a8ce8fd6d0b68d779302902e186221 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
 ------------------------------------------------------------------------
+r431 | philipp | 2007-03-06 23:09:55 +0100 (Tue, 06 Mar 2007) | 2 lines
+Changed paths:
+   M /teleschorsch/trunk/main.cpp
+
+Default date is today for time >= 12:00 o'clock and yesterday otherwise.
+
+------------------------------------------------------------------------
+r430 | gregoa | 2007-03-04 18:40:45 +0100 (Sun, 04 Mar 2007) | 1 line
+Changed paths:
+   M /teleschorsch/trunk/teleschorsch.1
+
+puh. groff (in man pages)
+------------------------------------------------------------------------
 r429 | gregoa | 2007-03-04 18:12:20 +0100 (Sun, 04 Mar 2007) | 1 line
 Changed paths:
    M /teleschorsch/trunk/makedist

diff --git a/main.cpp b/main.cpp
index 0c72f6d402d75f7d1e116ef820a5f8392ec79866..b2c807f341ff891afdf62c1182109dabc68b0ebb 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -25,6 +25,7 @@
 #include <QFile>
 #include <QProcess>
 #include <QMessageBox>
+#include <QDateTime>
 #include "main.h"
 #include "options.h"
 
@@ -243,6 +244,11 @@ MainDialog::MainDialog(QWidget *parent): QDialog(parent) {
 
        // Fill in channels
        updateLwChannels();
+
+       // Default date
+       QDateTime dateTime = QDateTime::currentDateTime(); // set the default date to today if it is past midday
+       if (dateTime.time().hour() < 12) dateTime = dateTime.addDays(-1);
+       calDate->setSelectedDate(dateTime.date());
 }