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

Add extra logic for overriding default images

This commit is contained in:
Duncan Ogilvie 2022-07-10 20:31:34 +02:00
parent 3d949b9847
commit ed5adb909c
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,7 +537,52 @@ void MainWindow::loadSelectedTheme(bool reloadOnlyStyleCss)
QString settingsPath;
if(*selectedTheme)
{
QIcon::setThemeName(selectedTheme);
// Handle the icon theme
QStringList searchPaths = { ":/" };
if(strcmp(selectedTheme, "Default") == 0)
{
// The Default theme needs some special handling to allow overriding
auto overrideDir = QCoreApplication::applicationDirPath() + "/../themes/Default";
if(QDir(overrideDir).exists("index.theme"))
{
/*
HACK: for some reason this allows you to override icons from the themes/Default folder.
You need themes/Default/index.theme and then you can put images in themes/Default/icons:
[Icon Theme]
Name=DefaultOverride
Comment=Default icon theme override
Directories=icons
Inherits=Default
[icons]
Size=16
Type=Scalable
*/
searchPaths << overrideDir;
QIcon::setThemeName("DefaultOverride");
}
else
{
QIcon::setThemeName("Default");
}
QIcon::setThemeSearchPaths(searchPaths);
}
else
{
auto themesDir = QCoreApplication::applicationDirPath() + "/../themes";
if(QDir(themesDir).exists(QString("%1/index.theme").arg(selectedTheme)))
{
searchPaths << themesDir;
QIcon::setThemeName(selectedTheme);
}
else
{
// If there is no icon theme, use the default icons
QIcon::setThemeName("Default");
}
QIcon::setThemeSearchPaths(searchPaths);
}
QString themePath = QString("%1/../themes/%2/style.css").arg(QCoreApplication::applicationDirPath()).arg(selectedTheme);
if(QFile(themePath).exists())

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

@ -182,9 +182,6 @@ int main(int argc, char* argv[])
application.setPalette(appPalette);
// Load the selected style
// For unclear reasons it looks like the search path order is inverted.
// This might be specific to Qt 5.6 and only matters when you override the "Default" theme
QIcon::setThemeSearchPaths({ ":/", QCoreApplication::applicationDirPath() + "/../themes" });
MainWindow::loadSelectedTheme();
// Register custom data types