diff --git a/.gitignore b/.gitignore
index 51cb42c49..ea81adde8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@
*.app
# Other files.
-*.user
\ No newline at end of file
+*.user*
\ No newline at end of file
diff --git a/resources/skins/base/involutus.xml b/resources/skins/base/involutus.xml
deleted file mode 100644
index 10680e548..000000000
--- a/resources/skins/base/involutus.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- involutus
-
- Martin Rotter
- rotter.martinos@gmail.com
-
-
- PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgLXdlYmtpdC10cmFuc2l0aW9uOiBiYWNrZ3JvdW5kIDFzIGVhc2Utb3V0Ow0KICAgICAgICBiYWNrZ3JvdW5kOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhcixsZWZ0IHRvcCxsZWZ0IGJvdHRvbSxjb2xvci1zdG9wKDAlLCM0NTQ4NGQpLGNvbG9yLXN0b3AoMTAwJSwjMDAwMDAwKSk7DQogICAgICAgIHRleHQtc2hhZG93OiAwIDAgMXB4ICNmZmY7DQogICAgICAgIGZpbHRlcjogZHJvcHNoYWRvdyhjb2xvcj0jZmZmZmZmLG9mZng9MCxvZmZ5PTApOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIG1hcmdpbjogMHB4IGF1dG87DQogICAgICAgIGNvbG9yOiB3aGl0ZTsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCgkJYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSxyZ2JhKDAsMCwwLDEpKSwgY29sb3Itc3RvcCgxJSxyZ2JhKDAsMCwwLDEpKSwgY29sb3Itc3RvcCgxMyUscmdiYSgyMjQsMjI0LDIyNCwxKSksIGNvbG9yLXN0b3AoMjQlLHJnYmEoMjU1LDI1NSwyNTUsMSkpLCBjb2xvci1zdG9wKDU4JSxyZ2JhKDI1NSwyNTUsMjU1LDEpKSwgY29sb3Itc3RvcCg3MSUscmdiYSgyNTUsMjU1LDI1NSwxKSksIGNvbG9yLXN0b3AoMTAwJSxyZ2JhKDI1NSwyNTUsMjU1LDApKSk7IC8qIENocm9tZSxTYWZhcmk0KyAqLw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQoJCXBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPg0KICAgICAgJTENCiAgICA8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KCSUyDQogIDwvYm9keT4NCjwvaHRtbD4=
-
- PGRpdiBjbGFzcz0iaGVhZGVyIj4NCiAgPGRpdiBjbGFzcz0iaGVhZGVydGV4dCI+DQoJJTENCiAgPC9kaXY+DQogICUyICglNSkNCiAgPGJyPg0KICA8YSBocmVmPSIlMyI+DQogICUzDQogIDwvYT4NCjwvZGl2Pg0KPGRpdiBjbGFzcz0iY29udGVudCI+DQogICU0IA0KPC9kaXY+
-
-
-UVRyZWVWaWV3IHsNCiAgICBib3JkZXI6IDFweCBzb2xpZCAjODg4Ow0KICAgIGJhY2tncm91bmQtY29sb3I6ICNlZWU7DQogICAgYm9yZGVyLXJhZGl1czogNHB4Ow0KICAgIG1hcmdpbjogMXB4Ow0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW06aG92ZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjZDJlN2E5IDsNCg0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW06c2VsZWN0ZWQgLA0KUVRyZWVWaWV3OjpicmFuY2g6c2VsZWN0ZWQgeyANCgliYWNrZ3JvdW5kLWNvbG9yOiAjOWMzOw0KfSANCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOiFhZGpvaW5zLWl0ZW0gIHsNCiAgICAgLyogYm9yZGVyLWltYWdlOiB1cmwocXNzL3ZsaW5lLnBuZykgMDsgKi8NCiAgICAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCiB9DQoNCiBRVHJlZVZpZXc6OmJyYW5jaDpoYXMtc2libGluZ3M6YWRqb2lucy1pdGVtIHsNCi8qICAgICBib3JkZXItaW1hZ2U6IHVybChxc3MvYnJhbmNoLW1vcmUucG5nKSAwOyAqLw0KICAgICBib3JkZXItaW1hZ2U6IHVybChxc3MvZHVtbXkucG5nKSAwOw0KIH0NCg0KDQogUVRyZWVWaWV3OjpicmFuY2g6IWhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzOmFkam9pbnMtaXRlbSAgew0KLyogICAgIGJvcmRlci1pbWFnZTogdXJsKHFzcy9icmFuY2gtZW5kLnBuZykgMDsgKi8NCiAgICAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCiB9DQoNCiBRVHJlZVZpZXc6OmJyYW5jaDpoYXMtY2hpbGRyZW46IWhhcy1zaWJsaW5nczpjbG9zZWQsDQogUVRyZWVWaWV3OjpicmFuY2g6Y2xvc2VkOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgICAgICAgIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgICAgICAgIGltYWdlOiB1cmwocXNzL2JyYW5jaC1jbG9zZWQucG5nKTsNCiB9DQoNCiBRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzLA0KIFFUcmVlVmlldzo6YnJhbmNoOm9wZW46aGFzLWNoaWxkcmVuOmhhcy1zaWJsaW5ncyAgew0KICAgICAgICAgYm9yZGVyLWltYWdlOiBub25lOw0KICAgICAgICAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLW9wZW4ucG5nKTsNCiB9DQogUVRyZWVWaWV3OjppdGVtIHsNCiAgICAgIHBhZGRpbmc6IDFweCAxcHggMXB4IDFweDsNCiB9IA0KIA0KIFFUcmVlVmlld1toaWRlVHJlZT0idHJ1ZSJdOjpicmFuY2g6IWhhcy1jaGxpZHJlbjpoYXNTaWJsaW5ncyB7DQogICAgICAgIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgICAgICAgaW1hZ2U6IG5vbmU7DQogfQ0KIA==
-
-
\ No newline at end of file
diff --git a/src/core/defs.h.in b/src/core/defs.h.in
index be6408fa3..6e31bd169 100755
--- a/src/core/defs.h.in
+++ b/src/core/defs.h.in
@@ -34,6 +34,7 @@
#define DOWNLOAD_TIMEOUT 5000
#define MESSAGES_VIEW_DEFAULT_COL 170
#define ELLIPSIS_LENGTH 3
+#define NEWSPAPER_URL "rssguard:newspaper"
#define APP_DB_INIT_FILE "db_init.sql"
#define APP_DB_INIT_SPLIT "-- !\n"
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index 08d049e27..c421b3332 100644
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -185,6 +185,7 @@ void FeedsView::initializeContextMenuCategoriesFeeds() {
m_contextMenuCategoriesFeeds = new QMenu(tr("Context menu for feeds"), this);
m_contextMenuCategoriesFeeds->addActions(QList() <<
FormMain::getInstance()->m_ui->m_actionUpdateSelectedFeedsCategories <<
+ FormMain::getInstance()->m_ui->m_actionViewSelectedItemsNewspaperMode <<
FormMain::getInstance()->m_ui->m_actionMarkFeedsAsRead <<
FormMain::getInstance()->m_ui->m_actionMarkFeedsAsUnread);
}
diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui
index 0d0593897..626684b02 100644
--- a/src/gui/formmain.ui
+++ b/src/gui/formmain.ui
@@ -15,7 +15,16 @@
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
0
-
@@ -39,7 +48,7 @@
0
0
979
- 20
+ 21
diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp
index e4288730c..2da820341 100644
--- a/src/gui/webbrowser.cpp
+++ b/src/gui/webbrowser.cpp
@@ -177,9 +177,9 @@ void WebBrowser::navigateToMessage(const Message &message) {
QString layout_wrapper = SkinFactory::getInstance()->getCurrentMarkupLayout().arg(message.m_title,
message_layout);
- m_webView->setHtml(layout_wrapper);
+ m_webView->setHtml(layout_wrapper, QUrl(NEWSPAPER_URL));
emit iconChanged(m_index,
- IconThemeFactory::getInstance()->fromTheme("mail-mark-read"));
+ IconThemeFactory::getInstance()->fromTheme("document-multiple"));
}
void WebBrowser::navigateToMessages(const QList &messages) {
@@ -198,9 +198,9 @@ void WebBrowser::navigateToMessages(const QList &messages) {
QString layout_wrapper = SkinFactory::getInstance()->getCurrentMarkupLayout().arg(tr("Newspaper view"),
messages_layout);
- m_webView->setHtml(layout_wrapper);
+ m_webView->setHtml(layout_wrapper, QUrl(NEWSPAPER_URL));
emit iconChanged(m_index,
- IconThemeFactory::getInstance()->fromTheme("mail-mark-read"));
+ IconThemeFactory::getInstance()->fromTheme("document-multiple"));
}