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

Timestamp:

Oct 27, 2016, 1:50:12 PM (4 years ago)

Author:

jrpelegrina

Message:

WIP in new GUI

Location:

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

Files:

• lliurex-up (modified) (14 diffs)
• rsrc/lliurex-up.ui (modified) (1 diff)

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

@@ -131 +131 @@
                 self.gather_logo_box=builder.get_object("gather_logo_box")
                 self.gather_label=builder.get_object("gather_label")
+                self.spinner=builder.get_object("spinner")
 
                 self.update_box=builder.get_object("update_box")
@@ -199 +200 @@
                 column=Gtk.TreeViewColumn("Installed")
                 cell=Gtk.CellRendererPixbuf()
-                #cell.set_property("stock-size",Gtk.IconSize.DIALOG)
                 column.pack_start(cell,True)
                 column.add_attribute(cell,"pixbuf",3)
@@ -235 +235 @@
                 self.t.daemon=True
                 self.t.start()
+                self.spinner.start()
                 
                 self.package_list=[]
@@ -363 +364 @@
 
                 is_lliurexup_update=True #Call to the function to get the version of lliurex-up
+                self.updated_percentage(0.5)
                 time.sleep(1)
 
@@ -372 +374 @@
                         while not is_lliurexup_updated:
                                 pass
+                        
+                        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)    
+                        time.sleep(2)   
                         os.execl(sys.executable, sys.executable, *sys.argv)     
-                        self.updated_percentage(1.0)
+                        
                         return True
 
@@ -383 +390 @@
 
         def check_mirror(self):
+                print "Check mirror"
 
                 self.response=-1
                 msg_gather="<span><b>"+_("Checking if mirror exist and there is updated")+"</b></span>"
                 self.gather_label.set_markup(msg_gather)
+                self.updated_percentage(0.5)
                 
                 exist_mirror=False #Call to the function to check mirror
@@ -404 +413 @@
                         if self.response==0:
                                 self.updated_percentage(1.0)
+                                time.sleep(1)
                                 return True
 
@@ -409 +419 @@
                                 msg_gather="<span><b>"+_("Updating mirror")+"</b></span>"
                                 self.gather_label.set_markup(msg_gather)
-                        
+                                self.updated_percentage(0.75)
                                 is_mirror_updated=True # Call to the function to update mirror
                                 time.sleep(1)
@@ -425 +435 @@
                 
                 self.total_process=3.0
+                self.total_progress=0.0
                 self.pbar_rang=1.0
                 self.percentage=0.0
-                self.updated_percentage(0.01)
+                self.ending_process=0.0
+                self.updated_percentage(0.0)
                 
                 check_lliurexup=self.check_lliurexup_version()
@@ -439 +451 @@
                 
                 try:
-                        self.updated_percentage(0.25)
+                        print ("Checking info")
+                        self.updated_percentage(0.5)
                         p1=subprocess.Popen(["llxcfg-upgrade-version-scripts","details"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
                         output=p1.communicate()[0]
@@ -463 +476 @@
                         self.pbar.hide()
                         self.pbar_label.hide()
+                        self.spinner.stop()
                         if len(self.package_list)==0:
                                 msg_gather="<span><b>"+_("Your system is update")+"</b></span>"
@@ -501 +515 @@
                 
                 self.process_block=(self.pbar_rang/self.total_process)
-                print self.process_block
-                self.percentage=self.percentage+self.process_block*completed
-                        
-                print self.percentage
-                self.pbar.set_fraction(self.percentage)
-                
-                value=self.percentage*100
+                self.percentage=self.process_block*completed
+                
+                if self.percentage==self.process_block:
+                        self.ending_process=self.ending_process+1
+                        self.total_progress=self.process_block*self.ending_process
+                else:
+                        self.total_progress=self.total_progress+self.percentage 
+                                
+                self.pbar.set_fraction(self.total_progress)
+                
+                value=self.total_progress*100
                 value=format(value,'.2f')
                 
@@ -564 +582 @@
         #def package_clicked                    
 
-        def execute_scritps(self):
+        def execute_scripts(self):
                 
                 self.vterminal.spawn_sync(
@@ -581 +599 @@
                                 
         def upgrade_process(self,widget, event=None):
+        
                 self.total_process=1.0
+                self.total_progress=0.0
                 self.pbar_rang=1.0
                 self.percentage=0.0
-                self.updated_percentage(0.01)
+                self.ending_process=0.0
+                self.updated_percentage(0.0)
 
                 self.t=threading.Thread(target=self.execute_scripts,args=())

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

@@ -141 +141 @@
         <property name="fill">True</property>
         <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="box4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox" id="box_spinner">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkSpinner" id="spinner">
+                <property name="width_request">50</property>
+                <property name="height_request">50</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="opacity">0.97999999999999998</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
       </packing>
     </child>