X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetChoice.h;h=742a4cea08e33dbe0f70eca151984339f704ffe5;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=e8db6c289487d6942d47c8688fadc26c282b7e34;hpb=868158fe6d39b25e60ac528295b1c908821e4af5;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetChoice.h b/src/ModuleBase/ModuleBase_WidgetChoice.h
index e8db6c289..742a4cea0 100644
--- a/src/ModuleBase/ModuleBase_WidgetChoice.h
+++ b/src/ModuleBase/ModuleBase_WidgetChoice.h
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModuleBase_WidgetChoice.h
-// Created:     03 Sept 2014
-// Author:      Vitaly Smetannikov
+// Copyright (C) 2014-2023  CEA, EDF
+//
+// 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, 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
+// 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
+//
 
 #ifndef ModuleBase_WidgetChoice_H
 #define ModuleBase_WidgetChoice_H
@@ -11,9 +24,7 @@
 #include "ModuleBase_ModelWidget.h"
 
 class QWidget;
-class QLabel;
-class QComboBox;
-class QButtonGroup;
+class ModuleBase_ChoiceCtrl;
 
 /**
 * \ingroup GUI
@@ -23,7 +34,7 @@ class QButtonGroup;
 *   <choice id="bool_type" 
 *     label="Type" 
 *     tooltip="Type of boolean operation"
-*     string_list="Cut Fuse Common"
+*     string_list="Cut Fuse Common Smash"
 *   />
 * \endcode
 * Aditionally can be used: 
@@ -40,15 +51,13 @@ Q_OBJECT
   /// Constructor
   /// \param theParent the parent object
   /// \param theData the widget configuation. The attribute of the model widget is obtained from
-  /// \param theParentId is Id of a parent of the current attribute
-  ModuleBase_WidgetChoice(QWidget* theParent, const Config_WidgetAPI* theData, 
-                          const std::string& theParentId);
+  ModuleBase_WidgetChoice(QWidget* theParent, const Config_WidgetAPI* theData);
 
   virtual ~ModuleBase_WidgetChoice();
 
   /// Defines if it is supported to set the value in this widget
   /// It returns false because this is an info widget
-  virtual bool canSetValue() const { return false; };
+  virtual bool canAcceptFocus() const { return false; };
 
   virtual bool focusTo();
 
@@ -56,13 +65,24 @@ Q_OBJECT
   /// \return a controls list
   virtual QList<QWidget*> getControls() const;
 
+  /// Returns text value for the property panel title
+  /// \param theIndex a button index
+  /// \return the title value
+  QString getPropertyPanelTitle(int theIndex);
+
+  /// The slot is called when user press Ok or OkPlus buttons in the parent property panel
+  virtual void onFeatureAccepted();
+
 signals:
-  void itemSelected(int);
+  /// Segnal about selected item
+  /// \param theWidget selected widget
+  /// \param theIndex selected index
+  void itemSelected(ModuleBase_ModelWidget* theWidget, int theIndex);
 
 protected:
   /// Saves the internal parameters to the given feature
   /// \return True in success
-  virtual bool storeValueCustom() const;
+  virtual bool storeValueCustom();
 
   virtual bool restoreValueCustom();
 
@@ -71,12 +91,15 @@ private slots:
   void onCurrentIndexChanged(int theIndex);
 
 private:
-  /// The label
-  QLabel* myLabel;
+  ModuleBase_ChoiceCtrl* myChoiceCtrl;
+
+  // XML definition of titles
+  QStringList myButtonTitles;
+  std::string myStringListAttribute;
 
-  /// The control
-  QComboBox* myCombo;
-  QButtonGroup* myButtons;
+  bool myIsFirst;
+  int myDefValue;
+  bool myHasValue;
 };
 
 #endif