VirtualBox

Changeset 100888 in vbox


Ignore:
Timestamp:
Aug 16, 2023 6:09:23 PM (14 months ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10496, bugref:6699. Some refactoring.

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

Legend:

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

    r100611 r100888  
    16411641};
    16421642
    1643 /** Toggle action extension, used to toggle 'File Manager Options' panel in file manager. */
    1644 class UIActionMenuFileManagerOptions : public UIActionToggle
    1645 {
    1646     Q_OBJECT;
    1647 
    1648 public:
    1649 
    1650     /** Constructs action passing @a pParent to the base-class. */
    1651     UIActionMenuFileManagerOptions(UIActionPool *pParent)
     1643/** Toggle action extension, used to toggle 'File Manager Preferences' panel in file manager. */
     1644class UIActionMenuFileManagerPreferences : public UIActionToggle
     1645{
     1646    Q_OBJECT;
     1647
     1648public:
     1649
     1650    /** Constructs action passing @a pParent to the base-class. */
     1651    UIActionMenuFileManagerPreferences(UIActionPool *pParent)
    16521652        : UIActionToggle(pParent)
    16531653    {
     
    16741674    virtual void retranslateUi() RT_OVERRIDE
    16751675    {
    1676         setName(QApplication::translate("UIActionPool", "Options"));
     1676        setName(QApplication::translate("UIActionPool", "Preferences"));
    16771677        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
    1678         setStatusTip(QApplication::translate("UIActionPool", "Open panel with file manager options"));
    1679         setToolTip(  QApplication::translate("UIActionPool", "Open Options Pane")
     1678        setStatusTip(QApplication::translate("UIActionPool", "Open panel with file manager preferences"));
     1679        setToolTip(  QApplication::translate("UIActionPool", "Open Preferences Pane")
    16801680                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
    16811681    }
     
    35213521    m_pool[UIActionIndex_M_FileManager_S_CopyToGuest] = new  UIActionMenuFileManagerCopyToGuest(this);
    35223522    m_pool[UIActionIndex_M_FileManager_S_CopyToHost] = new  UIActionMenuFileManagerCopyToHost(this);
    3523     m_pool[UIActionIndex_M_FileManager_T_Options] = new UIActionMenuFileManagerOptions(this);
     3523    m_pool[UIActionIndex_M_FileManager_T_Preferences] = new UIActionMenuFileManagerPreferences(this);
    35243524    m_pool[UIActionIndex_M_FileManager_T_Log] = new UIActionMenuFileManagerLog(this);
    35253525    m_pool[UIActionIndex_M_FileManager_T_Operations] = new UIActionMenuFileManagerOperations(this);
     
    40024002void UIActionPool::updateMenuFileManagerWrapper(UIMenu *pMenu)
    40034003{
    4004     addAction(pMenu, action(UIActionIndex_M_FileManager_T_Options));
     4004    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Preferences));
    40054005    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Operations));
    40064006    addAction(pMenu, action(UIActionIndex_M_FileManager_T_Log));
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r100548 r100888  
    120120    UIActionIndex_M_FileManager_S_CopyToGuest,
    121121    UIActionIndex_M_FileManager_S_CopyToHost,
    122     UIActionIndex_M_FileManager_T_Options,
     122    UIActionIndex_M_FileManager_T_Preferences,
    123123    UIActionIndex_M_FileManager_T_Log,
    124124    UIActionIndex_M_FileManager_T_Operations,
  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

    r100887 r100888  
    298298    if (m_pActionPool)
    299299    {
    300         if (m_pActionPool->action(UIActionIndex_M_FileManager_T_Options))
    301             connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options), &QAction::toggled,
     300        if (m_pActionPool->action(UIActionIndex_M_FileManager_T_Preferences))
     301            connect(m_pActionPool->action(UIActionIndex_M_FileManager_T_Preferences), &QAction::toggled,
    302302                    this, &UIFileManager::sltPanelActionToggled);
    303303        if (m_pActionPool->action(UIActionIndex_M_FileManager_T_Log))
     
    361361        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
    362362
    363         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
     363        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Preferences));
    364364        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
    365365        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log));
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r100698 r100888  
    10031003                case UIToolType_FileManager:
    10041004                {
    1005                     m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Options));
     1005                    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Preferences));
    10061006                    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Operations));
    10071007                    m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_T_Log));
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