Fix toolbar overflow problems: Closes #5523, Closes #5520, Closes #5515

This commit is contained in:
Matthew Pirocchi 2012-08-21 18:01:44 -07:00 committed by Jim Nelson
parent 9911d0c8c1
commit 61ff997a9f
5 changed files with 112 additions and 41 deletions

View file

@ -1,4 +1,7 @@
<ui>
<!--
If ToolbarMenu is changed, be sure to update ToolbarMenuProxy as well. See comments below.
-->
<popup name="ToolbarMenu">
<menuitem name="Preferences" action="GearyPreferences" />
<separator />
@ -7,4 +10,18 @@
<separator />
<menuitem name="Quit" action="GearyQuit" />
</popup>
<!--
This should be identical to ToolbarMenu, except for the name. We can't add ToolbarMenu to
multiple parents, and we don't want to create a second UIManager to load a copy. So instead,
we keep a duplicate of ToolbarMenu in this .ui file to be used by the proxy.
-->
<popup name="ToolbarMenuProxy">
<menuitem name="Preferences" action="GearyPreferences" />
<separator />
<menuitem name="Help" action="GearyHelp" />
<menuitem name="About" action="GearyAbout" />
<separator />
<menuitem name="Quit" action="GearyQuit" />
</popup>
</ui>