author | harlekin <harlekin> | 2002-10-28 22:56:28 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-28 22:56:28 (UTC) |
commit | 7aaf3d45d9156a126a753311ffdb220a550d47a5 (patch) (unidiff) | |
tree | 89bab2496a90d498848348c24a8186b4aba7285b /core | |
parent | 483941bdb352bccca2bcb344f3e2724e3a3eedab (diff) | |
download | opie-7aaf3d45d9156a126a753311ffdb220a550d47a5.zip opie-7aaf3d45d9156a126a753311ffdb220a550d47a5.tar.gz opie-7aaf3d45d9156a126a753311ffdb220a550d47a5.tar.bz2 |
less qcop trouble on retial rom
-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 | |||
@@ -3,2 +3,4 @@ | |||
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 | ||
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 | |||
2 | CONFIG -= moc | 2 | CONFIG -= moc |
3 | CONFIG += qt debug | 3 | CONFIG += qt release |
4 | |||
5 | # Input | 4 | # Input |
@@ -15,3 +14,3 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
15 | 14 | ||
16 | LIBS+= -lqpe -lopie | 15 | LIBS+= -lqpe -lopie |
17 | 16 | ||
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 @@ | |||
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, |
@@ -64,6 +68,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
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 | } |
@@ -77,3 +79,2 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
77 | QString DateBookEvent::ampmTime( QTime tm ) { | 79 | QString DateBookEvent::ampmTime( QTime tm ) { |
78 | |||
79 | QString s; | 80 | QString s; |
@@ -94,3 +95,2 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
94 | } | 95 | } |
95 | |||
96 | } | 96 | } |
@@ -102,7 +102,9 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
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 | } |
@@ -110,12 +112,4 @@ void DateBookEvent::editEventSlot( const Event &e ) { | |||
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 | } |
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: | |||
41 | private: | 41 | private: |
42 | void startDatebook(); | ||
43 | DateBookDB *db; | 42 | 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() { | |||
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 | } |