Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluis Sanchez <slluis.devel@gmail.com>2012-06-04 12:28:00 +0400
committerLluis Sanchez <slluis.devel@gmail.com>2012-06-04 12:28:00 +0400
commit5f758822cce778acb1f3c3c8878d40f1d43d1293 (patch)
tree5cf630f0b5ca41df945d63a757094a1616a1afd7
parentdac62a1f64625de713bb4533fb6e6de8d4df4e76 (diff)
parent2964b9b629199c9a9e3607cb674546db13059a03 (diff)
Merge pull request #201 from jmloeffler/master
Fixed Bug 2489 - Preferences->Build->Assembly Folders buttons grayed out when removing folder.
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FolderListSelector.cs2
-rw-r--r--main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Components.FolderListSelector.cs1
-rw-r--r--main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic1
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>