Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc (revision 75308)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc (revision 75309)
@@ -164,4 +164,90 @@
images/fd_unmount_disabled_16px.png
images/fd_write_16px.png
+ images/file_manager_16px.png
+ images/file_manager_24px.png
+ images/file_manager_32px.png
+ images/file_manager_copy_16px.png
+ images/file_manager_copy_24px.png
+ images/file_manager_copy_disabled_16px.png
+ images/file_manager_copy_disabled_24px.png
+ images/file_manager_copy_to_guest_16px.png
+ images/file_manager_copy_to_guest_24px.png
+ images/file_manager_copy_to_guest_disabled_16px.png
+ images/file_manager_copy_to_guest_disabled_24px.png
+ images/file_manager_copy_to_host_16px.png
+ images/file_manager_copy_to_host_24px.png
+ images/file_manager_copy_to_host_disabled_16px.png
+ images/file_manager_copy_to_host_disabled_24px.png
+ images/file_manager_cut_16px.png
+ images/file_manager_cut_24px.png
+ images/file_manager_cut_disabled_16px.png
+ images/file_manager_cut_disabled_24px.png
+ images/file_manager_delete_16px.png
+ images/file_manager_delete_24px.png
+ images/file_manager_delete_disabled_16px.png
+ images/file_manager_delete_disabled_24px.png
+ images/file_manager_disabled_16px.png
+ images/file_manager_disabled_24px.png
+ images/file_manager_disabled_32px.png
+ images/file_manager_go_home_16px.png
+ images/file_manager_go_home_24px.png
+ images/file_manager_go_home_disabled_16px.png
+ images/file_manager_go_home_disabled_24px.png
+ images/file_manager_go_up_16px.png
+ images/file_manager_go_up_24px.png
+ images/file_manager_go_up_disabled_16px.png
+ images/file_manager_go_up_disabled_24px.png
+ images/file_manager_invert_selection_16px.png
+ images/file_manager_invert_selection_24px.png
+ images/file_manager_invert_selection_disabled_16px.png
+ images/file_manager_invert_selection_disabled_24px.png
+ images/file_manager_log_16px.png
+ images/file_manager_log_32px.png
+ images/file_manager_log_disabled_16px.png
+ images/file_manager_log_disabled_32px.png
+ images/file_manager_move_to_guest_16px.png
+ images/file_manager_move_to_guest_24px.png
+ images/file_manager_move_to_guest_disabled_16px.png
+ images/file_manager_move_to_guest_disabled_24px.png
+ images/file_manager_move_to_host_16px.png
+ images/file_manager_move_to_host_24px.png
+ images/file_manager_move_to_host_disabled_16px.png
+ images/file_manager_move_to_host_disabled_24px.png
+ images/file_manager_new_directory_16px.png
+ images/file_manager_new_directory_24px.png
+ images/file_manager_new_directory_disabled_16px.png
+ images/file_manager_new_directory_disabled_24px.png
+ images/file_manager_operations_16px.png
+ images/file_manager_operations_32px.png
+ images/file_manager_operations_disabled_16px.png
+ images/file_manager_operations_disabled_32px.png
+ images/file_manager_paste_16px.png
+ images/file_manager_paste_24px.png
+ images/file_manager_paste_disabled_16px.png
+ images/file_manager_paste_disabled_24px.png
+ images/file_manager_properties_16px.png
+ images/file_manager_properties_24px.png
+ images/file_manager_properties_disabled_16px.png
+ images/file_manager_properties_disabled_24px.png
+ images/file_manager_refresh_16px.png
+ images/file_manager_refresh_24px.png
+ images/file_manager_refresh_disabled_16px.png
+ images/file_manager_refresh_disabled_24px.png
+ images/file_manager_rename_16px.png
+ images/file_manager_rename_24px.png
+ images/file_manager_rename_disabled_16px.png
+ images/file_manager_rename_disabled_24px.png
+ images/file_manager_select_all_16px.png
+ images/file_manager_select_all_24px.png
+ images/file_manager_select_all_disabled_16px.png
+ images/file_manager_select_all_disabled_24px.png
+ images/file_manager_session_16px.png
+ images/file_manager_session_32px.png
+ images/file_manager_session_disable_32px.png
+ images/file_manager_session_disabled_16px.png
+ images/file_manager_settings_16px.png
+ images/file_manager_settings_32px.png
+ images/file_manager_settings_disabled_16px.png
+ images/file_manager_settings_disabled_32px.png
images/floppy_16px.png
images/floppy_add_16px.png
@@ -298,47 +384,4 @@
images/machine_warning_16px.png
images/media_manager_16px.png
- images/media_manager_24px.png
- images/media_manager_32px.png
- images/media_manager_disabled_16px.png
- images/media_manager_disabled_24px.png
- images/meditation_32px.png
- images/menubar_16px.png
- images/menubar_disabled_16px.png
- images/menubar_on_16px.png
- images/menubar_on_disabled_16px.png
- images/menubar_settings_16px.png
- images/menubar_settings_disabled_16px.png
- images/minimize_16px.png
- images/monitor.png
- images/monitor_glossy.png
- images/mouse_16px.png
- images/mouse_can_seamless_16px.png
- images/mouse_can_seamless_disabled_16px.png
- images/mouse_can_seamless_on_16px.png
- images/mouse_can_seamless_on_disabled_16px.png
- images/mouse_can_seamless_uncaptured_16px.png
- images/mouse_disabled_16px.png
- images/mouse_seamless_16px.png
- images/movie_reel_16px.png
- images/name_16px.png
- images/next_16px.png
- images/nw_16px.png
- images/nw_24px.png
- images/nw_32px.png
- images/nw_disabled_16px.png
- images/nw_read_16px.png
- images/nw_settings_16px.png
- images/nw_settings_disabled_16px.png
- images/nw_warning_16px.png
- images/nw_write_16px.png
- images/ok_16px.png
- images/os_archlinux.png
- images/os_archlinux_64.png
- images/os_debian.png
- images/os_debian_64.png
- images/os_dos.png
- images/os_fedora.png
- images/os_fedora_64.png
- images/os_freebsd.png
Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 75308)
+++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc (revision 75309)
@@ -1,76 +1,119 @@
+ images/media_manager_24px.png
+ images/media_manager_32px.png
+ images/media_manager_disabled_16px.png
+ images/media_manager_disabled_24px.png
+ images/meditation_32px.png
+ images/menubar_16px.png
+ images/menubar_disabled_16px.png
+ images/menubar_on_16px.png
+ images/menubar_on_disabled_16px.png
+ images/menubar_settings_16px.png
+ images/menubar_settings_disabled_16px.png
+ images/minimize_16px.png
+ images/monitor_glossy.png
+ images/monitor.png
+ images/mouse_16px.png
+ images/mouse_can_seamless_16px.png
+ images/mouse_can_seamless_disabled_16px.png
+ images/mouse_can_seamless_on_16px.png
+ images/mouse_can_seamless_on_disabled_16px.png
+ images/mouse_can_seamless_uncaptured_16px.png
+ images/mouse_disabled_16px.png
+ images/mouse_seamless_16px.png
+ images/movie_reel_16px.png
+ images/name_16px.png
+ images/next_16px.png
+ images/nw_16px.png
+ images/nw_24px.png
+ images/nw_32px.png
+ images/nw_disabled_16px.png
+ images/nw_read_16px.png
+ images/nw_settings_16px.png
+ images/nw_settings_disabled_16px.png
+ images/nw_warning_16px.png
+ images/nw_write_16px.png
+ images/ok_16px.png
+ images/os_archlinux_64.png
+ images/os_archlinux.png
+ images/os_debian_64.png
+ images/os_debian.png
+ images/os_dos.png
+ images/os_fedora_64.png
+ images/os_fedora.png
images/os_freebsd_64.png
+ images/os_freebsd.png
+ images/os_gentoo_64.png
images/os_gentoo.png
- images/os_gentoo_64.png
images/os_jrockitve.png
images/os_l4.png
+ images/os_linux22.png
+ images/os_linux24_64.png
+ images/os_linux24.png
+ images/os_linux26_64.png
+ images/os_linux26.png
+ images/os_linux_64.png
images/os_linux.png
- images/os_linux22.png
- images/os_linux24.png
- images/os_linux24_64.png
- images/os_linux26.png
- images/os_linux26_64.png
- images/os_linux_64.png
+ images/os_macosx_64.png
images/os_macosx.png
- images/os_macosx_64.png
+ images/os_mandriva_64.png
images/os_mandriva.png
- images/os_mandriva_64.png
+ images/os_netbsd_64.png
images/os_netbsd.png
- images/os_netbsd_64.png
images/os_netware.png
+ images/os_openbsd_64.png
images/os_openbsd.png
- images/os_openbsd_64.png
+ images/os_opensuse_64.png
images/os_opensuse.png
- images/os_opensuse_64.png
+ images/os_oracle_64.png
images/os_oracle.png
- images/os_oracle_64.png
+ images/os_oraclesolaris_64.png
images/os_oraclesolaris.png
- images/os_oraclesolaris_64.png
+ images/os_os2ecs.png
images/os_os2_other.png
- images/os_os2ecs.png
images/os_os2warp3.png
+ images/os_os2warp45.png
images/os_os2warp4.png
- images/os_os2warp45.png
+ images/os_other_64.png
images/os_other.png
- images/os_other_64.png
images/os_qnx.png
+ images/os_redhat_64.png
images/os_redhat.png
- images/os_redhat_64.png
+ images/os_solaris_64.png
images/os_solaris.png
- images/os_solaris_64.png
+ images/os_turbolinux_64.png
images/os_turbolinux.png
- images/os_turbolinux_64.png
images/os_type_16px.png
+ images/os_ubuntu_64.png
images/os_ubuntu.png
- images/os_ubuntu_64.png
+ images/os_win10_64.png
images/os_win10.png
- images/os_win10_64.png
- images/os_win2k.png
images/os_win2k12_64.png
images/os_win2k16_64.png
+ images/os_win2k3_64.png
images/os_win2k3.png
- images/os_win2k3_64.png
+ images/os_win2k8_64.png
images/os_win2k8.png
- images/os_win2k8_64.png
+ images/os_win2k.png
images/os_win31.png
+ images/os_win7_64.png
images/os_win7.png
- images/os_win7_64.png
+ images/os_win81_64.png
+ images/os_win81.png
+ images/os_win8_64.png
images/os_win8.png
- images/os_win81.png
- images/os_win81_64.png
- images/os_win8_64.png
images/os_win95.png
images/os_win98.png
- images/os_win_other.png
- images/os_win_other_64.png
images/os_winme.png
images/os_winnt4.png
+ images/os_win_other_64.png
+ images/os_win_other.png
+ images/os_winvista_64.png
images/os_winvista.png
- images/os_winvista_64.png
+ images/os_winxp_64.png
images/os_winxp.png
- images/os_winxp_64.png
+ images/os_xandros_64.png
images/os_xandros.png
- images/os_xandros_64.png
images/pin_16px.png
images/preview_empty_16to10_242x167px.png
@@ -212,6 +255,4 @@
images/state_saving_16px.png
images/state_stuck_16px.png
- images/status_check_16px.png
- images/status_error_16px.png
images/statusbar_16px.png
images/statusbar_disabled_16px.png
@@ -220,4 +261,6 @@
images/statusbar_settings_16px.png
images/statusbar_settings_disabled_16px.png
+ images/status_check_16px.png
+ images/status_error_16px.png
images/tools_banner_global_200px.png
images/tools_banner_machine_200px.png
@@ -329,16 +372,16 @@
images/welcome_200px.png
images/welcome_screen_24px.png
+ images/wizard_clone_bg.png
images/wizard_clone.png
- images/wizard_clone_bg.png
+ images/wizard_first_run_bg.png
images/wizard_first_run.png
- images/wizard_first_run_bg.png
+ images/wizard_new_harddisk_bg.png
images/wizard_new_harddisk.png
- images/wizard_new_harddisk_bg.png
+ images/wizard_new_welcome_bg.png
images/wizard_new_welcome.png
- images/wizard_new_welcome_bg.png
+ images/wizard_ovf_export_bg.png
images/wizard_ovf_export.png
- images/wizard_ovf_export_bg.png
+ images/wizard_ovf_import_bg.png
images/wizard_ovf_import.png
- images/wizard_ovf_import_bg.png
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 75308)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp (revision 75309)
@@ -1538,6 +1538,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerCopyToGuest(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/arrow_left_10px_x2.png", ":/arrow_left_disabled_10px_x2.png")
- {}
+ : UIActionSimple(pParent, ":/file_manager_copy_to_guest_24px.png", ":/file_manager_copy_to_guest_16px.png",
+ ":/file_manager_copy_to_guest_disabled_24px.png", ":/file_manager_copy_to_guest_disabled_16px.png"){}
protected:
@@ -1574,6 +1574,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerCopyToHost(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/arrow_right_10px_x2.png", ":/arrow_right_disabled_10px_x2.png")
- {}
+ : UIActionSimple(pParent, ":/file_manager_copy_to_host_24px.png", ":/file_manager_copy_to_host_16px.png",
+ ":/file_manager_copy_to_host_disabled_24px.png", ":/file_manager_copy_to_host_disabled_16px.png"){}
protected:
@@ -1601,4 +1601,76 @@
};
+/** Simple action extension, used as 'Move to Guest' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerMoveToGuest : public UIActionSimple
+{
+ Q_OBJECT;
+
+public:
+
+ /** Constructs action passing @a pParent to the base-class. */
+ UIActionMenuGuestControlFileManagerMoveToGuest(UIActionPool *pParent)
+ : UIActionSimple(pParent, ":/file_manager_move_to_guest_24px.png", ":/file_manager_move_to_guest_16px.png",
+ ":/file_manager_move_to_guest_disabled_24px.png", ":/file_manager_move_to_guest_disabled_16px.png"){}
+
+protected:
+
+ /** Returns shortcut extra-data ID. */
+ virtual QString shortcutExtraDataID() const /* override */
+ {
+ return QString("FileManagerMoveToGuest");
+ }
+
+ /** Returns default shortcut. */
+ virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+ {
+ return QKeySequence();
+ }
+
+ /** Handles translation event. */
+ virtual void retranslateUi() /* override */
+ {
+ setName(QApplication::translate("UIActionPool", "Move to guest"));
+ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+ setToolTip(QApplication::translate("UIActionPool", "Move the Selected Object(s) from Host to Guest"));
+ setStatusTip(QApplication::translate("UIActionPool", "Move the selected object(s) from host to guest"));
+ }
+};
+
+/** Simple action extension, used as 'Move to Host' in guest control file manager action class. */
+class UIActionMenuGuestControlFileManagerMoveToHost : public UIActionSimple
+{
+ Q_OBJECT;
+
+public:
+
+ /** Constructs action passing @a pParent to the base-class. */
+ UIActionMenuGuestControlFileManagerMoveToHost(UIActionPool *pParent)
+ : UIActionSimple(pParent, ":/file_manager_move_to_host_24px.png", ":/file_manager_move_to_host_16px.png",
+ ":/file_manager_move_to_host_disabled_24px.png", ":/file_manager_move_to_host_disabled_16px.png"){}
+
+protected:
+
+ /** Returns shortcut extra-data ID. */
+ virtual QString shortcutExtraDataID() const /* override */
+ {
+ return QString("FileManagerMoveToHost");
+ }
+
+ /** Returns default shortcut. */
+ virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+ {
+ return QKeySequence();
+ }
+
+ /** Handles translation event. */
+ virtual void retranslateUi() /* override */
+ {
+ setName(QApplication::translate("UIActionPool", "Move to host"));
+ setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
+ setToolTip(QApplication::translate("UIActionPool", "Move the Selected Object(s) from Guest to Host"));
+ setStatusTip(QApplication::translate("UIActionPool", "Move the selected object(s) from guest to host"));
+ }
+};
+
/** Toggle action extension, used to toggle 'File Manager Settings' panel in guest control file manager. */
class UIActionMenuGuestControlFileManagerSettings : public UIActionToggle
@@ -1611,8 +1683,6 @@
UIActionMenuGuestControlFileManagerSettings(UIActionPool *pParent)
: UIActionToggle(pParent,
- ":/log_viewer_bookmark_32px.png", ":/log_viewer_bookmark_disabled_32px.png")
- {
- setShortcutContext(Qt::WidgetWithChildrenShortcut);
- }
+ ":/file_manager_settings_32px.png", ":/file_manager_settings_16px.png",
+ ":/file_manager_settings_disabled_32px.png", ":/file_manager_settings_disabled_16px.png"){}
protected:
@@ -1650,5 +1720,6 @@
UIActionMenuGuestControlFileManagerLog(UIActionPool *pParent)
: UIActionToggle(pParent,
- ":/log_viewer_bookmark_32px.png", ":/log_viewer_bookmark_disabled_32px.png")
+ ":/file_manager_log_32px.png", ":/file_manager_log_16px.png",
+ ":/file_manager_log_disabled_32px.png", ":/file_manager_log_disabled_16px.png")
{
setShortcutContext(Qt::WidgetWithChildrenShortcut);
@@ -1689,5 +1760,6 @@
UIActionMenuGuestControlFileManagerFileOperations(UIActionPool *pParent)
: UIActionToggle(pParent,
- ":/log_viewer_bookmark_32px.png", ":/log_viewer_bookmark_disabled_32px.png")
+ ":/file_manager_operations_32px.png", ":/file_manager_operations_16px.png",
+ ":/file_manager_operations_disabled_32px.png", ":/file_manager_operations_disabled_16px.png")
{
setShortcutContext(Qt::WidgetWithChildrenShortcut);
@@ -1728,5 +1800,6 @@
UIActionMenuGuestControlFileManagerSession(UIActionPool *pParent)
: UIActionToggle(pParent,
- ":/log_viewer_bookmark_32px.png", ":/log_viewer_bookmark_disabled_32px.png")
+ ":/file_manager_session_32px.png", ":/file_manager_session_16px.png",
+ ":/file_manager_session_disabled_32px.png", ":/file_manager_session_disabled_16px.png")
{
setShortcutContext(Qt::WidgetWithChildrenShortcut);
@@ -1766,5 +1839,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerGoUp(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/arrow_up_10px_x2.png", ":/arrow_up_10px_x2.png")
+ : UIActionSimple(pParent, ":/file_manager_go_up_24px.png", ":/file_manager_go_up_16px.png",
+ ":/file_manager_go_up_disabled_24px.png", ":/file_manager_go_up_disabled_16px.png")
{}
@@ -1803,5 +1877,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerGoHome(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/nw_24px.png", ":/nw_disabled_24px.png")
+ : UIActionSimple(pParent, ":/file_manager_go_home_24px.png", ":/file_manager_go_home_16px.png",
+ ":/file_manager_go_home_disabled_24px.png", ":/file_manager_go_home_disabled_16px.png")
{}
@@ -1831,5 +1906,5 @@
-/** Simple action extension, used as 'Perform Copy' in guest control file manager action class. */
+/** Simple action extension, used as 'Perform Delete' in guest control file manager action class. */
class UIActionMenuGuestControlFileManagerDelete : public UIActionSimple
{
@@ -1840,5 +1915,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerDelete(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/vm_delete_32px.png", ":/vm_delete_disabled_32px.png")
+ : UIActionSimple(pParent, ":/file_manager_delete_24px.png", ":/file_manager_delete_16px.png",
+ ":/file_manager_delete_disabled_24px.png", ":/file_manager_delete_disabled_16px.png")
{}
@@ -1876,5 +1952,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerRefresh(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/refresh_16px.png", ":/refresh_disabled_16px.png")
+ : UIActionSimple(pParent, ":/file_manager_refresh_24px.png", ":/file_manager_refresh_16px.png",
+ ":/file_manager_refresh_disabled_24px.png", ":/file_manager_refresh_disabled_16px.png")
{}
@@ -1913,5 +1990,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerRename(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/name_16px.png", ":/name_16px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_rename_24px.png", ":/file_manager_rename_16px.png",
+ ":/file_manager_rename_disabled_24px.png", ":/file_manager_rename_disabled_16px.png"){}
protected:
@@ -1948,5 +2026,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerCreateNewDirectory(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/sf_add_16px.png", ":/sf_add_disabled_16px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_new_directory_24px.png", ":/file_manager_new_directory_16px.png",
+ ":/file_manager_new_directory_disabled_24px.png", ":/file_manager_new_directory_disabled_16px.png"){}
protected:
@@ -1984,5 +2063,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerCopy(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/fd_copy_32px.png", ":/fd_copy_disabled_32px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_copy_24px.png", ":/file_manager_copy_16px.png",
+ ":/file_manager_copy_disabled_24px.png", ":/file_manager_copy_disabled_16px.png"){}
protected:
@@ -2019,5 +2099,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerCut(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/fd_move_32px.png", ":/fd_move_disabled_32px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_cut_24px.png", ":/file_manager_cut_16px.png",
+ ":/file_manager_cut_disabled_24px.png", ":/file_manager_cut_disabled_16px.png"){}
protected:
@@ -2054,5 +2135,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerPaste(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/shared_clipboard_16px.png", ":/shared_clipboard_disabled_16px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_paste_24px.png", ":/file_manager_paste_16px.png",
+ ":/file_manager_paste_disabled_24px.png", ":/file_manager_paste_disabled_16px.png"){}
protected:
@@ -2089,5 +2171,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerSelectAll(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/session_info_32px.png", ":/session_info_disabled_32px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_select_all_24px.png", ":/file_manager_select_all_16px.png",
+ ":/file_manager_select_all_disabled_24px.png", ":/file_manager_select_all_disabled_16px.png"){}
protected:
@@ -2125,5 +2208,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerInvertSelection(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/session_info_32px.png", ":/session_info_disabled_32px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_invert_selection_24px.png", ":/file_manager_invert_selection_16px.png",
+ ":/file_manager_invert_selection_disabled_24px.png", ":/file_manager_invert_selection_disabled_16px.png"){}
protected:
@@ -2147,5 +2231,5 @@
setShortcutScope(QApplication::translate("UIActionPool", "Guest Control File Manager"));
setStatusTip(QApplication::translate("UIActionPool", "Invert the current selection"));
- setToolTip(QApplication::translate("UIActionPool", "Invert The Current Selection"));
+ setToolTip(QApplication::translate("UIActionPool", "Invert the Current Selection"));
}
};
@@ -2161,5 +2245,6 @@
/** Constructs action passing @a pParent to the base-class. */
UIActionMenuGuestControlFileManagerShowProperties(UIActionPool *pParent)
- : UIActionSimple(pParent, ":/session_info_32px.png", ":/session_info_disabled_32px.png"){}
+ : UIActionSimple(pParent, ":/file_manager_properties_24px.png", ":/file_manager_properties_16px.png",
+ ":/file_manager_properties_disabled_24px.png", ":/file_manager_properties_disabled_16px.png"){}
protected:
@@ -2402,4 +2487,6 @@
m_pool[UIActionIndex_M_GuestControlFileManager_S_CopyToGuest] = new UIActionMenuGuestControlFileManagerCopyToGuest(this);
m_pool[UIActionIndex_M_GuestControlFileManager_S_CopyToHost] = new UIActionMenuGuestControlFileManagerCopyToHost(this);
+ m_pool[UIActionIndex_M_GuestControlFileManager_S_MoveToGuest] = new UIActionMenuGuestControlFileManagerMoveToGuest(this);
+ m_pool[UIActionIndex_M_GuestControlFileManager_S_MoveToHost] = new UIActionMenuGuestControlFileManagerMoveToHost(this);
m_pool[UIActionIndex_M_GuestControlFileManager_T_Settings] = new UIActionMenuGuestControlFileManagerSettings(this);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 75308)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h (revision 75309)
@@ -104,4 +104,6 @@
UIActionIndex_M_GuestControlFileManager_S_CopyToGuest,
UIActionIndex_M_GuestControlFileManager_S_CopyToHost,
+ UIActionIndex_M_GuestControlFileManager_S_MoveToGuest,
+ UIActionIndex_M_GuestControlFileManager_S_MoveToHost,
UIActionIndex_M_GuestControlFileManager_T_Settings,
UIActionIndex_M_GuestControlFileManager_T_Log,
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75308)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75309)
@@ -325,4 +325,6 @@
m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToHost));
m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest));
+ m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToHost));
+ m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToGuest));
m_pToolBar->addWidget(bottomSpacerWidget);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp (revision 75308)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerDialog.cpp (revision 75309)
@@ -83,5 +83,5 @@
{
/* Apply window icons: */
- //setWindowIcon(UIIconPool::iconSetFull(":/vm_show_logs_32px.png", ":/vm_show_logs_16px.png"));
+ setWindowIcon(UIIconPool::iconSetFull(":/file_manager_32px.png", ":/file_manager_16px.png"));
}