Ticket #817: clock.3.diff

themes/G.A.N.T./ui.xml

@@ -1223 +1223 @@
       </textarea>
     </container>
 
+    <container name="clock">
+      <textarea name="clocktext" drawoder="0">
+        <area>625,8,175,40</area>
+        <font>title</font>
+        <value>h:mm AP</value>
+      </textarea>
+    </container>
+
     <container name="selector">
       <area>0,50,800,310</area>
       <listarea name="toptitles" draworder="2">

themes/blue/ui.xml

@@ -774 +774 @@
       </textarea>
     </container>
     
+    <container name="clock">
+      <textarea name="clocktext" drawoder="0">
+        <area>645,4,155,40</area>
+        <font>title</font>
+        <value>h:mm AP</value>
+      </textarea>
+    </container>
+
     <container name="cur_group">
       <context>0</context>  
       <area>20,10,280,35</area>

programs/mythfrontend/playbackbox.cpp

@@ -252 +252 @@
     generatePreviewPixmap = gContext->GetNumSetting("GeneratePreviewPixmaps");
     dateformat = gContext->GetSetting("DateFormat", "ddd MMMM d");
     timeformat = gContext->GetSetting("TimeFormat", "h:mm AP");
+    showClock = gContext->GetNumSetting("ShowClock", 0);
 
     nvp = NULL;
     timer = new QTimer(this);
@@ -265 +266 @@
     timer->start(500);
     gContext->addListener(this);
 
+    if (showClock)
+    {
+        LayerSet *container = theme->GetSet("clock");
+        if (container)
+        {
+            UITextType *text = (UITextType*) container->GetType("clocktext");
+            if (text)
+            {
+                clockRect = text->getScreenArea();
+                clockformat = text->GetDefaultText();
+                clockTimer = new QTimer(this);
+                connect(clockTimer, SIGNAL(timeout()), this, SLOT(updateClock()));
+                clockTimer->start(100);
+            }
+            else
+            {
+                showClock = FALSE;
+            }
+        }
+        else
+        {
+            showClock = FALSE;
+        }
+    }
+
     freeSpaceTimer = new QTimer(this);
     connect(freeSpaceTimer, SIGNAL(timeout()), this, 
             SLOT(setUpdateFreeSpace()));
@@ -489 +515 @@
     setPaletteBackgroundPixmap(myBackground);
 }
   
+void PlaybackBox::updateClock(void)
+{
+    LayerSet *container = theme->GetSet("clock");
+    if (container)
+    {
+        UITextType *text = (UITextType*) container->GetType("clocktext");       
+        if (text)
+        {
+            QPainter tmp(this);
+            QPixmap pix(clockRect.size());
+            pix.fill(this, clockRect.topLeft());
+            tmp.drawPixmap(clockRect.topLeft(), pix);
+
+            QDateTime now = QDateTime::currentDateTime();
+
+            if (clockformat.contains('s'))
+            {
+                clockTimer->start(1000);
+            }
+            else
+            {
+                QDateTime nextMin = QDateTime(now.date(), QTime(now.time().hour(),
+                                              now.time().minute())).addSecs(60);
+                clockTimer->start(1000*(now.secsTo(nextMin)) + 500);
+            }
+
+            QString timeStr = now.toString(clockformat);
+            text->SetText(timeStr);
+
+            if(type != Delete)
+            {
+                text->Draw(&tmp, 0, 0);
+            }
+            else
+            {
+                text->Draw(&tmp, 0, 1);
+            }
+            tmp.end();
+        }
+    }
+}
+
 void PlaybackBox::paintEvent(QPaintEvent *e)
 {
     if (e->erased())
@@ -522 +590 @@
         updateVideo(&p);
     }
 
+    if (showClock && r.intersects(clockRect))
+    {
+        clockTimer->start(100);
+    }
+
     skipCnt--;
     if (skipCnt < 0)
     {
@@ -1903 +1976 @@
     state = kKilling; // stop preview playback and don't restart it
     playingSomething = true;
 
+    if (showClock)
+        clockTimer->stop();
+
     tv->setLastProgram(lastProgram);
 
     if (tv->Playback(tvrec))
@@ -1944 +2020 @@
 
     lastProgram = new ProgramInfo(*tvrec);
 
+    if (showClock)
+        clockTimer->start(100);
+
     playingSomething = false;
     state = kStarting; // restart playback preview
     setEnabled(true);

programs/mythfrontend/globalsettings.cpp

@@ -361 +361 @@
     return gc;
 }
 
+static HostCheckBox *PBBShowClock()
+{
+    HostCheckBox *gc = new HostCheckBox("ShowClock");
+    gc->setLabel(QObject::tr("Show clock"));
+    gc->setValue(false);
+    gc->setHelpText(QObject::tr("Show the current time in the Recorded "
+                    "Programs screen."));
+    return gc;
+}
+
 static HostCheckBox *SmartForward()
 {
     HostCheckBox *gc = new HostCheckBox("SmartForward");
@@ -3033 +3043 @@
     pbox->addChild(PlaybackPreviewLowCPU());
     pbox->addChild(PBBStartInTitle());
     pbox->addChild(PBBShowGroupSummary());
+    pbox->addChild(PBBShowClock());
     addChild(pbox);
 
     VerticalConfigurationGroup* pbox2 = new VerticalConfigurationGroup(false);

programs/mythfrontend/playbackbox.h

@@ -43 +43 @@
   
   protected slots:
     void timeout(void);
+    void updateClock(void);
 
     void cursorLeft();
     void cursorRight();
@@ -259 +260 @@
     QString dateformat;
     QString timeformat;
 
+    bool showClock;
+    QTimer *clockTimer;
+    QString clockformat;
+
     void grayOut(QPainter *);
     void updateBackground(void);
     void updateVideo(QPainter *);
@@ -287 +292 @@
     QRect usageRect;
     QRect videoRect;
     QRect curGroupRect;
+    QRect clockRect;
 
     QTimer *fillListTimer;
     int listsize;