From 9e0db7ed33f0cbae375d8652d68077e214999630 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Nov 12 2008 22:56:21 +0000 Subject: - Include icon in anaconda keyboard selection screen (#469165) - Remove extension from desktop entry icon --- diff --git a/system-config-keyboard-1.2.15-ext.patch b/system-config-keyboard-1.2.15-ext.patch new file mode 100644 index 0000000..1805228 --- /dev/null +++ b/system-config-keyboard-1.2.15-ext.patch @@ -0,0 +1,17 @@ +Fix invalid icon name. + +Lubomir Rintel + +diff -up system-config-keyboard-1.2.15/system-config-keyboard.desktop.ext system-config-keyboard-1.2.15/system-config-keyboard.desktop +diff -up system-config-keyboard-1.2.15/system-config-keyboard.desktop.in.ext system-config-keyboard-1.2.15/system-config-keyboard.desktop.in +--- system-config-keyboard-1.2.15/system-config-keyboard.desktop.in.ext 2008-11-12 23:53:52.000000000 +0100 ++++ system-config-keyboard-1.2.15/system-config-keyboard.desktop.in 2008-11-12 23:54:07.000000000 +0100 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Keyboard + _Comment=Configure the system keyboard +-Icon=system-config-keyboard.png ++Icon=system-config-keyboard + Exec=system-config-keyboard + Type=Application + Categories=Settings;System;HardwareSettings; diff --git a/system-config-keyboard-1.2.15-icon.patch b/system-config-keyboard-1.2.15-icon.patch new file mode 100644 index 0000000..f60a6a4 --- /dev/null +++ b/system-config-keyboard-1.2.15-icon.patch @@ -0,0 +1,98 @@ +Include the icon in Anaconda's keyboard selection screen. +https://bugzilla.redhat.com/show_bug.cgi?id=469165 + +Lubomir Rintel + +diff -up system-config-keyboard-1.2.15/src/keyboard_gui.py.icon system-config-keyboard-1.2.15/src/keyboard_gui.py +--- system-config-keyboard-1.2.15/src/keyboard_gui.py.icon 2008-11-12 23:42:29.000000000 +0100 ++++ system-config-keyboard-1.2.15/src/keyboard_gui.py 2008-11-12 23:47:30.000000000 +0100 +@@ -6,9 +6,10 @@ + ## Jeremy Katz + ## Chris Lumens + ## Bill Nottingham +-## Lubomir Kundrak ++## Lubomir Rintel + ## + ## Copyright (C) 2002, 2003, 2007, 2008 Red Hat, Inc. ++## Copyright (C) 2008 Lubomir Rintel + ## + ## This program is free software; you can redistribute it and/or modify + ## it under the terms of the GNU General Public License as published by +@@ -136,14 +137,21 @@ class moduleClass(Module): + + self.kbd = kbd + +- self.vbox = gtk.VBox() +- self.vbox.set_spacing(10) +- self.vbox.set_border_width(10) +- +- label = gtk.Label(_("Select the appropriate keyboard for the system.")) +- label.set_alignment(0.0, 0.5) +- label.set_size_request(500, -1) +- self.vbox.pack_start(label, False) ++ self.vbox = gtk.VBox(False, 10) ++ ++ iconBox = gtk.HBox(False, 5) ++ iconBox.pack_start(loadToImage(iconFile)) ++ ++ msgLabel = gtk.Label(_("Select the appropriate keyboard for the system.")) ++ msgLabel.set_line_wrap (True) ++ msgLabel.set_size_request(250, -1) ++ ++ iconBox.pack_start(msgLabel) ++ iconBox.set_border_width(5) ++ ++ align = gtk.Alignment() ++ align.add(iconBox); ++ self.vbox.pack_start(align, False) + + if self.kbd.beenset: + default = defaultByLang +@@ -192,6 +200,7 @@ class moduleClass(Module): + self.modelViewSW.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + self.modelViewSW.set_shadow_type(gtk.SHADOW_IN) + self.modelViewSW.add(self.modelView) ++ self.modelViewSW.set_border_width(5) + + self.vbox.pack_start(self.modelViewSW, True) + +@@ -243,7 +252,6 @@ class moduleClass(Module): + self.mainWindow.connect("destroy", self.destroy) + self.mainWindow.set_border_width(10) + self.mainWindow.set_size_request(400, 350) +- self.mainWindow.set_position(gtk.WIN_POS_CENTER) + + self.mainWindow.set_icon(iconPixbuf) + self.mainWindow.set_title(_(self.title)) +@@ -251,28 +259,13 @@ class moduleClass(Module): + okButton = self.mainWindow.add_button('gtk-ok', 0) + okButton.connect("clicked", self._okClicked) + +- toplevel = gtk.VBox() +- toplevel.set_spacing(5) +- iconBox = gtk.HBox(False, 5) +- iconBox.pack_start(loadToImage(iconFile)) +- +- msgLabel = gtk.Label(_("Select the appropriate keyboard for the system.")) +- msgLabel.set_line_wrap(True) +- msgLabel.set_alignment(0.0, 0.5) +- iconBox.pack_start(msgLabel) +- +- toplevel.pack_start(iconBox, False) +- toplevel.pack_start(self.vbox, True) +- +- # Remove the duplicate label. +- label = self.vbox.get_children()[0] +- self.vbox.remove(label) +- + # Remove the hsep from the dialog. It's ugly. + hsep = self.mainWindow.get_children()[0].get_children()[0] + self.mainWindow.get_children()[0].remove(hsep) +- self.mainWindow.vbox.pack_start(toplevel) ++ ++ self.mainWindow.vbox.pack_start(self.vbox) + self.mainWindow.show_all() ++ + gtk.main() + + childWindow = moduleClass diff --git a/system-config-keyboard.spec b/system-config-keyboard.spec index 3e90884..5628439 100644 --- a/system-config-keyboard.spec +++ b/system-config-keyboard.spec @@ -1,6 +1,6 @@ Name: system-config-keyboard Version: 1.2.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A graphical interface for modifying the keyboard Group: System Environment/Base @@ -10,6 +10,8 @@ Source0: %{name}-%{version}.tar.gz Patch0: system-config-keyboard-1.2.15-fixcomments.patch Patch1: system-config-keyboard-1.2.15-beenset.patch Patch2: system-config-keyboard-1.2.15-reconfig.patch +Patch3: system-config-keyboard-1.2.15-icon.patch +Patch4: system-config-keyboard-1.2.15-ext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,7 +37,9 @@ the user to change the default keyboard of the system. %setup -q %patch0 -p0 -b .fixcomments %patch1 -p1 -b .beenset -%patch2 -p1 +%patch2 -p1 -b .reconfig +%patch3 -p1 -b .icon +%patch4 -p1 -b .ext %build @@ -84,6 +88,10 @@ fi %changelog +* Wed Nov 12 2008 Lubomir Rintel - 1.2.15-5 +- Include icon in anaconda keyboard selection screen (#469165) +- Remove extension from desktop entry icon + * Thu Oct 23 2008 Chris Lumens 1.2.15-4 - Fix a traceback when running under firstboot reconfig mode.