diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 88c25a4ba..163d54af2 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -8,6 +8,7 @@ Fixed:
Added:
+- Embedded web browser now displays navigation toolbar even in message preview mode/newspaper mode when user loads external links.
diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp
index f28a2e115..e6b653d93 100755
--- a/src/gui/tabwidget.cpp
+++ b/src/gui/tabwidget.cpp
@@ -303,10 +303,8 @@ int TabWidget::addBrowser(bool move_after_current,
}
// Make connections.
- connect(browser, SIGNAL(titleChanged(int,QString)),
- this, SLOT(changeTitle(int,QString)));
- connect(browser, SIGNAL(iconChanged(int,QIcon)),
- this, SLOT(changeIcon(int,QIcon)));
+ connect(browser, SIGNAL(titleChanged(int,QString)), this, SLOT(changeTitle(int,QString)));
+ connect(browser, SIGNAL(iconChanged(int,QIcon)), this, SLOT(changeIcon(int,QIcon)));
// Setup the tab index.
browser->setIndex(final_index);
diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
index 788809744..0a0a277ae 100755
--- a/src/network-web/webbrowser.cpp
+++ b/src/network-web/webbrowser.cpp
@@ -48,11 +48,7 @@ WebBrowser::WebBrowser(QWidget *parent)
m_actionBack(m_webView->pageAction(QWebPage::Back)),
m_actionForward(m_webView->pageAction(QWebPage::Forward)),
m_actionReload(m_webView->pageAction(QWebPage::Reload)),
- m_actionStop(m_webView->pageAction(QWebPage::Stop)),
- m_activeNewspaperMode(false) {
-
- m_index = -1;
-
+ m_actionStop(m_webView->pageAction(QWebPage::Stop)) {
// Add this new instance to the global list of web browsers.
// NOTE: This is used primarily for dynamic icon theme switching.
m_runningWebBrowsers.append(this);
@@ -203,8 +199,11 @@ void WebBrowser::onTitleChanged(const QString &new_title) {
}
}
-void WebBrowser::updateUrl(const QUrl &url) {
- m_txtLocation->setText(url.toString());
+void WebBrowser::updateUrl(const QUrl &url) {
+ QString url_string = url.toString();
+
+ m_txtLocation->setText(url_string);
+ setNavigationBarVisible(url_string != "rssguard:empty" && url_string != INTERNAL_URL_NEWSPAPER);
}
void WebBrowser::navigateToUrl(const QUrl &url) {
diff --git a/src/network-web/webbrowser.h b/src/network-web/webbrowser.h
index 518769a0b..7da1afa9e 100755
--- a/src/network-web/webbrowser.h
+++ b/src/network-web/webbrowser.h
@@ -97,7 +97,7 @@ class WebBrowser : public TabContent {
// Clears contents.
inline void clear() {
if (m_webView->url() != QUrl()) {
- m_webView->setHtml("", QUrl());
+ m_webView->setHtml("", QUrl("rssguard:empty"));
}
}
@@ -158,8 +158,6 @@ class WebBrowser : public TabContent {
QAction *m_actionReload;
QAction *m_actionStop;
- bool m_activeNewspaperMode;
-
static QList m_runningWebBrowsers;
};