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 remote-tracking branch 'origin/internal' into internal

Browse Source
This commit is contained in:
Magne Sjaastad
2013-09-26 12:18:01 +02:00
parent 2006d10548 a4bcbf6115
commit 6ca5a0c520
11 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,7 @@ void PdmUiCheckBoxEditor::configureAndUpdateUi(const QString& uiConfigName)
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_checkBox->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_checkBox->setToolTip(field()->uiToolTip(uiConfigName));
PdmUiCheckBoxEditorAttribute attributes;
field()->ownerObject()->editorAttribute(field(), uiConfigName, &attributes);

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

@@ -81,8 +81,10 @@ void PdmUiFilePathEditor::configureAndUpdateUi(const QString& uiConfigName)
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_lineEdit->setToolTip(field()->uiToolTip(uiConfigName));
field()->ownerObject()->editorAttribute(field(), uiConfigName, &m_attributes);

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

@@ -79,7 +79,10 @@ void PdmUiLineEditor::configureAndUpdateUi(const QString& uiConfigName)
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_lineEdit->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_lineEdit->setToolTip(field()->uiToolTip(uiConfigName));
PdmUiLineEditorAttribute leab;
field()->ownerObject()->editorAttribute(field(), uiConfigName, &leab);

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

@@ -130,7 +130,10 @@ void PdmUiListEditor::configureAndUpdateUi(const QString& uiConfigName)
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_listView->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_listView->setToolTip(field()->uiToolTip(uiConfigName));
/// Demo code Not used yet
// PdmUiListEditorAttribute attributes;

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

@@ -77,6 +77,8 @@ void PdmUiPushButtonEditor::configureAndUpdateUi(const QString& uiConfigName)
//m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_pushButton->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_pushButton->setToolTip(field()->uiToolTip(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
PdmUiPushButtonEditorAttribute attributes;
field()->ownerObject()->editorAttribute(field(), uiConfigName, &attributes);

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

@@ -75,8 +75,13 @@ void PdmUiSliderEditor::configureAndUpdateUi(const QString& uiConfigName)
}
m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_spinBox->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_spinBox->setToolTip(field()->uiToolTip(uiConfigName));
m_slider->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_slider->setToolTip(field()->uiToolTip(uiConfigName));
field()->ownerObject()->editorAttribute(field(), uiConfigName, &m_attributes);

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

@@ -80,9 +80,11 @@ void PdmUiTextEditor::configureAndUpdateUi(const QString& uiConfigName)
}
//m_label->setEnabled(!field()->isUiReadOnly(uiConfigName));
m_label->setToolTip(field()->uiToolTip(uiConfigName));
m_textEdit->setReadOnly(field()->isUiReadOnly(uiConfigName));
//m_textEdit->setEnabled(!field()->isUiReadOnly(uiConfigName)); // Neccesary ?
m_textEdit->setToolTip(field()->uiToolTip(uiConfigName));
PdmUiTextEditorAttribute leab;
field()->ownerObject()->editorAttribute(field(), uiConfigName, &leab);

20
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewEditor.cpp
View File

@@ -54,19 +54,19 @@
class MySortFilterProxyModel : public QSortFilterProxyModel
{
public:
MySortFilterProxyModel(QObject *parent = 0)
: QSortFilterProxyModel(parent)
{
}
void notifyModelChanged()
{
MySortFilterProxyModel(QObject *parent = 0)
: QSortFilterProxyModel(parent)
{
}
void notifyModelChanged()
{
QModelIndex startModelIdx = index(0,0);
QModelIndex endModelIdx = index(rowCount(startModelIdx), 0);
emit dataChanged(startModelIdx, endModelIdx);
}
}
};
@@ -112,7 +112,7 @@ QWidget* PdmUiTreeViewEditor::createWidget(QWidget* parent)
m_proxyTreeModelPdm->setSourceModel(m_treeModelPdm);
m_treeView->setModel(m_proxyTreeModelPdm);
m_treeView->setSortingEnabled(true);
m_treeView->setSortingEnabled(true);
m_treeView->sortByColumn(1, Qt::AscendingOrder);

2
Fwk/AppFwk/cafUserInterface/cafUiTreeModelPdm.cpp
View File

@@ -503,7 +503,7 @@ void UiTreeModelPdm::notifyModelChanged()
//--------------------------------------------------------------------------------------------------
QVariant UiTreeModelPdm::headerData(int section, Qt::Orientation orientation, int role /*= Qt::DisplayRole */) const
{
if (role != Qt::DisplayRole)
if (role != Qt::DisplayRole)
return QVariant();
if (section < m_columnHeaders.size())