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

Timestamp:

Nov 17, 2011 2:58:30 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Update Manager: New Version Notifier: Feature cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIExtraDataEventHandler.cpp (modified) (4 diffs)
• UIExtraDataEventHandler.h (modified) (1 diff)
• VBoxDefs.cpp (modified) (1 diff)
• VBoxDefs.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp

@@ -64 +64 @@
                 }
 
-                if (strKey == VBoxDefs::GUI_UpdateDlgWinID)
-                {
-                    if (m_fIsUpdDlgOwner)
-                    {
-                        if (!(strValue.isEmpty() ||
-                              strValue == QString("%1")
-                              .arg((qulonglong)vboxGlobal().mainWindow()->winId())))
-                            fVeto = true;
-                    }
-                    return;
-                }
 #ifdef VBOX_GUI_WITH_SYSTRAY
                 if (strKey == VBoxDefs::GUI_TrayIconWinID)
@@ -127 +116 @@
                        emit sigCanShowRegistrationDlg(false);
                }
-               if (strKey == VBoxDefs::GUI_UpdateDlgWinID)
-               {
-                   if (strValue.isEmpty())
-                   {
-                       m_fIsUpdDlgOwner = false;
-                       emit sigCanShowUpdateDlg(true);
-                   }
-                   else if (strValue == QString("%1")
-                            .arg((qulonglong)vboxGlobal().mainWindow()->winId()))
-                   {
-                       m_fIsUpdDlgOwner = true;
-                       emit sigCanShowUpdateDlg(true);
-                   }
-                   else
-                       emit sigCanShowUpdateDlg(false);
-               }
                if (strKey == VBoxDefs::GUI_LanguageId)
                        emit sigGUILanguageChange(strValue);
@@ -202 +175 @@
 signals:
     void sigCanShowRegistrationDlg(bool fEnabled);
-    void sigCanShowUpdateDlg(bool fEnabled);
     void sigGUILanguageChange(QString strLang);
 #ifdef VBOX_GUI_WITH_SYSTRAY
@@ -280 +252 @@
             Qt::QueuedConnection);
 
-    connect(m_pHandler, SIGNAL(sigCanShowUpdateDlg(bool)),
-            this, SIGNAL(sigCanShowUpdateDlg(bool)),
-            Qt::QueuedConnection);
-
     connect(m_pHandler, SIGNAL(sigGUILanguageChange(QString)),
             this, SIGNAL(sigGUILanguageChange(QString)),

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.h

@@ -37 +37 @@
     /* Specialized extra data signals */
     void sigCanShowRegistrationDlg(bool fEnabled);
-    void sigCanShowUpdateDlg(bool fEnabled);
     void sigGUILanguageChange(QString strLang);
 #ifdef VBOX_GUI_WITH_SYSTRAY

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

@@ -63 +63 @@
 const char* VBoxDefs::GUI_RegistrationDlgWinID = "GUI/RegistrationDlgWinID";
 const char* VBoxDefs::GUI_RegistrationData = "GUI/SUNOnlineData";
-const char* VBoxDefs::GUI_UpdateDlgWinID = "GUI/UpdateDlgWinID";
 const char* VBoxDefs::GUI_UpdateDate = "GUI/UpdateDate";
 const char* VBoxDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";

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

@@ -143 +143 @@
     static const char* GUI_RegistrationDlgWinID;
     static const char* GUI_RegistrationData;
-    static const char* GUI_UpdateDlgWinID;
     static const char* GUI_UpdateDate;
     static const char* GUI_UpdateCheckCount;