diff options
| -rw-r--r-- | libLumina/LuminaUtils.cpp | 6 | ||||
| -rw-r--r-- | lumina-config/mainUI.cpp | 25 | ||||
| -rw-r--r-- | lumina-config/mainUI.ui | 15 |
3 files changed, 31 insertions, 15 deletions
diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp index b569782e..89dc72a4 100644 --- a/libLumina/LuminaUtils.cpp +++ b/libLumina/LuminaUtils.cpp @@ -203,7 +203,13 @@ QStringList LUtils::listFavorites(){ if(lastRead.isNull() || lastRead<QFileInfo(QDir::homePath()+"/.lumina/favorites/fav.list").lastModified()){ fav = LUtils::readFile(QDir::homePath()+"/.lumina/favorites/fav.list"); lastRead = cur; + if(fav.isEmpty()){ + //Make sure the favorites dir exists, and create it if necessary + QDir dir(QDir::homePath()+"/.lumina/favorites"); + if(!dir.exists()){ dir.mkpath(QDir::homePath()+"/.lumina/favorites"); } + } } + return fav; } diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp index ddc62842..dac7f4f0 100644 --- a/lumina-config/mainUI.cpp +++ b/lumina-config/mainUI.cpp @@ -161,7 +161,8 @@ void MainUI::setupConnections(){ connect(ui->tool_desk_addbgcolor, SIGNAL(clicked()), this, SLOT(deskbgcoloradded()) ); connect(ui->tool_desk_rmbg, SIGNAL(clicked()), this, SLOT(deskbgremoved()) ); connect(ui->spin_desk_min, SIGNAL(valueChanged(int)), this, SLOT(desktimechanged()) ); - + connect(ui->check_desktop_autolaunchers, SIGNAL(clicked()), this, SLOT(desktimechanged()) ); //just need to poke the save routines + //Panels Page connect(ui->tool_panel1_add,SIGNAL(clicked()), this, SLOT(addpanel1()) ); connect(ui->tool_panel2_add,SIGNAL(clicked()), this, SLOT(addpanel2()) ); @@ -510,6 +511,7 @@ void MainUI::loadCurrentSettings(bool screenonly){ else if(bgs[i].startsWith("rgb(")){ui->combo_desk_bg->addItem(QString(tr("Solid Color: %1")).arg(bgs[i]), bgs[i]); } else{ ui->combo_desk_bg->addItem( QIcon(bgs[i]), bgs[i].section("/",-1), bgs[i] ); } } + ui->check_desktop_autolaunchers->setChecked(settings->value(DPrefix+"generateDesktopIcons", false).toBool()); ui->radio_desk_multi->setEnabled(bgs.length()>1); if(bgs.length()>1){ ui->radio_desk_multi->setChecked(true);} else{ ui->radio_desk_single->setChecked(true); } @@ -687,18 +689,19 @@ void MainUI::saveCurrentSettings(bool screenonly){ // Desktop Page if(moddesk){ - QStringList bgs; //get the list of backgrounds to use - if(ui->radio_desk_multi->isChecked()){ - for(int i=0; i<ui->combo_desk_bg->count(); i++){ - bgs << ui->combo_desk_bg->itemData(i).toString(); - } - }else if(ui->combo_desk_bg->count() > 0){ + QStringList bgs; //get the list of backgrounds to use + if(ui->radio_desk_multi->isChecked()){ + for(int i=0; i<ui->combo_desk_bg->count(); i++){ + bgs << ui->combo_desk_bg->itemData(i).toString(); + } + }else if(ui->combo_desk_bg->count() > 0){ bgs << ui->combo_desk_bg->itemData( ui->combo_desk_bg->currentIndex() ).toString(); bgs.removeAll("default"); - } - if(bgs.isEmpty()){ bgs << "default"; } //Make sure to always fall back on the default - settings->setValue(DPrefix+"background/filelist", bgs); - settings->setValue(DPrefix+"background/minutesToChange", ui->spin_desk_min->value()); + } + if(bgs.isEmpty()){ bgs << "default"; } //Make sure to always fall back on the default + settings->setValue(DPrefix+"background/filelist", bgs); + settings->setValue(DPrefix+"background/minutesToChange", ui->spin_desk_min->value()); + settings->setValue(DPrefix+"generateDesktopIcons", ui->check_desktop_autolaunchers->isChecked()); } // Panels Page diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui index ea91e3e6..4be021d8 100644 --- a/lumina-config/mainUI.ui +++ b/lumina-config/mainUI.ui @@ -109,7 +109,7 @@ <enum>QFrame::StyledPanel</enum> </property> <property name="currentIndex"> - <number>0</number> + <number>1</number> </property> <widget class="QWidget" name="page_desktop"> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -508,6 +508,13 @@ </layout> </item> <item> + <widget class="QCheckBox" name="check_desktop_autolaunchers"> + <property name="text"> + <string>Auto-Create Desktop Shortcuts</string> + </property> + </widget> + </item> + <item> <widget class="QLabel" name="label_23"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -609,7 +616,7 @@ <rect> <x>0</x> <y>0</y> - <width>238</width> + <width>249</width> <height>215</height> </rect> </property> @@ -843,7 +850,7 @@ <rect> <x>0</x> <y>0</y> - <width>238</width> + <width>249</width> <height>209</height> </rect> </property> @@ -1876,7 +1883,7 @@ <x>0</x> <y>0</y> <width>129</width> - <height>28</height> + <height>16</height> </rect> </property> <property name="sizePolicy"> |