Merge branch 'master' of https://github.com/papoteur-mga/isodumper

accept modifications from david_david

3 files changed, 36 insertions, 13 deletions

diff --git a/README.md b/README.md
index 30da38b..8c9cada 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,25 @@
 isodumper
 =========
 
-A tool for writing ISO amges on a USB stick. It's a fork of usb-imagewriter.
+A tool for writing ISO images on a USB stick. It's a fork of usb-imagewriter.
+
+
+Requirements
+-------------
+
+- coreutils
+- udisks
+- procps
+- python
+- xterm
+- pygtk2.0-libglade
+
+
+License
+--------
+
+GPLv2+, see COPYING.
+
+Authors
+--------
+Papoteur, <papoteur@mageialinux-online.org>
diff --git a/lib/isodumper.py b/lib/isodumper.py
index b891cb2..7f22916 100755
--- a/lib/isodumper.py
+++ b/lib/isodumper.py
@@ -4,8 +4,8 @@
 #  
 #  Author: Oliver Grawert <ogra@ubuntu.com>
 # 
-#   Modifications 2013 from papoteur <papoteur@mageialinux-online.org>
-#   and Geiger David <david.david@mageialinux-online.org>
+#  Modifications 2013 from papoteur <papoteur@mageialinux-online.org>
+#  and Geiger David <david.david@mageialinux-online.org>
 #  This program is free software; you can redistribute it and/or 
 #  modify it under the terms of the GNU General Public License as 
 #  published by the Free Software Foundation; either version 2 of the
@@ -31,7 +31,7 @@ import gettext
 from gettext import gettext as _
 
 
-class ImageWriter:
+class IsoDumper:
     def __init__(self):
         APP="isodumper"
         DIR="/usr/share/locale"
@@ -42,7 +42,7 @@ class ImageWriter:
         gtk.glade.textdomain(APP)
 
         # get glade tree
-        self.gladefile = "/documents/isodumper-0.1.0/share/isodumper/isodumper.glade"
+        self.gladefile = "/usr/share/isodumper/isodumper.glade"
         self.wTree = gtk.glade.XML(self.gladefile)
 
         # get globally needed widgets
@@ -193,7 +193,7 @@ class ImageWriter:
                         self.emergency()
                     written= written+bs
                     if written > steps[indice]:
-                        if indice%5==0:
+                        if indice%1==0:
                             self.logger(_('Wrote: ')+str(indice)+'% '+str(written)+' bytes')
                             mark = self.log.create_mark("end", self.log.get_end_iter(), False)
                             self.logview.scroll_to_mark(mark, 0.05, True, 0.0, 1.0)
@@ -275,5 +275,5 @@ class ImageWriter:
             gobject.timeout_add(130, lambda: self.window.reshow_with_initial_size())
 
 if __name__ == "__main__":
-    app = ImageWriter()
+    app = IsoDumper()
     gtk.main()
diff --git a/share/applications/isodumper.desktop b/share/applications/isodumper.desktop
index 20bda04..5dff84e 100644
--- a/share/applications/isodumper.desktop
+++ b/share/applications/isodumper.desktop
@@ -1,9 +1,11 @@
-
 [Desktop Entry]
-Version=1.0
+Name=IsoDumper
+Comment=A GUI tool to write .img and .iso files to USB Keys
+Comment[fr]=Outil graphique pour écrire des fichiers .IMG et .ISO sur clés USB
+Comment[de]=Ein Programm zum scheiben von *.img and *.iso Dateien auf USB-Sicks
+Comment[pt]=Um Programa para gravar ficheiros *.img e *.iso em dispositivos USB
+Icon=isodumper.png
+Exec=/sbin/isodumper
 Type=Application
 Terminal=false
-Icon=gtk-execute
-Exec=gksudo isodumper
-Name=ImageWriter
-Categories=GNOME;GTK;Utility
+Categories=System;