summaryrefslogtreecommitdiff
authorhakan <hakan>2002-05-07 10:43:49 (UTC)
committer hakan <hakan>2002-05-07 10:43:49 (UTC)
commitcfe30703da090180b66bc571e85654c71a7ee8e0 (patch) (unidiff)
treed6954140f2208becb9a6beb5b8a21529bfd5bceb
parentc9849cc04b668f1cda7a16d868299c436d1de042 (diff)
downloadopie-cfe30703da090180b66bc571e85654c71a7ee8e0.zip
opie-cfe30703da090180b66bc571e85654c71a7ee8e0.tar.gz
opie-cfe30703da090180b66bc571e85654c71a7ee8e0.tar.bz2
Moved ClickableLabel to libopie/OClickableLabel
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.pro4
-rw-r--r--core/pim/datebook/datebookweeklst.cpp2
-rw-r--r--core/pim/datebook/datebookweeklst.h4
-rw-r--r--core/pim/datebook/datebookweeklstdayhdr.ui8
-rw-r--r--core/pim/datebook/dateentryimpl.cpp8
-rw-r--r--core/pim/datebook/opie-datebook.control2
-rw-r--r--core/pim/datebook/timepicker.cpp19
-rw-r--r--core/pim/datebook/timepicker.h6
-rw-r--r--libopie/libopie.pro4
-rw-r--r--libopie/oclickablelabel.cpp (renamed from core/pim/datebook/clickablelabel.cpp)18
-rw-r--r--libopie/oclickablelabel.h (renamed from core/pim/datebook/clickablelabel.h)4
11 files changed, 40 insertions, 39 deletions
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index a8a9285..9383053 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -11,7 +11,6 @@ HEADERS = datebookday.h \
11 datebookweeklst.h \ 11 datebookweeklst.h \
12 datebookweekheaderimpl.h \ 12 datebookweekheaderimpl.h \
13 repeatentry.h \ 13 repeatentry.h \
14 clickablelabel.h \
15 timepicker.h 14 timepicker.h
16 15
17 SOURCES= main.cpp \ 16 SOURCES= main.cpp \
@@ -24,7 +23,6 @@ SOURCES = main.cpp \
24 datebookweeklst.cpp \ 23 datebookweeklst.cpp \
25 datebookweekheaderimpl.cpp \ 24 datebookweekheaderimpl.cpp \
26 repeatentry.cpp \ 25 repeatentry.cpp \
27 clickablelabel.cpp \
28 timepicker.cpp 26 timepicker.cpp
29 27
30 INTERFACES= dateentry.ui \ 28 INTERFACES= dateentry.ui \
@@ -37,7 +35,7 @@ INTERFACES = dateentry.ui \
37 35
38INCLUDEPATH += $(OPIEDIR)/include 36INCLUDEPATH += $(OPIEDIR)/include
39 DEPENDPATH+= $(OPIEDIR)/include 37 DEPENDPATH+= $(OPIEDIR)/include
40LIBS += -lqpe 38LIBS += -lqpe -lopie
41 39
42 TARGET = datebook 40 TARGET = datebook
43 41
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 85c745a..8e88377 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -143,7 +143,7 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
143 QWidget* parent, 143 QWidget* parent,
144 const char* name, 144 const char* name,
145 WFlags fl) : 145 WFlags fl) :
146 ClickableLabel(parent,name,fl), 146 OClickableLabel(parent,name,fl),
147 event(ev) 147 event(ev)
148{ 148{
149 char s[10]; 149 char s[10];
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index b0b0417..24f6c83 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -10,7 +10,7 @@
10#include "datebookweeklstheader.h" 10#include "datebookweeklstheader.h"
11#include "datebookweeklstdayhdr.h" 11#include "datebookweeklstdayhdr.h"
12 12
13#include "clickablelabel.h" 13#include <opie/oclickablelabel.h>
14 14
15class QDateTime; 15class QDateTime;
16class DateBookDB; 16class DateBookDB;
@@ -55,7 +55,7 @@ private:
55 QDate date; 55 QDate date;
56}; 56};
57 57
58class DateBookWeekLstEvent: public ClickableLabel 58class DateBookWeekLstEvent: public OClickableLabel
59{ 59{
60 Q_OBJECT 60 Q_OBJECT
61public: 61public:
diff --git a/core/pim/datebook/datebookweeklstdayhdr.ui b/core/pim/datebook/datebookweeklstdayhdr.ui
index 2b68754..9499726 100644
--- a/core/pim/datebook/datebookweeklstdayhdr.ui
+++ b/core/pim/datebook/datebookweeklstdayhdr.ui
@@ -60,7 +60,7 @@
60 </property> 60 </property>
61 </widget> 61 </widget>
62 <widget> 62 <widget>
63 <class>ClickableLabel</class> 63 <class>OClickableLabel</class>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>name</name> 65 <name>name</name>
66 <cstring>label</cstring> 66 <cstring>label</cstring>
@@ -105,7 +105,7 @@
105 </property> 105 </property>
106 </widget> 106 </widget>
107 <widget> 107 <widget>
108 <class>ClickableLabel</class> 108 <class>OClickableLabel</class>
109 <property stdset="1"> 109 <property stdset="1">
110 <name>name</name> 110 <name>name</name>
111 <cstring>add</cstring> 111 <cstring>add</cstring>
@@ -122,8 +122,8 @@
122</widget> 122</widget>
123<customwidgets> 123<customwidgets>
124 <customwidget> 124 <customwidget>
125 <class>ClickableLabel</class> 125 <class>OClickableLabel</class>
126 <header location="local">clickablelabel.h</header> 126 <header location="global">opie/oclickablelabel.h</header>
127 <sizehint> 127 <sizehint>
128 <width>-1</width> 128 <width>-1</width>
129 <height>-1</height> 129 <height>-1</height>
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index e14e2f5..c4f6c68 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -43,6 +43,7 @@
43#include "timepicker.h" 43#include "timepicker.h"
44 44
45#include <stdlib.h> 45#include <stdlib.h>
46#include <stdio.h>
46 47
47/* 48/*
48 * Constructs a DateEntry which is a child of 'parent', with the 49 * Constructs a DateEntry which is a child of 'parent', with the
@@ -57,7 +58,8 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start,
57 const char* name ) 58 const char* name )
58 : DateEntryBase( parent, name ), 59 : DateEntryBase( parent, name ),
59 ampm( whichClock ), 60 ampm( whichClock ),
60 startWeekOnMonday( startOnMonday ) 61 startWeekOnMonday( startOnMonday ),
62 m_showStart(true)
61{ 63{
62 init(); 64 init();
63 setDates(start,end); 65 setDates(start,end);
@@ -113,7 +115,9 @@ DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock,
113 QWidget* parent, const char* name ) 115 QWidget* parent, const char* name )
114 : DateEntryBase( parent, name ), 116 : DateEntryBase( parent, name ),
115 ampm( whichClock ), 117 ampm( whichClock ),
116 startWeekOnMonday( startOnMonday ) 118 startWeekOnMonday( startOnMonday ),
119 m_showStart(true)
120
117{ 121{
118 init(); 122 init();
119 setDates(event.start(),event.end()); 123 setDates(event.start(),event.end());
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index 6566d50..9bef119 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -4,6 +4,6 @@ Section: opie/applications
4Maintainer: Warwick Allison <warwick@trolltech.com> 4Maintainer: Warwick Allison <warwick@trolltech.com>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION 6Version: $QPE_VERSION-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
8Description: A datebook/appointment manager 8Description: A datebook/appointment manager
9 A datebook/appointment manager for the Opie environment. 9 A datebook/appointment manager for the Opie environment.
diff --git a/core/pim/datebook/timepicker.cpp b/core/pim/datebook/timepicker.cpp
index 43e05ad..f2cb71d 100644
--- a/core/pim/datebook/timepicker.cpp
+++ b/core/pim/datebook/timepicker.cpp
@@ -3,7 +3,6 @@
3#include <qbuttongroup.h> 3#include <qbuttongroup.h>
4#include <qtoolbutton.h> 4#include <qtoolbutton.h>
5#include <qlayout.h> 5#include <qlayout.h>
6#include "clickablelabel.h"
7#include <qstring.h> 6#include <qstring.h>
8#include <stdio.h> 7#include <stdio.h>
9 8
@@ -13,7 +12,7 @@ TimePicker::TimePicker(QWidget* parent, const char* name,
13{ 12{
14 QVBoxLayout *vbox=new QVBoxLayout(this); 13 QVBoxLayout *vbox=new QVBoxLayout(this);
15 14
16 ClickableLabel *r; 15 OClickableLabel *r;
17 QString s; 16 QString s;
18 17
19 // Hour Row 18 // Hour Row
@@ -23,7 +22,7 @@ TimePicker::TimePicker(QWidget* parent, const char* name,
23 22
24 23
25 for (int i=0; i<24; i++) { 24 for (int i=0; i<24; i++) {
26 r=new ClickableLabel(row); 25 r=new OClickableLabel(row);
27 hourLst.append(r); 26 hourLst.append(r);
28 s.sprintf("%.2d",i); 27 s.sprintf("%.2d",i);
29 r->setText(s); 28 r->setText(s);
@@ -46,7 +45,7 @@ TimePicker::TimePicker(QWidget* parent, const char* name,
46 vbox->addWidget(row); 45 vbox->addWidget(row);
47 46
48 for (int i=0; i<60; i+=5) { 47 for (int i=0; i<60; i+=5) {
49 r=new ClickableLabel(row); 48 r=new OClickableLabel(row);
50 minuteLst.append(r); 49 minuteLst.append(r);
51 s.sprintf("%.2d",i); 50 s.sprintf("%.2d",i);
52 r->setText(s); 51 r->setText(s);
@@ -60,10 +59,10 @@ TimePicker::TimePicker(QWidget* parent, const char* name,
60 59
61void TimePicker::slotHour(bool b) { 60void TimePicker::slotHour(bool b) {
62 61
63 ClickableLabel *r = (ClickableLabel *) sender(); 62 OClickableLabel *r = (OClickableLabel *) sender();
64 63
65 if (b) { 64 if (b) {
66 QValueListIterator<ClickableLabel *> it; 65 QValueListIterator<OClickableLabel *> it;
67 for (it=hourLst.begin(); it!=hourLst.end(); it++) { 66 for (it=hourLst.begin(); it!=hourLst.end(); it++) {
68 if (*it != r) (*it)->setOn(false); 67 if (*it != r) (*it)->setOn(false);
69 else tm.setHMS((*it)->text().toInt(), tm.minute(), 0); 68 else tm.setHMS((*it)->text().toInt(), tm.minute(), 0);
@@ -77,10 +76,10 @@ void TimePicker::slotHour(bool b) {
77 76
78void TimePicker::slotMinute(bool b) { 77void TimePicker::slotMinute(bool b) {
79 78
80 ClickableLabel *r = (ClickableLabel *) sender(); 79 OClickableLabel *r = (OClickableLabel *) sender();
81 80
82 if (b) { 81 if (b) {
83 QValueListIterator<ClickableLabel *> it; 82 QValueListIterator<OClickableLabel *> it;
84 for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { 83 for (it=minuteLst.begin(); it!=minuteLst.end(); it++) {
85 if (*it != r) (*it)->setOn(false); 84 if (*it != r) (*it)->setOn(false);
86 else tm.setHMS(tm.hour(),(*it)->text().toInt(), 0); 85 else tm.setHMS(tm.hour(),(*it)->text().toInt(), 0);
@@ -97,7 +96,7 @@ void TimePicker::setMinute(int m) {
97 QString minute; 96 QString minute;
98 minute.sprintf("%.2d",m); 97 minute.sprintf("%.2d",m);
99 98
100 QValueListIterator<ClickableLabel *> it; 99 QValueListIterator<OClickableLabel *> it;
101 for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { 100 for (it=minuteLst.begin(); it!=minuteLst.end(); it++) {
102 if ((*it)->text() == minute) (*it)->setOn(true); 101 if ((*it)->text() == minute) (*it)->setOn(true);
103 else (*it)->setOn(false); 102 else (*it)->setOn(false);
@@ -111,7 +110,7 @@ void TimePicker::setHour(int h) {
111 QString hour; 110 QString hour;
112 hour.sprintf("%.2d",h); 111 hour.sprintf("%.2d",h);
113 112
114 QValueListIterator<ClickableLabel *> it; 113 QValueListIterator<OClickableLabel *> it;
115 for (it=hourLst.begin(); it!=hourLst.end(); it++) { 114 for (it=hourLst.begin(); it!=hourLst.end(); it++) {
116 if ((*it)->text() == hour) (*it)->setOn(true); 115 if ((*it)->text() == hour) (*it)->setOn(true);
117 else (*it)->setOn(false); 116 else (*it)->setOn(false);
diff --git a/core/pim/datebook/timepicker.h b/core/pim/datebook/timepicker.h
index 0acadcb..1c35600 100644
--- a/core/pim/datebook/timepicker.h
+++ b/core/pim/datebook/timepicker.h
@@ -3,7 +3,7 @@
3 3
4#include <qwidget.h> 4#include <qwidget.h>
5#include <qvaluelist.h> 5#include <qvaluelist.h>
6#include "clickablelabel.h" 6#include <opie/oclickablelabel.h>
7#include <qdatetime.h> 7#include <qdatetime.h>
8 8
9class TimePicker: public QWidget { 9class TimePicker: public QWidget {
@@ -16,8 +16,8 @@ class TimePicker: public QWidget {
16 void setMinute(int m); 16 void setMinute(int m);
17 17
18 private: 18 private:
19 QValueList<ClickableLabel *> hourLst; 19 QValueList<OClickableLabel *> hourLst;
20 QValueList<ClickableLabel *> minuteLst; 20 QValueList<OClickableLabel *> minuteLst;
21 QTime tm; 21 QTime tm;
22 22
23 private slots: 23 private slots:
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index ba64bda..337206a 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,7 +1,7 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qte warn_on release 2CONFIG += qte warn_on release
3 HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h 3 HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h oclickablelabel.h
4 SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp 4 SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp
5 TARGET = opie 5 TARGET = opie
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7DESTDIR = $(QTDIR)/lib$(PROJMAK) 7DESTDIR = $(QTDIR)/lib$(PROJMAK)
diff --git a/core/pim/datebook/clickablelabel.cpp b/libopie/oclickablelabel.cpp
index 128bebb..43a0524 100644
--- a/core/pim/datebook/clickablelabel.cpp
+++ b/libopie/oclickablelabel.cpp
@@ -1,7 +1,7 @@
1#include "clickablelabel.h" 1#include "oclickablelabel.h"
2#include <stdio.h> 2#include <stdio.h>
3 3
4ClickableLabel::ClickableLabel(QWidget* parent, 4OClickableLabel::OClickableLabel(QWidget* parent,
5 const char* name, 5 const char* name,
6 WFlags fl) : 6 WFlags fl) :
7 QLabel(parent,name,fl) 7 QLabel(parent,name,fl)
@@ -13,11 +13,11 @@ ClickableLabel::ClickableLabel(QWidget* parent,
13 setFrameShadow(Sunken); 13 setFrameShadow(Sunken);
14} 14}
15 15
16void ClickableLabel::setToggleButton(bool t) { 16void OClickableLabel::setToggleButton(bool t) {
17 isToggle=t; 17 isToggle=t;
18} 18}
19 19
20void ClickableLabel::mousePressEvent( QMouseEvent *e ) { 20void OClickableLabel::mousePressEvent( QMouseEvent *e ) {
21 if (isToggle && isDown) { 21 if (isToggle && isDown) {
22 showState(false); 22 showState(false);
23 } else { 23 } else {
@@ -25,7 +25,7 @@ void ClickableLabel::mousePressEvent( QMouseEvent *e ) {
25 } 25 }
26} 26}
27 27
28void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { 28void OClickableLabel::mouseReleaseEvent( QMouseEvent *e ) {
29 if (rect().contains(e->pos()) && isToggle) isDown=!isDown; 29 if (rect().contains(e->pos()) && isToggle) isDown=!isDown;
30 30
31 if (isToggle && isDown) { 31 if (isToggle && isDown) {
@@ -42,7 +42,7 @@ void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) {
42 } 42 }
43} 43}
44 44
45void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { 45void OClickableLabel::mouseMoveEvent( QMouseEvent *e ) {
46 if (rect().contains(e->pos())) { 46 if (rect().contains(e->pos())) {
47 if (isToggle && isDown) { 47 if (isToggle && isDown) {
48 showState(false); 48 showState(false);
@@ -58,7 +58,7 @@ void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) {
58 } 58 }
59} 59}
60 60
61void ClickableLabel::showState(bool on) { 61void OClickableLabel::showState(bool on) {
62 if (on) { 62 if (on) {
63 //setFrameShape(Panel); 63 //setFrameShape(Panel);
64 setInverted(true); 64 setInverted(true);
@@ -71,7 +71,7 @@ void ClickableLabel::showState(bool on) {
71 repaint(); 71 repaint();
72} 72}
73 73
74void ClickableLabel::setInverted(bool on) { 74void OClickableLabel::setInverted(bool on) {
75 if ( (!textInverted && on) || (textInverted && !on) ) { 75 if ( (!textInverted && on) || (textInverted && !on) ) {
76 QPalette pal=palette(); 76 QPalette pal=palette();
77 QColor col=pal.color(QPalette::Normal, QColorGroup::Foreground); 77 QColor col=pal.color(QPalette::Normal, QColorGroup::Foreground);
@@ -82,7 +82,7 @@ void ClickableLabel::setInverted(bool on) {
82 } 82 }
83} 83}
84 84
85void ClickableLabel::setOn(bool on) { 85void OClickableLabel::setOn(bool on) {
86 isDown=on; 86 isDown=on;
87 showState(isDown); 87 showState(isDown);
88} 88}
diff --git a/core/pim/datebook/clickablelabel.h b/libopie/oclickablelabel.h
index d00fee6..f65c440 100644
--- a/core/pim/datebook/clickablelabel.h
+++ b/libopie/oclickablelabel.h
@@ -3,11 +3,11 @@
3 3
4#include <qlabel.h> 4#include <qlabel.h>
5 5
6class ClickableLabel: public QLabel 6class OClickableLabel: public QLabel
7{ 7{
8 Q_OBJECT 8 Q_OBJECT
9public: 9public:
10 ClickableLabel(QWidget* parent = 0, const char* name = 0, 10 OClickableLabel(QWidget* parent = 0, const char* name = 0,
11 WFlags fl = 0); 11 WFlags fl = 0);
12 void setToggleButton(bool t); 12 void setToggleButton(bool t);
13 protected: 13 protected: