diff options
Diffstat (limited to 'src/plugins/Ui')
| -rw-r--r-- | src/plugins/Ui/skinned/forms/skinnedsettings.ui | 312 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/skinnedsettings.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/skinnedsettings.h | 3 |
3 files changed, 185 insertions, 146 deletions
diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui index 70c267280..1c2f513d8 100644 --- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui +++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui @@ -17,7 +17,7 @@ <item row="0" column="0"> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>0</number> + <number>3</number> </property> <widget class="QWidget" name="tab_4"> <attribute name="title"> @@ -450,8 +450,15 @@ <bool>false</bool> </property> <layout class="QGridLayout" name="gridLayout_5"> - <item row="4" column="6"> - <widget class="ColorWidget" name="plGrTextColor"> + <item row="0" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Background #1:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="ColorWidget" name="plBg1Color"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -464,16 +471,39 @@ <height>20</height> </size> </property> + <property name="maximumSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> <property name="frameShape"> <enum>QFrame::Box</enum> </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> + </widget> + </item> + <item row="0" column="2" rowspan="5"> + <spacer name="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>43</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="3"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Normal text:</string> </property> </widget> </item> - <item row="2" column="1"> - <widget class="ColorWidget" name="plHlColor"> + <item row="0" column="4"> + <widget class="ColorWidget" name="plTextNormalColor"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -497,11 +527,15 @@ </property> </widget> </item> - <item row="8" column="1"> - <widget class="ColorWidget" name="plCurrentTrackBgColor"> - <property name="enabled"> - <bool>false</bool> + <item row="1" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Background #2:</string> </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="ColorWidget" name="plBg2Color"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -514,16 +548,26 @@ <height>20</height> </size> </property> + <property name="maximumSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> <property name="frameShape"> <enum>QFrame::Box</enum> </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> + </widget> + </item> + <item row="1" column="3"> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Current text:</string> </property> </widget> </item> - <item row="2" column="6"> - <widget class="ColorWidget" name="plTextHlCurrentColor"> + <item row="1" column="4"> + <widget class="ColorWidget" name="plTextCurrentColor"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -545,13 +589,17 @@ <property name="frameShape"> <enum>QFrame::Box</enum> </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Highlighted background:</string> </property> </widget> </item> - <item row="1" column="6"> - <widget class="ColorWidget" name="plTextCurrentColor"> + <item row="2" column="1"> + <widget class="ColorWidget" name="plHlColor"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -575,54 +623,15 @@ </property> </widget> </item> - <item row="0" column="2" rowspan="5" colspan="2"> - <spacer name="horizontalSpacer_5"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>43</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="7" rowspan="5"> - <spacer name="horizontalSpacer_6"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>66</width> - <height>68</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_8"> + <item row="2" column="3"> + <widget class="QLabel" name="label_14"> <property name="text"> - <string>Background #2:</string> + <string>Highlighted text:</string> </property> </widget> </item> - <item row="8" column="4" colspan="4"> - <spacer name="horizontalSpacer_10"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>189</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="1"> - <widget class="ColorWidget" name="plBg1Color"> + <item row="2" column="4"> + <widget class="ColorWidget" name="plTextHlCurrentColor"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -644,19 +653,15 @@ <property name="frameShape"> <enum>QFrame::Box</enum> </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Highlighted background:</string> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> </widget> </item> - <item row="0" column="4" colspan="2"> - <widget class="QLabel" name="label_12"> + <item row="3" column="0" rowspan="2"> + <widget class="QLabel" name="label_19"> <property name="text"> - <string>Normal text:</string> + <string>Splitter:</string> </property> </widget> </item> @@ -694,39 +699,50 @@ </property> </widget> </item> - <item row="3" column="0" rowspan="2"> - <widget class="QLabel" name="label_19"> + <item row="4" column="3"> + <widget class="QLabel" name="label_16"> <property name="text"> - <string>Splitter:</string> + <string>Group text:</string> </property> </widget> </item> - <item row="1" column="4" colspan="2"> - <widget class="QLabel" name="label_13"> - <property name="text"> - <string>Current text:</string> + <item row="4" column="4"> + <widget class="ColorWidget" name="plGrTextColor"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - </widget> - </item> - <item row="2" column="4" colspan="2"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>Highlighted text:</string> + <property name="minimumSize"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::Box</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> </widget> </item> - <item row="8" column="0"> - <widget class="QLabel" name="label_20"> + <item row="6" column="0"> + <widget class="QLabel" name="label_15"> <property name="enabled"> <bool>false</bool> </property> <property name="text"> - <string>Current track background:</string> + <string>Group background:</string> </property> </widget> </item> - <item row="0" column="6"> - <widget class="ColorWidget" name="plTextNormalColor"> + <item row="6" column="1"> + <widget class="ColorWidget" name="plGrBgColor"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> @@ -739,26 +755,26 @@ <height>20</height> </size> </property> - <property name="maximumSize"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> <property name="frameShape"> <enum>QFrame::Box</enum> </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> </widget> </item> - <item row="7" column="0" colspan="5"> - <widget class="QCheckBox" name="plOverrideCurrentBgCheckBox"> + <item row="8" column="0"> + <widget class="QLabel" name="label_20"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="text"> - <string>Override current track background</string> + <string>Current track background:</string> </property> </widget> </item> - <item row="6" column="1"> - <widget class="ColorWidget" name="plGrBgColor"> + <item row="8" column="1"> + <widget class="ColorWidget" name="plCurrentTrackBgColor"> <property name="enabled"> <bool>false</bool> </property> @@ -782,72 +798,80 @@ </property> </widget> </item> - <item row="6" column="4" colspan="4"> - <spacer name="horizontalSpacer_9"> + <item row="8" column="3" colspan="3"> + <spacer name="horizontalSpacer_10"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>110</width> + <width>189</width> <height>20</height> </size> </property> </spacer> </item> - <item row="6" column="0"> - <widget class="QLabel" name="label_15"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Group background:</string> - </property> - </widget> - </item> - <item row="5" column="0" colspan="8"> - <widget class="QCheckBox" name="plOverrideGroupBgCheckBox"> - <property name="text"> - <string>Override group background</string> - </property> - </widget> - </item> - <item row="4" column="4" colspan="2"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>Group text:</string> - </property> - </widget> + <item row="9" column="0" colspan="6"> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="loadSkinColorsButton"> + <property name="text"> + <string>Load skin colors</string> + </property> + </widget> + </item> + </layout> </item> - <item row="1" column="1"> - <widget class="ColorWidget" name="plBg2Color"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item row="6" column="3" colspan="3"> + <spacer name="horizontalSpacer_9"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="minimumSize"> + <property name="sizeHint" stdset="0"> <size> - <width>20</width> + <width>110</width> <height>20</height> </size> </property> - <property name="maximumSize"> + </spacer> + </item> + <item row="0" column="5" rowspan="5"> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>20</height> + <width>66</width> + <height>68</height> </size> </property> - <property name="frameShape"> - <enum>QFrame::Box</enum> + </spacer> + </item> + <item row="5" column="0" colspan="6"> + <widget class="QCheckBox" name="plOverrideGroupBgCheckBox"> + <property name="text"> + <string>Override group background</string> </property> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_7"> + <item row="7" column="0" colspan="6"> + <widget class="QCheckBox" name="plOverrideCurrentBgCheckBox"> <property name="text"> - <string>Background #1:</string> + <string>Override current track background</string> </property> </widget> </item> diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index 89fba0d22..4ecc30231 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -318,3 +318,19 @@ void SkinnedSettings::writeSettings() settings.setValue("pl_override_current_bg", m_ui.plOverrideCurrentBgCheckBox->isChecked()); settings.endGroup(); } + +void SkinnedSettings::on_loadSkinColorsButton_clicked() +{ + m_ui.plBg1Color->setColor(m_skin->getPLValue("normalbg")); + m_ui.plBg2Color->setColor(m_skin->getPLValue("normalbg")); + m_ui.plHlColor->setColor(m_skin->getPLValue("selectedbg")); + m_ui.plTextNormalColor->setColor(m_skin->getPLValue("normal")); + m_ui.plTextCurrentColor->setColor(m_skin->getPLValue("current")); + m_ui.plTextHlCurrentColor->setColor(m_skin->getPLValue("normal")); + m_ui.plGrBgColor->setColor(m_skin->getPLValue("normalbg")); + m_ui.plSplitterColor->setColor(m_skin->getPLValue("normal")); + m_ui.plGrTextColor->setColor(m_skin->getPLValue("normal")); + m_ui.plCurrentTrackBgColor->setColor(m_skin->getPLValue("normalbg")); + m_ui.plOverrideGroupBgCheckBox->setChecked(false); + m_ui.plOverrideCurrentBgCheckBox->setChecked(false); +} diff --git a/src/plugins/Ui/skinned/skinnedsettings.h b/src/plugins/Ui/skinned/skinnedsettings.h index 308c0f106..d5525fa3f 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.h +++ b/src/plugins/Ui/skinned/skinnedsettings.h @@ -46,8 +46,7 @@ private slots: void loadSkins(); void on_popupTemplateButton_clicked(); void addWindowTitleString(const QString &str); - - + void on_loadSkinColorsButton_clicked(); private: void showEvent(QShowEvent *) override; |
