*** empty log message ***

diff --git a/InterfaceQT/editor.py b/InterfaceQT/editor.py
index 988344389191c67f13d19782bdabee26c4844d00..6346902abc2d0366d01aaaba6a29c3a9127731cd 100644 (file)
--- a/InterfaceQT/editor.py
+++ b/InterfaceQT/editor.py
@@ -660,10 +660,10 @@ class JDCEditor(QSplitter):
                 if QFileInfo(fn).exists():
                     abort = QMessageBox.warning(
                        self,
-                        self.trUtf8("Save File"),
-                        self.trUtf8("The file <b>%1</b> already exists.").arg(fn),
-                        self.trUtf8("&Overwrite"),
-                        self.trUtf8("&Abort") )
+                        self.trUtf8("Sauvegarde Fichier"),
+                        self.trUtf8("Le fichier <b>%1</b> existe deja.").arg(fn),
+                        self.trUtf8("&Remplacer"),
+                        self.trUtf8("&Abandonner") )
                     print abort
                     if abort:
                         return (0, None)

diff --git a/InterfaceQT/qtCommun.py b/InterfaceQT/qtCommun.py
index 4b43a5b8332895ac52bffb86262c7fe8a5122a2a..7e5b13e511fed3bfb062870d1550135e5ad9701b 100644 (file)
--- a/InterfaceQT/qtCommun.py
+++ b/InterfaceQT/qtCommun.py
@@ -181,10 +181,17 @@ class QTPanelTBW2(QTPanel):
 
       
   def handleCurrentChanged(self):
-        try :
-           self.LEFiltre.setFocus()
-        except :
-           pass
+        label=self.TWChoix.tabLabel(self.TWChoix.currentPage())
+        if label==QString("Nouvelle Commande"):
+           try :
+               self.LEFiltre.setFocus()
+           except :
+               pass
+        if label==QString("Nommer Concept"):
+           try :
+               self.LENomConcept.setFocus()
+           except :
+               pass
 
   def BuildLBNouvCommande(self):
         self.LBNouvCommande.clear()
@@ -270,6 +277,7 @@ class QTPanelTBW3(QTPanel):
         self.typeConcept.setText(type_sd)
         self.LENomConcept.setText("")
         self.LENomConcept.setText(nomConcept)
+        self.LENomConcept.setFocus()
         
 
 
@@ -327,11 +335,11 @@ class ViewText(QDialog):
         if not fn.isNull():                
            if QFileInfo(fn).exists():
               abort = QMessageBox.warning(self,
-                        self.trUtf8("Save File"),
-                        self.trUtf8("The file <b>%1</b> already exists.")
+                        self.trUtf8("Sauvegarde Fichier"),
+                        self.trUtf8("Le fichier <b>%1</b> existe.")
                             .arg(fn),
-                        self.trUtf8("&Overwrite"),
-                        self.trUtf8("&Abort"), None, 1)
+                        self.trUtf8("&Remplacer"),
+                        self.trUtf8("&Abandonner"), None, 1)
               if abort:
                  return
            fn = unicode(QDir.convertSeparators(fn))                

diff --git a/Traducteur/traduitV7V8.py b/Traducteur/traduitV7V8.py
index 3efb2ca1e9f1c93b60d4df08d059d7c93b38bdfe..543b34adf535f880c4fdfaaeb30aea0700b55095 100644 (file)
--- a/Traducteur/traduitV7V8.py
+++ b/Traducteur/traduitV7V8.py
@@ -36,13 +36,11 @@ atraiter=( "IMPR_GENE","CALC_FONCTION", "DEFI_MATERIAU","STAT_NON_LINE",
           "CALC_PRECONT","DEFI_TEXTURE","TEST_RESU","COMB_CHAM_NO","COMB_CHAM_ELEM",
           "CALC_FATIGUE","IMPR_OAR", "AFFE_CHAR_MECA_F",
            "MACR_ASCOUF_CALC","MACR_ASPIC_CALC","MACR_CABRI_CALC",
-           "MACR_ADAP_MAIL","IMPR_FICO_HOMARD","DEFI_PART_FETI",
-           "DEBUT"
+           "MACR_ADAP_MAIL","IMPR_FICO_HOMARD","DEFI_PART_FETI"
         )
 
 dict_erreurs={
 #STA8.4
-              "DEBUT" : "tiiiiiiiiiiiiiiiiiiii",
               "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",
               "DEFI_THER_JOULE": "la commande DIST_LIGN_3D a ete supprimee",
               "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",

diff --git a/Traducteur/traduitV8V9.py b/Traducteur/traduitV8V9.py
index 6882a4cfa2bbf505084e173abf49cb5fb27fe525..c43121d4c1cb59c1188a0ac0e4b37ee6d87f6b0f 100644 (file)
--- a/Traducteur/traduitV8V9.py
+++ b/Traducteur/traduitV8V9.py
@@ -28,7 +28,6 @@ atraiter=( "DEFI_MAILLAGE","CALC_VECT_ELEM","DYNA_TRAN_EXPLI","DYNA_NON_LINE","S
 
 dict_erreurs={
 #STA8.4
-              "DEBUT" : "tiiiiiiiiiiiiiiiiiiii",
               "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",
               "DEFI_THER_JOULE": "la commande DIST_LIGN_3D a ete supprimee",
               "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee",