From bda04f6e7cd5170ab1298b2c88fa732c38ed3302 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 7 May 2010 16:06:32 +0000 Subject: [PATCH] Merge from V5_1_4_BR 07/05/2010 --- Makefile.am | 21 +++++++++++++++ build_configure | 2 +- configure.ac | 2 +- m4/ac_cxx_option.m4 | 2 +- m4/ac_linker_options.m4 | 2 +- m4/check_omniorb.m4 | 2 +- m4/check_salome.m4 | 2 +- m4/check_sphinx.m4 | 2 +- m4/i2_check_qt4.m4 | 2 +- m4/production.m4 | 2 +- src/Makefile.am | 2 +- src/bases/BL_Exception.cxx | 2 +- src/bases/BL_Exception.hxx | 2 +- src/bases/BL_Traces.hxx | 2 +- src/bases/Makefile.am | 2 +- src/bases/make_begin.am | 2 +- src/engine/BL_Job.cxx | 2 +- src/engine/BL_Job.hxx | 2 +- src/engine/BL_JobsManager.cxx | 2 +- src/engine/BL_JobsManager.hxx | 2 +- src/engine/BL_Observer.hxx | 2 +- src/engine/BL_SALOMEServices.cxx | 2 +- src/engine/BL_SALOMEServices.hxx | 2 +- src/engine/Makefile.am | 2 +- src/genericgui/BL_Buttons.cxx | 2 +- src/genericgui/BL_Buttons.hxx | 2 +- src/genericgui/BL_CreateJobWizard.cxx | 2 +- src/genericgui/BL_CreateJobWizard.hxx | 2 +- src/genericgui/BL_GenericGui.cxx | 34 ++++++++++++++---------- src/genericgui/BL_GenericGui.hxx | 2 +- src/genericgui/BL_JobTab.cxx | 2 +- src/genericgui/BL_JobTab.hxx | 2 +- src/genericgui/BL_JobsManager_QT.cxx | 9 ++++--- src/genericgui/BL_JobsManager_QT.hxx | 2 +- src/genericgui/BL_JobsTable.cxx | 2 +- src/genericgui/BL_JobsTable.hxx | 2 +- src/genericgui/BL_QModelManager.cxx | 2 +- src/genericgui/BL_QModelManager.hxx | 2 +- src/genericgui/BL_Summary.cxx | 4 +-- src/genericgui/BL_Summary.hxx | 4 +-- src/genericgui/JM_EditSalomeResource.cxx | 2 +- src/genericgui/JM_EditSalomeResource.hxx | 2 +- src/genericgui/JM_ResourceCatalog.cxx | 4 +-- src/genericgui/JM_ResourceCatalog.hxx | 4 +-- src/genericgui/JM_SalomeResource.cxx | 2 +- src/genericgui/JM_SalomeResource.hxx | 2 +- src/genericgui/Makefile.am | 2 +- src/salomegui/BL_SalomeGui.cxx | 2 +- src/salomegui/BL_SalomeGui.hxx | 2 +- src/salomegui/Makefile.am | 2 +- src/salomegui/resources/SalomeApp.xml | 2 +- src/standalone/Makefile.am | 19 +++++++++++++ src/standalone/main.cxx | 19 +++++++++++++ src/standalone/start_jobmanager.sh.in | 2 +- src/wrappers/BL_MainWindows_Qt.cxx | 2 +- src/wrappers/BL_MainWindows_Qt.hxx | 2 +- src/wrappers/BL_MainWindows_SALOME.cxx | 2 +- src/wrappers/BL_MainWindows_SALOME.hxx | 2 +- src/wrappers/BL_MainWindows_Wrap.hxx | 2 +- src/wrappers/Makefile.am | 2 +- 60 files changed, 144 insertions(+), 76 deletions(-) diff --git a/Makefile.am b/Makefile.am index f8238b2..73cbb24 100644 --- 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 + +EXTRA_DIST = build_configure diff --git a/build_configure b/build_configure index e3987c4..4188966 100755 --- 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 da46773..8faf94f 100644 --- 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 6f31513..ac17d38 100644 --- 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 cec98c4..e3430d3 100644 --- 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 f2be9a7..57e25f5 100644 --- 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 f6bdfa7..0c944dd 100644 --- 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 eec1495..d4cb094 100644 --- 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 355c389..7a90d05 100644 --- 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 802d37e..e682b31 100644 --- 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 0897ae9..22b832e 100644 --- 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 087eeb7..018966c 100644 --- 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 a03a836..fd8d0fa 100644 --- 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 74ea636..a53d488 100644 --- 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 2429972..f36670b 100644 --- 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 0e885b9..74055a5 100644 --- 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 d49ce8f..16d329d 100644 --- 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 723fe4c..72e265e 100644 --- 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 b6e25a3..7a56458 100644 --- 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 a4b137c..20b2b81 100644 --- 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 996fbd2..b2b271a 100644 --- 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 da485c3..d54be81 100644 --- 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 cce2c2b..d96c1cd 100644 --- 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 81ec96a..82fdcd3 100644 --- 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 b634a93..ebc58cd 100644 --- 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 b26f583..091e621 100644 --- 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 1c372fb..97da5a6 100644 --- 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 15a0881..56b1a15 100644 --- 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 253b4b1..fde75e3 100644 --- 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 3f7d8e1..822538d 100644 --- 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 1fdd1b2..9a901e4 100644 --- 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 d4b670d..14d07fd 100644 --- 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 ff2c245..fabacd7 100644 --- 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 46f19a2..b821c18 100644 --- 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 8a1f3fb..25deeaa 100644 --- 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 ace8b2f..9ad63a5 100644 --- 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 2966e86..ae563ad 100644 --- 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 868d93a..81fb1e4 100644 --- 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 5e565cf..ef79ee6 100644 --- 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 f066bdf..8d45d27 100644 --- 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 c8eb7b4..2caf956 100644 --- 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 582037a..f30c83d 100644 --- 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 0ce262d..cebecff 100644 --- 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 ba486da..0c8e2b1 100644 --- 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 a0cf9a7..2dce9fe 100644 --- 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 b71b449..7afba5e 100644 --- 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 c155cf7..22132ff 100644 --- 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 81226e4..7528758 100644 --- 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 b072f63..5ca85de 100644 --- 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 c916702..a79e4fe 100644 --- 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 c8e0933..b9c2643 100644 --- a/src/salomegui/resources/SalomeApp.xml +++ b/src/salomegui/resources/SalomeApp.xml @@ -1,5 +1,5 @@