author | hakan <hakan> | 2002-05-07 10:43:49 (UTC) |
---|---|---|
committer | hakan <hakan> | 2002-05-07 10:43:49 (UTC) |
commit | cfe30703da090180b66bc571e85654c71a7ee8e0 (patch) (side-by-side diff) | |
tree | d6954140f2208becb9a6beb5b8a21529bfd5bceb /core | |
parent | c9849cc04b668f1cda7a16d868299c436d1de042 (diff) | |
download | opie-cfe30703da090180b66bc571e85654c71a7ee8e0.zip opie-cfe30703da090180b66bc571e85654c71a7ee8e0.tar.gz opie-cfe30703da090180b66bc571e85654c71a7ee8e0.tar.bz2 |
Moved ClickableLabel to libopie/OClickableLabel
-rw-r--r-- | core/pim/datebook/clickablelabel.cpp | 88 | ||||
-rw-r--r-- | core/pim/datebook/clickablelabel.h | 30 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.h | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklstdayhdr.ui | 8 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 8 | ||||
-rw-r--r-- | core/pim/datebook/opie-datebook.control | 2 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.cpp | 19 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.h | 6 |
10 files changed, 27 insertions, 144 deletions
diff --git a/core/pim/datebook/clickablelabel.cpp b/core/pim/datebook/clickablelabel.cpp deleted file mode 100644 index 128bebb..0000000 --- a/core/pim/datebook/clickablelabel.cpp +++ b/dev/null @@ -1,88 +0,0 @@ -#include "clickablelabel.h" -#include <stdio.h> - -ClickableLabel::ClickableLabel(QWidget* parent, - const char* name, - WFlags fl) : - QLabel(parent,name,fl) -{ - textInverted=false; - isToggle=false; - isDown=false; - showState(false); - setFrameShadow(Sunken); -} - -void ClickableLabel::setToggleButton(bool t) { - isToggle=t; -} - -void ClickableLabel::mousePressEvent( QMouseEvent *e ) { - if (isToggle && isDown) { - showState(false); - } else { - showState(true); - } -} - -void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { - if (rect().contains(e->pos()) && isToggle) isDown=!isDown; - - if (isToggle && isDown) { - showState(true); - } else { - showState(false); - } - - if (rect().contains(e->pos())) { - if (isToggle) { - emit toggled(isDown); - } - emit clicked(); - } -} - -void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { - if (rect().contains(e->pos())) { - if (isToggle && isDown) { - showState(false); - } else { - showState(true); - } - } else { - if (isToggle && isDown) { - showState(true); - } else { - showState(false); - } - } -} - -void ClickableLabel::showState(bool on) { - if (on) { - //setFrameShape(Panel); - setInverted(true); - setBackgroundMode(PaletteHighlight); - } else { - //setFrameShape(NoFrame); - setInverted(false); - setBackgroundMode(PaletteBackground); - } - repaint(); -} - -void ClickableLabel::setInverted(bool on) { - if ( (!textInverted && on) || (textInverted && !on) ) { - QPalette pal=palette(); - QColor col=pal.color(QPalette::Normal, QColorGroup::Foreground); - col.setRgb(255-col.red(),255-col.green(),255-col.blue()); - pal.setColor(QPalette::Normal, QColorGroup::Foreground, col); - setPalette(pal); - textInverted=!textInverted; - } -} - -void ClickableLabel::setOn(bool on) { - isDown=on; - showState(isDown); -} diff --git a/core/pim/datebook/clickablelabel.h b/core/pim/datebook/clickablelabel.h deleted file mode 100644 index d00fee6..0000000 --- a/core/pim/datebook/clickablelabel.h +++ b/dev/null @@ -1,30 +0,0 @@ -#ifndef CLICKABLELABEL -#define CLICKABLELABEL - -#include <qlabel.h> - -class ClickableLabel: public QLabel -{ - Q_OBJECT -public: - ClickableLabel(QWidget* parent = 0, const char* name = 0, - WFlags fl = 0); - void setToggleButton(bool t); - protected: - void mousePressEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); - void mouseMoveEvent( QMouseEvent *e ); - public slots: - void setOn(bool on); - signals: - void clicked(); - void toggled(bool on); - private: - bool isToggle; - bool isDown; - void showState(bool on); - bool textInverted; - void setInverted(bool on); -}; - -#endif 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 @@ -13,3 +13,2 @@ HEADERS = datebookday.h \ repeatentry.h \ - clickablelabel.h \ timepicker.h @@ -26,3 +25,2 @@ SOURCES = main.cpp \ repeatentry.cpp \ - clickablelabel.cpp \ timepicker.cpp @@ -39,3 +37,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopie 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 @@ -145,3 +145,3 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, WFlags fl) : - ClickableLabel(parent,name,fl), + OClickableLabel(parent,name,fl), event(ev) 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 @@ -12,3 +12,3 @@ -#include "clickablelabel.h" +#include <opie/oclickablelabel.h> @@ -57,3 +57,3 @@ private: -class DateBookWeekLstEvent: public ClickableLabel +class DateBookWeekLstEvent: public OClickableLabel { 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 @@ -62,3 +62,3 @@ <widget> - <class>ClickableLabel</class> + <class>OClickableLabel</class> <property stdset="1"> @@ -107,3 +107,3 @@ <widget> - <class>ClickableLabel</class> + <class>OClickableLabel</class> <property stdset="1"> @@ -124,4 +124,4 @@ <customwidget> - <class>ClickableLabel</class> - <header location="local">clickablelabel.h</header> + <class>OClickableLabel</class> + <header location="global">opie/oclickablelabel.h</header> <sizehint> 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 @@ -45,2 +45,3 @@ #include <stdlib.h> +#include <stdio.h> @@ -59,3 +60,4 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start, ampm( whichClock ), - startWeekOnMonday( startOnMonday ) + startWeekOnMonday( startOnMonday ), + m_showStart(true) { @@ -115,3 +117,5 @@ DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock, ampm( whichClock ), - startWeekOnMonday( startOnMonday ) + startWeekOnMonday( startOnMonday ), + m_showStart(true) + { 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 @@ -6,3 +6,3 @@ Architecture: arm Version: $QPE_VERSION-$SUB_VERSION -Depends: opie-base ($QPE_VERSION) +Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) Description: A datebook/appointment manager 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 @@ -5,3 +5,2 @@ #include <qlayout.h> -#include "clickablelabel.h" #include <qstring.h> @@ -15,3 +14,3 @@ TimePicker::TimePicker(QWidget* parent, const char* name, - ClickableLabel *r; + OClickableLabel *r; QString s; @@ -25,3 +24,3 @@ TimePicker::TimePicker(QWidget* parent, const char* name, for (int i=0; i<24; i++) { - r=new ClickableLabel(row); + r=new OClickableLabel(row); hourLst.append(r); @@ -48,3 +47,3 @@ TimePicker::TimePicker(QWidget* parent, const char* name, for (int i=0; i<60; i+=5) { - r=new ClickableLabel(row); + r=new OClickableLabel(row); minuteLst.append(r); @@ -62,6 +61,6 @@ void TimePicker::slotHour(bool b) { - ClickableLabel *r = (ClickableLabel *) sender(); + OClickableLabel *r = (OClickableLabel *) sender(); if (b) { - QValueListIterator<ClickableLabel *> it; + QValueListIterator<OClickableLabel *> it; for (it=hourLst.begin(); it!=hourLst.end(); it++) { @@ -79,6 +78,6 @@ void TimePicker::slotMinute(bool b) { - ClickableLabel *r = (ClickableLabel *) sender(); + OClickableLabel *r = (OClickableLabel *) sender(); if (b) { - QValueListIterator<ClickableLabel *> it; + QValueListIterator<OClickableLabel *> it; for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { @@ -99,3 +98,3 @@ void TimePicker::setMinute(int m) { - QValueListIterator<ClickableLabel *> it; + QValueListIterator<OClickableLabel *> it; for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { @@ -113,3 +112,3 @@ void TimePicker::setHour(int h) { - QValueListIterator<ClickableLabel *> it; + QValueListIterator<OClickableLabel *> it; for (it=hourLst.begin(); it!=hourLst.end(); it++) { 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 @@ -5,3 +5,3 @@ #include <qvaluelist.h> -#include "clickablelabel.h" +#include <opie/oclickablelabel.h> #include <qdatetime.h> @@ -18,4 +18,4 @@ class TimePicker: public QWidget { private: - QValueList<ClickableLabel *> hourLst; - QValueList<ClickableLabel *> minuteLst; + QValueList<OClickableLabel *> hourLst; + QValueList<OClickableLabel *> minuteLst; QTime tm; |