Changeset 5451

Timestamp:

Jul 5, 2017, 10:27:17 AM (4 years ago)

Author:

hectorgh

Message:

wip

Location:

lliurex-shutdowner/trunk/fuentes

Files:

• lliurex-shutdowner-common.install/usr/sbin/shutdown-lliurex-dialog (modified) (4 diffs)
• lliurex-shutdowner.install/usr/share/lliurex-shutdowner/LliurexShutdowner.py (modified) (3 diffs)

lliurex-shutdowner/trunk/fuentes/lliurex-shutdowner-common.install/usr/sbin/shutdown-lliurex-dialog

@@ -21 +21 @@
                 
                 self.msg=_("System will shutdown in %s seconds. Please, save your files.")
+                
                 self.countdown=wait_time*60
                 self.current_counter=0
+                
                 self.start_gui()
+                
                 
         #def init
@@ -31 +34 @@
                 builder=Gtk.Builder()
                 builder.set_translation_domain('lliurex-shutdowner-common')
-                builder.add_from_file("/usr/share/lliurex-shutdowner/rsrc/shutdowner-lliurex-dialog.ui")
+                builder.add_from_file("/usr/share/lliurex-shutdowner/rsrcs/shutdowner-lliurex-dialog.ui")
                 self.main_window=builder.get_object("shutdown_window")
                 
@@ -57 +60 @@
                 self.msg_label.set_text(self.msg%self.countdown)
                 
+                # The way this is beeing executed, shutdown -h now is missing authentication to work
+                self.shutdown_button.hide()
+                
                 self.main_window.show()
                 
@@ -80 +86 @@
         def shutdown_clicked(self,button):
                 
-                command="shutdown -h now"
+                command="shutdown -c; shutdown -h now"
                 os.system(command)
                 Gtk.main_quit()

lliurex-shutdowner/trunk/fuentes/lliurex-shutdowner.install/usr/share/lliurex-shutdowner/LliurexShutdowner.py

@@ -99 +99 @@
                 self.main_window.connect("delete_event",self.check_changes)
                 self.login_button.connect("clicked",self.login_clicked)
+                self.user_entry.connect("activate",self.entries_press_event)
+                self.password_entry.connect("activate",self.entries_press_event)
+                self.server_ip_entry.connect("activate",self.entries_press_event)
                 
                 self.cron_switch.connect("notify::active",self.cron_switch_changed)
@@ -108 +111 @@
         
         # SIGNALS ########################################################
+        
+        def entries_press_event(self,widget):
+                
+                self.login_clicked(None)
+                
+        #def entries_press_event
+        
         
         def cron_switch_changed(self,widget,data):
@@ -163 +173 @@
                 self.login_msg_label.set_text(_("Validating user..."))
                 
-                widget.set_sensitive(False)
+                self.login_button.set_sensitive(False)
                 self.validate_user(user,password)