diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp index b07183906f..0d2d088779 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp @@ -438,28 +438,16 @@ void RimSummaryPlotFilterTextCurveSetEditor::defineEditorAttribute( const caf::P { if ( field == &m_curveFilterText ) { + auto attr = dynamic_cast( attribute ); + if ( attr ) { - auto attr = dynamic_cast( attribute ); - if ( attr ) - { - if ( uiConfigName == caf::PdmUiToolBarEditor::uiEditorConfigName() ) - { - // Special config for toolbar - attr->maximumWidth = 150; - } + attr->enableEditableContent = true; + attr->adjustWidthToContents = true; + attr->placeholderText = "Click to edit curves"; - attr->selectAllOnFocusEvent = true; - attr->placeholderText = "Click to define filter"; - } - } - - { - auto attr = dynamic_cast( attribute ); - if ( attr ) + if ( uiConfigName == caf::PdmUiToolBarEditor::uiEditorConfigName() ) { - attr->enableEditableContent = true; - attr->adjustWidthToContents = true; - attr->minimumWidth = 140; + attr->minimumWidth = 140; } } } diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp index 826aea0265..d615538800 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -234,6 +235,8 @@ void PdmUiComboBoxEditor::configureAndUpdateUi(const QString& uiConfigName) if (m_attributes.enableEditableContent) { m_comboBox->setEditable(true); + + m_comboBox->lineEdit()->setPlaceholderText(m_attributes.placeholderText); } if (m_attributes.minimumWidth != -1) diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h index f0343310f8..abca518183 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h @@ -74,6 +74,7 @@ public: bool enableEditableContent; int minimumWidth; + QString placeholderText; QString nextButtonText; QString prevButtonText;