summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/BTCpack.cmake35
-rw-r--r--cmake/BTDocumentation.cmake57
-rw-r--r--cmake/BTSourceFileList.cmake37
-rw-r--r--cmake/BTUITranslation.cmake44
-rw-r--r--cmake/docs/handbook_po4a.conf2
-rw-r--r--cmake/docs/howto_po4a.conf2
6 files changed, 103 insertions, 74 deletions
diff --git a/cmake/BTCpack.cmake b/cmake/BTCpack.cmake
index e570a5d..c02f787 100644
--- a/cmake/BTCpack.cmake
+++ b/cmake/BTCpack.cmake
@@ -20,27 +20,30 @@ IF(WIN32 AND NOT UNIX)
# We need the libraries, and they're not pulled in automatically
INCLUDE(${QT_USE_FILE})
SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
+ SET(QT_BINARY_DIR "${QT_LIBRARY_DIR}/../bin")
INSTALL(FILES
- "${QT_LIBRARY_DIR}/QtWebKitd4.dll"
- "${QT_LIBRARY_DIR}/QtGuid4.dll"
- "${QT_LIBRARY_DIR}/QtXmld4.dll"
- "${QT_LIBRARY_DIR}/QtTestd4.dll"
- "${QT_LIBRARY_DIR}/QtNetworkd4.dll"
- "${QT_LIBRARY_DIR}/QtCored4.dll"
- "${QT_LIBRARY_DIR}/phonond4.dll"
- "${QT_LIBRARY_DIR}/QtSvgd4.dll"
+ "${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_LIBRARY_DIR}/QtWebKit4.dll"
- "${QT_LIBRARY_DIR}/QtGui4.dll"
- "${QT_LIBRARY_DIR}/QtXml4.dll"
- "${QT_LIBRARY_DIR}/QtTest4.dll"
- "${QT_LIBRARY_DIR}/QtNetwork4.dll"
- "${QT_LIBRARY_DIR}/QtCore4.dll"
- "${QT_LIBRARY_DIR}/phonon4.dll"
- "${QT_LIBRARY_DIR}/QtSvg4.dll"
+ "${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"
DESTINATION "${BT_DESTINATION}"
CONFIGURATIONS "Release"
)
diff --git a/cmake/BTDocumentation.cmake b/cmake/BTDocumentation.cmake
index 9e7eca9..6c8ff18 100644
--- a/cmake/BTDocumentation.cmake
+++ b/cmake/BTDocumentation.cmake
@@ -1,36 +1,22 @@
-######################################################
-# Update source catalog files (this is the basis for the translator's work)
-# Invoke this with "make messages"
-#
-
-FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
- NAMES lupdate-qt4 lupdate
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH
-)
-
-FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
- NAMES lrelease-qt4 lrelease
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH
-)
-
-ADD_CUSTOM_TARGET("messages")
-FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS})
- ADD_CUSTOM_TARGET("messages_${MESSAGE_LOCALE_LANG}"
- COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui_${MESSAGE_LOCALE_LANG}.ts")
- ADD_CUSTOM_TARGET("compile_messages_${MESSAGE_LOCALE_LANG}"
- COMMAND ${QT_LRELEASE_EXECUTABLE} "bibletime_ui_${MESSAGE_LOCALE_LANG}.ts" -qm "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/")
- ADD_DEPENDENCIES("compile_messages_${MESSAGE_LOCALE_LANG}" "messages_${MESSAGE_LOCALE_LANG}")
- ADD_DEPENDENCIES("messages" "compile_messages_${MESSAGE_LOCALE_LANG}")
-ENDFOREACH(MESSAGE_LOCALE_LANG)
-
-# Template file for translators
-ADD_CUSTOM_TARGET("messages_default"
- COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui.ts")
-ADD_DEPENDENCIES(messages "messages_default")
-######################################################
+#handbook (install images from en/ to all languages)
+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")
+ INSTALL(FILES ${INSTALL_HANDBOOK_HTML_FILES_${HANDBOOK_LOCALE_LANG}}
+ DESTINATION "${BT_SHARE_PATH}share/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/"
+ )
+ INSTALL(FILES ${INSTALL_HANDBOOK_IMAGES}
+ DESTINATION "${BT_SHARE_PATH}share/bibletime/docs/handbook/${HANDBOOK_LOCALE_LANG}/"
+ )
+ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
+
+#howto (does not have images)
+FOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en")
+ FILE(GLOB INSTALL_HOWTO_HTML_FILES_${HOWTO_LOCALE_LANG} "${CMAKE_CURRENT_SOURCE_DIR}/docs/howto/${HOWTO_LOCALE_LANG}/html/*.html")
+ INSTALL(FILES ${INSTALL_HOWTO_HTML_FILES_${HOWTO_LOCALE_LANG}}
+ DESTINATION "${BT_SHARE_PATH}share/bibletime/docs/howto/${HOWTO_LOCALE_LANG}/"
+ )
+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")
@@ -38,7 +24,6 @@ ELSE(CMAKE_SYSTEM MATCHES "BSD")
SET(BT_DOCBOOK_XSL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/docs/docs.xsl")
ENDIF(CMAKE_SYSTEM MATCHES "BSD")
-######################################################
# Update handbook
ADD_CUSTOM_TARGET("handbook")
@@ -53,9 +38,7 @@ FOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS} "en")
ADD_DEPENDENCIES("handbook_${HANDBOOK_LOCALE_LANG}" "handbook_translations")
ADD_DEPENDENCIES("handbook" "handbook_${HANDBOOK_LOCALE_LANG}")
ENDFOREACH(HANDBOOK_LOCALE_LANG ${HANDBOOK_LOCALE_LANGS})
-######################################################
-######################################################
# Update howto
ADD_CUSTOM_TARGET("howto")
ADD_CUSTOM_TARGET("howto_translations"
@@ -71,5 +54,3 @@ FOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS} "en")
ADD_DEPENDENCIES("howto_${HOWTO_LOCALE_LANG}" "howto_translations")
ADD_DEPENDENCIES("howto" "howto_${HOWTO_LOCALE_LANG}")
ENDFOREACH(HOWTO_LOCALE_LANG ${HOWTO_LOCALE_LANGS})
-
-###################################################### \ No newline at end of file
diff --git a/cmake/BTSourceFileList.cmake b/cmake/BTSourceFileList.cmake
index 45ad65c..8d55335 100644
--- a/cmake/BTSourceFileList.cmake
+++ b/cmake/BTSourceFileList.cmake
@@ -1,5 +1,3 @@
-
-
SET(bibletime_UIS
src/frontend/display/bthtmlfindtext.ui
)
@@ -8,13 +6,10 @@ SET(bibletime_SOURCES
#backend bookshelf model:
src/backend/bookshelfmodel/btbookshelfmodel.cpp
src/backend/bookshelfmodel/btbookshelftreemodel.cpp
-# src/backend/bookshelfmodel/btcheckstatefilterproxymodel.cpp
-# src/backend/bookshelfmodel/btmodulecategoryfilterproxymodel.cpp
- src/backend/bookshelfmodel/btmodulehiddenfilterproxymodel.cpp
- src/backend/bookshelfmodel/btmodulenamefilterproxymodel.cpp
+ src/backend/bookshelfmodel/btbookshelffiltermodel.cpp
src/backend/bookshelfmodel/categoryitem.cpp
- src/backend/bookshelfmodel/distributionitem.cpp
src/backend/bookshelfmodel/item.cpp
+ src/backend/bookshelfmodel/indexingitem.cpp
src/backend/bookshelfmodel/languageitem.cpp
src/backend/bookshelfmodel/moduleitem.cpp
#backend filters
@@ -66,6 +61,7 @@ SET(bibletime_SOURCES
# frontend top level
src/frontend/btbookshelfdockwidget.cpp
+ src/frontend/btmenuview.cpp
src/frontend/cdragdrop.cpp
src/frontend/crossrefrendering.cpp
src/frontend/cprinter.cpp
@@ -113,6 +109,7 @@ SET(bibletime_SOURCES
src/frontend/bookshelfmanager/installpage/btinstallpathdialog.cpp
src/frontend/bookshelfmanager/removepage/btremovepage.cpp
+ src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.cpp
src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
# Search dialog
@@ -168,9 +165,7 @@ SET(bibletime_SOURCES
#display windows and their widgets
src/frontend/displaywindow/bttoolbarpopupaction.cpp
src/frontend/displaywindow/btactioncollection.cpp
- src/frontend/displaywindow/cmodulechooserbutton.cpp
- src/frontend/displaywindow/cmodulechooserbar.cpp
- src/frontend/displaywindow/cbuttons.cpp
+ src/frontend/displaywindow/btdisplaysettingsbutton.cpp
src/frontend/displaywindow/cdisplaywindow.cpp
src/frontend/displaywindow/creadwindow.cpp
src/frontend/displaywindow/cwritewindow.cpp
@@ -181,6 +176,11 @@ SET(bibletime_SOURCES
src/frontend/displaywindow/ccommentaryreadwindow.cpp
src/frontend/displaywindow/cbookreadwindow.cpp
src/frontend/displaywindow/cdisplaywindowfactory.cpp
+ src/frontend/displaywindow/bttextwindowheader.cpp
+ src/frontend/displaywindow/bttextwindowheaderwidget.cpp
+ src/frontend/displaywindow/btmodulechooserbar.cpp
+ src/frontend/displaywindow/btmodulechooserbutton.cpp
+
# web based tab dialogs
src/frontend/htmldialogs/btaboutdialog.cpp
@@ -200,15 +200,13 @@ SET(bibletime_SOURCES
SET(bibletime_MOCABLE_HEADERS
src/backend/bookshelfmodel/btbookshelfmodel.h
src/backend/bookshelfmodel/btbookshelftreemodel.h
-# src/backend/bookshelfmodel/btcheckstatefilterproxymodel.h
-# src/backend/bookshelfmodel/btmodulecategoryfilterproxymodel.h
- src/backend/bookshelfmodel/btmodulehiddenfilterproxymodel.h
- src/backend/bookshelfmodel/btmodulenamefilterproxymodel.h
+ src/backend/bookshelfmodel/btbookshelffiltermodel.h
src/backend/drivers/cswordmoduleinfo.h
src/backend/managers/cswordbackend.h
src/backend/cswordmodulesearch.h
src/bibletime.h
src/bibletime_dbus_adaptor.h
+ src/frontend/btmenuview.h
src/frontend/btbookshelfdockwidget.h
src/frontend/searchdialog/csearchmodulechooserdialog.h
src/frontend/searchdialog/crangechooserdialog.h
@@ -262,20 +260,23 @@ SET(bibletime_MOCABLE_HEADERS
src/frontend/settingsdialogs/clanguagesettings.h
src/frontend/displaywindow/cbookreadwindow.h
src/frontend/displaywindow/ccommentaryreadwindow.h
- src/frontend/displaywindow/cmodulechooserbar.h
src/frontend/displaywindow/clexiconreadwindow.h
src/frontend/displaywindow/chtmlwritewindow.h
src/frontend/displaywindow/bttoolbarpopupaction.h
src/frontend/displaywindow/btactioncollection.h
src/frontend/displaywindow/creadwindow.h
- src/frontend/displaywindow/cmodulechooserbutton.h
- src/frontend/displaywindow/cbuttons.h
+ src/frontend/displaywindow/btdisplaysettingsbutton.h
src/frontend/displaywindow/cbiblereadwindow.h
src/frontend/displaywindow/cplainwritewindow.h
src/frontend/displaywindow/cdisplaywindow.h
src/frontend/displaywindow/cwritewindow.h
- src/frontend/bookshelfmanager/btconfigdialog.h
+ src/frontend/displaywindow/btmodulechooserbar.h
+ src/frontend/displaywindow/btmodulechooserbutton.h
+ src/frontend/displaywindow/bttextwindowheader.h
+ src/frontend/displaywindow/bttextwindowheaderwidget.h
+ src/frontend/bookshelfmanager/btconfigdialog.h
src/frontend/bookshelfmanager/removepage/btremovepage.h
+ src/frontend/bookshelfmanager/removepage/btremovepagetreemodel.h
src/frontend/bookshelfmanager/cswordsetupinstallsourcesdialog.h
src/frontend/bookshelfmanager/installpage/btsourcewidget.h
src/frontend/bookshelfmanager/installpage/btinstallpage.h
diff --git a/cmake/BTUITranslation.cmake b/cmake/BTUITranslation.cmake
new file mode 100644
index 0000000..ad97d9b
--- /dev/null
+++ b/cmake/BTUITranslation.cmake
@@ -0,0 +1,44 @@
+SET(bibletime_UI_translations)
+
+FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
+ NAMES lupdate-qt4 lupdate
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+)
+
+FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
+ NAMES lrelease-qt4 lrelease
+ PATHS ${QT_BINARY_DIR}
+ NO_DEFAULT_PATH
+)
+
+FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS})
+ ADD_CUSTOM_COMMAND(OUTPUT "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
+ PRE_BUILD
+ COMMAND ${QT_LRELEASE_EXECUTABLE} "bibletime_ui_${MESSAGE_LOCALE_LANG}.ts" -qm "${CMAKE_CURRENT_BINARY_DIR}/bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/"
+ COMMENT "Updating UI translation for ${MESSAGE_LOCALE_LANG}"
+ VERBATIM
+ )
+ SET(bibletime_UI_translations
+ ${bibletime_UI_translations}
+ "bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
+ )
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/bibletime_ui_${MESSAGE_LOCALE_LANG}.qm"
+ DESTINATION "${BT_SHARE_PATH}share/bibletime/locale/"
+ )
+ENDFOREACH(MESSAGE_LOCALE_LANG)
+
+
+# Update source catalog files (this is the basis for the translator's work)
+# Invoke this with "make messages"
+ADD_CUSTOM_TARGET("messages")
+FOREACH(MESSAGE_LOCALE_LANG ${MESSAGE_LOCALE_LANGS})
+ ADD_CUSTOM_TARGET("messages_${MESSAGE_LOCALE_LANG}"
+ COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui_${MESSAGE_LOCALE_LANG}.ts")
+ ADD_DEPENDENCIES("messages" "messages_${MESSAGE_LOCALE_LANG}")
+ENDFOREACH(MESSAGE_LOCALE_LANG)
+# Template file for translators
+ADD_CUSTOM_TARGET("messages_default"
+ COMMAND ${QT_LUPDATE_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src" -ts "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/bibletime_ui.ts")
+ADD_DEPENDENCIES(messages "messages_default")
diff --git a/cmake/docs/handbook_po4a.conf b/cmake/docs/handbook_po4a.conf
index e6493de..41092e3 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] cs de fi fr hu nl pt-br
+[po4a_langs] cs de fi fr hu it 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 88082c8..13bdf79 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] bg cs de da es fi fr it hu ko nl pt-br ru
+[po4a_langs] bg cs de da es fi fr it 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 01:00:45 +0000