Author: mhutch
Date: 2007-12-03 21:10:50 -0500 (Mon, 03 Dec 2007)
New Revision: 90620
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpOperations.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs: Make logging call more
verbose.
* MonoDevelop.Ide.mdp, MonoDevelop.Ide.Gui/HelpOperations.cs,
MonoDevelop.Ide.Gui/HelpViewer.cs: Port to IWebBrowser to remove
GtkHtml dependency. Doesn't yet handle images.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-12-04
02:09:11 UTC (rev 90619)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-12-04
02:10:50 UTC (rev 90620)
@@ -1,3 +1,11 @@
+2007-12-03 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs: Make logging call more
+ verbose.
+ * MonoDevelop.Ide.mdp, MonoDevelop.Ide.Gui/HelpOperations.cs,
+ MonoDevelop.Ide.Gui/HelpViewer.cs: Port to IWebBrowser to remove
GtkHtml
+ dependency. Doesn't yet handle images.
+
2007-12-03 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.addin.xml: Use gtk icons instead of old gnomeui icons.
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpOperations.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpOperations.cs
2007-12-04 02:09:11 UTC (rev 90619)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpOperations.cs
2007-12-04 02:10:50 UTC (rev 90620)
@@ -142,11 +142,11 @@
{
if (helpViewer == null) {
helpViewer = new HelpViewer ();
- helpViewer.Render (text, matched_node, url);
+ helpViewer.LoadNode (text, matched_node, url);
IdeApp.Workbench.OpenDocument (helpViewer,
true);
helpViewer.WorkbenchWindow.Closed += new
EventHandler (CloseWindowEvent);
} else {
- helpViewer.Render (text, matched_node, url);
+ helpViewer.LoadNode (text, matched_node, url);
helpViewer.WorkbenchWindow.SelectWindow ();
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs
2007-12-04 02:09:11 UTC (rev 90619)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/HelpViewer.cs
2007-12-04 02:10:50 UTC (rev 90620)
@@ -27,30 +27,29 @@
using System;
using System.IO;
+using System.Text;
using Gtk;
using Monodoc;
using MonoDevelop.Core.Gui;
+using MonoDevelop.Core.Gui.WebBrowser;
using MonoDevelop.Core;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide.Commands;
namespace MonoDevelop.Ide.Gui
{
public class HelpViewer : AbstractViewContent
{
- HTML html_viewer;
+ IWebBrowser html_viewer;
+ Widget widget;
- ScrolledWindow scroller = new ScrolledWindow ();
-
public override bool IsViewOnly {
get { return true; }
}
public override Gtk.Widget Control {
- get { return scroller; }
+ get { return widget; }
}
public override string ContentName {
@@ -59,95 +58,164 @@
public override void Dispose ()
{
- scroller.Destroy ();
+ widget.Destroy ();
base.Dispose ();
}
-
-
+
+ public static bool CanLoadHelpViewer {
+ get { return WebBrowserService.CanGetWebBrowser; }
+ }
+
public HelpViewer ()
{
- try {
- html_viewer = new HTML ();
- html_viewer.LinkClicked += new
LinkClickedHandler (LinkClicked);
- html_viewer.UrlRequested += new
UrlRequestedHandler (UrlRequested);
- html_viewer.OnUrl += new OnUrlHandler (OnUrl);
- scroller.Add (html_viewer);
- } catch (Exception ex) {
- Label lab = new Label (GettextCatalog.GetString
("The help viewer could not be loaded.") + "\n\n" + ex.GetType() + ": " +
ex.Message);
- scroller.Add (lab);
+ if (WebBrowserService.CanGetWebBrowser) {
+ html_viewer = WebBrowserService.GetWebBrowser
();
+ html_viewer.LinkClicked += LinkClicked;
+ html_viewer.LinkStatusChanged += onLinkMessage;
+ widget = (Widget) html_viewer;
+ } else {
+ Label lab = new Label (GettextCatalog.GetString
("The help viewer could not be loaded, because an embedded web browser is not
available."));
+ widget = lab;
}
Control.ShowAll ();
}
- void OnUrl (object sender, OnUrlArgs args)
+ void onLinkMessage (object sender,
StatusMessageChangedEventArgs args)
{
- if (args.Url == null)
- IdeApp.Workbench.StatusBar.SetMessage ("");
- else
- IdeApp.Workbench.StatusBar.SetMessage
(args.Url);
+ IdeApp.Workbench.StatusBar.SetMessage (args.Message ??
string.Empty);
}
-
- void UrlRequested (object sender, UrlRequestedArgs args)
+
+ void LinkClicked (object o, LocationChangingEventArgs args)
{
- LoggingService.LogDebug ("Image requested: {0}",
args.Url);
- Stream s =
Services.DocumentationService.HelpTree.GetImage (args.Url);
-
- if (s != null) {
- byte [] buffer = new byte [8192];
- int n;
-
- while ((n = s.Read (buffer, 0, 8192)) != 0)
- args.Handle.Write (buffer, (ulong)n);
+ LoadUrl (args.NextLocation);
+ args.SuppressChange = true;
+ }
+
+ public void LoadNode (string nodeText, Node node, string url)
+ {
+ if (html_viewer == null)
+ return;
+ try {
+ string tempFile = buildTempDocDirectory
(nodeText);
+ html_viewer.LoadUrl (string.Format
("file://{0}#{1}", tempFile, string.Empty));
+ } catch (Exception e) {
+ LoadErrorHtml (e, url);
}
- args.Handle.Close (HTMLStreamStatus.Ok);
}
-
- void LinkClicked (object o, LinkClickedArgs args)
+
+ public void LoadErrorHtml (Exception e, string missingUrl)
{
- LoadUrl (args.Url);
+ LoggingService.LogError ("Could not load help url
{0}\n{1}", missingUrl, e.ToString ());
+ html_viewer.LoadHtml
(GettextCatalog.GetString("{0}Error: the help topic '{2}' could not be
loaded.{1}",
+
"<html><body><h1>",
+
"</h1></body></html>",
+
missingUrl));
}
public void LoadUrl (string url)
{
- if (html_viewer == null)
+ if (html_viewer == null || url.StartsWith("#"))
return;
+ Node node;
+ string res =
Services.DocumentationService.HelpTree.RenderUrl (url, out node);
+ LoadNode (res, node, url);
+ }
+
+ string buildTempDocDirectory (string fileText)
+ {
+ if (fileText == null)
+ throw new ArgumentNullException ("fileText");
- if (url.StartsWith("#"))
- {
- html_viewer.JumpToAnchor(url.Substring(1));
- return;
- }
+ string tempDir = Path.GetTempFileName ();
+ File.Delete (tempDir);
+ Directory.CreateDirectory (tempDir);
- Node node;
+ StringBuilder builder = new StringBuilder ();
+ builder.Append ("<html><body>");
+ ProcessImages (fileText, builder, tempDir);
+ builder.Append ("</body></html>");
- string res =
Services.DocumentationService.HelpTree.RenderUrl (url, out node);
- if (res != null) {
- Render (res, node, url);
+ using (StreamWriter writer = File.CreateText
(Path.Combine (tempDir, "index.html"))) {
+ writer.Write (builder.ToString ());
}
+ return Path.Combine (tempDir, "index.html"); //FIXME:
and the anchor too
}
- public void Render (string text, Node matched_node, string url)
+ void ProcessImages (string input, StringBuilder output, string
tempDir)
{
- if (html_viewer == null)
- return;
+ int imageIndex = 0;
+ int pos = 0;
+ bool inCDATA = false;
+ bool inComment = false;
+ int previousCaptureEndedAt = 0;
- Gtk.HTMLStream stream = html_viewer.Begin ("text/html");
-
- stream.Write ("<html><body>");
- stream.Write (text);
- stream.Write ("</body></html>");
- html_viewer.End (stream, HTMLStreamStatus.Ok);
+ while (pos < (input.Length - 9)) {
+ //escape from comments
+ if (inComment) {
+ while (pos < input.Length - 3) {
+ if (input[pos] == '-' &&
input[pos+1] == '-' && input [pos+2] == '>') {
+ pos += 2;
+ break;
+ }
+ pos++;
+ }
+ continue;
+ }
+ //escape from CDATA
+ else if (inCDATA) {
+ while (pos < input.Length - 3) {
+ if (input[pos] == ']' &&
input[pos+1] == ']' && input [pos+2] == '>') {
+ pos += 2;
+ break;
+ }
+ pos++;
+ }
+ continue;
+ }
+ //HTML/XML/SGML tags
+ else if (input[pos] == '<') {
+ //enter CDATA or comment
+ if (input[pos+1] == '!') {
+ if (input[pos+2] == '-' &&
input [pos+3] == '-') {
+ inComment = true;
+ pos += 4;
+ continue;
+ } else if (input.Substring
(pos+2, 7) == "[CDATA[") {
+ pos += 9;
+ continue;
+ }
+ }
+ //IMG tags; what we're looking for!
+ else if (input[pos+1] == 'i' && input
[pos+2] == 'm' && input [pos+3] == 'm' ){
+ //WriteImage
+ string url = "";
+ string path = Path.Combine
(tempDir, "image" + imageIndex);
+ //WriteImage (path, url);
+ imageIndex++;
+
System.Console.WriteLine(input.Substring (pos, 10));
+ }
+ }
+ pos++;
+ }
+ output.Append (input.Substring
(previousCaptureEndedAt));
}
+
+ void WriteImage (string path, string url)
+ {
+ using (Stream s =
Services.DocumentationService.HelpTree.GetImage (url)) {
+ using (FileStream fs = new FileStream (path,
FileMode.Create)) {
+ byte[] buffer = new byte [8192];
+ int n = 0;
+ while ((n = s.Read (buffer, 0, 8192))
!= 0)
+ fs.Write (buffer, 0, n);
+ }
+ }
+ }
public override void Load (string s)
{
}
- [CommandHandler (EditCommands.Copy)]
- protected void OnCopy ()
- {
- html_viewer.Copy ();
- }
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs
2007-12-04 02:09:11 UTC (rev 90619)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/MonodocTreePad.cs
2007-12-04 02:10:50 UTC (rev 90620)
@@ -127,7 +127,7 @@
IdeApp.HelpOperations.ShowDocs (s,
match, url);
return;
}
- LoggingService.LogError ("Couldnt find match");
+ LoggingService.LogError ("MonoDocTreePad
RowActivated couldn't find match");
}
}
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2007-12-04 02:09:11 UTC (rev 90619)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
2007-12-04 02:10:50 UTC (rev 90620)
@@ -346,7 +346,6 @@
<ProjectReference type="Gac" localcopy="False" refto="Mono.Posix,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="False" refto="Mono.GetOptions,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<ProjectReference type="Gac" localcopy="False"
refto="System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="False" refto="glade-sharp,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Core" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects.Gui" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Documentation" />
@@ -355,19 +354,26 @@
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Core.Gui" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects" />
<ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Gui"
/>
+ <ProjectReference type="Project" localcopy="False"
refto="Mono.Addins.Setup" />
+ <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
+ <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="glade-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="glib-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gconf-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gnome-vfs-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Gac" localcopy="True" refto="gtkhtml-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <ProjectReference type="Project" localcopy="False" refto="Mono.Addins.Gui"
/>
- <ProjectReference type="Project" localcopy="False"
refto="Mono.Addins.Setup" />
- <ProjectReference type="Project" localcopy="False" refto="Mono.Addins" />
</References>
+ <GtkDesignInfo isWidgetLibrary="True" gtkVersion="2.8.3">
+ <ExportedWidgets>
+ <Widget>MonoDevelop.Ide.Gui.Dialogs.CombineEntryFeatureSelector</Widget>
+ <Widget>MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel</Widget>
+ <Widget>MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel</Widget>
+ </ExportedWidgets>
+ </GtkDesignInfo>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True" IsAutotoolsProject="True"
RelativeConfigureInPath="../../../">
<ExcludedFiles>
<File>AssemblyInfo.cs</File>
@@ -380,13 +386,6 @@
<AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
<ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
</MonoDevelop.Autotools.MakefileInfo>
- <GtkDesignInfo isWidgetLibrary="True">
- <ExportedWidgets>
- <Widget>MonoDevelop.Ide.Gui.Dialogs.CombineEntryFeatureSelector</Widget>
- <Widget>MonoDevelop.Ide.StandardHeaders.StandardHeaderPanel</Widget>
- <Widget>MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel</Widget>
- </ExportedWidgets>
- </GtkDesignInfo>
<MonoDevelop.Gettext.TranslationInfo />
<DeploymentInformation strategy="File">
<excludeFiles />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches