VirtualBox

Changeset 75311 in vbox


Ignore:
Timestamp:
Nov 7, 2018 3:08:20 PM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:6699: A bit of fixes for action-pool stuff.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

    r75309 r75311  
    244244        <file alias="file_manager_session_16px.png">images/file_manager_session_16px.png</file>
    245245        <file alias="file_manager_session_32px.png">images/file_manager_session_32px.png</file>
    246         <file alias="file_manager_session_disable_32px.png">images/file_manager_session_disable_32px.png</file>
     246        <file alias="file_manager_session_disabled_32px.png">images/file_manager_session_disabled_32px.png</file>
    247247        <file alias="file_manager_session_disabled_16px.png">images/file_manager_session_disabled_16px.png</file>
    248248        <file alias="file_manager_settings_16px.png">images/file_manager_settings_16px.png</file>

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

    r75309 r75311  
    12211221    /** Constructs action passing @a pParent to the base-class. */
    12221222    UIActionMenuSelectorLogTogglePaneFind(UIActionPool *pParent)
    1223         : UIActionToggle(pParent,
    1224                          ":/log_viewer_find_32px.png", ":/log_viewer_find_disabled_32px.png")
     1223        : UIActionToggle(pParent)
    12251224    {
    12261225        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1226        setIcon(UIIconPool::iconSetFull(":/log_viewer_find_32px.png",          ":/log_viewer_find_16px.png",
     1227                                        ":/log_viewer_find_disabled_32px.png", ":/log_viewer_find_disabled_16px.png"));
    12271228    }
    12281229
    … …  
    12601261    /** Constructs action passing @a pParent to the base-class. */
    12611262    UIActionMenuSelectorLogTogglePaneFilter(UIActionPool *pParent)
    1262         : UIActionToggle(pParent,
    1263                          ":/log_viewer_filter_32px.png", ":/log_viewer_filter_disabled_32px.png")
     1263        : UIActionToggle(pParent)
    12641264    {
    12651265        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1266        setIcon(UIIconPool::iconSetFull(":/log_viewer_filter_32px.png",          ":/log_viewer_filter_16px.png",
     1267                                        ":/log_viewer_filter_disabled_32px.png", ":/log_viewer_filter_disabled_16px.png"));
    12661268    }
    12671269
    … …  
    12991301    /** Constructs action passing @a pParent to the base-class. */
    13001302    UIActionMenuSelectorLogTogglePaneBookmark(UIActionPool *pParent)
    1301         : UIActionToggle(pParent,
    1302                          ":/log_viewer_bookmark_32px.png", ":/log_viewer_bookmark_disabled_32px.png")
     1303        : UIActionToggle(pParent)
    13031304    {
    13041305        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1306        setIcon(UIIconPool::iconSetFull(":/log_viewer_bookmark_32px.png",          ":/log_viewer_bookmark_16px.png",
     1307                                        ":/log_viewer_bookmark_disabled_32px.png", ":/log_viewer_bookmark_disabled_16px.png"));
    13051308    }
    13061309
    … …  
    13381341    /** Constructs action passing @a pParent to the base-class. */
    13391342    UIActionMenuSelectorLogTogglePaneSettings(UIActionPool *pParent)
    1340         : UIActionToggle(pParent,
    1341                          ":/log_viewer_settings_32px.png", ":/log_viewer_settings_disabled_32px.png")
     1343        : UIActionToggle(pParent)
    13421344    {
    13431345        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1346        setIcon(UIIconPool::iconSetFull(":/log_viewer_settings_32px.png",          ":/log_viewer_settings_16px.png",
     1347                                        ":/log_viewer_settings_disabled_32px.png", ":/log_viewer_settings_disabled_16px.png"));
    13441348    }
    13451349
    … …  
    15381542    /** Constructs action passing @a pParent to the base-class. */
    15391543    UIActionMenuGuestControlFileManagerCopyToGuest(UIActionPool *pParent)
    1540         : UIActionSimple(pParent, ":/file_manager_copy_to_guest_24px.png", ":/file_manager_copy_to_guest_16px.png",
     1544        : UIActionSimple(pParent,
     1545                         ":/file_manager_copy_to_guest_24px.png", ":/file_manager_copy_to_guest_16px.png",
    15411546                         ":/file_manager_copy_to_guest_disabled_24px.png", ":/file_manager_copy_to_guest_disabled_16px.png"){}
    15421547
    … …  
    15741579    /** Constructs action passing @a pParent to the base-class. */
    15751580    UIActionMenuGuestControlFileManagerCopyToHost(UIActionPool *pParent)
    1576         : UIActionSimple(pParent, ":/file_manager_copy_to_host_24px.png", ":/file_manager_copy_to_host_16px.png",
     1581        : UIActionSimple(pParent,
     1582                         ":/file_manager_copy_to_host_24px.png", ":/file_manager_copy_to_host_16px.png",
    15771583                         ":/file_manager_copy_to_host_disabled_24px.png", ":/file_manager_copy_to_host_disabled_16px.png"){}
    15781584
    … …  
    16101616    /** Constructs action passing @a pParent to the base-class. */
    16111617    UIActionMenuGuestControlFileManagerMoveToGuest(UIActionPool *pParent)
    1612         : UIActionSimple(pParent, ":/file_manager_move_to_guest_24px.png", ":/file_manager_move_to_guest_16px.png",
     1618        : UIActionSimple(pParent,
     1619                         ":/file_manager_move_to_guest_24px.png", ":/file_manager_move_to_guest_16px.png",
    16131620                         ":/file_manager_move_to_guest_disabled_24px.png", ":/file_manager_move_to_guest_disabled_16px.png"){}
    16141621
    … …  
    16461653    /** Constructs action passing @a pParent to the base-class. */
    16471654    UIActionMenuGuestControlFileManagerMoveToHost(UIActionPool *pParent)
    1648         : UIActionSimple(pParent, ":/file_manager_move_to_host_24px.png", ":/file_manager_move_to_host_16px.png",
     1655        : UIActionSimple(pParent,
     1656                         ":/file_manager_move_to_host_24px.png", ":/file_manager_move_to_host_16px.png",
    16491657                         ":/file_manager_move_to_host_disabled_24px.png", ":/file_manager_move_to_host_disabled_16px.png"){}
    16501658
    … …  
    16821690    /** Constructs action passing @a pParent to the base-class. */
    16831691    UIActionMenuGuestControlFileManagerSettings(UIActionPool *pParent)
    1684         : UIActionToggle(pParent,
    1685                          ":/file_manager_settings_32px.png", ":/file_manager_settings_16px.png",
    1686                          ":/file_manager_settings_disabled_32px.png", ":/file_manager_settings_disabled_16px.png"){}
     1692        : UIActionToggle(pParent)
     1693    {
     1694        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1695        setIcon(UIIconPool::iconSetFull(":/file_manager_settings_32px.png",          ":/file_manager_settings_16px.png",
     1696                                        ":/file_manager_settings_disabled_32px.png", ":/file_manager_settings_disabled_16px.png"));
     1697    }
    16871698
    16881699protected:
    … …  
    17191730    /** Constructs action passing @a pParent to the base-class. */
    17201731    UIActionMenuGuestControlFileManagerLog(UIActionPool *pParent)
    1721         : UIActionToggle(pParent,
    1722                          ":/file_manager_log_32px.png", ":/file_manager_log_16px.png",
    1723                          ":/file_manager_log_disabled_32px.png", ":/file_manager_log_disabled_16px.png")
     1732        : UIActionToggle(pParent)
    17241733    {
    17251734        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1735        setIcon(UIIconPool::iconSetFull(":/file_manager_log_32px.png",          ":/file_manager_log_16px.png",
     1736                                        ":/file_manager_log_disabled_32px.png", ":/file_manager_log_disabled_16px.png"));
    17261737    }
    17271738
    … …  
    17591770    /** Constructs action passing @a pParent to the base-class. */
    17601771    UIActionMenuGuestControlFileManagerFileOperations(UIActionPool *pParent)
    1761         : UIActionToggle(pParent,
    1762                          ":/file_manager_operations_32px.png", ":/file_manager_operations_16px.png",
    1763                          ":/file_manager_operations_disabled_32px.png", ":/file_manager_operations_disabled_16px.png")
     1772        : UIActionToggle(pParent)
    17641773    {
    17651774        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1775        setIcon(UIIconPool::iconSetFull(":/file_manager_operations_32px.png",          ":/file_manager_operations_16px.png",
     1776                                        ":/file_manager_operations_disabled_32px.png", ":/file_manager_operations_disabled_16px.png"));
    17661777    }
    17671778
    … …  
    17991810    /** Constructs action passing @a pParent to the base-class. */
    18001811    UIActionMenuGuestControlFileManagerSession(UIActionPool *pParent)
    1801         : UIActionToggle(pParent,
    1802                          ":/file_manager_session_32px.png", ":/file_manager_session_16px.png",
    1803                          ":/file_manager_session_disabled_32px.png", ":/file_manager_session_disabled_16px.png")
     1812        : UIActionToggle(pParent)
    18041813    {
    18051814        setShortcutContext(Qt::WidgetWithChildrenShortcut);
     1815        setIcon(UIIconPool::iconSetFull(":/file_manager_session_32px.png",          ":/file_manager_session_16px.png",
     1816                                        ":/file_manager_session_disabled_32px.png", ":/file_manager_session_disabled_16px.png"));
    18061817    }
    18071818
    … …  
    18391850    /** Constructs action passing @a pParent to the base-class. */
    18401851    UIActionMenuGuestControlFileManagerGoUp(UIActionPool *pParent)
    1841         : UIActionSimple(pParent, ":/file_manager_go_up_24px.png", ":/file_manager_go_up_16px.png",
     1852        : UIActionSimple(pParent,
     1853                         ":/file_manager_go_up_24px.png", ":/file_manager_go_up_16px.png",
    18421854                         ":/file_manager_go_up_disabled_24px.png", ":/file_manager_go_up_disabled_16px.png")
    18431855    {}
    … …  
    18771889    /** Constructs action passing @a pParent to the base-class. */
    18781890    UIActionMenuGuestControlFileManagerGoHome(UIActionPool *pParent)
    1879         : UIActionSimple(pParent, ":/file_manager_go_home_24px.png", ":/file_manager_go_home_16px.png",
     1891        : UIActionSimple(pParent,
     1892                         ":/file_manager_go_home_24px.png", ":/file_manager_go_home_16px.png",
    18801893                         ":/file_manager_go_home_disabled_24px.png", ":/file_manager_go_home_disabled_16px.png")
    18811894    {}
    … …  
    19151928    /** Constructs action passing @a pParent to the base-class. */
    19161929    UIActionMenuGuestControlFileManagerDelete(UIActionPool *pParent)
    1917         : UIActionSimple(pParent, ":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png",
     1930        : UIActionSimple(pParent,
     1931                         ":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png",
    19181932                         ":/file_manager_delete_disabled_24px.png", ":/file_manager_delete_disabled_16px.png")
    19191933    {}
    … …  
    19521966    /** Constructs action passing @a pParent to the base-class. */
    19531967    UIActionMenuGuestControlFileManagerRefresh(UIActionPool *pParent)
    1954         : UIActionSimple(pParent, ":/file_manager_refresh_24px.png", ":/file_manager_refresh_16px.png",
     1968        : UIActionSimple(pParent,
     1969                         ":/file_manager_refresh_24px.png", ":/file_manager_refresh_16px.png",
    19551970                         ":/file_manager_refresh_disabled_24px.png", ":/file_manager_refresh_disabled_16px.png")
    19561971    {}
    … …  
    19902005    /** Constructs action passing @a pParent to the base-class. */
    19912006    UIActionMenuGuestControlFileManagerRename(UIActionPool *pParent)
    1992           : UIActionSimple(pParent, ":/file_manager_rename_24px.png", ":/file_manager_rename_16px.png",
     2007        : UIActionSimple(pParent,
     2008                         ":/file_manager_rename_24px.png", ":/file_manager_rename_16px.png",
    19932009                         ":/file_manager_rename_disabled_24px.png", ":/file_manager_rename_disabled_16px.png"){}
    19942010
    … …  
    20262042    /** Constructs action passing @a pParent to the base-class. */
    20272043    UIActionMenuGuestControlFileManagerCreateNewDirectory(UIActionPool *pParent)
    2028         : UIActionSimple(pParent, ":/file_manager_new_directory_24px.png", ":/file_manager_new_directory_16px.png",
     2044        : UIActionSimple(pParent,
     2045                         ":/file_manager_new_directory_24px.png", ":/file_manager_new_directory_16px.png",
    20292046                         ":/file_manager_new_directory_disabled_24px.png", ":/file_manager_new_directory_disabled_16px.png"){}
    20302047
    … …  
    20632080    /** Constructs action passing @a pParent to the base-class. */
    20642081    UIActionMenuGuestControlFileManagerCopy(UIActionPool *pParent)
    2065         : UIActionSimple(pParent, ":/file_manager_copy_24px.png", ":/file_manager_copy_16px.png",
     2082        : UIActionSimple(pParent,
     2083                         ":/file_manager_copy_24px.png", ":/file_manager_copy_16px.png",
    20662084                         ":/file_manager_copy_disabled_24px.png", ":/file_manager_copy_disabled_16px.png"){}
    20672085
    … …  
    20992117    /** Constructs action passing @a pParent to the base-class. */
    21002118    UIActionMenuGuestControlFileManagerCut(UIActionPool *pParent)
    2101         : UIActionSimple(pParent, ":/file_manager_cut_24px.png", ":/file_manager_cut_16px.png",
     2119        : UIActionSimple(pParent,
     2120                         ":/file_manager_cut_24px.png", ":/file_manager_cut_16px.png",
    21022121                         ":/file_manager_cut_disabled_24px.png", ":/file_manager_cut_disabled_16px.png"){}
    21032122
    … …  
    21352154    /** Constructs action passing @a pParent to the base-class. */
    21362155    UIActionMenuGuestControlFileManagerPaste(UIActionPool *pParent)
    2137         : UIActionSimple(pParent, ":/file_manager_paste_24px.png", ":/file_manager_paste_16px.png",
     2156        : UIActionSimple(pParent,
     2157                         ":/file_manager_paste_24px.png", ":/file_manager_paste_16px.png",
    21382158                         ":/file_manager_paste_disabled_24px.png", ":/file_manager_paste_disabled_16px.png"){}
    21392159
    … …  
    21712191    /** Constructs action passing @a pParent to the base-class. */
    21722192    UIActionMenuGuestControlFileManagerSelectAll(UIActionPool *pParent)
    2173         : UIActionSimple(pParent, ":/file_manager_select_all_24px.png", ":/file_manager_select_all_16px.png",
     2193        : UIActionSimple(pParent,
     2194                         ":/file_manager_select_all_24px.png", ":/file_manager_select_all_16px.png",
    21742195                         ":/file_manager_select_all_disabled_24px.png", ":/file_manager_select_all_disabled_16px.png"){}
    21752196
    … …  
    22082229    /** Constructs action passing @a pParent to the base-class. */
    22092230    UIActionMenuGuestControlFileManagerInvertSelection(UIActionPool *pParent)
    2210    : UIActionSimple(pParent, ":/file_manager_invert_selection_24px.png", ":/file_manager_invert_selection_16px.png",
    2211                     ":/file_manager_invert_selection_disabled_24px.png", ":/file_manager_invert_selection_disabled_16px.png"){}
     2231        : UIActionSimple(pParent,
     2232                         ":/file_manager_invert_selection_24px.png", ":/file_manager_invert_selection_16px.png",
     2233                         ":/file_manager_invert_selection_disabled_24px.png", ":/file_manager_invert_selection_disabled_16px.png"){}
    22122234
    22132235protected:
    … …  
    22452267    /** Constructs action passing @a pParent to the base-class. */
    22462268    UIActionMenuGuestControlFileManagerShowProperties(UIActionPool *pParent)
    2247         : UIActionSimple(pParent, ":/file_manager_properties_24px.png", ":/file_manager_properties_16px.png",
     2269        : UIActionSimple(pParent,
     2270                         ":/file_manager_properties_24px.png", ":/file_manager_properties_16px.png",
    22482271                         ":/file_manager_properties_disabled_24px.png", ":/file_manager_properties_disabled_16px.png"){}
    22492272
    … …  
    28392862{
    28402863    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Settings));
     2864    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Log));
     2865    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));
     2866    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_T_Session));
    28412867    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_M_HostSubmenu));
    28422868    addAction(pMenu, action(UIActionIndex_M_GuestControlFileManager_M_GuestSubmenu));
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