diff options
| -rw-r--r-- | lumina-config/mainUI.cpp | 23 | ||||
| -rw-r--r-- | lumina-config/mainUI.ui | 150 |
2 files changed, 135 insertions, 38 deletions
diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp index afabfbf7..d6e90ecd 100644 --- a/lumina-config/mainUI.cpp +++ b/lumina-config/mainUI.cpp @@ -171,8 +171,12 @@ void MainUI::setupConnections(){ connect(ui->toolBox_panel2, SIGNAL(currentChanged(int)), this, SLOT(adjustpanel1()) ); connect(ui->combo_panel1_loc, SIGNAL(currentIndexChanged(int)), this, SLOT(adjustpanel2()) ); connect(ui->combo_panel2_loc, SIGNAL(currentIndexChanged(int)), this, SLOT(adjustpanel1()) ); + connect(ui->combo_panel1_align, SIGNAL(currentIndexChanged(int)), this, SLOT(panelValChanged()) ); + connect(ui->combo_panel2_align, SIGNAL(currentIndexChanged(int)), this, SLOT(panelValChanged()) ); connect(ui->spin_panel1_size, SIGNAL(valueChanged(int)), this, SLOT(panelValChanged()) ); connect(ui->spin_panel2_size, SIGNAL(valueChanged(int)), this, SLOT(panelValChanged()) ); + connect(ui->spin_panel1_length, SIGNAL(valueChanged(int)), this, SLOT(panelValChanged()) ); + connect(ui->spin_panel2_length, 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()) ); @@ -258,6 +262,11 @@ void MainUI::setupMenus(){ QStringList loc; loc << tr("Top") << tr("Bottom") << tr("Left") << tr("Right"); ui->combo_panel1_loc->addItems(loc); ui->combo_panel2_loc->addItems(loc); + ui->combo_panel1_align->clear(); ui->combo_panel2_align->clear(); + ui->combo_panel1_align->addItem(tr("Center"),"center"); ui->combo_panel2_align->addItem(tr("Center"),"center"); + ui->combo_panel1_align->addItem(tr("Top/Left"),"left"); ui->combo_panel2_align->addItem(tr("Top/Left"),"left"); + ui->combo_panel1_align->addItem(tr("Bottom/Right"),"right"); ui->combo_panel2_align->addItem(tr("Bottom/Right"),"right"); + //Session window manager settings ui->combo_session_wfocus->clear(); @@ -505,6 +514,7 @@ void MainUI::loadCurrentSettings(bool screenonly){ QString PPrefix = "panel"+QString::number(cdesk)+".0/"; ui->toolBox_panel1->setVisible(true); ui->spin_panel1_size->setValue( settings->value( PPrefix+"height",30).toInt() ); + ui->spin_panel1_length->setValue( settings->value( PPrefix+"lengthPercent",100).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(); @@ -512,6 +522,8 @@ void MainUI::loadCurrentSettings(bool screenonly){ else if(loc=="bottom"){ ui->combo_panel1_loc->setCurrentIndex(1); } else if(loc=="left"){ ui->combo_panel1_loc->setCurrentIndex(2); } else{ ui->combo_panel1_loc->setCurrentIndex(3); } //right + int aindex = ui->combo_panel1_align->findData(settings->value(PPrefix+"pinLocation","center").toString().toLower()); + if(aindex>=0){ ui->combo_panel1_align->setCurrentIndex(aindex); } QStringList plugs = settings->value(PPrefix+"pluginlist", QStringList()).toStringList(); if(plugs.isEmpty() && primary){ plugs << "userbutton" << "taskmanager" << "systemtray" << "clock" << "systemdashboard"; } ui->list_panel1_plugins->clear(); @@ -542,9 +554,11 @@ void MainUI::loadCurrentSettings(bool screenonly){ //Panel 1 defaults ui->toolBox_panel1->setVisible(false); //not initially visible ui->spin_panel1_size->setValue(30); + ui->spin_panel1_length->setValue(100); ui->check_panel1_hidepanel->setChecked( false ); ui->check_panel1_usetheme->setChecked( true ); ui->combo_panel1_loc->setCurrentIndex(0); //Top + ui->combo_panel1_align->setCurrentIndex(0); //Center ui->list_panel1_plugins->clear(); ui->label_panel1_sample->setWhatsThis("rgba(255,255,255,160)"); ui->label_panel1_sample->setStyleSheet("background: rgba(255,255,255,160)"); @@ -554,6 +568,7 @@ void MainUI::loadCurrentSettings(bool screenonly){ ui->toolBox_panel2->setVisible(true); QString PPrefix = "panel"+QString::number(cdesk)+".1/"; ui->spin_panel2_size->setValue( settings->value( PPrefix+"height",30).toInt() ); + ui->spin_panel2_length->setValue( settings->value( PPrefix+"lengthPercent",100).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(); @@ -561,6 +576,8 @@ void MainUI::loadCurrentSettings(bool screenonly){ else if(loc=="bottom"){ ui->combo_panel2_loc->setCurrentIndex(1); } else if(loc=="left"){ ui->combo_panel2_loc->setCurrentIndex(2); } else{ ui->combo_panel2_loc->setCurrentIndex(3); } //right + int aindex = ui->combo_panel2_align->findData(settings->value(PPrefix+"pinLocation","center").toString().toLower()); + if(aindex>=0){ ui->combo_panel2_align->setCurrentIndex(aindex); } QStringList plugs = settings->value(PPrefix+"pluginlist", QStringList()).toStringList(); ui->list_panel2_plugins->clear(); for(int i=0; i<plugs.length(); i++){ @@ -590,9 +607,11 @@ void MainUI::loadCurrentSettings(bool screenonly){ //Panel 2 defaults ui->toolBox_panel2->setVisible(false); //not initially visible ui->spin_panel2_size->setValue(30); + ui->spin_panel2_length->setValue(100); ui->check_panel2_hidepanel->setChecked( false ); ui->check_panel2_usetheme->setChecked( true ); ui->combo_panel2_loc->setCurrentIndex(1); //Bottom + ui->combo_panel2_align->setCurrentIndex(0); //Center ui->list_panel2_plugins->clear(); ui->label_panel2_sample->setWhatsThis("rgba(255,255,255,160)"); ui->label_panel2_sample->setStyleSheet("background: rgba(255,255,255,160)"); @@ -677,6 +696,7 @@ void MainUI::saveCurrentSettings(bool screenonly){ QString PPrefix = "panel"+QString::number(currentDesktop())+".0/"; settings->setValue(PPrefix+"color", ui->label_panel1_sample->whatsThis()); settings->setValue(PPrefix+"height", ui->spin_panel1_size->value()); + settings->setValue(PPrefix+"lengthPercent", ui->spin_panel1_length->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(); @@ -684,6 +704,7 @@ void MainUI::saveCurrentSettings(bool screenonly){ else if(loc==1){ settings->setValue(PPrefix+"location", "bottom"); } else if(loc==2){ settings->setValue(PPrefix+"location", "left"); } else{ settings->setValue(PPrefix+"location", "right"); } + settings->setValue(PPrefix+"pinLocation", ui->combo_panel1_align->currentData().toString()); QStringList plugs; for(int i=0; i<ui->list_panel1_plugins->count(); i++){ plugs << ui->list_panel1_plugins->item(i)->whatsThis(); @@ -699,6 +720,7 @@ void MainUI::saveCurrentSettings(bool screenonly){ QString PPrefix = "panel"+QString::number(currentDesktop())+".1/"; settings->setValue(PPrefix+"color", ui->label_panel2_sample->whatsThis()); settings->setValue(PPrefix+"height", ui->spin_panel2_size->value()); + settings->setValue(PPrefix+"lengthPercent", ui->spin_panel2_length->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(); @@ -706,6 +728,7 @@ void MainUI::saveCurrentSettings(bool screenonly){ else if(loc==1){ settings->setValue(PPrefix+"location", "bottom"); } else if(loc==2){ settings->setValue(PPrefix+"location", "left"); } else{ settings->setValue(PPrefix+"location", "right"); } + settings->setValue(PPrefix+"pinLocation", ui->combo_panel2_align->currentData().toString()); QStringList plugs; for(int i=0; i<ui->list_panel2_plugins->count(); i++){ plugs << ui->list_panel2_plugins->item(i)->whatsThis(); diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui index 6061cae4..791165d7 100644 --- a/lumina-config/mainUI.ui +++ b/lumina-config/mainUI.ui @@ -109,7 +109,7 @@ <enum>QFrame::StyledPanel</enum> </property> <property name="currentIndex"> - <number>4</number> + <number>1</number> </property> <widget class="QWidget" name="page_desktop"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -374,7 +374,7 @@ <item> <widget class="QTabWidget" name="tabWidget_panels"> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="tab_desktopInterface"> <attribute name="title"> @@ -602,8 +602,8 @@ <rect> <x>0</x> <y>0</y> - <width>263</width> - <height>178</height> + <width>249</width> + <height>215</height> </rect> </property> <attribute name="label"> @@ -630,24 +630,14 @@ </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Size:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="spin_panel1_size"/> - </item> - <item row="4" column="0"> + <item row="6" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> <string>Custom Color:</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="6" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_8"> <item> <widget class="QLabel" name="label_panel1_sample"> @@ -677,14 +667,14 @@ </item> </layout> </item> - <item row="2" column="1"> + <item row="4" 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"> + <item row="5" column="1"> <widget class="QCheckBox" name="check_panel1_usetheme"> <property name="text"> <string>Follow Theme</string> @@ -694,6 +684,53 @@ </property> </widget> </item> + <item row="2" column="1"> + <layout class="QVBoxLayout" name="verticalLayout_11"> + <item> + <widget class="QSpinBox" name="spin_panel1_size"> + <property name="suffix"> + <string> pixels thick</string> + </property> + <property name="maximum"> + <number>500</number> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="spin_panel1_length"> + <property name="suffix"> + <string>% length</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>100</number> + </property> + </widget> + </item> + </layout> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Size:</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_30"> + <property name="text"> + <string>Alignment:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QComboBox" name="combo_panel1_align"/> + </item> </layout> </widget> <widget class="QWidget" name="page_panel1_plugins"> @@ -701,7 +738,7 @@ <rect> <x>0</x> <y>0</y> - <width>198</width> + <width>197</width> <height>117</height> </rect> </property> @@ -799,8 +836,8 @@ <rect> <x>0</x> <y>0</y> - <width>263</width> - <height>178</height> + <width>249</width> + <height>209</height> </rect> </property> <attribute name="label"> @@ -827,24 +864,14 @@ </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Size:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QSpinBox" name="spin_panel2_size"/> - </item> - <item row="4" column="0"> + <item row="5" column="0"> <widget class="QLabel" name="label_9"> <property name="text"> <string>Custom Color:</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="5" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_10"> <item> <widget class="QLabel" name="label_panel2_sample"> @@ -874,14 +901,14 @@ </item> </layout> </item> - <item row="2" column="1"> + <item row="3" 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"> + <item row="4" column="1"> <widget class="QCheckBox" name="check_panel2_usetheme"> <property name="text"> <string>Follow Theme</string> @@ -891,6 +918,53 @@ </property> </widget> </item> + <item row="1" column="1"> + <layout class="QVBoxLayout" name="verticalLayout_20"> + <item> + <widget class="QSpinBox" name="spin_panel2_size"> + <property name="suffix"> + <string> pixels thick</string> + </property> + <property name="maximum"> + <number>500</number> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="spin_panel2_length"> + <property name="suffix"> + <string>% length</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>100</number> + </property> + </widget> + </item> + </layout> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Size:</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_31"> + <property name="text"> + <string>Alignment:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="combo_panel2_align"/> + </item> </layout> </widget> <widget class="QWidget" name="page_panel2_plugins"> @@ -898,7 +972,7 @@ <rect> <x>0</x> <y>0</y> - <width>198</width> + <width>197</width> <height>117</height> </rect> </property> @@ -1801,8 +1875,8 @@ <rect> <x>0</x> <y>0</y> - <width>510</width> - <height>107</height> + <width>129</width> + <height>16</height> </rect> </property> <property name="sizePolicy"> |