Suppression of warnings, application launching problems in different cases (on Window...

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetOptionalBox.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetOptionalBox.cpp b/src/ModuleBase/ModuleBase_WidgetOptionalBox.cpp
old mode 100755 (executable)
new mode 100644 (file)
index c035f02..9ce0b4b
--- a/src/ModuleBase/ModuleBase_WidgetOptionalBox.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetOptionalBox.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021  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
@@ -12,10 +12,9 @@
 //
 // 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <ModuleBase_WidgetOptionalBox.h>
@@ -45,9 +44,9 @@ ModuleBase_WidgetOptionalBox::ModuleBase_WidgetOptionalBox(QWidget* theParent,
   myGroupBox(0),
   myGroupBoxLayout(0),
   myCheckGroup(0),
-  myCheckGroupLayout(0),
-  myCheckContent(0),
   myCheckGroupBtn(0),
+  myCheckContent(0),
+  myCheckGroupLayout(0),
   myEnableOnCheck(true)
 {
   myToolTip = theData->widgetTooltip();
@@ -55,6 +54,7 @@ ModuleBase_WidgetOptionalBox::ModuleBase_WidgetOptionalBox(QWidget* theParent,
 
   myHaveFrame = theData->getBooleanAttribute("has_frame", true);
   myEnableOnCheck = theData->getBooleanAttribute("enable_on_check", true);
+  myAlwaysShowTitle = theData->getBooleanAttribute("show_title", false);
 
   bool isChecked = theData->getBooleanAttribute(ATTR_DEFAULT, false);
   setDefaultValue(isChecked ? "true" : "false");
@@ -93,8 +93,9 @@ void ModuleBase_WidgetOptionalBox::onPageClicked()
   storeValue();
   updateControlsVisibility();
 
-  if (!isEditingMode())
-    emit focusOutWidget(this);
+  // The widget doesn't accept a focus
+  //if (!isEditingMode())
+  //  emit focusOutWidget(this);
 }
 
 void ModuleBase_WidgetOptionalBox::addPageStretch()
@@ -202,7 +203,10 @@ void ModuleBase_WidgetOptionalBox::createControl(const OptionType& theType)
 
     myCheckBoxLayout = new QHBoxLayout(myCheckBoxFrame);
     ModuleBase_Tools::adjustMargins(myCheckBoxLayout);
-    myCheckBox = new QCheckBox(myCheckBoxFrame);
+    if (myAlwaysShowTitle)
+      myCheckBox = new QCheckBox(translate(myGroupTitle), myCheckBoxFrame);
+    else
+      myCheckBox = new QCheckBox(myCheckBoxFrame);
     myCheckBox->setChecked(getDefaultValue() == "true");
     myCheckBoxLayout->addWidget(myCheckBox);