Merge lp:~tealeg/landscape-client/switching-text-on-button into lp:~landscape/landscape-client/trunk

[Geoff Teale]

Fixes a point made in a comment on Bug #953065

Causes the text on the "OK" button on the dialog to show as either "Register" or "Disable" based on the selected management type.

[Chad Smith (chad.smith)]

+1 looks & works great on precise & oneiric.

review: Approve

[Fernando Correa Neto (fcorrea)]

Looks good! +1!

review: Approve

=== modified file 'landscape/ui/view/configuration.py'
--- landscape/ui/view/configuration.py	2012-03-14 10:00:01 +0000
+++ landscape/ui/view/configuration.py	2012-03-14 17:10:37 +0000
@@ -17,7 +17,8 @@
     NO_SERVICE_TEXT = "None"
     HOSTED_SERVICE_TEXT = "Landscape - hosted by Canonical"
     LOCAL_SERVICE_TEXT = "Landscape - dedicated server"
-    REGISTER_BUTTON_TEXT = "Register this machine"
+    REGISTER_BUTTON_TEXT = "Register"
+    DISABLE_BUTTON_TEXT = "Disable"
 
     def __init__(self, controller):
         super(ClientSettingsDialog, self).__init__(
@@ -127,6 +128,15 @@
     def register_response(self, widget):
         self.response(Gtk.ResponseType.OK)
 
+    def set_button_text(self, management_type):
+        [alignment] = self.register_button.get_children()
+        [hbox] = alignment.get_children()
+        [image, label] = hbox.get_children()
+        if management_type == NOT_MANAGED:
+            label.set_text(self.DISABLE_BUTTON_TEXT)
+        else:
+            label.set_text(self.REGISTER_BUTTON_TEXT)
+
     def setup_buttons(self):
         self.revert_button = Gtk.Button(stock=Gtk.STOCK_REVERT_TO_SAVED)
         self.action_area.pack_start(self.revert_button, True, True, 0)
@@ -139,10 +149,6 @@
         self.register_button = Gtk.Button(stock=Gtk.STOCK_OK)
         self.action_area.pack_start(self.register_button, True, True, 0)
         self.register_button.show()
-        [alignment] = self.register_button.get_children()
-        [hbox] = alignment.get_children()
-        [image, label] = hbox.get_children()
-        label.set_text(self.REGISTER_BUTTON_TEXT)
         self.register_button.connect("clicked", self.register_response)
 
     def setup_ui(self):
@@ -166,8 +172,10 @@
         iter = self.liststore.get_iter(combobox.get_active())
         if not self.active_widget is None:
             self._vbox.remove(self.active_widget)
+        [management_type] = self.liststore.get(iter, 0)
+        self.set_button_text(management_type)
         if self._initialised:
-            [self.controller.management_type] = self.liststore.get(iter, 0)
+            self.controller.management_type = management_type
             self.controller.modify()
         [self.active_widget] = self.liststore.get(iter, 2)
         self.active_widget.unparent()

=== modified file 'landscape/ui/view/tests/test_configuration.py'
--- landscape/ui/view/tests/test_configuration.py	2012-03-14 10:05:30 +0000
+++ landscape/ui/view/tests/test_configuration.py	2012-03-14 17:10:37 +0000
@@ -78,20 +78,26 @@
         local_service_frame = dialog.liststore.get(iter, 2)[0]
 
         self.assertEqual(1, dialog.use_type_combobox.get_active())
+        [alignment] = dialog.register_button.get_children()
+        [hbox] = alignment.get_children()
+        [image, label] = hbox.get_children()
 
         while Gtk.events_pending():
             Gtk.main_iteration()
         self.assertIs(hosted_service_frame, dialog.active_widget)
+        self.assertEqual(dialog.REGISTER_BUTTON_TEXT, label.get_text())
 
         dialog.use_type_combobox.set_active(0)
         while Gtk.events_pending():
             Gtk.main_iteration()
         self.assertIs(no_service_frame, dialog.active_widget)
+        self.assertEqual(dialog.DISABLE_BUTTON_TEXT, label.get_text())
 
         dialog.use_type_combobox.set_active(2)
         while Gtk.events_pending():
             Gtk.main_iteration()
         self.assertIs(local_service_frame, dialog.active_widget)
+        self.assertEqual(dialog.REGISTER_BUTTON_TEXT, label.get_text())
 
     def test_modify(self):
         """

=== modified file 'landscape/ui/view/ui/landscape-client-settings.glade'
--- landscape/ui/view/ui/landscape-client-settings.glade	2012-03-14 10:00:01 +0000
+++ landscape/ui/view/ui/landscape-client-settings.glade	2012-03-14 17:10:37 +0000
@@ -432,7 +432,7 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0.059999998658895493</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes">If you click "OK" the Landscape client on this machine will be disabled.  You can reenable it later by revisiting this dialog.</property>
+                    <property name="label" translatable="yes">If you click "Disable" the Landscape client on this machine will be disabled.  You can reenable it later by revisiting this dialog.</property>
                     <property name="wrap">True</property>
                     <property name="ellipsize">end</property>
                   </object>