-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 @@ -8,39 +8,37 @@ HEADERS = datebookday.h \ datebookdayheaderimpl.h \ datebooksettings.h \ datebookweek.h \ datebookweeklst.h \ datebookweekheaderimpl.h \ repeatentry.h \ - clickablelabel.h \ timepicker.h SOURCES = main.cpp \ datebookday.cpp \ datebook.cpp \ dateentryimpl.cpp \ datebookdayheaderimpl.cpp \ datebooksettings.cpp \ datebookweek.cpp \ datebookweeklst.cpp \ datebookweekheaderimpl.cpp \ repeatentry.cpp \ - clickablelabel.cpp \ timepicker.cpp INTERFACES = dateentry.ui \ datebookdayheader.ui \ datebooksettingsbase.ui \ datebookweekheader.ui \ datebookweeklstheader.ui \ datebookweeklstdayhdr.ui \ repeatentrybase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopie TARGET = datebook TRANSLATIONS = ../i18n/pt_BR/datebook.ts TRANSLATIONS += ../i18n/de/datebook.ts TRANSLATIONS += ../i18n/en/datebook.ts 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 @@ -140,13 +140,13 @@ void DateBookWeekLstDayHdr::newEvent() { emit addEvent(start,stop,""); } DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, QWidget* parent, const char* name, WFlags fl) : - ClickableLabel(parent,name,fl), + OClickableLabel(parent,name,fl), event(ev) { char s[10]; if ( ev.startDate() != ev.date() ) { // multiday event (not first day) if ( ev.endDate() == ev.date() ) { // last day strcpy(s, "__|__"); 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 @@ -7,13 +7,13 @@ #include <qlabel.h> #include <qscrollview.h> #include "datebookweeklstheader.h" #include "datebookweeklstdayhdr.h" -#include "clickablelabel.h" +#include <opie/oclickablelabel.h> class QDateTime; class DateBookDB; class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase { @@ -52,13 +52,13 @@ signals: void addEvent(const QDateTime &start, const QDateTime &stop, const QString &str); private: QDate date; }; -class DateBookWeekLstEvent: public ClickableLabel +class DateBookWeekLstEvent: public OClickableLabel { Q_OBJECT public: DateBookWeekLstEvent(const EffectiveEvent &ev, QWidget* parent = 0, const char* name = 0, WFlags fl = 0); 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 @@ -57,13 +57,13 @@ <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> </property> </widget> <widget> - <class>ClickableLabel</class> + <class>OClickableLabel</class> <property stdset="1"> <name>name</name> <cstring>label</cstring> </property> <property stdset="1"> <name>sizePolicy</name> @@ -102,13 +102,13 @@ <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> </property> </widget> <widget> - <class>ClickableLabel</class> + <class>OClickableLabel</class> <property stdset="1"> <name>name</name> <cstring>add</cstring> </property> <property stdset="1"> <name>sizePolicy</name> @@ -119,14 +119,14 @@ </property> </widget> </hbox> </widget> <customwidgets> <customwidget> - <class>ClickableLabel</class> - <header location="local">clickablelabel.h</header> + <class>OClickableLabel</class> + <header location="global">opie/oclickablelabel.h</header> <sizehint> <width>-1</width> <height>-1</height> </sizehint> <container>0</container> <sizepolicy> 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 @@ -40,12 +40,13 @@ #include <qspinbox.h> #include <qtoolbutton.h> #include "timepicker.h" #include <stdlib.h> +#include <stdio.h> /* * Constructs a DateEntry which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to @@ -54,13 +55,14 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start, const QDateTime &end, bool whichClock, QWidget* parent, const char* name ) : DateEntryBase( parent, name ), ampm( whichClock ), - startWeekOnMonday( startOnMonday ) + startWeekOnMonday( startOnMonday ), + m_showStart(true) { init(); setDates(start,end); setFocusProxy(comboDescription); } @@ -110,13 +112,15 @@ static void addOrPick( QComboBox* combo, const QString& t ) } DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock, QWidget* parent, const char* name ) : DateEntryBase( parent, name ), ampm( whichClock ), - startWeekOnMonday( startOnMonday ) + startWeekOnMonday( startOnMonday ), + m_showStart(true) + { init(); setDates(event.start(),event.end()); comboCategory->setCategories( event.categories(), "Calendar", tr("Calendar") ); if(!event.description().isEmpty()) addOrPick( comboDescription, event.description() ); 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 @@ -1,9 +1,9 @@ Files: bin/datebook apps/Applications/datebook.desktop Priority: optional Section: opie/applications Maintainer: Warwick Allison <warwick@trolltech.com> 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 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 @@ -1,32 +1,31 @@ #include "timepicker.h" #include <qbuttongroup.h> #include <qtoolbutton.h> #include <qlayout.h> -#include "clickablelabel.h" #include <qstring.h> #include <stdio.h> TimePicker::TimePicker(QWidget* parent, const char* name, WFlags fl) : QWidget(parent,name,fl) { QVBoxLayout *vbox=new QVBoxLayout(this); - ClickableLabel *r; + OClickableLabel *r; QString s; // Hour Row QWidget *row=new QWidget(this); QHBoxLayout *l=new QHBoxLayout(row); vbox->addWidget(row); for (int i=0; i<24; i++) { - r=new ClickableLabel(row); + r=new OClickableLabel(row); hourLst.append(r); s.sprintf("%.2d",i); r->setText(s); r->setToggleButton(true); r->setAlignment(AlignHCenter | AlignVCenter); l->addWidget(r); @@ -43,13 +42,13 @@ TimePicker::TimePicker(QWidget* parent, const char* name, // Minute Row row=new QWidget(this); l=new QHBoxLayout(row); vbox->addWidget(row); for (int i=0; i<60; i+=5) { - r=new ClickableLabel(row); + r=new OClickableLabel(row); minuteLst.append(r); s.sprintf("%.2d",i); r->setText(s); r->setToggleButton(true); r->setAlignment(AlignHCenter | AlignVCenter); l->addWidget(r); @@ -57,16 +56,16 @@ TimePicker::TimePicker(QWidget* parent, const char* name, this, SLOT(slotMinute(bool))); } } 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++) { if (*it != r) (*it)->setOn(false); else tm.setHMS((*it)->text().toInt(), tm.minute(), 0); } emit timeChanged(tm); } else { @@ -74,16 +73,16 @@ void TimePicker::slotHour(bool b) { } } 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++) { if (*it != r) (*it)->setOn(false); else tm.setHMS(tm.hour(),(*it)->text().toInt(), 0); } emit timeChanged(tm); } else { @@ -94,13 +93,13 @@ void TimePicker::slotMinute(bool b) { void TimePicker::setMinute(int m) { QString minute; minute.sprintf("%.2d",m); - QValueListIterator<ClickableLabel *> it; + QValueListIterator<OClickableLabel *> it; for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { if ((*it)->text() == minute) (*it)->setOn(true); else (*it)->setOn(false); } tm.setHMS(tm.hour(),m,0); @@ -108,13 +107,13 @@ void TimePicker::setMinute(int m) { void TimePicker::setHour(int h) { QString hour; hour.sprintf("%.2d",h); - QValueListIterator<ClickableLabel *> it; + QValueListIterator<OClickableLabel *> it; for (it=hourLst.begin(); it!=hourLst.end(); it++) { if ((*it)->text() == hour) (*it)->setOn(true); else (*it)->setOn(false); } tm.setHMS(h,tm.minute(),0); } 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 @@ -1,26 +1,26 @@ #ifndef TIMEPICKER_H #define TIMEPICKER_H #include <qwidget.h> #include <qvaluelist.h> -#include "clickablelabel.h" +#include <opie/oclickablelabel.h> #include <qdatetime.h> class TimePicker: public QWidget { Q_OBJECT public: TimePicker(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); void setHour(int h); void setMinute(int m); private: - QValueList<ClickableLabel *> hourLst; - QValueList<ClickableLabel *> minuteLst; + QValueList<OClickableLabel *> hourLst; + QValueList<OClickableLabel *> minuteLst; QTime tm; private slots: void slotHour(bool b); void slotMinute(bool b); |