Fixing of IPAL19491 (Qt4 porting. Merge Nodes (Elements). Edit selected group. Bad...

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_GroupDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 0732535eeadde92d0fe9c7d93b4b18a07f213eb0..536fe9ff668d7ea31354b57c638c13681222e39e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -379,6 +379,8 @@ void SMESHGUI_GroupDlg::initDialog(bool create)
   connect(myGroupBtn,      SIGNAL(clicked()), this, SLOT(setCurrentSelection()));
   connect(myGeomGroupBtn,  SIGNAL(toggled(bool)), this, SLOT(onGeomSelectionButton(bool)));
 
+  connect(myColorBtn, SIGNAL(changed( QColor )), this, SLOT(onColorChanged( QColor )));
+
   connect(myOKBtn,    SIGNAL(clicked()), this, SLOT(onOK()));
   connect(myApplyBtn, SIGNAL(clicked()), this, SLOT(onApply()));
   connect(myCloseBtn, SIGNAL(clicked()), this, SLOT(onClose()));
@@ -633,6 +635,15 @@ void SMESHGUI_GroupDlg::onGrpTypeChanged (int id)
   myGrpTypeId = id;
 }
 
+//=================================================================================
+// function : onColorChanged()
+// purpose  : Color button management
+//=================================================================================
+void SMESHGUI_GroupDlg::onColorChanged(QColor theColor)
+{
+  updateButtons();
+}
+
 //=================================================================================
 // function : setSelectionMode()
 // purpose  : Radio button management
@@ -932,7 +943,7 @@ void SMESHGUI_GroupDlg::onListSelectionChanged()
 void SMESHGUI_GroupDlg::onObjectSelectionChanged()
 {
   if ( myIsBusy || !isEnabled()) return;
-  if (myCurrentLineEdit == myGeomGroupLine && !myGeomGroupBtn->isDown()) return;
+  if (myCurrentLineEdit == myGeomGroupLine && !myGeomGroupBtn->isChecked()) return;
 
   myIsBusy = true;
 
@@ -958,8 +969,8 @@ void SMESHGUI_GroupDlg::onObjectSelectionChanged()
       myGeomObjects = new GEOM::ListOfGO();
       myGeomObjects->length(0);
 
-      if (myGeomGroupBtn->isDown())
-       myGeomGroupBtn->setDown(false);
+      if (myGeomGroupBtn->isChecked())
+       myGeomGroupBtn->setChecked(false);
       if (!myCreate)
         myName->setText("");
 
@@ -1246,7 +1257,7 @@ void SMESHGUI_GroupDlg::onSelectGeomGroup(bool on)
     setSelectionMode(8);
   }
   else {
-    myGeomGroupBtn->setDown(false);
+    myGeomGroupBtn->setChecked(false);
     myGeomObjects->length(0);
     myGeomGroupLine->setText("");
     myCurrentLineEdit = 0;