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

Merge pull request #4976 from OPM/placeholder-text-combo-box

Browse Source 
Summary : Add placeholder text to combo box editor
This commit is contained in:
Magne Sjaastad 2019-11-03 19:12:33 +01:00 committed by GitHub
commit e70ef260cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp
View File

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

3
Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.cpp
View File

@ -48,6 +48,7 @@
#include <QComboBox>
#include <QDebug>
#include <QLabel>
#include <QLineEdit>
#include <QListView>
#include <QWheelEvent>
@ -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)

1
Fwk/AppFwk/cafUserInterface/cafPdmUiComboBoxEditor.h
View File

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