From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knode/KNode.desktop | 1 - knode/articlewidget.cpp | 45 +++++++++++++++++++++-------------- knode/kncomposer.cpp | 2 +- knode/knglobals.cpp | 27 +++++++++++++++++++++ knode/knglobals.h | 3 +++ knode/knode_config_accounts.desktop | 5 +--- knode/knode_config_appearance.desktop | 5 +--- knode/knode_config_cleanup.desktop | 2 -- knode/knode_config_identity.desktop | 5 +--- knode/knode_config_post_news.desktop | 1 - knode/knode_config_privacy.desktop | 2 -- knode/knode_config_read_news.desktop | 4 +--- 12 files changed, 62 insertions(+), 40 deletions(-) (limited to 'knode') diff --git a/knode/KNode.desktop b/knode/KNode.desktop index dda0bb6b9..99e5d8674 100644 --- a/knode/KNode.desktop +++ b/knode/KNode.desktop @@ -44,7 +44,6 @@ GenericName[id]=Pembaca Berita GenericName[is]=Fréttaforrit GenericName[it]=Lettore newsgroup GenericName[ja]=ニュースリーダー -GenericName[ka]=სიახლეების წამკითხველი GenericName[kk]=Жаңалықтарды оқу құралы GenericName[km]=កម្មវិធី​អាន​ព័ត៌មាន GenericName[lt]=Naujienų skaityklė diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 1bb7527fe..357a9c009 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -278,10 +278,12 @@ void ArticleWidget::disableActions() void ArticleWidget::readConfig() { - mFixedFontToggle->setChecked( knGlobals.configManager()->readNewsViewer()->useFixedFont() ); - mFancyToggle->setChecked( knGlobals.configManager()->readNewsViewer()->interpretFormatTags() ); + KNConfigManager *cfgMgr = knGlobals.configManager(); - mShowHtml = knGlobals.configManager()->readNewsViewer()->alwaysShowHTML(); + mFixedFontToggle->setChecked( cfgMgr->readNewsViewer()->useFixedFont() ); + mFancyToggle->setChecked( cfgMgr->readNewsViewer()->interpretFormatTags() ); + + mShowHtml = cfgMgr->readNewsViewer()->alwaysShowHTML(); KConfig *conf = knGlobals.config(); conf->setGroup( "READNEWS" ); @@ -296,7 +298,7 @@ void ArticleWidget::readConfig() delete mCSSHelper; mCSSHelper = new CSSHelper( TQPaintDeviceMetrics( mViewer->view() ) ); - if ( !knGlobals.configManager()->readNewsGeneral()->autoMark() ) + if ( !cfgMgr->readNewsGeneral()->autoMark() ) mTimer->stop(); } @@ -312,8 +314,9 @@ void ArticleWidget::writeConfig() conf->writeEntry( "attachmentStyle", mAttachmentStyle ); conf->writeEntry( "headerStyle", mHeaderStyle ); - knGlobals.configManager()->readNewsViewer()->setUseFixedFont( mFixedFontToggle->isChecked() ); - knGlobals.configManager()->readNewsViewer()->setInterpretFormatTags( mFancyToggle->isChecked() ); + KNConfigManager *cfgMgr = knGlobals.configManager(); + cfgMgr->readNewsViewer()->setUseFixedFont( mFixedFontToggle->isChecked() ); + cfgMgr->readNewsViewer()->setInterpretFormatTags( mFancyToggle->isChecked() ); } @@ -324,7 +327,8 @@ void ArticleWidget::setArticle( KNArticle *article ) if ( mArticle && mArticle->isOrphant() ) delete mArticle; - mShowHtml = knGlobals.configManager()->readNewsViewer()->alwaysShowHTML(); + KNConfigManager *cfgMgr = knGlobals.configManager(); + mShowHtml = cfgMgr->readNewsViewer()->alwaysShowHTML(); mRot13 = false; mRot13Toggle->setChecked( false ); mTimer->stop(); @@ -380,7 +384,8 @@ void ArticleWidget::displayArticle() mArticle->setForceDefaultCS( mForceCharset ); } - KNConfig::ReadNewsViewer *rnv = knGlobals.configManager()->readNewsViewer(); + KNConfigManager *cfgMgr = knGlobals.configManager(); + KNConfig::ReadNewsViewer *rnv = cfgMgr->readNewsViewer(); removeTempFiles(); mViewer->begin(); @@ -460,12 +465,12 @@ void ArticleWidget::displayArticle() mViewer->write( i18n("
This article has the MIME type "message/partial", which KNode cannot handle yet.
Meanwhile you can save the article as a text file and reassemble it by hand.") ); } - // display body text + // display body text if ( text && text->hasContent() && !ct->isPartial() ) { // handle HTML messages if ( text->contentType()->isHTMLText() ) { TQString htmlTxt; - text->decodedText( htmlTxt, true, knGlobals.configManager()->readNewsViewer()->removeTrailingNewlines() ); + text->decodedText( htmlTxt, true, cfgMgr->readNewsViewer()->removeTrailingNewlines() ); if ( mShowHtml ) { // strip & int i = kMin( htmlTxt.findRev( "", -1, false ), htmlTxt.findRev( "", -1, false ) ); @@ -487,7 +492,7 @@ void ArticleWidget::displayArticle() else { if ( !containsPGP ) { TQStringList lines; - text->decodedText( lines, true, knGlobals.configManager()->readNewsViewer()->removeTrailingNewlines() ); + text->decodedText( lines, true, cfgMgr->readNewsViewer()->removeTrailingNewlines() ); displayBodyBlock( lines ); } } @@ -508,8 +513,8 @@ void ArticleWidget::displayArticle() mViewer->end(); enableActions(); - if( mArticle->type() == KMime::Base::ATremote && knGlobals.configManager()->readNewsGeneral()->autoMark() ) - mTimer->start( knGlobals.configManager()->readNewsGeneral()->autoMarkSeconds() * 1000, true ); + if( mArticle->type() == KMime::Base::ATremote && cfgMgr->readNewsGeneral()->autoMark() ) + mTimer->start( cfgMgr->readNewsGeneral()->autoMarkSeconds() * 1000, true ); } @@ -527,7 +532,8 @@ void ArticleWidget::displayErrorMessage( const TQString &msg ) mViewer->end(); // mark article as read if there is a negative reply from the server - if ( knGlobals.configManager()->readNewsGeneral()->autoMark() && + KNConfigManager *cfgMgr = knGlobals.configManager(); + if ( cfgMgr->readNewsGeneral()->autoMark() && mArticle && mArticle->type() == KMime::Base::ATremote && !mArticle->isOrphant() && ( msg.find("430") != -1 || msg.find("423") != -1 ) ) { KNRemoteArticle::List l; @@ -569,7 +575,8 @@ void ArticleWidget::displayHeader() // standard & fancy header style KMime::Headers::Base *hb; - TQValueList dhs = knGlobals.configManager()->displayedHeaders()->headers(); + KNConfigManager *cfgMgr = knGlobals.configManager(); + TQValueList dhs = cfgMgr->displayedHeaders()->headers(); for ( TQValueList::Iterator it = dhs.begin(); it != dhs.end(); ++it ) { KNDisplayedHeader *dh = (*it); hb = mArticle->getHeaderByType(dh->header().latin1()); @@ -648,7 +655,7 @@ void ArticleWidget::displayHeader() // references KMime::Headers::References *refs = mArticle->references( false ); if ( mArticle->type() == KMime::Base::ATremote && refs - && knGlobals.configManager()->readNewsViewer()->showRefBar() ) { + && cfgMgr->readNewsViewer()->showRefBar() ) { html += "
"; int refCnt = refs->count(), i = 1; TQCString id = refs->first(); @@ -674,7 +681,8 @@ void ArticleWidget::displayBodyBlock( const TQStringList &lines ) int oldLevel = -2, newLevel = -2; bool isSig = false; TQString line, html; - KNConfig::ReadNewsViewer *rnv = knGlobals.configManager()->readNewsViewer(); + KNConfigManager *cfgMgr = knGlobals.configManager(); + KNConfig::ReadNewsViewer *rnv = cfgMgr->readNewsViewer(); TQString quoteChars = rnv->quoteCharacters().simplifyWhiteSpace(); if (quoteChars.isEmpty()) quoteChars = ">"; @@ -1160,7 +1168,8 @@ void ArticleWidget::slotURLClicked( const KURL &url, bool forceOpen) if ( !c ) return; // TODO: replace with message box as done in KMail - if ( forceOpen || knGlobals.configManager()->readNewsViewer()->openAttachmentsOnClick() ) + KNConfigManager *cfgMgr = knGlobals.configManager(); + if ( forceOpen || cfgMgr->readNewsViewer()->openAttachmentsOnClick() ) knGlobals.articleManager()->openContent( c ); else knGlobals.articleManager()->saveContentToFile( c, this ); diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 111bdf19e..53520e29d 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -2069,7 +2069,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) } else { - p.insertItem( TQString::fromLatin1("No Suggestions"), -2 ); + p.insertItem( i18n( "No Suggestions" ), -2 ); } //Execute the popup inline diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp index be9bb1488..eaf026e8d 100644 --- a/knode/knglobals.cpp +++ b/knode/knglobals.cpp @@ -32,6 +32,33 @@ #include "knmainwidget.h" #include "knwidgets.h" +KNGlobals::KNGlobals() : + mNetAccess( 0 ), + mCfgManager( 0 ), + mAccManager( 0 ), + mGrpManager( 0 ), + mArtManager( 0 ), + mFilManager( 0 ), + mFolManager( 0 ), + mMemManager( 0 ) +{ +} + +KNGlobals::~KNGlobals( ) +{ +#if 0 +// hmm.. something in here is causing an 'impossible' crash. let's ignore the cleanup then. + delete mNetAccess; + delete mCfgManager; + delete mAccManager; + delete mGrpManager; + delete mArtManager; + delete mFilManager; + delete mFolManager; + delete mMemManager; +#endif +} + KConfig* KNGlobals::config() { if (!c_onfig) { diff --git a/knode/knglobals.h b/knode/knglobals.h index 3a6aa10a1..605f956c6 100644 --- a/knode/knglobals.h +++ b/knode/knglobals.h @@ -51,6 +51,9 @@ namespace KNode { (knode.h isn't include everywhere) */ class KDE_EXPORT KNGlobals { public: + KNGlobals(); + ~KNGlobals(); + /** topWidget == top, used for message boxes, */ TQWidget *topWidget; /** no need to include knode.h everywhere */ diff --git a/knode/knode_config_accounts.desktop b/knode/knode_config_accounts.desktop index 9d0716f64..f311b260d 100644 --- a/knode/knode_config_accounts.desktop +++ b/knode/knode_config_accounts.desktop @@ -39,7 +39,6 @@ Name[hu]=Fiókok Name[is]=Tengingar Name[it]=Account Name[ja]=アカウント -Name[ka]=ანგარიშები Name[kk]=Тіркелгілері Name[km]=គណនី Name[lt]=Paskyros @@ -64,8 +63,7 @@ Name[ta]=கணக்குகள் Name[tg]=Қайдҳои баҳисобгирӣ Name[tr]=Hesaplar Name[uk]=Рахунки -Name[uz]=Hisoblar -Name[uz@cyrillic]=Ҳисоблар +Name[uz]=Ҳисоблар Name[zh_CN]=账户 Name[zh_TW]=帳號 Comment=Setup for Newsgroup and Mail Servers @@ -89,7 +87,6 @@ Comment[hu]=Hír- és levelezési kiszolgálók beállítása Comment[is]=Uppsetning fyrir fréttahópa og póstþjóna Comment[it]=Impostazioni per newsgroup e server di posta Comment[ja]=ニュースグループとメールサーバの設定 -Comment[ka]=სიახლეთა ჯგუფებისა და საფოსტო სერვერის კონფიგურაცია Comment[kk]=Жаңалық топтар мен Пошта серверлері Comment[km]=រៀបចំម៉ាស៊ីន​បម្រើ​វេទិកា​ព័ត៌មាន និង​សំបុត្រ Comment[lt]=Naujienų grupių ir pašto serverių nustatymai diff --git a/knode/knode_config_appearance.desktop b/knode/knode_config_appearance.desktop index bbd2ec26d..2e734de40 100644 --- a/knode/knode_config_appearance.desktop +++ b/knode/knode_config_appearance.desktop @@ -39,7 +39,6 @@ Name[hu]=Megjelenés Name[is]=Útlit Name[it]=Aspetto Name[ja]=外観 -Name[ka]=იერსახე Name[kk]=Сыртқы көрінісі Name[km]=រូបរាង Name[ko]=모양 @@ -66,8 +65,7 @@ Name[ta]=தோற்றம் Name[tg]=Намуди зоҳирӣ Name[tr]=Görünüm Name[uk]=Вигляд -Name[uz]=Koʻrinishi -Name[uz@cyrillic]=Кўриниши +Name[uz]=Кўриниши Name[zh_CN]=外观 Comment=Customize Visual Appearance Comment[af]=Pasmaak die visuele voorkoms @@ -93,7 +91,6 @@ Comment[hu]=A grafikai megjelenés testreszabása Comment[is]=Stilla útlit Comment[it]=Personalizza l'aspetto Comment[ja]=外観をカスタマイズ -Comment[ka]=ვიზუალური იერსახის დაყენება Comment[kk]=Сыртқы көрінісін ыңғайлау Comment[km]=ប្ដូរ​រូបរាង​មើល​ឃើញ​តាម​បំណង Comment[lt]=Derinti vizualinę išvaizdą diff --git a/knode/knode_config_cleanup.desktop b/knode/knode_config_cleanup.desktop index 5f08bbe29..e6afc8cca 100644 --- a/knode/knode_config_cleanup.desktop +++ b/knode/knode_config_cleanup.desktop @@ -35,7 +35,6 @@ Name[hu]=Tisztítás Name[is]=Hreinsun Name[it]=Pulizia Name[ja]=整理 -Name[ka]=გაწმენდა Name[kk]=Тазалау Name[km]=សម្អាត Name[lt]=Išvalymas @@ -85,7 +84,6 @@ Comment[hu]=A lemezterület megőrzése Comment[is]=Varðveita diskpláss Comment[it]=Risparmia lo spazio su disco Comment[ja]=ディスクスペースを維持 -Comment[ka]=სივრცის შენახვა დისკზე Comment[kk]=Дискідегі орынды үнемдеу Comment[km]=បង្ការ​ទំហំ​ថាស Comment[lt]=Disko erdvės išsaugojimas diff --git a/knode/knode_config_identity.desktop b/knode/knode_config_identity.desktop index 2fda0f69b..f7c0fae9c 100644 --- a/knode/knode_config_identity.desktop +++ b/knode/knode_config_identity.desktop @@ -38,7 +38,6 @@ Name[hu]=Azonosító Name[is]=Auðkenni Name[it]=Identità Name[ja]=個人情報 -Name[ka]=პროფილი Name[kk]=Іс-әлпеті Name[km]=អត្តសញ្ញាណ Name[lt]=Tapatybė @@ -63,8 +62,7 @@ Name[ta]=அடையாளம் Name[tg]=Профил Name[tr]=Kimlik Name[uk]=Профіль -Name[uz]=Shaxsiyat -Name[uz@cyrillic]=Шахсият +Name[uz]=Шахсият Name[zh_CN]=身份 Name[zh_TW]=身份 Comment=Personal Information @@ -94,7 +92,6 @@ Comment[hu]=Személyi adatok Comment[is]=Persónuupplýsingar Comment[it]=Informazioni personali Comment[ja]=個人の情報 -Comment[ka]=პირადი ინფორმაცია Comment[kk]=Дербес мәліметтер Comment[km]=ព័ត៌មាន​ផ្ទាល់​ខ្លួន Comment[lt]=Asmeninė informacija diff --git a/knode/knode_config_post_news.desktop b/knode/knode_config_post_news.desktop index 784b7c39c..8d1658b11 100644 --- a/knode/knode_config_post_news.desktop +++ b/knode/knode_config_post_news.desktop @@ -33,7 +33,6 @@ Name[hu]=Hírek írása Name[is]=Senda fréttir Name[it]=Invio news Name[ja]=ニュースを投稿 -Name[ka]=სიახლეების განთავსება Name[kk]=Жариялау Name[km]=ប្រកាស​ព័ត៌មាន​ Name[lt]=Naujienų skelbimas diff --git a/knode/knode_config_privacy.desktop b/knode/knode_config_privacy.desktop index 21bdddb6f..e2ab8fcfc 100644 --- a/knode/knode_config_privacy.desktop +++ b/knode/knode_config_privacy.desktop @@ -34,7 +34,6 @@ Name[hu]=Aláírás/ellenőrzés Name[is]=Undirrita/staðfesta Name[it]=Firma/verifica Name[ja]=署名/検証 -Name[ka]=ხელმოწერა/დამოწმება Name[kk]=Қолтаңбалау/Тексеру Name[km]=ចុះហត្ថលេខា/ផ្ទៀងផ្ទាត់ Name[lt]=Pasirašoma/tikrinama @@ -81,7 +80,6 @@ Comment[hu]=Az adatok védelme az üzenetek elektronikus aláírásával, titkos Comment[is]=Verndaðu einkalífið þitt með því að undirrita og staðfesta sendingar Comment[it]=Proteggi la tua privacy firmando e verificando i messaggi Comment[ja]=投稿の署名と検証によりあなたのプライバシーを保護します -Comment[ka]=დაიცავით თქვენი პირადულობა ხელმოწერითა და განთავსებული სტატიების დამოწმებით Comment[kk]=Жарияланғанды қолтаңбалап/тексеріп қорғану Comment[km]=ការពារ​ភាព​ឯកជន​របស់​អ្នក​ដោយ​ចុះហត្ថលេខា និង​​ផ្ទៀងផ្ទាត់​ការ​ប្រកាស Comment[lt]=Saugokite savo privatumą pasirašydami ir patikrindami skelbimus diff --git a/knode/knode_config_read_news.desktop b/knode/knode_config_read_news.desktop index a4ad37183..a8ba3e2d7 100644 --- a/knode/knode_config_read_news.desktop +++ b/knode/knode_config_read_news.desktop @@ -35,7 +35,6 @@ Name[hu]=Hírek olvasása Name[is]=Lestur frétta Name[it]=Lettura News Name[ja]=ニュースを読む -Name[ka]=სიახლეების კითხვა Name[kk]=Жаңалықтарды оқу Name[km]=អាន​ព័ត៌មាន Name[lt]=Naujienų skaitymas @@ -59,8 +58,7 @@ Name[ta]=செய்திகளைப் படித்தல் Name[tg]=Хондани ахборот Name[tr]=Haber Okuma Name[uk]=Читання новин -Name[uz]=Yangiliklarni oʻqish -Name[uz@cyrillic]=Янгиликларни ўқиш +Name[uz]=Янгиликларни ўқиш Name[zh_CN]=阅读新闻 Name[zh_TW]=閱讀新聞 -- cgit v1.2.1