Changeset 3960

Timestamp:

Mar 15, 2017, 4:31:37 PM (2 years ago)

Author:

daduve

Message:

Fixed bugs: login with spinner

Location:

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer

Files:

• Core.py (modified) (1 diff)
• LliurexRemoteInstaller.py (modified) (4 diffs)
• N4dManager.py (modified) (1 diff)
• lliurex-remote-installer.ui (modified) (1 diff)

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer/Core.py

@@ -12 +12 @@
         DEBUG=True
         os.chdir(sys.path[0])
+        
         @classmethod
         def get_core(self):

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer/LliurexRemoteInstaller.py

@@ -10 +10 @@
 import Dialog
 import sys
+import time
 import threading
 
@@ -64 +65 @@
                 self.login_msg_label=builder.get_object("login_msg_label")
                 self.server_ip_entry=builder.get_object("server_ip_entry")
-                
+                self.validate_spinner=builder.get_object("validate_spinner")
         
                 self.login_overlay.add_overlay(self.login_box)
                 self.login_overlay.show_all()
+                
                 
                 #FIN LOGIN
@@ -103 +105 @@
                 self.main_window.show_all()
                 self.show_main_controls(False)
+                self.validate_spinner.hide()
+                
                 
                 
@@ -180 +184 @@
                 
         #def entries_press_event
-        
-        def validate_user_clicked(self,widget):
-                
-                try:
-                        self.thread=threading.Thread(target=self.validate_user(widget))
-                        self.thread.daemon=True
-                        self.thread.start()
-                        
-                        main_window=self.core.lri.main_window
-                        dialog=Dialog.ApplyingChangesDialog(main_window,title="Lliurex Remote Installer",msg="Validating user.......")
-                        dialog.show()
-                        GLib.timeout_add(500,self.validate_user_clicked_delete,dialog)
-                        
-                except Exception as e:
-                        print e
-                        return False
-        
-        #def validate_user_clicked
-        
-        def validate_user_clicked_delete (self,dialog):
+
+        
+        
+        def validate_user_thread(self):
+                
+                self.login_ret=self.core.n4d.validate_user(self.user_entry.get_text(),self.password_entry.get_text(),self.server_ip_entry.get_text())
+                
+        #def validate_user_thread
+                
+        
+        def validate_user(self,widget):
+                
+                self.login_msg_label.hide()
+                self.validate_spinner.show()
+                
+                self.login_button.set_sensitive(False)
+                
+                self.thread=threading.Thread(target=self.validate_user_thread)
+                self.thread.daemon=True
+                self.thread.start()
+
+                GLib.timeout_add(500,self.validate_user_thread_listener)
+                
+                
+        #def validate_user
+        
+        def validate_user_thread_listener(self):
                 
                 if self.thread.is_alive():
                         return True
                 
-                dialog.destroy()
-                
-                if self.login_ok:
+                if not self.login_ret[0]:
+                        self.login_msg_label.set_text("%s"%self.login_ret[1])
+                        self.validate_spinner.hide()
+                        self.login_msg_label.show()
+                        self.login_button.set_sensitive(True)
+
+                else:
+                        
                         self.load_values()
-                        self.not_validate=False
                         self.stack.set_visible_child_name("apt")
                         self.show_main_controls(True)
-        
-        def validate_user(self,widget):
-                
-                self.login_ok=False
-                ret=self.core.n4d.validate_user(self.user_entry.get_text(),self.password_entry.get_text(),self.server_ip_entry.get_text())
-                
-                if not ret[0]:
-                        self.login_msg_label.set_text("%s"%ret[1])
-                        return False
-                else:
-                        self.login_ok=True
-                        return True
-                
-                
-        #def validate_user
+                
+                return False
+                
+                
+                
+        #def validate_user_thread
         
         def check_changes(self,widget,event):

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer/N4dManager.py

@@ -182 +182 @@
                                         return [False,"User is not allowed to use this application"]
                                         
-                        return [False,"Your user or passwd is bad"]
+                        return [False,"Wrong user and/or password"]
                         
                 except Exception as e:

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer/lliurex-remote-installer.ui

@@ -472 +472 @@
             </child>
             <child>
-              <object class="GtkLabel" id="login_msg_label">
+              <object class="GtkSpinner" id="validate_spinner">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">10</property>
+                <property name="margin_bottom">5</property>
+                <property name="active">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="login_msg_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
               </packing>
             </child>