Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp (revision 73660) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolSelector.cpp (revision 73661) @@ -63,12 +63,12 @@ /** Simple action extension, used as 'Show Virtual Media Manager' action class. */ -class UIActionSimpleSelectorShowVirtualMediaManager : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorShowVirtualMediaManager(UIActionPool *pParent) +class UIActionSimpleSelectorFileShowVirtualMediaManager : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorFileShowVirtualMediaManager(UIActionPool *pParent) : UIActionSimple(pParent, ":/media_manager_16px.png") {} @@ -97,12 +97,12 @@ /** Simple action extension, used as 'Show Host Network Manager' action class. */ -class UIActionSimpleSelectorShowHostNetworkManager : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorShowHostNetworkManager(UIActionPool *pParent) +class UIActionSimpleSelectorFileShowHostNetworkManager : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorFileShowHostNetworkManager(UIActionPool *pParent) : UIActionSimple(pParent, ":/host_iface_manager_16px.png") {} @@ -131,12 +131,12 @@ /** Simple action extension, used as 'Show Import Appliance Wizard' action class. */ -class UIActionSimpleSelectorShowImportApplianceWizard : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorShowImportApplianceWizard(UIActionPool *pParent) +class UIActionSimpleSelectorFileShowImportApplianceWizard : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorFileShowImportApplianceWizard(UIActionPool *pParent) : UIActionSimple(pParent, ":/import_16px.png") {} @@ -165,12 +165,12 @@ /** Simple action extension, used as 'Show Export Appliance Wizard' action class. */ -class UIActionSimpleSelectorShowExportApplianceWizard : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorShowExportApplianceWizard(UIActionPool *pParent) +class UIActionSimpleSelectorFileShowExportApplianceWizard : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorFileShowExportApplianceWizard(UIActionPool *pParent) : UIActionSimple(pParent, ":/export_16px.png") {} @@ -200,12 +200,12 @@ #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI /** Simple action extension, used as 'Show Extra-data Manager' action class. */ -class UIActionSimpleSelectorShowExtraDataManager : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorShowExtraDataManager(UIActionPool *pParent) +class UIActionSimpleSelectorFileShowExtraDataManager : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorFileShowExtraDataManager(UIActionPool *pParent) : UIActionSimple(pParent, ":/edata_manager_16px.png") {} @@ -235,12 +235,12 @@ /** Simple action extension, used as 'Perform Exit' action class. */ -class UIActionSimpleSelectorPerformExit : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorPerformExit(UIActionPool *pParent) +class UIActionSimpleSelectorFilePerformExit : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorFilePerformExit(UIActionPool *pParent) : UIActionSimple(pParent, ":/exit_16px.png") { @@ -1161,12 +1161,12 @@ /** Simple action extension, used as 'Perform Detach' action class. */ -class UIActionSimpleSelectorPerformDetach : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorPerformDetach(UIActionPool *pParent) +class UIActionSimpleSelectorClosePerformDetach : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorClosePerformDetach(UIActionPool *pParent) : UIActionSimple(pParent, ":/vm_create_shortcut_16px.png", ":/vm_create_shortcut_disabled_16px.png") {} @@ -1189,12 +1189,12 @@ /** Simple action extension, used as 'Perform Save' action class. */ -class UIActionSimpleSelectorPerformSave : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorPerformSave(UIActionPool *pParent) +class UIActionSimpleSelectorClosePerformSave : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorClosePerformSave(UIActionPool *pParent) : UIActionSimple(pParent, ":/vm_save_state_16px.png", ":/vm_save_state_disabled_16px.png") {} @@ -1223,12 +1223,12 @@ /** Simple action extension, used as 'Perform Shutdown' action class. */ -class UIActionSimpleSelectorPerformShutdown : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorPerformShutdown(UIActionPool *pParent) +class UIActionSimpleSelectorClosePerformShutdown : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorClosePerformShutdown(UIActionPool *pParent) : UIActionSimple(pParent, ":/vm_shutdown_16px.png", ":/vm_shutdown_disabled_16px.png") {} @@ -1257,12 +1257,12 @@ /** Simple action extension, used as 'Perform PowerOff' action class. */ -class UIActionSimpleSelectorPerformPowerOff : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorPerformPowerOff(UIActionPool *pParent) +class UIActionSimpleSelectorClosePerformPowerOff : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorClosePerformPowerOff(UIActionPool *pParent) : UIActionSimple(pParent, ":/vm_poweroff_16px.png", ":/vm_poweroff_disabled_16px.png") {} @@ -1348,12 +1348,12 @@ /** Simple action extension, used as 'Show Machine Details' action class. */ -class UIActionSimpleSelectorToolsShowMachineDetails : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorToolsShowMachineDetails(UIActionPool *pParent) +class UIActionSimpleSelectorToolsMachineShowDetails : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorToolsMachineShowDetails(UIActionPool *pParent) : UIActionSimple(pParent, ":/machine_details_manager_22px.png", ":/machine_details_manager_16px.png", @@ -1378,12 +1378,12 @@ /** Simple action extension, used as 'Show Machine Snapshots' action class. */ -class UIActionSimpleSelectorToolsShowMachineSnapshots : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorToolsShowMachineSnapshots(UIActionPool *pParent) +class UIActionSimpleSelectorToolsMachineShowSnapshots : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorToolsMachineShowSnapshots(UIActionPool *pParent) : UIActionSimple(pParent, ":/snapshot_manager_22px.png", ":/snapshot_manager_16px.png", @@ -1408,12 +1408,12 @@ /** Simple action extension, used as 'Show Machine Logs' action class. */ -class UIActionSimpleSelectorToolsShowMachineLogs : public UIActionSimple -{ - Q_OBJECT; - -public: - - /** Constructs action passing @a pParent to the base-class. */ - UIActionSimpleSelectorToolsShowMachineLogs(UIActionPool *pParent) +class UIActionSimpleSelectorToolsMachineShowLogs : public UIActionSimple +{ + Q_OBJECT; + +public: + + /** Constructs action passing @a pParent to the base-class. */ + UIActionSimpleSelectorToolsMachineShowLogs(UIActionPool *pParent) : UIActionSimple(pParent, ":/vm_show_logs_32px.png", ":/vm_show_logs_32px.png", @@ -1568,12 +1568,12 @@ /* 'File' actions: */ m_pool[UIActionIndexST_M_File] = new UIActionMenuSelectorFile(this); - m_pool[UIActionIndexST_M_File_S_ShowVirtualMediumManager] = new UIActionSimpleSelectorShowVirtualMediaManager(this); - m_pool[UIActionIndexST_M_File_S_ShowHostNetworkManager] = new UIActionSimpleSelectorShowHostNetworkManager(this); - m_pool[UIActionIndexST_M_File_S_ImportAppliance] = new UIActionSimpleSelectorShowImportApplianceWizard(this); - m_pool[UIActionIndexST_M_File_S_ExportAppliance] = new UIActionSimpleSelectorShowExportApplianceWizard(this); + m_pool[UIActionIndexST_M_File_S_ShowVirtualMediumManager] = new UIActionSimpleSelectorFileShowVirtualMediaManager(this); + m_pool[UIActionIndexST_M_File_S_ShowHostNetworkManager] = new UIActionSimpleSelectorFileShowHostNetworkManager(this); + m_pool[UIActionIndexST_M_File_S_ImportAppliance] = new UIActionSimpleSelectorFileShowImportApplianceWizard(this); + m_pool[UIActionIndexST_M_File_S_ExportAppliance] = new UIActionSimpleSelectorFileShowExportApplianceWizard(this); #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI - m_pool[UIActionIndexST_M_File_S_ShowExtraDataManager] = new UIActionSimpleSelectorShowExtraDataManager(this); + m_pool[UIActionIndexST_M_File_S_ShowExtraDataManager] = new UIActionSimpleSelectorFileShowExtraDataManager(this); #endif - m_pool[UIActionIndexST_M_File_S_Close] = new UIActionSimpleSelectorPerformExit(this); + m_pool[UIActionIndexST_M_File_S_Close] = new UIActionSimpleSelectorFilePerformExit(this); /* 'Group' actions: */ @@ -1590,8 +1590,8 @@ m_pool[UIActionIndexST_M_Group_S_Reset] = new UIActionSimpleSelectorCommonPerformReset(this); m_pool[UIActionIndexST_M_Group_M_Close] = new UIActionMenuSelectorClose(this); - m_pool[UIActionIndexST_M_Group_M_Close_S_Detach] = new UIActionSimpleSelectorPerformDetach(this); - m_pool[UIActionIndexST_M_Group_M_Close_S_SaveState] = new UIActionSimpleSelectorPerformSave(this); - m_pool[UIActionIndexST_M_Group_M_Close_S_Shutdown] = new UIActionSimpleSelectorPerformShutdown(this); - m_pool[UIActionIndexST_M_Group_M_Close_S_PowerOff] = new UIActionSimpleSelectorPerformPowerOff(this); + m_pool[UIActionIndexST_M_Group_M_Close_S_Detach] = new UIActionSimpleSelectorClosePerformDetach(this); + m_pool[UIActionIndexST_M_Group_M_Close_S_SaveState] = new UIActionSimpleSelectorClosePerformSave(this); + m_pool[UIActionIndexST_M_Group_M_Close_S_Shutdown] = new UIActionSimpleSelectorClosePerformShutdown(this); + m_pool[UIActionIndexST_M_Group_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this); m_pool[UIActionIndexST_M_Group_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this); m_pool[UIActionIndexST_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this); @@ -1617,8 +1617,8 @@ m_pool[UIActionIndexST_M_Machine_S_Reset] = new UIActionSimpleSelectorCommonPerformReset(this); m_pool[UIActionIndexST_M_Machine_M_Close] = new UIActionMenuSelectorClose(this); - m_pool[UIActionIndexST_M_Machine_M_Close_S_Detach] = new UIActionSimpleSelectorPerformDetach(this); - m_pool[UIActionIndexST_M_Machine_M_Close_S_SaveState] = new UIActionSimpleSelectorPerformSave(this); - m_pool[UIActionIndexST_M_Machine_M_Close_S_Shutdown] = new UIActionSimpleSelectorPerformShutdown(this); - m_pool[UIActionIndexST_M_Machine_M_Close_S_PowerOff] = new UIActionSimpleSelectorPerformPowerOff(this); + m_pool[UIActionIndexST_M_Machine_M_Close_S_Detach] = new UIActionSimpleSelectorClosePerformDetach(this); + m_pool[UIActionIndexST_M_Machine_M_Close_S_SaveState] = new UIActionSimpleSelectorClosePerformSave(this); + m_pool[UIActionIndexST_M_Machine_M_Close_S_Shutdown] = new UIActionSimpleSelectorClosePerformShutdown(this); + m_pool[UIActionIndexST_M_Machine_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this); m_pool[UIActionIndexST_M_Machine_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this); m_pool[UIActionIndexST_M_Machine_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this); @@ -1631,7 +1631,7 @@ m_pool[UIActionIndexST_M_Tools_T_Machine] = new UIActionToggleSelectorToolsMachine(this); m_pool[UIActionIndexST_M_Tools_M_Machine] = new UIActionMenuSelectorToolsMachine(this); - m_pool[UIActionIndexST_M_Tools_M_Machine_S_Details] = new UIActionSimpleSelectorToolsShowMachineDetails(this); - m_pool[UIActionIndexST_M_Tools_M_Machine_S_Snapshots] = new UIActionSimpleSelectorToolsShowMachineSnapshots(this); - m_pool[UIActionIndexST_M_Tools_M_Machine_S_LogViewer] = new UIActionSimpleSelectorToolsShowMachineLogs(this); + m_pool[UIActionIndexST_M_Tools_M_Machine_S_Details] = new UIActionSimpleSelectorToolsMachineShowDetails(this); + m_pool[UIActionIndexST_M_Tools_M_Machine_S_Snapshots] = new UIActionSimpleSelectorToolsMachineShowSnapshots(this); + m_pool[UIActionIndexST_M_Tools_M_Machine_S_LogViewer] = new UIActionSimpleSelectorToolsMachineShowLogs(this); /* Global Tools actions: */ @@ -1677,3 +1677,2 @@ #include "UIActionPoolSelector.moc" -