summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorTeus Benschop <teusjannette@gmail.com>2017-10-06 12:24:31 +0200
committerTeus Benschop <teusjannette@gmail.com>2017-10-06 12:24:31 +0200
commit90d2181239761f8950b95768d3b037843e9e8b50 (patch)
tree6cc667ab420cc04029de2de7e361d2305e214595 /cmake
parent1ea03c0fce8066c1e22188447b4a6ca4dcef1201 (diff)
New upstream version 2.11.0
Diffstat (limited to 'cmake')
-rw-r--r--cmake/BTBinaryPackageMacOS.cmake53
-rw-r--r--cmake/BTBinaryPackageWindows.cmake148
-rw-r--r--cmake/BTDocumentation.cmake19
-rw-r--r--cmake/BTSourceFileList.cmake226
-rw-r--r--cmake/BTTests.cmake42
-rw-r--r--cmake/BTTranslationMacros.cmake131
-rw-r--r--cmake/BTUITranslation.cmake60
-rw-r--r--cmake/BTUITranslationLink.cmake22
-rw-r--r--cmake/FindSword.cmake8
-rw-r--r--cmake/docs/docs.xsl6
-rw-r--r--cmake/docs/docs_freebsd.xsl6
-rw-r--r--cmake/docs/docs_mac.xsl9
-rw-r--r--cmake/docs/handbook_po4a.conf2
-rw-r--r--cmake/docs/howto_po4a.conf2
-rw-r--r--cmake/docs/pdf_mac.xsl2
-rw-r--r--cmake/platforms/linux/bibletime.desktop.cmake6
-rw-r--r--cmake/platforms/macos/Info.plist30
-rw-r--r--cmake/platforms/macos/qt.conf2
-rwxr-xr-xcmake/util/release-bibletime8
19 files changed, 461 insertions, 321 deletions
diff --git a/cmake/BTBinaryPackageMacOS.cmake b/cmake/BTBinaryPackageMacOS.cmake
index 62a6f42..97a97e6 100644
--- a/cmake/BTBinaryPackageMacOS.cmake
+++ b/cmake/BTBinaryPackageMacOS.cmake
@@ -1,41 +1,4 @@
IF(APPLE)
- # Qt Plugins
- IF(Qt5Core_FOUND)
- GET_TARGET_PROPERTY(ICON_PLUGIN Qt5::QICOPlugin LOCATION)
- GET_TARGET_PROPERTY(GIF_PLUGIN Qt5::QGifPlugin LOCATION)
- GET_TARGET_PROPERTY(JPG_PLUGIN Qt5::QJpegPlugin LOCATION)
- GET_TARGET_PROPERTY(SVG_PLUGIN Qt5::QSvgPlugin LOCATION)
- GET_TARGET_PROPERTY(TIFF_PLUGIN Qt5::QTiffPlugin LOCATION)
- GET_TARGET_PROPERTY(BMP_PLUGIN Qt5::QWbmpPlugin LOCATION)
- GET_TARGET_PROPERTY(MNG_PLUGIN Qt5::QMngPlugin LOCATION)
- INSTALL(
- FILES
- "${ICON_PLUGIN}"
- "${GIF_PLUGIN}"
- "${JPG_PLUGIN}"
- "${SVG_PLUGIN}"
- "${TIFF_PLUGIN}"
- "${BMP_PLUGIN}"
- "${MNG_PLUGIN}"
- DESTINATION "${BT_DESTINATION}/plugins"
- )
- ELSE(Qt5Core_FOUND)
- INSTALL(
- DIRECTORY "${QT_PLUGINS_DIR}/iconengines" "${QT_PLUGINS_DIR}/imageformats"
- DESTINATION "${BT_DESTINATION}/plugins"
- )
-
- INSTALL(
- DIRECTORY "${QT_LIBRARY_DIR}/QtGui.framework/Resources/qt_menu.nib"
- DESTINATION "${BT_DESTINATION}/../Frameworks/QtGui.framework/Resources"
- )
- ENDIF(Qt5Core_FOUND)
-
- INSTALL(
- FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/platforms/macos/qt.conf"
- DESTINATION "${BT_SHARE_PATH}/../Resources"
- )
-
# Install the Sword library
INSTALL(
FILES "${Sword_LIBRARY_DIRS}/lib${Sword_LIBRARIES}-${Sword_VERSION}.dylib"
@@ -43,21 +6,10 @@ IF(APPLE)
)
IF (CMAKE_BUILD_TYPE STREQUAL "Release")
-
+ SET(QT_MACDEPLOYQT_EXECUTABLE "${_qt5Core_install_prefix}/bin/macdeployqt")
INSTALL(CODE "
- FILE(GLOB_RECURSE QTPLUGINS
- \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
-
- SET(BU_CHMOD_BUNDLE_ITEMS ON) # Add write permissions for libs that need it like libssl
- INCLUDE(BundleUtilities)
-
- FIXUP_BUNDLE(
- \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/BibleTime\"
- \"\${QTPLUGINS}\"
- \"\"
- )
+ EXECUTE_PROCESS(COMMAND ${QT_MACDEPLOYQT_EXECUTABLE} \"\${CMAKE_INSTALL_PREFIX}/${BT_DESTINATION}/../..\")
")
-
ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release")
SET(CPACK_BUNDLE_NAME "BibleTime")
@@ -71,4 +23,3 @@ IF(APPLE)
INCLUDE(CPack)
ENDIF(APPLE)
-
diff --git a/cmake/BTBinaryPackageWindows.cmake b/cmake/BTBinaryPackageWindows.cmake
index 28b7a11..14ed01a 100644
--- a/cmake/BTBinaryPackageWindows.cmake
+++ b/cmake/BTBinaryPackageWindows.cmake
@@ -3,15 +3,16 @@ IF(WIN32 AND NOT UNIX)
# Libs needed for packaging
FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(CURL REQUIRED)
+ FIND_PACKAGE(Sword REQUIRED)
- SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BibleTime for Windows svn")
+ SET(CPACK_PACKAGE_NAME "BibleTime")
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BibleTime for Windows")
SET(CPACK_PACKAGE_VENDOR "http://www.bibletime.info")
SET(CPACK_PACKAGE_VERSION_MAJOR ${BT_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${BT_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${BT_VERSION_PATCH})
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BibleTime")
- SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
# There is a bug in NSI that does not handle full unix paths properly. Make
# sure there is at least one set of four (4) backlasshes.
@@ -19,144 +20,121 @@ IF(WIN32 AND NOT UNIX)
# We need the libraries, and they're not pulled in automatically
SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
-IF (Qt5Core_FOUND)
SET(QT_BINARY_DIR "${Qt5Core_DIR}/../../../bin")
+ SET(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins")
INSTALL(FILES
- "${QT_BINARY_DIR}/icudt51d.dll"
- "${QT_BINARY_DIR}/icuin51d.dll"
- "${QT_BINARY_DIR}/icuuc51d.dll"
+ "${QT_BINARY_DIR}/icudt54.dll"
+ "${QT_BINARY_DIR}/icuin54.dll"
+ "${QT_BINARY_DIR}/icuuc54.dll"
"${QT_BINARY_DIR}/libEGLd.dll"
"${QT_BINARY_DIR}/libGLESv2d.dll"
"${QT_BINARY_DIR}/Qt5Cored.dll"
"${QT_BINARY_DIR}/Qt5Guid.dll"
- "${QT_BINARY_DIR}/Qt5Multimediad.dll"
- "${QT_BINARY_DIR}/Qt5MultimediaWidgetsd.dll"
"${QT_BINARY_DIR}/Qt5Networkd.dll"
- "${QT_BINARY_DIR}/Qt5OpenGLd.dll"
+ "${QT_BINARY_DIR}/Qt5PrintSupportd.dll"
"${QT_BINARY_DIR}/Qt5Qmld.dll"
"${QT_BINARY_DIR}/Qt5Quickd.dll"
- "${QT_BINARY_DIR}/Qt5Positioningd.dll"
- "${QT_BINARY_DIR}/Qt5PrintSupportd.dll"
- "${QT_BINARY_DIR}/Qt5Sensorsd.dll"
- "${QT_BINARY_DIR}/Qt5Sqld.dll"
"${QT_BINARY_DIR}/Qt5Svgd.dll"
- "${QT_BINARY_DIR}/Qt5WebKitd.dll"
- "${QT_BINARY_DIR}/Qt5WebKitWidgetsd.dll"
+ "${QT_BINARY_DIR}/Qt5WebChanneld.dll"
+ "${QT_BINARY_DIR}/Qt5WebEngineCored.dll"
+ "${QT_BINARY_DIR}/Qt5WebEngineWidgetsd.dll"
"${QT_BINARY_DIR}/Qt5Widgetsd.dll"
"${QT_BINARY_DIR}/Qt5Xmld.dll"
- "${QT_BINARY_DIR}/Qt5XmlPatternsd.dll"
+ "${QT_BINARY_DIR}/QtWebEngineProcess.exe"
DESTINATION "${BT_DESTINATION}"
CONFIGURATIONS "Debug"
)
INSTALL(FILES
- "${QT_BINARY_DIR}/icudt51.dll"
- "${QT_BINARY_DIR}/icuin51.dll"
- "${QT_BINARY_DIR}/icuuc51.dll"
+ "${QT_BINARY_DIR}/icudt54.dll"
+ "${QT_BINARY_DIR}/icuin54.dll"
+ "${QT_BINARY_DIR}/icuuc54.dll"
"${QT_BINARY_DIR}/libEGL.dll"
"${QT_BINARY_DIR}/libGLESv2.dll"
"${QT_BINARY_DIR}/Qt5Core.dll"
"${QT_BINARY_DIR}/Qt5Gui.dll"
- "${QT_BINARY_DIR}/Qt5Multimedia.dll"
- "${QT_BINARY_DIR}/Qt5MultimediaWidgets.dll"
"${QT_BINARY_DIR}/Qt5Network.dll"
- "${QT_BINARY_DIR}/Qt5OpenGL.dll"
+ "${QT_BINARY_DIR}/Qt5PrintSupport.dll"
"${QT_BINARY_DIR}/Qt5Qml.dll"
"${QT_BINARY_DIR}/Qt5Quick.dll"
- "${QT_BINARY_DIR}/Qt5Positioning.dll"
- "${QT_BINARY_DIR}/Qt5PrintSupport.dll"
- "${QT_BINARY_DIR}/Qt5Sensors.dll"
- "${QT_BINARY_DIR}/Qt5Sql.dll"
"${QT_BINARY_DIR}/Qt5Svg.dll"
- "${QT_BINARY_DIR}/Qt5WebKit.dll"
- "${QT_BINARY_DIR}/Qt5WebKitWidgets.dll"
+ "${QT_BINARY_DIR}/Qt5WebChannel.dll"
+ "${QT_BINARY_DIR}/Qt5WebEngineCore.dll"
+ "${QT_BINARY_DIR}/Qt5WebEngineWidgets.dll"
"${QT_BINARY_DIR}/Qt5Widgets.dll"
"${QT_BINARY_DIR}/Qt5Xml.dll"
- "${QT_BINARY_DIR}/Qt5XmlPatterns.dll"
+ "${QT_BINARY_DIR}/QtWebEngineProcess.exe"
+ "${QT_BINARY_DIR}/D3Dcompiler_47.dll"
+ "${QT_BINARY_DIR}/opengl32sw.dll"
+ "${QT_PLUGINS_DIR}/../resources/icudtl.dat"
DESTINATION "${BT_DESTINATION}"
CONFIGURATIONS "Release"
)
- INSTALL(FILES
- "cmake/platforms/windows/qt.conf"
- DESTINATION "${BT_DESTINATION}"
+ INSTALL(FILES
+ "${QT_PLUGINS_DIR}/bearer/qgenericbearer.dll"
+ "${QT_PLUGINS_DIR}/bearer/qnativewifibearer.dll"
+ DESTINATION "${BT_DESTINATION}/bearer"
CONFIGURATIONS "Release"
)
- SET(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins")
INSTALL(FILES
"${QT_PLUGINS_DIR}/iconengines/qsvgicon.dll"
- DESTINATION "${BT_DESTINATION}/plugins/iconengines"
+ DESTINATION "${BT_DESTINATION}/iconengines"
CONFIGURATIONS "Release"
)
INSTALL(FILES
- "${QT_PLUGINS_DIR}/platforms/qminimal.dll"
- "${QT_PLUGINS_DIR}/platforms/qoffscreen.dll"
"${QT_PLUGINS_DIR}/platforms/qwindows.dll"
- DESTINATION "${BT_DESTINATION}/plugins/platforms"
+ DESTINATION "${BT_DESTINATION}/platforms"
CONFIGURATIONS "Release"
)
INSTALL(FILES
- "${QT_PLUGINS_DIR}/imageformats/qgif.dll"
- "${QT_PLUGINS_DIR}/imageformats/qico.dll"
- "${QT_PLUGINS_DIR}/imageformats/qjpeg.dll"
- "${QT_PLUGINS_DIR}/imageformats/qmng.dll"
- "${QT_PLUGINS_DIR}/imageformats/qsvg.dll"
- "${QT_PLUGINS_DIR}/imageformats/qtiff.dll"
- DESTINATION "${BT_DESTINATION}/plugins/imageformats"
+ "${QT_PLUGINS_DIR}/printsupport/windowsprintersupport.dll"
+ DESTINATION "${BT_DESTINATION}/printsupport"
CONFIGURATIONS "Release"
)
-ELSE (Qt5Core_FOUND)
- SET(QT_BINARY_DIR "${QT_LIBRARY_DIR}/../bin")
INSTALL(FILES
- "${QT_BINARY_DIR}/QtWebKitd4.dll"
- "${QT_BINARY_DIR}/QtGuid4.dll"
- "${QT_BINARY_DIR}/QtXmld4.dll"
- "${QT_BINARY_DIR}/QtTestd4.dll"
- "${QT_BINARY_DIR}/QtNetworkd4.dll"
- "${QT_BINARY_DIR}/QtCored4.dll"
- "${QT_BINARY_DIR}/phonond4.dll"
- "${QT_BINARY_DIR}/QtSvgd4.dll"
- "${QT_BINARY_DIR}/QtXmlPatternsd4.dll"
- DESTINATION "${BT_DESTINATION}"
- CONFIGURATIONS "Debug"
- )
- INSTALL(FILES
- "${QT_BINARY_DIR}/QtWebKit4.dll"
- "${QT_BINARY_DIR}/QtGui4.dll"
- "${QT_BINARY_DIR}/QtXml4.dll"
- "${QT_BINARY_DIR}/QtTest4.dll"
- "${QT_BINARY_DIR}/QtNetwork4.dll"
- "${QT_BINARY_DIR}/QtCore4.dll"
- "${QT_BINARY_DIR}/phonon4.dll"
- "${QT_BINARY_DIR}/QtSvg4.dll"
- "${QT_BINARY_DIR}/QtXmlPatterns4.dll"
+ "${QT_PLUGINS_DIR}/../resources/qtwebengine_resources.pak"
+ "${QT_PLUGINS_DIR}/../resources/qtwebengine_resources_100p.pak"
+ "${QT_PLUGINS_DIR}/../resources/qtwebengine_resources_200p.pak"
DESTINATION "${BT_DESTINATION}"
CONFIGURATIONS "Release"
)
- # Qt Plugins
INSTALL(FILES
- "${QT_PLUGINS_DIR}/iconengines/qsvgicon4.dll"
- DESTINATION "${BT_DESTINATION}/plugins/iconengines"
+ "${QT_PLUGINS_DIR}/imageformats/qdds.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qgif.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qico.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qicns.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qjpeg.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qsvg.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qtga.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qtiff.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qwbmp.dll"
+ "${QT_PLUGINS_DIR}/imageformats/qwebp.dll"
+ DESTINATION "${BT_DESTINATION}/imageformats"
CONFIGURATIONS "Release"
)
- INSTALL(FILES
- "${QT_PLUGINS_DIR}/imageformats/qgif4.dll"
- "${QT_PLUGINS_DIR}/imageformats/qico4.dll"
- "${QT_PLUGINS_DIR}/imageformats/qjpeg4.dll"
- "${QT_PLUGINS_DIR}/imageformats/qmng4.dll"
- "${QT_PLUGINS_DIR}/imageformats/qsvg4.dll"
- "${QT_PLUGINS_DIR}/imageformats/qtiff4.dll"
- DESTINATION "${BT_DESTINATION}/plugins/imageformats"
+ INSTALL(DIRECTORY
+ "${QT_BINARY_DIR}/../translations"
+ DESTINATION "${BT_DESTINATION}"
CONFIGURATIONS "Release"
)
-ENDIF (Qt5Core_FOUND)
# This adds in the required Windows system libraries
MESSAGE(STATUS "INSTALL Microsoft Redist ${MSVC_REDIST}" )
INSTALL(PROGRAMS ${MSVC_REDIST} DESTINATION bin)
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
- ExecWait \\\"$INSTDIR\\\\bin\\\\vcredist_x86.exe /q\\\"
- Delete \\\"$INSTDIR\\\\bin\\\\vcredist_x86.exe\\\"
+ ExecWait \\\"$INSTDIR\\\\bin\\\\vcredist.x86.exe /quiet\\\"
+ Delete \\\"$INSTDIR\\\\bin\\\\vcredist.x86.exe\\\"
")
+ IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ SET(ZLIB_LIBRARY ${ZLIB_LIBRARY_DEBUG})
+ ELSE()
+ SET(ZLIB_LIBRARY ${ZLIB_LIBRARY_RELEASE})
+ ENDIF()
+
+ MESSAGE(STATUS "INSTALL Zlib_LIBRARY ${ZLIB_LIBRARY}" )
+ STRING(REPLACE ".lib" ".dll" ZLIB_DLL "${ZLIB_LIBRARY}")
+ INSTALL(FILES ${ZLIB_DLL} DESTINATION ${BT_DESTINATION})
+
MESSAGE(STATUS "INSTALL CLucene_LIBRARY ${CLucene_LIBRARY}" )
STRING(REPLACE ".lib" ".dll" CLUCENE_DLL "${CLucene_LIBRARY}")
INSTALL(FILES ${CLUCENE_DLL} DESTINATION ${BT_DESTINATION})
@@ -169,10 +147,14 @@ ENDIF (Qt5Core_FOUND)
STRING(REPLACE "_imp.lib" ".dll" CURL_DLL "${CURL_LIBRARY}")
INSTALL(FILES ${CURL_DLL} DESTINATION ${BT_DESTINATION})
+ SET(SWORD_DLL "${Sword_LIBRARY_DIRS}/sword.dll")
+ MESSAGE(STATUS "INSTALL SWORD_LIBRARY ${SWORD_DLL}" )
+ INSTALL(FILES ${SWORD_DLL} DESTINATION ${BT_DESTINATION})
+
# Some options for the CPack system. These should be pretty self-evident
SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\pics\\\\icons\\\\bibletime.png")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\bibletime.exe")
- SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} for Windows")
+ SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.bibletime.info")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.bibletime.info")
SET(CPACK_NSIS_CONTACT "bt-devel@crosswire.org")
diff --git a/cmake/BTDocumentation.cmake b/cmake/BTDocumentation.cmake
index c696014..3e004b7 100644
--- a/cmake/BTDocumentation.cmake
+++ b/cmake/BTDocumentation.cmake
@@ -1,4 +1,8 @@
#handbook (install images from en/ to all languages)
+
+# For grouping handbooks in Visual Studio
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+
FILE(GLOB INSTALL_HANDBOOK_IMAGES "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/en/html/*.png")
FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
FILE(GLOB INSTALL_HANDBOOK_HTML_FILES_${HANDBOOK_LOCALE_LANG} "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/${HANDBOOK_LOCALE_LANG}/html/*.html")
@@ -21,15 +25,21 @@ ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en")
IF(CMAKE_SYSTEM MATCHES "BSD")
SET(BT_DOCBOOK_XSL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs_freebsd.xsl")
ELSE(CMAKE_SYSTEM MATCHES "BSD")
- SET(BT_DOCBOOK_XSL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs.xsl")
+ IF (APPLE)
+ SET(BT_DOCBOOK_XSL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs_mac.xsl")
+ ELSE (APPLE)
+ SET(BT_DOCBOOK_XSL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs.xsl")
+ ENDIF (APPLE)
ENDIF(CMAKE_SYSTEM MATCHES "BSD")
# Update handbook
ADD_CUSTOM_TARGET("handbook")
+SET_TARGET_PROPERTIES("handbook" PROPERTIES FOLDER "Documentation")
ADD_CUSTOM_TARGET("handbook_translations"
COMMAND po4a -v --no-backups -k 0 cmake/docs/handbook_po4a.conf
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+SET_TARGET_PROPERTIES("handbook_translations" PROPERTIES FOLDER "Documentation")
FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
ADD_CUSTOM_TARGET("handbook_${HANDBOOK_LOCALE_LANG}"
@@ -37,6 +47,8 @@ FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/${HANDBOOK_LOCALE_LANG}/html/")
ADD_DEPENDENCIES("handbook_${HANDBOOK_LOCALE_LANG}" "handbook_translations")
ADD_DEPENDENCIES("handbook" "handbook_${HANDBOOK_LOCALE_LANG}")
+ SET_TARGET_PROPERTIES("handbook_${HANDBOOK_LOCALE_LANG}" PROPERTIES FOLDER "Documentation")
+
ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS})
IF(CMAKE_SYSTEM MATCHES "BSD")
@@ -51,6 +63,7 @@ ENDIF(CMAKE_SYSTEM MATCHES "BSD")
# Update handbook pdf
ADD_CUSTOM_TARGET("handbook_pdf")
+SET_TARGET_PROPERTIES("handbook_pdf" PROPERTIES FOLDER "Documentation")
FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
ADD_CUSTOM_TARGET("handbook_pdf_${HANDBOOK_LOCALE_LANG}"
@@ -58,13 +71,16 @@ FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
COMMAND fop -xml ../../${HANDBOOK_LOCALE_LANG}/docbook/index.docbook -xsl ${BT_DOCBOOK_PDF_XSL} -pdf ../../${HANDBOOK_LOCALE_LANG}/pdf/handbook.pdf
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/handbook/en/html/")
ADD_DEPENDENCIES("handbook_pdf" "handbook_pdf_${HANDBOOK_LOCALE_LANG}")
+ SET_TARGET_PROPERTIES("handbook_pdf_${HANDBOOK_LOCALE_LANG}" PROPERTIES FOLDER "Documentation")
ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS})
# Update howto
ADD_CUSTOM_TARGET("howto")
+SET_TARGET_PROPERTIES("howto" PROPERTIES FOLDER "Documentation")
ADD_CUSTOM_TARGET("howto_translations"
COMMAND po4a -v --no-backups -k 0 cmake/docs/howto_po4a.conf
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+SET_TARGET_PROPERTIES("howto_translations" PROPERTIES FOLDER "Documentation")
ADD_DEPENDENCIES("howto" "howto_translations")
@@ -74,4 +90,5 @@ FOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en")
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/docs/howto/${HOWTO_LOCALE_LANG}/html/")
ADD_DEPENDENCIES("howto_${HOWTO_LOCALE_LANG}" "howto_translations")
ADD_DEPENDENCIES("howto" "howto_${HOWTO_LOCALE_LANG}")
+ SET_TARGET_PROPERTIES("howto_${HOWTO_LOCALE_LANG}" PROPERTIES FOLDER "Documentation")
ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS})
diff --git a/cmake/BTSourceFileList.cmake b/cmake/BTSourceFileList.cmake
index ed7273b..c2cd5ce 100644
--- a/cmake/BTSourceFileList.cmake
+++ b/cmake/BTSourceFileList.cmake
@@ -2,12 +2,9 @@
SET(bibletime_SRC
# Toplevel files:
src/bibletime.cpp
- src/bibletime_dbus.cpp
- src/bibletime_dbus_adaptor.cpp
src/bibletime_init.cpp
src/bibletime_slots.cpp
src/bibletimeapp.cpp
- src/btglobal.cpp
src/main.cpp
)
@@ -20,6 +17,9 @@ SET(bibletime_SRC_BACKEND
src/backend/btinstallbackend.cpp
src/backend/btinstallmgr.cpp
src/backend/btinstallthread.cpp
+ src/backend/btsourcesthread.cpp
+ src/backend/btbookmarksmodel.cpp
+ src/backend/btglobal.cpp
)
SOURCE_GROUP("src\\backend" FILES ${bibletime_SRC_BACKEND})
@@ -64,8 +64,6 @@ SET(bibletime_SRC_BACKEND_FILTERS
src/backend/filters/plaintohtml.cpp
src/backend/filters/teitohtml.cpp
src/backend/filters/thmltohtml.cpp
- src/backend/filters/thmltoplain.cpp
- src/backend/filters/btosismorphsegmentation.cpp
)
SOURCE_GROUP("src\\backend\\filters" FILES ${bibletime_SRC_BACKEND_FILTERS})
@@ -89,6 +87,7 @@ SET(bibletime_SRC_BACKEND_RENDERING
src/backend/rendering/chtmlexportrendering.cpp
src/backend/rendering/cplaintextexportrendering.cpp
src/backend/rendering/ctextrendering.cpp
+ src/backend/rendering/btinforendering.cpp
)
SOURCE_GROUP("src\\backend\\rendering" FILES ${bibletime_SRC_BACKEND_RENDERING})
@@ -104,12 +103,19 @@ SET(bibletime_SRC_BACKEND_MANAGERS
SOURCE_GROUP("src\\backend\\managers" FILES ${bibletime_SRC_BACKEND_MANAGERS})
+SET(bibletime_SRC_BACKEND_MODELS
+ src/backend/models/btmoduletextmodel.cpp
+ src/backend/models/btlistmodel.cpp
+)
+
+SOURCE_GROUP("src\\backend\\models" FILES ${bibletime_SRC_BACKEND_MODELS})
+
SET(bibletime_SRC_UTIL
# Utilities:
src/util/cresmgr.cpp
- src/util/directory.cpp
+ src/util/bticons.cpp
src/util/btmodules.cpp
- src/util/geticon.cpp
+ src/util/directory.cpp
src/util/tool.cpp
)
@@ -127,59 +133,43 @@ SET(bibletime_SRC_FRONTEND
src/frontend/btmodulechooserdialog.cpp
src/frontend/btmoduleindexdialog.cpp
src/frontend/btopenworkaction.cpp
+ src/frontend/btprinter.cpp
+ src/frontend/btwebenginepage.cpp
+ src/frontend/btwebengineview.cpp
src/frontend/cexportmanager.cpp
src/frontend/cinfodisplay.cpp
src/frontend/cmdiarea.cpp
- src/frontend/cprinter.cpp
src/frontend/crossrefrendering.cpp
src/frontend/messagedialog.cpp
)
SOURCE_GROUP("src\\frontend" FILES ${bibletime_SRC_FRONTEND})
-SET(bibletime_SRC_FRONTEND_BOOKSHELFMANAGER
- # Bookshelf manager frontend:
- src/frontend/bookshelfmanager/btconfigdialog.cpp
- src/frontend/bookshelfmanager/btmodulemanagerdialog.cpp
- src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.cpp
-)
-
-SOURCE_GROUP("src\\frontend\\bookshelfmanager" FILES ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER})
-
-SET(bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_INDEXPAGE
- # Bookshelf manager frontend index page:
- src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
-)
-
-SOURCE_GROUP("src\\frontend\\bookshelfmanager\\indexpage" FILES ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_INDEXPAGE})
-
-SET(bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_INSTALLPAGE
- # Bookshelf manager frontend install page:
- src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.cpp
- src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.cpp
- src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
- src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.cpp
- src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
- src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.cpp
- src/frontend/bookshelfmanager/installpage/btinstallpagemodel.cpp
- src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.cpp
-)
-
-SOURCE_GROUP("src\\frontend\\bookshelfmanager\\installpage" FILES ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_INSTALLPAGE})
-
-SET(bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_REMOVEPAGE
- # Bookshelf manager frontend remove page:
- src/frontend/bookshelfmanager/removepage/btremovepage.cpp
- src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp
-)
-
-SOURCE_GROUP("src\\frontend\\bookshelfmanager\\removepage" FILES ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_REMOVEPAGE})
+SET(bibletime_SRC_FRONTEND_BOOKSHELFWIZARD
+ src/frontend/bookshelfwizard/btbookshelfwizard.cpp
+ src/frontend/bookshelfwizard/btbookshelfwizard.h
+ src/frontend/bookshelfwizard/btbookshelftaskpage.cpp
+ src/frontend/bookshelfwizard/btbookshelftaskpage.h
+ src/frontend/bookshelfwizard/btbookshelfinstallfinalpage.cpp
+ src/frontend/bookshelfwizard/btbookshelfinstallfinalpage.h
+ src/frontend/bookshelfwizard/btbookshelfremovefinalpage.cpp
+ src/frontend/bookshelfwizard/btbookshelfremovefinalpage.h
+ src/frontend/bookshelfwizard/btbookshelfworkspage.cpp
+ src/frontend/bookshelfwizard/btbookshelfworkspage.h
+ src/frontend/bookshelfwizard/btbookshelflanguagespage.cpp
+ src/frontend/bookshelfwizard/btbookshelflanguagespage.h
+ src/frontend/bookshelfwizard/btbookshelfsourcespage.cpp
+ src/frontend/bookshelfwizard/btbookshelfsourcespage.h
+ src/frontend/bookshelfwizard/btbookshelfsourcesprogresspage.cpp
+ src/frontend/bookshelfwizard/btbookshelfsourcesprogresspage.h
+ src/frontend/bookshelfwizard/cswordsetupinstallsourcesdialog.cpp
+ src/frontend/bookshelfwizard/btinstallpagemodel.cpp
+)
+
+SOURCE_GROUP("src\\frontend\\bookshelfwizard" FILES ${bibletime_SRC_FRONTEND_BOOKSHELFWIZARD})
SET(bibletime_SRC_FRONTEND_BOOKMARKS
# Bookshelf/Bookmarks widget in main window:
- src/frontend/bookmarks/btbookmarkfolder.cpp
- src/frontend/bookmarks/btbookmarkitem.cpp
- src/frontend/bookmarks/btbookmarkloader.cpp
src/frontend/bookmarks/bteditbookmarkdialog.cpp
src/frontend/bookmarks/cbookmarkindex.cpp
)
@@ -214,6 +204,7 @@ SOURCE_GROUP("src\\frontend\\searchdialog\\analysis" FILES ${bibletime_SRC_FRONT
SET(bibletime_SRC_FRONTEND_SETTINGSDIALOG
# Settings dialog (configuration):
+ src/frontend/settingsdialogs/btconfigdialog.cpp
src/frontend/settingsdialogs/btshortcutsdialog.cpp
src/frontend/settingsdialogs/btshortcutseditor.cpp
src/frontend/settingsdialogs/bttextfilterstab.cpp
@@ -223,7 +214,6 @@ SET(bibletime_SRC_FRONTEND_SETTINGSDIALOG
src/frontend/settingsdialogs/cdisplaysettings.cpp
src/frontend/settingsdialogs/btfontchooserwidget.cpp
src/frontend/settingsdialogs/btfontsettings.cpp
- src/frontend/settingsdialogs/btlanguagesettings.cpp
src/frontend/settingsdialogs/clistwidget.cpp
src/frontend/settingsdialogs/cswordsettings.cpp
)
@@ -237,6 +227,13 @@ SET(bibletime_SRC_FRONTEND_TIPDIALOG
SOURCE_GROUP("src\\frontend\\tips" FILES ${bibletime_SRC_FRONTEND_TIPDIALOG})
+SET(bibletime_SRC_FRONTEND_WELCOMEDIALOG
+ src/frontend/welcome/btwelcomedialog.cpp
+ src/frontend/welcome/btwelcomedialog.h
+)
+
+SOURCE_GROUP("src\\frontend\\welcome" FILES ${bibletime_SRC_FRONTEND_WELCOMEDIALOG})
+
SET(bibletime_SRC_FRONTEND_KEYCHOOSER
# Frontend keychooser widgets:
src/frontend/keychooser/bthistory.cpp
@@ -289,7 +286,6 @@ SET(bibletime_SRC_FRONTEND_DISPLAYWINDOW
src/frontend/displaywindow/cbookreadwindow.cpp
src/frontend/displaywindow/ccommentaryreadwindow.cpp
src/frontend/displaywindow/cdisplaywindow.cpp
- src/frontend/displaywindow/cdisplaywindowfactory.cpp
src/frontend/displaywindow/chtmlwritewindow.cpp
src/frontend/displaywindow/clexiconreadwindow.cpp
src/frontend/displaywindow/cplainwritewindow.cpp
@@ -300,6 +296,7 @@ SOURCE_GROUP("src\\frontend\\displaywindow" FILES ${bibletime_SRC_FRONTEND_DISPL
# Mocable headers:
SET(bibletime_COMMON_MOCABLE_HEADERS
+ src/backend/btsignal.h
src/backend/bookshelfmodel/btbookshelffiltermodel.h
src/backend/bookshelfmodel/btbookshelfmodel.h
src/backend/bookshelfmodel/btbookshelftreemodel.h
@@ -310,35 +307,30 @@ SET(bibletime_COMMON_MOCABLE_HEADERS
src/backend/drivers/cswordlexiconmoduleinfo.h
src/backend/drivers/cswordmoduleinfo.h
src/backend/managers/cswordbackend.h
- src/util/btsignal.h
+ src/backend/models/btmoduletextmodel.h
+ src/backend/models/btlistmodel.h
src/backend/btinstallmgr.h
src/backend/btinstallthread.h
+ src/backend/btsourcesthread.h
+ src/backend/btbookmarksmodel.h
)
-IF(BT_Use_DBus)
- SET(bibletime_FRONTEND_DESKTOP_DBUS_MOCABLE_HEADERS src/bibletime_dbus_adaptor.h)
-ENDIF()
-
SET(bibletime_FRONTEND_DESKTOP_MOCABLE_HEADERS
- ${bibletime_FRONTEND_DESKTOP_DBUS_MOCABLE_HEADERS}
src/bibletime.h
src/bibletimeapp.h
src/frontend/bookmarks/bteditbookmarkdialog.h
src/frontend/bookmarks/cbookmarkindex.h
- src/frontend/bookshelfmanager/btconfigdialog.h
- src/frontend/bookshelfmanager/btmodulemanagerdialog.h
- src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h
- src/frontend/bookshelfmanager/indexpage/btindexpage.h
- src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialog.h
- src/frontend/bookshelfmanager/installpage/btinstallmodulechooserdialogmodel.h
- src/frontend/bookshelfmanager/installpage/btinstallpage.h
- src/frontend/bookshelfmanager/installpage/btinstallpageworkswidget.h
- src/frontend/bookshelfmanager/installpage/btinstallpathdialog.h
- src/frontend/bookshelfmanager/installpage/btinstallprogressdialog.h
- src/frontend/bookshelfmanager/installpage/btinstallpagemodel.h
- src/frontend/bookshelfmanager/installpage/btrefreshprogressdialog.h
- src/frontend/bookshelfmanager/removepage/btremovepage.h
- src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.h
+ src/frontend/bookshelfwizard/cswordsetupinstallsourcesdialog.h
+ src/frontend/bookshelfwizard/btinstallpagemodel.h
+ src/frontend/bookshelfwizard/btbookshelfwizard.h
+ src/frontend/bookshelfwizard/btbookshelfwizardpage.h
+ src/frontend/bookshelfwizard/btbookshelftaskpage.h
+ src/frontend/bookshelfwizard/btbookshelfinstallfinalpage.h
+ src/frontend/bookshelfwizard/btbookshelfremovefinalpage.h
+ src/frontend/bookshelfwizard/btbookshelfworkspage.h
+ src/frontend/bookshelfwizard/btbookshelflanguagespage.h
+ src/frontend/bookshelfwizard/btbookshelfsourcespage.h
+ src/frontend/bookshelfwizard/btbookshelfsourcesprogresspage.h
src/frontend/btaboutdialog.h
src/frontend/btaboutmoduledialog.h
src/frontend/btbookshelfdockwidget.h
@@ -349,10 +341,12 @@ SET(bibletime_FRONTEND_DESKTOP_MOCABLE_HEADERS
src/frontend/btmodulechooserdialog.h
src/frontend/btmoduleindexdialog.h
src/frontend/btopenworkaction.h
+ src/frontend/btprinter.h
+ src/frontend/btwebenginepage.h
+ src/frontend/btwebengineview.h
src/frontend/cdragdrop.h
src/frontend/cinfodisplay.h
src/frontend/cmdiarea.h
- src/frontend/cprinter.h
src/frontend/display/btcolorwidget.h
src/frontend/display/btfindwidget.h
src/frontend/display/btfontsizewidget.h
@@ -407,10 +401,10 @@ SET(bibletime_FRONTEND_DESKTOP_MOCABLE_HEADERS
src/frontend/settingsdialogs/cdisplaysettings.h
src/frontend/settingsdialogs/btfontchooserwidget.h
src/frontend/settingsdialogs/btfontsettings.h
- src/frontend/settingsdialogs/btlanguagesettings.h
src/frontend/settingsdialogs/clistwidget.h
src/frontend/settingsdialogs/cswordsettings.h
src/frontend/tips/bttipdialog.h
+ src/frontend/welcome/btwelcomedialog.h
)
SET(bibletime_COMMON_SOURCES
@@ -422,20 +416,19 @@ SET(bibletime_COMMON_SOURCES
${bibletime_SRC_BACKEND_KEYS}
${bibletime_SRC_BACKEND_RENDERING}
${bibletime_SRC_BACKEND_MANAGERS}
+ ${bibletime_SRC_BACKEND_MODELS}
${bibletime_SRC_UTIL})
SET(bibletime_FRONTEND_DESKTOP_SOURCES
${bibletime_SRC}
${bibletime_SRC_FRONTEND}
${bibletime_SRC_FRONTEND_BOOKMARKS}
- ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER}
- ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_INDEXPAGE}
- ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_INSTALLPAGE}
- ${bibletime_SRC_FRONTEND_BOOKSHELFMANAGER_REMOVEPAGE}
+ ${bibletime_SRC_FRONTEND_BOOKSHELFWIZARD}
${bibletime_SRC_FRONTEND_SEARCHDIALOG}
${bibletime_SRC_FRONTEND_SEARCHDIALOG_ANALYSIS}
${bibletime_SRC_FRONTEND_SETTINGSDIALOG}
${bibletime_SRC_FRONTEND_TIPDIALOG}
+ ${bibletime_SRC_FRONTEND_WELCOMEDIALOG}
${bibletime_SRC_FRONTEND_KEYCHOOSER}
${bibletime_SRC_FRONTEND_KEYCHOOSER_VERSEKEYCHOOSER}
${bibletime_SRC_FRONTEND_DISPLAY}
@@ -452,12 +445,15 @@ SET(bibletime_SRC_MOBILE_SOURCES
)
SET(bibletime_SRC_MOBILE_MODEL_SOURCES
- src/mobile/models/bibletextmodelbuilder.cpp
- src/mobile/models/bibletextmodelbuilder.h
- src/mobile/models/booktextmodelbuilder.cpp
- src/mobile/models/booktextmodelbuilder.h
src/mobile/models/roleitemmodel.cpp
src/mobile/models/roleitemmodel.h
+ src/mobile/models/searchmodel.cpp
+ src/mobile/models/searchmodel.h
+)
+
+SET(bibletime_SRC_MOBILE_SESSIONMANAGER_SOURCES
+ src/mobile/sessionmanager/sessionmanager.cpp
+ src/mobile/sessionmanager/sessionmanager.h
)
SET(bibletime_SRC_MOBILE_UTIL_SOURCES
@@ -478,12 +474,18 @@ SET(bibletime_SRC_MOBILE_UI_SOURCES
src/mobile/bookshelfmanager/installsources.h
src/mobile/keychooser/bookkeychooser.cpp
src/mobile/keychooser/bookkeychooser.h
+ src/mobile/keychooser/keynamechooser.cpp
+ src/mobile/keychooser/keynamechooser.h
src/mobile/keychooser/versechooser.cpp
src/mobile/keychooser/versechooser.h
src/mobile/ui/btstyle.cpp
src/mobile/ui/btstyle.h
+ src/mobile/ui/btsearchinterface.cpp
+ src/mobile/ui/btsearchinterface.h
src/mobile/ui/btwindowinterface.cpp
src/mobile/ui/btwindowinterface.h
+ src/mobile/ui/indexthread.cpp
+ src/mobile/ui/indexthread.h
src/mobile/ui/modulechooser.cpp
src/mobile/ui/modulechooser.h
src/mobile/ui/moduleinterface.cpp
@@ -497,16 +499,21 @@ SET(bibletime_SRC_MOBILE_UI_SOURCES
)
SET(bibletime_SRC_MOBILE_MOCABLE_HEADERS
+ src/mobile/bibletime.h
+ src/mobile/bibletimeapp.h
src/mobile/bookshelfmanager/installmanager.h
src/mobile/bookshelfmanager/installprogress.h
src/mobile/bookshelfmanager/installsourcesmanager.h
src/mobile/bookshelfmanager/installsources.h
src/mobile/keychooser/bookkeychooser.h
+ src/mobile/keychooser/keynamechooser.h
src/mobile/keychooser/versechooser.h
- src/mobile/bibletime.h
- src/mobile/bibletimeapp.h
+ src/mobile/models/searchmodel.h
+ src/mobile/sessionmanager/sessionmanager.h
src/mobile/ui/btstyle.h
+ src/mobile/ui/btsearchinterface.h
src/mobile/ui/btwindowinterface.h
+ src/mobile/ui/indexthread.h
src/mobile/ui/modulechooser.h
src/mobile/ui/moduleinterface.h
src/mobile/ui/qtquick2applicationviewer.h
@@ -514,35 +521,48 @@ SET(bibletime_SRC_MOBILE_MOCABLE_HEADERS
src/mobile/ui/viewmanager.h
)
+SET(bibletime_MOBILE_RESOURCE_FILES
+ src/mobile/btm.qrc
+)
+
SET(bibletime_MOBILE_QML_FILES
+ src/mobile/qml/About.qml
+ src/mobile/qml/BtButtonStyle.qml
src/mobile/qml/ContextMenu.qml
src/mobile/qml/GridChooserButton.qml
src/mobile/qml/GridChooser.qml
- src/mobile/qml/ImageButton.qml
src/mobile/qml/InstallManagerChooser.qml
+ src/mobile/qml/KeyNameChooser.qml
+ src/mobile/qml/LeftArrow.qml
+ src/mobile/qml/ListSelectView.qml
src/mobile/qml/ListTextView.qml
src/mobile/qml/ListWorksView.qml
src/mobile/qml/main.qml
src/mobile/qml/MainToolbar.qml
src/mobile/qml/Menus.qml
src/mobile/qml/MenuButton.qml
- src/mobile/qml/MenuView.qml
src/mobile/qml/ModuleChooser.qml
+ src/mobile/qml/PrevNextArrow.qml
src/mobile/qml/Progress.qml
- src/mobile/qml/Settings.qml
+ src/mobile/qml/Question.qml
+ src/mobile/qml/RightArrow.qml
+ src/mobile/qml/Search.qml
+ src/mobile/qml/SearchIcon.qml
+ src/mobile/qml/SearchResults.qml
+ src/mobile/qml/SimpleComboBox.qml
+ src/mobile/qml/StartupBookshelfManager.qml
+ src/mobile/qml/TitleColorBar.qml
src/mobile/qml/FontSizeSlider.qml
src/mobile/qml/TreeChooser.qml
src/mobile/qml/Window.qml
src/mobile/qml/WindowManager.qml
- src/mobile/qml/checkmark.svg
- src/mobile/qml/leftarrow.svg
- src/mobile/qml/rightarrow.svg
)
SET(bibletime_FRONTEND_MOBILE_SOURCES
${bibletime_SRC_MOBILE_SOURCES}
${bibletime_SRC_MOBILE_MOCABLE_HEADERS}
${bibletime_SRC_MOBILE_MODEL_SOURCES}
+ ${bibletime_SRC_MOBILE_SESSIONMANAGER_SOURCES}
${bibletime_SRC_MOBILE_UI_SOURCES}
${bibletime_SRC_MOBILE_UTIL_SOURCES}
)
@@ -551,6 +571,15 @@ SET(bibletime_FRONTEND_MOBILE_MOCABLE_HEADERS
${bibletime_SRC_MOBILE_MOCABLE_HEADERS}
)
+SET(bibletime_DESKTOP_TRANSLATION_FILE_PREFIX "bibletime_ui_")
+SET(bibletime_MOBILE_TRANSLATION_FILE_PREFIX "mobile_ui_")
+
+SET(bibletime_LINK_DESKTOP_TRANSLATION_FILES FALSE)
+SET(bibletime_LINK_MOBILE_TRANSLATION_FILES TRUE)
+
+SET(bibletime_DESKTOP_TRANSLATION_RESOURCE_FILE "")
+SET(bibletime_MOBILE_TRANSLATION_RESOURCE_FILE "mobile_translate.qrc")
+
# Default to building a desktop frontend:
IF(NOT (DEFINED BIBLETIME_FRONTEND))
SET(BIBLETIME_FRONTEND "DESKTOP")
@@ -558,7 +587,6 @@ ENDIF(NOT (DEFINED BIBLETIME_FRONTEND))
# Check for valid frontend:
SET(bibletime_AVAILABLE_FRONTENDS DESKTOP MOBILE)
-#SET(bibletime_AVAILABLE_FRONTENDS DESKTOP QML_SYMBIAN)
LIST(FIND bibletime_AVAILABLE_FRONTENDS ${BIBLETIME_FRONTEND} bibletime_FRONTEND_INDEX)
IF(${bibletime_FRONTEND_INDEX} EQUAL -1)
MESSAGE(STATUS "Invalid frontend specified: ${BIBLETIME_FRONTEND}.")
@@ -571,24 +599,26 @@ ENDIF(${bibletime_FRONTEND_INDEX} EQUAL -1)
MESSAGE(STATUS "Selected frontend: ${BIBLETIME_FRONTEND}")
SET(bibletime_SOURCES
- ${bibletime_COMMON_SOURCES}
${bibletime_FRONTEND_${BIBLETIME_FRONTEND}_SOURCES})
SET(bibletime_MOCABLE_HEADERS
- ${bibletime_COMMON_MOCABLE_HEADERS}
${bibletime_FRONTEND_${BIBLETIME_FRONTEND}_MOCABLE_HEADERS})
+SET(bibletime_RESOURCE_FILES
+ ${bibletime_${BIBLETIME_FRONTEND}_RESOURCE_FILES})
SET(bibletime_QML_FILES
${bibletime_${BIBLETIME_FRONTEND}_QML_FILES})
-IF(Qt5Core_FOUND)
- QT5_WRAP_UI(bibletime_UIS_H ${bibletime_UIS})
- QT5_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
-ELSE()
- QT4_WRAP_UI(bibletime_UIS_H ${bibletime_UIS})
- QT4_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS})
-ENDIF()
+SET(bibletime_TRANSLATION_FILE_PREFIX "${bibletime_${BIBLETIME_FRONTEND}_TRANSLATION_FILE_PREFIX}")
+SET(bibletime_LINK_TRANSLATION_FILES "${bibletime_LINK_${BIBLETIME_FRONTEND}_TRANSLATION_FILES}")
+SET(bibletime_TRANSLATION_RESOURCE_FILE "${bibletime_${BIBLETIME_FRONTEND}_TRANSLATION_RESOURCE_FILE}")
+
+QT5_WRAP_UI(bibletime_UIS_H ${bibletime_UIS})
+QT5_WRAP_CPP(bibletime_COMMON_MOCABLE_SOURCES ${bibletime_COMMON_MOCABLE_HEADERS} OPTIONS ${BIBLETIME_MOC_OPTIONS})
+QT5_WRAP_CPP(bibletime_MOC_SOURCES ${bibletime_MOCABLE_HEADERS} OPTIONS ${BIBLETIME_MOC_OPTIONS})
+QT5_ADD_RESOURCES(bibletime_RESOURCE_SOURCES ${bibletime_RESOURCE_FILES})
SET(common_bibletime_SOURCES
${bibletime_SOURCES}
+ ${bibletime_RESOURCE_SOURCES}
${bibletime_UIS_H}
${bibletime_MOC_SOURCES}
${bibletime_QML_FILES}
diff --git a/cmake/BTTests.cmake b/cmake/BTTests.cmake
new file mode 100644
index 0000000..5b44962
--- /dev/null
+++ b/cmake/BTTests.cmake
@@ -0,0 +1,42 @@
+
+ENABLE_TESTING(true)
+
+QT5_ADD_RESOURCES(test_RESOURCE_SOURCES
+ ${bibletime_SOURCE_DIR}/src/mobile/btm.qrc
+ ${bibletime_SOURCE_DIR}/i18n/messages/test_translate.qrc
+)
+
+SET(test_OTHER_SOURCES
+ ${bibletime_SOURCE_DIR}/src/frontend/messagedialog.cpp
+)
+
+FUNCTION(test_a_class testDir testClass )
+ PROJECT(test_${testClass})
+ SET(test_${testClass}_MOCABLE_HEADERS
+ ${testDir}/test_${testClass}.h
+ )
+ QT5_WRAP_CPP(test_${testClass}_MOC_SRC ${test_${testClass}_MOCABLE_HEADERS})
+ ADD_EXECUTABLE(test_${testClass}
+ ${testDir}/test_${testClass}.cpp
+ ${test_OTHER_SOURCES}
+ ${test_${testClass}_MOC_SRC}
+ ${test_RESOURCE_SOURCES}
+ )
+ SET_TARGET_PROPERTIES("test_${testClass}" PROPERTIES COMPILE_FLAGS ${Sword_CFLAGS_OTHER} -std=c++11 )
+ QT5_USE_MODULES(test_${testClass} Widgets Xml Network Test)
+ TARGET_LINK_LIBRARIES(test_${testClass}
+ bibletime_common
+ ${Sword_LDFLAGS}
+ ${CLucene_LIBRARY}
+ )
+ ADD_TEST(NAME ${testClass} COMMAND test_${testClass})
+ENDFUNCTION(test_a_class)
+
+# The first 2 tests install modules that the other tests need
+# They should be ran in this order
+test_a_class(tests/backend/btsourcesthread btsourcesthread)
+test_a_class(tests/backend/btinstallthread btinstallthread)
+
+test_a_class(tests/backend/managers/cswordbackend cswordbackend)
+test_a_class(tests/backend/keys/cswordversekey cswordversekey)
+test_a_class(tests/backend/models/btlistmodel btlistmodel)
diff --git a/cmake/BTTranslationMacros.cmake b/cmake/BTTranslationMacros.cmake
new file mode 100644
index 0000000..0859a96
--- /dev/null
+++ b/cmake/BTTranslationMacros.cmake
@@ -0,0 +1,131 @@
+# makes a list of language codes from the *.ts files
+function(BT_GET_TS_LANGS TS_LANGS)
+ SET(TS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages")
+ FILE(GLOB TS_FILES "${TS_DIR}/bibletime_ui_*.ts")
+ FOREACH(TSFILE_FULLPATH ${TS_FILES})
+ STRING(REGEX REPLACE "${TS_DIR}/bibletime_ui_(..(_..)?).ts" "\\1"
+ TS_LANG "${TSFILE_FULLPATH}")
+ SET(_TS_LANGS ${_TS_LANGS} ${TS_LANG})
+ ENDFOREACH()
+ SET(${TS_LANGS} ${_TS_LANGS} PARENT_SCOPE)
+endfunction()
+
+
+#bt_get_translation_executables(QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE)
+function(BT_GET_TRANSLATION_EXECUTABLES lupdate lrelease rcc)
+ GET_TARGET_PROPERTY(QT_LUPDATE_EXECUTABLE Qt5::lupdate IMPORTED_LOCATION)
+ GET_TARGET_PROPERTY(QT_LRELEASE_EXECUTABLE Qt5::lrelease IMPORTED_LOCATION)
+ GET_TARGET_PROPERTY(QT_RESOURCE_EXECUTABLE Qt5::rcc IMPORTED_LOCATION)
+ SET(${lupdate} ${QT_LUPDATE_EXECUTABLE} PARENT_SCOPE)
+ SET(${lrelease} ${QT_LRELEASE_EXECUTABLE} PARENT_SCOPE)
+ SET(${rcc} ${QT_RESOURCE_EXECUTABLE} PARENT_SCOPE)
+endfunction()
+
+# get a list of the ts files with full path and a list
+# of the qm files with no path.
+function(BT_GET_TRANSLATION_FILELISTS
+ TS_DIR
+ TS_PREFIX
+ TS_FILES_FULLPATH
+ QM_FILES
+)
+ FILE(GLOB TS_FILES "${TS_DIR}/${TS_PREFIX}*.ts")
+ FOREACH(TS_FILE_FULLPATH ${TS_FILES})
+ STRING(REGEX REPLACE "${TS_DIR}/${TS_PREFIX}(.+(_..)?).ts" "\\1"
+ TS_LANG "${TS_FILE_FULLPATH}")
+ SET(TS_LANGS ${TS_LANGS} ${TS_LANG})
+ SET(QM_FILE "${TS_PREFIX}${TS_LANG}.qm")
+ SET(_QM_FILES ${_QM_FILES} ${TS_PREFIX}${TS_LANG}.qm)
+ ENDFOREACH()
+ SET(${TS_FILES_FULLPATH} ${TS_FILES} PARENT_SCOPE)
+ SET(${QM_FILES} ${_QM_FILES} PARENT_SCOPE)
+endfunction()
+
+
+# creates the qm files in the build directory from the ts files in the source directory
+function(BT_CREATE_QM_FILES TS_FILES QM_FILES bibletime_LINK_TRANSLATION_FILES)
+ BT_GET_TRANSLATION_EXECUTABLES( QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_RCC_EXECUTABLE)
+ list(LENGTH QM_FILES QM_Length)
+ math(EXPR stop "${QM_Length}-1")
+ FOREACH(Index RANGE 0 ${stop})
+ LIST(GET TS_FILES ${Index} TS_FILE)
+ LIST(GET QM_FILES ${Index} QM_FILE)
+ IF(${bibletime_LINK_TRANSLATION_FILES})
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${QM_FILE}
+ POST_BUILD
+ COMMAND ${QT_LRELEASE_EXECUTABLE} "${TS_FILE}" -qm "${QM_FILE}"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Updating UI translation for ${QM_FILE}"
+ VERBATIM
+ )
+ ELSE()
+ ADD_CUSTOM_COMMAND(
+ TARGET "bibletime"
+ POST_BUILD
+ COMMAND ${QT_LRELEASE_EXECUTABLE} "${TS_FILE}" -qm "${QM_FILE}"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Updating UI translation for ${QM_FILE}"
+ VERBATIM
+ )
+ ENDIF()
+ ENDFOREACH()
+endfunction()
+
+
+# installs the qm files for bibletime.
+function(BT_INSTALL_QM_FILES QM_FILES)
+ list(LENGTH QM_FILES QM_Length)
+ math(EXPR stop "${QM_Length}-1")
+ FOREACH(Index RANGE 0 ${stop})
+ LIST(GET QM_FILES ${Index} QM_FILE)
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILE}"
+ DESTINATION "${BT_SHARE_PATH}/bibletime/locale/"
+ )
+ ENDFOREACH()
+endfunction()
+
+function(BT_UPDATE_TS_FILES TS_DIR TS_PREFIX)
+ BT_GET_TRANSLATION_EXECUTABLES( QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_RCC_EXECUTABLE)
+ # Update source catalog files (this is the basis for the translator's work)
+ # Invoke this with "make messages"
+ ADD_CUSTOM_TARGET("messages")
+ SET_TARGET_PROPERTIES("messages" PROPERTIES FOLDER "Messages")
+ BT_GET_TS_LANGS(TS_LANGS)
+ FOREACH(TS_LANG ${TS_LANGS})
+ ADD_CUSTOM_TARGET("messages_${TS_LANG}"
+ COMMAND ${QT_LUPDATE_EXECUTABLE} -extensions cpp,h "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${TS_DIR}/${TS_PREFIX}${TS_LANG}.ts")
+ ADD_DEPENDENCIES("messages" "messages_${TS_LANG}")
+ SET_TARGET_PROPERTIES("messages_${TS_LANG}" PROPERTIES FOLDER "Messages")
+ ENDFOREACH(TS_LANG)
+
+ # Template file for translators
+ ADD_CUSTOM_TARGET("messages_default"
+ COMMAND ${QT_LUPDATE_EXECUTABLE} -extensions cpp,h "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${TS_DIR}/bibletime_ui.ts")
+ ADD_DEPENDENCIES(messages "messages_default")
+ SET_TARGET_PROPERTIES("messages_default" PROPERTIES FOLDER "Messages")
+endfunction()
+
+ # copy translation qrc file to build dir
+function(BT_COPY_QRC_TO_BUILD_DIR QRC_FILE QRC_COPIED_FILE)
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${QRC_COPIED_FILE}
+ COMMAND ${CMAKE_COMMAND} -E copy ${QRC_FILE} ${QRC_COPIED_FILE}
+ MAIN_DEPENDENCY ${QRC_FILE}
+ COMMENT "Copying translation resource file: ${QRC_FILE}"
+ VERBATIM
+ )
+endfunction()
+
+ # run resource compiler on translation qrc file
+function(BT_RUN_RESOURCE_COMPILER QM_FILES QRC_COPIED_FILE QRC_CPP_FILE)
+ BT_GET_TRANSLATION_EXECUTABLES( QT_LUPDATE_EXECUTABLE QT_LRELEASE_EXECUTABLE QT_RCC_EXECUTABLE)
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${QRC_CPP_FILE}
+ COMMAND ${QT_RCC_EXECUTABLE}
+ ARGS ${rcc_options} ${QRC_COPIED_FILE} -o ${QRC_CPP_FILE}
+ MAIN_DEPENDENCY ${QM_COPIED_FILE}
+ DEPENDS ${QM_FILES} ${QRC_COPIED_FILE}
+ COMMENT "Compiling resource file: ${QRC_COPIED_FILE}"
+ )
+endfunction()
diff --git a/cmake/BTUITranslation.cmake b/cmake/BTUITranslation.cmake
index 2af0f61..9d938ce 100644
--- a/cmake/BTUITranslation.cmake
+++ b/cmake/BTUITranslation.cmake
@@ -1,58 +1,16 @@
-SET(bibletime_UI_translations)
+MESSAGE(STATUS "Translation files will be installed")
+MESSAGE(STATUS "Translation prefix: ${bibletime_TRANSLATION_FILE_PREFIX}")
-IF (Qt5Core_FOUND)
- SET(QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE})
- SET(QT_LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE})
-ELSE (Qt5Core_FOUND)
- FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
- NAMES lupdate-qt4 lupdate
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH
- )
+SET(TS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages)
- FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
- NAMES lrelease-qt4 lrelease
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH
- )
-ENDIF (Qt5Core_FOUND)
+BT_GET_TRANSLATION_FILELISTS(${TS_DIR} ${bibletime_TRANSLATION_FILE_PREFIX} TS_FILES QM_FILES)
-SET(TS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages")
-FILE(GLOB TS_FILES "${TS_DIR}/bibletime_ui_*.ts")
-FOREACH(TSFILE_FULLPATH ${TS_FILES})
- STRING(REGEX REPLACE "${TS_DIR}/bibletime_ui_(..(_..)?).ts" "\\1"
- TS_LANG "${TSFILE_FULLPATH}")
- SET(TS_LANGS ${TS_LANGS} ${TS_LANG})
- SET(QMFILE "bibletime_ui_${TS_LANG}.qm")
- ADD_CUSTOM_COMMAND(
- TARGET "bibletime"
- POST_BUILD
- COMMAND ${QT_LRELEASE_EXECUTABLE} "${TSFILE_FULLPATH}" -qm "${QMFILE}"
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- COMMENT "Updating UI translation for ${TS_LANG}"
- VERBATIM
- )
- SET(bibletime_UI_translations
- ${bibletime_UI_translations}
- "${QMFILE}"
- )
- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QMFILE}"
- DESTINATION "${BT_SHARE_PATH}/bibletime/locale/"
- )
-ENDFOREACH(TSFILE_FULLPATH)
+BT_CREATE_QM_FILES("${TS_FILES}" "${QM_FILES}" "${bibletime_LINK_TRANSLATION_FILES}")
+BT_INSTALL_QM_FILES("${QM_FILES}")
+
+SET(bibletime_UI_translations "${QM_FILES}")
# Update source catalog files (this is the basis for the translator's work)
# Invoke this with "make messages"
-ADD_CUSTOM_TARGET("messages")
-FOREACH(TS_LANG ${TS_LANGS})
- ADD_CUSTOM_TARGET("messages_${TS_LANG}"
- COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${TS_DIR}/bibletime_ui_${TS_LANG}.ts")
- ADD_DEPENDENCIES("messages" "messages_${TS_LANG}")
-ENDFOREACH(TS_LANG)
-
-
-# Template file for translators
-ADD_CUSTOM_TARGET("messages_default"
- COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${TS_DIR}/bibletime_ui.ts")
-ADD_DEPENDENCIES(messages "messages_default")
+BT_UPDATE_TS_FILES(${TS_DIR} ${bibletime_TRANSLATION_FILE_PREFIX})
diff --git a/cmake/BTUITranslationLink.cmake b/cmake/BTUITranslationLink.cmake
new file mode 100644
index 0000000..b5f3d17
--- /dev/null
+++ b/cmake/BTUITranslationLink.cmake
@@ -0,0 +1,22 @@
+MESSAGE(STATUS "Translation files will be linked using ${bibletime_TRANSLATION_RESOURCE_FILE}")
+
+SET(QRC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/${bibletime_TRANSLATION_RESOURCE_FILE}")
+SET(QRC_COPIED_FILE "${CMAKE_CURRENT_BINARY_DIR}/${bibletime_TRANSLATION_RESOURCE_FILE}")
+SET(QRC_CPP_FILE "${CMAKE_CURRENT_BINARY_DIR}/translate_qrc.cpp")
+
+SET(TS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages)
+
+BT_GET_TRANSLATION_FILELISTS(${TS_DIR} ${bibletime_TRANSLATION_FILE_PREFIX} TS_FILES QM_FILES)
+
+BT_CREATE_QM_FILES("${TS_FILES}" "${QM_FILES}" "${bibletime_LINK_TRANSLATION_FILES}")
+
+BT_COPY_QRC_TO_BUILD_DIR(${QRC_FILE} ${QRC_COPIED_FILE})
+
+BT_RUN_RESOURCE_COMPILER("${QM_FILES}" ${QRC_COPIED_FILE} ${QRC_CPP_FILE})
+
+
+# compile and link translations into the bibletime executable
+SET(common_bibletime_SOURCES
+ ${common_bibletime_SOURCES}
+ ${QRC_CPP_FILE}
+)
diff --git a/cmake/FindSword.cmake b/cmake/FindSword.cmake
index 1458765..2ba3691 100644
--- a/cmake/FindSword.cmake
+++ b/cmake/FindSword.cmake
@@ -3,7 +3,7 @@
#
# This file is part of BibleTime's source code, http://www.bibletime.info/.
#
-# Copyright 1999-2014 by the BibleTime developers.
+# Copyright 1999-2016 by the BibleTime developers.
# The BibleTime source code is licensed under the GNU General Public License version 2.0.
#
@@ -91,7 +91,11 @@ IF(NOT Sword_FOUND)
SET(Sword_VERSION "${RUN_OUTPUT}")
GET_FILENAME_COMPONENT(Sword_LIBRARY_DIRS "${FindSword_LIBS}" PATH)
SET(Sword_LIBRARIES "sword")
- SET(Sword_LDFLAGS "-L${Sword_LIBRARY_DIRS};-l${Sword_LIBRARIES}")
+ IF(WIN32)
+ SET(Sword_LDFLAGS "${FindSword_LIBS}")
+ ELSE()
+ SET(Sword_LDFLAGS "-L${Sword_LIBRARY_DIRS};-l${Sword_LIBRARIES}")
+ ENDIF()
SET(Sword_INCLUDE_DIRS "${FindSword_INCS}")
SET(Sword_CFLAGS "-I${Sword_INCLUDE_DIRS}")
ENDIF()
diff --git a/cmake/docs/docs.xsl b/cmake/docs/docs.xsl
index ab44e09..9d6da83 100644
--- a/cmake/docs/docs.xsl
+++ b/cmake/docs/docs.xsl
@@ -1,5 +1,9 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
- <xsl:param name="use.id.as.filename" select="1"/>
+ <xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
+ <!--<xsl:param name="css.decoration" select="0"/>-->
+ <!--<xsl:param name="ignore.image.scaling" select="1"/>-->
+ <xsl:param name="use.id.as.filename" select="1"/>
+ <xsl:param name="generate.consistent.ids" select="1"/>
</xsl:stylesheet>
diff --git a/cmake/docs/docs_freebsd.xsl b/cmake/docs/docs_freebsd.xsl
index 81a2190..58480f2 100644
--- a/cmake/docs/docs_freebsd.xsl
+++ b/cmake/docs/docs_freebsd.xsl
@@ -1,5 +1,9 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="/usr/local/share/xsl/docbook/html/chunk.xsl"/>
- <xsl:param name="use.id.as.filename" select="1"/>
+ <xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
+ <!--<xsl:param name="css.decoration" select="0"/>-->
+ <!--<xsl:param name="ignore.image.scaling" select="1"/>-->
+ <xsl:param name="use.id.as.filename" select="1"/>
+ <xsl:param name="generate.consistent.ids" select="1"/>
</xsl:stylesheet>
diff --git a/cmake/docs/docs_mac.xsl b/cmake/docs/docs_mac.xsl
new file mode 100644
index 0000000..18ab4a0
--- /dev/null
+++ b/cmake/docs/docs_mac.xsl
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:import href="/usr/local/opt/docbook-xsl/docbook-xsl/html/chunk.xsl"/>
+ <xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
+ <!--<xsl:param name="css.decoration" select="0"/>-->
+ <!--<xsl:param name="ignore.image.scaling" select="1"/>-->
+ <xsl:param name="use.id.as.filename" select="1"/>
+ <xsl:param name="generate.consistent.ids" select="1"/>
+</xsl:stylesheet>
diff --git a/cmake/docs/handbook_po4a.conf b/cmake/docs/handbook_po4a.conf
index fc74c7f..9a9f2ba 100644
--- a/cmake/docs/handbook_po4a.conf
+++ b/cmake/docs/handbook_po4a.conf
@@ -4,7 +4,7 @@
# If you modify the language list here, make sure you also modify CMakeLists.txt
#
-[po4a_langs] ar cs de es fi fr hu it nl pt_BR
+[po4a_langs] ar cs de es fi fr hu it lt nl pt_BR
[po4a_paths] i18n/handbook/handbook.pot $lang:i18n/handbook/handbook-$lang.po
[type: docbook] docs/handbook/en/docbook/hdbk-config.docbook $lang:docs/handbook/$lang/docbook/hdbk-config.docbook
[type: docbook] docs/handbook/en/docbook/hdbk-intro.docbook $lang:docs/handbook/$lang/docbook/hdbk-intro.docbook
diff --git a/cmake/docs/howto_po4a.conf b/cmake/docs/howto_po4a.conf
index 1fe870f..27da510 100644
--- a/cmake/docs/howto_po4a.conf
+++ b/cmake/docs/howto_po4a.conf
@@ -4,7 +4,7 @@
# If you modify the language list here, make sure you also modify CMakeLists.txt
#
-[po4a_langs] ar bg cs de da es fi fr it hu ko nl pt_BR ru
+[po4a_langs] ar bg cs de da es fi fr it lt hu ko nl pt_BR ru
[po4a_paths] i18n/howto/howto.pot $lang:i18n/howto/howto-$lang.po
[type: docbook] docs/howto/en/docbook/howto-basics.docbook $lang:docs/howto/$lang/docbook/howto-basics.docbook
[type: docbook] docs/howto/en/docbook/howto-importance.docbook $lang:docs/howto/$lang/docbook/howto-importance.docbook
diff --git a/cmake/docs/pdf_mac.xsl b/cmake/docs/pdf_mac.xsl
index 61b2bc4..5aa946c 100644
--- a/cmake/docs/pdf_mac.xsl
+++ b/cmake/docs/pdf_mac.xsl
@@ -1,4 +1,4 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:import href="/opt/local/share/xsl/docbook-xsl/fo/docbook.xsl"/>
+ <xsl:import href="/usr/local/Cellar/docbook-xsl/1.78.1/docbook-xsl/fo/docbook.xsl"/>
</xsl:stylesheet>
diff --git a/cmake/platforms/linux/bibletime.desktop.cmake b/cmake/platforms/linux/bibletime.desktop.cmake
index f3c0849..e7fb0f4 100644
--- a/cmake/platforms/linux/bibletime.desktop.cmake
+++ b/cmake/platforms/linux/bibletime.desktop.cmake
@@ -1,16 +1,15 @@
[Desktop Entry]
Comment=An easy to use bible study tool
Comment[C]=An easy to use bible study tool
-Comment[cs]=Snadno pouiteln n�troj pro studium Bible
+Comment[cs]=Snadno použitelný nástroj pro studium Bible
Comment[da]=Et letanvendeligt bibelstudieprogram
Comment[de]=Ein einfach zu benutzendes Bibelprogramm
Comment[et]=Lihtne Piibliuurimise vahend
Comment[fi]=Helppokäyttöinen raamatunlukuohjelmisto
-Comment[fr]=Un outil d'éde biblique facile àtiliser
+Comment[fr]=Un outil d'étude biblique facile à utiliser
Comment[it]=Un semplice strumento per studiare la Bibbia
Exec=bibletime
Icon=bibletime
-MimeType=
Name=BibleTime @BT_VERSION@
Name[C]=BibleTime @BT_VERSION@
Name[cs]=BibleTime @BT_VERSION@
@@ -23,4 +22,5 @@ GenericName=Bible Study Tool
Terminal=false
Type=Application
Categories=X-Bible;X-Religion;Literature;Education;Dictionary;Qt;
+Keywords=bible;study;religion;literature;education;
DocPath=bibletime/handbook/index.html
diff --git a/cmake/platforms/macos/Info.plist b/cmake/platforms/macos/Info.plist
index 1417798..d693a5c 100644
--- a/cmake/platforms/macos/Info.plist
+++ b/cmake/platforms/macos/Info.plist
@@ -4,23 +4,19 @@
<dict>
<key>CFBundleIconFile</key>
<string>BibleTime.icns</string>
-
<key>CFBundleDevelopmentRegion</key>
- <string>English</string>
-
- <key>CFBundleName</key>
- <string>BibleTime</string>
-
- <key>CFBundleDisplayName</key>
- <string>BibleTime</string>
-
- <key>CFBundleIdentifier</key>
- <string>info.bibletime.BibleTime</string>
-
- <key>CFBundlePackageType</key>
- <string>APPL</string>
-
- <key>MDItemKeywords</key>
- <string>BibleTime Bible bible time study</string>
+ <string>en-US</string>
+ <key>CFBundleName</key>
+ <string>BibleTime</string>
+ <key>CFBundleDisplayName</key>
+ <string>BibleTime</string>
+ <key>CFBundleIdentifier</key>
+ <string>info.bibletime.BibleTime</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>NSHighResolutionCapable</key>
+ <string>True</string>
</dict>
</plist>
diff --git a/cmake/platforms/macos/qt.conf b/cmake/platforms/macos/qt.conf
deleted file mode 100644
index eb8002b..0000000
--- a/cmake/platforms/macos/qt.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Paths]
-Plugins = MacOS/plugins \ No newline at end of file
diff --git a/cmake/util/release-bibletime b/cmake/util/release-bibletime
deleted file mode 100755
index f075f2a..0000000
--- a/cmake/util/release-bibletime
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "Packaging fresh BibleTime checkout in /tmp/"
-cd /tmp
-rm -rf /tmp/bibletime
-rm -rf /tmp/bibletime-$2*
-svn co https://bibletime.svn.sourceforge.net/svnroot/bibletime/$1/bibletime bibletime
-mv bibletime bibletime-$2
-tar --exclude=".*" -vv -chzf bibletime-$2.tar.gz bibletime-$2/
-echo "Done."