summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index 52d285b..19d3f6c 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -32,72 +32,69 @@
#include <qdatetime.h>
#include <qtimer.h>
#include <qpopupmenu.h>
#include <qfile.h>
#include <stdlib.h>
LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
{
// If you want a sunken border around the clock do this:
// setFrameStyle( QFrame::Panel | QFrame::Sunken );
setFont( QFont( "Helvetica", 10, QFont::Normal ) );
connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) );
connect( qApp, SIGNAL( clockChanged( bool ) ),
this, SLOT( slotClockChanged( bool ) ) );
readConfig();
timerId = 0;
timerEvent( 0 );
show();
}
void LauncherClock::readConfig() {
Config config( "qpe" );
config.setGroup( "Time" );
ampmFormat = config.readBoolEntry( "AMPM", TRUE );
config.setGroup( "Date" );
format = config.readNumEntry("ClockApplet",0);
}
void LauncherClock::mouseReleaseEvent( QMouseEvent * )
{
QCString setTimeApp;
- if (QFile::exists(QPEApplication::qpeDir()+"bin/netsystemtime"))
- setTimeApp="netsystemtime";
- else setTimeApp="systemtime";
+ setTimeApp="systemtime";
QCopEnvelope e("QPE/Application/"+setTimeApp, "setDocument(QString)");
- QString lf = QString::null;
+ QString lf = QString::null;
e << lf;
-
}
void LauncherClock::timerEvent( QTimerEvent *e )
{
if ( !e || e->timerId() == timerId ) {
killTimer( timerId );
changeTime();
QTime t = QTime::currentTime();
int ms = (60 - t.second())*1000 - t.msec();
timerId = startTimer( ms );
} else {
QLabel::timerEvent( e );
}
}
void LauncherClock::updateTime( void )
{
changeTime();
}
void LauncherClock::changeTime( void )
{
QTime tm = QDateTime::currentDateTime().time();
QString s;
if( ampmFormat ) {
int hour = tm.hour();
if (hour == 0)
hour = 12;
if (hour > 12)
hour -= 12;
s.sprintf( "%2d:%02d %s", hour, tm.minute(),