diff options
| author | Ken Moore <ken@ixsystems.com> | 2016-11-22 14:08:52 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2016-11-22 14:08:52 -0500 |
| commit | 1b7f0d30506c1c9ff39acbe8cd6e6403a02ae5f2 (patch) | |
| tree | 6c7fa554f55b099d349bd30304ead92b6d2a51c6 /src-qt5/core/libLumina/LDesktopUtils.cpp | |
| parent | Add a shortcut for opening the wallpaper settings within the "preferences" menu. (diff) | |
| download | lumina-1b7f0d30506c1c9ff39acbe8cd6e6403a02ae5f2.tar.gz lumina-1b7f0d30506c1c9ff39acbe8cd6e6403a02ae5f2.tar.bz2 lumina-1b7f0d30506c1c9ff39acbe8cd6e6403a02ae5f2.zip | |
Fix up the default settings-setting routine to use the new panel/desktop syntax when setting the default configuration for the primary monitor.
Diffstat (limited to 'src-qt5/core/libLumina/LDesktopUtils.cpp')
| -rw-r--r-- | src-qt5/core/libLumina/LDesktopUtils.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src-qt5/core/libLumina/LDesktopUtils.cpp b/src-qt5/core/libLumina/LDesktopUtils.cpp index 2797c8ca..80135ed0 100644 --- a/src-qt5/core/libLumina/LDesktopUtils.cpp +++ b/src-qt5/core/libLumina/LDesktopUtils.cpp @@ -269,10 +269,11 @@ 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_"); - if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."); }//for backwards compat - if(!tmp.isEmpty()){deskset << "[desktop-"+screen+"]"; } + tmp = sysDefaults.filter("desktop-"+deskID); + if(tmp.isEmpty()){ tmp = sysDefaults.filter("desktop."+deskID); }//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; } QString var = tmp[i].section("=",0,0).toLower().simplified(); @@ -293,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"+QString::number(i); + QString panvar = "panel_"+deskID+"."+QString::number(i-1); tmp = sysDefaults.filter(panvar); - if(!tmp.isEmpty()){deskset << "[panel"+screen+"."+QString::number(i-1)+"]"; } + if(!tmp.isEmpty()){deskset << "["+panvar+"]"; } 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(); |