VirtualBox

Changeset 49596 in vbox


Ignore:
Timestamp:
Nov 21, 2013 10:11:36 AM (11 years ago)
Author:
vboxsync
Message:

FE/Qt: 7109: Allow to compile with VBOX_WITH_LIBCURL disabled.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
19 edited

Legend:

Unmodified
Added
Removed

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

    r49158 r49596  
    123123 VirtualBox_DEFS        += VBOX_GUI_USE_QGL
    124124endif
     125ifdef VBOX_WITH_LIBCURL
     126 VirtualBox_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
     127 VBOX_GUI_WITH_NETWORK_MANAGER := 1
     128endif
    125129ifdef VBOX_BLEEDING_EDGE
    126130VirtualBox_src/selector/UISelectorWindow.cpp_DEFS += \
    … …  
    141145        ./src/extensions/graphics \
    142146        ./src/globals \
    143         ./src/net \
    144147        ./src/medium \
    145148        ./src/platform \
    … …  
    169172        ./src/wizards/firstrun
    170173
     174ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     175VBOX_GUI_INC_DIRS += \
     176        ./src/net
     177endif
     178       
    171179VirtualBox_INCS = \
    172180        $(VBOX_GUI_INC_DIRS) \
    … …  
    279287        src/globals/VBoxGlobal.h \
    280288        src/globals/VBoxUtils.h \
    281         src/net/UINetworkManager.h \
    282         src/net/UINetworkManagerDialog.h \
    283         src/net/UINetworkManagerIndicator.h \
    284         src/net/UINetworkRequest.h \
    285         src/net/UINetworkRequestWidget.h \
    286         src/net/UINetworkReply.h \
    287         src/net/UINetworkCustomer.h \
    288         src/net/UIUpdateManager.h \
    289         src/net/UIDownloader.h \
    290         src/net/UIDownloaderAdditions.h \
    291         src/net/UIDownloaderExtensionPack.h \
    292         src/net/UIDownloaderUserManual.h \
    293289        src/medium/UIMediumEnumerator.h \
    294290        src/medium/UIMediumManager.h \
    … …  
    358354        src/settings/global/UIGlobalSettingsNetworkDetailsHost.h \
    359355        src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
    360         src/settings/global/UIGlobalSettingsProxy.h \
    361         src/settings/global/UIGlobalSettingsUpdate.h \
    362356        src/settings/machine/UIMachineSettingsAudio.h \
    363357        src/settings/machine/UIMachineSettingsDisplay.h \
    … …  
    438432        src/wizards/firstrun/UIWizardFirstRunPageBasic.h
    439433
     434ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     435VirtualBox_QT_MOCHDRS += \
     436        src/net/UINetworkManager.h \
     437        src/net/UINetworkManagerDialog.h \
     438        src/net/UINetworkManagerIndicator.h \
     439        src/net/UINetworkRequest.h \
     440        src/net/UINetworkRequestWidget.h \
     441        src/net/UINetworkReply.h \
     442        src/net/UINetworkCustomer.h \
     443        src/net/UIUpdateManager.h \
     444        src/net/UIDownloader.h \
     445        src/net/UIDownloaderAdditions.h \
     446        src/net/UIDownloaderExtensionPack.h \
     447        src/net/UIDownloaderUserManual.h \
     448        src/settings/global/UIGlobalSettingsProxy.h \
     449        src/settings/global/UIGlobalSettingsUpdate.h
     450endif
     451
    440452VirtualBox_QT_MOCHDRS.darwin += \
    441453    src/platform/darwin/UIWindowMenuManager.h
    … …  
    451463        src/medium/UIMediumEnumerator.cpp \
    452464        src/medium/UIMediumManager.cpp \
    453         src/net/UINetworkReply.cpp \
    454         src/net/UIUpdateManager.cpp \
    455465        src/runtime/UIActionPoolRuntime.cpp \
    456466        src/runtime/UIIndicatorsPool.cpp \
    … …  
    465475        src/widgets/UIPortForwardingTable.cpp \
    466476        src/wizards/importappliance/UIWizardImportApp.cpp
     477
     478ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     479VirtualBox_QT_MOCSRCS += \
     480        src/net/UINetworkReply.cpp \
     481        src/net/UIUpdateManager.cpp
     482endif
    467483
    468484VirtualBox_QT_MOCSRCS.darwin += \
    … …  
    533549        src/medium/UIMediumEnumerator.cpp \
    534550        src/medium/UIMediumManager.cpp \
    535         src/net/UINetworkManager.cpp \
    536         src/net/UINetworkManagerDialog.cpp \
    537         src/net/UINetworkManagerIndicator.cpp \
    538         src/net/UINetworkRequest.cpp \
    539         src/net/UINetworkRequestWidget.cpp \
    540         src/net/UINetworkReply.cpp \
    541         src/net/UINetworkCustomer.cpp \
    542         src/net/UIDownloader.cpp \
    543         src/net/UIDownloaderAdditions.cpp \
    544         src/net/UIDownloaderExtensionPack.cpp \
    545         src/net/UIDownloaderUserManual.cpp \
    546         src/net/UIUpdateDefs.cpp \
    547         src/net/UIUpdateManager.cpp \
    548551        src/runtime/UIActionPoolRuntime.cpp \
    549552        src/runtime/UIConsoleEventHandler.cpp \
    … …  
    614617        src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp \
    615618        src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
    616         src/settings/global/UIGlobalSettingsProxy.cpp \
    617         src/settings/global/UIGlobalSettingsUpdate.cpp \
    618619        src/settings/machine/UIMachineSettingsAudio.cpp \
    619620        src/settings/machine/UIMachineSettingsDisplay.cpp \
    … …  
    695696        src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
    696697
     698ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     699VirtualBox_SOURCES += \
     700        src/net/UINetworkManager.cpp \
     701        src/net/UINetworkManagerDialog.cpp \
     702        src/net/UINetworkManagerIndicator.cpp \
     703        src/net/UINetworkRequest.cpp \
     704        src/net/UINetworkRequestWidget.cpp \
     705        src/net/UINetworkReply.cpp \
     706        src/net/UINetworkCustomer.cpp \
     707        src/net/UIDownloader.cpp \
     708        src/net/UIDownloaderAdditions.cpp \
     709        src/net/UIDownloaderExtensionPack.cpp \
     710        src/net/UIDownloaderUserManual.cpp \
     711        src/net/UIUpdateDefs.cpp \
     712        src/net/UIUpdateManager.cpp \
     713        src/settings/global/UIGlobalSettingsProxy.cpp \
     714        src/settings/global/UIGlobalSettingsUpdate.cpp
     715endif
     716
    697717VirtualBox_SOURCES.darwin += \
    698718        src/platform/darwin/UIAbstractDockIconPreview.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

    r48983 r49596  
    517517        case GlobalSettingsPageType_General:    strResult = "General"; break;
    518518        case GlobalSettingsPageType_Input:      strResult = "Input"; break;
     519#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    519520        case GlobalSettingsPageType_Update:     strResult = "Update"; break;
     521#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    520522        case GlobalSettingsPageType_Language:   strResult = "Language"; break;
    521523        case GlobalSettingsPageType_Display:    strResult = "Display"; break;
    522524        case GlobalSettingsPageType_Network:    strResult = "Network"; break;
    523525        case GlobalSettingsPageType_Extensions: strResult = "Extensions"; break;
     526#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    524527        case GlobalSettingsPageType_Proxy:      strResult = "Proxy"; break;
     528#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    525529        default:
    526530        {
    … …  
    540544    keys << "General";    values << GlobalSettingsPageType_General;
    541545    keys << "Input";      values << GlobalSettingsPageType_Input;
     546#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    542547    keys << "Update";     values << GlobalSettingsPageType_Update;
     548#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    543549    keys << "Language";   values << GlobalSettingsPageType_Language;
    544550    keys << "Display";    values << GlobalSettingsPageType_Display;
    545551    keys << "Network";    values << GlobalSettingsPageType_Network;
    546552    keys << "Extensions"; values << GlobalSettingsPageType_Extensions;
     553#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    547554    keys << "Proxy";      values << GlobalSettingsPageType_Proxy;
     555#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    548556    /* Invalid type for unknown words: */
    549557    if (!keys.contains(strGlobalSettingsPageType, Qt::CaseInsensitive))
    … …  
    560568        case GlobalSettingsPageType_General:    return QPixmap(":/machine_warning_16px.png");
    561569        case GlobalSettingsPageType_Input:      return QPixmap(":/hostkey_warning_16px.png");
     570#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    562571        case GlobalSettingsPageType_Update:     return QPixmap(":/refresh_warning_16px.png");
     572#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    563573        case GlobalSettingsPageType_Language:   return QPixmap(":/site_warning_16px.png");
    564574        case GlobalSettingsPageType_Display:    return QPixmap(":/vrdp_warning_16px.png");
    565575        case GlobalSettingsPageType_Network:    return QPixmap(":/nw_warning_16px.png");
    566576        case GlobalSettingsPageType_Extensions: return QPixmap(":/extension_pack_warning_16px.png");
     577#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    567578        case GlobalSettingsPageType_Proxy:      return QPixmap(":/proxy_warning_16px.png");
     579#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    568580        default: AssertMsgFailed(("No pixmap for %d", type)); break;
    569581    }

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r48577 r49596  
    432432};
    433433
     434#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    434435class UIActionSimpleNetworkAccessManager : public UIActionSimple
    435436{
    … …  
    484485    }
    485486};
     487#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    486488
    487489class UIActionSimpleAbout : public UIActionSimple
    … …  
    650652    m_pool[UIActionIndex_Simple_WebSite] = new UIActionSimpleWebSite(this);
    651653    m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
     654#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    652655    m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
    653656    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
     657#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    654658    m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
    655659}

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r44710 r49596  
    5858    UIActionIndex_Simple_WebSite,
    5959    UIActionIndex_Simple_ResetWarnings,
     60#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    6061    UIActionIndex_Simple_NetworkAccessManager,
    6162    UIActionIndex_Simple_CheckForUpdates,
     63#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    6264    UIActionIndex_Simple_About,
    6365

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

    r47478 r49596  
    3232const char* UIDefs::GUI_RecentListCD = "GUI/RecentListCD";
    3333const char* UIDefs::GUI_RecentListFD = "GUI/RecentListFD";
    34 const char* UIDefs::GUI_PreventApplicationUpdate = "GUI/PreventApplicationUpdate";
    3534
    3635/* Selector-window definitions: */
    … …  
    9796const char* UIDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption";
    9897
     98#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    9999/* Update manager definitions: */
     100const char* UIDefs::GUI_PreventApplicationUpdate = "GUI/PreventApplicationUpdate";
    100101const char* UIDefs::GUI_UpdateDate = "GUI/UpdateDate";
    101102const char* UIDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";
     103#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    102104
    103105/* Information dialog definitions: */

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

    r49505 r49596  
    101101    extern const char* GUI_RecentListCD;
    102102    extern const char* GUI_RecentListFD;
    103     extern const char* GUI_PreventApplicationUpdate;
    104103
    105104    /* Selector-window declarations: */
    … …  
    166165    extern const char* GUI_InvertMessageOption;
    167166
     167#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    168168    /* Update manager declarations: */
     169    extern const char* GUI_PreventApplicationUpdate;
    169170    extern const char* GUI_UpdateDate;
    170171    extern const char* GUI_UpdateCheckCount;
     172#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    171173
    172174    /* Information dialog declarations: */
    … …  
    300302    GlobalSettingsPageType_General,
    301303    GlobalSettingsPageType_Input,
     304#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    302305    GlobalSettingsPageType_Update,
     306#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    303307    GlobalSettingsPageType_Language,
    304308    GlobalSettingsPageType_Display,
    305309    GlobalSettingsPageType_Network,
    306310    GlobalSettingsPageType_Extensions,
     311#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    307312    GlobalSettingsPageType_Proxy,
     313#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    308314    GlobalSettingsPageType_Max
    309315};

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r49333 r49596  
    3535#include "UISelectorWindow.h"
    3636#include "UIProgressDialog.h"
    37 #include "UINetworkManager.h"
    38 #include "UINetworkManagerDialog.h"
     37#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     38# include "UINetworkManager.h"
     39# include "UINetworkManagerDialog.h"
     40#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    3941#include "UIModalWindowManager.h"
    4042#include "UIMedium.h"
    … …  
    19821984}
    19831985
     1986void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const
     1987{
     1988    alert(0, MessageType_Error,
     1989          tr("<p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, "
     1990             "as the machine has no CD/DVD drives. Please add a drive using the storage page of the "
     1991             "virtual machine settings window.</p>")
     1992             .arg(strMachineName));
     1993}
     1994
     1995#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    19841996bool UIMessageCenter::confirmCancelingAllNetworkRequests() const
    19851997{
    … …  
    20532065}
    20542066
    2055 void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const
    2056 {
    2057     alert(0, MessageType_Error,
    2058           tr("<p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, "
    2059              "as the machine has no CD/DVD drives. Please add a drive using the storage page of the "
    2060              "virtual machine settings window.</p>")
    2061              .arg(strMachineName));
    2062 }
    2063 
    20642067void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress) const
    20652068{
    … …  
    21502153                          tr("Install", "extension pack"));
    21512154}
     2155#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    21522156
    21532157bool UIMessageCenter::confirmInstallExtensionPack(const QString &strPackName, const QString &strPackVersion,

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

    r49333 r49596  
    300300    void cannotToggleVideoCapture(const CMachine &machine, bool fEnable);
    301301    void remindAboutGuestAdditionsAreNotActive() const;
    302 
     302    void cannotMountGuestAdditions(const QString &strMachineName) const;
     303
     304#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    303305    /* API: Network management warnings: */
    304306    bool confirmCancelingAllNetworkRequests() const;
    … …  
    312314    void cannotSaveGuestAdditions(const QString &strURL, const QString &strTarget) const;
    313315    bool proposeMountGuestAdditions(const QString &strUrl, const QString &strSrc) const;
    314     void cannotMountGuestAdditions(const QString &strMachineName) const;
    315316    void cannotUpdateGuestAdditions(const CProgress &progress) const;
    316317    bool cannotFindUserManual(const QString &strMissedLocation) const;
    … …  
    322323    void cannotSaveExtensionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const;
    323324    bool proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const;
     325#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     326
     327    /* API: Extension-pack warnings: */
    324328    bool confirmInstallExtensionPack(const QString &strPackName, const QString &strPackVersion, const QString &strPackDescription, QWidget *pParent = 0) const;
    325329    bool confirmReplaceExtensionPack(const QString &strPackName, const QString &strPackVersionNew, const QString &strPackVersionOld,

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp

    r48534 r49596  
    2020/* GUI includes: */
    2121#include "UIModalWindowManager.h"
    22 #include "UINetworkManagerDialog.h"
    23 #include "UINetworkManager.h"
     22#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     23# include "UINetworkManagerDialog.h"
     24# include "UINetworkManager.h"
     25#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    2426#include "UISelectorWindow.h"
    2527#include "UIProgressDialog.h"
    … …  
    101103}
    102104
     105#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    103106QWidget* UIModalWindowManager::networkManagerOrMainWindowShown() const
    104107{
    … …  
    107110    return gNetworkManager && gNetworkManager->window()->isVisible() ? gNetworkManager->window() : mainWindowShown();
    108111}
     112#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    109113
    110114QWidget* UIModalWindowManager::realParentWindow(QWidget *pWidget)

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.h

    r47612 r49596  
    4848    /* API: Main application window stuff: */
    4949    QWidget* mainWindowShown() const;
     50#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    5051    QWidget* networkManagerOrMainWindowShown() const;
     52#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    5153
    5254private slots:

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

    r49553 r49596  
    3434#include <QDir>
    3535#include <QLocale>
    36 #include <QNetworkProxy>
     36#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     37# include <QNetworkProxy>
     38#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    3739#include <QSpinBox>
    3840#include <QStyleOptionSpinBox>
    … …  
    6668#include "UIExtraDataEventHandler.h"
    6769#include "QIFileDialog.h"
    68 #include "UINetworkManager.h"
    69 #include "UIUpdateManager.h"
     70#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     71# include "UINetworkManager.h"
     72# include "UIUpdateManager.h"
     73#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    7074#include "UIMachine.h"
    7175#include "UISession.h"
    … …  
    16821686}
    16831687
     1688#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    16841689void VBoxGlobal::reloadProxySettings()
    16851690{
    … …  
    17131718    }
    17141719}
     1720#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    17151721
    17161722void VBoxGlobal::createMedium(const UIMedium &medium)
    … …  
    34093415}
    34103416
     3417#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    34113418/* static */
    34123419bool VBoxGlobal::shouldWeAllowApplicationUpdate(CVirtualBox &vbox)
    … …  
    34153422    return !isApprovedByExtraData(vbox, GUI_PreventApplicationUpdate);
    34163423}
     3424#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    34173425
    34183426/* static */
    … …  
    37953803void VBoxGlobal::sltProcessGlobalSettingChange()
    37963804{
     3805#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    37973806    /* Reload proxy settings: */
    37983807    reloadProxySettings();
     3808#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    37993809}
    38003810
    … …  
    43844394    }
    43854395
     4396#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    43864397    /* Create network manager: */
    43874398    UINetworkManager::create();
    … …  
    43894400    /* Schedule update manager: */
    43904401    UIUpdateManager::schedule();
     4402#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    43914403}
    43924404
    … …  
    43974409    m_sfCleanupInProgress = true;
    43984410
     4411#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    43994412    /* Shutdown update manager: */
    44004413    UIUpdateManager::shutdown();
    … …  
    44024415    /* Destroy network manager: */
    44034416    UINetworkManager::destroy();
     4417#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    44044418
    44054419    /* Destroy action pool: */

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

    r49553 r49596  
    248248    CSession openExistingSession(const QString &aId) { return openSession(aId, KLockType_Shared); }
    249249
     250#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    250251    void reloadProxySettings();
     252#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    251253
    252254    /* API: Medium-processing stuff: */
    … …  
    349351    static bool isApprovedByExtraData(CVirtualBox &vbox, const QString &strExtraDataKey);
    350352    static bool isApprovedByExtraData(CMachine &machine, const QString &strExtraDataKey);
     353#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    351354    static bool shouldWeAllowApplicationUpdate(CVirtualBox &vbox);
     355#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    352356    static bool shouldWeShowMachine(CMachine &machine);
    353357    static bool shouldWeAllowMachineReconfiguration(CMachine &machine,

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r49506 r49596  
    3131#include "QIFileDialog.h"
    3232#include "UIActionPoolRuntime.h"
    33 #include "UINetworkManager.h"
    34 #include "UIDownloaderAdditions.h"
     33#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     34# include "UINetworkManager.h"
     35# include "UIDownloaderAdditions.h"
     36#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    3537#include "UIIconPool.h"
    3638#include "UIKeyboardHandler.h"
    … …  
    21632165    }
    21642166
     2167#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    21652168    /* If downloader is running already: */
    21662169    if (UIDownloaderAdditions::current())
    … …  
    21792182        pDl->start();
    21802183    }
     2184#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    21812185}
    21822186

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

    r49466 r49596  
    2929#include "UIMessageCenter.h"
    3030#include "UIImageTools.h"
    31 #include "UINetworkManager.h"
     31#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     32# include "UINetworkManager.h"
     33#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    3234
    3335/* COM includes: */
    … …  
    303305    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_ResetWarnings));
    304306    pMenu->addSeparator();
     307#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    305308    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_NetworkAccessManager));
     309#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    306310#ifndef Q_WS_MAC
    307311    pMenu->addSeparator();
    … …  
    316320    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()),
    317321                        &msgCenter(), SLOT(sltResetSuppressedMessages()));
     322#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    318323    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()),
    319324                        gNetworkManager, SLOT(show()));
     325#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    320326    VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
    321327                        &msgCenter(), SLOT(sltShowHelpAboutDialog()));

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

    r49506 r49596  
    2626#include "UIMachineLogicNormal.h"
    2727#include "UIMachineWindow.h"
    28 #include "UIDownloaderAdditions.h"
    29 #include "UIDownloaderUserManual.h"
    30 #include "UIDownloaderExtensionPack.h"
    3128#ifdef Q_WS_MAC
    3229#include "VBoxUtils.h"

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

    r49505 r49596  
    2323#include "UIMachineLogicScale.h"
    2424#include "UIMachineWindow.h"
    25 #include "UIDownloaderAdditions.h"
    26 #include "UIDownloaderExtensionPack.h"
    2725#ifdef Q_WS_MAC
    2826#include "VBoxUtils.h"

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

    r49586 r49596  
    3434#include "QIFileDialog.h"
    3535#include "UIBar.h"
    36 #include "UINetworkManager.h"
    37 #include "UINetworkManagerIndicator.h"
    38 #include "UIUpdateManager.h"
    39 #include "UIDownloaderUserManual.h"
    40 #include "UIDownloaderExtensionPack.h"
     36#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     37# include "UINetworkManager.h"
     38# include "UINetworkManagerIndicator.h"
     39# include "UIUpdateManager.h"
     40# include "UIDownloaderUserManual.h"
     41# include "UIDownloaderExtensionPack.h"
     42#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    4143#include "UIIconPool.h"
    4244#include "UIWizardCloneVM.h"
    … …  
    13221324    m_pResetWarningsAction = gActionPool->action(UIActionIndex_Simple_ResetWarnings);
    13231325    pMenu->addAction(m_pResetWarningsAction);
     1326#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    13241327    pMenu->addSeparator();
    13251328    m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
    … …  
    13311334    else
    13321335        m_pUpdateAction->setEnabled(false);
     1336#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    13331337#ifndef Q_WS_MAC
    13341338    pMenu->addSeparator();
    … …  
    13401344void UISelectorWindow::prepareStatusBar()
    13411345{
     1346#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    13421347    /* Setup statusbar policy: */
    13431348    statusBar()->setContextMenuPolicy(Qt::CustomContextMenu);
    … …  
    13471352    statusBar()->addPermanentWidget(pIndicator);
    13481353    pIndicator->updateAppearance();
     1354#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    13491355}
    13501356
    … …  
    14621468    connect(m_pWebAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpWebDialog()));
    14631469    connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
     1470#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    14641471    connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
    14651472    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
     1473#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    14661474    connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
    14671475

  • trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

    r48316 r49596  
    2626/* GUI includes: */
    2727#include "QIWithRetranslateUI.h"
    28 #include "UINetworkDefs.h"
    2928
    3029/* Forward declarations: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

    r48577 r49596  
    3636#include "UIGlobalSettingsGeneral.h"
    3737#include "UIGlobalSettingsInput.h"
    38 #include "UIGlobalSettingsUpdate.h"
     38#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     39# include "UIGlobalSettingsUpdate.h"
     40#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    3941#include "UIGlobalSettingsLanguage.h"
    4042#include "UIGlobalSettingsDisplay.h"
    4143#include "UIGlobalSettingsNetwork.h"
    4244#include "UIGlobalSettingsExtension.h"
    43 #include "UIGlobalSettingsProxy.h"
     45#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     46# include "UIGlobalSettingsProxy.h"
     47#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    4448
    4549#include "UIMachineSettingsGeneral.h"
    … …  
    355359                    break;
    356360                }
     361#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    357362                /* Update page: */
    358363                case GlobalSettingsPageType_Update:
    … …  
    364369                    break;
    365370                }
     371#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    366372                /* Language page: */
    367373                case GlobalSettingsPageType_Language:
    … …  
    400406                    break;
    401407                }
     408#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    402409                /* Proxy page: */
    403410                case GlobalSettingsPageType_Proxy:
    … …  
    409416                    break;
    410417                }
     418#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    411419                default:
    412420                    break;
    … …  
    490498    m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
    491499
     500#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    492501    /* Update page: */
    493502    m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
     503#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    494504
    495505    /* Language page: */
    … …  
    505515    m_pSelector->setItemText(GlobalSettingsPageType_Extensions, tr("Extensions"));
    506516
     517#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
    507518    /* Proxy page: */
    508519    m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
     520#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
    509521
    510522    /* Polish the selector: */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette