diff options
author | Ken Moore <ken@ixsystems.com> | 2017-05-01 09:57:21 -0400 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2017-05-01 09:57:21 -0400 |
commit | 5b3c3b9b380326b2b59943f0b5704cd2cac10f07 (patch) | |
tree | c59bd2c5c4466001de5ca9d83d83da9d65601563 | |
parent | Merge branch 'master' of github.com:trueos/lumina (diff) | |
download | lumina-5b3c3b9b380326b2b59943f0b5704cd2cac10f07.tar.gz lumina-5b3c3b9b380326b2b59943f0b5704cd2cac10f07.tar.bz2 lumina-5b3c3b9b380326b2b59943f0b5704cd2cac10f07.zip |
Add the new "generateMediaIcons" setting to lumina-config (Interface->Desktop page).
-rw-r--r-- | src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp | 4 | ||||
-rw-r--r-- | src-qt5/core-utils/lumina-config/pages/page_interface_desktop.ui | 21 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp b/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp index 66fdb9f7..a26ef268 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.cpp @@ -18,6 +18,7 @@ page_interface_desktop::page_interface_desktop(QWidget *parent) : PageWidget(par connect(ui->tool_desktop_addplugin, SIGNAL(clicked()), this, SLOT(deskplugadded()) ); connect(ui->tool_desktop_rmplugin, SIGNAL(clicked()), this, SLOT(deskplugremoved()) ); connect(ui->check_desktop_autolaunchers, SIGNAL(clicked()), this, SLOT(settingChanged()) ); + connect(ui->check_media_icons, SIGNAL(clicked()), this, SLOT(settingChanged()) ); updateIcons(); } @@ -34,6 +35,7 @@ void page_interface_desktop::SaveSettings(){ QString DPrefix = "desktop-"+screenID+"/"; settings.setValue(DPrefix+"generateDesktopIcons", ui->check_desktop_autolaunchers->isChecked() ); + settings.setValue(DPrefix+"generateMediaIcons", ui->check_media_icons->isChecked() ); QStringList plugs; for(int i=0; i<ui->list_desktop_plugins->count(); i++){ plugs << ui->list_desktop_plugins->item(i)->whatsThis(); @@ -56,7 +58,7 @@ void page_interface_desktop::LoadSettings(int screennum){ QString screenID = QApplication::screens().at(cscreen)->name(); QString DPrefix = "desktop-"+screenID+"/"; ui->check_desktop_autolaunchers->setChecked(settings.value(DPrefix+"generateDesktopIcons",false).toBool() ); - + ui->check_media_icons->setChecked(settings.value(DPrefix+"generateMediaIcons",true).toBool() ); QStringList dplugs = settings.value(DPrefix+"pluginlist",QStringList()).toStringList(); ui->list_desktop_plugins->clear(); for(int i=0; i<dplugs.length(); i++){ diff --git a/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.ui b/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.ui index bd209fc4..6385e957 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.ui +++ b/src-qt5/core-utils/lumina-config/pages/page_interface_desktop.ui @@ -72,11 +72,22 @@ </layout> </item> <item> - <widget class="QCheckBox" name="check_desktop_autolaunchers"> - <property name="text"> - <string>Display Desktop Folder Contents</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QCheckBox" name="check_desktop_autolaunchers"> + <property name="text"> + <string>Display Desktop Folder Contents</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="check_media_icons"> + <property name="text"> + <string>Display Removable Media Icons</string> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> |