From: mkr <mkr@opencascade.com>
Date: Wed, 20 May 2015 12:33:14 +0000 (+0300)
Subject: Merge branch 'BR_IMPROVEMENTS' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.4.1~25^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f662e2fdc45595b8dd6d7855f3bbd6e9a4176c77;p=modules%2Fhydro.git

Merge branch 'BR_IMPROVEMENTS' of ssh://git.salome-platform.org/modules/hydro into BR_IMPROVEMENTS
---

f662e2fdc45595b8dd6d7855f3bbd6e9a4176c77
diff --cc src/HYDROGUI/HYDROGUI_Module.cxx
index c97dbd87,4ba884b4..3c752c29
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@@ -729,20 -734,15 +734,24 @@@ void HYDROGUI_Module::createPreferences
  
    setPreferenceProperty( typeOfCursor, "indexes", aCursorTypeIndicesList );
    setPreferenceProperty( typeOfCursor, "icons",   aCursorTypeIconsList );
+ 
+   int viewerGroup = addPreference( tr( "PREF_GROUP_VIEWER" ), genTab );
+   addPreference( tr( "PREF_VIEWER_AUTO_FITALL" ), viewerGroup,
+                  LightApp_Preferences::Bool, "HYDRO", "auto_fit_all" );
  }
  
 +QCursor HYDROGUI_Module::getPrefEditCursor() const
 +{
 +  int aCursorType = SUIT_Session::session()->resourceMgr()->integerValue("preferences", "type_of_cursor", (int)CT_CrossCursor );
 +  if ( aCursorType >= Qt::BlankCursor)
 +    aCursorType++;
 +  QCursor aCursor = QCursor( Qt::CursorShape(aCursorType) );
 +  return aCursor;
 +}
 +
  void HYDROGUI_Module::update( const int flags )
  {
-   if( !isUpdateEnabled() )
+   if ( !isUpdateEnabled() )
      return;
  
    QApplication::setOverrideCursor( Qt::WaitCursor );