Re: [Mono-docs-list] Re: [Mono-devel-list] patch for bug#57748

2005-06-13 Thread Rafael Ferreira
Joshua, 

give you get a chance to look at this yet? 

- raf

On Sat, 2005-06-11 at 14:21 -0700, Rafael Ferreira wrote:
 On Sat, 2005-06-11 at 07:25 -0400, Joshua Tauberer wrote:
  Rafael Ferreira wrote:
   This patch fixes bug#57748 by giving the docbrowser its AssemblyInfo
   back and by changing the About dialog to display the extra information.
  
  Hi, Rafael.  You should post monodoc-related patches to mono-docs-list.
  
   I broke up the About dialog into a 4 tab notebook/treeview
   (about/authors/plugins/version). 
  
  Not bad.
 
 Thanks!
 
  
  AboutDialog.cs:
   string[] plugins = {ECMA Documentation,Mono XML 
   Documentation, Mono Handbook, Manual Pages,  Compiler Errors,ECMA 
   C# Specification };
  
  The providers are all compiled into monodoc 'statically', so the user 
  has no control over it.  I don't think we need to list them.
  
 
 Would you like to remove the plugins tab completely or just have a label
 instead of the list?
 
  AssemblyInfo.cs.in:
   [assembly:AssemblyVersion(@DOCBROWSER_VERSION@)]
   [assembly:AssemblyDelaySign(true)]
  
 Thanks!
 
  Nice.
  
  configure.in:
   +DOCBROWSER_VERSION=1.0
  
 Yeah, I should have noted that I put a placeholder there. 
 
  Miguel needs to chime in with how he would want monodoc to be versioned.
  
  Also, it would be nice to display the monodoc version more prominently, 
  instead of just in the list of loaded assemblies.
 
 I changed the interface so the docbrowser version shows up in the about
 tab as well, check it out and tell me what you think:
 
 http://ophion.org/~rafael/static/about3.png
 
  
  docbrowser/browser.cs:
   - RootTree.UncompiledHelpSources.Add(args[i+1]);
   + //RootTree.UncompiledHelpSources.Add(args[i+1]);
  
  Please don't disable my features. :)
  
 
 Oops, I forgot I did that. That line is giving me some compilation
 problems:
 
 ./browser.cs(79) error CS0117: `Monodoc.RootTree' does not contain a
 definition for `UncompiledHelpSources'
 
 Do you want me to just leaved it commented for now?
 
 
   -class Browser {
   +public class Browser {
  
  Why this?
 
 Fixed. 
 
  
   +/*
 class About {
  
  You can just delete that class and any Glade stuff it has, if any.
  
   -class Tab : Notebook {
   +public class Tab : Notebook {
  
  Again, I don't think this was necessary.
 
  Fixed. 
 
  
  Thanks for working on updating the about dialog.  Can you fix the issues 
  I noted, add a ChangeLog, and then repost the patch on mono-docs-list?
  
 
 Let me know what you want to do about the plugins tab and I'll send you
 a new patch with all the fixes. 
 
 Take care, 
 
 - raf
 
 ___
 Mono-docs-list maillist  -  Mono-docs-list@lists.ximian.com
 http://lists.ximian.com/mailman/listinfo/mono-docs-list

___
Mono-docs-list maillist  -  Mono-docs-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-docs-list


Re: [Mono-docs-list] Re: [Mono-devel-list] patch for bug#57748

2005-06-13 Thread Joshua Tauberer

Heh, okay, okay, here we go...

Rafael Ferreira wrote:

Would you like to remove the plugins tab completely or just have a label
instead of the list?


My preference would be to remove it alltogether.


I changed the interface so the docbrowser version shows up in the about
tab as well, check it out and tell me what you think:


Nice.


Oops, I forgot I did that. That line is giving me some compilation
problems:


You just need to 'make install' the latest monodoc.dll from 
/monodoc/browser.


--
- Joshua Tauberer

http://taubz.for.net

** Nothing Unreal Exists **


___
Mono-docs-list maillist  -  Mono-docs-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-docs-list


[Mono-docs-list] PATCH: resubmit

2005-06-13 Thread Rafael Ferreira
Thanks Joshua, I didn't mean to rush you... 

See my comments below:

On Mon, 2005-06-13 at 15:39 -0400, Joshua Tauberer wrote:
 Heh, okay, okay, here we go...
 
 Rafael Ferreira wrote:
  Would you like to remove the plugins tab completely or just have a label
  instead of the list?
 
 My preference would be to remove it alltogether.
Done.

 
  I changed the interface so the docbrowser version shows up in the about
  tab as well, check it out and tell me what you think:
 
 Nice.

 :-)

 
  Oops, I forgot I did that. That line is giving me some compilation
  problems:
 
 You just need to 'make install' the latest monodoc.dll from 
 /monodoc/browser.
 
issue resolved.

So, here's the latest patch, let me know if you see any issues. I still
have 1.0.0 hardcoded for the docbrowser version. That would be easy to
change once a decision on docbrowser's version is made. 

- raf

namespace Monodoc {

using System;
using Gtk;
using Glade;
using System.Reflection;

public class AboutDialog : Gtk.Window {  
	
[Glade.Widget] Window about;
		[Glade.Widget] Image logo_image;
[Glade.Widget] TreeView AuthorsTreeView;
[Glade.Widget] TreeView VersionTreeView;
[Glade.Widget] TreeView PluginsTreeView;
[Glade.Widget] Gtk.Label AboutLabel;

string[] authors = {Miguel de Icaza ([EMAIL PROTECTED]),Duncan Mak ([EMAIL PROTECTED]),Joshua Tauberer ([EMAIL PROTECTED]),Lee Malabone,Philip Van Hoof,Johannes Roith ([EMAIL PROTECTED]),Alp Toker ([EMAIL PROTECTED]),Piers Haken,John Luke ([EMAIL PROTECTED]),Ben Maurer,Mario Sopena novales,
Rafael Ferreira ([EMAIL PROTECTED])};

string about_str = The mono documentation viewer\n bversion {0}/b;

public AboutDialog() : base(AboutWindow) { 

Glade.XML gxml = new Glade.XML (null, browser.glade, about, null);
			gxml.Autoconnect (this);
//about.TransientFor = parent.window1;

// populating tabs
PopulateAuthors();
PopulateVersion();

   
// About tab:
//putting logo in
logo_image.Pixbuf = new Gdk.Pixbuf (null, monodoc.png);

AboutLabel.Markup = String.Format(about_str,Assembly.GetExecutingAssembly().GetName().Version.ToString());
}

void PopulateVersion() {

VersionTreeView.AppendColumn(Assembly,new CellRendererText(),text,0);
VersionTreeView.AppendColumn(Version,new CellRendererText(),text,1);

TreeStore store = new TreeStore(typeof(string),typeof(string));
VersionTreeView.Model = store;

TreeIter iter = new TreeIter();

foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies ()) {
iter = store.AppendValues (asm.GetName().Name, asm.GetName().Version.ToString());
}

VersionTreeView.RulesHint = true;


}

void PopulateAuthors() {

AuthorsTreeView.AppendColumn(Author,new CellRendererText(),text,0);
   
TreeStore store = new TreeStore(typeof(string));
AuthorsTreeView.Model = store;

//disabling headers
//AuthorsTreeView.HeadersVisible = false;

TreeIter iter = new TreeIter();

foreach (string a in authors)
iter = store.AppendValues(a);

AuthorsTreeView.RulesHint = true;
}

public void OnOkClicked (object sender, EventArgs a)
		{  
about.Hide();
		}

public void OnDelete (object sender, EventArgs a)
		{
about.Destroy();
		}

}
}
using System.Reflection;
using System.Runtime.CompilerServices;

[assembly:AssemblyVersion(@DOCBROWSER_VERSION@)]
[assembly:AssemblyDelaySign(true)]
Index: configure.in
===
--- configure.in	(revision 45802)
+++ configure.in	(working copy)
@@ -52,6 +52,9 @@
 GNUNIT_VERSION=0.5
 AC_SUBST(GNUNIT_VERSION)
 
+DOCBROWSER_VERSION=1.0
+AC_SUBST(DOCBROWSER_VERSION)
+
 AC_OUTPUT([
 Makefile
 gnunit/Makefile
@@ -62,6 +65,7 @@
 docbrowser/Makefile
 docbrowser/monodoc.desktop
 docbrowser/monodoc
+docbrowser/AssemblyInfo.cs
 po/Makefile.in
 asn1view/Makefile
 asn1view/art/Makefile
Index: ChangeLog
===
--- ChangeLog	(revision 45802)
+++ ChangeLog	(working copy)
@@ -1,3 +1,6 @@
+2005-06-11 Rafael Ferreira [EMAIL PROTECTED]
+* configure.in: added @DOCBROWSER_VERSION@
+
 2005-06-09 Gonzalo Paniagua Javier [EMAIL PROTECTED]
 
 	* configure.in: added GNUNIT_VERSION.
Index: docbrowser/ChangeLog
===
--- docbrowser/ChangeLog	(revision 45802)
+++ docbrowser/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2005-06-11 Rafael Ferreira [EMAIL PROTECTED]
+*