[Monodevelop-patches-list] r588 - in trunk/MonoDevelop: data/resources/glade samples/HtmlControl src/Main/Base/Gui/Dialogs
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Mon Jan 19 23:04:57 EST 2004
Author: jluke
Date: 2004-01-19 23:04:57 -0500 (Mon, 19 Jan 2004)
New Revision: 588
Modified:
trunk/MonoDevelop/data/resources/glade/Base.glade
trunk/MonoDevelop/samples/HtmlControl/Test.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
Log:
use Gnome.FileEntry
cleanups
Modified: trunk/MonoDevelop/data/resources/glade/Base.glade
===================================================================
--- trunk/MonoDevelop/data/resources/glade/Base.glade 2004-01-20 03:11:35 UTC (rev 587)
+++ trunk/MonoDevelop/data/resources/glade/Base.glade 2004-01-20 04:04:57 UTC (rev 588)
@@ -624,7 +624,32 @@
<property name="spacing">0</property>
<child>
- <placeholder/>
+ <widget class="GnomeFileEntry" id="entry_location">
+ <property name="visible">True</property>
+ <property name="max_saved">10</property>
+ <property name="browse_dialog_title" translatable="yes">Combine location</property>
+ <property name="directory_entry">True</property>
+ <property name="modal">True</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="location">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
<packing>
Modified: trunk/MonoDevelop/samples/HtmlControl/Test.cs
===================================================================
--- trunk/MonoDevelop/samples/HtmlControl/Test.cs 2004-01-20 03:11:35 UTC (rev 587)
+++ trunk/MonoDevelop/samples/HtmlControl/Test.cs 2004-01-20 04:04:57 UTC (rev 588)
@@ -81,7 +81,7 @@
win.Add (vbox);
win.ShowAll ();
- html.InitializeWithBase ("file://");
+ html.InitializeWithBase ("file://" + Environment.CurrentDirectory);
}
void OnWinDelete (object o, DeleteEventArgs args)
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-01-20 03:11:35 UTC (rev 587)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewFileDialog.cs 2004-01-20 04:04:57 UTC (rev 588)
@@ -7,25 +7,19 @@
using System;
using System.Collections;
-using System.ComponentModel;
-using System.Drawing;
-using System.Reflection;
-using System.Resources;
-using System.Xml;
using System.IO;
using ICSharpCode.Core.Services;
using ICSharpCode.SharpDevelop.Services;
-
using ICSharpCode.SharpDevelop.Gui.Components;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.Core.Properties;
-
using ICSharpCode.Core.AddIns;
using ICSharpCode.SharpDevelop.Internal.Templates;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
-using MonoDevelop.Gui;
+
using Gtk;
+using MonoDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Gui.Dialogs
{
@@ -101,9 +95,6 @@
}
}
- //((ListView)ControlDictionary["templateListView"]).LargeImageList = imglist;
- //((ListView)ControlDictionary["templateListView"]).SmallImageList = smalllist;
-
InsertCategories(TreeIter.Zero, categories);
PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
/*for (int j = 0; j < categories.Count; ++j) {
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-01-20 03:11:35 UTC (rev 587)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs 2004-01-20 04:04:57 UTC (rev 588)
@@ -12,12 +12,12 @@
using ICSharpCode.Core.AddIns;
using ICSharpCode.Core.Properties;
using ICSharpCode.Core.Services;
-
using ICSharpCode.SharpDevelop.Services;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Internal.Project;
using ICSharpCode.SharpDevelop.Internal.Templates;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
+
using MonoDevelop.Gui;
using Gtk;
using GladeSharp;
@@ -34,7 +34,6 @@
Hashtable icons = new Hashtable();
IconView TemplateView;
- FolderEntry entry_location;
TreeStore catStore;
[Glade.Widget ("NewProjectDialog")] Dialog dialog;
@@ -47,6 +46,7 @@
[Glade.Widget] Gtk.Entry txt_name, txt_subdirectory;
[Glade.Widget] CheckButton chk_combine_directory;
+ [Glade.Widget] Gnome.FileEntry entry_location;
[Glade.Widget] Gtk.TreeView lst_template_types;
[Glade.Widget] HBox hbox_template, hbox_for_browser;
@@ -181,9 +181,9 @@
string ProjectLocation {
get {
if (chk_combine_directory.Active)
- return Path.Combine (entry_location.Path, txt_name.Text);
+ return System.IO.Path.Combine (entry_location.GtkEntry.Text, txt_name.Text);
- return entry_location.Path;
+ return entry_location.GtkEntry.Text;
}
}
@@ -228,7 +228,7 @@
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
string solution = txt_subdirectory.Text;
string name = txt_name.Text;
- string location = entry_location.Path;
+ string location = entry_location.GtkEntry.Text;
if ((solution != null && solution.Trim () != ""
&& (!fileUtilityService.IsValidFileName (solution) || solution.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0)) ||
!fileUtilityService.IsValidFileName(name) || name.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0 ||
@@ -362,17 +362,15 @@
//label = stringParserService.Parse ("${res:Dialog.NewProject.NameLabelText}");
//label = stringParserService.Parse ("${res:Dialog.NewProject.checkBox1Text}");
//label = stringParserService.Parse ("${res:Dialog.NewProject.autoCreateSubDirCheckBox}");
- entry_location = new FolderEntry ("Combine Location");
- hbox_for_browser.PackStart (entry_location, true, true, 0);
- entry_location.DefaultPath = propertyService.GetProperty ("ICSharpCode.SharpDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", fileUtilityService.GetDirectoryNameWithSeparator (Environment.GetFolderPath (Environment.SpecialFolder.Personal)) + "MonoDevelopProjects").ToString ();
+ entry_location.GtkEntry.Text = propertyService.GetProperty ("ICSharpCode.SharpDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", fileUtilityService.GetDirectoryNameWithSeparator (Environment.GetFolderPath (Environment.SpecialFolder.Personal)) + "MonoDevelopProjects").ToString ();
PathChanged (null, null);
TemplateView.IconSelected += new EventHandler(SelectedIndexChange);
TemplateView.IconDoubleClicked += new EventHandler(OpenEvent);
- entry_location.PathChanged += new EventHandler (PathChanged);
+ entry_location.Changed += new EventHandler (PathChanged);
}
/// <summary>
More information about the Monodevelop-patches-list
mailing list