From eccce30d7e271ddd4631efa4b43a12b5602c2ecf Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 20 Apr 2015 23:45:03 -0400 Subject: Make sure to check the list of watched files and reset it if something was removed temporarily (to ensure that the watcher functionality does not stop working while a session is in progress). --- lumina-desktop/panel-plugins/clock/LClock.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lumina-desktop/panel-plugins/clock') diff --git a/lumina-desktop/panel-plugins/clock/LClock.cpp b/lumina-desktop/panel-plugins/clock/LClock.cpp index c3eb1451..1e407083 100644 --- a/lumina-desktop/panel-plugins/clock/LClock.cpp +++ b/lumina-desktop/panel-plugins/clock/LClock.cpp @@ -49,9 +49,12 @@ void LClock::updateTime(){ labelWidget->setToolTip(timelabel); }else if(datetimeorder == "timedate"){ label = timelabel + " " + datelabel; + labelWidget->setToolTip(""); }else if(datetimeorder == "datetime"){ label = datelabel + " " + timelabel; - }else{ label = timelabel; + labelWidget->setToolTip(""); + }else{ + label = timelabel; labelWidget->setToolTip(datelabel); } if( this->layout()->direction() == QBoxLayout::TopToBottom ){ @@ -62,11 +65,12 @@ void LClock::updateTime(){ } void LClock::updateFormats(){ + qDebug() << "Updating clock format"; timefmt = LSession::handle()->sessionSettings()->value("TimeFormat","").toString(); datefmt = LSession::handle()->sessionSettings()->value("DateFormat","").toString(); deftime = timefmt.simplified().isEmpty(); defdate = datefmt.simplified().isEmpty(); - datetimeorder = LSession::handle()->sessionSettings()->value("DateTimeOrder", "timeonly").toString(); + datetimeorder = LSession::handle()->sessionSettings()->value("DateTimeOrder", "timeonly").toString().toLower(); useTZ = LSession::handle()->sessionSettings()->value("CustomTimeZone",false).toBool(); if(useTZ){ TZ = QTimeZone( LSession::handle()->sessionSettings()->value("TimeZoneByteCode", QByteArray()).toByteArray() ); } -- cgit