X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FmonChoixCommande.py;h=09a0913f955481628f6db3efeffd633e39e308ef;hb=0dd3754f2c6ebee6f61a7aa505ed8711dd9ba79e;hp=ce11c7d57526a66de699e172ba6472557668a122;hpb=1b91010fc2c0a681db9177d6fa0e4e0af866ec31;p=tools%2Feficas.git

diff --git a/InterfaceQT4/monChoixCommande.py b/InterfaceQT4/monChoixCommande.py
index ce11c7d5..09a0913f 100644
--- a/InterfaceQT4/monChoixCommande.py
+++ b/InterfaceQT4/monChoixCommande.py
@@ -194,8 +194,9 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
            self.dicoCmd[tr(cmd)]=cmd
            rbcmd=(QRadioButton(tr(cmd)))
            self.buttonGroup.addButton(rbcmd)
-           rbcmd.mouseDoubleClickEvent=self.insereNoeudApresClick
            self.commandesLayout.addWidget(rbcmd)
+           if self.editor.simpleClic :  rbcmd.mouseReleaseEvent=self.insereNoeudApresClick
+           else : rbcmd.mouseDoubleClickEvent=self.insereNoeudApresClick
            self.buttonGroup.buttonClicked.connect(self.rbClique) 
       elif  self.affiche_groupe==1 :
          listeGroupes,dictGroupes=self.jdc.get_groups()
@@ -217,7 +218,8 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
               rbcmd=(QRadioButton(tr(cmd)))
               self.buttonGroup.addButton(rbcmd)
               self.commandesLayout.addWidget(rbcmd)
-              rbcmd.mouseDoubleClickEvent=self.insereNoeudApresClick
+              if self.editor.simpleClic :  rbcmd.mouseReleaseEvent=self.insereNoeudApresClick
+              else : rbcmd.mouseDoubleClickEvent=self.insereNoeudApresClick
               self.buttonGroup.buttonClicked.connect(self.rbClique) 
            label2=QLabel(self)
            label2.setText(" ")
@@ -236,7 +238,8 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
            rbcmd=(QRadioButton(tr(cmd)))
            self.buttonGroup.addButton(rbcmd)
            self.commandesLayout.addWidget(rbcmd)
-           rbcmd.mouseDoubleClickEvent=self.insereNoeudApresClick
+           if self.editor.simpleClic :  rbcmd.mouseReleaseEvent=self.insereNoeudApresClick
+           else : rbcmd.mouseDoubleClickEvent=self.insereNoeudApresClick
            self.buttonGroup.buttonClicked.connect(self.rbClique) 
 
      
@@ -272,16 +275,18 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
            rbcmd=QPushButton(tr(cmd))
            rbcmd.setGeometry(QRect(40, 20, 211, 71))
            rbcmd.setMaximumSize(QSize(250, 81))
-           rbcmd.setStyleSheet("background-color : rgb(168, 227, 142);\n"
+           rbcmd.setStyleSheet("background-color : rgb(66, 165, 238);\n"
 "/*border-style : outset;*/\n"
 "border-radius : 20px;\n"
 "border-width : 30 px;\n"
 "border-color : beige;\n"
-"text-align : left")
-           icon = QIcon()
-           icon.addPixmap(QPixmap("../monCode/images/essaiAster.png"), QIcon.Normal, QIcon.Off)
-           rbcmd.setIcon(icon)
-           rbcmd.setIconSize(QSize(48, 48))
+"text-align : center")
+           if cmd in self.editor.dicoImages :
+              fichier=self.editor.dicoImages[cmd]
+              icon = QIcon()
+              icon.addPixmap(QPixmap(fichier), QIcon.Normal, QIcon.Off)
+              rbcmd.setIcon(icon)
+              rbcmd.setIconSize(QSize(48, 48))
 
            self.buttonGroup.addButton(rbcmd)
            self.maGrilleBouton.addWidget(rbcmd,ligne,col)
@@ -295,7 +300,6 @@ class MonChoixCommande(Ui_ChoixCommandes,QWidget):
       self.insereNoeudApresClick(None)
 
   def rbClique(self,id):
-      #print ('ds rbClique')
       self.name=self.dicoCmd[str(id.text())]
       definitionEtape=getattr(self.jdc.cata[0],self.name)
       commentaire=getattr(definitionEtape,self.jdc.lang)