Changeset 2143

Timestamp:

Jul 11, 2016, 12:51:46 PM (3 years ago)

Author:

jrpelegrina

Message:

WIP

Location:

zero-lliurex-flavours/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py (modified) (5 diffs)
• lliurex-po/zero-lliurex-flavours/es.po (modified) (1 diff)
• lliurex-po/zero-lliurex-flavours/zero-lliurex-flavours.pot (modified) (1 diff)

zero-lliurex-flavours/trunk/fuentes/debian/changelog

@@ +1 @@
+zero-lliurex-flavours (0.9.13) xenial; urgency=medium
+
+  * New gui based in python+Gtk
+
+ -- Juan Ramon Pelegrina <juapesai@hotmail.com>  Mon, 11 Jul 2016 10:54:35 +0200
+
 zero-lliurex-flavours (0.9.12) xenial; urgency=medium
 

zero-lliurex-flavours/trunk/fuentes/debian/control

@@ -9 +9 @@
 Package: zero-lliurex-flavours
 Architecture: all
-Depends: ${misc:Depends}, llxcfg-runtime
+Depends: ${misc:Depends}, llxcfg-runtime, python
 Description: Flavours Selection Tool
  Flavours Selection Tool for changing between LliureX flavours

zero-lliurex-flavours/trunk/fuentes/install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py

@@ -13 +13 @@
 import subprocess
 import sys
+import datetime
 from math import pi
 
@@ -400 +401 @@
                 
                 self.thread_ret=-1
-                self.thread_ret=os.system(command)
+                p=subprocess.Popen([command],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)  
+                output=p.communicate()
+                self.thread_ret=p.returncode
+                self.flavour_error=output[1]
                 
         #def execute
@@ -433 +437 @@
                         else:
                                 self.msg_label.show()
-                                msg=_("An error ocurred during installation")
-                                self.msg_label.set_markup(msg)  
+                                msg=_("An error ocurred. See log in /tmp/lliurex-flavours-selector")
+                                self.msg_label.set_markup(msg)
+                                self.log(self.flavour_error)    
                 return self.t.is_alive()
         
@@ -579 +584 @@
                 
                 pctx = PangoCairo.create_layout(ctx)
-                desc = Pango.font_description_from_string ("Noto Sans Bold 8")
+                desc = Pango.font_description_from_string ("Noto Sans Bold 7.5")
                 pctx.set_font_description(desc)
                 pctx.set_markup(grid_button.info["name"])
@@ -813 +818 @@
         # def restore_shadow_alfpha     
 
-        
+        def log(self,error):
+                log_file="/tmp/lliurex-flavour-selector"
+                f=open(log_file,"a")
+                f.write("[" +datetime.datetime.today().strftime("%d/%m/%y %H:%M:%S") + " ] " + "\n" + error + "\n")
+                f.close()
 #awesome tabs
 

zero-lliurex-flavours/trunk/fuentes/lliurex-po/zero-lliurex-flavours/es.po

@@ -29 +29 @@
 
 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:435
-msgid "An error ocurred during installation"
-msgstr "A ocurrido un error durante la instalación"
+msgid "An error ocurred. See log in /tmp/lliurex-flavours-selector"
+msgstr "A ocurrido un error. Revise el log en /tmp/lliurex-flavours-selector"
 
 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:525

zero-lliurex-flavours/trunk/fuentes/lliurex-po/zero-lliurex-flavours/zero-lliurex-flavours.pot

@@ -27 +27 @@
 
 #: ../install-files/usr/share/lliurex-flavours-selector/lliurex-flavours-selector.py:435
-msgid "An error ocurred during installation"
+msgid "An error ocurred. See log in /tmp/lliurex-flavours-selector"
 msgstr ""