Merge lp:~magnun-leno/usbmanager/release-1.0 into lp:usbmanager/1.x-hal

[Magnun Leno]

[Magnun Leno (magnun-leno)]

Added and tested formating functions for the following File Systems:
- NTFS;
- FAT16;
- FAT32.

[Magnun Leno (magnun-leno)]

review: Approve

=== modified file 'locale/pt_BR/LC_MESSAGES/usbmanager.mo'
Binary files locale/pt_BR/LC_MESSAGES/usbmanager.mo	2009-08-01 04:08:37 +0000 and locale/pt_BR/LC_MESSAGES/usbmanager.mo	2009-08-07 13:13:11 +0000 differ
=== modified file 'locale/pt_BR/LC_MESSAGES/usbmanager.po'
--- locale/pt_BR/LC_MESSAGES/usbmanager.po	2009-08-01 04:08:37 +0000
+++ locale/pt_BR/LC_MESSAGES/usbmanager.po	2009-08-07 13:13:11 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: usbmanager 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-01 01:04-0300\n"
-"PO-Revision-Date: 2009-08-01 01:06-0300\n"
+"POT-Creation-Date: 2009-08-07 10:10-0300\n"
+"PO-Revision-Date: 2009-08-07 10:12-0300\n"
 "Last-Translator: Magnun Leno da Silva <[e-mail]>\n"
 "Language-Team: Magnun Leno <[e-mail]>\n"
 "MIME-Version: 1.0\n"
@@ -16,12 +16,13 @@
 "X-Poedit-SearchPath-0: ../../../src\n"
 
 #: ../../../src/gui/widgets.py:70
-#: ../../../src/gui/widgets.py:339
+#: ../../../src/gui/widgets.py:340
 msgid "Label"
 msgstr "Rótulo"
 
 #: ../../../src/gui/widgets.py:71
-#: ../../../src/gui/windows.py:136
+#: ../../../src/gui/windows.py:138
+#: ../../../src/gui/windows.py:223
 msgid "Block Device"
 msgstr "Disp. de Bloco"
 
@@ -29,78 +30,99 @@
 msgid "Mounted"
 msgstr "Montado"
 
-#: ../../../src/gui/widgets.py:213
+#: ../../../src/gui/widgets.py:212
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../../../src/gui/widgets.py:213
+#: ../../../src/gui/widgets.py:212
 msgid "Show volume detailed properties"
 msgstr "Mostrar propriedades detalhadas do volume"
 
-#: ../../../src/gui/widgets.py:217
-#: ../../../src/gui/widgets.py:277
+#: ../../../src/gui/widgets.py:216
+#: ../../../src/gui/widgets.py:276
 msgid "Mount/Umount"
 msgstr "Montar/Desmontar"
 
-#: ../../../src/gui/widgets.py:217
+#: ../../../src/gui/widgets.py:216
 msgid "Mount or Umount device"
 msgstr "Montar ou Desmontar dispositivo"
 
-#: ../../../src/gui/widgets.py:221
+#: ../../../src/gui/widgets.py:220
+#: ../../../src/gui/windows.py:238
 msgid "Format"
 msgstr "Formatar"
 
-#: ../../../src/gui/widgets.py:221
+#: ../../../src/gui/widgets.py:220
 msgid "Format devices"
 msgstr "Formatar dispositivos"
 
-#: ../../../src/gui/widgets.py:231
+#: ../../../src/gui/widgets.py:230
 msgid "Quit"
 msgstr "Sair"
 
-#: ../../../src/gui/widgets.py:231
+#: ../../../src/gui/widgets.py:230
 msgid "Quit USBManager"
 msgstr "Sair do USBManager"
 
-#: ../../../src/gui/widgets.py:278
+#: ../../../src/gui/widgets.py:277
 msgid "Mount/Umount selected device"
 msgstr "Montar/Desmontar dispositivo selecionado"
 
-#: ../../../src/gui/widgets.py:281
+#: ../../../src/gui/widgets.py:280
 msgid "Umount"
 msgstr "Desmontar"
 
-#: ../../../src/gui/widgets.py:282
+#: ../../../src/gui/widgets.py:281
 msgid "Umount selected device"
 msgstr "Desmontar dispositivo selecionado"
 
-#: ../../../src/gui/widgets.py:285
+#: ../../../src/gui/widgets.py:284
 msgid "Mount"
 msgstr "Montar"
 
-#: ../../../src/gui/widgets.py:286
+#: ../../../src/gui/widgets.py:285
 msgid "Mount selected device"
 msgstr "Montar dispositivo selecionado"
 
-#: ../../../src/gui/widgets.py:402
+#: ../../../src/gui/widgets.py:407
 msgid "Storage Device"
 msgstr "Armazenamento"
 
-#: ../../../src/gui/widgets.py:414
+#: ../../../src/gui/widgets.py:419
 msgid "Mount Options"
 msgstr "Montagem"
 
-#: ../../../src/gui/widgets.py:432
+#: ../../../src/gui/widgets.py:437
 msgid "General"
 msgstr "Geral"
 
-#: ../../../src/gui/widgets.py:441
+#: ../../../src/gui/widgets.py:446
 msgid "File System"
 msgstr "Sist. de Arquivos"
 
+#: ../../../src/gui/widgets.py:539
+msgid "Device"
+msgstr "Dispositivo"
+
+#: ../../../src/gui/widgets.py:550
+msgid "Formating"
+msgstr "Formatando"
+
+#: ../../../src/gui/widgets.py:570
+msgid "Check for Bad Blocks"
+msgstr "Buscar por Bad Blocks"
+
+#: ../../../src/gui/widgets.py:585
+msgid "Quick Format"
+msgstr "Formatação Rápida"
+
+#: ../../../src/gui/widgets.py:588
+msgid "Enable Compression"
+msgstr "Habilitar Compressão"
+
 #: ../../../src/gui/tray.py:78
 #: ../../../src/gui/tray.py:98
-#: ../../../src/gui/windows.py:61
+#: ../../../src/gui/windows.py:63
 msgid "USB Volume Storage Manager"
 msgstr "Gerenciador de Volumes USB"
 
@@ -225,63 +247,95 @@
 msgid "Erro while umounting %s"
 msgstr "Erro ao desmontar %s"
 
-#: ../../../src/gui/windows.py:119
+#: ../../../src/gui/windows.py:121
 #, python-format
 msgid "%(device_label)s properties"
 msgstr "Propriedades de %(device_label)s"
 
-#: ../../../src/gui/windows.py:132
+#: ../../../src/gui/windows.py:134
 msgid "Vendor"
 msgstr "Fabricante"
 
-#: ../../../src/gui/windows.py:132
+#: ../../../src/gui/windows.py:134
+#: ../../../src/gui/windows.py:223
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../../../src/gui/windows.py:132
+#: ../../../src/gui/windows.py:134
 msgid "Model"
 msgstr "Modelo"
 
-#: ../../../src/gui/windows.py:133
+#: ../../../src/gui/windows.py:135
 msgid "Is Mounted"
 msgstr "Montado"
 
-#: ../../../src/gui/windows.py:133
+#: ../../../src/gui/windows.py:135
 msgid "Read Only"
 msgstr "Somente Leitura"
 
-#: ../../../src/gui/windows.py:134
+#: ../../../src/gui/windows.py:136
 msgid "Mount Point"
 msgstr "Ponto de Montagem"
 
-#: ../../../src/gui/windows.py:134
+#: ../../../src/gui/windows.py:136
 msgid "Category"
 msgstr "Categoria"
 
-#: ../../../src/gui/windows.py:135
+#: ../../../src/gui/windows.py:137
 msgid "Serial Number"
 msgstr "Numero de Série"
 
-#: ../../../src/gui/windows.py:135
+#: ../../../src/gui/windows.py:137
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../../src/gui/windows.py:136
+#: ../../../src/gui/windows.py:138
 msgid "Version"
 msgstr "Versão"
 
-#: ../../../src/gui/windows.py:164
+#: ../../../src/gui/windows.py:166
 msgid "Basic Informations"
 msgstr "Informações Básicas"
 
-#: ../../../src/gui/windows.py:169
+#: ../../../src/gui/windows.py:171
 msgid "Advanced Informations"
 msgstr "Informações Avançadas"
 
+#: ../../../src/gui/windows.py:215
+#, python-format
+msgid "Formating %(device_label)s"
+msgstr "Formatando %(device_label)s"
+
+#: ../../../src/gui/windows.py:224
+msgid "New Label"
+msgstr "Novo Rótulo"
+
+#: ../../../src/gui/windows.py:224
+msgid "Files System"
+msgstr "Sist. de Arquivos"
+
+#: ../../../src/gui/windows.py:320
+msgid "Details"
+msgstr "Detalhes"
+
+#: ../../../src/gui/windows.py:375
+msgid "Formating done"
+msgstr "Formatação concluída"
+
+#: ../../../src/gui/windows.py:376
+msgid "Done"
+msgstr "Concluído"
+
+#: ../../../src/gui/windows.py:379
+msgid "Error while formating"
+msgstr "Erro ao montar"
+
+#: ../../../src/gui/windows.py:380
+msgid "Errors:"
+msgstr "Erros:"
+
 #~ msgid "Volume Label"
 #~ msgstr "Rótulo do Vol."
-#~ msgid "Details"
-#~ msgstr "Detalhes"
 #~ msgid "Volume Size"
 #~ msgstr "Tam. do Vol."
 #~ msgid ""

=== modified file 'src/gui/messages.py'
--- src/gui/messages.py	2009-08-01 04:08:08 +0000
+++ src/gui/messages.py	2009-08-07 13:09:33 +0000
@@ -91,4 +91,4 @@
     ShowMessage(None, _('Erro while mounting %s')%(device.block_device), _("The following error ocurred:")+"\n\n"+msg, 0)
 
 def UmountingError(device, msg):
-    ShowMessage(None, _('Erro while umounting %s')%(device.block_device), _("The following error ocurred:")+"\n\n"+msg, 0)
+    ShowMessage(None, _('Erro while umounting %s')%(device.block_device), _("The following error ocurred:")+"\n\n"+str(msg), 0)

=== modified file 'src/gui/widgets.py'
--- src/gui/widgets.py	2009-08-01 04:08:08 +0000
+++ src/gui/widgets.py	2009-08-07 13:09:33 +0000
@@ -140,7 +140,6 @@
         # Existing Device
         if current_devices.has_key(device.udi):
             properties = current_devices[device.udi]
-            print properties, dir(properties)
             properties[0] = device.label
             properties[1] = device.block_device
             properties[2] = device.is_mounted
@@ -292,7 +291,9 @@
 
 
     def __on_format_click(self, widget, envet=None):
-        messages.FunctionNotImemented()
+        #messages.FunctionNotImemented()
+        device = self.master.main_window.devices_list_view.get_selected_device()
+        self.master.create_formating_window(device)
 
     def __on_mount_umount_click(self, widget, event=None):
         device = self.master.main_window.devices_list_view.get_selected_device()
@@ -341,6 +342,10 @@
         self.entry = gtk.Entry(max=15)
         self.entry.set_text(device.label)
 
+        if not device.is_renamable():
+            self.entry.set_sensitive(False)
+            messages.DeviceNotRenamable(device)
+
         self.pack_start(self.label, expand=True, fill=False)
         self.pack_start(self.entry, expand=True, fill=True)
 
@@ -448,3 +453,146 @@
         # Block Device
         self.add_label_to_table(table, self.labels[4], 2)
         self.add_text_value_to_table(table, self.device.block_device, 2)
+
+class FormatingGenericInfo(gtk.Frame):
+    def __init__(self, device, labels, text):
+        self.device = device
+        self.labels = labels
+        gtk.Frame.__init__(self)
+        label = MarkupLabel("<b>"+text+"</b>")
+        self.set_shadow_type(gtk.SHADOW_NONE)
+        self.set_label_widget(label)
+
+        self.align = gtk.Alignment(xalign=0.5, yalign=0.5, xscale=1.0, yscale=1.0)
+        self.align.set_padding(padding_top=5, padding_bottom=5, padding_left=10, padding_right=10)
+        self.add(self.align)
+
+        self.table = gtk.Table(rows=2, columns=3, homogeneous=False)
+        self.table.set_col_spacings(10)
+        self.align.add(self.table)
+
+
+    def add_label_to_table(self, text, index):
+        label = gtk.Label(text)
+        label.set_alignment(xalign=0, yalign=0.5)
+        self.table.attach(label, 0, 1, index, index+1,
+                          xoptions=gtk.FILL,
+                          yoptions=gtk.EXPAND|gtk.FILL,
+                          xpadding=0, ypadding=2)
+        self.add_point_sep(index)
+
+    def add_entry(self, text, index):
+        entry = gtk.Entry(15)
+        entry.set_text(text)
+        self.table.attach(entry, 2, 3, index, index+1,
+                          xoptions=gtk.EXPAND|gtk.FILL,
+                          yoptions=gtk.EXPAND|gtk.FILL,
+                          xpadding=0, ypadding=2)
+        return entry
+
+    def add_combo_box(self, items, index):
+        combo = gtk.combo_box_new_text()
+        for item in items:
+            combo.append_text(item)
+
+        current_fs = None
+        if self.device.fs_type == 'vfat':
+            current_fs = self.device.fs_version
+        else:
+            current_fs = self.device.fs_type
+        if self.device.fs_type == 'ntfs-3g':
+            current_fs = 'NTFS'
+
+        if items.count(current_fs) is 0:
+            print ' * Device current FS is unknown (%(fs)s). Assuming FAT16'%{"fs":current_fs}
+            combo.set_active(0)
+        else:
+            print ' * Assuming device current FS:', current_fs
+            combo.set_active(items.index(current_fs))
+
+        self.table.attach(combo, 2, 3, index, index+1,
+                          xoptions=gtk.EXPAND|gtk.FILL,
+                          yoptions=gtk.EXPAND|gtk.FILL,
+                          xpadding=0, ypadding=2)
+        return combo
+
+    def add_text_value_to_table(self, text, index):
+        label = gtk.Label(text)
+        label.set_alignment(xalign=0, yalign=0.5)
+        self.table.attach(label, 2, 3, index, index+1,
+                          xoptions=gtk.EXPAND|gtk.FILL,
+                          yoptions=gtk.EXPAND|gtk.FILL,
+                          xpadding=0, ypadding=2)
+        return label
+
+    def add_point_sep(self, index):
+        label = gtk.Label(":")
+        label.set_alignment(xalign=0.5, yalign=0.5)
+        self.table.attach(label, 1, 2, index, index+1,
+                          xoptions=gtk.FILL,
+                          yoptions=gtk.EXPAND|gtk.FILL,
+                          xpadding=0, ypadding=2)
+
+
+class FormatingDeviceInfo(FormatingGenericInfo):
+    def __init__(self, device, labels):
+        FormatingGenericInfo.__init__(self, device, labels, _("Device"))
+
+        # Size
+        self.add_label_to_table(self.labels[0], 0)
+        self.add_text_value_to_table(device.size, 0)
+        # Block Device
+        self.add_label_to_table(self.labels[1], 1)
+        self.add_text_value_to_table(device.block_device, 1)
+
+class FormatingFormatInfo(FormatingGenericInfo):
+    def __init__(self, device, labels, suported_fs):
+        FormatingGenericInfo.__init__(self, device, labels, _("Formating"))
+
+        # Label
+        self.add_label_to_table(self.labels[2], 0)
+        self.label_entry = self.add_entry(device.label, 0)
+        # FS Type
+        self.add_label_to_table(self.labels[3], 1)
+        self.fs_combo = self.add_combo_box(suported_fs, 1)
+
+    def get_selected_fs(self):
+        return self.fs_combo.get_active_text()
+
+    def get_new_label(self):
+        return self.label_entry.get_text()
+
+class FormatingVFatInfo(gtk.Alignment):
+    def __init__(self):
+        gtk.Alignment.__init__(self, xalign=0.5, yalign=0.5, xscale=1.0, yscale=1.0)
+        self.set_padding(padding_top=0, padding_bottom=5, padding_left=10, padding_right=10)
+
+        self.check_bad_blocks = gtk.CheckButton(label=_("Check for Bad Blocks"))
+        self.check_bad_blocks.set_active(False)
+
+        self.vbox = gtk.VBox()
+        self.add(self.vbox)
+        self.vbox.pack_start(self.check_bad_blocks)
+
+    def get_options(self):
+        return [self.check_bad_blocks.get_active()]
+
+class FormatingNTFSInfo(gtk.Alignment):
+    def __init__(self):
+        gtk.Alignment.__init__(self, xalign=0.5, yalign=0.5, xscale=1.0, yscale=1.0)
+        self.set_padding(padding_top=0, padding_bottom=5, padding_left=10, padding_right=10)
+
+        self.quick_format = gtk.CheckButton(label=_("Quick Format"))
+        self.quick_format.set_active(True)
+
+        self.compression = gtk.CheckButton(label=_("Enable Compression"))
+        self.compression.set_active(False)
+
+        self.vbox = gtk.VBox()
+        self.add(self.vbox)
+        self.vbox.pack_start(self.quick_format)
+        self.vbox.pack_start(self.compression)
+
+    def get_options(self):
+        return [self.quick_format.get_active(),
+                self.compression.get_active()]

=== modified file 'src/gui/windows.py'
--- src/gui/windows.py	2009-08-01 04:08:08 +0000
+++ src/gui/windows.py	2009-08-07 13:09:33 +0000
@@ -32,6 +32,8 @@
 import locale
 import gettext
 import sys
+import time
+from threading import Thread
 
 WINDOW_ICON = None
 locale.setlocale(locale.LC_ALL, '')
@@ -199,4 +201,202 @@
             self.apply.set_sensitive(True)
 
 
-
+class FormatWindow(gtk.Dialog):
+    def __init__(self, device, master, suported_fs):
+        self.master = master
+        self.device = device
+        suported_fs.sort()
+
+        self.new_label = None
+        self.fs_type = None
+        self.fs_options = None
+        self.fs_align = None
+
+        gtk.Dialog.__init__(self, _("Formating %(device_label)s")%{"device_label":device.label},
+                            self.master.main_window,
+                            gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT)
+        self.set_resizable(False)
+        self.set_icon_from_file(WINDOW_ICON)
+        self.set_border_width(10)
+        self.vbox.set_spacing(10)
+
+        self.field_labels = [_("Size"), _("Block Device"),
+                             _("New Label"), _("Files System")]
+
+        max_len = max([len(label) for label in self.field_labels])
+        self.field_labels = [label.ljust(max_len) for label in self.field_labels]
+
+        self.device_info = widgets.FormatingDeviceInfo(device, self.field_labels)
+        self.vbox.pack_start(self.device_info)
+
+        self.format_info = widgets.FormatingFormatInfo(device, self.field_labels, suported_fs)
+        self.vbox.pack_start(self.format_info)
+
+        self.format_info.fs_combo.connect("changed", self.__on_fs_selected)
+        self.__on_fs_selected(None)
+
+        btn = gtk.Button(_("Format"))
+        btn.set_image(gtk.image_new_from_stock(gtk.STOCK_CLEAR, gtk.ICON_SIZE_BUTTON))
+        self.add_action_widget(btn, gtk.RESPONSE_ACCEPT)
+        self.close = self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_REJECT)
+
+        self.connect("response", self.__on_close)
+
+        self.show_all()
+
+
+    def __on_fs_selected(self, widget):
+        if self.fs_align:
+            self.vbox.remove(self.fs_align)
+            self.fs_align.destroy()
+
+        selected_fs = self.format_info.get_selected_fs().upper()
+        self.fs_align = None
+        if selected_fs in ("FAT16", "FAT32"):
+            self.fs_align = widgets.FormatingVFatInfo()
+        elif selected_fs == "NTFS":
+            self.fs_align = widgets.FormatingNTFSInfo()
+        elif selected_fs == "EXT2":
+            pass
+        elif selected_fs == "EXT3":
+            pass
+        elif selected_fs == "EXT4":
+            pass
+
+        self.vbox.pack_start(self.fs_align)
+        self.show_all()
+
+    def __on_close(self, dialog, response_id):
+        print 'closing'
+        self.new_label = self.format_info.get_new_label()
+        self.fs_type = self.format_info.get_selected_fs().upper()
+        self.fs_options = self.fs_align.get_options()
+
+
+class ProgressBarPulseThread(Thread):
+    def __init__(self, bar):
+        Thread.__init__(self)
+        self.bar = bar
+
+    def run(self):
+        while self.bar.pulse():
+            time.sleep(0.2)
+
+class ProgressBar:
+    '''
+            Simple class to create a progress bar to show progress
+    '''
+    def __init__(self, master, device):
+        '''Initialize the class'''
+        self.progress_bar = None
+        self.window = None
+        self.master = master
+        self.device = device
+        self.keep_pulsing = False
+        self.thread = ProgressBarPulseThread(self)
+
+    def draw(self):
+        '''Draw the widgets'''
+        # Simple window
+        self.window = gtk.Window(gtk.WINDOW_POPUP)
+        self.window.set_resizable(False)
+        self.window.set_border_width(10)
+        self.window.set_position(gtk.WIN_POS_CENTER)
+        self.window.set_transient_for(self.master.main_window)
+        self.window.set_destroy_with_parent(True)
+
+        # Create a VBox
+        vbox = gtk.VBox(False, 5)
+        vbox.set_border_width(10)
+        self.window.add(vbox)
+
+        # Create the desired progress bar
+        self.progress_bar = gtk.ProgressBar()
+        self.progress_bar.set_size_request(500, -1)
+        self.progress_bar.pulse()
+        vbox.pack_start(self.progress_bar, False, False, 0)
+
+        # An expander to hold the textview
+        expander = gtk.Expander("<b>"+_("Details")+"</b>")
+        expander.set_use_markup(True)
+        expander.set_expanded(True)
+        # Text buffer
+        self.text_buffer = gtk.TextBuffer()
+        # The text view
+        self.text_view = gtk.TextView(self.text_buffer);
+        self.text_view.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("black"))
+        self.text_view.modify_text(gtk.STATE_NORMAL, gtk.gdk.color_parse("white"))
+        self.text_view.set_editable(False)
+        self.text_view.set_wrap_mode(gtk.WRAP_CHAR)
+        self.text_view.set_justification(gtk.JUSTIFY_LEFT)
+        self.text_view.set_left_margin(10)
+        self.text_view.set_right_margin(10)
+        self.text_view.set_size_request(-1, 150)
+        # A scroller to the text view
+        sw = gtk.ScrolledWindow()
+        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        sw.add(self.text_view)
+        expander.add(sw)
+        vbox.pack_start(expander)
+
+        # close button
+        self.close_button = gtk.Button(stock=gtk.STOCK_CLOSE)
+        self.close_button.set_sensitive(False)
+        self.close_button.connect("clicked", self.__on_close_click)
+        # HButtonBox
+        btn_box = gtk.HButtonBox()
+        btn_box.set_layout(gtk.BUTTONBOX_END)
+        btn_box.pack_start(self.close_button)
+        vbox.pack_start(btn_box)
+
+        # Show all widgets
+        self.window.show_all()
+
+    def addTimer(self):
+        self.timer = gobject.timeout_add(5, self.draw_progress, self.progress_bar)
+
+    def write_text(self, text):
+        '''Write the text to the label'''
+        self.text_buffer.insert(self.text_buffer.get_end_iter(), text)
+        self.text_view.scroll_mark_onscreen(self.text_buffer.get_insert())
+        #self.pulse()
+        while gtk.events_pending():
+            gtk.main_iteration(False)
+
+    def draw_end_progress(self, text, widget=None):
+        '''Update the progress from the progressbar'''
+        self.progress_bar.set_fraction(1)
+        self.progress_bar.set_text(text)
+
+    def enable_close(self, erro=None):
+        self.keep_pulsing = False
+        self.thread.join()
+        if erro is None:
+            self.draw_end_progress(_("Formating done"))
+            self.write_text("\n\n"+_("Done")+"\n")
+            print ' * Formationg done!'
+        else:
+            self.draw_end_progress(_("Error while formating"))
+            self.write_text("\n\n*** "+_("Errors:")+"\n")
+            self.write_text(erro)
+            print ' * Error while formating!'
+            print erro
+
+        self.close_button.set_sensitive(True)
+
+    def __on_close_click(self, widget=None):
+        '''Close the progress bar'''
+        print "Closing..."
+        self.window.destroy()
+        self.master.destroy_format_progress_bar(self.device)
+
+    def pulse(self, widget=None):
+        self.progress_bar.pulse()
+        while gtk.events_pending():
+            gtk.main_iteration(False)
+
+        return self.keep_pulsing
+
+    def start_pulsing_thread(self):
+        self.keep_pulsing = True
+        self.thread.start()

=== modified file 'src/main.py'
--- src/main.py	2009-08-01 04:08:08 +0000
+++ src/main.py	2009-08-07 13:09:33 +0000
@@ -33,6 +33,8 @@
 RESPONSE_ACCEPT = -3
 RESPONSE_CANCEL = -2
 
+SUPPORTED_FS = ["FAT16", "FAT32", "NTFS"]
+
 class Main:
     '''
         Main is the main class from the USBManager.
@@ -59,6 +61,7 @@
         # Windows 'controllers'
         self.main_window = None
         self.properties_window = None
+        self.formating_window = None
         self.tray = None
         self.mode = None
         if mode is 2:
@@ -122,6 +125,8 @@
             self.properties_window.destroy()
 
     def mount_device(self, device):
+        if device.is_mounted:
+            return
         if device.blocked:
             gui.messages.BlockedDevice()
             return
@@ -130,6 +135,8 @@
             gui.messages.MountingError(device, msg)
 
     def umount_device(self, device):
+        if not device.is_mounted:
+            return
         if device.blocked:
             gui.messages.BlockedDevice()
             return
@@ -142,6 +149,7 @@
             if device.is_mounted:
                 gui.messages.UmountingDevice(device)
                 self.umount_device(device)
+
             gui.messages.BlockingDevice()
             ret, error = device.set_label(new_label)
             if not ret:
@@ -175,6 +183,38 @@
             self.properties_window.restore_orig_label()
         self.properties_window.destroy()
 
+    def create_formating_window(self, device):
+        if device.blocked:
+            gui.messages.BlockedDevice()
+            return
+
+        self.formating_window = gui.windows.FormatWindow(device, self, self.devices.get_supported_fs())
+        ret = self.formating_window.run()
+
+        if ret is RESPONSE_ACCEPT:
+            new_label = self.formating_window.new_label
+            new_fs = self.formating_window.fs_type
+            fs_options = self.formating_window.fs_options
+            self.formating_window.destroy()
+            # TODO: Check if device is mounted
+            if device.is_mounted:
+                gui.messages.UmountingDevice(device)
+                self.umount_device(device)
+
+            bar = gui.windows.ProgressBar(self, device)
+            bar.draw()
+            bar.start_pulsing_thread()
+            bar.write_text("Formating "+device.block_device+" to: "+new_fs+"\n")
+            err = device.format(new_label, new_fs, fs_options, bar.write_text)
+            if len(err) is 0:
+                err = None
+            else:
+                err = '\n'.join(err)
+            bar.enable_close(err)
+            return
+
+        self.formating_window.destroy()
+
     def destroy_main_window(self):
         if self.main_window:
             self.main_window.hide()
@@ -185,3 +225,7 @@
             print 'Quiting...'
         else:
             self.main_window = None
+
+    def destroy_format_progress_bar(self, device):
+        gui.messages.BlockedDevice()
+        device.blocked = True

=== modified file 'src/shexec.py'
--- src/shexec.py	2009-07-31 03:31:01 +0000
+++ src/shexec.py	2009-08-06 14:07:48 +0000
@@ -25,8 +25,29 @@
 __version__ = "1.0"
 __author__ = "Magnun Leno da Silva <[e-mail]>"
 
+
+import os
 import subprocess as sp
-import os
+FORMATING_DIC = {"mkfs.vfat":"VFAT",
+                 "mkfs.ntfs":"NTFS",
+                 #"mkfs.ext2":"EXT2",
+                 #"mkfs.ext3":"EXT3",
+                 #"mkfs.ext4":"EXT4",
+                }
+
+SUPPORTED_FS = {}
+ret = sp.Popen(shell = False, stdin = sp.PIPE, stdout = sp.PIPE,
+               stderr = sp.PIPE, args = ["whereis", "mkfs"])
+ret = ret.communicate()[0].split(' ')[2:]
+for fs in ret:
+    if '/usr/share/man' not in fs:
+        fs = fs.split('/')[-1]
+        if FORMATING_DIC.has_key(fs):
+            if FORMATING_DIC[fs] == "VFAT":
+                SUPPORTED_FS["FAT32"] = fs
+                SUPPORTED_FS["FAT16"] = fs
+            else:
+                SUPPORTED_FS[FORMATING_DIC[fs]] = fs
 
 def whereis_command(command):
     ret = sp.Popen(shell = False, stdin = sp.PIPE, stdout = sp.PIPE,
@@ -46,4 +67,85 @@
 
     return ret.communicate()
 
-# TODO: Add functions to format volumes (FAT16, FAT32, NTFS, EXT2, EXT3 and EXT4)
+def format(new_fs, new_label, block_device, fs_options, out_func):
+    command = 'gksudo "'+SUPPORTED_FS[new_fs]+' '+block_device +' '
+    if new_fs == "FAT16":
+        decode_func = fat16_decode
+    if new_fs == "FAT32":
+        decode_func = fat32_decode
+    if new_fs == "NTFS":
+        decode_func = ntfs_decode
+    if new_fs == "EXT2":
+        decode_func = ext2_decode
+    if new_fs == "EXT3":
+        decode_func = ext3_decode
+    if new_fs == "EXT4":
+        decode_func = ext4_decode
+
+    command += decode_func(new_label, fs_options)
+
+    out_func("# "+command+"\n\n")
+    print ' * Formating:',command
+    proc = sp.Popen([command], shell=True, stdin=sp.PIPE, stdout=sp.PIPE, stderr=sp.PIPE)
+    while True:
+        out = proc.stdout.read(1)
+        out_func(out)
+        if len(out) == 0 and proc.poll() == 0:
+            break
+    return proc.stderr.readlines()
+
+
+def fat16_decode(new_label, fs_options):
+    command = '-F 16 -v '
+    bad_blocks = fs_options[0]
+
+    if bad_blocks is True:
+        command += '-c '
+
+    if new_label != "":
+        if len(new_label) > 11:
+            new_label = new_label[:11]
+        command += '-n '+new_label
+    command += '"'
+    return command
+
+def fat32_decode(new_label, fs_options):
+    command = '-F 32 -v '
+    bad_blocks = fs_options[0]
+
+    if bad_blocks is True:
+        command += '-c '
+
+    if new_label != "":
+        if len(new_label) > 11:
+            new_label = new_label[:11]
+        command += '-n '+new_label
+    command += '"'
+    return command
+
+def ntfs_decode(new_label, fs_options):
+    quick_format = fs_options[0]
+    compression = fs_options[1]
+
+    command = '-v '
+
+    if quick_format:
+        command += '-f '
+
+    if compression:
+        command += '-C '
+
+    if new_label != "":
+        command += '-L '+new_label
+    command += '"'
+    return command
+
+def ext2_decode(new_label, dev, fs_options, bar):
+    pass
+
+def ext3_decode(new_label, dev, fs_options, bar):
+    pass
+
+def ext4_decode(new_label, fs_options, out_func):
+    pass
+# TODO: Add functions to format volumes (NTFS, EXT2, EXT3 and EXT4)

=== modified file 'src/usbdbus.py'
--- src/usbdbus.py	2009-07-31 13:41:08 +0000
+++ src/usbdbus.py	2009-08-07 13:09:33 +0000
@@ -30,6 +30,7 @@
 
 RENAME_COMMANDS = {"vfat":("mlabel", "-i %(block_device)s ::%(new_label)s", "mtools"),
                    "ntfs":("ntfslabel", "%(block_device)s %(new_label)s", "ntfsprogs"),
+                   "ntfs-3g":("ntfslabel", "%(block_device)s %(new_label)s", "ntfsprogs"),
                    "ext2":("e2label", "%(block_device)s %(new_label)s", "e2fsprogs"),
                    "ext3":("e2label", "%(block_device)s %(new_label)s", "e2fsprogs"),
                    "ext4":("e2label", "%(block_device)s %(new_label)s", "e2fsprogs")}
@@ -156,6 +157,10 @@
         print ' * Device', self.label,"("+self.block_device+") is now locked!"
         return (True, None)
 
+    def format(self, new_label, new_fs, fs_options, out_func):
+        format_func = None
+        return shexec.format(new_fs, new_label, self.block_device, fs_options, out_func)
+
     def on_device_properties_change(self, key, was_added=None, was_removed=None, path=None):
         self.get_info()
         self.devices.master.device_properties_changed(self)
@@ -303,6 +308,9 @@
         if self.devices.has_key(udi):
             return self.devices.pop(udi)
 
+    def get_supported_fs(self):
+        return shexec.SUPPORTED_FS.keys()
+
     def on_device_add(self, volume_udi):
         '''
             Function connected to the 'DeviceAdded' signal.