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

#4775 Summary : Use combo box with history to edit text based curve creation

Browse Source
This commit is contained in:
Magne Sjaastad
2019-10-28 20:41:15 +01:00
parent 7a470587ac
commit 0af6a1d95d
4 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp
View File

@@ -204,6 +204,32 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* PdmUiToolBarEditor::focusWidget(PdmUiFieldEditorHandle* uiFieldEditorHandle)
{
// Some editors have a placeholder widget as parent of the main editor widget
// This is the case for combo box widget to allow up/down arrow buttons associated with the combo box
QWidget* editorWidget = nullptr;
auto comboEditor = dynamic_cast<caf::PdmUiComboBoxEditor*>(uiFieldEditorHandle);
if (comboEditor)
{
auto topWidget = comboEditor->editorWidget();
QComboBox* comboBox = topWidget->findChild<QComboBox*>();
editorWidget = comboBox;
}
else
{
editorWidget = uiFieldEditorHandle->editorWidget();
}
return editorWidget;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -244,10 +270,11 @@ void PdmUiToolBarEditor::setFocusWidgetFromKeyword(const QString& fieldKeyword)
auto fieldView = m_fieldViews.find(fieldKeyword);
if (fieldView != m_fieldViews.end() && fieldView->second)
{
auto editorWidget = fieldView->second->editorWidget();
if (editorWidget)
QWidget* widget = focusWidget(fieldView->second);
if (widget)
{
editorWidget->setFocus(Qt::ActiveWindowFocusReason);
widget->setFocus(Qt::ActiveWindowFocusReason);
PdmUiLineEditorAttribute attributes;
@@ -265,7 +292,7 @@ void PdmUiToolBarEditor::setFocusWidgetFromKeyword(const QString& fieldKeyword)
if (attributes.selectAllOnFocusEvent)
{
auto lineEdit = dynamic_cast<QLineEdit*>(editorWidget);
auto lineEdit = dynamic_cast<QLineEdit*>(widget);
if (lineEdit )
{
lineEdit->selectAll();
@@ -316,11 +343,11 @@ QString PdmUiToolBarEditor::keywordForFocusWidget()
{
for (auto fieldViewPair : m_fieldViews)
{
auto fieldView = fieldViewPair.second;
if (fieldView)
auto uiFieldEditorHandle = fieldViewPair.second;
if (uiFieldEditorHandle)
{
auto editorWidget = fieldView->editorWidget();
if (editorWidget && editorWidget->hasFocus())
auto widget = focusWidget(uiFieldEditorHandle);
if (widget && widget->hasFocus())
{
keyword = fieldViewPair.first;
}

2
Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.h
View File

@@ -75,6 +75,8 @@ public:
private:
void configureAndUpdateUi(const QString& uiConfigName) override;
static QWidget* focusWidget(PdmUiFieldEditorHandle* uiFieldEditorHandle);
private:
QPointer<QToolBar> m_toolbar;