summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -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;
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index ba64bda..337206a 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -2,4 +2,4 @@ TEMPLATE = lib
CONFIG += qte warn_on release
-HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h
-SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp
+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
+SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp
TARGET = opie
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,5 +1,5 @@
-#include "clickablelabel.h"
+#include "oclickablelabel.h"
#include <stdio.h>
-ClickableLabel::ClickableLabel(QWidget* parent,
+OClickableLabel::OClickableLabel(QWidget* parent,
const char* name,
@@ -15,3 +15,3 @@ ClickableLabel::ClickableLabel(QWidget* parent,
-void ClickableLabel::setToggleButton(bool t) {
+void OClickableLabel::setToggleButton(bool t) {
isToggle=t;
@@ -19,3 +19,3 @@ void ClickableLabel::setToggleButton(bool t) {
-void ClickableLabel::mousePressEvent( QMouseEvent *e ) {
+void OClickableLabel::mousePressEvent( QMouseEvent *e ) {
if (isToggle && isDown) {
@@ -27,3 +27,3 @@ void ClickableLabel::mousePressEvent( QMouseEvent *e ) {
-void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) {
+void OClickableLabel::mouseReleaseEvent( QMouseEvent *e ) {
if (rect().contains(e->pos()) && isToggle) isDown=!isDown;
@@ -44,3 +44,3 @@ void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) {
-void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) {
+void OClickableLabel::mouseMoveEvent( QMouseEvent *e ) {
if (rect().contains(e->pos())) {
@@ -60,3 +60,3 @@ void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) {
-void ClickableLabel::showState(bool on) {
+void OClickableLabel::showState(bool on) {
if (on) {
@@ -73,3 +73,3 @@ void ClickableLabel::showState(bool on) {
-void ClickableLabel::setInverted(bool on) {
+void OClickableLabel::setInverted(bool on) {
if ( (!textInverted && on) || (textInverted && !on) ) {
@@ -84,3 +84,3 @@ void ClickableLabel::setInverted(bool on) {
-void ClickableLabel::setOn(bool on) {
+void OClickableLabel::setOn(bool on) {
isDown=on;
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
@@ -5,3 +5,3 @@
-class ClickableLabel: public QLabel
+class OClickableLabel: public QLabel
{
@@ -9,3 +9,3 @@ class ClickableLabel: public QLabel
public:
- ClickableLabel(QWidget* parent = 0, const char* name = 0,
+ OClickableLabel(QWidget* parent = 0, const char* name = 0,
WFlags fl = 0);