author | harlekin <harlekin> | 2003-04-11 10:04:06 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-04-11 10:04:06 (UTC) |
commit | ebf5bb083d47179918d47f083a3cc98a5ed5d2e0 (patch) (side-by-side diff) | |
tree | da68f67dc45ea495edefef9842b6d2124f6a53c4 /core/applets/clockapplet/clock.cpp | |
parent | 0cce344730fbdcc131254bf04a2d40f665e1bd86 (diff) | |
download | opie-ebf5bb083d47179918d47f083a3cc98a5ed5d2e0.zip opie-ebf5bb083d47179918d47f083a3cc98a5ed5d2e0.tar.gz opie-ebf5bb083d47179918d47f083a3cc98a5ed5d2e0.tar.bz2 |
use default font
Diffstat (limited to 'core/applets/clockapplet/clock.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp index 19d3f6c..bcecab4 100644 --- a/core/applets/clockapplet/clock.cpp +++ b/core/applets/clockapplet/clock.cpp @@ -19,49 +19,49 @@ **********************************************************************/ #include "clock.h" #include <qpe/global.h> #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/config.h> #include <qmainwindow.h> #include <qlayout.h> #include <qpushbutton.h> #include <qmessagebox.h> #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 ) ); + //setFont( QFont( "Helvetica", , 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; setTimeApp="systemtime"; QCopEnvelope e("QPE/Application/"+setTimeApp, "setDocument(QString)"); QString lf = QString::null; @@ -71,54 +71,54 @@ void LauncherClock::mouseReleaseEvent( QMouseEvent * ) 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(); + int hour = tm.hour(); if (hour == 0) hour = 12; if (hour > 12) hour -= 12; - s.sprintf( "%2d:%02d %s", hour, tm.minute(), + s.sprintf( "%2d:%02d %s", hour, tm.minute(), (tm.hour() >= 12) ? "PM" : "AM" ); } else s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); if (format==1) { QDate dm = QDate::currentDate(); QString d; d.sprintf("%d/%d ", dm.day(), dm.month()); setText( d+s ); } else if (format==2) { QDate dm = QDate::currentDate(); QString d; d.sprintf("%d/%d ", dm.month(), dm.day()); setText( d+s ); } else { setText( s ); } } void LauncherClock::slotClockChanged( bool pm ) { readConfig(); updateTime(); } |