ui: Fixed gui_paths in css subtracted with RessourcePaths::getGuiPath()

This commit is contained in:
Eberhard Graether
2016-02-01 14:14:54 +01:00
parent ead0abfba2
commit 5aa1add617
2 changed files with 12 additions and 7 deletions
+6 -6
View File
@@ -108,25 +108,25 @@
}
#code_file #maximize_button {
border-image: url(data/gui/code_view/images/maximize_inactive.png);
border-image: url(<setting:gui_path>code_view/images/maximize_inactive.png);
}
#code_file #maximize_button:enabled {
border-image: url(data/gui/code_view/images/maximize_active.png);
border-image: url(<setting:gui_path>code_view/images/maximize_active.png);
}
#code_file #snippet_button {
border-image: url(data/gui/code_view/images/snippet_inactive.png);
border-image: url(<setting:gui_path>code_view/images/snippet_inactive.png);
}
#code_file #snippet_button:enabled {
border-image: url(data/gui/code_view/images/snippet_active.png);
border-image: url(<setting:gui_path>code_view/images/snippet_active.png);
}
#code_file #minimize_button {
border-image: url(data/gui/code_view/images/minimize_inactive.png);
border-image: url(<setting:gui_path>code_view/images/minimize_inactive.png);
}
#code_file #minimize_button:enabled {
border-image: url(data/gui/code_view/images/minimize_active.png);
border-image: url(<setting:gui_path>code_view/images/minimize_active.png);
}
+6 -1
View File
@@ -8,8 +8,9 @@
#include "utility/file/FileSystem.h"
#include "utility/logging/logging.h"
#include "utility/utilityString.h"
#include "utility/ResourcePaths.h"
#include "utility/text/TextAccess.h"
#include "utility/utilityString.h"
#include "settings/ApplicationSettings.h"
#include "settings/ColorScheme.h"
@@ -98,6 +99,10 @@ namespace utility
{
val = ApplicationSettings::getInstance()->getFontName();
}
else if (val == "gui_path")
{
val = ResourcePaths::getGuiPath();
}
else
{
LOG_ERROR("Syntax error in file: " + path);