[Monodevelop-patches-list] r1127 - in trunk/MonoDevelop: . build/data/templates/project/CSharp src/Main/Base src/Main/Base/Gui/Dialogs
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Mon Mar 8 13:20:47 EST 2004
Author: jluke
Date: 2004-03-08 13:20:47 -0500 (Mon, 08 Mar 2004)
New Revision: 1127
Removed:
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/FolderDialog.cs
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs
trunk/MonoDevelop/src/Main/Base/Makefile.am
Log:
* src/Main/Base/Makefile.am:
* src/Main/Base/Gui/FolderDialog.cs: remove because it is
implemented in MonoDevelop.Gui.Widgets instead
* build/data/templates/project/CSharp/GnomeSharpProject.xpt:
fix so it builds
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-03-08 18:02:59 UTC (rev 1126)
+++ trunk/MonoDevelop/ChangeLog 2004-03-08 18:20:47 UTC (rev 1127)
@@ -1,3 +1,11 @@
+2004-03-07 John Luke <jluke at cfl.rr.com>
+
+ * src/Main/Base/Makefile.am:
+ * src/Main/Base/Gui/FolderDialog.cs: remove because it is
+ implemented in MonoDevelop.Gui.Widgets instead
+ * build/data/templates/project/CSharp/GnomeSharpProject.xpt:
+ fix so it builds
+
2004-03-07 Todd Berman <tberman at sevenl.net>
* src/Main/Base/Gui/Workbench/DefaultWorkbench.cs:
Modified: trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt
===================================================================
--- trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt 2004-03-08 18:02:59 UTC (rev 1126)
+++ trunk/MonoDevelop/build/data/templates/project/CSharp/GnomeSharpProject.xpt 2004-03-08 18:20:47 UTC (rev 1127)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Template originator = "John Luke"
created = "01/03/2004"
- lastModified = "02/25/2004">
+ lastModified = "03/08/2004">
<!-- Template Header -->
<TemplateConfiguration>
@@ -40,49 +40,32 @@
<File name="Main.cs"><![CDATA[// project created on ${Date} at ${Time}
using System;
-class MainClass
+public class MainClass
{
- public static void Main(string[] args)
+ public static void Main (string[] args)
{
- new MyWindow ();
+ new MyProgram (args);
}
}]]></File>
<File name="MyProgram.cs"><![CDATA[using System;
using Gtk;
-using GtkSharp;
using Gnome;
-using GnomeSharp;
-public class MyProgram : Program
+public class MyProgram
{
- static GLib.GType gtype;
-
- public static new GLib.GType GType
+ public MyProgram (string [] args)
{
- get
- {
- if (gtype == GLib.GType.Invalid)
- gtype = RegisterGType (typeof (MyProgram));
- return gtype;
- }
- }
-
- public MyProgram () : base (GType)
- {
- }
-
- public MyProgram (string [] args) : base ("MyProgram", "0.0", Modules.UI, args)
- {
+ Program program = new Program ("MyProgram", "0.0", Modules.UI, args);
App app = new App ("MyProgram", "MyWindow");
app.SetDefaultSize (400, 300);
app.DeleteEvent += new DeleteEventHandler (OnAppDelete);
app.ShowAll ();
- this.Run ();
+ program.Run ();
}
private void OnAppDelete (object o, DeleteEventArgs args)
{
- this.Quit ();
+ Application.Quit ();
}
}]]></File>
<File name="AssemblyInfo.cs"><![CDATA[using System.Reflection;
Deleted: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/FolderDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/FolderDialog.cs 2004-03-08 18:02:59 UTC (rev 1126)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/FolderDialog.cs 2004-03-08 18:20:47 UTC (rev 1127)
@@ -1,48 +0,0 @@
-// <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 ICSharpCode.Core.Services;
-
-namespace ICSharpCode.SharpDevelop.Gui.Dialogs
-{/*
- /// <summary>
- /// This class helps to display the directory structure in the folder
- /// As the FolderBrowser is inaccessible we have to inherit from the
- /// FileNameBroswer and then call the method
- /// </summary>
- public class FolderDialog : FolderNameEditor
- {
- string path;
-
- public string Path {
- get {
- return path;
- }
- }
-
- public FolderDialog()
- {
- }
-
- public DialogResult DisplayDialog()
- {
- return DisplayDialog("Select the directory in which the project will be created.");
- }
-
- // Alain VIZZINI reminded me to try out the .NET folder browser, because
- // the my documents bug seemed to have gone away ...
- public DialogResult DisplayDialog(string description)
- {
- FolderBrowser folderBrowser = new FolderBrowser();
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- folderBrowser.Description = stringParserService.Parse(description);
- DialogResult result = folderBrowser.ShowDialog();
- path = folderBrowser.DirectoryPath;
- return result;
- }
- }*/
-}
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs 2004-03-08 18:02:59 UTC (rev 1126)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs 2004-03-08 18:20:47 UTC (rev 1127)
@@ -39,11 +39,6 @@
this.configurationNode = configurationNode;
this.Title = StringParserService.Parse("${res:Dialog.Options.ProjectOptions.DialogName}");
- //((TreeView)ControlDictionary["optionsTreeView"]).MouseUp += new MouseEventHandler(TreeViewMouseUp);
- //((TreeView)ControlDictionary["optionsTreeView"]).AfterLabelEdit += new NodeLabelEditEventHandler(AfterLabelEdit);
-
- //((TreeView)ControlDictionary["optionsTreeView"]).Font = boldFont;
-
properties = new DefaultProperties();
properties.SetProperty("Project", project);
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-08 18:02:59 UTC (rev 1126)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-03-08 18:20:47 UTC (rev 1127)
@@ -60,7 +60,6 @@
./Gui/Dialogs/OptionPanels/EditTemplateDialog.cs \
./Gui/Dialogs/OptionPanels/ExternalToolPanel.cs \
./Gui/Dialogs/OptionPanels/PropertyGridPanel.cs \
-./Gui/Dialogs/FolderDialog.cs \
./Gui/Dialogs/TreeViewOptions.cs \
./Gui/Dialogs/WordCountDialog.cs \
./Gui/Dialogs/SharpDevelopAboutPanels.cs \
More information about the Monodevelop-patches-list
mailing list