OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4377 Octave : Remove obsolete developer setting in Preferences

Browse Source
This commit is contained in:
Magne Sjaastad
2019-04-29 08:05:03 +02:00
parent f758a8edb2
commit 80718901d1
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/Application/RiaPreferences.cpp
View File

@@ -124,9 +124,6 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitField(&m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog", "", "", ""); CAF_PDM_InitField(&m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog", "", "", "");
m_showProjectChangedDialog.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); m_showProjectChangedDialog.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&m_showOctaveWarningForMultipleInstances, "showOctaveWarningForMultipleInstances", true, "Show Octave warning when multiple instances are created", "", "", "");
m_showOctaveWarningForMultipleInstances.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", "");
m_readerSettings = new RifReaderSettings; m_readerSettings = new RifReaderSettings;
@@ -175,7 +172,6 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
field == &showLasCurveWithoutTvdWarning || field == &showLasCurveWithoutTvdWarning ||
field == &holoLensDisableCertificateVerification || field == &holoLensDisableCertificateVerification ||
field == &m_showProjectChangedDialog || field == &m_showProjectChangedDialog ||
field == &m_showOctaveWarningForMultipleInstances ||
field == &showLegendBackground) field == &showLegendBackground)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
@@ -263,7 +259,6 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
uiOrdering.add(&m_appendFieldKeywordToToolTipText); uiOrdering.add(&m_appendFieldKeywordToToolTipText);
uiOrdering.add(&m_showProjectChangedDialog); uiOrdering.add(&m_showProjectChangedDialog);
uiOrdering.add(&m_showOctaveWarningForMultipleInstances);
uiOrdering.add(&m_showTestToolbar); uiOrdering.add(&m_showTestToolbar);
uiOrdering.add(&m_includeFractureDebugInfoFile); uiOrdering.add(&m_includeFractureDebugInfoFile);
@@ -355,19 +350,6 @@ bool RiaPreferences::showProjectChangedDialog() const
return m_showProjectChangedDialog(); return m_showProjectChangedDialog();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferences::showOctaveCommunicationWarning() const
{
if (!RiaApplication::enableDevelopmentFeatures())
{
return true;
}
return m_showOctaveWarningForMultipleInstances();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/Application/RiaPreferences.h
View File

@@ -60,7 +60,6 @@ public:
bool showTestToolbar() const; bool showTestToolbar() const;
bool includeFractureDebugInfoFile() const; bool includeFractureDebugInfoFile() const;
bool showProjectChangedDialog() const; bool showProjectChangedDialog() const;
bool showOctaveCommunicationWarning() const;
QString holoLensExportFolder() const; QString holoLensExportFolder() const;
std::map<RiaDefines::FontSettingType, RiaFontCache::FontSize> defaultFontSizes() const; std::map<RiaDefines::FontSettingType, RiaFontCache::FontSize> defaultFontSizes() const;
@@ -117,7 +116,6 @@ private:
caf::PdmField<bool> m_appendFieldKeywordToToolTipText; caf::PdmField<bool> m_appendFieldKeywordToToolTipText;
caf::PdmField<bool> m_showProjectChangedDialog; caf::PdmField<bool> m_showProjectChangedDialog;
caf::PdmField<bool> m_showOctaveWarningForMultipleInstances;
caf::PdmField<bool> m_showTestToolbar; caf::PdmField<bool> m_showTestToolbar;
caf::PdmField<bool> m_includeFractureDebugInfoFile; caf::PdmField<bool> m_includeFractureDebugInfoFile;