From bd743a82f6cbb66ca2263717012ef5110c7ee1fa Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 7 Aug 2014 20:29:31 +0200 Subject: [PATCH] + fix dir2qrc script to keep alphabetical order of file names, update Sketcher.qrc --- src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 206 ++++++++++---------- src/Tools/dir2qrc.py | 8 +- 2 files changed, 109 insertions(+), 105 deletions(-) diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index b44f7dc608..9da695780f 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -1,124 +1,124 @@ + icons/Constraint_Concentric.svg + icons/Constraint_EqualLength.svg + icons/Constraint_ExternalAngle.svg + icons/Constraint_Horizontal.svg + icons/Constraint_HorizontalDistance.svg + icons/Constraint_InternalAngle.svg + icons/Constraint_Length.svg + icons/Constraint_Parallel.svg + icons/Constraint_Perpendicular.svg + icons/Constraint_PointOnEnd.svg + icons/Constraint_PointOnMidPoint.svg + icons/Constraint_PointOnObject.svg + icons/Constraint_PointOnPoint.svg + icons/Constraint_PointOnStart.svg + icons/Constraint_PointToObject.svg + icons/Constraint_Radius.svg + icons/Constraint_Symmetric.svg + icons/Constraint_Tangent.svg + icons/Constraint_TangentToEnd.svg icons/Constraint_TangentToStart.svg - icons/Sketcher_CreateFillet.svg - icons/Sketcher_CreateLine.svg - icons/Sketcher_SelectConstraints.svg + icons/Constraint_Vertical.svg + icons/Constraint_VerticalDistance.svg + icons/Sketcher_AlterConstruction.svg + icons/Sketcher_AlterFillet.svg + icons/Sketcher_CloseShape.svg + icons/Sketcher_ConnectLines.svg + icons/Sketcher_ConstrainCoincident.svg + icons/Sketcher_ConstrainDistance.svg + icons/Sketcher_ConstrainHorizontal.svg + icons/Sketcher_ConstrainLock.svg + icons/Sketcher_ConstrainParallel.svg + icons/Sketcher_ConstrainVertical.svg + icons/Sketcher_Create3PointArc.svg + icons/Sketcher_Create3PointCircle.svg icons/Sketcher_CreateArc.svg icons/Sketcher_CreateCircle.svg - icons/Sketcher_CreateSlot.svg - icons/Sketcher_CloseShape.svg - icons/Constraint_PointOnPoint.svg - icons/Sketcher_Sketch.svg - icons/Sketcher_Element_Circle_Edge.svg - icons/Sketcher_Element_Line_EndPoint.svg - icons/Sketcher_DraftLine.svg - icons/Sketcher_External.svg - icons/Sketcher_Element_Line_StartingPoint.svg - icons/Sketcher_ConstrainDistance.svg - icons/Sketcher_LeaveSketch.svg - icons/Sketcher_AlterFillet.svg - icons/Sketcher_CreateHexagon.svg - icons/Sketcher_Create3PointArc.svg - icons/Sketcher_SelectHorizontalAxis.svg - icons/Sketcher_ConstrainParallel.svg - icons/Sketcher_ConnectLines.svg - icons/Sketcher_SelectVerticalAxis.svg - icons/Sketcher_Element_Arc_MidPoint.svg - icons/Constraint_Parallel.svg - icons/Constraint_Concentric.svg - icons/Sketcher_ProfilesHexagon1.svg - icons/Sketcher_ConstrainHorizontal.svg - icons/Constraint_InternalAngle.svg - icons/Constraint_PointOnStart.svg - icons/Sketcher_ConstrainCoincident.svg - icons/Constraint_PointOnEnd.svg - icons/Sketcher_CreateText.svg - icons/Sketcher_Element_Circle_MidPoint.svg - icons/Sketcher_MapSketch.svg - icons/Constraint_PointOnObject.svg - icons/Constraint_PointOnMidPoint.svg - icons/Sketcher_NewSketch.svg - icons/Sketcher_ConstrainLock.svg - icons/Constraint_Perpendicular.svg - icons/Constraint_Symmetric.svg - icons/Constraint_PointToObject.svg + icons/Sketcher_CreateFillet.svg icons/Sketcher_CreateHeptagon.svg - icons/Sketcher_Trimming.svg - icons/Sketcher_Element_Arc_Edge.svg - icons/Sketcher_CreateTriangle.svg - icons/Sketcher_Element_Arc_StartingPoint.svg - icons/Sketcher_Element_Line_Edge.svg - icons/Constraint_EqualLength.svg - icons/Sketcher_CreateRectangle.svg - icons/Constraint_ExternalAngle.svg - icons/Constraint_Length.svg - icons/Sketcher_EditSketch.svg - icons/Constraint_Vertical.svg - icons/Constraint_TangentToEnd.svg - icons/Constraint_VerticalDistance.svg + icons/Sketcher_CreateHexagon.svg + icons/Sketcher_CreateLine.svg icons/Sketcher_CreateOctagon.svg - icons/Sketcher_CreatePoint.svg - icons/Constraint_Horizontal.svg icons/Sketcher_CreatePentagon.svg - icons/Sketcher_ConstrainVertical.svg - icons/Sketcher_Element_Arc_EndPoint.svg - icons/Sketcher_AlterConstruction.svg - icons/Constraint_HorizontalDistance.svg - icons/Sketcher_CreateSquare.svg - icons/Constraint_Radius.svg - icons/Sketcher_ViewSketch.svg - icons/Sketcher_Element_Point_StartingPoint.svg - icons/Sketcher_Create3PointCircle.svg - icons/Sketcher_SelectOrigin.svg - icons/Sketcher_Element_SelectionTypeInvalid.svg - icons/Constraint_Tangent.svg + icons/Sketcher_CreatePoint.svg icons/Sketcher_CreatePolyline.svg - icons/small/Constraint_Radius_sm.xpm - icons/small/Constraint_HorizontalDistance_sm.xpm - icons/small/Constraint_PointOnEnd_sm.xpm - icons/small/Constraint_PointToObject_sm.xpm - icons/small/Constraint_Parallel_sm.xpm - icons/small/Constraint_InternalAngle_sm.xpm - icons/small/Constraint_PointOnPoint_sm.xpm - icons/small/Constraint_VerticalDistance_sm.xpm - icons/small/Constraint_Length_sm.xpm - icons/small/Constraint_PointOnStart_sm.xpm - icons/small/Constraint_PointOnObject_sm.xpm + icons/Sketcher_CreateRectangle.svg + icons/Sketcher_CreateSlot.svg + icons/Sketcher_CreateSquare.svg + icons/Sketcher_CreateText.svg + icons/Sketcher_CreateTriangle.svg + icons/Sketcher_DraftLine.svg + icons/Sketcher_EditSketch.svg + icons/Sketcher_Element_Arc_Edge.svg + icons/Sketcher_Element_Arc_EndPoint.svg + icons/Sketcher_Element_Arc_MidPoint.svg + icons/Sketcher_Element_Arc_StartingPoint.svg + icons/Sketcher_Element_Circle_Edge.svg + icons/Sketcher_Element_Circle_MidPoint.svg + icons/Sketcher_Element_Line_Edge.svg + icons/Sketcher_Element_Line_EndPoint.svg + icons/Sketcher_Element_Line_StartingPoint.svg + icons/Sketcher_Element_Point_StartingPoint.svg + icons/Sketcher_Element_SelectionTypeInvalid.svg + icons/Sketcher_External.svg + icons/Sketcher_LeaveSketch.svg + icons/Sketcher_MapSketch.svg + icons/Sketcher_NewSketch.svg + icons/Sketcher_ProfilesHexagon1.svg + icons/Sketcher_SelectConstraints.svg + icons/Sketcher_SelectHorizontalAxis.svg + icons/Sketcher_SelectOrigin.svg + icons/Sketcher_SelectVerticalAxis.svg + icons/Sketcher_Sketch.svg + icons/Sketcher_Trimming.svg + icons/Sketcher_ViewSketch.svg icons/small/Constraint_Concentric_sm.xpm - icons/small/Constraint_Perpendicular_sm.xpm - icons/small/Constraint_PointOnMidPoint_sm.xpm - icons/small/Constraint_Lock_sm.xpm - icons/small/Constraint_ExternalAngle_sm.xpm - icons/small/Constraint_Horizontal_sm.xpm - icons/small/Constraint_TangentToStart_sm.xpm icons/small/Constraint_EqualLength_sm.xpm - icons/small/Constraint_TangentToEnd_sm.xpm + icons/small/Constraint_ExternalAngle_sm.xpm + icons/small/Constraint_HorizontalDistance_sm.xpm + icons/small/Constraint_Horizontal_sm.xpm + icons/small/Constraint_InternalAngle_sm.xpm + icons/small/Constraint_Length_sm.xpm + icons/small/Constraint_Lock_sm.xpm + icons/small/Constraint_Parallel_sm.xpm + icons/small/Constraint_Perpendicular_sm.xpm + icons/small/Constraint_PointOnEnd_sm.xpm + icons/small/Constraint_PointOnMidPoint_sm.xpm + icons/small/Constraint_PointOnObject_sm.xpm + icons/small/Constraint_PointOnPoint_sm.xpm + icons/small/Constraint_PointOnStart_sm.xpm + icons/small/Constraint_PointToObject_sm.xpm + icons/small/Constraint_Radius_sm.xpm icons/small/Constraint_Symmetric_sm.xpm - icons/small/Constraint_Vertical_sm.xpm + icons/small/Constraint_TangentToEnd_sm.xpm + icons/small/Constraint_TangentToStart_sm.xpm icons/small/Constraint_Tangent_sm.xpm - translations/Sketcher_es-ES.qm - translations/Sketcher_nl.qm - translations/Sketcher_uk.qm - translations/Sketcher_sv-SE.qm + icons/small/Constraint_VerticalDistance_sm.xpm + icons/small/Constraint_Vertical_sm.xpm + translations/Sketcher_af.qm + translations/Sketcher_cs.qm translations/Sketcher_de.qm - translations/Sketcher_it.qm - translations/Sketcher_pl.qm + translations/Sketcher_es-ES.qm translations/Sketcher_fi.qm - translations/Sketcher_tr.qm - translations/Sketcher_ru.qm translations/Sketcher_fr.qm translations/Sketcher_hr.qm - translations/Sketcher_af.qm - translations/Sketcher_no.qm - translations/Sketcher_zh-TW.qm - translations/Sketcher_zh-CN.qm - translations/Sketcher_ro.qm - translations/Sketcher_ja.qm - translations/Sketcher_pt-BR.qm - translations/Sketcher_sk.qm translations/Sketcher_hu.qm - translations/Sketcher_cs.qm + translations/Sketcher_it.qm + translations/Sketcher_ja.qm + translations/Sketcher_nl.qm + translations/Sketcher_no.qm + translations/Sketcher_pl.qm + translations/Sketcher_pt-BR.qm translations/Sketcher_pt-PT.qm + translations/Sketcher_ro.qm + translations/Sketcher_ru.qm + translations/Sketcher_sk.qm + translations/Sketcher_sv-SE.qm + translations/Sketcher_tr.qm + translations/Sketcher_uk.qm + translations/Sketcher_zh-CN.qm + translations/Sketcher_zh-TW.qm diff --git a/src/Tools/dir2qrc.py b/src/Tools/dir2qrc.py index c77546c04b..3cc26eb449 100644 --- a/src/Tools/dir2qrc.py +++ b/src/Tools/dir2qrc.py @@ -115,6 +115,7 @@ def updateResourceFile(Dir, Output,prefix=""): file = open(Output,"w") file.write(hhcHeader % (prefix)) DirPath = Dir + os.path.sep + filelist=[] for root, dirs, files in os.walk(Dir): for name in files: if ( (1 in [c in name for c in EndingList]) and not ('.svn' in root) ): @@ -123,10 +124,13 @@ def updateResourceFile(Dir, Output,prefix=""): FilePath = FilePath.replace('.\\','') FilePath = FilePath.replace('\\','/') if Verbose: print FilePathOrg + ' -> ' + FilePath - - file.write(' ' + FilePath + '\n') + filelist.append(FilePath) + filelist.sort() + for i in filelist: + file.write(' ' + i + '\n') + file.write(hhcFooter) file.close()