diff --git a/po/it.po b/po/it.po
index f5a2eec..0f2824b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -63,26 +63,23 @@ msgstr "Avanti"
msgid "Cancel"
msgstr "Annulla"
-msgid "Step 1/4 - choice of boot file"
-msgstr "Passo 1/4 - scelta del file di boot"
+msgid "Step 1/3 - choice of ISO file"
+msgstr "Passo 1/3 - scelta del file ISO"
-msgid "Step 2/4 - choice of iso file"
-msgstr "Passo 2/4 - scelta del file iso"
+msgid "Step 2/3 - choice of USB key"
+msgstr "Passo 2/3 - scelta della chiavetta USB"
-msgid "Step 3/4 - choice of usb key"
-msgstr "Passo 3/4 - scelta della chiavetta"
-
-msgid "Step 4/4 - installation of openmamba to usb"
-msgstr "Passo 4/4 - installazione di openmamba su usb"
+msgid "Step 3/3 - installation of openmamba to USB"
+msgstr "Passo 3/3 - installazione di openmamba su USB"
msgid "Choose the .cpio file"
msgstr "Scegli l'archivio .cpio per il boot"
-msgid "Choose the openmamba .iso file"
-msgstr "Scegli il file iso di openmamba"
+msgid "Choose the openmamba ISO file"
+msgstr "Scegli il file ISO di openmamba"
-msgid "Choose the usb key"
-msgstr "Scegli la chiavetta usb"
+msgid "Choose the USB key"
+msgstr "Scegli la chiavetta USB"
msgid "Installazione in corso..."
msgstr "Installation in progress..."
diff --git a/src/img/back1.png b/src/img/back1.png
index 810c5fa..7ebabf0 100644
Binary files a/src/img/back1.png and b/src/img/back1.png differ
diff --git a/src/img/back2.png b/src/img/back2.png
index a3d3075..babfaab 100644
Binary files a/src/img/back2.png and b/src/img/back2.png differ
diff --git a/src/img/back3.png b/src/img/back3.png
index 25c9eea..cd36921 100644
Binary files a/src/img/back3.png and b/src/img/back3.png differ
diff --git a/src/img/back4.png b/src/img/back4.png
deleted file mode 100644
index 1f6d3b1..0000000
Binary files a/src/img/back4.png and /dev/null differ
diff --git a/src/img/src/back1.xcf b/src/img/src/back1.xcf
index 6d1aeb9..c7d66ec 100644
Binary files a/src/img/src/back1.xcf and b/src/img/src/back1.xcf differ
diff --git a/src/img/src/back2.xcf b/src/img/src/back2.xcf
index 560109d..a89df2f 100644
Binary files a/src/img/src/back2.xcf and b/src/img/src/back2.xcf differ
diff --git a/src/img/src/back3.xcf b/src/img/src/back3.xcf
index d838cf1..5b49b8e 100644
Binary files a/src/img/src/back3.xcf and b/src/img/src/back3.xcf differ
diff --git a/src/img/src/back4.xcf b/src/img/src/back4.xcf
deleted file mode 100644
index 56251a8..0000000
Binary files a/src/img/src/back4.xcf and /dev/null differ
diff --git a/src/usbinstall.py b/src/usbinstall.py
index c657222..3876fe8 100755
--- a/src/usbinstall.py
+++ b/src/usbinstall.py
@@ -36,7 +36,7 @@ path_dev = ""
dev_model = ""
a_path_dev = [] # Array of choosen devices
a_dev_model = [] # Their models.
-step = 1
+step = 1
choose_type = "" # Type of dialog in choose_file()
#1)###############################(VARIABILI)########################################
@@ -157,20 +157,16 @@ def add_events():
def go_on():
global step, path_cpio, path_iso, path_dev, dev_model
cloud_hide()
- # Step n°1 to n°2
+ # Step 1 to 2
if step == 1:
- step += 1
- step2()
- # Step n°2 to n°3
- elif step == 2:
if path_iso == "":
msg_warn(_("An openmamba's iso is required"))
return
else:
step += 1
- step3()
- # Step n°3 to n°4
- elif step == 3:
+ step2()
+ # Step 2 to 3
+ elif step == 2:
if path_dev == "":
msg_warn(_("You must choose a usb key"))
return
@@ -180,7 +176,7 @@ def go_on():
# Go on only if was pressed yes button
if msg == QtGui.QMessageBox.Yes:
step += 1
- step4()
+ step3()
else:
return
@@ -190,31 +186,22 @@ def go_back():
step -= 1
cloud_hide()
obj_chang_hide()
- # Step n°1 to n°0 -> exit
+ # Step 1 to 0 -> exit
if step == 0:
app.exit(1)
print _("Application terminated by pressing \"cancel\" button")
- # Step n°2 to n°1
+ # Step 2 to 1
elif step == 1:
step1()
- # Step n°3 to n°2
+ # Step 3 to 2
elif step == 2:
step2()
- #~ NON SONO SICURO SERVA (DA TESTARE)
- # Step n°4 to n°3
- elif step == 3:
- step3()
# Event n°3
def choose_file():
global path_cpio, path_iso, choose_type
- # If step in n°1
- if choose_type == "boot":
- nfileName = QtGui.QFileDialog.getOpenFileName(window, _("Choose the boot file"), "/home", "File .cpio.gz (*.cpio.gz)", "cpio *.cpio.gz")
- path_cpio = nfileName
- window.t_file.setText(nfileName)
- # Else if step is n°2
- elif choose_type == "iso":
+ # if step is 1
+ if choose_type == "iso":
nfileName = QtGui.QFileDialog.getOpenFileName(window, _("Choose the iso file"), "/home", "File .iso (*.iso)", "iso *.iso")
path_iso = nfileName
window.t_file.setText(nfileName)
@@ -223,10 +210,8 @@ def choose_file():
def manage_cloud():
global step
if step == 1:
- aiuto = _("This archive is designed to make the usb bootable.") + _(" You can find this file here")
- elif step == 2:
aiuto = _("The file .iso contains the operating system. You can download it from here")
- elif step == 3:
+ elif step == 2:
aiuto = _("Choose an usb key for the installation. All data will be lost")
window.l_cloud.setText(aiuto)
cloud_show()
@@ -342,34 +327,24 @@ def set_objs(i_back, title, descr):
def step1():
- global choose_type, path_cpio
- choose_type = "boot"
- path_cpio = ""
- window.t_file.setText(path_cpio) # Clean path box
- window.b_back.setText(_("Cancel"))
- set_objs("/usr/share/openmamba/usbinstall/img/back1.png", _("Step 1/4 - choice of boot file"), _("Choose the .cpio file"))
- obj_chang_hide()
- list_obj1() # Show a set of object
-
-def step2():
global choose_type, path_iso
choose_type = "iso"
path_iso = ""
window.t_file.setText(path_iso) # Clean path box
- window.b_back.setText(_("Go back"))
- set_objs("/usr/share/openmamba/usbinstall/img/back2.png", _("Step 2/4 - choice of iso file"), _("Choose the openmamba .iso file"))
+ window.b_back.setText(_("Cancel"))
+ set_objs("/usr/share/openmamba/usbinstall/img/back1.png", _("Step 1/3 - choice of ISO file"), _("Choose the openmamba ISO file")+":")
obj_chang_hide()
list_obj1() # Show a set of object
-def step3():
- set_objs("/usr/share/openmamba/usbinstall/img/back3.png", _("Step 3/4 - choice of usb key"), _("Choose the usb key"))
+def step2():
+ set_objs("/usr/share/openmamba/usbinstall/img/back2.png", _("Step 2/3 - choice of USB key"), _("Choose the USB key")+":")
obj_chang_hide()
list_obj2()
get_list() # Get available devices
-def step4():
+def step3():
global process_sh
- set_objs("/usr/share/openmamba/usbinstall/img/back4.png", _("Step 4/4 - installation of openmamba to usb"), _("Installation in progress..."))
+ set_objs("/usr/share/openmamba/usbinstall/img/back3.png", _("Step 3/3 - installation of openmamba to USB"), _("Installation in progress..."))
# Hide all unnecessary objects
obj_chang_hide()
window.b_help.hide()
@@ -381,14 +356,13 @@ def step4():
dbus_start()
process_sh = Popen(["pkexec", "/usr/sbin/usbinstall", path_dev, path_cpio, path_iso, "-d"])
-
-# Show a list of object (step 1 and 2)
+# Show a list of object (step 1)
def list_obj1():
window.t_file.show()
window.pach1.show()
window.b_open_file.show()
-# Show a list of object (step 3)
+# Show a list of object (step 2)
def list_obj2():
window.c_usb.show()
window.b_refresh.show()
@@ -413,7 +387,6 @@ def end_forced():
mainloop.quit()
#print _("Installation aborted")
app.exit(1)
-
# Program start
app = QtGui.QApplication(['usbinstall'])
@@ -428,6 +401,3 @@ def run():
if __name__ == "__main__":
run()
#5)##############################(PROGRAM CODE)######################################
-
-
-