summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/specialdates/sdsummarywidget.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kontact/plugins/specialdates/sdsummarywidget.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kontact/plugins/specialdates/sdsummarywidget.cpp')
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 44c671559..2967e889c 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -127,7 +127,6 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
manager->setStandardResource( defaultResource );
}
mCalendar = KOrg::StdCalendar::self();
- mCalendar->load();
connect( mCalendar, TQT_SIGNAL( calendarChanged() ),
this, TQT_SLOT( updateView() ) );
@@ -220,6 +219,8 @@ void SDSummaryWidget::updateView()
mLabels.clear();
mLabels.setAutoDelete( false );
+ KIconLoader loader( "kdepim" );
+
KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
TQValueList<SDEntry> dates;
TQLabel *label = 0;
@@ -391,9 +392,9 @@ void SDSummaryWidget::updateView()
TQImage icon_img;
TQString icon_name;
KABC::Picture pic;
- switch( (*addrIt).category ) { // TODO: better icons
+ switch( (*addrIt).category ) {
case CategoryBirthday:
- icon_name = "cookie";
+ icon_name = "calendarbirthday";
pic = (*addrIt).addressee.photo();
if ( pic.isIntern() && !pic.data().isNull() ) {
TQImage img = pic.data();
@@ -405,7 +406,7 @@ void SDSummaryWidget::updateView()
}
break;
case CategoryAnniversary:
- icon_name = "kdmconfig";
+ icon_name = "calendaranniversary";
pic = (*addrIt).addressee.photo();
if ( pic.isIntern() && !pic.data().isNull() ) {
TQImage img = pic.data();
@@ -417,7 +418,7 @@ void SDSummaryWidget::updateView()
}
break;
case CategoryHoliday:
- icon_name = "kdmconfig"; break;
+ icon_name = "calendarholiday"; break;
case CategoryOther:
icon_name = "cookie"; break;
}
@@ -438,8 +439,7 @@ void SDSummaryWidget::updateView()
//Muck with the year -- change to the year 'daysTo' days away
int year = currentDate.addDays( (*addrIt).daysTo ).year();
- TQDate sD = TQDate::TQDate( year,
- (*addrIt).date.month(), (*addrIt).date.day() );
+ TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() );
if ( (*addrIt).daysTo == 0 ) {
datestr = i18n( "Today" );