Bug#236430: gnome-cups-manager: menus suck

Filip Van Raemdonck Filip Van Raemdonck <mechanix@debian.org>, 236430@bugs.debian.org
Sat, 6 Mar 2004 09:53:19 +0100


--MfFXiAuoTsnnDAfZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Package: gnome-cups-manager
Tags: patch

Hi,

The menus in the printers overview for g-c-m currently suck; they don't
use stock items where they can and should; the "printer" menu has way too
meny separators; and arguably some menu items are in the wrong place
(actually, with the menu items that are currently there, one could argue
that all of them belong in the "printer" menu)

Attached patch addresses those issues.


Regards,

Filip

-- 
"If supporters' vociferousness and flamosity are valid measures of an OS'
 enterprise readiness, Windows is obviously less enterprise-ready than
 Linux (...) Steve Ballmer alone has shown as much anti-Linux vitriol as
 all the pro-Linux, anti-Microsoft zealots (...) put together."
	-- Robin Miller

--MfFXiAuoTsnnDAfZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=gcm-glade-diff

--- gnome-cups-manager-0.17/gnome-cups-manager/gnome-cups-manager.glade
+++ gnome-cups-manager-0.17-new/gnome-cups-manager/gnome-cups-manager.glade
@@ -1262,48 +1260,18 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="new_printer_item">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_New Printer</property>
-		      <property name="use_underline">True</property>
+		      <property name="label">gtk-new</property>
+		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="on_new_printer1_activate" last_modification_time="Tue, 24 Jun 2003 14:04:13 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image86">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-new</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="separator7">
-		      <property name="visible">True</property>
 		    </widget>
 		  </child>
 
 		  <child>
 		    <widget class="GtkImageMenuItem" id="open_item">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Open</property>
-		      <property name="use_underline">True</property>
+		      <property name="label">gtk-open</property>
+		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="on_item1_activate" last_modification_time="Tue, 24 Jun 2003 14:04:13 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image87">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-open</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
 		    </widget>
 		  </child>
 
@@ -1314,50 +1282,11 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="properties_item">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Properties</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_properties_item_activate" last_modification_time="Wed, 25 Jun 2003 20:36:08 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image88">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-properties</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="separator8">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
 		    <widget class="GtkImageMenuItem" id="close_item">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Close</property>
-		      <property name="use_underline">True</property>
+		      <property name="label">gtk-quit</property>
+		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="on_close_item_activate" last_modification_time="Tue, 24 Jun 2003 14:17:25 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image89">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-close</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -1416,6 +1343,12 @@
 		  </child>
 
 		  <child>
+		    <widget class="GtkMenuItem" id="separator9">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
 		    <widget class="GtkMenuItem" id="make_default_item">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Make _Default</property>
@@ -1425,29 +1358,20 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="separator9">
+		    <widget class="GtkImageMenuItem" id="delete_item">
 		      <property name="visible">True</property>
+		      <property name="label">gtk-remove</property>
+		      <property name="use_stock">True</property>
+		      <signal name="activate" handler="on_delete_item_activate" last_modification_time="Wed, 25 Jun 2003 20:36:08 GMT"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="delete_item">
+		    <widget class="GtkImageMenuItem" id="properties_item">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Delete</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_delete_item_activate" last_modification_time="Wed, 25 Jun 2003 20:36:08 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image92">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-delete</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
+		      <property name="label">gtk-properties</property>
+		      <property name="use_stock">True</property>
+		      <signal name="activate" handler="on_properties_item_activate" last_modification_time="Wed, 25 Jun 2003 20:36:08 GMT"/>
 		    </widget>
 		  </child>
 		</widget>

--MfFXiAuoTsnnDAfZ--