VirtualBox

Changeset 40537 in vbox


Ignore:
Timestamp:
Mar 19, 2012 1:42:01 PM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
76926
Message:

FE/Qt: 5018: VM menu accelerator keys do not work: Disable menu mnemonic-accelerators for VBox VM GUI.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
3 edited

Legend:

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

    r39950 r40537  
    5454}
    5555
     56QString UIActionInterface::menuText(const QString &strText)
     57{
     58    return vboxGlobal().isVMConsoleProcess() ? VBoxGlobal::removeAccelMark(strText) : strText;
     59}
     60
    5661/* UIMenuInterface stuff: */
    5762UIMenuInterface::UIMenuInterface()
     
    212217    void retranslateUi()
    213218    {
    214         setText(QApplication::translate("UIActionPool", "&Help"));
     219        setText(menuText(QApplication::translate("UIActionPool", "&Help")));
    215220    }
    216221};
     
    241246    void retranslateUi()
    242247    {
    243         setText(QApplication::translate("UIMessageCenter", "&Contents..."));
     248        setText(menuText(QApplication::translate("UIMessageCenter", "&Contents...")));
    244249        setStatusTip(QApplication::translate("UIMessageCenter", "Show the online help contents"));
    245250    }
     
    271276    void retranslateUi()
    272277    {
    273         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIMessageCenter", "&VirtualBox Web Site..."), gMS->shortcut(UIMachineShortcuts::WebShortcut)));
     278        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIMessageCenter", "&VirtualBox Web Site...")), gMS->shortcut(UIMachineShortcuts::WebShortcut)));
    274279        setStatusTip(QApplication::translate("UIMessageCenter", "Open the browser and go to the VirtualBox product web site"));
    275280    }
     
    301306    void retranslateUi()
    302307    {
    303         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIMessageCenter", "&Reset All Warnings"), gMS->shortcut(UIMachineShortcuts::ResetWarningsShortcut)));
     308        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIMessageCenter", "&Reset All Warnings")), gMS->shortcut(UIMachineShortcuts::ResetWarningsShortcut)));
    304309        setStatusTip(QApplication::translate("UIMessageCenter", "Go back to showing all suppressed warnings and messages"));
    305310    }
     
    331336    void retranslateUi()
    332337    {
    333         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIMessageCenter", "Network Operations Manager..."), gMS->shortcut(UIMachineShortcuts::NetworkAccessManager)));
     338        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIMessageCenter", "&Network Operations Manager...")), gMS->shortcut(UIMachineShortcuts::NetworkAccessManager)));
    334339        setStatusTip(QApplication::translate("UIMessageCenter", "Show Network Operations Manager"));
    335340    }
     
    364369    void retranslateUi()
    365370    {
    366         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIMessageCenter", "R&egister VirtualBox..."), gMS->shortcut(UIMachineShortcuts::RegisterShortcut)));
     371        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIMessageCenter", "R&egister VirtualBox...")), gMS->shortcut(UIMachineShortcuts::RegisterShortcut)));
    367372        setStatusTip(QApplication::translate("UIMessageCenter", "Open VirtualBox registration form"));
    368373    }
     
    396401    void retranslateUi()
    397402    {
    398         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIMessageCenter", "C&heck for Updates..."), gMS->shortcut(UIMachineShortcuts::UpdateShortcut)));
     403        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIMessageCenter", "C&heck for Updates...")), gMS->shortcut(UIMachineShortcuts::UpdateShortcut)));
    399404        setStatusTip(QApplication::translate("UIMessageCenter", "Check for a new VirtualBox version"));
    400405    }
     
    427432    void retranslateUi()
    428433    {
    429         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIMessageCenter", "&About VirtualBox..."), gMS->shortcut(UIMachineShortcuts::AboutShortcut)));
     434        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIMessageCenter", "&About VirtualBox...")), gMS->shortcut(UIMachineShortcuts::AboutShortcut)));
    430435        setStatusTip(QApplication::translate("UIMessageCenter", "Show a dialog with product information"));
    431436    }
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r39932 r40537  
    7070    UIActionInterface(QObject *pParent, UIActionType type);
    7171
     72    QString menuText(const QString &strText);
     73
    7274private:
    7375
  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

    r39580 r40537  
    3939    void retranslateUi()
    4040    {
    41         menu()->setTitle(QApplication::translate("UIActionPool", "&Machine"));
     41        menu()->setTitle(menuText(QApplication::translate("UIActionPool", "&Machine")));
    4242    }
    4343};
     
    5959    void retranslateUi()
    6060    {
    61         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Settings..."), gMS->shortcut(UIMachineShortcuts::SettingsDialogShortcut)));
     61        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Settings...")), gMS->shortcut(UIMachineShortcuts::SettingsDialogShortcut)));
    6262        setStatusTip(QApplication::translate("UIActionPool", "Manage the virtual machine settings"));
    6363    }
     
    8080    void retranslateUi()
    8181    {
    82         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Take Sn&apshot..."), gMS->shortcut(UIMachineShortcuts::TakeSnapshotShortcut)));
     82        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Take Sn&apshot...")), gMS->shortcut(UIMachineShortcuts::TakeSnapshotShortcut)));
    8383        setStatusTip(QApplication::translate("UIActionPool", "Take a snapshot of the virtual machine"));
    8484    }
     
    101101    void retranslateUi()
    102102    {
    103         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Take Screensh&ot..."), gMS->shortcut(UIMachineShortcuts::TakeScreenshotShortcut)));
     103        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Take Screensh&ot...")), gMS->shortcut(UIMachineShortcuts::TakeScreenshotShortcut)));
    104104        setStatusTip(QApplication::translate("UIActionPool", "Take a screenshot of the virtual machine"));
    105105    }
     
    122122    void retranslateUi()
    123123    {
    124         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Session I&nformation..."), gMS->shortcut(UIMachineShortcuts::InformationDialogShortcut)));
     124        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Session I&nformation...")), gMS->shortcut(UIMachineShortcuts::InformationDialogShortcut)));
    125125        setStatusTip(QApplication::translate("UIActionPool", "Show Session Information Dialog"));
    126126    }
     
    162162    void retranslateUi()
    163163    {
    164         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Disable &Mouse Integration"), gMS->shortcut(UIMachineShortcuts::MouseIntegrationShortcut)));
     164        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Disable &Mouse Integration")), gMS->shortcut(UIMachineShortcuts::MouseIntegrationShortcut)));
    165165        setStatusTip(QApplication::translate("UIActionPool", "Temporarily disable host mouse pointer integration"));
    166166    }
     
    183183    void retranslateUi()
    184184    {
    185         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Insert Ctrl-Alt-Del"), gMS->shortcut(UIMachineShortcuts::TypeCADShortcut)));
     185        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Insert Ctrl-Alt-Del")), gMS->shortcut(UIMachineShortcuts::TypeCADShortcut)));
    186186        setStatusTip(QApplication::translate("UIActionPool", "Send the Ctrl-Alt-Del sequence to the virtual machine"));
    187187    }
     
    205205    void retranslateUi()
    206206    {
    207         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Ins&ert Ctrl-Alt-Backspace"), gMS->shortcut(UIMachineShortcuts::TypeCABSShortcut)));
     207        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Ins&ert Ctrl-Alt-Backspace")), gMS->shortcut(UIMachineShortcuts::TypeCABSShortcut)));
    208208        setStatusTip(QApplication::translate("UIActionPool", "Send the Ctrl-Alt-Backspace sequence to the virtual machine"));
    209209    }
     
    227227    void retranslateUi()
    228228    {
    229         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Pause"), gMS->shortcut(UIMachineShortcuts::PauseShortcut)));
     229        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Pause")), gMS->shortcut(UIMachineShortcuts::PauseShortcut)));
    230230        setStatusTip(QApplication::translate("UIActionPool", "Suspend the execution of the virtual machine"));
    231231    }
     
    248248    void retranslateUi()
    249249    {
    250         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Reset"), gMS->shortcut(UIMachineShortcuts::ResetShortcut)));
     250        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Reset")), gMS->shortcut(UIMachineShortcuts::ResetShortcut)));
    251251        setStatusTip(QApplication::translate("UIActionPool", "Reset the virtual machine"));
    252252    }
     
    269269    void retranslateUi()
    270270    {
    271         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "ACPI Sh&utdown"), gMS->shortcut(UIMachineShortcuts::ShutdownShortcut)));
     271        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "ACPI Sh&utdown")), gMS->shortcut(UIMachineShortcuts::ShutdownShortcut)));
    272272        setStatusTip(QApplication::translate("UIActionPool", "Send the ACPI Power Button press event to the virtual machine"));
    273273    }
     
    291291    void retranslateUi()
    292292    {
    293         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Close..."), gMS->shortcut(UIMachineShortcuts::CloseShortcut)));
     293        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Close...")), gMS->shortcut(UIMachineShortcuts::CloseShortcut)));
    294294        setStatusTip(QApplication::translate("UIActionPool", "Close the virtual machine"));
    295295    }
     
    312312    void retranslateUi()
    313313    {
    314         menu()->setTitle(QApplication::translate("UIActionPool", "&View"));
     314        menu()->setTitle(menuText(QApplication::translate("UIActionPool", "&View")));
    315315    }
    316316};
     
    334334    void retranslateUi()
    335335    {
    336         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Switch to &Fullscreen"), gMS->shortcut(UIMachineShortcuts::FullscreenModeShortcut)));
     336        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Switch to &Fullscreen")), gMS->shortcut(UIMachineShortcuts::FullscreenModeShortcut)));
    337337        setStatusTip(QApplication::translate("UIActionPool", "Switch between normal and fullscreen mode"));
    338338    }
     
    357357    void retranslateUi()
    358358    {
    359         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Switch to Seam&less Mode"), gMS->shortcut(UIMachineShortcuts::SeamlessModeShortcut)));
     359        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Switch to Seam&less Mode")), gMS->shortcut(UIMachineShortcuts::SeamlessModeShortcut)));
    360360        setStatusTip(QApplication::translate("UIActionPool", "Switch between normal and seamless desktop integration mode"));
    361361    }
     
    380380    void retranslateUi()
    381381    {
    382         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Switch to &Scale Mode"), gMS->shortcut(UIMachineShortcuts::ScaleModeShortcut)));
     382        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Switch to &Scale Mode")), gMS->shortcut(UIMachineShortcuts::ScaleModeShortcut)));
    383383        setStatusTip(QApplication::translate("UIActionPool", "Switch between normal and scale mode"));
    384384    }
     
    403403    void retranslateUi()
    404404    {
    405         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Auto-resize &Guest Display"), gMS->shortcut(UIMachineShortcuts::GuestAutoresizeShortcut)));
     405        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Auto-resize &Guest Display")), gMS->shortcut(UIMachineShortcuts::GuestAutoresizeShortcut)));
    406406        setStatusTip(QApplication::translate("UIActionPool", "Automatically resize the guest display when the window is resized (requires Guest Additions)"));
    407407    }
     
    424424    void retranslateUi()
    425425    {
    426         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Adjust Window Size"), gMS->shortcut(UIMachineShortcuts::WindowAdjustShortcut)));
     426        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Adjust Window Size")), gMS->shortcut(UIMachineShortcuts::WindowAdjustShortcut)));
    427427        setStatusTip(QApplication::translate("UIActionPool", "Adjust window size and position to best fit the guest display"));
    428428    }
     
    445445    void retranslateUi()
    446446    {
    447         menu()->setTitle(QApplication::translate("UIActionPool", "&Devices"));
     447        menu()->setTitle(menuText(QApplication::translate("UIActionPool", "&Devices")));
    448448    }
    449449};
     
    466466    void retranslateUi()
    467467    {
    468         menu()->setTitle(QApplication::translate("UIActionPool", "&CD/DVD Devices"));
     468        menu()->setTitle(menuText(QApplication::translate("UIActionPool", "&CD/DVD Devices")));
    469469    }
    470470};
     
    487487    void retranslateUi()
    488488    {
    489         menu()->setTitle(QApplication::translate("UIActionPool", "&Floppy Devices"));
     489        menu()->setTitle(menuText(QApplication::translate("UIActionPool", "&Floppy Devices")));
    490490    }
    491491};
     
    508508    void retranslateUi()
    509509    {
    510         menu()->setTitle(QApplication::translate("UIActionPool", "&USB Devices"));
     510        menu()->setTitle(menuText(QApplication::translate("UIActionPool", "&USB Devices")));
    511511    }
    512512};
     
    545545    void retranslateUi()
    546546    {
    547         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Network Adapters..."), gMS->shortcut(UIMachineShortcuts::NetworkAdaptersDialogShortcut)));
     547        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Network Adapters...")), gMS->shortcut(UIMachineShortcuts::NetworkAdaptersDialogShortcut)));
    548548        setStatusTip(QApplication::translate("UIActionPool", "Change the settings of network adapters"));
    549549    }
     
    583583    void retranslateUi()
    584584    {
    585         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Shared Folders..."), gMS->shortcut(UIMachineShortcuts::SharedFoldersDialogShortcut)));
     585        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Shared Folders...")), gMS->shortcut(UIMachineShortcuts::SharedFoldersDialogShortcut)));
    586586        setStatusTip(QApplication::translate("UIActionPool", "Create or modify shared folders"));
    587587    }
     
    606606    void retranslateUi()
    607607    {
    608         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Enable R&emote Display"), gMS->shortcut(UIMachineShortcuts::VRDPServerShortcut)));
     608        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Enable R&emote Display")), gMS->shortcut(UIMachineShortcuts::VRDPServerShortcut)));
    609609        setStatusTip(QApplication::translate("UIActionPool", "Enable remote desktop (RDP) connections to this machine"));
    610610    }
     
    627627    void retranslateUi()
    628628    {
    629         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Install Guest Additions..."), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut)));
     629        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Install Guest Additions...")), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut)));
    630630        setStatusTip(QApplication::translate("UIActionPool", "Mount the Guest Additions installation image"));
    631631    }
     
    649649    void retranslateUi()
    650650    {
    651         menu()->setTitle(QApplication::translate("UIActionPool", "De&bug"));
     651        menu()->setTitle(menuText(QApplication::translate("UIActionPool", "De&bug")));
    652652    }
    653653};
     
    669669    void retranslateUi()
    670670    {
    671         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Statistics...", "debug action"), gMS->shortcut(UIMachineShortcuts::StatisticWindowShortcut)));
     671        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Statistics...", "debug action")), gMS->shortcut(UIMachineShortcuts::StatisticWindowShortcut)));
    672672    }
    673673};
     
    689689    void retranslateUi()
    690690    {
    691         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "&Command Line...", "debug action"), gMS->shortcut(UIMachineShortcuts::CommandLineWindowShortcut)));
     691        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Command Line...", "debug action")), gMS->shortcut(UIMachineShortcuts::CommandLineWindowShortcut)));
    692692    }
    693693};
     
    709709    void retranslateUi()
    710710    {
    711         setText(vboxGlobal().insertKeyToActionText(QApplication::translate("UIActionPool", "Enable &Logging...", "debug action"), gMS->shortcut(UIMachineShortcuts::LoggingShortcut)));
     711        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "Enable &Logging...", "debug action")), gMS->shortcut(UIMachineShortcuts::LoggingShortcut)));
    712712    }
    713713};
Note: See TracChangeset for help on using the changeset viewer.

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