]> SALOME platform Git repositories - modules/paravis.git/commitdiff
Salome HOME
Merge branch 'master' of ssh://git.salome-platform.org/modules/paravis
authorabn <adrien.bruneton@cea.fr>
Thu, 16 Oct 2014 11:13:29 +0000 (13:13 +0200)
committerabn <adrien.bruneton@cea.fr>
Thu, 16 Oct 2014 11:13:29 +0000 (13:13 +0200)
Conflicts:
src/PVGUI/PVGUI_Module.cxx

1  2 
src/PVGUI/PVGUI_Module.cxx

index b96cae25e4700d3200d09ee16b06b98f40fa2b6b,ce1390e573e3050ec99f9a9bd1188e0b723e4db8..ccf2167f1486fc71b08b3eea1f3fcc5b2d676d7d
@@@ -982,7 -971,8 +982,10 @@@ void PVGUI_Module::createPreferences(
  {
    // Paraview settings tab
    int aParaViewSettingsTab = addPreference( tr( "TIT_PVIEWSETTINGS" ) );
 -  int aPanel = addPreference(QString(), aParaViewSettingsTab, LightApp_Preferences::UserDefined, "PARAVIS", "");
++
+   setPreferenceProperty(aParaViewSettingsTab, "stretch", false );
 +  int aPanel = addPreference(QString(), aParaViewSettingsTab, LightApp_Preferences::UserDefined, PARAVIS_MODULE_NAME, "");
++
    setPreferenceProperty(aPanel, "content", (qint64)(new PVGUI_ParaViewSettingsPane()));
  
    // Paravis settings tab