VirtualBox

Changeset 66593 in vbox


Ignore:
Timestamp:
Apr 17, 2017 3:18:57 PM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
114620
Message:

FE/Qt: Finally get rid of VBoxGlobalSettings.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
2 deleted
21 edited

Legend:

Unmodified
Added
Removed

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

    r66279 r66593  
    295295        src/UIMediumTypeChangeDialog.h \
    296296        src/VBoxAboutDlg.h \
    297         src/VBoxGlobalSettings.h \
    298297        src/VBoxLicenseViewer.h \
    299298        src/VBoxSnapshotDetailsDlg.h \
    … …  
    592591        src/UIMediumTypeChangeDialog.cpp \
    593592        src/VBoxAboutDlg.cpp \
    594         src/VBoxGlobalSettings.cpp \
    595593        src/VBoxLicenseViewer.cpp \
    596594        src/VBoxSnapshotDetailsDlg.cpp \

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

    r66590 r66593  
    4747const char* UIExtraDataDefs::GUI_RestrictedGlobalSettingsPages = "GUI/RestrictedGlobalSettingsPages";
    4848const char* UIExtraDataDefs::GUI_RestrictedMachineSettingsPages = "GUI/RestrictedMachineSettingsPages";
     49
     50/* Settings: General: */
     51const char* UIExtraDataDefs::GUI_HostScreenSaverDisabled = "GUI/HostScreenSaverDisabled";
    4952
    5053/* Settings: Language: */

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

    r66590 r66593  
    6868        /** Holds restricted Machine Settings pages. */
    6969        extern const char* GUI_RestrictedMachineSettingsPages;
     70    /** @} */
     71
     72    /** @name Settings: General
     73      * @{ */
     74        /** Holds whether host screen-saver should be disabled. */
     75        extern const char* GUI_HostScreenSaverDisabled;
    7076    /** @} */
    7177

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

    r66590 r66593  
    4343# include "UIHostComboEditor.h"
    4444# include "UIMainEventListener.h"
    45 # include "VBoxGlobalSettings.h"
    4645# include "VBoxGlobal.h"
    4746# include "UIActionPool.h"
    … …  
    238237}
    239238
    240 void UIExtraDataEventHandler::sltPreprocessExtraDataCanChange(QString strMachineID, QString strKey, QString strValue, bool &fVeto, QString &strVetoReason)
     239void UIExtraDataEventHandler::sltPreprocessExtraDataCanChange(QString strMachineID, QString strKey, QString /* strValue */, bool & /* fVeto */, QString & /* strVetoReason */)
    241240{
    242241    /* Preprocess global 'extra-data can change' event: */
    … …  
    245244        if (strKey.startsWith("GUI/"))
    246245        {
    247             /* Try to set the global setting to check its syntax: */
    248             VBoxGlobalSettings gs(false /* non-null */);
    249             /* Known GUI property key? */
    250             if (gs.setPublicProperty(strKey, strValue))
    251             {
    252                 /* But invalid GUI property value? */
    253                 if (!gs)
    254                 {
    255                     /* Remember veto reason: */
    256                     strVetoReason = gs.lastError();
    257                     /* And disallow that change: */
    258                     fVeto = true;
    259                 }
    260             }
     246            /* Check whether global extra-data property can be applied: */
     247            // TODO: Here can be various extra-data flags handling.
     248            //       Generally we should check whether one or another flag feats some rule (like reg-exp).
     249            //       For each required strValue we should set fVeto = true; and fill strVetoReason = "with some text".
    261250        }
    262251    }
    … …  
    270259        if (strKey.startsWith("GUI/"))
    271260        {
    272             /* Apply global property: */
    273             m_mutex.lock();
    274             vboxGlobal().settings().setPublicProperty(strKey, strValue);
    275             m_mutex.unlock();
    276             AssertMsgReturnVoid(!!vboxGlobal().settings(), ("Failed to apply global property.\n"));
     261            /* Apply global extra-data property: */
     262            // TODO: Here can be various extra-data flags handling.
     263            //       Generally we should push one or another flag to various instances which want to handle
     264            //       those flags independently from UIExtraDataManager. Remember to process each required strValue
     265            //       from under the m_mutex lock (since we are in another thread) and unlock that m_mutex afterwards.
    277266        }
    278267    }
    … …  
    23372326}
    23382327
     2328bool UIExtraDataManager::hostScreenSaverDisabled()
     2329{
     2330    /* 'False' unless feature allowed: */
     2331    return isFeatureAllowed(GUI_HostScreenSaverDisabled);
     2332}
     2333
     2334void UIExtraDataManager::setHostScreenSaverDisabled(bool fDisabled)
     2335{
     2336    /* 'True' if feature allowed, null-string otherwise: */
     2337    setExtraDataString(GUI_HostScreenSaverDisabled, toFeatureAllowed(fDisabled));
     2338}
     2339
    23392340QString UIExtraDataManager::languageId()
    23402341{

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

    r66590 r66593  
    187187        /** Returns restricted machine settings pages. */
    188188        QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QString &strID);
     189    /** @} */
     190
     191    /** @name Settings: General
     192      * @{ */
     193        /** Returns whether the host screen-saver should be disabled. */
     194        bool hostScreenSaverDisabled();
     195        /** Defines whether the host screen-saver should be @a fDisabled. */
     196        void setHostScreenSaverDisabled(bool fDisabled);
    189197    /** @} */
    190198

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

    r66569 r66593  
    479479             "VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p>")
    480480             .arg(strLangFile));
    481 }
    482 
    483 void UIMessageCenter::cannotLoadGlobalConfig(const CVirtualBox &vbox, const QString &strError) const
    484 {
    485     error(0, MessageType_Critical,
    486           tr("<p>Failed to load the global GUI configuration from <b><nobr>%1</nobr></b>.</p>"
    487              "<p>The application will now terminate.</p>")
    488              .arg(CVirtualBox(vbox).GetSettingsFilePath()),
    489           !vbox.isOk() ? formatErrorInfo(vbox) : QString("<!--EOM--><p>%1</p>").arg(vboxGlobal().emphasize(strError)));
    490481}
    491482

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

    r66566 r66593  
    165165    void cannotFindLanguage(const QString &strLangId, const QString &strNlsPath) const;
    166166    void cannotLoadLanguage(const QString &strLangFile) const;
    167     void cannotLoadGlobalConfig(const CVirtualBox &vbox, const QString &strError) const;
    168167    void cannotSaveGlobalConfig(const CVirtualBox &vbox) const;
    169168    void cannotFindMachineByName(const CVirtualBox &vbox, const QString &strName) const;

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

    r66587 r66593  
    341341#endif /* VBOX_WS_MAC */
    342342
    343 /**
    344  *  Sets the new global settings and saves them to the VirtualBox server.
    345  */
    346 bool VBoxGlobal::setSettings (VBoxGlobalSettings &gs)
    347 {
    348     gs.save(m_vbox);
    349 
    350     if (!m_vbox.isOk())
    351     {
    352         msgCenter().cannotSaveGlobalConfig(m_vbox);
    353         return false;
    354     }
    355 
    356     /* We don't assign gs to our gset member here, because VBoxCallback
    357      * will update gset as necessary when new settings are successfully
    358      * sent to the VirtualBox server by gs.save(). */
    359 
    360     return true;
    361 }
    362 
    363343QWidget* VBoxGlobal::activeMachineWindow() const
    364344{
    … …  
    21902170/**
    21912171 *  Returns the loaded (active) language ID.
    2192  *  Note that it may not match with VBoxGlobalSettings::languageId() if the
     2172 *  Note that it may not match with UIExtraDataManager::languageId() if the
    21932173 *  specified language cannot be loaded.
    21942174 *  If the built-in language is active, this method returns "C".
    … …  
    41174097    m_pThreadPool = new UIThreadPool(3 /* worker count */, 5000 /* worker timeout */);
    41184098
    4119     /* create default non-null global settings */
    4120     gset = VBoxGlobalSettings (false);
    4121 
    4122     /* try to load global settings */
    4123     gset.load(m_vbox);
    4124     if (!m_vbox.isOk() || !gset)
    4125     {
    4126         msgCenter().cannotLoadGlobalConfig(m_vbox, gset.lastError());
    4127         return;
    4128     }
    4129 
    41304099    /* Load translation based on the user settings: */
    41314100    QString sLanguageId = gEDataManager->languageId();

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

    r66397 r66593  
    3434#include "UIDefs.h"
    3535#include "UIMediumDefs.h"
    36 #include "VBoxGlobalSettings.h"
    3736#ifdef VBOX_WS_X11
    3837# include "VBoxX11Helper.h"
    … …  
    144143    UIThreadPool* threadPool() const { return m_pThreadPool; }
    145144
    146     VBoxGlobalSettings &settings() { return gset; }
    147     bool setSettings (VBoxGlobalSettings &gs);
    148 
    149145    /** Returns currently active virtual machine window. */
    150146    QWidget* activeMachineWindow() const;
    … …  
    547543    /** Holds whether VBoxSVC is currently available. */
    548544    bool m_fVBoxSVCAvailable;
    549 
    550     VBoxGlobalSettings gset;
    551545
    552546    /** Holds whether GUI is separate (from VM) process. */

  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r65381 r66593  
    647647#include "UIFilePathSelector.h"
    648648#include "VBoxGlobal.h"
    649 #include "VBoxGlobalSettings.h"
    650649#include "VBoxGuestRAMSlider.h"
    651650//#include "VBoxIChatTheaterWrapper.h"

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

    r66355 r66593  
    205205void UISettingsDialogGlobal::loadOwnData()
    206206{
    207     /* Get properties and settings: */
     207    /* Get properties: */
    208208    CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
    209     VBoxGlobalSettings settings = vboxGlobal().settings();
    210209    /* Prepare global data: */
    211210    qRegisterMetaType<UISettingsDataGlobal>();
    212     UISettingsDataGlobal data(properties, settings);
     211    UISettingsDataGlobal data(properties);
    213212    QVariant varData = QVariant::fromValue(data);
    214213
    … …  
    219218void UISettingsDialogGlobal::saveOwnData()
    220219{
    221     /* Get properties and settings: */
     220    /* Get properties: */
    222221    CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
    223     VBoxGlobalSettings settings = vboxGlobal().settings();
    224222    /* Prepare global data: */
    225223    qRegisterMetaType<UISettingsDataGlobal>();
    226     UISettingsDataGlobal data(properties, settings);
     224    UISettingsDataGlobal data(properties);
    227225    QVariant varData = QVariant::fromValue(data);
    228226
    … …  
    230228    UISettingsDialog::saveData(varData);
    231229
    232     /* Get updated properties & settings: */
     230    /* Get updated properties: */
    233231    CSystemProperties newProperties = varData.value<UISettingsDataGlobal>().m_properties;
    234     VBoxGlobalSettings newSettings = varData.value<UISettingsDataGlobal>().m_settings;
    235232    /* If properties are not OK => show the error: */
    236233    if (!newProperties.isOk())
    237234        msgCenter().cannotSetSystemProperties(newProperties, this);
    238     /* Else save the new settings if they were changed: */
    239     else if (!(newSettings == settings))
    240         vboxGlobal().setSettings(newSettings);
    241235
    242236    /* Mark as saved: */

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

    r62493 r66593  
    8080}
    8181
    82 /* Fetch data to m_properties & m_settings: */
     82/* Fetch data to m_properties: */
    8383void UISettingsPageGlobal::fetchData(const QVariant &data)
    8484{
    8585    m_properties = data.value<UISettingsDataGlobal>().m_properties;
    86     m_settings = data.value<UISettingsDataGlobal>().m_settings;
    8786}
    8887
    89 /* Upload m_properties & m_settings to data: */
     88/* Upload m_properties to data: */
    9089void UISettingsPageGlobal::uploadData(QVariant &data) const
    9190{
    92     data = QVariant::fromValue(UISettingsDataGlobal(m_properties, m_settings));
     91    data = QVariant::fromValue(UISettingsDataGlobal(m_properties));
    9392}
    9493

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h

    r66163 r66593  
    2727#include "UISettingsDefs.h"
    2828#include "UIExtraDataDefs.h"
    29 #include "VBoxGlobalSettings.h"
    3029
    3130/* COM includes: */
    … …  
    5352{
    5453    UISettingsDataGlobal() {}
    55     UISettingsDataGlobal(const CSystemProperties &properties, const VBoxGlobalSettings &settings)
    56         : m_properties(properties), m_settings(settings) {}
     54    UISettingsDataGlobal(const CSystemProperties &properties)
     55        : m_properties(properties) {}
    5756    CSystemProperties m_properties;
    58     VBoxGlobalSettings m_settings;
    5957};
    6058Q_DECLARE_METATYPE(UISettingsDataGlobal);
    … …  
    207205    /* Global data source: */
    208206    CSystemProperties m_properties;
    209     VBoxGlobalSettings m_settings;
    210207};
    211208

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

    r66588 r66593  
    7676void UIGlobalSettingsDisplay::loadToCacheFrom(QVariant &data)
    7777{
    78     /* Fetch data to properties & settings: */
     78    /* Fetch data to properties: */
    7979    UISettingsPageGlobal::fetchData(data);
    8080
    … …  
    9494    m_pCache->cacheInitialData(oldDisplayData);
    9595
    96     /* Upload properties & settings to data: */
     96    /* Upload properties to data: */
    9797    UISettingsPageGlobal::uploadData(data);
    9898}
    … …  
    130130void UIGlobalSettingsDisplay::saveFromCacheTo(QVariant &data)
    131131{
    132     /* Fetch data to properties & settings: */
     132    /* Fetch data to properties: */
    133133    UISettingsPageGlobal::fetchData(data);
    134134
    … …  
    144144    }
    145145
    146     /* Upload properties & settings to data: */
     146    /* Upload properties to data: */
    147147    UISettingsPageGlobal::uploadData(data);
    148148}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

    r66568 r66593  
    271271void UIGlobalSettingsExtension::loadToCacheFrom(QVariant &data)
    272272{
    273     /* Fetch data to properties & settings: */
     273    /* Fetch data to properties: */
    274274    UISettingsPageGlobal::fetchData(data);
    275275
    … …  
    293293    m_pCache->cacheInitialData(oldExtensionData);
    294294
    295     /* Upload properties & settings to data: */
     295    /* Upload properties to data: */
    296296    UISettingsPageGlobal::uploadData(data);
    297297}
    … …  
    319319void UIGlobalSettingsExtension::saveFromCacheTo(QVariant &data)
    320320{
    321     /* Fetch data to properties & settings: */
     321    /* Fetch data to properties: */
    322322    UISettingsPageGlobal::fetchData(data);
    323323
    324324    /* Nothing to save from the cache... */
    325325
    326     /* Upload properties & settings to data: */
     326    /* Upload properties to data: */
    327327    UISettingsPageGlobal::uploadData(data);
    328328}

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

    r66568 r66593  
    2525/* GUI includes: */
    2626# include "UIGlobalSettingsGeneral.h"
     27# include "UIExtraDataManager.h"
    2728# include "VBoxGlobal.h"
    2829
    … …  
    7980void UIGlobalSettingsGeneral::loadToCacheFrom(QVariant &data)
    8081{
    81     /* Fetch data to properties & settings: */
     82    /* Fetch data to properties: */
    8283    UISettingsPageGlobal::fetchData(data);
    8384
    … …  
    9192    oldGeneralData.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
    9293    oldGeneralData.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
    93     oldGeneralData.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled();
     94    oldGeneralData.m_fHostScreenSaverDisabled = gEDataManager->hostScreenSaverDisabled();
    9495
    9596    /* Cache old general data: */
    9697    m_pCache->cacheInitialData(oldGeneralData);
    9798
    98     /* Upload properties & settings to data: */
     99    /* Upload properties to data: */
    99100    UISettingsPageGlobal::uploadData(data);
    100101}
    … …  
    127128void UIGlobalSettingsGeneral::saveFromCacheTo(QVariant &data)
    128129{
    129     /* Fetch data to properties & settings: */
     130    /* Fetch data to properties: */
    130131    UISettingsPageGlobal::fetchData(data);
    131132
    … …  
    141142            m_properties.SetVRDEAuthLibrary(m_pCache->data().m_strVRDEAuthLibrary);
    142143        if (m_pCache->data().m_fHostScreenSaverDisabled != m_pCache->base().m_fHostScreenSaverDisabled)
    143             m_settings.setHostScreenSaverDisabled(m_pCache->data().m_fHostScreenSaverDisabled);
     144            gEDataManager->setHostScreenSaverDisabled(m_pCache->data().m_fHostScreenSaverDisabled);
    144145    }
    145146
    146     /* Upload properties & settings to data: */
     147    /* Upload properties to data: */
    147148    UISettingsPageGlobal::uploadData(data);
    148149}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

    r66571 r66593  
    882882void UIGlobalSettingsInput::loadToCacheFrom(QVariant &data)
    883883{
    884     /* Fetch data to properties & settings: */
     884    /* Fetch data to properties: */
    885885    UISettingsPageGlobal::fetchData(data);
    886886
    … …  
    910910    m_pCache->cacheInitialData(oldInputData);
    911911
    912     /* Upload properties & settings to data: */
     912    /* Upload properties to data: */
    913913    UISettingsPageGlobal::uploadData(data);
    914914}
    … …  
    944944void UIGlobalSettingsInput::saveFromCacheTo(QVariant &data)
    945945{
    946     /* Fetch data to properties & settings: */
     946    /* Fetch data to properties: */
    947947    UISettingsPageGlobal::fetchData(data);
    948948
    … …  
    974974    }
    975975
    976     /* Upload properties & settings to data: */
     976    /* Upload properties to data: */
    977977    UISettingsPageGlobal::uploadData(data);
    978978}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

    r66587 r66593  
    221221void UIGlobalSettingsLanguage::loadToCacheFrom(QVariant &data)
    222222{
    223     /* Fetch data to properties & settings: */
     223    /* Fetch data to properties: */
    224224    UISettingsPageGlobal::fetchData(data);
    225225
    … …  
    236236    m_pCache->cacheInitialData(oldLanguageData);
    237237
    238     /* Upload properties & settings to data: */
     238    /* Upload properties to data: */
    239239    UISettingsPageGlobal::uploadData(data);
    240240}
    … …  
    266266void UIGlobalSettingsLanguage::saveFromCacheTo(QVariant &data)
    267267{
    268     /* Fetch data to properties & settings: */
     268    /* Fetch data to properties: */
    269269    UISettingsPageGlobal::fetchData(data);
    270270
    … …  
    277277    }
    278278
    279     /* Upload properties & settings to data: */
     279    /* Upload properties to data: */
    280280    UISettingsPageGlobal::uploadData(data);
    281281}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

    r66568 r66593  
    437437void UIGlobalSettingsNetwork::loadToCacheFrom(QVariant &data)
    438438{
    439     /* Fetch data to properties & settings: */
     439    /* Fetch data to properties: */
    440440    UISettingsPageGlobal::fetchData(data);
    441441
    … …  
    464464    m_pCache->cacheInitialData(oldNetworkData);
    465465
    466     /* Upload properties & settings to data: */
     466    /* Upload properties to data: */
    467467    UISettingsPageGlobal::uploadData(data);
    468468}
    … …  
    518518void UIGlobalSettingsNetwork::saveFromCacheTo(QVariant &data)
    519519{
    520     /* Fetch data to properties & settings: */
     520    /* Fetch data to properties: */
    521521    UISettingsPageGlobal::fetchData(data);
    522522
    … …  
    533533    }
    534534
    535     /* Upload properties & settings to data: */
     535    /* Upload properties to data: */
    536536    UISettingsPageGlobal::uploadData(data);
    537537}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp

    r66590 r66593  
    8181void UIGlobalSettingsProxy::loadToCacheFrom(QVariant &data)
    8282{
    83     /* Fetch data to properties & settings: */
     83    /* Fetch data to properties: */
    8484    UISettingsPageGlobal::fetchData(data);
    8585
    … …  
    9999    m_pCache->cacheInitialData(oldProxyData);
    100100
    101     /* Upload properties & settings to data: */
     101    /* Upload properties to data: */
    102102    UISettingsPageGlobal::uploadData(data);
    103103}
    … …  
    141141void UIGlobalSettingsProxy::saveFromCacheTo(QVariant &data)
    142142{
    143     /* Fetch data to properties & settings: */
     143    /* Fetch data to properties: */
    144144    UISettingsPageGlobal::fetchData(data);
    145145
    … …  
    155155    }
    156156
    157     /* Upload properties & settings to data: */
     157    /* Upload properties to data: */
    158158    UISettingsPageGlobal::uploadData(data);
    159159}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp

    r66568 r66593  
    8282void UIGlobalSettingsUpdate::loadToCacheFrom(QVariant &data)
    8383{
    84     /* Fetch data to properties & settings: */
     84    /* Fetch data to properties: */
    8585    UISettingsPageGlobal::fetchData(data);
    8686
    … …  
    101101    m_pCache->cacheInitialData(oldUpdateData);
    102102
    103     /* Upload properties & settings to data: */
     103    /* Upload properties to data: */
    104104    UISettingsPageGlobal::uploadData(data);
    105105}
    … …  
    141141void UIGlobalSettingsUpdate::saveFromCacheTo(QVariant &data)
    142142{
    143     /* Fetch data to properties & settings: */
     143    /* Fetch data to properties: */
    144144    UISettingsPageGlobal::fetchData(data);
    145145
    … …  
    152152    }
    153153
    154     /* Upload properties & settings to data: */
     154    /* Upload properties to data: */
    155155    UISettingsPageGlobal::uploadData(data);
    156156}
Note: See TracChangeset for help on using the changeset viewer.

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