Author: mkrueger
Date: 2007-06-22 04:03:37 -0400 (Fri, 22 Jun 2007)
New Revision: 80532
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/IDialogPanel.cs
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/TreeViewOptions.cs
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
Log:
* MonoDevelop.Core.Gui.Dialogs/TreeViewOptions.cs,
MonoDevelop.Core.Gui.Dialogs/IDialogPanel.cs: Tree View Options now
works on the IDialogPanel interface instead of the abstract class
AbstractOptionPanel.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/ChangeLog 2007-06-22
08:01:36 UTC (rev 80531)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/ChangeLog 2007-06-22
08:03:37 UTC (rev 80532)
@@ -1,3 +1,10 @@
+2007-06-22 Mike Krüger <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Core.Gui.Dialogs/TreeViewOptions.cs,
+ MonoDevelop.Core.Gui.Dialogs/IDialogPanel.cs: Tree View Options now
+ works on the IDialogPanel interface instead of the abstract class
+ AbstractOptionPanel.
+
2007-06-20 Mike Krüger <[EMAIL PROTECTED]>
Fixed a bug (treeviewoptions asserted that all option dialog widgets
are frames).
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/IDialogPanel.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/IDialogPanel.cs
2007-06-22 08:01:36 UTC (rev 80531)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/IDialogPanel.cs
2007-06-22 08:03:37 UTC (rev 80532)
@@ -41,6 +41,10 @@
get;
}
+ bool WasActivated {
+ get;
+ }
+
bool EnableFinish {
get;
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/TreeViewOptions.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/TreeViewOptions.cs
2007-06-22 08:01:36 UTC (rev 80531)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/TreeViewOptions.cs
2007-06-22 08:03:37 UTC (rev 80532)
@@ -8,6 +8,7 @@
using System;
using System.IO;
using System.Collections;
+using System.Collections.Generic;
using MonoDevelop.Core;
using Mono.Addins;
@@ -22,11 +23,10 @@
/// IDE Options + Plugin Options)
/// </summary>
public class TreeViewOptions {
-
- protected ArrayList OptionPanels = new ArrayList ();
+ List<IDialogPanel> optionPanels = new List<IDialogPanel> ();
protected IProperties properties = null;
CommandManager cmdManager;
- Hashtable descriptors = new Hashtable ();
+ Dictionary<string, Gtk.TreeIter> descriptors = new
Dictionary<string, Gtk.TreeIter> ();
protected Gtk.TreeStore treeStore;
@@ -57,7 +57,9 @@
protected virtual bool StoreContents ()
{
- foreach (AbstractOptionPanel pane in OptionPanels) {
+ foreach (IDialogPanel pane in optionPanels) {
+ if (!pane.WasActivated)
+ continue;
if (!pane.ReceiveDialogMessage
(DialogMessage.OK))
return false;
}
@@ -109,7 +111,7 @@
descriptor.DialogPanel.CustomizationObject =
customizer;
if (descriptor.DialogPanel.Control is
Gtk.Frame)
((Gtk.Frame)descriptor.DialogPanel.Control).Shadow = Gtk.ShadowType.None;
- OptionPanels.Add (descriptor.DialogPanel);
+ optionPanels.Add (descriptor.DialogPanel);
mainBook.AppendPage
(descriptor.DialogPanel.Control, new Gtk.Label ("a"));
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
2007-06-22 08:01:36 UTC (rev 80531)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.mdp
2007-06-22 08:03:37 UTC (rev 80532)
@@ -125,7 +125,6 @@
<File name="./MonoDevelop.Core.Gui/SyncContext.cs" subtype="Code"
buildaction="Compile" />
<File name="./MonoDevelop.Core.Gui/SyncContextAttribute.cs" subtype="Code"
buildaction="Compile" />
<File name="./MonoDevelop.Core.Gui/SyncObject.cs" subtype="Code"
buildaction="Compile" />
- <File name="./Freedesktop.RecentFiles/RecentFiles.cs" subtype="Code"
buildaction="Compile" />
<File name="./MonoDevelop.Core.Gui/RecentOpen.cs" subtype="Code"
buildaction="Compile" />
<File
name="./MonoDevelop.Core.Gui.Dialogs/DefaultDialogPanelDescriptor.cs"
subtype="Code" buildaction="Compile" />
<File name="./MonoDevelop.Core.Gui.Codons/DialogPanelCodon.cs"
subtype="Code" buildaction="Compile" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
