Merge branch 'Dev_GroupsRevision'

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetMultiSelector.h

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.h b/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
index f4a155981fc69e822da0d61539aa1b1a0d79eebf..be8bfee91b49e97f17b64547ae34905ea152ba91 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
@@ -37,9 +37,10 @@
 #include <QMap>
 
 class QWidget;
-class QComboBox;
+//class QComboBox;
 class ModuleBase_ListView;
 class ModuleBase_IWorkshop;
+class ModuleBase_ChoiceCtrl;
 
 /**
 * \ingroup GUI
@@ -219,8 +220,13 @@ protected:
 
 protected:
   ModuleBase_ListView* myListView; ///< List control
-  QComboBox* myTypeCombo; ///< Combobox of types
-  bool myIsUseChoice; /// A flag to store use_choice parameter state
+
+  bool myIsUseChoice; ///< A flag to store use_choice parameter state
+
+  QStringList myShapeTypes; ///< List of Shape types defined in XML
+
+  /// Control for types
+  ModuleBase_ChoiceCtrl* myTypeCtrl;
 
   /// A flag to clear selection by click in empty place in the viewer
   bool myIsNeutralPointClear;
@@ -230,6 +236,7 @@ protected:
 
   /// A container of selected objects
   QList<QList<std::shared_ptr<ModuleBase_ViewerPrs> > > mySelectedHistoryValues;
+
   /// Position in a container of selected values
   int myCurrentHistoryIndex;
 };