VirtualBox

Changeset 73882 in vbox for trunk


Ignore:
Timestamp:
Aug 24, 2018 4:56:38 PM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: UIActionPool: A bit of renames.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r73860 r73882  
    12061206    virtual void retranslateUi() /* override */
    12071207    {
    1208         setName(QApplication::translate("UIActionPool", "&Log Viewer"));
     1208        setName(QApplication::translate("UIActionPool", "&Log"));
    12091209        setStatusTip(QApplication::translate("UIActionPool", "Open the log menu"));
    12101210    }
    … …  
    16301630
    16311631    /* Create 'Log Viewer' actions: */
    1632     m_pool[UIActionIndex_M_LogViewerWindow] = new UIActionMenuSelectorLog(this);
    1633     m_pool[UIActionIndex_M_LogViewer] = new UIActionMenuSelectorLog(this);
    1634     m_pool[UIActionIndex_M_LogViewer_T_Find] = new UIActionMenuSelectorLogTogglePaneFind(this);
    1635     m_pool[UIActionIndex_M_LogViewer_T_Filter] = new UIActionMenuSelectorLogTogglePaneFilter(this);
    1636     m_pool[UIActionIndex_M_LogViewer_T_Bookmark] = new UIActionMenuSelectorLogTogglePaneBookmark(this);
    1637     m_pool[UIActionIndex_M_LogViewer_T_Settings] = new UIActionMenuSelectorLogTogglePaneSettings(this);
    1638     m_pool[UIActionIndex_M_LogViewer_S_Refresh] = new UIActionMenuSelectorLogPerformRefresh(this);
    1639     m_pool[UIActionIndex_M_LogViewer_S_Save] = new UIActionMenuSelectorLogPerformSave(this);
     1632    m_pool[UIActionIndex_M_LogWindow] = new UIActionMenuSelectorLog(this);
     1633    m_pool[UIActionIndex_M_Log] = new UIActionMenuSelectorLog(this);
     1634    m_pool[UIActionIndex_M_Log_T_Find] = new UIActionMenuSelectorLogTogglePaneFind(this);
     1635    m_pool[UIActionIndex_M_Log_T_Filter] = new UIActionMenuSelectorLogTogglePaneFilter(this);
     1636    m_pool[UIActionIndex_M_Log_T_Bookmark] = new UIActionMenuSelectorLogTogglePaneBookmark(this);
     1637    m_pool[UIActionIndex_M_Log_T_Settings] = new UIActionMenuSelectorLogTogglePaneSettings(this);
     1638    m_pool[UIActionIndex_M_Log_S_Refresh] = new UIActionMenuSelectorLogPerformRefresh(this);
     1639    m_pool[UIActionIndex_M_Log_S_Save] = new UIActionMenuSelectorLogPerformSave(this);
    16401640
    16411641    /* Prepare update-handlers for known menus: */
    … …  
    16451645#endif
    16461646    m_menuUpdateHandlers[UIActionIndex_Menu_Help].ptf = &UIActionPool::updateMenuHelp;
    1647     m_menuUpdateHandlers[UIActionIndex_M_LogViewerWindow].ptf = &UIActionPool::updateMenuLogViewerWindow;
    1648     m_menuUpdateHandlers[UIActionIndex_M_LogViewer].ptf = &UIActionPool::updateMenuLogViewer;
     1647    m_menuUpdateHandlers[UIActionIndex_M_LogWindow].ptf = &UIActionPool::updateMenuLogViewerWindow;
     1648    m_menuUpdateHandlers[UIActionIndex_M_Log].ptf = &UIActionPool::updateMenuLogViewer;
    16491649
    16501650    /* Invalidate all known menus: */
    … …  
    18861886{
    18871887    /* Update corresponding menu: */
    1888     updateMenuLogViewerWrapper(action(UIActionIndex_M_LogViewerWindow)->menu());
     1888    updateMenuLogViewerWrapper(action(UIActionIndex_M_LogWindow)->menu());
    18891889
    18901890    /* Mark menu as valid: */
    1891     m_invalidations.remove(UIActionIndex_M_LogViewerWindow);
     1891    m_invalidations.remove(UIActionIndex_M_LogWindow);
    18921892}
    18931893
    … …  
    18951895{
    18961896    /* Update corresponding menu: */
    1897     updateMenuLogViewerWrapper(action(UIActionIndex_M_LogViewer)->menu());
     1897    updateMenuLogViewerWrapper(action(UIActionIndex_M_Log)->menu());
    18981898
    18991899    /* Mark menu as valid: */
    1900     m_invalidations.remove(UIActionIndex_M_LogViewer);
     1900    m_invalidations.remove(UIActionIndex_M_Log);
    19011901}
    19021902
    … …  
    19101910
    19111911    /* 'Save' action: */
    1912     fSeparator = addAction(pMenu, action(UIActionIndex_M_LogViewer_S_Save)) || fSeparator;
     1912    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_S_Save)) || fSeparator;
    19131913
    19141914    /* Separator? */
    … …  
    19201920
    19211921    /* 'Find' action: */
    1922     fSeparator = addAction(pMenu, action(UIActionIndex_M_LogViewer_T_Find)) || fSeparator;
     1922    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_T_Find)) || fSeparator;
    19231923    /* 'Filter' action: */
    1924     fSeparator = addAction(pMenu, action(UIActionIndex_M_LogViewer_T_Filter)) || fSeparator;
     1924    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_T_Filter)) || fSeparator;
    19251925    /* 'Bookmarks' action: */
    1926     fSeparator = addAction(pMenu, action(UIActionIndex_M_LogViewer_T_Bookmark)) || fSeparator;
     1926    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_T_Bookmark)) || fSeparator;
    19271927    /* 'Settings' action: */
    1928     fSeparator = addAction(pMenu, action(UIActionIndex_M_LogViewer_T_Settings)) || fSeparator;
     1928    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_T_Settings)) || fSeparator;
    19291929
    19301930    /* Separator? */
    … …  
    19361936
    19371937    /* 'Refresh' action: */
    1938     fSeparator = addAction(pMenu, action(UIActionIndex_M_LogViewer_S_Refresh)) || fSeparator;;
     1938    fSeparator = addAction(pMenu, action(UIActionIndex_M_Log_S_Refresh)) || fSeparator;;
    19391939}
    19401940

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r73859 r73882  
    8888#endif
    8989
    90     /* 'Log Viewer' menu actions: */
    91     UIActionIndex_M_LogViewerWindow,
    92     UIActionIndex_M_LogViewer,
    93     UIActionIndex_M_LogViewer_T_Find,
    94     UIActionIndex_M_LogViewer_T_Filter,
    95     UIActionIndex_M_LogViewer_T_Bookmark,
    96     UIActionIndex_M_LogViewer_T_Settings,
    97     UIActionIndex_M_LogViewer_S_Refresh,
    98     UIActionIndex_M_LogViewer_S_Save,
     90    /* 'Log' menu actions: */
     91    UIActionIndex_M_LogWindow,
     92    UIActionIndex_M_Log,
     93    UIActionIndex_M_Log_T_Find,
     94    UIActionIndex_M_Log_T_Filter,
     95    UIActionIndex_M_Log_T_Bookmark,
     96    UIActionIndex_M_Log_T_Settings,
     97    UIActionIndex_M_Log_S_Refresh,
     98    UIActionIndex_M_Log_S_Save,
    9999
    100100    /* Maximum index: */

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

    r73783 r73882  
    112112QMenu *UIVMLogViewerWidget::menu() const
    113113{
    114     return m_pActionPool->action(UIActionIndex_M_LogViewerWindow)->menu();
     114    return m_pActionPool->action(UIActionIndex_M_LogWindow)->menu();
    115115}
    116116
    … …  
    190190
    191191    /* Enable/Disable toolbar actions (except Refresh) & tab widget according log presence: */
    192     m_pActionPool->action(UIActionIndex_M_LogViewer_T_Find)->setEnabled(!noLogsToShow);
    193     m_pActionPool->action(UIActionIndex_M_LogViewer_T_Filter)->setEnabled(!noLogsToShow);
    194     m_pActionPool->action(UIActionIndex_M_LogViewer_S_Save)->setEnabled(!noLogsToShow);
    195     m_pActionPool->action(UIActionIndex_M_LogViewer_T_Bookmark)->setEnabled(!noLogsToShow);
    196     m_pActionPool->action(UIActionIndex_M_LogViewer_T_Settings)->setEnabled(!noLogsToShow);
     192    m_pActionPool->action(UIActionIndex_M_Log_T_Find)->setEnabled(!noLogsToShow);
     193    m_pActionPool->action(UIActionIndex_M_Log_T_Filter)->setEnabled(!noLogsToShow);
     194    m_pActionPool->action(UIActionIndex_M_Log_S_Save)->setEnabled(!noLogsToShow);
     195    m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark)->setEnabled(!noLogsToShow);
     196    m_pActionPool->action(UIActionIndex_M_Log_T_Settings)->setEnabled(!noLogsToShow);
    197197
    198198    m_pTabWidget->show();
    … …  
    437437{
    438438    /* Connect actions: */
    439     connect(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Find), &QAction::toggled,
     439    connect(m_pActionPool->action(UIActionIndex_M_Log_T_Find), &QAction::toggled,
    440440            this, &UIVMLogViewerWidget::sltPanelActionToggled);
    441     connect(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Filter), &QAction::toggled,
     441    connect(m_pActionPool->action(UIActionIndex_M_Log_T_Filter), &QAction::toggled,
    442442            this, &UIVMLogViewerWidget::sltPanelActionToggled);
    443     connect(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Bookmark), &QAction::toggled,
     443    connect(m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark), &QAction::toggled,
    444444            this, &UIVMLogViewerWidget::sltPanelActionToggled);
    445     connect(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Settings), &QAction::toggled,
     445    connect(m_pActionPool->action(UIActionIndex_M_Log_T_Settings), &QAction::toggled,
    446446            this, &UIVMLogViewerWidget::sltPanelActionToggled);
    447     connect(m_pActionPool->action(UIActionIndex_M_LogViewer_S_Refresh), &QAction::triggered,
     447    connect(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh), &QAction::triggered,
    448448            this, &UIVMLogViewerWidget::sltRefresh);
    449     connect(m_pActionPool->action(UIActionIndex_M_LogViewer_S_Save), &QAction::triggered,
     449    connect(m_pActionPool->action(UIActionIndex_M_Log_S_Save), &QAction::triggered,
    450450            this, &UIVMLogViewerWidget::sltSave);
    451451}
    … …  
    486486            connect(m_pSearchPanel, &UIVMLogViewerSearchPanel::sigHighlightingUpdated,
    487487                    this, &UIVMLogViewerWidget::sltSearchResultHighLigting);
    488             m_panelActionMap.insert(m_pSearchPanel, m_pActionPool->action(UIActionIndex_M_LogViewer_T_Find));
     488            m_panelActionMap.insert(m_pSearchPanel, m_pActionPool->action(UIActionIndex_M_Log_T_Find));
    489489
    490490            /* Add into layout: */
    … …  
    501501            connect(m_pFilterPanel, &UIVMLogViewerFilterPanel::sigFilterApplied,
    502502                    this, &UIVMLogViewerWidget::sltFilterApplied);
    503             m_panelActionMap.insert(m_pFilterPanel, m_pActionPool->action(UIActionIndex_M_LogViewer_T_Filter));
     503            m_panelActionMap.insert(m_pFilterPanel, m_pActionPool->action(UIActionIndex_M_Log_T_Filter));
    504504
    505505            /* Add into layout: */
    … …  
    519519            connect(m_pBookmarksPanel, &UIVMLogViewerBookmarksPanel::sigBookmarkSelected,
    520520                    this, &UIVMLogViewerWidget::gotoBookmark);
    521             m_panelActionMap.insert(m_pBookmarksPanel, m_pActionPool->action(UIActionIndex_M_LogViewer_T_Bookmark));
     521            m_panelActionMap.insert(m_pBookmarksPanel, m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark));
    522522
    523523            /* Add into layout: */
    … …  
    539539            connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigChangeFont, this, &UIVMLogViewerWidget::sltChangeFont);
    540540            connect(m_pSettingsPanel, &UIVMLogViewerSettingsPanel::sigResetToDefaults, this, &UIVMLogViewerWidget::sltResetSettingsToDefault);
    541             m_panelActionMap.insert(m_pSettingsPanel, m_pActionPool->action(UIActionIndex_M_LogViewer_T_Settings));
     541            m_panelActionMap.insert(m_pSettingsPanel, m_pActionPool->action(UIActionIndex_M_Log_T_Settings));
    542542
    543543            /* Add into layout: */
    … …  
    559559
    560560        /* Add toolbar actions: */
    561         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_LogViewer_S_Save));
     561        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Save));
    562562        m_pToolBar->addSeparator();
    563         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Find));
    564         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Filter));
    565         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Bookmark));
    566         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_LogViewer_T_Settings));
     563        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Find));
     564        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Filter));
     565        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Bookmark));
     566        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_T_Settings));
    567567        m_pToolBar->addSeparator();
    568         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_LogViewer_S_Refresh));
     568        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_Log_S_Refresh));
    569569
    570570#ifdef VBOX_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r73780 r73882  
    12361236
    12371237    /* Prepare 'Log Viewer' menu: */
    1238     prepareMenuLogViewer(actionPool()->action(UIActionIndex_M_LogViewer)->menu());
    1239     m_pLogViewerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndex_M_LogViewer)->menu());
     1238    prepareMenuLogViewer(actionPool()->action(UIActionIndex_M_Log)->menu());
     1239    m_pLogViewerMenuAction = menuBar()->addMenu(actionPool()->action(UIActionIndex_M_Log)->menu());
    12401240
    12411241    /* Prepare 'Medium' menu: */
    … …  
    16641664
    16651665    /* Remember action list: */
    1666     m_logViewerActions << actionPool()->action(UIActionIndex_M_LogViewer_T_Find)
    1667                        << actionPool()->action(UIActionIndex_M_LogViewer_T_Filter)
    1668                        << actionPool()->action(UIActionIndex_M_LogViewer_T_Bookmark)
    1669                        << actionPool()->action(UIActionIndex_M_LogViewer_T_Settings)
    1670                        << actionPool()->action(UIActionIndex_M_LogViewer_S_Refresh)
    1671                        << actionPool()->action(UIActionIndex_M_LogViewer_S_Save);
     1666    m_logViewerActions << actionPool()->action(UIActionIndex_M_Log_T_Find)
     1667                       << actionPool()->action(UIActionIndex_M_Log_T_Filter)
     1668                       << actionPool()->action(UIActionIndex_M_Log_T_Bookmark)
     1669                       << actionPool()->action(UIActionIndex_M_Log_T_Settings)
     1670                       << actionPool()->action(UIActionIndex_M_Log_S_Refresh)
     1671                       << actionPool()->action(UIActionIndex_M_Log_S_Save);
    16721672}
    16731673

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r73846 r73882  
    659659    if (isToolOpened(ToolTypeMachine_LogViewer))
    660660    {
    661         m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_S_Save));
    662         m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Find));
    663         m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Filter));
    664         m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Bookmark));
    665         m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_T_Settings));
    666         m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_LogViewer_S_Refresh));
     661        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_S_Save));
     662        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Find));
     663        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Filter));
     664        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Bookmark));
     665        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_T_Settings));
     666        m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_S_Refresh));
    667667    }
    668668
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