SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Sat Jan 21 23:58:57 CET 2006
Author: arekm Date: Sat Jan 21 22:58:57 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.14 SOURCES/kdepim-branch.diff:1.15
--- SOURCES/kdepim-branch.diff:1.14 Tue Jan 17 16:01:21 2006
+++ SOURCES/kdepim-branch.diff Sat Jan 21 23:58:52 2006
@@ -1,8 +1,8 @@
Index: akregator/ChangeLog
===================================================================
---- akregator/ChangeLog (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/ChangeLog (.../branches/KDE/3.5/kdepim) (revision 499311)
-@@ -1,10 +1,31 @@
+--- akregator/ChangeLog (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/ChangeLog (.../branches/KDE/3.5/kdepim) (revision 501053)
+@@ -1,10 +1,34 @@
Akregator ChangeLog
===================
-(c) 2004, 2005 the Akregator authors.
@@ -13,6 +13,9 @@
+
+Bug fixes:
+
++ 2006/01/17 Do not open binary files in the HTML viewer but externally.
++ Fix Save Link As for binary files (regression introduced after 1.2)
++ (#120087 (partially)) -fo
+ 2006/01/16 Fix article order in Combined View: sort by date (reversed) (#118055) -fo
+ 2006/01/15 Fix parsing of Atom 1.0 feeds with escaped HTML in it: Don't show tags
+ as text (#112491, #117938) -fo
@@ -37,8 +40,8 @@
Index: akregator/src/articleviewer.cpp
===================================================================
---- akregator/src/articleviewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/articleviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/articleviewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/articleviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -637,6 +637,7 @@
return slotClear();
@@ -49,8 +52,8 @@
Index: akregator/src/notificationmanager.cpp
===================================================================
---- akregator/src/notificationmanager.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/notificationmanager.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/notificationmanager.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/notificationmanager.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -33,7 +33,7 @@
#include "feed.h"
#include "notificationmanager.h"
@@ -69,8 +72,8 @@
#include "notificationmanager.moc"
Index: akregator/src/treenodeitem.cpp
===================================================================
---- akregator/src/treenodeitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/treenodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/treenodeitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/treenodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -34,7 +34,7 @@
#include <kdebug.h>
@@ -91,8 +94,8 @@
+} // namespace Akregator
Index: akregator/src/tagnodeitem.cpp
===================================================================
---- akregator/src/tagnodeitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/tagnodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/tagnodeitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/tagnodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -33,7 +33,7 @@
#include <qpoint.h>
#include <qpopupmenu.h>
@@ -110,8 +113,8 @@
+
Index: akregator/src/feed.cpp
===================================================================
---- akregator/src/feed.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/feed.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/feed.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/feed.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -62,9 +62,14 @@
bool markImmediatelyAsRead;
bool useNotification;
@@ -170,8 +173,8 @@
return;
Index: akregator/src/articlelistview.cpp
===================================================================
---- akregator/src/articlelistview.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/articlelistview.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/articlelistview.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/articlelistview.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -59,9 +59,21 @@
class ArticleListView::ArticleListViewPrivate
{
@@ -331,8 +334,8 @@
Index: akregator/src/mainwindow.cpp
===================================================================
---- akregator/src/mainwindow.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/mainwindow.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/mainwindow.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/mainwindow.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -59,7 +59,7 @@
#include <qtimer.h>
@@ -353,8 +356,8 @@
Index: akregator/src/librss/tools_p.cpp
===================================================================
---- akregator/src/librss/tools_p.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/librss/tools_p.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/librss/tools_p.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/librss/tools_p.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -45,24 +45,42 @@
return QString::null;
@@ -417,8 +420,8 @@
QString RSS::extractTitle(const QDomNode & parent)
Index: akregator/src/actionmanagerimpl.cpp
===================================================================
---- akregator/src/actionmanagerimpl.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/actionmanagerimpl.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/actionmanagerimpl.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/actionmanagerimpl.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -69,14 +69,14 @@
public:
NodeSelectVisitor(ActionManagerImpl* manager) : m_manager(manager) {}
@@ -438,8 +441,8 @@
m_manager->action("feed_modify")->setText(i18n("&Edit Feed..."));
Index: akregator/src/mk4storage/metakit/src/column.cpp
===================================================================
---- akregator/src/mk4storage/metakit/src/column.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/mk4storage/metakit/src/column.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/mk4storage/metakit/src/column.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/mk4storage/metakit/src/column.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -1441,8 +1441,9 @@
Set(index_++, c4_Bytes (ptr, length));
}
@@ -453,8 +456,8 @@
}
Index: akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
===================================================================
---- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -5,12 +5,15 @@
Name[cs]=Metakit ĂşloĹžiĹĄtÄ›
Name[da]=Metakit lagringsgrĂŚnseflade
@@ -513,10 +516,53 @@
Comment[zh_CN]=Akregator ć’äťś
ServiceTypes=Akregator/Plugin
+Index: akregator/src/akregator_part.cpp
+===================================================================
+--- akregator/src/akregator_part.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_part.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
+@@ -393,12 +393,15 @@
+ if (!doc.setContent(str))
+ {
+
+- QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
++ if (file.size() > 0) // don't backup empty files
++ {
++ QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
++
++ copyFile(backup);
++
++ KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
++ }
+
+- copyFile(backup);
+-
+- KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
+-
+ if (!doc.setContent(listBackup))
+ doc = createDefaultFeedList();
+ }
+@@ -406,11 +409,13 @@
+
+ if (!m_view->loadFeeds(doc))
+ {
+- QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
+- copyFile(backup);
++ if (file.size() > 0) // don't backup empty files
++ {
++ QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
++ copyFile(backup);
+
+- KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
+-
++ KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
++ }
+ m_view->loadFeeds(createDefaultFeedList());
+ }
+
Index: akregator/src/propertiesdialog.cpp
===================================================================
---- akregator/src/propertiesdialog.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/propertiesdialog.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/propertiesdialog.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/propertiesdialog.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -36,7 +36,7 @@
#include <qbuttongroup.h>
#include <qradiobutton.h>
@@ -536,8 +582,8 @@
// vim: ts=4 sw=4 et
Index: akregator/src/akregator_view.h
===================================================================
---- akregator/src/akregator_view.h (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator_view.h (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator_view.h (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_view.h (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -32,6 +32,7 @@
#include <kurl.h>
@@ -594,7 +640,7 @@
+ void slotOpenURLReply(const KURL& url, Akregator::Viewer* currentViewer, Akregator::BrowserRun::OpeningMode mode);
+
+ /** HACK: part of the url opening hack for 3.5. called when a viewer emits urlClicked(). TODO: Remove for KDE4 */
-+ void slotUrlClickedInViewer(const KURL& url, bool background);
++ void slotUrlClickedInViewer(const KURL& url, Viewer* viewer, bool newTab, bool background);
+
+ void slotOpenURL(const KURL& url, Akregator::Viewer* currentViewer, Akregator::BrowserRun::OpeningMode mode);
+
@@ -603,8 +649,8 @@
Index: akregator/src/feeditem.cpp
===================================================================
---- akregator/src/feeditem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/feeditem.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/feeditem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/feeditem.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -32,7 +32,7 @@
#include <kiconloader.h>
#include <qstring.h>
@@ -622,8 +668,8 @@
+
Index: akregator/src/feedlistview.cpp
===================================================================
---- akregator/src/feedlistview.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/feedlistview.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/feedlistview.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/feedlistview.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -71,6 +71,7 @@
ConnectNodeVisitor* connectNodeVisitor;
DisconnectNodeVisitor* disconnectNodeVisitor;
@@ -814,8 +860,8 @@
void NodeListView::slotRootNodeChanged(TreeNode* rootNode)
Index: akregator/src/folderitem.cpp
===================================================================
---- akregator/src/folderitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/folderitem.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/folderitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/folderitem.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -31,7 +31,7 @@
#include <kaction.h>
#include <kiconloader.h>
@@ -833,8 +879,8 @@
+} // namespace Akregator
Index: akregator/src/addfeeddialog.cpp
===================================================================
---- akregator/src/addfeeddialog.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/addfeeddialog.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/addfeeddialog.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/addfeeddialog.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -37,7 +37,7 @@
#include <ksqueezedtextlabel.h>
#include <kmessagebox.h>
@@ -854,8 +900,8 @@
// vim: ts=4 sw=4 et
Index: akregator/src/pageviewer.cpp
===================================================================
---- akregator/src/pageviewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/pageviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/pageviewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -237,12 +237,15 @@
closeURL();
}
@@ -908,7 +954,49 @@
void PageViewer::slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args)
{
updateHistoryEntry();
-@@ -492,9 +476,10 @@
+@@ -286,21 +270,6 @@
+
+ }
+
+-void PageViewer::urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs args)
+-{
+- updateHistoryEntry();
+- if (button == MidButton)
+- Viewer::urlSelected(url, button, state, _target, args);
+- else
+- {
+- browserExtension()->setURLArgs(args);
+- if (_target.lower() == "_blank")
+- Viewer::urlSelected(url, button, state, _target, args);
+- else
+- openURL(completeURL(url) );
+- }
+-}
+-
+ void PageViewer::slotPopupActivated( int id )
+ {
+ QValueList<HistoryEntry>::Iterator it = d->history.begin();
+@@ -376,6 +345,19 @@
+ d->stopAction->setEnabled(false);
+ }
+
++void PageViewer::urlSelected(const QString &url, int button, int state, const QString &_target, KParts::URLArgs args)
++{
++ if (button == LeftButton)
++ {
++ m_url = completeURL(url);
++ browserExtension()->setURLArgs(args);
++ slotOpenLinkInThisTab();
++ }
++ else
++ {
++ Viewer::urlSelected(url,button,state,_target,args);
++ }
++}
+
+ void PageViewer::slotSetCaption(const QString& cap)
+ {
+@@ -492,9 +474,10 @@
else
kurl = KURL(url);
// kurl.addPath(url);
@@ -924,8 +1012,8 @@
Index: akregator/src/feedlistview.h
===================================================================
---- akregator/src/feedlistview.h (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/feedlistview.h (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/feedlistview.h (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/feedlistview.h (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -178,6 +178,9 @@
friend class CreateItemVisitor;
class CreateItemVisitor;
@@ -938,8 +1026,8 @@
Index: akregator/src/viewer.cpp
===================================================================
---- akregator/src/viewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/viewer.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/viewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/viewer.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -45,7 +45,7 @@
#include "akregator_run.h"
#include "akregatorconfig.h"
@@ -949,7 +1037,29 @@
Viewer::Viewer(QWidget *parent, const char *name)
: KHTMLPart(parent, name), m_url(0)
-@@ -327,6 +327,8 @@
+@@ -232,14 +232,19 @@
+
+ void Viewer::slotOpenLinkInForegroundTab()
+ {
+- emit urlClicked(m_url, false);
++ emit urlClicked(m_url, this, true, false);
+ }
+
+ void Viewer::slotOpenLinkInBackgroundTab()
+ {
+- emit urlClicked(m_url, true);
++ emit urlClicked(m_url, this, true, true);
+ }
+
++void Viewer::slotOpenLinkInThisTab()
++{
++ emit urlClicked(m_url, this, false, false);
++}
++
+ void Viewer::slotOpenLinkInBrowser()
+ {
+ displayInExternalBrowser(m_url, QString::null);
+@@ -327,6 +332,8 @@
setStatusMessagesEnabled(false);
}
@@ -960,8 +1070,8 @@
// vim: set et ts=4 sts=4 sw=4:
Index: akregator/src/akregator_run.h
===================================================================
---- akregator/src/akregator_run.h (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator_run.h (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator_run.h (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_run.h (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -30,23 +30,37 @@
namespace Akregator
{
@@ -1011,8 +1121,8 @@
}
Index: akregator/src/pageviewer.h
===================================================================
---- akregator/src/pageviewer.h (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/pageviewer.h (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/pageviewer.h (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/pageviewer.h (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -45,9 +45,6 @@
virtual ~PageViewer();
virtual bool openURL(const KURL &url);
@@ -1025,8 +1135,8 @@
class HistoryEntry;
Index: akregator/src/akregator_run.cpp
===================================================================
---- akregator/src/akregator_run.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator_run.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator_run.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_run.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -27,14 +27,19 @@
#include "viewer.h"
#include "akregator_run.h"
@@ -1081,8 +1191,8 @@
// vim: set et ts=4 sts=4 sw=4:
Index: akregator/src/aboutdata.h
===================================================================
---- akregator/src/aboutdata.h (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/aboutdata.h (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/aboutdata.h (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/aboutdata.h (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -28,7 +28,7 @@
#include <kaboutdata.h>
#include <kdepimmacros.h>
@@ -1094,8 +1204,8 @@
/**
Index: akregator/src/akregator_plugin.desktop
===================================================================
---- akregator/src/akregator_plugin.desktop (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator_plugin.desktop (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator_plugin.desktop (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_plugin.desktop (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -3,30 +3,35 @@
X-KDE-ServiceType=Akregator/Plugin
Comment=Plugin for Akregator
@@ -1135,8 +1245,8 @@
Index: akregator/src/akregator.desktop
===================================================================
---- akregator/src/akregator.desktop (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator.desktop (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator.desktop (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator.desktop (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -1,7 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
@@ -1201,8 +1311,8 @@
Categories=Qt;KDE;Network;
Index: akregator/src/akregator_part.rc
===================================================================
---- akregator/src/akregator_part.rc (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator_part.rc (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator_part.rc (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_part.rc (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="akregator_part" version="77">
@@ -1231,8 +1341,8 @@
<Menu name="settings">
Index: akregator/src/akregator_part.desktop
===================================================================
---- akregator/src/akregator_part.desktop (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator_part.desktop (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator_part.desktop (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_part.desktop (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -5,10 +5,10 @@
Name[da]=AkregatorPart
Name[de]=aKregator-Komponente
@@ -1247,8 +1357,8 @@
Type=Service
Index: akregator/src/viewer.h
===================================================================
---- akregator/src/viewer.h (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/viewer.h (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/viewer.h (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/viewer.h (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -40,14 +40,18 @@
{
Q_OBJECT
@@ -1271,7 +1381,7 @@
public slots:
void slotScrollUp();
-@@ -59,7 +63,7 @@
+@@ -59,10 +63,10 @@
void setSafeMode();
virtual void slotPaletteOrFontChanged() = 0;
@@ -1279,8 +1389,21 @@
+
signals:
/** This gets emitted when url gets clicked */
- void urlClicked(const KURL& url, bool background=false);
-@@ -110,11 +114,6 @@
+- void urlClicked(const KURL& url, bool background=false);
++ void urlClicked(const KURL& url, Viewer* viewer, bool newTab, bool background);
+
+ protected: // methods
+ int pointsToPixel(int points) const;
+@@ -96,6 +100,8 @@
+
+ /** Opens @c m_url in background tab */
+ virtual void slotOpenLinkInBackgroundTab();
++
++ virtual void slotOpenLinkInThisTab();
+
+ virtual void slotSaveLinkAs();
+
+@@ -110,11 +116,6 @@
protected: // attributes
KURL m_url;
@@ -1294,8 +1417,8 @@
Index: akregator/src/eventsrc
===================================================================
---- akregator/src/eventsrc (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/eventsrc (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/eventsrc (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/eventsrc (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -3,7 +3,6 @@
Comment=Akregator
Comment[da]=Akregator Plugin
@@ -1401,8 +1524,8 @@
Index: akregator/src/akregator_view.cpp
===================================================================
---- akregator/src/akregator_view.cpp (.../tags/KDE/3.5.0/kdepim) (revision 499311)
-+++ akregator/src/akregator_view.cpp (.../branches/KDE/3.5/kdepim) (revision 499311)
+--- akregator/src/akregator_view.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
++++ akregator/src/akregator_view.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
@@ -26,6 +26,7 @@
#include "actionmanagerimpl.h"
@@ -1411,12 +1534,14 @@
#include "akregator_view.h"
#include "listtabwidget.h"
#include "addfeeddialog.h"
-@@ -306,7 +307,7 @@
+@@ -305,8 +306,8 @@
+
connect(m_searchBar, SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)));
- connect( m_articleViewer, SIGNAL(urlClicked(const KURL&, bool)),
+- connect( m_articleViewer, SIGNAL(urlClicked(const KURL&, bool)),
- this, SLOT(slotOpenTab(const KURL&, bool)) );
-+ this, SLOT(slotUrlClickedInViewer(const KURL&, bool)) );
++ connect( m_articleViewer, SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)),
++ this, SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) );
connect( m_articleViewer->browserExtension(), SIGNAL(mouseOverInfo(const KFileItem *)),
this, SLOT(slotMouseOverInfo(const KFileItem *)) );
@@ -1429,16 +1554,18 @@
{
PageViewer* page = new PageViewer(this, "page");
-@@ -430,7 +431,7 @@
+@@ -429,8 +430,8 @@
+
connect( page, SIGNAL(setTabIcon(const QPixmap&)),
this, SLOT(setTabIcon(const QPixmap&)));
- connect( page, SIGNAL(urlClicked(const KURL &,bool)),
+- connect( page, SIGNAL(urlClicked(const KURL &,bool)),
- this, SLOT(slotOpenTab(const KURL &,bool)) );
-+ this, SLOT(slotUrlClickedInViewer(const KURL &, bool)) );
++ connect( page, SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
++ this, SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled"));
frame->setAutoDeletePart(true); // delete page viewer when removing the tab
-@@ -823,7 +824,44 @@
+@@ -823,7 +824,52 @@
updateTagActions();
}
@@ -1457,9 +1584,17 @@
+}
+//TODO: KDE4 remove this ugly ugly hack
-+void View::slotUrlClickedInViewer(const KURL& url, bool background)
++void View::slotUrlClickedInViewer(const KURL& url, Viewer* viewer, bool newTab, bool background)
+{
-+ slotOpenURL(url, 0L, background ? BrowserRun::NEW_TAB_BACKGROUND : BrowserRun::NEW_TAB_FOREGROUND);
++
++ if (!newTab)
++ {
++ slotOpenURL(url, viewer, BrowserRun::CURRENT_TAB);
++ }
++ else
++ {
++ slotOpenURL(url, 0L, background ? BrowserRun::NEW_TAB_BACKGROUND : BrowserRun::NEW_TAB_FOREGROUND);
++ }
+}
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list