diff options
| -rw-r--r-- | lumina-config/mainUI.cpp | 8 | ||||
| -rw-r--r-- | lumina-config/mainUI.ui | 80 |
2 files changed, 67 insertions, 21 deletions
diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp index ae4ec122..d2fc0215 100644 --- a/lumina-config/mainUI.cpp +++ b/lumina-config/mainUI.cpp @@ -157,6 +157,8 @@ void MainUI::setupConnections(){ connect(ui->spin_panel2_size, SIGNAL(valueChanged(int)), this, SLOT(panelValChanged()) ); connect(ui->check_panel1_hidepanel, SIGNAL(clicked()), this, SLOT(panelValChanged()) ); connect(ui->check_panel2_hidepanel, SIGNAL(clicked()), this, SLOT(panelValChanged()) ); + connect(ui->check_panel1_usetheme, SIGNAL(clicked()), this, SLOT(panelValChanged()) ); + connect(ui->check_panel2_usetheme, SIGNAL(clicked()), this, SLOT(panelValChanged()) ); connect(ui->tool_panel1_addplugin, SIGNAL(clicked()), this, SLOT(addpanel1plugin()) ); connect(ui->tool_panel1_rmplugin, SIGNAL(clicked()), this, SLOT(rmpanel1plugin()) ); connect(ui->tool_panel1_upplug, SIGNAL(clicked()), this, SLOT(uppanel1plugin()) ); @@ -442,6 +444,7 @@ void MainUI::loadCurrentSettings(bool screenonly){ ui->toolBox_panel1->setVisible(true); ui->spin_panel1_size->setValue( settings->value( PPrefix+"height",30).toInt() ); ui->check_panel1_hidepanel->setChecked( settings->value(PPrefix+"hidepanel", false).toBool() ); + ui->check_panel1_usetheme->setChecked( !settings->value(PPrefix+"customcolor",false).toBool() ); QString loc = settings->value(PPrefix+"location","top").toString().toLower(); if(loc=="top"){ ui->combo_panel1_loc->setCurrentIndex(0); } else if(loc=="bottom"){ ui->combo_panel1_loc->setCurrentIndex(1); } @@ -468,6 +471,7 @@ void MainUI::loadCurrentSettings(bool screenonly){ ui->toolBox_panel1->setVisible(false); //not initially visible ui->spin_panel1_size->setValue(30); ui->check_panel1_hidepanel->setChecked( false ); + ui->check_panel1_usetheme->setChecked( true ); ui->combo_panel1_loc->setCurrentIndex(0); //Top ui->list_panel1_plugins->clear(); ui->label_panel1_sample->setWhatsThis("rgba(255,255,255,160)"); @@ -479,6 +483,7 @@ void MainUI::loadCurrentSettings(bool screenonly){ QString PPrefix = "panel"+QString::number(cdesk)+".1/"; ui->spin_panel2_size->setValue( settings->value( PPrefix+"height",30).toInt() ); ui->check_panel2_hidepanel->setChecked( settings->value(PPrefix+"hidepanel", false).toBool() ); + ui->check_panel2_usetheme->setChecked( !settings->value(PPrefix+"customcolor",false).toBool() ); QString loc = settings->value(PPrefix+"location","top").toString().toLower(); if(loc=="top"){ ui->combo_panel2_loc->setCurrentIndex(0); } else if(loc=="bottom"){ ui->combo_panel2_loc->setCurrentIndex(1); } @@ -504,6 +509,7 @@ void MainUI::loadCurrentSettings(bool screenonly){ ui->toolBox_panel2->setVisible(false); //not initially visible ui->spin_panel2_size->setValue(30); ui->check_panel2_hidepanel->setChecked( false ); + ui->check_panel2_usetheme->setChecked( true ); ui->combo_panel2_loc->setCurrentIndex(1); //Bottom ui->list_panel2_plugins->clear(); ui->label_panel2_sample->setWhatsThis("rgba(255,255,255,160)"); @@ -590,6 +596,7 @@ void MainUI::saveCurrentSettings(bool screenonly){ settings->setValue(PPrefix+"color", ui->label_panel1_sample->whatsThis()); settings->setValue(PPrefix+"height", ui->spin_panel1_size->value()); settings->setValue(PPrefix+"hidepanel", ui->check_panel1_hidepanel->isChecked()); + settings->setValue(PPrefix+"customcolor", !ui->check_panel1_usetheme->isChecked()); int loc = ui->combo_panel1_loc->currentIndex(); if(loc==0){ settings->setValue(PPrefix+"location", "top"); } else if(loc==1){ settings->setValue(PPrefix+"location", "bottom"); } @@ -611,6 +618,7 @@ void MainUI::saveCurrentSettings(bool screenonly){ settings->setValue(PPrefix+"color", ui->label_panel2_sample->whatsThis()); settings->setValue(PPrefix+"height", ui->spin_panel2_size->value()); settings->setValue(PPrefix+"hidepanel", ui->check_panel2_hidepanel->isChecked()); + settings->setValue(PPrefix+"customcolor", !ui->check_panel2_usetheme->isChecked()); int loc = ui->combo_panel2_loc->currentIndex(); if(loc==0){ settings->setValue(PPrefix+"location", "top"); } else if(loc==1){ settings->setValue(PPrefix+"location", "bottom"); } diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui index 7495240a..2622f9c0 100644 --- a/lumina-config/mainUI.ui +++ b/lumina-config/mainUI.ui @@ -10,7 +10,7 @@ <x>0</x> <y>0</y> <width>579</width> - <height>392</height> + <height>405</height> </rect> </property> <property name="windowTitle"> @@ -39,7 +39,16 @@ <string/> </property> <layout class="QHBoxLayout" name="horizontalLayout_2"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -97,7 +106,7 @@ <enum>QFrame::StyledPanel</enum> </property> <property name="currentIndex"> - <number>2</number> + <number>1</number> </property> <widget class="QWidget" name="page_desktop"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -376,7 +385,7 @@ <x>0</x> <y>0</y> <width>265</width> - <height>193</height> + <height>184</height> </rect> </property> <attribute name="label"> @@ -413,14 +422,14 @@ <item row="1" column="1"> <widget class="QSpinBox" name="spin_panel2_size"/> </item> - <item row="2" column="0"> + <item row="4" column="0"> <widget class="QLabel" name="label_9"> <property name="text"> - <string>Color:</string> + <string>Custom Color:</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="4" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_10"> <item> <widget class="QLabel" name="label_panel2_sample"> @@ -450,13 +459,23 @@ </item> </layout> </item> - <item row="3" column="1"> + <item row="2" column="1"> <widget class="QCheckBox" name="check_panel2_hidepanel"> <property name="text"> <string>Auto-hide Panel </string> </property> </widget> </item> + <item row="3" column="1"> + <widget class="QCheckBox" name="check_panel2_usetheme"> + <property name="text"> + <string>Follow Theme</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </widget> <widget class="QWidget" name="page_panel2_plugins"> @@ -464,8 +483,8 @@ <rect> <x>0</x> <y>0</y> - <width>177</width> - <height>106</height> + <width>272</width> + <height>184</height> </rect> </property> <attribute name="label"> @@ -603,7 +622,7 @@ <x>0</x> <y>0</y> <width>266</width> - <height>193</height> + <height>184</height> </rect> </property> <attribute name="label"> @@ -640,14 +659,14 @@ <item row="1" column="1"> <widget class="QSpinBox" name="spin_panel1_size"/> </item> - <item row="2" column="0"> + <item row="4" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> - <string>Color:</string> + <string>Custom Color:</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="4" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_8"> <item> <widget class="QLabel" name="label_panel1_sample"> @@ -677,13 +696,23 @@ </item> </layout> </item> - <item row="3" column="1"> + <item row="2" column="1"> <widget class="QCheckBox" name="check_panel1_hidepanel"> <property name="text"> <string>Auto-hide Panel </string> </property> </widget> </item> + <item row="3" column="1"> + <widget class="QCheckBox" name="check_panel1_usetheme"> + <property name="text"> + <string>Follow Theme</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> </layout> </widget> <widget class="QWidget" name="page_panel1_plugins"> @@ -691,8 +720,8 @@ <rect> <x>0</x> <y>0</y> - <width>177</width> - <height>106</height> + <width>272</width> + <height>184</height> </rect> </property> <attribute name="label"> @@ -1490,8 +1519,8 @@ <rect> <x>0</x> <y>0</y> - <width>118</width> - <height>26</height> + <width>117</width> + <height>16</height> </rect> </property> <property name="sizePolicy"> @@ -1501,7 +1530,16 @@ </sizepolicy> </property> <layout class="QVBoxLayout" name="verticalLayout_13"> - <property name="margin"> + <property name="leftMargin"> + <number>1</number> + </property> + <property name="topMargin"> + <number>1</number> + </property> + <property name="rightMargin"> + <number>1</number> + </property> + <property name="bottomMargin"> <number>1</number> </property> <item> @@ -1598,7 +1636,7 @@ <x>0</x> <y>0</y> <width>579</width> - <height>20</height> + <height>18</height> </rect> </property> </widget> |