From c2e929a5aa8b8c44f0db9a44b96616a918948d5d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 26 Nov 2009 16:32:17 +0000
Subject: [PATCH] - Prevent display of marker levels from making the properties
 dialog too     big (bug #540826).

---
 system-config-printer-markers-display.patch | 165 ++++++++++++++++++++
 system-config-printer.spec                  |   4 +
 2 files changed, 169 insertions(+)
 create mode 100644 system-config-printer-markers-display.patch

diff --git a/system-config-printer-markers-display.patch b/system-config-printer-markers-display.patch
new file mode 100644
index 0000000..e3afbc5
--- /dev/null
+++ b/system-config-printer-markers-display.patch
@@ -0,0 +1,165 @@
+diff -up system-config-printer-1.1.13/glade/PrinterPropertiesDialog.glade.markers-display system-config-printer-1.1.13/glade/PrinterPropertiesDialog.glade
+--- system-config-printer-1.1.13/glade/PrinterPropertiesDialog.glade.markers-display	2009-09-04 10:35:48.000000000 +0100
++++ system-config-printer-1.1.13/glade/PrinterPropertiesDialog.glade	2009-11-26 16:30:46.456177697 +0000
+@@ -4677,27 +4677,84 @@ Reverse portrait (180°)</property>
+ 		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+ 
+ 		      <child>
+-			<widget class="GtkAlignment" id="alignment95">
++			<widget class="GtkVBox" id="vbox54">
+ 			  <property name="visible">True</property>
+-			  <property name="xalign">0.5</property>
+-			  <property name="yalign">0.5</property>
+-			  <property name="xscale">1</property>
+-			  <property name="yscale">1</property>
+-			  <property name="top_padding">6</property>
+-			  <property name="bottom_padding">0</property>
+-			  <property name="left_padding">12</property>
+-			  <property name="right_padding">0</property>
++			  <property name="homogeneous">False</property>
++			  <property name="spacing">6</property>
+ 
+ 			  <child>
+-			    <widget class="GtkVBox" id="vboxMarkerLevels">
++			    <widget class="GtkAlignment" id="alignment95">
+ 			      <property name="visible">True</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="spacing">6</property>
++			      <property name="xalign">0.5</property>
++			      <property name="yalign">0.5</property>
++			      <property name="xscale">1</property>
++			      <property name="yscale">1</property>
++			      <property name="top_padding">6</property>
++			      <property name="bottom_padding">0</property>
++			      <property name="left_padding">12</property>
++			      <property name="right_padding">0</property>
+ 
+ 			      <child>
+-				<placeholder/>
++				<widget class="GtkScrolledWindow" id="scrolledwindow24">
++				  <property name="visible">True</property>
++				  <property name="can_focus">True</property>
++				  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
++				  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++				  <property name="shadow_type">GTK_SHADOW_NONE</property>
++				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++				  <child>
++				    <widget class="GtkViewport" id="viewport10">
++				      <property name="visible">True</property>
++				      <property name="shadow_type">GTK_SHADOW_IN</property>
++
++				      <child>
++					<widget class="GtkVBox" id="vboxMarkerLevels">
++					  <property name="border_width">3</property>
++					  <property name="visible">True</property>
++					  <property name="homogeneous">False</property>
++					  <property name="spacing">6</property>
++
++					  <child>
++					    <placeholder/>
++					  </child>
++					</widget>
++				      </child>
++				    </widget>
++				  </child>
++				</widget>
+ 			      </child>
+ 			    </widget>
++			    <packing>
++			      <property name="padding">0</property>
++			      <property name="expand">True</property>
++			      <property name="fill">True</property>
++			    </packing>
++			  </child>
++
++			  <child>
++			    <widget class="GtkHButtonBox" id="hbuttonbox1">
++			      <property name="visible">True</property>
++			      <property name="layout_style">GTK_BUTTONBOX_END</property>
++			      <property name="spacing">0</property>
++
++			      <child>
++				<widget class="GtkButton" id="btnRefreshMarkerLevels">
++				  <property name="visible">True</property>
++				  <property name="can_default">True</property>
++				  <property name="can_focus">True</property>
++				  <property name="label">gtk-refresh</property>
++				  <property name="use_stock">True</property>
++				  <property name="relief">GTK_RELIEF_NORMAL</property>
++				  <property name="focus_on_click">True</property>
++				</widget>
++			      </child>
++			    </widget>
++			    <packing>
++			      <property name="padding">0</property>
++			      <property name="expand">False</property>
++			      <property name="fill">False</property>
++			    </packing>
+ 			  </child>
+ 			</widget>
+ 		      </child>
+@@ -4727,33 +4784,8 @@ Reverse portrait (180°)</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkHButtonBox" id="hbuttonbox1">
+-		      <property name="visible">True</property>
+-		      <property name="layout_style">GTK_BUTTONBOX_END</property>
+-		      <property name="spacing">0</property>
+-
+-		      <child>
+-			<widget class="GtkButton" id="btnRefreshMarkerLevels">
+-			  <property name="visible">True</property>
+-			  <property name="can_default">True</property>
+-			  <property name="can_focus">True</property>
+-			  <property name="label">gtk-refresh</property>
+-			  <property name="use_stock">True</property>
+-			  <property name="relief">GTK_RELIEF_NORMAL</property>
+-			  <property name="focus_on_click">True</property>
+-			</widget>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
++		      <property name="expand">True</property>
++		      <property name="fill">True</property>
+ 		    </packing>
+ 		  </child>
+ 
+@@ -4913,13 +4945,13 @@ Reverse portrait (180°)</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="padding">0</property>
+-		      <property name="expand">True</property>
+-		      <property name="fill">True</property>
++		      <property name="expand">False</property>
++		      <property name="fill">False</property>
+ 		    </packing>
+ 		  </child>
+ 		</widget>
+ 		<packing>
+-		  <property name="tab_expand">False</property>
++		  <property name="tab_expand">True</property>
+ 		  <property name="tab_fill">True</property>
+ 		</packing>
+ 	      </child>
+diff -up system-config-printer-1.1.13/system-config-printer.py.markers-display system-config-printer-1.1.13/system-config-printer.py
+--- system-config-printer-1.1.13/system-config-printer.py.markers-display	2009-11-26 16:29:46.758302644 +0000
++++ system-config-printer-1.1.13/system-config-printer.py	2009-11-26 16:30:46.453177964 +0000
+@@ -2558,6 +2558,7 @@ class GUI(GtkGUI, monitor.Watcher):
+                 subhbox.pack_start (inklevel, True, False, 0)
+                 vbox.pack_start (subhbox, False, False, 0)
+                 label = gtk.Label (name)
++                label.set_width_chars (10)
+                 label.set_line_wrap (True)
+                 vbox.pack_start (label, False, False, 0)
+                 table.attach (vbox, col, col + 1, row, row + 1)
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 7a01025..ace1e5c 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -39,6 +39,7 @@ Patch21: system-config-printer-install-foomatic-db-ppds.patch
 Patch22: system-config-printer-gpk-traceback.patch
 Patch23: system-config-printer-editable-ppd.patch
 Patch24: system-config-printer-center.patch
+Patch25: system-config-printer-markers-display.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -122,6 +123,7 @@ printers.
 %patch22 -p1 -b .gpk-traceback
 %patch23 -p1 -b .editable-ppd
 %patch24 -p1 -b .center
+%patch25 -p1 -b .markers-display
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -234,6 +236,8 @@ exit 0
 
 %changelog
 * Thu Nov 26 2009 Tim Waugh <twaugh@redhat.com> 1.1.13-12
+- Prevent display of marker levels from making the properties dialog
+  too big (bug #540826).
 - Place the window in the middle of the screen (bug #539876).
 - Fixed editability of PPD options for explicit IPP queues
   (bug #541588).