diff options
| author | Jason Loeffler <jmloeffler@gmail.com> | 2012-06-03 00:37:53 +0400 |
|---|---|---|
| committer | Jason Loeffler <jmloeffler@gmail.com> | 2012-06-03 00:37:53 +0400 |
| commit | 2964b9b629199c9a9e3607cb674546db13059a03 (patch) | |
| tree | 8f769eec4a9f2575588c19a5e25ccb6076c3acaf | |
| parent | aa46cebf673b0d06daa0e9e268eb91e4695ccc74 (diff) | |
Fix #2489 - Remove Assembly Folders. The TreeIter was not being checked for validity properly. Also, the PathChanged event on the folder entry control was not mapped to UpdateStatus() so the Add button was not being reenabled when the box was populated.
3 files changed, 3 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FolderListSelector.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FolderListSelector.cs index b093d08d36..c4196d06af 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FolderListSelector.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FolderListSelector.cs @@ -108,7 +108,7 @@ namespace MonoDevelop.Components string dir = (string) store.GetValue (it, 0); directories.Remove (dir); store.Remove (ref it); - if (!it.Equals (TreeIter.Zero)) + if (store.IterIsValid (it)) FocusRow (it); else UpdateStatus (); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Components.FolderListSelector.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Components.FolderListSelector.cs index 5bacaf6342..f5667ec2cb 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Components.FolderListSelector.cs +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Components.FolderListSelector.cs @@ -127,6 +127,7 @@ namespace MonoDevelop.Components this.Child.ShowAll (); } this.Hide (); + this.folderentry.PathChanged += new global::System.EventHandler (this.OnFolderentryPathChanged); this.buttonAdd.Clicked += new global::System.EventHandler (this.OnButtonAddClicked); this.buttonRemove.Clicked += new global::System.EventHandler (this.OnButtonRemoveClicked); this.buttonUpdate.Clicked += new global::System.EventHandler (this.OnButtonUpdateClicked); diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic index 1d524274c8..ae99927104 100644 --- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic +++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic @@ -10345,6 +10345,7 @@ Visual Studio generates a default ID for embedded resources, instead of simply u <child> <widget class="MonoDevelop.Components.FolderEntry" id="folderentry"> <property name="MemberName" /> + <signal name="PathChanged" handler="OnFolderentryPathChanged" /> </widget> <packing> <property name="Position">0</property> |