Addition of autolocker class to avoid deadlocks on throw.

[modules/yacs.git] / src / genericgui / Resource.cxx

diff --git a/src/genericgui/Resource.cxx b/src/genericgui/Resource.cxx
index 7ed0121859389d8d6fb459d46d2a18a20c3d6a3f..fcb5f36ed17790334cb1ed04ebdc5daab5a9f17b 100644 (file)
--- a/src/genericgui/Resource.cxx
+++ b/src/genericgui/Resource.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2014  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.
+// 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
@@ -33,6 +33,8 @@ bool Resource::autoComputeLinks = AUTOCOMPUTELINKS;
 bool Resource::simplifyLink = SIMPLIFYLINK;
 bool Resource::ensureVisibleWhenMoved = ENSUREVISIBLEWHENMOVED;
 int Resource::dockWidgetPriority = DOCKWIDGETPRIORITY;
+QColor Resource::progressBarColor = PROGRESSBARCOLOR;
+int Resource::progressBarLabel = PROGRESSBARLABEL;
 QFont  Resource::pythonfont = PYTHONFONT;
 
 // Statics for color of states
@@ -144,6 +146,8 @@ int Resource::Corner_Margin   = ( Resource::Border_Margin + Resource::Space_Marg
 int Resource::Header_Height   = ( Resource::Corner_Margin + Resource::CtrlPort_Height + Resource::Line_Space + Resource::Line_Width + Resource::Line_Space );
 int Resource::Radius          =  3;
 
+int Resource::progressBar_Height =  20;
+
 bool Resource::tabPanelsUp = TABPANELSUP;
 
 // Constructor