|
|
9e0db7e |
Include the icon in Anaconda's keyboard selection screen.
|
|
|
9e0db7e |
https://bugzilla.redhat.com/show_bug.cgi?id=469165
|
|
|
9e0db7e |
|
|
|
9e0db7e |
Lubomir Rintel <lkundrak@v3.sk>
|
|
|
9e0db7e |
|
|
|
9e0db7e |
diff -up system-config-keyboard-1.2.15/src/keyboard_gui.py.icon system-config-keyboard-1.2.15/src/keyboard_gui.py
|
|
|
9e0db7e |
--- system-config-keyboard-1.2.15/src/keyboard_gui.py.icon 2008-11-12 23:42:29.000000000 +0100
|
|
|
9e0db7e |
+++ system-config-keyboard-1.2.15/src/keyboard_gui.py 2008-11-12 23:47:30.000000000 +0100
|
|
|
9e0db7e |
@@ -6,9 +6,10 @@
|
|
|
9e0db7e |
## Jeremy Katz <katzj@redhat.com>
|
|
|
9e0db7e |
## Chris Lumens <clumens@redhat.com>
|
|
|
9e0db7e |
## Bill Nottingham <notting@redhat.com>
|
|
|
9e0db7e |
-## Lubomir Kundrak <lkundrak@redhat.com>
|
|
|
9e0db7e |
+## Lubomir Rintel <lkundrak@v3.sk>
|
|
|
9e0db7e |
##
|
|
|
9e0db7e |
## Copyright (C) 2002, 2003, 2007, 2008 Red Hat, Inc.
|
|
|
9e0db7e |
+## Copyright (C) 2008 Lubomir Rintel
|
|
|
9e0db7e |
##
|
|
|
9e0db7e |
## This program is free software; you can redistribute it and/or modify
|
|
|
9e0db7e |
## it under the terms of the GNU General Public License as published by
|
|
|
9e0db7e |
@@ -136,14 +137,21 @@ class moduleClass(Module):
|
|
|
9e0db7e |
|
|
|
9e0db7e |
self.kbd = kbd
|
|
|
9e0db7e |
|
|
|
9e0db7e |
- self.vbox = gtk.VBox()
|
|
|
9e0db7e |
- self.vbox.set_spacing(10)
|
|
|
9e0db7e |
- self.vbox.set_border_width(10)
|
|
|
9e0db7e |
-
|
|
|
9e0db7e |
- label = gtk.Label(_("Select the appropriate keyboard for the system."))
|
|
|
9e0db7e |
- label.set_alignment(0.0, 0.5)
|
|
|
9e0db7e |
- label.set_size_request(500, -1)
|
|
|
9e0db7e |
- self.vbox.pack_start(label, False)
|
|
|
9e0db7e |
+ self.vbox = gtk.VBox(False, 10)
|
|
|
9e0db7e |
+
|
|
|
9e0db7e |
+ iconBox = gtk.HBox(False, 5)
|
|
|
9e0db7e |
+ iconBox.pack_start(loadToImage(iconFile))
|
|
|
9e0db7e |
+
|
|
|
9e0db7e |
+ msgLabel = gtk.Label(_("Select the appropriate keyboard for the system."))
|
|
|
9e0db7e |
+ msgLabel.set_line_wrap (True)
|
|
|
9e0db7e |
+ msgLabel.set_size_request(250, -1)
|
|
|
9e0db7e |
+
|
|
|
9e0db7e |
+ iconBox.pack_start(msgLabel)
|
|
|
9e0db7e |
+ iconBox.set_border_width(5)
|
|
|
9e0db7e |
+
|
|
|
9e0db7e |
+ align = gtk.Alignment()
|
|
|
9e0db7e |
+ align.add(iconBox);
|
|
|
9e0db7e |
+ self.vbox.pack_start(align, False)
|
|
|
9e0db7e |
|
|
|
9e0db7e |
if self.kbd.beenset:
|
|
|
9e0db7e |
default = defaultByLang
|
|
|
9e0db7e |
@@ -192,6 +200,7 @@ class moduleClass(Module):
|
|
|
9e0db7e |
self.modelViewSW.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
|
|
|
9e0db7e |
self.modelViewSW.set_shadow_type(gtk.SHADOW_IN)
|
|
|
9e0db7e |
self.modelViewSW.add(self.modelView)
|
|
|
9e0db7e |
+ self.modelViewSW.set_border_width(5)
|
|
|
9e0db7e |
|
|
|
9e0db7e |
self.vbox.pack_start(self.modelViewSW, True)
|
|
|
9e0db7e |
|
|
|
9e0db7e |
@@ -243,7 +252,6 @@ class moduleClass(Module):
|
|
|
9e0db7e |
self.mainWindow.connect("destroy", self.destroy)
|
|
|
9e0db7e |
self.mainWindow.set_border_width(10)
|
|
|
9e0db7e |
self.mainWindow.set_size_request(400, 350)
|
|
|
9e0db7e |
- self.mainWindow.set_position(gtk.WIN_POS_CENTER)
|
|
|
9e0db7e |
|
|
|
9e0db7e |
self.mainWindow.set_icon(iconPixbuf)
|
|
|
9e0db7e |
self.mainWindow.set_title(_(self.title))
|
|
|
9e0db7e |
@@ -251,28 +259,13 @@ class moduleClass(Module):
|
|
|
9e0db7e |
okButton = self.mainWindow.add_button('gtk-ok', 0)
|
|
|
9e0db7e |
okButton.connect("clicked", self._okClicked)
|
|
|
9e0db7e |
|
|
|
9e0db7e |
- toplevel = gtk.VBox()
|
|
|
9e0db7e |
- toplevel.set_spacing(5)
|
|
|
9e0db7e |
- iconBox = gtk.HBox(False, 5)
|
|
|
9e0db7e |
- iconBox.pack_start(loadToImage(iconFile))
|
|
|
9e0db7e |
-
|
|
|
9e0db7e |
- msgLabel = gtk.Label(_("Select the appropriate keyboard for the system."))
|
|
|
9e0db7e |
- msgLabel.set_line_wrap(True)
|
|
|
9e0db7e |
- msgLabel.set_alignment(0.0, 0.5)
|
|
|
9e0db7e |
- iconBox.pack_start(msgLabel)
|
|
|
9e0db7e |
-
|
|
|
9e0db7e |
- toplevel.pack_start(iconBox, False)
|
|
|
9e0db7e |
- toplevel.pack_start(self.vbox, True)
|
|
|
9e0db7e |
-
|
|
|
9e0db7e |
- # Remove the duplicate label.
|
|
|
9e0db7e |
- label = self.vbox.get_children()[0]
|
|
|
9e0db7e |
- self.vbox.remove(label)
|
|
|
9e0db7e |
-
|
|
|
9e0db7e |
# Remove the hsep from the dialog. It's ugly.
|
|
|
9e0db7e |
hsep = self.mainWindow.get_children()[0].get_children()[0]
|
|
|
9e0db7e |
self.mainWindow.get_children()[0].remove(hsep)
|
|
|
9e0db7e |
- self.mainWindow.vbox.pack_start(toplevel)
|
|
|
9e0db7e |
+
|
|
|
9e0db7e |
+ self.mainWindow.vbox.pack_start(self.vbox)
|
|
|
9e0db7e |
self.mainWindow.show_all()
|
|
|
9e0db7e |
+
|
|
|
9e0db7e |
gtk.main()
|
|
|
9e0db7e |
|
|
|
9e0db7e |
childWindow = moduleClass
|