Merge remote-tracking branch 'origin/master'

3 files changed, 12 insertions, 6 deletions

diff --git a/src-qt5/core-utils/lumina-config/PanelWidget.cpp b/src-qt5/core-utils/lumina-config/PanelWidget.cpp
index 8b38f407..aff7bda3 100644
--- a/src-qt5/core-utils/lumina-config/PanelWidget.cpp
+++ b/src-qt5/core-utils/lumina-config/PanelWidget.cpp
@@ -42,7 +42,8 @@ PanelWidget::~PanelWidget(){
 void PanelWidget::LoadSettings(QSettings *settings, int Dnum, int Pnum){
   pnum = Pnum; dnum = Dnum; //save these for later
   ui->label->setText( QString(tr("Panel %1")).arg(QString::number(Pnum+1) ) );
-  QString prefix = "panel"+QString::number(Dnum)+"."+QString::number(Pnum)+"/";
+  QString screenID = QApplication::screens().at(Dnum)->name();
+  QString prefix = "panel_"+screenID+"."+QString::number(Pnum)+"/";
   qDebug() << "Loading Panel Settings:" << prefix;
   //Now load the settings into the GUI
   int tmp = ui->combo_align->findData( settings->value(prefix+"pinLocation","center").toString().toLower() );
@@ -78,7 +79,8 @@ void PanelWidget::LoadSettings(QSettings *settings, int Dnum, int Pnum){
 }
 
 void PanelWidget::SaveSettings(QSettings *settings){//save the current settings
-  QString prefix = "panel"+QString::number(dnum)+"."+QString::number(pnum)+"/";
+  QString screenID = QApplication::screens().at(dnum)->name();
+  QString prefix = "panel_"+screenID+"."+QString::number(pnum)+"/";
   qDebug() << "Saving panel settings:" << prefix;
   settings->setValue(prefix+"location", ui->combo_edge->currentData().toString() );
   settings->setValue(prefix+"pinLocation", ui->combo_align->currentData().toString() );
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 fdcde804..f467db36 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
@@ -31,7 +31,8 @@ page_interface_desktop::~page_interface_desktop(){
 //================
 void page_interface_desktop::SaveSettings(){
   QSettings settings("lumina-desktop","desktopsettings");
-  QString DPrefix = "desktop-"+QString::number(cscreen)+"/";
+  QString screenID = QApplication::screens().at(cscreen)->name();
+  QString DPrefix = "desktop-"+screenID+"/";
 
   settings.setValue(DPrefix+"generateDesktopIcons", ui->check_desktop_autolaunchers->isChecked() );
   QStringList plugs;
@@ -53,7 +54,8 @@ void page_interface_desktop::LoadSettings(int screennum){
   emit HasPendingChanges(false);
   emit ChangePageTitle( tr("Desktop Settings") );
   QSettings settings("lumina-desktop","desktopsettings");
-  QString DPrefix = "desktop-"+QString::number(cscreen)+"/";
+  QString screenID = QApplication::screens().at(cscreen)->name();
+  QString DPrefix = "desktop-"+screenID+"/";
   ui->check_desktop_autolaunchers->setChecked(settings.value(DPrefix+"generateDesktopIcons",false).toBool() );
 
   QStringList dplugs = settings.value(DPrefix+"pluginlist",QStringList()).toStringList();
diff --git a/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp b/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp
index 0e486bdd..7d0d3d8c 100644
--- a/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp
+++ b/src-qt5/core-utils/lumina-config/pages/page_interface_panels.cpp
@@ -30,7 +30,8 @@ page_interface_panels::~page_interface_panels(){
 //    PUBLIC SLOTS
 //================
 void page_interface_panels::SaveSettings(){
-  QString DPrefix = "desktop-"+QString::number(cscreen)+"/";
+  QString screenID = QApplication::screens().at(cscreen)->name();
+  QString DPrefix = "desktop-"+screenID+"/";
   settings->setValue(DPrefix+"panels", PANELS.length());
   for(int i=0; i<PANELS.length(); i++){
     PANELS[i]->SaveSettings(settings);
@@ -48,7 +49,8 @@ void page_interface_panels::LoadSettings(int screennum){
   loading = true;
   emit HasPendingChanges(false);
   emit ChangePageTitle( tr("Desktop Settings") );
-  QString DPrefix = "desktop-"+QString::number(cscreen)+"/";
+  QString screenID = QApplication::screens().at(cscreen)->name();
+  QString DPrefix = "desktop-"+screenID+"/";
   int panelnumber = settings->value(DPrefix+"panels",-1).toInt();
   
 //First clean any current panels