diff options
| author | Ken Moore <ken@ixsystems.com> | 2016-11-22 14:16:14 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2016-11-22 14:16:14 -0500 |
| commit | 86fc339b032d454469c966066d9b4ca61f844e30 (patch) | |
| tree | c7f407b4430e83d48af6ada0124ce786afc2052f /src-qt5/core | |
| parent | Fix up the default settings-setting routine to use the new panel/desktop synt... (diff) | |
| download | lumina-86fc339b032d454469c966066d9b4ca61f844e30.tar.gz lumina-86fc339b032d454469c966066d9b4ca61f844e30.tar.bz2 lumina-86fc339b032d454469c966066d9b4ca61f844e30.zip | |
Oops - NOW the desktop/panel settings-reload will work.
Diffstat (limited to 'src-qt5/core')
| -rw-r--r-- | src-qt5/core/libLumina/LDesktopUtils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index 80135ed0..978ce70b 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -271,8 +271,8 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){ // -- DESKTOP SETTINGS -- QString deskID = QApplication::primaryScreen()->name(); //(only works for the primary desktop at the moment) - tmp = sysDefaults.filter("desktop-"+deskID); - if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."+deskID); }//for backwards compat + tmp = sysDefaults.filter("desktop_"); + if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."); }//for backwards compat if(!tmp.isEmpty()){deskset << "[desktop-"+deskID+"]"; } for(int i=0; i<tmp.length(); i++){ if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; } @@ -294,9 +294,9 @@ void LDesktopUtils::LoadSystemDefaults(bool skipOS){ // -- PANEL SETTINGS -- //(only works for the primary desktop at the moment) for(int i=1; i<11; i++){ - QString panvar = "panel_"+deskID+"."+QString::number(i-1); + QString panvar = "panel"+QString::number(i); tmp = sysDefaults.filter(panvar); - if(!tmp.isEmpty()){deskset << "["+panvar+"]"; } + if(!tmp.isEmpty()){deskset << "[panel_"+deskID+"."+QString::number(i-1)+"]"; } for(int i=0; i<tmp.length(); i++){ if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; } QString var = tmp[i].section("=",0,0).toLower().simplified(); |