Changeset 5022 in vbox for trunk/src

Timestamp:

Sep 25, 2007 1:56:26 PM (17 years ago)

Author:

vboxsync

Message:

First version of VirtualBox Registration Dialog implemented.
Non-modal dialog (which appears maximum 3 times if rejected and 1 time if accepted).
Confirm button inaccessible for 5 seconds after dialog startup.
User should input his name and correct email address to Confirm registration.
After that inner mechanism tries to connect to required *.php script performs handshake and registration.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxUI.pro (modified) (1 diff)
• include/VBoxDefs.h (modified) (2 diffs)
• include/VBoxGlobal.h (modified) (4 diffs)
• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxDefs.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (6 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -103 +103 @@
         include/VBoxConsoleView.h \
         include/VBoxProblemReporter.h \
-        include/VBoxDownloaderWgt.h
+        include/VBoxDownloaderWgt.h \
+        include/VBoxNetworkFramework.h
 
 # Sources containing local definitions of classes that use the Q_OBJECT macro
@@ -167 +168 @@
         src/VBoxVMListBox.cpp \
         src/VBoxFrameBuffer.cpp \
-        src/HappyHttp.cpp
+        src/HappyHttp.cpp \
+        src/VBoxNetworkFramework.cpp
 
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(BUILD_TARGET)),) # X11
@@ -189 +191 @@
 src/HappyHttp.cpp_CXXFLAGS += -fexceptions
 src/VBoxDownloaderWgt.cpp_CXXFLAGS += -fexceptions
+src/VBoxNetworkFramework.cpp_CXXFLAGS += -fexceptions
 endif
 src/HappyHttp.cpp_CXXFLAGS.linux += -O2

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -35 +35 @@
         ui/VBoxAboutDlg.ui \
         ui/VBoxVMFirstRunWzd.ui \
-        ui/VBoxVMLogViewer.ui
+        ui/VBoxVMLogViewer.ui \
+        ui/VBoxRegistrationDlg.ui
 
 IMAGES  = images/tpixel.png \

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

@@ -132 +132 @@
         MachineDataChangeEventType,
         MachineRegisteredEventType,
+        ShowRegDlgEventType,
         SessionStateChangeEventType,
         SnapshotEventType,
@@ -163 +164 @@
     static const char* GUI_LicenseKey;
 #endif
+    static const char* GUI_RegistrationTryLeft;
+    static const char* GUI_RegistrationDlgWinID;
 };
 

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

@@ -100 +100 @@
 };
 
+class VBoxShowRegDlgEvent : public QEvent
+{
+public:
+    VBoxShowRegDlgEvent()
+        : QEvent ((QEvent::Type) VBoxDefs::ShowRegDlgEventType)
+        {}
+};
+
 class VBoxSessionStateChangeEvent : public QEvent
 {
@@ -136 +144 @@
 class VBoxSelectorWnd;
 class VBoxConsoleWnd;
+class VBoxRegistrationDlg;
 
 class VBoxGlobal : public QObject
@@ -367 +376 @@
     bool showVirtualBoxLicense();
 #endif
+
+    void showRegistrationDialog();
 
     CSession openSession (const QUuid &id);
@@ -519 +530 @@
     VBoxSelectorWnd *selector_wnd;
     VBoxConsoleWnd *console_wnd;
+
+    VBoxRegistrationDlg *mRegDlg;
 
     QUuid vmUuid;

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

@@ -209 +209 @@
     void warnAboutNewAdditions (QWidget *, const QString &, const QString &);
 
+    void cannotConnectRegister (QWidget *aParent,
+                                const QString &aURL,
+                                const QString &aReason);
+    void showRegisterResult (QWidget *aParent,
+                             const QString &aResult);
+
     bool remindAboutInputCapture();
     bool remindAboutAutoCapture();

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

@@ -32 +32 @@
 const char* VBoxDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
 #endif
-
+const char* VBoxDefs::GUI_RegistrationTryLeft = "GUI/RegistrationTryLeft";
+const char* VBoxDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID";

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

@@ -24 +24 @@
 #include "VBoxProblemReporter.h"
 #include "QIHotKeyEdit.h"
+#include "VBoxRegistrationDlg.h"
 
 #include <qapplication.h>
@@ -204 +205 @@
             if (sKey.startsWith ("GUI/"))
             {
+                if (!sVal.isEmpty() &&
+                    sKey == VBoxDefs::GUI_RegistrationDlgWinID)
+                {
+                    if (sVal == QString ("%1")
+                        .arg (qApp->mainWidget()->winId()))
+                    {
+                        *allowChange = TRUE;
+                        QApplication::postEvent (&global, new VBoxShowRegDlgEvent());
+                    }
+                    else
+                        *allowChange = FALSE;
+                    return S_OK;
+                }
+
                 /* try to set the global setting to check its syntax */
                 VBoxGlobalSettings gs (false /* non-null */);
@@ -654 +669 @@
     : valid (false)
     , selector_wnd (0), console_wnd (0)
+    , mRegDlg (0)
     , media_enum_thread (0)
     , verString ("1.0")
@@ -1627 +1643 @@
 }
 #endif
+
+void VBoxGlobal::showRegistrationDialog()
+{
+    /* check if the registration already passed */
+    if (virtualBox().GetExtraData (VBoxDefs::GUI_RegistrationTryLeft) == "0")
+        return;
+
+    /* store the winid of main app wgt to ensure only one reg dlg running */
+    virtualBox().SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID,
+                               QString ("%1").arg (qApp->mainWidget()->winId()));
+}
 
 /**
@@ -3428 +3455 @@
             return true;
         }
+        case VBoxDefs::ShowRegDlgEventType:
+        {
+            /* show unique registration dialog */
+            if (!mRegDlg)
+            {
+                VBoxRegistrationDlg *dlg = new VBoxRegistrationDlg();
+                dlg->setup (&mRegDlg, "http://www.innotek.de/register762.php");
+                Assert (dlg == mRegDlg);
+                mRegDlg->show();
+            }
+            return true;
+        }
         case VBoxDefs::SessionStateChangeEventType:
         {
@@ -3719 +3758 @@
     if (selector_wnd)
         delete selector_wnd;
+    if (mRegDlg)
+        delete mRegDlg;
 
     /* ensure CGuestOSType objects are no longer used */

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

@@ -1404 +1404 @@
 }
 
+void VBoxProblemReporter::cannotConnectRegister (QWidget *aParent,
+                                                 const QString &aURL,
+                                                 const QString &aReason)
+{
+    message (aParent, Error,
+             tr ("<p>Failed to connect to the VirtualBox network "
+                 "registration form "
+                 "<nobr><a href=\"%1\">%2</a>.</nobr></p><p>%3</p>")
+                 .arg (aURL).arg (aURL).arg (aReason));
+}
+
+void VBoxProblemReporter::showRegisterResult (QWidget *aParent,
+                                              const QString &aResult)
+{
+    aResult == "OK" ?
+        message (aParent, Info,
+                 tr ("<p><nobr>You have successfully registered with innotek. "
+                     "Thank you for registration.</nobr></p>")) :
+        message (aParent, Error,
+                 tr ("<p>Registration failed (%1)</p>").arg (aResult));
+}
+
 /** @return false if the dialog wasn't actually shown (i.e. it was autoconfirmed) */
 bool VBoxProblemReporter::remindAboutInputCapture()

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

@@ -231 +231 @@
             if (vboxGlobal().isVMConsoleProcess())
             {
-                a.setMainWidget( &vboxGlobal().consoleWnd());
+                a.setMainWidget (&vboxGlobal().consoleWnd());
                 if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
+                {
+                    vboxGlobal().showRegistrationDialog();
                     rc = a.exec();
+                }
             }
             else if (noSelector)
@@ -242 +245 @@
             {
                 a.setMainWidget (&vboxGlobal().selectorWnd());
+                vboxGlobal().showRegistrationDialog();
                 vboxGlobal().selectorWnd().show();
                 vboxGlobal().startEnumeratingMedia();