On Tue, 2014-11-18 at 14:31 -0500, David Shea wrote:
[ Still approaching a complete solution. This version removes the
taskbar
icon from fedora-welcome. ]
Thanks to Matthias Clasen for fixing the icon. Remove the hardcoded text
color from the icon labels and use a named icon for "Install to Hard
Drive" instead of a full path.
Solve the problem of themeing the fedora-welcome launcher icon by
removing the launcher icon. This program is not user-launchable so
there's no reason to display a fedora logo for it.
---
data/liveinst/gnome/fedora-welcome | 11 +++++------
data/liveinst/gnome/fedora-welcome.desktop.in | 1 -
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome b/data/liveinst/gnome/fedora-welcome
index 973a3ab..c4834e7 100755
--- a/data/liveinst/gnome/fedora-welcome
+++ b/data/liveinst/gnome/fedora-welcome
@@ -40,14 +40,14 @@ function makeLabel(label, button) {
let widget = new Gtk.Label();
if (button)
- widget.set_markup('<b><span size="x-large"
color="white">' + label + '</span></b>');
+ widget.set_markup('<b><span size="x-large">' +
label + '</span></b>');
else {
widget.set_line_wrap(true);
widget.set_justify(Gtk.Justification.CENTER);
widget.set_margin_top(32);
widget.set_margin_bottom(32);
- widget.set_markup('<span size="large"
color="white">' + label + '</span>');
+ widget.set_markup('<span size="large">' + label +
'</span>');
}
return widget;
@@ -61,6 +61,7 @@ const WelcomeWindow = new Lang.Class({
type: Gtk.WindowType.TOPLEVEL,
default_width: 600,
default_height: 550,
+ skip_taskbar_hint: true,
title: _("Welcome to
Fedora"),
window_position:
Gtk.WindowPosition.CENTER });
this.window.connect('key-press-event', Lang.bind(this,
@@ -99,10 +100,8 @@ const WelcomeWindow = new Lang.Class({
spacing: 16 });
// provided by the 'fedora-logos' package
- let pix = GdkPixbuf.Pixbuf.new_from_file_at_size(
- '/usr/share/icons/Fedora/scalable/apps/anaconda.svg',
- 256, 256);
- installContent.add(new Gtk.Image({ pixbuf: pix }));
+ installContent.add(new Gtk.Image({ icon_name: 'anaconda',
+ pixel_size: 256 }));
installContent.add(makeLabel(anacondaApp.get_name(), true));
let installButton = new Gtk.Button({ child: installContent });
diff --git a/data/liveinst/gnome/fedora-welcome.desktop.in
b/data/liveinst/gnome/fedora-welcome.desktop.in
index bac0e0a..aebaf50 100644
--- a/data/liveinst/gnome/fedora-welcome.desktop.in
+++ b/data/liveinst/gnome/fedora-welcome.desktop.in
@@ -1,7 +1,6 @@
[Desktop Entry]
_Name=Welcome to Fedora
Exec=/usr/share/anaconda/gnome/fedora-welcome
-Icon=/usr/share/icons/Fedora/256x256/places/start-here.png
Terminal=false
Type=Application
StartupNotify=true
Still looks good to me.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic