summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.cpp4
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.h24
2 files changed, 16 insertions, 12 deletions
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index 8277529..48f204e 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -24,25 +24,25 @@
using namespace Opie;
DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
QWidget* parent,
bool show_location,
bool show_notes,
int maxCharClip,
const char* name,
WFlags fl) :
OClickableLabel(parent,name,fl), event(ev) {
- setAlignment( AlignTop );
+ // 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>";
}
@@ -64,24 +64,26 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
+ "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) )
+ differDate( tempDate );
}
// include possible note or not
if ( show_notes ) {
msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip );
}
setText( msg );
connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) );
}
+DateBookEvent::~DateBookEvent() {
+}
/**
* 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;
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index f8a9c03..8027809 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -17,33 +17,35 @@
#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,
- bool show_location = 0,
- bool show_notes = 0,
- int maxCharClip = 0,
- const char* name = 0,
- WFlags fl = 0 );
-signals:
- void editEvent( const Event &e );
+ DateBookEvent( const EffectiveEvent &ev,
+ QWidget* parent = 0,
+ bool show_location = 0,
+ bool show_notes = 0,
+ int maxCharClip = 0,
+ const char* name = 0,
+ WFlags fl = 0 );
+ ~DateBookEvent();
+ signals:
+ void editEvent( const Event &e );
+
private slots:
void editEventSlot( const Event &e );
void editMe();
-private:
- DateBookDB *db;
+ private:
+
QString ampmTime( QTime );
QString differDate( QDate date );
const EffectiveEvent event;
bool ampm;
};
#endif