[Monodevelop-patches-list] r894 - in trunk/MonoDevelop: . build/data build/data/options src/Main/Base/Gui/CompletionDatabaseWizard

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-02-13 23:03:49 -0500 (Fri, 13 Feb 2004)
New Revision: 894

Added:
   trunk/MonoDevelop/build/data/options/Makefile.am
Modified:
   trunk/MonoDevelop/build/data/Makefile.am
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingFilePanel.cs
Log:
install the default options
fix some UseExistingFile stuff,
the location is not saved it seems


Modified: trunk/MonoDevelop/build/data/Makefile.am
===================================================================
--- trunk/MonoDevelop/build/data/Makefile.am	2004-02-14 03:39:18 UTC (rev 893)
+++ trunk/MonoDevelop/build/data/Makefile.am	2004-02-14 04:03:49 UTC (rev 894)
@@ -1 +1 @@
-SUBDIRS = resources
+SUBDIRS = resources options

Added: trunk/MonoDevelop/build/data/options/Makefile.am
===================================================================
--- trunk/MonoDevelop/build/data/options/Makefile.am	2004-02-14 03:39:18 UTC (rev 893)
+++ trunk/MonoDevelop/build/data/options/Makefile.am	2004-02-14 04:03:49 UTC (rev 894)
@@ -0,0 +1,13 @@
+
+monodevelopdir = $(prefix)/lib/monodevelop
+mdoptionsdir = $(monodevelopdir)/data/options
+mdoptions_DATA = DefaultEditingLayout.xml \
+	MonoDevelopProperties.xml \
+	SharpDevelop-templates.xml \
+	SharpDevelop-tools.xml \
+	TipsOfTheDay.xml
+
+EXTRA_DIST = $(mdoptions_DATA)
+
+all:
+	

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-02-14 03:39:18 UTC (rev 893)
+++ trunk/MonoDevelop/configure.in	2004-02-14 04:03:49 UTC (rev 894)
@@ -73,6 +73,7 @@
 build/Makefile
 build/data/Makefile
 build/data/resources/Makefile
+build/data/options/Makefile
 build/data/resources/icons/Makefile
 build/AddIns/Makefile
 build/AddIns/AddIns/Makefile

Modified: trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingFilePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingFilePanel.cs	2004-02-14 03:39:18 UTC (rev 893)
+++ trunk/MonoDevelop/src/Main/Base/Gui/CompletionDatabaseWizard/UseExistingFilePanel.cs	2004-02-14 04:03:49 UTC (rev 894)
@@ -22,7 +22,7 @@
 	{
 		static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
 		IProperties properties;
-		Entry locationTextBox;
+		FolderEntry fEntry;
 		
 		public override bool ReceiveDialogMessage(DialogMessage message)
 		{
@@ -36,11 +36,17 @@
 			}
 			return true;
 		}
+
+		void OnPathChanged (object sender, EventArgs e)
+		{
+			SetFinishedState (sender, e);
+		}
 		
 		void SetFinishedState(object sender, EventArgs e)
 		{
 			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
-			string path = locationTextBox.Text;
+			string path = fEntry.Path;
+
 			EnableFinish = fileUtilityService.IsValidFileName(path) &&
 			               Directory.Exists(path) && 
 			               File.Exists(fileUtilityService.GetDirectoryNameWithSeparator(path) + "CodeCompletionProxyDataV02.bin");
@@ -55,17 +61,6 @@
 			properties = (IProperties)CustomizationObject;
 		}
 		
-		void BrowseLocationEvent(object sender, EventArgs e)
-		{
-			FolderDialog fd = new FolderDialog ("choose the location in which you want the code completion files to be generated");
-			int response = fd.Run ();
-			fd.Hide ();
-			
-			if (response == (int) ResponseType.Ok) {
-				locationTextBox.Text = fd.Filename;
-			}
-		}
-		
 		static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
 		public UseExistingFilePanel()
 		{
@@ -80,14 +75,12 @@
 			mainVBox.PackStart (textBox, false, true, 0);
 			mainVBox.PackStart (new Label ("Specify location of existing code completion database."));
 			
-			locationTextBox = new Entry ();
-			locationTextBox.WidthChars = 50;
-			locationTextBox.Changed += new EventHandler(SetFinishedState);
-			Button browseButton = new Button ("...");
-			browseButton.Clicked += new EventHandler(BrowseLocationEvent);
+			fEntry = new FolderEntry ("Select existing database location");
+			fEntry.DefaultPath = Environment.GetEnvironmentVariable ("HOME");
+			fEntry.PathChanged += new EventHandler (OnPathChanged);
+
 			HBox hbox = new HBox (false, 0);
-			hbox.PackStart (locationTextBox, false, true, 0);
-			hbox.PackStart (browseButton, false, true, 0);
+			hbox.PackStart (fEntry, false, true, 0);
 			SetFinishedState(this, EventArgs.Empty);
 			CustomizationObjectChanged += new EventHandler(SetValues);
 			
@@ -96,3 +89,4 @@
 		}
 	}
 }
+