#4972 Summary : Add placeholder text to combo box editor

This commit is contained in:
Magne Sjaastad 2019-11-03 14:49:08 +01:00
parent ee3f6a5a43
commit a950852559
3 changed files with 11 additions and 19 deletions

View File

@ -438,28 +438,16 @@ void RimSummaryPlotFilterTextCurveSetEditor::defineEditorAttribute( const caf::P
{ {
if ( field == &m_curveFilterText ) if ( field == &m_curveFilterText )
{ {
auto attr = dynamic_cast<caf::PdmUiComboBoxEditorAttribute*>( attribute );
if ( attr )
{ {
auto attr = dynamic_cast<caf::PdmUiLineEditorAttribute*>( attribute ); attr->enableEditableContent = true;
if ( attr ) attr->adjustWidthToContents = true;
{ attr->placeholderText = "Click to edit curves";
if ( uiConfigName == caf::PdmUiToolBarEditor::uiEditorConfigName() )
{
// Special config for toolbar
attr->maximumWidth = 150;
}
attr->selectAllOnFocusEvent = true; if ( uiConfigName == caf::PdmUiToolBarEditor::uiEditorConfigName() )
attr->placeholderText = "Click to define filter";
}
}
{
auto attr = dynamic_cast<caf::PdmUiComboBoxEditorAttribute*>( attribute );
if ( attr )
{ {
attr->enableEditableContent = true; attr->minimumWidth = 140;
attr->adjustWidthToContents = true;
attr->minimumWidth = 140;
} }
} }
} }

View File

@ -48,6 +48,7 @@
#include <QComboBox> #include <QComboBox>
#include <QDebug> #include <QDebug>
#include <QLabel> #include <QLabel>
#include <QLineEdit>
#include <QListView> #include <QListView>
#include <QWheelEvent> #include <QWheelEvent>
@ -234,6 +235,8 @@ void PdmUiComboBoxEditor::configureAndUpdateUi(const QString& uiConfigName)
if (m_attributes.enableEditableContent) if (m_attributes.enableEditableContent)
{ {
m_comboBox->setEditable(true); m_comboBox->setEditable(true);
m_comboBox->lineEdit()->setPlaceholderText(m_attributes.placeholderText);
} }
if (m_attributes.minimumWidth != -1) if (m_attributes.minimumWidth != -1)

View File

@ -74,6 +74,7 @@ public:
bool enableEditableContent; bool enableEditableContent;
int minimumWidth; int minimumWidth;
QString placeholderText;
QString nextButtonText; QString nextButtonText;
QString prevButtonText; QString prevButtonText;