rpms/system-config-keyboard/devel system-config-keyboard-1.2.15-ext.patch, NONE, 1.1 system-config-keyboard-1.2.15-icon.patch, NONE, 1.1 system-config-keyboard.spec, 1.42, 1.43

Wed Nov 12 22:56:52 UTC 2008

Author: lkundrak

Update of /cvs/pkgs/rpms/system-config-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30820

Modified Files:
	system-config-keyboard.spec 
Added Files:
	system-config-keyboard-1.2.15-ext.patch 
	system-config-keyboard-1.2.15-icon.patch 
Log Message:
* Wed Nov 12 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.2.15-5
- Include icon in anaconda keyboard selection screen (#469165)
- Remove extension from desktop entry icon


system-config-keyboard-1.2.15-ext.patch:

--- NEW FILE system-config-keyboard-1.2.15-ext.patch ---
Fix invalid icon name.

Lubomir Rintel <lkundrak at v3.sk>

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;

system-config-keyboard-1.2.15-icon.patch:

--- NEW FILE system-config-keyboard-1.2.15-icon.patch ---
Include the icon in Anaconda's keyboard selection screen.
https://bugzilla.redhat.com/show_bug.cgi?id=469165

Lubomir Rintel <lkundrak at v3.sk>

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 <katzj at redhat.com>
 ## Chris Lumens <clumens at redhat.com>
 ## Bill Nottingham <notting at redhat.com>
-## Lubomir Kundrak <lkundrak at redhat.com>
+## Lubomir Rintel <lkundrak at v3.sk>
 ##
 ## 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


Index: system-config-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-keyboard/devel/system-config-keyboard.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- system-config-keyboard.spec	23 Oct 2008 20:32:57 -0000	1.42
+++ system-config-keyboard.spec	12 Nov 2008 22:56:21 -0000	1.43
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Wed Nov 12 2008 Lubomir Rintel <lkundrak at v3.sk> - 1.2.15-5
+- Include icon in anaconda keyboard selection screen (#469165)
+- Remove extension from desktop entry icon
+
 * Thu Oct 23 2008 Chris Lumens <clumens at redhat.com> 1.2.15-4
 - Fix a traceback when running under firstboot reconfig mode.
 


