X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=tools%2Fdlgfactory%2Fdlgfactory.py;h=e2516290f99b0cbc77f5487cee281ff630785c22;hb=fba039969d732ec15cd4dd83280a320550f00a73;hp=5eca0eea419f0cc088137f10c3d3b9a86aac96ee;hpb=6f30a39cf0e334b55338328e63c320413f332dba;p=modules%2Fgui.git diff --git a/tools/dlgfactory/dlgfactory.py b/tools/dlgfactory/dlgfactory.py index 5eca0eea4..e2516290f 100755 --- a/tools/dlgfactory/dlgfactory.py +++ b/tools/dlgfactory/dlgfactory.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2010-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2010-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ import sys, os __descr_str = "" __descr_str += "This script generates a set of files to initiate a dialog Qt window " -__descr_str += "(i.e. MyDialog.ui, MyDialog.hxx and MyDialog.cxx files). " +__descr_str += "(i.e. MyDialog.ui, MyDialog.h and MyDialog.cxx files). " __descr_str += "The dialog window can be a self-consistent class (i.e. depends only " __descr_str += "on Qt classes) or a class that inherits class GenericDialog " __descr_str += "which implementation is provided in this package and " @@ -38,10 +38,10 @@ __msg_str = """ # and form source files from ui files # --------------------------------------------------------- -%_moc.cxx: %.hxx +%_moc.cxx: %.h $(MOC) $< -o $@ -ui_%.hxx: %.ui +ui_%.h: %.ui $(UIC) -o $@ $< @@ -51,7 +51,7 @@ ui_%.hxx: %.ui # --------------------------------------------------------- # UIC_FILES = \ - ui___CLASSNAME__.hxx + ui___CLASSNAME__.h # MOC_FILES = \ __CLASSNAME___moc.cxx @@ -70,7 +70,7 @@ BUILT_SOURCES = $(UIC_FILES) nodist__la_SOURCES += $(MOC_FILES) $(UIC_FILES) dist__la_SOURCES += __CLASSNAME__.cxx -salomeinclude_HEADERS += __CLASSNAME__.hxx +salomeinclude_HEADERS += __CLASSNAME__.h _la_CPPFLAGS = \\ $(QT_CXXFLAGS) @@ -100,7 +100,7 @@ if __name__ == "__main__": className = options.className classType = options.classType - for ext in [".cxx", ".hxx", ".ui"]: + for ext in [".cxx", ".h", ".ui"]: file_dest = className + ext if classType == "qdialog": file_src = os.path.join( tool_path, "__QDIALOG__" + ext )