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

#1867 AppFwk : Use updateLabelFromField from field editors

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-07 09:08:11 +02:00
parent 2f22f82ba1
commit a0a28fee36
13 changed files with 20 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxEditor.cpp
View File

@ -72,23 +72,15 @@ void PdmUiCheckBoxEditor::configureAndUpdateUi(const QString& uiConfigName)
if (attributes.m_useNativeCheckBoxLabel) if (attributes.m_useNativeCheckBoxLabel)
{ {
m_checkBox->setText(field()->uiName(uiConfigName)); m_checkBox->setText(field()->uiName(uiConfigName));
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
} }
else else
{ {
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
} }
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_checkBox->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_checkBox->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_checkBox->setToolTip(field()->uiToolTip(uiConfigName)); m_checkBox->setToolTip(field()->uiToolTip(uiConfigName));

15
Fwk/AppFwk/cafUserInterface/cafPdmUiCheckBoxTristateEditor.cpp
View File

@ -28,20 +28,7 @@ void PdmUiCheckBoxTristateEditor::configureAndUpdateUi(const QString& uiConfigNa
CAF_ASSERT(!m_checkBox.isNull()); CAF_ASSERT(!m_checkBox.isNull());
CAF_ASSERT(!m_label.isNull()); CAF_ASSERT(!m_label.isNull());
{ PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
QIcon ic = field()->uiIcon(uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_checkBox->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_checkBox->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_checkBox->setToolTip(field()->uiToolTip(uiConfigName)); m_checkBox->setToolTip(field()->uiToolTip(uiConfigName));

24
Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
View File

@ -46,12 +46,12 @@
#include "cafFactory.h" #include "cafFactory.h"
#include <QLineEdit>
#include <QLabel>
#include <QColor> #include <QColor>
#include <QHBoxLayout>
#include <QToolButton>
#include <QColorDialog> #include <QColorDialog>
#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
#include <QToolButton>
namespace caf namespace caf
@ -67,7 +67,6 @@ PdmUiColorEditor::PdmUiColorEditor()
m_color = QColor::Invalid; m_color = QColor::Invalid;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -75,17 +74,7 @@ void PdmUiColorEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
CAF_ASSERT(!m_label.isNull()); CAF_ASSERT(!m_label.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
caf::PdmUiObjectHandle* uiObject = uiObj(field()->fieldHandle()->ownerObject()); caf::PdmUiObjectHandle* uiObject = uiObj(field()->fieldHandle()->ownerObject());
if (uiObject) if (uiObject)
@ -97,7 +86,6 @@ void PdmUiColorEditor::configureAndUpdateUi(const QString& uiConfigName)
setColor(col); setColor(col);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -135,7 +123,6 @@ QWidget* PdmUiColorEditor::createLabelWidget(QWidget * parent)
return m_label; return m_label;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -154,7 +141,6 @@ void PdmUiColorEditor::colorSelectionClicked()
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@ -60,16 +60,7 @@ void PdmUiComboBoxEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
if (!m_label.isNull()) if (!m_label.isNull())
{ {
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
} }
if (!m_comboBox.isNull()) if (!m_comboBox.isNull())

12
Fwk/AppFwk/cafUserInterface/cafPdmUiDateEditor.cpp
View File

@ -71,17 +71,7 @@ void PdmUiDateEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
CAF_ASSERT(!m_dateEdit.isNull()); CAF_ASSERT(!m_dateEdit.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_dateEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_dateEdit->setEnabled(!field()->isUiReadOnly(uiConfigName));

12
Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp
View File

@ -95,17 +95,7 @@ void PdmUiDoubleSliderEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
CAF_ASSERT(!m_lineEdit.isNull()); CAF_ASSERT(!m_lineEdit.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_slider->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_slider->setEnabled(!field()->isUiReadOnly(uiConfigName));

13
Fwk/AppFwk/cafUserInterface/cafPdmUiFilePathEditor.cpp
View File

@ -69,18 +69,7 @@ void PdmUiFilePathEditor::configureAndUpdateUi(const QString& uiConfigName)
CAF_ASSERT(!m_lineEdit.isNull()); CAF_ASSERT(!m_lineEdit.isNull());
CAF_ASSERT(!m_label.isNull()); CAF_ASSERT(!m_label.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_lineEdit->setToolTip(field()->uiToolTip(uiConfigName)); m_lineEdit->setToolTip(field()->uiToolTip(uiConfigName));

14
Fwk/AppFwk/cafUserInterface/cafPdmUiLineEditor.cpp
View File

@ -161,21 +161,9 @@ void PdmUiLineEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
if (!m_label.isNull()) if (!m_label.isNull())
{ {
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
} }
if (!m_lineEdit.isNull()) if (!m_lineEdit.isNull())
{ {
bool isReadOnly = field()->isUiReadOnly(uiConfigName); bool isReadOnly = field()->isUiReadOnly(uiConfigName);

14
Fwk/AppFwk/cafUserInterface/cafPdmUiListEditor.cpp
View File

@ -162,19 +162,7 @@ void PdmUiListEditor::configureAndUpdateUi(const QString& uiConfigName)
CAF_ASSERT(!m_label.isNull()); CAF_ASSERT(!m_label.isNull());
CAF_ASSERT(m_listView->selectionModel()); CAF_ASSERT(m_listView->selectionModel());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
QString uiName = field()->uiName(uiConfigName);
m_label->setText(uiName);
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_listView->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_listView->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_listView->setToolTip(field()->uiToolTip(uiConfigName)); m_listView->setToolTip(field()->uiToolTip(uiConfigName));

16
Fwk/AppFwk/cafUserInterface/cafPdmUiPushButtonEditor.cpp
View File

@ -62,22 +62,11 @@ void PdmUiPushButtonEditor::configureAndUpdateUi(const QString& uiConfigName)
CAF_ASSERT(!m_pushButton.isNull()); CAF_ASSERT(!m_pushButton.isNull());
CAF_ASSERT(!m_label.isNull()); CAF_ASSERT(!m_label.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_pushButton->setCheckable(true); m_pushButton->setCheckable(true);
//m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_pushButton->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_pushButton->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_pushButton->setToolTip(field()->uiToolTip(uiConfigName)); m_pushButton->setToolTip(field()->uiToolTip(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
PdmUiPushButtonEditorAttribute attributes; PdmUiPushButtonEditorAttribute attributes;
caf::PdmUiObjectHandle* uiObject = uiObj(field()->fieldHandle()->ownerObject()); caf::PdmUiObjectHandle* uiObject = uiObj(field()->fieldHandle()->ownerObject());
@ -115,7 +104,6 @@ void PdmUiPushButtonEditor::configureAndUpdateUi(const QString& uiConfigName)
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -140,14 +128,12 @@ QWidget* PdmUiPushButtonEditor::createLabelWidget(QWidget * parent)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiPushButtonEditor::slotClicked(bool checked) void PdmUiPushButtonEditor::slotClicked(bool checked)
{ {
if (field() && dynamic_cast<PdmField<bool> *> (field()->fieldHandle())) if (field() && dynamic_cast<PdmField<bool> *> (field()->fieldHandle()))
{ {
QVariant v; QVariant v;
v = checked; v = checked;
this->setValueToField(v); this->setValueToField(v);
} }
} }

13
Fwk/AppFwk/cafUserInterface/cafPdmUiSliderEditor.cpp
View File

@ -63,18 +63,7 @@ void PdmUiSliderEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
CAF_ASSERT(!m_spinBox.isNull()); CAF_ASSERT(!m_spinBox.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_spinBox->setEnabled(!field()->isUiReadOnly(uiConfigName)); m_spinBox->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_spinBox->setToolTip(field()->uiToolTip(uiConfigName)); m_spinBox->setToolTip(field()->uiToolTip(uiConfigName));

13
Fwk/AppFwk/cafUserInterface/cafPdmUiTextEditor.cpp
View File

@ -84,18 +84,7 @@ void PdmUiTextEditor::configureAndUpdateUi(const QString& uiConfigName)
CAF_ASSERT(!m_textEdit.isNull()); CAF_ASSERT(!m_textEdit.isNull());
CAF_ASSERT(!m_label.isNull()); CAF_ASSERT(!m_label.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
m_label->setText(field()->uiName(uiConfigName));
}
//m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_textEdit->setReadOnly(field()->isUiReadOnly(uiConfigName)); m_textEdit->setReadOnly(field()->isUiReadOnly(uiConfigName));
//m_textEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); // Neccesary ? //m_textEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); // Neccesary ?

14
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionEditor.cpp
View File

@ -77,19 +77,7 @@ void PdmUiTreeSelectionEditor::configureAndUpdateUi(const QString& uiConfigName)
// Label // Label
CAF_ASSERT(!m_label.isNull()); CAF_ASSERT(!m_label.isNull());
QIcon ic = field()->uiIcon(uiConfigName); PdmUiFieldEditorHandle::updateLabelFromField(m_label, uiConfigName);
if (!ic.isNull())
{
m_label->setPixmap(ic.pixmap(ic.actualSize(QSize(64, 64))));
}
else
{
QString uiName = field()->uiName(uiConfigName);
m_label->setText(uiName);
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
// Tree view // Tree view