From e30a962d8bb9bc5018ba121a4046132a59f6e1c3 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Wed, 21 Apr 2010 11:53:32 +0200
Subject: Akregator RSS support

---
 src/webtab.cpp | 96 +++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 65 insertions(+), 31 deletions(-)

(limited to 'src/webtab.cpp')

diff --git a/src/webtab.cpp b/src/webtab.cpp
index 62de6299..83532a65 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -50,6 +50,7 @@
 #include <KWebView>
 #include <kwebwallet.h>
 #include <KDE/KMessageBox>
+#include <KProcess>
 
 // Qt Includes
 #include <QContextMenuEvent>
@@ -179,43 +180,76 @@ void WebTab::createPreviewSelectorBar(int index)
 
 bool WebTab::hasRSSInfo()
 {
-    _rssList.clear();
-    QWebElementCollection col = page()->mainFrame()->findAllElements("link");
-    foreach(QWebElement el, col)
-    {
-        if( el.attribute("type") == QL1S("application/rss+xml") || el.attribute("type") == QL1S("application/rss+xml") )
-        {
-            if( el.attribute("href").startsWith( QL1S("http") ) )
-            {
-                _rssList << KUrl( el.attribute("href") );
-            }
-            else
-            {
-                KUrl u = url();
-                // NOTE
-                // cd() is probably better than setPath() here, 
-                // for all those url sites just having a path
-                if(u.cd( el.attribute("href") ))
-                    _rssList << u;
-            }
-        }
-    }
+    QWebElementCollection col = page()->mainFrame()->findAllElements("link[type=\"application/rss+xml\"]");
+    col.append(page()->mainFrame()->findAllElements("link[type=\"application/atom+xml\"]"));
+    if(col.count() != 0)
+        return true;
     
-    return !_rssList.isEmpty();
+    return false;
 }
 
 
-void WebTab::showRSSInfo()
+void WebTab::showRSSInfo(QPoint menuPos)
 {
-    QString urlList = QString(i18n("The following RSS feeds were found:<br /><br />"));
-    foreach(const KUrl &url, _rssList)
+    KMenu *menu = new KMenu();
+    menu->addTitle(KIcon("application-rss+xml"), i18n("Add Streams to Akregator"));
+    
+    QWebElementCollection col = page()->mainFrame()->findAllElements("link[type=\"application/rss+xml\"]");
+    col.append(page()->mainFrame()->findAllElements("link[type=\"application/atom+xml\"]"));
+    foreach(QWebElement el, col)
     {
-        urlList += QString("<a href=\"") + url.url() + QString("\">") + url.url() + QString("</a><br />");
+        QString urlString;
+        if( el.attribute("href").startsWith( QL1S("http") ) )
+            urlString = el.attribute("href");
+        else
+        {
+            KUrl u = url();
+            // NOTE
+            // cd() is probably better than setPath() here, 
+            // for all those url sites just having a path
+            if(u.cd( el.attribute("href") ))
+                    urlString = u.toMimeDataString();
+        }
+        
+        QString title = el.attribute("title");
+        if(title.isEmpty())
+            title= el.attribute("href");
+        
+        KAction *action = new KAction(title, menu);
+        action->setData(urlString);
+        
+        menu->addAction(action);
     }
-    urlList += QString(i18n("<br />Enough for now... Waiting for some cool Akonadi based feeds management :)"));
     
-    KMessageBox::information( view(), 
-                              urlList,
-                              i18n("RSS Management")
-                            );
+    QAction *action = menu->exec(menuPos);
+    if(action == 0)
+        return;
+    
+    // Akregator is running
+    if(QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.akregator"))
+    {
+        QDBusInterface akregator("org.kde.akregator", "/Akregator", "org.kde.akregator.part");
+        QDBusReply<void> reply = akregator.call("addFeedsToGroup", action->data().toStringList(), i18n("Imported Feeds"));
+        
+        if(!reply.isValid()) 
+        {
+            KMessageBox::error( 0, QString(i18n("Could not add stream to akregator, Please add it manually :")
+                                            + "<br /><br /> <a href=\"" + action->data().toString() + "\">"
+                                            + action->data().toString() + "</a>"));
+        }
+    }
+    // Akregator is not running
+    else
+    {
+        KProcess proc;
+        proc << "akregator" << "-g" << i18n("Imported Feeds");
+        proc << "-a" << action->data().toString();
+        if(proc.startDetached() == 0)
+        {
+            KMessageBox::error( 0, QString(i18n("There was an error. Please verify Akregator is installed on your system.")
+                                            + "<br /><br /> <a href=\"" + action->data().toString() + "\">"
+                                            + action->data().toString() + "</a>"));
+        }
+        
+    }
 }
-- 
cgit v1.2.1


From f8d039131bcb2badbdd4d7cb9abae00f569a1ad4 Mon Sep 17 00:00:00 2001
From: matgic78 <matgic78@gmail.com>
Date: Thu, 22 Apr 2010 20:09:53 +0200
Subject: RSS : new popup appaeraing when clicking the icon, 2 combobox to
 select agregator and feed, and buttons to add/cancel

---
 src/webtab.cpp | 48 +++++++++---------------------------------------
 1 file changed, 9 insertions(+), 39 deletions(-)

(limited to 'src/webtab.cpp')

diff --git a/src/webtab.cpp b/src/webtab.cpp
index 83532a65..02511d39 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -40,6 +40,7 @@
 #include "bookmarksmanager.h"
 #include "walletbar.h"
 #include "previewselectorbar.h"
+#include "rsswidget.h"
 
 // KDE Includes
 #include <KService>
@@ -50,7 +51,6 @@
 #include <KWebView>
 #include <kwebwallet.h>
 #include <KDE/KMessageBox>
-#include <KProcess>
 
 // Qt Includes
 #include <QContextMenuEvent>
@@ -189,13 +189,13 @@ bool WebTab::hasRSSInfo()
 }
 
 
-void WebTab::showRSSInfo(QPoint menuPos)
+void WebTab::showRSSInfo(QPoint pos)
 {
-    KMenu *menu = new KMenu();
-    menu->addTitle(KIcon("application-rss+xml"), i18n("Add Streams to Akregator"));
-    
     QWebElementCollection col = page()->mainFrame()->findAllElements("link[type=\"application/rss+xml\"]");
     col.append(page()->mainFrame()->findAllElements("link[type=\"application/atom+xml\"]"));
+    
+    QMap<KUrl, QString> map;
+    int i = 0;
     foreach(QWebElement el, col)
     {
         QString urlString;
@@ -215,41 +215,11 @@ void WebTab::showRSSInfo(QPoint menuPos)
         if(title.isEmpty())
             title= el.attribute("href");
         
-        KAction *action = new KAction(title, menu);
-        action->setData(urlString);
+        map.insert(KUrl(urlString), title);
         
-        menu->addAction(action);
+        i++;
     }
     
-    QAction *action = menu->exec(menuPos);
-    if(action == 0)
-        return;
-    
-    // Akregator is running
-    if(QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.akregator"))
-    {
-        QDBusInterface akregator("org.kde.akregator", "/Akregator", "org.kde.akregator.part");
-        QDBusReply<void> reply = akregator.call("addFeedsToGroup", action->data().toStringList(), i18n("Imported Feeds"));
-        
-        if(!reply.isValid()) 
-        {
-            KMessageBox::error( 0, QString(i18n("Could not add stream to akregator, Please add it manually :")
-                                            + "<br /><br /> <a href=\"" + action->data().toString() + "\">"
-                                            + action->data().toString() + "</a>"));
-        }
-    }
-    // Akregator is not running
-    else
-    {
-        KProcess proc;
-        proc << "akregator" << "-g" << i18n("Imported Feeds");
-        proc << "-a" << action->data().toString();
-        if(proc.startDetached() == 0)
-        {
-            KMessageBox::error( 0, QString(i18n("There was an error. Please verify Akregator is installed on your system.")
-                                            + "<br /><br /> <a href=\"" + action->data().toString() + "\">"
-                                            + action->data().toString() + "</a>"));
-        }
-        
-    }
+    RSSWidget *widget = new RSSWidget(map, window()); 
+    widget->showAt(pos);
 }
-- 
cgit v1.2.1