VirtualBox

Changeset 44598 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Feb 8, 2013 11:44:48 AM (12 years ago)
Author:
vboxsync
Message:

FE/Qt: 5823: Do not directly set shortcut for action with hidden one.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/globals
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r44449 r44598  
    5151    , m_type(type)
    5252    , m_actionPoolType(pParent->type())
     53    , m_fShortcutHidden(false)
    5354{
    5455    /* By default there is no specific menu role.
     
    7576    if (m_actionPoolType == UIActionPoolType_Selector)
    7677    {
    77         /* Call to base-class: */
    78         QAction::setShortcut(shortcut);
     78        /* If shortcut is visible: */
     79        if (!m_fShortcutHidden)
     80            /* Call to base-class: */
     81            QAction::setShortcut(shortcut);
    7982        /* Remember shortcut: */
    8083        m_shortcut = shortcut;
     
    8689void UIAction::showShortcut()
    8790{
     91    m_fShortcutHidden = false;
    8892    if (!m_shortcut.isEmpty())
    8993        QAction::setShortcut(m_shortcut);
     
    9296void UIAction::hideShortcut()
    9397{
     98    m_fShortcutHidden = true;
    9499    if (!shortcut().isEmpty())
    95100        QAction::setShortcut(QKeySequence());
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r44448 r44598  
    115115    QString m_strName;
    116116    QKeySequence m_shortcut;
     117    bool m_fShortcutHidden;
    117118};
    118119
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette