From e1cfaf129866b3482bf8650e8993089a834747f0 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 18 Jun 2020 12:34:43 +0200 Subject: [PATCH] Gui: [skip ci] handle case if an absolute path to a qss file is set --- src/Gui/DlgGeneralImp.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Gui/DlgGeneralImp.cpp b/src/Gui/DlgGeneralImp.cpp index d821de9774..1a09a4a411 100644 --- 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); }