[Monodevelop-patches-list] r2019 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Services/File

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

Author: jluke
Date: 2004-11-02 16:14:25 -0500 (Tue, 02 Nov 2004)
New Revision: 2019

Modified:
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
   trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs
Log:
	* Services/File/DefaultFileService.cs:
	* Services/File/RecentOpen.cs:
	* Commands/MenuItemBuilders.cs:
	* Commands/FileCommand.cs: display File [Project] or just File



Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-11-02 20:51:47 UTC (rev 2018)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-11-02 21:14:25 UTC (rev 2019)
@@ -9,6 +9,11 @@
 	* Services/Project/DefaultProjectService:
 	* Commands/MenuItemBuilders.cs: display project name for projects
 
+	* Services/File/DefaultFileService.cs:
+	* Services/File/RecentOpen.cs:
+	* Commands/MenuItemBuilders.cs:
+	* Commands/FileCommand.cs: display File [Project] or just File
+
 2004-11-01	Fawad Halim  <fawad at fawad.net>
 
 	* Internal/Parser/SharpAssemblyLayer/SharpAssemblyParameter.cs

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs	2004-11-02 20:51:47 UTC (rev 2018)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs	2004-11-02 21:14:25 UTC (rev 2019)
@@ -175,7 +175,7 @@
 					
 					// do actual save
 					if (fileUtilityService.ObservedSave(new NamedFileOperationDelegate(window.ViewContent.Save), filename) == FileOperationResult.OK) {
-						fileService.RecentOpen.AddLastFile(filename);							
+						fileService.RecentOpen.AddLastFile (filename, null);
 					}
 				}
 			}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-11-02 20:51:47 UTC (rev 2018)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-11-02 21:14:25 UTC (rev 2019)
@@ -56,8 +56,10 @@
 				
 				for (int i = 0; i < recentOpen.RecentFile.Length; ++i) {
 					string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : "";
-					items[i] = new RFMItem(null, null, accelaratorKeyPrefix + recentOpen.RecentFile[i].ToString().Replace ("_", "__"), new EventHandler(LoadRecentFile));
-					items[i].Tag = recentOpen.RecentFile[i].ToString();
+					RecentItem ri = recentOpen.RecentFile[i];
+					string label = ri.Private == null ? ri.ToString () : ri.Private;
+					items[i] = new RFMItem (null, null, accelaratorKeyPrefix + label.Replace ("_", "__"), new EventHandler (LoadRecentFile));
+					items[i].Tag = ri.ToString ();
 				}
 				return items;
 			}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs	2004-11-02 20:51:47 UTC (rev 2018)
+++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs	2004-11-02 21:14:25 UTC (rev 2019)
@@ -162,13 +162,13 @@
 				if (combine != null && project != null)
 				{
 					if (fileUtilityService.ObservedLoad(new NamedFileOperationDelegate(new LoadFileWrapper(binding, project).Invoke), fileName) == FileOperationResult.OK) {
-						fileService.RecentOpen.AddLastFile(fileName);
+						fileService.RecentOpen.AddLastFile (fileName, project.Name);
 					}
 				}
 				else
 				{
 					if (fileUtilityService.ObservedLoad(new NamedFileOperationDelegate(new LoadFileWrapper(binding, null).Invoke), fileName) == FileOperationResult.OK) {
-						fileService.RecentOpen.AddLastFile(fileName);
+						fileService.RecentOpen.AddLastFile (fileName, null);
 					}
 				}
 			} else {
@@ -182,7 +182,7 @@
 					}
 				} catch {
 					if (fileUtilityService.ObservedLoad(new NamedFileOperationDelegate (new LoadFileWrapper (displayBindingService.LastBinding, null).Invoke), fileName) == FileOperationResult.OK) {
-						fileService.RecentOpen.AddLastFile (fileName);
+						fileService.RecentOpen.AddLastFile (fileName, null);
 					}
 				}
 			}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs	2004-11-02 20:51:47 UTC (rev 2018)
+++ trunk/MonoDevelop/Core/src/Main/Base/Services/File/RecentOpen.cs	2004-11-02 21:14:25 UTC (rev 2019)
@@ -71,12 +71,15 @@
 			UpdateLastProject ();
 		}
 		
-		// FIXME: store the Project name also
-		// so we can optionally display in the menu
-		// filename [Project]
-		public void AddLastFile (string name)
+		public void AddLastFile (string name, string project)
 		{
-			recentFiles.AddWithLimit (new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files"), "MonoDevelop Files", MAX_LENGTH);
+			RecentItem ri = new RecentItem (new Uri (name), Vfs.GetMimeType (name), "MonoDevelop Files");
+			if (project == null)
+				ri.Private = String.Format ("{0}", Path.GetFileName (name));
+			else
+				ri.Private = String.Format ("{0} [{1}]", Path.GetFileName (name), project);
+
+			recentFiles.AddWithLimit (ri, "MonoDevelop Files", MAX_LENGTH);
 			UpdateLastFile ();
 		}