taille relative des widgets

diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index acc78cedd15d661818f05fd5cf9e028867fe4328..497a91af4b7d73dfe601c62d0baf0c09a1cd321b 100644 (file)
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -354,7 +354,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         self.tree.node_selected= self
 
         if self.editor.first :
-           self.editor.splitter.setSizes((400,1400,400))
+           #self.editor.splitter.setSizes((400,1400,400))
            if not(isinstance(self.fenetre,MonChoixCommande)): self.editor.first=False
         self.tree.inhibeExpand=True
         self.tree.expandItem(self)
@@ -686,8 +686,6 @@ class JDCNode(QTreeWidgetItem,GereRegles):
 
     def update_node_texte(self):
         """ Met a jour les noms des SD et valeurs des mots-cles """
-        print "kkkkkkkkkkkk"
-        print self.item.GetText()
         value = self.item.GetText()
         self.setText(1, value)
         

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 12b2616a078da43943e009b539358393ae32598a..62597252098b3a9a489b6b0b7b6028aefc7e6b95 100755 (executable)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -23,7 +23,7 @@ import traceback
 
 from determine import monEnvQT5
 if monEnvQT5:
-    from PyQt5.QtWidgets import QWidget, QMessageBox, QFileDialog, QApplication
+    from PyQt5.QtWidgets import QWidget, QMessageBox, QFileDialog, QApplication, QSplitter
     from PyQt5.QtGui import QPalette
     from PyQt5.QtCore import QProcess, QFileInfo, QTimer, Qt, QDir, QSize
 else :
@@ -49,6 +49,7 @@ import readercata
 
 DictExtensions= {"MAP" : ".map"}
 
+    
 
 
 class JDCEditor(Ui_baseWidget,QWidget):
@@ -61,7 +62,9 @@ class JDCEditor(Ui_baseWidget,QWidget):
     #----------------------------------------------------------------------------------------------------------#
 
         QWidget.__init__(self,None)
+        self.i=0
         self.setupUi(self)
+        self.inhibeSplitter=0
         self.widgetOptionnel=None
         self.fenetreCentraleAffichee=None
         self.dejaDansPlieTout=False
@@ -98,7 +101,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
            self.widgetTree=None
            self.appliEficas.resize(1440,self.appliEficas.height())
         else :
-           self.appliEficas.resize(2000,self.appliEficas.height())
+           self.appliEficas.resize(1800,self.appliEficas.height())
 
         self.version_code = session.d_env.cata
 
@@ -115,6 +118,8 @@ class JDCEditor(Ui_baseWidget,QWidget):
         self.format =  self.appliEficas.format_fichier
 
         self.dict_reels={}
+        self.splitterSizes =  [320,1320,320]
+        self.oldSizeWidgetOptionnel = 320
         self.liste_simp_reel=[]
         self.ihm="QT"
 
@@ -213,8 +218,10 @@ class JDCEditor(Ui_baseWidget,QWidget):
         if jdc_item:
             self.tree = browser.JDCTree( jdc_item,  self )
         self.appliEficas.construitMenu()
-        self.splitterSizes = []
-
+        self.saveSplitterSizes()
+        #if monEnvQT5:
+        #   self.splitter./s
+        #else :
 
 
     #-------------------#  Pour execution avec output et error dans le bash
@@ -631,10 +638,8 @@ class JDCEditor(Ui_baseWidget,QWidget):
       if (self.QWParent.edit != "couper"):
         try:
            if noeudOuColler == self.tree.racine :
-              print 1 
               child=noeudOuColler.doPastePremier(noeudACopier)
            else :
-              print 2 
               child=noeudACopier.doPaste(noeudOuColler,pos)
            if child==None or child==0:
                QMessageBox.critical( self,tr( "Copie refusee"),tr('Eficas n a pas reussi a copier l objet'))
@@ -1393,36 +1398,59 @@ class JDCEditor(Ui_baseWidget,QWidget):
       self.nomMaillage="A_partir_de_SMESH"
       self.openfile.close()
 
-   #-----------------------------
-    def saveSplitterSizes(self):
-    #----------------------------
-      if self.splitter != None : self.splitterSizes = self.splitter.sizes()
-
-    #-----------------------------
-    def restoreSplitterSizes(self):
-    #----------------------------
-      if hasattr(self,'splitterSizes') :
-        lenSizes = len(self.splitterSizes)
-        if lenSizes > 0 :
-          if self.splitter != None and self.splitter.count() >= lenSizes :
-            newSizes = self.splitter.sizes()
-            newSizes[:len(self.splitterSizes)-1] = self.splitterSizes[:len(self.splitterSizes)-1]
-            newSizes[len(newSizes)-1] = self.splitterSizes[len(self.splitterSizes)-1]
-            self.splitter.setSizes(newSizes)
-
-    #-----------------------------
-    def restoreTailleTree(self):
-    #----------------------------
-      if hasattr(self,'splitterSizes') and self.splitterSizes != [] :
-         nbFenetre=len(self.splitter.sizes())
-         if nbFenetre == len(self.splitterSizes) :
-            self.splitter.setSizes(self.splitterSizes)
-            return
-           
-      if self.widgetOptionnel==None:
-         print "kkkkkkkkkkkkkk"
-         #
-      #PN
+    #-------------------------------------
+    def saveSplitterSizes(self,event=None):
+    #------------------------------------
+      if self.inhibeSplitter : return
+      if not hasattr(self,'splitter') : return
+      print "______________________"
+      print "saveSplitterSizes"
+      print self.splitterSizes
+      if self.splitterSizes[2] != 0 : self.oldSizeWidgetOptionnel = self.splitterSizes[2]
+      for i in range(len(self.splitter.sizes())):
+         self.splitterSizes[i] = self.splitter.sizes()[i]
+         self.splitter.widget(i).resizeEvent=self.saveSplitterSizes
+      print self.splitterSizes
+      print "______________________"
+
+
+    #-----------------------------------------
+    def restoreSplitterSizes(self,nbWigdet=3):
+    #----------------------------------------
+      self.inhibeSplitter = 1
+      self.i+=1
+      if not(hasattr(self,'splitter')) : return
+      newSizes=self.splitterSizes[:nbWigdet]
+      self.splitter.setSizes(newSizes)
+      print self.splitterSizes
+      self.inhibeSplitter = 0
+   
+    #------------------------
+    def fermeOptionnel(self):
+    #------------------------
+      if self.widgetOptionnel == None : return
+
+      self.inhibeSplitter=1
+      self.splitterSizes[1] = self.splitterSizes[1] + self.splitterSizes[2]
+      if self.splitterSizes[2]!=0 : self.oldSizeWidgetOptionnel = self.splitterSizes[2]
+      self.splitterSizes[2]=0
+
+      self.widgetOptionnel.setParent(None)
+      self.widgetOptionnel.close()
+      self.widgetOptionnel.deleteLater()
+      self.widgetOptionnel=None
+      self.inhibeSplitter=0
+      self.restoreSplitterSizes(2)
+      
+    #------------------------
+    def ajoutOptionnel(self):
+    #------------------------
+      #print "ajoutOptionnel"
+      #print self.splitterSizes
+      self.splitterSizes[2] = self.oldSizeWidgetOptionnel
+      self.splitterSizes[1] = self.splitterSizes[1] - self.splitterSizes[2]
+      self.inhibeSplitter=0
+      self.restoreSplitterSizes(3)
 
 
     #-----------------------------

diff --git a/InterfaceQT4/monBoutonValide.py b/InterfaceQT4/monBoutonValide.py
index 0027be39e30f02d110e29b8d72ff69c15b305e7b..504184349206067e4c5530e88b1a19b1f81e758f 100644 (file)
--- a/InterfaceQT4/monBoutonValide.py
+++ b/InterfaceQT4/monBoutonValide.py
@@ -22,7 +22,7 @@
 import re
 from determine import monEnvQT5
 if monEnvQT5:
-   from PyQt5.QtWidgets import QToolButton
+   from PyQt5.QtWidgets import QToolButton, QToolTip
 else :
    from PyQt4.QtGui import *
    from PyQt4.QtCore import *
@@ -44,7 +44,7 @@ class MonBoutonValide(QToolButton) :
      def mousePressEvent(self, event):
        #print "dans mousePressEvent"
        if self.parent.node.item.object.isvalid() :
-          myToolTip=QString(tr("objet valide"))
+          myToolTip=tr("objet valide")
           QToolTip.showText(event.globalPos(),myToolTip )
        else :
           t=""
@@ -61,7 +61,7 @@ class MonBoutonValide(QToolButton) :
                  t=l
               else :
                  t=t+'\n'+l
-          myToolTip=QString(t)
+          myToolTip=tr(t)
        QToolTip.showText(event.globalPos(),myToolTip )
 
 

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index 4bf5aa534a9f1791916a9add109d4d59189fc67a..d0073e6d5db372d6e6fffb616931d698ff549a28 100644 (file)
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -49,7 +49,9 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       self.listeAffichageWidget=[]
       self.inhibe=0
       self.ensure=0
+      editor.inhibeSplitter=1
       Groupe.__init__(self,node,editor,None,etape.definition,etape,1,self)
+      editor.inhibeSplitter=0
 
       if node.item.get_fr() != "" : self.labelDoc.setText(node.item.get_fr())
       else : self.labelDoc.close()
@@ -97,18 +99,21 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       if self.editor.code == "CARMELCND" : 
          self.RBPoubelle.close() # JDC Fige
          return                  # Pas de MC Optionnels pour Carmel
+
       from monWidgetOptionnel import MonWidgetOptionnel
-      #if hasattr(self.editor,'widgetOptionnel') : 
       if self.editor.widgetOptionnel!= None : 
         self.monOptionnel=self.editor.widgetOptionnel
-        self.editor.restoreSplitterSizes()
       else :
         self.monOptionnel=MonWidgetOptionnel(self)
         self.editor.widgetOptionnel=self.monOptionnel
+        self.editor.inhibeSplitter=1
         self.editor.splitter.addWidget(self.monOptionnel)
-        #self.editor.restoreSplitterSizes()
+        self.editor.inhibeSplitter=0
+        self.editor.ajoutOptionnel()
       self.afficheOptionnel()
-      #print "fin init de widget Commande"
+
+      self.editor.restoreSplitterSizes()
+      print "fin init de widget Commande"
       
 
   def donnePremier(self):

diff --git a/InterfaceQT4/monWidgetCommentaire.py b/InterfaceQT4/monWidgetCommentaire.py
index 5b222fb2ba083eada8117147d606abf9bccb8b7c..1923b38ec057070e0a4b213ac7abdb6ef17dd9f7 100644 (file)
--- a/InterfaceQT4/monWidgetCommentaire.py
+++ b/InterfaceQT4/monWidgetCommentaire.py
@@ -71,6 +71,8 @@ class MonWidgetCommentaire(QWidget,Ui_WidgetCommentaire,FacultatifOuOptionnel):
          else :
                self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
                self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
+      self.editor.fermeOptionnel()
+
 
   def afficheApres(self):
        self.node.selectApres()

diff --git a/InterfaceQT4/monWidgetFormule.py b/InterfaceQT4/monWidgetFormule.py
index f9cac5b7ecda2817a15492c56abb8bd37505e58f..7c6fbcbe811ae22a977debabdb62dda715c0b1e5 100644 (file)
--- a/InterfaceQT4/monWidgetFormule.py
+++ b/InterfaceQT4/monWidgetFormule.py
@@ -90,7 +90,7 @@ class MonWidgetFormule(QWidget,Ui_WidgetFormule,FacultatifOuOptionnel):
    
       self.racine=self.node.tree.racine
       self.monOptionnel=None
-      #self.editor.restoreSplitterSizes()
+      self.editor.fermeOptionnel()
       #print "fin init de widget Commande"
       
 

diff --git a/InterfaceQT4/monWidgetOptionnel.py b/InterfaceQT4/monWidgetOptionnel.py
index dd0b60e46fee7dac53ef848ab5c2aead39b20086..af298206b739472ba6c1f13bdbd1dc99044dcdaa 100644 (file)
--- a/InterfaceQT4/monWidgetOptionnel.py
+++ b/InterfaceQT4/monWidgetOptionnel.py
@@ -65,7 +65,7 @@ class MonWidgetOptionnel (QWidget,Ui_WidgetOptionnel):
   """
   """
   def __init__(self,parentQt):
-     #print "dans init de monWidgetOptionnel ", parentQt, parentQt.node.item.nom
+     print "dans init de monWidgetOptionnel ", parentQt, parentQt.node.item.nom
      QWidget.__init__(self,None)
      self.setupUi(self)
      self.dicoCb={}
@@ -76,10 +76,13 @@ class MonWidgetOptionnel (QWidget,Ui_WidgetOptionnel):
      self.cb=None
      self.parentQt=parentQt
      #self.connect(self.bAjoutMC,SIGNAL("clicked()"), self.ajoutMC)
-     #print "fin init de monWidgetOptionnel ", parentQt, parentQt.node.item.nom
-
-     
-
+     #self.parentQt.editor.splitterSizes[1]-=self.parentQt.editor.splitterSizes[2]
+     #print self.parentQt.editor.splitterSizes
+     self.parentQt.editor.splitterSizes[2]=self.parentQt.editor.oldSizeWidgetOptionnel
+     if self.parentQt.editor.splitterSizes[2] == 0 : self.parentQt.editor.splitterSizes[2] = 400
+     self.parentQt.editor.restoreSplitterSizes()
+     print "fin init de monWidgetOptionnel ", parentQt, parentQt.node.item.nom
+    
 
   def affiche(self,liste):
      print "dans Optionnel ____ affiche", liste
@@ -128,6 +131,3 @@ class MonWidgetOptionnel (QWidget,Ui_WidgetOptionnel):
      #print "dans Optionnel __ ajout de ", maListe
      self.parentMC.ajoutMC(maListe)
 
-  def hide(self):
-     self.parentQt.editor.saveSplitterSizes()
-     QWidget.hide(self)

diff --git a/InterfaceQT4/monWidgetParam.py b/InterfaceQT4/monWidgetParam.py
index e2b832b371e873717a7d47be1d89beed80756f18..0190e530e7275b5bb9cf34e48cffe60e40f0e04b 100644 (file)
--- a/InterfaceQT4/monWidgetParam.py
+++ b/InterfaceQT4/monWidgetParam.py
@@ -23,7 +23,7 @@ from desWidgetParam import Ui_WidgetParam
 from gereIcones import FacultatifOuOptionnel
 from determine import monEnvQT5
 if monEnvQT5:
-    from PyQt5.QtWidgets import QWidget
+    from PyQt5.QtWidgets import QWidget, QMessageBox
 else :
     from PyQt4.QtGui  import *
     from PyQt4.QtCore import *
@@ -72,12 +72,7 @@ class MonWidgetParam(QWidget,Ui_WidgetParam,FacultatifOuOptionnel):
         self.connect(self.bVerifie,SIGNAL("clicked()"), self.verifiePressed)
         self.editor.affiche_infos("")
 
-
-      if self.editor.widgetOptionnel!= None :
-         self.editor.widgetOptionnel.close()
-         self.editor.widgetOptionnel=None
-
-
+      self.editor.fermeOptionnel()
 
        
   def afficheCatalogue(self):

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index ff41bcff83adab5452d0b4597b552c6e25b4ced4..9efa2851871347fef867d7441c009dde046ff9ba 100755 (executable)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -85,6 +85,8 @@ class Appli(Ui_Eficas,QMainWindow):
         localisation.localise(app,langue)
 
         self.setupUi(self)
+        if self.code in ['MAP',] : self.resize(1440,self.height())
+        else : self.resize(1800,self.height())
 
         icon = QIcon(self.repIcon+"/parametres.png")
         self.actionParametres.setIcon(icon)

diff --git a/InterfaceQT4/viewManager.py b/InterfaceQT4/viewManager.py
index 547f6ef810c0f087473e85ee6e09427f8d587459..be870312e2eb761985ea36fa1686016603f56ed1 100644 (file)
--- a/InterfaceQT4/viewManager.py
+++ b/InterfaceQT4/viewManager.py
@@ -371,10 +371,10 @@ class MyTabview:
             if fn is None: fn = tr('Noname')
             if monEnvQT5 :
               msgBox = QMessageBox(None)
-              msgBox.setWindowTitle(tr("Fichier Duplique"))
+              msgBox.setWindowTitle(tr("Fichier Modifie"))
               msgBox.setText(tr("Le fichier ne sera pas sauvegarde."))
-              msgBox.addButton(texte,0)
-              msgBox.addButton(tr("&Annuler"),1)
+              msgBox.addButton(tr("&Sauvegarder"),1)
+              msgBox.addButton(tr("&Quitter sans sauvegarder"),0)
               res=msgBox.exec_()
             else :
               res = QMessageBox.warning(self.appliEficas, 
@@ -382,7 +382,7 @@ class MyTabview:
                 tr("Le fichier %s n a pas ete sauvegarde.",str(fn)),
                 tr("&Sauvegarder"),
                 tr(texte),
-                tr("&Annuler") )
+                tr("&Quitter sans sauvegarder") )
             if res == 0:
                 (ok, newName) = editor.saveFile()
                 if ok:

diff --git a/UiQT5/desBaseWidget.ui b/UiQT5/desBaseWidget.ui
index 49e7469337783db39ad9c1b18caad9e9b6b2a588..43289173739015395cc57b52d482a165c21a3f32 100644 (file)
--- a/UiQT5/desBaseWidget.ui
+++ b/UiQT5/desBaseWidget.ui
@@ -28,18 +28,18 @@
   <property name="styleSheet">
    <string notr="true"/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>3</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <property name="margin">
     <number>0</number>
    </property>
-   <item>
+   <item row="0" column="0">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="handleWidth">
+      <number>3</number>
+     </property>
      <widget class="QWidget" name="widgetTree" native="true">
       <property name="styleSheet">
        <string notr="true">background:rgb(247,247,247);
@@ -61,7 +61,7 @@
      </widget>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QLabel" name="labelCommentaire">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

diff --git a/UiQT5/desChoixCommandes.ui b/UiQT5/desChoixCommandes.ui
index 4dca9db0f6642fcb921ff176d0cce36544beef2f..e8c9904001ab11b7616768a9c162c360df69bb60 100644 (file)
--- a/UiQT5/desChoixCommandes.ui
+++ b/UiQT5/desChoixCommandes.ui
@@ -415,6 +415,12 @@ border-radius : 12px
         <height>518</height>
        </rect>
       </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        <property name="spacing">
         <number>0</number>

diff --git a/UiQT5/desWidgetCommande.ui b/UiQT5/desWidgetCommande.ui
index 2ec16046aa9a532048e4bae764c5efb98b7b2783..3e4e3ae00cf747b3d3215911b9f5700d86e3d3e6 100644 (file)
--- a/UiQT5/desWidgetCommande.ui
+++ b/UiQT5/desWidgetCommande.ui
@@ -81,9 +81,15 @@ font : 'times' 9px</string>
       <property name="spacing">
        <number>0</number>
       </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
       <property name="topMargin">
        <number>0</number>
       </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
@@ -665,6 +671,18 @@ border-radius : 12px
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
         <layout class="QVBoxLayout" name="commandesLayout">
          <property name="spacing">
@@ -679,10 +697,6 @@ border-radius : 12px
   </layout>
   <zorder>scrollAreaCommandes</zorder>
   <zorder>frameAffichage</zorder>
-  <zorder></zorder>
-  <zorder>frame_2</zorder>
-  <zorder>frame_2</zorder>
-  <zorder></zorder>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>

diff --git a/UiQT5/desWidgetOptionnel.ui b/UiQT5/desWidgetOptionnel.ui
index ca162eef1470a92fe6a73ab00a9505ab979c405c..df2de39a31463e56aead669ff674eb9ebd2fe116 100644 (file)
--- a/UiQT5/desWidgetOptionnel.ui
+++ b/UiQT5/desWidgetOptionnel.ui
@@ -30,6 +30,9 @@
 font : 'times' 9px</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QFrame" name="frame_2">
      <property name="sizePolicy">
@@ -98,7 +101,16 @@ font : 'times' 9px</string>
       <property name="spacing">
        <number>0</number>
       </property>
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
@@ -127,7 +139,7 @@ font : 'times' 9px</string>
            <x>0</x>
            <y>0</y>
            <width>279</width>
-           <height>124</height>
+           <height>131</height>
           </rect>
          </property>
          <property name="sizePolicy">

diff --git a/UiQT5/myMain.ui b/UiQT5/myMain.ui
index 04f25f74d26e3061e783062221efd000675e3d68..c5d954344c9b02b172225118a8ebebc78daba0df 100644 (file)
--- a/UiQT5/myMain.ui
+++ b/UiQT5/myMain.ui
@@ -58,14 +58,20 @@ QMenuBar {
    <property name="styleSheet">
     <string notr="true">QComboBox{combobox-popup:0;}</string>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="leftMargin">
      <number>0</number>
     </property>
-    <property name="margin">
+    <property name="topMargin">
      <number>0</number>
     </property>
-    <item>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <item row="0" column="0">
      <widget class="QFrame" name="frameEntete">
       <property name="minimumSize">
        <size>
@@ -95,7 +101,7 @@ QMenuBar {
       </property>
      </widget>
     </item>
-    <item>
+    <item row="1" column="0">
      <widget class="QTabWidget" name="myQtab">
       <property name="styleSheet">
        <string notr="true">background-color:rgb(224,223,222)</string>
@@ -124,7 +130,7 @@ QMenuBar {
      <x>0</x>
      <y>0</y>
      <width>1676</width>
-     <height>30</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFichier">
@@ -212,8 +218,7 @@ QMenuBar {
   <action name="action_Nouveau">
    <property name="icon">
     <iconset theme="document-new">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Nouveau</string>
@@ -238,8 +243,7 @@ QMenuBar {
   <action name="actionOuvrir">
    <property name="icon">
     <iconset theme="document-open">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>&amp;Ouvrir</string>
@@ -251,8 +255,7 @@ QMenuBar {
   <action name="actionEnregistrer">
    <property name="icon">
     <iconset theme="document-save">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Enregistrer</string>
@@ -269,8 +272,7 @@ QMenuBar {
   <action name="actionEnregistrer_sous">
    <property name="icon">
     <iconset theme="document-save-as">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Enregistrer sous</string>
@@ -295,8 +297,7 @@ QMenuBar {
   <action name="actionCouper">
    <property name="icon">
     <iconset theme="edit-cut">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Couper</string>
@@ -311,8 +312,7 @@ QMenuBar {
   <action name="actionCopier">
    <property name="icon">
     <iconset theme="edit-copy">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Copier</string>
@@ -327,8 +327,7 @@ QMenuBar {
   <action name="actionColler">
    <property name="icon">
     <iconset theme="edit-paste">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Coller</string>
@@ -387,8 +386,7 @@ QMenuBar {
   <action name="actionSupprimer">
    <property name="icon">
     <iconset theme="edit-delete">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Supprimer</string>
@@ -411,8 +409,7 @@ QMenuBar {
   <action name="actionRechercher">
    <property name="icon">
     <iconset theme="edit-find">
-     <normaloff/>
-    </iconset>
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Rechercher</string>