summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp109
-rw-r--r--core/pim/today/today.h5
-rw-r--r--core/pim/today/todaybase.cpp25
-rw-r--r--core/pim/today/todaybase.h2
4 files changed, 101 insertions, 40 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 81d4d36..08efe2d 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -22,16 +22,18 @@
#include "TodoItem.h"
#include <qpe/datebookdb.h>
#include <qpe/timestring.h>
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qprocess.h>
#include <qpe/resource.h>
+#include <qpe/contact.h>
+#include <qpe/global.h>
#include <qdir.h>
#include <qfile.h>
#include <qdatetime.h>
#include <qtextstream.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qpushbutton.h>
@@ -61,46 +63,97 @@ int NEW_START=1;
* name 'name' and widget flags set to 'f'
*/
Today::Today( QWidget* parent, const char* name, WFlags fl )
: TodayBase( parent, name, fl ), AllDateBookEvents(NULL) {
QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) );
QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) );
QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
-
+
+#if defined(Q_WS_QWS)
+#if !defined(QT_NO_COP)
+ QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this );
+ connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)),
+ this, SLOT ( channelReceived(const QCString &, const QByteArray &)) );
+#endif
+#endif
+
draw();
+ setOwnerField();
autoStart();
}
+/*
+ * Qcop receive method.
+ */
+void Today::channelReceived(const QCString &msg, const QByteArray & data) {
+ QDataStream stream(data, IO_ReadOnly );
+ if ( msg == "message(QString)" ) {
+ QString message;
+ stream >> message;
+ setOwnerField(message);
+ }
+
+}
+
+/*
+ * Initialises the owner field with the default value, the username
+ */
+void Today::setOwnerField() {
+ QString file = Global::applicationFileName("addressbook", "businesscard.vcf");
+ if (QFile::exists(file)) {
+ Contact cont = Contact::readVCard(file)[0];
+ QString returnString = cont.fullName();
+ OwnerField->setText( tr ("<b>Owned by " + returnString + "</b>"));
+ } else {
+ OwnerField->setText( tr ("<b>to lame to fill out the business card </b>"));
+ }
+}
+
+/*
+ * Set the owner field with a given QString, for example per qcop.
+ */
+void Today::setOwnerField(QString &message) {
+ if (!message.isEmpty()) {
+ OwnerField->setText("<b>" + message + "</b>");
+ }
+}
+
+/*
+ * Autostart, uses the new (opie only) autostart method in the launcher code.
+ * If registered against that today ist started on each resume.
+ */
void Today::autoStart() {
Config cfg("today");
cfg.setGroup("Autostart");
AUTOSTART = cfg.readNumEntry("autostart",1);
if (AUTOSTART) {
QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
e << QString("add");
e << QString("today");
} else {
QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
e << QString("remove");
e << QString("today");
}
}
+/*
+ * Repaint method. Reread all fields.
+ */
void Today::draw() {
init();
getDates();
getMail();
getTodo();
// how often refresh
QTimer::singleShot( 10*1000, this, SLOT(draw() ) );
}
-
/*
* Check if the todolist.xml was modified (if there are new entries.
* Returns true if it was modified.
*/
bool Today::checkIfModified() {
QDir dir;
QString homedir = dir.homeDirPath ();
@@ -117,48 +170,52 @@ bool Today::checkIfModified() {
} else {
cfg.writeEntry("todolisttimestamp", fileTime.toString() );
cfg.write();
return true;
}
}
+/*
+ * Init stuff needed for today. Reads the config file.
+ */
void Today::init() {
QDate date = QDate::currentDate();
QString time = (tr( date.toString()) );
-// QString time = (tr( date.toString()) , white);
TextLabel1->setText(time);
db = new DateBookDB;
// read config
Config cfg("today");
cfg.setGroup("BaseConfig");
-
+
+ // -- config file section --
// how many lines should be showed in the task section
MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5);
// after how many chars should the be cut off on tasks and notes
- MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",30);
+ MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",40);
// how many lines should be showed in the datebook section
MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5);
// If location is to be showed too, 1 to activate it.
SHOW_LOCATION = cfg.readNumEntry("showlocation",1);
// if notes should be shown
SHOW_NOTES = cfg.readNumEntry("shownotes",0);
+ // should only later appointments be shown or all for the current day.
ONLY_LATER = cfg.readNumEntry("onlylater",1);
-
}
+
+/*
+ * The method for the configuration dialog.
+ */
void Today::startConfig() {
- conf = new todayconfig ( this, "", true );
-
-
- //Config cfg = new Config("today");
+ conf = new todayconfig ( this, "", true );
// read the config
Config cfg("today");
cfg.setGroup("BaseConfig");
//init();
conf->SpinBox1->setValue(MAX_LINES_MEET);
// location show box
@@ -166,17 +223,17 @@ void Today::startConfig() {
// notes show box
conf->CheckBox2->setChecked(SHOW_NOTES);
// task lines
conf->SpinBox2->setValue(MAX_LINES_TASK);
// clip when?
conf->SpinBox7->setValue(MAX_CHAR_CLIP);
// only later
conf->CheckBox3->setChecked(ONLY_LATER);
-
+ // if today should be autostarted
conf->CheckBoxAuto->setChecked(AUTOSTART);
conf->exec();
int maxlinestask = conf->SpinBox2->value();
int maxmeet = conf->SpinBox1->value();
int location = conf->CheckBox1->isChecked();
int notes = conf->CheckBox2->isChecked();
@@ -187,16 +244,17 @@ void Today::startConfig() {
cfg.writeEntry("maxlinestask",maxlinestask);
cfg.writeEntry("maxcharclip", maxcharclip);
cfg.writeEntry("maxlinesmeet",maxmeet);
cfg.writeEntry("showlocation",location);
cfg.writeEntry("shownotes", notes);
cfg.writeEntry("onlylater", onlylater);
cfg.setGroup("Autostart");
cfg.writeEntry("autostart", autostart);
+
// sync it to "disk"
cfg.write();
NEW_START=1;
draw();
autoStart();
}
@@ -217,34 +275,34 @@ void Today::getDates() {
Config config( "qpe" );
// if 24 h format
//bool ampm = config.readBoolEntry( "AMPM", TRUE );
int count=0;
if ( list.count() > 0 ) {
-
+
for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
it!=list.end(); ++it ) {
if ( count <= MAX_LINES_MEET ) {
QTime time = QTime::currentTime();
if (!ONLY_LATER) {
- count++;
+ count++;
DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
layoutDates->addWidget(l);
connect (l, SIGNAL(editEvent(const Event &)),
this, SLOT(editEvent(const Event &)));
} else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
- count++;
-
+ count++;
+
// show only later appointments
DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents);
layoutDates->addWidget(l);
connect (l, SIGNAL(editEvent(const Event &)),
this, SLOT(editEvent(const Event &)));
}
}
}
@@ -257,18 +315,16 @@ void Today::getDates() {
QLabel* noEvents = new QLabel(AllDateBookEvents);
noEvents->setText("No appointments today");
layoutDates->addWidget(noEvents);
}
layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
sv1->addChild(AllDateBookEvents);
AllDateBookEvents->show();
-
-
}
/*
* Parse in the todolist.xml
*/
QList<TodoItem> Today::loadTodo(const char *filename) {
DOM *todo;
ELE *tasks;
@@ -334,34 +390,32 @@ QList<TodoItem> Today::loadTodo(const char *filename) {
void Today::getMail() {
Config cfg("opiemail");
cfg.setGroup("today");
// how many lines should be showed in the task section
int NEW_MAILS = cfg.readNumEntry("newmails",0);
int OUTGOING = cfg.readNumEntry("outgoing",0);
-
QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
-
MailField->setText(output);
}
/*
* Get the todos
- *
*/
void Today::getTodo() {
// if the todolist.xml file was not modified in between, do not parse it.
if (!checkIfModified() && !NEW_START) {
return;
}
+ // since it was the new start or the return from config dialog, set it to 0 again.
NEW_START=0;
QString output;
QString tmpout;
int count = 0;
QDir dir;
QString homedir = dir.homeDirPath ();
@@ -397,16 +451,20 @@ void Today::getTodo() {
/*
* launches datebook
*/
void Today::startDatebook() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("datebook");
}
+
+/*
+ * starts the edit dialog as known from datebook
+ */
void Today::editEvent(const Event &e) {
startDatebook();
//Dissabled for now as uid's not working properly
/*
while(!QCopChannel::isRegistered("QPE/Datebook")) sleep(1);
QCopEnvelope env("QPE/Datebook", "editEvent(int)");
env << e.uid();
@@ -424,24 +482,25 @@ void Today::startTodo() {
/*
* launch opiemail
*/
void Today::startMail() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("opiemail");
}
-/*
- * Destroys the object and frees any allocated resources
- */
+
Today::~Today() {
- // no need to delete child widgets, Qt does it all for us
}
+
+/*
+ * Gets the events for the current day, if it should get all dates
+ */
DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
QWidget* parent = 0,
const char* name = 0,
WFlags fl = 0) :
ClickableLabel(parent,name,fl), event(ev) {
QString msg;
QTime time = QTime::currentTime();
@@ -460,16 +519,17 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
msg += "<br>All day";
} else {
// start time of event
msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
// end time of event
+ "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
}
+
// include possible note or not
if (SHOW_NOTES == 1) {
msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
}
}
setText(msg);
connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
@@ -514,16 +574,17 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
// if (msg.isEmpty()) {
// msg = tr("No more appointments today");
// }
setText(msg);
connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
}
+
void DateBookEvent::editMe() {
emit editEvent(event.event());
}
void DateBookEventLater::editMe() {
emit editEvent(event.event());
}
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 0b4356c..6dec2c2 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -50,17 +50,22 @@ class Today : public TodayBase {
void editEvent(const Event &e);
private:
void init();
void getDates();
void getTodo();
void getMail();
void autoStart();
bool checkIfModified();
+ void setOwnerField();
+ void setOwnerField(QString &string);
QList<TodoItem> loadTodo(const char *filename);
+private slots:
+ void channelReceived(const QCString &msg, const QByteArray & data);
+
private:
DateBookDB *db;
todayconfig *conf;
QWidget* AllDateBookEvents;
//Config cfg;
int MAX_LINES_TASK;
int MAX_CHAR_CLIP;
int MAX_LINES_MEET;
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 552e2eb..c0b8d34 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -80,51 +80,46 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
// date
TextLabel1 = new QLabel( Frame, "TextLabel1" );
TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) );
QFont TextLabel1_font( TextLabel1->font() );
TextLabel1_font.setBold( TRUE );
TextLabel1->setFont( TextLabel1_font );
TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
TextLabel1->setTextFormat( RichText );
-
-
+
+ OwnerField = new QLabel(this , "Owner" );
+ OwnerField->setGeometry(QRect(0,0, this->width(), 12 ));
+ OwnerField->setAlignment(int (QLabel::AlignTop | QLabel::AlignLeft ) );
+ OwnerField->setMaximumHeight(12);
+
// --- dates section ---
Frame4 = new QFrame( this, "Frame4" );
Frame4->setPalette( pal );
Frame4->setFrameShape( QScrollView::StyledPanel );
Frame4->setFrameShadow( QScrollView::Sunken );
Frame4->setBackgroundOrigin( QScrollView::ParentOrigin );
Frame4->setFrameStyle( QFrame::NoFrame );
- Frame4->setGeometry (QRect( 0, 0, this->width() , this->height()) );
+ Frame4->setGeometry (QRect( 0, 8, this->width() , this->height()) );
- // QScrollView* sv1 = new QScrollView( Frame4 );
sv1 = new QScrollView( Frame4 );
sv1->setResizePolicy(QScrollView::AutoOneFit);
sv1->setHScrollBarMode( QScrollView::AlwaysOff );
// need to find a better way!!!
sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20 ) );
sv1->setFrameShape(QFrame::NoFrame);
DatesButton = new QPushButton (Frame4, "DatesButton" );
DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) );
DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
DatesButton->setPalette( pal );
DatesButton->setPixmap( datebook );
DatesButton->setFlat( TRUE );
-
- //DatesField = new QLabel( sv1->viewport(), "DatesField" );
- //DatesField = new QVBox(sv1->viewport());
- //QWidget *dummy = new QWidget(sv1->viewport());
- //sv1->addChild(DatesField);
- //DatesField->setText( tr( "No appointments today" ) );
- // DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
-
-
- // --- mail section ---)
+
+ // --- mail section ---)
MailFrame = new QFrame( this ,"MailFrame" );
MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) );
MailFrame->setFrameStyle( QFrame::NoFrame );
QFrame* Line1 = new QFrame( MailFrame);
Line1->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken );
@@ -137,17 +132,16 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
MailField = new QLabel( MailFrame, "MailField" );
MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) );
MailField->setText( tr( "Opiemail not installed" ) );
MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
MailField->setMaximumHeight(40);
MailField->setMinimumHeight(15);
-
// --- todo section --
Frame15 = new QFrame( this, "Frame15" );
Frame15->setFrameStyle( QFrame::NoFrame );
Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) );
QFrame* Line2 = new QFrame( Frame15);
Line2->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken );
@@ -174,16 +168,17 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) );
PushButton1->setPixmap( config );
PushButton1->setPalette( pal );
PushButton1->setAutoDefault( TRUE );
PushButton1->setFlat( TRUE );
// -- layout --
layout->addWidget(Frame);
+ layout->addWidget(OwnerField);
layout->addWidget(Frame4);
layout->addWidget(MailFrame);
layout->addWidget(Frame15);
layout->setStretchFactor(Frame4,5);
layout->setStretchFactor(MailFrame,1);
layout->setStretchFactor(Frame15,4);
}
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 8840125..0118faa 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -27,17 +27,17 @@ class TodayBase : public QWidget
public:
TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~TodayBase();
//QScrollView* Frame4;
QFrame* Frame4;
QPushButton* DatesButton;
- //QLabel* DatesField;
+ QLabel* OwnerField;
QLabel* Frame;
QFrame* MailFrame;
QLabel* TextLabel1;
QScrollView* sv1;
QVBox* DatesField;
QFrame* Frame15;
QLabel* TodoField;
QLabel* MailField;