packages: kde4-kdepim/kde4-kdepim-branch.diff, kde4-kdepim/kde4-kdepim.spec...
arekm
arekm at pld-linux.org
Wed Aug 19 22:03:00 CEST 2009
Author: arekm Date: Wed Aug 19 20:03:00 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; branch diff is back
---- Files affected:
packages/kde4-kdepim:
kde4-kdepim-branch.diff (1.11 -> 1.12) , kde4-kdepim.spec (1.105 -> 1.106)
---- Diffs:
================================================================
Index: packages/kde4-kdepim/kde4-kdepim-branch.diff
diff -u packages/kde4-kdepim/kde4-kdepim-branch.diff:1.11 packages/kde4-kdepim/kde4-kdepim-branch.diff:1.12
--- packages/kde4-kdepim/kde4-kdepim-branch.diff:1.11 Fri Jun 26 12:04:07 2009
+++ packages/kde4-kdepim/kde4-kdepim-branch.diff Wed Aug 19 22:02:54 2009
@@ -1,6841 +1,8263 @@
-Index: akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop
+Index: akregator/src/browserframe.h
===================================================================
---- akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -19,7 +19,7 @@
- Name[ga]=Inneall stórála Metakit
- Name[gl]=Manexador do almacenador Metakit
- Name[hu]=Metakit tároló
--Name[is]=Metakit geymslu bakendi
-+Name[is]=Metakit geymslubakendi
- Name[it]=Backend archiviazione metakit
- Name[ja]=Metakit ストレージバックエンド
- Name[ka]=Metakit მეხსიერების ბუფერი
-Index: akregator/plugins/mk4storage/feedstoragemk4impl.cpp
-===================================================================
---- akregator/plugins/mk4storage/feedstoragemk4impl.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/plugins/mk4storage/feedstoragemk4impl.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -95,10 +95,6 @@
- StorageMK4Impl* mainStorage;
- c4_View archiveView;
-
-- c4_Storage* catStorage;
-- c4_View catView;
-- c4_Storage* tagStorage;
-- c4_View tagView;
- bool autoCommit;
- bool modified;
- bool convert;
-@@ -159,23 +155,12 @@
-
- c4_View hash = d->storage->GetAs("archiveHash[_H:I,_R:I]");
- d->archiveView = d->archiveView.Hash(hash, 1); // hash on guid
--
--
-- d->tagStorage = new c4_Storage((filePath + ".mk4___TAGS").toLocal8Bit(), true);
-- d->tagView = d->tagStorage->GetAs("tagIndex[tag:S,taggedArticles[guid:S]]");
-- hash = d->tagStorage->GetAs("archiveHash[_H:I,_R:I]");
-- d->tagView = d->tagView.Hash(hash, 1); // hash on tag
--
-- d->catStorage = new c4_Storage((filePath + ".mk4___CATEGORIES").toLocal8Bit(), true);
-- d->catView = d->catStorage->GetAs("catIndex[catTerm:S,catScheme:S,catName:S,categorizedArticles[guid:S]]");
- }
-
-
- FeedStorageMK4Impl::~FeedStorageMK4Impl()
- {
- delete d->storage;
-- delete d->tagStorage;
-- delete d->catStorage;
- delete d; d = 0;
- }
-
-@@ -194,8 +179,6 @@
- if (d->modified)
- {
- d->storage->Commit();
-- d->tagStorage->Commit();
-- d->catStorage->Commit();
- }
- d->modified = false;
- }
-@@ -203,8 +186,6 @@
- void FeedStorageMK4Impl::rollback()
- {
- d->storage->Rollback();
-- d->tagStorage->Rollback();
-- d->catStorage->Rollback();
- }
-
- void FeedStorageMK4Impl::close()
-@@ -244,11 +225,14 @@
- QStringList FeedStorageMK4Impl::articles(const QString& tag) const
- {
- QStringList list;
-+#if 0 //category and tag support disabled
- if (tag.isNull()) // return all articles
- {
-+#endif
- int size = d->archiveView.GetSize();
- for (int i = 0; i < size; i++) // fill with guids
- list += QString(d->pguid(d->archiveView.GetAt(i)));
-+#if 0 //category and tag support disabled
- }
- else
- {
-@@ -265,13 +249,14 @@
- }
-
- }
-+#endif
- return list;
- }
-
- QStringList FeedStorageMK4Impl::articles(const Category& cat) const
- {
- QStringList list;
--
-+#if 0 //category and tag support disabled
- c4_Row catrow;
- d->pcatTerm(catrow) = cat.term.toUtf8().data();
- d->pcatScheme(catrow) = cat.scheme.toUtf8().data();
-@@ -285,7 +270,7 @@
- for (int i = 0; i < size; i++)
- list += QString(d->pguid(catView.GetAt(i)));
- }
--
-+#endif
- return list;
- }
-
-@@ -636,7 +621,7 @@
- d->pcatTerm(catrow) = cat.term.toUtf8().data();
- d->pcatScheme(catrow) = cat.scheme.toUtf8().data();
- d->pcatName(catrow) = cat.name.toUtf8().data();
--
-+#if 0 //category and tag support disabled
- int catidx2 = d->catView.Find(catrow);
-
- if (catidx2 == -1)
-@@ -657,7 +642,7 @@
- d->pcategorizedArticles(catrow2) = catView2;
- d->catView.SetAt(catidx2, catrow2);
- }
--
-+#endif
- markDirty();
- }
- }
-@@ -691,6 +676,7 @@
- }
- else // return all categories in the feed
- {
-+#if 0 //category and tag support disabled
- int size = d->catView.GetSize();
- for (int i = 0; i < size; i++)
- {
-@@ -703,6 +689,8 @@
+--- akregator/src/browserframe.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
++++ akregator/src/browserframe.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
+@@ -68,6 +68,10 @@
+
+ void loadConfig( const KConfigGroup& config, const QString& prefix);
+ void saveConfig( KConfigGroup& config, const QString& prefix);
++
++ bool hasZoom() const;
++ int getZoomFactor() const;
++ void setZoomFactor(int);
+ public slots:
+
+ void slotHistoryForward();
+@@ -80,6 +84,8 @@
+ void slotPaletteOrFontChanged();
+ void slotOpenLinkInBrowser();
+ void slotOpenLinkInNewTab();
++ void slotZoomIn(int);
++ void slotZoomOut(int);
- list += cat;
- }
-+#endif
-+
- }
+ private slots:
- return list;
-@@ -710,6 +698,7 @@
+Index: akregator/src/articleviewer.cpp
+===================================================================
+--- akregator/src/articleviewer.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
++++ akregator/src/articleviewer.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
+@@ -76,7 +76,7 @@
+ namespace Akregator {
- void FeedStorageMK4Impl::addTag(const QString& guid, const QString& tag)
- {
-+#if 0 //category and tag support disabled
- int findidx = findArticle(guid);
- if (findidx == -1)
- return;
-@@ -747,10 +736,12 @@
- }
- markDirty();
- }
-+#endif
+ ArticleViewer::ArticleViewer(QWidget *parent)
+- : QWidget(parent),
++ : QFrame(parent),
+ m_url(0),
+ m_htmlFooter(),
+ m_currentText(),
+@@ -87,6 +87,7 @@
+ m_normalViewFormatter( new DefaultNormalViewFormatter( m_imageDir, m_part->view() ) ),
+ m_combinedViewFormatter( new DefaultCombinedViewFormatter( m_imageDir, m_part->view() ) )
+ {
++ setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
+ QGridLayout* layout = new QGridLayout(this);
+ layout->setMargin(0);
+ layout->addWidget(m_part->widget(), 0, 0);
+@@ -137,16 +138,6 @@
+ action->setText(i18n("&Save Link As..."));
+ connect(action, SIGNAL(triggered(bool) ), SLOT(slotSaveLinkAs()));
+
+- action = m_part->actionCollection()->addAction("articleviewer_scroll_up");
+- action->setText(i18n("&Scroll Up"));
+- connect(action, SIGNAL(triggered(bool)), SLOT(slotScrollUp()));
+- action->setShortcuts(KShortcut( "Up" ));
+-
+- action = m_part->actionCollection()->addAction("articleviewer_scroll_down");
+- action->setText(i18n("&Scroll Down"));
+- connect(action, SIGNAL(triggered(bool)), SLOT(slotScrollDown()));
+- action->setShortcuts(KShortcut( "Down" ));
+-
+ updateCss();
+
+ connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()));
+@@ -337,18 +328,11 @@
+ emit completed();
}
- void FeedStorageMK4Impl::removeTag(const QString& guid, const QString& tag)
+-void ArticleViewer::slotScrollUp()
++void ArticleViewer::slotZoomIn(int id)
{
-+#if 0 //category and tag support disabled
- int findidx = findArticle(guid);
- if (findidx == -1)
- return;
-@@ -789,12 +780,13 @@
-
- markDirty();
- }
-+#endif
- }
+- m_part->view()->scrollBy(0,-10);
+-}
++ if (id != 0)
++ return;
- QStringList FeedStorageMK4Impl::tags(const QString& guid) const
- {
- QStringList list;
+-void ArticleViewer::slotScrollDown()
+-{
+- m_part->view()->scrollBy(0,10);
+-}
-
-+#if 0 //category and tag support disabled
- if (!guid.isNull()) // return tags for an articles
+-void ArticleViewer::slotZoomIn()
+-{
+ int zf = m_part->fontScaleFactor();
+ if (zf < 100)
{
- int findidx = findArticle(guid);
-@@ -815,7 +807,7 @@
- for (int i = 0; i < size; i++)
- list += QString(d->ptag(d->tagView.GetAt(i)));
+@@ -362,8 +346,11 @@
}
--
-+#endif
- return list;
}
-@@ -905,7 +897,7 @@
- void FeedStorageMK4Impl::clear()
+-void ArticleViewer::slotZoomOut()
++void ArticleViewer::slotZoomOut(int id)
{
- d->storage->RemoveAll();
-- d->tagStorage->RemoveAll();
-+
- setUnread(0);
- markDirty();
- }
-Index: akregator/plugins/CMakeLists.txt
-===================================================================
---- akregator/plugins/CMakeLists.txt (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/plugins/CMakeLists.txt (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -1,3 +1,8 @@
- add_subdirectory( mk4storage )
++ if (id != 0)
++ return;
+
-+# onlinesync plugin is broken, thus disabled
-+# minimal TODO before reactivating this:
-+# * make it work
-+# * make it use KWallet instead of plaintext KConfig to store the password
- add_subdirectory( onlinesync )
-
-Index: akregator/src/articleviewer.cpp
-===================================================================
---- akregator/src/articleviewer.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/articleviewer.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -304,7 +304,9 @@
- QClipboard *cb = QApplication::clipboard();
- cb->setText(m_url.prettyUrl(), QClipboard::Clipboard);
- // don't set url to selection as it's a no-no according to a fd.o spec
-- //cb->setText(m_url.prettyUrl(), QClipboard::Selection);
-+ // which spec? Nobody seems to care (tested Firefox (3.5.10) Konqueror,and KMail (4.2.3)), so I re-enable the following line unless someone gives
-+ // a good reason to remove it again (bug 183022) --Frank
-+ cb->setText(m_url.prettyUrl(), QClipboard::Selection);
- }
-
- void ArticleViewer::slotSelectionChanged()
-@@ -710,9 +712,9 @@
- if(url == "config:/disable_introduction")
+ int zf = m_part->fontScaleFactor();
+ if (zf <= 100)
{
- KGuiItem yesButton(KStandardGuiItem::yes());
-- yesButton.setText(i18n("Keep Enabled"));
-+ yesButton.setText(i18n("Disable"));
- KGuiItem noButton(KStandardGuiItem::no());
-- noButton.setText(i18n("Disable"));
-+ noButton.setText(i18n("Keep Enabled"));
- if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want to disable this introduction page?"), i18n("Disable Introduction Page"), yesButton, noButton) == KMessageBox::Yes)
- {
- KConfigGroup conf(Settings::self()->config(), "General");
-Index: akregator/src/selectioncontroller.cpp
+Index: akregator/src/org.kde.akregator.part.xml
===================================================================
---- akregator/src/selectioncontroller.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/selectioncontroller.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -181,7 +181,7 @@
-
- void Akregator::SelectionController::articleHeadersAvailable()
- {
-- ArticleModel* const newModel = new ArticleModel( m_selectedSubscription );
-+ ArticleModel* const newModel = new ArticleModel( m_selectedSubscription, this );
- m_articleLister->setIsAggregation( m_selectedSubscription->isAggregation() );
- m_articleLister->setArticleModel( newModel );
- delete m_articleModel;
-Index: akregator/src/feed.cpp
-===================================================================
---- akregator/src/feed.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/feed.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -668,7 +668,7 @@
- }
-
- if (title().isEmpty())
-- setTitle( doc->title() );
-+ setTitle( Syndication::htmlToPlainText( doc->title() ) );
-
- d->description = doc->description();
- d->htmlUrl = doc->link();
+--- akregator/src/org.kde.akregator.part.xml (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
++++ akregator/src/org.kde.akregator.part.xml (.../branches/KDE/4.3/kdepim) (wersja 1013413)
+@@ -16,5 +16,8 @@
+ <arg name="url" type="s" direction="in"/>
+ </method>
+ <method name="addFeed" />
++ <method name="handleCommandLine">
++ <arg name="result" type="b" direction="out"/>
++ </method>
+ </interface>
+ </node>
Index: akregator/src/aboutdata.h
===================================================================
---- akregator/src/aboutdata.h (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/aboutdata.h (.../branches/KDE/4.2/kdepim) (wersja 987536)
+--- akregator/src/aboutdata.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
++++ akregator/src/aboutdata.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
@@ -28,7 +28,7 @@
#include "akregator_export.h"
#include <kaboutdata.h>
--#define AKREGATOR_VERSION "1.4.2"
-+#define AKREGATOR_VERSION "1.4.4"
+-#define AKREGATOR_VERSION "1.5.0"
++#define AKREGATOR_VERSION "1.5.1"
namespace Akregator {
/**
-Index: akregator/src/articlelistview.cpp
-===================================================================
---- akregator/src/articlelistview.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/articlelistview.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -428,7 +428,7 @@
- {
- if ( !model() )
- return;
--
-+ emit userActionTakingPlace();
- const QModelIndex idx = currentIndex();
- const int newRow = qMax( 0, ( idx.isValid() ? idx.row() : model()->rowCount() ) - 1 );
- const QModelIndex newIdx = idx.isValid() ? idx.sibling( newRow, 0 ) : model()->index( newRow, 0 );
-@@ -440,6 +440,7 @@
- if ( !model() )
- return;
-
-+ emit userActionTakingPlace();
- const QModelIndex idx = currentIndex();
- const int newRow = idx.isValid() ? ( idx.row() + 1 ) : 0;
- const QModelIndex newIdx = model()->index( qMin( newRow, model()->rowCount() - 1 ), 0 );
-Index: akregator/src/mainwindow.cpp
-===================================================================
---- akregator/src/mainwindow.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/mainwindow.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -152,7 +152,7 @@
- void MainWindow::optionsConfigureKeys()
- {
- KShortcutsDialog dlg( KShortcutsEditor::AllActions,
-- KShortcutsEditor::LetterShortcutsDisallowed, this );
-+ KShortcutsEditor::LetterShortcutsAllowed, this );
-
- dlg.addCollection(actionCollection());
- if (m_part)
-Index: akregator/src/subscriptionlistview.h
-===================================================================
---- akregator/src/subscriptionlistview.h (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/subscriptionlistview.h (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -73,6 +73,9 @@
- void slotItemRight();
- void slotItemUp();
- void slotItemDown();
-+
-+Q_SIGNALS:
-+ void userActionTakingPlace();
-
- private:
- void saveHeaderSettings();
-Index: akregator/src/actionmanagerimpl.cpp
-===================================================================
---- akregator/src/actionmanagerimpl.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/actionmanagerimpl.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -313,14 +313,16 @@
- connect(action, SIGNAL(triggered(bool)), d->mainWidget, SLOT(slotCopyLinkAddress()));
-
- action = coll->addAction("go_prev_unread_article");
-+ action->setIcon(KIcon("go-previous"));
- action->setText(i18n("Pre&vious Unread Article"));
- connect(action, SIGNAL(triggered(bool)), d->mainWidget, SLOT(slotPrevUnreadArticle()));
- action->setShortcut(QKeySequence(Qt::Key_Minus));
-
- action = coll->addAction("go_next_unread_article");
-+ action->setIcon(KIcon("go-next"));
- action->setText(i18n("Ne&xt Unread Article"));
- connect(action, SIGNAL(triggered(bool)), d->mainWidget, SLOT(slotNextUnreadArticle()));
-- action->setShortcuts(KShortcut(Qt::Key_Equal, Qt::Key_Plus));
-+ action->setShortcuts(KShortcut(Qt::Key_Plus, Qt::Key_Equal));
-
- action = coll->addAction("article_delete");
- action->setIcon(KIcon("edit-delete"));
-@@ -453,11 +455,13 @@
- action->setShortcuts(KShortcut( "N" ));
-
- action = coll->addAction("go_next_unread_feed");
-+ action->setIcon(KIcon("go-down"));
- action->setText(i18n("N&ext Unread Feed"));
- connect(action, SIGNAL(triggered(bool)), subscriptionListView, SLOT(slotNextUnreadFeed()));
- action->setShortcut( QKeySequence(Qt::ALT+Qt::Key_Plus) );
-
- action = coll->addAction("go_prev_unread_feed");
-+ action->setIcon(KIcon("go-up"));
- action->setText(i18n("Prev&ious Unread Feed"));
- connect(action, SIGNAL(triggered(bool)), subscriptionListView, SLOT(slotPrevUnreadFeed()));
- action->setShortcut( QKeySequence(Qt::ALT+Qt::Key_Minus) );
-Index: akregator/src/tabwidget.cpp
+Index: akregator/src/akregator_part.h
===================================================================
---- akregator/src/tabwidget.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/tabwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -213,6 +213,7 @@
- Frame* f = d->framesById.value(frameId);
- d->frames.remove(f);
- d->framesById.remove(frameId);
-+ f->disconnect( this );
- removeTab(indexOf(f));
- emit signalRemoveFrameRequest(f->id());
- if (d->currentFrame())
-Index: akregator/src/subscriptionlistview.cpp
-===================================================================
---- akregator/src/subscriptionlistview.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/subscriptionlistview.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -237,6 +237,7 @@
- {
- if ( !model() )
- return;
-+ emit userActionTakingPlace();
- const QModelIndex current = currentIndex();
- QModelIndex next = nextFeedIndex( current );
- if ( !next.isValid() )
-@@ -249,6 +250,7 @@
- {
- if ( !model() )
- return;
-+ emit userActionTakingPlace();
- const QModelIndex current = currentIndex();
- QModelIndex prev = prevUnreadFeedIndex( current );
- if ( !prev.isValid() )
-@@ -261,6 +263,7 @@
- {
- if ( !model() )
- return;
-+ emit userActionTakingPlace();
- const QModelIndex current = currentIndex();
- QModelIndex next = nextUnreadFeedIndex( current );
- if ( !next.isValid() )
-Index: akregator/src/articlelistview.h
-===================================================================
---- akregator/src/articlelistview.h (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/articlelistview.h (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -139,6 +139,10 @@
+--- akregator/src/akregator_part.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
++++ akregator/src/akregator_part.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
+@@ -124,6 +124,8 @@
- void slotNextUnreadArticle();
+ void exportFile(const KUrl& url);
-+Q_SIGNALS:
-+
-+ void userActionTakingPlace();
++ bool handleCommandLine();
+
- private:
- void saveHeaderSettings();
- void loadHeaderSettings();
-Index: akregator/src/mainwidget.cpp
+ public slots:
+ /** Used to save settings after changing them from configuration dialog. Calls AkregatorPart's saveSettings. */
+ void saveSettings();
+Index: akregator/src/actionmanagerimpl.cpp
===================================================================
---- akregator/src/mainwidget.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 987536)
-+++ akregator/src/mainwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja 987536)
-@@ -134,9 +134,10 @@
- m_feedListView->setObjectName( "feedtree" );
- m_actionManager->initSubscriptionListView( m_feedListView );
-
-- connect(m_feedListView, SIGNAL(signalContextMenu(K3ListView*, Akregator::TreeNode*, const QPoint&)),
-- this, SLOT(slotFeedTreeContextMenu(K3ListView*, Akregator::TreeNode*, const QPoint&)));
--
-+
-+ connect( m_feedListView, SIGNAL(userActionTakingPlace()),
-+ this, SLOT(ensureArticleTabVisible()) );
-+
- connect(m_feedListView, SIGNAL(signalDropped (KUrl::List &, Akregator::TreeNode*,
- Akregator::Folder*)),
- this, SLOT(slotFeedUrlDropped (KUrl::List &,
-@@ -188,7 +189,9 @@
- m_articleSplitter->setObjectName("panner2");
-
- m_articleListView = new ArticleListView( m_articleSplitter );
--
-+ connect( m_articleListView, SIGNAL(UserActionTakingPlace()),
-+ this, SLOT(ensureArticleTabVisible()) );
-+
- m_selectionController = new SelectionController( this );
- m_selectionController->setArticleLister( m_articleListView );
- m_selectionController->setFeedSelector( m_feedListView );
-@@ -565,7 +568,7 @@
- Settings::setViewMode( m_viewMode );
- }
-
--void Akregator::MainWidget::slotFeedTreeContextMenu(K3ListView*, TreeNode* /*node*/, const QPoint& /*p*/)
-+void Akregator::MainWidget::ensureArticleTabVisible()
- {
- m_tabWidget->setCurrentWidget( m_mainFrame );
+--- akregator/src/actionmanagerimpl.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
++++ akregator/src/actionmanagerimpl.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
+@@ -366,7 +366,9 @@
+ KToggleAction* importantAction = coll->add<KToggleAction>("article_set_status_important");
+ importantAction->setText(i18n("&Mark as Important"));
+ importantAction->setIcon(KIcon("mail-mark-important"));
+- importantAction->setShortcuts(KShortcut("Ctrl+I"));
++ KShortcut importantSC( "Ctrl+I" );
++ importantSC.setAlternate( Qt::Key_I );
++ importantAction->setShortcuts( importantSC );
+ importantAction->setCheckedState(KGuiItem(i18n("Remove &Important Mark")));
+ connect(importantAction, SIGNAL(triggered(bool)), d->mainWidget, SLOT(slotArticleToggleKeepFlag(bool)));
+
+@@ -419,17 +421,8 @@
+ action = KStandardAction::copy(articleViewer, SLOT(slotCopy()), coll);
+ coll->addAction("viewer_copy", action);
+
+- action = coll->addAction("inc_font_sizes");
+- action->setIcon(KIcon("zoom-in"));
+- action->setText(i18n("&Increase Font Sizes"));
+- connect(action, SIGNAL(triggered(bool)), articleViewer, SLOT(slotZoomIn()));
+- action->setShortcut( QKeySequence::ZoomIn );
+-
+- action = coll->addAction("dec_font_sizes");
+- action->setIcon(KIcon("zoom-out"));
+- action->setText(i18n("&Decrease Font Sizes"));
+- connect(action, SIGNAL(triggered(bool)), articleViewer, SLOT(slotZoomOut()));
+- action->setShortcut( QKeySequence::ZoomOut );
++ connect(d->tabWidget, SIGNAL(signalZoomInFrame(int)), d->articleViewer, SLOT(slotZoomIn(int)));
++ connect(d->tabWidget, SIGNAL(signalZoomOutFrame(int)), d->articleViewer, SLOT(slotZoomOut(int)));
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim-branch.diff?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim.spec?r1=1.105&r2=1.106&f=u
More information about the pld-cvs-commit
mailing list