summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/specialdates
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
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')
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.desktop9
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp14
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.h2
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp2
-rw-r--r--kontact/plugins/specialdates/specialdatesplugin.desktop13
5 files changed, 12 insertions, 28 deletions
diff --git a/kontact/plugins/specialdates/kcmsdsummary.desktop b/kontact/plugins/specialdates/kcmsdsummary.desktop
index f294c3835..6835ce8fd 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.desktop
+++ b/kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -16,22 +16,15 @@ Name[ca]=Resum de dates especials
Name[da]=Oversigt over særlige datoer
Name[de]=Übersicht über besondere Termine
Name[el]=Επισκόπηση σημαντικών ημερομηνιών
-Name[es]=Resumen de fechas especiales
Name[et]=Tähtpäevade ülevaade
-Name[fr]=Aperçu des dates importantes
-Name[is]=Yfirlit sérstakra daga
Name[it]=Panoramica delle date speciali
Name[ja]=特別な日の要約
-Name[km]=ទិដ្ឋភាព​កាលបរិច្ឆេទ​ពិសេស
Name[nds]=Översicht besünner Daten
Name[nl]=Overzicht van speciale data
Name[pl]=Daty specjalne
-Name[pt_BR]=Resumo de Datas Especiais
-Name[ru]=Сводка особых дат
Name[sr]=Преглед посебних датума
Name[sr@Latn]=Pregled posebnih datuma
Name[sv]=Översikt av speciella datum
-Name[tr]=Özel Tarihlere Genel Bakış
Name[zh_CN]=特殊日期概览
Name[zh_TW]=特殊日期概觀
Comment=Special Dates Summary Setup
@@ -55,7 +48,6 @@ Comment[hu]=A fontos dátumok áttekintőjének beállításai
Comment[is]=Yfirlitsuppsetning sérstakra daga
Comment[it]=Impostazioni per le date speciali
Comment[ja]=特別な日の要約設定
-Comment[ka]=განსაკუთრებულ თარიღთა დაიჯესტის კონფიგურაცია
Comment[kk]=Ерекше күндер тұжырымының баптауы
Comment[km]=រៀបចំ​សេចក្ដី​សង្ខេប​ថ្ងៃ​ពិសេស
Comment[lt]=Ypatingų datų santraukos sąranka
@@ -102,7 +94,6 @@ Keywords[hu]=születésnap,évforduló,szabadság,konfigurálás,beállítások
Keywords[is]=afmæli, frídagar, stillingar, stilla
Keywords[it]=compleanno, anniversario, vacanze, configura, impostazioni
Keywords[ja]=誕生日,記念日,休日,設定,設定
-Keywords[ka]=დაბადების დღე,სახელობის დღე,დასვენების დღე,კონფიგურაცია,პარამეტრები
Keywords[km]=ថ្ងៃ​ខួប​កំណើត,បុណ្យ​ខួប,វិស្សមកាល,កំណត់​រចនាសម្ព័ន្ធ,ការ​កំណត់
Keywords[lt]=birthday, anniversary, holiday, configure, settings, konfigūruoti, nustatymai, gimtadieniai, išeiginės,sukaktys
Keywords[mk]=birthday, anniversary, holiday, configure, settings, роденден, годишнина, конфигурирање, конфигурација, поставувања
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" );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index 6ef29eff3..5c52c77cf 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.h
@@ -78,7 +78,7 @@ class SDSummaryWidget : public Kontact::Summary
bool mShowHolidays;
bool mShowSpecialsFromCal;
- KHolidays::KHolidays *mHolidays;
+ KHolidays *mHolidays;
};
#endif
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 9f78de3f6..c8a816c2f 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -24,6 +24,7 @@
#include <kaboutdata.h>
#include <kgenericfactory.h>
+#include <kiconloader.h>
#include <klocale.h>
#include <kparts/componentfactory.h>
@@ -41,6 +42,7 @@ SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, c
mAboutData( 0 )
{
setInstance( SpecialdatesPluginFactory::instance() );
+ instance()->iconLoader()->addAppDir( "kdepim" );
}
SpecialdatesPlugin::~SpecialdatesPlugin()
diff --git a/kontact/plugins/specialdates/specialdatesplugin.desktop b/kontact/plugins/specialdates/specialdatesplugin.desktop
index bceb13ada..cb6a691c0 100644
--- a/kontact/plugins/specialdates/specialdatesplugin.desktop
+++ b/kontact/plugins/specialdates/specialdatesplugin.desktop
@@ -29,7 +29,7 @@ Name[et]=Tähtpäevad
Name[eu]=Data bereziak
Name[fa]=تاریخهای ویژه
Name[fi]=Erikoispäivät
-Name[fr]=Dates importantes
+Name[fr]=Dates particulières
Name[fy]=Spesjale datums
Name[ga]=Dátaí Speisialta
Name[gl]=Datas Especiais
@@ -38,7 +38,6 @@ Name[hu]=Fontos dátumok
Name[is]=Sérstakir dagar
Name[it]=Date speciali
Name[ja]=特別な日
-Name[ka]=განსაკუტრებული თარიღები
Name[kk]=Ерекше күндер
Name[km]=ថ្ងៃ​ពិសេស
Name[lt]=Ypatingos datos
@@ -62,8 +61,7 @@ Name[ta]=விசேஷ தேதிகள்
Name[th]=วันพิเศษ
Name[tr]=Özel Tarihler
Name[uk]=Особливі дати
-Name[uz]=Maxsus kunlar
-Name[uz@cyrillic]=Махсус кунлар
+Name[uz]=Махсус кунлар
Name[zh_CN]=特殊日期
Name[zh_TW]=特殊日期
Comment=Special Dates Component
@@ -72,21 +70,14 @@ Comment[ca]=Component de dates especials
Comment[da]=Komponent til særlige datoer
Comment[de]=Komponente für Übersicht über besondere Termine
Comment[el]=Συστατικό σημαντικών ημερομηνιών
-Comment[es]=Componente de fechas especiales
Comment[et]=Tähtpäevade plugin
-Comment[fr]=Composant des dates importantes
-Comment[is]=Eining fyrir sérstaka daga
Comment[it]=Componente per le date speciali
Comment[ja]=特別な日コンポーネント
-Comment[km]=សមាសភាគ​កាលបរិច្ឆេទ​ពិសេស
Comment[nds]=Komponent för besünner Daten
Comment[nl]=Component voor overzicht van speciale data
Comment[pl]=Składnik dat specjalnych
-Comment[pt_BR]=Componente de Datas Especiais
-Comment[ru]=Особые даты
Comment[sr]=Компонента посебних датума
Comment[sr@Latn]=Komponenta posebnih datuma
Comment[sv]=Speciella datumkomponent
-Comment[tr]=Özel Tarihler Bileşeni
Comment[zh_CN]=特殊日期组件
Comment[zh_TW]=特殊日期組件