Proper highlight of active "shape selector" widget

diff --git a/src/ModuleBase/ModuleBase_WidgetChoice.cpp b/src/ModuleBase/ModuleBase_WidgetChoice.cpp
index 3a3ed74593529adbb266e78327d359a3717ec81d..65c6c189077c27f97a42a1eeafac4bbfb49cddc3 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetChoice.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetChoice.cpp
@@ -74,7 +74,6 @@ bool ModuleBase_WidgetChoice::focusTo()
 QList<QWidget*> ModuleBase_WidgetChoice::getControls() const
 {
   QList<QWidget*> aControls;
-  aControls.append(myLabel);
   aControls.append(myCombo);
   return aControls;
 }

diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index 922ab91519dde70b29a459e79aa762472c752bff..7400d7f7d48db95bc329456d6a75aa6c7a567282 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@ -122,7 +122,6 @@ bool ModuleBase_WidgetDoubleValue::restoreValue()
 QList<QWidget*> ModuleBase_WidgetDoubleValue::getControls() const
 {
   QList<QWidget*> aList;
-  aList.append(myLabel);
   aList.append(mySpinBox);
   return aList;
 }

diff --git a/src/ModuleBase/ModuleBase_WidgetFeature.cpp b/src/ModuleBase/ModuleBase_WidgetFeature.cpp
index faf664fe53e9d48180ac7323988e5be4e256808f..0b84e8444cedee1262f775e5a73fb10f68487c5d 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFeature.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFeature.cpp
@@ -155,7 +155,6 @@ QWidget* ModuleBase_WidgetFeature::getControl() const
 QList<QWidget*> ModuleBase_WidgetFeature::getControls() const
 {
   QList<QWidget*> aList;
-  aList.append(myLabel);
   aList.append(myEditor);
   return aList;
 }

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 86f7a3471d935804915ccdb23045586cee2abd45..76c2da2062fa2955e807410e1198d5dd5470c3c8 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -101,11 +101,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen
   myTextLine->setToolTip(aToolTip);
   myTextLine->installEventFilter(this);
 
-  myBasePalet = myTextLine->palette();
-  myInactivePalet = myBasePalet;
-  myInactivePalet.setBrush(QPalette::Base, QBrush(Qt::gray, Qt::Dense6Pattern));
-  myTextLine->setPalette(myInactivePalet);
-
   aLayout->addWidget(myTextLine, 1);
 
   std::string aTypes = theData->getProperty("shape_types");
@@ -180,7 +175,6 @@ bool ModuleBase_WidgetShapeSelector::restoreValue()
 QList<QWidget*> ModuleBase_WidgetShapeSelector::getControls() const
 {
   QList<QWidget*> aControls;
-  aControls.append(myLabel);
   aControls.append(myTextLine);
   return aControls;
 }
@@ -333,17 +327,8 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName()
     myTextLine->setText(QString::fromStdString(aName));
   } else {
     if (myIsActive) {
-      QString aMsg = tr("Select a ");
-      int i = 0;
-      foreach (QString aType, myShapeTypes) {
-        if (i > 0)
-          aMsg += " or ";
-        aMsg += aType;
-        i++;
-      }
-      myTextLine->setText(aMsg);
-    } else
-      myTextLine->setText(tr("No object selected"));
+      myTextLine->setText("");
+    }
   }
 }
 
@@ -352,10 +337,6 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName()
 void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate)
 {
   myIsActive = toActivate;
-  if (myIsActive)
-    myTextLine->setPalette(myBasePalet);
-  else
-    myTextLine->setPalette(myInactivePalet);
   updateSelectionName();
 
   if (myIsActive) {
@@ -405,7 +386,7 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const
 bool ModuleBase_WidgetShapeSelector::focusTo()
 {
   activateSelection(true);
-  return true;
+  return ModuleBase_ModelWidget::focusTo();
 }
 
 //********************************************************************

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index eee5389a1dd11fbb115130362d07b5a7d1f2bc97..ad3d3b857931ff08b2f62fdc6c82137295c7473f 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@ -15,7 +15,6 @@
 #include <TopAbs_ShapeEnum.hxx>
 
 #include <QStringList>
-#include <QPalette>
 
 class Config_WidgetAPI;
 class QWidget;
@@ -111,9 +110,6 @@ Q_OBJECT
   /// If true then local selector has to be activated in context
   bool myUseSubShapes;
 
-  QPalette myBasePalet;
-  QPalette myInactivePalet;
-
   bool myIsActive;
 
   Handle(ModuleBase_ObjectTypesFilter) myObjTypeFilter;

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index 6c0c3aaae02b42b93cf5a1650f204d0e04a4cf74..b6f18fb7f365b654ec02be44ad573d818f7f9d93 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -27,9 +27,7 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
 
 QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
 {
-  QList<QWidget*> aLst;
-  aLst << myLabel;
-  return aLst;
+  return QList<QWidget*>();
 }
 
 QWidget* PartSet_WidgetSketchLabel::getControl() const

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.h b/src/PartSet/PartSet_WidgetSketchLabel.h
index 442f319074c52a5a8f34982b4a0a888897936bfb..5ad06d65d615ccac1f197b7cba1ded407f22b026 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.h
+++ b/src/PartSet/PartSet_WidgetSketchLabel.h
@@ -23,7 +23,6 @@ Q_OBJECT
   virtual ~PartSet_WidgetSketchLabel()
   {
   }
-  ;
 
   /// Saves the internal parameters to the given feature
   /// \param theFeature a model feature to be changed