rpms/system-config-printer/devel system-config-printer-inklevel.patch, 1.1, 1.2 system-config-printer.spec, 1.385, 1.386
Tim Waugh
twaugh at fedoraproject.org
Fri Mar 26 10:36:30 UTC 2010
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31110
Modified Files:
system-config-printer-inklevel.patch
system-config-printer.spec
Log Message:
* Fri Mar 26 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-10
- Better inklevel 25/50/75 markers.
system-config-printer-inklevel.patch:
gtkinklevel.py | 36 +++++++++++++++++++++++++++++++-----
system-config-printer.py | 1 +
2 files changed, 32 insertions(+), 5 deletions(-)
Index: system-config-printer-inklevel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-inklevel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- system-config-printer-inklevel.patch 25 Mar 2010 16:29:47 -0000 1.1
+++ system-config-printer-inklevel.patch 26 Mar 2010 10:36:28 -0000 1.2
@@ -1,6 +1,6 @@
diff -up system-config-printer-1.2.0/gtkinklevel.py.inklevel system-config-printer-1.2.0/gtkinklevel.py
--- system-config-printer-1.2.0/gtkinklevel.py.inklevel 2009-12-03 17:06:22.000000000 +0000
-+++ system-config-printer-1.2.0/gtkinklevel.py 2010-03-25 16:25:55.108235939 +0000
++++ system-config-printer-1.2.0/gtkinklevel.py 2010-03-26 10:34:15.981600493 +0000
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -33,26 +33,32 @@ diff -up system-config-printer-1.2.0/gtk
ctx.stroke_preserve ()
if fill_point > 0.0:
grad_width = 0.10
-@@ -90,6 +91,25 @@ class GtkInkLevel (gtk.DrawingArea):
+@@ -90,6 +91,31 @@ class GtkInkLevel (gtk.DrawingArea):
ctx.set_source_rgb (1, 1, 1)
ctx.fill ()
+ ctx.set_line_width (thickness / 2)
+
-+ ctx.move_to (0.03, 0.5)
-+ ctx.line_to (0.9, 0.5)
++ ctx.move_to (0.5, 0.0)
++ ctx.line_to (0.5, 1.0)
+ ctx.set_source_rgb (r, g, b)
-+ ctx.set_dash ([0.1])
+ ctx.stroke ()
+
-+ ctx.move_to (0, 0.75)
-+ ctx.line_to (1, 0.75)
++ # 50% marker
++ ctx.move_to (0.4, 0.5)
++ ctx.line_to (0.6, 0.5)
+ ctx.set_source_rgb (r, g, b)
-+ ctx.set_dash ([0.05])
+ ctx.stroke ()
+
-+ ctx.move_to (0.15, 0.25)
-+ ctx.line_to (0.6, 0.25)
++ # 25% marker
++ ctx.move_to (0.45, 0.75)
++ ctx.line_to (0.55, 0.75)
++ ctx.set_source_rgb (r, g, b)
++ ctx.stroke ()
++
++ # 75% marker
++ ctx.move_to (0.45, 0.25)
++ ctx.line_to (0.55, 0.25)
+ ctx.set_source_rgb (r, g, b)
+ ctx.stroke ()
+
@@ -60,8 +66,8 @@ diff -up system-config-printer-1.2.0/gtk
# Try it out.
import gobject
diff -up system-config-printer-1.2.0/system-config-printer.py.inklevel system-config-printer-1.2.0/system-config-printer.py
---- system-config-printer-1.2.0/system-config-printer.py.inklevel 2010-03-25 16:25:37.904233984 +0000
-+++ system-config-printer-1.2.0/system-config-printer.py 2010-03-25 16:26:07.037359284 +0000
+--- system-config-printer-1.2.0/system-config-printer.py.inklevel 2010-03-26 10:34:06.158727658 +0000
++++ system-config-printer-1.2.0/system-config-printer.py 2010-03-26 10:34:06.250725897 +0000
@@ -2681,6 +2681,7 @@ class GUI(GtkGUI, monitor.Watcher):
vbox = gtk.VBox (spacing=6)
subhbox = gtk.HBox ()
Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- system-config-printer.spec 26 Mar 2010 10:33:57 -0000 1.385
+++ system-config-printer.spec 26 Mar 2010 10:36:30 -0000 1.386
@@ -120,6 +120,7 @@ printers.
%patch9 -p1 -b .JobCancel
# Make inklevel widget easier to read (bug #576930).
+# Better inklevel 25/50/75 markers.
%patch10 -p1 -b .inklevel
# check-device-ids: search harder for missing Device IDs.
@@ -258,6 +259,7 @@ exit 0
%changelog
* Fri Mar 26 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-10
+- Better inklevel 25/50/75 markers.
- Fixed window transience for 'Change Device URI'.
- More async traceback fixes (Ubuntu #547075).
More information about the scm-commits
mailing list