summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/summary
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/summary
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/summary')
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp4
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.desktop11
-rw-r--r--kontact/plugins/summary/summaryplugin.desktop16
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp13
4 files changed, 17 insertions, 27 deletions
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index cf8154168..f21a2bb35 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -142,8 +142,10 @@ void KCMKontactSummary::load()
mPluginList = KPluginInfo::fromServices( offers, &config, "Plugins" );
KPluginInfo::List::Iterator it;
+ KConfig *conf = new KConfig("kontactrc");
+ KConfigGroup *cg = new KConfigGroup( conf, "Plugins" );
for ( it = mPluginList.begin(); it != mPluginList.end(); ++it ) {
- (*it)->load();
+ (*it)->load( cg );
if ( !(*it)->isPluginEnabled() )
continue;
diff --git a/kontact/plugins/summary/kcmkontactsummary.desktop b/kontact/plugins/summary/kcmkontactsummary.desktop
index 5442d5c0b..b4100a59f 100644
--- a/kontact/plugins/summary/kcmkontactsummary.desktop
+++ b/kontact/plugins/summary/kcmkontactsummary.desktop
@@ -13,23 +13,17 @@ X-KDE-CfgDlgHierarchy=KontactSummary
Name=Summary View Items
Name[bg]=Обобщение
Name[ca]=Vista resum d'elements
-Name[da]=Elementer i opsummeringsvisning
-Name[de]=Elemente der Zusammenfassungsansicht
+Name[de]=Übersichtseinträge
Name[el]=Αντικείμενα προβολής σύνοψης
-Name[es]=Elementos de la vista de sumario
Name[et]=Kokkuvõttevaate elemendid
Name[it]=Elementi vista sommario
Name[ja]=要約ビューの項目
-Name[km]=ធាតុ​ទិដ្ឋភាព​សង្ខេប
Name[nds]=Översicht-Indrääg
Name[nl]=Overzichtsweergave-items
-Name[pl]=Elementy widoku podsumowania
Name[sr]=Ставке приказа сажетка
Name[sr@Latn]=Stavke prikaza sažetka
Name[sv]=Objekt i översiktsvy
-Name[tr]=Özet Görünüm Ögeleri
Name[zh_CN]=摘要视图项目
-Name[zh_TW]=摘要檢視項目
Comment=General Configuration of Kontact's Summary View
Comment[af]=Algemene opstelling van Kontact se opsomming aansig
Comment[bg]=Настройка на обобщението
@@ -51,7 +45,6 @@ Comment[hu]=A Kontact áttekintő nézetének beállításai
Comment[is]=Almennar stillingar fyrir Kontact yfirlitssýn
Comment[it]=Configurazione generale della vista sommario di Kontact
Comment[ja]=Kontact の要約表示の一般的な設定
-Comment[ka]=Kontact დაიჯესტის ხედის ზოგადი პარამეტრები
Comment[kk]=Тұжырымдаманың жалпы параметрлері
Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ទូទៅ​នៃ​ទិដ្ឋភាព​សង្ខេប​របស់ Kontact
Comment[lt]=Kontact Santraukos vaizdo bendrasis konfigūravimas
@@ -65,7 +58,7 @@ Comment[nn]=Generelt oppsett av samandragsvisinga i Kontact
Comment[pl]=Ogólna konfiguracja widoku podsumowania w Kontact
Comment[pt]=Configuração Geral da Vista Sumária do Kontact
Comment[pt_BR]=Configuração Geral da Visão de Resumo do Kontact
-Comment[ru]=Настройка сводок Kontact
+Comment[ru]=Общие настройки дайджеста Kontact
Comment[sk]=Všeobecné nastavenie súhrnu Kontact
Comment[sl]=Splošne nastavitve za prikaz povzetka v Kontract
Comment[sr]=Опште подешавање Kontact-овог приказа сажетка
diff --git a/kontact/plugins/summary/summaryplugin.desktop b/kontact/plugins/summary/summaryplugin.desktop
index d2aa1c956..79f8119de 100644
--- a/kontact/plugins/summary/summaryplugin.desktop
+++ b/kontact/plugins/summary/summaryplugin.desktop
@@ -15,23 +15,17 @@ Comment=Summary View Component
Comment[bg]=Обобщение
Comment[ca]=Component de vista resum
Comment[da]=Komponent for opsummeringsvisning
-Comment[de]=Zusammenfassungsansicht-Komponente
+Comment[de]=Übersichtskomponente
Comment[el]=Συστατικό προβολής σύνοψης
-Comment[es]=Componente Vista de resumen
Comment[et]=Kokkuvõttevaate plugin
-Comment[fr]=Composant de la vue résumée
-Comment[is]=Eining fyrir yfirlitssýn
Comment[it]=Componente vista sommario
Comment[ja]=要約ビューコンポーネント
-Comment[km]=សមាសភាគ​ទិដ្ឋភាព​សង្ខេប
Comment[nds]=Översicht-Komponent
Comment[nl]=Overzichtsweergaveitem
-Comment[pl]=Składnik widoku podsumowania
-Comment[ru]=Просмотр сводок
+Comment[pl]=Składnik podsumowania
Comment[sr]=Компонента приказа сажетка
Comment[sr@Latn]=Komponenta prikaza sažetka
Comment[sv]=Översiktsvykomponent
-Comment[tr]=Özet Görünüm Bileşeni
Comment[zh_CN]=摘要视图组件
Comment[zh_TW]=摘要檢視組件
Name=Summary
@@ -62,7 +56,6 @@ Name[hu]=Áttekintő
Name[is]=Yfirlit
Name[it]=Sommario
Name[ja]=要約
-Name[ka]=დაიჯესტი
Name[kk]=Тұжырым
Name[km]=សង្ខេប
Name[lt]=Santrauka
@@ -77,7 +70,7 @@ Name[pl]=Podsumowanie
Name[pt]=Resumo
Name[pt_BR]=Resumo
Name[ro]=Sumar
-Name[ru]=Сводки
+Name[ru]=Дайджест
Name[se]=Čoahkkáigeassu
Name[sk]=Súhrn
Name[sl]=Povzetek
@@ -89,8 +82,7 @@ Name[tg]=Дайджест
Name[th]=หน้าสรุป
Name[tr]=Özet
Name[uk]=Зведення
-Name[uz]=Hisobot
-Name[uz@cyrillic]=Ҳисобот
+Name[uz]=Ҳисобот
Name[zh_CN]=概览
Name[zh_TW]=摘要
#Always last
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 9f9073808..555d79544 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -39,8 +39,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL
{
setInstance( SummaryViewFactory::instance() );
- mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, this,
- TQT_SLOT( doSync() ), actionCollection(),
+ mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, 0,
+ 0, actionCollection(),
"kontact_summary_sync" );
connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) );
connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) );
@@ -68,9 +68,12 @@ void SummaryView::fillSyncActionSubEntries()
void SummaryView::syncAccount( const TQString& account )
{
- const TQString acc = account == i18n("All") ? TQString() : account;
- DCOPRef ref( "kmail", "KMailIface" );
- ref.send( "checkAccount", acc );
+ if ( account == i18n("All") ) {
+ doSync();
+ } else {
+ DCOPRef ref( "kmail", "KMailIface" );
+ ref.send( "checkAccount", account );
+ }
fillSyncActionSubEntries();
}