diff options
| author | Mario Sopena Novales <masono@mono-cvs.ximian.com> | 2005-08-12 04:32:07 +0400 |
|---|---|---|
| committer | Mario Sopena Novales <masono@mono-cvs.ximian.com> | 2005-08-12 04:32:07 +0400 |
| commit | de4df7eae36f60db31600ed637254d054c2fdf15 (patch) | |
| tree | b94afd05034da40077fd9811c87e96c9f5cf00a2 /docbrowser | |
| parent | ca3ec82cc4c04dfb7fcf607163de2749861cf828 (diff) | |
2005-08-09 Mario Sopena Novales <mario.sopena@gmail.com>
* browser.cs:
- Allow render with CSS
- Detect fonts for CSS rendering
svn path=/trunk/mono-tools/; revision=48306
Diffstat (limited to 'docbrowser')
| -rw-r--r-- | docbrowser/ChangeLog | 4 | ||||
| -rw-r--r-- | docbrowser/browser.cs | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/docbrowser/ChangeLog b/docbrowser/ChangeLog index 8859785e..ef034245 100644 --- a/docbrowser/ChangeLog +++ b/docbrowser/ChangeLog @@ -1,3 +1,7 @@ +2005-08-09 Mario Sopena Novales <mario.sopena@gmail.com> + * browser.cs: + - Allow render with CSS + - Detect fonts for CSS rendering 2005-07-30 Mario Sopena Novales <mario.sopena@gmail.com> * Makefile.am: build gecko support in a separate dll: GeckoHtmlRender.dll * monodoc.in: Change "--gecko" parameter to "--no-gecko" diff --git a/docbrowser/browser.cs b/docbrowser/browser.cs index 692b7907..ddb9b7fa 100644 --- a/docbrowser/browser.cs +++ b/docbrowser/browser.cs @@ -381,8 +381,7 @@ class Browser { public void Render (string text, Node matched_node, string url) { CurrentUrl = url; - - CurrentTab.html.Render("<html><body>" + text + "</body></html>"); + CurrentTab.html.Render(text); if (matched_node != null) { if (tree_browser.SelectedNode != matched_node) tree_browser.ShowNode (matched_node); @@ -1860,9 +1859,16 @@ class Tab : Notebook { args [0] = browser.help_tree; html = (IHtmlRender) Activator.CreateInstance (gecko_render_type, args); html_preview = (IHtmlRender) Activator.CreateInstance (gecko_render_type, args); + + //Prepare Font for css (TODO: use GConf?) + Pango.FontDescription font_desc = Pango.FontDescription.FromString ("Sans 12"); + HelpSource.preferred_font_family = font_desc.Family; + HelpSource.preferred_font_size = font_desc.Size / Pango.Scale.PangoScale; + HelpSource.use_css = true; } catch (Exception exc) { html = new GtkHtmlHtmlRender (browser); html_preview = new GtkHtmlHtmlRender (browser); + browser.UseGecko = false; } // if the user explicitally state that doesnt want gecko } else { @@ -2065,15 +2071,8 @@ class Tab : Notebook { XmlWriter w = new XmlTextWriter (sw); try { - w.WriteStartElement ("html"); - w.WriteStartElement ("body"); - edit_node.InnerXml = text_editor.Buffer.Text; EditingUtils.RenderEditPreview (edit_url, browser.help_tree, edit_node, w); - - w.WriteEndElement (); - w.WriteEndElement (); - w.Flush (); } catch (Exception e) { browser.statusbar.Pop (browser.context_id); @@ -2082,7 +2081,8 @@ class Tab : Notebook { } browser.statusbar.Pop (browser.context_id); browser.statusbar.Push (browser.context_id, "XML OK"); - html_preview.Render(sw.ToString()); + string s = HelpSource.BuildHtml (EcmaHelpSource.css_ecma_code, sw.ToString ()); + html_preview.Render(s); } void OnTabClose (object sender, EventArgs a) { |