Renamed autofillwidget to autofillnotification, started working on rss

menu popup, updated translation files, edited RSS checking, it checks
WebView on loadprogress

src/QupZilla.pro

@@ -81,8 +81,9 @@ SOURCES += main.cpp\
     plugins/webpluginfactory.cpp \
     downloads/downloaditem.cpp \
     3rdparty/ecwin7.cpp \
-    autofill/autofillwidget.cpp \
+    webview/webtab.cpp \
-    webview/webtab.cpp
+    rss/rsswidget.cpp \
+    autofill/autofillnotification.cpp
 
 HEADERS  += 3rdparty/squeezelabel.h \
     3rdparty/qtwin.h \
@@ -133,8 +134,9 @@ HEADERS  += 3rdparty/squeezelabel.h \
     plugins/webpluginfactory.h \
     downloads/downloaditem.h \
     3rdparty/ecwin7.h \
-    autofill/autofillwidget.h \
+    webview/webtab.h \
-    webview/webtab.h
+    rss/rsswidget.h \
+    autofill/autofillnotification.h
 
 FORMS    += \
     preferences/autofillmanager.ui \
@@ -151,7 +153,8 @@ FORMS    += \
     webview/siteinfowidget.ui \
     downloads/downloaditem.ui \
     downloads/downloadmanager.ui \
-    autofill/autofillwidget.ui
+    rss/rsswidget.ui \
+    autofill/autofillnotification.ui
 
 RESOURCES += \
     data/icons.qrc \

src/autofill/autofillmodel.cpp

@@ -177,7 +177,7 @@ void AutoFillModel::post(const QNetworkRequest &request, const QByteArray &outgo
         }
     }
 
-    AutoFillWidget* aWidget = new AutoFillWidget(request.url(), outgoingData, pass);
+    AutoFillNotification* aWidget = new AutoFillNotification(request.url(), outgoingData, pass);
     webView->addNotification(aWidget);
 
 }

src/autofill/autofillnotification.cpp

@@ -1,9 +1,9 @@
-#include "autofillwidget.h"
+#include "autofillnotification.h"
-#include "ui_autofillwidget.h"
+#include "ui_autofillnotification.h"
 #include "autofillmodel.h"
 #include "mainapplication.h"
 
-AutoFillWidget::AutoFillWidget(QUrl url, QByteArray data, QString pass, QWidget *parent)
+AutoFillNotification::AutoFillNotification(QUrl url, QByteArray data, QString pass, QWidget *parent)
    :QWidget(parent)
    ,ui(new Ui::AutoFillWidget)
    ,m_url(url)
@@ -35,7 +35,7 @@ AutoFillWidget::AutoFillWidget(QUrl url, QByteArray data, QString pass, QWidget
     QTimer::singleShot(300, m_animation, SLOT(start()));
 }
 
-void AutoFillWidget::hide()
+void AutoFillNotification::hide()
 {
     m_animation->setDirection(QTimeLine::Backward);
 
@@ -44,25 +44,25 @@ void AutoFillWidget::hide()
     connect(m_animation, SIGNAL(finished()), this, SLOT(close()));
 }
 
-void AutoFillWidget::frameChanged(int frame)
+void AutoFillNotification::frameChanged(int frame)
 {
     setMinimumHeight(frame);
     setMaximumHeight(frame);
 }
 
-void AutoFillWidget::never()
+void AutoFillNotification::never()
 {
     MainApplication::getInstance()->autoFill()->blockStoringfor(m_url);
     hide();
 }
 
-void AutoFillWidget::remember()
+void AutoFillNotification::remember()
 {
     MainApplication::getInstance()->autoFill()->addEntry(m_url, m_data, m_pass);
     hide();
 }
 
-AutoFillWidget::~AutoFillWidget()
+AutoFillNotification::~AutoFillNotification()
 {
     delete ui;
 }

src/autofill/autofillnotification.h

@@ -10,13 +10,13 @@ namespace Ui {
     class AutoFillWidget;
 }
 
-class AutoFillWidget : public QWidget
+class AutoFillNotification : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit AutoFillWidget(QUrl url, QByteArray data, QString pass, QWidget *parent = 0);
+    explicit AutoFillNotification(QUrl url, QByteArray data, QString pass, QWidget *parent = 0);
-    ~AutoFillWidget();
+    ~AutoFillNotification();
 
 private slots:
     void frameChanged(int frame);

src/bookmarks/bookmarkswidget.ui

@@ -14,17 +14,17 @@
    <string/>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="Frame" name="frame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <property name="horizontalSpacing">
-       <number>0</number>
-      </property>
       <property name="margin">
-       <number>0</number>
+       <number>9</number>
       </property>
       <item row="0" column="0" rowspan="2">
        <widget class="QLabel" name="label">
@@ -32,7 +32,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="../icons.qrc">:/icons/other/bigstar.png</pixmap>
+         <pixmap resource="../data/icons.qrc">:/icons/other/bigstar.png</pixmap>
         </property>
        </widget>
       </item>
@@ -136,7 +136,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
+  <include location="../data/icons.qrc"/>
  </resources>
  <connections/>
 </ui>

src/data/icons.qrc

@@ -64,5 +64,6 @@
         <file>icons/other/flash.png</file>
         <file>icons/other/flashstart.png</file>
         <file>icons/other/keys.png</file>
+        <file>icons/other/bigrss.png</file>
     </qresource>
 </RCC>

src/navigation/locationbar.cpp

@@ -8,6 +8,7 @@
 #include "bookmarkswidget.h"
 #include "bookmarksmodel.h"
 #include "siteinfowidget.h"
+#include "rsswidget.h"
 
 LocationBar::LocationBar(QupZilla* mainClass, QWidget *parent)
     : LineEdit(parent)
@@ -27,17 +28,12 @@ LocationBar::LocationBar(QupZilla* mainClass, QWidget *parent)
     m_siteIcon->setStyleSheet("QToolButton{border-image: url(:/icons/locationbar/searchchoose.png); margin-left:2px;}");
     m_siteIcon->setFocusPolicy(Qt::ClickFocus);
 
-    m_rssIcon = new QToolButton(this);
+    m_rssIcon = new ClickableLabel(this);
-    m_rssIcon->setIcon(QIcon(":/icons/menu/rss.png"));
+    m_rssIcon->setPixmap(QPixmap(":/icons/menu/rss.png"));
-    m_rssIcon->setCursor(Qt::ArrowCursor);
+    m_rssIcon->setCursor(Qt::PointingHandCursor);
-    m_rssIcon->setMaximumSize(30, 23);
-    m_rssIcon->setAutoRaise(true);
-    m_rssIcon->setVisible(false);
-    m_rssIcon->setPopupMode(QToolButton::InstantPopup);
     m_rssIcon->setToolTip(tr("Add RSS from this page..."));
     m_rssIcon->setStyleSheet("margin-bottom:2px");
     m_rssIcon->setFocusPolicy(Qt::ClickFocus);
-    m_rssMenu = new QMenu(this);
 
     m_goButton = new ClickableLabel(this);
     m_goButton->setPixmap(QPixmap(":/icons/locationbar/gotoaddress.png"));
@@ -78,10 +74,11 @@ LocationBar::LocationBar(QupZilla* mainClass, QWidget *parent)
     connect(down, SIGNAL(clicked(QPoint)), this, SLOT(showPopup()));
     connect(m_goButton, SIGNAL(clicked(QPoint)), p_QupZilla, SLOT(urlEnter()));
     connect(m_bookmarkButton, SIGNAL(clicked(QPoint)), this, SLOT(bookmarkIconClicked()));
-
+    connect(m_rssIcon, SIGNAL(clicked(QPoint)), this, SLOT(rssIconClicked()));
-    setLeftMargin(33);
 
     setStyleSheet("QLineEdit { background: transparent; border-image: url(:/icons/locationbar/lineedit.png); border-width:4; color:black;}");
+//    setLeftMargin(33);
+    setLeftMargin(m_siteIcon->sizeHint().width()+1);
 }
 
 void LocationBar::loadSettings()
@@ -149,6 +146,14 @@ void LocationBar::bookmarkIconClicked()
     }
 }
 
+void LocationBar::rssIconClicked()
+{
+    QList<QPair<QString,QString> > _rss = p_QupZilla->weView()->getRss();
+
+    RSSWidget* rss = new RSSWidget(_rss, this);
+    rss->showAt(this);
+}
+
 void LocationBar::checkBookmark()
 {
     if (m_bookmarksModel->isBookmarked(QUrl(text()))) {
@@ -160,41 +165,6 @@ void LocationBar::checkBookmark()
     }
 }
 
-void LocationBar::checkRss()
-{
-    WebView* view = p_QupZilla->weView();
-    if (!view)
-        return;
-    QWebFrame* frame = view->page()->mainFrame();
-    QWebElementCollection links = frame->findAllElements("link");
-
-    bool found = false;
-    m_rssMenu->clear();
-    for (int i = 0; i<links.count(); i++) {
-        QWebElement element = links.at(i);
-        //We will show only atom+xml and rss+xml
-        if (element.attribute("rel")!="alternate" || (element.attribute("type")!="application/rss+xml" && element.attribute("type")!="application/atom+xml") )
-            continue;
-        QString title = element.attribute("title");
-        QString href = element.attribute("href");
-        if (href.isEmpty() || title.isEmpty())
-            continue;
-
-        QAction* act = new QAction(tr("Add RSS channel with title '")+title+"'...", this);
-        connect(act, SIGNAL(triggered()), this, SLOT(addRss()));
-        act->setData(href);
-        act->setToolTip(title);
-        m_rssMenu->addAction(act);
-        found = true;
-    }
-
-    m_rssMenu->addSeparator();
-    m_rssMenu->addAction(QIcon(":/icons/menu/rss.png"), tr("Read RSS news"), p_QupZilla, SLOT(showRSSManager()));
-
-    m_rssIcon->setVisible(found);
-    m_rssIcon->setMenu(m_rssMenu);
-}
-
 QIcon LocationBar::icon(const QUrl &url)
 {
     QUrl url2 = url.scheme() + "://" + url.host();

src/navigation/locationbar.h

@@ -36,8 +36,9 @@ public:
     void loadSettings();
 
 public slots:
-    void checkRss();
     void showUrl(const QUrl &url, bool empty = true);
+
+private slots:
     void siteIconChanged();
     void setPrivacy(bool state);
     void addRss();
@@ -46,6 +47,7 @@ public slots:
     void bookmarkIconClicked();
     void checkBookmark();
     void showSiteInfo();
+    void rssIconClicked();
 
 private:
     void focusOutEvent(QFocusEvent* e);
@@ -58,8 +60,8 @@ private:
 
     ClickableLabel* m_bookmarkButton;
     ClickableLabel* m_goButton;
+    ClickableLabel* m_rssIcon;
     QToolButton* m_siteIcon;
-    QToolButton* m_rssIcon;
     QMenu* m_rssMenu;
 
     bool m_selectAllOnDoubleClick;

src/rss/rsswidget.cpp

@@ -0,0 +1,22 @@
+#include "rsswidget.h"
+#include "ui_rsswidget.h"
+
+RSSWidget::RSSWidget(QList<QPair<QString, QString> > availableRss, QWidget *parent)
+    :QMenu(parent)
+    ,ui(new Ui::RSSWidget)
+    ,m_avRss(availableRss)
+{
+    ui->setupUi(this);
+}
+
+void RSSWidget::showAt(QWidget* _parent)
+{
+    QPoint p = _parent->mapToGlobal(QPoint(0, 0));
+    move( (p.x()+_parent->width() ) - width(), p.y() + _parent->height());
+    show();
+}
+
+RSSWidget::~RSSWidget()
+{
+    delete ui;
+}

src/rss/rsswidget.h

@@ -0,0 +1,26 @@
+#ifndef RSSWIDGET_H
+#define RSSWIDGET_H
+
+#include <QWidget>
+#include <QMenu>
+
+namespace Ui {
+    class RSSWidget;
+}
+
+class RSSWidget : public QMenu
+{
+    Q_OBJECT
+
+public:
+    explicit RSSWidget(QList<QPair<QString,QString> > availableRss, QWidget *parent = 0);
+    ~RSSWidget();
+
+    void showAt(QWidget* _parent);
+
+private:
+    Ui::RSSWidget *ui;
+    QList<QPair<QString,QString> > m_avRss;
+};
+
+#endif // RSSWIDGET_H

src/rss/rsswidget.ui

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RSSWidget</class>
+ <widget class="QWidget" name="RSSWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>245</width>
+    <height>66</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="Frame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <property name="horizontalSpacing">
+       <number>6</number>
+      </property>
+      <property name="margin">
+       <number>9</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="pixmap">
+         <pixmap resource="../data/icons.qrc">:/icons/other/bigrss.png</pixmap>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Add RSS Feeds from this site</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Frame</class>
+   <extends>QFrame</extends>
+   <header>frame.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../data/icons.qrc"/>
+ </resources>
+ <connections/>
+</ui>

src/webview/webview.cpp

@@ -91,6 +91,7 @@ void WebView::setProgress(int prog)
     if (isCurrent()) {
         emit showUrl(url());
     }
+    checkRss();
 }
 
 void WebView::loadStarted()
@@ -172,7 +173,6 @@ void WebView::loadFinished(bool state)
     p_QupZilla->getMainApp()->history()->addHistoryEntry(this);
     if (isCurrent()) {
         emit showUrl(url());
-        emit checkRss();
     }
 
     iconChanged();
@@ -285,6 +285,25 @@ QUrl WebView::guessUrlFromString(const QString &string)
     return QUrl();
 }
 
+void WebView::checkRss()
+{
+    QWebFrame* frame = page()->mainFrame();
+    QWebElementCollection links = frame->findAllElements("link");
+    m_rss.clear();
+
+    for (int i = 0; i<links.count(); i++) {
+        QWebElement element = links.at(i);
+        //We will show only atom+xml and rss+xml
+        if (element.attribute("rel")!="alternate" || (element.attribute("type")!="application/rss+xml" && element.attribute("type")!="application/atom+xml") )
+            continue;
+        QString title = element.attribute("title");
+        QString href = element.attribute("href");
+        if (href.isEmpty() || title.isEmpty())
+            continue;
+        m_rss.append(QPair<QString,QString>(title, href));
+    }
+}
+
 void WebView::mousePressEvent(QMouseEvent *event)
 {
     switch (event->button()) {

src/webview/webview.h

@@ -41,6 +41,8 @@ public:
     QString getIp() { return m_currentIp; }
     QLabel* animationLoading(int index, bool addMovie);
     void addNotification(QWidget* notif);
+    bool hasRss() { return !m_rss.isEmpty(); }
+    QList<QPair<QString,QString> > getRss() { return m_rss; }
 
     static QUrl guessUrlFromString(const QString &string);
     static bool isUrlValid(const QUrl &url);
@@ -82,6 +84,7 @@ private slots:
     void showInspector();
     void stopAnimation();
     void setIp(QHostInfo info);
+    void checkRss();
 
 private:
     void keyPressEvent(QKeyEvent *event);
@@ -103,6 +106,7 @@ private:
     QUrl m_aboutToLoadUrl;
     bool m_wantsClose;
     QString m_currentIp;
+    QList<QPair<QString,QString> > m_rss;
 
     WebPage* m_page;
     NetworkManagerProxy* m_networkProxy;
@@ -112,7 +116,6 @@ signals:
     void showUrl(QUrl url);
     void siteIconChanged();
     void setPrivacy(bool state);
-    void checkRss();
     void wantsCloseTab(int index);
     void changed();
     void ipChanged(QString ip);

translations/cs_CZ.ts

@@ -136,28 +136,31 @@ p, li { white-space: pre-wrap; }
         <translation>Změnit heslo:</translation>
     </message>
 </context>
+<context>
+    <name>AutoFillNotification</name>
+    <message>
+        <location filename="../src/autofill/autofillnotification.cpp" line="15"/>
+        <source>Do you want QupZilla to remember password on %1?</source>
+        <translation>Chcete aby si QupZilla zapamatovala heslo pro %1?</translation>
+    </message>
+</context>
 <context>
     <name>AutoFillWidget</name>
     <message>
-        <location filename="../src/autofill/autofillwidget.ui" line="78"/>
+        <location filename="../src/autofill/autofillnotification.ui" line="81"/>
         <source>Remember</source>
         <translation>Zapamatovat</translation>
     </message>
     <message>
-        <location filename="../src/autofill/autofillwidget.ui" line="91"/>
+        <location filename="../src/autofill/autofillnotification.ui" line="97"/>
         <source>Never For This Site</source>
         <translation>Nikdy pro tuto stránku</translation>
     </message>
     <message>
-        <location filename="../src/autofill/autofillwidget.ui" line="104"/>
+        <location filename="../src/autofill/autofillnotification.ui" line="113"/>
         <source>Not Now</source>
         <translation>Nyní ne</translation>
     </message>
-    <message>
-        <location filename="../src/autofill/autofillwidget.cpp" line="15"/>
-        <source>Do you want QupZilla to remember password on %1?</source>
-        <translation>Chcete aby si QupZilla zapamatovala heslo pro %1?</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -849,54 +852,44 @@ neexistuje!</translation>
 <context>
     <name>LocationBar</name>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="26"/>
+        <location filename="../src/navigation/locationbar.cpp" line="27"/>
         <source>Show informations about this page</source>
         <translation>Zobrazit informace o stránce</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="36"/>
+        <location filename="../src/navigation/locationbar.cpp" line="34"/>
         <source>Add RSS from this page...</source>
         <translation>Přidat RSS kanál ...</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="50"/>
+        <location filename="../src/navigation/locationbar.cpp" line="48"/>
-        <location filename="../src/navigation/locationbar.cpp" line="156"/>
+        <location filename="../src/navigation/locationbar.cpp" line="164"/>
         <source>Bookmark this Page</source>
         <translation>Přidat stránku do záložek</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="61"/>
+        <location filename="../src/navigation/locationbar.cpp" line="60"/>
         <source>Enter URL address or search on Google.com</source>
         <translation>Zadejte internetovou adresu nebo vyhledávejte na Google.com</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="180"/>
+        <location filename="../src/navigation/locationbar.cpp" line="212"/>
-        <source>Add RSS channel with title &apos;</source>
-        <translation>Přidat kanál s titulkem &apos;</translation>
-    </message>
-    <message>
-        <location filename="../src/navigation/locationbar.cpp" line="189"/>
-        <source>Read RSS news</source>
-        <translation>Číst RSS novinky</translation>
-    </message>
-    <message>
-        <location filename="../src/navigation/locationbar.cpp" line="239"/>
         <source>Loading...</source>
         <translation>Načítám...</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="244"/>
+        <location filename="../src/navigation/locationbar.cpp" line="217"/>
         <source>Done</source>
         <translation>Hotovo</translation>
     </message>
     <message>
         <location filename="../src/navigation/locationbar.cpp" line="145"/>
-        <location filename="../src/navigation/locationbar.cpp" line="153"/>
+        <location filename="../src/navigation/locationbar.cpp" line="161"/>
         <source>Edit this bookmark</source>
         <translation>Upravit záložku</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="326"/>
+        <location filename="../src/navigation/locationbar.cpp" line="299"/>
         <source>.co.uk</source>
         <oldsource>.cz</oldsource>
         <comment>Append domain name on ALT key = Should be different for every country</comment>
@@ -2068,6 +2061,19 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.</
         <translation>Tento kanál již odebíráte.</translation>
     </message>
 </context>
+<context>
+    <name>RSSWidget</name>
+    <message>
+        <location filename="../src/rss/rsswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/rss/rsswidget.ui" line="51"/>
+        <source>Add RSS Feeds from this site</source>
+        <translation>Přidat RSS kanál z této stránky</translation>
+    </message>
+</context>
 <context>
     <name>SearchToolBar</name>
     <message>
@@ -2444,14 +2450,14 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.</
 <context>
     <name>WebView</name>
     <message>
-        <location filename="../src/webview/webview.cpp" line="103"/>
+        <location filename="../src/webview/webview.cpp" line="104"/>
         <location filename="../src/webview/webview.cpp" line="226"/>
         <source>Loading...</source>
         <translation>Načítám...</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="195"/>
-        <location filename="../src/webview/webview.cpp" line="654"/>
+        <location filename="../src/webview/webview.cpp" line="673"/>
         <source>No Named Page</source>
         <translation>Bezejmenná stránka</translation>
     </message>
@@ -2461,130 +2467,130 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.</
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="299"/>
+        <location filename="../src/webview/webview.cpp" line="318"/>
-        <location filename="../src/webview/webview.cpp" line="303"/>
+        <location filename="../src/webview/webview.cpp" line="322"/>
-        <location filename="../src/webview/webview.cpp" line="465"/>
+        <location filename="../src/webview/webview.cpp" line="484"/>
         <source>New tab</source>
         <translation>Nový panel</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="353"/>
+        <location filename="../src/webview/webview.cpp" line="372"/>
         <source>Open link in new window</source>
         <translation>Otevřít odkaz v novém okně</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="354"/>
+        <location filename="../src/webview/webview.cpp" line="373"/>
         <source>Open link in new tab</source>
         <translation>Otevřít odkaz v novém panelu</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="356"/>
+        <location filename="../src/webview/webview.cpp" line="375"/>
         <source>Bookmark link</source>
         <translation>Přidat odkaz do záložek</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="357"/>
+        <location filename="../src/webview/webview.cpp" line="376"/>
         <source>Save link as...</source>
         <translation>Uložit odkaz jako...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="358"/>
+        <location filename="../src/webview/webview.cpp" line="377"/>
         <source>Send link...</source>
         <translation>Odeslat odkaz...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="359"/>
+        <location filename="../src/webview/webview.cpp" line="378"/>
         <source>Copy link address</source>
         <translation>Kopírovat adresu odkazu</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="368"/>
+        <location filename="../src/webview/webview.cpp" line="387"/>
         <source>Show image</source>
         <translation>Zobrazit obrázek</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="369"/>
+        <location filename="../src/webview/webview.cpp" line="388"/>
         <source>Copy image</source>
         <translation>Kopírovat obrázek</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="370"/>
+        <location filename="../src/webview/webview.cpp" line="389"/>
         <source>Copy image address</source>
         <oldsource>Coyp image address</oldsource>
         <translation>Kopírovat adresu obrázku</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="372"/>
+        <location filename="../src/webview/webview.cpp" line="391"/>
         <source>Save image as...</source>
         <translation>Uložit obrázek jako...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="373"/>
+        <location filename="../src/webview/webview.cpp" line="392"/>
         <source>Send image...</source>
         <translation>Odeslat obrázek...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="389"/>
+        <location filename="../src/webview/webview.cpp" line="408"/>
         <source>Back</source>
         <translation>Zpět</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="397"/>
+        <location filename="../src/webview/webview.cpp" line="416"/>
         <source>Forward</source>
         <translation>Vpřed</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="411"/>
+        <location filename="../src/webview/webview.cpp" line="430"/>
         <source>Reload</source>
         <translation>Obnovit</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="418"/>
+        <location filename="../src/webview/webview.cpp" line="437"/>
         <source>Stop</source>
         <translation>Zastavit</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="422"/>
+        <location filename="../src/webview/webview.cpp" line="441"/>
         <source>Bookmark page</source>
         <translation>Přidat stránku do záložek</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="423"/>
+        <location filename="../src/webview/webview.cpp" line="442"/>
         <source>Save page as...</source>
         <translation>Uložit stránku jako...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="424"/>
+        <location filename="../src/webview/webview.cpp" line="443"/>
         <source>Send page...</source>
         <translation>Odeslat stránku...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="426"/>
+        <location filename="../src/webview/webview.cpp" line="445"/>
         <source>Select all</source>
         <translation>Vybrat vše</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="431"/>
+        <location filename="../src/webview/webview.cpp" line="450"/>
         <source>Show source code</source>
         <translation>Zobrazit zdrojový kód</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="432"/>
+        <location filename="../src/webview/webview.cpp" line="451"/>
         <source>Show info about site</source>
         <translation>Zobrazit informace o stránce</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="436"/>
+        <location filename="../src/webview/webview.cpp" line="455"/>
         <source>Show Web Inspector</source>
         <translation>Zobrazit Web Inspektor</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="442"/>
+        <location filename="../src/webview/webview.cpp" line="461"/>
         <source>Search </source>
         <translation>Hledat </translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="442"/>
+        <location filename="../src/webview/webview.cpp" line="461"/>
         <source>... on Google</source>
         <translation>... na Googlu</translation>
     </message>

translations/sk_SK.ts

@@ -140,28 +140,31 @@ p, li { white-space: pre-wrap; }
         <translation>Zmeniť heslo:</translation>
     </message>
 </context>
+<context>
+    <name>AutoFillNotification</name>
+    <message>
+        <location filename="../src/autofill/autofillnotification.cpp" line="15"/>
+        <source>Do you want QupZilla to remember password on %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AutoFillWidget</name>
     <message>
-        <location filename="../src/autofill/autofillwidget.ui" line="78"/>
+        <location filename="../src/autofill/autofillnotification.ui" line="81"/>
         <source>Remember</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/autofill/autofillwidget.ui" line="91"/>
+        <location filename="../src/autofill/autofillnotification.ui" line="97"/>
         <source>Never For This Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/autofill/autofillwidget.ui" line="104"/>
+        <location filename="../src/autofill/autofillnotification.ui" line="113"/>
         <source>Not Now</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/autofill/autofillwidget.cpp" line="15"/>
-        <source>Do you want QupZilla to remember password on %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -850,54 +853,44 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationBar</name>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="26"/>
+        <location filename="../src/navigation/locationbar.cpp" line="27"/>
         <source>Show informations about this page</source>
         <translation>Zobraziť informácie o tejto stránke</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="36"/>
+        <location filename="../src/navigation/locationbar.cpp" line="34"/>
         <source>Add RSS from this page...</source>
         <translation>Pridať RSS kanál...</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="50"/>
+        <location filename="../src/navigation/locationbar.cpp" line="48"/>
-        <location filename="../src/navigation/locationbar.cpp" line="156"/>
+        <location filename="../src/navigation/locationbar.cpp" line="164"/>
         <source>Bookmark this Page</source>
         <translation>Pridať stránku do záložiek</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="61"/>
+        <location filename="../src/navigation/locationbar.cpp" line="60"/>
         <source>Enter URL address or search on Google.com</source>
         <translation>Zadajte URL adresu alebo vyhľadajte na Google.com</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="180"/>
+        <location filename="../src/navigation/locationbar.cpp" line="212"/>
-        <source>Add RSS channel with title &apos;</source>
-        <translation>Pridať RSS kanál s názvom </translation>
-    </message>
-    <message>
-        <location filename="../src/navigation/locationbar.cpp" line="189"/>
-        <source>Read RSS news</source>
-        <translation>Čítať RSS novinky</translation>
-    </message>
-    <message>
-        <location filename="../src/navigation/locationbar.cpp" line="239"/>
         <source>Loading...</source>
         <translation>Nahrávam...</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="244"/>
+        <location filename="../src/navigation/locationbar.cpp" line="217"/>
         <source>Done</source>
         <translation>Hotovo</translation>
     </message>
     <message>
         <location filename="../src/navigation/locationbar.cpp" line="145"/>
-        <location filename="../src/navigation/locationbar.cpp" line="153"/>
+        <location filename="../src/navigation/locationbar.cpp" line="161"/>
         <source>Edit this bookmark</source>
         <translation>Upraviť záložku</translation>
     </message>
     <message>
-        <location filename="../src/navigation/locationbar.cpp" line="326"/>
+        <location filename="../src/navigation/locationbar.cpp" line="299"/>
         <source>.co.uk</source>
         <comment>Append domain name on ALT key = Should be different for every country</comment>
         <translation>.sk</translation>
@@ -2067,6 +2060,19 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
         <translation>Tento kanál už odoberáte.</translation>
     </message>
 </context>
+<context>
+    <name>RSSWidget</name>
+    <message>
+        <location filename="../src/rss/rsswidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished">Form</translation>
+    </message>
+    <message>
+        <location filename="../src/rss/rsswidget.ui" line="51"/>
+        <source>Add RSS Feeds from this site</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SearchToolBar</name>
     <message>
@@ -2442,14 +2448,14 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
 <context>
     <name>WebView</name>
     <message>
-        <location filename="../src/webview/webview.cpp" line="103"/>
+        <location filename="../src/webview/webview.cpp" line="104"/>
         <location filename="../src/webview/webview.cpp" line="226"/>
         <source>Loading...</source>
         <translation>Načítavam...</translation>
     </message>
     <message>
         <location filename="../src/webview/webview.cpp" line="195"/>
-        <location filename="../src/webview/webview.cpp" line="654"/>
+        <location filename="../src/webview/webview.cpp" line="673"/>
         <source>No Named Page</source>
         <translation>Stránka bez mena</translation>
     </message>
@@ -2459,129 +2465,129 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
         <translation>Hotovo</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="299"/>
+        <location filename="../src/webview/webview.cpp" line="318"/>
-        <location filename="../src/webview/webview.cpp" line="303"/>
+        <location filename="../src/webview/webview.cpp" line="322"/>
-        <location filename="../src/webview/webview.cpp" line="465"/>
+        <location filename="../src/webview/webview.cpp" line="484"/>
         <source>New tab</source>
         <translation>Nový panel</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="353"/>
+        <location filename="../src/webview/webview.cpp" line="372"/>
         <source>Open link in new window</source>
         <translation>Otvoriť odkaz v novom okne</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="354"/>
+        <location filename="../src/webview/webview.cpp" line="373"/>
         <source>Open link in new tab</source>
         <translation>Otvoriť odkaz na novom panely</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="356"/>
+        <location filename="../src/webview/webview.cpp" line="375"/>
         <source>Bookmark link</source>
         <translation>Pridať odkaz do záložiek</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="357"/>
+        <location filename="../src/webview/webview.cpp" line="376"/>
         <source>Save link as...</source>
         <translation>Odoslať odkaz...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="358"/>
+        <location filename="../src/webview/webview.cpp" line="377"/>
         <source>Send link...</source>
         <translation>Odoslať odkaz...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="359"/>
+        <location filename="../src/webview/webview.cpp" line="378"/>
         <source>Copy link address</source>
         <translation>Kopírovať adresu odkazu</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="368"/>
+        <location filename="../src/webview/webview.cpp" line="387"/>
         <source>Show image</source>
         <translation>Zobraziť obrázok</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="369"/>
+        <location filename="../src/webview/webview.cpp" line="388"/>
         <source>Copy image</source>
         <translation>Kopírovať obrázok</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="370"/>
+        <location filename="../src/webview/webview.cpp" line="389"/>
         <source>Copy image address</source>
         <translation>Kopírovať adresu obrázku</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="372"/>
+        <location filename="../src/webview/webview.cpp" line="391"/>
         <source>Save image as...</source>
         <translation>Uložiť obrázok ako...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="373"/>
+        <location filename="../src/webview/webview.cpp" line="392"/>
         <source>Send image...</source>
         <translation>Odoslať obrázok...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="389"/>
+        <location filename="../src/webview/webview.cpp" line="408"/>
         <source>Back</source>
         <translation>Späť</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="397"/>
+        <location filename="../src/webview/webview.cpp" line="416"/>
         <source>Forward</source>
         <translation>Dopredu</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="411"/>
+        <location filename="../src/webview/webview.cpp" line="430"/>
         <source>Reload</source>
         <translation>Obnoviť</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="418"/>
+        <location filename="../src/webview/webview.cpp" line="437"/>
         <source>Stop</source>
         <translation>Zastaviť</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="422"/>
+        <location filename="../src/webview/webview.cpp" line="441"/>
         <source>Bookmark page</source>
         <translation>Pridať stránku do záložiek</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="423"/>
+        <location filename="../src/webview/webview.cpp" line="442"/>
         <source>Save page as...</source>
         <translation>Uložiť stránku ako...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="424"/>
+        <location filename="../src/webview/webview.cpp" line="443"/>
         <source>Send page...</source>
         <translation>Odoslať stránku...</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="426"/>
+        <location filename="../src/webview/webview.cpp" line="445"/>
         <source>Select all</source>
         <translation>Vybrať všetko</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="431"/>
+        <location filename="../src/webview/webview.cpp" line="450"/>
         <source>Show source code</source>
         <translation>Zobraziť zdrojový kód</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="432"/>
+        <location filename="../src/webview/webview.cpp" line="451"/>
         <source>Show info about site</source>
         <translation>Zobraziť informácie o stránke</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="436"/>
+        <location filename="../src/webview/webview.cpp" line="455"/>
         <source>Show Web Inspector</source>
         <translation>Zobraziť Web inšpektora</translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="442"/>
+        <location filename="../src/webview/webview.cpp" line="461"/>
         <source>Search </source>
         <translation>Hľadať </translation>
     </message>
     <message>
-        <location filename="../src/webview/webview.cpp" line="442"/>
+        <location filename="../src/webview/webview.cpp" line="461"/>
         <source>... on Google</source>
         <translation>... na Googlu</translation>
     </message>