*** empty log message ***

diff --git a/InterfaceQT/browser.py b/InterfaceQT/browser.py
index e149adc59415c735fef7ed691f25d7d89cf50bfb..2b11541e5f8e83e652439709233dbc63bfdd37a5 100644 (file)
--- a/InterfaceQT/browser.py
+++ b/InterfaceQT/browser.py
@@ -22,7 +22,7 @@ class JDCTree( QListView ):
         self.addColumn(self.trUtf8('Commande'))
         self.addColumn(self.trUtf8('Concept/Valeur'))
                 
-        self.setMinimumSize(QSize(400,500))
+        #self.setMinimumSize(QSize(400,500))
         self.connect(self,SIGNAL('contextMenuRequested(QListViewItem *, const QPoint &, int)'),
                      self.handleContextMenu)
 

diff --git a/InterfaceQT/editor.py b/InterfaceQT/editor.py
index f5c8762bb2f2c87fd6a65374b7bbe53b673a6018..b2391368c5aaf2aa932e63f83354ac022a24217c 100644 (file)
--- a/InterfaceQT/editor.py
+++ b/InterfaceQT/editor.py
@@ -18,7 +18,7 @@ import readercata
 import prefs
 import qtCommun
 
-VERSION_EFICAS  = "EFICAS v1.14"
+VERSION_EFICAS  = "EFICAS v1.15"
 
 
 # -------------------------- #
@@ -656,12 +656,13 @@ class JDCEditor(QSplitter):
                     ex =  ".comm"
                     fn.append(ex)
                 if QFileInfo(fn).exists():
-                    abort = QMessageBox.warning(self,
+                    abort = QMessageBox.warning(
+                       self,
                         self.trUtf8("Save File"),
-                        self.trUtf8("The file <b>%1</b> already exists.")
-                            .arg(fn),
+                        self.trUtf8("The file <b>%1</b> already exists.").arg(fn),
                         self.trUtf8("&Overwrite"),
-                        self.trUtf8("&Abort"), None, 1)
+                        self.trUtf8("&Abort") )
+                    print abort
                     if abort:
                         return (0, None)
                 fn = unicode(QDir.convertSeparators(fn))

diff --git a/InterfaceQT/monPlusieursBasePanel.py b/InterfaceQT/monPlusieursBasePanel.py
index 98a522559efc6398b08a99b11f1804478be1e41e..50eeb339bf61781edaaa4008479f51aa2b9d7c77 100644 (file)
--- a/InterfaceQT/monPlusieursBasePanel.py
+++ b/InterfaceQT/monPlusieursBasePanel.py
@@ -51,7 +51,6 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
   def detruitBouton(self):
         mc = self.node.item.get_definition()
         type = mc.type[0]
-        print self.editor.salome
         if not(('grma' in repr(type)) or ('grno' in repr(type))) or not(self.editor.salome) :
            self.BSalome.close()
            self.BView2D.close()
@@ -113,6 +112,7 @@ class MonPlusieursBasePanel(DPlusBase,QTPanel,SaisieValeur):
                self.LBValeurs.setCurrentItem(index)
                index=index+1
            self.listeValeursCourantes=l1+listeRetour+l3
+        self.editor.modified=1
 
   def BImportPressed(self):
         init=QString( self.editor.CONFIGURATION.savedir)

diff --git a/InterfaceQT/monSelectVal.py b/InterfaceQT/monSelectVal.py
index 9c5c2f5014e50a1dc7e442151620dfc9827609c7..c3c641488b368b0e61f53cb67816c378a1eb8754 100644 (file)
--- a/InterfaceQT/monSelectVal.py
+++ b/InterfaceQT/monSelectVal.py
@@ -58,7 +58,6 @@ class MonSelectVal(DSelVal):
   def SeparateurSelect(self,numero):
         monBouton=self.BGSeparateur.find(numero)
         self.separateur=self.dictSepar[str(monBouton.text())]
-        print self.separateur
         
   def BImportSelPressed(self):
         text=str(self.TBtext.selectedText())
@@ -71,12 +70,9 @@ class MonSelectVal(DSelVal):
 
   def Traitement(self):
         import string
-        print "kkkkkkkkkkkkkkkkkkkkk"
         if self.textTraite[-1]=="\n" : self.textTraite=self.textTraite[0:-1]
         self.textTraite=string.replace(self.textTraite,"\n",self.separateur)
         liste1=self.textTraite.split(self.separateur)
-        print self.separateur
-        print liste1
         liste=[]
         for val in liste1 :
             val=str(val)

diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py
index c698dd28beb51a753d78877384ec5a98708bb4ab..3c50cd748834524cc16732d96370061d7eb81781 100644 (file)
--- a/InterfaceQT/qtEficas.py
+++ b/InterfaceQT/qtEficas.py
@@ -132,7 +132,7 @@ class Appli(Eficas):
         titre = "version "
         monVisu=DVisu(parent=self.viewmanager,fl=Qt.WType_Dialog)
         monVisu.setCaption(titre)
-        monVisu.TB.setText("Eficas V1.14")
+        monVisu.TB.setText("Eficas V1.15")
         monVisu.adjustSize()
         monVisu.show()
 

diff --git a/InterfaceQT/qtSaisie.py b/InterfaceQT/qtSaisie.py
index 7c3c86e6b5bca775f2758e9b3c048cf291e34114..03fee3ee4cde18202193f158bf4665b744e6d022 100644 (file)
--- a/InterfaceQT/qtSaisie.py
+++ b/InterfaceQT/qtSaisie.py
@@ -116,7 +116,7 @@ class SaisieValeur:
            valeurBrute=str(self.LEValeur.text())
         else :
            valeurBrute=valeurTraitee
-        if valeurBrute == str("") : return 1, listeValeurs
+        if valeurBrute == str("") : return  listeValeurs,1
         try :
            valeur=eval(valeurBrute,{})        
         except :

diff --git a/UiQT4/OptionsEditeur.py b/UiQT4/OptionsEditeur.py
index 6435e88bf48e68c7415efcbe6886ddea96ec15a6..efd47e7feef4e1484ca7fa4b9869ccd5d7ec6bc6 100644 (file)
--- a/UiQT4/OptionsEditeur.py
+++ b/UiQT4/OptionsEditeur.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'OptionsEditeur.ui'
 #
-# Created: Wed Jul  9 10:12:47 2008
+# Created: Tue Nov 18 17:37:26 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/OptionsPdf.py b/UiQT4/OptionsPdf.py
index d20115f7a75dba649577f987818ea98b06b54e90..6b8ac238241ffdd3a1654269f577f6701032e4cc 100644 (file)
--- a/UiQT4/OptionsPdf.py
+++ b/UiQT4/OptionsPdf.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'OptionsPdf.ui'
 #
-# Created: Wed Jul  9 10:12:47 2008
+# Created: Tue Nov 18 17:37:26 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/aideQT.py b/UiQT4/aideQT.py
index d736e7ce03bb457034567f10509133b0f1024c18..42b7e751db31c41a35303cefa94caa7895b0f539 100644 (file)
--- a/UiQT4/aideQT.py
+++ b/UiQT4/aideQT.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'aideQT.ui'
 #
-# Created: Wed Jul  9 10:12:47 2008
+# Created: Tue Nov 18 17:37:26 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desChoixCata.py b/UiQT4/desChoixCata.py
index d35f39ff16f4826de07033e4ed35707a7e3db7ae..7da381db928c21bb4f8a33851b6723f623a555ce 100644 (file)
--- a/UiQT4/desChoixCata.py
+++ b/UiQT4/desChoixCata.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desChoixCata.ui'
 #
-# Created: Wed Jul 16 16:27:33 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desCommande.py b/UiQT4/desCommande.py
index 03e404f2dac9377116205c76a1fe5a2db711c84f..749cd0378b5dd970f3e2eb3f6e302221fcfb1dfd 100644 (file)
--- a/UiQT4/desCommande.py
+++ b/UiQT4/desCommande.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desCommande.ui'
 #
-# Created: Tue Sep 23 10:19:58 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desCommentaire.py b/UiQT4/desCommentaire.py
index d4b7a5e4005adc60b636444473be5f38e30c9e3b..c89681d22fa36b0f8ac727ede172ac9c5538789c 100644 (file)
--- a/UiQT4/desCommentaire.py
+++ b/UiQT4/desCommentaire.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desCommentaire.ui'
 #
-# Created: Wed Jul 23 12:00:45 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desError.py b/UiQT4/desError.py
index 31da9ec1418ac6d106172a96ff283d0927dfc163..39e994fac77b87e82d4797ca1079bc1cd3681b18 100644 (file)
--- a/UiQT4/desError.py
+++ b/UiQT4/desError.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desError.ui'
 #
-# Created: Wed Jul  9 10:11:20 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desFormule.py b/UiQT4/desFormule.py
index 2ac2323d2563104608054e37a702bad872a2093f..95d721ae84f9c9642a443c0b50c3de7fbb6187da 100644 (file)
--- a/UiQT4/desFormule.py
+++ b/UiQT4/desFormule.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desFormule.ui'
 #
-# Created: Wed Jul 23 11:43:53 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desInactif.py b/UiQT4/desInactif.py
index 7a8ce1df83ef504611d81708484ddd0e846b8608..33790c95936437e20b113bc4df2bc5d7f70eeb45 100644 (file)
--- a/UiQT4/desInactif.py
+++ b/UiQT4/desInactif.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desInactif.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desInclude.py b/UiQT4/desInclude.py
index 73a967c7819fdd12ee333365cda149a7ac4a1555..c78611d645a84d63602a48d2249f36b0bbd6803d 100644 (file)
--- a/UiQT4/desInclude.py
+++ b/UiQT4/desInclude.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desInclude.ui'
 #
-# Created: Tue Oct  7 16:59:34 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desListeParam.py b/UiQT4/desListeParam.py
index ade7e63ba3135d0af15c3616d4c8d8130ba41722..43c5d350830cb6d915a787e96bc6dbd0532015ad 100644 (file)
--- a/UiQT4/desListeParam.py
+++ b/UiQT4/desListeParam.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desListeParam.ui'
 #
-# Created: Fri Jul 18 16:24:34 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desMCFact.py b/UiQT4/desMCFact.py
index ede8054900aa6180ce80f88872d02ee0e548e360..ac6b782e4d3d9b1465d0fbc59e94845679efb2a5 100644 (file)
--- a/UiQT4/desMCFact.py
+++ b/UiQT4/desMCFact.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desMCFact.ui'
 #
-# Created: Fri Jul 18 16:24:34 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desMCListAjout.py b/UiQT4/desMCListAjout.py
index f01c732545cfbe9ee79306a0ab52248092bea8cb..69cbc51aa70938df6df1e3dfbcf57b7e28fa89a8 100644 (file)
--- a/UiQT4/desMCListAjout.py
+++ b/UiQT4/desMCListAjout.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desMCListAjout.ui'
 #
-# Created: Wed Jul  9 10:11:21 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desParam.py b/UiQT4/desParam.py
index cee894d99243d0b5c47562a455411fe1a2710597..c9b3bf3b0b871b8cb4d6fd060320dccba8b2178f 100644 (file)
--- a/UiQT4/desParam.py
+++ b/UiQT4/desParam.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desParam.ui'
 #
-# Created: Wed Sep 10 11:20:17 2008
+# Created: Tue Nov 18 17:37:24 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desPlusieursBase.py b/UiQT4/desPlusieursBase.py
index 54c612b3ffa773027a61768189622fa8057f19d8..a75ca407ce576e4f6fa6c9182a0f4cf0490d93c4 100644 (file)
--- a/UiQT4/desPlusieursBase.py
+++ b/UiQT4/desPlusieursBase.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursBase.ui'
 #
-# Created: Fri Jul 18 16:24:35 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desPlusieursInto.py b/UiQT4/desPlusieursInto.py
index 0af9546faa998aeb74d73f9fed275e9cfa9aa490..5165f98eb78e8e6cbe32eaedee775eae5e959291 100644 (file)
--- a/UiQT4/desPlusieursInto.py
+++ b/UiQT4/desPlusieursInto.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPlusieursInto.ui'
 #
-# Created: Fri Sep 26 11:16:49 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desPoursuite.py b/UiQT4/desPoursuite.py
index 3b36f1c5bebb82c9bc4cd18726b661330db64e77..d02e1fc30cd71d59b9d1f851b9134e881a693cd0 100644 (file)
--- a/UiQT4/desPoursuite.py
+++ b/UiQT4/desPoursuite.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desPoursuite.ui'
 #
-# Created: Fri Oct 10 11:42:29 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desRacine.py b/UiQT4/desRacine.py
index 19def6bc50fd68f1d394cf42279e46b8d517d389..297b9adf9166112aa6d08d21891640f797a8d3e4 100644 (file)
--- a/UiQT4/desRacine.py
+++ b/UiQT4/desRacine.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desRacine.ui'
 #
-# Created: Tue Sep 23 10:19:58 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desSelectVal.py b/UiQT4/desSelectVal.py
index 914a3fa2dc198ad3ff26b2b605c6cae2b44ce7c5..c42291946750ab6a39666611e129c98f535c44d8 100644 (file)
--- a/UiQT4/desSelectVal.py
+++ b/UiQT4/desSelectVal.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desSelectVal.ui'
 #
-# Created: Fri Sep 26 17:59:06 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desUniqueASSD.py b/UiQT4/desUniqueASSD.py
index 39863fbc0ad523b63e58b6b16864bc614bc930da..11130db36a443f312b1c559e5c6c0b44e02b8ad3 100644 (file)
--- a/UiQT4/desUniqueASSD.py
+++ b/UiQT4/desUniqueASSD.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueASSD.ui'
 #
-# Created: Fri Jul 18 16:24:35 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desUniqueBase.py b/UiQT4/desUniqueBase.py
index 265207970a1909d7629edae36e25289c2ade6ffe..6d2c6b3301472f297f6f1cc6a17ef30c872c3731 100644 (file)
--- a/UiQT4/desUniqueBase.py
+++ b/UiQT4/desUniqueBase.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueBase.ui'
 #
-# Created: Thu Jul 24 10:46:31 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desUniqueComp.py b/UiQT4/desUniqueComp.py
index 1edb0042ae8120e193a5308d18c098e0bcf603dc..77b18a589093231dfcc4cf26696cb9c5539aed33 100644 (file)
--- a/UiQT4/desUniqueComp.py
+++ b/UiQT4/desUniqueComp.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueComp.ui'
 #
-# Created: Wed Jul  9 10:31:14 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desUniqueInto.py b/UiQT4/desUniqueInto.py
index 5d9270f5095abca3fca8533ad3903080bac44873..9c2785c7865002e9a15ffcdaf60d0cb7e9359892 100644 (file)
--- a/UiQT4/desUniqueInto.py
+++ b/UiQT4/desUniqueInto.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueInto.ui'
 #
-# Created: Fri Jul 18 16:24:35 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desUniqueSDCO.py b/UiQT4/desUniqueSDCO.py
index e1381af36709ba5d58c342dd811c2c7810835060..a65143e445b9bfeed3d3197748696656b86e011c 100644 (file)
--- a/UiQT4/desUniqueSDCO.py
+++ b/UiQT4/desUniqueSDCO.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCO.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Tue Nov 18 17:37:26 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desUniqueSDCOInto.py b/UiQT4/desUniqueSDCOInto.py
index 718c787b884f7ee135b3c29daf326987cec8d0e3..65367aaab80c1f2803d86fec992e4c3694562ba4 100644 (file)
--- a/UiQT4/desUniqueSDCOInto.py
+++ b/UiQT4/desUniqueSDCOInto.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desUniqueSDCOInto.ui'
 #
-# Created: Fri Jul 18 16:24:35 2008
+# Created: Tue Nov 18 17:37:25 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desViewTexte.py b/UiQT4/desViewTexte.py
index dac56f763cd1de68895b6185ea1c7a79486b8362..43e63fd3e5b9957f0616fce5504395c0c4b4cbc1 100644 (file)
--- a/UiQT4/desViewTexte.py
+++ b/UiQT4/desViewTexte.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desViewTexte.ui'
 #
-# Created: Tue Sep  9 18:09:46 2008
+# Created: Tue Nov 18 17:37:26 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/desVisu.py b/UiQT4/desVisu.py
index 8a0e28953bd8abbc3861b317e25cbff09ccbdd13..687d2f4213379c865dcb61930ceff0a85090cfe6 100644 (file)
--- a/UiQT4/desVisu.py
+++ b/UiQT4/desVisu.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'desVisu.ui'
 #
-# Created: Wed Jul  9 10:11:22 2008
+# Created: Tue Nov 18 17:37:26 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!

diff --git a/UiQT4/myMain.py b/UiQT4/myMain.py
index 604403a7e2e413152778a9f747c3956a46796f14..7720fb0c04a52c8d646075370a35a2d870520e1d 100644 (file)
--- a/UiQT4/myMain.py
+++ b/UiQT4/myMain.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'myMain.ui'
 #
-# Created: Wed Sep 10 09:57:04 2008
+# Created: Tue Nov 18 17:37:26 2008
 #      by: PyQt4 UI code generator 4.4.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -66,25 +66,21 @@ class Ui_Eficas(object):
         self.actionFermer.setObjectName("actionFermer")
         self.actionFermer_tout = QtGui.QAction(Eficas)
         self.actionFermer_tout.setObjectName("actionFermer_tout")
-        self.actionCopier = QtGui.QAction(Eficas)
-        self.actionCopier.setObjectName("actionCopier")
         self.actionCouper = QtGui.QAction(Eficas)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap("icons/Cut24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
         self.actionCouper.setIcon(icon)
         self.actionCouper.setObjectName("actionCouper")
-        self.actionColler = QtGui.QAction(Eficas)
-        self.actionColler.setObjectName("actionColler")
-        self.actionCopier1 = QtGui.QAction(Eficas)
+        self.actionCopier = QtGui.QAction(Eficas)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap("icons/Copy24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.actionCopier1.setIcon(icon)
-        self.actionCopier1.setObjectName("actionCopier1")
-        self.actionColler1 = QtGui.QAction(Eficas)
+        self.actionCopier.setIcon(icon)
+        self.actionCopier.setObjectName("actionCopier")
+        self.actionColler = QtGui.QAction(Eficas)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap("icons/Paste24.gif"),QtGui.QIcon.Normal,QtGui.QIcon.Off)
-        self.actionColler1.setIcon(icon)
-        self.actionColler1.setObjectName("actionColler1")
+        self.actionColler.setIcon(icon)
+        self.actionColler.setObjectName("actionColler")
         self.actionQuitter = QtGui.QAction(Eficas)
         self.actionQuitter.setObjectName("actionQuitter")
         self.actionRapport_de_Validation = QtGui.QAction(Eficas)
@@ -155,17 +151,20 @@ class Ui_Eficas(object):
         self.action_Ouvrir.setText(QtGui.QApplication.translate("Eficas", "&Ouvrir", None, QtGui.QApplication.UnicodeUTF8))
         self.action_Ouvrir.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+O", None, QtGui.QApplication.UnicodeUTF8))
         self.actionEnregistrer.setText(QtGui.QApplication.translate("Eficas", "Enregistrer", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionEnregistrer.setShortcut(QtGui.QApplication.translate("Eficas", "Shift+E", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionEnregistrer.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+E", None, QtGui.QApplication.UnicodeUTF8))
         self.actionEnregistrer_sous.setText(QtGui.QApplication.translate("Eficas", "Enregistrer sous", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionEnregistrer_sous.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+Shift+E", None, QtGui.QApplication.UnicodeUTF8))
         self.actionFermer.setText(QtGui.QApplication.translate("Eficas", "Fermer ", None, QtGui.QApplication.UnicodeUTF8))
         self.actionFermer.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+W", None, QtGui.QApplication.UnicodeUTF8))
         self.actionFermer_tout.setText(QtGui.QApplication.translate("Eficas", "Fermer tout", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionCopier.setText(QtGui.QApplication.translate("Eficas", "Copier", None, QtGui.QApplication.UnicodeUTF8))
         self.actionCouper.setText(QtGui.QApplication.translate("Eficas", "Couper", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionCouper.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+X", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionCopier.setText(QtGui.QApplication.translate("Eficas", "Copier", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionCopier.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+C", None, QtGui.QApplication.UnicodeUTF8))
         self.actionColler.setText(QtGui.QApplication.translate("Eficas", "Coller", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionCopier1.setText(QtGui.QApplication.translate("Eficas", "Copier", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionColler1.setText(QtGui.QApplication.translate("Eficas", "Coller", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionColler.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+V", None, QtGui.QApplication.UnicodeUTF8))
         self.actionQuitter.setText(QtGui.QApplication.translate("Eficas", "Quitter", None, QtGui.QApplication.UnicodeUTF8))
+        self.actionQuitter.setShortcut(QtGui.QApplication.translate("Eficas", "Ctrl+Q", None, QtGui.QApplication.UnicodeUTF8))
         self.actionRapport_de_Validation.setText(QtGui.QApplication.translate("Eficas", "Rapport de Validation", None, QtGui.QApplication.UnicodeUTF8))
         self.actionFichier_Source.setText(QtGui.QApplication.translate("Eficas", "Fichier Source", None, QtGui.QApplication.UnicodeUTF8))
         self.actionFichier_Resultat.setText(QtGui.QApplication.translate("Eficas", "Fichier Résultat", None, QtGui.QApplication.UnicodeUTF8))

diff --git a/UiQT4/myMain.ui b/UiQT4/myMain.ui
index 0112d9c6117f29d16bf058225392450ccc483dd4..6025ed619b40ce0bb8e5038baaa385b4d38d3c23 100644 (file)
--- a/UiQT4/myMain.ui
+++ b/UiQT4/myMain.ui
@@ -168,13 +168,16 @@
     <string>Enregistrer</string>
    </property>
    <property name="shortcut" >
-    <string>Shift+E</string>
+    <string>Ctrl+E</string>
    </property>
   </action>
   <action name="actionEnregistrer_sous" >
    <property name="text" >
     <string>Enregistrer sous</string>
    </property>
+   <property name="shortcut" >
+    <string>Ctrl+Shift+E</string>
+   </property>
   </action>
   <action name="actionFermer" >
    <property name="text" >
@@ -189,11 +192,6 @@
     <string>Fermer tout</string>
    </property>
   </action>
-  <action name="actionCopier" >
-   <property name="text" >
-    <string>Copier</string>
-   </property>
-  </action>
   <action name="actionCouper" >
    <property name="icon" >
     <iconset>
@@ -202,10 +200,8 @@
    <property name="text" >
     <string>Couper</string>
    </property>
-  </action>
-  <action name="actionColler" >
-   <property name="text" >
-    <string>Coller</string>
+   <property name="shortcut" >
+    <string>Ctrl+X</string>
    </property>
   </action>
   <action name="actionCopier" >
@@ -216,6 +212,9 @@
    <property name="text" >
     <string>Copier</string>
    </property>
+   <property name="shortcut" >
+    <string>Ctrl+C</string>
+   </property>
   </action>
   <action name="actionColler" >
    <property name="icon" >
@@ -225,11 +224,17 @@
    <property name="text" >
     <string>Coller</string>
    </property>
+   <property name="shortcut" >
+    <string>Ctrl+V</string>
+   </property>
   </action>
   <action name="actionQuitter" >
    <property name="text" >
     <string>Quitter</string>
    </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
   </action>
   <action name="actionRapport_de_Validation" >
    <property name="text" >