[rkward] rkward/windows: Honor KDE default font, and default fixed width font settings. Fix a small init bug.

Thomas Friedrichsmeier thomas.friedrichsmeier at ruhr-uni-bochum.de
Thu Mar 5 08:28:10 UTC 2015


Git commit a0bd447d8515bf1f061ec79a07e6247e25757359 by Thomas Friedrichsmeier.
Committed on 05/03/2015 at 08:27.
Pushed by tfry into branch 'master'.

Honor KDE default font, and default fixed width font settings. Fix a small init bug.

M  +4    -1    rkward/windows/rkhtmlwindow.cpp

http://commits.kde.org/rkward/a0bd447d8515bf1f061ec79a07e6247e25757359

diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index 2e950d5..6210b1f 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -31,6 +31,7 @@
 #include <ktemporaryfile.h>
 #include <kwebview.h>
 #include <kcodecaction.h>
+#include <kglobalsettings.h>
 
 #include <qfileinfo.h>
 #include <qwidget.h>
@@ -71,6 +72,8 @@ RKWebPage::RKWebPage (RKHTMLWindow* window): KWebPage (window, KIOIntegration |
 	RKWebPage::window = window;
 	new_window = false;
 	direct_load = false;
+	settings ()->setFontFamily (QWebSettings::StandardFont, KGlobalSettings::generalFont ().family ());
+	settings ()->setFontFamily (QWebSettings::FixedFont, KGlobalSettings::fixedFont ().family ());
 }
 
 bool RKWebPage::acceptNavigationRequest (QWebFrame* frame, const QNetworkRequest& request, QWebPage::NavigationType type) {
@@ -130,7 +133,7 @@ RKHTMLWindow::RKHTMLWindow (QWidget *parent, WindowMode mode) : RKMDIWindow (par
 	layout->addWidget (findbar);
 	findbar->hide ();
 	connect (findbar, SIGNAL(findRequest(QString,bool,const RKFindBar*,bool*)), this, SLOT(findRequest(QString,bool,const RKFindBar*,bool*)));
-	bool have_highlight = false;
+	have_highlight = false;
 
 	part = new RKHTMLWindowPart (this);
 	setPart (part);



More information about the rkward-tracker mailing list