fixing colors

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index c09bdee..f86005e 100644 (file)
--- 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()) {
     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);
        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 f06cac7..6e8cdf1 100644 (file)
--- 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) {
 }
 
 void QtUiStyleSettings::setHighlightColor(const QColor &col) {

diff --git a/src/qtui/qtuisettings.h b/src/qtui/qtuisettings.h
index 9754ecb..c2aa4e2 100644 (file)
--- a/src/qtui/qtuisettings.h
+++ b/src/qtui/qtuisettings.h
@@ -33,7 +33,8 @@ public:
 
 class QtUiStyleSettings : public UiStyleSettings {
 public:
 
 class QtUiStyleSettings : public UiStyleSettings {
 public:

-  QtUiStyleSettings(const QString &group = "QtUiStyle");
+  QtUiStyleSettings(const QString &subGroup);
+  QtUiStyleSettings();

 
   void setHighlightColor(const QColor &);
   QColor highlightColor();
 
   void setHighlightColor(const QColor &);
   QColor highlightColor();

diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index 636cc58..8e76c70 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -226,7 +226,7 @@ void ColorSettingsPage::defaultNickview() {
 }
 
 void ColorSettingsPage::load() {
 }
 
 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)));
   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() {
 }
 
 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());
   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 c338691..83c5167 100644 (file)
--- 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) {
 }
 
 void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format) {

diff --git a/src/uisupport/uisettings.h b/src/uisupport/uisettings.h
index efd2828..6da65ef 100644 (file)
--- a/src/uisupport/uisettings.h
+++ b/src/uisupport/uisettings.h
@@ -27,10 +27,10 @@
 class UiSettings : public ClientSettings {
 public:
   UiSettings(const QString &group = "Ui");
 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");
 
 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);
 
   void setCustomFormat(UiStyle::FormatType, QTextCharFormat);
   QTextCharFormat customFormat(UiStyle::FormatType);