Merge lp:~mjs7231/do-plugins/files-folders-extensions into lp:do-plugins

[MShepanski]

Added option to filter folders and files by an extensions list. Includes the following updates:
  * Extensions is a simple whitelist of extensions to include (leave blank for old behavior).
  * Preferences UI updated to contain third column for extensions.
  * Preferences UI updated to include note & example about adding extension (in English).
  * Extensions list is propagated throughout the IndexedFolder classes in the code.

[MShepanski (mjs7231)]

I can't link it like normally because they are attached to the wrong project, but the following blueprints may be solved by this update. I would argue that also including a blacklist would be a bit confusing to the UI at this point.

https://blueprints.launchpad.net/do/+spec/files-plugin-filetypes
https://blueprints.launchpad.net/do/+spec/gnome-do-file-types

Unmerged revisions

754. By MShepanski on 2012-02-20

Add option to filter files by an extensions list

=== modified file 'File/gtk-gui/Do.FilesAndFolders.Configuration.cs'
--- File/gtk-gui/Do.FilesAndFolders.Configuration.cs	2009-06-23 00:52:54 +0000
+++ File/gtk-gui/Do.FilesAndFolders.Configuration.cs	2012-02-20 22:25:22 +0000
@@ -1,333 +1,312 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
 
-namespace Do.FilesAndFolders {
-    
-    
-    public partial class Configuration {
-        
-        private Gtk.Alignment alignment1;
-        
-        private Gtk.VBox vbox2;
-        
-        private Gtk.VBox vbox1;
-        
-        private Gtk.Notebook notebook1;
-        
-        private Gtk.VBox vbox4;
-        
-        private Gtk.Alignment alignment3;
-        
-        private Gtk.VBox vbox6;
-        
-        private Gtk.ScrolledWindow index_node_scroll;
-        
-        private Gtk.HBox hbox1;
-        
-        private Gtk.Label IndexLabel;
-        
-        private Gtk.HButtonBox hbuttonbox2;
-        
-        private Gtk.Button index_remove_btn;
-        
-        private Gtk.Button index_add_btn;
-        
-        private Gtk.CheckButton show_hidden_chk;
-        
-        private Gtk.Label label1;
-        
-        private Gtk.VBox vbox5;
-        
-        private Gtk.Alignment alignment2;
-        
-        private Gtk.VBox vbox3;
-        
-        private Gtk.ScrolledWindow ignore_node_scroll;
-        
-        private Gtk.HBox hbox3;
-        
-        private Gtk.Label IgnoreLabel;
-        
-        private Gtk.HButtonBox hbuttonbox3;
-        
-        private Gtk.Button ignore_remove_btn;
-        
-        private Gtk.Button ignore_add_btn;
-        
-        private Gtk.Label label2;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize(this);
-            // Widget Do.FilesAndFolders.Configuration
-            Stetic.BinContainer.Attach(this);
-            this.Name = "Do.FilesAndFolders.Configuration";
-            // Container child Do.FilesAndFolders.Configuration.Gtk.Container+ContainerChild
-            this.alignment1 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
-            this.alignment1.Name = "alignment1";
-            this.alignment1.BorderWidth = ((uint)(8));
-            // Container child alignment1.Gtk.Container+ContainerChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            this.vbox2.Spacing = 6;
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.vbox1 = new Gtk.VBox();
-            this.vbox1.Name = "vbox1";
-            this.vbox1.Spacing = 6;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.notebook1 = new Gtk.Notebook();
-            this.notebook1.HeightRequest = 270;
-            this.notebook1.CanFocus = true;
-            this.notebook1.Name = "notebook1";
-            this.notebook1.CurrentPage = 0;
-            this.notebook1.ShowBorder = false;
-            // Container child notebook1.Gtk.Notebook+NotebookChild
-            this.vbox4 = new Gtk.VBox();
-            this.vbox4.Name = "vbox4";
-            this.vbox4.Spacing = 6;
-            // Container child vbox4.Gtk.Box+BoxChild
-            this.alignment3 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
-            this.alignment3.Name = "alignment3";
-            this.alignment3.LeftPadding = ((uint)(8));
-            this.alignment3.TopPadding = ((uint)(8));
-            this.alignment3.RightPadding = ((uint)(8));
-            this.alignment3.BottomPadding = ((uint)(8));
-            // Container child alignment3.Gtk.Container+ContainerChild
-            this.vbox6 = new Gtk.VBox();
-            this.vbox6.Name = "vbox6";
-            this.vbox6.Spacing = 6;
-            // Container child vbox6.Gtk.Box+BoxChild
-            this.index_node_scroll = new Gtk.ScrolledWindow();
-            this.index_node_scroll.CanFocus = true;
-            this.index_node_scroll.Name = "index_node_scroll";
-            this.index_node_scroll.ShadowType = ((Gtk.ShadowType)(1));
-            this.vbox6.Add(this.index_node_scroll);
-            Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.vbox6[this.index_node_scroll]));
-            w1.Position = 0;
-            // Container child vbox6.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            this.hbox1.Spacing = 6;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.IndexLabel = new Gtk.Label();
-            this.IndexLabel.Name = "IndexLabel";
-            this.hbox1.Add(this.IndexLabel);
-            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.IndexLabel]));
-            w2.Position = 0;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.hbuttonbox2 = new Gtk.HButtonBox();
-            this.hbuttonbox2.Name = "hbuttonbox2";
-            // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
-            this.index_remove_btn = new Gtk.Button();
-            this.index_remove_btn.CanFocus = true;
-            this.index_remove_btn.Name = "index_remove_btn";
-            this.index_remove_btn.UseUnderline = true;
-            // Container child index_remove_btn.Gtk.Container+ContainerChild
-            Gtk.Alignment w3 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w4 = new Gtk.HBox();
-            w4.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w5 = new Gtk.Image();
-            w5.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-remove", Gtk.IconSize.Button, 16);
-            w4.Add(w5);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w7 = new Gtk.Label();
-            w4.Add(w7);
-            w3.Add(w4);
-            this.index_remove_btn.Add(w3);
-            this.hbuttonbox2.Add(this.index_remove_btn);
-            Gtk.ButtonBox.ButtonBoxChild w11 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2[this.index_remove_btn]));
-            w11.Expand = false;
-            w11.Fill = false;
-            // Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
-            this.index_add_btn = new Gtk.Button();
-            this.index_add_btn.CanFocus = true;
-            this.index_add_btn.Name = "index_add_btn";
-            this.index_add_btn.UseUnderline = true;
-            // Container child index_add_btn.Gtk.Container+ContainerChild
-            Gtk.Alignment w12 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w13 = new Gtk.HBox();
-            w13.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w14 = new Gtk.Image();
-            w14.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-add", Gtk.IconSize.Menu, 16);
-            w13.Add(w14);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w16 = new Gtk.Label();
-            w13.Add(w16);
-            w12.Add(w13);
-            this.index_add_btn.Add(w12);
-            this.hbuttonbox2.Add(this.index_add_btn);
-            Gtk.ButtonBox.ButtonBoxChild w20 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2[this.index_add_btn]));
-            w20.Position = 1;
-            w20.Expand = false;
-            w20.Fill = false;
-            this.hbox1.Add(this.hbuttonbox2);
-            Gtk.Box.BoxChild w21 = ((Gtk.Box.BoxChild)(this.hbox1[this.hbuttonbox2]));
-            w21.Position = 1;
-            w21.Expand = false;
-            this.vbox6.Add(this.hbox1);
-            Gtk.Box.BoxChild w22 = ((Gtk.Box.BoxChild)(this.vbox6[this.hbox1]));
-            w22.Position = 1;
-            w22.Expand = false;
-            w22.Fill = false;
-            // Container child vbox6.Gtk.Box+BoxChild
-            this.show_hidden_chk = new Gtk.CheckButton();
-            this.show_hidden_chk.CanFocus = true;
-            this.show_hidden_chk.Name = "show_hidden_chk";
-            this.show_hidden_chk.Label = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Show hidden files");
-            this.show_hidden_chk.DrawIndicator = true;
-            this.show_hidden_chk.UseUnderline = true;
-            this.show_hidden_chk.BorderWidth = ((uint)(5));
-            this.vbox6.Add(this.show_hidden_chk);
-            Gtk.Box.BoxChild w23 = ((Gtk.Box.BoxChild)(this.vbox6[this.show_hidden_chk]));
-            w23.Position = 2;
-            w23.Expand = false;
-            w23.Fill = false;
-            this.alignment3.Add(this.vbox6);
-            this.vbox4.Add(this.alignment3);
-            Gtk.Box.BoxChild w25 = ((Gtk.Box.BoxChild)(this.vbox4[this.alignment3]));
-            w25.Position = 0;
-            this.notebook1.Add(this.vbox4);
-            // Notebook tab
-            this.label1 = new Gtk.Label();
-            this.label1.Name = "label1";
-            this.label1.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Indexed Folders");
-            this.notebook1.SetTabLabel(this.vbox4, this.label1);
-            this.label1.ShowAll();
-            // Container child notebook1.Gtk.Notebook+NotebookChild
-            this.vbox5 = new Gtk.VBox();
-            this.vbox5.Name = "vbox5";
-            this.vbox5.Spacing = 6;
-            // Container child vbox5.Gtk.Box+BoxChild
-            this.alignment2 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
-            this.alignment2.Name = "alignment2";
-            this.alignment2.LeftPadding = ((uint)(8));
-            this.alignment2.TopPadding = ((uint)(8));
-            this.alignment2.RightPadding = ((uint)(8));
-            this.alignment2.BottomPadding = ((uint)(8));
-            // Container child alignment2.Gtk.Container+ContainerChild
-            this.vbox3 = new Gtk.VBox();
-            this.vbox3.Name = "vbox3";
-            this.vbox3.Spacing = 6;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.ignore_node_scroll = new Gtk.ScrolledWindow();
-            this.ignore_node_scroll.CanFocus = true;
-            this.ignore_node_scroll.Name = "ignore_node_scroll";
-            this.ignore_node_scroll.ShadowType = ((Gtk.ShadowType)(1));
-            this.vbox3.Add(this.ignore_node_scroll);
-            Gtk.Box.BoxChild w27 = ((Gtk.Box.BoxChild)(this.vbox3[this.ignore_node_scroll]));
-            w27.Position = 0;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.hbox3 = new Gtk.HBox();
-            this.hbox3.Name = "hbox3";
-            this.hbox3.Spacing = 6;
-            // Container child hbox3.Gtk.Box+BoxChild
-            this.IgnoreLabel = new Gtk.Label();
-            this.IgnoreLabel.Name = "IgnoreLabel";
-            this.hbox3.Add(this.IgnoreLabel);
-            Gtk.Box.BoxChild w28 = ((Gtk.Box.BoxChild)(this.hbox3[this.IgnoreLabel]));
-            w28.Position = 0;
-            w28.Fill = false;
-            // Container child hbox3.Gtk.Box+BoxChild
-            this.hbuttonbox3 = new Gtk.HButtonBox();
-            this.hbuttonbox3.Name = "hbuttonbox3";
-            // Container child hbuttonbox3.Gtk.ButtonBox+ButtonBoxChild
-            this.ignore_remove_btn = new Gtk.Button();
-            this.ignore_remove_btn.CanFocus = true;
-            this.ignore_remove_btn.Name = "ignore_remove_btn";
-            this.ignore_remove_btn.UseUnderline = true;
-            // Container child ignore_remove_btn.Gtk.Container+ContainerChild
-            Gtk.Alignment w29 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w30 = new Gtk.HBox();
-            w30.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w31 = new Gtk.Image();
-            w31.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-remove", Gtk.IconSize.Button, 16);
-            w30.Add(w31);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w33 = new Gtk.Label();
-            w30.Add(w33);
-            w29.Add(w30);
-            this.ignore_remove_btn.Add(w29);
-            this.hbuttonbox3.Add(this.ignore_remove_btn);
-            Gtk.ButtonBox.ButtonBoxChild w37 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox3[this.ignore_remove_btn]));
-            w37.Expand = false;
-            w37.Fill = false;
-            w37.Padding = ((uint)(5));
-            // Container child hbuttonbox3.Gtk.ButtonBox+ButtonBoxChild
-            this.ignore_add_btn = new Gtk.Button();
-            this.ignore_add_btn.CanFocus = true;
-            this.ignore_add_btn.Name = "ignore_add_btn";
-            this.ignore_add_btn.UseUnderline = true;
-            // Container child ignore_add_btn.Gtk.Container+ContainerChild
-            Gtk.Alignment w38 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w39 = new Gtk.HBox();
-            w39.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w40 = new Gtk.Image();
-            w40.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-add", Gtk.IconSize.Menu, 16);
-            w39.Add(w40);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w42 = new Gtk.Label();
-            w39.Add(w42);
-            w38.Add(w39);
-            this.ignore_add_btn.Add(w38);
-            this.hbuttonbox3.Add(this.ignore_add_btn);
-            Gtk.ButtonBox.ButtonBoxChild w46 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox3[this.ignore_add_btn]));
-            w46.Position = 1;
-            w46.Expand = false;
-            w46.Fill = false;
-            w46.Padding = ((uint)(5));
-            this.hbox3.Add(this.hbuttonbox3);
-            Gtk.Box.BoxChild w47 = ((Gtk.Box.BoxChild)(this.hbox3[this.hbuttonbox3]));
-            w47.Position = 1;
-            w47.Expand = false;
-            this.vbox3.Add(this.hbox3);
-            Gtk.Box.BoxChild w48 = ((Gtk.Box.BoxChild)(this.vbox3[this.hbox3]));
-            w48.Position = 1;
-            w48.Expand = false;
-            w48.Fill = false;
-            this.alignment2.Add(this.vbox3);
-            this.vbox5.Add(this.alignment2);
-            Gtk.Box.BoxChild w50 = ((Gtk.Box.BoxChild)(this.vbox5[this.alignment2]));
-            w50.Position = 0;
-            this.notebook1.Add(this.vbox5);
-            Gtk.Notebook.NotebookChild w51 = ((Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox5]));
-            w51.Position = 1;
-            // Notebook tab
-            this.label2 = new Gtk.Label();
-            this.label2.Name = "label2";
-            this.label2.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Ignored Folders");
-            this.notebook1.SetTabLabel(this.vbox5, this.label2);
-            this.label2.ShowAll();
-            this.vbox1.Add(this.notebook1);
-            Gtk.Box.BoxChild w52 = ((Gtk.Box.BoxChild)(this.vbox1[this.notebook1]));
-            w52.Position = 0;
-            this.vbox2.Add(this.vbox1);
-            Gtk.Box.BoxChild w53 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox1]));
-            w53.Position = 0;
-            this.alignment1.Add(this.vbox2);
-            this.Add(this.alignment1);
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.Show();
-            this.index_remove_btn.Clicked += new System.EventHandler(this.OnRemoveBtnClicked);
-            this.index_add_btn.Clicked += new System.EventHandler(this.OnAddBtnClicked);
-            this.show_hidden_chk.Clicked += new System.EventHandler(this.OnShowHiddenChkClicked);
-            this.ignore_remove_btn.Clicked += new System.EventHandler(this.OnRemoveBtnClicked);
-            this.ignore_add_btn.Clicked += new System.EventHandler(this.OnAddBtnClicked);
-        }
-    }
+// This file has been generated by the GUI designer. Do not modify.
+namespace Do.FilesAndFolders
+{
+	public partial class Configuration
+	{
+		private global::Gtk.Alignment alignment1;
+		private global::Gtk.VBox vbox2;
+		private global::Gtk.VBox vbox1;
+		private global::Gtk.Notebook notebook1;
+		private global::Gtk.VBox vbox4;
+		private global::Gtk.Alignment alignment3;
+		private global::Gtk.VBox vbox6;
+		private global::Gtk.ScrolledWindow index_node_scroll;
+		private global::Gtk.HBox hbox1;
+		private global::Gtk.Label ExtensionsHelp;
+		private global::Gtk.HButtonBox hbuttonbox2;
+		private global::Gtk.Button index_remove_btn;
+		private global::Gtk.Button index_add_btn;
+		private global::Gtk.CheckButton show_hidden_chk;
+		private global::Gtk.Label label1;
+		private global::Gtk.VBox vbox5;
+		private global::Gtk.Alignment alignment2;
+		private global::Gtk.VBox vbox3;
+		private global::Gtk.ScrolledWindow ignore_node_scroll;
+		private global::Gtk.HBox hbox3;
+		private global::Gtk.Label IgnoreLabel;
+		private global::Gtk.HButtonBox hbuttonbox3;
+		private global::Gtk.Button ignore_remove_btn;
+		private global::Gtk.Button ignore_add_btn;
+		private global::Gtk.Label label2;
+		
+		protected virtual void Build ()
+		{
+			global::Stetic.Gui.Initialize (this);
+			// Widget Do.FilesAndFolders.Configuration
+			global::Stetic.BinContainer.Attach (this);
+			this.WidthRequest = 630;
+			this.Name = "Do.FilesAndFolders.Configuration";
+			// Container child Do.FilesAndFolders.Configuration.Gtk.Container+ContainerChild
+			this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment1.Name = "alignment1";
+			this.alignment1.BorderWidth = ((uint)(8));
+			// Container child alignment1.Gtk.Container+ContainerChild
+			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2.Name = "vbox2";
+			this.vbox2.Spacing = 6;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.vbox1 = new global::Gtk.VBox ();
+			this.vbox1.Name = "vbox1";
+			this.vbox1.Spacing = 6;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.notebook1 = new global::Gtk.Notebook ();
+			this.notebook1.HeightRequest = 270;
+			this.notebook1.CanFocus = true;
+			this.notebook1.Name = "notebook1";
+			this.notebook1.CurrentPage = 0;
+			this.notebook1.ShowBorder = false;
+			// Container child notebook1.Gtk.Notebook+NotebookChild
+			this.vbox4 = new global::Gtk.VBox ();
+			this.vbox4.Name = "vbox4";
+			this.vbox4.Spacing = 6;
+			// Container child vbox4.Gtk.Box+BoxChild
+			this.alignment3 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment3.Name = "alignment3";
+			this.alignment3.LeftPadding = ((uint)(8));
+			this.alignment3.TopPadding = ((uint)(8));
+			this.alignment3.RightPadding = ((uint)(8));
+			this.alignment3.BottomPadding = ((uint)(8));
+			// Container child alignment3.Gtk.Container+ContainerChild
+			this.vbox6 = new global::Gtk.VBox ();
+			this.vbox6.Name = "vbox6";
+			this.vbox6.Spacing = 6;
+			// Container child vbox6.Gtk.Box+BoxChild
+			this.index_node_scroll = new global::Gtk.ScrolledWindow ();
+			this.index_node_scroll.CanFocus = true;
+			this.index_node_scroll.Name = "index_node_scroll";
+			this.index_node_scroll.ShadowType = ((global::Gtk.ShadowType)(1));
+			this.vbox6.Add (this.index_node_scroll);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.index_node_scroll]));
+			w1.Position = 0;
+			// Container child vbox6.Gtk.Box+BoxChild
+			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1.Name = "hbox1";
+			this.hbox1.Spacing = 6;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.ExtensionsHelp = new global::Gtk.Label ();
+			this.ExtensionsHelp.WidthRequest = 410;
+			this.ExtensionsHelp.HeightRequest = 30;
+			this.ExtensionsHelp.Name = "ExtensionsHelp";
+			this.ExtensionsHelp.Xpad = 8;
+			this.ExtensionsHelp.Xalign = 0F;
+			this.ExtensionsHelp.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Leave extensions blank to index all files.  Use a comma seperated\nlist to index only those items.  Example: gif,jpg,png\n\n");
+			this.ExtensionsHelp.UseMarkup = true;
+			this.ExtensionsHelp.Wrap = true;
+			this.ExtensionsHelp.Justify = ((global::Gtk.Justification)(3));
+			this.hbox1.Add (this.ExtensionsHelp);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.ExtensionsHelp]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Fill = false;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.hbuttonbox2 = new global::Gtk.HButtonBox ();
+			this.hbuttonbox2.Name = "hbuttonbox2";
+			// Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
+			this.index_remove_btn = new global::Gtk.Button ();
+			this.index_remove_btn.CanFocus = true;
+			this.index_remove_btn.Name = "index_remove_btn";
+			this.index_remove_btn.UseUnderline = true;
+			// Container child index_remove_btn.Gtk.Container+ContainerChild
+			global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+			// Container child GtkAlignment.Gtk.Container+ContainerChild
+			global::Gtk.HBox w4 = new global::Gtk.HBox ();
+			w4.Spacing = 2;
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Image w5 = new global::Gtk.Image ();
+			w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-remove", global::Gtk.IconSize.Button);
+			w4.Add (w5);
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Label w7 = new global::Gtk.Label ();
+			w4.Add (w7);
+			w3.Add (w4);
+			this.index_remove_btn.Add (w3);
+			this.hbuttonbox2.Add (this.index_remove_btn);
+			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.index_remove_btn]));
+			w11.Expand = false;
+			w11.Fill = false;
+			// Container child hbuttonbox2.Gtk.ButtonBox+ButtonBoxChild
+			this.index_add_btn = new global::Gtk.Button ();
+			this.index_add_btn.CanFocus = true;
+			this.index_add_btn.Name = "index_add_btn";
+			this.index_add_btn.UseUnderline = true;
+			// Container child index_add_btn.Gtk.Container+ContainerChild
+			global::Gtk.Alignment w12 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+			// Container child GtkAlignment.Gtk.Container+ContainerChild
+			global::Gtk.HBox w13 = new global::Gtk.HBox ();
+			w13.Spacing = 2;
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Image w14 = new global::Gtk.Image ();
+			w14.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-add", global::Gtk.IconSize.Menu);
+			w13.Add (w14);
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Label w16 = new global::Gtk.Label ();
+			w13.Add (w16);
+			w12.Add (w13);
+			this.index_add_btn.Add (w12);
+			this.hbuttonbox2.Add (this.index_add_btn);
+			global::Gtk.ButtonBox.ButtonBoxChild w20 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox2 [this.index_add_btn]));
+			w20.Position = 1;
+			w20.Expand = false;
+			w20.Fill = false;
+			this.hbox1.Add (this.hbuttonbox2);
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.hbuttonbox2]));
+			w21.Position = 1;
+			w21.Expand = false;
+			this.vbox6.Add (this.hbox1);
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.hbox1]));
+			w22.Position = 1;
+			w22.Expand = false;
+			w22.Fill = false;
+			// Container child vbox6.Gtk.Box+BoxChild
+			this.show_hidden_chk = new global::Gtk.CheckButton ();
+			this.show_hidden_chk.CanFocus = true;
+			this.show_hidden_chk.Name = "show_hidden_chk";
+			this.show_hidden_chk.Label = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Show hidden files");
+			this.show_hidden_chk.DrawIndicator = true;
+			this.show_hidden_chk.UseUnderline = true;
+			this.show_hidden_chk.BorderWidth = ((uint)(5));
+			this.vbox6.Add (this.show_hidden_chk);
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.show_hidden_chk]));
+			w23.Position = 2;
+			w23.Expand = false;
+			w23.Fill = false;
+			this.alignment3.Add (this.vbox6);
+			this.vbox4.Add (this.alignment3);
+			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.alignment3]));
+			w25.Position = 0;
+			this.notebook1.Add (this.vbox4);
+			// Notebook tab
+			this.label1 = new global::Gtk.Label ();
+			this.label1.Name = "label1";
+			this.label1.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Indexed Folders");
+			this.notebook1.SetTabLabel (this.vbox4, this.label1);
+			this.label1.ShowAll ();
+			// Container child notebook1.Gtk.Notebook+NotebookChild
+			this.vbox5 = new global::Gtk.VBox ();
+			this.vbox5.Name = "vbox5";
+			this.vbox5.Spacing = 6;
+			// Container child vbox5.Gtk.Box+BoxChild
+			this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+			this.alignment2.Name = "alignment2";
+			this.alignment2.LeftPadding = ((uint)(8));
+			this.alignment2.TopPadding = ((uint)(8));
+			this.alignment2.RightPadding = ((uint)(8));
+			this.alignment2.BottomPadding = ((uint)(8));
+			// Container child alignment2.Gtk.Container+ContainerChild
+			this.vbox3 = new global::Gtk.VBox ();
+			this.vbox3.Name = "vbox3";
+			this.vbox3.Spacing = 6;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.ignore_node_scroll = new global::Gtk.ScrolledWindow ();
+			this.ignore_node_scroll.CanFocus = true;
+			this.ignore_node_scroll.Name = "ignore_node_scroll";
+			this.ignore_node_scroll.ShadowType = ((global::Gtk.ShadowType)(1));
+			this.vbox3.Add (this.ignore_node_scroll);
+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.ignore_node_scroll]));
+			w27.Position = 0;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.hbox3 = new global::Gtk.HBox ();
+			this.hbox3.Name = "hbox3";
+			this.hbox3.Spacing = 6;
+			// Container child hbox3.Gtk.Box+BoxChild
+			this.IgnoreLabel = new global::Gtk.Label ();
+			this.IgnoreLabel.Name = "IgnoreLabel";
+			this.hbox3.Add (this.IgnoreLabel);
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.IgnoreLabel]));
+			w28.Position = 0;
+			w28.Fill = false;
+			// Container child hbox3.Gtk.Box+BoxChild
+			this.hbuttonbox3 = new global::Gtk.HButtonBox ();
+			this.hbuttonbox3.Name = "hbuttonbox3";
+			// Container child hbuttonbox3.Gtk.ButtonBox+ButtonBoxChild
+			this.ignore_remove_btn = new global::Gtk.Button ();
+			this.ignore_remove_btn.CanFocus = true;
+			this.ignore_remove_btn.Name = "ignore_remove_btn";
+			this.ignore_remove_btn.UseUnderline = true;
+			// Container child ignore_remove_btn.Gtk.Container+ContainerChild
+			global::Gtk.Alignment w29 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+			// Container child GtkAlignment.Gtk.Container+ContainerChild
+			global::Gtk.HBox w30 = new global::Gtk.HBox ();
+			w30.Spacing = 2;
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Image w31 = new global::Gtk.Image ();
+			w31.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-remove", global::Gtk.IconSize.Button);
+			w30.Add (w31);
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Label w33 = new global::Gtk.Label ();
+			w30.Add (w33);
+			w29.Add (w30);
+			this.ignore_remove_btn.Add (w29);
+			this.hbuttonbox3.Add (this.ignore_remove_btn);
+			global::Gtk.ButtonBox.ButtonBoxChild w37 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox3 [this.ignore_remove_btn]));
+			w37.Expand = false;
+			w37.Fill = false;
+			w37.Padding = ((uint)(5));
+			// Container child hbuttonbox3.Gtk.ButtonBox+ButtonBoxChild
+			this.ignore_add_btn = new global::Gtk.Button ();
+			this.ignore_add_btn.CanFocus = true;
+			this.ignore_add_btn.Name = "ignore_add_btn";
+			this.ignore_add_btn.UseUnderline = true;
+			// Container child ignore_add_btn.Gtk.Container+ContainerChild
+			global::Gtk.Alignment w38 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+			// Container child GtkAlignment.Gtk.Container+ContainerChild
+			global::Gtk.HBox w39 = new global::Gtk.HBox ();
+			w39.Spacing = 2;
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Image w40 = new global::Gtk.Image ();
+			w40.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-add", global::Gtk.IconSize.Menu);
+			w39.Add (w40);
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Label w42 = new global::Gtk.Label ();
+			w39.Add (w42);
+			w38.Add (w39);
+			this.ignore_add_btn.Add (w38);
+			this.hbuttonbox3.Add (this.ignore_add_btn);
+			global::Gtk.ButtonBox.ButtonBoxChild w46 = ((global::Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox3 [this.ignore_add_btn]));
+			w46.Position = 1;
+			w46.Expand = false;
+			w46.Fill = false;
+			w46.Padding = ((uint)(5));
+			this.hbox3.Add (this.hbuttonbox3);
+			global::Gtk.Box.BoxChild w47 = ((global::Gtk.Box.BoxChild)(this.hbox3 [this.hbuttonbox3]));
+			w47.Position = 1;
+			w47.Expand = false;
+			this.vbox3.Add (this.hbox3);
+			global::Gtk.Box.BoxChild w48 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox3]));
+			w48.Position = 1;
+			w48.Expand = false;
+			w48.Fill = false;
+			this.alignment2.Add (this.vbox3);
+			this.vbox5.Add (this.alignment2);
+			global::Gtk.Box.BoxChild w50 = ((global::Gtk.Box.BoxChild)(this.vbox5 [this.alignment2]));
+			w50.Position = 0;
+			this.notebook1.Add (this.vbox5);
+			global::Gtk.Notebook.NotebookChild w51 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox5]));
+			w51.Position = 1;
+			// Notebook tab
+			this.label2 = new global::Gtk.Label ();
+			this.label2.Name = "label2";
+			this.label2.LabelProp = global::Mono.Addins.AddinManager.CurrentLocalizer.GetString ("Ignored Folders");
+			this.notebook1.SetTabLabel (this.vbox5, this.label2);
+			this.label2.ShowAll ();
+			this.vbox1.Add (this.notebook1);
+			global::Gtk.Box.BoxChild w52 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.notebook1]));
+			w52.Position = 0;
+			this.vbox2.Add (this.vbox1);
+			global::Gtk.Box.BoxChild w53 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.vbox1]));
+			w53.Position = 0;
+			this.alignment1.Add (this.vbox2);
+			this.Add (this.alignment1);
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
+			}
+			this.Show ();
+			this.index_remove_btn.Clicked += new global::System.EventHandler (this.OnRemoveBtnClicked);
+			this.index_add_btn.Clicked += new global::System.EventHandler (this.OnAddBtnClicked);
+			this.show_hidden_chk.Clicked += new global::System.EventHandler (this.OnShowHiddenChkClicked);
+			this.ignore_remove_btn.Clicked += new global::System.EventHandler (this.OnRemoveBtnClicked);
+			this.ignore_add_btn.Clicked += new global::System.EventHandler (this.OnAddBtnClicked);
+		}
+	}
 }

=== modified file 'File/gtk-gui/generated.cs'
--- File/gtk-gui/generated.cs	2009-03-05 01:12:21 +0000
+++ File/gtk-gui/generated.cs	2012-02-20 22:25:22 +0000
@@ -1,115 +1,115 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
 
-namespace Stetic {
-    
-    
-    internal class Gui {
-        
-        private static bool initialized;
-        
-        internal static void Initialize(Gtk.Widget iconRenderer) {
-            if ((Stetic.Gui.initialized == false)) {
-                Stetic.Gui.initialized = true;
-            }
-        }
-    }
-    
-    internal class BinContainer {
-        
-        private Gtk.Widget child;
-        
-        private Gtk.UIManager uimanager;
-        
-        public static BinContainer Attach(Gtk.Bin bin) {
-            BinContainer bc = new BinContainer();
-            bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
-            bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
-            bin.Added += new Gtk.AddedHandler(bc.OnAdded);
-            return bc;
-        }
-        
-        private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
-            if ((this.child != null)) {
-                args.Requisition = this.child.SizeRequest();
-            }
-        }
-        
-        private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
-            if ((this.child != null)) {
-                this.child.Allocation = args.Allocation;
-            }
-        }
-        
-        private void OnAdded(object sender, Gtk.AddedArgs args) {
-            this.child = args.Widget;
-        }
-        
-        public void SetUiManager(Gtk.UIManager uim) {
-            this.uimanager = uim;
-            this.child.Realized += new System.EventHandler(this.OnRealized);
-        }
-        
-        private void OnRealized(object sender, System.EventArgs args) {
-            if ((this.uimanager != null)) {
-                Gtk.Widget w;
-                w = this.child.Toplevel;
-                if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
-                    ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
-                    this.uimanager = null;
-                }
-            }
-        }
-    }
-    
-    internal class IconLoader {
-        
-        public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size, int sz) {
-            Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
-            if ((res != null)) {
-                return res;
-            }
-            else {
-                try {
-                    return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
-                }
-                catch (System.Exception ) {
-                    if ((name != "gtk-missing-image")) {
-                        return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size, sz);
-                    }
-                    else {
-                        Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
-                        Gdk.GC gc = new Gdk.GC(pmap);
-                        gc.RgbFgColor = new Gdk.Color(255, 255, 255);
-                        pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
-                        gc.RgbFgColor = new Gdk.Color(0, 0, 0);
-                        pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
-                        gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-                        gc.RgbFgColor = new Gdk.Color(255, 0, 0);
-                        pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-                        pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-                        return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-                    }
-                }
-            }
-        }
-    }
-    
-    internal class ActionGroups {
-        
-        public static Gtk.ActionGroup GetActionGroup(System.Type type) {
-            return Stetic.ActionGroups.GetActionGroup(type.FullName);
-        }
-        
-        public static Gtk.ActionGroup GetActionGroup(string name) {
-            return null;
-        }
-    }
+// This file has been generated by the GUI designer. Do not modify.
+namespace Stetic
+{
+	internal class Gui
+	{
+		private static bool initialized;
+		
+		internal static void Initialize (Gtk.Widget iconRenderer)
+		{
+			if ((Stetic.Gui.initialized == false)) {
+				Stetic.Gui.initialized = true;
+			}
+		}
+	}
+	
+	internal class BinContainer
+	{
+		private Gtk.Widget child;
+		private Gtk.UIManager uimanager;
+		
+		public static BinContainer Attach (Gtk.Bin bin)
+		{
+			BinContainer bc = new BinContainer ();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
+			return bc;
+		}
+		
+		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
+		{
+			if ((this.child != null)) {
+				args.Requisition = this.child.SizeRequest ();
+			}
+		}
+		
+		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
+		{
+			if ((this.child != null)) {
+				this.child.Allocation = args.Allocation;
+			}
+		}
+		
+		private void OnAdded (object sender, Gtk.AddedArgs args)
+		{
+			this.child = args.Widget;
+		}
+		
+		public void SetUiManager (Gtk.UIManager uim)
+		{
+			this.uimanager = uim;
+			this.child.Realized += new System.EventHandler (this.OnRealized);
+		}
+		
+		private void OnRealized (object sender, System.EventArgs args)
+		{
+			if ((this.uimanager != null)) {
+				Gtk.Widget w;
+				w = this.child.Toplevel;
+				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
+					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
+					this.uimanager = null;
+				}
+			}
+		}
+	}
+	
+	internal class IconLoader
+	{
+		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
+		{
+			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
+			if ((res != null)) {
+				return res;
+			} else {
+				int sz;
+				int sy;
+				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
+				try {
+					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
+				} catch (System.Exception) {
+					if ((name != "gtk-missing-image")) {
+						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
+					} else {
+						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
+						Gdk.GC gc = new Gdk.GC (pmap);
+						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
+						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
+						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
+						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
+						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
+						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
+						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
+						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
+						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
+					}
+				}
+			}
+		}
+	}
+	
+	internal class ActionGroups
+	{
+		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		{
+			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+		}
+		
+		public static Gtk.ActionGroup GetActionGroup (string name)
+		{
+			return null;
+		}
+	}
 }

=== modified file 'File/gtk-gui/gui.stetic'
--- File/gtk-gui/gui.stetic	2009-06-23 00:52:54 +0000
+++ File/gtk-gui/gui.stetic	2012-02-20 22:25:22 +0000
@@ -5,12 +5,11 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
-    <widget-library name="Do.Interface.Linux, Version=0.9.0.0, Culture=neutral" />
-    <widget-library name="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
     <widget-library name="../bin/Debug/File.dll" internal="true" />
   </import>
-  <widget class="Gtk.Bin" id="Do.FilesAndFolders.Configuration" design-size="414 356">
+  <widget class="Gtk.Bin" id="Do.FilesAndFolders.Configuration" design-size="630 356">
     <property name="MemberName" />
+    <property name="WidthRequest">630</property>
     <child>
       <widget class="Gtk.Alignment" id="alignment1">
         <property name="MemberName" />
@@ -70,12 +69,25 @@
                                     <property name="MemberName" />
                                     <property name="Spacing">6</property>
                                     <child>
-                                      <widget class="Gtk.Label" id="IndexLabel">
+                                      <widget class="Gtk.Label" id="ExtensionsHelp">
                                         <property name="MemberName" />
+                                        <property name="WidthRequest">410</property>
+                                        <property name="HeightRequest">30</property>
+                                        <property name="Xpad">8</property>
+                                        <property name="Xalign">0</property>
+                                        <property name="LabelProp" translatable="yes">Leave extensions blank to index all files.  Use a comma seperated
+list to index only those items.  Example: gif,jpg,png
+
+</property>
+                                        <property name="UseMarkup">True</property>
+                                        <property name="Wrap">True</property>
+                                        <property name="Justify">Fill</property>
                                       </widget>
                                       <packing>
                                         <property name="Position">0</property>
-                                        <property name="AutoSize">False</property>
+                                        <property name="AutoSize">True</property>
+                                        <property name="Expand">False</property>
+                                        <property name="Fill">False</property>
                                       </packing>
                                     </child>
                                     <child>

=== modified file 'File/src/Do/Do.FilesAndFolders/Configuration.cs'
--- File/src/Do/Do.FilesAndFolders/Configuration.cs	2009-06-22 04:05:16 +0000
+++ File/src/Do/Do.FilesAndFolders/Configuration.cs	2012-02-20 22:25:22 +0000
@@ -98,7 +98,7 @@
 				
 			if (chooser.Run () == (int) ResponseType.Accept) {
 				if (!Plugin.FolderIndex.ContainsFolder (chooser.Filename))
-				    Plugin.FolderIndex.Add (new IndexedFolder (chooser.Filename, depth, status));
+				    Plugin.FolderIndex.Add (new IndexedFolder (chooser.Filename, depth, "", status));
 				RefreshCurrentView ();
 			}
 			chooser.Destroy ();

=== modified file 'File/src/Do/Do.FilesAndFolders/FileItemSource.cs'
--- File/src/Do/Do.FilesAndFolders/FileItemSource.cs	2009-06-24 14:35:46 +0000
+++ File/src/Do/Do.FilesAndFolders/FileItemSource.cs	2012-02-20 22:25:22 +0000
@@ -20,6 +20,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Collections;
 using System.Collections.Generic;
 
 using Mono.Addins;
@@ -37,6 +38,7 @@
 
 		IEnumerable<Item> items;
 		bool maximum_files_warned;
+		private static IList<string> NoExtensions = "".Split(new char[] {','}, StringSplitOptions.RemoveEmptyEntries);
 
 		string MaximumFilesIndexedWarning {
 			get {
@@ -105,7 +107,7 @@
 			else
 				return Enumerable.Empty<Item> ();
 			
-			return RecursiveGetItems (file.Path, 1, Plugin.Preferences.IncludeHiddenFilesWhenBrowsing);
+			return RecursiveGetItems(file.Path, 1, NoExtensions, Plugin.Preferences.IncludeHiddenFilesWhenBrowsing);
 		}
 		
 		public override void UpdateItems ()
@@ -118,12 +120,12 @@
 				
 				if (Plugin.Preferences.LimitMaxFilesIndexed)
 					items = Plugin.FolderIndex
-						.SelectMany (folder => RecursiveGetItems (folder.Path, folder.Level, Plugin.Preferences.IncludeHiddenFiles, ignored))
+						.SelectMany (folder => RecursiveGetItems(folder.Path, folder.Level, folder.ExtensionList, Plugin.Preferences.IncludeHiddenFiles, ignored))
 						.Take (Plugin.Preferences.MaximumFilesIndexed)
 						.ToArray ();
 				else
 					items = Plugin.FolderIndex
-						.SelectMany (folder => RecursiveGetItems (folder.Path, folder.Level, Plugin.Preferences.IncludeHiddenFiles, ignored))
+						.SelectMany (folder => RecursiveGetItems(folder.Path, folder.Level, folder.ExtensionList, Plugin.Preferences.IncludeHiddenFiles, ignored))
 						.ToArray ();
 								
 				if (!maximum_files_warned && items.Count () == Plugin.Preferences.MaximumFilesIndexed) {
@@ -157,17 +159,17 @@
 		/// A <see cref="IEnumerable"/>
 		/// </returns>
 		
-		static IEnumerable<Item> RecursiveGetItems (string path, uint levels, bool includeHidden)
+		static IEnumerable<Item> RecursiveGetItems (string path, uint levels, IList<string> extensions, bool includeHidden)
 		{
-			return RecursiveGetItems(path, levels, includeHidden, Enumerable.Empty<IndexedFolder> ());
+			return RecursiveGetItems(path, levels, extensions, includeHidden, Enumerable.Empty<IndexedFolder> ());
 		}
 		
-		static IEnumerable<Item> RecursiveGetItems (string path, uint levels, bool includeHidden, IEnumerable<IndexedFolder> ignored)
+		static IEnumerable<Item> RecursiveGetItems (string path, uint levels, IList<string> extensions, bool includeHidden, IEnumerable<IndexedFolder> ignored)
 		{
 			IEnumerable<string> files;
 			IEnumerable<Item> fileItems, applicationItems;
 			
-			files = RecursiveListFiles (path, levels, includeHidden, ignored);
+			files = RecursiveListFiles (path, levels, extensions, includeHidden, ignored);
 
 			fileItems = files
 				.Select (filepath => Plugin.NewFileItem (filepath))
@@ -181,7 +183,7 @@
 			return applicationItems.Concat (fileItems);
 		}
 		
-		static IEnumerable<string> RecursiveListFiles (string path, uint levels, bool includeHidden, IEnumerable<IndexedFolder> ignored)
+		static IEnumerable<string> RecursiveListFiles (string path, uint levels, IList<string> extensions, bool includeHidden, IEnumerable<IndexedFolder> ignored)
 		{
 			IEnumerable<string> results = null;
 
@@ -194,11 +196,11 @@
 				IEnumerable<string> files, directories, recursiveFiles;
 				
 				files = Directory.GetFiles (path)
-					.Where (filepath => ShouldIndexPath (filepath, includeHidden, ignored));
+					.Where (filepath => ShouldIndexPath (filepath, includeHidden, extensions, ignored));
 				directories = Directory.GetDirectories (path)
-					.Where (filepath => ShouldIndexPath (filepath, includeHidden, ignored));
+					.Where (filepath => ShouldIndexPath (filepath, includeHidden, extensions, ignored));
 				recursiveFiles = directories
-					.SelectMany (dir => RecursiveListFiles (dir, levels - 1, includeHidden, ignored));
+					.SelectMany (dir => RecursiveListFiles (dir, levels - 1, extensions, includeHidden, ignored));
 				results = files.Concat (directories).Concat (recursiveFiles);
 				
 			} catch (Exception e) {
@@ -209,14 +211,21 @@
 			return results;
 		}
 
-		static bool ShouldIndexPath (string path, bool includeHidden, IEnumerable<IndexedFolder> ignored)
+		static bool ShouldIndexPath (string path, bool includeHidden, IList<string> extensions, IEnumerable<IndexedFolder> ignored)
 		{
 			string filename = Path.GetFileName (path);
 			bool isForbidden = filename == "." || filename == ".." || filename.EndsWith ("~");
 			bool isHidden = filename.StartsWith (".");
+			bool isIncluded = true;
+			
+			if (File.Exists(path) && extensions.Count() > 0) {
+				string extension = Path.GetExtension(path).TrimStart(new char[] {'.'});
+				isIncluded = extensions.Contains(extension);
+			}
+			
 			if (ignored.Where (folder => path == folder.Path).Any ()) 
 				isForbidden = true;
-			return !isForbidden && (includeHidden || !isHidden);
+			return !isForbidden && isIncluded && (includeHidden || !isHidden);
 		}
 		
 	}

=== modified file 'File/src/Do/Do.FilesAndFolders/IndexedFolder.cs'
--- File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2010-11-04 22:55:52 +0000
+++ File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2012-02-20 22:25:22 +0000
@@ -20,6 +20,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 using Do.Platform;
 
@@ -30,24 +31,36 @@
 	{
 		public string Path { get; private set; }
 		public uint Level { get; private set; }
+		public string Extensions { get; private set; }
+		public IList<string> ExtensionList { get; private set; }
 		public FolderStatus Status { get; private set; }
 		
-		public IndexedFolder (string path, uint level, FolderStatus status) : this ()
+		public IndexedFolder (string path, uint level, string extensions, FolderStatus status) : this ()
 		{
 			if (path == null) throw new ArgumentNullException ("path");
+			if (extensions == null) extensions = "";
 			
 			Path = Services.Environment.ExpandPath (path);
 			Level = level;
+			Extensions = extensions;
+			ExtensionList = BuildExtensionList();
 			Status = status;
 		}
 		
-		public IndexedFolder (string path, uint level) : this (path, level, FolderStatus.Indexed)
+		private IList<string> BuildExtensionList ()
+		{
+			IList<string> extensions = Extensions.Replace(" ", "").Split(new char[] {','}, StringSplitOptions.RemoveEmptyEntries);
+			extensions = (from item in extensions select(item = item.ToLower().TrimStart('.').Trim())).ToList();
+			return extensions;
+		}
+		
+		public IndexedFolder (string path, uint level) : this (path, level, "", FolderStatus.Indexed)
 		{
 		}
 
 		public override string ToString ()
 		{
-			return string.Format ("{0} {2} {1} {3}", GetType ().Name, Path, Level, Status);
+			return string.Format ("{0} {2} {1} {3} {4}", GetType ().Name, Path, Level, Extensions, Status);
 		}
 
 		public override bool Equals (object other)
@@ -57,12 +70,12 @@
 
 		public override int GetHashCode ()
 		{
-			return Path.GetHashCode () ^ Level.GetHashCode () ^ Status.GetHashCode ();
+			return Path.GetHashCode () ^ Level.GetHashCode () ^ Extensions.GetHashCode() ^ Status.GetHashCode ();
 		}
 
 		public bool Equals (IndexedFolder other)
 		{
-			return other.Path == Path && other.Level == Level && other.Status == Status;
+			return other.Path == Path && other.Level == Level && other.Extensions == Extensions  && other.Status == Status;
 		}
 
 		public static bool operator== (IndexedFolder left, IndexedFolder right)

=== modified file 'File/src/Do/Do.FilesAndFolders/IndexedFolderCollection.cs'
--- File/src/Do/Do.FilesAndFolders/IndexedFolderCollection.cs	2009-03-04 22:34:14 +0000
+++ File/src/Do/Do.FilesAndFolders/IndexedFolderCollection.cs	2012-02-20 22:25:22 +0000
@@ -54,10 +54,10 @@
 
 		IEnumerable<IndexedFolder> GetDefaultFolders ()
 		{
-			yield return new IndexedFolder (Path.GetDirectoryName (Plugin.ImportantFolders.UserHome), 1, FolderStatus.Indexed);
-			yield return new IndexedFolder (Plugin.ImportantFolders.UserHome, 1, FolderStatus.Indexed);
-			yield return new IndexedFolder (Plugin.ImportantFolders.Desktop, 1, FolderStatus.Indexed);
-			yield return new IndexedFolder (Plugin.ImportantFolders.Documents, 2, FolderStatus.Indexed);
+			yield return new IndexedFolder (Path.GetDirectoryName (Plugin.ImportantFolders.UserHome), 1, "", FolderStatus.Indexed);
+			yield return new IndexedFolder (Plugin.ImportantFolders.UserHome, 1, "", FolderStatus.Indexed);
+			yield return new IndexedFolder (Plugin.ImportantFolders.Desktop, 1, "", FolderStatus.Indexed);
+			yield return new IndexedFolder (Plugin.ImportantFolders.Documents, 2, "", FolderStatus.Indexed);
 		}
 
 		public IndexedFolderCollection ()
@@ -74,11 +74,11 @@
 			}
 		}
 
-		public void UpdateIndexedFolder (string path, string newPath, uint newDepth, FolderStatus newStatus)
+		public void UpdateIndexedFolder (string path, string newPath, uint newDepth, string newExtensions, FolderStatus newStatus)
 		{
 			if (newDepth > LargeIndexLevel)
 				Log<IndexedFolderCollection>.Warn (LargeIndexLevelWarning, newPath, newDepth);
-			UpdateIndexedFolder (path, new IndexedFolder (newPath, newDepth, newStatus));
+			UpdateIndexedFolder (path, new IndexedFolder (newPath, newDepth, newExtensions, newStatus));
 		}
 
 		public void UpdateIndexedFolder (string path, IndexedFolder folder)
@@ -163,7 +163,7 @@
 				foreach (IndexedFolder folder in f) {
 					if (folder.Level > 0 && folder.Status == FolderStatus.Ignored) {
 						Log<IndexedFolderCollection>.Debug ("Old DB entry found for {0}, fixing.", folder.Path);
-						UpdateIndexedFolder(folder.Path, folder.Path, folder.Level, FolderStatus.Indexed);
+						UpdateIndexedFolder(folder.Path, folder.Path, folder.Level, folder.Extensions, FolderStatus.Indexed);
 					}
 				}
 				Log<IndexedFolderCollection>.Debug ("Loaded Files and Folders plugin state.");

=== modified file 'File/src/IndexPathNodeView.cs'
--- File/src/IndexPathNodeView.cs	2010-04-11 17:45:19 +0000
+++ File/src/IndexPathNodeView.cs	2012-02-20 22:25:22 +0000
@@ -32,6 +32,7 @@
 		public enum Column {
 			Path = 0,
 			Depth,
+			Extensions,
 			NumColumns
 		}
 		
@@ -41,7 +42,7 @@
 			RulesHint = true;
 			HeadersVisible = true;
 			
-			Model = new ListStore (typeof (string), typeof (uint));
+			Model = new ListStore (typeof (string), typeof (uint), typeof(string));
 
 			cell = new CellRendererText ();
 			(cell as CellRendererText).Width = 280;
@@ -53,7 +54,13 @@
 			(cell as CellRendererText).Edited += OnDepthEdited;
 			(cell as CellRendererText).Alignment = Pango.Alignment.Right;
 			AppendColumn (AddinManager.CurrentLocalizer.GetString ("Depth"), cell, "text", Column.Depth);
-						
+			
+			cell = new CellRendererText();
+			(cell as CellRendererText).Editable = true;
+			(cell as CellRendererText).Edited += OnExtensionsEdited;
+			(cell as CellRendererText).Alignment = Pango.Alignment.Right;
+			AppendColumn(AddinManager.CurrentLocalizer.GetString("Extensions"), cell, "text", Column.Extensions);
+			
 			Refresh ();
 		}
 		
@@ -66,6 +73,7 @@
 		{
 			uint depth;
 			string path;
+			string extensions;
 			TreeIter iter;
 			ListStore store;
 
@@ -73,14 +81,34 @@
 			store.GetIter (out iter, new TreePath (e.Path));
 			
 			path = store.GetValue (iter, (int) Column.Path) as string;
+			extensions = store.GetValue(iter, (int)Column.Extensions) as string;
 			try {
 				depth = uint.Parse (e.NewText);
 			} catch {
 				depth = 1;
 			}
-			Plugin.FolderIndex.UpdateIndexedFolder (path, path, depth, FolderStatus.Indexed);
+			Plugin.FolderIndex.UpdateIndexedFolder (path, path, depth, extensions, FolderStatus.Indexed);
 			
 			Refresh ();
 		}
+		
+		public void OnExtensionsEdited (object o, EditedArgs e)
+		{
+			uint depth;
+			string path;
+			string extensions;
+			TreeIter iter;
+			ListStore store;
+			
+			store = Model as ListStore;
+			store.GetIter(out iter, new TreePath(e.Path));
+			
+			path = store.GetValue(iter, (int)Column.Path) as string;
+			depth = (uint)store.GetValue(iter, (int)Column.Depth);
+			extensions = e.NewText;
+			Plugin.FolderIndex.UpdateIndexedFolder(path, path, depth, extensions, FolderStatus.Indexed);
+			
+			Refresh();
+		}
 	}
 }

=== modified file 'File/src/PathNodeView.cs'
--- File/src/PathNodeView.cs	2009-06-22 04:05:16 +0000
+++ File/src/PathNodeView.cs	2012-02-20 22:25:22 +0000
@@ -48,7 +48,7 @@
 				store.Clear ();
 				foreach (IndexedFolder pair in Plugin.FolderIndex) {
 					if (indexed && pair.Status == FolderStatus.Indexed)
-						store.AppendValues (pair.Path, pair.Level);
+						store.AppendValues (pair.Path, pair.Level, pair.Extensions);
 					else if (!indexed && pair.Status == FolderStatus.Ignored)
 						store.AppendValues (pair.Path);
 				}