[Monodevelop-patches-list] r620 - in trunk/MonoDevelop: . gtkmozembed-sharp src/Main/Base/Gui/Dialogs
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Jan 23 16:53:01 EST 2004
Author: jluke
Date: 2004-01-23 16:53:01 -0500 (Fri, 23 Jan 2004)
New Revision: 620
Modified:
trunk/MonoDevelop/README
trunk/MonoDevelop/TODO
trunk/MonoDevelop/gtkmozembed-sharp/Makefile
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
Log:
rework drawing of About Scrollbox and remove unused properties
add info to README
Modified: trunk/MonoDevelop/README
===================================================================
--- trunk/MonoDevelop/README 2004-01-23 01:47:07 UTC (rev 619)
+++ trunk/MonoDevelop/README 2004-01-23 21:53:01 UTC (rev 620)
@@ -1,5 +1,7 @@
This is a port of SharpDevelop to Gtk# and Mono.
+Compiling and running
+---------------------
To compile run the following command:
make PREFIX=/usr/local
@@ -8,13 +10,25 @@
To run MonoDevelop:
./monodevelop
-EXAMPLE:
+Example:
make clean && make PREFIX=/usr && ./monodevelop
+Dependencies
+------------
You need Mono and Gtk# cvs, and ORBit2-2.8.3 or newer
Mono must be installed with ICU enabled.
+References
+----------
+SharpDevelop Tech Notes
+http://www.icsharpcode.net/TechNotes/
+
We are attempting to follow the HIG in certain areas especially, particularly dialogs.
You can find a copy of the HIG at http://developer.gnome.org/projects/gup/hig/1.0/
+
+Discussion, Bugs, Patches
+-------------------------
+monodevelop-list at lists.ximian.com (questions and discussion)
+http://bugzilla.ximian.com (bugs and patches)
Modified: trunk/MonoDevelop/TODO
===================================================================
--- trunk/MonoDevelop/TODO 2004-01-23 01:47:07 UTC (rev 619)
+++ trunk/MonoDevelop/TODO 2004-01-23 21:53:01 UTC (rev 620)
@@ -16,7 +16,6 @@
- When too many tabs are opened they go out for the window and don't show
- printing support
- some keywords should be bold when highlighted
-- make fonts choice persist (after restarting)
- organize this list (Bugzilla maybe?)
- switch to a proper build system (mbuild or auto*?)
- Allow show hidden (.*) files/directories in the file browser.
Modified: trunk/MonoDevelop/gtkmozembed-sharp/Makefile
===================================================================
--- trunk/MonoDevelop/gtkmozembed-sharp/Makefile 2004-01-23 01:47:07 UTC (rev 619)
+++ trunk/MonoDevelop/gtkmozembed-sharp/Makefile 2004-01-23 21:53:01 UTC (rev 620)
@@ -13,7 +13,7 @@
gapi-codegen --generate gtkmozembed-api.xml --include $(INCLUDE_APIS) --outdir=generated --customdir=. --assembly-name=gtkmozembed-sharp && touch generated-stamp
$(ASSEMBLY): generated-stamp
- $(MCS) --unsafe --target library -L @prefix@/lib \
+ $(MCS) --unsafe --target library \
-r glib-sharp.dll -r gtk-sharp.dll -r gdk-sharp.dll \
--recurse '*.cs' -o $(ASSEMBLY)
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-01-23 01:47:07 UTC (rev 619)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs 2004-01-23 21:53:01 UTC (rev 620)
@@ -6,15 +6,12 @@
// </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 ICSharpCode.SharpDevelop.Gui.HtmlControl;
+//using ICSharpCode.SharpDevelop.Gui.HtmlControl;
+
using Gdk;
using Gtk;
using GtkSharp;
@@ -30,37 +27,9 @@
int scroll = -220;
uint hndlr;
Pango.Font font;
- Drawable dr;
bool initial = true;
- Gdk.GC gc;
+ Pango.Layout layout;
- 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;
- }
- }
-
internal uint Handler
{
get { return hndlr; }
@@ -78,9 +47,9 @@
this.ExposeEvent += new ExposeEventHandler (OnExposed);
ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
- this.Image = resourceService.GetBitmap ("Icons.AboutImage");
+ image = resourceService.GetBitmap ("Icons.AboutImage");
- text = "Ported and developed by:\nTodd Berman\nPedro Abelleira Seco\nJohn Luke\nDaniel Kornhauser\norph\nnricciar\njba\nBen Maurer";
+ text = "<b>Ported and developed by:</b>\nTodd Berman\nPedro Abelleira Seco\nJohn Luke\nDaniel Kornhauser\norph\nnricciar\njba\nBen Maurer";
//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";
@@ -104,26 +73,14 @@
private void DrawImage ()
{
if (image != null) {
- dr.DrawPixbuf (gc, Image, 0, 0, 0, 0, -1, -1, RgbDither.Normal, 0, 0);
-
+ this.GdkWindow.DrawPixbuf (this.Style.BackgroundGC (StateType.Normal), image, 0, 0, 0, 0, -1, -1, RgbDither.Normal, 0, 0);
}
}
private void DrawText ()
{
- Pango.Layout layout = new Pango.Layout (this.PangoContext);
- // FIXME: this seems wrong but works
- layout.Width = 253952;
- layout.Wrap = Pango.WrapMode.Word;
- FontDescription fd = FontDescription.FromString ("Tahoma 10");
- layout.FontDescription = fd;
- layout.SetText (text);
- dr.DrawLayout (gc, 200, 0 - scroll, layout);
-
- //Console.WriteLine (layout.Size);
- //Console.WriteLine (layout.Width);
- //Console.WriteLine (layout.LineCount);
-
+ this.GdkWindow.DrawLayout (this.Style.TextGC (StateType.Normal), 200, 0 - scroll, layout);
+
if (scroll > 220 ) {
scroll = -scroll;
}
@@ -137,10 +94,14 @@
protected void OnRealized (object o, EventArgs args)
{
- int xoff;
- int yoff;
- this.GdkWindow.GetInternalPaintInfo (out dr, out xoff, out yoff);
- gc = new Gdk.GC (dr);
+ layout = new Pango.Layout (this.PangoContext);
+ Console.WriteLine (this.GdkWindow.Size);
+ // FIXME: this seems wrong but works
+ layout.Width = 253952;
+ layout.Wrap = Pango.WrapMode.Word;
+ FontDescription fd = FontDescription.FromString ("Tahoma 10");
+ layout.FontDescription = fd;
+ layout.SetMarkup (text);
}
}
@@ -153,12 +114,6 @@
//ChangeLogTabPage changelog;
ScrollBox aboutPictureScrollBox;
- public ScrollBox ScrollBox {
- get {
- return (ScrollBox) aboutPictureScrollBox;
- }
- }
-
static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
static CommonAboutDialog ()
@@ -195,7 +150,7 @@
public new int Run ()
{
int tmp = base.Run ();
- Timeout.Remove (ScrollBox.Handler);
+ Timeout.Remove (aboutPictureScrollBox.Handler);
return tmp;
}
More information about the Monodevelop-patches-list
mailing list