From f144f6ea7f57162f3c3d3b7c8c2e72c66ff4b149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Fri, 4 Aug 2017 14:46:06 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@256 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/CMakeLists.txt | 4 +- qad/QtWraps.cmake | 51 ++++++++++++++++++ qad/blockview/blockeditor/CMakeLists.txt | 2 +- .../blockeditor/blockeditor_main.cpp | 1 + qad/blockview/blockeditor/icons/blockview.ico | Bin 0 -> 50190 bytes .../blockeditor/resource_win_icon.rc | 43 +++++++++++++++ qad/graphic/qpicalculator/CMakeLists.txt | 2 +- qad/icons/blockview.xcf | Bin 0 -> 21607 bytes 8 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 qad/blockview/blockeditor/icons/blockview.ico create mode 100644 qad/blockview/blockeditor/resource_win_icon.rc create mode 100644 qad/icons/blockview.xcf diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 1d40563..7841d95 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -70,8 +70,8 @@ macro(qad_plugin NAME _MODULES _LIBS) add_definitions(-DQT_NO_DEBUG) add_definitions(-DQT_SHARED) add_definitions(-DQDESIGNER_EXPORT_WIDGETS) - file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") find_qt(${QtVersions} Core Designer ${_MODULES}) + qt_sources(SRC) qt_wrap(${SRC} CPPS out_CPP QMS out_QM) qt_add_library(${PROJ_NAME} SHARED out_CPP) qt_target_link_libraries(${PROJ_NAME} ${_LIBS} qad_${NAME} ${_${NAME}_PLUGIN_LIBS}) @@ -80,8 +80,8 @@ endmacro() macro(qad_project NAME _MODULES _LIBS) set(PROJ_NAME qad_${NAME}) - file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") find_qt(${QtVersions} Core ${_MODULES}) + qt_sources(SRC) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) qt_add_library(${PROJ_NAME} SHARED out_CPP) qt_target_link_libraries(${PROJ_NAME} ${_LIBS}) diff --git a/qad/QtWraps.cmake b/qad/QtWraps.cmake index 7abaf59..d00a4f8 100644 --- a/qad/QtWraps.cmake +++ b/qad/QtWraps.cmake @@ -127,6 +127,51 @@ macro(find_qt) endmacro() +# usage: qt_sources( [NO_DEFAULT] [DIR ] [ ...]) +# collect all sources, optionally in directory and +# additional filters . By default filter files with regexps +# "*.h", "*.hpp", "*.c", "*.cpp", "*.ui", "*.qrc", "*.rc", "*.ts" and "lang/*.ts". +# Default filters disabled with option NO_DEFAULT +macro(qt_sources OUT) + set(${OUT}) + set(_DIR "") + set(_IS_DIR 0) + set(_NO_DEFAULT 0) + set(_DEFAULT) + set(_REGEXP) + set(_REGEXP_WD) + foreach(_i ${ARGN}) + if (_IS_DIR) + set(_DIR "${_i}") + set(_IS_DIR 0) + else() + if ("x${_i}" STREQUAL "xDIR") + set(_IS_DIR 1) + else() + if ("x${_i}" STREQUAL "xNO_DEFAULT") + set(_NO_DEFAULT 1) + else() + list(APPEND _REGEXP ${_i}) + endif() + endif() + endif() + endforeach() + if (NOT "x${_DIR}" STREQUAL "x") + #file(TO_CMAKE_PATH "${_DIR}//" _DIR) + string(REPLACE "\\" "/" _DIR "${_DIR}/") + string(REPLACE "//" "/" _DIR "${_DIR}") + endif() + foreach(_i ${_REGEXP}) + list(APPEND _REGEXP_WD "${_DIR}${_i}") + endforeach() + if (NOT _NO_DEFAULT) + set(_DEFAULT "${_DIR}*.h" "${_DIR}*.hpp" "${_DIR}*.c" "${_DIR}*.cpp" "${_DIR}*.ui" "${_DIR}*.qrc" "${_DIR}*.rc" "${_DIR}*.ts" "${_DIR}lang/*.ts") + endif() + #message("${_DEFAULT}, ${_REGEXP_WD}") + file(GLOB ${OUT} ${_DEFAULT} ${_REGEXP_WD}) +endmacro() + + # usage: qt_wrap( ... [HDRS ] [CPPS ] [QMS ]) # prepare sources for compile # store headers to , all wrapped Qt4 files to _Qt4 and Qt5 files to _Qt5 @@ -196,6 +241,7 @@ macro(qt_wrap) set(CPP_LIST) set(UI_LIST) set(RES_LIST) + set(RC_LIST) set(TS_LIST) foreach(_i ${FILE_LIST}) get_filename_component(_EXT "${_i}" EXT) @@ -215,6 +261,9 @@ macro(qt_wrap) if ("x${_EXT}" STREQUAL "x.qrc") list(APPEND RES_LIST "${_i}") endif() + if ("x${_EXT}" STREQUAL "x.rc") + list(APPEND RC_LIST "${_i}") + endif() if ("x${_EXT}" STREQUAL "x.ts") list(APPEND TS_LIST "${_i}") endif() @@ -253,7 +302,9 @@ macro(qt_wrap) else() endif() endif() + #message("${${QM${_v}_VAR}}") list(APPEND ${CPP${_v}_VAR} ${CPP_LIST}) + list(APPEND ${CPP${_v}_VAR} ${RC_LIST}) list(APPEND ${CPP${_v}_VAR} ${MOCS${_v}}) list(APPEND ${CPP${_v}_VAR} ${CUIS${_v}}) list(APPEND ${CPP${_v}_VAR} ${CRES${_v}}) diff --git a/qad/blockview/blockeditor/CMakeLists.txt b/qad/blockview/blockeditor/CMakeLists.txt index 773fa1d..d259c1a 100644 --- a/qad/blockview/blockeditor/CMakeLists.txt +++ b/qad/blockview/blockeditor/CMakeLists.txt @@ -1,6 +1,6 @@ project(blockeditor) -file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") find_qt(${QtVersions} Core Gui Widgets) +qt_sources(SRC) qt_wrap(${SRC} CPPS out_CPP QMS out_QM) qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_blockview) diff --git a/qad/blockview/blockeditor/blockeditor_main.cpp b/qad/blockview/blockeditor/blockeditor_main.cpp index 8d623f2..645ec0b 100644 --- a/qad/blockview/blockeditor/blockeditor_main.cpp +++ b/qad/blockview/blockeditor/blockeditor_main.cpp @@ -4,6 +4,7 @@ int main(int argc, char * argv[]) { QApplication a(argc, argv); + a.setWindowIcon(QIcon(":/icons/blockview.png")); BlockEditor w; if (a.arguments().size() > 1) w.loadFile(a.arguments().back()); diff --git a/qad/blockview/blockeditor/icons/blockview.ico b/qad/blockview/blockeditor/icons/blockview.ico new file mode 100644 index 0000000000000000000000000000000000000000..90d261e84b29054d1213525e0291aa785fcfdf51 GIT binary patch literal 50190 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 +# else +# include +# endif + +1 ICON icons/blockview.ico + +VS_VERSION_INFO VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3fL +#ifdef _DEBUG +FILEFLAGS 0x9L +#else +FILEFLAGS 0x8L +#endif +FILEOS 0x40004L +FILETYPE 0x2L +FILESUBTYPE 0x0L +BEGIN +BLOCK "StringFileInfo" +BEGIN +BLOCK "040904b0" +BEGIN +VALUE "Comments", "\0" +VALUE "CompanyName", "BMSTU SM5\0" +VALUE "FileDescription", "Block Editor\0" +VALUE "FileVersion", "1,0,0,0\0" +VALUE "InternalName", "Block Editor\0" +VALUE "LegalTrademarks", "\0" +VALUE "OriginalFilename", "blockeditor.exe\0" +VALUE "PrivateBuild", "1\0" +VALUE "ProductName", "Block Editor\0" +VALUE "ProductVersion", "1, 0, 0, 0\0" +VALUE "SpecialBuild", "\0" +END +END +BLOCK "VarFileInfo" +BEGIN +VALUE "Translation", 0x409, 1200 +END +END diff --git a/qad/graphic/qpicalculator/CMakeLists.txt b/qad/graphic/qpicalculator/CMakeLists.txt index 731dae3..1ddf336 100644 --- a/qad/graphic/qpicalculator/CMakeLists.txt +++ b/qad/graphic/qpicalculator/CMakeLists.txt @@ -1,6 +1,6 @@ project(qpicalc) -file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") find_qt(${QtVersions} Core Gui Widgets) +qt_sources(SRC) qt_wrap(${SRC} CPPS out_CPP QMS out_QM) qt_add_executable(${PROJECT_NAME} WIN32 out_CPP) qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_graphic) diff --git a/qad/icons/blockview.xcf b/qad/icons/blockview.xcf new file mode 100644 index 0000000000000000000000000000000000000000..54eb897aebe0711506f5925092dfbe4b2d394a5f GIT binary patch literal 21607 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 literal 0 HcmV?d00001