Author: mhutch
Date: 2007-09-19 18:42:41 -0400 (Wed, 19 Sep 2007)
New Revision: 86049

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandWidget.cs
Log:
* MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandWidget.cs:
  Only display relevant substitution tags for solutions and projects.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog       
2007-09-19 21:48:04 UTC (rev 86048)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/ChangeLog       
2007-09-19 22:42:41 UTC (rev 86049)
@@ -1,3 +1,8 @@
+2007-09-19  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandWidget.cs: 
Only
+         display relevant substitution tags for solutions and projects.
+
 2007-09-18  Mike Krüger <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Projects.Gui.Completion/CodeCompletionData.cs,

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandWidget.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandWidget.cs
    2007-09-19 21:48:04 UTC (rev 86048)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/CustomCommandWidget.cs
    2007-09-19 22:42:41 UTC (rev 86049)
@@ -14,6 +14,7 @@
                bool updating;
                
                // snatched from 
MonoDevelop.Ide.Gui.OptionPanels/ExternalToolPanel.cs
+               // a lot of these probably don't apply to custom build commands 
(e.g. ItemPath -- path of current open doc)
 //             static string[,] argumentQuickInsertMenu = new string[,] {
 //                     {GettextCatalog.GetString ("Item Path"), "${ItemPath}"},
 //                     {GettextCatalog.GetString ("_Item Directory"), 
"${ItemDir}"},
@@ -38,17 +39,19 @@
 //                     {GettextCatalog.GetString ("MonoDevelop Startup 
Directory"), "${StartupPath}"},
 //             };
 
-               static string[,] workingDirInsertMenu = new string[,] {
-                       {GettextCatalog.GetString ("_Item Directory"), 
"${ItemDir}"},
-                       {"-", ""},
+               static string[,] projectWorkingDirInsertMenu = new string[,] {
                        {GettextCatalog.GetString ("_Target Directory"), 
"${TargetDir}"},
                        {GettextCatalog.GetString ("Target Name"), 
"${TargetName}"},
                        {"-", ""},
                        {GettextCatalog.GetString ("_Project Directory"), 
"${ProjectDir}"},
                        {"-", ""},
-                       {GettextCatalog.GetString ("_Solution Directory"), 
"${CombineDir}"},
+                       {GettextCatalog.GetString ("_Root Solution Directory"), 
"${CombineDir}"},
+               };
+               
+               static string[,] entryWorkingDirInsertMenu = new string[,] {
+                       {GettextCatalog.GetString ("_Project Directory"), 
"${ProjectDir}"},
                        {"-", ""},
-                       {GettextCatalog.GetString ("MonoDevelop Startup 
Directory"), "${StartupPath}"},
+                       {GettextCatalog.GetString ("_Root Solution Directory"), 
"${CombineDir}"},
                };
                
                public CustomCommandWidget (CombineEntry entry, CustomCommand 
cmd)
@@ -65,6 +68,7 @@
                        UpdateControls ();
                        this.WidgetFlags |= Gtk.WidgetFlags.NoShowAll;
                        
+                       string[,] workingDirInsertMenu = entry is Project? 
projectWorkingDirInsertMenu : entryWorkingDirInsertMenu;
                        new MenuButtonEntry (workingdirEntry, 
workingdirQuickInsertButton, workingDirInsertMenu);
                }
                

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to