Changeset 5139 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 2, 2007 11:36:46 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt: Offer registration again if the registration data is missing or invalid (i.e. manually modified).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)

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

@@ -377 +377 @@
 #endif
 
-    void callRegistration();
+    void checkRegistration();
 
     CSession openSession (const QUuid &id);

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

@@ -1650 +1650 @@
 #endif
 
-void VBoxGlobal::callRegistration()
-{
-    /* Check if the automatic registration already passed */
-    QString regData = virtualBox().GetExtraData (VBoxDefs::GUI_RegistrationData);
-    if (regData.startsWith ("triesLeft="))
-    {
-        QString triesLeft = regData.section ("=", 1, 1);
-        if (triesLeft == "0")
-            return;
-    }
-    else if (!regData.isEmpty())
+void VBoxGlobal::checkRegistration()
+{
+#ifdef VBOX_WITH_REGISTRATION
+    if (!VBoxRegistrationDlg::hasToBeShown())
         return;
 
-    /* Store the winid of main app wgt to ensure only one reg dlg running */
+    /* 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()));
+                               QString ("%1").arg ((long) qApp->mainWidget()->winId()));
+#endif
 }
 

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

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