From 524e8d8375f640591c555daf17c0c04e549fea72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 26 Jun 2013 09:02:37 +0200 Subject: [PATCH] Added a left margin in the property window. p4#: 22002 --- ApplicationCode/ProjectDataModel/RimResultCase.cpp | 14 ++++++++++++-- ApplicationCode/ProjectDataModel/RimResultCase.h | 2 ++ ApplicationCode/UserInterface/RiuMainWindow.cpp | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp index 8ed0aaf910..97b7adaf4f 100644 --- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp @@ -63,9 +63,9 @@ RimResultCase::RimResultCase() caseDirectory.setUiHidden(true); flipXAxis.setIOWritable(true); - flipXAxis.setUiHidden(true); + //flipXAxis.setUiHidden(true); flipYAxis.setIOWritable(true); - flipYAxis.setUiHidden(true); + //flipYAxis.setUiHidden(true); m_activeCellInfoIsReadFromFile = false; m_gridAndWellDataIsReadFromFile = false; @@ -328,3 +328,13 @@ void RimResultCase::initAfterRead() } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimResultCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +{ + uiOrdering.add(&caseUserDescription); + uiOrdering.add(&caseId); + uiOrdering.add(&caseFileName); +} + diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.h b/ApplicationCode/ProjectDataModel/RimResultCase.h index d3db414e87..cf6e57cd15 100644 --- a/ApplicationCode/ProjectDataModel/RimResultCase.h +++ b/ApplicationCode/ProjectDataModel/RimResultCase.h @@ -56,6 +56,8 @@ private: virtual void initAfterRead(); + virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ); + // Fields: caf::PdmField caseFileName; diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index 02c7b1a501..3da0efa68b 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -459,6 +459,7 @@ void RiuMainWindow::createDockPanels() m_pdmUiPropertyView = new caf::PdmUiPropertyView(dockWidget); dockWidget->setWidget(m_pdmUiPropertyView); + m_pdmUiPropertyView->layout()->setContentsMargins(5,0,0,0); connect(m_treeView, SIGNAL(selectedObjectChanged( caf::PdmObject* )), m_pdmUiPropertyView, SLOT(showProperties( caf::PdmObject* ))); addDockWidget(Qt::LeftDockWidgetArea, dockWidget);