author | harlekin <harlekin> | 2002-11-27 14:19:09 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-11-27 14:19:09 (UTC) |
commit | 5f0c90d4b6972c1ad22ba20b45cd1d3f88298099 (patch) (unidiff) | |
tree | 0cd24ab2ff259a76e06d7940b9de03a2b067d57a | |
parent | a75b95fd9f89fc80e867c0efb5837178cab56cbb (diff) | |
download | opie-5f0c90d4b6972c1ad22ba20b45cd1d3f88298099.zip opie-5f0c90d4b6972c1ad22ba20b45cd1d3f88298099.tar.gz opie-5f0c90d4b6972c1ad22ba20b45cd1d3f88298099.tar.bz2 |
ability to show next days too added
6 files changed, 46 insertions, 7 deletions
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index 0a0d186..8277529 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -59,5 +59,8 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
59 | // start time of event | 59 | // start time of event |
60 | msg += "<br>" + ampmTime(QTime( (ev).event().start().time() ) ) | 60 | QDate tempDate = (ev).event().start().date(); |
61 | msg += "<br>" | ||
62 | + ampmTime( QTime( (ev).event().start().time() ) ) | ||
61 | // end time of event | 63 | // end time of event |
62 | + "<b> - </b>" + ampmTime(QTime( (ev).event().end().time() ) ); | 64 | + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ) |
65 | + differDate( tempDate ); | ||
63 | } | 66 | } |
@@ -97,2 +100,19 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
97 | 100 | ||
101 | QString DateBookEvent::differDate( QDate date ) { | ||
102 | QDate currentDate = QDate::currentDate(); | ||
103 | QString returnText = "<font color = #407DD9><b> "; | ||
104 | int differDate = currentDate.daysTo( date ); | ||
105 | if ( currentDate.dayOfWeek() == date.dayOfWeek() ) { | ||
106 | returnText += "" ; | ||
107 | // not working right for recurring events | ||
108 | //} else if ( differDate == 1 ) { | ||
109 | //returnText += tr( "tomorrow" ); | ||
110 | } else { | ||
111 | //returnText += tr( "in %1 days" ).arg( differDate ); | ||
112 | returnText += " [ " + date.dayName( date.dayOfWeek() ) + " ] "; | ||
113 | } | ||
114 | returnText += "</b></font>"; | ||
115 | return returnText; | ||
116 | } | ||
117 | |||
98 | 118 | ||
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 7b0371a..f8a9c03 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -43,2 +43,3 @@ private: | |||
43 | QString ampmTime(QTime); | 43 | QString ampmTime(QTime); |
44 | QString differDate( QDate date ); | ||
44 | const EffectiveEvent event; | 45 | const EffectiveEvent event; |
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp index e93c82c..0fc38de 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp | |||
@@ -37,2 +37,4 @@ DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) | |||
37 | 37 | ||
38 | |||
39 | |||
38 | QHBox *box4 = new QHBox( this ); | 40 | QHBox *box4 = new QHBox( this ); |
@@ -46,2 +48,12 @@ DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) | |||
46 | 48 | ||
49 | |||
50 | QHBox *box5 = new QHBox( this ); | ||
51 | QLabel *TextLabelDays = new QLabel( box5 ); | ||
52 | TextLabelDays->setText( tr( "How many more days" ) ); | ||
53 | SpinBox2 = new QSpinBox( box5, "SpinBox2" ); | ||
54 | QWhatsThis::add( SpinBox2 , tr( "How many more days should be in the range" ) ); | ||
55 | SpinBox2->setMaxValue( 7 ); | ||
56 | SpinBox2->setSuffix( tr( " day(s)" ) ); | ||
57 | SpinBox2->setSpecialValueText ( tr("only today") ); | ||
58 | |||
47 | layout->addWidget( box1 ); | 59 | layout->addWidget( box1 ); |
@@ -50,2 +62,3 @@ DatebookPluginConfig::DatebookPluginConfig( QWidget* parent, const char* name) | |||
50 | layout->addWidget( box4 ); | 62 | layout->addWidget( box4 ); |
63 | layout->addWidget( box5 ); | ||
51 | 64 | ||
@@ -66,2 +79,4 @@ void DatebookPluginConfig::readConfig() { | |||
66 | CheckBox3->setChecked( m_only_later ); | 79 | CheckBox3->setChecked( m_only_later ); |
80 | m_more_days = cfg.readNumEntry( "moredays", 0 ); | ||
81 | SpinBox2->setValue( m_more_days ); | ||
67 | } | 82 | } |
@@ -81,2 +96,4 @@ void DatebookPluginConfig::writeConfig() { | |||
81 | cfg.writeEntry( "onlylater", m_only_later ); | 96 | cfg.writeEntry( "onlylater", m_only_later ); |
97 | m_more_days = SpinBox2->value(); | ||
98 | cfg.writeEntry( "moredays", m_more_days ); | ||
82 | cfg.write(); | 99 | cfg.write(); |
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index feba9ee..6c32ae9 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h | |||
@@ -30,2 +30,4 @@ private: | |||
30 | QSpinBox* SpinBox1; | 30 | QSpinBox* SpinBox1; |
31 | QSpinBox* SpinBox2; | ||
32 | |||
31 | 33 | ||
@@ -39,3 +41,3 @@ private: | |||
39 | int m_only_later; | 41 | int m_only_later; |
40 | 42 | int m_more_days; | |
41 | 43 | ||
@@ -44,5 +46,2 @@ private: | |||
44 | 46 | ||
45 | |||
46 | |||
47 | |||
48 | #endif | 47 | #endif |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index a8ce059..c6aa2a6 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -49,2 +49,3 @@ void DatebookPluginWidget::readConfig() { | |||
49 | m_onlyLater = cfg.readNumEntry( "onlylater", 1 ); | 49 | m_onlyLater = cfg.readNumEntry( "onlylater", 1 ); |
50 | m_moreDays = cfg.readNumEntry( "moredays", 0 ); | ||
50 | } | 51 | } |
@@ -70,3 +71,3 @@ void DatebookPluginWidget::getDates() { | |||
70 | 71 | ||
71 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date ); | 72 | QValueList<EffectiveEvent> list = db->getEffectiveEvents( date, date.addDays( m_moreDays ) ); |
72 | 73 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index 1720bb2..3ebbc3d 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h | |||
@@ -48,2 +48,3 @@ private: | |||
48 | bool m_onlyLater; | 48 | bool m_onlyLater; |
49 | int m_moreDays; | ||
49 | 50 | ||