Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp (revision 71524) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp (revision 71525) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2011-2017 Oracle Corporation + * Copyright (C) 2011-2018 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -21,7 +21,8 @@ /* GUI includes: */ -# include "UIShortcutPool.h" +# include "VBoxGlobal.h" # include "UIActionPool.h" # include "UIExtraDataManager.h" +# include "UIShortcutPool.h" #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ @@ -32,4 +33,8 @@ +/********************************************************************************************************************************* +* Class UIShortcut implementation. * +*********************************************************************************************************************************/ + void UIShortcut::setDescription(const QString &strDescription) { @@ -37,5 +42,5 @@ } -const QString& UIShortcut::description() const +const QString &UIShortcut::description() const { return m_strDescription; @@ -47,5 +52,5 @@ } -const QKeySequence& UIShortcut::sequence() const +const QKeySequence &UIShortcut::sequence() const { return m_sequence; @@ -57,5 +62,5 @@ } -const QKeySequence& UIShortcut::defaultSequence() const +const QKeySequence &UIShortcut::defaultSequence() const { return m_defaultSequence; @@ -67,18 +72,18 @@ } -UIShortcutPool* UIShortcutPool::m_pInstance = 0; - -const QString UIShortcutPool::m_sstrShortcutKeyTemplate = QString("%1/%2"); -const QString UIShortcutPool::m_sstrShortcutKeyTemplateRuntime = m_sstrShortcutKeyTemplate.arg(GUI_Input_MachineShortcuts); - -UIShortcutPool* UIShortcutPool::instance() -{ - return m_pInstance; -} + +/********************************************************************************************************************************* +* Class UIShortcutPool implementation. * +*********************************************************************************************************************************/ + +/* static */ +UIShortcutPool *UIShortcutPool::s_pInstance = 0; +const QString UIShortcutPool::s_strShortcutKeyTemplate = QString("%1/%2"); +const QString UIShortcutPool::s_strShortcutKeyTemplateRuntime = s_strShortcutKeyTemplate.arg(GUI_Input_MachineShortcuts); void UIShortcutPool::create() { /* Check that instance do NOT exists: */ - if (m_pInstance) + if (s_pInstance) return; @@ -87,5 +92,5 @@ /* Prepare instance: */ - m_pInstance->prepare(); + s_pInstance->prepare(); } @@ -93,19 +98,19 @@ { /* Check that instance exists: */ - if (!m_pInstance) + if (!s_pInstance) return; /* Cleanup instance: */ - m_pInstance->cleanup(); + s_pInstance->cleanup(); /* Delete instance: */ - delete m_pInstance; -} - -UIShortcut& UIShortcutPool::shortcut(UIActionPool *pActionPool, UIAction *pAction) + delete s_pInstance; +} + +UIShortcut &UIShortcutPool::shortcut(UIActionPool *pActionPool, UIAction *pAction) { /* Compose shortcut key: */ - const QString strShortcutKey(m_sstrShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(), - pAction->shortcutExtraDataID())); + const QString strShortcutKey(s_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(), + pAction->shortcutExtraDataID())); /* Return existing if any: */ if (m_shortcuts.contains(strShortcutKey)) @@ -119,8 +124,8 @@ } -UIShortcut& UIShortcutPool::shortcut(const QString &strPoolID, const QString &strActionID) +UIShortcut &UIShortcutPool::shortcut(const QString &strPoolID, const QString &strActionID) { /* Return if present, autocreate if necessary: */ - return shortcut(m_sstrShortcutKeyTemplate.arg(strPoolID, strActionID)); + return shortcut(s_strShortcutKeyTemplate.arg(strPoolID, strActionID)); } @@ -151,6 +156,6 @@ /* Compose shortcut key: */ - const QString strShortcutKey = m_sstrShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(), - pAction->shortcutExtraDataID()); + const QString strShortcutKey = s_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(), + pAction->shortcutExtraDataID()); /* If shortcut key is already known: */ if (m_shortcuts.contains(strShortcutKey)) @@ -180,4 +185,11 @@ } +void UIShortcutPool::retranslateUi() +{ + /* Translate own defaults: */ + m_shortcuts[s_strShortcutKeyTemplateRuntime.arg("PopupMenu")] + .setDescription(QApplication::translate("UIActionPool", "Popup Menu")); +} + void UIShortcutPool::sltReloadSelectorShortcuts() { @@ -217,6 +229,6 @@ { /* Prepare instance: */ - if (!m_pInstance) - m_pInstance = this; + if (!s_pInstance) + s_pInstance = this; } @@ -224,6 +236,6 @@ { /* Cleanup instance: */ - if (m_pInstance == this) - m_pInstance = 0; + if (s_pInstance == this) + s_pInstance = 0; } @@ -247,11 +259,4 @@ } -void UIShortcutPool::retranslateUi() -{ - /* Translate own defaults: */ - m_shortcuts[m_sstrShortcutKeyTemplateRuntime.arg("PopupMenu")] - .setDescription(QApplication::translate("UIActionPool", "Popup Menu")); -} - void UIShortcutPool::loadDefaults() { @@ -273,5 +278,5 @@ { /* Default shortcut for the Runtime Popup Menu: */ - m_shortcuts.insert(m_sstrShortcutKeyTemplateRuntime.arg("PopupMenu"), + m_shortcuts.insert(s_strShortcutKeyTemplateRuntime.arg("PopupMenu"), UIShortcut(QApplication::translate("UIActionPool", "Popup Menu"), QString("Home"), QString("Home"))); @@ -290,5 +295,5 @@ { /* Compose shortcut key template: */ - const QString strShortcutKeyTemplate(m_sstrShortcutKeyTemplate.arg(strPoolExtraDataID)); + const QString strShortcutKeyTemplate(s_strShortcutKeyTemplate.arg(strPoolExtraDataID)); /* Iterate over all the overrides: */ const QStringList overrides = gEDataManager->shortcutOverrides(strPoolExtraDataID); @@ -342,5 +347,5 @@ { /* Compose shortcut prefix: */ - const QString strShortcutPrefix(m_sstrShortcutKeyTemplate.arg(strPoolExtraDataID, QString())); + const QString strShortcutPrefix(s_strShortcutKeyTemplate.arg(strPoolExtraDataID, QString())); /* Populate the list of all the known overrides: */ QStringList overrides; @@ -364,5 +369,5 @@ } -UIShortcut& UIShortcutPool::shortcut(const QString &strShortcutKey) +UIShortcut &UIShortcutPool::shortcut(const QString &strShortcutKey) { return m_shortcuts[strShortcutKey]; Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h (revision 71524) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h (revision 71525) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2011-2017 Oracle Corporation + * Copyright (C) 2011-2018 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -16,6 +16,6 @@ */ -#ifndef __UIShortcutPool_h__ -#define __UIShortcutPool_h__ +#ifndef ___UIShortcutPool_h___ +#define ___UIShortcutPool_h___ /* Qt includes: */ @@ -23,17 +23,19 @@ /* GUI includes: */ -#include "VBoxGlobal.h" #include "QIWithRetranslateUI.h" /* Forward declarations: */ +class QKeySequence; +class QString; class UIActionPool; class UIAction; -/* Shortcut descriptor: */ + +/** Shortcut descriptor prototype. */ class UIShortcut { public: - /* Constructors: */ + /** Constructs empty shortcut descriptor. */ UIShortcut() : m_strDescription(QString()) @@ -41,4 +43,8 @@ , m_defaultSequence(QKeySequence()) {} + /** Constructs shortcut descriptor. + * @param strDescription Brings the shortcut description. + * @param sequence Brings the shortcut sequence. + * @param defaultSequence Brings the default shortcut sequence. */ UIShortcut(const QString &strDescription, const QKeySequence &sequence, @@ -49,28 +55,34 @@ {} - /* API: Description stuff: */ + /** Defines the shortcut @a strDescription. */ void setDescription(const QString &strDescription); - const QString& description() const; + /** Returns the shortcut description. */ + const QString &description() const; - /* API: Sequence stuff: */ + /** Defines the shortcut @a sequence. */ void setSequence(const QKeySequence &sequence); - const QKeySequence& sequence() const; + /** Returns the shortcut sequence. */ + const QKeySequence &sequence() const; - /* API: Default sequence stuff: */ - void setDefaultSequence(const QKeySequence &defaultSequence); - const QKeySequence& defaultSequence() const; + /** Defines the default shortcut @a sequence. */ + void setDefaultSequence(const QKeySequence &sequence); + /** Returns the default shortcut sequence. */ + const QKeySequence &defaultSequence() const; - /* API: Conversion stuff: */ + /** Converts shortcut sequence to string. */ QString toString() const; private: - /* Variables: */ - QString m_strDescription; + /** Holds the shortcut description. */ + QString m_strDescription; + /** Holds the shortcut sequence. */ QKeySequence m_sequence; + /** Holds the default shortcut sequence. */ QKeySequence m_defaultSequence; }; -/* Singleton shortcut pool: */ + +/** QObject extension used as shortcut pool singleton. */ class UIShortcutPool : public QIWithRetranslateUI3 { @@ -79,68 +91,88 @@ signals: - /* Notifiers: Extra-data stuff: */ + /** Notifies about Selector UI shortcuts changed. */ void sigSelectorShortcutsReloaded(); + /** Notifies about Runtime UI shortcuts changed. */ void sigMachineShortcutsReloaded(); public: - /* API: Singleton stuff: */ - static UIShortcutPool* instance(); + /** Returns singleton instance. */ + static UIShortcutPool *instance() { return s_pInstance; } + /** Creates singleton instance. */ static void create(); + /** Destroys singleton instance. */ static void destroy(); - /* API: Shortcut stuff: */ - UIShortcut& shortcut(UIActionPool *pActionPool, UIAction *pAction); - UIShortcut& shortcut(const QString &strPoolID, const QString &strActionID); - const QMap& shortcuts() const { return m_shortcuts; } + /** Returns shortcuts of particular @a pActionPool for specified @a pAction. */ + UIShortcut &shortcut(UIActionPool *pActionPool, UIAction *pAction); + /** Returns shortcuts of action-pool with @a strPoolID for action with @a strActionID. */ + UIShortcut &shortcut(const QString &strPoolID, const QString &strActionID); + /** Returns all the shortcuts. */ + const QMap &shortcuts() const { return m_shortcuts; } + /** Defines shortcut overrides. */ void setOverrides(const QMap &overrides); - /* API: Action-pool stuff: */ + /** Applies shortcuts for specified @a pActionPool. */ void applyShortcuts(UIActionPool *pActionPool); + +protected: + + /** Handles translation event. */ + virtual void retranslateUi() /* override */; private slots: - /* Handlers: Extra-data stuff: */ + /** Reloads Selector UI shortcuts. */ void sltReloadSelectorShortcuts(); + /** Reloads Runtime UI shortcuts. */ void sltReloadMachineShortcuts(); private: - /* Constructor/destructor: */ + /** Constructs shortcut pool. */ UIShortcutPool(); + /** Destructs shortcut pool. */ ~UIShortcutPool(); - /* Helpers: Prepare stuff: */ + /** Prepares all. */ void prepare(); + /** Prepares connections. */ void prepareConnections(); - /* Helper: Cleanup stuff: */ + /** Cleanups all. */ void cleanup() {} - /** Translation handler. */ - void retranslateUi(); - - /* Helpers: Shortcuts stuff: */ + /** Loads defaults. */ void loadDefaults(); + /** Loads defaults for pool with specified @a strPoolExtraDataID. */ void loadDefaultsFor(const QString &strPoolExtraDataID); + /** Loads overrides. */ void loadOverrides(); + /** Loads overrides for pool with specified @a strPoolExtraDataID. */ void loadOverridesFor(const QString &strPoolExtraDataID); + /** Saves overrides. */ void saveOverrides(); + /** Saves overrides for pool with specified @a strPoolExtraDataID. */ void saveOverridesFor(const QString &strPoolExtraDataID); - /* Helper: Shortcut stuff: */ - UIShortcut& shortcut(const QString &strShortcutKey); + /** Returns shortcut with specified @a strShortcutKey. */ + UIShortcut &shortcut(const QString &strShortcutKey); - /* Variables: */ - static UIShortcutPool *m_pInstance; + /** Holds the singleton instance. */ + static UIShortcutPool *s_pInstance; /** Shortcut key template. */ - static const QString m_sstrShortcutKeyTemplate; + static const QString s_strShortcutKeyTemplate; /** Shortcut key template for Runtime UI. */ - static const QString m_sstrShortcutKeyTemplateRuntime; + static const QString s_strShortcutKeyTemplateRuntime; + + /** Holds the pool shortcuts. */ QMap m_shortcuts; }; +/** Singleton Shortcut Pool 'official' name. */ #define gShortcutPool UIShortcutPool::instance() -#endif /* __UIShortcutPool_h__ */ +#endif /* !___UIShortcutPool_h___ */ + Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp (revision 71524) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp (revision 71525) @@ -30,4 +30,5 @@ # include "QITableView.h" # include "QIWidgetValidator.h" +# include "VBoxGlobal.h" # include "UIActionPool.h" # include "UIGlobalSettingsInput.h" @@ -898,6 +899,6 @@ AssertPtr(pParent); oldInputData.shortcuts() << UIDataShortcutRow(pParent, strShortcutKey, VBoxGlobal::removeAccelMark(shortcut.description()), - shortcut.sequence().toString(QKeySequence::NativeText), - shortcut.defaultSequence().toString(QKeySequence::NativeText)); + shortcut.sequence().toString(QKeySequence::NativeText), + shortcut.defaultSequence().toString(QKeySequence::NativeText)); } oldInputData.setAutoCapture(gEDataManager->autoCaptureEnabled());