Imported Upstream version 2.2

4 files changed, 34 insertions, 42 deletions

diff --git a/cmake/FindCLucene.cmake b/cmake/FindCLucene.cmake
index 85e59b3..a5aa681 100644
--- a/cmake/FindCLucene.cmake
+++ b/cmake/FindCLucene.cmake
@@ -29,11 +29,11 @@ ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
 
 IF(MSVC)
 	IF(CMAKE_BUILD_TYPE STREQUAL "Release")
-		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core-0.9.21b/src/CLucene/Release)
+		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/Release)
 	ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
-		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core-0.9.21b/src/CLucene/debug)
+		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/debug)
 	ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
-	SET(WIN_CLUCENE_INCLUDE_PATH ../clucene-core-0.9.21b/src)
+	SET(WIN_CLUCENE_INCLUDE_PATH ../clucene-core/src)
 ELSE(MSVC)
 	SET(WIN_CLUCENE_SEARCH_PATH "")
 	SET(WIN_CLUCENE_INCLUDE_PATH "")
diff --git a/cmake/FindSword.cmake b/cmake/FindSword.cmake
index 8080895..4c5677d 100644
--- a/cmake/FindSword.cmake
+++ b/cmake/FindSword.cmake
@@ -1,8 +1,4 @@
-SET (REQUIRED_SWORD_VERSION 1.5.9)
-SET (SIMPLE_RENDER_SWORD_VERSION 1.5.10)
-SET (MULTIVERSE_SWORD_VERSION 1.5.11.1)
-SET (SYSCONF_CHANGED_SWORD_VERSION 1.5.11.98)
-#SET (INTERNET_WARNING_SWORD_VERSION 1.5.11.98) # same as SYSCONF_CHANGED_SWORD_VERSION, treated together
+SET (REQUIRED_SWORD_VERSION 1.6.0)
 
 # This module looks for installed sword
 #
@@ -10,7 +6,6 @@ SET (SYSCONF_CHANGED_SWORD_VERSION 1.5.11.98)
 # SWORD_INCLUDE_DIR
 # SWORD_LIBRARY
 # SWORD_LIBRARY_DIR
-# SWORD_CFLAGS
 
 IF(MSVC)
 	SET(SWORD_WIN32_LIBRARY_PATH ../sword/lib/vcppmake/vc8/ICUDebug)
@@ -43,10 +38,15 @@ SET(TRIAL_INCLUDE_PATHS
 	${SWORD_WIN32_INCLUDE_PATH}
 )
 
-FIND_LIBRARY(SWORD_LIBRARY sword NAMES libsword PATHS ${TRIAL_LIBRARY_PATHS})
+IF(MSVC)
+	FIND_LIBRARY(SWORD_LIBRARY NAMES libsword PATHS ${TRIAL_LIBRARY_PATHS})
+ELSE(MSVC)
+	FIND_LIBRARY(SWORD_LIBRARY sword NAMES libsword PATHS ${TRIAL_LIBRARY_PATHS})
+ENDIF(MSVC)
+
 IF (SWORD_LIBRARY)
 	MESSAGE(STATUS "Found Sword library: ${SWORD_LIBRARY}")
-	SET(SWORD_LIBRARY "sword")
+#	SET(SWORD_LIBRARY "sword")
 ELSE (SWORD_LIBRARY)
 	MESSAGE(FATAL_ERROR "Could not find the Sword library.")
 ENDIF (SWORD_LIBRARY)
@@ -69,12 +69,18 @@ ENDIF (SWORD_INCLUDE_DIR)
 # Check for minimum Sword version
 #
 MACRO(CHECK_SWORD_VERSION VERSION)
+	IF(MSVC)
+		SET(CHECK_SWORD_VERSION_DEFINES "/DSWUSINGDLL")
+	ENDIF(MSVC)
 	TRY_RUN(SWVERSIONTEST_RUN_RESULT SWVERSIONTEST_COMPILE_RESULT
 		${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sword_version_compare.cpp
 		CMAKE_FLAGS
 			"-DINCLUDE_DIRECTORIES:STRING=${SWORD_INCLUDE_DIR}"
 			"-DLINK_DIRECTORIES:STRING=${SWORD_LIBRARY_DIR}"
 			"-DLINK_LIBRARIES:STRING=${SWORD_LIBRARY}"
+			${SWORD_LIBRARY}
+		COMPILE_DEFINITIONS
+			${CHECK_SWORD_VERSION_DEFINES}
 		COMPILE_OUTPUT_VARIABLE SWVERSIONTEST_COMPILE_OUTPUT
 		RUN_OUTPUT_VARIABLE SWVERSIONTEST_RUN_OUTPUT
 		ARGS ${VERSION}
@@ -94,42 +100,25 @@ ELSE(SWVERSIONTEST_RUN_RESULT EQUAL 0)
 ENDIF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
 
 #
-# Check for API changes that require compiler definitions
-#
-
-# SIMPLE_RENDER
-CHECK_SWORD_VERSION(${SIMPLE_RENDER_SWORD_VERSION})
-IF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-	SET (SWORD_CFLAGS "${SWORD_CFLAGS} -DSWORD_SIMPLERENDER")
-	MESSAGE(STATUS "	Found simple render version of Sword.")
-ENDIF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-
-# MULTIVERSE
-CHECK_SWORD_VERSION(${MULTIVERSE_SWORD_VERSION})
-IF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-	SET (SWORD_CFLAGS "${SWORD_CFLAGS} -DSWORD_MULTIVERSE")
-	MESSAGE(STATUS "	Found multiverse version of Sword.")
-ENDIF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-
-# SYSCONF_CHANGED and INTERNET_WARNING
-CHECK_SWORD_VERSION(${SYSCONF_CHANGED_SWORD_VERSION})
-IF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-	SET (SWORD_CFLAGS "${SWORD_CFLAGS} -DSWORD_SYSCONF_CHANGED -DSWORD_INTERNET_WARNING")
-	MESSAGE(STATUS "	Found sysconf_changed and internet_warning version of Sword.")
-ENDIF(SWVERSIONTEST_RUN_RESULT EQUAL 0)
-
-MESSAGE(STATUS "SWORD_CFLAGS: ${SWORD_CFLAGS}")
-
-#
 # Sword linker flag detection
 #
 MACRO(CHECK_SWORD_LINK_LIBRARIES FLAGS)
+	IF(MSVC)
+		SET(CHECK_SWORD_CXX_FLAGS "/Zc:wchar_t- /MDd")
+		SET(CHECK_SWORD_LINK_DEFINES "/DSWUSINGDLL")
+	ELSE(MSVC)
+		SET(CHECK_SWORD_CXX_FLAGS "")
+		SET(CHECK_SWORD_LINK_DEFINES "")
+	ENDIF(MSVC)
 	TRY_COMPILE(SWLINKER_CHECK_COMPILE_RESULT
 	${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sword_linker_check.cpp
 	CMAKE_FLAGS
 		"-DINCLUDE_DIRECTORIES:STRING=${SWORD_INCLUDE_DIR}"
 		"-DLINK_DIRECTORIES:STRING=${SWORD_LIBRARY_DIR};${CLUCENE_LIBRARY_DIR}"
 		"-DLINK_LIBRARIES:STRING=${FLAGS}"
+		"-DCMAKE_CXX_FLAGS_DEBUG:STRING=${CHECK_SWORD_CXX_FLAGS}"
+	COMPILE_DEFINITIONS
+		${CHECK_SWORD_LINK_DEFINES}
 	OUTPUT_VARIABLE SWLINKER_CHECK_COMPILE_OUTPUT
 )
 ENDMACRO(CHECK_SWORD_LINK_LIBRARIES FLAGS)
@@ -151,5 +140,4 @@ MARK_AS_ADVANCED(
 	SWORD_INCLUDE_DIR
 	SWORD_LIBRARY
 	SWORD_LIBRARY_DIR
-	SWORD_CFLAGS
 )
diff --git a/cmake/bibletime_source_list.cmake b/cmake/bibletime_source_list.cmake
index c3ac1da..bddf98f 100644
--- a/cmake/bibletime_source_list.cmake
+++ b/cmake/bibletime_source_list.cmake
@@ -79,7 +79,9 @@ SET(bibletime_SOURCES
 	src/frontend/mainindex/bookshelf/chidemodulechooserdialog.cpp
 
 	#Settings dialog (configuration)
-#	src/frontend/settingsdialogs/cacceleratorsettings.cpp #DISABLED
+	src/frontend/settingsdialogs/btshortcutsdialog.cpp 
+	src/frontend/settingsdialogs/btshortcutseditor.cpp 
+	src/frontend/settingsdialogs/cacceleratorsettings.cpp 
 	src/frontend/settingsdialogs/cdisplaysettings.cpp
 	src/frontend/settingsdialogs/cswordsettings.cpp
 	src/frontend/settingsdialogs/clanguagesettings.cpp
@@ -238,7 +240,9 @@ SET(bibletime_MOCABLE_HEADERS
 	src/frontend/settingsdialogs/cswordsettings.h
 	src/frontend/settingsdialogs/clistwidget.h
 	src/frontend/settingsdialogs/cconfigurationdialog.h
-	#src/frontend/settingsdialogs/cacceleratorsettings.h.OFF
+	src/frontend/settingsdialogs/btshortcutsdialog.h
+	src/frontend/settingsdialogs/btshortcutseditor.h
+	src/frontend/settingsdialogs/cacceleratorsettings.h
 	src/frontend/settingsdialogs/cfontchooser.h
 	src/frontend/settingsdialogs/clanguagesettings.h
 	src/frontend/displaywindow/cbookreadwindow.h
diff --git a/cmake/docs/handbook_po4a.conf b/cmake/docs/handbook_po4a.conf
index 96c485a..e6493de 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
+[po4a_langs] cs de fi fr hu 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