VirtualBox

Ignore:
Timestamp:
Apr 20, 2016 12:58:40 PM (9 years ago)
Author:
vboxsync
Message:

FE/Qt: ​​​​​​​bugref:6660: Make Extra-data Manager UI accessible for any build except 'release' one (it was only 'debug' one before).

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

Legend:

Unmodified
Added
Removed

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

    r60496 r60599  
    160160 VirtualBox_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
    161161 VBOX_GUI_WITH_NETWORK_MANAGER := 1
     162endif
     163ifneq ($(KBUILD_TYPE),release)
     164 VirtualBox_DEFS        += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    162165endif
    163166ifdef VBOX_BLEEDING_EDGE

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

    r60362 r60599  
    162162#endif /* VBOX_WITH_DEBUGGER_GUI */
    163163
    164 #ifdef DEBUG
     164#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    165165/* VirtualBox: Extra-data Manager window: */
    166166const char* UIExtraDataDefs::GUI_ExtraDataManager_Geometry = "GUI/ExtraDataManager/Geometry";
    167167const char* UIExtraDataDefs::GUI_ExtraDataManager_SplitterHints = "GUI/ExtraDataManager/SplitterHints";
    168 #endif /* DEBUG */
     168#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    169169
    170170/* Virtual Machine: Log dialog: */

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

    r60362 r60599  
    287287#endif /* VBOX_WITH_DEBUGGER_GUI */
    288288
    289 #ifdef DEBUG
     289#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    290290    /** @name VirtualBox: Extra-data Manager window
    291291      * @{ */
    … …  
    295295        extern const char* GUI_ExtraDataManager_SplitterHints;
    296296    /** @} */
    297 #endif /* DEBUG */
     297#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    298298
    299299    /** @name Virtual Machine: Log dialog

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

    r60362 r60599  
    2323# include <QMutex>
    2424# include <QMetaEnum>
    25 # ifdef DEBUG
     25# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    2626#  include <QMainWindow>
    2727#  include <QMenuBar>
    … …  
    3636#  include <QComboBox>
    3737#  include <QPushButton>
    38 # endif /* DEBUG */
     38# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    3939
    4040/* GUI includes: */
    … …  
    4747# include "UISettingsDefs.h"
    4848# include "UIMessageCenter.h"
    49 # ifdef DEBUG
     49# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    5050#  include "VBoxUtils.h"
    5151#  include "UIVirtualBoxEventHandler.h"
    … …  
    5757#  include "QISplitter.h"
    5858#  include "QIDialog.h"
    59 # endif /* DEBUG */
     59# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    6060
    6161/* COM includes: */
    … …  
    6868#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    6969
    70 #ifdef DEBUG
     70#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    7171# include <QStandardItemModel>
    7272# include <QXmlStreamWriter>
    7373# include <QXmlStreamReader>
    74 #endif
     74#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    7575
    7676
    … …  
    276276
    277277
    278 #ifdef DEBUG
     278#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    279279/** Data fields. */
    280280enum Field
    … …  
    20102010           << GUI_LogWindowGeometry;
    20112011}
    2012 #endif /* DEBUG */
     2012#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    20132013
    20142014
    … …  
    20412041}
    20422042
    2043 #ifdef DEBUG
     2043#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    20442044/* static */
    20452045void UIExtraDataManager::openWindow(QWidget *pCenterWidget)
    … …  
    20482048    instance()->open(pCenterWidget);
    20492049}
    2050 #endif /* DEBUG */
     2050#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    20512051
    20522052void UIExtraDataManager::hotloadMachineExtraDataMap(const QString &strID)
    … …  
    38183818#endif /* VBOX_WITH_DEBUGGER_GUI */
    38193819
    3820 #ifdef DEBUG
     3820#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    38213821QRect UIExtraDataManager::extraDataManagerGeometry(QWidget *pWidget)
    38223822{
    … …  
    39343934    setExtraDataStringList(GUI_ExtraDataManager_SplitterHints, data);
    39353935}
    3936 #endif /* DEBUG */
     3936#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    39373937
    39383938QRect UIExtraDataManager::logWindowGeometry(QWidget *pWidget, const QRect &defaultGeometry)
    … …  
    41284128}
    41294129
    4130 #ifdef DEBUG
     4130#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    41314131void UIExtraDataManager::cleanupWindow()
    41324132{
    41334133    delete m_pWindow;
    41344134}
    4135 #endif /* DEBUG */
     4135#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    41364136
    41374137void UIExtraDataManager::cleanupExtraDataEventHandler()
    … …  
    41464146    /* Cleanup extra-data event-handler: */
    41474147    cleanupExtraDataEventHandler();
    4148 #ifdef DEBUG
     4148#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    41494149    /* Cleanup window: */
    41504150    cleanupWindow();
    4151 #endif /* DEBUG */
    4152 }
    4153 
    4154 #ifdef DEBUG
     4151#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     4152}
     4153
     4154#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    41554155void UIExtraDataManager::open(QWidget *pCenterWidget)
    41564156{
    … …  
    41694169    m_pWindow->showAndRaise(pCenterWidget);
    41704170}
    4171 #endif /* DEBUG */
     4171#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    41724172
    41734173bool UIExtraDataManager::isFeatureAllowed(const QString &strKey, const QString &strID /* = GlobalID */)

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

    r60362 r60599  
    2222#include <QObject>
    2323#include <QMap>
    24 #ifdef DEBUG
     24#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    2525# include <QPointer>
    26 #endif /* DEBUG */
     26#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    2727
    2828/* GUI includes: */
    … …  
    3131/* Forward declarations: */
    3232class UIExtraDataEventHandler;
    33 #ifdef DEBUG
     33#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    3434class UIExtraDataManagerWindow;
    35 #endif /* DEBUG */
     35#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    3636
    3737/** Defines the map of extra data values. The index is an extra-data key. */
    … …  
    105105    static void destroy();
    106106
    107 #ifdef DEBUG
     107#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    108108    /** Static show and raise API. */
    109109    static void openWindow(QWidget *pCenterWidget);
    110 #endif /* DEBUG */
     110#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    111111
    112112    /** @name Base
    … …  
    534534#endif /* VBOX_WITH_DEBUGGER_GUI */
    535535
    536 #ifdef DEBUG
     536#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    537537    /** @name VirtualBox: Extra-data Manager window
    538538      * @{ */
    … …  
    549549        void setExtraDataManagerSplitterHints(const QList<int> &hints);
    550550    /** @} */
    551 #endif /* DEBUG */
     551#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    552552
    553553    /** @name Virtual Machine: Log dialog
    … …  
    574574    /** Prepare extra-data event-handler. */
    575575    void prepareExtraDataEventHandler();
    576 #ifdef DEBUG
     576#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    577577    // /** Prepare window. */
    578578    // void prepareWindow();
    … …  
    580580    /** Cleanup window. */
    581581    void cleanupWindow();
    582 #endif /* DEBUG */
     582#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    583583    /** Cleanup extra-data event-handler. */
    584584    void cleanupExtraDataEventHandler();
    … …  
    588588    void cleanup();
    589589
    590 #ifdef DEBUG
     590#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    591591    /** Open window. */
    592592    void open(QWidget *pCenterWidget);
    593 #endif /* DEBUG */
     593#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    594594
    595595    /** Retrieves an extra-data key from both machine and global sources.
    … …  
    630630    MapOfExtraDataMaps m_data;
    631631
    632 #ifdef DEBUG
     632#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    633633    /** Holds Extra-data Manager window instance. */
    634634    QPointer<UIExtraDataManagerWindow> m_pWindow;
    635 #endif /* DEBUG */
     635#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    636636};
    637637

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

    r60362 r60599  
    138138};
    139139
    140 #ifdef DEBUG
     140#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    141141class UIActionSimpleExtraDataManagerWindow : public UIActionSimple
    142142{
    … …  
    166166    }
    167167};
    168 #endif /* DEBUG */
     168#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    169169
    170170class UIActionSimpleExit : public UIActionSimple
    … …  
    10101010    m_pool[UIActionIndexST_M_File_S_ImportAppliance] = new UIActionSimpleImportApplianceWizard(this);
    10111011    m_pool[UIActionIndexST_M_File_S_ExportAppliance] = new UIActionSimpleExportApplianceWizard(this);
    1012 #ifdef DEBUG
     1012#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    10131013    m_pool[UIActionIndexST_M_File_S_ShowExtraDataManager] = new UIActionSimpleExtraDataManagerWindow(this);
    1014 #endif /* DEBUG */
     1014#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    10151015    m_pool[UIActionIndexST_M_File_S_Close] = new UIActionSimpleExit(this);
    10161016

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

    r57787 r60599  
    3636    UIActionIndexST_M_File_S_ImportAppliance,
    3737    UIActionIndexST_M_File_S_ExportAppliance,
    38 #ifdef DEBUG
     38#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    3939    UIActionIndexST_M_File_S_ShowExtraDataManager,
    40 #endif /* DEBUG */
     40#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    4141    UIActionIndexST_M_File_S_Close,
    4242

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

    r60437 r60599  
    432432}
    433433
    434 #ifdef DEBUG
     434#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    435435void UISelectorWindow::sltOpenExtraDataManagerWindow()
    436436{
    437437    gEDataManager->openWindow(this);
    438438}
    439 #endif /* DEBUG */
     439#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    440440
    441441void UISelectorWindow::sltOpenPreferencesDialog()
    … …  
    12611261    /* 'Export Appliance' action goes to 'File' menu: */
    12621262    pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
    1263 # ifdef DEBUG
     1263# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    12641264    /* 'Show Extra-data Manager' action goes to 'File' menu for Debug build: */
    12651265    pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
    1266 # endif /* DEBUG */
     1266# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    12671267    /* 'Show Media Manager' action goes to 'File' menu: */
    12681268    pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
    … …  
    12801280    /* Separator after 'Export Appliance' action of the 'File' menu: */
    12811281    pMenu->addSeparator();
    1282 # ifdef DEBUG
     1282# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    12831283    /* 'Extra-data Manager' action goes to 'File' menu for Debug build: */
    12841284    pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
    1285 # endif /* DEBUG */
     1285# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    12861286    /* 'Show Media Manager' action goes to 'File' menu: */
    12871287    pMenu->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
    … …  
    15501550    connect(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance), SIGNAL(triggered()), this, SLOT(sltOpenImportApplianceWizard()));
    15511551    connect(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance), SIGNAL(triggered()), this, SLOT(sltOpenExportApplianceWizard()));
    1552 #ifdef DEBUG
     1552#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    15531553    connect(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager), SIGNAL(triggered()), this, SLOT(sltOpenExtraDataManagerWindow()));
    1554 #endif /* DEBUG */
     1554#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    15551555    connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), SIGNAL(triggered()), this, SLOT(sltOpenPreferencesDialog()));
    15561556    connect(actionPool()->action(UIActionIndexST_M_File_S_Close), SIGNAL(triggered()), this, SLOT(sltPerformExit()));

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

    r60362 r60599  
    105105        /** Handles call to open Export Appliance wizard. */
    106106        void sltOpenExportApplianceWizard();
    107 #ifdef DEBUG
     107#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
    108108        /** Handles call to open Extra-data Manager window. */
    109109        void sltOpenExtraDataManagerWindow();
    110 #endif /* DEBUG */
     110#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
    111111        /** Handles call to open Preferences dialog. */
    112112        void sltOpenPreferencesDialog();
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