Rename GResources for standard GTK themes

After commit 2ab9be54fb we had to rename
the generated CSS files to be included into the GResource bundle; we
kept the URI stable to avoid too much churn, and allow backporting the
change to the 3.24 stable branch. This had the adverse effect of making
it harder to debug issues, as the on-disk file name does not match the
location in the GResource that will be used to print out warnings,
errors, and debugging messages.
This commit is contained in:
Emmanuele Bassi 2020-03-27 15:20:59 +00:00
parent c3c06e60dc
commit f1003d6ae8
5 changed files with 8 additions and 8 deletions

View File

@ -20,8 +20,8 @@ xml += '''
<file>theme/Empty/gtk.css</file>
<file>theme/Adwaita/gtk.css</file>
<file>theme/Adwaita/gtk-dark.css</file>
<file alias='theme/Adwaita/gtk-contained.css'>theme/Adwaita/Adwaita.css</file>
<file alias='theme/Adwaita/gtk-contained-dark.css'>theme/Adwaita/Adwaita-dark.css</file>
<file>theme/Adwaita/Adwaita.css</file>
<file>theme/Adwaita/Adwaita-dark.css</file>
'''
for f in get_files('theme/Adwaita/assets', '.png'):
@ -35,8 +35,8 @@ for f in get_files('theme/Adwaita/assets', '.svg'):
xml += '''
<file>theme/HighContrast/gtk.css</file>
<file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>
<file alias='theme/HighContrast/gtk-contained.css'>theme/HighContrast/HighContrast.css</file>
<file alias='theme/HighContrast/gtk-contained-inverse.css'>theme/HighContrast/HighContrast-inverse.css</file>
<file>theme/HighContrast/HighContrast.css</file>
<file>theme/HighContrast/HighContrast-inverse.css</file>
'''
for f in get_files('theme/HighContrast/assets', '.png'):

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained-dark.css");
@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-dark.css");

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained.css");
@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita.css");

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained-inverse.css");
@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-inverse.css");

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained.css");
@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast.css");