From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Fri, 5 Sep 2008 18:39:57 +0000 (+0200)
Subject: fixing colors
X-Git-Tag: 0.3.1~285
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=630dbdaf56fcee546387275898bde59426da71cb

fixing colors
---

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index c09bdee0..f86005e5 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -132,7 +132,7 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     if(!(flags & Message::Self)) {
       BufferId bufferId = model_->data(prevRowIdx, MessageModel::BufferIdRole).value<BufferId>();
       if(msgId == Client::networkModel()->lastSeenMsgId(bufferId) && chatScene()->isSingleBufferScene()) {
-	QtUiSettings s("QtUiStyle/Colors");
+	QtUiStyleSettings s("Colors");
 	QLinearGradient gradient(0, 0, 0, height());
 	gradient.setColorAt(0, s.value("newMsgMarkerFG", QColor(Qt::red)).value<QColor>());
 	gradient.setColorAt(0.1, Qt::transparent);
diff --git a/src/qtui/qtuisettings.cpp b/src/qtui/qtuisettings.cpp
index f06cac7d..6e8cdf1f 100644
--- a/src/qtui/qtuisettings.cpp
+++ b/src/qtui/qtuisettings.cpp
@@ -31,9 +31,14 @@ QtUiSettings::QtUiSettings()
 }
 
 /***********************************************************************/
+QtUiStyleSettings::QtUiStyleSettings(const QString &subGroup)
+  : UiStyleSettings(QString("QtUiStyle/%1").arg(subGroup))
+{
+}
 
-QtUiStyleSettings::QtUiStyleSettings(const QString &group) : UiStyleSettings(group) {
-
+QtUiStyleSettings::QtUiStyleSettings()
+  : UiStyleSettings("QtUiStyle")
+{
 }
 
 void QtUiStyleSettings::setHighlightColor(const QColor &col) {
diff --git a/src/qtui/qtuisettings.h b/src/qtui/qtuisettings.h
index 9754ecba..c2aa4e22 100644
--- a/src/qtui/qtuisettings.h
+++ b/src/qtui/qtuisettings.h
@@ -33,7 +33,8 @@ public:
 
 class QtUiStyleSettings : public UiStyleSettings {
 public:
-  QtUiStyleSettings(const QString &group = "QtUiStyle");
+  QtUiStyleSettings(const QString &subGroup);
+  QtUiStyleSettings();
 
   void setHighlightColor(const QColor &);
   QColor highlightColor();
diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index 636cc58c..8e76c709 100644
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -226,7 +226,7 @@ void ColorSettingsPage::defaultNickview() {
 }
 
 void ColorSettingsPage::load() {
-  QtUiSettings s("QtUiStyle/Colors");
+  QtUiStyleSettings s("Colors");
   settings["InactiveActivityFG"] = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray)));
   ui.inactiveActivityFG->setColor(settings["InactiveActivityFG"].value<QColor>());
   settings["InactiveActivityBG"] = s.value("inactiveActivityBG", QVariant(QColor(Qt::white)));
@@ -411,7 +411,7 @@ void ColorSettingsPage::load() {
 }
 
 void ColorSettingsPage::save() {
-  QtUiSettings s("QtUiStyle/Colors");
+  QtUiStyleSettings s("Colors");
   s.setValue("noActivityFG", ui.noActivityFG->color());
   s.setValue("noActivityBG", ui.noActivityBG->color());
   s.setValue("noActivityUseBG", ui.noActivityUseBG->isChecked());
diff --git a/src/uisupport/uisettings.cpp b/src/uisupport/uisettings.cpp
index c3386916..83c51675 100644
--- a/src/uisupport/uisettings.cpp
+++ b/src/uisupport/uisettings.cpp
@@ -25,22 +25,11 @@ UiSettings::UiSettings(const QString &group)
 {
 }
 
-void UiSettings::setValue(const QString &key, const QVariant &data) {
-  setLocalValue(key, data);
-}
-
-QVariant UiSettings::value(const QString &key, const QVariant &def) {
-  return localValue(key, def);
-}
-
-void UiSettings::remove(const QString &key) {
-  removeLocalKey(key);
-}
-
 /**************************************************************************/
 
-UiStyleSettings::UiStyleSettings(const QString &group) : ClientSettings(group) {
-
+UiStyleSettings::UiStyleSettings(const QString &group)
+  : ClientSettings(group)
+{
 }
 
 void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format) {
diff --git a/src/uisupport/uisettings.h b/src/uisupport/uisettings.h
index efd2828b..6da65ef5 100644
--- a/src/uisupport/uisettings.h
+++ b/src/uisupport/uisettings.h
@@ -27,10 +27,10 @@
 class UiSettings : public ClientSettings {
 public:
   UiSettings(const QString &group = "Ui");
-  
-  void setValue(const QString &key, const QVariant &data);
-  QVariant value(const QString &key, const QVariant &def = QVariant());
-  void remove(const QString &key);
+
+  inline void setValue(const QString &key, const QVariant &data) { setLocalValue(key, data); }
+  inline QVariant value(const QString &key, const QVariant &def = QVariant()) { return localValue(key, def); }
+  inline void remove(const QString &key) { removeLocalKey(key); }
 };
 
 
@@ -38,6 +38,10 @@ class UiStyleSettings : public ClientSettings {
 public:
   UiStyleSettings(const QString &group = "UiStyle");
 
+  inline void setValue(const QString &key, const QVariant &data) { setLocalValue(key, data); }
+  inline QVariant value(const QString &key, const QVariant &def = QVariant()) { return localValue(key, def); }
+  inline void remove(const QString &key) { removeLocalKey(key); }
+
   void setCustomFormat(UiStyle::FormatType, QTextCharFormat);
   QTextCharFormat customFormat(UiStyle::FormatType);