author | harlekin <harlekin> | 2002-06-11 13:03:07 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-11 13:03:07 (UTC) |
commit | e9b7ffa394fa30bea063fbed68b36800e9ebee6d (patch) (unidiff) | |
tree | 42c4af4f287e63fb60653a06d5d017927f9eb21a /core | |
parent | b9b967bca768625cba2019981954c8b336020fb2 (diff) | |
download | opie-e9b7ffa394fa30bea063fbed68b36800e9ebee6d.zip opie-e9b7ffa394fa30bea063fbed68b36800e9ebee6d.tar.gz opie-e9b7ffa394fa30bea063fbed68b36800e9ebee6d.tar.bz2 |
vcard now clickable label
-rw-r--r-- | core/pim/today/TODO | 3 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 10 | ||||
-rw-r--r-- | core/pim/today/today.h | 1 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/todaybase.h | 3 |
5 files changed, 17 insertions, 3 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 @@ | |||
1 | TODO for today: | 1 | TODO for today: |
2 | 2 | ||
3 | * show "upcoming appointents the next days .. one or too" | ||
4 | |||
3 | * show alarm icons on alarm events (partly done) | 5 | * show alarm icons on alarm events (partly done) |
4 | 6 | ||
5 | * qcop integration for updating events? | 7 | * qcop integration for updating events? |
6 | 8 | ||
7 | * make Opiezilla a clickable label wich is allway on the far right side of | 9 | * make Opiezilla a clickable label wich is allway on the far right side of |
8 | the screen , klick will open credits ,) \ No newline at end of file | 10 | the screen , klick will open credits ,) \ No newline at end of file |
11 | |||
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 | |||
@@ -65,12 +65,13 @@ QString AUTOSTART_TIMER; | |||
65 | Today::Today( QWidget* parent, const char* name, WFlags fl ) | 65 | Today::Today( QWidget* parent, const char* name, WFlags fl ) |
66 | : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) { | 66 | : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) { |
67 | QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) ); | 67 | QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) ); |
68 | QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) ); | 68 | QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) ); |
69 | QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); | 69 | QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); |
70 | QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); | 70 | QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); |
71 | QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT(editCard() ) ); | ||
71 | 72 | ||
72 | #if defined(Q_WS_QWS) | 73 | #if defined(Q_WS_QWS) |
73 | #if !defined(QT_NO_COP) | 74 | #if !defined(QT_NO_COP) |
74 | QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this ); | 75 | QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this ); |
75 | connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)), | 76 | connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)), |
76 | this, SLOT ( channelReceived(const QCString &, const QByteArray &)) ); | 77 | this, SLOT ( channelReceived(const QCString &, const QByteArray &)) ); |
@@ -416,12 +417,21 @@ void Today::getTodo() { | |||
416 | output = tr("No active tasks"); | 417 | output = tr("No active tasks"); |
417 | } | 418 | } |
418 | 419 | ||
419 | TodoField->setText(tr(output)); | 420 | TodoField->setText(tr(output)); |
420 | } | 421 | } |
421 | 422 | ||
423 | |||
424 | /* | ||
425 | * launch addressbook | ||
426 | */ | ||
427 | void Today::editCard() { | ||
428 | QCopEnvelope e("QPE/System", "execute(QString)"); | ||
429 | e << QString("addressbook"); | ||
430 | } | ||
431 | |||
422 | /* | 432 | /* |
423 | * launches datebook | 433 | * launches datebook |
424 | */ | 434 | */ |
425 | void Today::startDatebook() { | 435 | void Today::startDatebook() { |
426 | QCopEnvelope e("QPE/System", "execute(QString)"); | 436 | QCopEnvelope e("QPE/System", "execute(QString)"); |
427 | e << QString("datebook"); | 437 | 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 | |||
@@ -44,12 +44,13 @@ class Today : public TodayBase { | |||
44 | 44 | ||
45 | private slots: | 45 | private slots: |
46 | void startConfig(); | 46 | void startConfig(); |
47 | void startTodo(); | 47 | void startTodo(); |
48 | void startDatebook(); | 48 | void startDatebook(); |
49 | void startMail(); | 49 | void startMail(); |
50 | void editCard(); | ||
50 | void draw(); | 51 | void draw(); |
51 | void editEvent(const Event &e); | 52 | void editEvent(const Event &e); |
52 | private: | 53 | private: |
53 | void init(); | 54 | void init(); |
54 | void getDates(); | 55 | void getDates(); |
55 | void getTodo(); | 56 | void getTodo(); |
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 | |||
@@ -54,13 +54,12 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
54 | // hehe, qt is ... | 54 | // hehe, qt is ... |
55 | getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" ); | 55 | getridoffuckingstrippeldlinesbutton = new QPushButton (this, "asdfsad" ); |
56 | getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) ); | 56 | getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) ); |
57 | 57 | ||
58 | QVBoxLayout * layout = new QVBoxLayout(this); | 58 | QVBoxLayout * layout = new QVBoxLayout(this); |
59 | 59 | ||
60 | |||
61 | QPalette pal = this->palette(); | 60 | QPalette pal = this->palette(); |
62 | QColor col = pal.color(QPalette::Active, QColorGroup::Background); | 61 | QColor col = pal.color(QPalette::Active, QColorGroup::Background); |
63 | pal.setColor(QPalette::Active, QColorGroup::Button, col); | 62 | pal.setColor(QPalette::Active, QColorGroup::Button, col); |
64 | pal.setColor(QPalette::Inactive, QColorGroup::Button, col); | 63 | pal.setColor(QPalette::Inactive, QColorGroup::Button, col); |
65 | pal.setColor(QPalette::Normal, QColorGroup::Button, col); | 64 | pal.setColor(QPalette::Normal, QColorGroup::Button, col); |
66 | pal.setColor(QPalette::Disabled, QColorGroup::Button, col); | 65 | pal.setColor(QPalette::Disabled, QColorGroup::Button, col); |
@@ -103,13 +102,13 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) | |||
103 | QFont TextLabel1_font( TextLabel1->font() ); | 102 | QFont TextLabel1_font( TextLabel1->font() ); |
104 | TextLabel1_font.setBold( TRUE ); | 103 | TextLabel1_font.setBold( TRUE ); |
105 | TextLabel1->setFont( TextLabel1_font ); | 104 | TextLabel1->setFont( TextLabel1_font ); |
106 | TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); | 105 | TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin ); |
107 | TextLabel1->setTextFormat( RichText ); | 106 | TextLabel1->setTextFormat( RichText ); |
108 | 107 | ||
109 | OwnerField = new QLabel(this , "Owner" ); | 108 | OwnerField = new OClickableLabel(this , "Owner" ); |
110 | OwnerField->setGeometry(QRect(0,0, this->width(), 12 )); | 109 | OwnerField->setGeometry(QRect(0,0, this->width(), 12 )); |
111 | OwnerField->setAlignment(int (QLabel::AlignTop | QLabel::AlignLeft ) ); | 110 | OwnerField->setAlignment(int (QLabel::AlignTop | QLabel::AlignLeft ) ); |
112 | OwnerField->setMaximumHeight(12); | 111 | OwnerField->setMaximumHeight(12); |
113 | 112 | ||
114 | // --- dates section --- | 113 | // --- dates section --- |
115 | Frame4 = new QFrame( this, "Frame4" ); | 114 | Frame4 = new QFrame( this, "Frame4" ); |
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 | |||
@@ -10,12 +10,13 @@ | |||
10 | #define TODAYBASE_H | 10 | #define TODAYBASE_H |
11 | 11 | ||
12 | #include <qvariant.h> | 12 | #include <qvariant.h> |
13 | #include <qwidget.h> | 13 | #include <qwidget.h> |
14 | #include <qscrollview.h> | 14 | #include <qscrollview.h> |
15 | #include <qsplitter.h> | 15 | #include <qsplitter.h> |
16 | #include <opie/oclickablelabel.h> | ||
16 | 17 | ||
17 | class QVBox; | 18 | class QVBox; |
18 | class QHBoxLayout; | 19 | class QHBoxLayout; |
19 | class QGridLayout; | 20 | class QGridLayout; |
20 | class QFrame; | 21 | class QFrame; |
21 | class QLabel; | 22 | class QLabel; |
@@ -29,13 +30,13 @@ public: | |||
29 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 30 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
30 | ~TodayBase(); | 31 | ~TodayBase(); |
31 | 32 | ||
32 | //QScrollView* Frame4; | 33 | //QScrollView* Frame4; |
33 | QFrame* Frame4; | 34 | QFrame* Frame4; |
34 | QPushButton* DatesButton; | 35 | QPushButton* DatesButton; |
35 | QLabel* OwnerField; | 36 | OClickableLabel* OwnerField; |
36 | QLabel* Frame; | 37 | QLabel* Frame; |
37 | QFrame* MailFrame; | 38 | QFrame* MailFrame; |
38 | QLabel* TextLabel1; | 39 | QLabel* TextLabel1; |
39 | QScrollView* sv1; | 40 | QScrollView* sv1; |
40 | QVBox* DatesField; | 41 | QVBox* DatesField; |
41 | QFrame* Frame15; | 42 | QFrame* Frame15; |