FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some work on newspaper again.

This commit is contained in:
Martin Rotter 2014-01-05 10:45:32 +01:00
parent 9a1a1d6e5d
commit b89a95899c
6 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -21,4 +21,4 @@
*.app
# Other files.
*.user
*.user*

16
resources/skins/base/involutus.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<skin version="0.11">
<name>involutus</name>
<author>
<name>Martin Rotter</name>
<email>rotter.martinos@gmail.com</email>
</author>
<style>fusion</style>
<markup_wrapper> PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgLXdlYmtpdC10cmFuc2l0aW9uOiBiYWNrZ3JvdW5kIDFzIGVhc2Utb3V0Ow0KICAgICAgICBiYWNrZ3JvdW5kOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhcixsZWZ0IHRvcCxsZWZ0IGJvdHRvbSxjb2xvci1zdG9wKDAlLCM0NTQ4NGQpLGNvbG9yLXN0b3AoMTAwJSwjMDAwMDAwKSk7DQogICAgICAgIHRleHQtc2hhZG93OiAwIDAgMXB4ICNmZmY7DQogICAgICAgIGZpbHRlcjogZHJvcHNoYWRvdyhjb2xvcj0jZmZmZmZmLG9mZng9MCxvZmZ5PTApOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIG1hcmdpbjogMHB4IGF1dG87DQogICAgICAgIGNvbG9yOiB3aGl0ZTsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCgkJYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSxyZ2JhKDAsMCwwLDEpKSwgY29sb3Itc3RvcCgxJSxyZ2JhKDAsMCwwLDEpKSwgY29sb3Itc3RvcCgxMyUscmdiYSgyMjQsMjI0LDIyNCwxKSksIGNvbG9yLXN0b3AoMjQlLHJnYmEoMjU1LDI1NSwyNTUsMSkpLCBjb2xvci1zdG9wKDU4JSxyZ2JhKDI1NSwyNTUsMjU1LDEpKSwgY29sb3Itc3RvcCg3MSUscmdiYSgyNTUsMjU1LDI1NSwxKSksIGNvbG9yLXN0b3AoMTAwJSxyZ2JhKDI1NSwyNTUsMjU1LDApKSk7IC8qIENocm9tZSxTYWZhcmk0KyAqLw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQoJCXBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPg0KICAgICAgJTENCiAgICA8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KCSUyDQogIDwvYm9keT4NCjwvaHRtbD4=
</markup_wrapper>
<markup> PGRpdiBjbGFzcz0iaGVhZGVyIj4NCiAgPGRpdiBjbGFzcz0iaGVhZGVydGV4dCI+DQoJJTENCiAgPC9kaXY+DQogICUyICglNSkNCiAgPGJyPg0KICA8YSBocmVmPSIlMyI+DQogICUzDQogIDwvYT4NCjwvZGl2Pg0KPGRpdiBjbGFzcz0iY29udGVudCI+DQogICU0IA0KPC9kaXY+
</markup>
<data>
UVRyZWVWaWV3IHsNCiAgICBib3JkZXI6IDFweCBzb2xpZCAjODg4Ow0KICAgIGJhY2tncm91bmQtY29sb3I6ICNlZWU7DQogICAgYm9yZGVyLXJhZGl1czogNHB4Ow0KICAgIG1hcmdpbjogMXB4Ow0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW06aG92ZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjZDJlN2E5IDsNCg0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW06c2VsZWN0ZWQgLA0KUVRyZWVWaWV3OjpicmFuY2g6c2VsZWN0ZWQgeyANCgliYWNrZ3JvdW5kLWNvbG9yOiAjOWMzOw0KfSANCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOiFhZGpvaW5zLWl0ZW0gIHsNCiAgICAgLyogYm9yZGVyLWltYWdlOiB1cmwocXNzL3ZsaW5lLnBuZykgMDsgKi8NCiAgICAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCiB9DQoNCiBRVHJlZVZpZXc6OmJyYW5jaDpoYXMtc2libGluZ3M6YWRqb2lucy1pdGVtIHsNCi8qICAgICBib3JkZXItaW1hZ2U6IHVybChxc3MvYnJhbmNoLW1vcmUucG5nKSAwOyAqLw0KICAgICBib3JkZXItaW1hZ2U6IHVybChxc3MvZHVtbXkucG5nKSAwOw0KIH0NCg0KDQogUVRyZWVWaWV3OjpicmFuY2g6IWhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzOmFkam9pbnMtaXRlbSAgew0KLyogICAgIGJvcmRlci1pbWFnZTogdXJsKHFzcy9icmFuY2gtZW5kLnBuZykgMDsgKi8NCiAgICAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCiB9DQoNCiBRVHJlZVZpZXc6OmJyYW5jaDpoYXMtY2hpbGRyZW46IWhhcy1zaWJsaW5nczpjbG9zZWQsDQogUVRyZWVWaWV3OjpicmFuY2g6Y2xvc2VkOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgICAgICAgIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgICAgICAgIGltYWdlOiB1cmwocXNzL2JyYW5jaC1jbG9zZWQucG5nKTsNCiB9DQoNCiBRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzLA0KIFFUcmVlVmlldzo6YnJhbmNoOm9wZW46aGFzLWNoaWxkcmVuOmhhcy1zaWJsaW5ncyAgew0KICAgICAgICAgYm9yZGVyLWltYWdlOiBub25lOw0KICAgICAgICAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLW9wZW4ucG5nKTsNCiB9DQogUVRyZWVWaWV3OjppdGVtIHsNCiAgICAgIHBhZGRpbmc6IDFweCAxcHggMXB4IDFweDsNCiB9IA0KIA0KIFFUcmVlVmlld1toaWRlVHJlZT0idHJ1ZSJdOjpicmFuY2g6IWhhcy1jaGxpZHJlbjpoYXNTaWJsaW5ncyB7DQogICAgICAgIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgICAgICAgaW1hZ2U6IG5vbmU7DQogfQ0KIA==
</data>
</skin>

1
src/core/defs.h.in
View File

@ -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"

1
src/gui/feedsview.cpp
View File

@ -185,6 +185,7 @@ void FeedsView::initializeContextMenuCategoriesFeeds() {
m_contextMenuCategoriesFeeds = new QMenu(tr("Context menu for feeds"), this);
m_contextMenuCategoriesFeeds->addActions(QList<QAction*>() <<
FormMain::getInstance()->m_ui->m_actionUpdateSelectedFeedsCategories <<
FormMain::getInstance()->m_ui->m_actionViewSelectedItemsNewspaperMode <<
FormMain::getInstance()->m_ui->m_actionMarkFeedsAsRead <<
FormMain::getInstance()->m_ui->m_actionMarkFeedsAsUnread);
}

15
src/gui/formmain.ui
View File

@ -15,7 +15,16 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
@ -39,7 +48,7 @@
<x>0</x>
<y>0</y>
<width>979</width>
<height>20</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="m_menuFile">
@ -389,7 +398,7 @@
<string>View selected items in newspaper mode</string>
</property>
<property name="toolTip">
<string>Displays all messages from selected feeds/categories in a new &quot;newspaper mode&quot; tab.</string>
<string>Displays all messages from selected feeds/categories in a new &quot;newspaper mode&quot; tab. All selected feeds are marked as read.</string>
</property>
</action>
</widget>

8
src/gui/webbrowser.cpp
View File

@ -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<Message> &messages) {
@ -198,9 +198,9 @@ void WebBrowser::navigateToMessages(const QList<Message> &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"));
}