summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-28 22:56:28 (UTC)
committer harlekin <harlekin>2002-10-28 22:56:28 (UTC)
commit7aaf3d45d9156a126a753311ffdb220a550d47a5 (patch) (side-by-side diff)
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 @@
0.5.2
* refresh settings
+* only launch datebook config when clicked on a date ( opie only )
+* less qcop trouble on sharps retail rom
0.5.1
* icons scalable and clickable again
0.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 @@
TEMPLATE = lib
CONFIG -= moc
-CONFIG += qt debug
-
+CONFIG += qt release
# Input
HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
datebookevent.h datebookpluginwidget.h
SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \
datebookevent.cpp datebookpluginwidget.cpp
INCLUDEPATH += $(OPIEDIR)/include \
../ ../library
DEPENDPATH += $(OPIEDIR)/include \
../ ../library
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopie
DESTDIR = $(OPIEDIR)/plugins/today
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
@@ -17,12 +17,16 @@
#include "datebookevent.h"
#include <qpe/config.h>
#include <qpe/timestring.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
+#include <opie/odevice.h>
+
+using namespace Opie;
+
DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
QWidget* parent,
bool show_location,
bool show_notes,
int maxCharClip,
const char* name,
@@ -59,26 +63,23 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
}
// include possible note or not
if ( show_notes ) {
msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip );
}
-
setText( msg );
connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) );
- // setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
}
/**
* AM/PM timestring conversion.
* @param tm the timestring
* @return formatted to am/pm is system is set to it
*/
QString DateBookEvent::ampmTime( QTime tm ) {
-
QString s;
if( ampm ) {
int hour = tm.hour();
if ( hour == 0 ) {
hour = 12;
}
@@ -89,34 +90,27 @@ QString DateBookEvent::ampmTime( QTime tm ) {
(tm.hour() >= 12) ? "PM" : "AM" );
return s;
} else {
s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
return s;
}
-
}
/**
* starts the edit dialog as known from datebook
*/
void DateBookEvent::editEventSlot( const Event &e ) {
- startDatebook();
- while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents();
- QCopEnvelope env( "QPE/Datebook", "editEvent(int)" );
- env << e.uid();
+ if ( ODevice::inst()->system() == System_Zaurus ) {
+ QCopEnvelope env( "QPE/Application/datebook", "raise()" );
+ } else {
+ QCopEnvelope env( "QPE/Datebook", "editEvent(int)" );
+ env << e.uid();
+ }
}
-/**
- * launches datebook
- */
-void DateBookEvent::startDatebook() {
- QCopEnvelope e( "QPE/System", "execute(QString)" );
- e << QString( "datebook" );
-}
-
void DateBookEvent::editMe() {
- emit editEvent( event.event() );
+ emit editEvent( event.event() );
}
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:
signals:
void editEvent(const Event &e);
private slots:
void editEventSlot(const Event &e);
void editMe();
private:
- void startDatebook();
DateBookDB *db;
QString ampmTime(QTime);
const EffectiveEvent event;
bool ampm;
};
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() {
}
} else {
QLabel* noEvents = new QLabel( this );
noEvents->setText( QObject::tr( "No appointments today" ) );
layoutDates->addWidget( noEvents );
}
- //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() ) );
}