From 38bc13977863186dde936ac3b07486632907e0d3 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 7 Oct 2014 00:59:03 +0200 Subject: [PATCH] GTK-stylesheet: change name to gtk-lumiera.css the mechanism for configuring and locating this file is just fine and can be retained. Of course, the content of the stylesheet remains to be ported --- data/config/setup.ini | 2 +- src/SConscript | 2 +- src/gui/{lumiera_ui.rc => gtk-lumiera.css} | 0 src/gui/window-manager.cpp | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename src/gui/{lumiera_ui.rc => gtk-lumiera.css} (100%) diff --git a/data/config/setup.ini b/data/config/setup.ini index e836d0287..de89b6820 100644 --- a/data/config/setup.ini +++ b/data/config/setup.ini @@ -18,6 +18,6 @@ authors = Joel Holdsworth|Christian Thäter|Hermann Voßeler|[Other Authors copyright = 2007 - 2013 [Gui] -stylesheet = lumiera_ui.rc +stylesheet = gtk-lumiera.css iconpath = $ORIGIN/../../share/lumiera/icons:$ORIGIN/gui/icons:~/.lumiera/icons resourcepath = $ORIGIN/../../share/lumiera/gui:$ORIGIN/gui diff --git a/src/SConscript b/src/SConscript index ac1424994..4b40db5b5 100644 --- a/src/SConscript +++ b/src/SConscript @@ -43,7 +43,7 @@ envGtk.Append(LIBS=core) guimodule = envGtk.LumieraPlugin('gtk_gui', srcSubtree('gui'), install=True) gui = ( guimodule + icons - + [env.GuiResource(f) for f in env.Glob('gui/*.rc')] + + [env.GuiResource(f) for f in env.Glob('gui/*.css')] ) diff --git a/src/gui/lumiera_ui.rc b/src/gui/gtk-lumiera.css similarity index 100% rename from src/gui/lumiera_ui.rc rename to src/gui/gtk-lumiera.css diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp index 330286e56..1f9a43be7 100644 --- a/src/gui/window-manager.cpp +++ b/src/gui/window-manager.cpp @@ -61,6 +61,7 @@ WindowManager::init (string const& iconPath, string const& resourcePath) void WindowManager::setTheme (string const& stylesheetName) { + //////////////////////////////////////////////////////////////////////////////////////////TICKET #937 : load here the CSS for GTK3 gtk_rc_parse (cStr(lib::resolveModulePath (stylesheetName, resourceSerachPath_))); gtk_rc_reset_styles (gtk_settings_get_default()); }