Changeset 2929 for lliurex-up/trunk/fuentes/lliurex-up-gui

Timestamp:

Nov 24, 2016, 1:23:57 PM (4 years ago)

Author:

jrpelegrina

Message:

WIP in gui

Location:

lliurex-up/trunk/fuentes/lliurex-up-gui

Files:

• LliurexUpConnect.py (modified) (4 diffs)
• lliurex-up.py (modified) (17 diffs)
• rsrc/lliurex-up.ui (modified) (1 diff)

lliurex-up/trunk/fuentes/lliurex-up-gui/LliurexUpConnect.py

@@ -34 +34 @@
         def isLliurexUpIsUpdated(self):
                 try:
-                        is_lliurexup_update=self.llxUpCore.isLliurexUpIsUpdated()
-                        return is_lliurexup_update
+                        is_lliurexup_updated=self.llxUpCore.isLliurexUpIsUpdated()
+                        return is_lliurexup_updated
                 
                 except Exception, e:
@@ -44 +44 @@
         def installLliurexUp(self):
                 try:
-                        #GLib.timeout_add(100,self.is_running)
-                        #self.t=threading.Thread(target=self.installing)
-                        #self.t.daemon=True
-                        #self.t.start()
                         is_lliurexup_installed=self.llxUpCore.installLliurexUp()
                         return is_lliurexup_installed
@@ -59 +55 @@
         def check_mirror(self):
                 try:
-                        is_mirror_update=self.llxUpCore.lliurexMirrorIsUpdated()
-                        print is_mirror_update['action']
-                        return is_mirror_update['action']
+                        is_mirror_updated=self.llxUpCore.lliurexMirrorIsUpdated()
+                        
+                        if is_mirror_updated['action']=='update':
+                                return False
+                        else: 
+                                return True
                 
                 except Exception, e:
@@ -92 +91 @@
                         packages_parse=[]
                         packages=self.llxUpCore.getPackagesToUpdate()
-                        for item in packages:
-                                version=packages[item]
-                                packages_parse.append(item+";"+version['candidate']+";"+'20Mb')
+                        if len(packages)>0:
+                                for item in packages:
+                                        version=packages[item]
+                                        packages_parse.append(item+";"+version['candidate']+";"+'20Mb')
 
-                        return packages_parse   
+                        return packages_parse
+
 
                 except Exception, e:

lliurex-up/trunk/fuentes/lliurex-up-gui/lliurex-up.py

@@ -258 +258 @@
                 self.no_button_box.hide()
 
-                self.pbar_label.show()
+                #self.pbar_label.show()
                 self.pbar.show()
                 
@@ -267 +267 @@
                 msg_gather="<span><b>"+_("Checking for new version of lliurex-up")+"</b></span>"
                 self.gather_label.set_markup(msg_gather)
-                self.updated_percentage(0.15)
                 GLib.timeout_add(100,self.pulsate_checksystem)
                 
@@ -299 +298 @@
 
                 self.response=-1
-                self.spinner.start()
+                #self.spinner.start()
                 
                 self.package_list=[]
@@ -438 +437 @@
         def pulsate_checksystem(self):
 
+
                 if not self.check_lliurexup_t.launched:
+                        print "Checking lliurex up version"
                         self.check_lliurexup_t.start()
                         self.check_lliurexup_t.launched=True
 
                 if  self.check_lliurexup_t.done:
-                        if  not self.is_lliurexup_update and not self.install_lliurexup_t.is_alive():
-                                if not self.install_lliurexup_t.launched:
+                        if  not self.is_lliurexup_updated:
+                                if  not self.install_lliurexup_t.is_alive() and not self.install_lliurexup_t.launched:
                                         print "Updating lliurex-up"
                                         msg_gather="<span><b>"+_("Updating lliurex-up")+"</b></span>"
@@ -455 +456 @@
                                                 msg_gather="<span><b>"+_("Lliurex-up is now updated and will be reboot")+"</b></span>"
                                                 self.gather_label.set_markup(msg_gather)
-                                                self.updated_percentage(1.0)
                                                 t=threading.Thread(target=self.reboot_me)
                                                 t.daemon=True
@@ -471 +471 @@
                                 if      self.check_mirror_t.done:
 
-                                        if self.is_mirror_update == 'update':
+                                        if not self.is_mirror_updated:
                                                 print "Asking if mirror will be update"
 
                                                 self.yes_button_box.show()
                                                 self.no_button_box.show()
-                                                msg_gather="<span><b>"+_("Do you want to create or update your mirror?")+"</b></span>"
+                                                msg_gather="<span><b>"+_("Your mirror is not update.Do you want to update it?")+"</b></span>"
                                                 self.gather_label.set_markup(msg_gather)
                                                 GLib.timeout_add(100,self.pulsate_wait_response)
@@ -488 +488 @@
 
                 if  self.check_lliurexup_t.is_alive():
+                        self.pbar.pulse()
                         return True
 
                 if self.install_lliurexup_t.launched:  
                         if self.install_lliurexup_t.is_alive():
+                                self.pbar.pulse()
                                 return True     
                                         
                 if self.check_mirror_t.launched:
                         if self.check_mirror_t.is_alive():
+                                self.pbar.pulse()
                                 return True
                 
@@ -508 +511 @@
 
         
-                self.is_lliurexup_update=self.llxup_connect.isLliurexUpIsUpdated() #Call to the function to get the version of lliurex-up
+                self.is_lliurexup_updated=self.llxup_connect.isLliurexUpIsUpdated()
                 self.check_lliurexup_t.done=True
                 
@@ -520 +523 @@
         def check_mirror(self):
 
-                self.is_mirror_update=self.llxup_connect.check_mirror()
+                self.is_mirror_updated=self.llxup_connect.check_mirror()
                 self.check_mirror_t.done=True
                 
@@ -536 +539 @@
 
                 if self.response==1:
+                        self.pbar_label.show()
+                        self.updated_percentage(0)
+                        self.spinner.start()
                         self.yes_button_box.hide()
                         self.no_button_box.hide()
@@ -541 +547 @@
                         self.gather_label.set_markup(msg_gather)
                         self.execute_lliurexmirror_t.start()
-                        GLib.timeout_add(100,self.pulsate_updating_mirror)
+                        GLib.timeout_add(1000,self.pulsate_updating_mirror)
                         
                         return False
-
+                
+                self.pbar.pulse()
                 return True
 
@@ -557 +564 @@
                 
                 else:
-                        GLib.timeout_add(100,self.pulsate_get_info)
+                        self.spinner.stop()
+                        self.pbar_label.hide()
+                        GLib.timeout_add(1000,self.pulsate_get_info)
                         return False    
 
@@ -565 +574 @@
 
         def pulsate_get_info(self):
-        
+
+                self.pbar.pulse()
                 if not self.gather_packages_t.is_alive() and not self.gather_packages_t.launched:
                         print "Gather packages"
@@ -578 +588 @@
                                 self.gather_label.set_markup(msg_gather)
                                 self.pbar.hide()
-                                self.pbar_label.hide()
-                                self.spinner.stop()
                                 self.cancel_button_box.show()
                                 print "Sytem update. Nothing to do"
@@ -590 +598 @@
                                 self.pbar.hide()
                                 self.pbar_label.hide()
-                                self.spinner.stop()
                                 self.stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT)
                                 self.stack.set_visible_child_name("update")     
@@ -631 +638 @@
                 
         def updated_percentage(self,completed):
-                
-                self.pbar.set_fraction(completed)
-                self.per=completed
-                
-                value=completed*100
-                value=format(value,'.2f')
-                
-                msg_percentage="<span><b>"+value+"%"+"</b></span>"
+
+                percentage=completed/100.0
+                self.pbar.set_fraction(percentage)
+                
+                msg_value=format(completed,'.0f')
+                
+                msg_percentage="<span><b>"+msg_value+"%"+"</b></span>"
                 self.pbar_label.set_markup(msg_percentage)
                 
@@ -705 +711 @@
                 self.percentage=0.0
                 self.ending_process=0.0
-                self.updated_percentage(0.0)
+                self.updated_percentage(0)
 
                 self.t=threading.Thread(target=self.execute_scripts,args=())

lliurex-up/trunk/fuentes/lliurex-up-gui/rsrc/lliurex-up.ui

@@ -245 +245 @@
                     <property name="can_focus">False</property>
                     <property name="margin_bottom">5</property>
-                    <property name="label" translatable="yes">label</property>
                   </object>
                   <packing>