[Monodevelop-patches-list] r2224 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Commands

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

Author: jluke
Date: 2005-02-02 15:02:46 -0500 (Wed, 02 Feb 2005)
New Revision: 2224

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs
Log:
fix disappearing recent menu labels


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-02-02 19:24:55 UTC (rev 2223)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-02-02 20:02:46 UTC (rev 2224)
@@ -1,5 +1,10 @@
 2005-02-02  John Luke  <john.luke at gmail.com>
 
+	* Commands/MenuItemBuilders.cs: only use RecentItem.Private
+	if it contains something, should fix disappearing labels
+
+2005-02-02  John Luke  <john.luke at gmail.com>
+
 	* Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
 	* Gui/Dialogs/OptionPanels/ProjectOptions/OutputOptionsPanel.cs
 	* Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs	2005-02-02 19:24:55 UTC (rev 2223)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Commands/MenuItemBuilders.cs	2005-02-02 20:02:46 UTC (rev 2224)
@@ -54,7 +54,7 @@
 				for (int i = 0; i < recentOpen.RecentFile.Length; ++i) {
 					string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : "";
 					RecentItem ri = recentOpen.RecentFile[i];
-					string label = ri.Private == null ? ri.ToString () : ri.Private;
+					string label = ((ri.Private == null || ri.Private.Length < 1) ? Path.GetFileName (ri.ToString ()) : ri.Private);
 					items[i] = new RFMItem (null, null, accelaratorKeyPrefix + label.Replace ("_", "__"), new EventHandler (LoadRecentFile));
 					items[i].Tag = ri.ToString ();
 				}
@@ -92,7 +92,7 @@
 				for (int i = 0; i < recentOpen.RecentProject.Length; ++i) {
 					string accelaratorKeyPrefix = i < 10 ? "&" + ((i + 1) % 10).ToString() + " " : "";
 					RecentItem ri = recentOpen.RecentProject[i];
-					string label = ri.Private == null ? ri.ToString () : ri.Private;
+					string label = ((ri.Private == null || ri.Private.Length < 1) ? Path.GetFileNameWithoutExtension (ri.ToString ()) : ri.Private);
 					items[i] = new RPMItem(null, null, accelaratorKeyPrefix + label.Replace ("_", "__"), new EventHandler(LoadRecentProject));
 					items[i].Tag = ri.ToString ();
 					items[i].Description = String.Format (GettextCatalog.GetString ("load solution {0}"), ri.ToString ());