ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-09 22:33:07 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rnv/win_swig_generation' of salome:modules/smesh into rnv/win_swig_generation

Browse Source 
Conflicts:
	src/Tools/ZCracksPlug/__init__.py
	src/Tools/padder/spadderpy/gui/inputdialog.py
This commit is contained in:
rnv 2017-05-30 11:35:54 +03:00
commit 6ac07fd349
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Tools/padder/spadderpy/gui/inputdialog.py
View File

@ -93,7 +93,7 @@ class InputDialog(GenericDialog):
# indexation. # indexation.
self.MESHTYPE_ICONS = {} self.MESHTYPE_ICONS = {}
meshTypeIndex = InputData.MESHTYPES.CONCRETE meshTypeIndex = InputData.MESHTYPES.CONCRETE
self.__ui.cmbMeshType.setItemText(meshTypeIndex, "Béton") self.__ui.cmbMeshType.setItemText(meshTypeIndex, "B?ton")
icon = QIcon() icon = QIcon()
icon.addFile(os.path.join(iconfolder,"concrete.png")) icon.addFile(os.path.join(iconfolder,"concrete.png"))
self.__ui.cmbMeshType.setItemIcon(meshTypeIndex, icon) self.__ui.cmbMeshType.setItemIcon(meshTypeIndex, icon)