Private Function AddButton(Controls As CommandBarControls, ControlTypeAs XTPControlType, Id As Long, Caption As String, Optional BeginGroupAs Boolean = False, Optional DescriptionText As String = "", OptionalButtonStyle As XTPButtonStyle = xtpButtonAutomatic, Optional CategoryAs String = "Controls") As CommandBarControl
    Dim Control As CommandBarControl
    Set Control = Controls.Add(ControlType, Id, Caption)
    
    Control.BeginGroup = BeginGroup
    Control.DescriptionText = DescriptionText
    Control.Style = ButtonStyle
    Control.Category = Category
    
    Set AddButton = Control
    
End Function

'Shortcutbar constants
Public Const SHORTCUT_INBOX = 300
Public Const SHORTCUT_CALENDAR = 301
Public Const SHORTCUT_CONTACTS = 302
Public Const SHORTCUT_TASKS = 303
Public Const SHORTCUT_NOTES = 304
Public Const SHORTCUT_FOLDER_LIST = 305
Public Const SHORTCUT_SHORTCUTS = 306
Public Const SHORTCUT_JOURNAL = 307

Public Const SHORTCUT_SHOW_MORE = 308
Public Const SHORTCUT_SHOW_FEWER = 309

Public Const SHORTCUT_NAVIGATE_PANE_OPTIONS = 310
Public Const SHORTCUT_ADD_REMOVE_BUTTONS = 311



Private Sub wndShortcutBar_ExpandButtonDown(CancelMenu As Boolean)

    'Cancels the default menu that is displayed when the expand button is pressed.
    'The default button only displays the "Show More Buttons" and "Show Fewer Buttons" commands.
    CancelMenu = True

    Dim Popup As CommandBar
    Dim Control As CommandBarControl
    Dim SubControl As CommandBarControl
    Dim i As Long
    Dim Item As ShortcutBarItem
    Dim iOffset As Integer
    iOffset = 30
    
    Dim CommandBars As CommandBars
    Set CommandBars = frmMain.CommandBars
    
    'Creates a popup command bar
    Set Popup = CommandBars.Add("Popup", xtpBarPopup)

    'Adds buttons to the popup command bar
    With Popup

        'Adds the "Show More Buttons" button
        Set Control =frmMain.AddButton(.Controls, xtpControlButton, SHORTCUT_SHOW_MORE,"Show &More Buttons")
        'Enable this button if all buttons are not expanded
        Control.Enabled = (wndShortcutBar.ExpandedLinesCount <> 9)

        'Adds the "Show Fewer Buttons" button
        Set Control =frmMain.AddButton(.Controls, xtpControlButton, SHORTCUT_SHOW_FEWER,"Show &Fewer Buttons")
        'Enable this button if there are 1 or more buttons expanded
        Control.Enabled = (wndShortcutBar.ExpandedLinesCount <> 1)
        
        frmMain.AddButton .Controls,xtpControlButton, SHORTCUT_NAVIGATE_PANE_OPTIONS, "Na&vigation PaneOptions..."
        Set Control =frmMain.AddButton(.Controls, xtpControlButtonPopup,SHORTCUT_ADD_REMOVE_BUTTONS, "&Add or Remove Buttons")

        For Each Item In wndShortcutBar
          &nbs p;  If Not Item.Id = -1 Then
          &nbs p;      With Control.CommandBar
          &nbs p;         Set SubControl = frmMain.AddButton(.Controls, xtpControlButton, Item.Id+ iOffset, Item.Caption)
          &nbs p;         SubControl.IconId = Item.Id
          &nbs p;         SubControl.Checked = Item.Visible
          &nbs p;      End With
          &nbs p;  End If
        Next
        
        Dim BeginGroup As Boolean
        BeginGroup = True
        
        'Adds all hidden shortcut bar buttons to the popup menu
        For Each Item In wndShortcutBar
          &nbs p;  'If shortcut bar item is hidden, then addit to the popup menu
          &nbs p;  If (Item.Hidden) Then
          &nbs p;     frmMain.AddButton .Controls, xtpControlButton, Item.Id, Item.Caption,BeginGroup
          &nbs p;      BeginGroup = False
          &nbs p;  End If
        Next

    End With

    'Stores the ID of the selected control prom the expand button popup menu.
    Dim nCommand As Long

    'Displays the expand button popup.
    'Passing TPM_RETURNCMD into ShowPopup will cause the ID of the control to be returned
    'when a control in the popup is clicked. When using the TPM_RETURNCMD parameter, the
    'CommandBars_Execute event does not fire because the ID of the control is returned instead.
    nCommand = Popup.ShowPopup(TPM_RETURNCMD)

    'Popup is closed and the user did not select anything, they might have click on something
    'other than the popup menu
    If (nCommand = 0) Then Exit Sub


    'A control was selected from the popup menu. Determines which control was selected.
    Select Case (nCommand)
        Case SHORTCUT_INBOX + iOffset To SHORTCUT_JOURNAL + iOffset
          &nbs p; wndShortcutBar.FindItem(nCommand - iOffset).Visible = NotwndShortcutBar.FindItem(nCommand - iOffset).Visible
          &nbs p;  
        Case SHORTCUT_SHOW_MORE:
          &nbs p; wndShortcutBar.ExpandedLinesCount = wndShortcutBar.ExpandedLinesCount +1
        
        Case SHORTCUT_SHOW_FEWER:
          &nbs p; wndShortcutBar.ExpandedLinesCount = wndShortcutBar.ExpandedLinesCount -1
          &nbs p;  
        Case SHORTCUT_NAVIGATE_PANE_OPTIONS:
          &nbs p;  Debug.Print "Navigate Pane Options Clicked"
          &nbs p;  
        Case Else:
          &nbs p;  'Selects the selected shortcut bar item.
          &nbs p;  wndShortcutBar.Selected = wndShortcutBar.FindItem(nCommand)
    End Select

End Sub