From 15653e7ac79c84cfd30a65acc2c08eacd1275bd5 Mon Sep 17 00:00:00 2001
From: Alan <alan@boum.org>
Date: Fri, 30 Oct 2015 17:13:15 +0100
Subject: [PATCH] Add button to disable encrypted storage

---
 greeter.py | 16 ++++++++++++++--
 greeter.ui | 13 +++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/greeter.py b/greeter.py
index fc66c5d..e645f9d 100755
--- a/greeter.py
+++ b/greeter.py
@@ -150,9 +150,11 @@ class GreeterMainWindow(Gtk.ApplicationWindow):
         treeview_tz = self._builder.get_object('treeview_tz')
 
         self.box_admin_popover = self._builder.get_object('box_admin_popover')
-        self.entry_admin_password = \
-                self._builder.get_object('entry_admin_password')
+        self.box_admin_password= self._builder.get_object('box_admin_password')
+        self.entry_admin_password = self._builder.get_object('entry_admin_password')
+        self.box_admin_verify = self._builder.get_object('box_admin_verify')
         self.entry_admin_verify = self._builder.get_object('entry_admin_verify')
+        self.button_admin_disable = self._builder.get_object('button_admin_disable')
         self.box_macspoof_popover = self._builder.get_object('box_macspoof_popover')
         switch_macspoof = self._builder.get_object('switch_macspoof')
         self.box_network_popover = self._builder.get_object('box_network_popover')
@@ -340,6 +342,9 @@ class GreeterMainWindow(Gtk.ApplicationWindow):
         if self.setting_admin_check():
             self.label_settings_admin_value.set_text(
                 self.__get_on_off_string(self.entry_admin_password.get_text()))
+            self.box_admin_password.set_visible(False)
+            self.box_admin_verify.set_visible(False)
+            self.button_admin_disable.set_visible(True)
             if hasattr(self, 'popover_admin'):
                 self.popover_admin.set_visible(False)
             return True
@@ -387,6 +392,13 @@ class GreeterMainWindow(Gtk.ApplicationWindow):
                 self.stack_add_setting.get_child_by_name('setting-details'))
         return False
 
+    def cb_button_admin_disable_clicked(self, widget, user_data=None):
+        self.entry_admin_password.set_text("")
+        self.entry_admin_verify.set_text("")
+        self.box_admin_password.set_visible(True)
+        self.box_admin_verify.set_visible(True)
+        self.button_admin_disable.set_visible(False)
+
     def cb_button_help_clicked(self, widget, user_data=None):
         dialog = Gtk.MessageDialog(
                 self,
diff --git a/greeter.ui b/greeter.ui
index 1e23fdb..a430b88 100644
--- a/greeter.ui
+++ b/greeter.ui
@@ -124,6 +124,19 @@
         <property name="position">3</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkButton" id="button_admin_disable">
+        <property name="label" translatable="yes">Disable</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <signal name="clicked" handler="cb_button_admin_disable_clicked" swapped="no"/>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
   </object>
   <object class="GtkSizeGroup" id="sizegroup_admin">
     <widgets>
-- 
2.11.4.GIT