From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 21 Dec 2017 12:44:56 +0000 (+0100)
Subject: Only enable sender prefix option if the core supports the feature
X-Git-Tag: travis-deploy-test~198
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=310218c3d7be363ceeba646d11d007abae2d478b

Only enable sender prefix option if the core supports the feature

Closes GH-309.
---

diff --git a/src/qtui/settingspages/chatviewsettingspage.cpp b/src/qtui/settingspages/chatviewsettingspage.cpp
index 924474c1..766bcd40 100644
--- a/src/qtui/settingspages/chatviewsettingspage.cpp
+++ b/src/qtui/settingspages/chatviewsettingspage.cpp
@@ -34,10 +34,14 @@ ChatViewSettingsPage::ChatViewSettingsPage(QWidget *parent)
 #endif
 
     // FIXME remove with protocol v11
-    if (!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
+    if (!Client::coreFeatures().testFlag(Quassel::SynchronizedMarkerLine)) {
         ui.autoMarkerLine->setEnabled(false);
         ui.autoMarkerLine->setChecked(true);
-        ui.autoMarkerLine->setToolTip(tr("You need at least version 0.6 of quasselcore to use this feature"));
+        ui.autoMarkerLine->setToolTip(tr("You need at least version 0.6 of Quassel Core to use this feature"));
+    }
+    if (!Client::coreFeatures().testFlag(Quassel::Feature::CoreSideHighlights)) {
+        ui.showSenderPrefixes->setEnabled(false);
+        ui.showSenderPrefixes->setToolTip(tr("You need at least version 0.13 of Quassel Core to use this feature"));
     }
 
     initAutoWidgets();
diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 55fbc08e..349d335c 100644
--- a/src/qtui/settingspages/chatviewsettingspage.ui
+++ b/src/qtui/settingspages/chatviewsettingspage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>486</width>
-    <height>230</height>
+    <width>514</width>
+    <height>294</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -98,7 +98,7 @@
       <string>Shows the modes of senders before their name (e.g. @, +)</string>
      </property>
      <property name="text">
-      <string>Show sendermodes in front of nicknames:</string>
+      <string>Show sendermodes in front of nicknames</string>
      </property>
      <property name="checked">
       <bool>true</bool>