From: pascale.noyret
Date: Wed, 16 Mar 2016 09:09:14 +0000 (+0100)
Subject: enleve les py de UiQT5 + mineur
X-Git-Tag: V8_1_0p0~39
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3df7cb6744178dbce6c102f5ec83a1a2a1782ab1;p=modules%2Feficas.git
enleve les py de UiQT5 + mineur
---
diff --git a/.gitignore b/.gitignore
index 9ba6f08b..f5545ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
*.comm
*.sh
UiQT4/*.py
+UiQT5/*.py
Aster/Cata/*
Aster/Tests/*
diff --git a/Adao/.monCode_Cata.py.swp b/Adao/.monCode_Cata.py.swp
deleted file mode 100644
index bafcb43c..00000000
Binary files a/Adao/.monCode_Cata.py.swp and /dev/null differ
diff --git a/InterfaceQT4/compoformule.py b/InterfaceQT4/compoformule.py
index 511a1e94..22e36d55 100644
--- a/InterfaceQT4/compoformule.py
+++ b/InterfaceQT4/compoformule.py
@@ -33,10 +33,9 @@ import typeNode
class FormuleNode(browser.JDCNode,typeNode.PopUpMenuNode):
def getPanel(self):
-
- from monFormulePanel import MonFormulePanel
- return MonFormulePanel(self,parent=self.editor)
-
+ from monWidgetFormule import MonWidgetFormule
+ return MonWidgetFormule(self,self.editor,self.item.object)
+
def createPopUpMenu(self):
typeNode.PopUpMenuNode.createPopUpMenu(self)
diff --git a/InterfaceQT4/monWidgetPlusieursPlie.py b/InterfaceQT4/monWidgetPlusieursPlie.py
index a12875fc..1a9a43f5 100644
--- a/InterfaceQT4/monWidgetPlusieursPlie.py
+++ b/InterfaceQT4/monWidgetPlusieursPlie.py
@@ -22,12 +22,12 @@ import string,types,os,sys
# Modules Eficas
from determine import monEnvQT5
-#if monEnvQT5:
-# from PyQt5.QtWidgets import Qicon, QScrollbar, QFrame
-# from PyQt5.QtCore import QTimer, QSize, QT
-#else :
-# from PyQt4.QtGui import *
-# from PyQt4.QtCore import
+if monEnvQT5:
+ from PyQt5.QtWidgets import Qicon, QScrollbar, QFrame
+ from PyQt5.QtCore import QTimer, QSize, QT
+else :
+ from PyQt4.QtGui import *
+ from PyQt4.QtCore import
from Extensions.i18n import tr
diff --git a/InterfaceQT4/utilIcons.py b/InterfaceQT4/utilIcons.py
deleted file mode 100644
index be2cc866..00000000
--- a/InterfaceQT4/utilIcons.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2007-2013 EDF R&D
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-from PyQt4.QtGui import QPixmap, QIcon
-import os
-
-class PixmapCache:
- """
- Class implementing a pixmap cache for icons.
- """
- def __init__(self):
- """
- Constructor
- """
- self.pixmapCache = {}
-
-
- def getPixmap(self, key):
- """
- Public method to retrieve a pixmap.
-
- @param key name of the wanted pixmap (string)
- @return the requested pixmap (QPixmap)
- """
- if (1==1):
- #try:
- key="/local/pnoyret/Install_Eficas/EficasV1/InterfaceQT/icons/"+key
- return QPixmap(key)
- #return self.pixmapCache[key]
- #except KeyError:
- else :
- self.pixmapCache[key] = QPixmap.fromMimeSource(key)
- return self.pixmapCache[key]
-
-pixCache = PixmapCache()
-
-def getPixmap(key, cache = pixCache):
- """
- Module function to retrieve a pixmap.
-
- @param key name of the wanted pixmap (string)
- @return the requested pixmap (QPixmap)
- """
- return cache.getPixmap(key)
-
-def getIcon(key):
- key="/local/pnoyret/Install_Eficas/EficasV1/InterfaceQT/icons/"+key
- return QIcon(key)
-
-
-#from PyQt4.Qt3Support import Q3MimeSourceFactory
-
-#def initializeMimeSourceFactory():
- """
- Function to initialize the default mime source factory.
-
- """
-# defaultFactory = Q3MimeSourceFactory.defaultFactory()
-# repini=os.path.dirname(os.path.abspath(__file__))
-# defaultFactory.addFilePath(repini+"/../Editeur/icons") #CS_pbruno todo (config)
-
diff --git a/UiQT5/Tuple2.py b/UiQT5/Tuple2.py
deleted file mode 100644
index c9214716..00000000
--- a/UiQT5/Tuple2.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'Tuple2.ui'
-#
-# Created by: PyQt5 UI code generator 5.5.1
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-class Ui_Tuple2(object):
- def setupUi(self, Tuple2):
- Tuple2.setObjectName("Tuple2")
- Tuple2.resize(482, 34)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(Tuple2.sizePolicy().hasHeightForWidth())
- Tuple2.setSizePolicy(sizePolicy)
- self.horizontalLayout = QtWidgets.QHBoxLayout(Tuple2)
- self.horizontalLayout.setContentsMargins(0, 1, 0, 0)
- self.horizontalLayout.setSpacing(0)
- self.horizontalLayout.setObjectName("horizontalLayout")
- self.label_5 = QtWidgets.QLabel(Tuple2)
- self.label_5.setObjectName("label_5")
- self.horizontalLayout.addWidget(self.label_5)
- self.lineEditVal_1 = LECustomTuple(Tuple2)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.lineEditVal_1.sizePolicy().hasHeightForWidth())
- self.lineEditVal_1.setSizePolicy(sizePolicy)
- self.lineEditVal_1.setMinimumSize(QtCore.QSize(0, 25))
- self.lineEditVal_1.setMaximumSize(QtCore.QSize(805, 16777215))
- self.lineEditVal_1.setStyleSheet("background:rgb(235,235,235);\n"
-"border:0px;\n"
-"\n"
-"")
- self.lineEditVal_1.setText("")
- self.lineEditVal_1.setReadOnly(False)
- self.lineEditVal_1.setObjectName("lineEditVal_1")
- self.horizontalLayout.addWidget(self.lineEditVal_1)
- self.label_6 = QtWidgets.QLabel(Tuple2)
- self.label_6.setObjectName("label_6")
- self.horizontalLayout.addWidget(self.label_6)
- self.lineEditVal_2 = LECustomTuple(Tuple2)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.lineEditVal_2.sizePolicy().hasHeightForWidth())
- self.lineEditVal_2.setSizePolicy(sizePolicy)
- self.lineEditVal_2.setMinimumSize(QtCore.QSize(0, 25))
- self.lineEditVal_2.setMaximumSize(QtCore.QSize(805, 16777215))
- self.lineEditVal_2.setFocusPolicy(QtCore.Qt.StrongFocus)
- self.lineEditVal_2.setStyleSheet("background:rgb(235,235,235);\n"
-"border:0px;")
- self.lineEditVal_2.setObjectName("lineEditVal_2")
- self.horizontalLayout.addWidget(self.lineEditVal_2)
- self.label_7 = QtWidgets.QLabel(Tuple2)
- self.label_7.setObjectName("label_7")
- self.horizontalLayout.addWidget(self.label_7)
- spacerItem = QtWidgets.QSpacerItem(5, 20, QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum)
- self.horizontalLayout.addItem(spacerItem)
-
- self.retranslateUi(Tuple2)
- QtCore.QMetaObject.connectSlotsByName(Tuple2)
-
- def retranslateUi(self, Tuple2):
- _translate = QtCore.QCoreApplication.translate
- Tuple2.setWindowTitle(_translate("Tuple2", "Form"))
- self.label_5.setText(_translate("Tuple2", "(
"))
- self.label_6.setText(_translate("Tuple2", "