summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-28 22:56:28 (UTC)
committer harlekin <harlekin>2002-10-28 22:56:28 (UTC)
commit7aaf3d45d9156a126a753311ffdb220a550d47a5 (patch) (unidiff)
tree89bab2496a90d498848348c24a8186b4aba7285b
parent483941bdb352bccca2bcb344f3e2724e3a3eedab (diff)
downloadopie-7aaf3d45d9156a126a753311ffdb220a550d47a5.zip
opie-7aaf3d45d9156a126a753311ffdb220a550d47a5.tar.gz
opie-7aaf3d45d9156a126a753311ffdb220a550d47a5.tar.bz2
less qcop trouble on retial rom
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/changelog2
-rw-r--r--core/pim/today/plugins/datebook/datebook.pro5
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.cpp28
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.h1
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.cpp5
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,9 +1,11 @@
10.5.2 10.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
50.5.1 70.5.1
6 8
7* icons scalable and clickable again 9* icons scalable and clickable again
8 10
90.5 110.5
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,19 +1,18 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG -= moc 2CONFIG -= moc
3CONFIG += qt debug 3CONFIG += qt release
4
5# Input 4# Input
6HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ 5HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
7 datebookevent.h datebookpluginwidget.h 6 datebookevent.h datebookpluginwidget.h
8SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \ 7SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
9 datebookevent.cpp datebookpluginwidget.cpp 8 datebookevent.cpp datebookpluginwidget.cpp
10 9
11INCLUDEPATH += $(OPIEDIR)/include \ 10INCLUDEPATH += $(OPIEDIR)/include \
12 ../ ../library 11 ../ ../library
13DEPENDPATH += $(OPIEDIR)/include \ 12DEPENDPATH += $(OPIEDIR)/include \
14 ../ ../library 13 ../ ../library
15 14
16LIBS+= -lqpe -lopie 15LIBS+= -lqpe -lopie
17 16
18DESTDIR = $(OPIEDIR)/plugins/today 17DESTDIR = $(OPIEDIR)/plugins/today
19TARGET = todaydatebookplugin \ No newline at end of file 18TARGET = 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
@@ -17,12 +17,16 @@
17#include "datebookevent.h" 17#include "datebookevent.h"
18#include <qpe/config.h> 18#include <qpe/config.h>
19#include <qpe/timestring.h> 19#include <qpe/timestring.h>
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
25using namespace Opie;
26
23DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 27DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
24 QWidget* parent, 28 QWidget* parent,
25 bool show_location, 29 bool show_location,
26 bool show_notes, 30 bool show_notes,
27 int maxCharClip, 31 int maxCharClip,
28 const char* name, 32 const char* name,
@@ -59,26 +63,23 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
59 } 63 }
60 64
61 // include possible note or not 65 // include possible note or not
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
72/** 74/**
73 * AM/PM timestring conversion. 75 * AM/PM timestring conversion.
74 * @param tm the timestring 76 * @param tm the timestring
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 */
77QString DateBookEvent::ampmTime( QTime tm ) { 79QString 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();
82 if ( hour == 0 ) { 83 if ( hour == 0 ) {
83 hour = 12; 84 hour = 12;
84 } 85 }
@@ -89,34 +90,27 @@ QString DateBookEvent::ampmTime( QTime tm ) {
89 (tm.hour() >= 12) ? "PM" : "AM" ); 90 (tm.hour() >= 12) ? "PM" : "AM" );
90 return s; 91 return s;
91 } else { 92 } else {
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
99/** 99/**
100 * starts the edit dialog as known from datebook 100 * starts the edit dialog as known from datebook
101 */ 101 */
102void DateBookEvent::editEventSlot( const Event &e ) { 102void 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 */
114void DateBookEvent::startDatebook() {
115 QCopEnvelope e( "QPE/System", "execute(QString)" );
116 e << QString( "datebook" );
117}
118
119void DateBookEvent::editMe() { 113void 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
@@ -36,13 +36,12 @@ public:
36signals: 36signals:
37 void editEvent(const Event &e); 37 void editEvent(const Event &e);
38private slots: 38private slots:
39 void editEventSlot(const Event &e); 39 void editEventSlot(const Event &e);
40 void editMe(); 40 void editMe();
41private: 41private:
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;
46 bool ampm; 45 bool ampm;
47}; 46};
48 47
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
@@ -104,13 +104,8 @@ void DatebookPluginWidget::getDates() {
104 } 104 }
105 } else { 105 } else {
106 QLabel* noEvents = new QLabel( this ); 106 QLabel* noEvents = new QLabel( this );
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