mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Make the preference dialog slightly narrower
This commit is contained in:
parent
4b07387a93
commit
2e13e53b3c
@ -25,6 +25,7 @@
|
|||||||
#include "RifReaderSettings.h"
|
#include "RifReaderSettings.h"
|
||||||
|
|
||||||
#include "cafPdmFieldCvfColor.h"
|
#include "cafPdmFieldCvfColor.h"
|
||||||
|
#include "cafPdmUiComboBoxEditor.h"
|
||||||
#include "cafPdmUiCheckBoxEditor.h"
|
#include "cafPdmUiCheckBoxEditor.h"
|
||||||
#include "cafPdmUiFieldHandle.h"
|
#include "cafPdmUiFieldHandle.h"
|
||||||
#include "cafPdmUiFilePathEditor.h"
|
#include "cafPdmUiFilePathEditor.h"
|
||||||
@ -123,7 +124,7 @@ RiaPreferences::RiaPreferences(void)
|
|||||||
CAF_PDM_InitField(&m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog", "", "", "");
|
CAF_PDM_InitField(&m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog", "", "", "");
|
||||||
m_showProjectChangedDialog.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
|
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);
|
m_showOctaveWarningForMultipleInstances.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
|
||||||
|
|
||||||
CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", "");
|
CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", "");
|
||||||
@ -191,6 +192,12 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
|
|||||||
myAttr->m_selectDirectory = true;
|
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,9 +209,9 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
|
|||||||
{
|
{
|
||||||
caf::PdmUiGroup* colorGroup = uiOrdering.addNewGroup("Default Colors");
|
caf::PdmUiGroup* colorGroup = uiOrdering.addNewGroup("Default Colors");
|
||||||
colorGroup->add(&defaultViewerBackgroundColor);
|
colorGroup->add(&defaultViewerBackgroundColor);
|
||||||
colorGroup->add(&defaultGridLineColors);
|
colorGroup->add(&defaultGridLineColors, false);
|
||||||
colorGroup->add(&defaultFaultGridLineColors);
|
colorGroup->add(&defaultFaultGridLineColors);
|
||||||
colorGroup->add(&defaultWellLabelColor);
|
colorGroup->add(&defaultWellLabelColor, false);
|
||||||
|
|
||||||
caf::PdmUiGroup* fontGroup = uiOrdering.addNewGroup("Default Font Sizes");
|
caf::PdmUiGroup* fontGroup = uiOrdering.addNewGroup("Default Font Sizes");
|
||||||
fontGroup->add(&defaultSceneFontSize);
|
fontGroup->add(&defaultSceneFontSize);
|
||||||
|
@ -68,6 +68,7 @@ RiuPropertyViewTabWidget::RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObje
|
|||||||
connect(m_dialogButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
|
connect(m_dialogButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
|
||||||
|
|
||||||
dialogLayout->addWidget(m_dialogButtonBox);
|
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 RiuPropertyViewTabWidget::sizeHint() const
|
||||||
{
|
{
|
||||||
QSize maxSizeHint = QDialog::sizeHint();
|
QSize maxSizeHint(0, 0);
|
||||||
//qDebug() << "dialog size hint : " << maxSizeHint;
|
|
||||||
|
|
||||||
for (auto w : m_pageWidgets)
|
for (auto w : m_pageWidgets)
|
||||||
{
|
{
|
||||||
|
@ -37,6 +37,7 @@ public:
|
|||||||
RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObject* object, const QString& windowTitle, const QStringList& uiConfigNameForTabs);
|
RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObject* object, const QString& windowTitle, const QStringList& uiConfigNameForTabs);
|
||||||
~RiuPropertyViewTabWidget() override;
|
~RiuPropertyViewTabWidget() override;
|
||||||
|
|
||||||
|
QSize minimumSizeHint() const override;
|
||||||
QSize sizeHint() const override;
|
QSize sizeHint() const override;
|
||||||
QDialogButtonBox* dialogButtonBox();
|
QDialogButtonBox* dialogButtonBox();
|
||||||
private:
|
private:
|
||||||
|
Loading…
Reference in New Issue
Block a user