Changeset 27599 in vbox

Timestamp:

Mar 22, 2010 3:48:48 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: disable register

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/runtime/UIActionsPool.cpp (modified) (3 diffs)
• src/runtime/UIActionsPool.h (modified) (1 diff)
• src/runtime/UIMachineMenuBar.cpp (modified) (2 diffs)

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

@@ -29 +29 @@
 VBOX_VIRTUALBOX4_OUT_DIR := $(PATH_TARGET)/VirtualBox/misc
 
-VBOX_WITH_REGISTRATION := 1
+# VBOX_WITH_REGISTRATION := 1
 
 # Ask the user to register at Sun. If this setting is disabled the user can
 # still register using the menu if desired.
-VBOX_WITH_REGISTRATION_REQUEST := 1
+# VBOX_WITH_REGISTRATION_REQUEST := 1
+
+# For now this should be disabled in any case
+ifdef VBOX_WITH_REGISTRATION
+ VBOX_WITH_REGISTRATION=
+endif
+ifdef VBOX_WITH_REGISTRATION_REQUEST
+ VBOX_WITH_REGISTRATION_REQUEST=
+endif
 
 # Show the update notifier dialog during startup. If this setting is disabled

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp

@@ -910 +910 @@
 };
 
+#ifdef VBOX_WITH_REGISTRATION
 class PerformRegisterAction : public UISimpleAction
 {
@@ -933 +934 @@
     }
 };
+#endif /* VBOX_WITH_REGISTRATION */
 
 class PerformUpdateAction : public UISimpleAction
@@ -1100 +1102 @@
     m_actionsPool[UIActionIndex_Simple_Web] = new ShowWebAction(this);
     m_actionsPool[UIActionIndex_Simple_ResetWarnings] = new PerformResetWarningsAction(this);
+#ifdef VBOX_WITH_REGISTRATION
     m_actionsPool[UIActionIndex_Simple_Register] = new PerformRegisterAction(this);
+#endif /* VBOX_WITH_REGISTRATION */
     m_actionsPool[UIActionIndex_Simple_Update] = new PerformUpdateAction(this);
     m_actionsPool[UIActionIndex_Simple_About] = new ShowAboutAction(this);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.h

@@ -105 +105 @@
     UIActionIndex_Simple_Web,
     UIActionIndex_Simple_ResetWarnings,
+#ifdef VBOX_WITH_REGISTRATION
     UIActionIndex_Simple_Register,
+#endif /* VBOX_WITH_REGISTRATION */
     UIActionIndex_Simple_Update,
     UIActionIndex_Simple_About,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

@@ -221 +221 @@
         VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()),
                             &vboxProblem(), SLOT(resetSuppressedMessages()));
+#ifdef VBOX_WITH_REGISTRATION
         VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Register), SIGNAL(triggered()),
                             &vboxGlobal(), SLOT(showRegistrationDialog()));
+#endif /* VBOX_WITH_REGISTRATION */
         VBoxGlobal::connect(pActionsPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()),
                             &vboxGlobal(), SLOT(showUpdateDialog()));
@@ -228 +230 @@
                             &vboxProblem(), SLOT(showHelpAboutDialog()));
 
+#ifdef VBOX_WITH_REGISTRATION
         VBoxGlobal::connect(&vboxGlobal(), SIGNAL (canShowRegDlg (bool)),
                             pActionsPool->action(UIActionIndex_Simple_Register), SLOT(setEnabled(bool)));
+#endif /* VBOX_WITH_REGISTRATION */
         VBoxGlobal::connect(&vboxGlobal(), SIGNAL (canShowUpdDlg (bool)),
                             pActionsPool->action(UIActionIndex_Simple_Update), SLOT(setEnabled(bool)));