rpms/driconf/F-8 driconf-0.9.1-glxinfo-unicode.patch, NONE, 1.1 driconf-0.9.1-update-toolbar-methods.patch, NONE, 1.1 driconf.spec, 1.2, 1.3
Kevin Fenzi (kevin)
fedora-extras-commits at redhat.com
Sun Jun 8 22:44:18 UTC 2008
- Previous message (by thread): rpms/sylpheed/F-9 .cvsignore,1.35,1.36 sources,1.35,1.36
- Next message (by thread): rpms/sylpheed/F-9 sylpheed-2.5.0rc-procmime.patch, 1.1, NONE sylpheed-2.5.0rc-summaryview.patch, 1.1, NONE sylpheed-2.5.0rc-utf8.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kevin
Update of /cvs/extras/rpms/driconf/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086
Modified Files:
driconf.spec
Added Files:
driconf-0.9.1-glxinfo-unicode.patch
driconf-0.9.1-update-toolbar-methods.patch
Log Message:
Improve unicode support (fixes bug #450083)
driconf-0.9.1-glxinfo-unicode.patch:
--- NEW FILE driconf-0.9.1-glxinfo-unicode.patch ---
diff -up driconf-0.9.1/driconf_simpleui.py.unicode driconf-0.9.1/driconf_simpleui.py
--- driconf-0.9.1/driconf_simpleui.py.unicode 2006-09-17 17:49:54.000000000 -0700
+++ driconf-0.9.1/driconf_simpleui.py 2008-06-05 09:56:19.000000000 -0700
@@ -450,11 +450,13 @@ class MainWindow (gtk.Window):
else:
screen = self.screens[0]
if screen.glxInfo:
- text = "%s (%s)" % (
- screen.glxInfo.renderer, screen.glxInfo.vendor)
+ text = u"%s (%s)" % (
+ unicode(screen.glxInfo.renderer, "utf-8", "replace"),
+ unicode(screen.glxInfo.vendor, "utf-8", "replace"))
else:
- text = _("Screen") + " %d: %s" % (
- screen.num, screen.driver.name.capitalize())
+ text = _(u"Screen") + u" %d: %s" % (screen.num,
+ unicode(screen.driver.name, "utf-8",
+ "replace").capitalize())
deviceHBox = gtk.HBox()
deviceLabel = gtk.Label()
deviceLabel.set_justify(gtk.JUSTIFY_LEFT)
driconf-0.9.1-update-toolbar-methods.patch:
--- NEW FILE driconf-0.9.1-update-toolbar-methods.patch ---
diff -up driconf-0.9.1/driconf_complexui.py.toolbar driconf-0.9.1/driconf_complexui.py
--- driconf-0.9.1/driconf_complexui.py.toolbar 2008-06-05 16:21:09.000000000 -0700
+++ driconf-0.9.1/driconf_complexui.py 2008-06-05 17:02:03.000000000 -0700
@@ -838,42 +838,73 @@ class MainWindow (gtk.Window):
self.paned.show()
self.toolbar = gtk.Toolbar ()
iconSize = self.toolbar.get_icon_size()
- self.saveButton = self.toolbar.insert_stock (
- "gtk-save", _("Save selected configuration file"),
- "priv", self.configTree.saveConfig, None, -1)
- self.reloadButton = self.toolbar.insert_stock (
- "gtk-revert-to-saved", _("Reload selected configuration file"),
- "priv", self.configTree.reloadConfig, None, -1)
- self.toolbar.append_space()
- self.newButton = self.toolbar.insert_stock (
- "gtk-new", _("Create a new device or application"),
- "priv", self.configTree.newItem, None, -1)
- self.removeButton = self.toolbar.insert_stock (
- "gtk-delete", _("Remove selected device or application"),
- "priv", self.configTree.removeItem, None, -1)
- self.upButton = self.toolbar.insert_stock (
- "gtk-go-up", _("Move selected item up"),
- "priv", self.configTree.moveUp, None, -1)
- self.downButton = self.toolbar.insert_stock (
- "gtk-go-down", _("Move selected item down"),
- "priv", self.configTree.moveDown, None, -1)
- self.propertiesButton = self.toolbar.insert_stock (
- "gtk-properties", _("Properties of selected device or application"),
- "priv", self.configTree.properties, None, -1)
- self.toolbar.append_space()
+
+ self.saveButton = gtk.ToolButton("gtk-save")
+ self.saveButton.set_tooltip_text(_("Save selected configuration file"))
+ self.saveButton.connect("clicked", self.configTree.saveConfig)
+ self.saveButton.show()
+ self.toolbar.insert(self.saveButton, -1)
+ self.reloadButton = gtk.ToolButton("gtk-revert-to-saved")
+ self.reloadButton.set_tooltip_text(_("Reload selected configuration file"))
+ self.reloadButton.connect("clicked", self.configTree.reloadConfig)
+ self.reloadButton.show()
+ self.toolbar.insert(self.reloadButton, -1)
+
+ separator = gtk.SeparatorToolItem()
+ separator.show()
+ self.toolbar.insert(separator, -1)
+
+ self.newButton = gtk.ToolButton("gtk-new")
+ self.newButton.set_tooltip_text(_("Create a new device or application"))
+ self.newButton.connect("clicked", self.configTree.newItem)
+ self.newButton.show()
+ self.toolbar.insert(self.newButton, -1)
+ self.removeButton = gtk.ToolButton("gtk-delete")
+ self.removeButton.set_tooltip_text(_("Remove selected device or application"))
+ self.removeButton.connect("clicked", self.configTree.removeItem)
+ self.removeButton.show()
+ self.toolbar.insert(self.removeButton, -1)
+ self.upButton = gtk.ToolButton("gtk-go-up")
+ self.upButton.set_tooltip_text(_("Move selected item up"))
+ self.upButton.connect("clicked", self.configTree.moveUp)
+ self.upButton.show()
+ self.toolbar.insert(self.upButton, -1)
+ self.downButton = gtk.ToolButton("gtk-go-down")
+ self.downButton.set_tooltip_text(_("Move selected item down"))
+ self.downButton.connect("clicked", self.configTree.moveDown)
+ self.downButton.show()
+ self.toolbar.insert(self.downButton, -1)
+ self.propertiesButton = gtk.ToolButton("gtk-properties")
+ self.propertiesButton.set_tooltip_text(_("Properties of selected device or application"))
+ self.propertiesButton.connect("clicked", self.configTree.properties)
+ self.propertiesButton.show()
+ self.toolbar.insert(self.propertiesButton, -1)
+
+ separator = gtk.SeparatorToolItem()
+ separator.show()
+ self.toolbar.insert(separator, -1)
+
# The gtk-about stock item is available with gtk >= 2.6.
# It's definitely not available with gtk 2.2. Not sure about 2.4.
if gtk.gtk_version[0] == 2 and gtk.gtk_version[1] < 6:
aboutStock = "gtk-dialog-info"
else:
aboutStock = "gtk-about"
- self.aboutButton = self.toolbar.insert_stock (
- aboutStock, _("About DRIconf"), "priv",
- self.aboutHandler, None, -1)
- self.toolbar.append_space()
- self.exitButton = self.toolbar.insert_stock (
- "gtk-quit", _("Exit DRIconf"), "priv",
- self.exitHandler, None, -1)
+ self.aboutButton = gtk.ToolButton(aboutStock)
+ self.aboutButton.set_tooltip_text(_("About DRIconf"))
+ self.aboutButton.connect("clicked", self.aboutHandler)
+ self.aboutButton.show()
+ self.toolbar.insert(self.aboutButton, -1)
+
+ separator = gtk.SeparatorToolItem()
+ separator.show()
+ self.toolbar.insert(separator, -1)
+
+ self.exitButton = gtk.ToolButton("gtk-quit")
+ self.exitButton.set_tooltip_text(_("Exit DRIconf"))
+ self.exitButton.connect("clicked", self.exitHandler)
+ self.exitButton.show()
+ self.toolbar.insert(self.exitButton, -1)
if len(configList) != 0:
self.activateConfigButtons (configList[0])
self.toolbar.show()
Index: driconf.spec
===================================================================
RCS file: /cvs/extras/rpms/driconf/F-8/driconf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- driconf.spec 22 Aug 2007 02:44:08 -0000 1.2
+++ driconf.spec 8 Jun 2008 22:43:33 -0000 1.3
@@ -2,7 +2,7 @@
Name: driconf
Version: 0.9.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A configuration applet for the Direct Rendering Infrastructure
Group: User Interface/X
@@ -10,6 +10,9 @@
URL: http://dri.freedesktop.org/wiki/DriConf
Source0: http://people.freedesktop.org/~fxkuehl/driconf/driconf-%{version}.tar.gz
Patch1: driconf-0.9.1-setup.patch
+Patch2: driconf-0.9.1-glxinfo-unicode.patch
+Patch3: driconf-0.9.1-update-toolbar-methods.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
@@ -31,6 +34,8 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__python} setup.py build
@@ -87,6 +92,9 @@
%{_datadir}/applications/*.desktop
%changelog
+* Sun Jun 8 2008 Kevin Fenzi <kevin at tummy.com> - 0.9.1-7
+- Improve unicode support (fixes bug #450083)
+
* Tue Aug 21 2007 Kevin Fenzi <kevin at tummy.com> - 0.9.1-6
- Update license tag.
- Previous message (by thread): rpms/sylpheed/F-9 .cvsignore,1.35,1.36 sources,1.35,1.36
- Next message (by thread): rpms/sylpheed/F-9 sylpheed-2.5.0rc-procmime.patch, 1.1, NONE sylpheed-2.5.0rc-summaryview.patch, 1.1, NONE sylpheed-2.5.0rc-utf8.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list