-rw-r--r-- | core/pim/today/changelog | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebook.pro | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 22 | ||||
-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, 11 insertions, 22 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 @@ -3,2 +3,4 @@ * refresh settings +* only launch datebook config when clicked on a date ( opie only ) +* less qcop trouble on sharps retail rom 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 @@ -2,4 +2,3 @@ TEMPLATE = lib CONFIG -= moc -CONFIG += qt debug - +CONFIG += qt release # Input 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 @@ -22,2 +22,6 @@ +#include <opie/odevice.h> + +using namespace Opie; + DateBookEvent::DateBookEvent(const EffectiveEvent &ev, @@ -64,6 +68,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, } - setText( msg ); connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); - // setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); } @@ -77,3 +79,2 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QString DateBookEvent::ampmTime( QTime tm ) { - QString s; @@ -94,3 +95,2 @@ QString DateBookEvent::ampmTime( QTime tm ) { } - } @@ -102,5 +102,6 @@ QString DateBookEvent::ampmTime( QTime tm ) { void DateBookEvent::editEventSlot( const Event &e ) { - startDatebook(); - while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents(); + if ( ODevice::inst()->system() == System_Zaurus ) { + QCopEnvelope env( "QPE/Application/datebook", "raise()" ); + } else { QCopEnvelope env( "QPE/Datebook", "editEvent(int)" ); @@ -108,12 +109,5 @@ void DateBookEvent::editEventSlot( const Event &e ) { } - - -/** - * launches datebook - */ -void DateBookEvent::startDatebook() { - QCopEnvelope e( "QPE/System", "execute(QString)" ); - e << QString( "datebook" ); } + void DateBookEvent::editMe() { 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 @@ -41,3 +41,2 @@ private slots: private: - void startDatebook(); DateBookDB *db; 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 @@ -109,7 +109,2 @@ void DatebookPluginWidget::getDates() { } - //layoutDates->addStretch(0); -// layoutDates->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - - // how often refresh - later have qcop update calls in *db - //QTimer::singleShot( 20*1000, this , SLOT( getDates() ) ); } |