author | drw <drw> | 2005-06-06 19:09:03 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-06 19:09:03 (UTC) |
commit | 9ccde964284da2c2dcc42da5e04f818e45baa148 (patch) (unidiff) | |
tree | aafeed7ef6bcceaf1271a7f3b748b3fd9634c0f6 /core/pim | |
parent | 85a043b065f0b43470bc15dc6594eb520f379505 (diff) | |
download | opie-9ccde964284da2c2dcc42da5e04f818e45baa148.zip opie-9ccde964284da2c2dcc42da5e04f818e45baa148.tar.gz opie-9ccde964284da2c2dcc42da5e04f818e45baa148.tar.bz2 |
Fix to show/not show birthdays and use checkboxes for selection in plugin config dialog (courtesy of hrw)
3 files changed, 6 insertions, 6 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp index 7b6117e..4f1630d 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp | |||
@@ -33,15 +33,15 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent, const char* | |||
33 | QVBoxLayout * layout = new QVBoxLayout( this ); | 33 | QVBoxLayout * layout = new QVBoxLayout( this ); |
34 | layout->setMargin( 5 ); | 34 | layout->setMargin( 5 ); |
35 | 35 | ||
36 | // Buttongroup to enable/disable shown stuff | 36 | // Buttongroup to enable/disable shown stuff |
37 | QVGroupBox* b_group = new QVGroupBox( this, "name" ); | 37 | QVGroupBox* b_group = new QVGroupBox( this, "name" ); |
38 | b_group -> setTitle( tr("Enable/Disable Views") ); | 38 | b_group -> setTitle( tr("Enable/Disable Views") ); |
39 | m_showBirthdayButton = new QRadioButton( b_group ); | 39 | m_showBirthdayButton = new QCheckBox( b_group ); |
40 | m_showBirthdayButton -> setText( tr( "Show &Birthdays" ) ); | 40 | m_showBirthdayButton -> setText( tr( "Show &Birthdays" ) ); |
41 | m_showAnniversaryButton = new QRadioButton( b_group ); | 41 | m_showAnniversaryButton = new QCheckBox( b_group ); |
42 | m_showAnniversaryButton -> setText( tr( "Show &Anniveraries" ) ); | 42 | m_showAnniversaryButton -> setText( tr( "Show &Anniveraries" ) ); |
43 | 43 | ||
44 | QWhatsThis::add( m_showBirthdayButton , tr( "The next birthdays will just be shown, if enabled!" ) ); | 44 | QWhatsThis::add( m_showBirthdayButton , tr( "The next birthdays will just be shown, if enabled!" ) ); |
45 | QWhatsThis::add( m_showAnniversaryButton , tr( "The next anniversaries will just be shown, if enabled !" ) ); | 45 | QWhatsThis::add( m_showAnniversaryButton , tr( "The next anniversaries will just be shown, if enabled !" ) ); |
46 | 46 | ||
47 | // Max lines settings | 47 | // Max lines settings |
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.h b/core/pim/today/plugins/addressbook/addresspluginconfig.h index e065ca2..1284fdc 100644 --- a/core/pim/today/plugins/addressbook/addresspluginconfig.h +++ b/core/pim/today/plugins/addressbook/addresspluginconfig.h | |||
@@ -21,13 +21,13 @@ | |||
21 | 21 | ||
22 | #include <opie2/todayconfigwidget.h> | 22 | #include <opie2/todayconfigwidget.h> |
23 | #include <opie2/ocolorbutton.h> | 23 | #include <opie2/ocolorbutton.h> |
24 | 24 | ||
25 | #include <qwidget.h> | 25 | #include <qwidget.h> |
26 | #include <qspinbox.h> | 26 | #include <qspinbox.h> |
27 | #include <qradiobutton.h> | 27 | #include <qcheckbox.h> |
28 | 28 | ||
29 | class AddressBookPluginConfig : public TodayConfigWidget { | 29 | class AddressBookPluginConfig : public TodayConfigWidget { |
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | 31 | ||
32 | public: | 32 | public: |
33 | 33 | ||
@@ -46,14 +46,14 @@ private: | |||
46 | QSpinBox* SpinBoxClip; | 46 | QSpinBox* SpinBoxClip; |
47 | QSpinBox* SpinDaysClip; | 47 | QSpinBox* SpinDaysClip; |
48 | QSpinBox* SpinUrgentClip; | 48 | QSpinBox* SpinUrgentClip; |
49 | Opie::OColorButton* entryColor; | 49 | Opie::OColorButton* entryColor; |
50 | Opie::OColorButton* headlineColor; | 50 | Opie::OColorButton* headlineColor; |
51 | Opie::OColorButton* urgentColor; | 51 | Opie::OColorButton* urgentColor; |
52 | QRadioButton* m_showBirthdayButton; | 52 | QCheckBox* m_showBirthdayButton; |
53 | QRadioButton* m_showAnniversaryButton; | 53 | QCheckBox* m_showAnniversaryButton; |
54 | 54 | ||
55 | // how many lines should be showed in the AddressBook section | 55 | // how many lines should be showed in the AddressBook section |
56 | int m_max_lines_task; | 56 | int m_max_lines_task; |
57 | // clip the lines after X chars | 57 | // clip the lines after X chars |
58 | int m_maxCharClip; | 58 | int m_maxCharClip; |
59 | // How many days look ahead | 59 | // How many days look ahead |
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp index df7c5e1..5662af2 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp | |||
@@ -99,13 +99,12 @@ void AddressBookPluginWidget::getAddress() { | |||
99 | // Define the query for birthdays and start search.. | 99 | // Define the query for birthdays and start search.. |
100 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); | 100 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); |
101 | int ammount = 0; | 101 | int ammount = 0; |
102 | if ( m_showBirthdays ){ | 102 | if ( m_showBirthdays ){ |
103 | owarn << "Searching from now (" << QDate::currentDate().toString() << ") until " | 103 | owarn << "Searching from now (" << QDate::currentDate().toString() << ") until " |
104 | << lookAheadDate.toString() << " ! " << oendl; | 104 | << lookAheadDate.toString() << " ! " << oendl; |
105 | } | ||
106 | 105 | ||
107 | if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){ | 106 | if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDiff ) ){ |
108 | 107 | ||
109 | 108 | ||
110 | Opie::OPimContact querybirthdays; | 109 | Opie::OPimContact querybirthdays; |
111 | querybirthdays.setBirthday( lookAheadDate ); | 110 | querybirthdays.setBirthday( lookAheadDate ); |
@@ -151,12 +150,13 @@ void AddressBookPluginWidget::getAddress() { | |||
151 | output = "<font color=" + m_headlineColor + ">" | 150 | output = "<font color=" + m_headlineColor + ">" |
152 | + QObject::tr( "No birthdays in <b> %1 </b> days!" ) | 151 | + QObject::tr( "No birthdays in <b> %1 </b> days!" ) |
153 | .arg( m_daysLookAhead ) | 152 | .arg( m_daysLookAhead ) |
154 | + "</font> <br>"; | 153 | + "</font> <br>"; |
155 | } | 154 | } |
156 | } | 155 | } |
156 | } | ||
157 | 157 | ||
158 | if ( m_showAnniversaries ){ | 158 | if ( m_showAnniversaries ){ |
159 | // Define the query for anniversaries and start search.. | 159 | // Define the query for anniversaries and start search.. |
160 | Opie::OPimContact queryanniversaries; | 160 | Opie::OPimContact queryanniversaries; |
161 | queryanniversaries.setAnniversary( lookAheadDate ); | 161 | queryanniversaries.setAnniversary( lookAheadDate ); |
162 | 162 | ||