Changeset 54303 in vbox

Timestamp:

Feb 19, 2015 4:55:58 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7253: Runtime UI: Move Remove Display action from Devices to View menu.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (4 diffs)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• runtime/UIActionPoolRuntime.cpp (modified) (7 diffs)
• runtime/UIActionPoolRuntime.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (6 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/UIMenuBarEditorWindow.cpp (modified) (2 diffs)
• runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -583 +583 @@
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings: strResult = "VideoCaptureSettings"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartVideoCapture:    strResult = "StartVideoCapture"; break;
+        case UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer:           strResult = "VRDEServer"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBar:              strResult = "MenuBar"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBarSettings:      strResult = "MenuBarSettings"; break;
@@ -617 +618 @@
     keys << "VideoCaptureSettings"; values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCaptureSettings;
     keys << "StartVideoCapture";    values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_StartVideoCapture;
+    keys << "VRDEServer";           values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer;
     keys << "MenuBar";              values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBar;
     keys << "MenuBarSettings";      values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_MenuBarSettings;
@@ -699 +701 @@
         case UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_SharedFolders:         strResult = "SharedFolders"; break;
         case UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_SharedFoldersSettings: strResult = "SharedFoldersSettings"; break;
-        case UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_VRDEServer:            strResult = "VRDEServer"; break;
         case UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_InstallGuestTools:     strResult = "InstallGuestTools"; break;
         case UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Nothing:               strResult = "Nothing"; break;
@@ -731 +732 @@
     keys << "SharedFolders";         values << UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_SharedFolders;
     keys << "SharedFoldersSettings"; values << UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_SharedFoldersSettings;
-    keys << "VRDEServer";            values << UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_VRDEServer;
     keys << "InstallGuestTools";     values << UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_InstallGuestTools;
     keys << "Nothing";               values << UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Nothing;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -391 +391 @@
         RuntimeMenuViewActionType_VideoCaptureSettings = RT_BIT(7),
         RuntimeMenuViewActionType_StartVideoCapture    = RT_BIT(8),
-        RuntimeMenuViewActionType_MenuBar              = RT_BIT(9),
-        RuntimeMenuViewActionType_MenuBarSettings      = RT_BIT(10),
-        RuntimeMenuViewActionType_ToggleMenuBar        = RT_BIT(11),
-        RuntimeMenuViewActionType_StatusBar            = RT_BIT(12),
-        RuntimeMenuViewActionType_StatusBarSettings    = RT_BIT(13),
-        RuntimeMenuViewActionType_ToggleStatusBar      = RT_BIT(14),
-        RuntimeMenuViewActionType_ScaleFactor          = RT_BIT(15),
-        RuntimeMenuViewActionType_Resize               = RT_BIT(16),
-        RuntimeMenuViewActionType_Multiscreen          = RT_BIT(17),
+        RuntimeMenuViewActionType_VRDEServer           = RT_BIT(9),
+        RuntimeMenuViewActionType_MenuBar              = RT_BIT(10),
+        RuntimeMenuViewActionType_MenuBarSettings      = RT_BIT(11),
+        RuntimeMenuViewActionType_ToggleMenuBar        = RT_BIT(12),
+        RuntimeMenuViewActionType_StatusBar            = RT_BIT(13),
+        RuntimeMenuViewActionType_StatusBarSettings    = RT_BIT(14),
+        RuntimeMenuViewActionType_ToggleStatusBar      = RT_BIT(15),
+        RuntimeMenuViewActionType_ScaleFactor          = RT_BIT(16),
+        RuntimeMenuViewActionType_Resize               = RT_BIT(17),
+        RuntimeMenuViewActionType_Multiscreen          = RT_BIT(18),
         RuntimeMenuViewActionType_All                  = 0xFFFF
     };
@@ -435 +436 @@
         RuntimeMenuDevicesActionType_SharedFolders         = RT_BIT(11),
         RuntimeMenuDevicesActionType_SharedFoldersSettings = RT_BIT(12),
-        RuntimeMenuDevicesActionType_VRDEServer            = RT_BIT(13),
-        RuntimeMenuDevicesActionType_InstallGuestTools     = RT_BIT(14),
-        RuntimeMenuDevicesActionType_Nothing               = RT_BIT(15),
+        RuntimeMenuDevicesActionType_InstallGuestTools     = RT_BIT(13),
+        RuntimeMenuDevicesActionType_Nothing               = RT_BIT(14),
         RuntimeMenuDevicesActionType_All                   = 0xFFFF
     };

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

@@ -730 +730 @@
 };
 
+class UIActionToggleVRDEServer : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionToggleVRDEServer(UIActionPool *pParent)
+        : UIActionToggle(pParent,
+                         ":/vrdp_on_16px.png", ":/vrdp_16px.png",
+                         ":/vrdp_on_disabled_16px.png", ":/vrdp_disabled_16px.png") {}
+
+protected:
+
+    /** Returns action extra-data ID. */
+    virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer; }
+    /** Returns action extra-data key. */
+    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer); }
+    /** Returns whether action is allowed. */
+    virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer); }
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("VRDPServer");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "R&emote Display"));
+        setStatusTip(QApplication::translate("UIActionPool", "Toggle remote desktop (RDP) connections to this machine"));
+    }
+};
+
 class UIActionMenuMenuBar : public UIActionMenu
 {
@@ -1507 +1539 @@
         setName(QApplication::translate("UIActionPool", "&Shared Folders Settings..."));
         setStatusTip(QApplication::translate("UIActionPool", "Create or modify shared folders"));
-    }
-};
-
-class UIActionToggleVRDEServer : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionToggleVRDEServer(UIActionPool *pParent)
-        : UIActionToggle(pParent,
-                         ":/vrdp_on_16px.png", ":/vrdp_16px.png",
-                         ":/vrdp_on_disabled_16px.png", ":/vrdp_disabled_16px.png") {}
-
-protected:
-
-    /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_VRDEServer; }
-    /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_VRDEServer); }
-    /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuDevices(UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_VRDEServer); }
-
-    QString shortcutExtraDataID() const
-    {
-        return QString("VRDPServer");
-    }
-
-    void retranslateUi()
-    {
-        setName(QApplication::translate("UIActionPool", "R&emote Display"));
-        setStatusTip(QApplication::translate("UIActionPool", "Toggle remote desktop (RDP) connections to this machine"));
     }
 };
@@ -2017 +2017 @@
     m_pool[UIActionIndexRT_M_View_M_VideoCapture_S_Settings] = new UIActionSimpleShowVideoCaptureSettingsDialog(this);
     m_pool[UIActionIndexRT_M_View_M_VideoCapture_T_Start] = new UIActionToggleVideoCapture(this);
+    m_pool[UIActionIndexRT_M_View_T_VRDEServer] = new UIActionToggleVRDEServer(this);
     m_pool[UIActionIndexRT_M_View_M_MenuBar] = new UIActionMenuMenuBar(this);
     m_pool[UIActionIndexRT_M_View_M_MenuBar_S_Settings] = new UIActionSimpleShowMenuBarSettingsWindow(this);
@@ -2051 +2052 @@
     m_pool[UIActionIndexRT_M_Devices_M_SharedFolders] = new UIActionMenuSharedFolders(this);
     m_pool[UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings] = new UIActionSimpleShowSharedFoldersSettingsDialog(this);
-    m_pool[UIActionIndexRT_M_Devices_T_VRDEServer] = new UIActionToggleVRDEServer(this);
     m_pool[UIActionIndexRT_M_Devices_S_InstallGuestTools] = new UIActionSimplePerformInstallGuestTools(this);
 
@@ -2177 +2177 @@
     if (!fExtensionPackOperationsAllowed)
     {
-        m_restrictedActionsMenuDevices[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)
-            (m_restrictedActionsMenuDevices[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_VRDEServer);
+        m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::RuntimeMenuViewActionType)
+            (m_restrictedActionsMenuView[UIActionRestrictionLevel_Base] | UIExtraDataMetaDefs::RuntimeMenuViewActionType_VRDEServer);
     }
 
@@ -2358 +2358 @@
     /* 'Video Capture Start' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_M_VideoCapture_T_Start)) || fSeparator;
+    /* 'VRDE Server' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_View_T_VRDEServer)) || fSeparator;
 
     /* Separator: */
@@ -2791 +2793 @@
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_SharedFolders)) || fSeparator;
     updateMenuDevicesSharedFolders();
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
     /* 'Shared Clipboard' submenu: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_SharedClipboard)) || fSeparator;
     /* 'Drag&Drop' submenu: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_M_DragAndDrop)) || fSeparator;
-
-    /* Separator: */
-    if (fSeparator)
-    {
-        pMenu->addSeparator();
-        fSeparator = false;
-    }
-
-    /* 'VRDE Server' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Devices_T_VRDEServer)) || fSeparator;
 
     /* Separator: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h

@@ -65 +65 @@
     UIActionIndexRT_M_View_M_VideoCapture_S_Settings,
     UIActionIndexRT_M_View_M_VideoCapture_T_Start,
+    UIActionIndexRT_M_View_T_VRDEServer,
     UIActionIndexRT_M_View_M_MenuBar,
     UIActionIndexRT_M_View_M_MenuBar_S_Settings,
@@ -99 +100 @@
     UIActionIndexRT_M_Devices_M_SharedFolders,
     UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings,
-    UIActionIndexRT_M_Devices_T_VRDEServer,
     UIActionIndexRT_M_Devices_S_InstallGuestTools,
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -930 +930 @@
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_VideoCapture_S_Settings));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_VideoCapture_T_Start));
+    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_S_Settings));
@@ -954 +955 @@
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings));
-    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Devices_T_VRDEServer));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Devices_S_InstallGuestTools));
 #ifdef Q_WS_MAC
@@ -1003 +1003 @@
     connect(actionPool()->action(UIActionIndexRT_M_View_M_VideoCapture_T_Start), SIGNAL(toggled(bool)),
             this, SLOT(sltToggleVideoCapture(bool)));
+    connect(actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer), SIGNAL(toggled(bool)),
+            this, SLOT(sltToggleVRDE(bool)));
 
     /* 'Input' actions connections: */
@@ -1026 +1028 @@
     connect(actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings), SIGNAL(triggered()),
             this, SLOT(sltOpenSharedFoldersSettingsDialog()));
-    connect(actionPool()->action(UIActionIndexRT_M_Devices_T_VRDEServer), SIGNAL(toggled(bool)),
-            this, SLOT(sltToggleVRDE(bool)));
     connect(actionPool()->action(UIActionIndexRT_M_Devices_S_InstallGuestTools), SIGNAL(triggered()),
             this, SLOT(sltInstallGuestAdditions()));
@@ -1631 +1631 @@
 }
 
-void UIMachineLogic::sltOpenVMSettingsDialog(const QString &strCategory /* = QString() */,
-                                             const QString &strControl /* = QString()*/)
-{
-    /* Do not process if window(s) missed! */
-    if (!isMachineWindowsCreated())
-        return;
-
-    /* Create VM settings window on the heap!
-     * Its necessary to allow QObject hierarchy cleanup to delete this dialog if necessary: */
-    QPointer<UISettingsDialogMachine> pDialog = new UISettingsDialogMachine(activeMachineWindow(),
-                                                                            machine().GetId(),
-                                                                            strCategory, strControl);
-    /* Executing VM settings window.
-     * This blocking function calls for the internal event-loop to process all further events,
-     * including event which can delete the dialog itself. */
-    pDialog->execute();
-    /* Delete dialog if its still valid: */
-    if (pDialog)
-        delete pDialog;
-
-    /* We can't rely on MediumChange events as they are not yet properly implemented within Main.
-     * We can't watch for MachineData change events as well as they are of broadcast type
-     * and console event-handler do not processing broadcast events.
-     * But we still want to be updated after possible medium changes at least if they were
-     * originated from our side. */
-    foreach (UIMachineWindow *pMachineWindow, machineWindows())
-        pMachineWindow->updateAppearanceOf(UIVisualElement_HDStuff | UIVisualElement_CDStuff | UIVisualElement_FDStuff);
-}
-
-void UIMachineLogic::sltOpenStorageSettingsDialog()
-{
-    /* Machine settings: Storage page: */
-    sltOpenVMSettingsDialog("#storage");
-}
-
-void UIMachineLogic::sltOpenNetworkSettingsDialog()
-{
-    /* Open VM settings : Network page: */
-    sltOpenVMSettingsDialog("#network");
-}
-
-void UIMachineLogic::sltOpenUSBDevicesSettingsDialog()
-{
-    /* Machine settings: Storage page: */
-    sltOpenVMSettingsDialog("#usb");
-}
-
-void UIMachineLogic::sltOpenSharedFoldersSettingsDialog()
-{
-    /* Do not process if additions are not loaded! */
-    if (!uisession()->isGuestAdditionsActive())
-        msgCenter().remindAboutGuestAdditionsAreNotActive();
-
-    /* Open VM settings : Shared folders page: */
-    sltOpenVMSettingsDialog("#sharedFolders");
-}
-
-void UIMachineLogic::sltMountStorageMedium()
-{
-    /* Sender action: */
-    QAction *pAction = qobject_cast<QAction*>(sender());
-    AssertMsgReturnVoid(pAction, ("This slot should only be called by menu action!\n"));
-
-    /* Current mount-target: */
-    const UIMediumTarget target = pAction->data().value<UIMediumTarget>();
-
-    /* Update current machine mount-target: */
-    vboxGlobal().updateMachineStorage(machine(), target);
-}
-
-void UIMachineLogic::sltAttachUSBDevice()
-{
-    /* Get and check sender action object: */
-    QAction *pAction = qobject_cast<QAction*>(sender());
-    AssertMsg(pAction, ("This slot should only be called on selecting USB menu item!\n"));
-
-    /* Get operation target: */
-    USBTarget target = pAction->data().value<USBTarget>();
-
-    /* Attach USB device: */
-    if (target.attach)
-    {
-        /* Try to attach corresponding device: */
-        console().AttachUSBDevice(target.id, QString(""));
-        /* Check if console is OK: */
-        if (!console().isOk())
-        {
-            /* Get current host: */
-            CHost host = vboxGlobal().host();
-            /* Search the host for the corresponding USB device: */
-            CHostUSBDevice hostDevice = host.FindUSBDeviceById(target.id);
-            /* Get USB device from host USB device: */
-            CUSBDevice device(hostDevice);
-            /* Show a message about procedure failure: */
-            msgCenter().cannotAttachUSBDevice(console(), vboxGlobal().details(device));
-        }
-    }
-    /* Detach USB device: */
-    else
-    {
-        /* Search the console for the corresponding USB device: */
-        CUSBDevice device = console().FindUSBDeviceById(target.id);
-        /* Try to detach corresponding device: */
-        console().DetachUSBDevice(target.id);
-        /* Check if console is OK: */
-        if (!console().isOk())
-        {
-            /* Show a message about procedure failure: */
-            msgCenter().cannotDetachUSBDevice(console(), vboxGlobal().details(device));
-        }
-    }
-}
-
-void UIMachineLogic::sltAttachWebCamDevice()
-{
-    /* Get and check sender action object: */
-    QAction *pAction = qobject_cast<QAction*>(sender());
-    AssertReturnVoid(pAction);
-
-    /* Get operation target: */
-    WebCamTarget target = pAction->data().value<WebCamTarget>();
-
-    /* Get current emulated USB: */
-    CEmulatedUSB dispatcher = console().GetEmulatedUSB();
-
-    /* Attach webcam device: */
-    if (target.attach)
-    {
-        /* Try to attach corresponding device: */
-        dispatcher.WebcamAttach(target.path, "");
-        /* Check if dispatcher is OK: */
-        if (!dispatcher.isOk())
-            msgCenter().cannotAttachWebCam(dispatcher, target.name, machineName());
-    }
-    /* Detach webcam device: */
-    else
-    {
-        /* Try to detach corresponding device: */
-        dispatcher.WebcamDetach(target.path);
-        /* Check if dispatcher is OK: */
-        if (!dispatcher.isOk())
-            msgCenter().cannotDetachWebCam(dispatcher, target.name, machineName());
-    }
-}
-
-void UIMachineLogic::sltChangeSharedClipboardType(QAction *pAction)
-{
-    /* Assign new mode (without save): */
-    KClipboardMode mode = pAction->data().value<KClipboardMode>();
-    machine().SetClipboardMode(mode);
-}
-
-/** Toggles network adapter's <i>Cable Connected</i> state. */
-void UIMachineLogic::sltToggleNetworkAdapterConnection()
-{
-    /* Get and check 'the sender' action object: */
-    QAction *pAction = qobject_cast<QAction*>(sender());
-    AssertReturnVoid(pAction);
-
-    /* Get operation target: */
-    CNetworkAdapter adapter = machine().GetNetworkAdapter((ULONG)pAction->property("slot").toInt());
-    AssertReturnVoid(machine().isOk() && !adapter.isNull());
-
-    /* Connect/disconnect cable to/from target: */
-    adapter.SetCableConnected(!adapter.GetCableConnected());
-    machine().SaveSettings();
-    if (!machine().isOk())
-        msgCenter().cannotSaveMachineSettings(machine());
-}
-
-void UIMachineLogic::sltChangeDragAndDropType(QAction *pAction)
-{
-    /* Assign new mode (without save): */
-    KDnDMode mode = pAction->data().value<KDnDMode>();
-    machine().SetDnDMode(mode);
-}
-
 void UIMachineLogic::sltToggleVRDE(bool fEnabled)
 {
@@ -1853 +1676 @@
 }
 
+void UIMachineLogic::sltOpenVMSettingsDialog(const QString &strCategory /* = QString() */,
+                                             const QString &strControl /* = QString()*/)
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Create VM settings window on the heap!
+     * Its necessary to allow QObject hierarchy cleanup to delete this dialog if necessary: */
+    QPointer<UISettingsDialogMachine> pDialog = new UISettingsDialogMachine(activeMachineWindow(),
+                                                                            machine().GetId(),
+                                                                            strCategory, strControl);
+    /* Executing VM settings window.
+     * This blocking function calls for the internal event-loop to process all further events,
+     * including event which can delete the dialog itself. */
+    pDialog->execute();
+    /* Delete dialog if its still valid: */
+    if (pDialog)
+        delete pDialog;
+
+    /* We can't rely on MediumChange events as they are not yet properly implemented within Main.
+     * We can't watch for MachineData change events as well as they are of broadcast type
+     * and console event-handler do not processing broadcast events.
+     * But we still want to be updated after possible medium changes at least if they were
+     * originated from our side. */
+    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+        pMachineWindow->updateAppearanceOf(UIVisualElement_HDStuff | UIVisualElement_CDStuff | UIVisualElement_FDStuff);
+}
+
+void UIMachineLogic::sltOpenStorageSettingsDialog()
+{
+    /* Machine settings: Storage page: */
+    sltOpenVMSettingsDialog("#storage");
+}
+
+void UIMachineLogic::sltOpenNetworkSettingsDialog()
+{
+    /* Open VM settings : Network page: */
+    sltOpenVMSettingsDialog("#network");
+}
+
+void UIMachineLogic::sltOpenUSBDevicesSettingsDialog()
+{
+    /* Machine settings: Storage page: */
+    sltOpenVMSettingsDialog("#usb");
+}
+
+void UIMachineLogic::sltOpenSharedFoldersSettingsDialog()
+{
+    /* Do not process if additions are not loaded! */
+    if (!uisession()->isGuestAdditionsActive())
+        msgCenter().remindAboutGuestAdditionsAreNotActive();
+
+    /* Open VM settings : Shared folders page: */
+    sltOpenVMSettingsDialog("#sharedFolders");
+}
+
+void UIMachineLogic::sltMountStorageMedium()
+{
+    /* Sender action: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertMsgReturnVoid(pAction, ("This slot should only be called by menu action!\n"));
+
+    /* Current mount-target: */
+    const UIMediumTarget target = pAction->data().value<UIMediumTarget>();
+
+    /* Update current machine mount-target: */
+    vboxGlobal().updateMachineStorage(machine(), target);
+}
+
+void UIMachineLogic::sltAttachUSBDevice()
+{
+    /* Get and check sender action object: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertMsg(pAction, ("This slot should only be called on selecting USB menu item!\n"));
+
+    /* Get operation target: */
+    USBTarget target = pAction->data().value<USBTarget>();
+
+    /* Attach USB device: */
+    if (target.attach)
+    {
+        /* Try to attach corresponding device: */
+        console().AttachUSBDevice(target.id, QString(""));
+        /* Check if console is OK: */
+        if (!console().isOk())
+        {
+            /* Get current host: */
+            CHost host = vboxGlobal().host();
+            /* Search the host for the corresponding USB device: */
+            CHostUSBDevice hostDevice = host.FindUSBDeviceById(target.id);
+            /* Get USB device from host USB device: */
+            CUSBDevice device(hostDevice);
+            /* Show a message about procedure failure: */
+            msgCenter().cannotAttachUSBDevice(console(), vboxGlobal().details(device));
+        }
+    }
+    /* Detach USB device: */
+    else
+    {
+        /* Search the console for the corresponding USB device: */
+        CUSBDevice device = console().FindUSBDeviceById(target.id);
+        /* Try to detach corresponding device: */
+        console().DetachUSBDevice(target.id);
+        /* Check if console is OK: */
+        if (!console().isOk())
+        {
+            /* Show a message about procedure failure: */
+            msgCenter().cannotDetachUSBDevice(console(), vboxGlobal().details(device));
+        }
+    }
+}
+
+void UIMachineLogic::sltAttachWebCamDevice()
+{
+    /* Get and check sender action object: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertReturnVoid(pAction);
+
+    /* Get operation target: */
+    WebCamTarget target = pAction->data().value<WebCamTarget>();
+
+    /* Get current emulated USB: */
+    CEmulatedUSB dispatcher = console().GetEmulatedUSB();
+
+    /* Attach webcam device: */
+    if (target.attach)
+    {
+        /* Try to attach corresponding device: */
+        dispatcher.WebcamAttach(target.path, "");
+        /* Check if dispatcher is OK: */
+        if (!dispatcher.isOk())
+            msgCenter().cannotAttachWebCam(dispatcher, target.name, machineName());
+    }
+    /* Detach webcam device: */
+    else
+    {
+        /* Try to detach corresponding device: */
+        dispatcher.WebcamDetach(target.path);
+        /* Check if dispatcher is OK: */
+        if (!dispatcher.isOk())
+            msgCenter().cannotDetachWebCam(dispatcher, target.name, machineName());
+    }
+}
+
+void UIMachineLogic::sltChangeSharedClipboardType(QAction *pAction)
+{
+    /* Assign new mode (without save): */
+    KClipboardMode mode = pAction->data().value<KClipboardMode>();
+    machine().SetClipboardMode(mode);
+}
+
+/** Toggles network adapter's <i>Cable Connected</i> state. */
+void UIMachineLogic::sltToggleNetworkAdapterConnection()
+{
+    /* Get and check 'the sender' action object: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertReturnVoid(pAction);
+
+    /* Get operation target: */
+    CNetworkAdapter adapter = machine().GetNetworkAdapter((ULONG)pAction->property("slot").toInt());
+    AssertReturnVoid(machine().isOk() && !adapter.isNull());
+
+    /* Connect/disconnect cable to/from target: */
+    adapter.SetCableConnected(!adapter.GetCableConnected());
+    machine().SaveSettings();
+    if (!machine().isOk())
+        msgCenter().cannotSaveMachineSettings(machine());
+}
+
+void UIMachineLogic::sltChangeDragAndDropType(QAction *pAction)
+{
+    /* Assign new mode (without save): */
+    KDnDMode mode = pAction->data().value<KDnDMode>();
+    machine().SetDnDMode(mode);
+}
+
 void UIMachineLogic::sltInstallGuestAdditions()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -263 +263 @@
     void sltOpenVideoCaptureOptions();
     void sltToggleVideoCapture(bool fEnabled);
+    void sltToggleVRDE(bool fEnabled);
 
     /* "Device" menu functionality: */
@@ -276 +277 @@
     void sltToggleNetworkAdapterConnection();
     void sltChangeDragAndDropType(QAction *pAction);
-    void sltToggleVRDE(bool fEnabled);
     void sltInstallGuestAdditions();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMenuBarEditorWindow.cpp

@@ -498 +498 @@
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_S_TakeScreenshot));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_M_VideoCapture_T_Start));
+        prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer));
         pMenu->addSeparator();
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_View_M_MenuBar));
@@ -536 +537 @@
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_WebCams));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_SharedFolders));
+        pMenu->addSeparator();
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_SharedClipboard));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_M_DragAndDrop));
-        pMenu->addSeparator();
-        prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_T_VRDEServer));
         pMenu->addSeparator();
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Devices_S_InstallGuestTools));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -752 +752 @@
     // TODO: Is this status can be changed at runtime?
     //       Because if no => the place for that stuff is in prepareActions().
-    actionPool()->action(UIActionIndexRT_M_Devices_T_VRDEServer)->setVisible(fIsVRDEServerAvailable);
+    actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->setVisible(fIsVRDEServerAvailable);
     /* Check/Uncheck VRDE action depending on VRDE server activity status: */
     if (fIsVRDEServerAvailable)
-        actionPool()->action(UIActionIndexRT_M_Devices_T_VRDEServer)->setChecked(server.GetEnabled());
+        actionPool()->action(UIActionIndexRT_M_View_T_VRDEServer)->setChecked(server.GetEnabled());
     /* Notify listeners about VRDE change: */
     emit sigVRDEChange();