Ticket #7589: 7589.diff

File 7589.diff, 1.5 KB (added by paulh, 11 years ago)

Better handling of show time and show recording status

  • programs/mythlcdserver/lcdprocclient.cpp

     
    18751875    if (lcd_bigclock)
    18761876        dobigclock(0);
    18771877    else
    1878     {
    1879         if (lcd_showrecstatus && isRecording)
    1880             outputCenteredText("Time", tr("RECORDING"), "topWidget", 1);
    1881         else
    1882             outputCenteredText("Time", QDate::currentDate().toString(dateformat), "topWidget", 1);
    1883 
    18841878        dostdclock();
    1885     }
    18861879}
    18871880
    18881881void LCDProcClient::dostdclock()
    18891882{
     1883    if (!lcd_showtime)
     1884        return;
     1885
     1886    if (lcd_showrecstatus && isRecording)
     1887         outputCenteredText("Time", tr("RECORDING"), "topWidget", 1);
     1888    else
     1889        outputCenteredText("Time", QDate::currentDate().toString(dateformat), "topWidget", 1);
     1890
    18901891    QString aString;
    18911892    int x, y;
    18921893
     
    19261927
    19271928    int listTime;
    19281929
    1929     if (isTimeVisible)
     1930    if (isTimeVisible || !lcd_showtime)
    19301931    {
    19311932        // switch to the rec status screen
    19321933        setPriority("RecStatus", MEDIUM);
  • libs/libmythdb/lcddevice.cpp

     
    586586
    587587void LCD::switchToTime()
    588588{
    589     if (!lcd_ready || !lcd_showtime)
     589    if (!lcd_ready)
    590590        return;
    591591
    592592    VERBOSE(VB_IMPORTANT|VB_EXTRA, LOC + "switchToTime");