Merge from V5_1_main 14/05/2010

diff --git a/Makefile.am b/Makefile.am
index e05f6193046b4bc60ffb81f0e755529f8d776678..6e7f6e137798297620ea3d5d73e4922d6cda5f09 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,24 @@
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  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
+#
+
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src doc
+
+EXTRA_DIST = build_configure

diff --git a/build_configure b/build_configure
index e3987c4c5355c9d35128c41599985d1841c307bf..418896697291e744a797e0ea19bda855f3d7ff27 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/configure.ac b/configure.ac
index fbef366bf5ac327fb9eaac94b69377cd410828f8..da86c8e5ad7b0fa135f30ee01e91e6faaf951f81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009  CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/m4/ac_cxx_option.m4 b/m4/ac_cxx_option.m4
index 6f315136fe74cbbfcc8585a2790c8f3964a19b5c..ac17d384ea02c5ce15d46dd62b6af5771d093a2a 100644 (file)
--- a/m4/ac_cxx_option.m4
+++ b/m4/ac_cxx_option.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public

diff --git a/m4/ac_linker_options.m4 b/m4/ac_linker_options.m4
index cec98c40dd3e78e10a6b18af976390bb85432e96..e3430d323c725662bd5970a5441564146dce30ae 100644 (file)
--- a/m4/ac_linker_options.m4
+++ b/m4/ac_linker_options.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public

diff --git a/m4/check_omniorb.m4 b/m4/check_omniorb.m4
index f2be9a7e507823213104f119e92cf58cdd3fc3ee..57e25f5e0847382bd9c0a1b18024a88aac56d074 100644 (file)
--- a/m4/check_omniorb.m4
+++ b/m4/check_omniorb.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public

diff --git a/m4/check_salome.m4 b/m4/check_salome.m4
index f6bdfa7d9bdf73f55a6d5565d7a3234296e2dbb2..0c944ddcfaf0380b1f364d379174b4a7c6f613f2 100644 (file)
--- a/m4/check_salome.m4
+++ b/m4/check_salome.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public

diff --git a/m4/check_sphinx.m4 b/m4/check_sphinx.m4
index eec149530e86e7ec9cbee4ea172d2c4b88080f58..d4cb0944c5412fb24c1f4070003d9f03d5b03cc4 100644 (file)
--- a/m4/check_sphinx.m4
+++ b/m4/check_sphinx.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public

diff --git a/m4/i2_check_qt4.m4 b/m4/i2_check_qt4.m4
index 355c3898a7958e2a059f5f59672120b5a638af1f..7a90d0512e319e794adf1fa66d0cc99c71472bd8 100644 (file)
--- a/m4/i2_check_qt4.m4
+++ b/m4/i2_check_qt4.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public

diff --git a/m4/production.m4 b/m4/production.m4
index 802d37e8aa4da2a5abff09eb942e1947ce7653f9..e682b31bb70154278792754bc48724ff8822c06a 100644 (file)
--- a/m4/production.m4
+++ b/m4/production.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+dnl  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public

diff --git a/src/Makefile.am b/src/Makefile.am
index 0897ae96524ef80cd454ffa805c9a992e846d4e4..22b832ed98c2b4dff86bc9a8ea6387f9dee3ac49 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/src/bases/BL_Exception.cxx b/src/bases/BL_Exception.cxx
index 087eeb736310995811fd6269802552182cac50e9..018966c311a52cf880796aca131402c320e0ecb9 100644 (file)
--- a/src/bases/BL_Exception.cxx
+++ b/src/bases/BL_Exception.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/bases/BL_Exception.hxx b/src/bases/BL_Exception.hxx
index a03a836df6fba2864c9f1dcb4ca8d93daffffca6..fd8d0fa9b46f4e368a6cb85e8e57849ea02f263a 100644 (file)
--- a/src/bases/BL_Exception.hxx
+++ b/src/bases/BL_Exception.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/bases/BL_Traces.hxx b/src/bases/BL_Traces.hxx
index 74ea63672eb64339018b84a3724e46d031ef0e36..a53d488c677b5a02c45f4773e3e10fa085dffeb4 100644 (file)
--- a/src/bases/BL_Traces.hxx
+++ b/src/bases/BL_Traces.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/bases/Makefile.am b/src/bases/Makefile.am
index 24299723a43edebf048443aa395f9f55c858abd5..f36670be8251ff3362e98208be9962f52d7278e5 100644 (file)
--- a/src/bases/Makefile.am
+++ b/src/bases/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/src/bases/make_begin.am b/src/bases/make_begin.am
index 0e885b979f4eacca1fc9b05d13d2f9e3f22b3861..74055a523204ef1d9442e9a459241e625c522849 100644 (file)
--- a/src/bases/make_begin.am
+++ b/src/bases/make_begin.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/BL_Job.cxx b/src/engine/BL_Job.cxx
index d49ce8ff2d7a2f8d4d38fc5b9c0a5a233c6204f3..16d329dc9c981e84d984bfea557d975ded175765 100644 (file)
--- a/src/engine/BL_Job.cxx
+++ b/src/engine/BL_Job.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/BL_Job.hxx b/src/engine/BL_Job.hxx
index 723fe4c581add62de7799a9bec224340e670394f..72e265e9332f5e5c6dc4ee461c07987f3f1e303a 100644 (file)
--- a/src/engine/BL_Job.hxx
+++ b/src/engine/BL_Job.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/BL_JobsManager.cxx b/src/engine/BL_JobsManager.cxx
index b6e25a38596b132194bb441a936eb4bb0adef41f..7a564587e958ebe716415f40f7c0a94086023ea1 100644 (file)
--- a/src/engine/BL_JobsManager.cxx
+++ b/src/engine/BL_JobsManager.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/BL_JobsManager.hxx b/src/engine/BL_JobsManager.hxx
index a4b137c3b88108e09abbbd9006073ca36e0341d4..20b2b814e50528b555bfc6cb376e22e69c0410e7 100644 (file)
--- a/src/engine/BL_JobsManager.hxx
+++ b/src/engine/BL_JobsManager.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/BL_Observer.hxx b/src/engine/BL_Observer.hxx
index 996fbd29ef209b4dcebf75c64590f2c98d01c0af..b2b271a8cfa7289cf10f8c6ac2210f8650e62448 100644 (file)
--- a/src/engine/BL_Observer.hxx
+++ b/src/engine/BL_Observer.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/BL_SALOMEServices.cxx b/src/engine/BL_SALOMEServices.cxx
index da485c3002898c7e917865df3814609f67dab176..d54be81bc048964ffa86a88472695c057fb862dd 100644 (file)
--- a/src/engine/BL_SALOMEServices.cxx
+++ b/src/engine/BL_SALOMEServices.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/BL_SALOMEServices.hxx b/src/engine/BL_SALOMEServices.hxx
index cce2c2b9aa7ba71b1379b5e7d00be30d230140e9..d96c1cdd6b2f6bc343a839483d793239edc7f636 100644 (file)
--- a/src/engine/BL_SALOMEServices.hxx
+++ b/src/engine/BL_SALOMEServices.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 81ec96a8c7130bb9468c10bfa7bee56a264ed146..82fdcd341e8ae6c9ae69cc85429826195ba0fe07 100644 (file)
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_Buttons.cxx b/src/genericgui/BL_Buttons.cxx
index b634a93e6e06bda378a6c418ef4e784455b8d2e4..ebc58cd0195ad4e00873e983d6837089667ba46d 100644 (file)
--- a/src/genericgui/BL_Buttons.cxx
+++ b/src/genericgui/BL_Buttons.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_Buttons.hxx b/src/genericgui/BL_Buttons.hxx
index b26f5837af4ba655431ceda601586dfad81ca296..091e6212fd876f81d8f6120921590d83574b4466 100644 (file)
--- a/src/genericgui/BL_Buttons.hxx
+++ b/src/genericgui/BL_Buttons.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx
index 1c372fbfee3c044eaf6bd2af26a114e24ab70804..97da5a6f3ad78779d18aa2d21358a8f0a5bace06 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.cxx
+++ b/src/genericgui/BL_CreateJobWizard.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index 15a08815dfb89393b207c0fee41f996b84022bf7..56b1a15751112638acca7b2b02adce8b832880d0 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_GenericGui.cxx b/src/genericgui/BL_GenericGui.cxx
index 253b4b1b43c3c7a17e36ce8e23a8c857a57d6f44..fde75e34d95fc31d8fa637045c843c484d2af4e8 100644 (file)
--- a/src/genericgui/BL_GenericGui.cxx
+++ b/src/genericgui/BL_GenericGui.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -40,6 +40,9 @@ BL::GenericGui::GenericGui(BL::MainWindows_Wrap * wrapper) : QObject(wrapper->ge
 
   // ---- Adding different GUI parts
 
+
+  /* Tab Central Widget */
+
   /* Buttons */
   _buttons = new BL::Buttons(_tab_parent);
   _buttons->setCreateButtonSlot(this, SLOT(create_job()));
@@ -58,38 +61,41 @@ BL::GenericGui::GenericGui(BL::MainWindows_Wrap * wrapper) : QObject(wrapper->ge
   _job_tab = new BL::JobTab(_tab_parent, _jobs_manager);
   _job_tab->setModel(_model);
 
-  /* Tab Central Widget */
-  //QWidget * central_widget = new QWidget(_tab_parent);
-  QScrollArea * central_widget = new QScrollArea(_tab_parent);
-
-  QSplitter * tab_central_widget = new QSplitter(Qt::Vertical, central_widget);
+  // Central Widget
+  QWidget * central_widget = new QWidget(_tab_parent);
+  QSplitter * tab_central_widget = new QSplitter(Qt::Vertical, _tab_parent);
   tab_central_widget->addWidget(_jobs_table);
   tab_central_widget->addWidget(_job_tab);
   tab_central_widget->setChildrenCollapsible(false);
-
   QVBoxLayout * central_layout = new QVBoxLayout;
   central_layout->addWidget(_buttons);
   central_layout->addWidget(tab_central_widget);
   central_widget->setLayout(central_layout);
 
-  _tab_parent->setCentralWidget(central_widget);
-  // Test tab
-  //QDockWidget * dw_main = new QDockWidget(_tab_parent);
-  //dw_main->setWidget(central_widget);
-  //_tab_parent->addDockWidget(Qt::LeftDockWidgetArea, dw_main);
+  // Adding a scroll area for low resolution
+  QScrollArea * scroll_central_widget = new QScrollArea(_tab_parent);
+  scroll_central_widget->setWidget(central_widget);
+  scroll_central_widget->setWidgetResizable(true);
+  _tab_parent->setCentralWidget(scroll_central_widget);
 
   /* Summary */
   _dw_summary = new QDockWidget(_dock_parent);
   _dw_summary->setWindowTitle("Summary");
   _summary = new BL::Summary(_dw_summary, _jobs_manager);
   _summary->setModel(_model);
-  _dw_summary->setWidget(_summary);
+  QScrollArea * scroll_widget_summary = new QScrollArea(_dw_summary);
+  scroll_widget_summary->setWidget(_summary);
+  scroll_widget_summary->setWidgetResizable(true);
+  _dw_summary->setWidget(scroll_widget_summary);
 
   /* ResourceCatalog */
   _dw_resource_catalog = new QDockWidget(_dock_parent);
   _dw_resource_catalog->setWindowTitle("Resource Catalog");
   _resource_catalog = new JM::ResourceCatalog(_dw_resource_catalog, _salome_services);
-  _dw_resource_catalog->setWidget(_resource_catalog);
+  QScrollArea * scroll_widget_resource = new QScrollArea(_dw_resource_catalog);
+  scroll_widget_resource->setWidget(_resource_catalog);
+  scroll_widget_resource->setWidgetResizable(true);
+  _dw_resource_catalog->setWidget(scroll_widget_resource);
 
   /* Main Dock Window */
   _dock_parent->addDockWidget(Qt::RightDockWidgetArea, _jobs_manager);

diff --git a/src/genericgui/BL_GenericGui.hxx b/src/genericgui/BL_GenericGui.hxx
index 3f7d8e1b37de3e3722dc4389e1030a82c88f4bea..822538da156f4a19566a2545ff76a2b013f9ca16 100644 (file)
--- a/src/genericgui/BL_GenericGui.hxx
+++ b/src/genericgui/BL_GenericGui.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_JobTab.cxx b/src/genericgui/BL_JobTab.cxx
index 1fdd1b2557eaf40b1d78de48a7b514a8f88cf33b..9a901e4beaef6cef3b8a7274e8db74f22187c640 100644 (file)
--- a/src/genericgui/BL_JobTab.cxx
+++ b/src/genericgui/BL_JobTab.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_JobTab.hxx b/src/genericgui/BL_JobTab.hxx
index d4b670dd4b17f34c23ea008b29052688169d3a02..14d07fd2d137bd3976e48e484ca7672b5af262df 100644 (file)
--- a/src/genericgui/BL_JobTab.hxx
+++ b/src/genericgui/BL_JobTab.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx
index ff2c24505524eb3e891cd967ef1e31075b3a3608..fabacd77af6a63cadba550a73537150a8699fd04 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.cxx
+++ b/src/genericgui/BL_JobsManager_QT.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ BL::JobsManager_QT::JobsManager_QT(QWidget * parent, BL::GenericGui * main_gui,
 
   // Widget Part
 
-  QScrollArea * main_widget = new QScrollArea(this);
+  QWidget * main_widget = new QWidget(this);
 
   _load_jobs = new QPushButton("Load Jobs");
   _save_jobs = new QPushButton("Save Jobs");
@@ -81,7 +81,10 @@ BL::JobsManager_QT::JobsManager_QT(QWidget * parent, BL::GenericGui * main_gui,
   mainLayout->addWidget(message_box);
   main_widget->setLayout(mainLayout);
 
-  setWidget(main_widget);
+  QScrollArea * scroll_widget = new QScrollArea(this);
+  scroll_widget->setWidget(main_widget);
+  scroll_widget->setWidgetResizable(true);
+  setWidget(scroll_widget);
   setWindowTitle("Job Manager");
 }
 

diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx
index 46f19a257f9129230eeb36995a2ea3343c962832..b821c18c18f9b609ea26ecc215d624ea545c0e28 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.hxx
+++ b/src/genericgui/BL_JobsManager_QT.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_JobsTable.cxx b/src/genericgui/BL_JobsTable.cxx
index 8a1f3fbd1193cf6287254cdbf3ddfe0979c27b75..25deeaa4238ec97c378cf4a0183dac055c440457 100644 (file)
--- a/src/genericgui/BL_JobsTable.cxx
+++ b/src/genericgui/BL_JobsTable.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_JobsTable.hxx b/src/genericgui/BL_JobsTable.hxx
index ace8b2f2fe7e1bc5c959f496e83809e20c22f9ef..9ad63a5ec9eb228ae7e4d8fac3e6f65676353cde 100644 (file)
--- a/src/genericgui/BL_JobsTable.hxx
+++ b/src/genericgui/BL_JobsTable.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_QModelManager.cxx b/src/genericgui/BL_QModelManager.cxx
index 2966e86e50f719512490d6178fc3bcd54de5ae6a..ae563ad23ff43d9a9070668543620d958b710181 100644 (file)
--- a/src/genericgui/BL_QModelManager.cxx
+++ b/src/genericgui/BL_QModelManager.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_QModelManager.hxx b/src/genericgui/BL_QModelManager.hxx
index 868d93a48ca8a8115115bf2c6a99c649be17feab..81fb1e426ceb0a9ad749c95ae4d4002b855f84c7 100644 (file)
--- a/src/genericgui/BL_QModelManager.hxx
+++ b/src/genericgui/BL_QModelManager.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/BL_Summary.cxx b/src/genericgui/BL_Summary.cxx
index 5e565cf8f666fa9ba9b00b19dfce738be897d3f2..ef79ee60049af5c854dce8a0581ad674e186ddba 100644 (file)
--- a/src/genericgui/BL_Summary.cxx
+++ b/src/genericgui/BL_Summary.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #include "BL_Summary.hxx"
 #include "BL_Traces.hxx"
 
-BL::Summary::Summary(QWidget *parent, BL::JobsManager_QT * jobs_manager) : QScrollArea(parent)
+BL::Summary::Summary(QWidget *parent, BL::JobsManager_QT * jobs_manager) : QWidget(parent)
 {
   DEBTRACE("Creating BL::Summary");
   BL_ASSERT(parent);

diff --git a/src/genericgui/BL_Summary.hxx b/src/genericgui/BL_Summary.hxx
index f066bdf86b3493389476ecc652c4442bb0c60f6d..8d45d2733ea47f4f27d0eb52b2ce523e1912a5fd 100644 (file)
--- a/src/genericgui/BL_Summary.hxx
+++ b/src/genericgui/BL_Summary.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
 
 namespace BL 
 {
-  class Summary: public QScrollArea
+  class Summary: public QWidget
   {
     Q_OBJECT
 

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index c8eb7b48f582dee603bfd8cb79aa1f0bdb905ca2..2caf956ec90d2f365e49582e1b8d52e2e8610abc 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2010 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/JM_EditSalomeResource.hxx b/src/genericgui/JM_EditSalomeResource.hxx
index 582037a0827696e8c4dec1f1c021c81e9bb808f9..f30c83daca5fd6c0020ef1a4c619c1ccb20562e7 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.hxx
+++ b/src/genericgui/JM_EditSalomeResource.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2010 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/JM_ResourceCatalog.cxx b/src/genericgui/JM_ResourceCatalog.cxx
index 0ce262d67c6c6b99db79d60e4b596ed2ccb2be8b..cebecffcabd2445fe5d5b72a34e711dfebab0292 100644 (file)
--- a/src/genericgui/JM_ResourceCatalog.cxx
+++ b/src/genericgui/JM_ResourceCatalog.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@
 #include "JM_SalomeResource.hxx"
 #include "JM_EditSalomeResource.hxx"
 
-JM::ResourceCatalog::ResourceCatalog(QWidget *parent, BL::SALOMEServices * salome_services) : QScrollArea(parent)
+JM::ResourceCatalog::ResourceCatalog(QWidget *parent, BL::SALOMEServices * salome_services) : QWidget(parent)
 {
   DEBTRACE("Creating JM::ResourceCatalog");
   BL_ASSERT(parent);

diff --git a/src/genericgui/JM_ResourceCatalog.hxx b/src/genericgui/JM_ResourceCatalog.hxx
index ba486da2f1218d12a0715d4ea8ab5d9b9c2fca2e..0c8e2b1fb2112167f165708d90490e19bbea01a3 100644 (file)
--- a/src/genericgui/JM_ResourceCatalog.hxx
+++ b/src/genericgui/JM_ResourceCatalog.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@
 
 namespace JM 
 {
-  class ResourceCatalog: public QScrollArea
+  class ResourceCatalog: public QWidget
   {
     Q_OBJECT
 

diff --git a/src/genericgui/JM_SalomeResource.cxx b/src/genericgui/JM_SalomeResource.cxx
index a0cf9a709781e9077a1bb761e8f9736769e18464..2dce9fea775d2db87d468d056c7e69d155aef7b7 100644 (file)
--- a/src/genericgui/JM_SalomeResource.cxx
+++ b/src/genericgui/JM_SalomeResource.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2010 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/JM_SalomeResource.hxx b/src/genericgui/JM_SalomeResource.hxx
index b71b4494c5e4e777124d8231189deaa044d88bd8..7afba5e92745c4eb8b2d66c089e66f48a9b9ba09 100644 (file)
--- a/src/genericgui/JM_SalomeResource.hxx
+++ b/src/genericgui/JM_SalomeResource.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2010 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/genericgui/Makefile.am b/src/genericgui/Makefile.am
index c155cf7e62989831d7a407d3aaf88f108b89ecca..22132ff971b170fdd0d82308607a9f761fd06503 100644 (file)
--- a/src/genericgui/Makefile.am
+++ b/src/genericgui/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/src/salomegui/BL_SalomeGui.cxx b/src/salomegui/BL_SalomeGui.cxx
index 81226e4f569dc394fcd42c7c9d68a1a2f66fef73..7528758353e700af93c64c9f55fcb5c6e1cf6c8a 100644 (file)
--- a/src/salomegui/BL_SalomeGui.cxx
+++ b/src/salomegui/BL_SalomeGui.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/salomegui/BL_SalomeGui.hxx b/src/salomegui/BL_SalomeGui.hxx
index b072f639baed64dd6ba9eb845e666874966fec26..5ca85dee8f0a055cede4fafcf1b52f56617f468f 100644 (file)
--- a/src/salomegui/BL_SalomeGui.hxx
+++ b/src/salomegui/BL_SalomeGui.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/salomegui/Makefile.am b/src/salomegui/Makefile.am
index c9167027c27867292405a533f2999d0bd165d7a7..a79e4fe0b77a0e403866eca4d626b58867196e74 100644 (file)
--- a/src/salomegui/Makefile.am
+++ b/src/salomegui/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/src/salomegui/resources/SalomeApp.xml b/src/salomegui/resources/SalomeApp.xml
index 84206ebd22978064b48749b066f2a241d891f64c..27f117e7942238367ece4f66dc1d623ab7214f11 100644 (file)
--- a/src/salomegui/resources/SalomeApp.xml
+++ b/src/salomegui/resources/SalomeApp.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2009  CEA/DEN, EDF R&D
+  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public

diff --git a/src/standalone/Makefile.am b/src/standalone/Makefile.am
index 761906154229cf7674375d1551a1e710a291f3de..3b552587795c44f9a74dbf0507d932d83ae511a6 100644 (file)
--- a/src/standalone/Makefile.am
+++ b/src/standalone/Makefile.am
@@ -1,3 +1,22 @@
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
+#
+#  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.
+#
+#  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
+#
+
 bin_PROGRAMS = jobmanager_gui
 
 bin_SCRIPTS = start_jobmanager.sh

diff --git a/src/standalone/main.cxx b/src/standalone/main.cxx
index baf07c6c7a75fd9607aabe5c84c20c2418f9d6d9..795439f9c2ce2a8bf24fa55be1722a7445d96dd7 100644 (file)
--- a/src/standalone/main.cxx
+++ b/src/standalone/main.cxx
@@ -1,3 +1,22 @@
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
+//
+//  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.
+//
+//  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 <QtGui>
 #include "BL_GenericGui.hxx"
 #include "BL_MainWindows_Qt.hxx"

diff --git a/src/standalone/start_jobmanager.sh.in b/src/standalone/start_jobmanager.sh.in
index 4b94938f14e8e3abb06ebd45271642926662cf91..e27b52f92aeb4e52a454531d0e380cdb9c62cc1e 100644 (file)
--- a/src/standalone/start_jobmanager.sh.in
+++ b/src/standalone/start_jobmanager.sh.in
@@ -1,5 +1,5 @@
 #!/bin/bash
-#  Copyright (C) 2009  CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public

diff --git a/src/wrappers/BL_MainWindows_Qt.cxx b/src/wrappers/BL_MainWindows_Qt.cxx
index ea7e5a2acad769748adc5cee41c5bc952cdd273e..56756945dd90e1ec70c73ca2c313ecdef549e79c 100644 (file)
--- a/src/wrappers/BL_MainWindows_Qt.cxx
+++ b/src/wrappers/BL_MainWindows_Qt.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/wrappers/BL_MainWindows_Qt.hxx b/src/wrappers/BL_MainWindows_Qt.hxx
index 550d6c54e29d038c144e84b327a5618fc70d7724..7661dae07af9a06298f69cc825c64d7a989365d4 100644 (file)
--- a/src/wrappers/BL_MainWindows_Qt.hxx
+++ b/src/wrappers/BL_MainWindows_Qt.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/wrappers/BL_MainWindows_SALOME.cxx b/src/wrappers/BL_MainWindows_SALOME.cxx
index 6a604b7f838919bcfcb2ed016cb4b3ee8a95922c..29c73cbca7e452d7fb85725a22bcacba64d1e15d 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.cxx
+++ b/src/wrappers/BL_MainWindows_SALOME.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/wrappers/BL_MainWindows_SALOME.hxx b/src/wrappers/BL_MainWindows_SALOME.hxx
index ec2ee35e0f6e61498b11addcbce91671f78d2b80..3be325f475d2029b244f0f12606397a74602635d 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.hxx
+++ b/src/wrappers/BL_MainWindows_SALOME.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/wrappers/BL_MainWindows_Wrap.hxx b/src/wrappers/BL_MainWindows_Wrap.hxx
index 3d16e980842b458f0b9ed39e2689ad36fbe3b12d..8103bf886506ad6173d91301b56e0e066e6006b9 100644 (file)
--- a/src/wrappers/BL_MainWindows_Wrap.hxx
+++ b/src/wrappers/BL_MainWindows_Wrap.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2009 CEA/DEN, EDF R&D
+//  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public

diff --git a/src/wrappers/Makefile.am b/src/wrappers/Makefile.am
index 773d02e1c88f95fab532e21200f77393f1de8e30..b3702685dd49b563f41238021fbfac8e51cb1fd6 100644 (file)
--- a/src/wrappers/Makefile.am
+++ b/src/wrappers/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009 CEA/DEN, EDF R&D
+#  Copyright (C) 2009-2010  CEA/DEN, EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public