diff options
Diffstat (limited to 'kontact')
52 files changed, 393 insertions, 494 deletions
diff --git a/kontact/interfaces/kontactplugin.desktop b/kontact/interfaces/kontactplugin.desktop index 28803bc6d..11787765a 100644 --- a/kontact/interfaces/kontactplugin.desktop +++ b/kontact/interfaces/kontactplugin.desktop @@ -28,7 +28,6 @@ Name[hu]=Kontact-bővítőmodul Name[is]=Kontact íforrit Name[it]=Plugin Kontact Name[ja]=Kontact プラグイン -Name[ka]=Kontact მოდული Name[kk]=Kontact модулі Name[km]=កម្មវិធីជំនួយ Kontact Name[lt]=Kontact priedas @@ -52,8 +51,7 @@ Name[ta]=சொருகுப்பொருளை தொடர்புக் Name[tg]=Модули Kontact Name[tr]=Kontact Eklentisi Name[uk]=Втулок Kontact -Name[uz]=Kontact uchun plagin -Name[uz@cyrillic]=Kontact учун плагин +Name[uz]=Kontact учун плагин Name[zh_CN]=Kontact 插件 Name[zh_TW]=Kontack 外掛程式 diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index e94c0315e..13f14c580 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -125,7 +125,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient virtual bool createDCOPInterface( const TQString& /*serviceType*/ ) { return false; } /** - Reimplement this method and return wether a standalone application is still running + Reimplement this method and return whether a standalone application is still running This is only required if your part is also available as standalone application. */ virtual bool isRunningStandalone() { return false; } @@ -174,7 +174,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; } /** - Returns wether the plugin provides a part that should be shown in the sidebar. + Returns whether the plugin provides a part that should be shown in the sidebar. */ virtual bool showInSideBar() const; diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 34de01807..5dd9e72d0 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -188,6 +188,8 @@ static KCmdLineOptions options[] = { "module <module>", I18N_NOOP( "Start with a specific Kontact module" ), 0 }, { "iconify", I18N_NOOP( "Start in iconified (minimized) mode" ), 0 }, { "list", I18N_NOOP( "List all possible modules and exit" ), 0 }, + { "listprofiles", I18N_NOOP( "List all possible profiles and exit" ), 0 }, + { "profile <profile>", I18N_NOOP( "Start with a specific Kontact profile" ), 0 }, KCmdLineLastOption }; diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h index 428084646..6689a5a30 100644 --- a/kontact/plugins/akregator/akregator_plugin.h +++ b/kontact/plugins/akregator/akregator_plugin.h @@ -57,7 +57,7 @@ class Plugin : public Kontact::Plugin const TQStringList & ); ~Plugin(); - int weight() const { return 700; } + int weight() const { return 475; } AkregatorPartIface_stub *interface(); diff --git a/kontact/plugins/akregator/akregatorplugin.desktop b/kontact/plugins/akregator/akregatorplugin.desktop index 015ae80a1..6b44fbc4a 100644 --- a/kontact/plugins/akregator/akregatorplugin.desktop +++ b/kontact/plugins/akregator/akregatorplugin.desktop @@ -17,24 +17,17 @@ Comment=Feed Reader Component (Akregator Plugin) Comment[bg]=Приставка за Akregator Comment[ca]=Component lector d'enllaços (endollable de l'Akregator) Comment[da]=Feed-læserkomponent (Akregator-plugin) -Comment[de]=News-Leser (Akregator-Modul) +Comment[de]=Feedreader Komponente Comment[el]=Συστατικό ανάγνωσης ροών (Πρόσθετο του Akregator) -Comment[es]=Componente de lectura de fuentes (complemento de Akregator) Comment[et]=Uudistevoogude plugin (Akregator) -Comment[fr]=Composant du lecteur de flux (Module pour Akregator) -Comment[is]=Fréttastraumalestur (Akregator íforrit) Comment[it]=Componente lettore fonti (plugin Akregator) Comment[ja]=フィードリーダーコンポーネント (Akregator プラグイン) -Comment[km]=មមាសភាគកម្មវិធីអានមតិព័ត៌មាន (កម្មវិធីជំនួយ Akregator) Comment[nds]=Stroomleser-Komponent (Akregator-Moduul) Comment[nl]=Component om feeds te lezen (Akregator-plugin) -Comment[pl]=Składnik do czytania kanałów RSS (wtyczka Akregator) -Comment[ru]=Просмотр лент новостей (модуль Akregator) -Comment[sk]=Komponent na čítanie kanálov (Modul pre Akregator) +Comment[pl]=Składnik do czytania niusów (wtyczka Akregator) Comment[sr]=Компонента читања довода (прикључак Akregator-а) Comment[sr@Latn]=Komponenta čitanja dovoda (priključak Akregator-a) Comment[sv]=Komponent för läsning av kanaler (Akregator-insticksprogram) -Comment[tr]=Kaynak Okuyucu Bileşeni (Akregator Eklentisi) Comment[zh_CN]=新闻源阅读器组件(Akregator 插件) Comment[zh_TW]=Feed 閱讀器組件（Akregator 外掛程式） Name=Feeds @@ -43,7 +36,7 @@ Name[bg]=Новини Name[ca]=Enllaços Name[cs]=Kanály Name[da]=Kilder -Name[de]=Nachrichten +Name[de]=Feeds Name[el]=Ροές Name[eo]=Fluoj Name[es]=Orígenes @@ -60,7 +53,6 @@ Name[hu]=Hírforrások Name[is]=Fréttastraumar Name[it]=Fonti Name[ja]=フィード -Name[ka]=კვება Name[kk]=Ақпарлар Name[km]=មតិព័ត៌មាន Name[lt]=Kanalai @@ -73,7 +65,7 @@ Name[pl]=Kanały Name[pt]=Fontes Name[pt_BR]=Fontes de Notícias Name[ru]=Ленты новостей -Name[sk]=Kanály +Name[sk]=Kŕmitka Name[sl]=Viri Name[sr]=Доводи Name[sr@Latn]=Dovodi @@ -81,7 +73,6 @@ Name[sv]=Kanaler Name[ta]=உள்ளீடுகள் Name[tr]=Haberler Name[uk]=Подачі -Name[uz]=Yangiliklar tasmalari -Name[uz@cyrillic]=Янгиликлар тасмалари +Name[uz]=Янгиликлар тасмалари Name[zh_CN]=种子 diff --git a/kontact/plugins/akregator/akregatorplugin3.2.desktop b/kontact/plugins/akregator/akregatorplugin3.2.desktop index 7bd29ffbc..81f9f074b 100644 --- a/kontact/plugins/akregator/akregatorplugin3.2.desktop +++ b/kontact/plugins/akregator/akregatorplugin3.2.desktop @@ -35,7 +35,6 @@ Comment[hu]=Akregator bővítőmodul Comment[is]=Akregator íforrit Comment[it]=Plugin aKregator Comment[ja]=Akregator プラグイン -Comment[ka]=Akregator-ის მოდული Comment[kk]=Akregator модулі Comment[km]=កម្មវិធីជំនួយ Akregator Comment[lt]=Akregator priedas @@ -58,8 +57,7 @@ Comment[sv]=Akregator-insticksprogram Comment[ta]=Akregator சொருகுப்பொருள் Comment[tr]=Akregator Eklentisi Comment[uk]=Втулок Akregator -Comment[uz]=Akregator plagini -Comment[uz@cyrillic]=Akregator плагини +Comment[uz]=Akregator плагини Comment[zh_CN]=Akregator 插件 Comment[zh_TW]=Akregator 外掛程式 Name=Feeds @@ -85,7 +83,6 @@ Name[hu]=Hírforrások Name[is]=Fréttastraumar Name[it]=Fonti Name[ja]=フィード -Name[ka]=კვება Name[kk]=Ақпарлар Name[km]=មតិព័ត៌មាន Name[lt]=Kanalai @@ -98,7 +95,7 @@ Name[pl]=Kanały Name[pt]=Fontes Name[pt_BR]=Fontes de Notícias Name[ru]=Ленты новостей -Name[sk]=Kanály +Name[sk]=Kŕmitka Name[sl]=Viri Name[sr]=Доводи Name[sr@Latn]=Dovodi @@ -106,7 +103,6 @@ Name[sv]=Kanaler Name[ta]=உள்ளீடுகள் Name[tr]=Haberler Name[uk]=Подачі -Name[uz]=Yangiliklar tasmalari -Name[uz@cyrillic]=Янгиликлар тасмалари +Name[uz]=Янгиликлар тасмалари Name[zh_CN]=种子 diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index e3128cdfb..d0493f1d0 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -145,8 +145,7 @@ bool KAddressbookPlugin::isRunningStandalone() bool KAddressbookPlugin::canDecodeDrag( TQMimeSource *mimeSource ) { - return TQTextDrag::canDecode( mimeSource ) || - KPIM::MailListDrag::canDecode( mimeSource ); + return KPIM::MailListDrag::canDecode( mimeSource ); } #include <dcopref.h> diff --git a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop index f5208ea52..29e5cb23f 100644 --- a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop +++ b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop @@ -19,23 +19,17 @@ Comment=Contacts Component (KAdressbook Plugin) Comment[bg]=Приставка за адресника Comment[ca]=Component de contactes (endollable del KAdressbook) Comment[da]=Kontaktkomponent (KAddressbook-plugin) -Comment[de]=Kontakte-Komponente (Adressbuch-Modul) +Comment[de]=Adressbuch-Komponente (KAddressbook-Modul) Comment[el]=Συστατικό επαφών (Πρόσθετο του KAdressbook) -Comment[es]=Componente de contactos (complemento de KAddressbook) Comment[et]=Kontaktide plugin (KDE aadressiraamat) -Comment[fr]=Composant des contacts (module externe KAdressBook) -Comment[is]=Vistfangaskráreining (KAddressBook íforrit) Comment[it]=Componente contatti (plugin KAddressbook) Comment[ja]=アドレス帳コンポーネント (KAddressbook プラグイン) -Comment[km]=សមាសភាគទំនាក់ទំនង (កម្មវិធីជំនួយ KAdressbook) Comment[nds]=Kontakten-Komponent (KAddressbook-Moduul) Comment[nl]=Adresboekcomponent (KAddressbook-plugin) Comment[pl]=Składnik wizytówek (wtyczka KAddressBook) -Comment[ru]=Контакты (модуль KAddressBook) Comment[sr]=Компонента контаката (прикључак KAddressBook-а) Comment[sr@Latn]=Komponenta kontakata (priključak KAddressBook-a) Comment[sv]=Kontaktkomponent (adressboksinsticksprogram) -Comment[tr]=Kişiler Bileşeni (KAdresDefteri Eklentisi) Comment[zh_CN]=联系人组件(KAddressbook 插件) Comment[zh_TW]=聯絡人組件（KAddressBook 外掛程式） Name=Contacts @@ -66,7 +60,6 @@ Name[hu]=Névjegyek Name[is]=Tengiliðir Name[it]=Contatti Name[ja]=コンタクト -Name[ka]=კონტაქტები Name[kk]=Контакттар Name[km]=ទំនាក់ទំនង Name[lt]=Kontaktai @@ -92,9 +85,8 @@ Name[sv]=Kontakter Name[ta]=தொடர்புகள் Name[tg]=Алоқот Name[th]=ที่อยู่ติดต่อ -Name[tr]=Kişiler +Name[tr]=Bağlantılar Name[uk]=Контакти -Name[uz]=Aloqalar -Name[uz@cyrillic]=Алоқалар +Name[uz]=Алоқалар Name[zh_CN]=联系人 Name[zh_TW]=聯絡人 diff --git a/kontact/plugins/karm/karmplugin.desktop b/kontact/plugins/karm/karmplugin.desktop index 469989fe6..c6b39dfc3 100644 --- a/kontact/plugins/karm/karmplugin.desktop +++ b/kontact/plugins/karm/karmplugin.desktop @@ -16,23 +16,17 @@ Comment=Time Tracker Component (KArm Plugin) Comment[bg]=Приставка за KArm Comment[ca]=Component de seguiment dels temps (endollable del KArm) Comment[da]=Time Tracker-komponent (KArm-plugin) -Comment[de]=Zeitplaner-Komponente (KArm-Modul) +Comment[de]=Zeiterfassungskomponente (KArm-Modul) Comment[el]=Συστατικό γραμμής χρόνου (Πρόσθετο του KArm) -Comment[es]=Componente de seguimiento de tiempos (complemento de KArm) Comment[et]=Ajaarvestaja plugin (KArm) -Comment[fr]=Composant de suivi temporel (Module pour KArm) -Comment[is]=Tímastjórnunareining (KArm íforrit) Comment[it]=Componente segna-tempo (plugin Karm) Comment[ja]=タイムトラッカーコンポーネント (KArm プラグイン) -Comment[km]=សមាសភាគកម្មវិធីតាមដានពេលវេលា (កម្មវិធីជំនួយ KArm) Comment[nds]=Tietlogbook-Komponent (KArm-Moduul) Comment[nl]=Tijdsregistratiecomponent (KArm-plugin) Comment[pl]=Składnik śledzenia czasu (wtyczka KArm) -Comment[ru]=Отслеживание времени (модуль KArm) Comment[sr]=Компонента праћења времена (прикључак KArm-а) Comment[sr@Latn]=Komponenta praćenja vremena (priključak KArm-a) Comment[sv]=Komponent för tidmätning (Karm-insticksprogram) -Comment[tr]=Zaman İzleyici Bileşeni (KArm Eklentisi) Comment[zh_CN]=时间追踪组件(KArm 插件) Comment[zh_TW]=時間追蹤器組件（KArm 外掛程式） @@ -41,17 +35,11 @@ Name[bg]=Таймер Name[ca]=Cronòmetre Name[de]=Stoppuhr Name[el]=Χρονόμετρο -Name[es]=Temporizador Name[et]=Ajaarvestaja -Name[fr]=Minuteur -Name[is]=Tímamælir Name[ja]=タイマー -Name[km]=កម្មវិធីកំណត់ពេលវេលា Name[nds]=Tietgever Name[nl]=Tijdklok Name[pl]=Stoper -Name[ru]=Таймер -Name[sk]=Časovač Name[sr]=Тајмер Name[sr@Latn]=Tajmer Name[sv]=Tidmätning diff --git a/kontact/plugins/kitchensync/kitchensync.desktop b/kontact/plugins/kitchensync/kitchensync.desktop index 0b1ac5078..8b8fd76b3 100644 --- a/kontact/plugins/kitchensync/kitchensync.desktop +++ b/kontact/plugins/kitchensync/kitchensync.desktop @@ -16,25 +16,17 @@ Comment=Synchronization Component (Kitchensynk Plugin) Comment[bg]=Приставка за синхронизация Comment[ca]=Component de sincronització (endollable del KitchenSync) Comment[da]=Synkronisergingskomponent (Kitchensync-plugin) -Comment[de]=Abgleich-Komponente (KitchenSync-Modul) +Comment[de]=Synchronisationskomponente (KitchenSync-Modul) Comment[el]=Συστατικό συγχρονισμού (Πρόσθετο του Kitchensynk) -Comment[en_GB]=Synchronisation Component (Kitchensynk Plugin) -Comment[es]=Componente de sincronización (complemento de KitchenSync) Comment[et]=Sünkroniseerimise plugin (KitchenSync) -Comment[fr]=Composant de synchronisation (Module KitchenSync) -Comment[is]=Samstillingareining (KitchenSync íforrit) Comment[it]=Componente di sincronizzazione (plugin KitchenSync) Comment[ja]=同期コンポーネント (KitchenSync プラグイン) -Comment[km]=ការធ្វើសមកាលកម្មសមាសភាគ (កម្មវិធីជំនួយ Kitchensynk) Comment[nds]=Synkroniseer-Komponent (Kitchensynk-Moduul) Comment[nl]=Synchronisatiecomponent (Kitchensynk-plugin) Comment[pl]=Składnik synchronizacji (wtyczka KitchenSync) -Comment[ru]=Синхронизация (модуль KitchenSync) -Comment[sk]=Synchronizačný komponent (Modul pre Kitchensynk) Comment[sr]=Компонента синхронизације (прикључак KitchenSync-а) Comment[sr@Latn]=Komponenta sinhronizacije (priključak KitchenSync-a) Comment[sv]=Synkroniseringskomponent (Kitchensynk-insticksprogram) -Comment[tr]=Eşzamanlama Eklentisi (Kitchensynk Eklentisi) Comment[zh_CN]=同步组件(KitchenSync 插件) Comment[zh_TW]=同步組件（KitchenSynk 外掛程式） Name=Sync @@ -42,11 +34,8 @@ Name[bg]=Синхронизация Name[de]=Abgleich Name[el]=Συγχρονισμός Name[et]=Sünkroniseerimine -Name[fr]=Synchroniser -Name[is]=Samstilling Name[ja]=同期 Name[nds]=Synkroniseren Name[pl]=Synchronizacja -Name[ru]=Синхронизация Name[sv]=Synkronisering Name[zh_TW]=同步 diff --git a/kontact/plugins/kmail/Makefile.am b/kontact/plugins/kmail/Makefile.am index d176693a3..f390aff4e 100644 --- a/kontact/plugins/kmail/Makefile.am +++ b/kontact/plugins/kmail/Makefile.am @@ -1,5 +1,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_builddir)/kmail \ -I$(top_srcdir)/libkdepim \ + -I$(top_srcdir)/libkdenetwork \ + -I$(top_srcdir)/certmanager/lib \ -I$(top_srcdir) $(all_includes) kde_module_LTLIBRARIES = libkontact_kmailplugin.la kcm_kmailsummary.la diff --git a/kontact/plugins/kmail/kcmkmailsummary.desktop b/kontact/plugins/kmail/kcmkmailsummary.desktop index 2b8c7d99e..d616429e7 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.desktop +++ b/kontact/plugins/kmail/kcmkmailsummary.desktop @@ -16,22 +16,15 @@ Name[ca]=Resum de correu Name[da]=Oversigt over e-mail Name[de]=E-Mail-Übersicht Name[el]=Επισκόπηση αλληλογραφίας -Name[es]=Resumen de correo electrónico Name[et]=E-posti ülevaade -Name[fr]=Aperçu du courriel -Name[is]=Yfirsýn á tölvupóst Name[it]=Panoramica posta elettronica Name[ja]=メールの要約 -Name[km]=ទិដ្ឋភាពទូទៅរបស់អ៊ីមែល Name[nds]=Nettpost-Översicht Name[nl]=E-mailoverzicht Name[pl]=Poczta -Name[ru]=Сведения о почте -Name[sk]=Prehľad pošty Name[sr]=Преглед е-поште Name[sr@Latn]=Pregled e-pošte Name[sv]=E-postöversikt -Name[tr]=E-Postalara Genel Bakış Name[zh_CN]=邮件概览 Name[zh_TW]=郵件概要 Comment=E-Mail Summary Setup @@ -40,22 +33,15 @@ Comment[ca]=Configuració del resum de correu Comment[da]=Opsætning af post-opsummering Comment[de]=Einstellungen für E-Mail-Übersicht Comment[el]=Ρύθμιση σύνοψης αλληλογραφίας -Comment[es]=Configuración del resumen de correo electrónico Comment[et]=E-posti kokkuvõtte seadistus -Comment[fr]=Configuration du résumé des courriels -Comment[is]=Uppsetning póstyfirlits Comment[it]=Impostazioni sommario posta elettronica Comment[ja]=メール要約の設定 -Comment[km]=រៀបចំសេចក្ដីសង្ខេបអ៊ីមែល Comment[nds]=Instellen för Nettpost-Översicht Comment[nl]=Instellingen voor e-mailoverzicht Comment[pl]=Ustawienia podsumowania e-maili -Comment[ru]=Настройка сводки почты -Comment[sk]=Nastavenie súhrnu pošty Comment[sr]=Подешавање сажетка е-поште Comment[sr@Latn]=Podešavanje sažetka e-pošte Comment[sv]=Inställning av e-postöversikt -Comment[tr]=E-Posta Özet Yapılandırması Comment[zh_CN]=邮件摘要设置 Comment[zh_TW]=郵件摘要設定 Keywords=email, summary, configure, settings @@ -72,7 +58,7 @@ Keywords[et]=e-post, meil, seadistamine, seadistused Keywords[eu]=eposta, laburpena, konfiguratu, ezarpenak Keywords[fa]=email، خلاصه، پیکربندی، تنظیمات Keywords[fi]=sähköposti, yhteenveto, asetukset -Keywords[fr]=message,messagerie,courriel,résumé,vue,configurer,paramètres,paramètre +Keywords[fr]=message,messagerie,courrier,résumé,vue,configurer,paramètres,paramètre Keywords[fy]=email,e-mail,e-post,oersicht,gearfetting,ynstellings, konfiguraasje Keywords[ga]=ríomhphost, achoimre, cumraigh, socruithe Keywords[gl]=email, resumo, configurar, opcións @@ -81,7 +67,6 @@ Keywords[hu]=e-mail,áttekintés,konfigurálás,beállítások Keywords[is]=tölvupóstur, yfirlit, stillingar, stilla Keywords[it]=posta elettronica, email, sommario, configura, impostazioni Keywords[ja]=メール,要約,設定,設定 -Keywords[ka]=ელფოსტა,დაიჯესტი,კონფიგურაცია,პარამეტრები Keywords[km]=អ៊ីមែល,សង្ខេប,កំណត់រចនាសម្ព័ន្ធ,ការកំណត់ Keywords[lt]=email, summary, configure, settings, e. paštas, santrauka, konfigūruoti, nustatymai Keywords[mk]=email, summary, configure, settings, е-пошта, преглед, конфигурација, поставувања @@ -91,10 +76,10 @@ Keywords[nds]=Nettpost,Nettbreef,Översicht,instellen Keywords[ne]=इमेल, सारांश, कन्फिगर, सेटिङ Keywords[nl]=email,e-mail,overzicht,samenvatting,instellingen,configuratie Keywords[nn]=e-post,samandrag,oppsett,innstillingar -Keywords[pl]=e-mail,list,podsumowanie,konfiguracja,ustawienia +Keywords[pl]=email,list,podsumowanie,konfiguracja,ustawienia Keywords[pt]=e-mail, sumário, configurar, configuração Keywords[pt_BR]=e-mail, resumo, configurar, configurações -Keywords[ru]=email,summary,configure,settings,настройки,сводка,почта +Keywords[ru]=email,summary,configure,settings,настройки,дайджест,почта Keywords[sk]=email,súhrn,nastavenie Keywords[sl]=e-pošta,pošta,povzetek,nastavi,nastavitve Keywords[sr]=емаил, сажетак, подеси, поставке diff --git a/kontact/plugins/kmail/kmailplugin.desktop b/kontact/plugins/kmail/kmailplugin.desktop index 55ba5e97b..7758a8e2a 100644 --- a/kontact/plugins/kmail/kmailplugin.desktop +++ b/kontact/plugins/kmail/kmailplugin.desktop @@ -22,46 +22,31 @@ Comment[ca]=Component de correu (endollable del KMail) Comment[da]=Post-komponent (KMail-plugin) Comment[de]=E-Mail-Komponente (KMail-Modul) Comment[el]=Συστατικό αλληλογραφίας (Πρόσθετο του KMail) -Comment[es]=Componente de correo electrónico (complemento de KMail) Comment[et]=E-posti plugin (KMail) -Comment[fr]=Composant de courriel (Module pour KMail) -Comment[is]=Pósteining (KMail íforrit) Comment[it]=Componente posta elettronica (plugin KMail) Comment[ja]=メールコンポーネント (KMail プラグイン) -Comment[km]=សមាសភាគអ៊ីមែល (កម្មវិធីជំនួយ KMail) Comment[nds]=Nettpost-Komponent (KMail-Moduul) Comment[nl]=E-mailcomponent (KMail-plugin) Comment[pl]=Składnik poczty (wtyczka KMail) -Comment[pt_BR]=Componente de e-mail (plug-in do KMail) -Comment[ru]=Электронная почта (модуль KMail) -Comment[sk]=Poštový komponent (Model pre KMail) Comment[sr]=Компонента е-поште (прикључак KMail-а) Comment[sr@Latn]=Komponenta e-pošte (priključak KMail-a) Comment[sv]=E-postkomponent (Kmail-insticksprogram) -Comment[tr]=E-Posta Bileşeni (KMail Eklentisi) Comment[zh_CN]=邮件组件(KMail 插件) Comment[zh_TW]=電子郵件組件（KMail 外掛程式） Name=E-Mail Name[bg]=Е-поща Name[ca]=Correu Name[da]=E-mail +Name[de]=E-Mail Name[el]=Αλληλογραφία -Name[es]=Correo electrónico Name[et]=E-post -Name[fr]=Courriel -Name[is]=Tölvupóstur Name[it]=Posta elettronica Name[ja]=メール -Name[km]=អ៊ីមែល Name[nds]=Nettpost Name[nl]=E-mail Name[pl]=E-mail -Name[pt_BR]=E-mail -Name[ru]=Электронная почта -Name[sk]=Pošta Name[sr]=Е-пошта Name[sr@Latn]=E-pošta Name[sv]=E-post -Name[tr]=E-Posta Name[zh_CN]=邮件 Name[zh_TW]=電子郵件 diff --git a/kontact/plugins/knode/knodeplugin.desktop b/kontact/plugins/knode/knodeplugin.desktop index d84c16f7e..559eaadde 100644 --- a/kontact/plugins/knode/knodeplugin.desktop +++ b/kontact/plugins/knode/knodeplugin.desktop @@ -19,21 +19,15 @@ Comment[ca]=Component de notícies (endollable del KNode) Comment[da]=Nyhedskomponent (KNode-plugin) Comment[de]=News-Komponente (KNode-Modul) Comment[el]=Συστατικό ανάγνωσης νέων (Πρόσθετο του KNode) -Comment[es]=Componente de noticias (complemento de KNode) Comment[et]=Uudistelugeja plugin (KNode) -Comment[fr]=Composant de lecteur de nouvelles (Module pour KNode) -Comment[is]=Fréttaeining (KNode íforrit) Comment[it]=Componente lettore di news (plugin KNode) Comment[ja]=ニュースリーダーコンポーネント (KNode プラグイン) -Comment[km]=សមាសភាគ Newsreader (កម្មវិធីជំនួយ KNode) Comment[nds]=Narichtenkieker-Komponent (KNode-Moduul) Comment[nl]=Nieuwscomponent (KNode-plugin) Comment[pl]=Składnik wiadomości (wtyczka KNode) -Comment[ru]=Новости (модуль KNode) Comment[sr]=Компонента вести (прикључак KNode-а) Comment[sr@Latn]=Komponenta vesti (priključak KNode-a) Comment[sv]=Komponent för läsning av diskussionsgrupper (Knode-insticksprogram) -Comment[tr]=Haber Okuyucu Bileşeni (KNode Eklentisi) Comment[zh_CN]=新闻组阅读器组件(KNode 插件) Comment[zh_TW]=新聞閱讀器組件（KNode 外掛程式） Name=News @@ -64,7 +58,6 @@ Name[hi]=समाचार Name[hu]=Hírek Name[is]=Fréttir Name[ja]=ニュース -Name[ka]=სიახლეები Name[kk]=Жаңалықтар Name[km]=ព័ត៌មាន Name[lt]=Naujienos @@ -92,7 +85,6 @@ Name[tg]=Ахборот Name[th]=ข่าว Name[tr]=Haberler Name[uk]=Новини -Name[uz]=Yangiliklar -Name[uz@cyrillic]=Янгиликлар +Name[uz]=Янгиликлар Name[zh_CN]=新闻 Name[zh_TW]=新聞 diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 4702eb2d2..d4a5e8547 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -386,12 +386,14 @@ void KNotesPart::editNote( TQIconViewItem *item ) void KNotesPart::renameNote() { + mOldName = mNotesView->currentItem()->text(); mNotesView->currentItem()->rename(); } void KNotesPart::renamedNote( TQIconViewItem* ) { - mManager->save(); + if ( mOldName != mNotesView->currentItem()->text() ) + mManager->save(); } void KNotesPart::slotOnCurrentChanged( TQIconViewItem* ) diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h index de41f9aae..764bb4849 100644 --- a/kontact/plugins/knotes/knotes_part.h +++ b/kontact/plugins/knotes/knotes_part.h @@ -96,6 +96,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface KNotesResourceManager *mManager; TQDict<KNotesIconViewItem> mNoteList; + TQString mOldName; }; #endif diff --git a/kontact/plugins/knotes/knotesplugin.desktop b/kontact/plugins/knotes/knotesplugin.desktop index e7fe8fc0c..71068d94f 100644 --- a/kontact/plugins/knotes/knotesplugin.desktop +++ b/kontact/plugins/knotes/knotesplugin.desktop @@ -19,21 +19,15 @@ Comment[ca]=Component de notes (endollable del KNotes) Comment[da]=Notatkomponent (KNotes-plugin) Comment[de]=Notizen-Komponente (KNotes-Modul) Comment[el]=Συσταικό σημειώσεων (Πρόσθετο του KNotes) -Comment[es]=Componente de notas (complemento de KNotes) Comment[et]=Märkmete plugin (KNotes) -Comment[fr]=Composant de notes (Module KNotes) -Comment[is]=Minnismiðaeining (KNotes íforrit) Comment[it]=Componente note (plugin KNotes) Comment[ja]=メモコンポーネント (KNotes プラグイン) -Comment[km]=សមាសភាគចំណាំ (កម្មវិធីជំនួយ KNotes) Comment[nds]=Notizen-Komponent (KNotes-Moduul) Comment[nl]=Notitiecomponent (KNotes-plugin) Comment[pl]=Składnik notatek (wtyczka KNotes) -Comment[ru]=Заметки (модуль KNotes) Comment[sr]=Компонента белешки (прикључак KNotes-а) Comment[sr@Latn]=Komponenta beleški (priključak KNotes-a) Comment[sv]=Anteckningskomponent (Knotes-insticksprogram) -Comment[tr]=Notlar Bileşeni (KNotes Eklentisi) Comment[zh_CN]=便笺组件(KNotes 插件) Comment[zh_TW]=便條組件（KNotes 外掛程式） Name=Notes @@ -63,7 +57,6 @@ Name[hu]=Feljegyzések Name[is]=Minnismiðar Name[it]=Note Name[ja]=メモ -Name[ka]=ჩანიშვნები Name[kk]=Жазбалар Name[km]=ចំណាំ Name[lt]=Užrašai @@ -89,7 +82,6 @@ Name[tg]=Ахборот Name[th]=บันทึกช่วยจำ Name[tr]=Notlar Name[uk]=Примітки -Name[uz]=Yozma xotira -Name[uz@cyrillic]=Ёзма хотира +Name[uz]=Ёзма хотира Name[zh_CN]=便笺 Name[zh_TW]=備忘錄 diff --git a/kontact/plugins/korganizer/journalplugin.desktop b/kontact/plugins/korganizer/journalplugin.desktop index 8f33753ed..f24c1206c 100644 --- a/kontact/plugins/korganizer/journalplugin.desktop +++ b/kontact/plugins/korganizer/journalplugin.desktop @@ -21,21 +21,15 @@ Comment[ca]=Component de diari (endollable del KOrganizer) Comment[da]=Journalkomponent (KOrganizer-plugin) Comment[de]=Journal-Komponente (KOrganizer-Modul) Comment[el]=Συστατικό χρονικών (Πρόσθετο του KOrganizer) -Comment[es]=Componente de diario (Complemento de KOrganizer) Comment[et]=Päevikuplugin (KOrganizer) -Comment[fr]= Composant de journal (Module KOrganizer) -Comment[is]=Dagbókareining (Journal KOrganizer íforrit) Comment[it]=Componente diario (plugin KOrganizer) Comment[ja]=ジャーナルコンポーネント (KOrganizer プラグイン) -Comment[km]=សមាភាគទិនានុប្បវត្តិ (កម្មវិធីជំនួយ KOrganizer) Comment[nds]=Daagböker-Komponent (KOrganizer-Moduul) Comment[nl]=Journaalcomponent (KOrganizer-plugin) Comment[pl]=Składnik dziennika (wtyczka Korganizer) -Comment[ru]=Журнал (модуль KOrganizer) Comment[sr]=Компонента дневника (прикључак KOrganizer-а) Comment[sr@Latn]=Komponenta dnevnika (priključak KOrganizer-a) Comment[sv]=Journalkomponent (Korganizer-insticksprogram) -Comment[tr]=Günlük Bileşeni (KOrganizer Eklentisi) Comment[zh_CN]=日记组件(KOrganizer 插件) Comment[zh_TW]=日誌組件（KOrganizer 外掛程式） Name=Journal @@ -61,7 +55,6 @@ Name[hu]=Napló Name[is]=Dagbók Name[it]=Diario Name[ja]=ジャーナル -Name[ka]=ჟურნალი Name[kk]=Күнделік Name[km]=ទិនានុប្បវត្តិ Name[lt]=Dienynas @@ -83,7 +76,6 @@ Name[ta]=பத்திரிகை Name[th]=วารสาร Name[tr]=Günlük Name[uk]=Журнал -Name[uz]=Kundalik -Name[uz@cyrillic]=Кундалик +Name[uz]=Кундалик Name[zh_CN]=日记 Name[zh_TW]=日誌 diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h index 2aeca3544..beb4c2e95 100644 --- a/kontact/plugins/korganizer/journalplugin.h +++ b/kontact/plugins/korganizer/journalplugin.h @@ -40,7 +40,7 @@ class JournalPlugin : public Kontact::Plugin virtual bool createDCOPInterface( const TQString& serviceType ); virtual bool isRunningStandalone(); - int weight() const { return 500; } + int weight() const { return 525; } virtual TQStringList invisibleToolbarActions() const; diff --git a/kontact/plugins/korganizer/kcmkorgsummary.desktop b/kontact/plugins/korganizer/kcmkorgsummary.desktop index 2f657852e..175ed6242 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.desktop +++ b/kontact/plugins/korganizer/kcmkorgsummary.desktop @@ -16,21 +16,15 @@ Name[ca]=Resum de cites i tasques pendents Name[da]=Oversigt over møder og gøremål Name[de]=Übersicht über Termine und Aufgaben Name[el]=Επισκόπηση ραντεβού και προς υλοποίηση εργασιών -Name[es]=Resumen de citas y tareas pendientes Name[et]=Kohtumised ja ülesannete ülevaade -Name[fr]=Aperçu des rendez-vous et des tâches -Name[is]=Yfirlit um fundi og verkþætti Name[it]=Panoramica appuntamenti e cose da fare Name[ja]=約束と To-Do の要約 -Name[km]=ទិដ្ឋភាពការណាត់ និងការងារត្រូវធ្វើ Name[nds]=Termin- un Opgaven-Översicht Name[nl]=Overzicht van evenementen en taken Name[pl]=Spotkania i zadania -Name[ru]=Сводка встреч и задач Name[sr]=Преглед састанака и обавеза Name[sr@Latn]=Pregled sastanaka i obaveza Name[sv]=Översikt av möten och uppgifter -Name[tr]=Randevulara ve Yapılacaklara Genel Bakış Name[zh_CN]=约会和待办概览 Name[zh_TW]=約會與待辦事項概觀 Comment=Appointments and To-dos Summary Setup @@ -50,10 +44,9 @@ Comment[fr]=Configuration du résumé des évènements et des tâches Comment[fy]=Oersichtsynstellings foar eveneminten en taken Comment[gl]=Configuración de sumarios de tarefas e notas Comment[hu]=A találkozók és feladatok áttekintőjének beállítása -Comment[is]=Uppsetning á yfirliti yfir fundi og verkefni +Comment[is]=Uppsetning á yfirliti yfir fundi og verkþætti Comment[it]=Impostazioni sommario appuntamenti e cose da fare Comment[ja]=約束と To-Do の要約設定 -Comment[ka]=შეხვედრათა და გასაკეთებელთა რეზიუმეს დაყენება Comment[kk]=Кездесулер мен Жоспарлар тұжырымының баптау Comment[km]=រៀបចំសេចក្ដីសង្ខេបការណាត់ និងការងារត្រូវធ្វើ Comment[lt]=Susitikimų ir užduočių santraukos nustatymai @@ -66,7 +59,7 @@ Comment[nn]=Oppsett av samandrag av avtalar og oppgåver Comment[pl]=Ustawienia podsumowania spotkań i zadań Comment[pt]=Configuração do Sumário de Compromissos e A-fazeres Comment[pt_BR]=Configuração do Resumo de Compromissos e Tarefas -Comment[ru]=Настройка сводки встреч и задач +Comment[ru]=Настройка показа встреч и задач Comment[sk]=Nastavenie súhrnu pripomienok a úloh Comment[sl]=Nastavitve povzetka sestankov in opravil Comment[sr]=Подешавање сажетка састанака и обавеза @@ -97,10 +90,9 @@ Keywords[ga]=féilire, tascanna, cumraigh, socruithe Keywords[gl]=calendario, pendentes, configurar, opcións Keywords[he]=calendar, todos, configure, settings, יומן, יומנים, משימות, מטלות, הגדרות, תצורה Keywords[hu]=naptár,feladatok,konfigurálás,beállítások -Keywords[is]=dagatal, verkefni, stillingar, stilla +Keywords[is]=dagatal, verkþættir, stillingar, stilla Keywords[it]=calendario, cose da fare, configura, impostazioni Keywords[ja]=カレンダー, To-Do, 設定 -Keywords[ka]=კალენდარი,გასაკეთებლები,კონფიგურაცია,პარამეტრები Keywords[km]=ប្រតិទិន,ការងារត្រូវធ្វើ,កំណត់រចនាសម្ព័ន្ធ,ការកំណត់ Keywords[lt]=calendar, todos, configure, settings, kalendorius, darbai, konfigūruoti, nustatymai Keywords[ms]=kalendar, tugasan, konfigur, seting diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp index b70042353..42a7adcae 100644 --- a/kontact/plugins/korganizer/korg_uniqueapp.cpp +++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp @@ -20,19 +20,40 @@ */ #include "korg_uniqueapp.h" -#include <kdebug.h> #include "../../korganizer/korganizer_options.h" +#include "core.h" +#include <dcopref.h> +#include <kapplication.h> +#include <kstartupinfo.h> +#include <kwin.h> + void KOrganizerUniqueAppHandler::loadCommandLineOptions() { - KCmdLineArgs::addCmdLineOptions( korganizer_options ); + KCmdLineArgs::addCmdLineOptions( korganizer_options ); } int KOrganizerUniqueAppHandler::newInstance() { - //kdDebug(5602) << k_funcinfo << endl; - // Ensure part is loaded - (void)plugin()->part(); - // TODO handle command line options - return Kontact::UniqueAppHandler::newInstance(); + // Ensure part is loaded + (void)plugin()->part(); + DCOPRef korganizer( "korganizer", "KOrganizerIface" ); + korganizer.send( "handleCommandLine" ); + + // Bring korganizer's plugin to front + // This bit is duplicated from KUniqueApplication::newInstance() + if ( kapp->mainWidget() ) { + kapp->mainWidget()->show(); + KWin::forceActiveWindow( kapp->mainWidget()->winId() ); + KStartupInfo::appStarted(); + } + + // Then ensure the part appears in kontact. + // ALWAYS use the korganizer plugin; i.e. never show the todo nor journal + // plugins when creating a new instance via the command line, even if + // the command line options are empty; else we'd need to examine the + // options and then figure out which plugin we should show. + // kolab/issue3971 + plugin()->core()->selectPlugin( "kontact_korganizerplugin" ); + return 0; } diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index f0f88c7ca..cd590ec96 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -42,6 +42,10 @@ #include <libkdepim/kvcarddrag.h> #include <libkdepim/maillistdrag.h> +#include <libkdepim/kpimprefs.h> + +#include <libkcal/calendarlocal.h> +#include <libkcal/icaldrag.h> #include "core.h" #include "summarywidget.h" @@ -78,6 +82,11 @@ KOrganizerPlugin::~KOrganizerPlugin() Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent ) { + // korg part must be loaded, otherwise when starting kontact on summary view + // it won't display our stuff. + // If the part is already loaded loadPart() is harmless and just returns + loadPart(); + return new SummaryWidget( this, parent ); } @@ -160,27 +169,43 @@ bool KOrganizerPlugin::canDecodeDrag( TQMimeSource *mimeSource ) void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) { - TQString text; - - KABC::VCardConverter converter; - if ( KVCardDrag::canDecode( event ) && KVCardDrag::decode( event, text ) ) { - KABC::Addressee::List contacts = converter.parseVCards( text ); - KABC::Addressee::List::Iterator it; - + KABC::Addressee::List list; + if ( KVCardDrag::decode( event, list ) ) { TQStringList attendees; - for ( it = contacts.begin(); it != contacts.end(); ++it ) { + KABC::Addressee::List::Iterator it; + for ( it = list.begin(); it != list.end(); ++it ) { TQString email = (*it).fullEmail(); - if ( email.isEmpty() ) + if ( email.isEmpty() ) { attendees.append( (*it).realName() + "<>" ); - else + } else { attendees.append( email ); + } } - interface()->openEventEditor( i18n( "Meeting" ), TQString::null, TQString::null, attendees ); return; } + if ( KCal::ICalDrag::canDecode( event) ) { + KCal::CalendarLocal cal( KPimPrefs::timezone() ); + if ( KCal::ICalDrag::decode( event, &cal ) ) { + KCal::Incidence::List incidences = cal.incidences(); + if ( !incidences.isEmpty() ) { + event->accept(); + KCal::Incidence *i = incidences.first(); + TQString summary; + if ( dynamic_cast<KCal::Journal*>( i ) ) + summary = i18n( "Note: %1" ).arg( i->summary() ); + else + summary = i->summary(); + interface()->openEventEditor( summary, i->description(), TQString() ); + return; + } + // else fall through to text decoding + } + } + + TQString text; if ( TQTextDrag::decode( event, text ) ) { kdDebug(5602) << "DROP:" << text << endl; interface()->openEventEditor( text ); diff --git a/kontact/plugins/korganizer/korganizerplugin.desktop b/kontact/plugins/korganizer/korganizerplugin.desktop index 7a29913c1..896320c15 100644 --- a/kontact/plugins/korganizer/korganizerplugin.desktop +++ b/kontact/plugins/korganizer/korganizerplugin.desktop @@ -21,22 +21,15 @@ Comment[ca]=Component de calendari (endollable del KOrganizer) Comment[da]=Kalenderkomponent (KOrganizer-plugin) Comment[de]=Kalender-Komponente (KOrganizer-Modul) Comment[el]=Συστατικό ημερολογίου (Πρόσθετο του KOrganizer) -Comment[es]=Componente de calendario (complemento de KOrganizer) Comment[et]=Kalendriplugin (KOrganizer) -Comment[fr]= Composant de calendrier (Module KOrganizer) -Comment[is]=Dagatalseining (KOrganizer íforrit) Comment[it]=Componente calendario (plugin KOrganizer) Comment[ja]=カレンダーコンポーネント (KOrganizer プラグイン) -Comment[km]=សមាសភាគប្រតិទិន (កម្មវិធីជំនួយ KOrganizer) Comment[nds]=Kalenner-Komponent (KOrganizer-Moduul) Comment[nl]=Agendacomponent (KOrganizer-plugin) Comment[pl]=Składnik kalendarza (wtyczka KOrganizer) -Comment[ru]=Календарь (модуль KOrganizer) -Comment[sk]=Kalendárový komponent (Modeul pre KOrganizer) Comment[sr]=Компонента календара (прикључак KOrganizer-а) Comment[sr@Latn]=Komponenta kalendara (priključak KOrganizer-a) Comment[sv]=Kalenderkomponent (Korganizer-insticksprogram) -Comment[tr]=Takvim Bileşeni (KOrganizer Eklentisi) Comment[zh_CN]=日历组件(KOrganizer 插件) Comment[zh_TW]=行事曆組件（KOrganizer 外掛程式） Name=Calendar @@ -68,7 +61,6 @@ Name[hu]=Naptár Name[is]=Dagatal Name[it]=Calendario Name[ja]=カレンダー -Name[ka]=კალენდარი Name[kk]=Күнтізбе Name[km]=ប្រតិទិន Name[lt]=Kalendorius @@ -95,7 +87,6 @@ Name[tg]=Тақвим Name[th]=บันทึกประจำวัน Name[tr]=Takvim Name[uk]=Календар -Name[uz]=Kalendar -Name[uz@cyrillic]=Календар +Name[uz]=Календар Name[zh_CN]=日历 Name[zh_TW]=行事曆 diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index ff3d5da9d..cab7788f9 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -65,7 +65,6 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, mLayout->setRowStretch( 6, 1 ); mCalendar = KOrg::StdCalendar::self(); - mCalendar->load(); connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), @@ -94,6 +93,8 @@ void SummaryWidget::updateView() TQLabel *label = 0; int counter = 0; TQPixmap pm = loader.loadIcon( "appointment", KIcon::Small ); + TQPixmap pmb = loader.loadIcon( "calendarbirthday", KIcon::Small ); + TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small ); TQDate dt; TQDate currentDate = TQDate::currentDate(); @@ -101,38 +102,22 @@ void SummaryWidget::updateView() dt<=currentDate.addDays( days - 1 ); dt=dt.addDays(1) ) { - KCal::Event *ev; - - KCal::Event::List events_orig = mCalendar->events( dt ); - KCal::Event::List::ConstIterator it = events_orig.begin(); - - KCal::Event::List events; - events.setAutoDelete( true ); - TQDateTime qdt; - - // prevent implicitely sharing while finding recurring events - // replacing the TQDate with the currentDate - for ( ; it != events_orig.end(); ++it ) { - ev = (*it)->clone(); - if ( ev->recursOn( dt ) ) { - qdt = ev->dtStart(); - qdt.setDate( dt ); - ev->setDtStart( qdt ); - } - events.append( ev ); - } + KCal::Event::List events = mCalendar->events( dt ); // sort the events for this date by summary - events = KCal::Calendar::sortEvents( &events, - KCal::EventSortSummary, - KCal::SortDirectionAscending ); + events = KCal::Calendar::sortEventsForDate( &events, + dt, + KCal::EventSortSummary, + KCal::SortDirectionAscending ); // sort the events for this date by start date - events = KCal::Calendar::sortEvents( &events, - KCal::EventSortStartDate, - KCal::SortDirectionAscending ); + events = KCal::Calendar::sortEventsForDate( &events, + dt, + KCal::EventSortStartDate, + KCal::SortDirectionAscending ); + KCal::Event::List::ConstIterator it = events.begin(); for ( it=events.begin(); it!=events.end(); ++it ) { - ev = *it; + KCal::Event *ev = *it; // Count number of days remaining in multiday event int span=1; int dayof=1; @@ -156,7 +141,13 @@ void SummaryWidget::updateView() // Fill Appointment Pixmap Field label = new TQLabel( this ); - label->setPixmap( pm ); + if ( ev->categories().contains( "Birthday" ) ) { + label->setPixmap( pmb ); + } else if ( ev->categories().contains( "Anniversary" ) ) { + label->setPixmap( pma ); + } else { + label->setPixmap( pm ); + } label->setMaximumWidth( label->minimumSizeHint().width() ); label->setAlignment( AlignVCenter ); mLayout->addWidget( label, counter, 0 ); @@ -167,7 +158,7 @@ void SummaryWidget::updateView() TQString datestr; // Modify event date for printing - TQDate sD = TQDate::TQDate( dt.year(), dt.month(), dt.day() ); + TQDate sD = TQDate( dt.year(), dt.month(), dt.day() ); if ( ( sD.month() == currentDate.month() ) && ( sD.day() == currentDate.day() ) ) { datestr = i18n( "Today" ); @@ -216,7 +207,7 @@ void SummaryWidget::updateView() connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), this, TQT_SLOT( popupMenu( const TQString& ) ) ); - TQString tipText( KCal::IncidenceFormatter::toolTipString( ev, true ) ); + TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, ev, dt, true ) ); if ( !tipText.isEmpty() ) { TQToolTip::add( urlLabel, tipText ); } @@ -227,10 +218,10 @@ void SummaryWidget::updateView() TQTime sET = ev->dtEnd().time(); if ( ev->isMultiDay() ) { if ( ev->dtStart().date() < dt ) { - sST = TQTime::TQTime( 0, 0 ); + sST = TQTime( 0, 0 ); } if ( ev->dtEnd().date() > dt ) { - sET = TQTime::TQTime( 23, 59 ); + sET = TQTime( 23, 59 ); } } datestr = i18n( "Time from - to", "%1 - %2" ) diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 3b6ab214f..bc76205c2 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -161,22 +161,18 @@ bool TodoPlugin::isRunningStandalone() void TodoPlugin::processDropEvent( TQDropEvent *event ) { - TQString text; - - KABC::VCardConverter converter; - if ( KVCardDrag::canDecode( event ) && KVCardDrag::decode( event, text ) ) { - KABC::Addressee::List contacts = converter.parseVCards( text ); - KABC::Addressee::List::Iterator it; - + KABC::Addressee::List list; + if ( KVCardDrag::decode( event, list ) ) { TQStringList attendees; - for ( it = contacts.begin(); it != contacts.end(); ++it ) { + KABC::Addressee::List::Iterator it; + for ( it = list.begin(); it != list.end(); ++it ) { TQString email = (*it).fullEmail(); - if ( email.isEmpty() ) + if ( email.isEmpty() ) { attendees.append( (*it).realName() + "<>" ); - else + } else { attendees.append( email ); + } } - interface()->openTodoEditor( i18n( "Meeting" ), TQString::null, TQString::null, attendees ); return; @@ -185,17 +181,23 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) if ( KCal::ICalDrag::canDecode( event) ) { KCal::CalendarLocal cal( KPimPrefs::timezone() ); if ( KCal::ICalDrag::decode( event, &cal ) ) { - KCal::Journal::List journals = cal.journals(); - if ( !journals.isEmpty() ) { + KCal::Incidence::List incidences = cal.incidences(); + if ( !incidences.isEmpty() ) { event->accept(); - KCal::Journal *j = journals.first(); - interface()->openTodoEditor( i18n("Note: %1").arg( j->summary() ), j->description(), TQString() ); + KCal::Incidence *i = incidences.first(); + TQString summary; + if ( dynamic_cast<KCal::Journal*>( i ) ) + summary = i18n( "Note: %1" ).arg( i->summary() ); + else + summary = i->summary(); + interface()->openTodoEditor( summary, i->description(), TQString() ); return; } // else fall through to text decoding } } + TQString text; if ( TQTextDrag::decode( event, text ) ) { interface()->openTodoEditor( text ); return; @@ -217,8 +219,8 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) mail.messageId(); tf.file()->writeBlock( event->encodedData( "message/rfc822" ) ); tf.close(); - interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ), txt, - uri, tf.name(), TQStringList(), "message/rfc822" ); + interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ), + txt, uri, tf.name(), TQStringList(), "message/rfc822", false ); } return; } diff --git a/kontact/plugins/korganizer/todoplugin.desktop b/kontact/plugins/korganizer/todoplugin.desktop index a571539d8..dde1a0c1b 100644 --- a/kontact/plugins/korganizer/todoplugin.desktop +++ b/kontact/plugins/korganizer/todoplugin.desktop @@ -21,22 +21,15 @@ Comment[ca]=Component de llista de pendents (endollable del KOrganizer) Comment[da]=Komponent til gøremålsliste (KOrganizer-plugin) Comment[de]=Aufgabenlisten-Komponente (KOrganizer-Modul) Comment[el]=Συστατικό λίστα προς υλοποίηση εργασιών (Πρόσθετο του KOrganizer) -Comment[es]=Componente de tareas pendientes (complemento de KOrganizer) Comment[et]=Ülesannete nimekirja plugin (KOrganizer) -Comment[fr]=Composant de la liste des tâches (Module KOrganizer) -Comment[is]=Verkefnaeining (KOrganizer íforrit) Comment[it]=Componente elenco delle cose da fare (plugin KOrganizer) Comment[ja]=To-Do リストコンポーネント (KOrganizer プラグイン) -Comment[km]=សមាសភាគបញ្ជីការងារត្រូវធ្វើ (កម្មវិធីជំនួយ KOrganizer) Comment[nds]=Opgavenlist-Komponent (KOrganizer-Moduul) Comment[nl]=Takenlijstcomponent (KOrganizer-plugin) Comment[pl]=Składnik zadań (wtyczka KOrganizer) -Comment[ru]=Задачи (модуль KOrganizer) -Comment[sk]=Komponent zoznamu úloh (Modul pre KOrganizer) Comment[sr]=Прикључак листе обавеза (прикључак KOrganizer-а) Comment[sr@Latn]=Priključak liste obaveza (priključak KOrganizer-a) Comment[sv]=Uppgiftslistkomponent (Korganizer-insticksprogram) -Comment[tr]=Yapılacak İşler Bileşeni (KOrganizer eklentisi) Comment[zh_CN]=待办清单组件(KOrganizer 插件) Comment[zh_TW]=待辦事項清單組件（KOrganizer 外掛程式） Name=To-do @@ -45,21 +38,14 @@ Name[ca]=Pendents Name[da]=Gøremål Name[de]=Aufgaben Name[el]=Προς υλοποίηση εργασίες -Name[es]=Tareas pendientes Name[et]=Ülesanded -Name[fr]=Tâches -Name[is]=Verkefni Name[it]=Cose da fare Name[ja]=To-Do -Name[km]=ការងារត្រូវធ្វើ Name[nds]=Opgaav Name[nl]=Takenlijst Name[pl]=Lista zadań -Name[ru]=Задачи -Name[sk]=Zoznam úloh Name[sr]=Обавезе Name[sr@Latn]=Obaveze Name[sv]=Uppgift -Name[tr]=Yapılacak Ögeleri Name[zh_CN]=待办清单 Name[zh_TW]=待辦事項 diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index e58ee6aa0..953aa42cb 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -67,7 +67,6 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin, mLayout->setRowStretch( 6, 1 ); mCalendar = KOrg::StdCalendar::self(); - mCalendar->load(); connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), @@ -169,7 +168,7 @@ void TodoSummaryWidget::updateView() connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), this, TQT_SLOT( popupMenu( const TQString& ) ) ); - TQString tipText( KCal::IncidenceFormatter::toolTipString( todo, true ) ); + TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) ); if ( !tipText.isEmpty() ) { TQToolTip::add( urlLabel, tipText ); } @@ -213,11 +212,11 @@ void TodoSummaryWidget::completeTodo( const TQString &uid ) { KCal::Todo *todo = mCalendar->todo( uid ); IncidenceChanger *changer = new IncidenceChanger( mCalendar, this ); - if ( !todo->isReadOnly() && changer->beginChange( todo ) ) { + if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) { KCal::Todo *oldTodo = todo->clone(); todo->setCompleted( TQDateTime::currentDateTime() ); - changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED ); - changer->endChange( todo ); + changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this ); + changer->endChange( todo, 0, TQString() ); delete oldTodo; updateView(); } diff --git a/kontact/plugins/kpilot/kpilotplugin.desktop b/kontact/plugins/kpilot/kpilotplugin.desktop index 7ad217fd9..68f8d9d29 100644 --- a/kontact/plugins/kpilot/kpilotplugin.desktop +++ b/kontact/plugins/kpilot/kpilotplugin.desktop @@ -19,26 +19,21 @@ Comment=Palm Tools Component (KPilot Plugin) Comment[bg]=Приставка за KPilot Comment[ca]=Component d'eines de la Palm (endollable del KPilot) Comment[da]=Komponent til palm-værktøjer (KPilot-plugin) -Comment[de]=Palm-Komponente (KPilot-Modul) +Comment[de]=Palm Werkzeuge (KPilot-Modul) Comment[el]=Συστατικό εργαλείων Palm (Πρόσθετο του KPilot) -Comment[es]=Componente de herramientas de Palm (complemento KPilot) Comment[et]=Palmi tööriistade plugin (KPilot) -Comment[fr]=Composant d'outils pour Palms (Module KPilot) -Comment[is]=Palm verkfæraeining (KPilot íforrit) Comment[it]=Componente strumenti Palm (plugin KPilot) Comment[ja]=Palm ツールコンポーネント (KPilot プラグイン) -Comment[km]=សមាសភាគឧបករណ៍ Palm (កម្មវិធីជំនួយ KPilot) Comment[nds]=Palmreekner-Warktüüchkomponent (KPilot-Moduul) Comment[nl]=Component met hulpmiddelen voor PalmOS(tm)-apparaten (KPilot-plugin) Comment[pl]=Składnik narzędzi Palma (wtyczka KPilot) -Comment[ru]=Синхронизация с Palm (модуль KPilot) Comment[sr]=Компонента алата за Palm (прикључак KPilot-а) Comment[sr@Latn]=Komponenta alata za Palm (priključak KPilot-a) Comment[sv]=Palm Pilot-verktygskomponent (Kpilot-insticksprogram) -Comment[tr]=Palm Araçları Bileşeni (KPilot Eklentisi) Comment[zh_CN]=Palm 工具组件(KPilot 插件) Comment[zh_TW]=Palm 工具組件（KPilot 外掛程式） Name=Palm +Name[de]=KPilot-Einrichtung Name[nds]=Palmreekner Name[nl]=PalmOS(tm)-apparaat Name[sv]=Palm Pilot diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop index d866e252a..3e57621c1 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.desktop +++ b/kontact/plugins/newsticker/kcmkontactknt.desktop @@ -36,7 +36,6 @@ Name[id]=Ticker Berita Name[is]=Fréttastrimill Name[it]=Ticker notizie Name[ja]=ニュースティッカー -Name[ka]=სიახლეთა ტიკერი Name[kk]=Жаңалық таспасы Name[km]=កម្មវិធីទទួលព័ត៌មាន Name[lt]=News pranešėjas @@ -88,7 +87,6 @@ Comment[hu]=A hírmegjelenítő áttekintőjének beállításai Comment[is]=Uppsetning á yfirliti yfir fréttastrimla Comment[it]=Impostazioni sommario ticker notizie Comment[ja]=ニュースティッカーの設定 -Comment[ka]=სიახლეთა ტიკერის დაიჯესტის კონფიგურაცია Comment[kk]=Жаңалық таспасының тұжырымынын баптау Comment[km]=រៀបចំសេចក្ដីសង្ខេបកម្មវិធីទទួលព័ត៌មាន Comment[lt]=News Ticker santraukos nustatymai @@ -100,7 +98,7 @@ Comment[nn]=Oppsett av nyhendetelegrafsamandrag Comment[pl]=Ustawienia podsumowania wiadomości Comment[pt]=Configuração do Sumário do Extractor de Notícias Comment[pt_BR]=Configuração de Resumo de Notícias -Comment[ru]=Настройка сводки новостей +Comment[ru]=Настройка дайджеста новостей Comment[sk]=Nastavenie súhrnu správ Comment[sl]=Nastavitve povzetka novic Comment[sr]=Подешавање сажетка приказивања вести @@ -131,7 +129,6 @@ Keywords[hu]=hírmegjelenítő,konfigurálás,beállítások Keywords[is]=fréttastrimill, stillingar, stilla Keywords[it]=ticker notizie, configura, impostazioni Keywords[ja]=ニュースティッカー,設定,設定 -Keywords[ka]=სიახლეთა ტიკერი, კონფიგურაცია, პარამეტრები Keywords[km]=កម្មវិធីទទួលព័ត៌មាន,កំណត់រចនាសម្ព័ន្ធ,ការកំណត់ Keywords[lt]=news ticker, configure, settings, konfigūravimas, nustatymai, naujienų pranešėjas Keywords[ms]=Pengetik berita, konfigur, seting diff --git a/kontact/plugins/newsticker/newstickerplugin.desktop b/kontact/plugins/newsticker/newstickerplugin.desktop index 18a34cda9..079f90079 100644 --- a/kontact/plugins/newsticker/newstickerplugin.desktop +++ b/kontact/plugins/newsticker/newstickerplugin.desktop @@ -20,21 +20,15 @@ Comment[ca]=Component de teletip de notícies Comment[da]=Nyhedstelegraf-komponent Comment[de]=Newsticker-Komponente Comment[el]=Συστατικό προβολέα ειδήσεων -Comment[es]=Componente de teletipo de noticias Comment[et]=Uudistejälgija plugin -Comment[fr]=Composant Newsticker -Comment[is]=Fréttastrimilseining Comment[it]=Componente ticker notizie Comment[ja]=ニュースティッカーコンポーネント -Comment[km]=សមាសភាគ Newsticker Comment[nds]=Narichtentelegraaf-Komponent Comment[nl]=Nieuwstickercomponent Comment[pl]=Składnik paska wiadomości -Comment[ru]=Компонент новостей Comment[sr]=Компонента откуцавача вести Comment[sr@Latn]=Komponenta otkucavača vesti Comment[sv]=Nyhetsövervakningskomponent -Comment[tr]=Haber İzleyici Bileşeni Comment[zh_CN]=新闻点点通组件 Comment[zh_TW]=新聞顯示組件 Name=News @@ -48,7 +42,7 @@ Name[ca]=Notícies Name[cs]=Novinky Name[cy]=Newyddion Name[da]=Nyheder -Name[de]=Usenet +Name[de]=Newsticker Name[el]=Νέα Name[eo]=Novaĵoj Name[es]=Noticias @@ -65,7 +59,6 @@ Name[hi]=समाचार Name[hu]=Hírek Name[is]=Fréttir Name[ja]=ニュース -Name[ka]=სიახლეები Name[kk]=Жаңалықтар Name[km]=ព័ត៌មាន Name[lt]=Naujienos @@ -93,7 +86,6 @@ Name[tg]=Ахборот Name[th]=ข่าว Name[tr]=Haberler Name[uk]=Новини -Name[uz]=Yangiliklar -Name[uz@cyrillic]=Янгиликлар +Name[uz]=Янгиликлар Name[zh_CN]=新闻 Name[zh_TW]=新聞 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]=特殊日期組件 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(); } diff --git a/kontact/plugins/test/kptestplugin.desktop b/kontact/plugins/test/kptestplugin.desktop index 17a3e52e9..75e0988e4 100644 --- a/kontact/plugins/test/kptestplugin.desktop +++ b/kontact/plugins/test/kptestplugin.desktop @@ -35,7 +35,6 @@ Comment[hu]=Kontact tesztmodul Comment[is]=Kontact prufu íforrit Comment[it]=Plugin test Kontact Comment[ja]=Kontact テストプラグイン -Comment[ka]=Kontact სატესტო მოდული Comment[kk]=Сынақ модулі Comment[km]=កម្មវិធីជំនួយការសាកល្បងក្នុង Kontact Comment[lt]=Kontact bandymo priedas @@ -60,8 +59,7 @@ Comment[ta]=பரிசோதனை சொருகுப்பொருளை Comment[tg]=Модули матнии Kontact Comment[tr]=Kontact Test Eklentisi Comment[uk]=Тестовий втулок Kontact -Comment[uz]=Kontact uchun sinash plagini -Comment[uz@cyrillic]=Kontact учун синаш плагини +Comment[uz]=Kontact учун синаш плагини Comment[zh_CN]=Kontact Test 插件 Comment[zh_TW]=Kontact 測試外掛程式 Name=TestPlugin @@ -83,7 +81,6 @@ Name[hu]=Tesztmodul Name[is]=Prufu íforrit Name[it]=Plugin Test Name[ja]=テストプラグイン -Name[ka]=სატესტო მოდული Name[kk]=Сынақ модулі Name[km]=កម្មវិធីជំនួយការសាកល្បង Name[mk]=Приклучок за тест diff --git a/kontact/plugins/weather/weatherplugin.desktop b/kontact/plugins/weather/weatherplugin.desktop index 68c1924e3..80d9be8e4 100644 --- a/kontact/plugins/weather/weatherplugin.desktop +++ b/kontact/plugins/weather/weatherplugin.desktop @@ -21,21 +21,15 @@ Comment[ca]=Component del temps del Kontact Comment[da]=Vejrkomponent til Kontact Comment[de]=Wetter-Komponente für Kontact Comment[el]=Συστατικό καιρού του Kontact -Comment[es]=Extensión de meteorología para Kontact Comment[et]=Kontacti ilmaplugin -Comment[fr]=Composant météo pour Kontact -Comment[is]=Kontact veðurfréttaeining Comment[it]=Componente meteorologico di Kontact Comment[ja]=Kontact 気象情報コンポーネント -Comment[km]=សមាសភាគអាកាសធាតុ Kontact Comment[nds]=Kontact-Wederkomponent Comment[nl]=Kontact Weercomponent Comment[pl]=Składnik Kontaktu wiadomości o pogodzie -Comment[ru]=Компонент информации о погоде для Kontact Comment[sr]=Компонента времена за Kontact Comment[sr@Latn]=Komponenta vremena za Kontact Comment[sv]=Kontacts väderkomponent -Comment[tr]=Kontact Hava Durumu Bileşeni Comment[zh_CN]=Kontact 天气插件 Comment[zh_TW]=Kontact 天氣組件 Name=Weather Service @@ -64,7 +58,6 @@ Name[hu]=Időjárás Name[is]=Veðurþjónusta Name[it]=Servizio meteorologico Name[ja]=気象サービス -Name[ka]=ამინდის მომსახურება Name[kk]=Ауа райы қызметі Name[km]=សេវាអាកាសធាតុ Name[lt]=Orų tarnyba @@ -86,7 +79,6 @@ Name[sv]=Väderleksprognos Name[th]=รายงานอากาศ Name[tr]=Hava Durumu Servisi Name[uk]=Служба погоди -Name[uz]=Ob-havo xizmati -Name[uz@cyrillic]=Об-ҳаво хизмати +Name[uz]=Об-ҳаво хизмати Name[zh_CN]=天气服务 Name[zh_TW]=天氣服務 diff --git a/kontact/src/Kontact.desktop b/kontact/src/Kontact.desktop index 6cd9d0d3a..a4127aac0 100644 --- a/kontact/src/Kontact.desktop +++ b/kontact/src/Kontact.desktop @@ -36,7 +36,6 @@ GenericName[hu]=Információkezelő GenericName[is]=Persónulegur upplýsingastjórnandi GenericName[it]=Gestione informazioni personali GenericName[ja]=個人情報マネージャ -GenericName[ka]=პირადი ინფორმაციის მმართველი GenericName[kk]=Дербес Ақпарат Менеджері GenericName[km]=កម្មវិធីគ្រប់គ្រងព័ត៌មានផ្ទាល់ខ្លួន GenericName[lt]=Asmeninės informacijos tvarkyklė @@ -61,8 +60,7 @@ GenericName[ta]=அந்தரங்க தகவல் மேலாளர் GenericName[tg]=Мудири маълумоти шахсӣ GenericName[tr]=Kişisel Bilgi Yöneticisi GenericName[uk]=Менеджер особистої інформації -GenericName[uz]=Shaxsiy maʼlumot boshqaruvchisi -GenericName[uz@cyrillic]=Шахсий маълумот бошқарувчиси +GenericName[uz]=Шахсий маълумот бошқарувчиси GenericName[zh_CN]=个人信息管理器 GenericName[zh_TW]=個人資訊管理者 Terminal=false diff --git a/kontact/src/about/kontact.css b/kontact/src/about/kontact.css index 18aa0ddcd..2366a9741 100644 --- a/kontact/src/about/kontact.css +++ b/kontact/src/about/kontact.css @@ -15,13 +15,6 @@ right: 125px; } -#boxCenter { - background-image: url(box-center-kontact.png); - background-repeat: no-repeat; - background-color: #dfe7f3; - background-position: bottom right; -} - #subtext { font-style: italic; } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index d56513aeb..4303175f6 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -113,8 +113,8 @@ void EntryItem::reloadPixmap() if ( size != 0 ) mPixmap = KGlobal::iconLoader()->loadIcon( mPlugin->icon(), KIcon::Desktop, size, - mPlugin->disabled() ? - KIcon::DisabledState + mPlugin->disabled() ? + KIcon::DisabledState : KIcon::DefaultState); else mPixmap = TQPixmap(); @@ -250,7 +250,7 @@ void EntryItem::setPaintActive( bool paintActive ) mPaintActive = paintActive; } -Navigator::Navigator( SidePaneBase *parent, const char *name ) +Navigator::Navigator( IconSidePane *parent, const char *name ) : KListBox( parent, name ), mSidePane( parent ), mShowIcons( true ), mShowText( true ) { @@ -328,7 +328,6 @@ void Navigator::updatePlugins( TQValueList<Kontact::Plugin*> plugins_ ) mActions.clear(); mActions.setAutoDelete( false ); - int counter = 0; int minWidth = 0; qBubbleSort( plugins ); TQValueList<Kontact::PluginProxy>::ConstIterator end = plugins.end(); @@ -343,14 +342,6 @@ void Navigator::updatePlugins( TQValueList<Kontact::Plugin*> plugins_ ) if ( item->width( this ) > minWidth ) minWidth = item->width( this ); - - TQString name = TQString( "CTRL+%1" ).arg( counter + 1 ); - KAction *action = new KAction( plugin->title(), plugin->icon(), KShortcut( name ), - mMapper, TQT_SLOT( map() ), - mSidePane->actionCollection(), name.latin1() ); - mActions.append( action ); - mMapper->setMapping( action, counter ); - counter++; } parentWidget()->setFixedWidth( minWidth ); diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index 03f838c97..674980c01 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -37,6 +37,7 @@ namespace Kontact { class Core; +class IconSidePane; class Plugin; class Navigator; @@ -118,7 +119,7 @@ class Navigator : public KListBox { Q_OBJECT public: - Navigator( SidePaneBase *parent = 0, const char *name = 0 ); + Navigator( IconSidePane *parent = 0, const char *name = 0 ); virtual void setSelected( TQListBoxItem *, bool ); @@ -156,7 +157,7 @@ class Navigator : public KListBox void slotStopHighlight(); private: - SidePaneBase *mSidePane; + IconSidePane *mSidePane; IconViewMode mViewMode; TQListBoxItem* mMouseOn; diff --git a/kontact/src/kontact.setdlg b/kontact/src/kontact.setdlg index a90778a21..872457ade 100644 --- a/kontact/src/kontact.setdlg +++ b/kontact/src/kontact.setdlg @@ -5,21 +5,15 @@ Name[ca]=Vista de resum Name[da]=Opsummeringsvisning Name[de]=Übersicht Name[el]=Προβολή σύνοψης -Name[es]=Vista de resumen Name[et]=Kokkuvõttevaade -Name[fr]=Vue résumée -Name[is]=Yfirlitssýn Name[it]=Vista sommario Name[ja]=要約ビュー -Name[km]=ទិដ្ឋភាពសង្ខេប Name[nds]=Översicht Name[nl]=Overzichtsweergave Name[pl]=Podsumowanie -Name[ru]=Просмотр сводок Name[sr]=Приказ сажетка Name[sr@Latn]=Prikaz sažetka Name[sv]=Översiktsvy -Name[tr]=Özet Görünümü Name[zh_CN]=摘要视图 Name[zh_TW]=摘要檢視 Comment=Configuration of Kontact's <b>Summary View</b>. Some plugins provide <i>Summary View</i> items, choose the ones you would like to list. @@ -28,17 +22,12 @@ Comment[ca]=Configuració de la <b>vista de resum</b> del Kontact. Alguns endoll Comment[da]=Konfiguration af Kontacts <b>Opsummeringsvisning</b>. Nogle plugins giver <i>Opsummeringsvisning</i>-elementer, vælg dem du ønsker på listen. Comment[de]=Einrichtung der <b>Zusammenfassungsansicht</b> von Kontact. Einige Kontact-Module stellen Elemente für die <i>Zusammenfassungsansicht</i> zur Verfügung. Wählen Sie hier, welche Elemente angezeigt werden sollen. Comment[el]=Ρύθμιση της <b>Προβολής σύνοψης</b> του Kontact. Κάποια πρόσθετα παρέχουν αντικείμενα <i>Προβολή σύνοψης</i>· επιλέξτε αυτά που θέλετε να εμφανίζονται. -Comment[es]=Configuración de Kontact <b>Vista de resumen</b>. Algunos complementos proveen elementos para la <i>Vista de resumen</i>, elija los que quiera listar. Comment[et]=Kontacti <b>kokkuvõttevaate</b> seadistamine. Mõned pluginad pakuvad <i>kokkuvõttevaate</i> elemente. Vali nimekirjas need, mida soovid näha. -Comment[fr]=Configuration de Kontact <b> Vue résumée</b>. Certains modules fournissent des éléments de <i>Vue Résumée</i>, choisissez ceux que vous voulez voir listés. -Comment[is]=Stillingar á <b>Yfirlitssýn</b>í Kontact. Sum íforrit koma með hluti í <i>Yfirlitssýn</i>, veldu þá sem þú vilt hafa á síðunni. Comment[it]=Configurazione della <b>vista sommario</b> di Kontact. Alcuni plugin forniscono elementi di <i>vista sommario</i>, scegli quelli che desideri vedere nell'elenco. Comment[ja]=Kontact の要約ビューの設定。要約ビューの項目を提供するプラグインがいくつかあります。要約ビューに表示させる項目を選択してください。 -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធរបស់ Kontact <b>ទិដ្ឋភាពសង្ខេប</b> ។ កម្មវិធីជំនួយមួយចំនួនផ្ដល់នូវធាតុ<i>ទិដ្ឋភាពសង្ខេប</i> ជ្រើសទិដ្ឋភាពមួយក្នុងចំណោមទិដ្ឋភាពទាំងនេះដែលអ្នកចង់រាយ ។ Comment[nds]=Kontact sien <b>Översicht</b> instellen. En Reeg Modulen stellt Indrääg för de <i>Översicht</i> praat. Hier kannst Du de utsöken, de Du hebben wullt. Comment[nl]=Configuratie van Kontacts <b>Overzichtsweergave</b>. Sommige plugins bieden ook items aan voor de <i>Overzichtweergave</i>, kies welke u wilt zien. Comment[pl]=Konfiguracja <b>Podsumowania</b> Kontaktu. Niektóre wtyczki zapewniają elementy <i>Widok podsumowania</i>, wybierz te które chcesz zobaczyć. -Comment[ru]=Настройка показа сводок различных компонентов. Comment[sr]=Подешавање Kontact-овог <b>приказа сажетка</b>. Неки прикључци дају ставке <i>приказа сажетка</i>, изаберите оне које желите. Comment[sr@Latn]=Podešavanje Kontact-ovog <b>prikaza sažetka</b>. Neki priključci daju stavke <i>prikaza sažetka</i>, izaberite one koje želite. Comment[sv]=Inställning av Kontacts <b>översiktsvy</b>. Vissa insticksprogram tillhandahåller objekt för <i>översiktsvyn</i>. Välj de du skulle vilja visa. @@ -52,24 +41,17 @@ Name=E-Mail Name[bg]=Е-поща Name[ca]=Correu Name[da]=E-mail +Name[de]=E-Mail Name[el]=Αλληλογραφία -Name[es]=Correo electrónico Name[et]=E-post -Name[fr]=Courriel -Name[is]=Tölvupóstur Name[it]=Posta elettronica Name[ja]=メール -Name[km]=អ៊ីមែល Name[nds]=Nettpost Name[nl]=E-mail Name[pl]=E-mail -Name[pt_BR]=E-mail -Name[ru]=Электронная почта -Name[sk]=Pošta Name[sr]=Е-пошта Name[sr@Latn]=E-pošta Name[sv]=E-post -Name[tr]=E-Posta Name[zh_CN]=邮件 Name[zh_TW]=電子郵件 Comment=Configuration of Kontact's E-Mail Plugin <b>KMail</b>, includes a <i>Summary View Item</i> and represents a <i>Kontact Component</i>. @@ -78,16 +60,11 @@ Comment[ca]=Configuració de l'endollable de correu <b>KMail</b> del Kontact, in Comment[da]=Konfiguration af Kontacts e-mail-plugin <b>KMail</b>, inkluderer et <i>Opsummeringsvisnings-element</i> og repræsenterer en <i>Kontact-komponent</i>. Comment[de]=Einrichtung des E-Mail-Moduls <b>KMail</b> für Kontact. Die E-Mail-Komponente kann als <i>Kontact-Komponente<i> in die <i>Zusammenfassungsansicht</i> integriert werden. Comment[el]=Η ρύθμιση του προσθέτου αλληλογραφίας <b>KMail</b> του Kontact, περιέχει ένα <i>Αντικείμενο προβολής σύνοψης</i> και αντιπροσωπεύει ένα <i>Συστατικό του Kontact</i>. -Comment[es]=Configuración del complemento de correo-e de Kontact <b>KMail</b>, incluye una <i>Vista de resumen</i> y representa un <i>Componente de Kontact</i>. Comment[et]=Kontacti e-posti plugina <b>KMaili</b> seadistamine, mis sisaldab <i>kokkuvõttevaate elementi</i>. -Comment[fr]=Configuration du Module de Courriel de Kontact <b>KMail</b>, inclut un <i>Élément de Vue Résumée</i> et correspond à un <i>Composant de Kontact</i>. -Comment[is]=Stillingar fyrir tölvupóstíforrit Kontact <b>KMail</b>, inniheldur <i>yfirlitssýnarhlut</i> sem stendur fyrir <i>Kontact einingu</i>. Comment[it]=Configurazione del plugin di posta elettronica <b>KMail</b> di Kontact, include una <i>vista sommario</i> e rappresenta un <i>componente Kontact</i>. -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធរបស់កម្មវិធីជំនួយអ៊ីមែលរបស់ Kontact <b>KMail</b> រួមមាន<i>ធាតុទិដ្ឋភាពសង្ខេប</i> និងបង្ហាញ <i>សមាសភាគ Kontact</i> ។ Comment[nds]=Kontact sien Nettpost-Moduul <b>KMail</b> instellen. Stellt en <i>Översicht-Indrag</i> praat un is en <i>Kontact-Komponent</i>. Comment[nl]=Instellingen voor Kontacts e-mailplugin <b>KMail</b>. Bevat een <i>Overzichtsweergaveplugin</i> en een <i>Kontact-component</i>. Comment[pl]=Konfiguracja wtyczki poczty Kontaktu <b>KMail</b>, zawiera <i>element Podsumowanie</i> i jest <i>Składnikiem Kontaktu</i>. -Comment[ru]=Настройка модуля электронной почты <b>KMail</b> для показа в виде сводки. Comment[sr]=Подешавање Kontact-овог прикључка за е-пошту преко <b>KMail-</b>, укључујући <i>приказ сажетка</i>, и дат као <i>компонента Kontact-а</i>. Comment[sr@Latn]=Podešavanje Kontact-ovog priključka za e-poštu preko <b>KMail-</b>, uključujući <i>prikaz sažetka</i>, i dat kao <i>komponenta Kontact-a</i>. Comment[sv]=Inställning av Kontacts e-postinsticksprogram <b>Kmail</b>, omfattar ett objekt för <i>översiktsvyn</i> och representerar en <i>Kontactkomponent</i>. @@ -125,7 +102,6 @@ Name[hu]=Névjegyek Name[is]=Tengiliðir Name[it]=Contatti Name[ja]=コンタクト -Name[ka]=კონტაქტები Name[kk]=Контакттар Name[km]=ទំនាក់ទំនង Name[lt]=Kontaktai @@ -151,10 +127,9 @@ Name[sv]=Kontakter Name[ta]=தொடர்புகள் Name[tg]=Алоқот Name[th]=ที่อยู่ติดต่อ -Name[tr]=Kişiler +Name[tr]=Bağlantılar Name[uk]=Контакти -Name[uz]=Aloqalar -Name[uz@cyrillic]=Алоқалар +Name[uz]=Алоқалар Name[zh_CN]=联系人 Name[zh_TW]=聯絡人 Comment=Configuration of Kontact's Adress Book Plugin <b>KAdressbook</b> which represents a <i>Kontact Component</i>. @@ -163,16 +138,11 @@ Comment[ca]=Configuració de l'endollable de la llibreta d'adreces <b>KAdressboo Comment[da]=Konfiguration af Kontacts adressebog-plugin <b>KAdressbook</b> som repræsenterer en <i>Kontact-komponent</i>. Comment[de]=Einrichtung des Adressbuch-Moduls für Kontact, welches eine <i>Kontact-Komponente</i> repräsentiert. Comment[el]=Ρύθμιση του πρόσθετου βιβλίου διευθύνσεων <b>KAdressbook</b> του Kontact που αντιπροσωπεύει ένα <i>Συστατικό του Kontact</i>. -Comment[es]=Configuración del complemento de libreta de direcciones de Kontact <b> KAddressbok</b>, el cual representa un <i>Componente de Kontact</i>. Comment[et]=Kontacti aadressiraamatu plugina <b>KAdressbook</b> seaditamine. -Comment[fr]=Configuration du Module de Carnet d'Adresses de Kontact <b> KAdressbook</b> qui correspond à un <i>Composant de Kontact</i>. -Comment[is]=Stillingar fyrir vistfangaskráríforrit Kontact <b>KAdressbook</b>, inniheldur <i>yfirlitssýnarhlut</i> sem stendur fyrir <i>Kontact einingu</i>. Comment[it]=Configurazione del plugin rubrica di <b>KAddressbook</b> che rappresenta un <i>componente Kontact</i>. -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធរបស់កម្មវិធីជំនួយសៀវភៅអាសយដ្ឋានរបស់ Kontact <b>KAdressbook</b> ដែលបង្ហាញ <i>សមាសភាគ Kontact</i> ។ Comment[nds]=Kontact sien Adressbook-Moduul <b>KAddressbook</b> instellende, dat en <i>Kontact-Komponent</i> is. Comment[nl]=Instellingen voor Kontacts adresboekplugin <b>KMail</b>. Bevat een <i>Kontact-component</i>. Comment[pl]=Konfiguracja wtyczki książki adresowej Kontaktu <b>KAddressBook</b>, która jest <i>Składnikiem Kontaktu</i>. -Comment[ru]=Настройка модуля адресной книги <b>KAdressbook</b> для показа в виде сводки. Comment[sr]=Подешавање Kontact-овог прикључка за адресар преко <b>KAdressbook</b> у облику <i>компоненте Kontact-а</i>. Comment[sr@Latn]=Podešavanje Kontact-ovog priključka za adresar preko <b>KAdressbook</b> u obliku <i>komponente Kontact-a</i>. Comment[sv]=Inställning av Kontacts adressboksinsticksprogram <b>Kaddressbook</b>, som representerar en <i>Kontactkomponent</i>. @@ -205,7 +175,6 @@ Name[hu]=A fontos dátumok áttekintője Name[is]=Yfirlit sérstakra daga Name[it]=Sommario date speciali Name[ja]=特別な日の要約 -Name[ka]=განსაკუთრებულ თარიღთა დაიჯესტი Name[kk]=Ерекше күндер тұжырымы Name[km]=សង្ខេបថ្ងៃពិសេស Name[lt]=Ypatingų dienų santrauka @@ -219,7 +188,7 @@ Name[nn]=Samandrag for spesielle datoar Name[pl]=Podsumowanie dat specjalnych Name[pt]=Sumário de Datas Especiais Name[pt_BR]=Resumo de Datas Especiais -Name[ru]=Сводка особых дат +Name[ru]=Дайджест особых дат Name[sk]=Súhrn špeciálnych dátumov Name[sl]=Povzetek posebnih datumov Name[sr]=Сажетак посебних датума @@ -253,7 +222,6 @@ Comment[hu]=A fontos dátumok áttekintő komponense Comment[is]=Yfirlitshluti sérstakra daga Comment[it]=Componente sommario per le date speciali Comment[ja]=特別な日の要約コンポーネント -Comment[ka]=განაკუთრებულ თარიღთა დაიჯესტის კომპონენტი Comment[kk]=Ерекше күндер тұжырымының компоненті Comment[km]=សមាសភាគសង្ខេបនៃថ្ងៃពិសេស Comment[lt]=Ypatingų dienų santraukos komponentas @@ -267,7 +235,7 @@ Comment[nn]=Komponent for samandrag for spesielle datoar Comment[pl]=Składnik podsumowania dat specjalnych Comment[pt]=Componente de Sumário de Datas Especiais Comment[pt_BR]=Componente de Datas Especiais -Comment[ru]=Компонент сводки особых дат +Comment[ru]=Компонент дайджеста особых дат Comment[sk]=Komponent súhrnu špeciálnych dátumov Comment[sl]=Komponenta za povzetke posebnih datumov Comment[sr]=Компонента сажетка посебних датума @@ -311,7 +279,6 @@ Name[hu]=Naptár Name[is]=Dagatal Name[it]=Calendario Name[ja]=カレンダー -Name[ka]=კალენდარი Name[kk]=Күнтізбе Name[km]=ប្រតិទិន Name[lt]=Kalendorius @@ -338,8 +305,7 @@ Name[tg]=Тақвим Name[th]=บันทึกประจำวัน Name[tr]=Takvim Name[uk]=Календар -Name[uz]=Kalendar -Name[uz@cyrillic]=Календар +Name[uz]=Календар Name[zh_CN]=日历 Name[zh_TW]=行事曆 Comment=Configuration of Kontact's Calendar Plugin <b>KOrganizer</b>, includes a <i>Summary View Item</i> and represents a <i>Kontact Component</i>. @@ -348,16 +314,11 @@ Comment[ca]=Configuració de l'endollable de calendari <b>KOrganizer</b> del Kon Comment[da]=Konfiguration af Kontacts kalender-plugin <b>KOrganizer</b>, inkluderer et <i>Opsummeringsvisningselement</i> og repræsenterer en <i>Kontact-komponent</i>. Comment[de]=Einrichtung des Kalender-Moduls <b>KOrganizer</b> für Kontact, einschließlich der <i>Zusammenfassungsansicht</i>; repräsentiert eine <i>Kontact-Komponente</i> Comment[el]=Η ρύθμιση του προσθέτου ημερολογίου του <b>KOrganizer</b> του Kontact, περιέχει ένα <i>Αντικείμενο προβολής σύνοψης</i> και αντιπροσωπεύει ένα <i>Συστατικό του Kontact</i>. -Comment[es]=Configuración del complemento de calendario de Kontact, <b> KOrganizer</b>, incluye una <i>Vista de resumen</i> y representa un <i>Componente de Kontact</i>. Comment[et]=Kontacti kalendriplugina <b>KOrganizeri</b> seadistamine, mis sisaldab <i>kokkuvõttevaate elementi</i>. -Comment[fr]=Configuration du Module de Calendrier de Kontact <b>KOrganizer</b>, inclut un <i>Élément de Vue Résumée</i> et correspond à un <i>Composant de Kontact</i>. -Comment[is]=Stillingar fyrir dagatalsíforrit Kontact <b>KOrganizer</b>, inniheldur <i>yfirlitssýnarhlut</i> sem stendur fyrir <i>Kontact einingu</i>. Comment[it]=Configurazione del plugin calendario <b>KOrganizer</b> di Kontact, include una <i>vista sommario</i> e rappresenta un <i>componente Kontact</i>. -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធរបស់កម្មវិធីជំនួយប្រតិទិនរបស់ Kontact <b>KOrganizer</b>រួមមាន <i>ធាតុទិដ្ឋភាពសង្ខេប</i> និងបង្ហាញ <i>សមាសភាគ Kontact</i>. Comment[nds]=Kontact sien Kalenner-Moduul <b>KOrganizer</b> instellen. Stellt en <i>Översicht-Indrag</i> praat un is en <i>Kontact-Komponent</i>. Comment[nl]=Instellingen voor Kontacts agendaplugin <b>KOrganizer</b>. Bevat een <i>Overzichtsweergaveplugin</i> en een <i>Kontact-component</i>. Comment[pl]=Konfiguracja wtyczki kalendarza Kontaktu <b>KOrganizer</b>, zawiera <i>element Podsumowanie</i> i jest <i>Składnikiem Kontaktu</i>. -Comment[ru]=Настройка модуля календаря <b>KOrganizer</b> для показа в виде сводки. Comment[sr]=Подешавање Kontact-овог прикључка за календар преко <b>KOrganizer-а</b>, укључујући <i>приказ сажетка</i>, и дат као <i>компонента Kontact-а</i>. Comment[sr@Latn]=Podešavanje Kontact-ovog priključka za kalendar preko <b>KOrganizer-a</b>, uključujući <i>prikaz sažetka</i>, i dat kao <i>komponenta Kontact-a</i>. Comment[sv]=Inställning av Kontacts kalenderinsticksprogram <b>Korganizer</b>, omfattar ett objekt för <i>översiktsvyn</i> och representerar en <i>Kontactkomponent</i>. @@ -395,7 +356,6 @@ Name[hi]=समाचार Name[hu]=Hírek Name[is]=Fréttir Name[ja]=ニュース -Name[ka]=სიახლეები Name[kk]=Жаңалықтар Name[km]=ព័ត៌មាន Name[lt]=Naujienos @@ -423,8 +383,7 @@ Name[tg]=Ахборот Name[th]=ข่าว Name[tr]=Haberler Name[uk]=Новини -Name[uz]=Yangiliklar -Name[uz@cyrillic]=Янгиликлар +Name[uz]=Янгиликлар Name[zh_CN]=新闻 Name[zh_TW]=新聞 Comment=Configuration of Kontact's News Plugin <b>KNode</b> which represents a <i>Kontact Component</i>. @@ -433,16 +392,11 @@ Comment[ca]=Configuració de l'endollable de notícies <b>KNode</b> del Kontact, Comment[da]=Konfiguration af Kontacts nyheds-plugin <b>KNode</b> som repræsenterer en <i>Kontact-komponent</i>. Comment[de]=Einrichtung des News-Moduls <b>KNode</b> für Kontact; repräsentiert eine <i>Kontact-Komponente</i> Comment[el]=Ρύθμιση του πρόσθετου νέων <b>KNode</b> του Kontact που αντιπροσωπεύει ένα <i>Συστατικό του Kontact</i>. -Comment[es]=Configuración del complemento de noticias de Kontact <b>KNode</b> , el cual representa un <i>Componente de Kontact</i>. Comment[et]=Kontacti uudisteplugina <b>KNode</b> seadistamine. -Comment[fr]=Configuration du Module de Nouvelles de Kontact <b>KNode</b> qui correspond à un <i>Composant de Kontact</i>. -Comment[is]=Stillingar fyrir fréttastraumsíforrit Kontact <b>KNode</b>, inniheldur <i>yfirlitssýnarhlut</i> sem stendur fyrir <i>Kontact einingu</i>. Comment[it]=Configurazione del plugin notizie <b>KNode</b> di Kontact, che rappresenta un <i>componente Kontact</i>. -Comment[km]=ការកំណត់រចនាសម្ព័ន្ធរបស់កម្មវិធីជំនួយព័ត៌មានរបស់ Kontact <b>KNode</b> ដែលបង្ហាញ <i>សមាភាគរបស់ Kontact</i> ។ Comment[nds]=Kontact sien Narichten-Moduul <b>KNode</b> instellen, dat en <i>Kontact-Komponent</i> is. Comment[nl]=Instellingen voor Kontacts nieuwsplugin <b>KNode</b>. Bevat een <i>Kontact-component</i>. -Comment[pl]=Konfiguracja wtyczki wiadomości Kontaktu <b>KNode</b>, która jest <i>składnikiem Kontaktu</i>. -Comment[ru]=Настройка модуля новостей <b>KNode</b> для показа в виде сводки. +Comment[pl]=Konfiguracja wtyczki niusów Kontaktu <b>KNode</b>, która jest <i>Składnikiem Kontaktu</i>. Comment[sr]=Подешавање Kontact-овог прикључка за вести преко <b>KNode-а</b> у облику <i>компненте Kontact-а</i>. Comment[sr@Latn]=Podešavanje Kontact-ovog priključka za vesti preko <b>KNode-a</b> u obliku <i>kompnente Kontact-a</i>. Comment[sv]=Inställning av Kontacts nyhetsinsticksprogram <b>Knode</b>, som representerar en <i>Kontactkomponent</i>. @@ -481,7 +435,6 @@ Name[hu]=Időjárás Name[is]=Veður Name[it]=Tempo meteorologico Name[ja]=気象情報 -Name[ka]=ამინდი Name[kk]=Ауа райы Name[km]=អាកាសធាតុ Name[lt]=Orų pranešėjas @@ -508,8 +461,7 @@ Name[tg]=Пешгӯии ҳаво Name[th]=รายงานอากาศ Name[tr]=Hava Durumu Name[uk]=Погода -Name[uz]=Ob-havo -Name[uz@cyrillic]=Об-ҳаво +Name[uz]=Об-ҳаво Name[zh_CN]=天气 Name[zh_TW]=天氣 Comment=Weather Information Component @@ -518,22 +470,15 @@ Comment[ca]=Component d'informació del temps Comment[da]=Komponent til vejrinformation Comment[de]=Komponente für Wetterinformationen Comment[el]=Συστατικό πληροφοριών καιρού -Comment[es]=Componente de información meteorológica Comment[et]=Ilmateate komponent -Comment[fr]=Composant d'Informations météorologiques -Comment[is]=Eining fyrir veðurupplýsingar Comment[it]=Informazioni meteorologiche Comment[ja]=気象情報コンポーネント -Comment[km]=សមាសភាគព័ត៌មានអាកាសធាតុ Comment[nds]=Wederinformatschonen-Komponent Comment[nl]=Weerinformatiecomponent Comment[pl]=Składnik informacji o pogodzie -Comment[ru]=Информация о погоде -Comment[sk]=Informácie o počasí Comment[sr]=Компонента информација о времену Comment[sr@Latn]=Komponenta informacija o vremenu Comment[sv]=Komponent med väderrapport -Comment[tr]=Hava Durumu Bilgisi Bileşeni Comment[zh_CN]=天气信息组件 Comment[zh_TW]=天氣資訊組件 Weight=1000 @@ -566,7 +511,6 @@ Name[id]=Ticker Berita Name[is]=Fréttastrimill Name[it]=Ticker notizie Name[ja]=ニュースティッカー -Name[ka]=სიახლეთა ტიკერი Name[kk]=Жаңалық таспасы Name[km]=កម្មវិធីទទួលព័ត៌មាន Name[lt]=News pranešėjas @@ -618,7 +562,6 @@ Comment[hu]=Hírmegjelenítő komponens Comment[is]=Fréttastrimilshluti Comment[it]=Ticker notizie Comment[ja]=ニュースティッカーコンポーネント -Comment[ka]=სიახლეთა ტიკერის კომპონენტი Comment[kk]=Жаңалық таспасының компоненті Comment[km]=សមាសភាគកម្មវិធីទទួលព័ត៌មាន Comment[lt]=Naujienų pranešėjo komponentas diff --git a/kontact/src/kontactui.rc b/kontact/src/kontactui.rc index 8c68f0607..bd846c78c 100644 --- a/kontact/src/kontactui.rc +++ b/kontact/src/kontactui.rc @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE gui SYSTEM "kpartgui.dtd"> -<gui version="22" name="kontact" > +<gui version="23" name="kontact" > <MenuBar> <Menu name="file" noMerge="1"> <text>&File</text> @@ -31,15 +31,12 @@ <Menu name="help"><text>&Help</text> <Action name="help_introduction"/> <Action name="help_tipofday"/> - <Separator/> - <Action name="help_requestfeature"/> </Menu> </MenuBar> <ToolBar position="Top" noMerge="1" name="mainToolBar"><text>Main Toolbar</text> <Action name="action_new"/> <Action name="action_sync"/> <Merge/> - <Action name="help_whats_this"/> </ToolBar> <ToolBar position="Top" hidden="true" name="navigatorToolBar"><text>Navigator</text> <Action name="navigator_spacer_item"/> diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index c19872357..ee098180e 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -40,17 +40,21 @@ #include "alarmclient.h" #include "mainwindow.h" #include <uniqueapphandler.h> // in ../interfaces +#include "profilemanager.h" using namespace std; static const char description[] = I18N_NOOP( "KDE personal information manager" ); -static const char version[] = "1.2.9"; +static const char version[] = "1.2.9 (enterprise35 0.20100827.1168748)"; class KontactApp : public KUniqueApplication { public: - KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) {} + KontactApp() : mMainWindow( 0 ), mSessionRestored( false ) + { + KGlobal::iconLoader()->addAppDir( "kdepim" ); + } ~KontactApp() {} int newInstance(); @@ -84,6 +88,14 @@ static void listPlugins() } } +static void listProfiles() +{ + TQValueList<Kontact::Profile> profiles = Kontact::ProfileManager::self()->profiles(); + for( TQValueListIterator<Kontact::Profile> it = profiles.begin() ; it != profiles.end(); ++it ) { + cout << (*it).name().latin1() << endl; + } +} + int KontactApp::newInstance() { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -112,6 +124,16 @@ int KontactApp::newInstance() } } + if ( args->isSet( "profile" ) ) { + TQValueList<Kontact::Profile> profiles = Kontact::ProfileManager::self()->profiles(); + for( TQValueListIterator<Kontact::Profile> it = profiles.begin(); it != profiles.end(); ++it ){ + if( args->getOption("profile") == (*it).name().latin1() ) { + Kontact::ProfileManager::self()->loadProfile( (*it).id() ); + break; + } + } + } + AlarmClient alarmclient; alarmclient.startDaemon(); @@ -143,6 +165,11 @@ int main( int argc, char **argv ) return 0; } + if ( args->isSet( "listprofiles" ) ) { + listProfiles(); + return 0; + } + if ( !KontactApp::start() ) { // Already running, brought to the foreground. return 0; diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 541742bba..247bb6654 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <tqaction.h> #include <tqcombobox.h> #include <tqdockarea.h> #include <tqguardedptr.h> @@ -122,6 +123,27 @@ void MainWindow::initGUI() connect( helpMenu, TQT_SIGNAL( showAboutApplication() ), TQT_SLOT( showAboutDialog() ) ); + KTrader::OfferList offers = KTrader::self()->query( + TQString::fromLatin1( "Kontact/Plugin" ), + TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); + + KPluginInfo::List::Iterator it; + for ( it = mPluginInfos.begin(); it != mPluginInfos.end(); ++it ) { + (*it)->load(); + + KAction *action = new KAction( (*it)->name(), (*it)->icon(), KShortcut(), + this, TQT_SLOT(slotActionTriggered()), + actionCollection(), (*it)->pluginName().latin1() ); + action->setName( (*it)->pluginName().latin1() ); + action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); + + TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); + if ( !hasPartProp.isValid() || hasPartProp.toBool() ) { + mActionPlugins.append( action ); + } + } + KStdAction::keyBindings( this, TQT_SLOT( configureShortcuts() ), actionCollection() ); KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() ); setXMLFile( "kontactui.rc" ); @@ -130,38 +152,27 @@ void MainWindow::initGUI() createGUI( 0 ); + loadPlugins(); + resize( 700, 520 ); // initial size to prevent a scrollbar in sidepane setAutoSaveSettings(); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), this, TQT_SLOT( slotLoadProfile( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ), + connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ), this, TQT_SLOT( slotSaveToProfile( const TQString& ) ) ); } void MainWindow::initObject() { - KTrader::OfferList offers = KTrader::self()->query( - TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); - mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); - - KPluginInfo::List::Iterator it; - for ( it = mPluginInfos.begin(); it != mPluginInfos.end(); ++it ) { - ( *it )->load(); - } - // prepare the part manager mPartManager = new KParts::PartManager( this ); connect( mPartManager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ), this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); - loadPlugins(); - if ( mSidePane ) { mSidePane->updatePlugins(); - plugActionList( "navigator_actionlist", mSidePane->actions() ); } KSettings::Dispatcher::self()->registerInstance( instance(), this, @@ -240,8 +251,6 @@ void MainWindow::initWidgets() sizes << 0; mSplitter->setSizes(sizes); - mSidePane->setActionCollection( actionCollection() ); - connect( mSidePane, TQT_SIGNAL( pluginSelected( Kontact::Plugin * ) ), TQT_SLOT( selectPlugin( Kontact::Plugin * ) ) ); @@ -348,9 +357,7 @@ void MainWindow::setupActions() actionCollection(), "help_introduction" ); new KAction( i18n( "&Tip of the Day" ), 0, this, TQT_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); - new KAction( i18n( "&Request Feature..." ), 0, this, TQT_SLOT( slotRequestFeature() ), - actionCollection(), "help_requestfeature" ); - + KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); spacerAction->setAutoSized( true ); } @@ -387,7 +394,7 @@ void MainWindow::slotSaveToProfile( const TQString& id ) ::copyConfigEntry( cfg, &profile, "MainWindow Toolbar navigatorToolBar", "Hidden", "true" ); ::copyConfigEntry( cfg, &profile, "View", "SidePaneSplitter" ); ::copyConfigEntry( cfg, &profile, "Icons", "Theme" ); - + for ( PluginList::Iterator it = mPlugins.begin(); it != mPlugins.end(); ++it ) { if ( !(*it)->isRunningStandalone() ) { (*it)->part(); @@ -461,6 +468,61 @@ Plugin *MainWindow::pluginFromInfo( const KPluginInfo *info ) return 0; } +Plugin *MainWindow::pluginFromAction( const KAction *action ) +{ + PluginList::ConstIterator end = mPlugins.end(); + for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it ) { + if ( (*it)->identifier() == action->name() ) { + return *it; + } + } + return 0; +} + +bool MainWindow::isPluginLoadedByAction( const KAction *action ) +{ + KPluginInfo::List::ConstIterator it; + for ( it = mPluginInfos.begin(); it != mPluginInfos.end(); ++it ) { + if ( !(*it)->isPluginEnabled() ) + continue; + if ( isPluginLoaded( *it ) ) { + Plugin *plugin = pluginFromInfo( *it ); + if ( plugin ) { + if ( plugin->identifier() == action->name() ) { + return true; + } + } + } + } + return false; +} + +void MainWindow::sortActionsByWeight() +{ + TQPtrList<KAction> sorted; + + TQPtrListIterator<KAction> eit( mActionPlugins ); + KAction *action; + while ( ( action = eit.current() ) != 0 ) { + ++eit; + TQPtrListIterator<KAction> sortIt( sorted ); + uint at = 0; + KAction *saction; + Plugin *p1 = pluginFromAction( action ); + while ( ( saction = sortIt.current() ) != 0 ) { + Plugin *p2 = pluginFromAction( saction ); + if ( p1 && p2 && p1->weight() >= p2->weight() ) { + ++sortIt; + ++at; + } else { + break; + } + } + sorted.insert( at, action ); + } + mActionPlugins = sorted; +} + void MainWindow::loadPlugins() { TQPtrList<Plugin> plugins; @@ -523,6 +585,9 @@ void MainWindow::loadPlugins() for ( action = actionList->first(); action; action = actionList->next() ) { kdDebug(5600) << "Plugging " << action->name() << endl; action->plug( mNewActions->popupMenu() ); + if ( action->name() == plugin->identifier() ) { + mPluginAction.insert( plugin, action ); + } } if ( mSyncActionsEnabled ) { @@ -534,6 +599,7 @@ void MainWindow::loadPlugins() } addPlugin( plugin ); } + updateShortcuts(); mNewActions->setEnabled( mPlugins.size() != 0 ); if ( mSyncActionsEnabled ) @@ -542,24 +608,47 @@ void MainWindow::loadPlugins() void MainWindow::unloadPlugins() { - KPluginInfo::List::ConstIterator end = mPluginInfos.end(); + KPluginInfo::List::ConstIterator end = mPluginInfos.constEnd(); KPluginInfo::List::ConstIterator it; - for ( it = mPluginInfos.begin(); it != end; ++it ) { + for ( it = mPluginInfos.constBegin(); it != end; ++it ) { if ( !(*it)->isPluginEnabled() ) removePlugin( *it ); } } +void MainWindow::updateShortcuts() +{ + TQPtrList<KAction> loadedActions; + + sortActionsByWeight(); + + TQPtrListIterator<KAction> it( mActionPlugins ); + int i = 1; + KAction *action; + while ( ( action = it.current() ) != 0 ) { + ++it; + if ( isPluginLoadedByAction( action ) ) { + loadedActions.append( action ); + TQString shortcut = TQString( "CTRL+%1" ).arg( i ); + action->setShortcut( KShortcut( shortcut ) ); + i++; + } else { + action->setShortcut( KShortcut() ); + } + } + unplugActionList( "navigator_actionlist" ); + factory()->plugActionList( this, TQString( "navigator_actionlist" ), loadedActions ); +} + bool MainWindow::removePlugin( const KPluginInfo *info ) { PluginList::Iterator end = mPlugins.end(); - for ( PluginList::Iterator it = mPlugins.begin(); it != end; ++it ) + for ( PluginList::Iterator it = mPlugins.begin(); it != end; ++it ) { if ( ( *it )->identifier() == info->pluginName() ) { Plugin *plugin = *it; KAction *action; TQPtrList<KAction> *actionList = plugin->newActions(); - for ( action = actionList->first(); action; action = actionList->next() ) { kdDebug(5600) << "Unplugging " << action->name() << endl; action->unplug( mNewActions->popupMenu() ); @@ -577,9 +666,13 @@ bool MainWindow::removePlugin( const KPluginInfo *info ) if ( mCurrentPlugin == plugin ) mCurrentPlugin = 0; - delete plugin; // removes the part automatically + plugin->deleteLater(); // removes the part automatically mPlugins.remove( it ); + if ( plugin->showInSideBar() ) { + mPluginAction.remove( plugin ); + } + if ( mCurrentPlugin == 0 ) { PluginList::Iterator it; for ( it = mPlugins.begin(); it != mPlugins.end(); ++it ) { @@ -589,10 +682,9 @@ bool MainWindow::removePlugin( const KPluginInfo *info ) } } } - return true; } - + } return false; } @@ -674,6 +766,15 @@ KToolBar* Kontact::MainWindow::findToolBar(const char* name) return static_cast<KToolBar *>(child(name, "KToolBar")); } +void MainWindow::slotActionTriggered() +{ + const KAction *actionSender = static_cast<const KAction*>( sender() ); + TQString identifier = actionSender->name(); + if ( !identifier.isEmpty() ) { + selectPlugin( identifier ); + } +} + void MainWindow::selectPlugin( Kontact::Plugin *plugin ) { if ( !plugin ) @@ -713,8 +814,9 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) } } - if ( mSidePane ) - mSidePane->selectPlugin( plugin ); + if ( mSidePane ) { + mSidePane->selectPlugin( plugin->identifier() ); + } plugin->select(); @@ -832,12 +934,6 @@ void MainWindow::slotShowTip() showTip( true ); } -void MainWindow::slotRequestFeature() -{ - if ( kapp ) - kapp->invokeBrowser( "http://kontact.org/shopping" ); -} - void MainWindow::slotShowIntroduction() { mPartsStack->raiseWidget( 0 ); // ### @@ -915,11 +1011,10 @@ int MainWindow::startServiceFor( const TQString& serviceType, void MainWindow::pluginsChanged() { - unplugActionList( "navigator_actionlist" ); unloadPlugins(); loadPlugins(); mSidePane->updatePlugins(); - plugActionList( "navigator_actionlist", mSidePane->actions() ); + updateShortcuts(); } void MainWindow::updateConfig() @@ -965,9 +1060,13 @@ void MainWindow::configureToolbars() void MainWindow::slotNewToolbarConfig() { - if ( mCurrentPlugin && mCurrentPlugin->part() ) + if ( mCurrentPlugin && mCurrentPlugin->part() ) { createGUI( mCurrentPlugin->part() ); - applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + } + if ( mCurrentPlugin ) { + applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + } + updateShortcuts(); // for the plugActionList call } void MainWindow::slotOpenUrl( const KURL &url ) @@ -980,8 +1079,16 @@ void MainWindow::slotOpenUrl( const KURL &url ) KRun::runCommand( "groupwarewizard" ); slotQuit(); } - } else + if ( url.path().startsWith( "/help" ) ) { + TQString app( "kontact" ); + if ( !url.query().isEmpty() ) { + app = url.query().mid( 1 ); + } + kapp->invokeHelp( TQString::null, app ); + } + } else { new KRun( url, this ); + } } void MainWindow::readProperties( KConfig *config ) @@ -1073,11 +1180,11 @@ TQString MainWindow::introductionString() "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" ) .arg( kapp->aboutData()->version() ) .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) - .arg( "help:/kontact" ) + .arg( "exec:/help?kontact" ) .arg( iconSize ) .arg( iconSize ) .arg( handbook_icon_path ) - .arg( "help:/kontact" ) + .arg( "exec:/help?kontact" ) .arg( i18n( "Read Manual" ) ) .arg( i18n( "Learn more about Kontact and its components" ) ) .arg( "http://kontact.org" ) diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h index 892fce64e..5d5945b6b 100644 --- a/kontact/src/mainwindow.h +++ b/kontact/src/mainwindow.h @@ -36,6 +36,7 @@ #include "core.h" #include "kontactiface.h" +class TQAction; class TQHBox; class TQSplitter; class TQVBox; @@ -56,11 +57,12 @@ namespace KPIM namespace Kontact { -class Plugin; -class SidePaneBase; class AboutDialog; +class IconSidePane; +class Plugin; typedef TQValueList<Kontact::Plugin*> PluginList; +typedef TQPtrList<KAction> ActionPluginList; class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface { @@ -83,6 +85,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont public slots: virtual void selectPlugin( Kontact::Plugin *plugin ); virtual void selectPlugin( const TQString &pluginName ); + void slotActionTriggered(); void updateConfig(); @@ -95,7 +98,6 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont void slotSyncClicked(); void slotQuit(); void slotShowTip(); - void slotRequestFeature(); void slotConfigureProfiles(); void slotLoadProfile( const TQString& id ); void slotSaveToProfile( const TQString& id ); @@ -112,10 +114,14 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont void loadSettings(); void saveSettings(); + void sortActionsByWeight(); bool isPluginLoaded( const KPluginInfo * ); + bool isPluginLoadedByAction( const KAction *action ); Kontact::Plugin *pluginFromInfo( const KPluginInfo * ); + Kontact::Plugin *pluginFromAction( const KAction * ); void loadPlugins(); void unloadPlugins(); + void updateShortcuts(); bool removePlugin( const KPluginInfo * ); void addPlugin( Kontact::Plugin *plugin ); void partLoaded( Kontact::Plugin *plugin, KParts::ReadOnlyPart *part ); @@ -141,12 +147,13 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont KToolBarPopupAction *mNewActions; KToolBarPopupAction *mSyncActions; - SidePaneBase *mSidePane; + IconSidePane *mSidePane; TQWidgetStack *mPartsStack; Plugin *mCurrentPlugin; KParts::PartManager *mPartManager; PluginList mPlugins; PluginList mDelayedPreload; + ActionPluginList mActionPlugins; TQValueList<KPluginInfo*> mPluginInfos; KHTMLPart *mIntroPart; @@ -156,6 +163,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont TQString mActiveModule; TQMap<TQString, TQGuardedPtr<TQWidget> > mFocusWidgets; + TQMap<Kontact::Plugin *, KAction *> mPluginAction; AboutDialog *mAboutDialog; bool mReallyClose; diff --git a/kontact/src/sidepanebase.cpp b/kontact/src/sidepanebase.cpp index 28bae2999..92a3ce510 100644 --- a/kontact/src/sidepanebase.cpp +++ b/kontact/src/sidepanebase.cpp @@ -39,14 +39,4 @@ Core* SidePaneBase::core() const return mCore; } -void SidePaneBase::setActionCollection( KActionCollection *actionCollection ) -{ - mActionCollection = actionCollection; -} - -KActionCollection *SidePaneBase::actionCollection() const -{ - return mActionCollection; -} - #include "sidepanebase.moc" diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h index 407d98de6..0b4a7a542 100644 --- a/kontact/src/sidepanebase.h +++ b/kontact/src/sidepanebase.h @@ -38,11 +38,6 @@ class SidePaneBase : public QVBox SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 ); virtual ~SidePaneBase(); - void setActionCollection( KActionCollection *actionCollection ); - KActionCollection *actionCollection() const; - - virtual const TQPtrList<KAction> & actions() = 0; - signals: void pluginSelected( Kontact::Plugin* ); @@ -53,17 +48,6 @@ class SidePaneBase : public QVBox */ virtual void updatePlugins() = 0; - /** - Select the current plugin without emmiting a signal. - This is used to sync with the core. - */ - virtual void selectPlugin( Kontact::Plugin* ) = 0; - - /** - This is an overloaded member function. It behaves essentially like the - above function. - */ - virtual void selectPlugin( const TQString &name ) = 0; virtual void indicateForegrunding( Kontact::Plugin* ) = 0; protected: |