diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index e248d4d25..02eb74334 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -1165,16 +1165,14 @@ void GxsForumThreadWidget::insertMessageData(const RsGxsForumMsg &msg)
flags |= RSHTML_OPTIMIZEHTML_MASK;
QColor backgroundColor = ui->postText->palette().base().color();
- qreal desiredContrast = Settings->valueFromGroup("Chat",
+ qreal desiredContrast = Settings->valueFromGroup("Forum",
"MinimumContrast", 4.5).toDouble();
- int desiredMinimumFontSize = Settings->valueFromGroup("Chat",
+ int desiredMinimumFontSize = Settings->valueFromGroup("Forum",
"MinimumFontSize", 10).toInt();
QString extraTxt = RsHtml().formatText(ui->postText->document(),
QString::fromUtf8(msg.mMsg.c_str()), flags
- #ifndef DEBUG_FORUMS \
, backgroundColor, desiredContrast, desiredMinimumFontSize
- #endif
);
ui->postText->setHtml(extraTxt);
}
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index 5fa0c36dd..088c50cf7 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -506,6 +506,11 @@
10
+
+
+ MS Sans Serif
+
+
Qt::CustomContextMenu
diff --git a/retroshare-gui/src/gui/settings/ForumPage.cpp b/retroshare-gui/src/gui/settings/ForumPage.cpp
index 8039a087c..ee0d32566 100644
--- a/retroshare-gui/src/gui/settings/ForumPage.cpp
+++ b/retroshare-gui/src/gui/settings/ForumPage.cpp
@@ -35,6 +35,8 @@ ForumPage::ForumPage(QWidget * parent, Qt::WindowFlags flags)
connect(ui.expandNewMessages , SIGNAL(toggled(bool)), this, SLOT( updateExpandNewMessages()));
connect(ui.loadEmbeddedImages , SIGNAL(toggled(bool)), this, SLOT(updateLoadEmbeddedImages() ));
connect(ui.loadEmoticons , SIGNAL(toggled(bool)), this, SLOT( updateLoadEmoticons() ));
+ connect(ui.minimumFontSize , SIGNAL(valueChanged(int)), this, SLOT(updateFonts()));
+ connect(ui.minimumContrast , SIGNAL(valueChanged(int)), this, SLOT(updateFonts()));
ui.groupFrameSettingsWidget->setType(GroupFrameSettings::Forum) ;
}
@@ -51,10 +53,22 @@ void ForumPage::updateLoadEmoticons() { Settings->setForumLoadEmoticons(
/** Loads the settings for this page */
void ForumPage::load()
{
+ Settings->beginGroup(QString("Forum"));
whileBlocking(ui.setMsgToReadOnActivate)->setChecked(Settings->getForumMsgSetToReadOnActivate());
whileBlocking(ui.expandNewMessages)->setChecked(Settings->getForumExpandNewMessages());
whileBlocking(ui.loadEmbeddedImages)->setChecked(Settings->getForumLoadEmbeddedImages());
whileBlocking(ui.loadEmoticons)->setChecked(Settings->getForumLoadEmoticons());
+ whileBlocking(ui.minimumFontSize)->setValue(Settings->value("MinimumFontSize", 10).toInt());
+ whileBlocking(ui.minimumContrast)->setValue(Settings->value("MinimumContrast", 4.5).toDouble());
+ Settings->endGroup();
ui.groupFrameSettingsWidget->loadSettings(GroupFrameSettings::Forum);
}
+
+void ForumPage::updateFonts()
+{
+ Settings->beginGroup(QString("Forum"));
+ Settings->setValue("MinimumFontSize", ui.minimumFontSize->value());
+ Settings->setValue("MinimumContrast", ui.minimumContrast->value());
+ Settings->endGroup();
+}
diff --git a/retroshare-gui/src/gui/settings/ForumPage.h b/retroshare-gui/src/gui/settings/ForumPage.h
index 19027c303..880f66f04 100644
--- a/retroshare-gui/src/gui/settings/ForumPage.h
+++ b/retroshare-gui/src/gui/settings/ForumPage.h
@@ -45,6 +45,9 @@ protected slots:
void updateLoadEmbeddedImages();
void updateLoadEmoticons();
+private slots:
+ void updateFonts();
+
private:
Ui::ForumPage ui;
};
diff --git a/retroshare-gui/src/gui/settings/ForumPage.ui b/retroshare-gui/src/gui/settings/ForumPage.ui
index 4fb74d888..a52638987 100644
--- a/retroshare-gui/src/gui/settings/ForumPage.ui
+++ b/retroshare-gui/src/gui/settings/ForumPage.ui
@@ -17,6 +17,16 @@
Misc
+ -
+
+
+ <html><head/><body><p>This option is costly and it's in the dev's plans to improve it. In the mean time it's disabled by default. If you enable it and long forum posts take a while to display, then disable it again. </p></body></html>
+
+
+ Load emoticons (costly)
+
+
+
-
@@ -38,15 +48,71 @@
- -
-
-
- <html><head/><body><p>This option is costly and it's in the dev's plans to improve it. In the mean time it's disabled by default. If you enable it and long forum posts take a while to display, then disable it again. </p></body></html>
-
-
- Load emoticons (costly)
-
-
+
-
+
+
-
+
+
+ Minimum font size
+
+
+
+ -
+
+
+ 1
+
+
+ 64
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 38
+
+
+
+
+ -
+
+
+ Minimum text contrast
+
+
+
+ -
+
+
+ 1.000000000000000
+
+
+ 21.000000000000000
+
+
+ 0.500000000000000
+
+
+
+
+
+
+
+
+ -
+
+
+ Tabs
+
+
+
-
+
@@ -64,18 +130,6 @@
- -
-
-
- Tabs
-
-
-
-
-
-
-
-
-