aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/Ui/skinned/forms/skinnedsettings.ui64
-rw-r--r--src/plugins/Ui/skinned/listwidget.cpp2
-rw-r--r--src/plugins/Ui/skinned/listwidgetdrawer.cpp15
-rw-r--r--src/plugins/Ui/skinned/listwidgetdrawer.h2
4 files changed, 74 insertions, 9 deletions
diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
index 706b65609..70c267280 100644
--- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui
+++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
@@ -1176,5 +1176,69 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>plOverrideGroupBgCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>label_15</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>89</x>
+ <y>229</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>90</x>
+ <y>255</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>plOverrideGroupBgCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>plGrBgColor</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>202</x>
+ <y>231</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>205</x>
+ <y>257</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>plOverrideCurrentBgCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>label_20</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>61</x>
+ <y>290</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>62</x>
+ <y>312</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>plOverrideCurrentBgCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>plCurrentTrackBgColor</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>236</x>
+ <y>284</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>208</x>
+ <y>310</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 0f446dd07..a8b3fcbfd 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -495,7 +495,7 @@ void ListWidget::setViewPosition(int sc)
void ListWidget::updateSkin()
{
- m_drawer.loadSkinColors();
+ m_drawer.readSettings();
update();
}
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.cpp b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
index aa7065113..e87387612 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.cpp
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.cpp
@@ -48,7 +48,6 @@ ListWidgetDrawer::ListWidgetDrawer()
m_metrics = nullptr;
m_extra_metrics = nullptr;
readSettings();
- loadSkinColors();
}
ListWidgetDrawer::~ListWidgetDrawer()
@@ -78,7 +77,7 @@ void ListWidgetDrawer::readSettings()
if(!m_use_skin_colors)
{
m_normal_bg.setNamedColor(settings.value("pl_bg1_color", m_normal_bg.name()).toString());
- m_alternate.setNamedColor(settings.value("pl_bg2_color", m_alternate.name()).toString());
+ m_alternate_bg.setNamedColor(settings.value("pl_bg2_color", m_alternate_bg.name()).toString());
m_selected_bg.setNamedColor(settings.value("pl_highlight_color", m_selected_bg.name()).toString());
m_normal.setNamedColor(settings.value("pl_normal_text_color", m_normal.name()).toString());
m_current.setNamedColor(settings.value("pl_current_text_color",m_current.name()).toString());
@@ -93,7 +92,7 @@ void ListWidgetDrawer::readSettings()
else
{
m_group_bg = m_normal_bg;
- m_group_alt_bg = m_alternate;
+ m_group_alt_bg = m_alternate_bg;
}
if(settings.value("pl_override_current_bg", false).toBool())
{
@@ -103,10 +102,12 @@ void ListWidgetDrawer::readSettings()
else
{
m_current_bg = m_normal_bg;
- m_current_alt_bg = m_alternate;
+ m_current_alt_bg = m_alternate_bg;
}
}
+ settings.endGroup();
+
if (m_update)
{
delete m_metrics;
@@ -125,7 +126,7 @@ void ListWidgetDrawer::loadSkinColors()
m_current.setNamedColor(m_skin->getPLValue("current"));
m_normal_bg.setNamedColor(m_skin->getPLValue("normalbg"));
m_selected_bg.setNamedColor(m_skin->getPLValue("selectedbg"));
- m_alternate = m_normal_bg;
+ m_alternate_bg = m_normal_bg;
m_highlighted = m_normal;
m_splitter = m_alternate_splitter_color ? m_current : m_normal;
m_group_bg = m_normal_bg;
@@ -265,8 +266,8 @@ void ListWidgetDrawer::drawBackground(QPainter *painter, ListWidgetRow *row, int
{
if(index % 2)
{
- painter->setBrush(QBrush(m_alternate));
- painter->setPen(m_alternate);
+ painter->setBrush(QBrush(m_alternate_bg));
+ painter->setPen(m_alternate_bg);
}
else
{
diff --git a/src/plugins/Ui/skinned/listwidgetdrawer.h b/src/plugins/Ui/skinned/listwidgetdrawer.h
index 9cf297cab..ce942a621 100644
--- a/src/plugins/Ui/skinned/listwidgetdrawer.h
+++ b/src/plugins/Ui/skinned/listwidgetdrawer.h
@@ -96,7 +96,7 @@ public:
void drawDropLine(QPainter *painter, int row_number, int width, int header_height);
private:
- QColor m_normal, m_current, m_normal_bg, m_selected_bg, m_alternate, m_highlighted, m_splitter;
+ QColor m_normal, m_current, m_normal_bg, m_selected_bg, m_alternate_bg, m_highlighted, m_splitter;
QColor m_group_bg, m_group_alt_bg, m_group_text, m_current_bg, m_current_alt_bg;
Skin *m_skin;
QFontMetrics *m_metrics;