summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/TODO5
-rw-r--r--core/pim/today/today.cpp10
-rw-r--r--core/pim/today/today.h1
-rw-r--r--core/pim/today/todaybase.cpp3
-rw-r--r--core/pim/today/todaybase.h11
5 files changed, 22 insertions, 8 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 6acbf5a..30a8bab 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,8 +1,11 @@
TODO for today:
+* show "upcoming appointents the next days .. one or too"
+
* show alarm icons on alarm events (partly done)
* qcop integration for updating events?
* make Opiezilla a clickable label wich is allway on the far right side of
-the screen , klick will open credits ,) \ No newline at end of file
+the screen , klick will open credits ,)
+
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 4368201..69a0f75 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -63,16 +63,17 @@ QString AUTOSTART_TIMER;
* 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() ) );
+ QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT(editCard() ) );
#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
@@ -414,16 +415,25 @@ void Today::getTodo() {
output += tmpout;
} else {
output = tr("No active tasks");
}
TodoField->setText(tr(output));
}
+
+/*
+ * launch addressbook
+ */
+void Today::editCard() {
+ QCopEnvelope e("QPE/System", "execute(QString)");
+ e << QString("addressbook");
+}
+
/*
* launches datebook
*/
void Today::startDatebook() {
QCopEnvelope e("QPE/System", "execute(QString)");
e << QString("datebook");
}
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 32bb4a3..54f31cc 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -42,16 +42,17 @@ class Today : public TodayBase {
Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Today();
private slots:
void startConfig();
void startTodo();
void startDatebook();
void startMail();
+ void editCard();
void draw();
void editEvent(const Event &e);
private:
void init();
void getDates();
void getTodo();
void getMail();
void autoStart();
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 3d0bfb3..bc1651d 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -52,17 +52,16 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
resize( w , h );
// hehe, qt is ...
getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" );
getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) );
QVBoxLayout * layout = new QVBoxLayout(this);
-
QPalette pal = this->palette();
QColor col = pal.color(QPalette::Active, QColorGroup::Background);
pal.setColor(QPalette::Active, QColorGroup::Button, col);
pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
pal.setColor(QPalette::Normal, QColorGroup::Button, col);
pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
this->setPalette(pal);
@@ -101,17 +100,17 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
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 = new OClickableLabel(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 );
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 0118faa..ec06281 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -8,36 +8,37 @@
****************************************************************************/
#ifndef TODAYBASE_H
#define TODAYBASE_H
#include <qvariant.h>
#include <qwidget.h>
#include <qscrollview.h>
#include <qsplitter.h>
+#include <opie/oclickablelabel.h>
-class QVBox;
-class QHBoxLayout;
-class QGridLayout;
+class QVBox;
+class QHBoxLayout;
+class QGridLayout;
class QFrame;
class QLabel;
class QPushButton;
class TodayBase : public QWidget
-{
+{
Q_OBJECT
public:
TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~TodayBase();
//QScrollView* Frame4;
QFrame* Frame4;
QPushButton* DatesButton;
- QLabel* OwnerField;
+ OClickableLabel* OwnerField;
QLabel* Frame;
QFrame* MailFrame;
QLabel* TextLabel1;
QScrollView* sv1;
QVBox* DatesField;
QFrame* Frame15;
QLabel* TodoField;
QLabel* MailField;