Commit 51428cb6 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Resolved merge conflict

parents f6ccc034 ea387e96
......@@ -280,6 +280,7 @@
</provides>
<launchable type="desktop-id">org.kde.Help.desktop</launchable>
<releases>
<release version="5.7.5.19122" date="2020-02-06"/>
<release version="5.7.5.19121" date="2020-01-09"/>
<release version="5.7.5.19120" date="2019-12-12"/>
</releases>
......
......@@ -24,6 +24,7 @@
#include "grantleeformatter.h"
#include "history.h"
#include "khc_debug.h"
#include "mainwindow.h"
#include <dom/html_document.h>
#include <dom/html_head.h>
......@@ -36,6 +37,7 @@
#include <KSharedConfig>
#include <docbookxslt.h>
#include <QApplication>
#include <QClipboard>
#include <QDir>
#include <QFileInfo>
......@@ -203,13 +205,13 @@ void View::lastSearch()
void View::slotIncFontSizes()
{
setFontScaleFactor( fontScaleFactor() + m_fontScaleStepping );
slotReload();
reloadPage();
}
void View::slotDecFontSizes()
{
setFontScaleFactor( fontScaleFactor() - m_fontScaleStepping );
slotReload();
reloadPage();
}
void View::showMenu( const QString& url, const QPoint& pos)
......@@ -251,7 +253,7 @@ void View::slotCopyLink()
}
static DOM::HTMLLinkElement findLink(const DOM::NodeList& links, const char *rel)
{
{
for (unsigned i = 0; i <= links.length(); ++i) {
DOM::HTMLLinkElement link(links.item(i));
if (link.isNull())
......@@ -363,5 +365,10 @@ void View::slotReload( const QUrl &url )
openUrl( url );
}
void View::reloadPage()
{
MainWindow *mainWindow = dynamic_cast<MainWindow *>( qobject_cast<QApplication*>(qApp)->activeWindow() );
mainWindow->viewUrl(baseURL().url());
}
// vim:ts=2:sw=2:et
......@@ -90,7 +90,7 @@ class View : public KHTMLPart
private:
QUrl urlFromLinkNode( const DOM::HTMLLinkElement &link ) const;
int mState;
QString mTitle;
......@@ -102,6 +102,7 @@ class View : public KHTMLPart
GrantleeFormatter *mGrantleeFormatter;
KActionCollection *mActionCollection;
QString mCopyURL;
void reloadPage();
};
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment