hiding unused settings from the colors settings page

diff --git a/src/qtui/settingspages/colorsettingspage.cpp b/src/qtui/settingspages/colorsettingspage.cpp
index a301bd8..01bc517 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.cpp
+++ b/src/qtui/settingspages/colorsettingspage.cpp
@@ -28,8 +28,6 @@
 #include <QColorDialog>
 #include <QPainter>
 
 #include <QColorDialog>
 #include <QPainter>
 

-// #define PHONDEV
-

 ColorSettingsPage::ColorSettingsPage(QWidget *parent)
   : SettingsPage(tr("Appearance"), tr("Color settings"), parent),
     mapper(new QSignalMapper(this))
 ColorSettingsPage::ColorSettingsPage(QWidget *parent)
   : SettingsPage(tr("Appearance"), tr("Color settings"), parent),
     mapper(new QSignalMapper(this))


@@ -46,26 +44,12 @@ ColorSettingsPage::ColorSettingsPage(QWidget *parent)
 
   connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseColor(QWidget *)));
 
 
   connect(mapper, SIGNAL(mapped(QWidget *)), this, SLOT(chooseColor(QWidget *)));
 

-
-  
-#ifndef PHONDEV
-  ui.inactiveActivityUseBG->setEnabled(false);
-  ui.noActivityUseBG->setEnabled(false);
-  ui.highlightActivityUseBG->setEnabled(false);
-  ui.newMessageActivityUseBG->setEnabled(false);
-  ui.otherActivityUseBG->setEnabled(false);
-
-  ui.nickFG->setEnabled(false);
-  ui.nickUseBG->setEnabled(false);
-  ui.hostmaskFG->setEnabled(false);
-  ui.hostmaskUseBG->setEnabled(false);
-  ui.channelnameFG->setEnabled(false);
-  ui.channelnameUseBG->setEnabled(false);
-  ui.modeFlagsFG->setEnabled(false);
-  ui.modeFlagsUseBG->setEnabled(false);
-  ui.urlFG->setEnabled(false);
-  ui.urlUseBG->setEnabled(false);
-#endif
+  foreach(QWidget *widget, findChildren<QWidget *>()) {
+    if(widget->property("NotInUse").toBool()) {
+      widget->setEnabled(false);
+      widget->hide();
+    }
+  }

 }
 
 bool ColorSettingsPage::hasDefaults() const {
 }
 
 bool ColorSettingsPage::hasDefaults() const {


@@ -85,14 +69,6 @@ void ColorSettingsPage::defaults() {
 }
 
 void ColorSettingsPage::defaultBufferview() {
 }
 
 void ColorSettingsPage::defaultBufferview() {

-  ui.inactiveActivityFG->setColor(QColor(Qt::gray));
-  ui.inactiveActivityBG->setColor(QColor(Qt::white));
-  ui.inactiveActivityBG->setEnabled(false);
-  ui.inactiveActivityUseBG->setChecked(false);
-  ui.noActivityFG->setColor(QColor(Qt::black));
-  ui.noActivityBG->setColor(QColor(Qt::white));
-  ui.noActivityBG->setEnabled(false);
-  ui.noActivityUseBG->setChecked(false);

   ui.highlightActivityFG->setColor(QColor(Qt::magenta));
   ui.highlightActivityBG->setColor(QColor(Qt::white));
   ui.highlightActivityBG->setEnabled(false);
   ui.highlightActivityFG->setColor(QColor(Qt::magenta));
   ui.highlightActivityBG->setColor(QColor(Qt::white));
   ui.highlightActivityBG->setEnabled(false);


@@ -214,20 +190,6 @@ void ColorSettingsPage::defaultMircColorCodes() {
 
 void ColorSettingsPage::load() {
   QtUiStyleSettings s("Colors");
 
 void ColorSettingsPage::load() {
   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)));
-  ui.inactiveActivityBG->setColor(settings["InactiveActivityBG"].value<QColor>());
-  settings["InactiveActivityUseBG"] = s.value("inactiveActivityUseBG");
-  ui.inactiveActivityUseBG->setChecked(settings["InactiveActivityUseBG"].toBool());
-
-  settings["NoActivityFG"] = s.value("noActivityFG", QVariant(QColor(Qt::black)));
-  ui.noActivityFG->setColor(settings["NoActivityFG"].value<QColor>());
-  settings["NoActivityBG"] = s.value("noActivityBG", QVariant(QColor(Qt::white)));
-  ui.noActivityBG->setColor(settings["NoActivityBG"].value<QColor>());
-  settings["NoActivityUseBG"] = s.value("noActivityUseBG");
-  ui.noActivityUseBG->setChecked(settings["NoActivityUseBG"].toBool());
-

   settings["HighlightActivityFG"] = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta)));
   ui.highlightActivityFG->setColor(settings["HighlightActivityFG"].value<QColor>());
   settings["HighlightActivityBG"] = s.value("highlightActivityBG", QVariant(QColor(Qt::white)));
   settings["HighlightActivityFG"] = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta)));
   ui.highlightActivityFG->setColor(settings["HighlightActivityFG"].value<QColor>());
   settings["HighlightActivityBG"] = s.value("highlightActivityBG", QVariant(QColor(Qt::white)));


@@ -385,12 +347,6 @@ void ColorSettingsPage::load() {
 
 void ColorSettingsPage::save() {
   QtUiStyleSettings s("Colors");
 
 void ColorSettingsPage::save() {
   QtUiStyleSettings s("Colors");

-  s.setValue("noActivityFG", ui.noActivityFG->color());
-  s.setValue("noActivityBG", ui.noActivityBG->color());
-  s.setValue("noActivityUseBG", ui.noActivityUseBG->isChecked());
-  s.setValue("inactiveActivityFG", ui.inactiveActivityFG->color());
-  s.setValue("inactiveActivityBG", ui.inactiveActivityBG->color());
-  s.setValue("inactiveActivityUseBG", ui.inactiveActivityUseBG->isChecked());

   s.setValue("highlightActivityFG", ui.highlightActivityFG->color());
   s.setValue("highlightActivityBG", ui.highlightActivityBG->color());
   s.setValue("highlightActivityUseBG", ui.highlightActivityUseBG->isChecked());
   s.setValue("highlightActivityFG", ui.highlightActivityFG->color());
   s.setValue("highlightActivityBG", ui.highlightActivityBG->color());
   s.setValue("highlightActivityUseBG", ui.highlightActivityUseBG->isChecked());


@@ -494,12 +450,6 @@ void ColorSettingsPage::widgetHasChanged() {
 }
 
 bool ColorSettingsPage::testHasChanged() {
 }
 
 bool ColorSettingsPage::testHasChanged() {

-  if(settings["InactiveActivityFG"].value<QColor>() != ui.inactiveActivityFG->color()) return true;
-  if(settings["InactiveActivityBG"].value<QColor>() != ui.inactiveActivityBG->color()) return true;
-  if(settings["InactiveActivityUseBG"].toBool() != ui.inactiveActivityUseBG->isChecked()) return true;
-  if(settings["NoActivityFG"].value<QColor>() != ui.noActivityFG->color()) return true;
-  if(settings["NoActivityBG"].value<QColor>() != ui.noActivityBG->color()) return true;
-  if(settings["NoActivityUseBG"].toBool() != ui.noActivityUseBG->isChecked()) return true;

   if(settings["HighlightActivityFG"].value<QColor>() != ui.highlightActivityFG->color()) return true;
   if(settings["HighlightActivityBG"].value<QColor>() != ui.highlightActivityBG->color()) return true;
   if(settings["HighlightActivityUseBG"].toBool() != ui.highlightActivityUseBG->isChecked()) return true;
   if(settings["HighlightActivityFG"].value<QColor>() != ui.highlightActivityFG->color()) return true;
   if(settings["HighlightActivityBG"].value<QColor>() != ui.highlightActivityBG->color()) return true;
   if(settings["HighlightActivityUseBG"].toBool() != ui.highlightActivityUseBG->isChecked()) return true;


@@ -612,47 +562,32 @@ void ColorSettingsPage::chatviewPreview() {
 void ColorSettingsPage::bufferviewPreview() {
   ui.bufferviewPreview->clear();
   ui.bufferviewPreview->setColumnCount(1);
 void ColorSettingsPage::bufferviewPreview() {
   ui.bufferviewPreview->clear();
   ui.bufferviewPreview->setColumnCount(1);

-  ui.bufferviewPreview->setHeaderLabels(QStringList("Buffers"));
+  ui.bufferviewPreview->setHeaderLabels(QStringList(tr("Buffers")));

 
 

-  QTreeWidgetItem *topLevelItem = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("network")));
+  QTreeWidgetItem *topLevelItem = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("Network")));

   ui.bufferviewPreview->insertTopLevelItem(0, topLevelItem);
   ui.bufferviewPreview->insertTopLevelItem(0, topLevelItem);

-  topLevelItem->setForeground(0, QBrush(ui.noActivityFG->color()));
-  if(ui.noActivityUseBG->isChecked())
-    topLevelItem->setBackground(0, QBrush(ui.noActivityBG->color()));
-

 
   QList<QTreeWidgetItem *> items;
 
   QList<QTreeWidgetItem *> items;

-  QTreeWidgetItem *statusBuffer = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("Status Buffer")));
-  items.append(statusBuffer);
-  statusBuffer->setForeground(0, QBrush(ui.noActivityFG->color()));
-  if(ui.noActivityUseBG->isChecked())
-    statusBuffer->setBackground(0, QBrush(ui.noActivityBG->color()));
-
-  QTreeWidgetItem *inactiveActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#inactive channel")));
+  QTreeWidgetItem *inactiveActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#incative")));

   items.append(inactiveActivity);
   items.append(inactiveActivity);

-  inactiveActivity->setForeground(0, QBrush(ui.inactiveActivityFG->color()));
-  if(ui.inactiveActivityUseBG->isChecked())
-    inactiveActivity->setBackground(0, QBrush(ui.inactiveActivityBG->color()));
+  inactiveActivity->setForeground(0, QPalette().color(QPalette::Dark));

 
 

-  QTreeWidgetItem *noActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with no activity")));
+  QTreeWidgetItem *noActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#regular")));

   items.append(noActivity);
   items.append(noActivity);

-  noActivity->setForeground(0, QBrush(ui.noActivityFG->color()));
-  if(ui.noActivityUseBG->isChecked())
-    noActivity->setBackground(0, QBrush(ui.noActivityBG->color()));

 
 

-  QTreeWidgetItem *highlightActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with highlight")));
+  QTreeWidgetItem *highlightActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#highlight")));

   items.append(highlightActivity);
   highlightActivity->setForeground(0, QBrush(ui.highlightActivityFG->color()));
   if(ui.highlightActivityUseBG->isChecked())
     highlightActivity->setBackground(0, QBrush(ui.highlightActivityBG->color()));
 
   items.append(highlightActivity);
   highlightActivity->setForeground(0, QBrush(ui.highlightActivityFG->color()));
   if(ui.highlightActivityUseBG->isChecked())
     highlightActivity->setBackground(0, QBrush(ui.highlightActivityBG->color()));
 

-  QTreeWidgetItem *newMessageActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with new message")));
+  QTreeWidgetItem *newMessageActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#new message")));

   items.append(newMessageActivity);
   newMessageActivity->setForeground(0, QBrush(ui.newMessageActivityFG->color()));
   if(ui.newMessageActivityUseBG->isChecked())
     newMessageActivity->setBackground(0, QBrush(ui.newMessageActivityBG->color()));
 
   items.append(newMessageActivity);
   newMessageActivity->setForeground(0, QBrush(ui.newMessageActivityFG->color()));
   if(ui.newMessageActivityUseBG->isChecked())
     newMessageActivity->setBackground(0, QBrush(ui.newMessageActivityBG->color()));
 

-  QTreeWidgetItem *otherActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("#channel with other activity")));
+  QTreeWidgetItem *otherActivity = new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("#other activity")));

   items.append(otherActivity);
   otherActivity->setForeground(0, QBrush(ui.otherActivityFG->color()));
   if(ui.otherActivityUseBG->isChecked())
   items.append(otherActivity);
   otherActivity->setForeground(0, QBrush(ui.otherActivityFG->color()));
   if(ui.otherActivityUseBG->isChecked())

diff --git a/src/qtui/settingspages/colorsettingspage.ui b/src/qtui/settingspages/colorsettingspage.ui
index f877254..932225c 100644 (file)
--- a/src/qtui/settingspages/colorsettingspage.ui
+++ b/src/qtui/settingspages/colorsettingspage.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>517</width>
     <x>0</x>
     <y>0</y>
     <width>517</width>

-    <height>532</height>
+    <height>436</height>

    </rect>
   </property>
   <property name="sizePolicy" >
    </rect>
   </property>
   <property name="sizePolicy" >


@@ -30,7 +30,7 @@
         <x>0</x>
         <y>0</y>
         <width>487</width>
         <x>0</x>
         <y>0</y>
         <width>487</width>

-        <height>485</height>
+        <height>389</height>

        </rect>
       </property>
       <attribute name="title" >
        </rect>
       </property>
       <attribute name="title" >


@@ -61,122 +61,39 @@
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>

+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>

            </widget>
           </item>
           <item row="0" column="3" >
            </widget>
           </item>
           <item row="0" column="3" >

-           <widget class="QLabel" name="label_3" >
+           <widget class="QLabel" name="bufferViewUseBgLabel" >

             <property name="text" >
              <string>Use BG</string>
             </property>
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>
             <property name="text" >
              <string>Use BG</string>
             </property>
             <property name="alignment" >
              <set>Qt::AlignCenter</set>
             </property>

-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_43" >
-            <property name="text" >
-             <string>Default:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" >
-           <widget class="ColorButton" name="noActivityFG" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2" >
-           <widget class="ColorButton" name="noActivityBG" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string/>
+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>

             </property>
            </widget>
           </item>
             </property>
            </widget>
           </item>

-          <item row="1" column="3" >
-           <widget class="QCheckBox" name="noActivityUseBG" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="label_42" >
-            <property name="text" >
-             <string>Inactive:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" >
-           <widget class="ColorButton" name="inactiveActivityFG" >
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2" >
-           <widget class="ColorButton" name="inactiveActivityBG" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="3" >
-           <widget class="QCheckBox" name="inactiveActivityUseBG" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="layoutDirection" >
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" >
+          <item row="1" column="0" >

            <widget class="QLabel" name="label_39" >
             <property name="text" >
              <string>Highlight:</string>
             </property>
            </widget>
           </item>
            <widget class="QLabel" name="label_39" >
             <property name="text" >
              <string>Highlight:</string>
             </property>
            </widget>
           </item>

-          <item row="3" column="1" >
+          <item row="1" column="1" >

            <widget class="ColorButton" name="highlightActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
            <widget class="ColorButton" name="highlightActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>

-          <item row="3" column="2" >
+          <item row="1" column="2" >

            <widget class="ColorButton" name="highlightActivityBG" >
             <property name="enabled" >
              <bool>false</bool>
            <widget class="ColorButton" name="highlightActivityBG" >
             <property name="enabled" >
              <bool>false</bool>


@@ -184,9 +101,12 @@
             <property name="text" >
              <string/>
             </property>
             <property name="text" >
              <string/>
             </property>

+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>

            </widget>
           </item>
            </widget>
           </item>

-          <item row="3" column="3" >
+          <item row="1" column="3" >

            <widget class="QCheckBox" name="highlightActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
            <widget class="QCheckBox" name="highlightActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >


@@ -197,23 +117,26 @@
             <property name="text" >
              <string/>
             </property>
             <property name="text" >
              <string/>
             </property>

+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>

            </widget>
           </item>
            </widget>
           </item>

-          <item row="4" column="0" >
+          <item row="2" column="0" >

            <widget class="QLabel" name="label_40" >
             <property name="text" >
              <string>New Message:</string>
             </property>
            </widget>
           </item>
            <widget class="QLabel" name="label_40" >
             <property name="text" >
              <string>New Message:</string>
             </property>
            </widget>
           </item>

-          <item row="4" column="1" >
+          <item row="2" column="1" >

            <widget class="ColorButton" name="newMessageActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
            <widget class="ColorButton" name="newMessageActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>

-          <item row="4" column="2" >
+          <item row="2" column="2" >

            <widget class="ColorButton" name="newMessageActivityBG" >
             <property name="enabled" >
              <bool>false</bool>
            <widget class="ColorButton" name="newMessageActivityBG" >
             <property name="enabled" >
              <bool>false</bool>


@@ -221,9 +144,12 @@
             <property name="text" >
              <string/>
             </property>
             <property name="text" >
              <string/>
             </property>

+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>

            </widget>
           </item>
            </widget>
           </item>

-          <item row="4" column="3" >
+          <item row="2" column="3" >

            <widget class="QCheckBox" name="newMessageActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
            <widget class="QCheckBox" name="newMessageActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >


@@ -234,23 +160,26 @@
             <property name="text" >
              <string/>
             </property>
             <property name="text" >
              <string/>
             </property>

+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>

            </widget>
           </item>
            </widget>
           </item>

-          <item row="5" column="0" >
+          <item row="3" column="0" >

            <widget class="QLabel" name="label_41" >
             <property name="text" >
              <string>Other Activity:</string>
             </property>
            </widget>
           </item>
            <widget class="QLabel" name="label_41" >
             <property name="text" >
              <string>Other Activity:</string>
             </property>
            </widget>
           </item>

-          <item row="5" column="1" >
+          <item row="3" column="1" >

            <widget class="ColorButton" name="otherActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>
            <widget class="ColorButton" name="otherActivityFG" >
             <property name="text" >
              <string/>
             </property>
            </widget>
           </item>

-          <item row="5" column="2" >
+          <item row="3" column="2" >

            <widget class="ColorButton" name="otherActivityBG" >
             <property name="enabled" >
              <bool>false</bool>
            <widget class="ColorButton" name="otherActivityBG" >
             <property name="enabled" >
              <bool>false</bool>


@@ -258,9 +187,12 @@
             <property name="text" >
              <string/>
             </property>
             <property name="text" >
              <string/>
             </property>

+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>

            </widget>
           </item>
            </widget>
           </item>

-          <item row="5" column="3" >
+          <item row="3" column="3" >

            <widget class="QCheckBox" name="otherActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
            <widget class="QCheckBox" name="otherActivityUseBG" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >


@@ -271,9 +203,12 @@
             <property name="text" >
              <string/>
             </property>
             <property name="text" >
              <string/>
             </property>

+            <property name="NotInUse" stdset="0" >
+             <bool>true</bool>
+            </property>

            </widget>
           </item>
            </widget>
           </item>

-          <item row="6" column="0" >
+          <item row="4" column="0" >

            <spacer>
             <property name="orientation" >
              <enum>Qt::Vertical</enum>
            <spacer>
             <property name="orientation" >
              <enum>Qt::Vertical</enum>


@@ -328,7 +263,7 @@
         <x>0</x>
         <y>0</y>
         <width>487</width>
         <x>0</x>
         <y>0</y>
         <width>487</width>

-        <height>485</height>
+        <height>389</height>

        </rect>
       </property>
       <attribute name="title" >
        </rect>
       </property>
       <attribute name="title" >


@@ -387,6 +322,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="1" column="0" >
             </widget>
            </item>
            <item row="1" column="0" >


@@ -411,6 +349,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="1" column="3" >
             </widget>
            </item>
            <item row="1" column="3" >


@@ -427,6 +368,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="2" column="0" >
             </widget>
            </item>
            <item row="2" column="0" >


@@ -451,6 +395,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="2" column="3" >
             </widget>
            </item>
            <item row="2" column="3" >


@@ -467,6 +414,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="3" column="0" >
             </widget>
            </item>
            <item row="3" column="0" >


@@ -491,6 +441,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="3" column="3" >
             </widget>
            </item>
            <item row="3" column="3" >


@@ -507,6 +460,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="4" column="0" >
             </widget>
            </item>
            <item row="4" column="0" >


@@ -531,6 +487,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="4" column="3" >
             </widget>
            </item>
            <item row="4" column="3" >


@@ -547,6 +506,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="5" column="0" colspan="2" >
             </widget>
            </item>
            <item row="5" column="0" colspan="2" >


@@ -584,10 +546,10 @@
          <widget class="QWidget" name="tab_2" >
           <property name="geometry" >
            <rect>
          <widget class="QWidget" name="tab_2" >
           <property name="geometry" >
            <rect>

-            <x>360</x>
-            <y>270</y>
-            <width>720</width>
-            <height>360</height>
+            <x>0</x>
+            <y>0</y>
+            <width>441</width>
+            <height>294</height>

            </rect>
           </property>
           <attribute name="title" >
            </rect>
           </property>
           <attribute name="title" >


@@ -612,6 +574,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="0" column="3" >
             </widget>
            </item>
            <item row="0" column="3" >


@@ -622,6 +587,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="1" column="0" >
             </widget>
            </item>
            <item row="1" column="0" >


@@ -646,6 +614,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="1" column="3" >
             </widget>
            </item>
            <item row="1" column="3" >


@@ -662,6 +633,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="2" column="0" >
             </widget>
            </item>
            <item row="2" column="0" >


@@ -686,6 +660,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="2" column="3" >
             </widget>
            </item>
            <item row="2" column="3" >


@@ -702,6 +679,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="3" column="0" >
             </widget>
            </item>
            <item row="3" column="0" >


@@ -726,6 +706,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="3" column="3" >
             </widget>
            </item>
            <item row="3" column="3" >


@@ -742,6 +725,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="4" column="0" >
             </widget>
            </item>
            <item row="4" column="0" >


@@ -766,6 +752,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="4" column="3" >
             </widget>
            </item>
            <item row="4" column="3" >


@@ -782,6 +771,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="5" column="0" >
             </widget>
            </item>
            <item row="5" column="0" >


@@ -806,6 +798,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="5" column="3" >
             </widget>
            </item>
            <item row="5" column="3" >


@@ -822,6 +817,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="6" column="0" >
             </widget>
            </item>
            <item row="6" column="0" >


@@ -846,6 +844,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="6" column="3" >
             </widget>
            </item>
            <item row="6" column="3" >


@@ -862,6 +863,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="7" column="0" >
             </widget>
            </item>
            <item row="7" column="0" >


@@ -886,6 +890,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="7" column="3" >
             </widget>
            </item>
            <item row="7" column="3" >


@@ -902,6 +909,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
           </layout>
             </widget>
            </item>
           </layout>


@@ -909,10 +919,10 @@
          <widget class="QWidget" name="Seite_2" >
           <property name="geometry" >
            <rect>
          <widget class="QWidget" name="Seite_2" >
           <property name="geometry" >
            <rect>

-            <x>360</x>
-            <y>270</y>
-            <width>720</width>
-            <height>360</height>
+            <x>0</x>
+            <y>0</y>
+            <width>441</width>
+            <height>294</height>

            </rect>
           </property>
           <attribute name="title" >
            </rect>
           </property>
           <attribute name="title" >


@@ -937,6 +947,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="0" column="3" >
             </widget>
            </item>
            <item row="0" column="3" >


@@ -947,6 +960,9 @@
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>
              <property name="alignment" >
               <set>Qt::AlignCenter</set>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="1" column="0" >
             </widget>
            </item>
            <item row="1" column="0" >


@@ -971,6 +987,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="1" column="3" >
             </widget>
            </item>
            <item row="1" column="3" >


@@ -987,6 +1006,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="2" column="0" >
             </widget>
            </item>
            <item row="2" column="0" >


@@ -1011,6 +1033,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="2" column="3" >
             </widget>
            </item>
            <item row="2" column="3" >


@@ -1027,6 +1052,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="3" column="0" >
             </widget>
            </item>
            <item row="3" column="0" >


@@ -1051,6 +1079,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="3" column="3" >
             </widget>
            </item>
            <item row="3" column="3" >


@@ -1067,6 +1098,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="4" column="0" >
             </widget>
            </item>
            <item row="4" column="0" >


@@ -1091,6 +1125,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="4" column="3" >
             </widget>
            </item>
            <item row="4" column="3" >


@@ -1107,6 +1144,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="5" column="0" >
             </widget>
            </item>
            <item row="5" column="0" >


@@ -1131,6 +1171,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="5" column="3" >
             </widget>
            </item>
            <item row="5" column="3" >


@@ -1147,6 +1190,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="6" column="0" >
             </widget>
            </item>
            <item row="6" column="0" >


@@ -1171,6 +1217,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="6" column="3" >
             </widget>
            </item>
            <item row="6" column="3" >


@@ -1187,6 +1236,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="7" column="0" >
             </widget>
            </item>
            <item row="7" column="0" >


@@ -1211,6 +1263,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="7" column="3" >
             </widget>
            </item>
            <item row="7" column="3" >


@@ -1227,6 +1282,9 @@
              <property name="text" >
               <string/>
              </property>
              <property name="text" >
               <string/>
              </property>

+             <property name="NotInUse" stdset="0" >
+              <bool>true</bool>
+             </property>

             </widget>
            </item>
            <item row="8" column="0" >
             </widget>
            </item>
            <item row="8" column="0" >


@@ -1247,24 +1305,6 @@
          </widget>
         </widget>
        </item>
          </widget>
         </widget>
        </item>

-       <item>
-        <widget class="QGroupBox" name="groupBox_5" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title" >
-          <string>Preview:</string>
-         </property>
-         <layout class="QHBoxLayout" >
-          <item>
-           <widget class="QWidget" native="1" name="chatviewPreview" />
-          </item>
-         </layout>
-        </widget>
-       </item>

       </layout>
      </widget>
      <widget class="QWidget" name="Mirc" >
       </layout>
      </widget>
      <widget class="QWidget" name="Mirc" >


@@ -1273,7 +1313,7 @@
         <x>0</x>
         <y>0</y>
         <width>487</width>
         <x>0</x>
         <y>0</y>
         <width>487</width>

-        <height>485</height>
+        <height>389</height>

        </rect>
       </property>
       <attribute name="title" >
        </rect>
       </property>
       <attribute name="title" >


@@ -1547,38 +1587,6 @@
  </customwidgets>
  <resources/>
  <connections>
  </customwidgets>
  <resources/>
  <connections>

-  <connection>
-   <sender>inactiveActivityUseBG</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>inactiveActivityBG</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>249</x>
-     <y>111</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>197</x>
-     <y>111</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>noActivityUseBG</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>noActivityBG</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>249</x>
-     <y>147</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>197</x>
-     <y>147</y>
-    </hint>
-   </hints>
-  </connection>

   <connection>
    <sender>highlightActivityUseBG</sender>
    <signal>clicked(bool)</signal>
   <connection>
    <sender>highlightActivityUseBG</sender>
    <signal>clicked(bool)</signal>

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 0b33869..38dc02d 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -523,7 +523,7 @@ void BufferViewDelegate::initStyleOption(QStyleOptionViewItem *option, const QMo
   }
 
   if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) {
   }
 
   if(!index.data(NetworkModel::ItemActiveRole).toBool() || index.data(NetworkModel::UserAwayRole).toBool()) {

-    option->palette.setColor(QPalette::Text, QPalette().color(QPalette::Dark));
+    option->palette.setColor(QPalette::Text, option->palette.color(QPalette::Dark));

   }
 }
 
   }
 }