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/pim | |
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 | |||
@@ -1,6 +1,8 @@ | |||
1 | 0.5.2 | 1 | 0.5.2 |
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 |
6 | 8 | ||
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,7 +1,6 @@ | |||
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 \ |
7 | datebookevent.h datebookpluginwidget.h | 6 | datebookevent.h datebookpluginwidget.h |
@@ -13,7 +12,7 @@ INCLUDEPATH += $(OPIEDIR)/include \ | |||
13 | DEPENDPATH += $(OPIEDIR)/include \ | 12 | 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 |
19 | TARGET = todaydatebookplugin \ No newline at end of file | 18 | TARGET = todaydatebookplugin \ No newline at end of file |
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 | |||
@@ -20,6 +20,10 @@ | |||
20 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
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, |
25 | bool show_location, | 29 | bool show_location, |
@@ -62,10 +66,8 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
62 | if ( show_notes ) { | 66 | if ( show_notes ) { |
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 | ||
71 | 73 | ||
@@ -75,7 +77,6 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
75 | * @return formatted to am/pm is system is set to it | 77 | * @return formatted to am/pm is system is set to it |
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 ) { |
81 | int hour = tm.hour(); | 82 | int hour = tm.hour(); |
@@ -92,7 +93,6 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
92 | s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); | 93 | s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); |
93 | return s; | 94 | return s; |
94 | } | 95 | } |
95 | |||
96 | } | 96 | } |
97 | 97 | ||
98 | 98 | ||
@@ -100,23 +100,17 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
100 | * starts the edit dialog as known from datebook | 100 | * starts the edit dialog as known from datebook |
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 | |||
@@ -39,7 +39,6 @@ private slots: | |||
39 | void editEventSlot(const Event &e); | 39 | void editEventSlot(const Event &e); |
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); |
45 | const EffectiveEvent event; | 44 | const EffectiveEvent event; |
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 | |||
@@ -107,10 +107,5 @@ void DatebookPluginWidget::getDates() { | |||
107 | noEvents->setText( QObject::tr( "No appointments today" ) ); | 107 | noEvents->setText( QObject::tr( "No appointments today" ) ); |
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 | ||