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

Make the preference dialog slightly narrower

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-04-14 15:40:37 +02:00
parent 4b07387a93
commit 2e13e53b3c
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -25,6 +25,7 @@
#include "RifReaderSettings.h"
#include "cafPdmFieldCvfColor.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiFieldHandle.h"
#include "cafPdmUiFilePathEditor.h"
@ -123,7 +124,7 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitField(&m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog", "", "", "");
m_showProjectChangedDialog.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&m_showOctaveWarningForMultipleInstances, "showOctaveWarningForMultipleInstances", true, "Show Octave communication warning when multiple instances are created", "", "", "");
CAF_PDM_InitField(&m_showOctaveWarningForMultipleInstances, "showOctaveWarningForMultipleInstances", true, "Show Octave warning when multiple instances are created", "", "", "");
m_showOctaveWarningForMultipleInstances.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", "");
@ -191,6 +192,12 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
myAttr->m_selectDirectory = true;
}
}
if (field == &defaultSceneFontSize || field == &defaultWellLabelFontSize ||
field == &defaultAnnotationFontSize || field == &defaultPlotFontSize)
{
caf::PdmUiComboBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiComboBoxEditorAttribute*>(attribute);
myAttr->minimumContentsLength = 2;
}
}
//--------------------------------------------------------------------------------------------------
@ -202,16 +209,16 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
{
caf::PdmUiGroup* colorGroup = uiOrdering.addNewGroup("Default Colors");
colorGroup->add(&defaultViewerBackgroundColor);
colorGroup->add(&defaultGridLineColors);
colorGroup->add(&defaultGridLineColors, false);
colorGroup->add(&defaultFaultGridLineColors);
colorGroup->add(&defaultWellLabelColor);
colorGroup->add(&defaultWellLabelColor, false);
caf::PdmUiGroup* fontGroup = uiOrdering.addNewGroup("Default Font Sizes");
fontGroup->add(&defaultSceneFontSize);
fontGroup->add(&defaultAnnotationFontSize, false);
fontGroup->add(&defaultWellLabelFontSize);
fontGroup->add(&defaultPlotFontSize, false);
caf::PdmUiGroup* viewsGroup = uiOrdering.addNewGroup("3d Views");
viewsGroup->add(&defaultMeshModeType);
viewsGroup->add(&navigationPolicy);
@ -232,7 +239,7 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
newCaseBehaviourGroup->add(&loadAndShowSoil);
m_readerSettings->defineUiOrdering(uiConfigName, *newCaseBehaviourGroup);
caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup("Origin Files");
restartBehaviourGroup->add(&summaryRestartFilesShowImportDialog);
caf::PdmUiGroup* summaryImportOptionGroup = restartBehaviourGroup->addNewGroup("Origin Summary Files");

25
ApplicationCode/UserInterface/RiuPropertyViewTabWidget.cpp
View File

@ -37,7 +37,7 @@ RiuPropertyViewTabWidget::RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObje
setWindowTitle(windowTitle);
QTabWidget* tabWidget = new QTabWidget;
for (int i = 0; i < uiConfigNameForTabs.size(); i++)
{
QHBoxLayout* widgetLayout = new QHBoxLayout;
@ -68,6 +68,7 @@ RiuPropertyViewTabWidget::RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObje
connect(m_dialogButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
dialogLayout->addWidget(m_dialogButtonBox);
}
//--------------------------------------------------------------------------------------------------
@ -81,13 +82,31 @@ RiuPropertyViewTabWidget::~RiuPropertyViewTabWidget()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QSize RiuPropertyViewTabWidget::minimumSizeHint() const
{
QSize maxSizeHint(0, 0);
for (auto w : m_pageWidgets)
{
QSize pageSize = w->minimumSizeHint();
pageSize += QSize(0, 100);
maxSizeHint = maxSizeHint.expandedTo(pageSize);
}
return maxSizeHint;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QSize RiuPropertyViewTabWidget::sizeHint() const
{
QSize maxSizeHint = QDialog::sizeHint();
//qDebug() << "dialog size hint : " << maxSizeHint;
QSize maxSizeHint(0, 0);
for (auto w : m_pageWidgets)
{

1
ApplicationCode/UserInterface/RiuPropertyViewTabWidget.h
View File

@ -37,6 +37,7 @@ public:
RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObject* object, const QString& windowTitle, const QStringList& uiConfigNameForTabs);
~RiuPropertyViewTabWidget() override;
QSize minimumSizeHint() const override;
QSize sizeHint() const override;
QDialogButtonBox* dialogButtonBox();
private: