[Monodevelop-patches-list] r1118 - in trunk/MonoDevelop: . samples/VFS src/Main/Base/Gui/BrowserDisplayBinding src/Main/Base/Gui/Dialogs/ReferenceDialog src/Main/Base/Services/File

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

Author: jluke
Date: 2004-03-05 14:39:28 -0500 (Fri, 05 Mar 2004)
New Revision: 1118

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/samples/VFS/test.cs
   trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs
   trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs
   trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs
Log:
updates and apply patch for bug#55192


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-03-05 19:11:03 UTC (rev 1117)
+++ trunk/MonoDevelop/ChangeLog	2004-03-05 19:39:28 UTC (rev 1118)
@@ -1,3 +1,9 @@
+2004-03-05  John Luke  <jluke at cfl.rr.com>
+	
+	* src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs:
+	apply patch from djj734 at mail.usask.ca (Doug) to fix adding a .NET
+	assembly reference by using GetFullPath, bug #55192
+
 2004-03-05  Mike Kestner  <mkestner at ximian.com>
 
 	* Main/Base/Services/DebuggingService.cs : add StepInto and

Modified: trunk/MonoDevelop/samples/VFS/test.cs
===================================================================
--- trunk/MonoDevelop/samples/VFS/test.cs	2004-03-05 19:11:03 UTC (rev 1117)
+++ trunk/MonoDevelop/samples/VFS/test.cs	2004-03-05 19:39:28 UTC (rev 1118)
@@ -1,6 +1,6 @@
 using System;
 using System.IO;
-using MonoDevelop.GuiUtils;
+using MonoDevelop.Gui.Utils;
 
 class T
 {
@@ -11,7 +11,6 @@
 		string test_file = Path.Combine (Environment.CurrentDirectory, "test.cs");
 		if (File.Exists (test_file))
 		{
-
 			string mt = Vfs.GetMimeType (test_file);
 			Console.WriteLine (Vfs.IsKnownType (mt));
 			string icon = Vfs.GetIcon (mt);

Modified: trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-03-05 19:11:03 UTC (rev 1117)
+++ trunk/MonoDevelop/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-03-05 19:39:28 UTC (rev 1118)
@@ -217,6 +217,7 @@
 			mainbox.PackStart (catcher);
 
 			status = new Statusbar ();
+			status.HasResizeGrip  = false;
 			mainbox.PackStart (status, false, true, 0);
 			
 			this.Add (mainbox);

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs	2004-03-05 19:11:03 UTC (rev 1117)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs	2004-03-05 19:39:28 UTC (rev 1118)
@@ -50,7 +50,7 @@
 				foreach (string file in selectedFiles) {
 					bool isAssembly = true;
 					try	{
-						System.Reflection.AssemblyName.GetAssemblyName(System.IO.Path.GetFileName(file));
+						System.Reflection.AssemblyName.GetAssemblyName(System.IO.Path.GetFullPath (file));
 					} catch (Exception assemblyExcep) {
 						isAssembly = false;
 					}

Modified: trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs	2004-03-05 19:11:03 UTC (rev 1117)
+++ trunk/MonoDevelop/src/Main/Base/Services/File/FdoRecentFiles.cs	2004-03-05 19:39:28 UTC (rev 1118)
@@ -98,28 +98,30 @@
             }
         }
 
+		// new entries seem to go on top
+		// but it is not explicitly stated as so
 		public void AddFile (string file_uri)
 		{
 			// uri must be unique
 			// or just update timestamp and group
+			RecentItem ri = new RecentItem (file_uri);
 		}
 
 		public void AddProject (string file_uri)
 		{
 			// uri must be unique
 			// or just update timestamp and group
+			RecentItem ri = new RecentItem (file_uri);
 		}
 
 		// spec doesn't mention removal
 		public void ClearFiles ()
 		{
-
 		}
 
 		// spec doesn't mention removal
 		public void ClearProjects ()
 		{
-
 		}
 	}
 }

Modified: trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs	2004-03-05 19:11:03 UTC (rev 1117)
+++ trunk/MonoDevelop/src/Main/Base/Services/File/RecentItem.cs	2004-03-05 19:39:28 UTC (rev 1118)
@@ -18,6 +18,7 @@
 		private string mime;
 		// the number of seconds sinced the Epoch when the item was added to the list.
 		private string timestamp;
+		private readonly DateTime epoch = new DateTime (1970, 1, 1, 0, 0, 0, 0);
 		// may need to change to allow for > 1
 		// lets wait til it's needed though
 		private string group;
@@ -25,11 +26,11 @@
 		// these 3 are required
 		public RecentItem (string uri)
 		{
+			// TODO: uri sanity check
 			this.uri = uri;
 			this.mime = Vfs.GetMimeType (uri);
-			// FIXME 00:00:00 UTC on January 1, 1970 (Unix Epoch)
-			// Now - Epoch in seconds
-			this.timestamp = DateTime.Now.ToString ();
+			DateTime now = DateTime.Now.ToUniversalTime ();
+			this.timestamp = ((int) (now - epoch).TotalSeconds).ToString ();
 		}
 
 		public string Mime