4 files changed, 18 insertions, 14 deletions
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index d4e8e1e..c37813b 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp @@ -1,118 +1,122 @@ /* * datebookevent.cpp * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "datebookevent.h" #include <qpe/config.h> #include <qpe/timestring.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qpeapplication.h> DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QWidget* parent, - int show_location, - int show_notes, - // int onlyLater, + bool show_location, + bool show_notes, int maxCharClip, const char* name, WFlags fl) : OClickableLabel(parent,name,fl), event(ev) { setAlignment( AlignTop ); QString msg; Config config( "qpe" ); config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); msg += "<B>" + (ev).description() + "</B>"; if ( (ev).event().hasAlarm() ) { msg += " <b>[with alarm]</b>"; } // include location or not - if ( show_location == 1) { + if ( show_location ) { msg += "<BR><i>" + (ev).location() + "</i>"; } if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59") ) { msg += "<br>All day"; } else { // start time of event msg += "<br>" + ampmTime(QTime( (ev).event().start().time() ) ) // end time of event + "<b> - </b>" + ampmTime(QTime( (ev).event().end().time() ) ); } // include possible note or not - if ( show_notes == 1) { + if ( show_notes ) { msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); } setText( msg ); connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); - setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); + // setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); } +/** + * AM/PM timestring conversion. + * @param tm the timestring + * @return formatted to am/pm is system is set to it + */ QString DateBookEvent::ampmTime( QTime tm ) { QString s; if( ampm ) { int hour = tm.hour(); if ( hour == 0 ) { hour = 12; } if ( hour > 12 ) { hour -= 12; } s.sprintf( "%2d:%02d %s", hour, tm.minute(), (tm.hour() >= 12) ? "PM" : "AM" ); return s; } else { s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); return s; } } -/* +/** * starts the edit dialog as known from datebook */ void DateBookEvent::editEventSlot( const Event &e ) { startDatebook(); while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents(); QCopEnvelope env( "QPE/Datebook", "editEvent(int)" ); env << e.uid(); } /** * launches datebook */ void DateBookEvent::startDatebook() { QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("datebook"); } void DateBookEvent::editMe() { emit editEvent(event.event()); } diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 1168f7c..61c64f1 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h @@ -7,44 +7,43 @@ */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef DATEBOOKEVENT_PLUGIN_H #define DATEBOOKEVENT_PLUGIN_H #include <opie/oclickablelabel.h> #include <qpe/datebookdb.h> class DateBookEvent: public OClickableLabel { Q_OBJECT public: DateBookEvent(const EffectiveEvent &ev, QWidget* parent = 0, - int show_location = 0, - int show_notes = 0, - // int onlyLater = 0, + bool show_location = 0, + bool show_notes = 0, int maxCharClip = 0, const char* name = 0, WFlags fl = 0); signals: void editEvent(const Event &e); private slots: void editEventSlot(const Event &e); void editMe(); private: void startDatebook(); DateBookDB *db; QString ampmTime(QTime); const EffectiveEvent event; bool ampm; }; #endif diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index 9800e61..07f5005 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp @@ -1,60 +1,61 @@ + /* * datebookplugin.cpp * * copyright : (c) 2002 by Maximilian Reiß * email : harlekin@handhelds.org * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "datebookevent.h" #include "datebookplugin.h" #include "datebookpluginwidget.h" #include "datebookpluginconfig.h" DatebookPlugin::DatebookPlugin() { } DatebookPlugin::~DatebookPlugin() { } QString DatebookPlugin::pluginName() const { return "Datebook plugin"; } double DatebookPlugin::versionNumber() const { - return 0.1; + return 1.0; } QString DatebookPlugin::pixmapNameWidget() const { return "DateBook"; } QWidget* DatebookPlugin::widget( QWidget* wid ) { return new DatebookPluginWidget( wid, "Datebook" ); } QString DatebookPlugin::pixmapNameConfig() const { return "DateBook"; } ConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) { return new DatebookPluginConfig( wid , "Datebook" ); } QString DatebookPlugin::appName() const { return "datebook"; } int DatebookPlugin::minHeight() const { return 10; diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index e0213ec..1720bb2 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h @@ -20,33 +20,33 @@ #include <qstring.h> #include <qwidget.h> #include <qpe/datebookdb.h> #include <opie/oclickablelabel.h> class DatebookPluginWidget : public QWidget { Q_OBJECT public: DatebookPluginWidget( QWidget *parent, const char *name ); ~DatebookPluginWidget(); private: DateBookDB* db; void readConfig(); void getDates(); // how many lines should be showed in the datebook section int m_max_lines_meet; // If location is to be showed too, 1 to activate it. - int m_show_location; + bool m_show_location; // if notes should be shown - int m_show_notes; + bool m_show_notes; // should only later appointments be shown or all for the current day. - int m_onlyLater; + bool m_onlyLater; }; #endif |