diff --git a/Code/Application/Monteverdi2/mvdMainWindow.cxx b/Code/Application/Monteverdi2/mvdMainWindow.cxx index 6a868bed5970893d10f023d5396146cb3ed422e6..1e9108c3d9ad1dd437e86f505282f90f17386b98 100644 --- a/Code/Application/Monteverdi2/mvdMainWindow.cxx +++ b/Code/Application/Monteverdi2/mvdMainWindow.cxx @@ -658,7 +658,7 @@ MainWindow tabifyDockWidget( m_DatasetPropertiesDock, m_OtbApplicationsBrowserDock ); #endif -#if 1 +#if 0 // Pixel Description (no controller needed here / direct update of // the pixel description through signals from VectorImageModel) assert( m_PixelDescriptionDock==NULL ); @@ -686,7 +686,7 @@ MainWindow Qt::RightDockWidgetArea ); -#if 0 +#if 1 // Pixel Description (no controller needed here / direct update of // the pixel description through signals from VectorImageModel) assert( m_PixelDescriptionDock==NULL ); @@ -736,10 +736,6 @@ MainWindow // Customize it. m_CentralTabWidget->setTabsClosable( true ); - /* - m_CentralTabWidget->setSizePolicy( - QSizePolicy::Expanding, QSizePolicy::Expanding ); - */ // Set-it up as central widget. setCentralWidget( m_CentralTabWidget ); @@ -815,6 +811,7 @@ MainWindow sharedGlWidget ); + imageView->setMinimumWidth( 256 ); /* imageView->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding ); diff --git a/Code/Common/Gui/mvdApplicationsToolBox.ui b/Code/Common/Gui/mvdApplicationsToolBox.ui index a9c4c96d93301b38e3519c7e348ff7f7fe544538..a872a6cac953b76c5f694f82844ad82a1ac065b4 100644 --- a/Code/Common/Gui/mvdApplicationsToolBox.ui +++ b/Code/Common/Gui/mvdApplicationsToolBox.ui @@ -6,14 +6,29 @@ <rect> <x>0</x> <y>0</y> - <width>121</width> - <height>132</height> + <width>94</width> + <height>116</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="windowTitle"> <string>OTB Applications</string> </property> + <property name="locale"> + <locale language="C" country="AnyCountry"/> + </property> <layout class="QGridLayout" name="gridLayout"> + <property name="margin"> + <number>3</number> + </property> + <property name="spacing"> + <number>2</number> + </property> <item row="0" column="0"> <widget class="QLineEdit" name="m_SearchLine"/> </item> diff --git a/Code/Common/Gui/mvdDatabaseBrowserWidget.ui b/Code/Common/Gui/mvdDatabaseBrowserWidget.ui index ffd18b14724eedc818fb91908a219e2ec28675f6..c2308f141498bc44d0237aab60352c419786daf6 100644 --- a/Code/Common/Gui/mvdDatabaseBrowserWidget.ui +++ b/Code/Common/Gui/mvdDatabaseBrowserWidget.ui @@ -6,10 +6,16 @@ <rect> <x>0</x> <y>0</y> - <width>260</width> - <height>288</height> + <width>94</width> + <height>116</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="windowTitle"> <string>Form</string> </property> @@ -17,6 +23,12 @@ <locale language="C" country="AnyCountry"/> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="margin"> + <number>3</number> + </property> + <property name="spacing"> + <number>2</number> + </property> <item row="0" column="0"> <widget class="QLineEdit" name="m_SearchLine"> <property name="text"> diff --git a/Code/Common/Gui/mvdDatasetPropertiesWidget.ui b/Code/Common/Gui/mvdDatasetPropertiesWidget.ui index 62f8fe4263170842f17f1f5e5a7b59a5b7405350..c75c94099d3c20bfac75f4af589fdfca86a8fc4d 100644 --- a/Code/Common/Gui/mvdDatasetPropertiesWidget.ui +++ b/Code/Common/Gui/mvdDatasetPropertiesWidget.ui @@ -6,10 +6,16 @@ <rect> <x>0</x> <y>0</y> - <width>222</width> - <height>99</height> + <width>94</width> + <height>87</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="windowTitle"> <string>Form</string> </property> @@ -17,6 +23,12 @@ <locale language="C" country="AnyCountry"/> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="margin"> + <number>3</number> + </property> + <property name="spacing"> + <number>2</number> + </property> <item row="0" column="0"> <widget class="QTreeWidget" name="m_DatasetPropertiesTree"> <property name="contextMenuPolicy"> diff --git a/Code/Common/Gui/mvdPixelDescriptionWidget.ui b/Code/Common/Gui/mvdPixelDescriptionWidget.ui index 07fc6c3fc8a00f67b780be096e891e04edca1100..ed75c70d8593fa7ac87d2c1f55a7bec548a22ed3 100644 --- a/Code/Common/Gui/mvdPixelDescriptionWidget.ui +++ b/Code/Common/Gui/mvdPixelDescriptionWidget.ui @@ -6,16 +6,31 @@ <rect> <x>0</x> <y>0</y> - <width>482</width> - <height>311</height> + <width>94</width> + <height>87</height> </rect> </property> <property name="windowTitle"> <string>Pixel Description</string> </property> <layout class="QGridLayout" name="gridLayout"> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> + <property name="margin"> + <number>3</number> + </property> + <property name="spacing"> + <number>2</number> + </property> <item row="0" column="0"> <widget class="QTreeWidget" name="m_DescriptionTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="contextMenuPolicy"> <enum>Qt::CustomContextMenu</enum> </property>