X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ColorDialog.cpp;h=184b56c68fc86c4cc9957a8f86598f7f90dd6187;hb=4de8d53fef7532b6843d79c970f55ad46f98da62;hp=9170958f29b3589b392edbf0ab1b13054a0218b3;hpb=1b93f1881c5fec599aa79707f93c84dd9c287bc0;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ColorDialog.cpp b/src/XGUI/XGUI_ColorDialog.cpp
index 9170958f2..184b56c68 100644
--- a/src/XGUI/XGUI_ColorDialog.cpp
+++ b/src/XGUI/XGUI_ColorDialog.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        XGUI_ColorDialog.cpp
-// Created:     27 Apr 2015
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2024  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
+//
 
 #include <XGUI_ColorDialog.h>
 
@@ -15,15 +28,56 @@
 #include <QGridLayout>
 #include <QRadioButton>
 #include <QDialogButtonBox>
+#include <QMouseEvent>
+#include <QApplication>
+
+namespace
+{
+  class RadioButton: public QRadioButton
+  {
+    QWidget* myBuddy;
+  public:
+    RadioButton(const QString& text, QWidget* buddy = nullptr, QWidget* parent = nullptr):
+      QRadioButton(text, parent), myBuddy(buddy)
+    {
+      if (buddy != nullptr)
+      {
+        buddy->setEnabled(isEnabled());
+        buddy->installEventFilter(this);
+      }
+    }
+    RadioButton(QWidget* buddy = nullptr, QWidget* parent = nullptr):
+      RadioButton(QString(), buddy, parent) {}
+
+    bool eventFilter(QObject* sender, QEvent* event)
+    {
+      if (myBuddy != nullptr && sender == myBuddy && event->type() == QEvent::MouseButtonPress)
+        setChecked(true);
+      return QRadioButton::eventFilter(sender, event);
+    }
+
+    void changeEvent(QEvent* event)
+    {
+      if (myBuddy != nullptr && event->type() == QEvent::EnabledChange)
+        myBuddy->setEnabled(isEnabled());
+      QRadioButton::changeEvent(event);
+    }
+  };
+}
 
 XGUI_ColorDialog::XGUI_ColorDialog(QWidget* theParent)
-  : QDialog(theParent)
+  : QDialog(theParent, Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint)
 {
-  setWindowTitle("Color");
+  setWindowTitle(tr("Color"));
   QGridLayout* aLay = new QGridLayout(this);
 
-  QRadioButton* aRandomChoiceBtn = new QRadioButton(this);
-  QRadioButton* aColorChoiceBtn = new QRadioButton(this);
+  myColorButton = new QtxColorButton(this);
+  myColorButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+  QLabel* aRandomLabel = new QLabel(tr("Random"), this);
+
+  QRadioButton* aColorChoiceBtn = new RadioButton(myColorButton, this);
+  QRadioButton* aRandomChoiceBtn = new RadioButton(aRandomLabel, this);
   aColorChoiceBtn->setChecked(true);
   myButtonGroup = new QButtonGroup(this);
   myButtonGroup->setExclusive(true);
@@ -31,13 +85,8 @@ XGUI_ColorDialog::XGUI_ColorDialog(QWidget* theParent)
   myButtonGroup->addButton(aRandomChoiceBtn, 1);
 
   aLay->addWidget(aColorChoiceBtn, 0, 0);
-  aLay->addWidget(aRandomChoiceBtn, 1, 0);
-
-  myColorButton = new QtxColorButton(this);
-  myColorButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
   aLay->addWidget(myColorButton, 0, 1);
-
-  QLabel* aRandomLabel = new QLabel("Random", this);
+  aLay->addWidget(aRandomChoiceBtn, 1, 0);
   aLay->addWidget(aRandomLabel, 1, 1);
 
   QDialogButtonBox* aButtons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
@@ -49,8 +98,6 @@ XGUI_ColorDialog::XGUI_ColorDialog(QWidget* theParent)
 
 bool XGUI_ColorDialog::isRandomColor() const
 {
-  int anId = myButtonGroup->checkedId();
-
   return myButtonGroup->checkedId() == 1;
 }
 
@@ -82,3 +129,4 @@ std::vector<int> XGUI_ColorDialog::getRandomColor() const
   }
   return aValues;
 }
+