summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmat-gui16
1 files changed, 10 insertions, 6 deletions
diff --git a/mat-gui b/mat-gui
index 9c2a5cf..03afedf 100755
--- a/mat-gui
+++ b/mat-gui
@@ -340,7 +340,7 @@ non-anonymised) file to output archive'))
340 dialog.run() 340 dialog.run()
341 dialog.destroy() 341 dialog.destroy()
342 342
343 def __popup_archive(self, file_list): 343 def __popup_archive(self, file_name, files_list):
344 ''' Popup that shows the user what files 344 ''' Popup that shows the user what files
345 are not going to be include into to outputed 345 are not going to be include into to outputed
346 archive 346 archive
@@ -355,7 +355,7 @@ non-anonymised) file to output archive'))
355 355
356 dialog.get_content_area().pack_start(sc, True, True, 0) 356 dialog.get_content_area().pack_start(sc, True, True, 0)
357 store = Gtk.ListStore(bool, str) 357 store = Gtk.ListStore(bool, str)
358 for i in file_list: # store.extend is not supported, wtf?! 358 for i in files_list: # store.extend is not supported, wtf?!
359 store.append([0,os.path.basename(i)]) 359 store.append([0,os.path.basename(i)])
360 360
361 treeview = Gtk.TreeView(store) 361 treeview = Gtk.TreeView(store)
@@ -375,10 +375,13 @@ non-anonymised) file to output archive'))
375 model[path][0] = not model[path][0] 375 model[path][0] = not model[path][0]
376 cellrenderer_toggle.connect('toggled', cell_toggled, store) 376 cellrenderer_toggle.connect('toggled', cell_toggled, store)
377 377
378 vbox.pack_start(Gtk.Label(_('MAT is not able to clean the'
379 ' following files, found in the %s archive') % file_name), False, False, 0)
380 label = Gtk.Label()
381 label.set_markup('Select the files you want to <b>include</b>'
382 ' in the cleaned up archive anyway.')
383 vbox.pack_start(label, False, False, 0)
378 vbox.pack_start(treeview, True, True, 0) 384 vbox.pack_start(treeview, True, True, 0)
379 vbox.pack_start(Gtk.Label(_('Thoses files are not recognized by MAT, and'
380 'may contain metadata.')), False, False, 0)
381 vbox.pack_start(Gtk.Label(_('MAT will not clean your archive.')), False, False, 0)
382 385
383 dialog.show_all() 386 dialog.show_all()
384 dialog.run() 387 dialog.run()
@@ -409,7 +412,8 @@ non-anonymised) file to output archive'))
409 if isinstance(self.liststore[line][0].file, archive.GenericArchiveStripper): 412 if isinstance(self.liststore[line][0].file, archive.GenericArchiveStripper):
410 unsupported_list = self.liststore[line][0].file.list_unsupported() 413 unsupported_list = self.liststore[line][0].file.list_unsupported()
411 if unsupported_list: 414 if unsupported_list:
412 list_to_add = self.__popup_archive(unsupported_list) 415 filename = os.path.basename(self.liststore[line][0].file.filename)
416 list_to_add = self.__popup_archive(filename, unsupported_list)
413 if self.liststore[line][0].file.remove_all(whitelist=list_to_add): 417 if self.liststore[line][0].file.remove_all(whitelist=list_to_add):
414 self.liststore[line][2] = _('Clean') 418 self.liststore[line][2] = _('Clean')
415 elif self.liststore[line][0].file.remove_all(): 419 elif self.liststore[line][0].file.remove_all():