-rw-r--r-- | core/pim/today/changelog | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebook.pro | 5 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 28 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.h | 1 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.cpp | 5 |
5 files changed, 15 insertions, 26 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index eb2496a..93abdcb 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog | |||
@@ -2,4 +2,6 @@ | |||
2 | 2 | ||
3 | * refresh settings | 3 | * refresh settings |
4 | * only launch datebook config when clicked on a date ( opie only ) | ||
5 | * less qcop trouble on sharps retail rom | ||
4 | 6 | ||
5 | 0.5.1 | 7 | 0.5.1 |
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro index 615059a..0bbdb77 100644 --- a/core/pim/today/plugins/datebook/datebook.pro +++ b/core/pim/today/plugins/datebook/datebook.pro | |||
@@ -1,6 +1,5 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | 2 | CONFIG -= moc |
3 | CONFIG += qt debug | 3 | CONFIG += qt release |
4 | |||
5 | # Input | 4 | # Input |
6 | HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ | 5 | HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ |
@@ -14,5 +13,5 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
14 | ../ ../library | 13 | ../ ../library |
15 | 14 | ||
16 | LIBS+= -lqpe -lopie | 15 | LIBS+= -lqpe -lopie |
17 | 16 | ||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 17 | DESTDIR = $(OPIEDIR)/plugins/today |
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index c37813b..0a0d186 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -21,4 +21,8 @@ | |||
21 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
22 | 22 | ||
23 | #include <opie/odevice.h> | ||
24 | |||
25 | using namespace Opie; | ||
26 | |||
23 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | 27 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, |
24 | QWidget* parent, | 28 | QWidget* parent, |
@@ -63,8 +67,6 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
63 | msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); | 67 | msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); |
64 | } | 68 | } |
65 | |||
66 | setText( msg ); | 69 | setText( msg ); |
67 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); | 70 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); |
68 | // setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); | ||
69 | } | 71 | } |
70 | 72 | ||
@@ -76,5 +78,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
76 | */ | 78 | */ |
77 | QString DateBookEvent::ampmTime( QTime tm ) { | 79 | QString DateBookEvent::ampmTime( QTime tm ) { |
78 | |||
79 | QString s; | 80 | QString s; |
80 | if( ampm ) { | 81 | if( ampm ) { |
@@ -93,5 +94,4 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
93 | return s; | 94 | return s; |
94 | } | 95 | } |
95 | |||
96 | } | 96 | } |
97 | 97 | ||
@@ -101,22 +101,16 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
101 | */ | 101 | */ |
102 | void DateBookEvent::editEventSlot( const Event &e ) { | 102 | void DateBookEvent::editEventSlot( const Event &e ) { |
103 | startDatebook(); | ||
104 | 103 | ||
105 | while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents(); | 104 | if ( ODevice::inst()->system() == System_Zaurus ) { |
106 | QCopEnvelope env( "QPE/Datebook", "editEvent(int)" ); | 105 | QCopEnvelope env( "QPE/Application/datebook", "raise()" ); |
107 | env << e.uid(); | 106 | } else { |
107 | QCopEnvelope env( "QPE/Datebook", "editEvent(int)" ); | ||
108 | env << e.uid(); | ||
109 | } | ||
108 | } | 110 | } |
109 | 111 | ||
110 | 112 | ||
111 | /** | ||
112 | * launches datebook | ||
113 | */ | ||
114 | void DateBookEvent::startDatebook() { | ||
115 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | ||
116 | e << QString( "datebook" ); | ||
117 | } | ||
118 | |||
119 | void DateBookEvent::editMe() { | 113 | void DateBookEvent::editMe() { |
120 | emit editEvent( event.event() ); | 114 | emit editEvent( event.event() ); |
121 | } | 115 | } |
122 | 116 | ||
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 61c64f1..7b0371a 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -40,5 +40,4 @@ private slots: | |||
40 | void editMe(); | 40 | void editMe(); |
41 | private: | 41 | private: |
42 | void startDatebook(); | ||
43 | DateBookDB *db; | 42 | DateBookDB *db; |
44 | QString ampmTime(QTime); | 43 | QString ampmTime(QTime); |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 7948656..a8ce059 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -108,9 +108,4 @@ void DatebookPluginWidget::getDates() { | |||
108 | layoutDates->addWidget( noEvents ); | 108 | layoutDates->addWidget( noEvents ); |
109 | } | 109 | } |
110 | //layoutDates->addStretch(0); | ||
111 | // layoutDates->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); | ||
112 | |||
113 | // how often refresh - later have qcop update calls in *db | ||
114 | //QTimer::singleShot( 20*1000, this , SLOT( getDates() ) ); | ||
115 | } | 110 | } |
116 | 111 | ||