FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make focus work for web viewer, also some other fixes.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-22 10:17:32 +02:00
parent c42e350bac
commit 37d4d34c99
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/feedsview.h
View File

@ -101,6 +101,16 @@ class FeedsView : public QTreeView {
// Requests opening of given messages in newspaper mode. // Requests opening of given messages in newspaper mode.
void openMessagesInNewspaperView(RootItem *root, const QList<Message> &messages); void openMessagesInNewspaperView(RootItem *root, const QList<Message> &messages);
protected:
// Handle selections.
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
// React on "Del" key.
void keyPressEvent(QKeyEvent *event);
// Show custom context menu.
void contextMenuEvent(QContextMenuEvent *event);
private slots: private slots:
void expandItemDelayed(const QModelIndex &idx); void expandItemDelayed(const QModelIndex &idx);
void markSelectedItemReadStatus(RootItem::ReadStatus read); void markSelectedItemReadStatus(RootItem::ReadStatus read);
@ -123,15 +133,6 @@ class FeedsView : public QTreeView {
void saveExpandStates(RootItem *item); void saveExpandStates(RootItem *item);
// Handle selections.
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
// React on "Del" key.
void keyPressEvent(QKeyEvent *event);
// Show custom context menu.
void contextMenuEvent(QContextMenuEvent *event);
QMenu *m_contextMenuCategories; QMenu *m_contextMenuCategories;
QMenu *m_contextMenuFeeds; QMenu *m_contextMenuFeeds;
QMenu *m_contextMenuEmptySpace; QMenu *m_contextMenuEmptySpace;

8
src/gui/webviewer.cpp
View File

@ -44,8 +44,8 @@ bool WebViewer::canDecreaseZoom() {
} }
void WebViewer::displayMessage() { void WebViewer::displayMessage() {
load(QUrl(INTERNAL_URL_MESSAGE)); //load(QUrl(INTERNAL_URL_MESSAGE));
//setHtml(m_messageContents, QUrl::fromUserInput("aa")); setHtml(m_messageContents, QUrl::fromUserInput(INTERNAL_URL_MESSAGE));
} }
bool WebViewer::increaseWebPageZoom() { bool WebViewer::increaseWebPageZoom() {
@ -119,7 +119,11 @@ void WebViewer::loadMessage(const Message &message) {
} }
void WebViewer::clear() { void WebViewer::clear() {
bool previously_enabled = isEnabled();
setEnabled(false);
setHtml("<!DOCTYPE html><html><body</body></html>", QUrl(INTERNAL_URL_BLANK)); setHtml("<!DOCTYPE html><html><body</body></html>", QUrl(INTERNAL_URL_BLANK));
setEnabled(previously_enabled);
} }
QWebEngineView *WebViewer::createWindow(QWebEnginePage::WebWindowType type) { QWebEngineView *WebViewer::createWindow(QWebEnginePage::WebWindowType type) {