Merge lp:~cszikszoy/do-plugins/fandfignore into lp:do-plugins

[Chris S.]

[Alex Launi (alexlauni)]

The nodeview can be abstracted further, the Refresh methods are almost identical, that should be a red flag for you to get rid of that duplicated code. Should be easy to do.

I think you should make RecursiveListFiles take a new IEnumerable parameter of files to ignore instead of keeping a heap variable of ignored paths, just keep it on the stack. Load it in UpdateItems, and then pass it in. The way you're doing it now requires you to keep a static variable on the heap, and also it looks like it will prevent files marked as ignored from showing up when exploring child items via the arrow keys.

review: Needs Fixing

[lp:~cszikszoy/do-plugins/fandfignore]

558. By Chris S. on 2009-03-02

further clean up

[Alex Launi (alexlauni)]

Here's a pretty bad bug, when installing this plugin for the first time, all of my indexed folders are listed as ignored.

[lp:~cszikszoy/do-plugins/fandfignore]

559. By Chris S. on 2009-03-02

try to fix old db versions

560. By Chris S. on 2009-03-03

detect old serialization database and fix

561. By Chris S. on 2009-03-04

use enum instead of bool

562. By Chris S. on 2009-03-04

added another constructor for IndexedFolder

563. By Chris S. on 2009-03-05

GUI fixes, button fixes

564. By Chris S. on 2009-03-05

update ver number

565. By Chris S. on 2009-03-05

merge trunk

=== modified file 'File/File.mdp'
--- File/File.mdp	2009-02-28 16:16:48 +0000
+++ File/File.mdp	2009-03-01 00:06:44 +0000
@@ -41,6 +41,9 @@
     <File name="src/Do/Do.FilesAndFolders/MoveToTrashAction.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do/Do.FilesAndFolders/AbstractFileAction.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do/Do.FilesAndFolders/RenameAction.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/CellRendererTogglePixbuf.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/IndexPathNodeView.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/IgnorePathNodeView.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -52,5 +55,6 @@
     <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform.Linux, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
+    <ProjectReference type="Gac" localcopy="True" refto="Do.Interface.Linux, Version=0.9.0.0, Culture=neutral, PublicKeyToken=null" />
   </References>
 </Project>
 \ No newline at end of file
 
=== modified file 'File/Makefile.am'
--- File/Makefile.am	2009-01-14 00:28:50 +0000
+++ File/Makefile.am	2009-02-16 01:11:46 +0000
@@ -6,6 +6,8 @@
 	gtk-gui/Do.FilesAndFolders.Configuration.cs \
 	gtk-gui/generated.cs \
 	src/PathNodeView.cs \
+	src/IndexPathNodeView.cs \
+	src/IgnorePathNodeView.cs \
 	src/Do/Do.FilesAndFolders/NewFolderAction.cs \
 	src/Do/Do.FilesAndFolders/IndexedFolderCollection.cs \
 	src/Do/Do.FilesAndFolders/Preferences.cs \
 
=== modified file 'File/Resources/File.addin.xml'
--- File/Resources/File.addin.xml	2009-01-10 02:13:19 +0000
+++ File/Resources/File.addin.xml	2009-02-14 20:58:03 +0000
@@ -1,10 +1,10 @@
 <Addin 
 	id="File"
 	namespace="Do"
-	version="2.0"
+	version="2.2"
 	name="Files and Folders"
 	description="Search, browse, and perform other actions on files and folders."
-	author="David Siegel, Alex Launi, Ankit Solanki"
+	author="David Siegel, Alex Launi, Ankit Solanki, Chris Szikszoy"
 	category="Official"
 	>
 
 
=== modified file 'File/gtk-gui/Do.FilesAndFolders.Configuration.cs'
--- File/gtk-gui/Do.FilesAndFolders.Configuration.cs	2009-02-13 21:34:02 +0000
+++ File/gtk-gui/Do.FilesAndFolders.Configuration.cs	2009-02-17 10:48:05 +0000
@@ -17,19 +17,23 @@
         
         private Gtk.VBox vbox2;
         
-        private Gtk.ScrolledWindow node_scroll;
-        
         private Gtk.VBox vbox1;
         
-        private Gtk.HButtonBox hbuttonbox1;
-        
-        private Gtk.Button remove_btn;
-        
-        private Gtk.Image image3;
-        
-        private Gtk.Button add_btn;
-        
-        private Gtk.Image image1;
+        private Gtk.Notebook notebook1;
+        
+        private Gtk.VBox vbox4;
+        
+        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.HBox hbox2;
         
@@ -37,10 +41,26 @@
         
         private Gtk.Entry numFiles;
         
-        private Gtk.VBox vbox3;
-        
         private Gtk.CheckButton show_hidden_chk;
         
+        private Gtk.Label label1;
+        
+        private Gtk.VBox vbox5;
+        
+        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
@@ -55,57 +75,98 @@
             this.vbox2.Name = "vbox2";
             this.vbox2.Spacing = 6;
             // Container child vbox2.Gtk.Box+BoxChild
-            this.node_scroll = new Gtk.ScrolledWindow();
-            this.node_scroll.CanFocus = true;
-            this.node_scroll.Name = "node_scroll";
-            this.node_scroll.ShadowType = ((Gtk.ShadowType)(1));
-            this.vbox2.Add(this.node_scroll);
-            Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.vbox2[this.node_scroll]));
-            w1.Position = 0;
-            // 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.hbuttonbox1 = new Gtk.HButtonBox();
-            this.hbuttonbox1.Name = "hbuttonbox1";
-            this.hbuttonbox1.Spacing = 4;
-            this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
-            // Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
-            this.remove_btn = new Gtk.Button();
-            this.remove_btn.CanFocus = true;
-            this.remove_btn.Name = "remove_btn";
-            // Container child remove_btn.Gtk.Container+ContainerChild
-            this.image3 = new Gtk.Image();
-            this.image3.Name = "image3";
-            this.image3.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-remove", Gtk.IconSize.Button, 20);
-            this.remove_btn.Add(this.image3);
-            this.remove_btn.Label = null;
-            this.hbuttonbox1.Add(this.remove_btn);
-            Gtk.ButtonBox.ButtonBoxChild w3 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1[this.remove_btn]));
-            w3.Expand = false;
-            w3.Fill = false;
-            // Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
-            this.add_btn = new Gtk.Button();
-            this.add_btn.CanFocus = true;
-            this.add_btn.Name = "add_btn";
-            // Container child add_btn.Gtk.Container+ContainerChild
-            this.image1 = new Gtk.Image();
-            this.image1.Name = "image1";
-            this.image1.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-add", Gtk.IconSize.Button, 20);
-            this.add_btn.Add(this.image1);
-            this.add_btn.Label = null;
-            this.hbuttonbox1.Add(this.add_btn);
-            Gtk.ButtonBox.ButtonBoxChild w5 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox1[this.add_btn]));
-            w5.Position = 1;
-            w5.Expand = false;
-            w5.Fill = false;
-            this.vbox1.Add(this.hbuttonbox1);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbuttonbox1]));
-            w6.Position = 0;
-            w6.Expand = false;
-            w6.Fill = false;
-            // 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 = 1;
+            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.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.vbox4.Add(this.index_node_scroll);
+            Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.vbox4[this.index_node_scroll]));
+            w1.Position = 0;
+            // Container child vbox4.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, 20);
+            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.vbox4.Add(this.hbox1);
+            Gtk.Box.BoxChild w22 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox1]));
+            w22.Position = 1;
+            w22.Expand = false;
+            w22.Fill = false;
+            // Container child vbox4.Gtk.Box+BoxChild
             this.hbox2 = new Gtk.HBox();
             this.hbox2.Name = "hbox2";
             this.hbox2.Spacing = 6;
@@ -114,10 +175,10 @@
             this.maxFileslbl.Name = "maxFileslbl";
             this.maxFileslbl.LabelProp = Mono.Unix.Catalog.GetString("Maximum number of items to index:");
             this.hbox2.Add(this.maxFileslbl);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox2[this.maxFileslbl]));
-            w7.Position = 0;
-            w7.Expand = false;
-            w7.Fill = false;
+            Gtk.Box.BoxChild w23 = ((Gtk.Box.BoxChild)(this.hbox2[this.maxFileslbl]));
+            w23.Position = 0;
+            w23.Expand = false;
+            w23.Fill = false;
             // Container child hbox2.Gtk.Box+BoxChild
             this.numFiles = new Gtk.Entry();
             this.numFiles.CanFocus = true;
@@ -126,19 +187,15 @@
             this.numFiles.WidthChars = 5;
             this.numFiles.InvisibleChar = '●';
             this.hbox2.Add(this.numFiles);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox2[this.numFiles]));
-            w8.Position = 1;
-            w8.Expand = false;
-            this.vbox1.Add(this.hbox2);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
-            w9.Position = 1;
-            w9.Expand = false;
-            w9.Fill = false;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.vbox3 = new Gtk.VBox();
-            this.vbox3.Name = "vbox3";
-            this.vbox3.Spacing = 6;
-            // Container child vbox3.Gtk.Box+BoxChild
+            Gtk.Box.BoxChild w24 = ((Gtk.Box.BoxChild)(this.hbox2[this.numFiles]));
+            w24.Position = 1;
+            w24.Expand = false;
+            this.vbox4.Add(this.hbox2);
+            Gtk.Box.BoxChild w25 = ((Gtk.Box.BoxChild)(this.vbox4[this.hbox2]));
+            w25.Position = 2;
+            w25.Expand = false;
+            w25.Fill = false;
+            // Container child vbox4.Gtk.Box+BoxChild
             this.show_hidden_chk = new Gtk.CheckButton();
             this.show_hidden_chk.CanFocus = true;
             this.show_hidden_chk.Name = "show_hidden_chk";
@@ -147,31 +204,127 @@
             this.show_hidden_chk.DrawIndicator = true;
             this.show_hidden_chk.UseUnderline = true;
             this.show_hidden_chk.BorderWidth = ((uint)(5));
-            this.vbox3.Add(this.show_hidden_chk);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox3[this.show_hidden_chk]));
-            w10.Position = 0;
-            w10.Expand = false;
-            w10.Fill = false;
-            this.vbox1.Add(this.vbox3);
-            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox1[this.vbox3]));
-            w11.Position = 2;
-            w11.Expand = false;
-            w11.Fill = false;
+            this.vbox4.Add(this.show_hidden_chk);
+            Gtk.Box.BoxChild w26 = ((Gtk.Box.BoxChild)(this.vbox4[this.show_hidden_chk]));
+            w26.Position = 3;
+            w26.Expand = false;
+            w26.Fill = false;
+            this.notebook1.Add(this.vbox4);
+            // Notebook tab
+            this.label1 = new Gtk.Label();
+            this.label1.Name = "label1";
+            this.label1.LabelProp = Mono.Unix.Catalog.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.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.vbox5.Add(this.ignore_node_scroll);
+            Gtk.Box.BoxChild w28 = ((Gtk.Box.BoxChild)(this.vbox5[this.ignore_node_scroll]));
+            w28.Position = 0;
+            // Container child vbox5.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 w29 = ((Gtk.Box.BoxChild)(this.hbox3[this.IgnoreLabel]));
+            w29.Position = 0;
+            w29.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 w30 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
+            // Container child GtkAlignment.Gtk.Container+ContainerChild
+            Gtk.HBox w31 = new Gtk.HBox();
+            w31.Spacing = 2;
+            // Container child GtkHBox.Gtk.Container+ContainerChild
+            Gtk.Image w32 = new Gtk.Image();
+            w32.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-remove", Gtk.IconSize.Button, 20);
+            w31.Add(w32);
+            // Container child GtkHBox.Gtk.Container+ContainerChild
+            Gtk.Label w34 = new Gtk.Label();
+            w31.Add(w34);
+            w30.Add(w31);
+            this.ignore_remove_btn.Add(w30);
+            this.hbuttonbox3.Add(this.ignore_remove_btn);
+            Gtk.ButtonBox.ButtonBoxChild w38 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox3[this.ignore_remove_btn]));
+            w38.Expand = false;
+            w38.Fill = false;
+            // 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 w39 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
+            // Container child GtkAlignment.Gtk.Container+ContainerChild
+            Gtk.HBox w40 = new Gtk.HBox();
+            w40.Spacing = 2;
+            // Container child GtkHBox.Gtk.Container+ContainerChild
+            Gtk.Image w41 = new Gtk.Image();
+            w41.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-add", Gtk.IconSize.Menu, 16);
+            w40.Add(w41);
+            // Container child GtkHBox.Gtk.Container+ContainerChild
+            Gtk.Label w43 = new Gtk.Label();
+            w40.Add(w43);
+            w39.Add(w40);
+            this.ignore_add_btn.Add(w39);
+            this.hbuttonbox3.Add(this.ignore_add_btn);
+            Gtk.ButtonBox.ButtonBoxChild w47 = ((Gtk.ButtonBox.ButtonBoxChild)(this.hbuttonbox3[this.ignore_add_btn]));
+            w47.Position = 1;
+            w47.Expand = false;
+            w47.Fill = false;
+            this.hbox3.Add(this.hbuttonbox3);
+            Gtk.Box.BoxChild w48 = ((Gtk.Box.BoxChild)(this.hbox3[this.hbuttonbox3]));
+            w48.Position = 1;
+            w48.Expand = false;
+            this.vbox5.Add(this.hbox3);
+            Gtk.Box.BoxChild w49 = ((Gtk.Box.BoxChild)(this.vbox5[this.hbox3]));
+            w49.Position = 1;
+            w49.Expand = false;
+            w49.Fill = false;
+            this.notebook1.Add(this.vbox5);
+            Gtk.Notebook.NotebookChild w50 = ((Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox5]));
+            w50.Position = 1;
+            // Notebook tab
+            this.label2 = new Gtk.Label();
+            this.label2.Name = "label2";
+            this.label2.LabelProp = Mono.Unix.Catalog.GetString("Ignored Folders");
+            this.notebook1.SetTabLabel(this.vbox5, this.label2);
+            this.label2.ShowAll();
+            this.vbox1.Add(this.notebook1);
+            Gtk.Box.BoxChild w51 = ((Gtk.Box.BoxChild)(this.vbox1[this.notebook1]));
+            w51.Position = 0;
             this.vbox2.Add(this.vbox1);
-            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox1]));
-            w12.Position = 1;
-            w12.Expand = false;
-            w12.Fill = false;
+            Gtk.Box.BoxChild w52 = ((Gtk.Box.BoxChild)(this.vbox2[this.vbox1]));
+            w52.Position = 0;
             this.alignment1.Add(this.vbox2);
             this.Add(this.alignment1);
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
             this.Show();
-            this.remove_btn.Clicked += new System.EventHandler(this.OnRemoveBtnClicked);
-            this.add_btn.Clicked += new System.EventHandler(this.OnAddBtnClicked);
+            this.index_remove_btn.Clicked += new System.EventHandler(this.OnRemoveBtnClicked);
+            this.index_add_btn.Clicked += new System.EventHandler(this.OnAddBtnClicked);
             this.numFiles.Changed += new System.EventHandler(this.OnNumFilesEdited);
             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);
         }
     }
 }
 
=== modified file 'File/gtk-gui/gui.stetic'
--- File/gtk-gui/gui.stetic	2009-02-13 21:34:02 +0000
+++ File/gtk-gui/gui.stetic	2009-03-02 03:08:02 +0000
@@ -2,9 +2,12 @@
 <stetic-interface>
   <configuration>
     <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12.1</target-gtk-version>
+    <target-gtk-version>2.12</target-gtk-version>
   </configuration>
-  <widget class="Gtk.Bin" id="Do.FilesAndFolders.Configuration" design-size="328 354">
+  <import>
+    <widget-library name="../bin/Debug/File.dll" internal="true" />
+  </import>
+  <widget class="Gtk.Bin" id="Do.FilesAndFolders.Configuration" design-size="414 356">
     <property name="MemberName" />
     <child>
       <widget class="Gtk.Alignment" id="alignment1">
@@ -15,156 +18,284 @@
             <property name="MemberName" />
             <property name="Spacing">6</property>
             <child>
-              <widget class="Gtk.ScrolledWindow" id="node_scroll">
-                <property name="MemberName" />
-                <property name="CanFocus">True</property>
-                <property name="ShadowType">In</property>
-                <child>
-                  <widget class="Gtk.Viewport" id="GtkViewport">
-                    <property name="MemberName" />
-                    <property name="ShadowType">None</property>
-                    <child>
-                      <placeholder />
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
-              </packing>
-            </child>
-            <child>
               <widget class="Gtk.VBox" id="vbox1">
                 <property name="MemberName" />
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.HButtonBox" id="hbuttonbox1">
+                  <widget class="Gtk.Notebook" id="notebook1">
                     <property name="MemberName" />
-                    <property name="Spacing">4</property>
-                    <property name="Size">2</property>
-                    <property name="LayoutStyle">End</property>
-                    <child>
-                      <widget class="Gtk.Button" id="remove_btn">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Type">Custom</property>
-                        <signal name="Clicked" handler="OnRemoveBtnClicked" />
-                        <child>
-                          <widget class="Gtk.Image" id="image3">
-                            <property name="MemberName" />
-                            <property name="Pixbuf">stock:gtk-remove Button</property>
-                          </widget>
-                        </child>
+                    <property name="HeightRequest">270</property>
+                    <property name="CanFocus">True</property>
+                    <property name="CurrentPage">1</property>
+                    <property name="ShowBorder">False</property>
+                    <child>
+                      <widget class="Gtk.VBox" id="vbox4">
+                        <property name="MemberName" />
+                        <property name="Spacing">6</property>
+                        <child>
+                          <widget class="Gtk.ScrolledWindow" id="index_node_scroll">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="ShadowType">In</property>
+                            <child>
+                              <widget class="Gtk.Viewport" id="GtkViewport">
+                                <property name="MemberName" />
+                                <property name="ShadowType">None</property>
+                                <child>
+                                  <placeholder />
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.HBox" id="hbox1">
+                            <property name="MemberName" />
+                            <property name="Spacing">6</property>
+                            <child>
+                              <widget class="Gtk.Label" id="IndexLabel">
+                                <property name="MemberName" />
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.HButtonBox" id="hbuttonbox2">
+                                <property name="MemberName" />
+                                <property name="Size">2</property>
+                                <child>
+                                  <widget class="Gtk.Button" id="index_remove_btn">
+                                    <property name="MemberName" />
+                                    <property name="CanFocus">True</property>
+                                    <property name="Type">TextAndIcon</property>
+                                    <property name="Icon">stock:gtk-remove Button</property>
+                                    <property name="Label" translatable="yes" />
+                                    <property name="UseUnderline">True</property>
+                                    <signal name="Clicked" handler="OnRemoveBtnClicked" />
+                                  </widget>
+                                  <packing>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Button" id="index_add_btn">
+                                    <property name="MemberName" />
+                                    <property name="CanFocus">True</property>
+                                    <property name="Type">TextAndIcon</property>
+                                    <property name="Icon">stock:gtk-add Menu</property>
+                                    <property name="Label" translatable="yes" />
+                                    <property name="UseUnderline">True</property>
+                                    <signal name="Clicked" handler="OnAddBtnClicked" />
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">1</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Expand">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.HBox" id="hbox2">
+                            <property name="MemberName" />
+                            <property name="Spacing">6</property>
+                            <child>
+                              <widget class="Gtk.Label" id="maxFileslbl">
+                                <property name="MemberName" />
+                                <property name="LabelProp" translatable="yes">Maximum number of items to index:</property>
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Expand">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.Entry" id="numFiles">
+                                <property name="MemberName">numFiles</property>
+                                <property name="CanFocus">True</property>
+                                <property name="IsEditable">True</property>
+                                <property name="WidthChars">5</property>
+                                <property name="InvisibleChar">●</property>
+                                <signal name="Changed" handler="OnNumFilesEdited" />
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Expand">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">2</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.CheckButton" id="show_hidden_chk">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Label" translatable="yes">Show hidden files</property>
+                            <property name="Active">True</property>
+                            <property name="DrawIndicator">True</property>
+                            <property name="HasLabel">True</property>
+                            <property name="UseUnderline">True</property>
+                            <property name="BorderWidth">5</property>
+                            <signal name="Clicked" handler="OnShowHiddenChkClicked" />
+                          </widget>
+                          <packing>
+                            <property name="Position">3</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Label" id="label1">
+                        <property name="MemberName" />
+                        <property name="LabelProp" translatable="yes">Indexed Folders</property>
                       </widget>
                       <packing>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
+                        <property name="type">tab</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="Gtk.Button" id="add_btn">
+                      <widget class="Gtk.VBox" id="vbox5">
                         <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Type">Custom</property>
-                        <signal name="Clicked" handler="OnAddBtnClicked" />
-                        <child>
-                          <widget class="Gtk.Image" id="image1">
-                            <property name="MemberName" />
-                            <property name="Pixbuf">stock:gtk-add Button</property>
-                          </widget>
+                        <property name="Spacing">6</property>
+                        <child>
+                          <widget class="Gtk.ScrolledWindow" id="ignore_node_scroll">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="ShadowType">In</property>
+                            <child>
+                              <widget class="Gtk.Viewport" id="GtkViewport1">
+                                <property name="MemberName" />
+                                <property name="ShadowType">None</property>
+                                <child>
+                                  <placeholder />
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.HBox" id="hbox3">
+                            <property name="MemberName" />
+                            <property name="Spacing">6</property>
+                            <child>
+                              <widget class="Gtk.Label" id="IgnoreLabel">
+                                <property name="MemberName" />
+                              </widget>
+                              <packing>
+                                <property name="Position">0</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="Gtk.HButtonBox" id="hbuttonbox3">
+                                <property name="MemberName" />
+                                <property name="Size">2</property>
+                                <child>
+                                  <widget class="Gtk.Button" id="ignore_remove_btn">
+                                    <property name="MemberName" />
+                                    <property name="CanFocus">True</property>
+                                    <property name="Type">TextAndIcon</property>
+                                    <property name="Icon">stock:gtk-remove Button</property>
+                                    <property name="Label" translatable="yes" />
+                                    <property name="UseUnderline">True</property>
+                                    <signal name="Clicked" handler="OnRemoveBtnClicked" />
+                                  </widget>
+                                  <packing>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="Gtk.Button" id="ignore_add_btn">
+                                    <property name="MemberName" />
+                                    <property name="CanFocus">True</property>
+                                    <property name="Type">TextAndIcon</property>
+                                    <property name="Icon">stock:gtk-add Menu</property>
+                                    <property name="Label" translatable="yes" />
+                                    <property name="UseUnderline">True</property>
+                                    <signal name="Clicked" handler="OnAddBtnClicked" />
+                                  </widget>
+                                  <packing>
+                                    <property name="Position">1</property>
+                                    <property name="Expand">False</property>
+                                    <property name="Fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="Position">1</property>
+                                <property name="AutoSize">False</property>
+                                <property name="Expand">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
                         </child>
                       </widget>
                       <packing>
                         <property name="Position">1</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Label" id="label2">
+                        <property name="MemberName" />
+                        <property name="LabelProp" translatable="yes">Ignored Folders</property>
+                      </widget>
+                      <packing>
+                        <property name="type">tab</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
                     <property name="Position">0</property>
                     <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.HBox" id="hbox2">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Label" id="maxFileslbl">
-                        <property name="MemberName" />
-                        <property name="LabelProp" translatable="yes">Maximum number of items to index:</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Entry" id="numFiles">
-                        <property name="MemberName">numFiles</property>
-                        <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="WidthChars">5</property>
-                        <property name="InvisibleChar">●</property>
-                        <signal name="Changed" handler="OnNumFilesEdited" />
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">False</property>
-                        <property name="Expand">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox3">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.CheckButton" id="show_hidden_chk">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="Label" translatable="yes">Show hidden files</property>
-                        <property name="Active">True</property>
-                        <property name="DrawIndicator">True</property>
-                        <property name="HasLabel">True</property>
-                        <property name="UseUnderline">True</property>
-                        <property name="BorderWidth">5</property>
-                        <signal name="Clicked" handler="OnShowHiddenChkClicked" />
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
                   </packing>
                 </child>
               </widget>
               <packing>
-                <property name="Position">1</property>
+                <property name="Position">0</property>
                 <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
               </packing>
             </child>
           </widget>
 
=== modified file 'File/src/Do/Do.FilesAndFolders/Configuration.cs'
--- File/src/Do/Do.FilesAndFolders/Configuration.cs	2009-02-13 21:34:02 +0000
+++ File/src/Do/Do.FilesAndFolders/Configuration.cs	2009-02-17 10:48:05 +0000
@@ -30,49 +30,86 @@
 	[System.ComponentModel.ToolboxItem(true)]
 	public partial class Configuration : Gtk.Bin
 	{
-		PathNodeView nview;
+		IndexPathNodeView indexNview;
+		IgnorePathNodeView ignoreNview;
 		
+		string indexDialog = Catalog.GetString ("Choose a folder to index");
+		string ignoreDialog = Catalog.GetString ("Choose a folder to ignore");
+			
 		public Configuration ()
-		{
+		{			
 			Build ();
 			
-			nview = new PathNodeView ();
-			nview.Selection.Changed += OnPathNodeViewSelectionChange;
+			indexNview = new IndexPathNodeView ();
+			ignoreNview = new IgnorePathNodeView ();
+			indexNview.Selection.Changed += OnPathNodeViewSelectionChange;
+			ignoreNview.Selection.Changed += OnPathNodeViewSelectionChange;
 			numFiles.Changed += OnNumFilesEdited;
-			node_scroll.Add (nview);
+			
+			index_node_scroll.Add (indexNview);
+			ignore_node_scroll.Add (ignoreNview);
 			
 			show_hidden_chk.Active = Plugin.Preferences.IncludeHiddenFiles;
 			numFiles.Text = Plugin.Preferences.MaximumFilesIndexed.ToString ();
-			remove_btn.Sensitive = false;
-			
-		}
-
+			index_remove_btn.Sensitive = false;
+			ignore_remove_btn.Sensitive = false;
+			
+			notebook1.Page = 0;
+			
+		}
+		
+		private PathNodeView GetCurrentView ()
+		{
+			PathNodeView currentNview;
+			if (this.notebook1.CurrentPage == 0)
+				currentNview = indexNview;
+			else
+				currentNview = ignoreNview;
+			
+			return currentNview;
+		}
+		
 		protected virtual void OnAddBtnClicked (object sender, System.EventArgs e)
 		{
 			FileChooserDialog chooser;
-
+			string dialogTitle;
+			bool index;
+			uint depth;
+			
+			if (GetCurrentView () == indexNview) {
+				dialogTitle = indexDialog;
+				index = true;
+				depth = 1;
+			}
+			else {
+				index = false;
+				depth = 0;
+				dialogTitle = ignoreDialog;
+			}
+			
 			chooser = new FileChooserDialog (
-			    Catalog.GetString ("Choose a folder to index"),
+			    dialogTitle,
 				new Dialog (), FileChooserAction.SelectFolder,
 				Catalog.GetString ("Cancel"), ResponseType.Cancel,
 				Catalog.GetString ("Choose folder"), ResponseType.Accept);
-					
-			
+				
 			if (chooser.Run () == (int) ResponseType.Accept) {
-				Plugin.FolderIndex.Add (new IndexedFolder (chooser.Filename, 1));
-				nview.Refresh ();
+				if (!Plugin.FolderIndex.ContainsFolder (chooser.Filename))
+				    Plugin.FolderIndex.Add (new IndexedFolder (chooser.Filename, depth, index));
+				GetCurrentView ().Refresh ();
 			}
 			chooser.Destroy ();
 		}
 
 		protected virtual void OnRemoveBtnClicked (object sender, EventArgs e)
 		{
-			nview.OnRemoveSelected (sender, e);
+			GetCurrentView ().OnRemoveSelected (sender, e);
 		}
 		
 		protected void OnPathNodeViewSelectionChange (object sender, EventArgs e)
 		{
-			remove_btn.Sensitive = nview.Selection.GetSelectedRows ().Any ();
+			index_remove_btn.Sensitive = indexNview.Selection.GetSelectedRows ().Any ();
+			ignore_remove_btn.Sensitive = ignoreNview.Selection.GetSelectedRows ().Any ();
 		}
 
 		protected virtual void OnShowHiddenChkClicked (object sender, EventArgs e)
@@ -85,7 +122,7 @@
 			try {
 				Plugin.Preferences.MaximumFilesIndexed = int.Parse (numFiles.Text);
 			}
-			catch (Exception ex) {
+			catch {
 				numFiles.Text = "";
 				Plugin.Preferences.MaximumFilesIndexed = 0;
 			}
 
=== modified file 'File/src/Do/Do.FilesAndFolders/FileItemSource.cs'
--- File/src/Do/Do.FilesAndFolders/FileItemSource.cs	2009-01-18 06:04:49 +0000
+++ File/src/Do/Do.FilesAndFolders/FileItemSource.cs	2009-02-14 20:52:23 +0000
@@ -36,6 +36,7 @@
 	public class FileItemSource : ItemSource, IConfigurable {
 
 		IEnumerable<Item> items;
+		static IEnumerable<IndexedFolder> ignored;
 		bool maximum_files_warned;
 
 		string MaximumFilesIndexedWarning {
@@ -55,6 +56,7 @@
 		public FileItemSource ()
 		{
 			items = Enumerable.Empty<Item> ();
+			ignored = Enumerable.Empty<IndexedFolder> ();
 		}
 
 		public override IEnumerable<Item> Items {
@@ -104,11 +106,15 @@
 		
 		public override void UpdateItems ()
 		{
+			ignored = Plugin.FolderIndex
+				.Where (folder => !folder.Index)
+				.ToArray ();
+			
 			items = Plugin.FolderIndex
 				.SelectMany (folder => RecursiveGetItems (folder.Path, folder.Level, Plugin.Preferences.IncludeHiddenFiles))
 				.Take (Plugin.Preferences.MaximumFilesIndexed)
 				.ToArray ();
-
+			
 			if (!maximum_files_warned && items.Count () == Plugin.Preferences.MaximumFilesIndexed) {
 				Log.Warn (MaximumFilesIndexedWarning);
 				Services.Notifications.Notify ("Do is indexing too many files.", MaximumFilesIndexedWarning);
@@ -167,9 +173,9 @@
 				IEnumerable<string> files, directories, recursiveFiles;
 				
 				files = Directory.GetFiles (path)
-					.Where (filepath => ShouldIndexPath (filepath, includeHidden));
+					.Where (filepath => ShouldIndexPath (filepath, includeHidden, false));
 				directories = Directory.GetDirectories (path)
-					.Where (filepath => ShouldIndexPath (filepath, includeHidden));
+					.Where (filepath => ShouldIndexPath (filepath, includeHidden, true));
 				recursiveFiles = directories
 					.SelectMany (dir => RecursiveListFiles (dir, levels - 1, includeHidden));
 				
@@ -182,11 +188,13 @@
 			return results;
 		}
 
-		static bool ShouldIndexPath (string path, bool includeHidden)
+		static bool ShouldIndexPath (string path, bool includeHidden, bool isDirectory)
 		{
 			string filename = Path.GetFileName (path);
 			bool isForbidden = filename == "." || filename == ".." || filename.EndsWith ("~");
 			bool isHidden = filename.StartsWith (".");
+			if (isDirectory && ignored.Where (folder => path == folder.Path).Any ())
+				isForbidden = true;
 			return !isForbidden && (includeHidden || !isHidden);
 		}
 		
 
=== modified file 'File/src/Do/Do.FilesAndFolders/IndexedFolder.cs'
--- File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2009-01-14 18:43:13 +0000
+++ File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2009-02-14 20:52:23 +0000
@@ -31,18 +31,20 @@
 	{
 		public string Path { get; private set; }
 		public uint Level { get; private set; }
+		public bool Index { get; private set; }
 		
-		public IndexedFolder (string path, uint level)
+		public IndexedFolder (string path, uint level, bool index)
 		{
 			if (path == null) throw new ArgumentNullException ("path");
 			
 			Path = path.Replace ("~", Plugin.ImportantFolders.UserHome);
 			Level = level;
+			Index = index;
 		}
 
 		public override string ToString ()
 		{
-			return string.Format ("{0} {2} {1}", GetType ().Name, Path, Level);
+			return string.Format ("{0} {2} {1} {3}", GetType ().Name, Path, Level, Index);
 		}
 
 		public override bool Equals (object other)
@@ -52,12 +54,12 @@
 
 		public override int GetHashCode ()
 		{
-			return Path.GetHashCode () ^ Level.GetHashCode ();
+			return Path.GetHashCode () ^ Level.GetHashCode () ^ Index.GetHashCode ();
 		}
 
 		public bool Equals (IndexedFolder other)
 		{
-			return other.Path == Path && other.Level == Level;
+			return other.Path == Path && other.Level == Level && other.Index == Index;
 		}
 
 		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-01-18 20:29:57 +0000
+++ File/src/Do/Do.FilesAndFolders/IndexedFolderCollection.cs	2009-02-16 01:11:46 +0000
@@ -49,10 +49,10 @@
 
 		IEnumerable<IndexedFolder> GetDefaultFolders ()
 		{
-			yield return new IndexedFolder (Path.GetDirectoryName (Plugin.ImportantFolders.UserHome), 1);
-			yield return new IndexedFolder (Plugin.ImportantFolders.UserHome, 1);
-			yield return new IndexedFolder (Plugin.ImportantFolders.Desktop, 1);
-			yield return new IndexedFolder (Plugin.ImportantFolders.Documents, 2);
+			yield return new IndexedFolder (Path.GetDirectoryName (Plugin.ImportantFolders.UserHome), 1, true);
+			yield return new IndexedFolder (Plugin.ImportantFolders.UserHome, 1, true);
+			yield return new IndexedFolder (Plugin.ImportantFolders.Desktop, 1, true);
+			yield return new IndexedFolder (Plugin.ImportantFolders.Documents, 2, true);
 		}
 
 		public IndexedFolderCollection ()
@@ -64,14 +64,16 @@
 			Deserialize ();
 
 			foreach (IndexedFolder folder in Folders.Values) {
-				if (folder.Level < LargeIndexLevel) continue;
-				Log.Warn (LargeIndexLevelWarning, folder.Path, folder.Level);
+				if (folder.Level > LargeIndexLevel)
+					Log.Warn (LargeIndexLevelWarning, folder.Path, folder.Level);
 			}
 		}
 
-		public void UpdateIndexedFolder (string path, string newPath, uint newDepth)
+		public void UpdateIndexedFolder (string path, string newPath, uint newDepth, bool newIndex)
 		{
-			UpdateIndexedFolder (path, new IndexedFolder (newPath, newDepth));
+			if (newDepth > LargeIndexLevel)
+				Log.Warn (LargeIndexLevelWarning, newPath, newDepth);
+			UpdateIndexedFolder (path, new IndexedFolder (newPath, newDepth, newIndex));
 		}
 
 		public void UpdateIndexedFolder (string path, IndexedFolder folder)
@@ -87,6 +89,11 @@
 			if (!Folders.ContainsKey (path)) return;
 			Remove (Folders [path]);
 		}
+		
+		public bool ContainsFolder (string path)
+		{
+			return Folders.ContainsKey (path);
+		}
 
 		#region ICollection<IndexedFolder>
 
 
=== modified file 'File/src/Do/Do.FilesAndFolders/RecentFileItemSource.cs'
--- File/src/Do/Do.FilesAndFolders/RecentFileItemSource.cs	2008-12-23 23:42:53 +0000
+++ File/src/Do/Do.FilesAndFolders/RecentFileItemSource.cs	2009-02-14 20:52:23 +0000
@@ -53,10 +53,14 @@
 
 		IEnumerable<IFileItem> GetRecentFiles ()
 		{
-			// These lines always cause mono to blow up:
-			//foreach (RecentInfo info in RecentManager.Default.Items) {
-			//	yield return UniverseFactory.NewFileItem (info.Uri);
-			//}
+			/*
+			These lines always cause mono to blow up:
+			
+			foreach (Gtk.RecentInfo info in Gtk.RecentManager.Default.Items) {
+				Console.WriteLine(info);
+				yield return Services.UniverseFactory.NewFileItem (info.Uri);
+			}
+			*/
 			return Enumerable.Empty<IFileItem> ();
 		}
 		
 
=== added file 'File/src/IgnorePathNodeView.cs'
--- File/src/IgnorePathNodeView.cs	1970-01-01 00:00:00 +0000
+++ File/src/IgnorePathNodeView.cs	2009-02-17 10:48:05 +0000
@@ -0,0 +1,74 @@
+/* IgnorePathNodeView.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using Mono.Unix;
+
+using Gtk;
+
+namespace Do.FilesAndFolders
+{
+	
+	// TODO: update this class to use spin buttons,
+	public class IgnorePathNodeView : PathNodeView
+	{
+		public enum Column {
+			Path = 0,
+			Index,
+			NumColumns
+		}
+		
+		public IgnorePathNodeView () : base ()
+		{
+			CellRenderer cell;
+			RulesHint = true;
+			HeadersVisible = true;
+			
+			Model = new ListStore (typeof (string), typeof (bool));
+
+			cell = new CellRendererText ();
+			(cell as CellRendererText).Width = 310;
+			(cell as CellRendererText).Ellipsize = Pango.EllipsizeMode.Middle;
+			AppendColumn (Catalog.GetString ("Folder"), cell, "text", Column.Path);
+			
+			Refresh ();
+		}
+
+		public override void Refresh ()
+		{
+			ListStore store = Model as ListStore;
+			//try to keep the currently selected row across refreshes
+			Gtk.TreePath selected = null;
+			try {
+				selected = this.Selection.GetSelectedRows ()[0];
+			}
+			catch {	}
+			finally {
+				store.Clear ();
+				foreach (IndexedFolder pair in Plugin.FolderIndex) {
+					if (!pair.Index)
+						store.AppendValues (pair.Path, pair.Index);
+				}
+				if (selected != null)
+					this.Selection.SelectPath (selected);
+			}
+		}
+	}
+}
 \ No newline at end of file
 
=== added file 'File/src/IndexPathNodeView.cs'
--- File/src/IndexPathNodeView.cs	1970-01-01 00:00:00 +0000
+++ File/src/IndexPathNodeView.cs	2009-02-17 10:48:05 +0000
@@ -0,0 +1,97 @@
+/* IndexPathNodeView.cs
+ *
+ * GNOME Do is the legal property of its developers. Please refer to the
+ * COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using Mono.Unix;
+
+using Gtk;
+
+namespace Do.FilesAndFolders
+{
+	
+	// TODO: update this class to use spin buttons,
+	public class IndexPathNodeView : PathNodeView
+	{
+		public enum Column {
+			Path = 0,
+			Depth,
+			NumColumns
+		}
+		
+		public IndexPathNodeView () : base ()
+		{
+			CellRenderer cell;
+			RulesHint = true;
+			HeadersVisible = true;
+			
+			Model = new ListStore (typeof (string), typeof (uint));
+
+			cell = new CellRendererText ();
+			(cell as CellRendererText).Width = 310;
+			(cell as CellRendererText).Ellipsize = Pango.EllipsizeMode.Middle;
+			AppendColumn (Catalog.GetString ("Folder"), cell, "text", Column.Path);
+			
+			cell = new CellRendererText ();
+			(cell as CellRendererText).Editable = true;
+			(cell as CellRendererText).Edited += OnDepthEdited;
+			(cell as CellRendererText).Alignment = Pango.Alignment.Right;
+			AppendColumn (Catalog.GetString ("Depth"), cell, "text", Column.Depth);
+						
+			Refresh ();
+		}
+
+		public override void Refresh ()
+		{
+			ListStore store = Model as ListStore;
+			//try to keep the currently selected row across refreshes
+			Gtk.TreePath selected = null;
+			try {
+				selected = this.Selection.GetSelectedRows ()[0];
+			}
+			catch {	}
+			finally {
+				store.Clear ();
+				foreach (IndexedFolder pair in Plugin.FolderIndex) {
+					if (pair.Index)
+						store.AppendValues ( pair.Path, pair.Level);
+				}
+				if (selected != null)
+					this.Selection.SelectPath (selected);
+			}
+		}
+		                    
+		public void OnDepthEdited (object o, EditedArgs e)
+		{
+			uint depth;
+			string path;
+			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.Parse (e.NewText);
+			Plugin.FolderIndex.UpdateIndexedFolder (path, path, depth, true);
+			
+			Refresh ();
+		}
+	}
+}
 \ No newline at end of file
 
=== modified file 'File/src/PathNodeView.cs'
--- File/src/PathNodeView.cs	2009-01-14 19:27:04 +0000
+++ File/src/PathNodeView.cs	2009-02-16 01:11:46 +0000
@@ -19,8 +19,6 @@
  */
 
 using System;
-using System.IO;
-
 using Mono.Unix;
 
 using Gtk;
@@ -29,61 +27,17 @@
 {
 	
 	// TODO: update this class to use spin buttons,
-	public class PathNodeView : NodeView
+	public abstract class PathNodeView : NodeView
 	{
-		enum Column {
-			Path = 0,
-			Depth,
-			NumColumns
-		}
+
 		
 		public PathNodeView () : base ()
 		{
-			CellRenderer cell;
-			RulesHint = true;
-			HeadersVisible = true;
-			
-			Model = new ListStore (typeof (string), typeof (uint));
-
-			cell = new CellRendererText ();
-			(cell as CellRendererText).Width = 310;
-			(cell as CellRendererText).Ellipsize = Pango.EllipsizeMode.Middle;
-			AppendColumn (Catalog.GetString ("Folder"), cell, "text", Column.Path);
-			
-			cell = new CellRendererText ();
-			(cell as CellRendererText).Editable = true;
-			(cell as CellRendererText).Edited += OnDepthEdited;
-			(cell as CellRendererText).Alignment = Pango.Alignment.Right;
-			AppendColumn (Catalog.GetString ("Depth"), cell, "text", Column.Depth);
-						
-			Refresh ();
-		}
-
-		public void Refresh ()
-		{
-			ListStore store = Model as ListStore;
-			store.Clear ();
-			foreach (IndexedFolder pair in Plugin.FolderIndex)
-				store.AppendValues (pair.Path, pair.Level);
-		}
-		                    
-		void OnDepthEdited (object o, EditedArgs e)
-		{
-			uint depth;
-			string path;
-			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.Parse (e.NewText);
-			Plugin.FolderIndex.UpdateIndexedFolder (path, path, depth);
-			
-			Refresh ();
-		}
-
-		public void OnRemoveSelected (object sender, EventArgs e)
+		}
+
+		public abstract void Refresh ();
+
+		public virtual void OnRemoveSelected (object sender, EventArgs e)
 		{
 			string path;
 			TreeIter iter;
@@ -91,7 +45,7 @@
 
 			store = Model as ListStore;
 			Selection.GetSelected (out iter);
-			path = store.GetValue (iter, (int)Column.Path) as string;
+			path = store.GetValue (iter, 0) as string;
 			Plugin.FolderIndex.RemoveIndexedFolder (path);
 			store.Remove (ref iter);