Changeset 45374 in vbox

Timestamp:

Apr 5, 2013 2:22:14 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84799

Message:

FE/Qt: Cleanup obsolete stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIDefs.cpp (modified) (1 diff)
• src/globals/UIDefs.h (modified) (1 diff)
• src/globals/UIExtraDataEventHandler.cpp (modified) (6 diffs)
• src/globals/UIExtraDataEventHandler.h (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (7 diffs)
• src/globals/VBoxGlobal.h (modified) (3 diffs)
• src/main.cpp (modified) (2 diffs)
• src/selector/UISelectorWindow.cpp (modified) (2 diffs)
• src/selector/VBoxTrayIcon.cpp (deleted)
• src/selector/VBoxTrayIcon.h (deleted)
• src/settings/global/UIGlobalSettingsGeneral.cpp (modified) (1 diff)

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

@@ -713 +713 @@
 endif
 
-ifdef VBOX_GUI_WITH_SYSTRAY
- VirtualBox_DEFS += VBOX_GUI_WITH_SYSTRAY
- VirtualBox_QT_MOCHDRS += \
-        src/selector/VBoxTrayIcon.h
- VirtualBox_SOURCES += \
-        src/selector/VBoxTrayIcon.cpp
-endif
-
 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
  VirtualBox_SOURCES += \

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

@@ -124 +124 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-/* Tray icon declarations: */
-const char* UIDefs::GUI_TrayIconWinID = "GUI/TrayIcon/WinID";
-const char* UIDefs::GUI_TrayIconEnabled = "GUI/TrayIcon/Enabled";
-const char* UIDefs::GUI_MainWindowCount = "GUI/MainWindowCount";
-#endif /* VBOX_GUI_WITH_SYSTRAY */
-
 /* File extensions definitions: */
 QStringList UIDefs::VBoxFileExts = QStringList() << "xml" << "vbox";

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

@@ -201 +201 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    /* Tray icon declarations: */
-    extern const char* GUI_TrayIconWinID;
-    extern const char* GUI_TrayIconEnabled;
-    extern const char* GUI_MainWindowCount;
-#endif /* VBOX_GUI_WITH_SYSTRAY */
-
     /* File extensions declarations: */
     extern QStringList VBoxFileExts;

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

@@ -40 +40 @@
     UIExtraDataEventHandlerPrivate(QObject *pParent = 0)
         : QObject(pParent)
-#ifdef VBOX_GUI_WITH_SYSTRAY
-        , m_fIsTrayIconOwner(false)
-#endif /* VBOX_GUI_WITH_SYSTRAY */
     {}
 
@@ -54 +51 @@
             if (strKey.startsWith("GUI/"))
             {
-#ifdef VBOX_GUI_WITH_SYSTRAY
-                if (strKey == GUI_TrayIconWinID)
-                {
-                    if (m_fIsTrayIconOwner)
-                    {
-                        if (!(strValue.isEmpty() ||
-                              strValue == QString("%1")
-                              .arg((qulonglong)vboxGlobal().mainWindow()->winId())))
-                            fVeto = true;
-                    }
-                    return;
-                }
-#endif /* VBOX_GUI_WITH_SYSTRAY */
                 /* Try to set the global setting to check its syntax */
                 VBoxGlobalSettings gs(false /* non-null */);
@@ -96 +80 @@
                 if (strKey == GUI_Input_MachineShortcuts && gActionPool->type() == UIActionPoolType_Runtime)
                     emit sigMachineShortcutsChanged();
-#ifdef VBOX_GUI_WITH_SYSTRAY
-                if (strKey == GUI_MainWindowCount)
-                    emit sigMainWindowCountChange(strValue.toInt());
-                if (strKey == GUI_TrayIconWinID)
-                {
-                    if (strValue.isEmpty())
-                    {
-                        m_fIsTrayIconOwner = false;
-                        emit sigCanShowTrayIcon(true);
-                    }
-                    else if (strValue == QString("%1")
-                             .arg((qulonglong)vboxGlobal().mainWindow()->winId()))
-                    {
-                        m_fIsTrayIconOwner = true;
-                        emit sigCanShowTrayIcon(true);
-                    }
-                    else
-                        emit sigCanShowTrayIcon(false);
-                }
-                if (strKey == GUI_TrayIconEnabled)
-                    emit sigTrayIconChange((strValue.toLower() == "true") ? true : false);
-#endif /* VBOX_GUI_WITH_SYSTRAY */
 #ifdef Q_WS_MAC
                 if (strKey == GUI_PresentationModeEnabled)
@@ -156 +118 @@
     void sigSelectorShortcutsChanged();
     void sigMachineShortcutsChanged();
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    void sigMainWindowCountChange(int count);
-    void sigCanShowTrayIcon(bool fEnabled);
-    void sigTrayIconChange(bool fEnabled);
-#endif /* VBOX_GUI_WITH_SYSTRAY */
 #ifdef RT_OS_DARWIN
     void sigPresentationModeChange(bool fEnabled);
@@ -170 +127 @@
     /** protects #OnExtraDataChange() */
     QMutex m_mutex;
-
-    /* Private member vars */
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    bool m_fIsTrayIconOwner;
-#endif /* VBOX_GUI_WITH_SYSTRAY */
 };
 
@@ -239 +191 @@
             Qt::QueuedConnection);
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    connect(m_pHandler, SIGNAL(sigMainWindowCountChange(int)),
-            this, SIGNAL(sigMainWindowCountChange(int)),
-            Qt::QueuedConnection);
-
-    connect(m_pHandler, SIGNAL(sigCanShowTrayIcon(bool)),
-            this, SIGNAL(sigCanShowTrayIcon(bool)),
-            Qt::QueuedConnection);
-
-    connect(m_pHandler, SIGNAL(sigTrayIconChange(bool)),
-            this, SIGNAL(sigTrayIconChange(bool)),
-            Qt::QueuedConnection);
-#endif /* VBOX_GUI_WITH_SYSTRAY */
-
 #ifdef Q_WS_MAC
     connect(m_pHandler, SIGNAL(sigPresentationModeChange(bool)),

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

@@ -39 +39 @@
     void sigSelectorShortcutsChanged();
     void sigMachineShortcutsChanged();
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    void sigMainWindowCountChange(int count);
-    void sigCanShowTrayIcon(bool fEnabled);
-    void sigTrayIconChange(bool fEnabled);
-#endif /* VBOX_GUI_WITH_SYSTRAY */
 #ifdef RT_OS_DARWIN
     void sigPresentationModeChange(bool fEnabled);

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

@@ -85 +85 @@
 # include "VBoxFBOverlay.h"
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-#include <iprt/process.h>
-#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
-#define HOSTSUFF_EXE ".exe"
-#else /* !RT_OS_WINDOWS */
-#define HOSTSUFF_EXE ""
-#endif /* !RT_OS_WINDOWS */
-#endif /* VBOX_GUI_WITH_SYSTRAY */
 
 /* COM includes: */
@@ -280 +271 @@
     , m_pVirtualMachine(0)
     , mMainWindow (NULL)
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    , mIsTrayMenu (false)
-    , mIncreasedWindowCounter (false)
-#endif
     , mMediaEnumThread (NULL)
     , mIsKWinManaged (false)
@@ -525 +512 @@
     return s.value(QString("%1").arg(aKey)).toString();
 }
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-
-/**
- *  Returns true if the current instance a systray menu only (started with
- *  "-systray" parameter).
- */
-bool VBoxGlobal::isTrayMenu() const
-{
-    return mIsTrayMenu;
-}
-
-void VBoxGlobal::setTrayMenu(bool aIsTrayMenu)
-{
-    mIsTrayMenu = aIsTrayMenu;
-}
-
-/**
- *  Spawns a new selector window (process).
- */
-void VBoxGlobal::trayIconShowSelector()
-{
-    /* Get the path to the executable. */
-    char path[RTPATH_MAX];
-    RTPathAppPrivateArch(path, RTPATH_MAX);
-    size_t sz = strlen(path);
-    path[sz++] = RTPATH_DELIMITER;
-    path[sz] = 0;
-    char *cmd = path + sz;
-    sz = RTPATH_MAX - sz;
-
-    int rc = 0;
-    const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
-    Assert(sz >= sizeof(VirtualBox_exe));
-    strcpy(cmd, VirtualBox_exe);
-    const char * args[] = {path, 0 };
-    rc = RTProcCreate(path, args, RTENV_DEFAULT, RTPROC_FLAGS_DETACHED, NULL);
-    if (RT_FAILURE(rc))
-        LogRel(("Systray: Failed to start new selector window! Path=%s, rc=%Rrc\n", path, rc));
-}
-
-/**
- *  Tries to install the tray icon using the current instance (singleton).
- *  Returns true if this instance is the tray icon, false if not.
- */
-bool VBoxGlobal::trayIconInstall()
-{
-    int rc = 0;
-    QString strTrayWinID = mVBox.GetExtraData(GUI_TrayIconWinID);
-    if (false == strTrayWinID.isEmpty())
-    {
-        /* Check if current tray icon is alive by writing some bogus value. */
-        mVBox.SetExtraData(GUI_TrayIconWinID, "0");
-        if (mVBox.isOk())
-        {
-            /* Current tray icon died - clean up. */
-            mVBox.SetExtraData(GUI_TrayIconWinID, NULL);
-            strTrayWinID.clear();
-        }
-    }
-
-    /* Is there already a tray icon or is tray icon not active? */
-    if (   (mIsTrayMenu == false)
-        && (vboxGlobal().settings().trayIconEnabled())
-        && (QSystemTrayIcon::isSystemTrayAvailable())
-        && (strTrayWinID.isEmpty()))
-    {
-        /* Get the path to the executable. */
-        char path[RTPATH_MAX];
-        RTPathAppPrivateArch(path, RTPATH_MAX);
-        size_t sz = strlen(path);
-        path[sz++] = RTPATH_DELIMITER;
-        path[sz] = 0;
-        char *cmd = path + sz;
-        sz = RTPATH_MAX - sz;
-
-        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
-        Assert(sz >= sizeof(VirtualBox_exe));
-        strcpy(cmd, VirtualBox_exe);
-        const char * args[] = {path, "-systray", 0 };
-        rc = RTProcCreate(path, args, RTENV_DEFAULT, RTPROC_FLAGS_DETACHED, NULL);
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("Systray: Failed to start systray window! Path=%s, rc=%Rrc\n", path, rc));
-            return false;
-        }
-    }
-
-    if (mIsTrayMenu)
-    {
-        // Use this selector for displaying the tray icon
-        mVBox.SetExtraData(GUI_TrayIconWinID,
-                           QString("%1").arg((qulonglong)vboxGlobal().mainWindow()->winId()));
-
-        /* The first process which can grab this "mutex" will win ->
-         * It will be the tray icon menu then. */
-        if (mVBox.isOk())
-        {
-            emit sigTrayIconShow(true);
-            return true;
-        }
-    }
-
-    return false;
-}
-
-#endif
 
 #ifdef Q_WS_X11
@@ -2303 +2183 @@
     return QString();
 }
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-/**
- *  Returns the number of current running Fe/Qt4 main windows.
- *
- *  @return Number of running main windows.
- */
-int VBoxGlobal::mainWindowCount ()
-{
-    return mVBox.GetExtraData (GUI_MainWindowCount).toInt();
-}
-#endif
 
 /**
@@ -4186 +4054 @@
     connect(gEDataEvents, SIGNAL(sigGUILanguageChange(QString)),
             this, SLOT(sltGUILanguageChange(QString)));
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    {
-        /* Increase open Fe/Qt4 windows reference count. */
-        int c = mVBox.GetExtraData (GUI_MainWindowCount).toInt() + 1;
-        AssertMsgReturnVoid ((c >= 0) || (mVBox.isOk()),
-            ("Something went wrong with the window reference count!"));
-        mVBox.SetExtraData (GUI_MainWindowCount, QString ("%1").arg (c));
-        mIncreasedWindowCounter = mVBox.isOk();
-        AssertReturnVoid (mIncreasedWindowCounter);
-    }
-#endif
 
     /* Initialize guest OS Type list. */
@@ -4380 +4236 @@
             bForceFullscreen = true;
         }
-#ifdef VBOX_GUI_WITH_SYSTRAY
-        else if (!::strcmp (arg, "-systray") || !::strcmp (arg, "--systray"))
-        {
-            mIsTrayMenu = true;
-        }
-#endif
         else if (!::strcmp (arg, "-comment") || !::strcmp (arg, "--comment"))
         {
@@ -4613 +4463 @@
     }
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    if (mIncreasedWindowCounter)
-    {
-        /* Decrease open Fe/Qt4 windows reference count. */
-        int c = mVBox.GetExtraData (GUI_MainWindowCount).toInt() - 1;
-        AssertMsg ((c >= 0) || (mVBox.isOk()),
-            ("Something went wrong with the window reference count!"));
-        if (c < 0)
-            c = 0;   /* Clean up the mess. */
-        mVBox.SetExtraData (GUI_MainWindowCount,
-                            (c > 0) ? QString ("%1").arg (c) : NULL);
-        AssertWrapperOk (mVBox);
-        if (c == 0)
-        {
-            mVBox.SetExtraData (GUI_TrayIconWinID, NULL);
-            AssertWrapperOk (mVBox);
-        }
-    }
-#endif
-
 #ifdef VBOX_GUI_WITH_PIDFILE
     deletePidfile();

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

@@ -114 +114 @@
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }
     bool showStartVMErrors() const { return mShowStartVMErrors; }
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    bool isTrayMenu() const;
-    void setTrayMenu(bool aIsTrayMenu);
-    void trayIconShowSelector();
-    bool trayIconInstall();
-#endif
     QString managedVMUuid() const { return vmUuid; }
     QList<QUrl> &argUrlList() { return m_ArgUrlList; }
@@ -424 +418 @@
     void mediumRemoved (UIMediumType, const QString &);
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    void sigTrayIconShow(bool fEnabled);
-#endif
-
 public slots:
 
@@ -465 +455 @@
     QString vmUuid;
     QList<QUrl> m_ArgUrlList;
-
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    bool mIsTrayMenu : 1; /*< Tray icon active/desired? */
-    bool mIncreasedWindowCounter : 1;
-#endif
 
     /** Whether to show error message boxes for VM start errors. */

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

@@ -483 +483 @@
             if (vboxGlobal().isVMConsoleProcess())
             {
-#ifdef VBOX_GUI_WITH_SYSTRAY
-                if (vboxGlobal().trayIconInstall())
-                {
-                    /* Nothing to do here yet. */
-                }
-#endif
                 if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
                 {
@@ -519 +513 @@
 
                 vboxGlobal().setMainWindow (&vboxGlobal().selectorWnd());
-#ifdef VBOX_GUI_WITH_SYSTRAY
-                if (vboxGlobal().trayIconInstall())
-                {
-                    /* Nothing to do here yet. */
-                }
-
-                if (false == vboxGlobal().isTrayMenu())
-                {
-#endif
                     vboxGlobal().selectorWnd().show();
-#ifdef VBOX_GUI_WITH_SYSTRAY
-                }
-
-                do
-                {
-#endif
                     rc = a.exec();
-#ifdef VBOX_GUI_WITH_SYSTRAY
-                } while (vboxGlobal().isTrayMenu());
-#endif
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -941 +941 @@
     sltCurrentVMItemChanged();
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    if (vboxGlobal().isTrayMenu())
-    {
-        m_pTrayIcon->retranslateUi();
-        m_pTrayIcon->refresh();
-    }
-#endif /* VBOX_GUI_WITH_SYSTRAY */
-
 #ifdef QT_MAC_USE_COCOA
     /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
@@ -1486 +1478 @@
             this, SLOT(sltShowMachineSettingsDialog(const QString&, const QString&, const QString&)));
 
-#ifdef VBOX_GUI_WITH_SYSTRAY
-    /* Tray icon connections: */
-    connect(m_pTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
-            this, SLOT(sltTrayIconActivated(QSystemTrayIcon::ActivationReason)));
-    connect(gEDataEvents, SIGNAL(sigMainWindowCountChange(int)), this, SLOT(sltMainWindowCountChanged(int)));
-    connect(gEDataEvents, SIGNAL(sigCanShowTrayIcon(bool)), this, SLOT(sltTrayIconCanShow(bool)));
-    connect(gEDataEvents, SIGNAL(sigTrayIconChange(bool)), this, SLOT(sltTrayIconChanged(bool)));
-    connect(&vboxGlobal(), SIGNAL(sigTrayIconShow(bool)), this, SLOT(sltTrayIconShow(bool)));
-#endif /* VBOX_GUI_WITH_SYSTRAY */
-
     /* Global event handlers: */
     connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)), this, SLOT(sltStateChanged(QString)));

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

@@ -31 +31 @@
     Ui::UIGlobalSettingsGeneral::setupUi(this);
 
-#ifndef VBOX_GUI_WITH_SYSTRAY
-    m_pEnableTrayIconCheckbox->hide();
-    m_pSpacerWidget1->hide();
-#endif /* !VBOX_GUI_WITH_SYSTRAY */
 #ifndef Q_WS_MAC
     m_pEnablePresentationModeCheckbox->hide();