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

Qt version now really needed as 5.7, working on internal web viewer.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-20 10:17:31 +02:00
parent d580c75ae4
commit c27c4258ea
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rssguard.pro
View File

@ -60,7 +60,7 @@ DEFINES *= QT_USE_QSTRINGBUILDER
message(rssguard: Welcome RSS Guard qmake script.) message(rssguard: Welcome RSS Guard qmake script.)
lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 5) { lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7) {
error(rssguard: At least Qt 5.7.0 is required.) error(rssguard: At least Qt 5.7.0 is required.)
} }

3
src/gui/dialogs/formmain.ui
View File

@ -32,9 +32,6 @@
<property name="currentIndex"> <property name="currentIndex">
<number>-1</number> <number>-1</number>
</property> </property>
<property name="documentMode">
<bool>false</bool>
</property>
<property name="movable"> <property name="movable">
<bool>true</bool> <bool>true</bool>
</property> </property>

4
src/gui/feedmessageviewer.cpp
View File

@ -258,7 +258,7 @@ void FeedMessageViewer::createConnections() {
// Message openers. // Message openers.
connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(RootItem*,QList<Message>)), connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(RootItem*,QList<Message>)),
qApp->mainForm()->tabWidget(), SLOT(addNewspaperView(RootItem*,QList<Message>)); qApp->mainForm()->tabWidget(), SLOT(addNewspaperView(RootItem*,QList<Message>)));
connect(m_feedsView, SIGNAL(openMessagesInNewspaperView(RootItem*,QList<Message>)), connect(m_feedsView, SIGNAL(openMessagesInNewspaperView(RootItem*,QList<Message>)),
qApp->mainForm()->tabWidget(), SLOT(addNewspaperView(RootItem*,QList<Message>))); qApp->mainForm()->tabWidget(), SLOT(addNewspaperView(RootItem*,QList<Message>)));
@ -347,6 +347,8 @@ void FeedMessageViewer::initialize() {
m_toolBarMessages->setAllowedAreas(Qt::TopToolBarArea); m_toolBarMessages->setAllowedAreas(Qt::TopToolBarArea);
m_toolBarMessages->loadChangeableActions(); m_toolBarMessages->loadChangeableActions();
m_messagesBrowser->clear();
// Now refresh visual setup. // Now refresh visual setup.
refreshVisualProperties(); refreshVisualProperties();
} }

7
src/gui/tabbar.cpp
View File

@ -131,16 +131,13 @@ void TabBar::mouseDoubleClickEvent(QMouseEvent *event) {
// NOTE: This needs to be done here because // NOTE: This needs to be done here because
// destination does not know the original event. // destination does not know the original event.
if (event->button() & Qt::LeftButton && qApp->settings()->value(GROUP(GUI), SETTING(GUI::TabCloseDoubleClick)).toBool()) { if (event->button() & Qt::LeftButton && qApp->settings()->value(GROUP(GUI), SETTING(GUI::TabCloseDoubleClick)).toBool()) {
if (tabType(tab_index) == TabBar::Closable) { if ((tabType(tab_index) & (TabBar::Closable | TabBar::DownloadManager)) > 0) {
// This tab is closable, so we can close it. // This tab is closable, so we can close it.
emit tabCloseRequested(tab_index); emit tabCloseRequested(tab_index);
} }
} }
} }
// Check if new tab should be opened with initial web browser. else {
// NOTE: This check could be unnecesary here and should be done in
// destination object but we keep it here for consistency.
else if (qApp->settings()->value(GROUP(GUI), SETTING(GUI::TabNewDoubleClick)).toBool()) {
emit emptySpaceDoubleClicked(); emit emptySpaceDoubleClicked();
} }
} }

1
src/gui/tabwidget.cpp
View File

@ -129,6 +129,7 @@ void TabWidget::tabRemoved(int index) {
void TabWidget::createConnections() { void TabWidget::createConnections() {
connect(tabBar(), SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int))); connect(tabBar(), SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
connect(tabBar(), SIGNAL(emptySpaceDoubleClicked()), this, SLOT(addEmptyBrowser()));
connect(tabBar(), SIGNAL(tabMoved(int,int)), this, SLOT(fixContentsAfterMove(int,int))); connect(tabBar(), SIGNAL(tabMoved(int,int)), this, SLOT(fixContentsAfterMove(int,int)));
} }

3
src/gui/webbrowser.cpp
View File

@ -88,7 +88,6 @@ WebBrowser::WebBrowser(QWidget *parent) : TabContent(parent),
createConnections(); createConnections();
reloadFontSettings(); reloadFontSettings();
clear();
} }
WebBrowser::~WebBrowser() { WebBrowser::~WebBrowser() {
@ -175,7 +174,7 @@ void WebBrowser::onTitleChanged(const QString &new_title) {
} }
void WebBrowser::onIconChanged(const QIcon &icon) { void WebBrowser::onIconChanged(const QIcon &icon) {
emit iconChanged(m_index, m_webView->icon()); emit iconChanged(m_index, icon);
} }
void WebBrowser::initializeLayout() { void WebBrowser::initializeLayout() {