Changeset 5160 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 4, 2007 4:31:41 PM (18 years ago)

Author:

vboxsync

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

25055

Message:

FE/Qt: Cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (1 diff)
• include/VBoxDefs.h (modified) (1 diff)
• include/VBoxGlobal.h (modified) (5 diffs)
• include/VBoxSelectorWnd.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)
• src/VBoxGlobal.cpp (modified) (8 diffs)
• src/VBoxSelectorWnd.cpp (modified) (3 diffs)
• src/main.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -186 +186 @@
     void onExitFullscreen();
 
-    void onToggleRegMenuItem (bool aEnable);
-
 private:
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -132 +132 @@
         MachineDataChangeEventType,
         MachineRegisteredEventType,
-        ShowRegDlgEventType,
-        ToggleRegMenuItemEvent,
         SessionStateChangeEventType,
         SnapshotEventType,
+        CanShowRegDlgEventType,
         NetworkAdapterChangeEventType,
         USBCtlStateChangeEventType,

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -100 +100 @@
 };
 
-class VBoxShowRegDlgEvent : public QEvent
-{
-public:
-    VBoxShowRegDlgEvent()
-        : QEvent ((QEvent::Type) VBoxDefs::ShowRegDlgEventType)
-        {}
-};
-
-class VBoxToggleRegMenuItem : public QEvent
-{
-public:
-    VBoxToggleRegMenuItem (bool aEnable)
-        : QEvent ((QEvent::Type) VBoxDefs::ToggleRegMenuItemEvent)
-        , mEnable (aEnable)
-        {}
-
-    bool mEnable;
-};
-
 class VBoxSessionStateChangeEvent : public QEvent
 {
@@ -148 +129 @@
     const QUuid machineId;
     const QUuid snapshotId;
+};
+
+class VBoxCanShowRegDlgEvent : public QEvent
+{
+public:
+    VBoxCanShowRegDlgEvent (bool aCanShow)
+        : QEvent ((QEvent::Type) VBoxDefs::CanShowRegDlgEventType)
+        , mCanShow (aCanShow)
+        {}
+
+    const bool mCanShow;
 };
 
@@ -516 +508 @@
     void sessionStateChanged (const VBoxSessionStateChangeEvent &e);
     void snapshotChanged (const VBoxSnapshotEvent &e);
-    void toggleRegMenuItem (bool aEnable);
+
+    void canShowRegDlg (bool aCanShow);
 
 public slots:
@@ -522 +515 @@
     bool openURL (const QString &aURL);
 
-    void checkRegistration (bool aForced = true);
+    void showRegistrationDialog (bool aForce = true);
 
 protected:
@@ -528 +521 @@
     bool event (QEvent *e);
     bool eventFilter (QObject *, QEvent *);
-
-    void showRegistrationDialog();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/include/VBoxSelectorWnd.h

@@ -103 +103 @@
     void snapshotChanged (const VBoxSnapshotEvent &e);
 
-    void onToggleRegMenuItem (bool aEnable);
-
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -267 +267 @@
     helpRegisterAction = new QAction (this, "helpRegisterAction");
     helpRegisterAction->setIconSet (VBoxGlobal::iconSet ("register_16px.png",
-                                                "register_disabled_16px.png"));
+                                                         "register_disabled_16px.png"));
     helpAboutAction = new QAction (this, "helpAboutAction");
     helpAboutAction->setIconSet (VBoxGlobal::iconSet ("about_16px.png"));
@@ -533 +533 @@
              &vboxProblem(), SLOT (showHelpWebDialog()));
     connect (helpRegisterAction, SIGNAL (activated()),
-             &vboxGlobal(), SLOT (checkRegistration()));
-    connect (&vboxGlobal(), SIGNAL (toggleRegMenuItem (bool)),
-             this, SLOT (onToggleRegMenuItem (bool)));
+             &vboxGlobal(), SLOT (showRegistrationDialog()));
+    connect (&vboxGlobal(), SIGNAL (canShowRegDlg (bool)),
+             helpRegisterAction, SLOT (setEnabled (bool)));
     connect (helpAboutAction, SIGNAL (activated()),
              &vboxProblem(), SLOT (showHelpAboutDialog()));
@@ -1023 +1023 @@
     console->setIgnoreMainwndResize (false);
     console->normalizeGeometry (true /* adjustPosition */);
-}
-
-void VBoxConsoleWnd::onToggleRegMenuItem (bool aEnable)
-{
-    helpRegisterAction->setEnabled (aEnable);
 }
 

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

@@ -131 +131 @@
 public:
 
-    VBoxCallback (VBoxGlobal &aGlobal) : global (aGlobal), mShowRegDlg (false)
+    VBoxCallback (VBoxGlobal &aGlobal)
+        : mGlobal (aGlobal), mIsRegDlgOwner (false)
     {
 #if defined (Q_OS_WIN32)
@@ -211 +212 @@
                 if (sKey == VBoxDefs::GUI_RegistrationDlgWinID)
                 {
-                    if (mShowRegDlg)
+                    if (mIsRegDlgOwner)
                     {
                         if (sVal.isEmpty() ||
@@ -261 +262 @@
                     if (sVal.isEmpty())
                     {
-                        mShowRegDlg = false;
-                        QApplication::postEvent (&global, new VBoxToggleRegMenuItem (true));
+                        mIsRegDlgOwner = false;
+                        QApplication::postEvent (&mGlobal, new VBoxCanShowRegDlgEvent (true));
                     }
-                    else if (sVal == QString ("%1").arg ((long)qApp->mainWidget()->winId()))
+                    else if (sVal == QString ("%1").arg ((long) qApp->mainWidget()->winId()))
                     {
-                        mShowRegDlg = true;
-                        QApplication::postEvent (&global, new VBoxToggleRegMenuItem (true));
-                        QApplication::postEvent (&global, new VBoxShowRegDlgEvent());
+                        mIsRegDlgOwner = true;
+                        QApplication::postEvent (&mGlobal, new VBoxCanShowRegDlgEvent (true));
                     }
                     else
-                        QApplication::postEvent (&global, new VBoxToggleRegMenuItem (false));
+                        QApplication::postEvent (&mGlobal, new VBoxCanShowRegDlgEvent (false));
                 }
 
-                mutex.lock();
-                global.gset.setPublicProperty (sKey, sVal);
-                mutex.unlock();
-                Assert (!!global.gset);
+                mMutex.lock();
+                mGlobal.gset.setPublicProperty (sKey, sVal);
+                mMutex.unlock();
+                Assert (!!mGlobal.gset);
             }
         }
@@ -339 +339 @@
         // to handle VirtualBox callback events in the execution console mode)
 
-        if (!global.isVMConsoleProcess())
-            QApplication::postEvent (&global, e);
-    }
-
-    VBoxGlobal &global;
+        if (!mGlobal.isVMConsoleProcess())
+            QApplication::postEvent (&mGlobal, e);
+    }
+
+    VBoxGlobal &mGlobal;
 
     /** protects #OnExtraDataChange() */
-    QMutex mutex;
-
-    bool mShowRegDlg;
+    QMutex mMutex;
+
+    bool mIsRegDlgOwner;
 
 #if defined (Q_OS_WIN32)
@@ -1669 +1669 @@
 }
 #endif
-
-void VBoxGlobal::checkRegistration (bool aForced)
-{
-#ifdef VBOX_WITH_REGISTRATION
-    if (!aForced && !VBoxRegistrationDlg::hasToBeShown())
-        return;
-
-    if (mRegDlg)
-    {
-        /* Show already opened registration dialog */
-        mRegDlg->setWindowState (mRegDlg->windowState() & ~WindowMinimized);
-        mRegDlg->raise();
-        mRegDlg->setActiveWindow();
-    }
-    /* Store the ID of the main window to ensure that only one registration
-     * dialog is shown at a time. This operation will implicitly cause the
-     * dialog to show if it's not already shown. */
-    else
-        virtualBox().SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID,
-            QString ("%1").arg ((long) qApp->mainWidget()->winId()));
-#endif
-}
-
-void VBoxGlobal::showRegistrationDialog()
-{
-#ifdef VBOX_WITH_REGISTRATION
-    if (!mRegDlg)
-    {
-        /* Create new registration dialog */
-        VBoxRegistrationDlg *dlg =
-            new VBoxRegistrationDlg (0, 0, false, WDestructiveClose);
-        dlg->setup (&mRegDlg);
-        Assert (dlg == mRegDlg);
-        mRegDlg->show();
-    }
-#endif
-}
 
 /**
@@ -3444 +3407 @@
 }
 
+void VBoxGlobal::showRegistrationDialog (bool aForce)
+{
+#ifdef VBOX_WITH_REGISTRATION
+    if (!aForce && !VBoxRegistrationDlg::hasToBeShown())
+        return;
+
+    if (mRegDlg)
+    {
+        /* Show the already opened registration dialog */
+        mRegDlg->setWindowState (mRegDlg->windowState() & ~WindowMinimized);
+        mRegDlg->raise();
+        mRegDlg->setActiveWindow();
+    }
+    else
+    {
+        /* Store the ID of the main window to ensure that only one
+         * registration dialog is shown at a time. Due to manipulations with
+         * OnExtraDataCanChange() and OnExtraDataChange() signals, this extra
+         * data item acts like an inter-process mutex, so the first process
+         * that attempts to set it will win, the rest will get a failure from
+         * the SetExtraData() call. */
+        mVBox.SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID,
+            QString ("%1").arg ((long) qApp->mainWidget()->winId()));
+
+        if (mVBox.isOk())
+        {
+            /* We've got the "mutex", create a new registration dialog */
+            VBoxRegistrationDlg *dlg =
+                new VBoxRegistrationDlg (0, 0, false, WDestructiveClose);
+            dlg->setup (&mRegDlg);
+            Assert (dlg == mRegDlg);
+            mRegDlg->show();
+        }
+    }
+#endif
+}
+
 // Protected members
 ////////////////////////////////////////////////////////////////////////////////
@@ -3512 +3512 @@
             return true;
         }
-        case VBoxDefs::ShowRegDlgEventType:
-        {
-            showRegistrationDialog();
-            return true;
-        }
-        case VBoxDefs::ToggleRegMenuItemEvent:
-        {
-            emit toggleRegMenuItem (((VBoxToggleRegMenuItem *)e)->mEnable);
-            return true;
-        }
         case VBoxDefs::SessionStateChangeEventType:
         {
@@ -3530 +3520 @@
         {
             emit snapshotChanged (*(VBoxSnapshotEvent *) e);
+            return true;
+        }
+        case VBoxDefs::CanShowRegDlgEventType:
+        {
+            emit canShowRegDlg (((VBoxCanShowRegDlgEvent *) e)->mCanShow);
             return true;
         }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -431 +431 @@
     helpRegisterAction = new QAction (this, "helpRegisterAction");
     helpRegisterAction->setIconSet (VBoxGlobal::iconSet ("register_16px.png",
-                                                "register_disabled_16px.png"));
+                                                         "register_disabled_16px.png"));
     helpAboutAction = new QAction (this, "helpAboutAction");
     helpAboutAction->setIconSet (VBoxGlobal::iconSet ("about_16px.png"));
@@ -594 +594 @@
              &vboxProblem(), SLOT (showHelpWebDialog()));
     connect (helpRegisterAction, SIGNAL (activated()),
-             &vboxGlobal(), SLOT (checkRegistration()));
-    connect (&vboxGlobal(), SIGNAL (toggleRegMenuItem (bool)),
-             this, SLOT (onToggleRegMenuItem (bool)));
+             &vboxGlobal(), SLOT (showRegistrationDialog()));
+    connect (&vboxGlobal(), SIGNAL (canShowRegDlg (bool)),
+             helpRegisterAction, SLOT (setEnabled (bool)));
     connect (helpAboutAction, SIGNAL (activated()),
              &vboxProblem(), SLOT (showHelpAboutDialog()));
@@ -1391 +1391 @@
 }
 
-void VBoxSelectorWnd::onToggleRegMenuItem (bool aEnable)
-{
-    helpRegisterAction->setEnabled (aEnable);
-}
-
 #include "VBoxSelectorWnd.moc"

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -234 +234 @@
                 if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
                 {
-                    vboxGlobal().checkRegistration (false);
+                    vboxGlobal().showRegistrationDialog (false /* aForce */);
                     rc = a.exec();
                 }
@@ -245 +245 @@
             {
                 a.setMainWidget (&vboxGlobal().selectorWnd());
-                vboxGlobal().checkRegistration (false);
+                vboxGlobal().showRegistrationDialog (false /* aForce */);
                 vboxGlobal().selectorWnd().show();
                 vboxGlobal().startEnumeratingMedia();