From joshua at mono-cvs.ximian.com  Sun Sep  4 12:12:40 2005
From: joshua at mono-cvs.ximian.com (Joshua Tauberer)
Date: Sun,  4 Sep 2005 12:12:40 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2789 - in
	trunk/MonoDevelop/Extras/VersionControl: . AddIn
Message-ID: <20050904161240.016DC9472C@mono-cvs.ximian.com>

Author: joshua
Date: 2005-09-04 12:12:40 -0400 (Sun, 04 Sep 2005)
New Revision: 2789

Modified:
   trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs
   trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am
   trunk/MonoDevelop/Extras/VersionControl/ChangeLog
Log:
VersionControl/Addin's makefile.am was broken

Modified: trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs	2005-08-29 17:35:20 UTC (rev 2788)
+++ trunk/MonoDevelop/Extras/VersionControl/AddIn/Addin.cs	2005-09-04 16:12:40 UTC (rev 2789)
@@ -63,6 +63,10 @@
 		
 			ProjectFile file = (ProjectFile) dataObject;
 			
+			// TODO: Monitor changes not just to project files
+			// but also to .svn directories to catch commits
+			// and updates.
+			
 			WatchProject(file.Project);
 			
 			// When a file had a status and later has no status,

Modified: trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am	2005-08-29 17:35:20 UTC (rev 2788)
+++ trunk/MonoDevelop/Extras/VersionControl/AddIn/Makefile.am	2005-09-04 16:12:40 UTC (rev 2789)
@@ -1,4 +1,4 @@
-FILES = Addin.cs Diffs.cs Logs.cs Statuses.cs Task.cs Update.cs
+build_sources = Addin.cs Diffs.cs Logs.cs Statuses.cs Task.cs Update.cs
 
 REFS = /r:$(ADDIN_BUILD)/Diff.dll \
 	   /r:$(ADDIN_BUILD)/DiffWidget.dll \
@@ -46,6 +46,6 @@
 
 CLEANFILES = $(DLL) $(DLL).mdb $(ADDIN_BUILD)/$(ADDIN)
 
-EXTRA_DIST = $(FILES) $(ADDIN) overlay_added.png overlay_modified.png overlay_conflicted.png overlay_normal.png overlay_locked.png
+EXTRA_DIST = $(build_sources) $(ADDIN) overlay_added.png overlay_modified.png overlay_conflicted.png overlay_normal.png overlay_locked.png
 
 

Modified: trunk/MonoDevelop/Extras/VersionControl/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/VersionControl/ChangeLog	2005-08-29 17:35:20 UTC (rev 2788)
+++ trunk/MonoDevelop/Extras/VersionControl/ChangeLog	2005-09-04 16:12:40 UTC (rev 2789)
@@ -1,3 +1,8 @@
+2005-09-04  Josh Tauberer <tauberer at for.net>
+
+	* AddIn/Makefile.am: Was broken since last time
+	  it was changed.
+
 2005-08-10  Ben Motmans  <ben.motmans at gmail.com>
 
 	* AddIn/AddIn.mdp



From tberman at mono-cvs.ximian.com  Mon Sep  5 16:39:55 2005
From: tberman at mono-cvs.ximian.com (Todd Berman <tberman@sevenl.net>)
Date: Mon,  5 Sep 2005 16:39:55 -0400 (EDT)
Subject: [Monodevelop-patches-list] r2790 - in
	trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Dialogs Services
Message-ID: <20050905203955.092999472C@mono-cvs.ximian.com>

Author: tberman
Date: 2005-09-05 16:39:54 -0400 (Mon, 05 Sep 2005)
New Revision: 2790

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs
Log:
2005-09-05  Todd Berman  <tberman at off.net>

	* Services/MessageService.cs: Add a new overload that allows a parent
	Window to be passed in.
	* Gui/Dialogs/NewProjectDialog.cs: Fix bug #75981



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-09-04 16:12:40 UTC (rev 2789)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-09-05 20:39:54 UTC (rev 2790)
@@ -1,3 +1,9 @@
+2005-09-05  Todd Berman  <tberman at off.net>
+
+	* Services/MessageService.cs: Add a new overload that allows a parent
+	Window to be passed in.
+	* Gui/Dialogs/NewProjectDialog.cs: Fix bug #75981
+
 2005-08-23  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Gui/Dialogs/CommonAboutDialog.c: Load the image for the About dialog

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs	2005-09-04 16:12:40 UTC (rev 2789)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/NewProjectDialog.cs	2005-09-05 20:39:54 UTC (rev 2790)
@@ -190,6 +190,10 @@
 		
 		void OpenEvent(object sender, EventArgs e)
 		{
+			if (!btn_new.Sensitive) {
+				return;
+			}
+			
 			if (TemplateView.CurrentlySelected != null) {
 				Runtime.Properties.SetProperty("Dialogs.NewProjectDialog.LastSelectedCategory", ((ProjectTemplate)TemplateView.CurrentlySelected).Name);
 				//Runtime.Properties.SetProperty("Dialogs.NewProjectDialog.LargeImages", ((RadioButton)ControlDictionary["largeIconsRadioButton"]).Checked);
@@ -203,9 +207,7 @@
 			
 			//The one below seemed to be failing sometimes.
 			if(solution.IndexOfAny("$#@!%^&*/?\\|'\";:}{".ToCharArray()) > -1) {
-				Runtime.MessageService.ShowError(GettextCatalog.GetString ("Illegal project name. \nOnly use letters, digits, space, '.' or '_'."));
-				dialog.Respond(Gtk.ResponseType.Reject);
-				dialog.Hide();
+				Runtime.MessageService.ShowError(dialog, GettextCatalog.GetString ("Illegal project name. \nOnly use letters, digits, space, '.' or '_'."));
 				return;
 			}
 
@@ -213,14 +215,12 @@
 				&& (!fileUtilityService.IsValidFileName (solution) || solution.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0)) ||
 			    !fileUtilityService.IsValidFileName(name)     || name.IndexOf(System.IO.Path.DirectorySeparatorChar) >= 0 ||
 			    !fileUtilityService.IsValidFileName(location)) {
-				Runtime.MessageService.ShowError(GettextCatalog.GetString ("Illegal project name.\nOnly use letters, digits, space, '.' or '_'."));
+				Runtime.MessageService.ShowError(dialog, GettextCatalog.GetString ("Illegal project name.\nOnly use letters, digits, space, '.' or '_'."));
 				return;
 			}
 
 			if (Runtime.ProjectService.GetProject (name) != null) {
-				Runtime.MessageService.ShowError(GettextCatalog.GetString ("A Project with that name is already in your Project Space"));
-				dialog.Respond(Gtk.ResponseType.Reject);
-				dialog.Hide();
+				Runtime.MessageService.ShowError(dialog, GettextCatalog.GetString ("A Project with that name is already in your Project Space"));
 				return;
 			}
 			
@@ -237,12 +237,12 @@
 				}
 				catch (IOException ioException)
 				{
-					Runtime.MessageService.ShowError (String.Format (GettextCatalog.GetString ("Could not create directory {0}. File already exists."), ProjectSolution));
+					Runtime.MessageService.ShowError (dialog, String.Format (GettextCatalog.GetString ("Could not create directory {0}. File already exists."), ProjectSolution));
 					return;
 				}
 				catch (UnauthorizedAccessException accessException)
 				{
-					Runtime.MessageService.ShowError (String.Format (GettextCatalog.GetString ("You do not have permission to create to {0}"), ProjectSolution));
+					Runtime.MessageService.ShowError (dialog, String.Format (GettextCatalog.GetString ("You do not have permission to create to {0}"), ProjectSolution));
 					return;
 				}
 				

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs	2005-09-04 16:12:40 UTC (rev 2789)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/MessageService.cs	2005-09-05 20:39:54 UTC (rev 2790)
@@ -26,17 +26,22 @@
 		
 		public void ShowError(Exception ex)
 		{
-			ShowError(ex, null);
+			ShowError(ex, null, (Window) WorkbenchSingleton.Workbench);
 		}
 		
 		public void ShowError(string message)
 		{
-			ShowError(null, message);
+			ShowError(null, message, (Window) WorkbenchSingleton.Workbench);
 		}
+
+		public void ShowError (Window parent, string message)
+		{
+			ShowError (null, message, parent);
+		}
 		
 		public void ShowErrorFormatted(string formatstring, params string[] formatitems)
 		{
-			ShowError(null, String.Format(stringParserService.Parse(formatstring), formatitems));
+			ShowError(null, String.Format(stringParserService.Parse(formatstring), formatitems), (Window) WorkbenchSingleton.Workbench);
 		}
 
 		private struct ErrorContainer
@@ -53,7 +58,12 @@
 
 		public void ShowError (Exception ex, string message)
 		{
-			ErrorDialog dlg = new ErrorDialog ((Window) WorkbenchSingleton.Workbench);
+			ShowError (ex, message, (Window) WorkbenchSingleton.Workbench);
+		}
+
+		public void ShowError (Exception ex, string message, Window parent)
+		{
+			ErrorDialog dlg = new ErrorDialog (parent);
 			
 			if (message != null) {
 				dlg.Message = message;