Salome HOME
Merge relevant changes from V8_0_0_BR branch
authorrnv <rnv@opencascade.com>
Tue, 2 Feb 2016 11:11:25 +0000 (14:11 +0300)
committervsr <vsr@opencascade.com>
Mon, 15 Feb 2016 14:23:48 +0000 (17:23 +0300)
commitbbc5c50035b23e5c74dd2ba28468a6adede1abbc
treebd30923d9f6ed99b38fe7de88fae7d16d586f060
parent6a792b4179f913b79291a7ea74c7fbf7f6e83d39
Merge relevant changes from V8_0_0_BR branch
119 files changed:
CMakeLists.txt
SalomeGUIConfig.cmake.in
adm_local/cmake_files/FindSalomeParaView.cmake
adm_local/cmake_files/FindSalomeQt4.cmake
adm_local/cmake_files/UseQt4Ext.cmake
src/CAF/CAF_Study.cxx
src/Event/CMakeLists.txt
src/GLViewer/GLViewer_BaseObjects.cxx
src/GLViewer/GLViewer_Context.cxx
src/GLViewer/GLViewer_Context.h
src/GLViewer/GLViewer_Grid.cxx
src/GLViewer/GLViewer_ToolTip.cxx
src/GLViewer/GLViewer_ViewFrame.cxx
src/GLViewer/GLViewer_ViewPort2d.cxx
src/GLViewer/GLViewer_Viewer2d.cxx
src/GLViewer/GLViewer_Widget.cxx
src/GraphicsView/GraphicsView_Object.cxx
src/GuiHelpers/CMakeLists.txt
src/HelpBrowser/CMakeLists.txt
src/HelpBrowser/qtlocalpeer.cpp
src/HelpBrowser/qtlockedfile_win.cpp
src/ImageComposer/CMakeLists.txt
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_Dialog.cxx
src/LightApp/LightApp_Driver.cxx
src/LightApp/LightApp_ModuleAction.cxx
src/LightApp/LightApp_NameDlg.cxx
src/LightApp/LightApp_Operation.cxx
src/OBJECT/CMakeLists.txt
src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
src/OCCViewer/OCCViewer_ClippingDlg.cxx
src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
src/OCCViewer/OCCViewer_SetRotationPointDlg.h
src/OCCViewer/OCCViewer_Utilities.cxx
src/OCCViewer/OCCViewer_ViewModel.cxx
src/OCCViewer/OCCViewer_ViewPort.cxx
src/OCCViewer/OCCViewer_ViewPort.h
src/Plot2d/Plot2d_FitDataDlg.cxx
src/Plot2d/Plot2d_PlotItems.cxx
src/Plot2d/Plot2d_SetupViewDlg.cxx
src/Plot2d/Plot2d_ViewFrame.cxx
src/PyConsole/PyConsole_EnhEditor.cxx
src/PyConsole/PyConsole_EnhEditor.h
src/PyEditor/PyEditor_SettingsDlg.cxx
src/PyViewer/PyViewer_ViewWindow.cxx
src/QDS/QDS_Datum.cxx
src/Qtx/Qtx.cxx
src/Qtx/QtxActionToolMgr.cxx
src/Qtx/QtxColorButton.cxx
src/Qtx/QtxDialog.cxx
src/Qtx/QtxDockAction.cxx
src/Qtx/QtxFontEdit.cxx
src/Qtx/QtxMainWindow.cxx
src/Qtx/QtxPathDialog.cxx
src/Qtx/QtxPathEdit.cxx
src/Qtx/QtxPreferenceMgr.cxx
src/Qtx/QtxResourceMgr.cxx
src/Qtx/QtxSearchTool.cxx
src/Qtx/QtxTreeView.cxx
src/Qtx/QtxWebBrowser.cxx
src/Qtx/QtxWorkspace.cxx
src/Qtx/QtxWorkspace.h
src/Qtx/QtxWorkspaceAction.cxx
src/Qtx/QtxWorkstack.cxx
src/Qtx/QtxWorkstackAction.cxx
src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt
src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
src/SALOME_PYQT/SalomePyQt/CMakeLists.txt
src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
src/STD/STD_Application.cxx
src/STD/STD_MDIDesktop.cxx
src/SUIT/SUIT_ActionOperation.cxx
src/SUIT/SUIT_Application.cxx
src/SUIT/SUIT_Application.h
src/SUIT/SUIT_DataObjectKey.cxx
src/SUIT/SUIT_Desktop.cxx
src/SUIT/SUIT_FileDlg.cxx
src/SUIT/SUIT_Operation.cxx
src/SUIT/SUIT_ResourceMgr.cxx
src/SUIT/SUIT_Study.cxx
src/SUIT/SUIT_ViewManager.cxx
src/SUIT/SUIT_ViewWindow.cxx
src/SVTK/SVTK_ComboAction.cxx
src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
src/SVTK/SVTK_NonIsometricDlg.cxx
src/SVTK/SVTK_SetRotationPointDlg.cxx
src/SVTK/SVTK_UpdateRateDlg.cxx
src/SVTK/SVTK_ViewModel.cxx
src/SVTK/SVTK_ViewParameterDlg.cxx
src/SVTK/SVTK_ViewWindow.cxx
src/SalomeApp/SalomeApp_Application.cxx
src/SalomeApp/SalomeApp_Engine_i.cxx
src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
src/SalomeApp/pluginsdemo/CMakeLists.txt
src/SalomeApp/pluginsdemo/minmax_dialog.py [deleted file]
src/SalomeApp/pluginsdemo/minmax_plugin.py
src/Session/SALOME_Session_Server.cxx
src/Session/Session_ServerCheck.cxx
src/Session/Session_Session_i.cxx
src/Style/Style_Salome.cxx
src/TreeData/Test/mainwindow.cxx
src/TreeData/TreeModel.cxx
src/VTKViewer/VTKViewer_Filter.cxx
src/VTKViewer/VTKViewer_InteractorStyle.cxx
src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
src/VTKViewer/VTKViewer_ViewWindow.cxx
src/ViewerTools/ViewerTools_DialogBase.h
tools/dlgfactory/CMakeLists.txt
tools/dlgfactory/GenericDialog.cxx
tools/dlgfactory/GenericDialog.h
tools/dlgfactory/__GDIALOG__.cxx
tools/dlgfactory/__GDIALOG__.h
tools/dlgfactory/__QDIALOG__.cxx
tools/dlgfactory/__QDIALOG__.h
tools/dlgfactory/gtester.cxx
tools/dlgfactory/qtester.cxx