Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/AdvancedGUI/CMakeLists.txt
Simple merge

diff --cc src/BREPPlugin/CMakeLists.txt
Simple merge

diff --cc src/BasicGUI/CMakeLists.txt
Simple merge

diff --cc src/BlocksGUI/CMakeLists.txt
Simple merge

diff --cc src/BooleanGUI/CMakeLists.txt
Simple merge

diff --cc src/BuildGUI/BuildGUI_FaceDlg.cxx
Simple merge

diff --cc src/BuildGUI/CMakeLists.txt
Simple merge

diff --cc src/CurveCreator/CMakeLists.txt
Simple merge

diff --cc src/CurveCreator/CurveCreator_TreeView.cxx
Simple merge

diff --cc src/DependencyTree/CMakeLists.txt
Simple merge

diff --cc src/DependencyTree/DependencyTree_Arrow.cxx
Simple merge

diff --cc src/DisplayGUI/CMakeLists.txt
Simple merge

diff --cc src/DlgRef/CMakeLists.txt
Simple merge

diff --cc src/EntityGUI/CMakeLists.txt
Simple merge

diff --cc src/GEOMBase/CMakeLists.txt
Simple merge

diff --cc src/GEOMFiltersSelection/CMakeLists.txt
Simple merge

diff --cc src/GEOMGUI/CMakeLists.txt
Simple merge

diff --cc src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx
Simple merge

diff --cc src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx
Simple merge

diff --cc src/GEOMToolsGUI/CMakeLists.txt
Simple merge

diff --cc src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
Simple merge

diff --cc src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
Simple merge

diff --cc src/GenerationGUI/CMakeLists.txt
Simple merge

diff --cc src/GroupGUI/CMakeLists.txt
Simple merge

diff --cc src/IGESPlugin/CMakeLists.txt
Simple merge

diff --cc src/Material/CMakeLists.txt
Simple merge

diff --cc src/MeasureGUI/CMakeLists.txt
Simple merge

diff --cc src/OBJECT/CMakeLists.txt
Simple merge

diff --cc src/OCC2VTK/CMakeLists.txt
Simple merge

diff --cc src/OperationGUI/CMakeLists.txt
Simple merge

diff --cc src/PrimitiveGUI/CMakeLists.txt
Simple merge

diff --cc src/RepairGUI/CMakeLists.txt
Simple merge

diff --cc src/RepairGUI/RepairGUI.cxx
Simple merge

diff --cc src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
Simple merge

diff --cc src/STEPPlugin/CMakeLists.txt
Simple merge

diff --cc src/STEPPlugin/STEPPlugin_ImportDlg.cxx
index 0000000000000000000000000000000000000000,b6a64e316d50767bd3ca9f0a79dd2eb58d165c3b..668050f90529ae50ddac5899a476595048fb1c49
mode 000000,100644..100644
--- /dev/null
--- 2/src/STEPPlugin/STEPPlugin_ImportDlg.cxx
+++ b/src/STEPPlugin/STEPPlugin_ImportDlg.cxx
@@@ -1,0 -1,94 +1,94 @@@
 -    anImpDlg.setFilter(tr("ALL_FILES_FILTER")); // All files (*)
+ // Copyright (C) 2014-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+ //
+ // This library is free software; you can redistribute it and/or
+ // modify it under the terms of the GNU Lesser General Public
+ // License as published by the Free Software Foundation; either
+ // version 2.1 of the License, or (at your option) any later version.
+ //
+ // This library is distributed in the hope that it will be useful,
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ // Lesser General Public License for more details.
+ //
+ // You should have received a copy of the GNU Lesser General Public
+ // License along with this library; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ //
+ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ //
+ 
+ #include "STEPPlugin_ImportDlg.h"
+ 
+ #include <QApplication>
+ #include <QLayout>
+ #include <QCheckBox>
+ 
+ //=============================================================================
+ // Constructor
+ //=============================================================================
+ STEPPlugin_ImportDlg::STEPPlugin_ImportDlg(QWidget *parent)
+   : SUIT_FileDlg (parent, true, true, true),
+     myCheckBox   (0)
+ {
+   myCheckBox = new QCheckBox(tr("STEP_CREATE_ASSEMBLIES"), this);
+ 
+   myCheckBox->setChecked(true);
+ 
+   layout()->addWidget(myCheckBox);
+ }
+ 
+ //=============================================================================
+ // Destructor
+ //=============================================================================
+ STEPPlugin_ImportDlg::~STEPPlugin_ImportDlg()
+ {
+ }
+ 
+ //=============================================================================
+ // IsCreateAssemblies
+ //=============================================================================
+ bool STEPPlugin_ImportDlg::IsCreateAssemblies() const
+ {
+   return myCheckBox->isChecked();
+ }
+ 
+ //=============================================================================
+ // getOpenFileNames
+ //=============================================================================
+ QStringList STEPPlugin_ImportDlg::getOpenFileNames
+                                   (const QString &theInitial,
+                                    const QString &theFilters,
+                                    const QString &theCaption,
+                                          QWidget *theParent,
+                                          bool    &IsCreateAssemblies)
+ {
+   STEPPlugin_ImportDlg anImpDlg(theParent);
+   QStringList aFilters = theFilters.split(";;", QString::SkipEmptyParts);
+ 
+   anImpDlg.setFileMode(ExistingFiles);
+ 
+   if (aFilters.isEmpty()) {
 -    anImpDlg.setFilters(aFilters);
++    anImpDlg.setNameFilter(tr("ALL_FILES_FILTER")); // All files (*)
+   } else {
++    anImpDlg.setNameFilters(aFilters);
+   }
+ 
+   if (!theCaption.isEmpty()) {
+     anImpDlg.setWindowTitle(theCaption);
+   }
+ 
+   if (!theInitial.isEmpty()) {
+     anImpDlg.processPath(theInitial);
+   }
+ 
+   QStringList aFileNames;
+ 
+   if (anImpDlg.exec() == QDialog::Accepted) {
+     aFileNames = anImpDlg.selectedFiles();
+     IsCreateAssemblies = anImpDlg.IsCreateAssemblies();
+   }
+ 
+   QApplication::processEvents();
+ 
+   return aFileNames;
+ }

diff --cc src/STLPlugin/CMakeLists.txt
Simple merge

diff --cc src/ShapeRecognition/CMakeLists.txt
Simple merge

diff --cc src/Tools/geom_plugins.py
Simple merge

diff --cc src/Tools/t_shape/CMakeLists.txt
index e4332a5e76d6cdbd347646951c33b537bf14d5e1,7d803f88a7242ba247da991b0bc6d0a057ecf696..7f9ffdaf0d978cabc6b5e21bff2e8f418dba3bd1
--- 1/src/Tools/t_shape/CMakeLists.txt
--- 2/src/Tools/t_shape/CMakeLists.txt
+++ b/src/Tools/t_shape/CMakeLists.txt
@@@ -16,8 -16,9 +16,9 @@@
  #
  # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
  #
+ 
  IF(SALOME_BUILD_GUI)
 -  INCLUDE(UsePyQt4)
 +  INCLUDE(UsePyQt)
  ENDIF()
  
  # --- scripts ---

diff --cc src/Tools/t_shape/t_shape_dialog.py
Simple merge

diff --cc src/Tools/t_shape/t_shape_progress.py
Simple merge

diff --cc src/TransformationGUI/CMakeLists.txt
Simple merge

diff --cc src/VTKPlugin/CMakeLists.txt
Simple merge

diff --cc src/XAOPlugin/CMakeLists.txt
Simple merge