[Monodevelop-patches-list] r420 - in trunk/MonoDevelop: samples/HtmlControl src/AddIns/DisplayBindings/TextEditor src/AddIns/DisplayBindings/TextEditor/Commands src/Libraries/MonoDevelop.Gui src/Main/Base src/Main/Base/Commands src/Main/Base/Gui src/Main/Base/Gui/BrowserDisplayBinding src/Main/Base/Gui/Dialogs
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Sat Jan 10 01:26:11 EST 2004
Author: tberman
Date: 2004-01-10 01:26:10 -0500 (Sat, 10 Jan 2004)
New Revision: 420
Added:
trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl/
Removed:
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui/HtmlControl/
Modified:
trunk/MonoDevelop/samples/HtmlControl/Makefile
trunk/MonoDevelop/samples/HtmlControl/Test.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/FoldingCommands.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/ToolCommands.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui/Makefile
trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs
trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
trunk/MonoDevelop/src/Main/Base/Makefile
Log:
reverting jluke's change.
Some of the files may be moveable, but HtmlControl and some pieces of it need to stay where they are.
jluke: If you changed anything other than location, recheck-in please
Modified: trunk/MonoDevelop/samples/HtmlControl/Makefile
===================================================================
--- trunk/MonoDevelop/samples/HtmlControl/Makefile 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/samples/HtmlControl/Makefile 2004-01-10 06:26:10 UTC (rev 420)
@@ -1,5 +1,5 @@
all:
- mcs -g Test.cs -r gtk-sharp -r ../../build/bin/MonoDevelop.Gui.dll -o ../../build/bin/HtmlTest.exe
+ mcs -g Test.cs -r gtk-sharp -r ../../build/bin/SharpDevelop.Base.dll -o ../../build/bin/HtmlTest.exe
run:
mono --debug ../../build/bin/HtmlTest.exe
Modified: trunk/MonoDevelop/samples/HtmlControl/Test.cs
===================================================================
--- trunk/MonoDevelop/samples/HtmlControl/Test.cs 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/samples/HtmlControl/Test.cs 2004-01-10 06:26:10 UTC (rev 420)
@@ -1,7 +1,7 @@
using System;
using Gtk;
using GtkSharp;
-using MonoDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.HtmlControl;
class HtmlTest
{
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/FoldingCommands.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/FoldingCommands.cs 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/FoldingCommands.cs 2004-01-10 06:26:10 UTC (rev 420)
@@ -28,7 +28,7 @@
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Actions;
using ICSharpCode.SharpDevelop.Gui;
-using MonoDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.HtmlControl;
using ICSharpCode.Core.Services;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/ToolCommands.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/ToolCommands.cs 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/ToolCommands.cs 2004-01-10 06:26:10 UTC (rev 420)
@@ -27,7 +27,7 @@
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.TextEditor;
using ICSharpCode.SharpDevelop.Gui;
-using MonoDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.HtmlControl;
using ICSharpCode.Core.Services;
namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile 2004-01-10 06:26:10 UTC (rev 420)
@@ -72,5 +72,4 @@
/r:../../../../build/bin/SharpDevelop.Base.dll \
/r:System.DirectoryServices.dll /r:pango-sharp.dll \
/define:GTK /r:gtk-sharp.dll /r:gdk-sharp.dll \
- /r:../../../../build/bin/MonoDevelop.Gui.dll \
$(SOURCES)
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui/Makefile
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui/Makefile 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui/Makefile 2004-01-10 06:26:10 UTC (rev 420)
@@ -3,8 +3,8 @@
all: $(DLL)
super-docker: */*.cs
- mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /r:gtk-sharp.dll /r:gdk-sharp.dll /r:pango-sharp.dll /r:glib-sharp.dll /r:gtkmozembed-sharp.dll /define:EXPERIMENTAL_DOCKER /recurse:*.cs
+ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /r:gtk-sharp.dll /r:gdk-sharp.dll /r:pango-sharp.dll /r:glib-sharp.dll /define:EXPERIMENTAL_DOCKER /recurse:*.cs
$(DLL): */*.cs
- mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /r:gtk-sharp.dll /r:gdk-sharp.dll /r:pango-sharp.dll /r:glib-sharp.dll /r:gtkmozembed-sharp.dll /recurse:*.cs
+ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /r:gtk-sharp.dll /r:gdk-sharp.dll /r:pango-sharp.dll /r:glib-sharp.dll /recurse:*.cs
Modified: trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/Main/Base/Commands/ToolsCommands.cs 2004-01-10 06:26:10 UTC (rev 420)
@@ -17,7 +17,6 @@
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Gui.Dialogs;
-using MonoDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Commands
{
Modified: trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs 2004-01-10 06:26:10 UTC (rev 420)
@@ -1,187 +1,187 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.Drawing;
+// <file>
+// <copyright see="prj:///doc/copyright.txt"/>
+// <license see="prj:///doc/license.txt"/>
+// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <version value="$version"/>
+// </file>
+
+using System;
+using System.Drawing;
using Gtk;
-using GtkSharp;
-
-using ICSharpCode.SharpDevelop.Internal.Undo;
-using System.Drawing.Printing;
-using ICSharpCode.Core.Properties;
-
-using ICSharpCode.Core.Services;
-using ICSharpCode.Core.AddIns.Codons;
-using ICSharpCode.SharpDevelop.Gui;
-using MonoDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
-{
- public class BrowserPane : AbstractViewContent
- {
- protected HtmlViewPane htmlViewPane;
-
- public override Widget Control {
- get {
- return htmlViewPane;
- }
- }
-
- public override bool IsDirty {
- get {
- return false;
- }
- set {
- }
- }
-
- public override bool IsViewOnly {
- get {
- return true;
- }
- }
-
- protected BrowserPane(bool showNavigation) //: base (type)
- {
- htmlViewPane = new HtmlViewPane(showNavigation);
- //htmlViewPane.HtmlControl.TitleChange += new DWebBrowserEvents2_TitleChangeEventHandler(TitleChange);
- }
-
- public BrowserPane() : this(true)
- {
- }
-
- public override void Dispose()
- {
- htmlViewPane.Dispose();
- }
-
- public override void Load(string url)
- {
- htmlViewPane.Navigate(url);
- }
-
- public override void Save(string url)
- {
- Load(url);
- }
-
- //void TitleChange(object sender, DWebBrowserEvents2_TitleChangeEvent e)
- //{
- // ContentName = e.text;
- //}
- }
-
- public class HtmlViewPane : Gtk.Frame
- {
- HtmlControl htmlControl = null;
-
- VBox topPanel = new VBox (false, 2);
- Toolbar toolBar = new Toolbar ();
- Entry urlTextBox = new Entry ();
-
- bool isHandleCreated = false;
+using GtkSharp;
+
+using ICSharpCode.SharpDevelop.Internal.Undo;
+using System.Drawing.Printing;
+using ICSharpCode.Core.Properties;
+
+using ICSharpCode.Core.Services;
+using ICSharpCode.Core.AddIns.Codons;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.HtmlControl;
+
+namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
+{
+ public class BrowserPane : AbstractViewContent
+ {
+ protected HtmlViewPane htmlViewPane;
+
+ public override Widget Control {
+ get {
+ return htmlViewPane;
+ }
+ }
+
+ public override bool IsDirty {
+ get {
+ return false;
+ }
+ set {
+ }
+ }
+
+ public override bool IsViewOnly {
+ get {
+ return true;
+ }
+ }
+
+ protected BrowserPane(bool showNavigation) //: base (type)
+ {
+ htmlViewPane = new HtmlViewPane(showNavigation);
+ //htmlViewPane.HtmlControl.TitleChange += new DWebBrowserEvents2_TitleChangeEventHandler(TitleChange);
+ }
+
+ public BrowserPane() : this(true)
+ {
+ }
+
+ public override void Dispose()
+ {
+ htmlViewPane.Dispose();
+ }
+
+ public override void Load(string url)
+ {
+ htmlViewPane.Navigate(url);
+ }
+
+ public override void Save(string url)
+ {
+ Load(url);
+ }
+
+ //void TitleChange(object sender, DWebBrowserEvents2_TitleChangeEvent e)
+ //{
+ // ContentName = e.text;
+ //}
+ }
+
+ public class HtmlViewPane : Gtk.Frame
+ {
+ HtmlControl htmlControl = null;
+
+ VBox topPanel = new VBox (false, 2);
+ Toolbar toolBar = new Toolbar ();
+ Entry urlTextBox = new Entry ();
+
+ bool isHandleCreated = false;
string lastUrl = null;
- static GLib.GType type;
-
- public HtmlControl HtmlControl {
- get {
- return htmlControl;
- }
+ static GLib.GType type;
+
+ public HtmlControl HtmlControl {
+ get {
+ return htmlControl;
+ }
}
static HtmlViewPane ()
{
type = RegisterGType (typeof (HtmlViewPane));
- }
-
- public HtmlViewPane(bool showNavigation) : base ()
- {
- //RequestSize = new Size (500, 500);
+ }
+
+ public HtmlViewPane(bool showNavigation) : base ()
+ {
+ //RequestSize = new Size (500, 500);
Shadow = Gtk.ShadowType.None;
VBox mainbox = new VBox (false, 2);
- if (showNavigation) {
-
- //topPanel.RequestSize = new Size (Width, 25);
- //topPanel.Dock = DockStyle.Top;
-
- //toolBar.Dock = DockStyle.None;
-
+ if (showNavigation) {
+
+ //topPanel.RequestSize = new Size (Width, 25);
+ //topPanel.Dock = DockStyle.Top;
+
+ //toolBar.Dock = DockStyle.None;
+
Button toolBarBack = new Button (Gtk.Stock.GoBack);
- toolBarBack.Clicked += new EventHandler (OnBackClicked);
+ toolBarBack.Clicked += new EventHandler (OnBackClicked);
Button toolBarForward = new Button (Gtk.Stock.GoForward);
- toolBarForward.Clicked += new EventHandler (OnForwardClicked);
+ toolBarForward.Clicked += new EventHandler (OnForwardClicked);
Button toolBarStop = new Button (Gtk.Stock.Stop);
- toolBarStop.Clicked += new EventHandler (OnStopClicked);
+ toolBarStop.Clicked += new EventHandler (OnStopClicked);
Button toolBarRefresh = new Button (Gtk.Stock.Refresh);
toolBarRefresh.Clicked += new EventHandler (OnRefreshClicked);
toolBar.ToolbarStyle = ToolbarStyle.Icons;
- toolBar.IconSize = IconSize.SmallToolbar;
+ toolBar.IconSize = IconSize.SmallToolbar;
toolBar.AppendWidget (toolBarBack, "", "");
toolBar.AppendWidget (toolBarForward, "", "");
toolBar.AppendWidget (toolBarStop, "", "");
- toolBar.AppendWidget (toolBarRefresh, "", "");
+ toolBar.AppendWidget (toolBarRefresh, "", "");
+
+ topPanel.PackStart (toolBar);
- topPanel.PackStart (toolBar);
-
- urlTextBox.Activated += new EventHandler (OnEntryActivated);
-
- topPanel.Add (urlTextBox);
- mainbox.PackStart (topPanel, false, false, 2);
- }
-
+ urlTextBox.Activated += new EventHandler (OnEntryActivated);
+
+ topPanel.Add (urlTextBox);
+ mainbox.PackStart (topPanel, false, false, 2);
+ }
+
htmlControl = new HtmlControl ();
- htmlControl.Control.Show ();
-
-// if (showNavigation) {
-// int height = 48;
-// axWebBrowser.Location = new Point(0, height);
-// axWebBrowser.Size = new Size(Width, Height - height);
-// axWebBrowser.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top;
-// axWebBrowser.Dock = DockStyle.Fill;
-// } else {
- //axWebBrowser.Dock = DockStyle.Fill;
-// }
- //axWebBrowser.HandleCreated += new EventHandler(this.CreatedWebBrowserHandle);
- //axWebBrowser.TitleChange += new DWebBrowserEvents2_TitleChangeEventHandler(TitleChange);
+ htmlControl.Control.Show ();
+
+// if (showNavigation) {
+// int height = 48;
+// axWebBrowser.Location = new Point(0, height);
+// axWebBrowser.Size = new Size(Width, Height - height);
+// axWebBrowser.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top;
+// axWebBrowser.Dock = DockStyle.Fill;
+// } else {
+ //axWebBrowser.Dock = DockStyle.Fill;
+// }
+ //axWebBrowser.HandleCreated += new EventHandler(this.CreatedWebBrowserHandle);
+ //axWebBrowser.TitleChange += new DWebBrowserEvents2_TitleChangeEventHandler(TitleChange);
mainbox.PackStart (htmlControl.Control);
-
+
this.Add (mainbox);
this.ShowAll ();
- }
-
- //void TitleChange(object sender, DWebBrowserEvents2_TitleChangeEvent e)
- //{
- // urlTextBox.Text = axWebBrowser.LocationURL;
+ }
+
+ //void TitleChange(object sender, DWebBrowserEvents2_TitleChangeEvent e)
+ //{
+ // urlTextBox.Text = axWebBrowser.LocationURL;
//}
void OnEntryActivated (object o, EventArgs args)
{
htmlControl.Url = urlTextBox.Text;
+ }
+
+ public void CreatedWebBrowserHandle(object sender, EventArgs evArgs)
+ {
+ isHandleCreated = true;
+ if (lastUrl != null) {
+ Navigate(lastUrl);
+ }
+ }
+
+ public void Navigate(string name)
+ {
+ urlTextBox.Text = name;
+ htmlControl.Url = name;
}
- public void CreatedWebBrowserHandle(object sender, EventArgs evArgs)
- {
- isHandleCreated = true;
- if (lastUrl != null) {
- Navigate(lastUrl);
- }
- }
-
- public void Navigate(string name)
- {
- urlTextBox.Text = name;
- htmlControl.Url = name;
- }
-
private void OnBackClicked (object o, EventArgs args)
{
//htmlControl.GoBack ();
@@ -200,6 +200,6 @@
private void OnRefreshClicked (object o, EventArgs args)
{
//htmlControl.Refresh ();
- }
- }
-}
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-01-10 06:26:10 UTC (rev 420)
@@ -1,98 +1,97 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.Resources;
-using System.IO;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.Core.Properties;
+// <file>
+// <copyright see="prj:///doc/copyright.txt"/>
+// <license see="prj:///doc/license.txt"/>
+// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <version value="$version"/>
+// </file>
+
+using System;
+using System.Resources;
+using System.IO;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.Core.Properties;
using ICSharpCode.Core.Services;
-using MonoDevelop.Gui;
-using Gdk;
-using Gtk;
+using ICSharpCode.SharpDevelop.Gui.HtmlControl;
+
using Gdk;
using Gtk;
using GtkSharp;
-using Pango;
-
-namespace ICSharpCode.SharpDevelop.Gui.Dialogs
-{
- public class ScrollBox : DrawingArea
+using Pango;
+
+namespace ICSharpCode.SharpDevelop.Gui.Dialogs
+{
+ public class ScrollBox : DrawingArea
{
- static GLib.GType type;
- Pixbuf image;
- string text;
+ static GLib.GType type;
+ Pixbuf image;
+ string text;
int scroll = -220;
uint hndlr;
Pango.Font font;
Drawable dr;
- bool initial = true;
-
- public int ScrollY {
- get {
- return scroll;
- }
- set {
- scroll = value;
- }
+ bool initial = true;
+
+ public int ScrollY {
+ get {
+ return scroll;
+ }
+ set {
+ scroll = value;
+ }
+ }
+
+ public Pixbuf Image {
+ get {
+ return image;
+ }
+ set {
+ image = value;
+ }
+ }
+
+ public string ScrollText {
+ get {
+ return text;
+ }
+ set {
+ text = value;
+ }
}
- public Pixbuf Image {
- get {
- return image;
- }
- set {
- image = value;
- }
- }
-
- public string ScrollText {
- get {
- return text;
- }
- set {
- text = value;
- }
- }
-
internal uint Handler
{
get { return hndlr; }
- }
+ }
static ScrollBox ()
{
type = RegisterGType (typeof (ScrollBox));
}
-
- public ScrollBox() : base (type)
+
+ public ScrollBox() : base (type)
{
this.RequestSize = new System.Drawing.Size (400, 220);
- this.ExposeEvent += new ExposeEventHandler (OnExposed);
-
+ this.ExposeEvent += new ExposeEventHandler (OnExposed);
+
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- this.Image = resourceService.GetBitmap ("Icons.AboutImage");
+ this.Image = resourceService.GetBitmap ("Icons.AboutImage");
+
+ text = "\"The most successful method of programming is to begin a program as simply as possible, test it, and then add to the program until it performs the required job.\"\n -- PDP8 handbook, Pg 9-64\n\n\n";
+ //text = "\"The primary purpose of the DATA statement is to give names to constants; instead of referring to pi as 3.141592653589793 at every\n appearance, the variable PI can be given that value with a DATA statement and used instead of the longer form of the constant. This also simplifies modifying the program, should the value of pi change.\"\n -- FORTRAN manual for Xerox computers\n\n\n";
+ //text = "\"No proper program contains an indication which as an operator-applied occurrence identifies an operator-defining occurrence which as an indication-applied occurrence identifies an indication-defining occurrence different from the one identified by the given indication as an indication- applied occurrence.\"\n -- ALGOL 68 Report\n\n\n";
+ //text = "\"The '#pragma' command is specified in the ANSI standard to have an arbitrary implementation-defined effect. In the GNU C preprocessor, `#pragma' first attempts to run the game rogue; if that fails, it tries to run the game hack; if that fails, it tries to run GNU Emacs displaying the Tower of Hanoi; if that fails, it reports a fatal error. In any case, preprocessing does not continue.\"\n --From an old GNU C Preprocessor document";
- text = "\"The most successful method of programming is to begin a program as simply as possible, test it, and then add to the program until it performs the required job.\"\n -- PDP8 handbook, Pg 9-64\n\n\n";
- //text = "\"The primary purpose of the DATA statement is to give names to constants; instead of referring to pi as 3.141592653589793 at every\n appearance, the variable PI can be given that value with a DATA statement and used instead of the longer form of the constant. This also simplifies modifying the program, should the value of pi change.\"\n -- FORTRAN manual for Xerox computers\n\n\n";
- //text = "\"No proper program contains an indication which as an operator-applied occurrence identifies an operator-defining occurrence which as an indication-applied occurrence identifies an indication-defining occurrence different from the one identified by the given indication as an indication- applied occurrence.\"\n -- ALGOL 68 Report\n\n\n";
- //text = "\"The '#pragma' command is specified in the ANSI standard to have an arbitrary implementation-defined effect. In the GNU C preprocessor, `#pragma' first attempts to run the game rogue; if that fails, it tries to run the game hack; if that fails, it tries to run GNU Emacs displaying the Tower of Hanoi; if that fails, it reports a fatal error. In any case, preprocessing does not continue.\"\n --From an old GNU C Preprocessor document";
-
- Gtk.Function ScrollHandler = new Gtk.Function (ScrollDown); hndlr = Timeout.Add (20, ScrollHandler);
- }
-
- bool ScrollDown ()
- {
+ Gtk.Function ScrollHandler = new Gtk.Function (ScrollDown);
hndlr = Timeout.Add (20, ScrollHandler);
+ }
+
+ bool ScrollDown ()
+ {
++scroll;
- // FIXME: only redraw the right side
+ // FIXME: only redraw the right side
this.QueueDraw ();
//this.QueueDrawArea (200, 0, 200, 220);
- return true;
+ return true;
}
private void DrawImage ()
@@ -103,7 +102,7 @@
this.GdkWindow.GetInternalPaintInfo (out dr, out xoff, out yoff);
dr.DrawPixbuf (new Gdk.GC (dr), Image, 0, 0, 0, 0, -1, -1, RgbDither.Normal, 0, 0);
-
+
}
}
@@ -119,42 +118,42 @@
layout.SetText (text);
dr.DrawLayout (new Gdk.GC (dr), 200, 0 - scroll, layout);
- if (scroll > 220 ) {
- scroll = -scroll;
+ if (scroll > 220 ) {
+ scroll = -scroll;
}
- }
-
- protected void OnExposed (object o, ExposeEventArgs args)
+ }
+
+ protected void OnExposed (object o, ExposeEventArgs args)
{
this.DrawImage ();
- this.DrawText ();
- }
- }
-
- public class CommonAboutDialog : Dialog
+ this.DrawText ();
+ }
+ }
+
+ public class CommonAboutDialog : Dialog
{
- static GLib.GType type;
+ static GLib.GType type;
static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
AuthorAboutTabPage aatp;
ChangeLogTabPage changelog;
ScrollBox aboutPictureScrollBox;
-
- public ScrollBox ScrollBox {
- get {
- return (ScrollBox) aboutPictureScrollBox;
- }
- }
-
+
+ public ScrollBox ScrollBox {
+ get {
+ return (ScrollBox) aboutPictureScrollBox;
+ }
+ }
+
static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
static CommonAboutDialog ()
{
type = RegisterGType (typeof (CommonAboutDialog));
}
-
- public CommonAboutDialog() : base (type)
- {
+
+ public CommonAboutDialog() : base (type)
+ {
}
public CommonAboutDialog(string title, Gtk.Window parent, DialogFlags flags) : base (title, parent, flags)
@@ -178,10 +177,10 @@
nb.AppendPage (aatp.Control, new Label ("Authors"));
nb.AppendPage (changelog.Control, new Label ("ChangeLog"));
nb.AppendPage (vinfo, new Label ("Version Info"));
- this.VBox.PackStart (nb);
+ this.VBox.PackStart (nb);
Gtk.Button close = new Gtk.Button (Gtk.Stock.Close);
- close.Clicked += new EventHandler (OnCloseClicked);
- close.Show ();
+ close.Clicked += new EventHandler (OnCloseClicked);
+ close.Show ();
this.ActionArea.Add (close);
this.ShowAll ();
}
@@ -209,6 +208,6 @@
{
changelog.DelayedInitialize ();
}
- }
- }
-}
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs 2004-01-10 06:26:10 UTC (rev 420)
@@ -1,128 +1,127 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-using System;
-using System.Drawing;
-using Gtk;
-
-using System.Resources;
-using System.IO;
-using System.Text;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-using ICSharpCode.SharpDevelop.Gui;
-using ICSharpCode.Core.Properties;
-
-using ICSharpCode.Core.Services;
-
-using ICSharpCode.SharpDevelop.Internal.Project.Collections;
-using ICSharpCode.SharpDevelop.Internal.Project;
-using ICSharpCode.SharpDevelop.Services;
-using MonoDevelop.Gui;
-
-namespace ICSharpCode.SharpDevelop.Gui.Dialogs
-{
- public class AboutSharpDevelopTabPage : VBox
- {
- static GLib.GType type;
- Label buildLabel = new Label ();
- Label buildTextBox = new Label ();
- Label versionLabel = new Label ();
- Label versionTextBox = new Label ();
- Label sponsorLabel = new Label ();
+// <file>
+// <copyright see="prj:///doc/copyright.txt"/>
+// <license see="prj:///doc/license.txt"/>
+// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+// <version value="$version"/>
+// </file>
+
+using System;
+using System.Drawing;
+using Gtk;
+
+using System.Resources;
+using System.IO;
+using System.Text;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.Core.Properties;
+
+using ICSharpCode.Core.Services;
+
+using ICSharpCode.SharpDevelop.Internal.Project.Collections;
+using ICSharpCode.SharpDevelop.Internal.Project;
+using ICSharpCode.SharpDevelop.Services;
+
+namespace ICSharpCode.SharpDevelop.Gui.Dialogs
+{
+ public class AboutSharpDevelopTabPage : VBox
+ {
+ static GLib.GType type;
+ Label buildLabel = new Label ();
+ Label buildTextBox = new Label ();
+ Label versionLabel = new Label ();
+ Label versionTextBox = new Label ();
+ Label sponsorLabel = new Label ();
static AboutSharpDevelopTabPage ()
{
type = RegisterGType (typeof (AboutSharpDevelopTabPage));
}
-
- public AboutSharpDevelopTabPage() : base (type)
+
+ public AboutSharpDevelopTabPage() : base (type)
{
- HBox hbox = new HBox (false, 0);
- Version v = Assembly.GetEntryAssembly().GetName().Version;
- versionTextBox.Text = v.Major + "." + v.Minor;
- buildTextBox.Text = v.Revision + "." + v.Build;
+ HBox hbox = new HBox (false, 0);
+ Version v = Assembly.GetEntryAssembly().GetName().Version;
+ versionTextBox.Text = v.Major + "." + v.Minor;
+ buildTextBox.Text = v.Revision + "." + v.Build;
+
+ ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
+ versionLabel.Text = resourceService.GetString("Dialog.About.label1Text");
+
+ //versionLabel.TabIndex = 1;
+ hbox.PackStart (versionLabel, false, false, 10);
+
+ //versionTextBox.TabIndex = 4;
+ hbox.PackStart (versionTextBox, false, false, 10);
+
+ buildLabel.Text = resourceService.GetString("Dialog.About.label2Text");
+ //buildLabel.TabIndex = 2;
+ hbox.PackStart (buildLabel, false, false, 10);
- ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- versionLabel.Text = resourceService.GetString("Dialog.About.label1Text");
-
- //versionLabel.TabIndex = 1;
- hbox.PackStart (versionLabel, false, false, 10);
-
- //versionTextBox.TabIndex = 4;
- hbox.PackStart (versionTextBox, false, false, 10);
-
- buildLabel.Text = resourceService.GetString("Dialog.About.label2Text");
- //buildLabel.TabIndex = 2;
- hbox.PackStart (buildLabel, false, false, 10);
-
- //buildTextBox.TabIndex = 3;
- hbox.PackStart (buildTextBox, false, false, 10);
+ //buildTextBox.TabIndex = 3;
+ hbox.PackStart (buildTextBox, false, false, 10);
this.PackStart (hbox, false, false, 5);
-
- sponsorLabel.Text = "Released under the GNU General Public license.\n\n" +
- "Sponsored by AlphaSierraPapa\n" +
- " http://www.AlphaSierraPapa.com";
- //sponsorLabel.TabIndex = 8;
- this.PackStart (sponsorLabel, false, false, 5);
- this.ShowAll ();
- }
- }
-
- public class AuthorAboutTabPage : HtmlControl
- {
- public AuthorAboutTabPage()
- {
- try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-
- string html = ConvertXml.ConvertToString(fileUtilityService.SharpDevelopRootPath +
- System.IO.Path.DirectorySeparatorChar + "doc" +
- System.IO.Path.DirectorySeparatorChar + "AUTHORS.xml",
-
- propertyService.DataDirectory +
- System.IO.Path.DirectorySeparatorChar + "ConversionStyleSheets" +
- System.IO.Path.DirectorySeparatorChar + "ShowAuthors.xsl");
-
-
- base.CascadingStyleSheet = propertyService.DataDirectory + System.IO.Path.DirectorySeparatorChar +
- "resources" + System.IO.Path.DirectorySeparatorChar +
- "css" + System.IO.Path.DirectorySeparatorChar +
- "SharpDevelopStandard.css";
- base.Html = html;
- } catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e);
- }
- }
- }
-
- public class ChangeLogTabPage : HtmlControl
- {
- public ChangeLogTabPage()
- {
- try {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-
- string html = ConvertXml.ConvertToString(fileUtilityService.SharpDevelopRootPath +
- System.IO.Path.DirectorySeparatorChar + "doc" +
- System.IO.Path.DirectorySeparatorChar + "ChangeLog.xml",
-
- propertyService.DataDirectory +
- System.IO.Path.DirectorySeparatorChar + "ConversionStyleSheets" +
- System.IO.Path.DirectorySeparatorChar + "ShowChangeLog.xsl");
-
- base.CascadingStyleSheet = propertyService.DataDirectory + System.IO.Path.DirectorySeparatorChar +
- "resources" + System.IO.Path.DirectorySeparatorChar +
- "css" + System.IO.Path.DirectorySeparatorChar +
- "SharpDevelopStandard.css";
+
+ sponsorLabel.Text = "Released under the GNU General Public license.\n\n" +
+ "Sponsored by AlphaSierraPapa\n" +
+ " http://www.AlphaSierraPapa.com";
+ //sponsorLabel.TabIndex = 8;
+ this.PackStart (sponsorLabel, false, false, 5);
+ this.ShowAll ();
+ }
+ }
+
+ public class AuthorAboutTabPage : ICSharpCode.SharpDevelop.Gui.HtmlControl.HtmlControl
+ {
+ public AuthorAboutTabPage()
+ {
+ try {
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+
+ string html = ConvertXml.ConvertToString(fileUtilityService.SharpDevelopRootPath +
+ System.IO.Path.DirectorySeparatorChar + "doc" +
+ System.IO.Path.DirectorySeparatorChar + "AUTHORS.xml",
+
+ propertyService.DataDirectory +
+ System.IO.Path.DirectorySeparatorChar + "ConversionStyleSheets" +
+ System.IO.Path.DirectorySeparatorChar + "ShowAuthors.xsl");
+
+
+ base.CascadingStyleSheet = propertyService.DataDirectory + System.IO.Path.DirectorySeparatorChar +
+ "resources" + System.IO.Path.DirectorySeparatorChar +
+ "css" + System.IO.Path.DirectorySeparatorChar +
+ "SharpDevelopStandard.css";
+ base.Html = html;
+ } catch (Exception e) {
+ IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ messageService.ShowError(e);
+ }
+ }
+ }
+
+ public class ChangeLogTabPage : ICSharpCode.SharpDevelop.Gui.HtmlControl.HtmlControl
+ {
+ public ChangeLogTabPage()
+ {
+ try {
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
+
+ string html = ConvertXml.ConvertToString(fileUtilityService.SharpDevelopRootPath +
+ System.IO.Path.DirectorySeparatorChar + "doc" +
+ System.IO.Path.DirectorySeparatorChar + "ChangeLog.xml",
+
+ propertyService.DataDirectory +
+ System.IO.Path.DirectorySeparatorChar + "ConversionStyleSheets" +
+ System.IO.Path.DirectorySeparatorChar + "ShowChangeLog.xsl");
+
+ base.CascadingStyleSheet = propertyService.DataDirectory + System.IO.Path.DirectorySeparatorChar +
+ "resources" + System.IO.Path.DirectorySeparatorChar +
+ "css" + System.IO.Path.DirectorySeparatorChar +
+ "SharpDevelopStandard.css";
//base.Html = html;
// feel free to add your name and email here
@@ -139,37 +138,37 @@
+ "<li>nricciar</li>"
+ "<li>jba</li>"
+ "</ul></body></html>";
-
- } catch (Exception e) {
- IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowError(e);
- }
- }
- }
-
-
- public class VersionInformationTabPage : VBox
+
+ } catch (Exception e) {
+ IMessageService messageService = (IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
+ messageService.ShowError(e);
+ }
+ }
+ }
+
+
+ public class VersionInformationTabPage : VBox
{
- private static GLib.GType type;
- private Gtk.TreeView listView;
+ private static GLib.GType type;
+ private TreeView listView;
private Button button;
private TreeStore store;
static VersionInformationTabPage ()
{
type = RegisterGType (typeof (VersionInformationTabPage));
- }
-
- public VersionInformationTabPage() : base (type)
+ }
+
+ public VersionInformationTabPage() : base (type)
{
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- listView = new Gtk.TreeView ();
+ TreeView listView = new TreeView ();
listView.RulesHint = true;
listView.AppendColumn (resourceService.GetString("Dialog.About.VersionInfoTabName.NameColumn"), new CellRendererText (), "text", 0);
listView.AppendColumn (resourceService.GetString("Dialog.About.VersionInfoTabName.VersionColumn"), new CellRendererText (), "text", 1);
listView.AppendColumn (resourceService.GetString("Dialog.About.VersionInfoTabName.PathColumn"), new CellRendererText (), "text", 2);
-
+
FillListView ();
ScrolledWindow sw = new ScrolledWindow ();
sw.Add (listView);
@@ -183,49 +182,49 @@
hbox.PackStart (new Label (), false, true, 3);
this.PackStart (hbox, false, false, 6);
- listView.Model = store;
- }
-
- void FillListView()
+ listView.Model = store;
+ }
+
+ void FillListView()
{
store = new TreeStore (typeof (string), typeof (string), typeof (string));
-
- foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) {
- AssemblyName name = asm.GetName();
-
+
+ foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) {
+ AssemblyName name = asm.GetName();
+
string loc;
-
- try {
- loc = asm.Location;
- } catch (Exception) {
- loc = "dynamic";
+
+ try {
+ loc = asm.Location;
+ } catch (Exception) {
+ loc = "dynamic";
}
- store.AppendValues (name.Name, name.Version.ToString(), loc);
+ store.AppendValues (name.Name, name.Version.ToString(), loc);
}
- store.SetSortColumnId (0, SortType.Ascending);
- }
-
- void CopyButtonClick(object o, EventArgs args)
- {
- StringBuilder versionInfo = new StringBuilder();
- foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) {
- AssemblyName name = asm.GetName();
- versionInfo.Append(name.Name);
- versionInfo.Append(",");
- versionInfo.Append(name.Version.ToString());
- versionInfo.Append(",");
- try {
- versionInfo.Append(asm.Location);
- } catch (Exception) {
- versionInfo.Append("dynamic");
- }
-
- versionInfo.Append(Environment.NewLine);
- }
-
- //Clipboard.SetDataObject(new DataObject(System.Windows.Forms.DataFormats.Text, versionInfo.ToString()), true);
- }
- }
-}
+ store.SetSortColumnId (0, SortType.Ascending);
+ }
+
+ void CopyButtonClick(object o, EventArgs args)
+ {
+ StringBuilder versionInfo = new StringBuilder();
+ foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies()) {
+ AssemblyName name = asm.GetName();
+ versionInfo.Append(name.Name);
+ versionInfo.Append(",");
+ versionInfo.Append(name.Version.ToString());
+ versionInfo.Append(",");
+ try {
+ versionInfo.Append(asm.Location);
+ } catch (Exception) {
+ versionInfo.Append("dynamic");
+ }
+
+ versionInfo.Append(Environment.NewLine);
+ }
+
+ //Clipboard.SetDataObject(new DataObject(System.Windows.Forms.DataFormats.Text, versionInfo.ToString()), true);
+ }
+ }
+}
Copied: trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl (from rev 416, trunk/MonoDevelop/src/Main/Base/Gui/HtmlControl)
Modified: trunk/MonoDevelop/src/Main/Base/Makefile
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile 2004-01-10 06:14:19 UTC (rev 419)
+++ trunk/MonoDevelop/src/Main/Base/Makefile 2004-01-10 06:26:10 UTC (rev 420)
@@ -126,6 +126,14 @@
./Gui/CompletionDatabaseWizard/ChooseLocationPanel.cs \
./Gui/ViewContentCollection.cs \
./Gui/IWorkbenchWindow.cs \
+./Gui/HtmlControl/IHTMLDocument2.cs \
+./Gui/HtmlControl/HtmlControl.cs \
+./Gui/HtmlControl/BrowserNavigateEventArgs.cs \
+./Gui/HtmlControl/IWebBrowser.cs \
+./Gui/HtmlControl/IHTMLElement.cs \
+./Gui/HtmlControl/IWebBrowserEvents.cs \
+./Gui/HtmlControl/MozillaControl.cs \
+./Gui/HtmlControl/ControlType.cs \
./Gui/Workbench/Layouts/SdiWorkspaceWindow.cs \
./Gui/Workbench/Layouts/SdiWorkspaceLayout.cs \
./Gui/Workbench/WorkbenchMemento.cs \
@@ -353,4 +361,5 @@
/r:System.Data.dll /r:System.Web.Services.dll /define:LINUX \
/define:GTK /r:gtk-sharp.dll /r:gdk-sharp.dll /r:glib-sharp.dll \
/r:pango-sharp.dll \
+ /r:gtkmozembed-sharp.dll \
$(SOURCES)
More information about the Monodevelop-patches-list
mailing list