WohlSoft
diff --git a/‎.github/workflows/macos-ci.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/macos-ci.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/ubuntu-ci.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/ubuntu-ci.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎.github/workflows/windows-ci.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/windows-ci.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎CMakeLists.txt‎
Lines changed: 7 additions & 0 deletions b/‎CMakeLists.txt‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎Engine/scenes/level/base/lvl_base_physics.h‎
Lines changed: 1 addition & 0 deletions b/‎Engine/scenes/level/base/lvl_base_physics.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Translator/CMakeLists.txt‎
Lines changed: 261 additions & 0 deletions b/‎Translator/CMakeLists.txt‎
Lines changed: 261 additions & 0 deletions
diff --git a/‎Translator/_resources/PressStart2P.ttf‎
80.5 KB b/‎Translator/_resources/PressStart2P.ttf‎
80.5 KB
diff --git a/‎Translator/_resources/icon/make_icns.sh‎
Lines changed: 24 additions & 0 deletions b/‎Translator/_resources/icon/make_icns.sh‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎Translator/_resources/icon/make_icns_linux.sh‎
Lines changed: 33 additions & 0 deletions b/‎Translator/_resources/icon/make_icns_linux.sh‎
Lines changed: 33 additions & 0 deletions
diff --git a/‎Translator/_resources/icon/translator16.png‎
6.47 KB b/‎Translator/_resources/icon/translator16.png‎
6.47 KB
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - stable
+      - wip-translator
   pull_request:
     branches:
       - master
 
@@ -6,6 +6,7 @@ on:
       - master
       - stable
       - versus-ci-ubuntu
+      - wip-translator
   pull_request:
     branches:
       - master
 
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - stable
+      - wip-translator
   pull_request:
     branches:
       - master
 
@@ -36,6 +36,7 @@ else()
 endif()
 
 option(PGE_STATIC_SDLMIXER "Prefer static assembly of SDL Mixer X and libraries" ${PGE_STATIC_SDLMIXER_PLATFORM_DEFAULT})
+option(ENABLE_ADDRESS_SANITIZER "Enable the Address Sanitizer GCC feature" OFF)
 
 if(PGE_STATIC_SDLMIXER)
     set(PGE_SHARED_SDLMIXER OFF)
@@ -171,6 +172,12 @@ if(PGE_ENABLE_QT AND NOT ANDROID AND NOT EMSCRIPTEN)
         qtDeployAdd(pge_maintainer)
     endif()
 
+    option(PGE_BUILD_TRANSLATOR "Build the Translator utility component (Qt5 required)" ON)
+    if(PGE_BUILD_TRANSLATOR)
+        add_subdirectory(Translator)
+        qtDeployAdd(pge_translator)
+    endif()
+
     pgeSetupQtDeploymet(${PGE_ENABLE_STATIC_QT} ${PGE_SHARED_SDLMIXER})
 endif()
 
 
@@ -38,6 +38,7 @@ class PGE_physBody
 public:
     PGE_physBody() = default;
     PGE_physBody(const PGE_physBody &o) = default;
+    PGE_physBody &operator=(const PGE_physBody &o) = default;
 
     // void processCollisions(PGE_RenderList &objs);
 
 
@@ -0,0 +1,261 @@
+cmake_minimum_required (VERSION 3.5)
+project(MoondustTranslator C CXX)
+
+if(POLICY CMP0071) # Automoc
+    cmake_policy(SET CMP0071 NEW)
+endif()
+
+# Tell CMake to run moc when necessary:
+set(CMAKE_AUTOMOC ON)
+
+# As moc files are generated in the binary dir, tell CMake
+# to always look for includes there:
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_INSTALL_RPATH ".")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${DEPENDENCIES_INSTALL_DIR}/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../_common/ # PGE-FL
+)
+link_directories(${DEPENDENCIES_INSTALL_DIR}/lib)
+
+# Version
+include(version.cmake)
+# Default GIT version
+include(../_common/git_version.cmake)
+# Common building properties and optimization flags
+include(../_common/build_props.cmake)
+# Build properties for executable projects
+include(../_common/executable_build_props.cmake)
+# Find extra libraries to link when using static Qt (use ${QT_EXTRA_LIBS}!)
+include(../_common/static_qt.cmake)
+
+include(../_common/translator-qt/translator.cmake)
+include(../_common/qt-modules/compat/pge_qt_compat.cmake)
+include(../_common/Utf8Main/utf8main.cmake)
+include(../_common/qt-modules/msg_box_preview/msg_box_preview.cmake)
+include(../_common/qt-modules/syntax_highlight/syntax_highlight.cmake)
+
+if(PGE_USE_QT5)
+    pge_cxx_standard(14)
+else()
+    pge_cxx_standard(17)
+endif()
+
+if(QT_DISABLE_NATIVE_FILE_DIALOG) # Disable native file dialogs when locally-built libPNG was been used to avoid the crash
+    message("== Translator: Native file dialogs will be DISABLED")
+    add_definitions(-DQT_DONT_USE_NATIVE_FILE_DIALOG)
+else()
+    message("== Translator: Native file dialogs will be ALLOWED if possible")
+endif()
+
+# =============== Translations ===============
+set(_LANGAUGES_TEMP_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/languages")
+set(PGE_LANG_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin/languages")
+
+file(GLOB PGE_LANG_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/languages/*.ts")
+
+set_source_files_properties(${PGE_LANG_SRC_FILES} PROPERTIES OUTPUT_LOCATION ${PGE_LANG_OUTPUT_DIR})
+set(PGE_LANG_BIN_FILES)
+pge_qt_add_translation(PGE_LANG_BIN_FILES ${PGE_LANG_SRC_FILES})
+add_custom_target(translator_translations DEPENDS ${PGE_LANG_BIN_FILES})
+
+if(NOT APPLE AND NOT EMSCRIPTEN)
+    install(FILES ${PGE_LANG_BIN_FILES} DESTINATION "${PGE_INSTALL_DIRECTORY}/languages")
+endif()
+# ===========================================
+
+# Executables fail to build with Qt 5 in the default configuration
+# without -fPIE. We add that here.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QT_Widgets_EXECUTABLE_COMPILE_FLAGS} ${QT_Concurrent_EXECUTABLE_COMPILE_FLAGS}")
+
+pge_qt_wrap_ui(UIS_HDRS
+    translator_main.ui
+    translate_field.ui
+    dialogue_item.ui
+    about/about.ui
+    lang_select/lang_select.ui
+)
+
+set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/_resources/translator.qrc)
+pge_qt_add_resources(RESOURCE_ADDED ${RESOURCE})
+
+if(QT_IMPORT_PLUGINS_MODULE)
+    set(QT_PLUGINS_CPP "${CMAKE_BINARY_DIR}/pge_translator_plugins.cpp")
+    file(WRITE
+            "${QT_PLUGINS_CPP}"
+            "${QT_IMPORT_PLUGINS_MODULE}")
+endif()
+
+set(PGE_TRANSLATOR_SRCS)
+
+list(APPEND PGE_TRANSLATOR_SRCS
+    ${PGETRANSLATOR_SRCS}
+    ${MSG_BOX_PREVIEW_SRC}
+    ${SYNTAX_HIGHLIGHT_SRC}
+    main.cpp
+    textdata/textdata.h
+    textdata/text_types.h
+    textdata/text_data_processor.h textdata/text_data_processor.cpp
+    textdata/files_list_model.h textdata/files_list_model.cpp
+    textdata/dialogues_list_model.h textdata/dialogues_list_model.cpp
+    textdata/files_strings.h textdata/files_strings.cpp
+    textdata/langs_list_model.h textdata/langs_list_model.cpp
+    textdata/delegates/checkbox_delegate.cpp textdata/delegates/checkbox_delegate.h
+    about/about.h about/about.cpp
+    lang_select/lang_select.h lang_select/lang_select.cpp
+    translator_main.h translator_main.cpp
+    translate_field.h translate_field.cpp
+    dialogue_item.h dialogue_item.cpp
+    common_features/app_path.h common_features/app_path.cpp
+    common_features/logger.h common_features/logger_sets.h common_features/logger.cpp
+    common_features/growing_text_edit.h common_features/growing_text_edit.cpp
+    ${UTF8MAIN_SRCS}
+    ${UIS_HDRS}
+    ${RESOURCE_ADDED}
+    ${QT_PLUGINS_CPP}
+)
+
+if(APPLE)
+    add_definitions(-DQ_OS_MACX) # Workaround for MOC
+    set_source_files_properties(${MOONDUST_QT_LANG_BIN_FILES} PROPERTIES GENERATED TRUE) # WORKAROUND
+    list(APPEND PGE_TRANSLATOR_SRCS
+        _resources/translator.icns
+        ${PGE_LANG_BIN_FILES}
+        ${MOONDUST_QT_LANG_BIN_FILES}
+        ${MOONDUST_QT_LANG_ICON_FILES}
+    )
+endif()
+
+if(WIN32)
+    list(APPEND PGE_TRANSLATOR_SRCS _resources/translator.rc)
+endif()
+
+add_executable(pge_translator
+    ${PGE_TRANSLATOR_SRCS}
+)
+
+add_dependencies(pge_translator
+    libpng_Local
+    FREETYPE_Local
+    PGE_FileFormatsQt
+    translator_translations
+    moondust_translations
+) # Needed for Qt to be linked
+
+add_library(PGE_Translator_QtLibs INTERFACE)
+
+# The Qt5Widgets_INCLUDES also includes the include directories for
+# dependencies QtCore and QtGui
+target_include_directories(PGE_Translator_QtLibs
+    INTERFACE
+    ${QT_Core_INCLUDE_DIRS}
+    ${QT_Gui_INCLUDE_DIRS}
+    ${QT_Widgets_INCLUDE_DIRS}
+    ${QT_Concurrent_INCLUDE_DIRS}
+)
+
+# We need add -DQT_WIDGETS_LIB when using QtWidgets in Qt 5.
+target_compile_definitions(PGE_Translator_QtLibs
+    INTERFACE
+    ${QT_Core_DEFINITIONS}
+    ${QT_Gui_DEFINITIONS}
+    ${QT_Widgets_DEFINITIONS}
+    ${QT_Concurrent_DEFINITIONS}
+    -DPGE_FILES_QT
+)
+
+string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+if(${CMAKE_BUILD_TYPE_LOWER} STREQUAL "debug")
+    target_compile_definitions(pge_translator
+        PRIVATE
+        -DDEBUG_BUILD
+    )
+endif()
+
+target_link_libraries(PGE_Translator_QtLibs INTERFACE
+    ${QT_EXTRA_LIBS_PRE}
+    PGE_FileFormatsQt
+    ${QT_Concurrent_LIBRARIES}
+    ${QT_Widgets_LIBRARIES}
+    ${QT_Gui_LIBRARIES}
+    ${QT_Core_LIBRARIES}
+    ${QT_EXTRA_LIBS}
+)
+if(QT_PTHREAD)
+    target_link_libraries(PGE_Translator_QtLibs INTERFACE ${QT_PTHREAD})
+endif()
+
+
+set(PGE_TRANSLATOR_LINK_LIBS)
+set(PGE_TRANSLATOR_INSTALLS)
+
+list(APPEND PGE_TRANSLATOR_INSTALLS
+    pge_translator
+)
+
+list(APPEND PGE_TRANSLATOR_LINK_LIBS PGE_Translator_QtLibs)
+
+if(WIN32)
+    list(APPEND PGE_TRANSLATOR_LINK_LIBS
+        version
+    )
+else()
+    if(UNIX AND NOT APPLE)
+        list(APPEND PGE_TRANSLATOR_LINK_LIBS dl)
+    endif()
+endif()
+
+if(NOT EMSCRIPTEN AND NOT MSVC)
+    if(WIN32)
+        set_target_properties(pge_translator PROPERTIES WIN32_EXECUTABLE ON)
+        if(NOT PGE_ENABLE_STATIC_QT)
+            list(APPEND PGE_TRANSLATOR_LINK_LIBS "-static")
+        endif()
+    endif()
+    find_library(_LIB_PTHREAD pthread)
+    if(_LIB_PTHREAD)
+        list(APPEND PGE_TRANSLATOR_LINK_LIBS ${_LIB_PTHREAD})
+    endif()
+endif()
+
+if(APPLE)
+    set_target_properties(pge_translator PROPERTIES
+        OUTPUT_NAME "Moondust Translator"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/_resources/translator.plist.in"
+        MACOSX_BUNDLE_EXECUTABLE_NAME "pge_translator"
+        MACOSX_BUNDLE_GUI_IDENTIFIER "ru.wohlsoft.pge-translator"
+        MACOSX_BUNDLE_SHORT_VERSION_STRING "${TRANSLATOR_VERSION_STRING}"
+        MACOSX_BUNDLE_LONG_VERSION_STRING "${TRANSLATOR_VERSION_STRING}"
+        MACOSX_BUNDLE_ICON_FILE "translator.icns"
+        CPACK_BUNDLE_NAME "Moondust Translator"
+        MACOSX_BUNDLE_INFO_STRING "Episode and levels localization tool"
+    )
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/_resources/translator.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+    set_source_files_properties(${PGE_LANG_BIN_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/languages")
+    set_source_files_properties(${MOONDUST_QT_LANG_BIN_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/languages")
+    set_source_files_properties(${MOONDUST_QT_LANG_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/languages")
+
+    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+    list(APPEND PGE_TRANSLATOR_LINK_LIBS ${COREFOUNDATION_LIBRARY})
+endif()
+
+target_link_libraries(pge_translator
+    ${PGE_TRANSLATOR_LINK_LIBS}
+)
+
+if(ENABLE_ADDRESS_SANITIZER)
+    target_compile_options(pge_translator PRIVATE -fsanitize=address)
+    target_link_options(pge_translator PRIVATE -fsanitize=address)
+endif()
+
+pge_set_nopie(pge_translator)
+
+install(TARGETS ${PGE_TRANSLATOR_INSTALLS}
+    RUNTIME DESTINATION "${PGE_INSTALL_DIRECTORY}"
+    BUNDLE DESTINATION "${PGE_INSTALL_DIRECTORY}"
+)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+TYPE="maintainer"
+
+mkdir $TYPE".iconset"
+cp $TYPE"16.png" $TYPE".iconset/icon_16x16.png"
+sips -Z 32 $TYPE".iconset/icon_16x16.png" --out $TYPE".iconset/icon_16x16@2x.png"
+cp $TYPE"32.png" $TYPE".iconset/icon_32x32.png"
+sips -Z 64 $TYPE".iconset/icon_32x32.png" --out $TYPE".iconset/icon_32x32@2x.png"
+cp $TYPE"48.png" $TYPE".iconset/icon_48x48.png"
+sips -Z 96 $TYPE".iconset/icon_48x48.png" --out $TYPE".iconset/icon_48x48@2x.png"
+cp $TYPE"256.png" $TYPE".iconset/icon_256x256.png"
+cp $TYPE"256.png" $TYPE".iconset/icon_128x128@2x.png"
+sips -Z 512 $TYPE".iconset/icon_256x256.png" --out $TYPE".iconset/icon_256x256@2x.png"
+#sips -Z 512 $TYPE".iconset/icon_256x256.png" --out $TYPE".iconset/icon_512x512.png"
+sips -Z 128 $TYPE".iconset/icon_256x256.png" --out $TYPE".iconset/icon_128x128.png"
+
+echo "makeIcon..."
+
+iconutil -c icns "$TYPE.iconset"
+mv $TYPE".icns" ../
+
+rm -Rf $TYPE".iconset"
+
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# This script requires ImageMagick and icnsutils packages being installed
+
+TYPE="translator"
+if [[ "$TYPE" == "" ]]; then
+echo "Error: empty name!"
+exit 1
+fi
+
+mkdir $TYPE".iconset"
+cp $TYPE"16.png" $TYPE".iconset/icon_16x16.png"
+cp $TYPE"32.png" $TYPE".iconset/icon_32x32.png"
+# convert $TYPE".iconset/icon_32x32.png" -scale 64 $TYPE".iconset/icon_64x64.png"
+cp $TYPE"48.png" $TYPE".iconset/icon_48x48.png"
+# convert $TYPE".iconset/icon_48x48.png" -scale 96 $TYPE".iconset/icon_96x96.png"
+cp $TYPE"256.png" $TYPE".iconset/icon_256x256.png"
+convert $TYPE".iconset/icon_256x256.png" -scale 512  $TYPE".iconset/icon_512x512.png"
+convert $TYPE".iconset/icon_256x256.png" -scale 128  $TYPE".iconset/icon_128x128.png"
+
+#convert $TYPE".iconset/icon_256x256.png" -scale 512 $TYPE".iconset/icon_256x256@2x.png"
+#sips -Z 512 $TYPE".iconset/icon_256x256.png" --out $TYPE".iconset/icon_256x256@2x.png"
+#sips -Z 512 $TYPE".iconset/icon_256x256.png" --out $TYPE".iconset/icon_512x512.png"
+#sips -Z 128 $TYPE".iconset/icon_256x256.png" --out $TYPE".iconset/icon_128x128.png"
+
+#read -n 1
+
+echo "makeIcon..."
+
+png2icns $TYPE.icns $TYPE".iconset/icon_"*.png
+# mv $TYPE".icns" ../
+
+rm -Rf $TYPE".iconset"