Changeset 45271 in vbox

Timestamp:

Apr 1, 2013 12:03:35 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84661

Message:

FE/Qt: Global: Open-session mechanism cleanup/rework.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIMessageCenter.cpp (modified) (1 diff)
• UIMessageCenter.h (modified) (1 diff)
• VBoxGlobal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -386 +386 @@
 }
 
-void UIMessageCenter::cannotFindMachineByName(const CVirtualBox &vbox, const QString &name)
+void UIMessageCenter::cannotFindMachineByName(const CVirtualBox &vbox, const QString &strName)
 {
     message(0, MessageType_Error,
-            tr("There is no virtual machine named <b>%1</b>.").arg(name),
+            tr("There is no virtual machine named <b>%1</b>.").arg(strName),
+            formatErrorInfo(vbox));
+}
+
+void UIMessageCenter::cannotFindMachineById(const CVirtualBox &vbox, const QString &strId)
+{
+    message(0, MessageType_Error,
+            tr("There is no virtual machine with id <b>%1</b>.").arg(strId),
             formatErrorInfo(vbox));
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -202 +202 @@
     void cannotLoadGlobalConfig(const CVirtualBox &vbox, const QString &strError);
     void cannotSaveGlobalConfig(const CVirtualBox &vbox);
-    void cannotFindMachineByName(const CVirtualBox &vbox, const QString &name);
+    void cannotFindMachineByName(const CVirtualBox &vbox, const QString &strName);
+    void cannotFindMachineById(const CVirtualBox &vbox, const QString &strId);
     void cannotOpenSession(const CSession &session);
     void cannotOpenSession(const CVirtualBox &vbox, const CMachine &machine, const CProgress &progress = CProgress());

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -1725 +1725 @@
 }
 
-/**
- *  Opens a direct session for a machine with the given ID.
- *  This method does user-friendly error handling (display error messages, etc.).
- *  and returns a null CSession object in case of any error.
- *  If this method succeeds, don't forget to close the returned session when
- *  it is no more necessary.
- *
- *  @param aId          Machine ID.
- *  @param aLockType    @c KLockType_Shared to open an existing session with
- *                      the machine which is already running, @c KLockType_Write
- *                      to open a new direct session, @c KLockType_VM to open
- *                      a new session for running a VM in this process.
- */
-CSession VBoxGlobal::openSession(const QString &aId, KLockType aLockType /* = KLockType_Shared */)
-{
+CSession VBoxGlobal::openSession(const QString &strId, KLockType lockType /* = KLockType_Shared */)
+{
+    /* Create empty session instance: */
     CSession session;
     session.createInstance(CLSID_Session);
     if (session.isNull())
     {
-        msgCenter().cannotOpenSession (session);
+        msgCenter().cannotOpenSession(session);
         return session;
     }
 
-    CMachine foundMachine = CVirtualBox(mVBox).FindMachine(aId);
-    if (!foundMachine.isNull())
-    {
-        foundMachine.LockMachine(session, aLockType);
-        if (session.GetType() == KSessionType_Shared)
-        {
-            CMachine machine = session.GetMachine();
-            /* Make sure that the language is in two letter code.
-             * Note: if languageId() returns an empty string lang.name() will
-             * return "C" which is an valid language code. */
-            QLocale lang(VBoxGlobal::languageId());
-            machine.SetGuestPropertyValue ("/VirtualBox/HostInfo/GUI/LanguageID", lang.name());
-        }
-    }
-
-    if (!foundMachine.isOk())
-    {
-        msgCenter().cannotOpenSession(foundMachine);
+    /* Search for the corresponding machine: */
+    CMachine machine = mVBox.FindMachine(strId);
+    if (machine.isNull())
+    {
+        msgCenter().cannotFindMachineById(mVBox, strId);
+        return session;
+    }
+
+    /* Lock found machine to session: */
+    machine.LockMachine(session, lockType);
+
+    /* Pass the language ID as the property to the guest: */
+    if (session.GetType() == KSessionType_Shared)
+    {
+        CMachine startedMachine = session.GetMachine();
+        /* Make sure that the language is in two letter code.
+         * Note: if languageId() returns an empty string lang.name() will
+         * return "C" which is an valid language code. */
+        QLocale lang(VBoxGlobal::languageId());
+        startedMachine.SetGuestPropertyValue("/VirtualBox/HostInfo/GUI/LanguageID", lang.name());
+    }
+
+    /* Show locking errors if any: */
+    if (!machine.isOk())
+    {
+        msgCenter().cannotOpenSession(machine);
         session.detach();
     }
     else if (!mVBox.isOk())
     {
-        msgCenter().cannotOpenSession(mVBox, foundMachine);
+        msgCenter().cannotOpenSession(mVBox, machine);
         session.detach();
     }
 
+    /* Return resulting session: */
     return session;
 }