From f44f97ee7b89b6eae70f99b7d4ed911ef7d5194a Mon Sep 17 00:00:00 2001
From: "pascale.noyret" <pascale.noyret@edf.fr>
Date: Tue, 7 Feb 2017 09:24:33 +0100
Subject: [PATCH] taille telemac

---
 InterfaceQT4/qtEficas.py | 27 +++++++++++++++-----------
 UiQT5/myMain.ui          | 42 ++++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 44a668bc..302a0101 100755
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -91,16 +91,18 @@ class Appli(Ui_Eficas,QMainWindow):
 
       
         if not self.salome and hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'lang') : langue=self.CONFIGURATION.lang
+
         if langue=='fr': self.langue=langue
         else           : self.langue="ang"
 
-        if self.CONFIGURATION.force_langue :
-           from monChoixLangue import MonChoixLangue
-           widgetLangue = MonChoixLangue(self)
-           ret=widgetLangue.exec_()
-
-
-        self.suiteTelemac=self.CONFIGURATION.suiteTelemac 
+        self.suiteTelemac=False 
+        if hasattr (self, 'CONFIGURATION') :
+           if self.CONFIGURATION.force_langue :
+              from monChoixLangue import MonChoixLangue
+              widgetLangue = MonChoixLangue(self)
+              ret=widgetLangue.exec_()
+           self.suiteTelemac=self.CONFIGURATION.suiteTelemac 
+           
 
         from Extensions import localisation
         app=QApplication
@@ -110,12 +112,14 @@ class Appli(Ui_Eficas,QMainWindow):
         #if parent != None : self.parentCentralWidget = parent.centralWidget()
         #else              : self.parentCentralWidget = None 
 
-        if  hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'taille') : self.taille=self.CONFIGURATION.taille
-        else : self.taille=1700
+        if not self.salome :
+           if  hasattr (self, 'CONFIGURATION') and hasattr(self.CONFIGURATION,'taille') : self.taille=self.CONFIGURATION.taille
+           else : self.taille=1700
 
-        if self.code in ['MAP',] : self.resize(1440,self.height())
-        else : self.resize(self.taille,self.height())
+           if self.code in ['MAP',] : self.resize(1440,self.height())
+           else : self.resize(self.taille,self.height())
 
+   
         icon = QIcon(self.repIcon+"/parametres.png")
         self.actionParametres.setIcon(icon)
 
@@ -191,6 +195,7 @@ class Appli(Ui_Eficas,QMainWindow):
         #   sys.setdefaultencoding(prefsCode.encoding)
 
     def construitMenu(self):
+        print "kjkljkljlkj"
         self.initPatrons()
         self.initRecents()
         self.initAides()
diff --git a/UiQT5/myMain.ui b/UiQT5/myMain.ui
index c5d95434..847bf6f2 100644
--- a/UiQT5/myMain.ui
+++ b/UiQT5/myMain.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -59,16 +59,7 @@ QMenuBar {
     <string notr="true">QComboBox{combobox-popup:0;}</string>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
+    <property name="margin">
      <number>0</number>
     </property>
     <item row="0" column="0">
@@ -130,7 +121,7 @@ QMenuBar {
      <x>0</x>
      <y>0</y>
      <width>1676</width>
-     <height>25</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFichier">
@@ -218,7 +209,8 @@ QMenuBar {
   <action name="action_Nouveau">
    <property name="icon">
     <iconset theme="document-new">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>&amp;Nouveau</string>
@@ -243,7 +235,8 @@ QMenuBar {
   <action name="actionOuvrir">
    <property name="icon">
     <iconset theme="document-open">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>&amp;Ouvrir</string>
@@ -255,7 +248,8 @@ QMenuBar {
   <action name="actionEnregistrer">
    <property name="icon">
     <iconset theme="document-save">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Enregistrer</string>
@@ -272,7 +266,8 @@ QMenuBar {
   <action name="actionEnregistrer_sous">
    <property name="icon">
     <iconset theme="document-save-as">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Enregistrer sous</string>
@@ -297,7 +292,8 @@ QMenuBar {
   <action name="actionCouper">
    <property name="icon">
     <iconset theme="edit-cut">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Couper</string>
@@ -312,7 +308,8 @@ QMenuBar {
   <action name="actionCopier">
    <property name="icon">
     <iconset theme="edit-copy">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Copier</string>
@@ -327,7 +324,8 @@ QMenuBar {
   <action name="actionColler">
    <property name="icon">
     <iconset theme="edit-paste">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Coller</string>
@@ -386,7 +384,8 @@ QMenuBar {
   <action name="actionSupprimer">
    <property name="icon">
     <iconset theme="edit-delete">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Supprimer</string>
@@ -409,7 +408,8 @@ QMenuBar {
   <action name="actionRechercher">
    <property name="icon">
     <iconset theme="edit-find">
-     <normaloff>.</normaloff>.</iconset>
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Rechercher</string>
-- 
2.39.2