x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 2 Activity

Merge pull request #3161 from shocoman/development-6 

Quote image paths in the Dark theme stylesheet
This commit is contained in:
Duncan Ogilvie 2023-08-08 21:45:40 +02:00 committed by GitHub
parent 4802cb008b 6d0656b5b8
commit d162dd1adc
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/Src/Gui/MainWindow.cpp
View File

@ -655,10 +655,11 @@ void MainWindow::loadSelectedTheme(bool reloadOnlyStyleCss)
{ {
auto style = QTextStream(&cssFile).readAll(); auto style = QTextStream(&cssFile).readAll();
cssFile.close(); cssFile.close();
style = style.replace("url(./", QString("url(%1/../themes/%2/").arg(applicationDirPath, selectedTheme));
style = style.replace("url(\"./", QString("url(\"%1/../themes/%2/").arg(applicationDirPath, selectedTheme)); style = style.replace("url(./", QString("url(approot:/themes/%1/").arg(selectedTheme));
style = style.replace("url('./", QString("url('%1/../themes/%2/").arg(applicationDirPath, selectedTheme)); style = style.replace("url(\"./", QString("url(\"approot:/themes/%1/").arg(selectedTheme));
style = style.replace("$RELPATH", QString("%1/../themes/%2").arg(applicationDirPath, selectedTheme)); style = style.replace("url('./", QString("url('approot:/themes/%1/").arg(selectedTheme));
style = style.replace("$RELPATH", QString("approot:/themes/%1").arg(selectedTheme));
qApp->setStyleSheet(style); qApp->setStyleSheet(style);
} }

4
src/gui/Src/main.cpp
View File

@ -8,6 +8,7 @@
#include <QTextStream> #include <QTextStream>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QDebug> #include <QDebug>
#include <QDir>
#include "MiscUtil.h" #include "MiscUtil.h"
MyApplication::MyApplication(int & argc, char** argv) MyApplication::MyApplication(int & argc, char** argv)
@ -181,6 +182,9 @@ int main(int argc, char* argv[])
appPalette.setColor(QPalette::Link, ConfigColor("LinkColor")); appPalette.setColor(QPalette::Link, ConfigColor("LinkColor"));
application.setPalette(appPalette); application.setPalette(appPalette);
// Register a path prefix for the program main directory
QDir::addSearchPath("approot", QApplication::applicationDirPath() + "/..");
// Load the selected theme // Load the selected theme
MainWindow::loadSelectedTheme(true); MainWindow::loadSelectedTheme(true);