[Monodevelop-patches-list] r1488 - in trunk/MonoDevelop: build/AddIns src/Main/Base src/Main/Base/Gui/Components

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

Author: tberman
Date: 2004-04-22 18:08:25 -0400 (Thu, 22 Apr 2004)
New Revision: 1488

Modified:
   trunk/MonoDevelop/build/AddIns/ChangeLog
   trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs
   trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
Log:
some menu movements, and some code to check to make sure no empty menus will be displayed.


Modified: trunk/MonoDevelop/build/AddIns/ChangeLog
===================================================================
--- trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-20 20:16:45 UTC (rev 1487)
+++ trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-22 22:08:25 UTC (rev 1488)
@@ -1,3 +1,8 @@
+2004-04-22  Todd Berman  <tberman at sevenl.net>
+
+	* SharpDevelopCore.addin.xml: moving Tools->Options to 
+	Edit->Preferences.
+
 2004-04-02  Todd Berman  <tberman at sevenl.net>
 
 	* SharpDevelopCore.addin: removing, moving to static methods.

Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml	2004-04-20 20:16:45 UTC (rev 1487)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml	2004-04-22 22:08:25 UTC (rev 1488)
@@ -706,6 +706,13 @@
 		                          description = "${res:XML.MainMenu.EditMenu.WordCount.Description}"
 		                          class = "MonoDevelop.Commands.WordCount"/>
 		        </Conditional>
+			<MenuItem id = "optionssep5" _label = "-" />
+                        <MenuItem id = "Options"
+                                  _label = "Preferences"
+                                  icon = "Icons.16x16.Options"
+                                  description = "${res:XML.MainMenu.ToolMenu.Options.Description}"
+                                  class = "MonoDevelop.Commands.OptionsCommand"/>
+
 	        </MenuItem>
 	        
 	        <MenuItem id = "View" _label = "View">
@@ -822,11 +829,6 @@
 
 	                <!-- <MenuItem id = "Separator5" _label = "-" /> -->
 	               
-			<MenuItem id = "Options"
-	                          _label = "Options" 
-	                          icon = "Icons.16x16.Options" 
-	                          description = "${res:XML.MainMenu.ToolMenu.Options.Description}"
-	                          class = "MonoDevelop.Commands.OptionsCommand"/>
 	        </MenuItem>
 	        
 <!-- ORIGINAL #D COMMENT	        <MenuItem id = "AddIns" _label = "${res:XML.MainMenu.PluginMenu}">

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-20 20:16:45 UTC (rev 1487)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-22 22:08:25 UTC (rev 1488)
@@ -1,3 +1,9 @@
+2004-04-22  Todd Berman  <tberman at sevenl.net>
+
+	* Gui/Components/SdMenu.cs: check for children, if none, hide menu.
+	* Gui/Components/SdMenuCheckBox.cs: small change for gtk-sharp from
+	future cvs, should work with current cvs though.
+
 2004-04-20  Todd Berman  <tberman at sevenl.net>
 
 	* Commands/AutostartCommands.cs: Move stuff around so workbench memento

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs	2004-04-20 20:16:45 UTC (rev 1487)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenu.cs	2004-04-22 22:08:25 UTC (rev 1488)
@@ -109,6 +109,9 @@
 					}
 				}
 				ShowAll ();
+				if (((Gtk.Menu)Submenu).Children.Length == 0) {
+					Visible = false;
+				}
 			}
 		}
 		

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs	2004-04-20 20:16:45 UTC (rev 1487)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCheckBox.cs	2004-04-22 22:08:25 UTC (rev 1488)
@@ -42,9 +42,14 @@
 			}
 		}
 	
-		public SdMenuCheckBox (string label) : base (label)
+		public SdMenuCheckBox (string label) : base ()
 		{
 			Toggled += new EventHandler (OnClick);
+			Gtk.AccelLabel child = new Gtk.AccelLabel (label);
+			child.Xalign = 0;
+			child.UseUnderline = true;
+			Child = child;
+			child.AccelWidget = this;
 		}
 	
 		public SdMenuCheckBox(ConditionCollection conditionCollection, object caller, string label) : this(stringParserService.Parse(label))