Gui: [skip ci] handle case if an absolute path to a qss file is set

FreeCAD · Jun 18, 2020 · e1cfaf1 · e1cfaf1
1 parent 87c0365
commit e1cfaf1
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp
@@ -270,6 +270,24 @@ void DlgGeneralImp::loadSettings()
 
     QString selectedStyleSheet = QString::fromLatin1(hGrp->GetASCII("StyleSheet").c_str());
     index = ui->StyleSheets->findData(selectedStyleSheet);
+
+    // might be an absolute path name
+    if (index < 0 && !selectedStyleSheet.isEmpty()) {
+        QFileInfo fi(selectedStyleSheet);
+        if (fi.isAbsolute()) {
+            QString path = fi.absolutePath();
+            if (qssPaths.indexOf(path) >= 0) {
+                selectedStyleSheet = fi.fileName();
+            }
+            else {
+                selectedStyleSheet = fi.absoluteFilePath();
+                ui->StyleSheets->addItem(fi.baseName(), selectedStyleSheet);
+            }
+
+            index = ui->StyleSheets->findData(selectedStyleSheet);
+        }
+    }
+
     if (index > -1) ui->StyleSheets->setCurrentIndex(index);
 }