From 8b5870229d9d1107453fce96218574ec28974060 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 4 May 2016 09:32:09 +0200 Subject: make CSD support available to forked processes just make CSD CSS rules global (mga#18332) --- perl-install/install/NEWS | 2 ++ perl-install/install/gtk.pm | 6 +++++- perl-install/install/share/gtk.css | 6 ++++++ perl-install/install/share/list.xml | 6 ++++++ perl-install/share/themes-galaxy.css | 5 ----- 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 perl-install/install/share/gtk.css diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b074a7bc8..a8188bf9d 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- make CSD support available to forked processes (mga#18332) + Version 17.28 - 26 April 2016 - adapt to new brltty diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index c83b8e6a7..686e31e2f 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -83,7 +83,6 @@ sub load_font { $pl->load_from_data("GtkWindow { font: $font }"); Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION); # FIXME: this should be done in /mnt too for forked app such as gurpmi{,.addmedia} (mga#67): - mkdir_p("/.config/gtk-3.0"); output("/.config/gtk-3.0/settings.ini", qq([Settings] $s )); @@ -195,6 +194,11 @@ sub init_gtk { symlink("/tmp/stage2/etc/$_", "/etc/$_") foreach qw(gtk-3.0 pango fonts); + # Custom _global_ CSS: + mkdir_p("/.config/gtk-3.0"); # TODO/FIXME: set ENV{HOME} ? + # FIXME: this should be done in /mnt too for forked app such as gurpmi{,.addmedia} (mga#67): + symlinkf('/usr/lib/libDrakX/gtk.css', '/.config/gtk-3.0/gtk.css'); + if ($o->{vga16}) { #- inactivate antialias in VGA16 because it makes fonts look worse output('/tmp/fonts.conf', diff --git a/perl-install/install/share/gtk.css b/perl-install/install/share/gtk.css new file mode 100644 index 000000000..71690dfcc --- /dev/null +++ b/perl-install/install/share/gtk.css @@ -0,0 +1,6 @@ +/* CSD for windows: */ +window, .window-frame { + border: solid 1px alpha(black, 0.75); + padding: 20px; +} + diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 31b470d2c..617f360f4 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -643,6 +643,12 @@ dbus-uuidgen > share/machine-id; echo machine-id + + + + gtk.css + + diff --git a/perl-install/share/themes-galaxy.css b/perl-install/share/themes-galaxy.css index 4e9658796..6540b30c8 100644 --- a/perl-install/share/themes-galaxy.css +++ b/perl-install/share/themes-galaxy.css @@ -29,8 +29,3 @@ background-color: #2859B5; color: #FFD200; } - -window, .window-frame { - border: solid 1px alpha(black, 0.75); - padding: 20px; -} -- cgit v1.2.1