Changeset 7563 for home-eraser/trunk/fuentes/home-eraser-gui.install/usr/share/home-eraser/HomeEraser.py

Timestamp:

Jun 27, 2018, 2:25:41 PM (3 years ago)

Author:

daduve

Message:

Adding logging window

File:

• home-eraser/trunk/fuentes/home-eraser-gui.install/usr/share/home-eraser/HomeEraser.py (modified) (7 diffs)

home-eraser/trunk/fuentes/home-eraser-gui.install/usr/share/home-eraser/HomeEraser.py

@@ -69 +69 @@
         #log="/var/log/home_eraser.log"
         
+        # ********HACKKKKKK
+        server="server"
+        
         detect_connected_clients_cancelled=False
         
@@ -86 +89 @@
                 
                 self.n4d_man=N4dManager.N4dManager()
-                self.n4d_man.set_server(args_dic["server"])
+                self.n4d_man.set_server(args_dic[self.server])
                 
                 if args_dic["gui"]:
@@ -104 +107 @@
                 self.main_window=builder.get_object("main_window")
                 self.main_window.set_icon_from_file('/usr/share/home-eraser/rsrc/home-eraser-icon.svg')
-                
+
                 self.main_box=builder.get_object("main_box")
-                
-                self.apply_button=builder.get_object("apply_button")
+                self.login_box=builder.get_object("login_box")
+                self.main_content_box=builder.get_object("main_content_box")
+                
+                self.stack=Gtk.Stack()
+                self.stack.set_transition_type(Gtk.StackTransitionType.CROSSFADE)
+                self.stack.set_transition_duration(500)
+                self.stack.add_titled(self.login_box,"login","login")
+                self.stack.add_titled(self.main_content_box,"main","main")
+                
+                self.stack.show_all()
+                
+                self.main_box.pack_start(self.stack,True,True,5)
+                
+                self.login_button=builder.get_object("login_button")
+                self.entry_user=builder.get_object("entry1")
+                self.entry_password=builder.get_object("entry2")
+                self.login_msg_label=builder.get_object("login_msg_label")
+                
                 self.checkb1 = builder.get_object("checkbutton1")
                 self.checkb2 = builder.get_object("checkbutton2")
@@ -114 +133 @@
                 self.checkb5 = builder.get_object("checkbutton5")
                 self.checkb6 = builder.get_object("checkbutton6")
+                self.apply_button=builder.get_object("apply_button")
                 self.num_clients_glade=builder.get_object("num_clients_glade")
                 
@@ -123 +143 @@
         
         def connect_signals(self):
-                
-                # ####################
-                #HACKED TESTING GUI
-                self.login_clicked()
-                # ######
-                
+                        
                 self.main_window.connect("destroy",Gtk.main_quit)
                 
                 self.apply_button.connect("clicked",self.apply_button_clicked)
                 
+                self.login_button.connect("clicked",self.login_clicked)
+                
                 
         #def connect_signals
-        
-        
-        # SIGNALS ########################################################
-        
-        #def login_clicked(self,widget):
-        
-        def login_clicked(self):
-                # HACK
-                
-                user="lliurex"
-                password="lliurex"
-                server="localhost"
-                
-                self.user_val=[user,password]
-                self.n4d_man.user_val=self.user_val
-                
-                self.n4d_man.get_client_list()
-                        
-                
-                
-                self.dprint("Clients connected: %s"%self.n4d_man.detected_clients)
-                self.num_clients_glade.set_text(str(self.n4d_man.detected_clients))
-                
-                t2=threading.Thread(target=self.n4d_man.update_client_list_thread)
-                t2.daemon=True
-                t2.start()
-                
-                GLib.timeout_add(5000,self.client_list_listener)
-                
-                '''user=self.user_entry.get_text()
-                password=self.password_entry.get_text()
-                server=self.server_ip_entry.get_text()          
-
-                if server!="":
-                        self.n4d_man.set_server(server)
-                
-                
+
+        # SIGNALS #######################################################       
+        
+        def login_clicked(self,button):
+                
+                self.login_button.set_sensitive(False)
                 self.login_msg_label.set_text(_("Validating user..."))
                 
-                self.login_button.set_sensitive(False)'''
-                #self.validate_user(user,password)
+                user=self.entry_user.get_text()
+                password=self.entry_password.get_text()
+                self.user_val=(user,password)
+                server="server"
+                
+                self.validate_user(user,password)
                 
         #def login_clicked
+        
+        def validate_user(self,user,password):
+                
+                
+                t=threading.Thread(target=self.n4d_man.validate_user,args=(user,password,))
+                t.daemon=True
+                t.start()
+                GLib.timeout_add(500,self.validate_user_listener,t)
+                
+        #def validate_user
+        
+        def validate_user_listener(self,thread):
+                        
+                if thread.is_alive():
+                        return True
+                                
+                self.login_button.set_sensitive(True)
+                
+                if not self.n4d_man.user_validated:
+                        self.login_msg_label.set_markup("<span foreground='red'>"+_("Invalid user, please only admin users.")+"</span>")
+                else:
+                        group_found=False
+                        for g in ["adm","admins"]:
+                                if g in self.n4d_man.user_groups:
+                                        group_found=True
+                                        break
+                                        
+                        if group_found:
+                                self.n4d_man.get_client_list()
+                                # ***START LOG
+                                self.dprint("")
+                                self.dprint("** START HOME ERASER GUI **")
+                                self.dprint("   ---------------------")
+                                self.dprint("")
+                                # ##########
+                                
+                                self.stack.set_visible_child_name("main")
+                                self.dprint("Clients connected: %s"%self.n4d_man.detected_clients)
+                                self.num_clients_glade.set_text(str(self.n4d_man.detected_clients))
+                                
+                                t2=threading.Thread(target=self.n4d_man.update_client_list_thread)
+                                t2.daemon=True
+                                t2.start()
+                                
+                                GLib.timeout_add(5000,self.client_list_listener)
+                        else:
+                                self.login_msg_label.set_markup("<span foreground='red'>"+_("Invalid user, please only admin users.")+"</span>")
                 
         
@@ -238 +275 @@
                                 
                                 dialog = Gtk.MessageDialog(None,0,Gtk.MessageType.WARNING, Gtk.ButtonsType.YES_NO, "HOME ERASER")
-                                dialog.format_secondary_text(_("Are you sure to delete?"))
+                                dialog.format_secondary_text(_("Are you sure you want to delete?"))
                                 response=dialog.run()
                                 dialog.destroy()
@@ -249 +286 @@
                         else:
                                 dialog = Gtk.MessageDialog(None,0,Gtk.MessageType.INFO, Gtk.ButtonsType.OK, "HOME ERASER")
-                                dialog.format_secondary_text(_("You don't select any option to delete."))
+                                dialog.format_secondary_text(_("You didn't select any option to delete."))
                                 response=dialog.run()
                                 dialog.destroy()