[ADD] - added preference allowing the user to combine the texture sorter, ROI...

[ADD] - added preference allowing the user to combine the texture sorter, ROI tree and module tree in only ONE tab widget to save space

doc/user/walnut.cfg.devel

@@ -15,6 +15,7 @@
 toolBarIconText = no # show text next to module's icon
 # useToolBarBreak = no # put compatibles toolbar in separate row
 useAutoDisplay = no # automatically add a standard module after loading a data module.
+# combineTreeAndRoiAndTextureSorter = yes # should the module tree, ROI tree and the Texture Sorter be combined in ONE Tab widget?
 
 [ge] ## Settings for the graphics engine
 # bgColor.r = .9 # background color (red part)

doc/user/walnut.cfg.mpi

@@ -21,6 +21,7 @@ whiteList ="Isosurface,Bounding Box,Isosurface Raytracer,Distance Map Isosurface
 toolBarIconText = no # show text next to module's icon
 # useToolBarBreak = no # put compatibles toolbar in separate row
 # useAutoDisplay = no # automatically add a standard module after loading a data module.
+# combineTreeAndRoiAndTextureSorter = yes # should the module tree, ROI tree and the Texture Sorter be combined in ONE Tab widget?
 
 [ge] ## Settings for the graphics engine
 # bgColor.r = .9 # background color (red part)

src/gui/qt4/datasetbrowser/WQtDatasetBrowser.cpp

@@ -87,8 +87,19 @@ WQtDatasetBrowser::WQtDatasetBrowser( WMainWindow* parent )
     m_tabWidget2 = new QTabWidget( m_panel );
     m_tabWidget->setMinimumHeight( 220 );
 
+    // should the Tree, Texture Sorter and the ROI Display be combined in one tab widget?
+    bool combineThem = false;
+    WPreferences::getPreference( "qt4gui.combineTreeAndRoiAndTextureSorter", &combineThem );
+
     m_layout = new QVBoxLayout();
-    m_layout->addWidget( m_moduleTreeWidget );
+    if ( !combineThem )
+    {
+        m_layout->addWidget( m_moduleTreeWidget );
+    }
+    else
+    {
+        m_tabWidget2->addTab( m_moduleTreeWidget, QString( "Modules" ) );
+    }
     m_layout->addWidget( m_tabWidget2 );
 
     m_tabWidget2->addTab( m_textureSorter, QString( "Texture Sorter" ) );