author | harlekin <harlekin> | 2003-12-05 11:20:37 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-05 11:20:37 (UTC) |
commit | 2b37759fc317b5efd9b371210b16117f7d346455 (patch) (unidiff) | |
tree | f99beb5ff1c886f9b41a2d3a34300f8f121cf738 /core/pim/today/plugins | |
parent | 1ef5137234e2b7cd0be2a220a86d848503196269 (diff) | |
download | opie-2b37759fc317b5efd9b371210b16117f7d346455.zip opie-2b37759fc317b5efd9b371210b16117f7d346455.tar.gz opie-2b37759fc317b5efd9b371210b16117f7d346455.tar.bz2 |
today in HEAD up to date
22 files changed, 165 insertions, 56 deletions
diff --git a/core/pim/today/plugins/datebook/.cvsignore b/core/pim/today/plugins/datebook/.cvsignore index 2888d4a..10cf625 100644 --- a/core/pim/today/plugins/datebook/.cvsignore +++ b/core/pim/today/plugins/datebook/.cvsignore | |||
@@ -1,2 +1,3 @@ | |||
1 | Makefile* | 1 | Makefile* |
2 | datebookpluginconfigbase* | ||
2 | moc* | 3 | moc* |
diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in index 621510f..7a14438 100644 --- a/core/pim/today/plugins/datebook/config.in +++ b/core/pim/today/plugins/datebook/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY_DATEBOOK | 1 | config TODAY_DATEBOOK |
2 | boolean "opie-today-datebookplugin (datebook plugin)" | 2 | boolean "datebook" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro index bd45f71..1f75964 100644 --- a/core/pim/today/plugins/datebook/datebook.pro +++ b/core/pim/today/plugins/datebook/datebook.pro | |||
@@ -18,4 +18,23 @@ LIBS+= -lqpe -lopie | |||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 18 | DESTDIR = $(OPIEDIR)/plugins/today |
19 | TARGET = todaydatebookplugin | 19 | TARGET = todaydatebookplugin |
20 | 20 | ||
21 | TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \ | ||
22 | ../../../../../i18n/nl/libtodaydatebookplugin.ts \ | ||
23 | ../../../../../i18n/xx/libtodaydatebookplugin.ts \ | ||
24 | ../../../../../i18n/en/libtodaydatebookplugin.ts \ | ||
25 | ../../../../../i18n/es/libtodaydatebookplugin.ts \ | ||
26 | ../../../../../i18n/fr/libtodaydatebookplugin.ts \ | ||
27 | ../../../../../i18n/hu/libtodaydatebookplugin.ts \ | ||
28 | ../../../../../i18n/ja/libtodaydatebookplugin.ts \ | ||
29 | ../../../../../i18n/ko/libtodaydatebookplugin.ts \ | ||
30 | ../../../../../i18n/no/libtodaydatebookplugin.ts \ | ||
31 | ../../../../../i18n/pl/libtodaydatebookplugin.ts \ | ||
32 | ../../../../../i18n/pt/libtodaydatebookplugin.ts \ | ||
33 | ../../../../../i18n/pt_BR/libtodaydatebookplugin.ts \ | ||
34 | ../../../../../i18n/sl/libtodaydatebookplugin.ts \ | ||
35 | ../../../../../i18n/zh_CN/libtodaydatebookplugin.ts \ | ||
36 | ../../../../../i18n/zh_TW/libtodaydatebookplugin.ts \ | ||
37 | ../../../../../i18n/it/libtodaydatebookplugin.ts \ | ||
38 | ../../../../../i18n/da/libtodaydatebookplugin.ts | ||
39 | |||
21 | include ( $(OPIEDIR)/include.pro ) | 40 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index 3c1e97a..e595047 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookevent.cpp | 2 | * datebookevent.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
@@ -19,6 +19,7 @@ | |||
19 | #include <qpe/timestring.h> | 19 | #include <qpe/timestring.h> |
20 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
21 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
22 | #include <qpe/calendar.h> | ||
22 | 23 | ||
23 | #include <opie/odevice.h> | 24 | #include <opie/odevice.h> |
24 | 25 | ||
@@ -28,6 +29,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
28 | QWidget* parent, | 29 | QWidget* parent, |
29 | bool show_location, | 30 | bool show_location, |
30 | bool show_notes, | 31 | bool show_notes, |
32 | bool timeExtraLine, | ||
31 | int maxCharClip, | 33 | int maxCharClip, |
32 | const char* name, | 34 | const char* name, |
33 | WFlags fl) : | 35 | WFlags fl) : |
@@ -52,17 +54,25 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
52 | msg += "<BR><i>" + (ev).location() + "</i>"; | 54 | msg += "<BR><i>" + (ev).location() + "</i>"; |
53 | } | 55 | } |
54 | 56 | ||
57 | QString timeSpacer = " "; | ||
58 | if ( timeExtraLine ) { | ||
59 | timeSpacer = "<br>"; | ||
60 | } | ||
61 | |||
55 | if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) | 62 | if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) |
56 | && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) { | 63 | && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) { |
57 | msg += "<br>All day"; | 64 | msg += tr ( "All day" ); |
58 | } else { | 65 | } else { |
59 | // start time of event | 66 | // start time of event |
60 | QDate tempDate = (ev).event().start().date(); | 67 | // QDate tempDate = (ev).event().start().date(); |
61 | msg += "<br>" | 68 | msg += timeSpacer; |
62 | + ampmTime( QTime( (ev).event().start().time() ) ) | 69 | msg += ampmTime( QTime( (ev).event().start().time() ) ) |
63 | // end time of event | 70 | // end time of event |
64 | + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ) | 71 | + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ); |
65 | + differDate( tempDate ); | 72 | } |
73 | |||
74 | if ( (ev).date() != QDate::currentDate() ) { | ||
75 | msg += differDate( (ev).date() /* tempDate*/ ); | ||
66 | } | 76 | } |
67 | 77 | ||
68 | // include possible note or not | 78 | // include possible note or not |
@@ -101,18 +111,18 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
101 | } | 111 | } |
102 | 112 | ||
103 | QString DateBookEvent::differDate( QDate date ) { | 113 | QString DateBookEvent::differDate( QDate date ) { |
104 | QDate currentDate = QDate::currentDate(); | 114 | // QDate currentDate = QDate::currentDate(); |
105 | QString returnText = "<font color = #407DD9><b> "; | 115 | QString returnText = "<font color = #407DD9><b> "; |
106 | int differDate = currentDate.daysTo( date ); | 116 | // int differDate = currentDate.daysTo( date ); |
107 | if ( currentDate.dayOfWeek() == date.dayOfWeek() ) { | 117 | // if ( currentDate.dayOfWeek() == date.dayOfWeek() ) { |
108 | returnText += "" ; | 118 | // returnText += "" ; |
109 | // not working right for recurring events | 119 | // // not working right for recurring events |
110 | //} else if ( differDate == 1 ) { | 120 | // //} else if ( differDate == 1 ) { |
111 | //returnText += tr( "tomorrow" ); | 121 | // //returnText += tr( "tomorrow" ); |
112 | } else { | 122 | // } else { |
113 | //returnText += tr( "in %1 days" ).arg( differDate ); | 123 | // returnText += " [ " + Calendar::nameOfDay( date.dayOfWeek() ) + " ] "; |
114 | returnText += " [ " + date.dayName( date.dayOfWeek() ) + " ] "; | 124 | // } |
115 | } | 125 | returnText += " [ " + Calendar::nameOfDay( date.dayOfWeek() ) + " ] "; |
116 | returnText += "</b></font>"; | 126 | returnText += "</b></font>"; |
117 | return returnText; | 127 | return returnText; |
118 | } | 128 | } |
@@ -126,7 +136,7 @@ void DateBookEvent::editEventSlot( const Event &e ) { | |||
126 | if ( ODevice::inst()->system() == System_Zaurus ) { | 136 | if ( ODevice::inst()->system() == System_Zaurus ) { |
127 | QCopEnvelope env( "QPE/Application/datebook", "raise()" ); | 137 | QCopEnvelope env( "QPE/Application/datebook", "raise()" ); |
128 | } else { | 138 | } else { |
129 | QCopEnvelope env( "QPE/Datebook", "editEvent(int)" ); | 139 | QCopEnvelope env( "QPE/Application/datebook", "editEvent(int)" ); |
130 | env << e.uid(); | 140 | env << e.uid(); |
131 | } | 141 | } |
132 | } | 142 | } |
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 8027809..1a090e3 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookplugin.h | 2 | * datebookplugin.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
@@ -30,16 +30,19 @@ public: | |||
30 | QWidget* parent = 0, | 30 | QWidget* parent = 0, |
31 | bool show_location = 0, | 31 | bool show_location = 0, |
32 | bool show_notes = 0, | 32 | bool show_notes = 0, |
33 | bool timeExtraLine = 0, | ||
33 | int maxCharClip = 0, | 34 | int maxCharClip = 0, |
34 | const char* name = 0, | 35 | const char* name = 0, |
35 | WFlags fl = 0 ); | 36 | WFlags fl = 0 ); |
36 | ~DateBookEvent(); | 37 | ~DateBookEvent(); |
38 | |||
37 | signals: | 39 | signals: |
38 | void editEvent( const Event &e ); | 40 | void editEvent( const Event &e ); |
39 | 41 | ||
40 | private slots: | 42 | private slots: |
41 | void editEventSlot( const Event &e ); | 43 | void editEventSlot( const Event &e ); |
42 | void editMe(); | 44 | void editMe(); |
45 | |||
43 | private: | 46 | private: |
44 | 47 | ||
45 | QString ampmTime( QTime ); | 48 | QString ampmTime( QTime ); |
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index 4e650ee..f77e440 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp | |||
@@ -69,3 +69,10 @@ void DatebookPlugin::refresh() { | |||
69 | m_widget->refresh(); | 69 | m_widget->refresh(); |
70 | } | 70 | } |
71 | } | 71 | } |
72 | |||
73 | void DatebookPlugin::reinitialize() { | ||
74 | if ( m_widget ) { | ||
75 | m_widget->reinitialize(); | ||
76 | } | ||
77 | } | ||
78 | |||
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index db899e8..890c59b 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h | |||
@@ -39,6 +39,7 @@ public: | |||
39 | QString appName() const; | 39 | QString appName() const; |
40 | bool excludeFromRefresh() const; | 40 | bool excludeFromRefresh() const; |
41 | void refresh(); | 41 | void refresh(); |
42 | void reinitialize(); | ||
42 | 43 | ||
43 | private: | 44 | private: |
44 | QGuardedPtr<DatebookPluginWidget> m_widget; | 45 | QGuardedPtr<DatebookPluginWidget> m_widget; |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 1970654..9e95bcd 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -30,11 +30,6 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name ) | |||
30 | db = 0l; | 30 | db = 0l; |
31 | m_layoutDates = 0l; | 31 | m_layoutDates = 0l; |
32 | 32 | ||
33 | if ( db ) { | ||
34 | delete db; | ||
35 | } | ||
36 | db = new DateBookDB; | ||
37 | |||
38 | if ( m_layoutDates ) { | 33 | if ( m_layoutDates ) { |
39 | delete m_layoutDates; | 34 | delete m_layoutDates; |
40 | } | 35 | } |
@@ -45,7 +40,6 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name ) | |||
45 | 40 | ||
46 | readConfig(); | 41 | readConfig(); |
47 | getDates(); | 42 | getDates(); |
48 | m_layoutDates->addStretch(5); | ||
49 | } | 43 | } |
50 | 44 | ||
51 | DatebookPluginWidget::~DatebookPluginWidget() { | 45 | DatebookPluginWidget::~DatebookPluginWidget() { |
@@ -62,6 +56,12 @@ void DatebookPluginWidget::readConfig() { | |||
62 | m_show_notes = cfg.readNumEntry( "shownotes", 0 ); | 56 | m_show_notes = cfg.readNumEntry( "shownotes", 0 ); |
63 | m_onlyLater = cfg.readNumEntry( "onlylater", 1 ); | 57 | m_onlyLater = cfg.readNumEntry( "onlylater", 1 ); |
64 | m_moreDays = cfg.readNumEntry( "moredays", 0 ); | 58 | m_moreDays = cfg.readNumEntry( "moredays", 0 ); |
59 | m_timeExtraLine = cfg.readNumEntry( "timeextraline", 1 ); | ||
60 | } | ||
61 | |||
62 | void DatebookPluginWidget::reinitialize() { | ||
63 | readConfig(); | ||
64 | refresh(); | ||
65 | } | 65 | } |
66 | 66 | ||
67 | void DatebookPluginWidget::refresh() { | 67 | void DatebookPluginWidget::refresh() { |
@@ -74,7 +74,6 @@ void DatebookPluginWidget::refresh() { | |||
74 | m_layoutDates->setAutoAdd( true ); | 74 | m_layoutDates->setAutoAdd( true ); |
75 | 75 | ||
76 | getDates(); | 76 | getDates(); |
77 | m_layoutDates->addStretch(5); | ||
78 | } | 77 | } |
79 | 78 | ||
80 | /** | 79 | /** |
@@ -82,6 +81,12 @@ void DatebookPluginWidget::refresh() { | |||
82 | */ | 81 | */ |
83 | void DatebookPluginWidget::getDates() { | 82 | void DatebookPluginWidget::getDates() { |
84 | 83 | ||
84 | |||
85 | if ( db ) { | ||
86 | delete db; | ||
87 | } | ||
88 | db = new DateBookDB; | ||
89 | |||
85 | QDate date = QDate::currentDate(); | 90 | QDate date = QDate::currentDate(); |
86 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); | 91 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); |
87 | qBubbleSort( list ); | 92 | qBubbleSort( list ); |
@@ -94,18 +99,31 @@ void DatebookPluginWidget::getDates() { | |||
94 | if ( count < m_max_lines_meet ) { | 99 | if ( count < m_max_lines_meet ) { |
95 | if ( !m_onlyLater ) { | 100 | if ( !m_onlyLater ) { |
96 | count++; | 101 | count++; |
97 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); | 102 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); |
98 | m_eventsList.append( l ); | ||
99 | l->show(); | ||
100 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | ||
101 | } else if ( QDateTime::currentDateTime() <= (*it).event().end() || (*it).event().start().date() != date ) { | ||
102 | count++; | ||
103 | // show only later appointments | ||
104 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes ); | ||
105 | m_eventsList.append( l ); | 103 | m_eventsList.append( l ); |
106 | l->show(); | 104 | l->show(); |
107 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | 105 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
108 | } | 106 | } else { |
107 | if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) | ||
108 | // Show events which span over many days and are not elapsed. | ||
109 | || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) | ||
110 | // Show repeated event for today that is not elapsed. | ||
111 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | ||
112 | && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) | ||
113 | && ( QTime::currentTime() < (*it).event().start().time() ) ) ) | ||
114 | // Show repeated event for next days. | ||
115 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | ||
116 | && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) | ||
117 | ) | ||
118 | { | ||
119 | count++; | ||
120 | // show only later appointments | ||
121 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); | ||
122 | m_eventsList.append( l ); | ||
123 | l->show(); | ||
124 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | ||
125 | } | ||
126 | } | ||
109 | } | 127 | } |
110 | } | 128 | } |
111 | if ( m_onlyLater && count == 0 ) { | 129 | if ( m_onlyLater && count == 0 ) { |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index 35d43cd..8988073 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h | |||
@@ -34,6 +34,7 @@ public: | |||
34 | DatebookPluginWidget( QWidget *parent, const char *name ); | 34 | DatebookPluginWidget( QWidget *parent, const char *name ); |
35 | ~DatebookPluginWidget(); | 35 | ~DatebookPluginWidget(); |
36 | void refresh(); | 36 | void refresh(); |
37 | void reinitialize(); | ||
37 | 38 | ||
38 | private: | 39 | private: |
39 | DateBookDB* db; | 40 | DateBookDB* db; |
@@ -52,7 +53,8 @@ private: | |||
52 | // should only later appointments be shown or all for the current day. | 53 | // should only later appointments be shown or all for the current day. |
53 | bool m_onlyLater; | 54 | bool m_onlyLater; |
54 | int m_moreDays; | 55 | int m_moreDays; |
55 | 56 | // true if time of an appointment should be an extra line | |
57 | bool m_timeExtraLine; | ||
56 | }; | 58 | }; |
57 | 59 | ||
58 | #endif | 60 | #endif |
diff --git a/core/pim/today/plugins/mail/config.in b/core/pim/today/plugins/mail/config.in index 6f3e06d..6f4450f 100644 --- a/core/pim/today/plugins/mail/config.in +++ b/core/pim/today/plugins/mail/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY_MAIL | 1 | config TODAY_MAIL |
2 | boolean "opie-today-mailplugin (mail plugin)" | 2 | boolean "mail" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro index 60ed87d..70c484d 100644 --- a/core/pim/today/plugins/mail/mail.pro +++ b/core/pim/today/plugins/mail/mail.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | 2 | CONFIG -= moc |
3 | CONFIG += qt plugin release | 3 | CONFIG += qt release |
4 | 4 | ||
5 | # Input | 5 | # Input |
6 | HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h | 6 | HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h |
@@ -16,4 +16,22 @@ LIBS+= -lqpe -lopie | |||
16 | DESTDIR = $(OPIEDIR)/plugins/today | 16 | DESTDIR = $(OPIEDIR)/plugins/today |
17 | TARGET = todaymailplugin | 17 | TARGET = todaymailplugin |
18 | 18 | ||
19 | TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \ | ||
20 | ../../../../../i18n/nl/libtodaymailplugin.ts \ | ||
21 | ../../../../../i18n/xx/libtodaymailplugin.ts \ | ||
22 | ../../../../../i18n/en/libtodaymailplugin.ts \ | ||
23 | ../../../../../i18n/es/libtodaymailplugin.ts \ | ||
24 | ../../../../../i18n/fr/libtodaymailplugin.ts \ | ||
25 | ../../../../../i18n/hu/libtodaymailplugin.ts \ | ||
26 | ../../../../../i18n/ja/libtodaymailplugin.ts \ | ||
27 | ../../../../../i18n/ko/libtodaymailplugin.ts \ | ||
28 | ../../../../../i18n/no/libtodaymailplugin.ts \ | ||
29 | ../../../../../i18n/pl/libtodaymailplugin.ts \ | ||
30 | ../../../../../i18n/pt/libtodaymailplugin.ts \ | ||
31 | ../../../../../i18n/pt_BR/libtodaymailplugin.ts \ | ||
32 | ../../../../../i18n/sl/libtodaymailplugin.ts \ | ||
33 | ../../../../../i18n/zh_CN/libtodaymailplugin.ts \ | ||
34 | ../../../../../i18n/zh_TW/libtodaymailplugin.ts \ | ||
35 | ../../../../../i18n/it/libtodaymailplugin.ts \ | ||
36 | ../../../../../i18n/da/libtodaymailplugin.ts | ||
19 | include ( $(OPIEDIR)/include.pro ) | 37 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp index 9430c30..bf30538 100644 --- a/core/pim/today/plugins/mail/mailplugin.cpp +++ b/core/pim/today/plugins/mail/mailplugin.cpp | |||
@@ -67,3 +67,6 @@ void MailPlugin::refresh() { | |||
67 | m_widget->refresh(); | 67 | m_widget->refresh(); |
68 | } | 68 | } |
69 | } | 69 | } |
70 | |||
71 | void MailPlugin::reinitialize() { | ||
72 | } | ||
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index 295a88c..5b93314 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h | |||
@@ -41,6 +41,7 @@ public: | |||
41 | QString appName() const; | 41 | QString appName() const; |
42 | bool excludeFromRefresh() const; | 42 | bool excludeFromRefresh() const; |
43 | void refresh(); | 43 | void refresh(); |
44 | void reinitialize(); | ||
44 | 45 | ||
45 | private: | 46 | private: |
46 | QGuardedPtr<MailPluginWidget> m_widget; | 47 | QGuardedPtr<MailPluginWidget> m_widget; |
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp index 3c1d908..646996a 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.cpp +++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp | |||
@@ -29,7 +29,7 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) | |||
29 | delete m_mailLabel; | 29 | delete m_mailLabel; |
30 | } | 30 | } |
31 | m_mailLabel = new OClickableLabel( this ); | 31 | m_mailLabel = new OClickableLabel( this ); |
32 | m_mailLabel->setMaximumHeight( 15 ); | 32 | //m_mailLabel->setMaximumHeight( 15 ); |
33 | connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); | 33 | connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); |
34 | 34 | ||
35 | if ( m_layout ) { | 35 | if ( m_layout ) { |
diff --git a/core/pim/today/plugins/mail/opie-today-mailplugin.control b/core/pim/today/plugins/mail/opie-today-mailplugin.control index 1419557..e69de29 100644 --- a/core/pim/today/plugins/mail/opie-today-mailplugin.control +++ b/core/pim/today/plugins/mail/opie-today-mailplugin.control | |||
@@ -1,9 +0,0 @@ | |||
1 | Package: opie-today-mailplugin | ||
2 | Files: plugins/today/libtodaymailplugin.so* | ||
3 | Priority: optional | ||
4 | Section: opie/applications | ||
5 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | ||
6 | Architecture: arm | ||
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: libqte2, opie-today | ||
9 | Description: Mail plugin for today | ||
diff --git a/core/pim/today/plugins/todolist/.cvsignore b/core/pim/today/plugins/todolist/.cvsignore index 2888d4a..b9284b8 100644 --- a/core/pim/today/plugins/todolist/.cvsignore +++ b/core/pim/today/plugins/todolist/.cvsignore | |||
@@ -1,2 +1,3 @@ | |||
1 | Makefile* | 1 | Makefile* |
2 | todopluginconfigbase* | ||
2 | moc* | 3 | moc* |
diff --git a/core/pim/today/plugins/todolist/config.in b/core/pim/today/plugins/todolist/config.in index c862f37..48ba226 100644 --- a/core/pim/today/plugins/todolist/config.in +++ b/core/pim/today/plugins/todolist/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY_TODOLIST | 1 | config TODAY_TODOLIST |
2 | boolean "opie-today-todolistplugin (shows the next todo entries)" | 2 | boolean "todolist" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE |
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro index 0343223..6a63f4e 100644 --- a/core/pim/today/plugins/todolist/todolist.pro +++ b/core/pim/today/plugins/todolist/todolist.pro | |||
@@ -19,4 +19,23 @@ LIBS+= -lqpe -lopie | |||
19 | DESTDIR = $(OPIEDIR)/plugins/today | 19 | DESTDIR = $(OPIEDIR)/plugins/today |
20 | TARGET = todaytodolistplugin | 20 | TARGET = todaytodolistplugin |
21 | 21 | ||
22 | TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \ | ||
23 | ../../../../../i18n/nl/libtodaytodolistplugin.ts \ | ||
24 | ../../../../../i18n/xx/libtodaytodolistplugin.ts \ | ||
25 | ../../../../../i18n/en/libtodaytodolistplugin.ts \ | ||
26 | ../../../../../i18n/es/libtodaytodolistplugin.ts \ | ||
27 | ../../../../../i18n/fr/libtodaytodolistplugin.ts \ | ||
28 | ../../../../../i18n/hu/libtodaytodolistplugin.ts \ | ||
29 | ../../../../../i18n/ja/libtodaytodolistplugin.ts \ | ||
30 | ../../../../../i18n/ko/libtodaytodolistplugin.ts \ | ||
31 | ../../../../../i18n/no/libtodaytodolistplugin.ts \ | ||
32 | ../../../../../i18n/pl/libtodaytodolistplugin.ts \ | ||
33 | ../../../../../i18n/pt/libtodaytodolistplugin.ts \ | ||
34 | ../../../../../i18n/pt_BR/libtodaytodolistplugin.ts \ | ||
35 | ../../../../../i18n/sl/libtodaytodolistplugin.ts \ | ||
36 | ../../../../../i18n/zh_CN/libtodaytodolistplugin.ts \ | ||
37 | ../../../../../i18n/zh_TW/libtodaytodolistplugin.ts \ | ||
38 | ../../../../../i18n/it/libtodaytodolistplugin.ts \ | ||
39 | ../../../../../i18n/da/libtodaytodolistplugin.ts | ||
40 | |||
22 | include ( $(OPIEDIR)/include.pro ) | 41 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index 7eeb8f1..801de9d 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * todoplugin.cpp | 2 | * todoplugin.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
@@ -68,3 +68,9 @@ void TodolistPlugin::refresh() { | |||
68 | m_widget->refresh(); | 68 | m_widget->refresh(); |
69 | } | 69 | } |
70 | } | 70 | } |
71 | |||
72 | void TodolistPlugin::reinitialize() { | ||
73 | if ( m_widget ) { | ||
74 | m_widget->reinitialize(); | ||
75 | } | ||
76 | } | ||
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index d7b51b4..f68162f 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h | |||
@@ -41,6 +41,7 @@ public: | |||
41 | QString appName() const; | 41 | QString appName() const; |
42 | bool excludeFromRefresh() const; | 42 | bool excludeFromRefresh() const; |
43 | void refresh(); | 43 | void refresh(); |
44 | void reinitialize(); | ||
44 | 45 | ||
45 | private: | 46 | private: |
46 | QGuardedPtr<TodolistPluginWidget> m_widget; | 47 | QGuardedPtr<TodolistPluginWidget> m_widget; |
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp index 15081ec..0364f94 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.cpp +++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp | |||
@@ -63,7 +63,14 @@ void TodolistPluginWidget::readConfig() { | |||
63 | m_maxCharClip = cfg.readNumEntry( "maxcharclip", 38 ); | 63 | m_maxCharClip = cfg.readNumEntry( "maxcharclip", 38 ); |
64 | } | 64 | } |
65 | 65 | ||
66 | void TodolistPluginWidget:: refresh() { | 66 | void TodolistPluginWidget:: refresh() { |
67 | todo->reload(); | ||
68 | getTodo(); | ||
69 | } | ||
70 | |||
71 | void TodolistPluginWidget::reinitialize() { | ||
72 | readConfig(); | ||
73 | todo->reload(); | ||
67 | getTodo(); | 74 | getTodo(); |
68 | } | 75 | } |
69 | 76 | ||
@@ -79,7 +86,7 @@ void TodolistPluginWidget::getTodo() { | |||
79 | int ammount = 0; | 86 | int ammount = 0; |
80 | 87 | ||
81 | // get overdue todos first | 88 | // get overdue todos first |
82 | m_list = todo->overDue(); | 89 | m_list = todo->sorted( true, 3, 2, 1); |
83 | 90 | ||
84 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | 91 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { |
85 | if (!(*m_it).isCompleted() && ( ammount < m_maxLinesTask ) ) { | 92 | if (!(*m_it).isCompleted() && ( ammount < m_maxLinesTask ) ) { |
@@ -87,7 +94,7 @@ void TodolistPluginWidget::getTodo() { | |||
87 | if( desc.isEmpty() ) { | 94 | if( desc.isEmpty() ) { |
88 | desc = (*m_it).description(); | 95 | desc = (*m_it).description(); |
89 | } | 96 | } |
90 | tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; | 97 | tmpout += "<font color=#e00000><b>[" + QString("%1").arg((*m_it).priority() ) + "]" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; |
91 | ammount++ ; | 98 | ammount++ ; |
92 | } | 99 | } |
93 | } | 100 | } |
@@ -104,7 +111,7 @@ void TodolistPluginWidget::getTodo() { | |||
104 | if( desc.isEmpty() ) { | 111 | if( desc.isEmpty() ) { |
105 | desc = (*m_it).description(); | 112 | desc = (*m_it).description(); |
106 | } | 113 | } |
107 | tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>"; | 114 | tmpout += "<b> [" + QString("%1").arg((*m_it).priority() ) + "] </b>" + desc.mid( 0, m_maxCharClip ) + "<br>"; |
108 | ammount++; | 115 | ammount++; |
109 | } | 116 | } |
110 | } | 117 | } |
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h index 0db65c4..9cac43d 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.h +++ b/core/pim/today/plugins/todolist/todopluginwidget.h | |||
@@ -32,6 +32,7 @@ public: | |||
32 | ~TodolistPluginWidget(); | 32 | ~TodolistPluginWidget(); |
33 | 33 | ||
34 | void refresh(); | 34 | void refresh(); |
35 | void reinitialize(); | ||
35 | 36 | ||
36 | protected slots: | 37 | protected slots: |
37 | void startTodolist(); | 38 | void startTodolist(); |