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

Timestamp:

Oct 3, 2007 12:05:25 PM (17 years ago)

Author:

vboxsync

Message:

2332: Registration feature:

Make one Registration Dialog allowed to be run in one time (for different COM-clients: VBoxSelector & VBoxConsole's).

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) (7 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

@@ -133 +133 @@
         MachineRegisteredEventType,
         ShowRegDlgEventType,
+        ToggleRegMenuItemEvent,
         SessionStateChangeEventType,
         SnapshotEventType,

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

@@ -108 +108 @@
 };
 
+class VBoxToggleRegMenuItem : public QEvent
+{
+public:
+    VBoxToggleRegMenuItem (bool aEnable)
+        : QEvent ((QEvent::Type) VBoxDefs::ToggleRegMenuItemEvent)
+        , mEnable (aEnable)
+        {}
+
+    bool mEnable;
+};
+
 class VBoxSessionStateChangeEvent : public QEvent
 {
@@ -376 +387 @@
     bool showVirtualBoxLicense();
 #endif
-
-    void checkRegistration();
 
     CSession openSession (const QUuid &id);
@@ -507 +516 @@
     void sessionStateChanged (const VBoxSessionStateChangeEvent &e);
     void snapshotChanged (const VBoxSnapshotEvent &e);
+    void toggleRegMenuItem (bool aEnable);
 
 public slots:
@@ -512 +522 @@
     bool openURL (const QString &aURL);
 
-    void showRegistrationDialog();
+    void checkRegistration (bool aForced = true);
 
 protected:
@@ -518 +528 @@
     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

@@ -378 +378 @@
 #ifdef VBOX_WITH_REGISTRATION
     helpRegisterAction->addTo (helpMenu);
+    helpRegisterAction->setEnabled (vboxGlobal().virtualBox().
+        GetExtraData (VBoxDefs::GUI_RegistrationDlgWinID).isEmpty());
 #endif
     helpAboutAction->addTo( helpMenu );
@@ -530 +532 @@
              &vboxProblem(), SLOT (showHelpWebDialog()));
     connect (helpRegisterAction, SIGNAL (activated()),
-             &vboxGlobal(), SLOT (showRegistrationDialog()));
+             &vboxGlobal(), SLOT (checkRegistration()));
+    connect (&vboxGlobal(), SIGNAL (toggleRegMenuItem (bool)),
+             this, SLOT (onToggleRegMenuItem (bool)));
     connect (helpAboutAction, SIGNAL (activated()),
              &vboxProblem(), SLOT (showHelpAboutDialog()));
@@ -1018 +1022 @@
     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)
+    VBoxCallback (VBoxGlobal &aGlobal) : global (aGlobal), mShowRegDlg (false)
     {
 #if defined (Q_OS_WIN32)
@@ -209 +209 @@
             if (sKey.startsWith ("GUI/"))
             {
-                if (!sVal.isEmpty() &&
-                    sKey == VBoxDefs::GUI_RegistrationDlgWinID)
+                if (sKey == VBoxDefs::GUI_RegistrationDlgWinID)
                 {
-                    if (sVal == QString ("%1")
-                        .arg ((long)qApp->mainWidget()->winId()))
+                    if (mShowRegDlg)
                     {
-                        *allowChange = TRUE;
-                        QApplication::postEvent (&global, new VBoxShowRegDlgEvent());
+                        if (sVal.isEmpty() ||
+                            sVal == QString ("%1").arg ((long)qApp->mainWidget()->winId()))
+                            *allowChange = TRUE;
+                        else
+                            *allowChange = FALSE;
                     }
                     else
-                        *allowChange = FALSE;
+                        *allowChange = TRUE;
                     return S_OK;
                 }
@@ -256 +257 @@
             if (sKey.startsWith ("GUI/"))
             {
+                if (sKey == VBoxDefs::GUI_RegistrationDlgWinID)
+                {
+                    if (sVal.isEmpty())
+                    {
+                        mShowRegDlg = false;
+                        QApplication::postEvent (&global, new VBoxToggleRegMenuItem (true));
+                    }
+                    else if (sVal == QString ("%1").arg ((long)qApp->mainWidget()->winId()))
+                    {
+                        mShowRegDlg = true;
+                        QApplication::postEvent (&global, new VBoxToggleRegMenuItem (true));
+                        QApplication::postEvent (&global, new VBoxShowRegDlgEvent());
+                    }
+                    else
+                        QApplication::postEvent (&global, new VBoxToggleRegMenuItem (false));
+                }
+
                 mutex.lock();
                 global.gset.setPublicProperty (sKey, sVal);
@@ -329 +347 @@
     /** protects #OnExtraDataChange() */
     QMutex mutex;
+
+    bool mShowRegDlg;
 
 #if defined (Q_OS_WIN32)
@@ -1650 +1670 @@
 #endif
 
-void VBoxGlobal::checkRegistration()
+void VBoxGlobal::checkRegistration (bool aForced)
 {
 #ifdef VBOX_WITH_REGISTRATION
-    if (!VBoxRegistrationDlg::hasToBeShown())
+    if (!aForced && !VBoxRegistrationDlg::hasToBeShown())
         return;
 
-    /* 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. */
-    virtualBox().SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID,
-                               QString ("%1").arg ((long) qApp->mainWidget()->winId()));
-#endif
-}
-
-void VBoxGlobal::showRegistrationDialog()
-{
-#ifdef VBOX_WITH_REGISTRATION
     if (mRegDlg)
     {
@@ -1674 +1683 @@
         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 */
@@ -3496 +3517 @@
             return true;
         }
+        case VBoxDefs::ToggleRegMenuItemEvent:
+        {
+            emit toggleRegMenuItem (((VBoxToggleRegMenuItem *)e)->mEnable);
+            return true;
+        }
         case VBoxDefs::SessionStateChangeEventType:
         {

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

@@ -530 +530 @@
 #ifdef VBOX_WITH_REGISTRATION
     helpRegisterAction->addTo (helpMenu);
+    helpRegisterAction->setEnabled (vboxGlobal().virtualBox().
+        GetExtraData (VBoxDefs::GUI_RegistrationDlgWinID).isEmpty());
 #endif
     helpAboutAction->addTo (helpMenu);
@@ -591 +593 @@
              &vboxProblem(), SLOT (showHelpWebDialog()));
     connect (helpRegisterAction, SIGNAL (activated()),
-             &vboxGlobal(), SLOT (showRegistrationDialog()));
+             &vboxGlobal(), SLOT (checkRegistration()));
+    connect (&vboxGlobal(), SIGNAL (toggleRegMenuItem (bool)),
+             this, SLOT (onToggleRegMenuItem (bool)));
     connect (helpAboutAction, SIGNAL (activated()),
              &vboxProblem(), SLOT (showHelpAboutDialog()));
@@ -1386 +1390 @@
 }
 
+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();
+                    vboxGlobal().checkRegistration (false);
                     rc = a.exec();
                 }
@@ -245 +245 @@
             {
                 a.setMainWidget (&vboxGlobal().selectorWnd());
-                vboxGlobal().checkRegistration();
+                vboxGlobal().checkRegistration (false);
                 vboxGlobal().selectorWnd().show();
                 vboxGlobal().startEnumeratingMedia();