projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encourage SASL over NickServ when server supports
[quassel.git]
/
src
/
qtui
/
settingspages
/
chatviewsettingspage.cpp
diff --git
a/src/qtui/settingspages/chatviewsettingspage.cpp
b/src/qtui/settingspages/chatviewsettingspage.cpp
index
9106613
..
924474c
100644
(file)
--- a/
src/qtui/settingspages/chatviewsettingspage.cpp
+++ b/
src/qtui/settingspages/chatviewsettingspage.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,7
+20,6
@@
#include "chatviewsettingspage.h"
#include "client.h"
#include "chatviewsettingspage.h"
#include "client.h"
-#include "colorbutton.h"
#include "qtui.h"
#include "qtuistyle.h"
#include "qtui.h"
#include "qtuistyle.h"
@@
-29,7
+28,7
@@
ChatViewSettingsPage::ChatViewSettingsPage(QWidget *parent)
{
ui.setupUi(this);
{
ui.setupUi(this);
-#if
ndef HAVE_WEBKIT
+#if
!defined HAVE_WEBKIT && !defined HAVE_WEBENGINE
ui.showWebPreview->hide();
ui.showWebPreview->setEnabled(false);
#endif
ui.showWebPreview->hide();
ui.showWebPreview->setEnabled(false);
#endif
@@
-47,7
+46,9
@@
ChatViewSettingsPage::ChatViewSettingsPage(QWidget *parent)
void ChatViewSettingsPage::save()
{
void ChatViewSettingsPage::save()
{
+ // Save the general settings
SettingsPage::save();
SettingsPage::save();
+ // Update the stylesheet in case fonts are changed
QtUi::style()->generateSettingsQss();
QtUi::style()->reload();
}
QtUi::style()->generateSettingsQss();
QtUi::style()->reload();
}