Author: mkrueger
Date: 2008-02-06 23:54:57 -0500 (Wed, 06 Feb 2008)
New Revision: 95112
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ITreeNavigator.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopTreeView.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
Log:
* MonoDevelop.Ide.Gui.Pads/ITreeNavigator.cs,
MonoDevelop.Ide.Dom.Output/OutputFlags.cs,
MonoDevelop.Ide.Dom.Output/Ambience.cs,
MonoDevelop.Ide.Dom.Output/NetAmbience.cs,
gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs,
gtk-gui/gui.stetic, MonoDevelop.Ide.Gui/MonoDevelopTreeView.cs:
Worked on assembly browser.
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-07
03:09:49 UTC (rev 95111)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-07
04:54:57 UTC (rev 95112)
@@ -1,5 +1,15 @@
2008-02-07 Mike Krüger <[EMAIL PROTECTED]>
+ * MonoDevelop.Ide.Gui.Pads/ITreeNavigator.cs,
+ MonoDevelop.Ide.Dom.Output/OutputFlags.cs,
+ MonoDevelop.Ide.Dom.Output/Ambience.cs,
+ MonoDevelop.Ide.Dom.Output/NetAmbience.cs,
+ gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs,
+ gtk-gui/gui.stetic, MonoDevelop.Ide.Gui/MonoDevelopTreeView.cs: Worked
+ on assembly browser.
+
+2008-02-07 Mike Krüger <[EMAIL PROTECTED]>
+
* MonoDevelop.Ide.Dom.Output/OutputFlags.cs,
MonoDevelop.Ide.Dom.Output/Ambience.cs,
MonoDevelop.Ide.Dom.Output/AmbienceService.cs,
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
2008-02-07 03:09:49 UTC (rev 95111)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
2008-02-07 04:54:57 UTC (rev 95112)
@@ -98,13 +98,28 @@
{
return (outputFlags & OutputFlags.IncludeParameterName)
== OutputFlags.IncludeParameterName;
}
+ protected static bool EmitMarkup (OutputFlags outputFlags)
+ {
+ return (outputFlags & OutputFlags.EmitMarkup) ==
OutputFlags.EmitMarkup;
+ }
+ protected static bool EmitKeywords (OutputFlags outputFlags)
+ {
+ return (outputFlags & OutputFlags.EmitKeywords) ==
OutputFlags.EmitKeywords;
+ }
+ protected static bool IncludeModifiers (OutputFlags outputFlags)
+ {
+ return (outputFlags & OutputFlags.IncludeModifiers) ==
OutputFlags.IncludeModifiers;
+ }
#endregion
+ public abstract string GetString (string nameSpace, OutputFlags
flags);
public abstract string GetString (IField field, OutputFlags
flags);
public abstract string GetString (IProperty property,
OutputFlags flags);
public abstract string GetString (IReturnType returnType,
OutputFlags flags);
public abstract string GetString (IMethod method, OutputFlags
flags);
public abstract string GetString (IParameter parameter,
OutputFlags flags);
+ public abstract string GetString (IType type, OutputFlags
flags);
+ public abstract string GetString (IEvent evt, OutputFlags
flags);
}
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
2008-02-07 03:09:49 UTC (rev 95111)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
2008-02-07 04:54:57 UTC (rev 95112)
@@ -71,11 +71,41 @@
modifiers[Modifiers.ProtectedOrInternal] = "Internal
Protected";
}
+ public override string GetString (string nameSpace, OutputFlags
flags)
+ {
+ StringBuilder result = new StringBuilder ();
+ if (EmitKeywords (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append ("Namespace ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+ result.Append (nameSpace);
+ return result.ToString ();
+ }
+
public override string GetString (IProperty property,
OutputFlags flags)
{
if (property == null)
return nullString;
StringBuilder result = new StringBuilder ();
+ if (IncludeModifiers (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append (base.GetString
(property.Modifiers));
+ result.Append (" ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+ if (EmitKeywords (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append ("Property ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
if (UseFullName (flags)) {
result.Append (property.FullName);
} else {
@@ -93,6 +123,24 @@
if (field == null)
return nullString;
StringBuilder result = new StringBuilder ();
+
+ if (IncludeModifiers (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append (base.GetString
(field.Modifiers));
+ result.Append (" ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
+ if (EmitKeywords (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append ("Field ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
if (UseFullName (flags)) {
result.Append (field.FullName);
} else {
@@ -123,6 +171,24 @@
if (method == null)
return nullString;
StringBuilder result = new StringBuilder ();
+
+ if (IncludeModifiers (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append (base.GetString
(method.Modifiers));
+ result.Append (" ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
+ if (EmitKeywords (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append ("Method ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
if (UseFullName (flags)) {
result.Append (method.FullName);
} else {
@@ -165,5 +231,65 @@
}
return result.ToString ();
}
+
+ public override string GetString (IType type, OutputFlags flags)
+ {
+ if (type == null)
+ return nullString;
+ StringBuilder result = new StringBuilder ();
+ if (IncludeModifiers (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append (base.GetString (type.Modifiers));
+ result.Append (" ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
+ if (EmitKeywords (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append (GetString (type.ClassType));
+ result.Append (" ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
+ result.Append (type.Name);
+
+ if (type.BaseType != null) {
+ result.Append (" : ");
+ result.Append (type.BaseType.Name);
+ }
+ return result.ToString ();
+ }
+
+ public override string GetString (IEvent evt, OutputFlags flags)
+ {
+ if (evt == null)
+ return nullString;
+ StringBuilder result = new StringBuilder ();
+ if (IncludeModifiers (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append (base.GetString (evt.Modifiers));
+ result.Append (" ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
+ if (EmitKeywords (flags)) {
+ if (EmitMarkup (flags))
+ result.Append ("<b>");
+ result.Append ("Event ");
+ if (EmitMarkup (flags))
+ result.Append ("</b>");
+ }
+
+ result.Append (evt.Name);
+
+ return result.ToString ();
+ }
+
}
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
2008-02-07 03:09:49 UTC (rev 95111)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
2008-02-07 04:54:57 UTC (rev 95112)
@@ -35,11 +35,15 @@
None = 0,
// Flags
- UseFullName = 0x1,
- IncludeReturnType = 0x2,
- IncludeParameters = 0x4,
- IncludeParameterName = 0x8,
+ UseFullName = 0x0001,
+ IncludeReturnType = 0x0002,
+ IncludeParameters = 0x0004,
+ IncludeParameterName = 0x0008,
+ EmitMarkup = 0x0010,
+ EmitKeywords = 0x0020,
+ IncludeModifiers = 0x0040,
- ClassBrowserEntries = IncludeReturnType | IncludeParameters
+ ClassBrowserEntries = IncludeReturnType |
IncludeParameters,
+ AssemblyBrowserDescription = IncludeReturnType |
IncludeParameters | IncludeParameterName | EmitMarkup | EmitKeywords
| IncludeModifiers
}
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopTreeView.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopTreeView.cs
2008-02-07 03:09:49 UTC (rev 95111)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopTreeView.cs
2008-02-07 04:54:57 UTC (rev 95112)
@@ -1248,34 +1248,6 @@
}
}
- public ICustomXmlSerializer CreateMemento ()
- {
- return this.SaveTreeState ();
- }
-
- public void SetMemento (ICustomXmlSerializer memento)
- {
- this.RestoreTreeState ((NodeState)memento);
- }
-
- // ********* Own events
- protected virtual void OnTitleChanged(EventArgs e)
- {
- if (TitleChanged != null) {
- TitleChanged(this, e);
- }
- }
-
- protected virtual void OnIconChanged(EventArgs e)
- {
- if (IconChanged != null) {
- IconChanged(this, e);
- }
- }
-
- public event EventHandler TitleChanged;
- public event EventHandler IconChanged;
-
internal class PadCheckMenuItem: Gtk.CheckMenuItem
{
internal string Id;
@@ -1385,6 +1357,12 @@
get { return store.GetValue (currentIter,
MonoDevelopTreeView.DataItemColumn); }
}
+ public TypeNodeBuilder TypeNodeBuilder {
+ get {
+ return pad.GetTypeNodeBuilder
(CurrentPosition._iter);
+ }
+ }
+
internal NodeBuilder[] NodeBuilderChain {
get {
NodeBuilder[] chain = (NodeBuilder[])
store.GetValue (currentIter, MonoDevelopTreeView.BuilderChainColumn);
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ITreeNavigator.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ITreeNavigator.cs
2008-02-07 03:09:49 UTC (rev 95111)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ITreeNavigator.cs
2008-02-07 04:54:57 UTC (rev 95112)
@@ -41,6 +41,7 @@
bool Expanded { get; set; }
void ExpandToNode ();
ITreeOptions Options { get; }
+ TypeNodeBuilder TypeNodeBuilder { get; }
NodeState SaveState ();
void RestoreState (NodeState state);
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
2008-02-07 03:09:49 UTC (rev 95111)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
2008-02-07 04:54:57 UTC (rev 95112)
@@ -99,7 +99,6 @@
// Container child vbox67.Gtk.Box+BoxChild
this.saveChangesRadioButton = new
Gtk.RadioButton(Mono.Unix.Catalog.GetString("_Save changes to open documents"));
this.saveChangesRadioButton.Name = "saveChangesRadioButton";
- this.saveChangesRadioButton.Active = true;
this.saveChangesRadioButton.DrawIndicator = true;
this.saveChangesRadioButton.UseUnderline = true;
this.saveChangesRadioButton.Group = new
GLib.SList(System.IntPtr.Zero);
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
2008-02-07 03:09:49 UTC (rev 95111)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
2008-02-07 04:54:57 UTC (rev 95112)
@@ -2126,7 +2126,7 @@
</widget>
</child>
</widget>
- <widget class="Gtk.Bin"
id="MonoDevelop.Ide.Gui.OptionPanels.CodeGenerationPanelWidget">
+ <widget class="Gtk.Bin"
id="MonoDevelop.Ide.Gui.OptionPanels.CodeGenerationPanelWidget"
design-size="239 208">
<property name="MemberName" />
<property name="GeneratePublic">False</property>
<child>
@@ -6102,4 +6102,4 @@
</widget>
</child>
</widget>
-</stetic-interface>
+</stetic-interface>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
