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 --- akregator/src/akregator.desktop | 8 +--- akregator/src/akregator_plugin.desktop | 4 +- akregator/src/akregator_view.cpp | 50 +++++++++++++--------- akregator/src/eventsrc | 13 ++---- .../mk4storage/akregator_mk4storage_plugin.desktop | 5 +-- 5 files changed, 36 insertions(+), 44 deletions(-) (limited to 'akregator/src') diff --git a/akregator/src/akregator.desktop b/akregator/src/akregator.desktop index 394cf1860..eb8952d3f 100644 --- a/akregator/src/akregator.desktop +++ b/akregator/src/akregator.desktop @@ -28,7 +28,6 @@ GenericName[hu]=RSS hírolvasó GenericName[is]=RSS fréttaforrit GenericName[it]=Lettore Fonti RSS GenericName[ja]=RSS ニュースリーダー -GenericName[ka]=RSS კვების წამკითხველი GenericName[kk]=RSS жаңалықтарын оқу GenericName[km]=កម្មវិធី​អាន​មតិព័ត៌មាន RSS GenericName[ko]=RSS 피드 리더 @@ -53,8 +52,7 @@ GenericName[sv]=Läsare av RSS-kanaler GenericName[ta]=RSS பீஃட் வாசிப்பான் GenericName[tr]=RSS Haber Kaynağı Okuyucu GenericName[uk]=Програма для читання подач RSS -GenericName[uz]=RSS yangiliklarni oʻquvchi -GenericName[uz@cyrillic]=RSS янгиликларни ўқувчи +GenericName[uz]=RSS янгиликларни ўқувчи GenericName[zh_CN]=RSS 种子阅读器 GenericName[zh_TW]=RSS Feed 閱讀器 Comment=An RSS Aggregator for KDE @@ -79,7 +77,6 @@ Comment[hu]=KDE-s hírolvasó RSS hírcsatornákhoz Comment[is]=RSS fréttaforrit fyrir KDE Comment[it]=Un concentratore KDE per RSS Comment[ja]=KDE 用 RSS アグリゲータ -Comment[ka]= RSS აგრეგატი KDE-სთვის Comment[kk]=KDE-нің RSS жаңалық агрегаторы Comment[km]=កម្មវិធី​អាន RSS សម្រាប់ KDE Comment[ko]=KDE용 RSS 리더 @@ -102,8 +99,7 @@ Comment[sv]=En RSS-samlare för KDE Comment[ta]=கேடியிக்கான ஒரு RSS சேர்ப்பான் Comment[tr]=Bir KDE RSS Okuyucusu Comment[uk]=Агрегатор RSS для KDE -Comment[uz]=KDE uchun RSS yangiliklarni oʻquvchi -Comment[uz@cyrillic]=KDE учун RSS янгиликларни ўқувчи +Comment[uz]=KDE учун RSS янгиликларни ўқувчи Comment[zh_CN]=KDE RSS 新闻收集器 Comment[zh_TW]=KDE 的 RSS 收集器 Terminal=false diff --git a/akregator/src/akregator_plugin.desktop b/akregator/src/akregator_plugin.desktop index 986515c06..9f8608bce 100644 --- a/akregator/src/akregator_plugin.desktop +++ b/akregator/src/akregator_plugin.desktop @@ -25,7 +25,6 @@ Comment[hu]=Akregator bővítőmodul Comment[is]=Íforrit fyrir Akregator Comment[it]=Plugin per Akregator Comment[ja]=Akregator 用プラグイン -Comment[ka]=Akregator-ის მოდული Comment[kk]=Akregator-дың плагин модулі Comment[km]=កម្មវិធី​ជំនួយ Akregator Comment[ko]=Akregator 플러그인 @@ -49,8 +48,7 @@ Comment[sr@Latn]=Priključak za Akregator Comment[sv]=Insticksprogram för Akregator Comment[tr]=Akregator Eklentisi Comment[uk]=Втулок для Akregator -Comment[uz]=Akregator uchun plagin -Comment[uz@cyrillic]=Akregator учун плагин +Comment[uz]=Akregator учун плагин Comment[zh_CN]=Akregator 插件 Comment[zh_TW]=Akregator 外掛程式 diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index d238307d2..8776ec123 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -225,7 +225,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons setFocusPolicy(TQWidget::StrongFocus); TQVBoxLayout *lt = new TQVBoxLayout( this ); - + m_horizontalSplitter = new TQSplitter(TQSplitter::Horizontal, this); m_horizontalSplitter->setOpaqueResize(true); @@ -260,7 +260,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&))); - + ProgressManager::self()->setFeedList(m_feedList); m_tabs = new TabWidget(m_horizontalSplitter); @@ -321,8 +321,12 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons connectFrame(m_mainFrame); m_tabs->addFrame(m_mainFrame); - m_horizontalSplitter->setSizes( Settings::splitter1Sizes() ); - m_articleSplitter->setSizes( Settings::splitter2Sizes() ); + const TQValueList sp1sizes = Settings::splitter1Sizes(); + if ( sp1sizes.count() >= m_horizontalSplitter->sizes().count() ) + m_horizontalSplitter->setSizes( sp1sizes ); + const TQValueList sp2sizes = Settings::splitter2Sizes(); + if ( sp2sizes.count() >= m_articleSplitter->sizes().count() ) + m_articleSplitter->setSizes( sp2sizes ); KConfig *conf = Settings::self()->config(); conf->setGroup("General"); @@ -374,7 +378,7 @@ void View::slotSettingsChanged() { // if tagging is hidden, show only feed list m_listTabWidget->setViewMode(Settings::showTaggingGUI() ? ListTabWidget::verticalTabs : ListTabWidget::single); - + } void View::slotOnShutdown() @@ -406,8 +410,12 @@ void View::slotOnShutdown() void View::saveSettings() { - Settings::setSplitter1Sizes( m_horizontalSplitter->sizes() ); - Settings::setSplitter2Sizes( m_articleSplitter->sizes() ); + const TQValueList spl1 = m_horizontalSplitter->sizes(); + if ( spl1.contains( 0 ) == 0 ) + Settings::setSplitter1Sizes( spl1 ); + const TQValueList spl2 = m_articleSplitter->sizes(); + if ( spl2.contains( 0 ) == 0 ) + Settings::setSplitter2Sizes( spl2 ); Settings::setViewMode( m_viewMode ); Settings::writeConfig(); } @@ -415,7 +423,7 @@ void View::saveSettings() void View::slotOpenNewTab(const KURL& url, bool background) { PageViewer* page = new PageViewer(this, "page"); - + connect( m_part, TQT_SIGNAL(signalSettingsChanged()), page, TQT_SLOT(slotPaletteOrFontChanged())); connect( page, TQT_SIGNAL(setTabIcon(const TQPixmap&)), @@ -822,7 +830,7 @@ void View::slotOpenURL(const KURL& url, Viewer* currentViewer, BrowserRun::Openi else { KParts::URLArgs args = currentViewer ? currentViewer->browserExtension()->urlArgs() : KParts::URLArgs(); - + BrowserRun* r = new BrowserRun(this, currentViewer, url, args, mode); connect(r, TQT_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)), this, TQT_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode))); @@ -832,7 +840,7 @@ void View::slotOpenURL(const KURL& url, Viewer* currentViewer, BrowserRun::Openi //TODO: KDE4 remove this ugly ugly hack void View::slotUrlClickedInViewer(const KURL& url, Viewer* viewer, bool newTab, bool background) { - + if (!newTab) { slotOpenURL(url, viewer, BrowserRun::CURRENT_TAB); @@ -983,7 +991,7 @@ void View::slotNextUnreadArticle() { if (m_viewMode == CombinedView) m_listTabWidget->activeView()->slotNextUnreadFeed(); - + TreeNode* sel = m_listTabWidget->activeView()->selectedNode(); if (sel && sel->unread() > 0) m_articleList->slotNextUnreadArticle(); @@ -995,7 +1003,7 @@ void View::slotPrevUnreadArticle() { if (m_viewMode == CombinedView) m_listTabWidget->activeView()->slotPrevUnreadFeed(); - + TreeNode* sel = m_listTabWidget->activeView()->selectedNode(); if (sel && sel->unread() > 0) m_articleList->slotPreviousUnreadArticle(); @@ -1211,8 +1219,8 @@ void View::slotOpenCurrentArticle() link = article.link(); else if (article.guidIsPermaLink()) link = KURL(article.guid()); - - if (link.isValid()) + + if (link.isValid()) { slotOpenURL(link, 0L, BrowserRun::NEW_TAB_FOREGROUND); } @@ -1236,8 +1244,8 @@ void View::slotOpenCurrentArticleBackgroundTab() link = article.link(); else if (article.guidIsPermaLink()) link = KURL(article.guid()); - - if (link.isValid()) + + if (link.isValid()) { slotOpenURL(link, 0L, BrowserRun::NEW_TAB_BACKGROUND); } @@ -1307,7 +1315,7 @@ void View::slotArticleDelete() msg = i18n("Are you sure you want to delete article %1?").arg(TQStyleSheet::escape(articles.first().title())); break; default: - msg = i18n("Are you sure you want to delete the selected article?", + msg = i18n("Are you sure you want to delete the selected article?", "Are you sure you want to delete the %n selected articles?", articles.count()); } @@ -1386,7 +1394,7 @@ void View::slotTextToSpeechRequest() else { TQString selectedText = static_cast(m_currentFrame->part())->selectedText(); - + if (!selectedText.isEmpty()) SpeechClient::self()->slotSpeak(selectedText, "en"); } @@ -1439,7 +1447,7 @@ void View::slotMouseOverInfo(const KFileItem *kifi) void View::readProperties(KConfig* config) { - + if (!Settings::resetQuickFilterOnNodeChange()) { m_searchBar->slotSetText(config->readEntry("searchLine")); @@ -1447,7 +1455,7 @@ void View::readProperties(KConfig* config) if (statusfilter != -1) m_searchBar->slotSetStatus(statusfilter); } - + int selectedID = config->readNumEntry("selectedNodeID", -1); if (selectedID != -1) { @@ -1471,7 +1479,7 @@ void View::saveProperties(KConfig* config) // save filter settings config->writeEntry("searchLine", m_searchBar->text()); config->writeEntry("searchCombo", m_searchBar->status()); - + TreeNode* sel = m_listTabWidget->activeView()->selectedNode(); if (sel) diff --git a/akregator/src/eventsrc b/akregator/src/eventsrc index 3be7516a8..6615ce17b 100644 --- a/akregator/src/eventsrc +++ b/akregator/src/eventsrc @@ -29,7 +29,6 @@ Name[hu]=Hírforrás felvéve Name[is]=Straum bætt við Name[it]=Aggiunta fonte Name[ja]=フィード追加 -Name[ka]=დამატებულია კვება Name[kk]=Қор қосылды Name[km]=បាន​បន្ថែម​មតិព័ត៌មាន Name[ko]=피드 추가됨 @@ -53,8 +52,7 @@ Name[sv]=Kanal tillagd Name[ta]=பீஃட் சேர்க்கப்பட்டது Name[tr]=Haber kaynağı eklendi Name[uk]=Подачу додано -Name[uz]=Yangiliklar tasmasi qoʻshildi -Name[uz@cyrillic]=Янгиликлар тасмаси қўшилди +Name[uz]=Янгиликлар тасмаси қўшилди Name[zh_CN]=添加了新闻源 Name[zh_TW]=已加入 Feed Comment=A new feed was remotely added to Akregator @@ -78,7 +76,6 @@ Comment[hu]=Egy hírforrást távolról felvettek az Akregatorba Comment[is]=Nýjum straum var bætt við Akregator Comment[it]=Una nuova fonte è stata aggiunta ad Akregator da remoto Comment[ja]=新規フィードがリモートで Akregator に追加されました -Comment[ka]=Akregator-ის სიას დისტანციურად ახალი კვება დაემატა Comment[kk]=Akregator-ға қашықтан жаңа қор қосылды Comment[km]=បាន​បន្ថែម​មតិព័ត៌មាន​ថ្មី​មួយ​ពី​ចម្ងាយ​ទៅ Akregator Comment[ko]=Akregator에 피드가 원격으로 추가됨 @@ -102,8 +99,7 @@ Comment[sv]=En ny kanal har lagts till i aKregator utifrån Comment[ta]=Akregatorக்கு ஒரு புதிய உள்ளீடு சேர்க்கப்பட்டது Comment[tr]=Akregator'a yeni bir haber kaynağı eklendi Comment[uk]=Нову подачу було віддалено додано до Akregator -Comment[uz]=Akregator dasturiga yangi yangiliklar tasmasi qoʻshildi -Comment[uz@cyrillic]=Akregator дастурига янги янгиликлар тасмаси қўшилди +Comment[uz]=Akregator дастурига янги янгиликлар тасмаси қўшилди Comment[zh_CN]=新闻源远程添加进了 Akregator Comment[zh_TW]=已從遠端加入新的 feed 到 Akregator default_presentation=4 @@ -135,7 +131,6 @@ Name[hu]=Hírekk Name[is]=Nýjar greinar Name[it]=Nuovi articoli Name[ja]=新規記事 -Name[ka]=ახალი სტატიები Name[kk]=Жаңа мақалалар Name[km]=អត្ថបទ​ថ្មី Name[ko]=새 글 @@ -160,8 +155,7 @@ Name[sv]=Nya artiklar Name[ta]= புதிய செய்திகள் Name[tr]=Yeni Haberler Name[uk]=Нові статті -Name[uz]=Yangi maqolalar -Name[uz@cyrillic]=Янги мақолалар +Name[uz]=Янги мақолалар Name[zh_CN]=新闻文章 Name[zh_TW]=新文章 Comment=New articles were fetched @@ -188,7 +182,6 @@ Comment[hu]=Új hírek lettek letöltve Comment[is]=Nýjar greinar voru sóttar Comment[it]=I nuovi articoli sono stati recuperati Comment[ja]=新規記事を取得しました -Comment[ka]=მიღებულია ახალი სტატიები Comment[kk]=Жаңа мақалалар қабылданды Comment[km]=បាន​ប្រមូល​អត្ថបទ​ថ្មី Comment[ko]=새 글을 가져옴 diff --git a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop index c7d899a7a..1e63cfc06 100644 --- a/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop +++ b/akregator/src/mk4storage/akregator_mk4storage_plugin.desktop @@ -21,7 +21,6 @@ Name[hu]=Metakit tároló Name[is]=Metakit geymslu bakendi Name[it]=Backend archiviazione metakit Name[ja]=メタキットストレージバックエンド -Name[ka]=Metakit მეხსიერების ბუფერი Name[kk]=Metakit архивтеу бағдарламасы Name[km]=កម្មវិធី​ខាង​ក្រោយ​សម្រាប់​រក្សាទុក (Metakit) Name[ko]=Metakit 저장소 백엔드 @@ -69,7 +68,6 @@ Comment[hu]=Akregator bővítőmodul Comment[is]=Íforrit fyrir Akregator Comment[it]=Plugin per Akregator Comment[ja]=Akregator 用プラグイン -Comment[ka]=Akregator-ის მოდული Comment[kk]=Akregator-дың плагин модулі Comment[km]=កម្មវិធី​ជំនួយ Akregator Comment[ko]=Akregator 플러그인 @@ -93,8 +91,7 @@ Comment[sr@Latn]=Priključak za Akregator Comment[sv]=Insticksprogram för Akregator Comment[tr]=Akregator Eklentisi Comment[uk]=Втулок для Akregator -Comment[uz]=Akregator uchun plagin -Comment[uz@cyrillic]=Akregator учун плагин +Comment[uz]=Akregator учун плагин Comment[zh_CN]=Akregator 插件 Comment[zh_TW]=Akregator 外掛程式 ServiceTypes=Akregator/Plugin -- cgit v1.2.1