summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/today.cpp97
-rw-r--r--core/pim/today/today.h5
-rw-r--r--core/pim/today/todaybase.cpp17
-rw-r--r--core/pim/today/todaybase.h2
4 files changed, 91 insertions, 30 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
@@ -28,4 +28,6 @@
#include <qpe/qprocess.h>
#include <qpe/resource.h>
+#include <qpe/contact.h>
+#include <qpe/global.h>
#include <qdir.h>
@@ -68,8 +70,57 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
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");
@@ -87,4 +138,7 @@ void Today::autoStart() {
}
+/*
+ * Repaint method. Reread all fields.
+ */
void Today::draw() {
init();
@@ -96,5 +150,4 @@ void Today::draw() {
}
-
/*
* Check if the todolist.xml was modified (if there are new entries.
@@ -123,8 +176,10 @@ bool Today::checkIfModified() {
+/*
+ * 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);
@@ -135,8 +190,9 @@ void Today::init() {
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);
@@ -145,14 +201,15 @@ void Today::init() {
// 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);
-
}
-void Today::startConfig() {
- conf = new todayconfig ( this, "", true );
+/*
+ * The method for the configuration dialog.
+ */
+void Today::startConfig() {
- //Config cfg = new Config("today");
-
+ conf = new todayconfig ( this, "", true );
// read the config
Config cfg("today");
@@ -172,5 +229,5 @@ void Today::startConfig() {
// only later
conf->CheckBox3->setChecked(ONLY_LATER);
-
+ // if today should be autostarted
conf->CheckBoxAuto->setChecked(AUTOSTART);
@@ -193,4 +250,5 @@ void Today::startConfig() {
cfg.setGroup("Autostart");
cfg.writeEntry("autostart", autostart);
+
// sync it to "disk"
cfg.write();
@@ -263,6 +321,4 @@ void Today::getDates() {
sv1->addChild(AllDateBookEvents);
AllDateBookEvents->show();
-
-
}
@@ -340,8 +396,6 @@ void Today::getMail() {
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);
}
@@ -350,5 +404,4 @@ void Today::getMail() {
/*
* Get the todos
- *
*/
void Today::getTodo() {
@@ -358,4 +411,5 @@ void Today::getTodo() {
return;
}
+ // since it was the new start or the return from config dialog, set it to 0 again.
NEW_START=0;
@@ -403,4 +457,8 @@ void Today::startDatebook() {
e << QString("datebook");
}
+
+/*
+ * starts the edit dialog as known from datebook
+ */
void Today::editEvent(const Event &e) {
startDatebook();
@@ -430,12 +488,13 @@ void Today::startMail() {
}
-/*
- * 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,
@@ -466,4 +525,5 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
+ "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
}
+
// include possible note or not
if (SHOW_NOTES == 1) {
@@ -520,4 +580,5 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
}
+
void DateBookEvent::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
@@ -56,5 +56,10 @@ class Today : public TodayBase {
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;
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
@@ -87,4 +87,8 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
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 ---
@@ -95,7 +99,6 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
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);
@@ -112,12 +115,4 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
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 ---)
MailFrame = new QFrame( this ,"MailFrame" );
@@ -143,5 +138,4 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
MailField->setMinimumHeight(15);
-
// --- todo section --
Frame15 = new QFrame( this, "Frame15" );
@@ -180,4 +174,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
// -- layout --
layout->addWidget(Frame);
+ layout->addWidget(OwnerField);
layout->addWidget(Frame4);
layout->addWidget(MailFrame);
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
@@ -33,5 +33,5 @@ public:
QFrame* Frame4;
QPushButton* DatesButton;
- //QLabel* DatesField;
+ QLabel* OwnerField;
QLabel* Frame;
QFrame* MailFrame;