]> SALOME platform Git repositories - modules/gui.git/commit
Salome HOME
Merge from V6_4_BR 05/12/2011
authorvsr <vsr@opencascade.com>
Mon, 5 Dec 2011 10:06:27 +0000 (10:06 +0000)
committervsr <vsr@opencascade.com>
Mon, 5 Dec 2011 10:06:27 +0000 (10:06 +0000)
commit520643871dad6e3213d9f6d148f87665ff9ced20
tree67d58767e4799746408d9789c30ee4bec898cff9
parentb94bff35804ffc4830198803b5050d5b75a73f4c
Merge from V6_4_BR 05/12/2011
186 files changed:
Makefile.am
SUIT.pro [deleted file]
adm_local/cmake_files/FindVTK.cmake
adm_local/unix/config_files/Makefile.am
adm_local/unix/config_files/check_pyqt.m4
adm_local/unix/config_files/check_qt.m4
adm_local/unix/config_files/check_salome_version.m4 [new file with mode: 0644]
adm_local/unix/make_common_starter.am
adm_local/unix/make_conclude.in [deleted file]
bin/runLightSalome.sh
clean_configure
configure.ac
doc/salome/gui/images/SALOME_pythonplugins_dialog.png [new file with mode: 0644]
doc/salome/gui/images/SALOME_pythonplugins_menu.png [new file with mode: 0644]
doc/salome/gui/images/SALOME_pythonplugins_result.png [new file with mode: 0644]
doc/salome/gui/input/installing_salome.doc
doc/salome/gui/input/mesh_preferences.doc
doc/salome/gui/input/occ_3d_viewer.doc
doc/salome/gui/input/plot2d_viewer.doc
doc/salome/gui/input/postpro_preferences.doc
doc/salome/gui/input/salome_desktop.doc
doc/salome/gui/input/themes.doc
doc/salome/gui/input/using_input_widgets.doc
doc/salome/gui/input/using_object_browser.doc
doc/salome/gui/input/using_pluginsmanager.doc [new file with mode: 0644]
doc/salome/gui/input/vtk_3d_viewer.doc
src/CAF/CAF.pro [deleted file]
src/CAM/CAM.pro [deleted file]
src/CAM/CAM_Application.cxx
src/DDS/DDS.pro [deleted file]
src/Event/Event.pro [deleted file]
src/GLViewer/GLViewer.pro [deleted file]
src/GUI_PY/Makefile.am
src/GuiHelpers/Makefile.am [new file with mode: 0644]
src/GuiHelpers/QtHelper.hxx [new file with mode: 0644]
src/GuiHelpers/SALOME_AppStudyEditor.cxx [new file with mode: 0644]
src/GuiHelpers/SALOME_AppStudyEditor.hxx [new file with mode: 0644]
src/GuiHelpers/SALOME_GuiServices.cxx [new file with mode: 0644]
src/GuiHelpers/SALOME_GuiServices.hxx [new file with mode: 0644]
src/GuiHelpers/StandardApp_Module.cxx [new file with mode: 0644]
src/GuiHelpers/StandardApp_Module.hxx [new file with mode: 0644]
src/LightApp/LightApp.pro [deleted file]
src/LightApp/LightApp_Application.cxx
src/LightApp/LightApp_DataModel.cxx
src/LightApp/LightApp_DataModel.h
src/LightApp/LightApp_DataObject.cxx
src/LightApp/LightApp_DataObject.h
src/LightApp/LightApp_ModuleAction.cxx
src/LightApp/LightApp_ModuleAction.h
src/LightApp/LightApp_Study.cxx
src/LightApp/LightApp_Study.h
src/LightApp/resources/LightApp.xml
src/LightApp/resources/LightApp_msg_fr.ts
src/LogWindow/LogWindow.pro [deleted file]
src/Makefile.am
src/OBJECT/OBJECT.pro [deleted file]
src/OCCViewer/OCCViewer.pro [deleted file]
src/OCCViewer/OCCViewer_ViewModel.h
src/OCCViewer/resources/OCCViewer_msg_fr.ts
src/Plot2d/Makefile.am
src/Plot2d/Plot2d.cxx
src/Plot2d/Plot2d.h
src/Plot2d/Plot2d.pro [deleted file]
src/Plot2d/Plot2d_AnaliticCurve.cxx [new file with mode: 0644]
src/Plot2d/Plot2d_AnaliticCurve.h [new file with mode: 0644]
src/Plot2d/Plot2d_AnaliticCurveDlg.cxx [new file with mode: 0644]
src/Plot2d/Plot2d_AnaliticCurveDlg.h [new file with mode: 0644]
src/Plot2d/Plot2d_AnaliticParcer.cxx [new file with mode: 0644]
src/Plot2d/Plot2d_AnaliticParcer.h [new file with mode: 0644]
src/Plot2d/Plot2d_Curve.cxx
src/Plot2d/Plot2d_Curve.h
src/Plot2d/Plot2d_Histogram.cxx
src/Plot2d/Plot2d_Object.cxx
src/Plot2d/Plot2d_Object.h
src/Plot2d/Plot2d_SetupCurveDlg.cxx
src/Plot2d/Plot2d_SetupCurveDlg.h
src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx
src/Plot2d/Plot2d_ViewFrame.cxx
src/Plot2d/Plot2d_ViewFrame.h
src/Plot2d/Plot2d_ViewWindow.cxx
src/Plot2d/Plot2d_ViewWindow.h
src/Plot2d/resources/Plot2d_images.ts
src/Plot2d/resources/Plot2d_msg_en.ts
src/Plot2d/resources/Plot2d_msg_fr.ts
src/Plot2d/resources/plot2d_analitic_curve.png [new file with mode: 0755]
src/Prs/Prs.pro [deleted file]
src/PyConsole/Makefile.am
src/PyConsole/PyConsole.pro [deleted file]
src/PyInterp/PyInterp.pro [deleted file]
src/QDS/QDS.h
src/QDS/QDS.pro [deleted file]
src/QDS/QDS_ComboBox.cxx
src/QDS/QDS_Datum.cxx
src/QDS/QDS_SpinBoxDbl.cxx
src/QDS/resources/QDS_msg_en.ts
src/Qtx/Qtx.pro [deleted file]
src/QxGraph/QxGraph.pro [deleted file]
src/ResExporter/ResExporter.pro [deleted file]
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
src/SALOME_SWIG/Help.py [deleted file]
src/SALOME_SWIG/PyInterp.py [deleted file]
src/SALOME_SWIG/salome.py [deleted file]
src/SOCC/SOCC.pro [deleted file]
src/SPlot2d/SPlot2d.pro [deleted file]
src/STD/STD.pro [deleted file]
src/STD/STD_Application.cxx
src/STD/STD_TabDesktop.cxx
src/SUIT/SUIT.pro [deleted file]
src/SUIT/SUIT_Accel.cxx
src/SUIT/SUIT_DataBrowser.cxx
src/SUIT/SUIT_DataBrowser.h
src/SUIT/SUIT_ViewWindow.cxx
src/SUITApp/SUITApp.pro [deleted file]
src/SUITApp/SUITApp_init_python.hxx
src/SUPERVGraph/SUPERVGraph.pro [deleted file]
src/SVTK/SVTK.pro [deleted file]
src/SVTK/SVTK_DialogBase.cxx [deleted file]
src/SVTK/SVTK_DialogBase.h [deleted file]
src/SVTK/SVTK_Extension.cxx [deleted file]
src/SVTK/SVTK_Extension.h [deleted file]
src/SalomeApp/Makefile.am
src/SalomeApp/SalomeApp.pro [deleted file]
src/SalomeApp/SalomeApp_Application.cxx
src/SalomeApp/SalomeApp_Application.h
src/SalomeApp/SalomeApp_DataObject.cxx
src/SalomeApp/SalomeApp_DataObject.h
src/SalomeApp/SalomeApp_Study.cxx
src/SalomeApp/SalomeApp_Study.h
src/SalomeApp/pluginsdemo/Makefile.am [new file with mode: 0644]
src/SalomeApp/pluginsdemo/salome_plugins.py [new file with mode: 0755]
src/SalomeApp/pluginsdemo/trihedron.py [new file with mode: 0644]
src/SalomeApp/pluginsdemo/tube.py [new file with mode: 0644]
src/SalomeApp/pluginsdemo/tubedialog.py [new file with mode: 0644]
src/SalomeApp/salome_pluginsmanager.py
src/Session/SALOME_Session_Server.cxx
src/Session/SalomeApp_Engine_i.cxx
src/Session/SalomeApp_Engine_i.hxx
src/Session/Session.pro [deleted file]
src/Session/Session_ServerLauncher.cxx
src/Session/Session_ServerThread.cxx
src/TOOLSGUI/TOOLSGUI.pro [deleted file]
src/TreeData/DataModel.cxx [new file with mode: 0644]
src/TreeData/DataModel.hxx [new file with mode: 0644]
src/TreeData/DataObject.cxx [new file with mode: 0644]
src/TreeData/DataObject.hxx [new file with mode: 0644]
src/TreeData/DataProcessor.cxx [new file with mode: 0644]
src/TreeData/DataProcessor.hxx [new file with mode: 0644]
src/TreeData/DockWidgets.cxx [new file with mode: 0644]
src/TreeData/DockWidgets.hxx [new file with mode: 0644]
src/TreeData/Makefile.am [new file with mode: 0644]
src/TreeData/Test/Makefile.am [new file with mode: 0644]
src/TreeData/Test/MyDataModel.cxx [new file with mode: 0644]
src/TreeData/Test/MyDataModel.hxx [new file with mode: 0644]
src/TreeData/Test/data.txt [new file with mode: 0755]
src/TreeData/Test/guitester.cxx [new file with mode: 0644]
src/TreeData/Test/mainwindow.cxx [new file with mode: 0644]
src/TreeData/Test/mainwindow.hxx [new file with mode: 0644]
src/TreeData/Test/mainwindow.ui [new file with mode: 0644]
src/TreeData/Test/tester.cxx [new file with mode: 0644]
src/TreeData/Test/testhelper.cxx [new file with mode: 0644]
src/TreeData/Test/testhelper.hxx [new file with mode: 0644]
src/TreeData/TreeData.hxx [new file with mode: 0755]
src/TreeData/TreeGuiManager.cxx [new file with mode: 0644]
src/TreeData/TreeGuiManager.hxx [new file with mode: 0644]
src/TreeData/TreeItem.cxx [new file with mode: 0644]
src/TreeData/TreeItem.hxx [new file with mode: 0644]
src/TreeData/TreeModel.cxx [new file with mode: 0644]
src/TreeData/TreeModel.hxx [new file with mode: 0644]
src/TreeData/TreeObserver.cxx [new file with mode: 0644]
src/TreeData/TreeObserver.hxx [new file with mode: 0644]
src/TreeData/TreeView.cxx [new file with mode: 0644]
src/TreeData/TreeView.hxx [new file with mode: 0644]
src/VTKViewer/VTKViewer.pro [deleted file]
src/VTKViewer/VTKViewer_PassThroughFilter.cxx [deleted file]
src/VTKViewer/VTKViewer_PassThroughFilter.h [deleted file]
src/VTKViewer/VTKViewer_TransformFilter.cxx
src/src.pro [deleted file]
tools/dlgfactory/Makefile.am