Merge lp:~tealeg/landscape-client/remove-local-account-name-widget into lp:~landscape/landscape-client/trunk

[Geoff Teale]

Fixes bug #954285.

This branch removes the Gtk Entry widget for the local account name and unhooks it from landscape.ui.veif.configuration.ClientSettingsDialog.

[Thomas Herve (therve)]

Looks great, +1!

review: Approve

[Björn Tillenius (bjornt)]

+1!

review: Approve

=== modified file 'landscape/ui/view/configuration.py'
--- landscape/ui/view/configuration.py	2012-03-13 12:47:54 +0000
+++ landscape/ui/view/configuration.py	2012-03-14 10:09:21 +0000
@@ -54,8 +54,6 @@
     def _set_local_values_from_controller(self):
         self.local_landscape_host_entry.set_text(
             self.controller.local_landscape_host)
-        self.local_account_name_entry.set_text(
-            self.controller.local_account_name)
         self.local_password_entry.set_text(self.controller.local_password)
 
     def load_data(self):
@@ -108,12 +106,6 @@
             "key-release-event",
             self.on_key_release_event,
             "local_landscape_host")
-        self.local_account_name_entry = self._builder.get_object(
-            "local-account-name-entry")
-        self.local_account_name_entry.connect(
-            "key-release-event",
-            self.on_key_release_event,
-            "local_account_name")
         self.local_password_entry = self._builder.get_object(
             "local-password-entry")
         self.local_password_entry.connect(

=== modified file 'landscape/ui/view/tests/test_configuration.py'
--- landscape/ui/view/tests/test_configuration.py	2012-03-06 17:43:11 +0000
+++ landscape/ui/view/tests/test_configuration.py	2012-03-14 10:09:21 +0000
@@ -145,8 +145,6 @@
         self.assertEqual("foo", dialog.hosted_account_name_entry.get_text())
         self.assertEqual("bar", dialog.hosted_password_entry.get_text())
         self.assertEqual("", dialog.local_landscape_host_entry.get_text())
-        self.assertEqual("standalone",
-                         dialog.local_account_name_entry.get_text())
         self.assertEqual("", dialog.local_password_entry.get_text())
 
     def test_revert(self):
@@ -163,8 +161,6 @@
         dialog.local_landscape_host_entry.set_text("more.barn")
         while Gtk.events_pending():
             Gtk.main_iteration()
-        self.assertEqual("standalone",
-                         dialog.local_account_name_entry.get_text())
         self.assertEqual("bar", dialog.hosted_password_entry.get_text())
         self.assertEqual("more.barn",
                          dialog.local_landscape_host_entry.get_text())
@@ -237,8 +233,6 @@
         self.assertEqual("", dialog.hosted_password_entry.get_text())
         self.assertEqual("landscape.localdomain",
                          dialog.local_landscape_host_entry.get_text())
-        self.assertEqual("standalone",
-                         dialog.local_account_name_entry.get_text())
         self.assertEqual("manky", dialog.local_password_entry.get_text())
 
     if not got_gobject_introspection:

=== modified file 'landscape/ui/view/ui/landscape-client-settings.glade'
--- landscape/ui/view/ui/landscape-client-settings.glade	2012-03-14 08:52:31 +0000
+++ landscape/ui/view/ui/landscape-client-settings.glade	2012-03-14 10:09:21 +0000
@@ -202,7 +202,7 @@
       <action-widget response="0">ok-button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="window1">
+  <object class="GtkWindow" id="hosted-window">
     <property name="can_focus">False</property>
     <child>
       <object class="GtkFrame" id="hosted-service-frame">
@@ -323,7 +323,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="window2">
+  <object class="GtkWindow" id="local-window">
     <property name="can_focus">False</property>
     <child>
       <object class="GtkFrame" id="local-service-frame">
@@ -342,20 +342,6 @@
                 <property name="row_spacing">12</property>
                 <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkLabel" id="local-account-name-label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Account name:</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkLabel" id="local-password-label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -364,7 +350,7 @@
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
+                    <property name="top_attach">1</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
@@ -384,21 +370,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="local-account-name-entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="invisible_char">•</property>
-                    <property name="invisible_char_set">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkEntry" id="local-password-entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -410,7 +381,7 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
+                    <property name="top_attach">1</property>
                     <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
@@ -438,7 +409,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="window3">
+  <object class="GtkWindow" id="no-service-window">
     <property name="can_focus">False</property>
     <child>
       <object class="GtkFrame" id="no-service-frame">
@@ -495,28 +466,25 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="entries-sizegroup">
+  <object class="GtkSizeGroup" id="entries-sizgroup">
     <widgets>
-      <widget name="use-type-combobox"/>
+      <widget name="hosted-account-name-entry"/>
+      <widget name="hosted-password-entry"/>
       <widget name="local-landscape-host-entry"/>
-      <widget name="local-account-name-entry"/>
       <widget name="local-password-entry"/>
-      <widget name="hosted-account-name-entry"/>
-      <widget name="hosted-password-entry"/>
-      <widget name="signup-linkbutton"/>
       <widget name="disabled-label"/>
+      <widget name="use-type-combobox"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="labels-sizegroup">
     <widgets>
-      <widget name="use-type-label"/>
+      <widget name="hosted-account-name-label"/>
+      <widget name="hosted-password-label"/>
+      <widget name="no-account-label"/>
       <widget name="local-landscape-host-label"/>
-      <widget name="local-account-name-label"/>
       <widget name="local-password-label"/>
-      <widget name="no-account-label"/>
-      <widget name="hosted-password-label"/>
-      <widget name="hosted-account-name-label"/>
       <widget name="empty-label"/>
+      <widget name="use-type-label"/>
     </widgets>
   </object>
 </interface>