From fa54583f2ca560bf67089016e06f44a3ec306c5c Mon Sep 17 00:00:00 2001
From: Filippo Bedendo Bordon <michiamophil@libero.it>
Date: Sun, 23 Oct 2011 16:38:52 +0200
Subject: [PATCH] Aumentata la width di l_dimensione e correti bug vari

---
 gui.py        |   2 +-
 gui.pyc       | Bin 4600 -> 4589 bytes
 usbinstall.py |  27 ++++++++++++++-------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gui.py b/gui.py
index 6b549e3..25842e4 100644
--- a/gui.py
+++ b/gui.py
@@ -31,7 +31,7 @@ class Ui_MainWindow(object):
         
         # Label della descrizione
         self.l_descrizione = QtGui.QLabel(self.centralwidget)
-        self.l_descrizione.setGeometry(QtCore.QRect(10, 317, 201, 31))
+        self.l_descrizione.setGeometry(QtCore.QRect(10, 317, 251, 31))
         self.l_descrizione.setText(_fromUtf8(""))
         self.l_descrizione.setObjectName(_fromUtf8("l_descrizione"))
         
diff --git a/gui.pyc b/gui.pyc
index b1bc2093b0cfcfadb8f7dc8baa1dd2ac584532e1..43bfc1a8e289031cef1f85177979c3aa9c968a59 100644
GIT binary patch
literal 4589
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
U+;^@%;GHt#X0}r0ia<^L8~Jr-Q~&?~

literal 4600
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
PjGLKC6?HM;O;o-ED&A}~

diff --git a/usbinstall.py b/usbinstall.py
index 1193c37..c1f0cb2 100644
--- a/usbinstall.py
+++ b/usbinstall.py
@@ -2,8 +2,8 @@
 #!/usr/bin/env python
 
 from gui import * 	# Importa la parte grafica
-import subprocess
 
+from subprocess import Popen
 # La parte di dbus
 import gobject
 import dbus
@@ -15,6 +15,7 @@ if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
 # Variabili globali
 passo = 1
+p = "" # Processo del file .sh
 ext 	  = ""	# Vedi apri_file()
 path_Boot = ""	# Percorso file.cpio.gz
 path_Iso  = ""	# Percorso file.iso
@@ -202,22 +203,20 @@ def aggiorna_oggetti(immagine, titolo, descrizione):
 		ui.b_indietro.setText(QtGui.QApplication.translate("Dialog", "Indietro", None, QtGui.QApplication.UnicodeUTF8))
 		visualizza_scegli_file()
 		# Chiudi la nuovola dell'help al cambio di passo
-                chiudi_nuvola()
+		chiudi_nuvola()
 	elif passo == 3:
 		visualizza_lista_usb()
 		lista_usb()
 		# Chiudi la nuovola dell'help al cambio di passo
-                chiudi_nuvola()	
+		chiudi_nuvola()
+	elif passo == 4:
+		chiudi_nuvola()
 	ui.t_file.setText(QtGui.QApplication.translate("Dialog", "", None, QtGui.QApplication.UnicodeUTF8))  		
 	ui.i_back.setPixmap(QtGui.QPixmap(immagine))
 	Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", titolo, None, QtGui.QApplication.UnicodeUTF8))
 	ui.l_descrizione.setText(QtGui.QApplication.translate("Dialog", descrizione, None, QtGui.QApplication.UnicodeUTF8))
 	
 	
-		
-## Funzione principale, installa openmamba sull'usb scelto
-def installazione_start():
-	a=0
 
 ## Setta la variabili globali sel_usb_* con l'usb scelto
 def seleziona_usb(i):
@@ -242,8 +241,7 @@ def passo3():
 
 	
 def passo4():
-	from subprocess import Popen
-
+	global p
 	aggiorna_oggetti("img/back4.png", "Passo 4/4 - installazione di openmamba su usb", "Installazione in corso...")	
 	
 	# Nasconde gli oggetti superflui:
@@ -287,14 +285,17 @@ class setta_dbus(dbus.service.Object):
 	mainloop.quit()
 	app.exit(0)
 
-
+# Termina lo scipt e dbus insieme alla finestra
+def closeEvent(form, event):
+	installazione_terminata()
 
 
 def installazione_terminata():
+	global p
 	print "Installazione terminata"	
 	msg = QtGui.QMessageBox.information(None, "Informazione", "Installazione terminata correttamente")
-	
-        mainloop.quit()
+	p.terminate()
+	mainloop.quit()
 	app.exit(0)       
 
 # Inizializza la parte grafica
@@ -308,7 +309,7 @@ def run():
 	assegna_eventi()
 	passo1()
 	
-	Dialog.show() # mostra il dialog precedentemente creato
+	Dialog.show() # Mostra il dialog precedentemente creato
 	
 	return app.exec_()