rpms/system-config-printer/F-11 system-config-printer-arrows.patch, NONE, 1.1 system-config-printer.spec, 1.267, 1.268

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8675

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-arrows.patch 
Log Message:
* Fri Jul  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-5
- Fixed sensitivity of class member selection arrows (bug #508653).


system-config-printer-arrows.patch:

--- NEW FILE system-config-printer-arrows.patch ---
diff -up system-config-printer-1.1.8/glade/NewPrinterWindow.glade.arrows system-config-printer-1.1.8/glade/NewPrinterWindow.glade
--- system-config-printer-1.1.8/glade/NewPrinterWindow.glade.arrows	2009-06-03 09:20:26.000000000 +0100
+++ system-config-printer-1.1.8/glade/NewPrinterWindow.glade	2009-07-03 18:18:50.640997051 +0100
@@ -3662,6 +3662,7 @@ DTR/DSR (Hardware)</property>
 			  <property name="fixed_height_mode">False</property>
 			  <property name="hover_selection">False</property>
 			  <property name="hover_expand">False</property>
+			  <signal name="cursor_changed" handler="on_tvNCMembers_cursor_changed" last_modification_time="Tue, 30 Jun 2009 15:15:42 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -3693,6 +3694,7 @@ DTR/DSR (Hardware)</property>
 			  <child>
 			    <widget class="GtkButton" id="btnNCAddMember">
 			      <property name="visible">True</property>
+			      <property name="sensitive">False</property>
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
@@ -3771,6 +3773,7 @@ DTR/DSR (Hardware)</property>
 			  <child>
 			    <widget class="GtkButton" id="btnNCDelMember">
 			      <property name="visible">True</property>
+			      <property name="sensitive">False</property>
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
@@ -3823,6 +3826,7 @@ DTR/DSR (Hardware)</property>
 			  <property name="fixed_height_mode">False</property>
 			  <property name="hover_selection">False</property>
 			  <property name="hover_expand">False</property>
+			  <signal name="cursor_changed" handler="on_tvNCNotMembers_cursor_changed" last_modification_time="Tue, 30 Jun 2009 15:15:49 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
diff -up system-config-printer-1.1.8/system-config-printer.py.arrows system-config-printer-1.1.8/system-config-printer.py
--- system-config-printer-1.1.8/system-config-printer.py.arrows	2009-07-03 18:18:36.478996538 +0100
+++ system-config-printer-1.1.8/system-config-printer.py	2009-07-03 18:18:50.643996718 +0100
@@ -174,7 +174,6 @@ def moveClassMembers(treeview_from, tree
     for row in rows:
         path = row.get_path()
         iter = model_from.get_iter(path)
-
         row_data = model_from.get(iter, 0)
         model_to.append(row_data)
         model_from.remove(iter)
@@ -3547,6 +3546,8 @@ class NewPrinterGUI(GtkGUI):
                               "entNPTDevice",
                               "tvNCMembers",
                               "tvNCNotMembers",
+                              "btnNCAddMember",
+                              "btnNCDelMember",
                               "ntbkPPDSource",
                               "rbtnNPPPD",
                               "tvNPMakes",
@@ -4089,11 +4090,23 @@ class NewPrinterGUI(GtkGUI):
         moveClassMembers(self.tvNCNotMembers, self.tvNCMembers)
         self.btnNPApply.set_sensitive(
             bool(getCurrentClassMembers(self.tvNCMembers)))
+        button.set_sensitive(False)
 
     def on_btnNCDelMember_clicked(self, button):
         moveClassMembers(self.tvNCMembers, self.tvNCNotMembers)
         self.btnNPApply.set_sensitive(
             bool(getCurrentClassMembers(self.tvNCMembers)))
+        button.set_sensitive(False)
+
+    def on_tvNCMembers_cursor_changed(self, widget):
+        selection = widget.get_selection()
+        model_from, rows = selection.get_selected_rows()
+        self.btnNCDelMember.set_sensitive(rows != [])
+
+    def on_tvNCNotMembers_cursor_changed(self, widget):
+        selection = widget.get_selection()
+        model_from, rows = selection.get_selected_rows()
+        self.btnNCAddMember.set_sensitive(rows != [])
 
     # Navigation buttons
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- system-config-printer.spec	3 Jul 2009 17:14:56 -0000	1.267
+++ system-config-printer.spec	3 Jul 2009 17:22:15 -0000	1.268
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -24,6 +24,7 @@ Patch7: system-config-printer-incorrect-
 Patch8: system-config-printer-packagekit.patch
 Patch9: system-config-printer-stopped-jobs.patch
 Patch10: system-config-printer-gutenprint.patch
+Patch11: system-config-printer-arrows.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -83,6 +84,7 @@ the configuration tool.
 %patch8 -p1 -b .packagekit
 %patch9 -p1 -b .stopped-jobs
 %patch10 -p1 -b .gutenprint
+%patch11 -p1 -b .arrows
 
 %build
 %configure
@@ -185,11 +187,12 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Fri Jul  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-4
+* Fri Jul  3 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-5
 - Use gpk-install-package-name instead of trying to use the D-Bus API.
 - Spot stopped jobs with CUPS 1.4 as well (trac #177).  This, along
   with the previous fix, addresses bug #509177.
 - Map gutenprint filenames to the package name.
+- Fixed sensitivity of class member selection arrows (bug #508653).
 
 * Thu Jun 25 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-3
 - Use correct 'location' field for printers added remotely.