Merge lp:~elementary-apps/noise/tabs-to-spaces into lp:~elementary-apps/noise/trunk

[Danielle Foré]

Convert tabs to spaces in Dialogs

Convert tabs to spaces in Dialogs

[David Gomes (davidgomes)]

Are you doing any more or can I merge? Builds and runs for me.

review: Approve

[Danielle Foré (danrabbit)]

Yeah let's merge. I want to come back and do other branches for dialogs but it's not directly related.

=== modified file 'src/Dialogs/FileNotFoundDialog.vala'
--- src/Dialogs/FileNotFoundDialog.vala	2014-04-19 22:03:29 +0000
+++ src/Dialogs/FileNotFoundDialog.vala	2014-04-20 17:31:49 +0000
@@ -30,158 +30,157 @@
  */
 
 public class Noise.FileNotFoundDialog : Gtk.Window {
-	Gee.LinkedList<Media> media_list;
-	
-	private Gtk.Box content;
-	private Gtk.Box padding;
-	
-	Gtk.Button removeMedia;
-	Gtk.Button locateMedia;
-	Gtk.Button rescanLibrary;
-	Gtk.Button doNothing;
-	
-	public FileNotFoundDialog (Gee.LinkedList<Media> media_list) {
-		this.media_list = media_list;
-
-		// set the size based on saved gconf settings
-		//this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.title = ((Noise.App) GLib.Application.get_default ()).get_name ();
-		this.set_modal (true);
-		this.set_transient_for (App.main_window);
-		this.destroy_with_parent = true;
-		
-		set_default_size(475, -1);
-		resizable = false;
-		
-		content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
-		padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
-		
-		// initialize controls
-		Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
-		Gtk.Label title = new Gtk.Label("");
-		Gtk.Label info = new Gtk.Label("");
-		removeMedia = new Gtk.Button.with_label(_("Remove Media"));
-		locateMedia = new Gtk.Button.with_label(_("Locate Media"));
-		rescanLibrary = new Gtk.Button.with_label(_("Rescan Library"));
-		doNothing = new Gtk.Button.with_label(_("Do Nothing"));
-		
-		// pretty up labels
-
-		// be a bit explicit to make translations better
-		var MARKUP_TEMPLATE = "<span weight=\"bold\" size=\"larger\">%s</span>";		
-		var title_string = MARKUP_TEMPLATE.printf (String.escape (_("Could not find media file")));
-		title.set_markup (title_string);
-		title.xalign = 0.0f; //FIXME: deprecated
-		
-		info.set_line_wrap (true);
-		info.xalign = 0.0f; //FIXME: deprecated
-
-		if (media_list.size == 1) {
-			var s = media_list.get (0);
-			info.set_markup (_("The music file for $NAME by $ARTIST could not be found. What would you like to do?").replace ("$NAME", s.title.escape ("")).replace ("$ARTIST", s.artist.escape ("")));
-		}
-		else {
-			info.set_text (_("%i media files could not be found. What would you like to do?").printf (media_list.size));
-		}
-
-
-		
-		rescanLibrary.set_sensitive(!libraries_manager.local_library.doing_file_operations());
-		
-		/* set up controls layout */
-		var information = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-		var information_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-		information.pack_start(warning, false, false, 10);
-		information_text.pack_start(title, false, true, 10);
-		information_text.pack_start(info, false, true, 0);
-		information.pack_start(information_text, true, true, 10);
-		
-		var bottomButtons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-		bottomButtons.set_layout(Gtk.ButtonBoxStyle.END);
-		bottomButtons.pack_end(removeMedia, false, false, 0);
-		bottomButtons.pack_end(rescanLibrary, false, false, 0);
-		bottomButtons.pack_end(locateMedia, false, false, 0);
-		bottomButtons.pack_end(doNothing, false, false, 10);
-		bottomButtons.set_spacing(10);
-		
-		content.pack_start(information, false, true, 0);
-		content.pack_start(bottomButtons, false, true, 10);
-		
-		padding.pack_start(content, true, true, 10);
-		
-		removeMedia.clicked.connect(removeMediaClicked);
-		locateMedia.clicked.connect(locateMediaClicked);
-		rescanLibrary.clicked.connect(rescanLibraryClicked);
-		doNothing.clicked.connect( () => { 
-			this.destroy(); 
-		});
-		
-		libraries_manager.local_library.file_operations_started.connect(file_operations_started);
-		libraries_manager.local_library.file_operations_done.connect(file_operations_done);
-		
-		add(padding);
-		show_all();
-	}
-	
-	void removeMediaClicked() {
-		libraries_manager.local_library.remove_medias (media_list, false);
-		
-		this.destroy();
-	}
-	
-	void locateMediaClicked() {
-		Media m = media_list.get(0);
-		int media_id = m.rowid;
-		
-		string file = "";
-		var file_chooser = new Gtk.FileChooserDialog (_("Choose Music Folder"), this,
-								  Gtk.FileChooserAction.OPEN,
-								  _(STRING_CANCEL), Gtk.ResponseType.CANCEL,
-								  _(STRING_OPEN), Gtk.ResponseType.ACCEPT);
-		
-		// try and help user by setting a sane default folder
-		var invalid_file = File.new_for_uri(libraries_manager.local_library.media_from_id(media_id).uri);
-		var music_folder = Settings.Main.get_default ().music_folder;
-		if(invalid_file.get_parent().query_exists())
-			file_chooser.set_current_folder(invalid_file.get_parent().get_path());
-		else if(invalid_file.get_parent().get_parent().query_exists() && 
-		invalid_file.get_parent ().get_parent ().get_path ().contains (music_folder))
-			file_chooser.set_current_folder(invalid_file.get_parent().get_parent().get_path());
-		else if(File.new_for_path (music_folder).query_exists ())
-			file_chooser.set_current_folder (music_folder);
-		else
-			file_chooser.set_current_folder(Environment.get_home_dir());
-		
-		if (file_chooser.run () == Gtk.ResponseType.ACCEPT) {
-			file = file_chooser.get_filename();
-		}
-		
-		file_chooser.destroy ();
-		
-		if(file != "" && File.new_for_path(file).query_exists()) {
-			m.uri = File.new_for_path(file).get_uri();
-			m.location_unknown = false;
-			m.unique_status_image = null;
-			// TODO: lm.lw.media_found(m.rowid);
-			libraries_manager.local_library.update_media (m, false, false);
-			
-			this.destroy();
-		}
-	}
-	
-	void rescanLibraryClicked() {
+    Gee.LinkedList<Media> media_list;
+
+    private Gtk.Box content;
+    private Gtk.Box padding;
+
+    Gtk.Button removeMedia;
+    Gtk.Button locateMedia;
+    Gtk.Button rescanLibrary;
+    Gtk.Button doNothing;
+
+    public FileNotFoundDialog (Gee.LinkedList<Media> media_list) {
+        this.media_list = media_list;
+
+        // set the size based on saved gconf settings
+        //this.window_position = WindowPosition.CENTER;
+        this.type_hint = Gdk.WindowTypeHint.DIALOG;
+        this.title = ((Noise.App) GLib.Application.get_default ()).get_name ();
+        this.set_modal (true);
+        this.set_transient_for (App.main_window);
+        this.destroy_with_parent = true;
+
+        set_default_size(475, -1);
+        resizable = false;
+
+        content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
+        padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
+
+        // initialize controls
+        Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
+        Gtk.Label title = new Gtk.Label("");
+        Gtk.Label info = new Gtk.Label("");
+        removeMedia = new Gtk.Button.with_label(_("Remove Media"));
+        locateMedia = new Gtk.Button.with_label(_("Locate Media"));
+        rescanLibrary = new Gtk.Button.with_label(_("Rescan Library"));
+        doNothing = new Gtk.Button.with_label(_("Do Nothing"));
+
+        // pretty up labels
+
+        // be a bit explicit to make translations better
+        var MARKUP_TEMPLATE = "<span weight=\"bold\" size=\"larger\">%s</span>";		
+        var title_string = MARKUP_TEMPLATE.printf (String.escape (_("Could not find media file")));
+        title.set_markup (title_string);
+        title.xalign = 0.0f; //FIXME: deprecated
+
+        info.set_line_wrap (true);
+        info.xalign = 0.0f; //FIXME: deprecated
+
+        if (media_list.size == 1) {
+            var s = media_list.get (0);
+            info.set_markup (_("The music file for $NAME by $ARTIST could not be found. What would you like to do?").replace ("$NAME", s.title.escape ("")).replace ("$ARTIST", s.artist.escape ("")));
+        } else {
+            info.set_text (_("%i media files could not be found. What would you like to do?").printf (media_list.size));
+        }
+
+
+
+        rescanLibrary.set_sensitive(!libraries_manager.local_library.doing_file_operations());
+
+        /* set up controls layout */
+        var information = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        var information_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        information.pack_start(warning, false, false, 10);
+        information_text.pack_start(title, false, true, 10);
+        information_text.pack_start(info, false, true, 0);
+        information.pack_start(information_text, true, true, 10);
+
+        var bottomButtons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        bottomButtons.set_layout(Gtk.ButtonBoxStyle.END);
+        bottomButtons.pack_end(removeMedia, false, false, 0);
+        bottomButtons.pack_end(rescanLibrary, false, false, 0);
+        bottomButtons.pack_end(locateMedia, false, false, 0);
+        bottomButtons.pack_end(doNothing, false, false, 10);
+        bottomButtons.set_spacing(10);
+
+        content.pack_start(information, false, true, 0);
+        content.pack_start(bottomButtons, false, true, 10);
+
+        padding.pack_start(content, true, true, 10);
+
+        removeMedia.clicked.connect(removeMediaClicked);
+        locateMedia.clicked.connect(locateMediaClicked);
+        rescanLibrary.clicked.connect(rescanLibraryClicked);
+        doNothing.clicked.connect( () => { 
+            this.destroy(); 
+        });
+
+        libraries_manager.local_library.file_operations_started.connect(file_operations_started);
+        libraries_manager.local_library.file_operations_done.connect(file_operations_done);
+
+        add(padding);
+        show_all();
+    }
+
+    void removeMediaClicked() {
+        libraries_manager.local_library.remove_medias (media_list, false);
+
+        this.destroy();
+    }
+
+    void locateMediaClicked() {
+        Media m = media_list.get(0);
+        int media_id = m.rowid;
+
+        string file = "";
+        var file_chooser = new Gtk.FileChooserDialog (_("Choose Music Folder"), this,
+                                  Gtk.FileChooserAction.OPEN,
+                                  _(STRING_CANCEL), Gtk.ResponseType.CANCEL,
+                                  _(STRING_OPEN), Gtk.ResponseType.ACCEPT);
+
+        // try and help user by setting a sane default folder
+        var invalid_file = File.new_for_uri(libraries_manager.local_library.media_from_id(media_id).uri);
+        var music_folder = Settings.Main.get_default ().music_folder;
+        if(invalid_file.get_parent().query_exists())
+            file_chooser.set_current_folder(invalid_file.get_parent().get_path());
+        else if(invalid_file.get_parent().get_parent().query_exists() && 
+        invalid_file.get_parent ().get_parent ().get_path ().contains (music_folder))
+            file_chooser.set_current_folder(invalid_file.get_parent().get_parent().get_path());
+        else if(File.new_for_path (music_folder).query_exists ())
+            file_chooser.set_current_folder (music_folder);
+        else
+            file_chooser.set_current_folder(Environment.get_home_dir());
+
+        if (file_chooser.run () == Gtk.ResponseType.ACCEPT) {
+            file = file_chooser.get_filename();
+        }
+
+        file_chooser.destroy ();
+
+        if(file != "" && File.new_for_path(file).query_exists()) {
+            m.uri = File.new_for_path(file).get_uri();
+            m.location_unknown = false;
+            m.unique_status_image = null;
+            // TODO: lm.lw.media_found(m.rowid);
+            libraries_manager.local_library.update_media (m, false, false);
+
+            this.destroy();
+        }
+    }
+
+    void rescanLibraryClicked() {
         ((LocalLibrary)libraries_manager.local_library).rescan_music_folder ();
-		
-		this.destroy();
-	}
-	
-	void file_operations_done() {
-		rescanLibrary.set_sensitive(true);
-	}
-	
-	void file_operations_started() {
-		rescanLibrary.set_sensitive(false);
-	}
-	
+
+        this.destroy();
+    }
+
+    void file_operations_done() {
+        rescanLibrary.set_sensitive(true);
+    }
+
+    void file_operations_started() {
+        rescanLibrary.set_sensitive(false);
+    }
+
 }
\ No newline at end of file

=== modified file 'src/Dialogs/InstallGstreamerPluginsDialog.vala'
--- src/Dialogs/InstallGstreamerPluginsDialog.vala	2014-04-19 22:03:29 +0000
+++ src/Dialogs/InstallGstreamerPluginsDialog.vala	2014-04-20 17:31:49 +0000
@@ -21,75 +21,75 @@
  */
 
 public class Noise.InstallGstreamerPluginsDialog : Gtk.Window {
-	Gst.Message message;
-	string detail;
-	
-	private Gtk.Box content;
-	private Gtk.Box padding;
-	
-	Gtk.Button installPlugin;
-	Gtk.Button doNothing;
-	
-	public InstallGstreamerPluginsDialog(Gst.Message message) {
-		this.message = message;
-		this.detail = Gst.PbUtils.missing_plugin_message_get_description (message);
-		
-		// set the size based on saved gconf settings
-		//this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.set_modal(true);
-		this.set_transient_for(App.main_window);
-		this.destroy_with_parent = true;
-		
-		set_default_size(475, -1);
-		resizable = false;
-		
-		content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
-		padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
-
-		// initialize controls
-		Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
-		Gtk.Label title = new Gtk.Label("");
-		Gtk.Label info = new Gtk.Label("");
-		installPlugin = new Gtk.Button.with_label(_("Install Plugin"));
-		doNothing = new Gtk.Button.from_stock ("dialog-cancel");
-		
-		// pretty up labels
-		title.xalign = 0.0f;
-		title.set_markup("<span weight=\"bold\" size=\"larger\">" + String.escape (_("Required GStreamer plugin not installed")) + "</span>");
-		info.xalign = 0.0f;
-		info.set_line_wrap(true);
-		info.set_markup(_("The plugin for media type %s is not installed.\nWhat would you like to do?").printf ("<b>" + String.escape (detail) + "</b>"));
-
-		
-		/* set up controls layout */
-		var information = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
-		var information_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-		information.pack_start(warning, false, false, 10);
-		information_text.pack_start(title, false, true, 10);
-		information_text.pack_start(info, false, true, 0);
-		information.pack_start(information_text, true, true, 10);
-		
-		var bottomButtons = new Gtk.ButtonBox(Gtk.Orientation.HORIZONTAL);
-		bottomButtons.set_layout(Gtk.ButtonBoxStyle.END);
-		bottomButtons.pack_end(installPlugin, false, false, 0);
-		bottomButtons.pack_end(doNothing, false, false, 10);
-		bottomButtons.set_spacing(10);
-		
-		content.pack_start(information, false, true, 0);
-		content.pack_start(bottomButtons, false, true, 10);
-		
-		padding.pack_start(content, true, true, 10);
-		
-		installPlugin.clicked.connect(installPluginClicked);
-
-		doNothing.clicked.connect ( () => {
-		    this.destroy ();
-		});
-		add(padding);
-		show_all();
-	}
-	
+    Gst.Message message;
+    string detail;
+
+    private Gtk.Box content;
+    private Gtk.Box padding;
+
+    Gtk.Button installPlugin;
+    Gtk.Button doNothing;
+
+    public InstallGstreamerPluginsDialog(Gst.Message message) {
+        this.message = message;
+        this.detail = Gst.PbUtils.missing_plugin_message_get_description (message);
+
+        // set the size based on saved gconf settings
+        //this.window_position = WindowPosition.CENTER;
+        this.type_hint = Gdk.WindowTypeHint.DIALOG;
+        this.set_modal(true);
+        this.set_transient_for(App.main_window);
+        this.destroy_with_parent = true;
+
+        set_default_size(475, -1);
+        resizable = false;
+
+        content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
+        padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
+
+        // initialize controls
+        Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
+        Gtk.Label title = new Gtk.Label("");
+        Gtk.Label info = new Gtk.Label("");
+        installPlugin = new Gtk.Button.with_label(_("Install Plugin"));
+        doNothing = new Gtk.Button.from_stock ("dialog-cancel");
+
+        // pretty up labels
+        title.xalign = 0.0f;
+        title.set_markup("<span weight=\"bold\" size=\"larger\">" + String.escape (_("Required GStreamer plugin not installed")) + "</span>");
+        info.xalign = 0.0f;
+        info.set_line_wrap(true);
+        info.set_markup(_("The plugin for media type %s is not installed.\nWhat would you like to do?").printf ("<b>" + String.escape (detail) + "</b>"));
+
+
+        /* set up controls layout */
+        var information = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
+        var information_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        information.pack_start(warning, false, false, 10);
+        information_text.pack_start(title, false, true, 10);
+        information_text.pack_start(info, false, true, 0);
+        information.pack_start(information_text, true, true, 10);
+
+        var bottomButtons = new Gtk.ButtonBox(Gtk.Orientation.HORIZONTAL);
+        bottomButtons.set_layout(Gtk.ButtonBoxStyle.END);
+        bottomButtons.pack_end(installPlugin, false, false, 0);
+        bottomButtons.pack_end(doNothing, false, false, 10);
+        bottomButtons.set_spacing(10);
+
+        content.pack_start(information, false, true, 0);
+        content.pack_start(bottomButtons, false, true, 10);
+
+        padding.pack_start(content, true, true, 10);
+
+        installPlugin.clicked.connect(installPluginClicked);
+
+        doNothing.clicked.connect ( () => {
+            this.destroy ();
+        });
+        add(padding);
+        show_all();
+    }
+
         public void installPluginClicked() {
             var installer = Gst.PbUtils.missing_plugin_message_get_installer_detail (message);
             var context = new Gst.PbUtils.InstallPluginsContext ();
@@ -121,4 +121,3 @@
             return true;
         }
 }
-

=== modified file 'src/Dialogs/NotImportedWindow.vala'
--- src/Dialogs/NotImportedWindow.vala	2014-04-19 22:03:29 +0000
+++ src/Dialogs/NotImportedWindow.vala	2014-04-20 17:31:49 +0000
@@ -26,208 +26,207 @@
 using Gtk;
 
 public class Noise.NotImportedWindow : Window{
-	Gee.LinkedList<string> _files;
-	string music_folder;
-	
-	//for padding around notebook mostly
-	private Gtk.Box content;
-	private Gtk.Box padding;
-	
-	CheckButton trashAll;
-	ScrolledWindow filesScroll;
-	TreeView filesView;
-	ListStore filesModel;
-	Button moveToTrash;
-	
-	public NotImportedWindow(Gee.Collection<string> files, string music) {
-		_files = new Gee.LinkedList<string> ();
-		_files.add_all (files);
-		this.music_folder = music;
-		
-		this.set_title(_("Not Imported Files"));
-		
-		// set the size based on saved gconf settings
-		//this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.set_modal (true);
-		this.set_transient_for (App.main_window);
-		this.destroy_with_parent = true;
-		
-		set_default_size(475, -1);
-		resizable = false;
-		
-		content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
-		padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
-		
-		// initialize controls
-		var warning = new Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
-		var title = new Label(_("Unable to import %d items from %s").printf (files.size, music_folder));
-		var info = new Label(_("%s was unable to import %d items. The files may be damaged.").printf (((Noise.App) GLib.Application.get_default ()).get_name (), files.size));
-		trashAll = new CheckButton.with_label(_("Move all corrupted files to trash"));
-		filesScroll = new ScrolledWindow(null, null);
-		filesView = new TreeView();
-		filesModel = new ListStore(2, typeof(bool), typeof(string));
-		filesView.set_model(filesModel);
-		moveToTrash = new Button.with_label(_("Move to Trash"));
-		Button okButton = new Button.with_label(_("Ignore"));
-		
-		// pretty up labels
-		title.xalign = 0.0f;
-		title.set_markup("<span weight=\"bold\" size=\"larger\">" + Markup.escape_text (_("Unable to import %d items from %s").printf (files.size, music_folder), -1) + "</span>");
-		info.xalign = 0.0f;
-		info.set_line_wrap(false);
-		
-		/* add cellrenderers to columns and columns to treeview */
-		var toggle = new CellRendererToggle ();
-		toggle.toggled.connect ((toggle, path) => {
-			var tree_path = new TreePath.from_string (path);
-			TreeIter iter;
-			filesModel.get_iter (out iter, tree_path);
-			filesModel.set (iter, 0, !toggle.active);
-			
-			moveToTrash.set_sensitive(false);
-			filesModel.foreach(updateMoveToTrashSensetivity);
-		});
-
-		var column = new TreeViewColumn ();
-		column.title = _("del");
-		column.pack_start (toggle, false);
-		column.add_attribute (toggle, "active", 0);
-		filesView.append_column (column);
-		
-		filesView.insert_column_with_attributes(-1, _("File Location"), new CellRendererText(), "text", 1, null);
-		filesView.headers_visible = false;
-		
-		/* fill the treeview */
-		foreach(string file in files) {
-			TreeIter item;
-			filesModel.append(out item);
-			
-			filesModel.set(item, 0, false, 1, file.replace(music_folder, ""));
-		}
-		
-		filesScroll.add(filesView);
-		filesScroll.set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
-		
-		moveToTrash.set_sensitive(false);
-		
-		/* set up controls layout */
-		var information = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-		var information_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-		information.pack_start(warning, false, false, 10);
-		information_text.pack_start(title, false, true, 10);
-		information_text.pack_start(info, false, true, 0);
-		information.pack_start(information_text, true, true, 10);
-		
-		var listBox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-		listBox.pack_start(filesScroll, true, true, 5);
-		
-		Expander exp = new Expander(_("Select individual files to move to trash:"));
-		exp.add(listBox);
-		exp.expanded = false;
-		
-		var bottomButtons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-		bottomButtons.set_layout(ButtonBoxStyle.END);
-		bottomButtons.pack_end(moveToTrash, false, false, 0);
-		bottomButtons.pack_end(okButton, false, false, 10);
-		bottomButtons.set_spacing(10);
-		
-		content.pack_start(information, false, true, 0);
-		content.pack_start(UI.wrap_alignment (trashAll, 5, 0, 0, 75), false, true, 0);
-		content.pack_start(UI.wrap_alignment (exp, 0, 0, 0, 75), true, true, 0);
-		content.pack_start(bottomButtons, false, true, 10);
-		
-		padding.pack_start(content, true, true, 10);
-		
-		moveToTrash.clicked.connect(moveToTrashClick);
-		trashAll.toggled.connect(trashAllToggled);
-		okButton.clicked.connect( () => { this.destroy(); });
-		exp.activate.connect( () => {
-			if(exp.get_expanded()) {
-				resizable = true;
-				set_size_request(475, 180);
-				resize(475, 180);
-				resizable = false;
-			}
-			else
-				set_size_request(475, 350);
-		});
-		
-		add(padding);
-		show_all();
-	}
-	
-	public bool updateMoveToTrashSensetivity(TreeModel model, TreePath path, TreeIter iter) {
-		bool sel = false;
-		model.get(iter, 0, out sel);
-		
-		if(sel) {
-			moveToTrash.set_sensitive(true);
-			return true;
-		}
-		
-		return false;
-	}
-	
-	public bool selectAll(TreeModel model, TreePath path, TreeIter iter) {
-		filesModel.set(iter, 0, true);
-		
-		return false;
-	}
-	
-	public bool unselectAll(TreeModel model, TreePath path, TreeIter iter) {
-		filesModel.set(iter, 0, false);
-		
-		return false;
-	}
-	
-	public virtual void trashAllToggled() {
-		if(trashAll.active) {
-			filesModel.foreach(selectAll);
-			filesView.set_sensitive(false);
-			moveToTrash.set_sensitive(true);
-		}
-		else {
-			filesModel.foreach(unselectAll);
-			filesView.set_sensitive(true);
-			moveToTrash.set_sensitive(false);
-		}
-	}
-	
-	public bool deleteSelectedItems(TreeModel model, TreePath path, TreeIter iter) {
-		bool selected;
-		string location;
-		filesModel.get(iter, 0, out selected);
-		filesModel.get(iter, 1, out location);
-		
-		if(selected) {
-			try {
-				var file = File.new_for_path(music_folder + location);
-				file.trash();
-			}
-			catch(GLib.Error err) {
-				warning ("Could not move file %s to recycle: %s\n", location, err.message);
-			}
-			/*else {
-				try {
-					var file = File.new_for_path (location);
-					file.delete();
-				}
-				catch(GLib.Error err) {
-					warning ("Could not delete file %s: %s\n", location, err.message);
-				}
-			}*/
-		}
-		
-		return false;
-	}
-	
-	public virtual void moveToTrashClick() {
-		filesModel.foreach(deleteSelectedItems);
-		this.destroy();
-	}
-	
-	public virtual void ignoreClick() {
-		this.destroy();
-	}
-}
+    Gee.LinkedList<string> _files;
+    string music_folder;
+
+    //for padding around notebook mostly
+    private Gtk.Box content;
+    private Gtk.Box padding;
+
+    CheckButton trashAll;
+    ScrolledWindow filesScroll;
+    TreeView filesView;
+    ListStore filesModel;
+    Button moveToTrash;
+
+    public NotImportedWindow(Gee.Collection<string> files, string music) {
+        _files = new Gee.LinkedList<string> ();
+        _files.add_all (files);
+        this.music_folder = music;
+
+        this.set_title(_("Not Imported Files"));
+
+        // set the size based on saved gconf settings
+        //this.window_position = WindowPosition.CENTER;
+        this.type_hint = Gdk.WindowTypeHint.DIALOG;
+        this.set_modal (true);
+        this.set_transient_for (App.main_window);
+        this.destroy_with_parent = true;
+
+        set_default_size(475, -1);
+        resizable = false;
+
+        content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
+        padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
+
+        // initialize controls
+        var warning = new Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
+        var title = new Label(_("Unable to import %d items from %s").printf (files.size, music_folder));
+        var info = new Label(_("%s was unable to import %d items. The files may be damaged.").printf (((Noise.App) GLib.Application.get_default ()).get_name (), files.size));
+        trashAll = new CheckButton.with_label(_("Move all corrupted files to trash"));
+        filesScroll = new ScrolledWindow(null, null);
+        filesView = new TreeView();
+        filesModel = new ListStore(2, typeof(bool), typeof(string));
+        filesView.set_model(filesModel);
+        moveToTrash = new Button.with_label(_("Move to Trash"));
+        Button okButton = new Button.with_label(_("Ignore"));
+
+        // pretty up labels
+        title.xalign = 0.0f;
+        title.set_markup("<span weight=\"bold\" size=\"larger\">" + Markup.escape_text (_("Unable to import %d items from %s").printf (files.size, music_folder), -1) + "</span>");
+        info.xalign = 0.0f;
+        info.set_line_wrap(false);
+
+        /* add cellrenderers to columns and columns to treeview */
+        var toggle = new CellRendererToggle ();
+        toggle.toggled.connect ((toggle, path) => {
+            var tree_path = new TreePath.from_string (path);
+            TreeIter iter;
+            filesModel.get_iter (out iter, tree_path);
+            filesModel.set (iter, 0, !toggle.active);
+
+            moveToTrash.set_sensitive(false);
+            filesModel.foreach(updateMoveToTrashSensetivity);
+        });
+
+        var column = new TreeViewColumn ();
+        column.title = _("del");
+        column.pack_start (toggle, false);
+        column.add_attribute (toggle, "active", 0);
+        filesView.append_column (column);
+
+        filesView.insert_column_with_attributes(-1, _("File Location"), new CellRendererText(), "text", 1, null);
+        filesView.headers_visible = false;
+
+        /* fill the treeview */
+        foreach(string file in files) {
+            TreeIter item;
+            filesModel.append(out item);
+
+            filesModel.set(item, 0, false, 1, file.replace(music_folder, ""));
+        }
+
+        filesScroll.add(filesView);
+        filesScroll.set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
+
+        moveToTrash.set_sensitive(false);
+
+        /* set up controls layout */
+        var information = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        var information_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        information.pack_start(warning, false, false, 10);
+        information_text.pack_start(title, false, true, 10);
+        information_text.pack_start(info, false, true, 0);
+        information.pack_start(information_text, true, true, 10);
+
+        var listBox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        listBox.pack_start(filesScroll, true, true, 5);
+
+        Expander exp = new Expander(_("Select individual files to move to trash:"));
+        exp.add(listBox);
+        exp.expanded = false;
+
+        var bottomButtons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        bottomButtons.set_layout(ButtonBoxStyle.END);
+        bottomButtons.pack_end(moveToTrash, false, false, 0);
+        bottomButtons.pack_end(okButton, false, false, 10);
+        bottomButtons.set_spacing(10);
+
+        content.pack_start(information, false, true, 0);
+        content.pack_start(UI.wrap_alignment (trashAll, 5, 0, 0, 75), false, true, 0);
+        content.pack_start(UI.wrap_alignment (exp, 0, 0, 0, 75), true, true, 0);
+        content.pack_start(bottomButtons, false, true, 10);
+
+        padding.pack_start(content, true, true, 10);
+
+        moveToTrash.clicked.connect(moveToTrashClick);
+        trashAll.toggled.connect(trashAllToggled);
+        okButton.clicked.connect( () => { this.destroy(); });
+        exp.activate.connect( () => {
+            if(exp.get_expanded()) {
+                resizable = true;
+                set_size_request(475, 180);
+                resize(475, 180);
+                resizable = false;
+            }
+            else
+                set_size_request(475, 350);
+        });
+
+        add(padding);
+        show_all();
+    }
+
+    public bool updateMoveToTrashSensetivity(TreeModel model, TreePath path, TreeIter iter) {
+        bool sel = false;
+        model.get(iter, 0, out sel);
+
+        if(sel) {
+            moveToTrash.set_sensitive(true);
+            return true;
+        }
+
+        return false;
+    }
+
+    public bool selectAll(TreeModel model, TreePath path, TreeIter iter) {
+        filesModel.set(iter, 0, true);
+
+        return false;
+    }
+
+    public bool unselectAll(TreeModel model, TreePath path, TreeIter iter) {
+        filesModel.set(iter, 0, false);
+
+        return false;
+    }
+
+    public virtual void trashAllToggled() {
+        if(trashAll.active) {
+            filesModel.foreach(selectAll);
+            filesView.set_sensitive(false);
+            moveToTrash.set_sensitive(true);
+        } else {
+            filesModel.foreach(unselectAll);
+            filesView.set_sensitive(true);
+            moveToTrash.set_sensitive(false);
+        }
+    }
+
+    public bool deleteSelectedItems(TreeModel model, TreePath path, TreeIter iter) {
+        bool selected;
+        string location;
+        filesModel.get(iter, 0, out selected);
+        filesModel.get(iter, 1, out location);
+
+        if(selected) {
+            try {
+                var file = File.new_for_path(music_folder + location);
+                file.trash();
+            }
+            catch(GLib.Error err) {
+                warning ("Could not move file %s to recycle: %s\n", location, err.message);
+            }
+            /*else {
+                try {
+                    var file = File.new_for_path (location);
+                    file.delete();
+                }
+                catch(GLib.Error err) {
+                    warning ("Could not delete file %s: %s\n", location, err.message);
+                }
+            }*/
+        }
+
+        return false;
+    }
+
+    public virtual void moveToTrashClick() {
+        filesModel.foreach(deleteSelectedItems);
+        this.destroy();
+    }
+
+    public virtual void ignoreClick() {
+        this.destroy();
+    }
+}
\ No newline at end of file

=== modified file 'src/Dialogs/SetMusicFolderConfirmation.vala'
--- src/Dialogs/SetMusicFolderConfirmation.vala	2014-04-19 22:03:29 +0000
+++ src/Dialogs/SetMusicFolderConfirmation.vala	2014-04-20 17:31:49 +0000
@@ -21,129 +21,129 @@
  */
 
 public class Noise.SetMusicFolderConfirmation : Gtk.Window {
-	string folder_path;
-	
-	private Gtk.Grid content;
-	
-	Gtk.Button savePlaylists;
-	Gtk.Button ok;
-	Gtk.Button cancel;
-	
-	Gtk.Image is_finished;
-	Gtk.Spinner is_working;
-	
-	public signal void finished(bool response);
-	
-	public SetMusicFolderConfirmation(string path) {
-		folder_path = path;
-		
-		// set the size based on saved gconf settings
-		//this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.set_modal (true);
-		this.set_transient_for (App.main_window);
-		this.destroy_with_parent = true;
-		
-		//set_default_size(250, -1);
-		resizable = false;
-		
-		content = new Gtk.Grid ();
-		content.margin = 12;
-		content.column_spacing = 12;
-		content.row_spacing = 6;
-		
-		// initialize controls
-		Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
-		Gtk.Label title = new Gtk.Label("");
-		Gtk.Label info = new Gtk.Label("");
-		savePlaylists = new Gtk.Button.with_label(_("Export Playlists"));
-		ok = new Gtk.Button.with_label(_("Set Music Folder"));
-		cancel = new Gtk.Button.with_label (_(STRING_CANCEL));
-		is_finished = new Gtk.Image();
-		is_working = new Gtk.Spinner();
-		
-		// pretty up labels
-		title.xalign = 0.0f;
-		title.set_markup("<span weight=\"bold\" size=\"larger\">%s</span>".printf(String.escape (_("Set Music Folder?"))));
-		info.xalign = 0.0f;
-		info.set_line_wrap (true);
-		info.set_markup (_("Are you sure you want to set the music folder to %s? This will reset your library and remove your playlists.").printf ("<b>" + String.escape (path) + "</b>"));
-		
-		// save playlist hbox
-		var playlistBox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 6);
-		playlistBox.pack_start(savePlaylists, true, true, 0);
-		playlistBox.pack_end(is_finished, false, false, 0);
-		playlistBox.pack_end(is_working, false, false, 0);
-		
-		var bottomButtons = new Gtk.ButtonBox(Gtk.Orientation.HORIZONTAL);
-		bottomButtons.set_layout(Gtk.ButtonBoxStyle.END);
-		bottomButtons.pack_start(playlistBox, false, false, 0);
-		bottomButtons.pack_end(cancel, false, false, 0);
-		bottomButtons.pack_end(ok, false, false, 0);
-		bottomButtons.set_spacing(10);
-		
-		((Gtk.ButtonBox)bottomButtons).set_child_secondary(playlistBox, true);
-		
-		content.attach (warning, 0, 0, 1, 2);
-		content.attach (title, 1, 0, 1, 1);
-		content.attach (info, 1, 1, 1, 1);
-		content.attach (bottomButtons, 0, 2, 2, 1);
-		
-		var local_library = libraries_manager.local_library;
-		savePlaylists.set_sensitive(!local_library.get_medias ().is_empty && local_library.playlist_count_without_read_only () > 0);
-		
-		savePlaylists.clicked.connect(savePlaylistsClicked);
-		cancel.clicked.connect(cancel_clicked);
-		ok.clicked.connect(ok_clicked);
-		
-		add (content);
-		show_all();
-		
-		is_working.hide();
-	}
-	
-	public void savePlaylistsClicked() {
-		string folder = "";
-		var file_chooser = new Gtk.FileChooserDialog (_("Choose Music Folder"), this,
-								  Gtk.FileChooserAction.SELECT_FOLDER,
-								  _(STRING_CANCEL), Gtk.ResponseType.CANCEL,
-								  _(STRING_OPEN), Gtk.ResponseType.ACCEPT);
-		if (file_chooser.run () == Gtk.ResponseType.ACCEPT) {
-			folder = file_chooser.get_filename();
-		}
-		
-		file_chooser.destroy ();
-		
-		if(folder != "") {
-			is_working.show();
-			is_finished.hide();
-			
-			// foreach playlist in lm.playlists(), save to (p.name).m3u
-			var success = true;
-			foreach(var p in libraries_manager.local_library.get_playlists()) {
-				if(!Noise.PlaylistsUtils.save_playlist_m3u(p, folder, ""))
-					success = false;
-			}
-			
-			is_working.hide();
-			is_finished.show();
-			
-			var process_completed_icon = Icons.PROCESS_COMPLETED.render (Gtk.IconSize.MENU);
-			var process_error_icon = Icons.PROCESS_ERROR.render (Gtk.IconSize.MENU);
-			
-			is_finished.set_from_pixbuf(success ? process_completed_icon : process_error_icon);
-		}
-	}
-	
-	public void cancel_clicked() {
-		finished(false);
-		
-		this.destroy();
-	}
-	
-	public void ok_clicked() {
-		finished(true);
-		
-		this.destroy();
-	}
+    string folder_path;
+
+    private Gtk.Grid content;
+
+    Gtk.Button savePlaylists;
+    Gtk.Button ok;
+    Gtk.Button cancel;
+
+    Gtk.Image is_finished;
+    Gtk.Spinner is_working;
+
+    public signal void finished(bool response);
+
+    public SetMusicFolderConfirmation(string path) {
+        folder_path = path;
+
+        // set the size based on saved gconf settings
+        //this.window_position = WindowPosition.CENTER;
+        this.type_hint = Gdk.WindowTypeHint.DIALOG;
+        this.set_modal (true);
+        this.set_transient_for (App.main_window);
+        this.destroy_with_parent = true;
+
+        //set_default_size(250, -1);
+        resizable = false;
+
+        content = new Gtk.Grid ();
+        content.margin = 12;
+        content.column_spacing = 12;
+        content.row_spacing = 6;
+
+        // initialize controls
+        Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
+        Gtk.Label title = new Gtk.Label("");
+        Gtk.Label info = new Gtk.Label("");
+        savePlaylists = new Gtk.Button.with_label(_("Export Playlists"));
+        ok = new Gtk.Button.with_label(_("Set Music Folder"));
+        cancel = new Gtk.Button.with_label (_(STRING_CANCEL));
+        is_finished = new Gtk.Image();
+        is_working = new Gtk.Spinner();
+
+        // pretty up labels
+        title.xalign = 0.0f;
+        title.set_markup("<span weight=\"bold\" size=\"larger\">%s</span>".printf(String.escape (_("Set Music Folder?"))));
+        info.xalign = 0.0f;
+        info.set_line_wrap (true);
+        info.set_markup (_("Are you sure you want to set the music folder to %s? This will reset your library and remove your playlists.").printf ("<b>" + String.escape (path) + "</b>"));
+
+        // save playlist hbox
+        var playlistBox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 6);
+        playlistBox.pack_start(savePlaylists, true, true, 0);
+        playlistBox.pack_end(is_finished, false, false, 0);
+        playlistBox.pack_end(is_working, false, false, 0);
+
+        var bottomButtons = new Gtk.ButtonBox(Gtk.Orientation.HORIZONTAL);
+        bottomButtons.set_layout(Gtk.ButtonBoxStyle.END);
+        bottomButtons.pack_start(playlistBox, false, false, 0);
+        bottomButtons.pack_end(cancel, false, false, 0);
+        bottomButtons.pack_end(ok, false, false, 0);
+        bottomButtons.set_spacing(10);
+
+        ((Gtk.ButtonBox)bottomButtons).set_child_secondary(playlistBox, true);
+
+        content.attach (warning, 0, 0, 1, 2);
+        content.attach (title, 1, 0, 1, 1);
+        content.attach (info, 1, 1, 1, 1);
+        content.attach (bottomButtons, 0, 2, 2, 1);
+
+        var local_library = libraries_manager.local_library;
+        savePlaylists.set_sensitive(!local_library.get_medias ().is_empty && local_library.playlist_count_without_read_only () > 0);
+
+        savePlaylists.clicked.connect(savePlaylistsClicked);
+        cancel.clicked.connect(cancel_clicked);
+        ok.clicked.connect(ok_clicked);
+
+        add (content);
+        show_all();
+
+        is_working.hide();
+    }
+
+    public void savePlaylistsClicked() {
+        string folder = "";
+        var file_chooser = new Gtk.FileChooserDialog (_("Choose Music Folder"), this,
+                                  Gtk.FileChooserAction.SELECT_FOLDER,
+                                  _(STRING_CANCEL), Gtk.ResponseType.CANCEL,
+                                  _(STRING_OPEN), Gtk.ResponseType.ACCEPT);
+        if (file_chooser.run () == Gtk.ResponseType.ACCEPT) {
+            folder = file_chooser.get_filename();
+        }
+
+        file_chooser.destroy ();
+
+        if(folder != "") {
+            is_working.show();
+            is_finished.hide();
+
+            // foreach playlist in lm.playlists(), save to (p.name).m3u
+            var success = true;
+            foreach(var p in libraries_manager.local_library.get_playlists()) {
+                if(!Noise.PlaylistsUtils.save_playlist_m3u(p, folder, ""))
+                    success = false;
+            }
+
+            is_working.hide();
+            is_finished.show();
+
+            var process_completed_icon = Icons.PROCESS_COMPLETED.render (Gtk.IconSize.MENU);
+            var process_error_icon = Icons.PROCESS_ERROR.render (Gtk.IconSize.MENU);
+
+            is_finished.set_from_pixbuf(success ? process_completed_icon : process_error_icon);
+        }
+    }
+
+    public void cancel_clicked() {
+        finished(false);
+
+        this.destroy();
+    }
+
+    public void ok_clicked() {
+        finished(true);
+
+        this.destroy();
+    }
 }
\ No newline at end of file

=== modified file 'src/Dialogs/TransferFromDeviceDialog.vala'
--- src/Dialogs/TransferFromDeviceDialog.vala	2014-04-19 22:03:29 +0000
+++ src/Dialogs/TransferFromDeviceDialog.vala	2014-04-20 17:31:49 +0000
@@ -26,276 +26,274 @@
 using Gtk;
 
 public class Noise.TransferFromDeviceDialog : Window {
-	Gee.LinkedList<Media> medias;
-	Device d;
-	
-	//for padding around notebook mostly
-	private Gtk.Box content;
-	private Gtk.Box padding;
-	
-	Gtk.CheckButton transferAll;
-	Gtk.ScrolledWindow mediasScroll;
-	Gtk.TreeView mediasView;
-	Gtk.ListStore mediasModel;
-	Gtk.Button transfer;
-	
-	Gtk.Menu viewMenu;
-	Gtk.MenuItem selectItem;
-	Gtk.MenuItem selectAlbum;
-	Gtk.MenuItem selectArtist;
-	
-	Gee.LinkedList<Media> to_transfer;
-	
-	public TransferFromDeviceDialog(Device d, Gee.LinkedList<Media> medias) {
-		this.medias = medias;
-		this.d = d;
-		
-		to_transfer = new Gee.LinkedList<Media>();
-		
-		this.set_title(_("Import from Device"));
-		
-		// set the size based on saved gconf settings
-		//this.window_position = WindowPosition.CENTER;
-		this.type_hint = Gdk.WindowTypeHint.DIALOG;
-		this.set_modal(true);
-		this.set_transient_for (App.main_window);
-		this.destroy_with_parent = true;
-		
-		set_default_size (550, -1);
-		resizable = false;
-		
-		content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
-		padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
-		
-		// initialize controls
-		var warning = new Gtk.Image.from_stock ("dialog-question", Gtk.IconSize.DIALOG);
-		var title = new Gtk.Label (_("Import media from %s").printf (d.getDisplayName ()));
-		var info = new Gtk.Label (_("The following files were found on %s, but are not in your library. Check all the files you would like to import.").printf (d.getDisplayName ()));
-		transferAll = new Gtk.CheckButton.with_label (_("Import all media"));
-		mediasScroll = new Gtk.ScrolledWindow (null, null);
-		mediasView = new Gtk.TreeView ();
-		mediasModel = new ListStore(5, typeof(bool), typeof(int), typeof(string), typeof(string), typeof(string));
-		mediasView.set_model(mediasModel);
-		transfer = new Button.with_label(_("Import"));
-		Button cancel = new Button.with_label(_("Don't Import"));
-		
-		// pretty up labels
-		title.xalign = 0.0f;
-
-		// be a bit explicit to make translations better
-		string title_text = "";
-		if (medias.size > 1) {
-			title_text = _("Import %i items from %s").printf (medias.size, d.getDisplayName ());
-		}
-		else {
-			var m = medias.get (0);
-			title_text = _("Import %s from %s").printf (m.title, d.getDisplayName ());
-		}
-
-		string MARKUP_TEMPLATE = "<span weight=\"bold\" size=\"larger\">%s</span>";		
-		var title_string = MARKUP_TEMPLATE.printf (String.escape (title_text));
-		title.set_markup (title_string);
-		
-		info.xalign = 0.0f;
-		info.set_line_wrap(true);
-		
-		/* add cellrenderers to columns and columns to treeview */
-		var toggle = new CellRendererToggle ();
-		toggle.toggled.connect ((toggle, path) => {
-			var tree_path = new TreePath.from_string (path);
-			TreeIter iter;
-			mediasModel.get_iter (out iter, tree_path);
-			mediasModel.set (iter, 0, !toggle.active);
-			
-			transfer.set_sensitive(false);
-			mediasModel.foreach(updateTransferSensetivity);
-		});
-
-		var column = new TreeViewColumn ();
-		column.title = "";
-		column.pack_start (toggle, false);
-		column.add_attribute (toggle, "active", 0);
-		mediasView.append_column(column);
-		
-		mediasView.insert_column_with_attributes(-1, _("ID"), new CellRendererText(), "text", 1, null);
-		mediasView.insert_column_with_attributes(-1, _("Title"), new CellRendererText(), "text", 2, null);
-		mediasView.insert_column_with_attributes(-1, _("Artist"), new CellRendererText(), "text", 3, null);
-		mediasView.insert_column_with_attributes(-1, _("Album"), new CellRendererText(), "text", 4, null);
-		mediasView.headers_visible = true;
-		
-		for(int i = 0; i < 5; ++i) {
-			mediasView.get_column(i).sizing = Gtk.TreeViewColumnSizing.FIXED;
-			mediasView.get_column(i).resizable = true;
-			mediasView.get_column(i).reorderable = false;
-			mediasView.get_column(i).clickable = false;
-		}
-		
-		mediasView.get_column(1).visible = false;
-		
-		mediasView.get_column(0).fixed_width = 25;
-		mediasView.get_column(1).fixed_width = 10;
-		mediasView.get_column(2).fixed_width = 300;
-		mediasView.get_column(3).fixed_width = 125;
-		mediasView.get_column(4).fixed_width = 125;
-		
-		//view.get_selection().set_mode(SelectionMode.MULTIPLE);
-		
-		/* fill the treeview */
-		var medias_sorted = new Gee.LinkedList<Media>();
-		foreach(var m in medias)
-			medias_sorted.add(m);
-		medias_sorted.sort(mediaCompareFunc);
-		
-		foreach(var s in medias_sorted) {
-			TreeIter item;
-			mediasModel.append(out item);
-			
-			mediasModel.set(item, 0, false, 1, s.rowid, 2, s.title, 3, s.artist, 4, s.album);
-		}
-		
-		mediasScroll.add(mediasView);
-		mediasScroll.set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
-		
-		transfer.set_sensitive(false);
-		
-		/* set up controls layout */
-		var information = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-		var information_text = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-		information.pack_start(warning, false, false, 10);
-		information_text.pack_start(title, false, true, 10);
-		information_text.pack_start(info, false, true, 0);
-		information.pack_start(information_text, true, true, 10);
-		
-		var listBox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-		listBox.pack_start(mediasScroll, true, true, 5);
-		
-		Expander exp = new Expander(_("Select individual media to import:"));
-		exp.add(listBox);
-		exp.expanded = false;
-		
-		var bottomButtons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-		bottomButtons.set_layout (Gtk.ButtonBoxStyle.END);
-		bottomButtons.pack_end (cancel, false, false, 10);
-		bottomButtons.pack_end (transfer, false, false, 0);
-		bottomButtons.set_spacing (10);
-		
-		content.pack_start(information, false, true, 0);
-		content.pack_start(UI.wrap_alignment (transferAll, 5, 0, 0, 75), false, true, 0);
-		content.pack_start(UI.wrap_alignment (exp, 0, 0, 0, 75), true, true, 0);
-		content.pack_start(bottomButtons, false, true, 10);
-		
-		padding.pack_start(content, true, true, 10);
-		
-		viewMenu = new Gtk.Menu();
-		selectItem = new Gtk.MenuItem.with_label(_("Check Item"));
-		selectAlbum = new Gtk.MenuItem.with_label(_("Check Album"));
-		selectArtist = new Gtk.MenuItem.with_label(_("Check Artist"));
-		
-		transfer.clicked.connect(transferClick);
-		transferAll.toggled.connect(transferAllToggled);
-		//mediasView.button_press_event.connect(mediasViewClick);
-		cancel.clicked.connect( () => { this.destroy(); });
-		exp.activate.connect( () => {
-			if(exp.get_expanded()) {
-				resizable = true;
-				set_size_request(550, 180);
-				resize(475, 180);
-				resizable = false;
-			}
-			else
-				set_size_request(550, 500);
-		});
-		
-		add(padding);
-		show_all();
-	}
-	
-	public static int mediaCompareFunc(Media a, Media b) {
-		if(a.artist == b.artist) {
-			if(a.album == b.album)
-				return (int)a.track - (int)b.track;
-			else
-				return (a.album > b.album) ? 1 : -1;
-			
-		}
-		else
-			return (a.artist > b.artist) ? 1 : -1;
-	}
-	
-	public static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
-		var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
-		alignment.top_padding = top;
-		alignment.right_padding = right;
-		alignment.bottom_padding = bottom;
-		alignment.left_padding = left;
-		
-		alignment.add(widget);
-		return alignment;
-	}
-	
-	public bool updateTransferSensetivity(TreeModel model, TreePath path, TreeIter iter) {
-		bool sel = false;
-		model.get(iter, 0, out sel);
-		
-		if(sel) {
-			transfer.set_sensitive(true);
-			return true;
-		}
-		
-		return false;
-	}
-	
-	public bool selectAll(TreeModel model, TreePath path, TreeIter iter) {
-		mediasModel.set(iter, 0, true);
-		
-		return false;
-	}
-	
-	public bool unselectAll(TreeModel model, TreePath path, TreeIter iter) {
-		mediasModel.set(iter, 0, false);
-		
-		return false;
-	}
-	
-	public virtual void transferAllToggled() {
-		if(transferAll.active) {
-			mediasModel.foreach(selectAll);
-			mediasView.set_sensitive(false);
-			transfer.set_sensitive(true);
-		}
-		else {
-			mediasModel.foreach(unselectAll);
-			mediasView.set_sensitive(true);
-			transfer.set_sensitive(false);
-		}
-	}
-	
-	public bool createTransferList(TreeModel model, TreePath path, TreeIter iter) {
-		Media? m = null;
-		bool selected = false;
-		mediasModel.get(iter, 0, out selected, 1, out m);
-		
-		if(m != null && selected) {
-			to_transfer.add(m);
-		}
-		
-		return false;
-	}
-	
-	public virtual void transferClick() {
-		to_transfer.clear();
-		mediasModel.foreach(createTransferList);
-		
-		if(libraries_manager.local_library.doing_file_operations()) {
-			NotificationManager.get_default ().doAlertNotification (_("Cannot Import"), _("Noise is already doing file operations. Please wait until those finish to import from %d").printf( d.getDisplayName()));
-		}
-		else {
-			libraries_manager.transfer_to_local_library (to_transfer);
-			this.destroy();
-		}
-	}
-	
-	public virtual void cancelClick() {
-		this.destroy();
-	}
+    Gee.LinkedList<Media> medias;
+    Device d;
+
+    //for padding around notebook mostly
+    private Gtk.Box content;
+    private Gtk.Box padding;
+
+    Gtk.CheckButton transferAll;
+    Gtk.ScrolledWindow mediasScroll;
+    Gtk.TreeView mediasView;
+    Gtk.ListStore mediasModel;
+    Gtk.Button transfer;
+
+    Gtk.Menu viewMenu;
+    Gtk.MenuItem selectItem;
+    Gtk.MenuItem selectAlbum;
+    Gtk.MenuItem selectArtist;
+
+    Gee.LinkedList<Media> to_transfer;
+
+    public TransferFromDeviceDialog(Device d, Gee.LinkedList<Media> medias) {
+        this.medias = medias;
+        this.d = d;
+
+        to_transfer = new Gee.LinkedList<Media>();
+
+        this.set_title(_("Import from Device"));
+
+        // set the size based on saved gconf settings
+        //this.window_position = WindowPosition.CENTER;
+        this.type_hint = Gdk.WindowTypeHint.DIALOG;
+        this.set_modal(true);
+        this.set_transient_for (App.main_window);
+        this.destroy_with_parent = true;
+
+        set_default_size (550, -1);
+        resizable = false;
+
+        content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
+        padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
+
+        // initialize controls
+        var warning = new Gtk.Image.from_stock ("dialog-question", Gtk.IconSize.DIALOG);
+        var title = new Gtk.Label (_("Import media from %s").printf (d.getDisplayName ()));
+        var info = new Gtk.Label (_("The following files were found on %s, but are not in your library. Check all the files you would like to import.").printf (d.getDisplayName ()));
+        transferAll = new Gtk.CheckButton.with_label (_("Import all media"));
+        mediasScroll = new Gtk.ScrolledWindow (null, null);
+        mediasView = new Gtk.TreeView ();
+        mediasModel = new ListStore(5, typeof(bool), typeof(int), typeof(string), typeof(string), typeof(string));
+        mediasView.set_model(mediasModel);
+        transfer = new Button.with_label(_("Import"));
+        Button cancel = new Button.with_label(_("Don't Import"));
+
+        // pretty up labels
+        title.xalign = 0.0f;
+
+        // be a bit explicit to make translations better
+        string title_text = "";
+        if (medias.size > 1) {
+            title_text = _("Import %i items from %s").printf (medias.size, d.getDisplayName ());
+        }
+        else {
+            var m = medias.get (0);
+            title_text = _("Import %s from %s").printf (m.title, d.getDisplayName ());
+        }
+
+        string MARKUP_TEMPLATE = "<span weight=\"bold\" size=\"larger\">%s</span>";		
+        var title_string = MARKUP_TEMPLATE.printf (String.escape (title_text));
+        title.set_markup (title_string);
+
+        info.xalign = 0.0f;
+        info.set_line_wrap(true);
+
+        /* add cellrenderers to columns and columns to treeview */
+        var toggle = new CellRendererToggle ();
+        toggle.toggled.connect ((toggle, path) => {
+            var tree_path = new TreePath.from_string (path);
+            TreeIter iter;
+            mediasModel.get_iter (out iter, tree_path);
+            mediasModel.set (iter, 0, !toggle.active);
+
+            transfer.set_sensitive(false);
+            mediasModel.foreach(updateTransferSensetivity);
+        });
+
+        var column = new TreeViewColumn ();
+        column.title = "";
+        column.pack_start (toggle, false);
+        column.add_attribute (toggle, "active", 0);
+        mediasView.append_column(column);
+
+        mediasView.insert_column_with_attributes(-1, _("ID"), new CellRendererText(), "text", 1, null);
+        mediasView.insert_column_with_attributes(-1, _("Title"), new CellRendererText(), "text", 2, null);
+        mediasView.insert_column_with_attributes(-1, _("Artist"), new CellRendererText(), "text", 3, null);
+        mediasView.insert_column_with_attributes(-1, _("Album"), new CellRendererText(), "text", 4, null);
+        mediasView.headers_visible = true;
+
+        for(int i = 0; i < 5; ++i) {
+            mediasView.get_column(i).sizing = Gtk.TreeViewColumnSizing.FIXED;
+            mediasView.get_column(i).resizable = true;
+            mediasView.get_column(i).reorderable = false;
+            mediasView.get_column(i).clickable = false;
+        }
+
+        mediasView.get_column(1).visible = false;
+
+        mediasView.get_column(0).fixed_width = 25;
+        mediasView.get_column(1).fixed_width = 10;
+        mediasView.get_column(2).fixed_width = 300;
+        mediasView.get_column(3).fixed_width = 125;
+        mediasView.get_column(4).fixed_width = 125;
+
+        //view.get_selection().set_mode(SelectionMode.MULTIPLE);
+
+        /* fill the treeview */
+        var medias_sorted = new Gee.LinkedList<Media>();
+        foreach(var m in medias)
+            medias_sorted.add(m);
+        medias_sorted.sort(mediaCompareFunc);
+
+        foreach(var s in medias_sorted) {
+            TreeIter item;
+            mediasModel.append(out item);
+
+            mediasModel.set(item, 0, false, 1, s.rowid, 2, s.title, 3, s.artist, 4, s.album);
+        }
+
+        mediasScroll.add(mediasView);
+        mediasScroll.set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
+
+        transfer.set_sensitive(false);
+
+        /* set up controls layout */
+        var information = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+        var information_text = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+        information.pack_start(warning, false, false, 10);
+        information_text.pack_start(title, false, true, 10);
+        information_text.pack_start(info, false, true, 0);
+        information.pack_start(information_text, true, true, 10);
+
+        var listBox = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+        listBox.pack_start(mediasScroll, true, true, 5);
+
+        Expander exp = new Expander(_("Select individual media to import:"));
+        exp.add(listBox);
+        exp.expanded = false;
+
+        var bottomButtons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
+        bottomButtons.set_layout (Gtk.ButtonBoxStyle.END);
+        bottomButtons.pack_end (cancel, false, false, 10);
+        bottomButtons.pack_end (transfer, false, false, 0);
+        bottomButtons.set_spacing (10);
+
+        content.pack_start(information, false, true, 0);
+        content.pack_start(UI.wrap_alignment (transferAll, 5, 0, 0, 75), false, true, 0);
+        content.pack_start(UI.wrap_alignment (exp, 0, 0, 0, 75), true, true, 0);
+        content.pack_start(bottomButtons, false, true, 10);
+
+        padding.pack_start(content, true, true, 10);
+
+        viewMenu = new Gtk.Menu();
+        selectItem = new Gtk.MenuItem.with_label(_("Check Item"));
+        selectAlbum = new Gtk.MenuItem.with_label(_("Check Album"));
+        selectArtist = new Gtk.MenuItem.with_label(_("Check Artist"));
+
+        transfer.clicked.connect(transferClick);
+        transferAll.toggled.connect(transferAllToggled);
+        //mediasView.button_press_event.connect(mediasViewClick);
+        cancel.clicked.connect( () => { this.destroy(); });
+        exp.activate.connect( () => {
+            if(exp.get_expanded()) {
+                resizable = true;
+                set_size_request(550, 180);
+                resize(475, 180);
+                resizable = false;
+            }
+            else
+                set_size_request(550, 500);
+        });
+
+        add(padding);
+        show_all();
+    }
+
+    public static int mediaCompareFunc(Media a, Media b) {
+        if(a.artist == b.artist) {
+            if(a.album == b.album)
+                return (int)a.track - (int)b.track;
+            else
+                return (a.album > b.album) ? 1 : -1;
+
+        }
+        else
+            return (a.artist > b.artist) ? 1 : -1;
+    }
+
+    public static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
+        var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
+        alignment.top_padding = top;
+        alignment.right_padding = right;
+        alignment.bottom_padding = bottom;
+        alignment.left_padding = left;
+
+        alignment.add(widget);
+        return alignment;
+    }
+
+    public bool updateTransferSensetivity(TreeModel model, TreePath path, TreeIter iter) {
+        bool sel = false;
+        model.get(iter, 0, out sel);
+
+        if(sel) {
+            transfer.set_sensitive(true);
+            return true;
+        }
+
+        return false;
+    }
+
+    public bool selectAll(TreeModel model, TreePath path, TreeIter iter) {
+        mediasModel.set(iter, 0, true);
+
+        return false;
+    }
+
+    public bool unselectAll(TreeModel model, TreePath path, TreeIter iter) {
+        mediasModel.set(iter, 0, false);
+
+        return false;
+    }
+
+    public virtual void transferAllToggled() {
+        if(transferAll.active) {
+            mediasModel.foreach(selectAll);
+            mediasView.set_sensitive(false);
+            transfer.set_sensitive(true);
+        } else {
+            mediasModel.foreach(unselectAll);
+            mediasView.set_sensitive(true);
+            transfer.set_sensitive(false);
+        }
+    }
+
+    public bool createTransferList(TreeModel model, TreePath path, TreeIter iter) {
+        Media? m = null;
+        bool selected = false;
+        mediasModel.get(iter, 0, out selected, 1, out m);
+
+        if(m != null && selected) {
+        to_transfer.add(m);
+        }
+
+        return false;
+    }
+
+    public virtual void transferClick() {
+        to_transfer.clear();
+        mediasModel.foreach(createTransferList);
+
+        if(libraries_manager.local_library.doing_file_operations()) {
+            NotificationManager.get_default ().doAlertNotification (_("Cannot Import"), _("Noise is already doing file operations. Please wait until those finish to import from %d").printf( d.getDisplayName()));
+        } else {
+            libraries_manager.transfer_to_local_library (to_transfer);
+            this.destroy();
+        }
+    }
+
+    public virtual void cancelClick() {
+        this.destroy();
+    }
 }
\ No newline at end of file