From: abn <adrien.bruneton@cea.fr>
Date: Thu, 16 Oct 2014 11:13:29 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.salome-platform.org/modules/paravis
X-Git-Tag: V7_5_0b1~25
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f44e1139d1f0ade3325f0e634ac1aaa5894b4619;p=modules%2Fparavis.git

Merge branch 'master' of ssh://git.salome-platform.org/modules/paravis

Conflicts:
	src/PVGUI/PVGUI_Module.cxx
---

f44e1139d1f0ade3325f0e634ac1aaa5894b4619
diff --cc src/PVGUI/PVGUI_Module.cxx
index b96cae25,ce1390e5..ccf2167f
--- a/src/PVGUI/PVGUI_Module.cxx
+++ b/src/PVGUI/PVGUI_Module.cxx
@@@ -982,7 -971,8 +982,10 @@@ void PVGUI_Module::createPreferences(
  {
    // Paraview settings tab
    int aParaViewSettingsTab = addPreference( tr( "TIT_PVIEWSETTINGS" ) );
++
+   setPreferenceProperty(aParaViewSettingsTab, "stretch", false );
 -  int aPanel = addPreference(QString(), aParaViewSettingsTab, LightApp_Preferences::UserDefined, "PARAVIS", "");
 +  int aPanel = addPreference(QString(), aParaViewSettingsTab, LightApp_Preferences::UserDefined, PARAVIS_MODULE_NAME, "");
++
    setPreferenceProperty(aPanel, "content", (qint64)(new PVGUI_ParaViewSettingsPane()));
  
    // Paravis settings tab