diff options
Diffstat (limited to 'bibletime')
336 files changed, 0 insertions, 57096 deletions
diff --git a/bibletime/Makefile.am b/bibletime/Makefile.am deleted file mode 100644 index 4cd9bd9..0000000 --- a/bibletime/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -bibletime_SOURCES = bibletime_init.cpp bibletime_slots.cpp bibletime.cpp \ - bibletimeapp.cpp main.cpp bibletime_dcop.cpp bibletimeinterface.skel - -bibletime_LDADD = \ -./frontend/displaywindow/libdisplaywindow.a \ -./frontend/display/libdisplay.a \ -./frontend/keychooser/libkeychooser.a \ -./frontend/mainindex/libmainindex.a \ -./frontend/searchdialog/libsearchdialog.a \ -./frontend/libfrontend.a \ -./frontend/util/libfrontendutil.a \ -./backend/libbackend.a \ -./util/libutil.a \ --lXext \ -$(LIB_QT) \ -$(LIB_KDECORE) \ -$(LIB_KDEUI) \ --lkdeprint \ -$(LIB_KFILE) \ -$(LIB_KHTML) \ -$(LIB_X11) \ -$(LIB_SWORD) \ -$(LIB_CLUCENE) \ -$(LIBSOCKET) - -SUBDIRS = display-templates backend frontend xml pics util - -all_headers = bibletime.h bibletimeapp.h -include_HEADERS = bibletimeinterface.h - -EXTRA_DIST = $(bibletime_SOURCES) $(all_headers) - -# this 10 paths are KDE specific. Use them: -# kde_htmldir Where your docs should go to. (contains lang subdirs) -# kde_appsdir Where your application file (.kdelnk) should go to. -# kde_icondir Where your icon should go to. -# kde_minidir Where your mini icon should go to. -# kde_datadir Where you install application data. (Use a subdir) -# kde_locale Where translation files should go to.(contains lang subdirs) -# kde_cgidir Where cgi-bin executables should go to. -# kde_confdir Where config files should go to. -# kde_mimedir Where mimetypes should go to. -# kde_toolbardir Where general toolbar icons should go to. -# kde_wallpaperdir Where general wallpapers should go to. - -# set the include path for X, qt, KDE and Sword -INCLUDES = $(all_includes) - -# claim, which subdirectories you want to install -# you can add here more. This one gets installed -bin_PROGRAMS = bibletime - -bibletime_METASOURCES = AUTO - -# the library search path. -bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) - -# them while "make clean", use CLEANFILES -DISTCLEANFILES = $(bibletime_METASOURCES) - -# make messages.po. Move this one to ../po/ and "make merge" in po -# the -x is for skipping messages already translated in kdelibs -#messages: -# $(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_confdir) - -rpm: dist -noinst_HEADERS = bibletimeinterface.h diff --git a/bibletime/Makefile.in b/bibletime/Makefile.in deleted file mode 100644 index 039515e..0000000 --- a/bibletime/Makefile.in +++ /dev/null @@ -1,993 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -bin_PROGRAMS = bibletime$(EXEEXT) -subdir = bibletime -DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_bibletime_OBJECTS = bibletime_init.$(OBJEXT) \ - bibletime_slots.$(OBJEXT) bibletime.$(OBJEXT) \ - bibletimeapp.$(OBJEXT) main.$(OBJEXT) bibletime_dcop.$(OBJEXT) -#>- bibletime_OBJECTS = $(am_bibletime_OBJECTS) -#>+ 7 -bibletime_final_OBJECTS = bibletime.all_cpp.o -bibletime_nofinal_OBJECTS = bibletime_init.$(OBJEXT) \ - bibletime_slots.$(OBJEXT) bibletime.$(OBJEXT) \ - bibletimeapp.$(OBJEXT) main.$(OBJEXT) bibletime_dcop.$(OBJEXT) bibletimeinterface_skel.$(OBJEXT)\ -bibletime.moc.o -@KDE_USE_FINAL_FALSE@bibletime_OBJECTS = $(bibletime_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@bibletime_OBJECTS = $(bibletime_final_OBJECTS) -am__DEPENDENCIES_1 = -bibletime_DEPENDENCIES = ./frontend/displaywindow/libdisplaywindow.a \ - ./frontend/display/libdisplay.a \ - ./frontend/keychooser/libkeychooser.a \ - ./frontend/mainindex/libmainindex.a \ - ./frontend/searchdialog/libsearchdialog.a \ - ./frontend/libfrontend.a ./frontend/util/libfrontendutil.a \ - ./backend/libbackend.a ./util/libutil.a $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -#>- bibletime_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -#>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -#>- $(CXXFLAGS) $(bibletime_LDFLAGS) $(LDFLAGS) -o $@ -#>+ 3 -bibletime_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(KDE_CXXFLAGS) $(bibletime_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(bibletime_SOURCES) -DIST_SOURCES = $(bibletime_SOURCES) -#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -#>- html-recursive info-recursive install-data-recursive \ -#>- install-dvi-recursive install-exec-recursive \ -#>- install-html-recursive install-info-recursive \ -#>- install-pdf-recursive install-ps-recursive install-recursive \ -#>- installcheck-recursive installdirs-recursive pdf-recursive \ -#>- ps-recursive uninstall-recursive -#>+ 7 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(include_HEADERS) $(noinst_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -#>- bibletime_SOURCES = bibletime_init.cpp bibletime_slots.cpp bibletime.cpp \ -#>- bibletimeapp.cpp main.cpp bibletime_dcop.cpp bibletimeinterface.skel -#>+ 2 -bibletime_SOURCES=bibletime_init.cpp bibletime_slots.cpp bibletime.cpp \ - bibletimeapp.cpp main.cpp bibletime_dcop.cpp bibletimeinterface_skel.cpp - -bibletime_LDADD = \ -./frontend/displaywindow/libdisplaywindow.a \ -./frontend/display/libdisplay.a \ -./frontend/keychooser/libkeychooser.a \ -./frontend/mainindex/libmainindex.a \ -./frontend/searchdialog/libsearchdialog.a \ -./frontend/libfrontend.a \ -./frontend/util/libfrontendutil.a \ -./backend/libbackend.a \ -./util/libutil.a \ --lXext \ -$(LIB_QT) \ -$(LIB_KDECORE) \ -$(LIB_KDEUI) \ --lkdeprint \ -$(LIB_KFILE) \ -$(LIB_KHTML) \ -$(LIB_X11) \ -$(LIB_SWORD) \ -$(LIB_CLUCENE) \ -$(LIBSOCKET) - -SUBDIRS = display-templates backend frontend xml pics util -all_headers = bibletime.h bibletimeapp.h -include_HEADERS = bibletimeinterface.h -EXTRA_DIST = $(bibletime_SOURCES) $(all_headers) - -# this 10 paths are KDE specific. Use them: -# kde_htmldir Where your docs should go to. (contains lang subdirs) -# kde_appsdir Where your application file (.kdelnk) should go to. -# kde_icondir Where your icon should go to. -# kde_minidir Where your mini icon should go to. -# kde_datadir Where you install application data. (Use a subdir) -# kde_locale Where translation files should go to.(contains lang subdirs) -# kde_cgidir Where cgi-bin executables should go to. -# kde_confdir Where config files should go to. -# kde_mimedir Where mimetypes should go to. -# kde_toolbardir Where general toolbar icons should go to. -# kde_wallpaperdir Where general wallpapers should go to. - -# set the include path for X, qt, KDE and Sword -INCLUDES = $(all_includes) -#>- bibletime_METASOURCES = AUTO - -# the library search path. -bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) - -# them while "make clean", use CLEANFILES -DISTCLEANFILES = $(bibletime_METASOURCES) -noinst_HEADERS = bibletimeinterface.h -#>- all: all-recursive -#>+ 1 -all: docs-am all-recursive - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -bibletime$(EXEEXT): $(bibletime_OBJECTS) $(bibletime_DEPENDENCIES) - @rm -f bibletime$(EXEEXT) - $(bibletime_LINK) $(bibletime_OBJECTS) $(bibletime_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime_dcop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime_init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime_slots.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletimeapp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-recursive -#>+ 1 -clean: kde-rpo-clean clean-recursive - -#>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-metasources clean-idl clean-bcheck clean-final clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-data-local install-includeHEADERS - -install-dvi: install-dvi-recursive - -install-exec-am: install-binPROGRAMS - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-includeHEADERS - - -# make messages.po. Move this one to ../po/ and "make merge" in po -# the -x is for skipping messages already translated in kdelibs -#messages: -# $(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_confdir) - -rpm: dist -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 5 -bibletimeinterface.kidl: $(srcdir)/bibletimeinterface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/bibletimeinterface.h > bibletimeinterface.kidl || ( rm -f bibletimeinterface.kidl ; false ) -bibletimeinterface_skel.cpp: bibletimeinterface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub bibletimeinterface.kidl - -#>+ 3 -bibletime.moc.cpp: $(srcdir)/bibletime.h - $(MOC) $(srcdir)/bibletime.h -o bibletime.moc.cpp - -#>+ 2 -mocs: bibletime.moc.cpp - -#>+ 3 -clean-metasources: - -rm -f bibletime.moc.cpp - -#>+ 2 -KDE_DIST=Makefile.in bibletime.h Makefile.am bibletimeapp.h - -#>+ 4 -clean-idl: - -rm -f \ - bibletimeinterface_skel.cpp bibletimeinterface_skel.h bibletimeinterface.kidl - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-recursive - -bcheck-am: - @for i in $(include_HEADERS) ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -bibletime.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bibletime_init.cpp $(srcdir)/bibletime_slots.cpp $(srcdir)/bibletime.cpp $(srcdir)/bibletimeapp.cpp $(srcdir)/main.cpp $(srcdir)/bibletime_dcop.cpp bibletimeinterface_skel.cpp bibletime.moc.cpp - @echo 'creating bibletime.all_cpp.cpp ...'; \ - rm -f bibletime.all_cpp.files bibletime.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> bibletime.all_cpp.final; \ - for file in bibletime_init.cpp bibletime_slots.cpp bibletime.cpp bibletimeapp.cpp main.cpp bibletime_dcop.cpp bibletimeinterface_skel.cpp bibletime.moc.cpp ; do \ - echo "#include \"$$file\"" >> bibletime.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> bibletime.all_cpp.final; \ - done; \ - cat bibletime.all_cpp.final bibletime.all_cpp.files > bibletime.all_cpp.cpp; \ - rm -f bibletime.all_cpp.final bibletime.all_cpp.files - -#>+ 3 -clean-final: - -rm -f bibletime.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) bibletime_OBJECTS="$(bibletime_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) bibletime_OBJECTS="$(bibletime_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) bibletime_OBJECTS="$(bibletime_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) bibletime_OBJECTS="$(bibletime_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/backend/Makefile.am b/bibletime/backend/Makefile.am deleted file mode 100644 index 85624f7..0000000 --- a/bibletime/backend/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -libbackend_a_METASOURCES = AUTO -noinst_LIBRARIES = libbackend.a - -INCLUDES = $(all_includes) - -libbackend_a_SOURCES = bt_gbfhtml.cpp bt_osishtml.cpp bt_plainhtml.cpp \ - bt_thmlhtml.cpp bt_thmlplain.cpp btstringmgr.cpp cbookdisplay.cpp \ - cchapterdisplay.cpp cdisplayrendering.cpp cdisplaytemplatemgr.cpp centrydisplay.cpp \ - chtmlexportrendering.cpp clanguagemgr.cpp cplaintextexportrendering.cpp \ - creferencemanager.cpp cswordbackend.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp \ - cswordcommentarymoduleinfo.cpp cswordkey.cpp cswordldkey.cpp cswordlexiconmoduleinfo.cpp \ - cswordmoduleinfo.cpp cswordmodulesearch.cpp cswordtreekey.cpp cswordversekey.cpp \ - ctextrendering.cpp osismorphsegmentation.cpp - -all_headers = cswordbiblemoduleinfo.h \ -cswordcommentarymoduleinfo.h \ -cswordlexiconmoduleinfo.h \ -cswordkey.h \ -cswordversekey.h \ -cswordldkey.h \ -cswordbackend.h \ -cswordmoduleinfo.h \ -cswordmodulesearch.h \ -creferencemanager.h \ -cswordbookmoduleinfo.h \ -cswordtreekey.h \ -bt_thmlhtml.h \ -bt_osishtml.h \ -bt_gbfhtml.h \ -bt_plainhtml.h \ -bt_thmlplain.h \ -centrydisplay.h \ -clanguagemgr.h \ -cdisplaytemplatemgr.h \ -ctextrendering.h \ -btstringmgr.h \ -cbookdisplay.h \ -cchapterdisplay.h \ -chtmlexportrendering.h \ -cplaintextexportrendering.h \ -cdisplayrendering.h \ -osismorphsegmentation.h - -EXTRA_DIST = $(libbackend_a_SOURCES) $(all_headers) diff --git a/bibletime/backend/Makefile.in b/bibletime/backend/Makefile.in deleted file mode 100644 index 3187253..0000000 --- a/bibletime/backend/Makefile.in +++ /dev/null @@ -1,794 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/backend -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libbackend_a_AR = $(AR) $(ARFLAGS) -libbackend_a_LIBADD = -am_libbackend_a_OBJECTS = bt_gbfhtml.$(OBJEXT) bt_osishtml.$(OBJEXT) \ - bt_plainhtml.$(OBJEXT) bt_thmlhtml.$(OBJEXT) \ - bt_thmlplain.$(OBJEXT) btstringmgr.$(OBJEXT) \ - cbookdisplay.$(OBJEXT) cchapterdisplay.$(OBJEXT) \ - cdisplayrendering.$(OBJEXT) cdisplaytemplatemgr.$(OBJEXT) \ - centrydisplay.$(OBJEXT) chtmlexportrendering.$(OBJEXT) \ - clanguagemgr.$(OBJEXT) cplaintextexportrendering.$(OBJEXT) \ - creferencemanager.$(OBJEXT) cswordbackend.$(OBJEXT) \ - cswordbiblemoduleinfo.$(OBJEXT) cswordbookmoduleinfo.$(OBJEXT) \ - cswordcommentarymoduleinfo.$(OBJEXT) cswordkey.$(OBJEXT) \ - cswordldkey.$(OBJEXT) cswordlexiconmoduleinfo.$(OBJEXT) \ - cswordmoduleinfo.$(OBJEXT) cswordmodulesearch.$(OBJEXT) \ - cswordtreekey.$(OBJEXT) cswordversekey.$(OBJEXT) \ - ctextrendering.$(OBJEXT) osismorphsegmentation.$(OBJEXT) -#>- libbackend_a_OBJECTS = $(am_libbackend_a_OBJECTS) -#>+ 17 -libbackend_a_final_OBJECTS = libbackend_a.all_cpp.o -libbackend_a_nofinal_OBJECTS = bt_gbfhtml.$(OBJEXT) bt_osishtml.$(OBJEXT) \ - bt_plainhtml.$(OBJEXT) bt_thmlhtml.$(OBJEXT) \ - bt_thmlplain.$(OBJEXT) btstringmgr.$(OBJEXT) \ - cbookdisplay.$(OBJEXT) cchapterdisplay.$(OBJEXT) \ - cdisplayrendering.$(OBJEXT) cdisplaytemplatemgr.$(OBJEXT) \ - centrydisplay.$(OBJEXT) chtmlexportrendering.$(OBJEXT) \ - clanguagemgr.$(OBJEXT) cplaintextexportrendering.$(OBJEXT) \ - creferencemanager.$(OBJEXT) cswordbackend.$(OBJEXT) \ - cswordbiblemoduleinfo.$(OBJEXT) cswordbookmoduleinfo.$(OBJEXT) \ - cswordcommentarymoduleinfo.$(OBJEXT) cswordkey.$(OBJEXT) \ - cswordldkey.$(OBJEXT) cswordlexiconmoduleinfo.$(OBJEXT) \ - cswordmoduleinfo.$(OBJEXT) cswordmodulesearch.$(OBJEXT) \ - cswordtreekey.$(OBJEXT) cswordversekey.$(OBJEXT) \ - ctextrendering.$(OBJEXT) osismorphsegmentation.$(OBJEXT) -@KDE_USE_FINAL_FALSE@libbackend_a_OBJECTS = $(libbackend_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libbackend_a_OBJECTS = $(libbackend_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libbackend_a_SOURCES) -DIST_SOURCES = $(libbackend_a_SOURCES) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -#>- libbackend_a_METASOURCES = AUTO -noinst_LIBRARIES = libbackend.a -INCLUDES = $(all_includes) -libbackend_a_SOURCES = bt_gbfhtml.cpp bt_osishtml.cpp bt_plainhtml.cpp \ - bt_thmlhtml.cpp bt_thmlplain.cpp btstringmgr.cpp cbookdisplay.cpp \ - cchapterdisplay.cpp cdisplayrendering.cpp cdisplaytemplatemgr.cpp centrydisplay.cpp \ - chtmlexportrendering.cpp clanguagemgr.cpp cplaintextexportrendering.cpp \ - creferencemanager.cpp cswordbackend.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp \ - cswordcommentarymoduleinfo.cpp cswordkey.cpp cswordldkey.cpp cswordlexiconmoduleinfo.cpp \ - cswordmoduleinfo.cpp cswordmodulesearch.cpp cswordtreekey.cpp cswordversekey.cpp \ - ctextrendering.cpp osismorphsegmentation.cpp - -all_headers = cswordbiblemoduleinfo.h \ -cswordcommentarymoduleinfo.h \ -cswordlexiconmoduleinfo.h \ -cswordkey.h \ -cswordversekey.h \ -cswordldkey.h \ -cswordbackend.h \ -cswordmoduleinfo.h \ -cswordmodulesearch.h \ -creferencemanager.h \ -cswordbookmoduleinfo.h \ -cswordtreekey.h \ -bt_thmlhtml.h \ -bt_osishtml.h \ -bt_gbfhtml.h \ -bt_plainhtml.h \ -bt_thmlplain.h \ -centrydisplay.h \ -clanguagemgr.h \ -cdisplaytemplatemgr.h \ -ctextrendering.h \ -btstringmgr.h \ -cbookdisplay.h \ -cchapterdisplay.h \ -chtmlexportrendering.h \ -cplaintextexportrendering.h \ -cdisplayrendering.h \ -osismorphsegmentation.h - -EXTRA_DIST = $(libbackend_a_SOURCES) $(all_headers) -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/backend/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/backend/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/backend/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/backend/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/backend/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libbackend.a: $(libbackend_a_OBJECTS) $(libbackend_a_DEPENDENCIES) - -rm -f libbackend.a - $(libbackend_a_AR) libbackend.a $(libbackend_a_OBJECTS) $(libbackend_a_LIBADD) - $(RANLIB) libbackend.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_gbfhtml.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_osishtml.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_plainhtml.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_thmlhtml.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_thmlplain.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btstringmgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbookdisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cchapterdisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplayrendering.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplaytemplatemgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/centrydisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlexportrendering.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clanguagemgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cplaintextexportrendering.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creferencemanager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbackend.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbiblemoduleinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbookmoduleinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordcommentarymoduleinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordkey.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordldkey.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordlexiconmoduleinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordmoduleinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordmodulesearch.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordtreekey.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordversekey.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctextrendering.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osismorphsegmentation.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=cswordcommentarymoduleinfo.h clanguagemgr.h cswordmodulesearch.h bt_plainhtml.h ctextrendering.h cswordkey.h bt_gbfhtml.h cswordbiblemoduleinfo.h cswordbookmoduleinfo.h cswordversekey.h cswordtreekey.h bt_thmlhtml.h btstringmgr.h cswordlexiconmoduleinfo.h cplaintextexportrendering.h centrydisplay.h Makefile.in cdisplayrendering.h chtmlexportrendering.h cbookdisplay.h cswordldkey.h cdisplaytemplatemgr.h cchapterdisplay.h cswordmoduleinfo.h bt_osishtml.h bt_thmlplain.h cswordbackend.h osismorphsegmentation.h creferencemanager.h Makefile.am - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/backend/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/backend/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/backend/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libbackend_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bt_gbfhtml.cpp $(srcdir)/bt_osishtml.cpp $(srcdir)/bt_plainhtml.cpp $(srcdir)/bt_thmlhtml.cpp $(srcdir)/bt_thmlplain.cpp $(srcdir)/btstringmgr.cpp $(srcdir)/cbookdisplay.cpp $(srcdir)/cchapterdisplay.cpp $(srcdir)/cdisplayrendering.cpp $(srcdir)/cdisplaytemplatemgr.cpp $(srcdir)/centrydisplay.cpp $(srcdir)/chtmlexportrendering.cpp $(srcdir)/clanguagemgr.cpp $(srcdir)/cplaintextexportrendering.cpp $(srcdir)/creferencemanager.cpp $(srcdir)/cswordbackend.cpp $(srcdir)/cswordbiblemoduleinfo.cpp $(srcdir)/cswordbookmoduleinfo.cpp $(srcdir)/cswordcommentarymoduleinfo.cpp $(srcdir)/cswordkey.cpp $(srcdir)/cswordldkey.cpp $(srcdir)/cswordlexiconmoduleinfo.cpp $(srcdir)/cswordmoduleinfo.cpp $(srcdir)/cswordmodulesearch.cpp $(srcdir)/cswordtreekey.cpp $(srcdir)/cswordversekey.cpp $(srcdir)/ctextrendering.cpp $(srcdir)/osismorphsegmentation.cpp - @echo 'creating libbackend_a.all_cpp.cpp ...'; \ - rm -f libbackend_a.all_cpp.files libbackend_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libbackend_a.all_cpp.final; \ - for file in bt_gbfhtml.cpp bt_osishtml.cpp bt_plainhtml.cpp bt_thmlhtml.cpp bt_thmlplain.cpp btstringmgr.cpp cbookdisplay.cpp cchapterdisplay.cpp cdisplayrendering.cpp cdisplaytemplatemgr.cpp centrydisplay.cpp chtmlexportrendering.cpp clanguagemgr.cpp cplaintextexportrendering.cpp creferencemanager.cpp cswordbackend.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp cswordcommentarymoduleinfo.cpp cswordkey.cpp cswordldkey.cpp cswordlexiconmoduleinfo.cpp cswordmoduleinfo.cpp cswordmodulesearch.cpp cswordtreekey.cpp cswordversekey.cpp ctextrendering.cpp osismorphsegmentation.cpp ; do \ - echo "#include \"$$file\"" >> libbackend_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libbackend_a.all_cpp.final; \ - done; \ - cat libbackend_a.all_cpp.final libbackend_a.all_cpp.files > libbackend_a.all_cpp.cpp; \ - rm -f libbackend_a.all_cpp.final libbackend_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libbackend_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libbackend_a_OBJECTS="$(libbackend_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libbackend_a_OBJECTS="$(libbackend_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libbackend_a_OBJECTS="$(libbackend_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libbackend_a_OBJECTS="$(libbackend_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/backend/bt_gbfhtml.cpp b/bibletime/backend/bt_gbfhtml.cpp deleted file mode 100644 index 33d31a9..0000000 --- a/bibletime/backend/bt_gbfhtml.cpp +++ /dev/null @@ -1,303 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordmoduleinfo.h" -#include "cswordbackend.h" -#include "util/cpointers.h" - -#include "bt_gbfhtml.h" - -//sytsme includes -#include <stdlib.h> -#include <stdio.h> - -//Sword includes -#include <utilxml.h> - -//Qt includes -#include <qregexp.h> -#include <qstring.h> - -using namespace Filters; - -BT_GBFHTML::BT_GBFHTML() : sword::GBFHTML() { - - setEscapeStringCaseSensitive(true); - setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes - - removeTokenSubstitute("Rf"); - // addTokenSubstitute("RB", "<span>"); //start of a footnote with embedded text - - addTokenSubstitute("FI", "<span class=\"italic\">"); // italics begin - addTokenSubstitute("Fi", "</span>"); - - addTokenSubstitute("FB", "<span class=\"bold\">"); // bold begin - addTokenSubstitute("Fb", "</span>"); - - addTokenSubstitute("FR", "<span class=\"jesuswords\">"); - addTokenSubstitute("Fr", "</span>"); - - addTokenSubstitute("FU", "<u>"); // underline begin - addTokenSubstitute("Fu", "</u>"); - - addTokenSubstitute("FO", "<span class=\"quotation\">"); // Old Testament quote begin - addTokenSubstitute("Fo", "</span>"); - - - addTokenSubstitute("FS", "<span class=\"sup\">"); // Superscript begin// Subscript begin - addTokenSubstitute("Fs", "</span>"); - - addTokenSubstitute("FV", "<span class=\"sub\">"); // Subscript begin - addTokenSubstitute("Fv", "</span>"); - - addTokenSubstitute("TT", "<div class=\"booktitle\">"); - addTokenSubstitute("Tt", "</div>"); - - addTokenSubstitute("TS", "<div class=\"sectiontitle\">"); - addTokenSubstitute("Ts", "</div>"); - - //addTokenSubstitute("PP", "<span class=\"poetry\">"); // poetry begin - //addTokenSubstitute("Pp", "</span>"); - - - addTokenSubstitute("Fn", "</font>"); // font end - addTokenSubstitute("CL", "<br/>"); // new line - addTokenSubstitute("CM", "<br/>"); // paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired - - addTokenSubstitute("CG", ">"); // literal greater-than sign - addTokenSubstitute("CT", "<"); // literal less-than sign - - addTokenSubstitute("JR", "<span class=\"right\">"); // right align begin - addTokenSubstitute("JC", "<span class=\"center\">"); // center align begin - addTokenSubstitute("JL", "</span>"); // align end -} - -/** No descriptions */ -char BT_GBFHTML::processText(sword::SWBuf& buf, const sword::SWKey * key, const sword::SWModule * module) { - GBFHTML::processText(buf, key, module); - - if (!module->isProcessEntryAttributes()) { - return 1; //no processing should be done, may happen in a search - } - - CSwordModuleInfo* m = CPointers::backend()->findModuleByName( module->Name() ); - - if (m && !(m->has(CSwordModuleInfo::lemmas) || m->has(CSwordModuleInfo::morphTags) || m->has(CSwordModuleInfo::strongNumbers))) { //only parse if the module has strongs or lemmas - return 1; //WARNING: Return alread here - } - - //Am Anfang<WH07225> schuf<WH01254><WTH8804> Gott<WH0430> Himmel<WH08064> und<WT> Erde<WH0776>. - //A simple word<WT> means: No entry for this word "word" - QString result; - - QString t = QString::fromUtf8(buf.c_str()); - - QRegExp tag("([.,;:]?<W[HGT][^>]*>\\s*)+"); - - QStringList list; - - int lastMatchEnd = 0; - - int pos = tag.search(t,0); - - if (pos == -1) { //no strong or morph code found in this text - return 1; //WARNING: Return already here - } - - //split the text into parts which end with the GBF tag marker for strongs/lemmas - while (pos != -1) { - list.append(t.mid(lastMatchEnd, pos+tag.matchedLength()-lastMatchEnd)); - - lastMatchEnd = pos + tag.matchedLength(); - pos = tag.search(t, pos + tag.matchedLength()); - } - - //append the trailing text to the list. - if (!t.right(t.length() - lastMatchEnd).isEmpty()) { - list.append(t.right(t.length() - lastMatchEnd)); - } - - //list is now a list of words with 1-n Strongs at the end, which belong to this word. - - //now create the necessary HTML in list entries and concat them to the result - tag = QRegExp("<W([HGT])([^>]*)>"); - tag.setMinimal(true); - - for (QStringList::iterator it = list.begin(); it != list.end(); ++it) { - QString e = (*it); //current entry to process - //qWarning(e.latin1()); - - //check if there is a word to which the strongs info belongs to. - //If yes, wrap that word with the strongs info - //If not, leave out the strongs info, because it can't be tight to a text - //Comparing the first char with < is not enough, because the tokenReplace is done already - //so there might be html tags already. - const bool textPresent = (e.stripWhiteSpace().remove(QRegExp("[.,;:]")).left(2) != "<W"); - - if (!textPresent) { - result += (*it); - continue; - } - - int pos = tag.search(e, 0); //try to find a strong number marker - bool insertedTag = false; - bool hasLemmaAttr = false; - bool hasMorphAttr = false; - - QString value = QString::null; - int tagAttributeStart = -1; - - while (pos != -1) { //work on all strong/lemma tags in this section, should be between 1-3 loops - const bool isMorph = (tag.cap(1) == "T"); - value = isMorph ? tag.cap(2) : tag.cap(2).prepend( tag.cap(1) ); - - if (value.isEmpty()) { - break; - } - - //insert the span - if (!insertedTag) { //we have to insert a new tag end and beginning, i.e. our first loop - e.replace(pos, tag.matchedLength(), "</span>"); - pos += 7; - - //skip blanks, commas, dots and stuff at the beginning, it doesn't belong to the morph code - QString rep("<span "); - rep.append(isMorph ? "morph" : "lemma").append("=\"").append(value).append("\">"); - - hasMorphAttr = isMorph; - hasLemmaAttr = !isMorph; - - int startPos = 0; - QChar c = e[startPos]; - - while ((startPos < pos) && (c.isSpace() || c.isPunct())) { - ++startPos; - - c = e[startPos]; - } - - e.insert( startPos, rep ); - tagAttributeStart = startPos + 6; //to point to the start of the attributes - pos += rep.length(); - } - else { //add the attribute to the existing tag - e.remove(pos, tag.matchedLength()); - - if (tagAttributeStart == -1) { - continue; //nothing valid found - } - - if ((!isMorph && hasLemmaAttr) || (isMorph && hasMorphAttr)) { //we append another attribute value, e.g. 3000 gets 3000|5000 - //search the existing attribute start - QRegExp attrRegExp( isMorph ? "morph=\".+(?=\")" : "lemma=\".+(?=\")" ); - attrRegExp.setMinimal(true); - const int foundPos = e.find(attrRegExp, tagAttributeStart); - - if (foundPos != -1) { - e.insert(foundPos + attrRegExp.matchedLength(), QString("|").append(value)); - pos += value.length() + 1; - - hasLemmaAttr = !isMorph; - hasMorphAttr = isMorph; - } - } - else { //attribute was not yet inserted - QString attr; - attr.setLatin1(isMorph ? "morph" : "lemma").append("=\"").append(value).append("\" "); - - e.insert(tagAttributeStart, attr); - pos += attr.length(); - - hasMorphAttr = isMorph; - hasLemmaAttr = !isMorph; - } - - //tagAttributeStart remains the same - } - - insertedTag = true; - pos = tag.search(e, pos); - } - - result += e; - } - - if (list.count()) { - buf = (const char*)result.utf8(); - } - - return 1; -} - -bool BT_GBFHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) { - if (!substituteToken(buf, token)) { //more than a simple replace - const unsigned int tokenLength = strlen(token); - unsigned long i; - sword::SWBuf value; - - BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData); - sword::SWModule* myModule = const_cast<sword::SWModule*>(myUserData->module); //hack to be able to call stuff like Lang() - - if ( !strncmp(token, "WG", 2) - || !strncmp(token, "WH", 2) - || !strncmp(token, "WT", 2) ) { - buf.append('<'); - buf.append(token); - buf.append('>'); - } - else if (!strncmp(token, "RB", 2)) { - myUserData->hasFootnotePreTag = true; - buf.append("<span class=\"footnotepre\">"); - } - else if (!strncmp(token, "RF", 2)) { - //we use several append calls because appendFormatted slows down filtering, which should be fast - - if (myUserData->hasFootnotePreTag) { - // qWarning("inserted footnotepre end"); - buf.append("</span>"); - myUserData->hasFootnotePreTag = false; - } - - buf.append(" <span class=\"footnote\" note=\""); - buf.append(myModule->Name()); - buf.append('/'); - buf.append(myUserData->key->getShortText()); - buf.append('/'); - buf.append( QString::number(myUserData->swordFootnote++).latin1() ); - buf.append("\">*</span> "); - - userData->suspendTextPassThru = true; - } - else if (!strncmp(token, "Rf", 2)) { //end of footnote - userData->suspendTextPassThru = false; - } - else if (!strncmp(token, "FN", 2)) { //the end </font> tag is inserted in addTokenSubsitute - buf.append("<font face=\""); - - for (i = 2; i < tokenLength; i++) { - if(token[i] != '\"') { - buf.append( token[i] ); - } - } - - buf.append("\">"); - } - else if (!strncmp(token, "CA", 2)) { // ASCII value - buf.append( (char)atoi(&token[2]) ); - } - else { - return GBFHTML::handleToken(buf, token, userData); - } - } - - return true; -} diff --git a/bibletime/backend/bt_gbfhtml.h b/bibletime/backend/bt_gbfhtml.h deleted file mode 100644 index 4132047..0000000 --- a/bibletime/backend/bt_gbfhtml.h +++ /dev/null @@ -1,60 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -/* $Header: /cvsroot/bibletime/bibletime/bibletime/backend/bt_gbfhtml.h,v 1.25 2007/06/29 22:47:14 joachim Exp $ */ -/* $Revision: 1.25 $ */ - -#ifndef BT_GBFHTML_H -#define BT_GBFHTML_H - -//Backend - -//Sword includes -#include <swkey.h> -#include <swmodule.h> -#include <swbasicfilter.h> -#include <gbfhtml.h> - -namespace Filters { - - /** GBF to HTML filter, - * This filter converts GBF Text into HTML - */ - -class BT_GBFHTML : public sword::GBFHTML/*, protected CFilterTool */ - { - -protected: - -class BT_UserData : public sword::GBFHTML::MyUserData { - -public: -BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::GBFHTML::MyUserData(module, key) { - swordFootnote = 1; - hasFootnotePreTag = false; - } - - short unsigned int swordFootnote; - }; - - virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) { - return new BT_UserData(module, key); - } - -public: - BT_GBFHTML(); - virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData); - virtual char processText(sword::SWBuf& buf, const sword::SWKey*, const sword::SWModule * = 0); - }; - -} - -#endif diff --git a/bibletime/backend/bt_osishtml.cpp b/bibletime/backend/bt_osishtml.cpp deleted file mode 100644 index efe8f3f..0000000 --- a/bibletime/backend/bt_osishtml.cpp +++ /dev/null @@ -1,621 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include <stdlib.h> -#include "bt_osishtml.h" -#include "versekey.h" - -#include "clanguagemgr.h" -#include "creferencemanager.h" -#include "cswordmoduleinfo.h" -#include "frontend/cbtconfig.h" -#include "util/cpointers.h" - -#include <iostream> - -//Sword includes -#include <swmodule.h> -#include <swbuf.h> -#include <utilxml.h> - -//KDE includes -#include <klocale.h> - -//Qt includes -#include <qstring.h> - -using sword::SWBuf; -using sword::XMLTag; - -using namespace Filters; - -BT_OSISHTML::BT_OSISHTML() : sword::OSISHTMLHREF() { - setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes - - addTokenSubstitute("inscription", "<span class=\"inscription\">"); - addTokenSubstitute("/inscription","</span>"); - - addTokenSubstitute("mentioned", "<span class=\"mentioned\">"); - addTokenSubstitute("/mentioned", "</span>"); - -// addTokenSubstitute("divineName", "<span class=\"name\"><span class=\"divine\">"); -// addTokenSubstitute("/divineName", "</span></span>"); - - //TODO Move that down to the real tag handling, segs without the type morph would generate incorrect markup, as the end span is always inserted -// addTokenSubstitute("seg type=\"morph\"", "<span class=\"morphSegmentation\">"); -// addTokenSubstitute("/seg", "</span>"); - - // OSIS tables - addTokenSubstitute("table", "<table>"); - addTokenSubstitute("/table", "</table>"); - addTokenSubstitute("row", "<tr>"); - addTokenSubstitute("/row", "</tr>"); - addTokenSubstitute("cell", "<td>"); - addTokenSubstitute("/cell", "</td>"); - -} - -bool BT_OSISHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) { - // manually process if it wasn't a simple substitution - - if (!substituteToken(buf, token)) { - BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData); - sword::SWModule* myModule = const_cast<sword::SWModule*>(myUserData->module); //hack - - XMLTag tag(token); - // qWarning("found %s", token); - const bool osisQToTick = ((!userData->module->getConfigEntry("OSISqToTick")) || (strcmp(userData->module->getConfigEntry("OSISqToTick"), "false"))); - - if (!tag.getName()) { - return false; - } - - // <div> tag - if (!strcmp(tag.getName(), "div")) { - //handle intro - - if ((!tag.isEmpty()) && (!tag.isEndTag())) { //start tag - SWBuf type( tag.getAttribute("type") ); - - if (type == "introduction") { - buf.append("<div class=\"introduction\">"); - } - else if (type == "chapter") { - buf.append("<div class=\"chapter\" />"); //don't open a div here, that would lead to a broken XML structure - } - else { - buf.append("<div>"); - } - } - else if (tag.isEndTag()) { //end tag - buf.append("</div>"); - } - } - else if (!strcmp(tag.getName(), "w")) { - if ((!tag.isEmpty()) && (!tag.isEndTag())) { //start tag - const char *attrib; - const char *val; - - XMLTag outTag("span"); - SWBuf attrValue; - - if ((attrib = tag.getAttribute("xlit"))) { - val = strchr(attrib, ':'); - val = (val) ? (val + 1) : attrib; - outTag.setAttribute("xlit", val); - } - - if ((attrib = tag.getAttribute("gloss"))) { - val = strchr(attrib, ':'); - val = (val) ? (val + 1) : attrib; - outTag.setAttribute("gloss", val); - } - - if ((attrib = tag.getAttribute("lemma"))) { - char splitChar = '|'; - const int countSplit1 = tag.getAttributePartCount("lemma", '|'); - const int countSplit2 = tag.getAttributePartCount("lemma", ' '); //TODO: not allowed, remove soon - int count = 0; - - if (countSplit1 > countSplit2) { //| split char - splitChar = '|'; //TODO: not allowed, remove soon - count = countSplit1; - } - else { - splitChar = ' '; - count = countSplit2; - } - - int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 - attrValue = ""; - - do { - if (attrValue.length()) { - attrValue.append( '|' ); - } - - attrib = tag.getAttribute("lemma", i, splitChar); - - if (i < 0) { // to handle our -1 condition - i = 0; - } - - val = strchr(attrib, ':'); - val = (val) ? (val + 1) : attrib; - - attrValue.append(val); - } - while (++i < count); - - if (attrValue.length()) { - outTag.setAttribute("lemma", attrValue.c_str()); - } - } - - if ((attrib = tag.getAttribute("morph"))) { - char splitChar = '|'; - const int countSplit1 = tag.getAttributePartCount("morph", '|'); - const int countSplit2 = tag.getAttributePartCount("morph", ' '); //TODO: not allowed, remove soon - int count = 0; - - if (countSplit1 > countSplit2) { //| split char - splitChar = '|'; - count = countSplit1; - } - else { - splitChar = ' '; - count = countSplit2; - } - - int i = (count > 1) ? 0 : -1; // -1 for whole value cuz it's faster, but does the same thing as 0 - - attrValue = ""; - - do { - if (attrValue.length()) { - attrValue.append('|'); - } - - attrib = tag.getAttribute("morph", i, splitChar); - - if (i < 0) { - i = 0; // to handle our -1 condition - } - - val = strchr(attrib, ':'); - - if (val) { //the prefix gives the modulename - //check the prefix - if (!strncmp("robinson:", attrib, 9)) { //robinson - attrValue.append( "Robinson:" ); //work is not the same as Sword's module name - attrValue.append( val+1 ); - } - //strongs is handled by BibleTime - /*else if (!strncmp("strongs", attrib, val-atrrib)) { - attrValue.append( !strncmp(attrib, "x-", 2) ? attrib+2 : attrib ); - }*/ - else { - attrValue.append( !strncmp(attrib, "x-", 2) ? attrib+2 : attrib ); - } - } - else { //no prefix given - const bool skipFirst = ((val[0] == 'T') && ((val[1] == 'H') || (val[1] == 'H'))); - attrValue.append( skipFirst ? val+1 : val ); - } - } - while (++i < count); - - if (attrValue.length()) { - outTag.setAttribute("morph", attrValue.c_str()); - } - } - - if ((attrib = tag.getAttribute("POS"))) { - val = strchr(attrib, ':'); - val = (val) ? (val + 1) : attrib; - outTag.setAttribute("pos", val); - } - - buf.append( outTag.toString() ); - } - else if (tag.isEndTag()) { // end or empty <w> tag - buf.append("</span>"); - } - } - - // <note> tag - else if (!strcmp(tag.getName(), "note")) { - if (!tag.isEndTag()) { //start tag - const SWBuf type( tag.getAttribute("type") ); - - if (type == "crossReference") { //note containing cross references - myUserData->inCrossrefNote = true; - myUserData->noteType = BT_UserData::CrossReference; - myUserData->swordFootnote++; // cross refs count as notes, too - - /* //get the refList value of the right entry attribute - AttributeList notes = myModule->getEntryAttributes()["Footnote"]; - bool foundNote = false; - - SWBuf id( tag.getAttribute("osisID") ); - SWBuf refList; - - for (AttributeList::iterator list_it = notes.begin(); (list_it != notes.end()) && !foundNote; ++list_it ) { - for (AttributeValue::iterator val_it = list_it->second.begin(); (val_it != list_it->second.end()) && !foundNote; ++val_it ) { - if ((val_it->first == "osisID") && (val_it->second == id)) { - foundNote = true; //this break the loop - refList = list_it->second["refList"]; - } - } - } - - if (refList.length()) { - buf.append(" <span class=\"crossreference\" crossrefs=\""); - buf.append(refList.c_str()); - buf.append("\"> "); - - myUserData->noteType = BT_UserData::CrossReference; - } - else { - myUserData->noteType = BT_UserData::Unknown; - }*/ - - buf.append("<span class=\"crossreference\">"); - } - - /* else if (type == "explanation") { - } - */ - else if ((type == "strongsMarkup") || (type == "x-strongsMarkup")) { - /** - * leave strong's markup notes out, in the future we'll probably have - * different option filters to turn different note types on or off - */ - - myUserData->suspendTextPassThru = true; - myUserData->noteType = BT_UserData::StrongsMarkup; - } - else if (type == "alternative") { - // qWarning("found alternative"); - // buf.append(" <span class=\"alternative\">"); - myUserData->noteType = BT_UserData::Alternative; - myUserData->suspendTextPassThru = true; - myUserData->swordFootnote++; // count as notes, too - } - else { - // qWarning("found note in %s", myUserData->key->getShortText()); - buf.append(" <span class=\"footnote\" note=\""); - buf.append(myModule->Name()); - buf.append('/'); - buf.append(myUserData->key->getShortText()); - buf.append('/'); - buf.append( QString::number(myUserData->swordFootnote++).latin1() ); //inefficient - - const SWBuf n = tag.getAttribute("n"); - - buf.append("\">"); - buf.append( (n.length() > 0) ? n.c_str() : "*" ); - buf.append("</span> "); - - myUserData->noteType = BT_UserData::Footnote; - myUserData->suspendTextPassThru = true; - } - } - else { //if (tag.isEndTag()) { - Q_ASSERT(myUserData->noteType != BT_UserData::Unknown); - - if (myUserData->noteType == BT_UserData::CrossReference) { - buf.append("</span> "); -// myUserData->suspendTextPassThru = false; - myUserData->inCrossrefNote = false; - } - else if (myUserData->noteType == BT_UserData::Alternative) { - buf.append(" <span class=\"alternative\" alternative=\""); - buf.append(myUserData->lastTextNode); - buf.append("\" title=\""); - buf.append((const char*)i18n("Alternative text").utf8()); - buf.append("\" />"); - } - - myUserData->noteType = BT_UserData::Unknown; - myUserData->suspendTextPassThru = false; - } - } - // The <p> paragraph tag is handled by OSISHTMLHref - else if (!strcmp(tag.getName(), "reference")) { // <reference> tag - - if (!tag.isEndTag() && !tag.isEmpty()) { - QString ref( tag.getAttribute("osisRef") ); - QString hrefRef( ref ); - Q_ASSERT(!ref.isEmpty()); - - if (!ref.isEmpty()) { - //find out the mod, using the current module makes sense if it's a bible or commentary because the refs link into a bible by default. - //If the osisRef is something like "ModuleID:key comes here" then the - // modulename is given, so we'll use that one - - CSwordModuleInfo* mod = CPointers::backend()->findSwordModuleByPointer(myModule); - Q_ASSERT(mod); - if (!mod || (mod->type() != CSwordModuleInfo::Bible - && mod->type() != CSwordModuleInfo::Commentary)) { - - mod = CBTConfig::get( CBTConfig::standardBible ); - } - - Q_ASSERT(mod); - - //if the osisRef like "GerLut:key" contains a module, use that - int pos = ref.find(":"); - - if ((pos >= 0) && ref.at(pos-1).isLetter() && ref.at(pos+1).isLetter()) { - QString newModuleName = ref.left(pos); - hrefRef = ref.mid(pos+1); - - if (CPointers::backend()->findModuleByName(newModuleName)) { - mod = CPointers::backend()->findModuleByName(newModuleName); - } - } - - CReferenceManager::ParseOptions options; - options.refBase = QString::fromUtf8(myUserData->key->getText()); - options.refDestinationModule = QString(mod->name()); - options.sourceLanguage = QString(myModule->Lang()); - options.destinationLanguage = QString("en"); - - buf.append("<a href=\""); - buf.append( //create the hyperlink with key and mod - CReferenceManager::encodeHyperlink( - mod->name(), - CReferenceManager::parseVerseReference(hrefRef, options), - CReferenceManager::typeFromModule(mod->type()) - ).utf8() - ); - buf.append("\" crossrefs=\""); - buf.append((const char*)CReferenceManager::parseVerseReference(ref, options).utf8()); //ref must contain the osisRef module marker if there was any - buf.append("\">"); - } - } - else if (tag.isEndTag()) { - buf.append("</a>"); - } - else { // empty reference marker - // -- what should we do? nothing for now. - } - } - - // <l> is handled by OSISHTMLHref - // <title> - else if (!strcmp(tag.getName(), "title")) { - if (!tag.isEndTag() && !tag.isEmpty()) { - buf.append("<div class=\"sectiontitle\">"); - } - else if (tag.isEndTag()) { - buf.append("</div>"); - } - else { // empty title marker - // what to do? is this even valid? - buf.append("<br/>"); - } - } - - // <hi> highlighted text - else if (!strcmp(tag.getName(), "hi")) { - const SWBuf type = tag.getAttribute("type"); - - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - if (type == "bold") { - buf.append("<span class=\"bold\">"); - } - else if (type == "illuminated") { - buf.append("<span class=\"illuminated\">"); - } - else if (type == "italic") { - buf.append("<span class=\"italic\">"); - } - else if (type == "line-through") { - buf.append("<span class=\"line-through\">"); - } - else if (type == "normal") { - buf.append("<span class=\"normal\">"); - } - else if (type == "small-caps") { - buf.append("<span class=\"small-caps\">"); - } - else if (type == "underline") { - buf.append("<span class=\"underline\">"); - } - else { - buf.append("<span>"); //don't break markup, </span> is inserted later - } - } - else if (tag.isEndTag()) { //all hi replacements are html spans - buf.append("</span>"); - } - } - - //name - else if (!strcmp(tag.getName(), "name")) { - const SWBuf type = tag.getAttribute("type"); - - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - if (type == "geographic") { - buf.append("<span class=\"name\"><span class=\"geographic\">"); - } - else if (type == "holiday") { - buf.append("<span class=\"name\"><span class=\"holiday\">"); - } - else if (type == "nonhuman") { - buf.append("<span class=\"name\"><span class=\"nonhuman\">"); - } - else if (type == "person") { - buf.append("<span class=\"name\"><span class=\"person\">"); - } - else if (type == "ritual") { - buf.append("<span class=\"name\"><span class=\"ritual\">"); - } - else { - buf.append("<span class=\"name\"><span>"); - } - } - else if (tag.isEndTag()) { //all hi replacements are html spans - buf.append("</span></span> "); - } - } - else if (!strcmp(tag.getName(), "transChange")) { - SWBuf type( tag.getAttribute("type") ); - - if ( !type.length() ) { - type = tag.getAttribute("changeType"); - } - - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - if (type == "added") { - buf.append("<span class=\"transchange\" title=\""); - buf.append((const char*)i18n("Added text").utf8()); - buf.append("\"><span class=\"added\">"); - } - else if (type == "amplified") { - buf.append("<span class=\"transchange\"><span class=\"amplified\">"); - } - else if (type == "changed") { - buf.append("<span class=\"transchange\"><span class=\"changed\">"); - } - else if (type == "deleted") { - buf.append("<span class=\"transchange\"><span class=\"deleted\">"); - } - else if (type == "moved") { - buf.append("<span class=\"transchange\"><span class=\"moved\">"); - } - else if (type == "tenseChange") { - buf.append("<span class=\"transchange\"><span class=\"tenseChange\">"); - } - else { - buf.append("<span class=\"transchange\"><span>"); - } - } - else if (tag.isEndTag()) { //all hi replacements are html spans - buf.append("</span></span>"); - } - } - else if (!strcmp(tag.getName(), "p")) { - if (tag.isEmpty()) { - buf.append("<p/>"); - } - } - - // <q> quote - else if (!strcmp(tag.getName(), "q")) { - SWBuf type = tag.getAttribute("type"); - SWBuf who = tag.getAttribute("who"); - const char *lev = tag.getAttribute("level"); - int level = (lev) ? atoi(lev) : 1; - - if ((!tag.isEndTag()) && (!tag.isEmpty())) { - myUserData->quote.who = who; - - if(osisQToTick) //alternate " and ' - buf.append((level % 2) ? '\"' : '\''); - - if (who == "Jesus") { - buf.append("<span class=\"jesuswords\">"); - } - } - else if (tag.isEndTag()) { - if (myUserData->quote.who == "Jesus") { - buf.append("</span>"); - } - - if (osisQToTick) { //alternate " and ' - buf.append((level % 2) ? '\"' : '\''); - } - - myUserData->quote.who = ""; - } - } - - // abbr tag - else if (!strcmp(tag.getName(), "abbr")) { - if (!tag.isEndTag() && !tag.isEmpty()) { - const SWBuf expansion = tag.getAttribute("expansion"); - - buf.append("<span class=\"abbreviation\" expansion=\""); - buf.append(expansion); - buf.append("\">"); - } - else if (tag.isEndTag()) { - buf.append("</span>"); - } - } - - // <milestone> tag - else if (!strcmp(tag.getName(), "milestone")) { - const SWBuf type = tag.getAttribute("type"); - - if ((type == "screen") || (type == "line")) {//line break - buf.append("<br/>"); - userData->supressAdjacentWhitespace = true; - } - else if (type == "x-p") { //e.g. occurs in the KJV2006 module - //buf.append("<br/>"); - const SWBuf marker = tag.getAttribute("marker"); - if (marker.length() > 0) { - buf.append(marker); - } - } - } - //seg tag - else if (!strcmp(tag.getName(), "seg")) { - if (!tag.isEndTag() && !tag.isEmpty()) { - - const SWBuf type = tag.getAttribute("type"); - - if (type == "morph") {//line break - //This code is for WLC and MORPH (WHI) - XMLTag outTag("span"); - outTag.setAttribute("class", "morphSegmentation"); - const char* attrValue; - //Transfer the values to the span - //Problem: the data is in hebrew/aramaic, how to encode in HTML/BibleTime? - if ((attrValue = tag.getAttribute("lemma"))) outTag.setAttribute("lemma", attrValue); - if ((attrValue = tag.getAttribute("morph"))) outTag.setAttribute("morph", attrValue); - if ((attrValue = tag.getAttribute("homonym"))) outTag.setAttribute("homonym", attrValue); - - buf.append(outTag.toString()); - //buf.append("<span class=\"morphSegmentation\">"); - } - else{ - buf.append("<span>"); - } - } - else { // seg end tag - buf.append("</span>"); - } - //qWarning(QString("handled <seg> token. result: %1").arg(buf.c_str()).latin1()); - } - - //divine name, don't use simple tag replacing because it may have attributes - else if (!strcmp(tag.getName(), "divineName")) { - if (!tag.isEndTag()) { - buf.append("<span class=\"name\"><span class=\"divine\">"); - } - else { //all hi replacements are html spans - buf.append("</span></span>"); - } - } - - else { //all tokens handled by OSISHTMLHref will run through the filter now - return sword::OSISHTMLHREF::handleToken(buf, token, userData); - } - } - - return false; -} diff --git a/bibletime/backend/bt_osishtml.h b/bibletime/backend/bt_osishtml.h deleted file mode 100644 index 22e5b81..0000000 --- a/bibletime/backend/bt_osishtml.h +++ /dev/null @@ -1,66 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef BT_OSISHTML_H -#define BT_OSISHTML_H - -//Sword includes -#include <osishtmlhref.h> - -namespace Filters { - - /** BibleTime's OSIS to HTMl filter. - * This filter works on OSIS tags and outputs HTML in the structure supported by BibleTime. - */ - -class BT_OSISHTML : public sword::OSISHTMLHREF { - -protected: - -class BT_UserData : public sword::OSISHTMLHREF::MyUserData { - -public: -BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::OSISHTMLHREF::MyUserData(module, key) { - noteType = Unknown; - swordFootnote = 1; - inCrossrefNote = false; - } - - unsigned short int swordFootnote; - bool inCrossrefNote; - - enum NoteType { - Unknown, - Alternative, - CrossReference, - Footnote, - StrongsMarkup - } noteType; - - struct { - sword::SWBuf who; - } - - quote; - }; - - virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) { - return new BT_UserData(module, key); - } - -public: - BT_OSISHTML(); - virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData); - }; - -} //end of Filters namespace - -#endif diff --git a/bibletime/backend/bt_plainhtml.cpp b/bibletime/backend/bt_plainhtml.cpp deleted file mode 100644 index 703362a..0000000 --- a/bibletime/backend/bt_plainhtml.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordmoduleinfo.h" -#include "cswordbackend.h" -#include "util/cpointers.h" - -#include "bt_plainhtml.h" - -//system includes -#include <stdlib.h> -#include <stdio.h> - -//Sword includes -#include <utilxml.h> - -//Qt includes -#include <qregexp.h> -#include <qstring.h> - -using namespace Filters; - -BT_PLAINHTML::BT_PLAINHTML() : sword::SWFilter() { -} - -/** No descriptions */ -char BT_PLAINHTML::processText(sword::SWBuf& text, const sword::SWKey * key, const sword::SWModule * module) { - int count = 0; - - SWBuf orig = text; - const char *from = orig.c_str(); - for (text = ""; *from; from++) - { - if ((*from == '\n') && (from[1] == '\n')) // two newlinea are a paragraph - { - text += "<P>"; - from++; - continue; - } - //This is a special case: Newlines in the plaintext editor are stored as <br />, not as \n - //we need to let them through - else if ((*from == '<') && (from[1] == 'b') && (from[2] == 'r') && (from[3] == ' ') && (from[4] == '/') && (from[5] == '>')){ - text += "<br />"; - from += 5; - continue; - } - else if ((*from == '\n')){ // only one new line - text += "<BR>"; - continue; - } - else if (*from == '<') { - text += "<"; - continue; - } - else if (*from == '>') { - text += ">"; - continue; - } - else if (*from == '&'){ - text += "&"; - continue; - } - else if (*from == '{') { //footnote start - text += "<FONT COLOR=\"#80000\"><SMALL> ("; - continue; - } - else if (*from == '}') //footnote end - { - text += ") </SMALL></FONT>"; - continue; - } - else if ((*from == ' ') && (count > 5000)) - { - text += "<WBR>"; - count = 0; - continue; - } - - text += *from; - count++; - } - return 0; -} diff --git a/bibletime/backend/bt_plainhtml.h b/bibletime/backend/bt_plainhtml.h deleted file mode 100644 index fec3a48..0000000 --- a/bibletime/backend/bt_plainhtml.h +++ /dev/null @@ -1,41 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -/* $Header: /cvsroot/bibletime/bibletime/bibletime/backend/bt_plainhtml.h,v 1.3 2007/06/29 22:47:14 joachim Exp $ */ -/* $Revision: 1.3 $ */ - -#ifndef BT_PLAINHTML_H -#define BT_PLAINHTML_H - -//Sword includes -#include <swkey.h> -#include <swmodule.h> -#include <swfilter.h> -//#include <plainhtml.h> - -namespace Filters { - - /** Plain to HTML filter, - * This filter converts Plain Text into HTML - */ - -class BT_PLAINHTML : public sword::SWFilter{ - -protected: - -public: - BT_PLAINHTML(); - virtual char processText(sword::SWBuf& buf, const sword::SWKey*, const sword::SWModule * = 0); - }; - -} - -#endif diff --git a/bibletime/backend/bt_thmlhtml.cpp b/bibletime/backend/bt_thmlhtml.cpp deleted file mode 100644 index 7a00bd4..0000000 --- a/bibletime/backend/bt_thmlhtml.cpp +++ /dev/null @@ -1,395 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - - -//BibleTime includes -#include "backend/bt_thmlhtml.h" -#include "backend/clanguagemgr.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/creferencemanager.h" - -#include "frontend/cbtconfig.h" - -#include "util/cpointers.h" -#include "util/scoped_resource.h" - -#include <iostream> - -//Sword includes -#include <swmodule.h> -#include <utilxml.h> -#include "versekey.h" - -//Qt includes -#include <qstring.h> -#include <qregexp.h> - -//System includes -#include <stdlib.h> - -using namespace Filters; - -BT_ThMLHTML::BT_ThMLHTML() { - setEscapeStringCaseSensitive(true); - setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes - - setTokenStart("<"); - setTokenEnd(">"); - setTokenCaseSensitive(true); - - addTokenSubstitute("/foreign", "</span>"); - - removeTokenSubstitute("note"); - removeTokenSubstitute("/note"); -} - -char BT_ThMLHTML::processText(sword::SWBuf& buf, const sword::SWKey* key, const sword::SWModule* module) { - ThMLHTML::processText(buf, key, module); - - CSwordModuleInfo* m = CPointers::backend()->findModuleByName( module->Name() ); - - if (m && !(m->has(CSwordModuleInfo::lemmas) || m->has(CSwordModuleInfo::strongNumbers))) { //only parse if the module has strongs or lemmas - return 1; - } - - QString result; - - QString t = QString::fromUtf8(buf.c_str()); - QRegExp tag("([.,;]?<sync[^>]+(type|value)=\"([^\"]+)\"[^>]+(type|value)=\"([^\"]+)\"([^<]*)>)+"); - - QStringList list; - int lastMatchEnd = 0; - int pos = tag.search(t,0); - - if (pos == -1) { //no strong or morph code found in this text - return 1; //WARNING: Return alread here - } - - while (pos != -1) { - list.append(t.mid(lastMatchEnd, pos+tag.matchedLength()-lastMatchEnd)); - - lastMatchEnd = pos+tag.matchedLength(); - pos = tag.search(t,pos+tag.matchedLength()); - } - - if (!t.right(t.length() - lastMatchEnd).isEmpty()) { - list.append(t.right(t.length() - lastMatchEnd)); - } - - tag = QRegExp("<sync[^>]+(type|value|class)=\"([^\"]+)\"[^>]+(type|value|class)=\"([^\"]+)\"[^>]+((type|value|class)=\"([^\"]+)\")*([^<]*)>"); - - for (QStringList::iterator it = list.begin(); it != list.end(); ++it) { - QString e( *it ); - - const bool textPresent = (e.stripWhiteSpace().remove(QRegExp("[.,;:]")).left(1) != "<"); - - if (!textPresent) { - continue; - } - - - bool hasLemmaAttr = false; - bool hasMorphAttr = false; - - int pos = tag.search(e, 0); - bool insertedTag = false; - QString value; - QString valueClass; - - while (pos != -1) { - bool isMorph = false; - bool isStrongs = false; - value = QString::null; - valueClass = QString::null; - - // check 3 attribute/value pairs - - for (int i = 1; i < 6; i += 2) { - if (i > 4) - i++; - - if (tag.cap(i) == "type") { - isMorph = (tag.cap(i+1) == "morph"); - isStrongs = (tag.cap(i+1) == "Strongs"); - } - else if (tag.cap(i) == "value") { - value = tag.cap(i+1); - } - else if (tag.cap(i) == "class") { - valueClass = tag.cap(i+1); - } - } - - // prepend the class qualifier to the value - if (!valueClass.isEmpty()) { - value = valueClass + ":" + value; - // value.append(":").append(value); - } - - if (value.isEmpty()) { - break; - } - - //insert the span - if (!insertedTag) { - e.replace(pos, tag.matchedLength(), "</span>"); - pos += 7; - - QString rep; - rep.setLatin1("<span lemma=\"").append(value).append("\">"); - int startPos = 0; - QChar c = e[startPos]; - - while ((startPos < pos) && (c.isSpace() || c.isPunct())) { - ++startPos; - c = e[startPos]; - } - - hasLemmaAttr = isStrongs; - hasMorphAttr = isMorph; - - e.insert( startPos, rep ); - pos += rep.length(); - } - else { //add the attribute to the existing tag - e.remove(pos, tag.matchedLength()); - - if ((!isMorph && hasLemmaAttr) || (isMorph && hasMorphAttr)) { //we append another attribute value, e.g. 3000 gets 3000|5000 - //search the existing attribute start - QRegExp attrRegExp( isMorph ? "morph=\".+(?=\")" : "lemma=\".+(?=\")" ); - attrRegExp.setMinimal(true); - const int foundAttrPos = e.find(attrRegExp, pos); - - if (foundAttrPos != -1) { - e.insert(foundAttrPos + attrRegExp.matchedLength(), QString("|").append(value)); - pos += value.length() + 1; - - hasLemmaAttr = !isMorph; - hasMorphAttr = isMorph; - } - } - else { //attribute was not yet inserted - const int attrPos = e.find(QRegExp("morph=|lemma="), 0); - - if (attrPos >= 0) { - QString attr; - attr.append(isMorph ? "morph" : "lemma").append("=\"").append(value).append("\" "); - e.insert(attrPos, attr); - - hasMorphAttr = isMorph; - hasLemmaAttr = !isMorph; - - pos += attr.length(); - } - } - } - - insertedTag = true; - pos = tag.search(e, pos); - } - - result.append( e ); - } - - if (list.count()) { - buf = (const char*)result.utf8(); - } - - return 1; -} - - -bool BT_ThMLHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) { - if (!substituteToken(buf, token) && !substituteEscapeString(buf, token)) { - sword::XMLTag tag(token); - BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData); - sword::SWModule* myModule = const_cast<sword::SWModule*>(myUserData->module); //hack to be able to call stuff like Lang() - - if ( tag.getName() && !strcasecmp(tag.getName(), "foreign") ) { // a text part in another language, we have to set the right font - - if (tag.getAttribute("lang")) { - const char* abbrev = tag.getAttribute("lang"); - //const CLanguageMgr::Language* const language = CPointers::languageMgr()->languageForAbbrev( QString::fromLatin1(abbrev) ); - - buf.append("<span class=\"foreign\" lang=\""); - buf.append(abbrev); - buf.append("\">"); - } - } - else if (tag.getName() && !strcasecmp(tag.getName(), "sync")) { //lemmas, morph codes or strongs - - if (tag.getAttribute("type") && (!strcasecmp(tag.getAttribute("type"), "morph") || !strcasecmp(tag.getAttribute("type"), "Strongs") || !strcasecmp(tag.getAttribute("type"), "lemma"))) { // Morph or Strong - buf.append('<'); - buf.append(token); - buf.append('>'); - } - } - else if (tag.getName() && !strcasecmp(tag.getName(), "note")) { // <note> tag - - if (!tag.isEndTag() && !tag.isEmpty()) { - //appending is faster than appendFormatted - buf.append(" <span class=\"footnote\" note=\""); - buf.append(myModule->Name()); - buf.append('/'); - buf.append(myUserData->key->getShortText()); - buf.append('/'); - buf.append( QString::number(myUserData->swordFootnote++).latin1() ); - buf.append("\">*</span> "); - - myUserData->suspendTextPassThru = true; - myUserData->inFootnoteTag = true; - } - else if (tag.isEndTag() && !tag.isEmpty()) { //end tag - //buf += ")</span>"; - myUserData->suspendTextPassThru = false; - myUserData->inFootnoteTag = false; - } - } - else if (tag.getName() && !strcasecmp(tag.getName(), "scripRef")) { // a scripRef - //scrip refs which are embeded in footnotes may not be displayed! - - if (!myUserData->inFootnoteTag) { - if (tag.isEndTag()) { - if (myUserData->inscriptRef) { // like "<scripRef passage="John 3:16">See John 3:16</scripRef>" - buf.append("</a></span>"); - - myUserData->inscriptRef = false; - myUserData->suspendTextPassThru = false; - } - else { // like "<scripRef>John 3:16</scripRef>" - - CSwordModuleInfo* mod = CBTConfig::get(CBTConfig::standardBible); - Q_ASSERT(mod); - if (mod) { - CReferenceManager::ParseOptions options; - options.refBase = QString::fromUtf8(myUserData->key->getText()); //current module key - options.refDestinationModule = QString(mod->name()); - options.sourceLanguage = QString(myModule->Lang()); - options.destinationLanguage = QString("en"); - - //it's ok to split the reference, because to descriptive text is given - bool insertSemicolon = false; - buf.append("<span class=\"crossreference\">"); - QStringList refs = QStringList::split(";", QString::fromUtf8(myUserData->lastTextNode.c_str())); - QString oldRef; //the previous reference to use as a base for the next refs - for (QStringList::iterator it(refs.begin()); it != refs.end(); ++it) { - - if (! oldRef.isEmpty() ){ - options.refBase = oldRef; //use the last ref as a base, e.g. Rom 1,2-3, when the next ref is only 3:3-10 - } - const QString completeRef( CReferenceManager::parseVerseReference((*it), options) ); - - oldRef = completeRef; //use the parsed result as the base for the next ref. - - if (insertSemicolon) { //prepend a ref divider if we're after the first one - buf.append("; "); - } - - buf.append("<a href=\""); - buf.append( - CReferenceManager::encodeHyperlink( - mod->name(), - completeRef, - CReferenceManager::typeFromModule(mod->type()) - ).utf8() - ); - - buf.append("\" crossrefs=\""); - buf.append((const char*)completeRef.utf8()); - buf.append("\">"); - - buf.append((const char*)(*it).utf8()); - - buf.append("</a>"); - - insertSemicolon = true; - } - buf.append("</span>"); //crossref end - } - - myUserData->suspendTextPassThru = false; - } - } - else if (tag.getAttribute("passage") ) { //the passage was given as a parameter value - myUserData->inscriptRef = true; - myUserData->suspendTextPassThru = false; - - const char* ref = tag.getAttribute("passage"); - Q_ASSERT(ref); - - CSwordModuleInfo* mod = CBTConfig::get(CBTConfig::standardBible); - Q_ASSERT(mod); - - CReferenceManager::ParseOptions options; - options.refBase = QString::fromUtf8(myUserData->key->getText()); - options.refDestinationModule = QString(mod->name()); - options.sourceLanguage = myModule->Lang(); - options.destinationLanguage = QString("en"); - - const QString completeRef = CReferenceManager::parseVerseReference(QString::fromUtf8(ref), options); - - if (mod) { - buf.append("<span class=\"crossreference\">"); - buf.append("<a href=\""); - buf.append( - CReferenceManager::encodeHyperlink( - mod->name(), - completeRef, - CReferenceManager::typeFromModule(mod->type()) - ).utf8() - ); - buf.append("\" crossrefs=\""); - buf.append((const char*)completeRef.utf8()); - buf.append("\">"); - } - else { - buf.append("<span><a>"); - } - } - else if ( !tag.getAttribute("passage") ) { // we're starting a scripRef like "<scripRef>John 3:16</scripRef>" - myUserData->inscriptRef = false; - - // let's stop text from going to output, the text get's added in the -tag handler - myUserData->suspendTextPassThru = true; - } - } - } - else if (tag.getName() && !strcasecmp(tag.getName(), "div")) { - if (tag.isEndTag()) { - buf.append("</div>"); - } - else if ( tag.getAttribute("class") && !strcasecmp(tag.getAttribute("class"),"sechead") ) { - buf.append("<div class=\"sectiontitle\">"); - } - else if (tag.getAttribute("class") && !strcasecmp(tag.getAttribute("class"), "title")) { - buf.append("<div class=\"booktitle\">"); - } - } - else if (tag.getName() && !strcasecmp(tag.getName(), "img") && tag.getAttribute("src")) { - const char* value = tag.getAttribute("src"); - - if (value[0] == '/') { - value++; //strip the first / - } - - buf.append("<img src=\"file:"); - buf.append(myUserData->module->getConfigEntry("AbsoluteDataPath")); - buf.append('/'); - buf.append(value); - buf.append("\" />"); - } - else { // let unknown token pass thru - return sword::ThMLHTML::handleToken(buf, token, userData); - } - } - - return true; -} diff --git a/bibletime/backend/bt_thmlhtml.h b/bibletime/backend/bt_thmlhtml.h deleted file mode 100644 index e5ac614..0000000 --- a/bibletime/backend/bt_thmlhtml.h +++ /dev/null @@ -1,56 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef BT_THMLHTML_H -#define BT_THMLHTML_H - -#include <swbuf.h> -#include <thmlhtml.h> - -using sword::SWBuf; - -namespace Filters { - - /** ThML to HTML filter. - * This filter converts ThML text to HTML text - */ - -class BT_ThMLHTML : public sword::ThMLHTML { - -protected: - -class BT_UserData : public sword::ThMLHTML::MyUserData { - -public: -BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::ThMLHTML::MyUserData(module, key) { - inscriptRef = false; - swordFootnote = 1; - inFootnoteTag = false; - } - - bool inscriptRef; - bool inFootnoteTag; - unsigned short int swordFootnote; - }; - - virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) { - return new BT_UserData(module, key); - } - -public: - BT_ThMLHTML (); - virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData); - virtual char processText(sword::SWBuf& buf, const sword::SWKey*, const sword::SWModule * = 0); - }; - -} - -#endif diff --git a/bibletime/backend/bt_thmlplain.cpp b/bibletime/backend/bt_thmlplain.cpp deleted file mode 100644 index 8c4d72d..0000000 --- a/bibletime/backend/bt_thmlplain.cpp +++ /dev/null @@ -1,221 +0,0 @@ -/****************************************************************************** - * - * thmlplain - SWFilter descendant to strip out all ThML tags or convert to - * ASCII rendered symbols. - */ - -#include "bt_thmlplain.h" - -#include <stdlib.h> -#include <swbuf.h> - -using namespace sword; - -namespace Filters { - -BT_ThMLPlain::BT_ThMLPlain() { -} - -char BT_ThMLPlain::processText(SWBuf &text, const SWKey *key, const SWModule *module) -{ - char token[2048]; - int tokpos = 0; - bool intoken = false; - bool ampersand = false; - - const char *from; - SWBuf orig = text; - from = orig.c_str(); - for (text = ""; *from; from++) - { - if (*from == 10 || *from == 13) - from++; - if (*from == '<') { - intoken = true; - tokpos = 0; - token[0] = 0; - token[1] = 0; - token[2] = 0; - ampersand = false; - continue; - } - else if (*from == '&') { - intoken = true; - tokpos = 0; - token[0] = 0; - token[1] = 0; - token[2] = 0; - ampersand = true; - continue; - } - if (*from == ';' && ampersand) { - intoken = false; - ampersand = false; - - if (!strncmp("nbsp", token, 4)) text += " "; - else if (!strncmp("quot", token, 4)) text += "\""; - else if (!strncmp("amp", token, 3)) text += "&"; - else if (!strncmp("lt", token, 2)) text += "<"; - else if (!strncmp("gt", token, 2)) text += ">"; - else if (!strncmp("brvbar", token, 6)) text += "¦"; - else if (!strncmp("sect", token, 4)) text += "§"; - else if (!strncmp("copy", token, 4)) text += "©"; - else if (!strncmp("laquo", token, 5)) text += "«"; - else if (!strncmp("reg", token, 3)) text += "®"; - else if (!strncmp("acute", token, 5)) text += "´"; - else if (!strncmp("para", token, 4)) text += "¶"; - else if (!strncmp("raquo", token, 5)) text += "»"; - - else if (!strncmp("Aacute", token, 6)) text += "Á"; - else if (!strncmp("Agrave", token, 6)) text += "À"; - else if (!strncmp("Acirc", token, 5)) text += "Â"; - else if (!strncmp("Auml", token, 4)) text += "Ä"; - else if (!strncmp("Atilde", token, 6)) text += "Ã"; - else if (!strncmp("Aring", token, 5)) text += "Å"; - else if (!strncmp("aacute", token, 6)) text += "á"; - else if (!strncmp("agrave", token, 6)) text += "à"; - else if (!strncmp("acirc", token, 5)) text += "â"; - else if (!strncmp("auml", token, 4)) text += "ä"; - else if (!strncmp("atilde", token, 6)) text += "ã"; - else if (!strncmp("aring", token, 5)) text += "å"; - else if (!strncmp("Eacute", token, 6)) text += "É"; - else if (!strncmp("Egrave", token, 6)) text += "È"; - else if (!strncmp("Ecirc", token, 5)) text += "Ê"; - else if (!strncmp("Euml", token, 4)) text += "Ë"; - else if (!strncmp("eacute", token, 6)) text += "é"; - else if (!strncmp("egrave", token, 6)) text += "è"; - else if (!strncmp("ecirc", token, 5)) text += "ê"; - else if (!strncmp("euml", token, 4)) text += "ë"; - else if (!strncmp("Iacute", token, 6)) text += "Í"; - else if (!strncmp("Igrave", token, 6)) text += "Ì"; - else if (!strncmp("Icirc", token, 5)) text += "Î"; - else if (!strncmp("Iuml", token, 4)) text += "Ï"; - else if (!strncmp("iacute", token, 6)) text += "í"; - else if (!strncmp("igrave", token, 6)) text += "ì"; - else if (!strncmp("icirc", token, 5)) text += "î"; - else if (!strncmp("iuml", token, 4)) text += "ï"; - else if (!strncmp("Oacute", token, 6)) text += "Ó"; - else if (!strncmp("Ograve", token, 6)) text += "Ò"; - else if (!strncmp("Ocirc", token, 5)) text += "Ô"; - else if (!strncmp("Ouml", token, 4)) text += "Ö"; - else if (!strncmp("Otilde", token, 6)) text += "Õ"; - else if (!strncmp("oacute", token, 6)) text += "ó"; - else if (!strncmp("ograve", token, 6)) text += "ò"; - else if (!strncmp("ocirc", token, 5)) text += "ô"; - else if (!strncmp("ouml", token, 4)) text += "ö"; - else if (!strncmp("otilde", token, 6)) text += "õ"; - else if (!strncmp("Uacute", token, 6)) text += "Ú"; - else if (!strncmp("Ugrave", token, 6)) text += "Ù"; - else if (!strncmp("Ucirc", token, 5)) text += "Û"; - else if (!strncmp("Uuml", token, 4)) text += "Ü"; - else if (!strncmp("uacute", token, 6)) text += "ú"; - else if (!strncmp("ugrave", token, 6)) text += "ù"; - else if (!strncmp("ucirc", token, 5)) text += "û"; - else if (!strncmp("uuml", token, 4)) text += "ü"; - else if (!strncmp("Yacute", token, 6)) text += "Ý"; - else if (!strncmp("yacute", token, 6)) text += "ý"; - else if (!strncmp("yuml", token, 4)) text += "ÿ"; - - else if (!strncmp("deg", token, 3)) text += "°"; - else if (!strncmp("plusmn", token, 6)) text += "±"; - else if (!strncmp("sup2", token, 4)) text += "²"; - else if (!strncmp("sup3", token, 4)) text += "³"; - else if (!strncmp("sup1", token, 4)) text += "¹"; - else if (!strncmp("nbsp", token, 4)) text += "º"; - else if (!strncmp("pound", token, 5)) text += "£"; - else if (!strncmp("cent", token, 4)) text += "¢"; - else if (!strncmp("frac14", token, 6)) text += "¼"; - else if (!strncmp("frac12", token, 6)) text += "½"; - else if (!strncmp("frac34", token, 6)) text += "¾"; - else if (!strncmp("iquest", token, 6)) text += "¿"; - else if (!strncmp("iexcl", token, 5)) text += "¡"; - else if (!strncmp("ETH", token, 3)) text += "Ð"; - else if (!strncmp("eth", token, 3)) text += "ð"; - else if (!strncmp("THORN", token, 5)) text += "Þ"; - else if (!strncmp("thorn", token, 5)) text += "þ"; - else if (!strncmp("AElig", token, 5)) text += "Æ"; - else if (!strncmp("aelig", token, 5)) text += "æ"; - else if (!strncmp("Oslash", token, 6)) text += "Ø"; - else if (!strncmp("curren", token, 6)) text += "¤"; - else if (!strncmp("Ccedil", token, 6)) text += "Ç"; - else if (!strncmp("ccedil", token, 6)) text += "ç"; - else if (!strncmp("szlig", token, 5)) text += "ß"; - else if (!strncmp("Ntilde", token, 6)) text += "Ñ"; - else if (!strncmp("ntilde", token, 6)) text += "ñ"; - else if (!strncmp("yen", token, 3)) text += "¥"; - else if (!strncmp("not", token, 3)) text += "¬"; - else if (!strncmp("ordf", token, 4)) text += "ª"; - else if (!strncmp("uml", token, 3)) text += "¨"; - else if (!strncmp("shy", token, 3)) text += ""; - else if (!strncmp("macr", token, 4)) text += "¯"; - else if (!strncmp("micro", token, 5)) text += "µ"; - else if (!strncmp("middot", token, 6)) text +="·"; - else if (!strncmp("cedil", token, 5)) text += "¸"; - else if (!strncmp("ordm", token, 4)) text += "º"; - else if (!strncmp("times", token, 5)) text += "×"; - else if (!strncmp("divide", token, 6)) text +="÷"; - else if (!strncmp("oslash", token, 6)) text +="ø"; - continue; - - } - else if (*from == '>' && !ampersand) { - intoken = false; - // process desired tokens - if (!strncmp(token, "sync type=\"Strongs\" value=\"", 27)) { - text += ' '; - text += '<'; - for (unsigned int i = 27; token[i] != '\"'; i++) - text += token[i]; - text += '>'; - continue; - } - if (!strncmp(token, "sync type=\"morph\" value=\"", 25)) { - text += ' '; - text += '('; - for (unsigned int i = 25; token[i] != '\"'; i++) - text += token[i]; - text += ')'; - continue; - } - if (!strncmp("note", token, 4)) { - text += ' '; - text += '('; - } - else if (!strncmp("br", token, 2)) - text += '\n'; - else if (!strncmp("/p", token, 2)) - text += '\n'; - else if (!strncmp("/note", token, 5)) { - text += ')'; - text += ' '; - } - continue; - } - if (intoken) { - if (tokpos < 2045) - token[tokpos++] = *from; - token[tokpos+2] = 0; - } - else text += *from; - } - - orig = text; - from = orig.c_str(); - for (text = ""; *from; from++) { //loop to remove extra spaces - if ((strchr(" \t\n\r", *from))) { - while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) { - from++; - } - text += " "; - } - else { - text += *from; - } - } - text += (char)0; - - return 0; -} - - -} diff --git a/bibletime/backend/bt_thmlplain.h b/bibletime/backend/bt_thmlplain.h deleted file mode 100644 index b510d33..0000000 --- a/bibletime/backend/bt_thmlplain.h +++ /dev/null @@ -1,40 +0,0 @@ -/****************************************************************************** - * - * $Id: bt_thmlplain.h,v 1.1 2007/03/14 21:32:47 joachim Exp $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifndef BT_THMLPLAIN_H -#define BT_THMLPLAIN_H - -#include <swfilter.h> - -using namespace sword; - -namespace Filters { - -/** this filter converts ThML text to plain text - */ -class BT_ThMLPlain : public SWFilter { -protected: - virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); -public: - BT_ThMLPlain(); -}; - -} -#endif diff --git a/bibletime/backend/btstringmgr.cpp b/bibletime/backend/btstringmgr.cpp deleted file mode 100644 index 83c29c8..0000000 --- a/bibletime/backend/btstringmgr.cpp +++ /dev/null @@ -1,145 +0,0 @@ -// -// C++ Implementation: btstringmgr -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#include "btstringmgr.h" - -//System includes -#include <ctype.h> - -char* BTStringMgr::upperUTF8(char* text, unsigned int maxlen) const { - const int max = (maxlen>0) ? maxlen : strlen(text); - - if (isUtf8(text)) { - strncpy(text, (const char*)QString::fromUtf8(text).upper().utf8(), max); - - return text; - } - else { - char* ret = text; - - while (*text) { - *text = toupper(*text); - text++; - } - - return ret; - } - - return text; -} - -char* BTStringMgr::upperLatin1(char* text, unsigned int max) const { - char* ret = text; - - while (*text) { - *text = toupper(*text); - text++; - } - - return ret; -} - -bool BTStringMgr::supportsUnicode() const { - return true; -} - -const bool BTStringMgr::isUtf8(const char *buf) const { - int i, n; - register unsigned char c; - bool gotone = false; - - #define F 0 /* character never appears in text */ - #define T 1 /* character appears in plain ASCII text */ - #define I 2 /* character appears in ISO-8859 text */ - #define X 3 /* character appears in non-ISO extended ASCII (Mac, IBM PC) */ - - static const unsigned char text_chars[256] = { - /* BEL BS HT LF FF CR */ - F, F, F, F, F, F, F, T, T, T, T, F, T, T, F, F, /* 0x0X */ - /* ESC */ - F, F, F, F, F, F, F, F, F, F, F, T, F, F, F, F, /* 0x1X */ - T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, /* 0x2X */ - T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, /* 0x3X */ - T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, /* 0x4X */ - T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, /* 0x5X */ - T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, /* 0x6X */ - T, T, T, T, T, T, T, T, T, T, T, T, T, T, T, F, /* 0x7X */ - /* NEL */ - X, X, X, X, X, T, X, X, X, X, X, X, X, X, X, X, /* 0x8X */ - X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, /* 0x9X */ - I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, /* 0xaX */ - I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, /* 0xbX */ - I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, /* 0xcX */ - I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, /* 0xdX */ - I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, /* 0xeX */ - I, I, I, I, I, I, I, I, I, I, I, I, I, I, I, I /* 0xfX */ - }; - - /* *ulen = 0; */ - - for (i = 0; (c = buf[i]); i++) { - if ((c & 0x80) == 0) { /* 0xxxxxxx is plain ASCII */ - /* - * Even if the whole file is valid UTF-8 sequences, - * still reject it if it uses weird control characters. - */ - - if (text_chars[c] != T) - return false; - - } - else if ((c & 0x40) == 0) { /* 10xxxxxx never 1st byte */ - return false; - } - else { /* 11xxxxxx begins UTF-8 */ - int following; - - if ((c & 0x20) == 0) { /* 110xxxxx */ - following = 1; - } - else if ((c & 0x10) == 0) { /* 1110xxxx */ - following = 2; - } - else if ((c & 0x08) == 0) { /* 11110xxx */ - following = 3; - } - else if ((c & 0x04) == 0) { /* 111110xx */ - following = 4; - } - else if ((c & 0x02) == 0) { /* 1111110x */ - following = 5; - } - else - return false; - - for (n = 0; n < following; n++) { - i++; - - if (!(c = buf[i])) - goto done; - - if ((c & 0x80) == 0 || (c & 0x40)) - return false; - } - - gotone = true; - } - } - -done: - return gotone; /* don't claim it's UTF-8 if it's all 7-bit */ -} - -#undef F -#undef T -#undef I -#undef X diff --git a/bibletime/backend/btstringmgr.h b/bibletime/backend/btstringmgr.h deleted file mode 100644 index de5349d..0000000 --- a/bibletime/backend/btstringmgr.h +++ /dev/null @@ -1,57 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef BTSTRINGMGR_H -#define BTSTRINGMGR_H - -//Sword includes -#include <stringmgr.h> - -//Qt includes -#include <qstring.h> - -using namespace sword; - -/** Unicode string manager implementation. - * This is the StringManager implementation which works with QString. - * @author The BibleTime developers - */ - -class BTStringMgr : public StringMgr { - -public: - /** Converts the param to an upper case Utf8 string - * @param The text encoded in utf8 which should be turned into an upper case string - */ - virtual char *upperUTF8(char *text, unsigned int max = 0) const; - - /** Converts the param to an uppercase latin1 string - * @param The text encoded in latin1 which should be turned into an upper case string - */ - virtual char *upperLatin1(char *text, unsigned int max = 0) const; - -protected: - /** Enable Unicode support. - * Reimplementation to show unicode support. - */ - virtual bool supportsUnicode() const; - - /** CODE TAKEN FROM KDELIBS 3.2, which is licensed under the LGPL 2. - * - * This code was taken from KStringHandler, which is part of the KDE libraries. - * - * This function checks whether a string is utf8 or not. - * It was taken from kdelibs so we do not depend on KDE 3.2. - */ - const bool isUtf8(const char *buf) const; -}; - -#endif diff --git a/bibletime/backend/cbookdisplay.cpp b/bibletime/backend/cbookdisplay.cpp deleted file mode 100644 index 276c604..0000000 --- a/bibletime/backend/cbookdisplay.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// -// C++ Implementation: cbookdisplay -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004-2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -//Backend -#include "cbookdisplay.h" -#include "cdisplayrendering.h" -#include "cswordbookmoduleinfo.h" -#include "cswordtreekey.h" - -//Util -#include "util/scoped_resource.h" - -namespace Rendering { - - - /** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */ - const QString CBookDisplay::text( const ListCSwordModuleInfo& modules, const QString& keyName, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions ) { - CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.first()); - Q_ASSERT(book); - - CSwordBackend::DisplayOptions dOpts = displayOptions; - dOpts.lineBreaks = true; //books should render with blocks, not with inlined sections - - CDisplayRendering render(dOpts, filterOptions); - CDisplayRendering::KeyTree tree; - CDisplayRendering::KeyTreeItem::Settings itemSettings; - - // the number of levels which should be display together, 1 means display no entries together - int displayLevel = book->config( CSwordModuleInfo::DisplayLevel ).toInt(); - - util::scoped_ptr<CSwordTreeKey> key ( - dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(book) ) - ); - key->key(keyName); //set the key to position we'd like to get - - const unsigned long offset = key->getOffset(); - - // standard of DisplayLevel, display nothing together - // if the current key is the root entry don't display anything together! - - if ((displayLevel <= 1) || (key->key().isEmpty() || (key->key() == "/") )) { - tree.append( new CDisplayRendering::KeyTreeItem( key->key(), modules, itemSettings ) ); - - const QString renderedText = render.renderKeyTree(tree); - key->setOffset( offset ); - return renderedText; - }; - - /** - * Check whether displaying displayLevel levels together is possible. - * For this count the childs and parents - * of the required position - */ - - int possibleLevels = 1; //we start with the default value of displayLevel, which means no entries together - - while( key->parent() && (key->key() != "/") && !key->key().isEmpty() ) {//add parents - ++possibleLevels; - }; - - // key->key(keyName); //set the key to the start position - - key->setOffset( offset ); - - while( key->firstChild( )) { //add childs - ++possibleLevels; - }; - - if (possibleLevels < displayLevel) { //too few levels available! - //display current level, we could also decide to display the available levels together - tree.append( new CDisplayRendering::KeyTreeItem( key->key(), modules, itemSettings ) ); - - const QString renderedText = render.renderKeyTree(tree); - key->setOffset( offset ); - return renderedText; - }; - - if ((displayLevel > 2) && (displayLevel == possibleLevels)) { //fix not to diplay the whole module - --displayLevel; - } - - // at this point we're sure that we can display the required levels toogether - // at the moment we're at the lowest level, so we only have to go up! - for (int currentLevel = 1; currentLevel < displayLevel; ++currentLevel) { //we start again with 1 == standard of displayLevel - - if ( !key->parent() ) { //something went wrong although we checked before! Be safe and return entry's text - tree.append( new CDisplayRendering::KeyTreeItem( key->key(), modules, itemSettings ) ); - - const QString renderedText = render.renderKeyTree(tree); - key->setOffset( offset ); - return renderedText; - }; - }; - - // no we can display all sub levels together! We checked before that this is possible! - itemSettings.highlight = (key->key() == keyName); - - tree.append( new CDisplayRendering::KeyTreeItem( key->key(), modules, itemSettings ) ); - - //const bool hasToplevelText = !key->strippedText().isEmpty(); - key->firstChild(); //go to the first sibling on the same level - - setupRenderTree(key.get(), &tree, keyName); - - const QString renderedText = render.renderKeyTree(tree); - - key->setOffset( offset ); //restore key - - return renderedText; - } - - void CBookDisplay::setupRenderTree(CSwordTreeKey * swordTree, CTextRendering::KeyTree * renderTree, const QString& highlightKey) { -// const QString key = swordTree->getFullName(); - const QString key = swordTree->key(); - const unsigned long offset = swordTree->getOffset(); - - CTextRendering::KeyTreeItem::Settings settings; - settings.highlight = (key == highlightKey); - - CTextRendering::KeyTreeItem* item = new CTextRendering::KeyTreeItem(key, swordTree->module(0), settings ); - renderTree->append( item ); - - if (swordTree->hasChildren()) { //print tree for the child items - swordTree->firstChild(); - setupRenderTree(swordTree, item->childList(), highlightKey); - swordTree->setOffset( offset ); //go back where we came from - } - - if (swordTree->nextSibling()) { //print tree for next entry on the same depth - setupRenderTree(swordTree, renderTree, highlightKey); - swordTree->setOffset( offset ); //return to the value we had at the beginning of this block! - } - } - -}; diff --git a/bibletime/backend/cbookdisplay.h b/bibletime/backend/cbookdisplay.h deleted file mode 100644 index 56fc2f2..0000000 --- a/bibletime/backend/cbookdisplay.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// C++ Interface: cbookdisplay -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef RENDERINGCBOOKDISPLAY_H -#define RENDERINGCBOOKDISPLAY_H - -#include "centrydisplay.h" - -class CSwordTreeKey; - -namespace Rendering { - - class CTextRendering::KeyTree; - - /** - * A CEntryDisplay implementation which works on tree-based GenBook modules - * of Sword. - * @short CEntryDisplay implementation for GenBook modules, - * @author The BibleTime team - */ - -class CBookDisplay : public CEntryDisplay { -public: // Public methods - virtual ~CBookDisplay() {} - - /** - * Returns the rendered text using the modules in the list and using the key parameter. - * The displayoptions and filter options are used, too. - */ - virtual const QString text( const ListCSwordModuleInfo& modules, const QString& key, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions); - -protected: - void setupRenderTree(CSwordTreeKey* swordTree, CTextRendering::KeyTree* renderTree, const QString& highlightKey); - }; -}; - -#endif diff --git a/bibletime/backend/cchapterdisplay.cpp b/bibletime/backend/cchapterdisplay.cpp deleted file mode 100644 index 02668e4..0000000 --- a/bibletime/backend/cchapterdisplay.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// -// C++ Implementation: cchapterdisplay -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -//Backend -#include "cchapterdisplay.h" -#include "cdisplayrendering.h" -#include "cswordversekey.h" -#include "cswordbiblemoduleinfo.h" - - -namespace Rendering { - - const QString CChapterDisplay::text( const ListCSwordModuleInfo& modules, const QString& keyName, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions ) { - Q_ASSERT( modules.count() >= 1 ); - Q_ASSERT( !keyName.isEmpty() ); - - CSwordModuleInfo* module = modules.first(); - - if (modules.count() == 1) module->module()->setSkipConsecutiveLinks( true ); //skip empty, linked verses - - CTextRendering::KeyTreeItem::Settings settings; - settings.keyRenderingFace = - displayOptions.verseNumbers - ? CTextRendering::KeyTreeItem::Settings::SimpleKey - : CTextRendering::KeyTreeItem::Settings::NoKey; - - QString startKey = keyName; - QString endKey = startKey; - - //check whether there's an intro we have to include - Q_ASSERT((module->type() == CSwordModuleInfo::Bible)); - - if (module->type() == CSwordModuleInfo::Bible) { - ((VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys - - CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module); - Q_ASSERT(bible); - - CSwordVerseKey k1(module); - k1.Headings(1); - k1.key(keyName); - - if (k1.Chapter() == 1) k1.Chapter(0); //Chapter 1, start with 0:0, otherwise X:0 - - k1.Verse(0); - - startKey = k1.key(); - - if (k1.Chapter() == 0) k1.Chapter(1); - k1.Verse(bible->verseCount(k1.book(), k1.Chapter())); - endKey = k1.key(); - } - - CDisplayRendering render(displayOptions, filterOptions); - return render.renderKeyRange( startKey, endKey, modules, keyName, settings ); - } - -}; diff --git a/bibletime/backend/cchapterdisplay.h b/bibletime/backend/cchapterdisplay.h deleted file mode 100644 index 891b16b..0000000 --- a/bibletime/backend/cchapterdisplay.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// C++ Interface: cchapterdisplay -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef RENDERINGCCHAPTERDISPLAY_H -#define RENDERINGCCHAPTERDISPLAY_H - -#include "centrydisplay.h" - -namespace Rendering { - -/** Chapter rendering. -* A CEntryDisplay implementation mde for Bibles to display whole chapters -* at once. -* @author The BibleTime team -*/ - -class CChapterDisplay : public CEntryDisplay { - -public: // Public methods - virtual ~CChapterDisplay() {} - - /** - * Returns the rendered text using the modules in the list and using the key parameter. - * The displayoptions and filter options are used, too. - */ - virtual const QString text( const ListCSwordModuleInfo& modules, const QString& key, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions); -}; - -}; - -#endif diff --git a/bibletime/backend/cdisplayrendering.cpp b/bibletime/backend/cdisplayrendering.cpp deleted file mode 100644 index 6b13114..0000000 --- a/bibletime/backend/cdisplayrendering.cpp +++ /dev/null @@ -1,163 +0,0 @@ -// -// C++ Implementation: cdisplayrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -//Backend includes -#include "cdisplayrendering.h" - -#include "cdisplaytemplatemgr.h" -#include "creferencemanager.h" -#include "cswordkey.h" -#include "cswordversekey.h" - -//Qt includes -#include <qstring.h> -#include <qregexp.h> - -namespace Rendering { - - CDisplayRendering::CDisplayRendering(CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) -: CHTMLExportRendering(CHTMLExportRendering::Settings(true), displayOptions, filterOptions) {} - - const QString CDisplayRendering::entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ) { - QString linkText; - - const bool isBible = module && (module->type() == CSwordModuleInfo::Bible); - CSwordVerseKey vk(module); //only valid for bible modules, i.e. isBible == true - vk.Headings(true); - - if (isBible) { - vk = item.key(); - } - - if (isBible && (vk.Verse() == 0)) { - return QString::null; //Warning: return already here - } - - switch (item.settings().keyRenderingFace) { - - case KeyTreeItem::Settings::NoKey: { - linkText = QString::null; - break; //no key is valid for all modules - } - - case KeyTreeItem::Settings::CompleteShort: { - if (isBible) { - linkText = QString::fromUtf8(vk.getShortText()); - break; - } - - //fall through for non-Bible modules - } - - case KeyTreeItem::Settings::CompleteLong: { - if (isBible) { - linkText = vk.key(); - break; - } - - //fall through for non-Bible modules - } - - case KeyTreeItem::Settings::SimpleKey: { - if (isBible) { - linkText = QString::number(vk.Verse()); - break; - } - - //fall through for non-Bible modules - } - - default: { //default behaviour to return the passed key - linkText = item.key(); - break; - } - } - - if (linkText.isEmpty()) { - return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\" />"); - } - else { - return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\" ") - .append("href=\"") - .append(CReferenceManager::encodeHyperlink( - module->name(), item.key(), CReferenceManager::typeFromModule(module->type())) - ) - .append("\">").append(linkText).append("</a>\n"); - } - - return QString::null; - } - - const QString CDisplayRendering::keyToHTMLAnchor(const QString& key) { - QString ret = key; - ret = ret.stripWhiteSpace().remove(QRegExp("[^A-Za-z0-9]+")); - ret = ret.remove(QRegExp("^\\d+|")); - - return ret; - } - - const QString CDisplayRendering::finishText( const QString& oldText, KeyTree& tree ) { - ListCSwordModuleInfo modules = tree.collectModules(); - - - //marking words is very slow, we have to find a better solution - - /* - //mark all words by spans - - QString text = oldText; - - QRegExp re("(\\b)(?=\\w)"); //word begin marker - int pos = text.find(re, 0); - - while (pos != -1) { //word begin found - //qWarning("found word at %i in %i", pos, text.length()); - int endPos = pos + 1; - if (!CToolClass::inHTMLTag(pos+1, text)) { //the re has a positive look ahead which matches one char before the word start - //qWarning("matched %s", text.mid(pos+1, 4).latin1()); - - //find end of word and put a marker around it - endPos = text.find(QRegExp("\\b|[,.:]"), pos+1); - if ((endPos != -1) && !CToolClass::inHTMLTag(endPos, text) && (endPos - pos >= 3)) { //reuire wordslonger than 3 chars - text.insert(endPos, "</span>"); - text.insert(pos, "<span class=\"word\">"); - - endPos += 26; - } - } - pos = text.find(re, endPos); - } - */ - const CLanguageMgr::Language* const lang = - (modules.count() >= 1) - ? modules.first()->language() - : CPointers::languageMgr()->defaultLanguage(); - - CDisplayTemplateMgr* tMgr = CPointers::displayTemplateManager(); - - Q_ASSERT(modules.count() >= 1); - - CDisplayTemplateMgr::Settings settings; - settings.modules = modules; - settings.langAbbrev = ((modules.count() == 1) && lang->isValid()) - ? lang->abbrev() - : QString::null; - settings.pageDirection = (modules.count() == 1) - ? ((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") - : QString::null; - - return tMgr->fillTemplate(CBTConfig::get - (CBTConfig::displayStyle), oldText, settings); - - - } -} diff --git a/bibletime/backend/cdisplayrendering.h b/bibletime/backend/cdisplayrendering.h deleted file mode 100644 index b835ac6..0000000 --- a/bibletime/backend/cdisplayrendering.h +++ /dev/null @@ -1,40 +0,0 @@ -// -// C++ Interface: cdisplayrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef RENDERINGCDISPLAYRENDERING_H -#define RENDERINGCDISPLAYRENDERING_H - -#include "chtmlexportrendering.h" - -namespace Rendering { - -/** HTML rendering for the text display widgets. - * @short Rendering for the html display widget. - * @author The BibleTime team - */ - -class CDisplayRendering : public CHTMLExportRendering { -public: - static const QString keyToHTMLAnchor(const QString& key); - - CDisplayRendering( - CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(), - CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults() - ); - -protected: - virtual const QString entryLink( const KeyTreeItem& item, CSwordModuleInfo* const module ); - virtual const QString finishText( const QString&, KeyTree& tree ); -}; - -} - -#endif diff --git a/bibletime/backend/cdisplaytemplatemgr.cpp b/bibletime/backend/cdisplaytemplatemgr.cpp deleted file mode 100644 index a0f5222..0000000 --- a/bibletime/backend/cdisplaytemplatemgr.cpp +++ /dev/null @@ -1,191 +0,0 @@ -// -// C++ Implementation: cdisplaytemplatemgr -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -//BibleTime includes -#include "cdisplaytemplatemgr.h" -#include "cswordmoduleinfo.h" -#include "clanguagemgr.h" - -#include "frontend/cbtconfig.h" - -#include "util/cpointers.h" - -#include "config.h" - -//Qt includes -#include <qstringlist.h> -#include <qfile.h> -#include <qfileinfo.h> - -//KDE includes -#include <klocale.h> -#include <kstandarddirs.h> - -#include <iostream> - -CDisplayTemplateMgr::CDisplayTemplateMgr() { - init(); - loadUserTemplates(); -} - -CDisplayTemplateMgr::~CDisplayTemplateMgr() {} - - -/*! - \fn CDisplayTemplateMgr::fillTemplate( const QString& name, const QString& title, const QString& content ) - */ -const QString CDisplayTemplateMgr::fillTemplate( const QString& name, const QString& content, Settings& settings ) { - const QString templateName = m_templateMap.contains(name) ? name : defaultTemplate(); - - QString displayTypeString; - - if (!settings.pageCSS_ID.isEmpty()) { - displayTypeString = settings.pageCSS_ID; - } - else { - if (settings.modules.count()) { - switch (settings.modules.first()->type()) { - - case CSwordModuleInfo::Bible: - displayTypeString = "bible"; - break; - - case CSwordModuleInfo::GenericBook: - displayTypeString = "book"; - break; - - case CSwordModuleInfo::Commentary: - - case CSwordModuleInfo::Lexicon: - - default: - displayTypeString = "singleentry"; - break; - }; - } - else { //use bible as default type if no modules are set - displayTypeString = "bible"; - }; - } - - QString newContent = content; - const int moduleCount = settings.modules.count(); - - if (moduleCount >= 2) { - //create header for the modules - QString header; - - ListCSwordModuleInfo::iterator end_it = settings.modules.end(); - - for (ListCSwordModuleInfo::iterator it(settings.modules.begin()); it != end_it; ++it) { - header.append("<th style=\"width:") - .append(QString::number(int( 100.0 / (float)moduleCount ))) - .append("%;\">") - .append((*it)->name()) - .append("</th>"); - } - - newContent.setLatin1("<table><tr>") - .append(header) - .append("</tr>") - .append(content) - .append("</table>"); - } - - QString langCSS; - CLanguageMgr::LangMap langMap = CPointers::languageMgr()->availableLanguages(); - - for ( CLanguageMgr::LangMapIterator it( langMap ); it.current(); ++it ) { - const CLanguageMgr::Language* lang = it.current(); - - - //if (lang->isValid() && CBTConfig::get(lang).first) { - if (!lang->abbrev().isEmpty() && CBTConfig::get(lang).first) { - const QFont f = CBTConfig::get(lang).second; - - //don't use important, because it would reset the title formatting, etc. to the setup font - QString css("{ "); - css.append("font-family:").append(f.family())/*.append(" !important")*/; - css.append("; font-size:").append(QString::number(f.pointSize())).append("pt /*!important*/"); - css.append("; font-weight:").append(f.bold() ? "bold" : "normal /*!important*/"); - css.append("; font-style:").append(f.italic() ? "italic" : "normal /*!important*/"); - css.append("; }\n"); - - langCSS += - QString("\n*[lang=%1] %2") - .arg(lang->abbrev()) - .arg(css); - } - } - - //at first append the font standard settings for all languages without configured font - CLanguageMgr::LangMapIterator it( langMap ); - - const CLanguageMgr::Language* lang = it.current(); - - if (lang && !lang->abbrev().isEmpty()/*&& lang->isValid()*/) { - const QFont standardFont = CBTConfig::getDefault(lang); //we just need a dummy lang param - langCSS.prepend( - QString("\n#content {font-family:%1; font-size:%2pt; font-weight:%3; font-style: %4;}\n") - .arg(standardFont.family()) - .arg(standardFont.pointSize()) - .arg(standardFont.bold() ? "bold" : "normal") - .arg(standardFont.italic() ? "italic" : "normal") - ); - } - -// qWarning("Outputing unformated text"); - const QString t = QString(m_templateMap[ templateName ]) //don't change the map's content directly, use a copy - .replace("#TITLE#", settings.title) - .replace("#LANG_ABBREV#", settings.langAbbrev.isEmpty() ? QString("en") : settings.langAbbrev) - .replace("#DISPLAYTYPE#", displayTypeString) - .replace("#LANG_CSS#", langCSS) - .replace("#PAGE_DIRECTION#", settings.pageDirection) - .replace("#CONTENT#", newContent); - //printf("%s\n\n", t.latin1()); - - return t; -/* QString(m_templateMap[ templateName ]) //don't change the map's content directly, use a copy - .replace("#TITLE#", settings.title) - .replace("#LANG_ABBREV#", settings.langAbbrev.isEmpty() ? QString("en") : settings.langAbbrev) - .replace("#DISPLAYTYPE#", displayTypeString) - .replace("#LANG_CSS#", langCSS) - .replace("#PAGE_DIRECTION#", settings.pageDirection) - .replace("#CONTENT#", newContent);*/ -} - - -/*! - \fn CDisplayTemplateMgr::loadUserTemplates - */ -void CDisplayTemplateMgr::loadUserTemplates() { - qDebug("Loading user templates"); - QStringList files = KGlobal::dirs()->findAllResources("BT_DisplayTemplates"); - - for ( QStringList::iterator it( files.begin() ); it != files.end(); ++it) { - qDebug("Found user template %s", (*it).latin1()); - - QFile f( *it ); - Q_ASSERT( f.exists() ); - - if (f.open( IO_ReadOnly )) { - QString fileContent = QTextStream( &f ).read(); - - if (!fileContent.isEmpty()) { - m_templateMap[ QFileInfo(*it).fileName() + QString(" ") + i18n("(user template)")] = fileContent; - } - } - } -} - -//Include the HTML templates which were put into a cpp file by a Perl script -#include "../display-templates/template-init.cpp" diff --git a/bibletime/backend/cdisplaytemplatemgr.h b/bibletime/backend/cdisplaytemplatemgr.h deleted file mode 100644 index 764fb69..0000000 --- a/bibletime/backend/cdisplaytemplatemgr.h +++ /dev/null @@ -1,100 +0,0 @@ -// -// C++ Interface: cdisplaytemplatemgr -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef CDISPLAYTEMPLATEMGR_H -#define CDISPLAYTEMPLATEMGR_H - -//BibleTime include -#include "cswordmoduleinfo.h" - -//Qt includes -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> - -//KDE includes -#include <klocale.h> - -/** - * Manages the display templates used in the filters and display classes. - * @author The BibleTime team -*/ - -class CDisplayTemplateMgr { - -public: - /** Settings which are used to fill the content into the template. - */ - - struct Settings { - /** Constructor. Constructs the new settings object. The default values are empty. - */ - Settings() { - title = QString::null; - langAbbrev = QString::null; - pageCSS_ID = QString::null; - pageDirection = QString("ltr"); - }; - - ListCSwordModuleInfo modules; /**< the list of modules */ - QString title; /**< the title which is used for the new processed HTML page */ - QString langAbbrev; /**< the language for the HTML page. */ - QString pageDirection; /**< the language for the HTML page. */ - QString pageCSS_ID; /**< the CSS ID which is used in the content part of the page */ - }; - - /** Available templates. - * @return The list of templates, which are available. - */ - inline const QStringList availableTemplates(); - /** Fill template. Fill rendered content into the template given by the name. - * @param name The name of the template - * @param content The content which should be filled into the template - * @param settings The settings which are used to process the templating process - * @return The full HTML template HTML code including the CSS data. - */ - const QString fillTemplate( const QString& name, const QString& content, Settings& settings); - /** Default template. - * @return The i18n'ed name of the default template - */ - inline static const QString defaultTemplate(); - -protected: - - friend class CPointers; - /** Display template manager constructor. Protected to just allow CPointers to create objects. - */ - CDisplayTemplateMgr(); - /** Destructor. - */ - ~CDisplayTemplateMgr(); - - void loadUserTemplates(); - -private: - void init(); - QMap<QString, QString> m_templateMap; -}; - -inline const QString CDisplayTemplateMgr::defaultTemplate() { - return i18n("Default"); -} - -/** - * CDisplayTemplateMgr::availableTemplates() - */ -inline const QStringList CDisplayTemplateMgr::availableTemplates() { - return m_templateMap.keys(); -} - - - -#endif diff --git a/bibletime/backend/centrydisplay.cpp b/bibletime/backend/centrydisplay.cpp deleted file mode 100644 index 8fdcace..0000000 --- a/bibletime/backend/centrydisplay.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "centrydisplay.h" - -#include "cswordkey.h" -#include "cswordversekey.h" -#include "cswordbookmoduleinfo.h" -#include "creferencemanager.h" -#include "cdisplaytemplatemgr.h" -#include "cdisplayrendering.h" - -#include "frontend/cbtconfig.h" - -#include "util/scoped_resource.h" - -//Qt includes -#include <qapplication.h> -#include <qregexp.h> - -using namespace Rendering; - -/** Returns the rendered text using the modules in the list and using the key parameter. - * The displayoptions and filter options are used, too. - */ -const QString CEntryDisplay::text( const ListCSwordModuleInfo& modules, const QString& keyName, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions ) { - CDisplayRendering render(displayOptions, filterOptions); - - //no highlighted key and no extra key link in the text - CTextRendering::KeyTreeItem::Settings normal_settings(false, CTextRendering::KeyTreeItem::Settings::CompleteShort); - CSwordModuleInfo* module = modules.first(); - QString result; - - //in Bibles and Commentaries we need to check if 0:0 and X:0 contain something - if (module->type() == CSwordModuleInfo::Bible || module->type() == CSwordModuleInfo::Commentary) { - ((VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys - - CSwordVerseKey k1(module); - k1.Headings(1); - k1.key(keyName); - - // don't print the key - CTextRendering::KeyTreeItem::Settings preverse_settings(false, CTextRendering::KeyTreeItem::Settings::NoKey); - - if (k1.Verse() == 1){ //X:1, prepend X:0 - if (k1.Chapter() == 1){ //1:1, also prepend 0:0 before that - k1.Chapter(0); - k1.Verse(0); - if ( k1.rawText().length() > 0 ) result.append( render.renderSingleKey(k1.key(), modules, preverse_settings ) ); - k1.Chapter(1); - } - k1.Verse(0); - if ( k1.rawText().length() > 0 ) result.append( render.renderSingleKey(k1.key(), modules, preverse_settings ) ); - } - } - return result.append( render.renderSingleKey(keyName, modules, normal_settings) ); -} diff --git a/bibletime/backend/centrydisplay.h b/bibletime/backend/centrydisplay.h deleted file mode 100644 index 141ed1d..0000000 --- a/bibletime/backend/centrydisplay.h +++ /dev/null @@ -1,53 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CENTRYDISPLAY_H -#define CENTRYDISPLAY_H - -//BibleTime includes -#include "ctextrendering.h" -#include "cswordmoduleinfo.h" -#include "cswordbackend.h" - -#include "util/cpointers.h" - -//Sword includes -#include <swdisp.h> - -//Qt includes -#include <qstring.h> - -class CSwordModuleInfo; - -namespace Rendering { - -/** -* The reimplementation of SWDisplay to fit our needs. -* @short Display implementation -* @author The BibleTime team -*/ - -class CEntryDisplay : public sword::SWDisplay, public CPointers { - -public: - virtual ~CEntryDisplay() {} - - /** - * Returns the rendered text using the modules in the list and using the key parameter. - * The displayoptions and filter options are used, too. - */ - virtual const QString text( const ListCSwordModuleInfo& modules, const QString& key, const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions); -}; - - -} - -#endif diff --git a/bibletime/backend/chtmlexportrendering.cpp b/bibletime/backend/chtmlexportrendering.cpp deleted file mode 100644 index a32d57c..0000000 --- a/bibletime/backend/chtmlexportrendering.cpp +++ /dev/null @@ -1,236 +0,0 @@ -// -// C++ Implementation: chtmlexportrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -//Backend -#include "chtmlexportrendering.h" - -#include "cdisplaytemplatemgr.h" -#include "clanguagemgr.h" -#include "cswordkey.h" -#include "cswordversekey.h" -#include "cswordmoduleinfo.h" - -//Util -#include "util/cpointers.h" -#include "util/scoped_resource.h" - -//KDE includes -#include <klocale.h> - -namespace Rendering { - - CHTMLExportRendering::CHTMLExportRendering(const CHTMLExportRendering::Settings& settings, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) -: m_displayOptions(displayOptions), - m_filterOptions(filterOptions), - m_settings(settings) {} - - CHTMLExportRendering::~CHTMLExportRendering() {} - - const QString CHTMLExportRendering::renderEntry( const KeyTreeItem& i, CSwordKey* k) { - // qDebug("CHTMLExportRendering::renderEntry"); - - if (i.hasAlternativeContent()) { - QString ret; - ret.setLatin1(i.settings().highlight ? "<div class=\"currententry\">" : "<div class=\"entry\">"); - ret.append(i.getAlternativeContent()); - - // Q_ASSERT(i.hasChildItems()); - - if (i.hasChildItems()) { - KeyTree const * tree = i.childList(); - - const ListCSwordModuleInfo& modules( tree->collectModules() ); - - if (modules.count() == 1) { //insert the direction into the sorrounding div - ret.insert( 5, QString("dir=\"%1\" ").arg((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl" )); - } - - for ( KeyTreeItem* c = tree->first(); c; c = tree->next() ) { - ret.append( renderEntry( *c ) ); - } - } - - ret.append("</div>"); - return ret; //WARNING: Return already here! - } - - - const ListCSwordModuleInfo& modules( i.modules() ); - - Q_ASSERT(modules.count() >= 1); - - util::scoped_ptr<CSwordKey> scoped_key( !k ? CSwordKey::createInstance(modules.first()) : 0 ); - - CSwordKey* key = k ? k : scoped_key; - - Q_ASSERT(key); - - CSwordVerseKey* myVK = dynamic_cast<CSwordVerseKey*>(key); - - if ( myVK ) { - myVK->Headings(1); - } - - QString renderedText( (modules.count() > 1) ? "<tr>" : "" ); - - if (modules.count() == 0) { - return QString(""); //no module present for rendering - } - - // Only insert the table stuff if we are displaying parallel. - // Otherwise, strip out he table stuff -> the whole chapter will be rendered in one cell! - - //declarations out of the loop for optimization - QString entry; - - QString keyText; - - bool isRTL; - - //taken out of the loop for optimization - QString preverseHeading; - - QString langAttr; - - ListCSwordModuleInfo::const_iterator end_modItr = modules.end(); - - for (ListCSwordModuleInfo::const_iterator mod_Itr(modules.begin()); mod_Itr != end_modItr; ++mod_Itr) { - key->module(*mod_Itr); - key->key( i.key() ); - - keyText = key->key(); - isRTL = ((*mod_Itr)->textDirection() == CSwordModuleInfo::RightToLeft); - entry = QString::null; - - if ((*mod_Itr)->language()->isValid()) { - langAttr.setLatin1("xml:lang=\"") - .append((*mod_Itr)->language()->abbrev()) - .append("\" lang=\"") - .append((*mod_Itr)->language()->abbrev()) - .append("\""); - } - else { - langAttr.setLatin1("xml:lang=\"") - .append((*mod_Itr)->module()->Lang()) - .append("\" lang=\"") - .append((*mod_Itr)->module()->Lang()) - .append("\""); - } - - const QString key_renderedText = key->renderedText(); - - // qWarning(key_renderedText.latin1()); - - if (m_filterOptions.headings) { - AttributeValue::const_iterator it = - (*mod_Itr)->module()->getEntryAttributes()["Heading"]["Preverse"].begin(); - const AttributeValue::const_iterator end = - (*mod_Itr)->module()->getEntryAttributes()["Heading"]["Preverse"].end(); - - for (; it != end; ++it) { - preverseHeading = QString::fromUtf8(it->second.c_str()); - - //TODO: Take care of the heading type! - - if (!preverseHeading.isEmpty()) { - entry.append("<div ") - .append(langAttr) - .append(" class=\"sectiontitle\">") - .append(preverseHeading) - .append("</div>"); - } - } - } - - entry.append(m_displayOptions.lineBreaks ? "<div " : "<span "); - - if (modules.count() == 1) { //insert only the class if we're not in a td - entry.append( i.settings().highlight ? "class=\"currententry\" " : "class=\"entry\" " ); - } - - entry.append(langAttr).append(isRTL ? " dir=\"rtl\"" : " dir=\"ltr\"").append(">"); - - //keys should normally be left-to-right, but this doesn't apply in all cases - entry.append("<span class=\"entryname\" dir=\"ltr\">").append(entryLink(i, *mod_Itr)).append("</span>"); - - if (m_settings.addText) { - //entry.append( QString::fromLatin1("<span %1>%2</span>").arg(langAttr).arg(key_renderedText) ); - entry.append( key_renderedText ); - } - - if (i.hasChildItems()) { - KeyTree const * tree = i.childList(); - - for (KeyTreeItem* c = tree->first(); c; c = tree->next()) { - entry.append( renderEntry(*c) ); - } - } - - entry.append(m_displayOptions.lineBreaks ? "</div>\n" : "</span>\n"); - - if (modules.count() == 1) { - renderedText.append( entry ); - } - else { - renderedText.append("<td class=\"") - .append(i.settings().highlight ? "currententry" : "entry") - .append("\" ") - .append(langAttr) - .append(" dir=\"") - .append(isRTL ? "rtl" : "ltr") - .append("\">") - .append(entry) - .append("</td>\n"); - } - } - - if (modules.count() > 1) { - renderedText.append("</tr>\n"); - } - - // qDebug("CHTMLExportRendering: %s", renderedText.latin1()); - return renderedText; - } - - void CHTMLExportRendering::initRendering() { - CPointers::backend()->setDisplayOptions( m_displayOptions ); - CPointers::backend()->setFilterOptions( m_filterOptions ); - } - - const QString CHTMLExportRendering::finishText( const QString& text, KeyTree& tree ) { - ListCSwordModuleInfo modules = tree.collectModules(); - - const CLanguageMgr::Language* const lang = modules.first()->language(); - - CDisplayTemplateMgr* tMgr = CPointers::displayTemplateManager(); - CDisplayTemplateMgr::Settings settings; - settings.modules = modules; - settings.langAbbrev = ((modules.count() == 1) && lang->isValid()) - ? lang->abbrev() - : "unknown"; - settings.pageDirection = (modules.count() == 1) - ? ((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") - : QString::null; - - return tMgr->fillTemplate(i18n("Export"), text, settings); - } - - /*! - \fn CHTMLExportRendering::entryLink( KeyTreeItem& item ) - */ - const QString CHTMLExportRendering::entryLink( const KeyTreeItem& item, CSwordModuleInfo* ) { - return item.key(); - } - -} - -; //end of namespace "Rendering" diff --git a/bibletime/backend/chtmlexportrendering.h b/bibletime/backend/chtmlexportrendering.h deleted file mode 100644 index 0526df9..0000000 --- a/bibletime/backend/chtmlexportrendering.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// C++ Interface: chtmlexportrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef RENDERINGCHTMLEXPORTRENDERING_H -#define RENDERINGCHTMLEXPORTRENDERING_H - -#include "cswordbackend.h" -#include "ctextrendering.h" - -#include "frontend/cbtconfig.h" - -namespace Rendering { - - /** - * This CTextRenerding implementation - * creates HTML specially made for export as HTML files. - * @short HTML rendering for export. - * @author The BibleTime team - */ - -class CHTMLExportRendering : public CTextRendering { - -public: - struct Settings { - Settings(const bool text = true) { - addText = text; - }; - - bool addText; - }; - - CHTMLExportRendering( - const Settings& settings, - CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(), - CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults() - ); - virtual ~CHTMLExportRendering(); - -protected: - virtual const QString renderEntry( const KeyTreeItem&, CSwordKey* = 0 ); - virtual const QString finishText( const QString&, KeyTree& tree ); - virtual const QString entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ); - virtual void initRendering(); - - CSwordBackend::DisplayOptions m_displayOptions; - CSwordBackend::FilterOptions m_filterOptions; - Settings m_settings; -}; - -} - -#endif diff --git a/bibletime/backend/clanguagemgr.cpp b/bibletime/backend/clanguagemgr.cpp deleted file mode 100644 index ef05b3e..0000000 --- a/bibletime/backend/clanguagemgr.cpp +++ /dev/null @@ -1,499 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "clanguagemgr.h" - -#include "cswordmoduleinfo.h" -#include "cswordbackend.h" - -#include "util/cpointers.h" - - -//Qt includes -#include <qptrlist.h> - -//KDE includes -#include <klocale.h> - -//initialize static language list -CLanguageMgr::LanguageList CLanguageMgr::m_langList; -CLanguageMgr::LanguageList CLanguageMgr::m_cleanupLangPtrs; - -CLanguageMgr::Language::Language() : m_altAbbrevs(0) { - m_abbrev = QString::null; - m_englishName = QString::null; - m_translatedName = QString::null; -}; - -CLanguageMgr::Language::Language(const Language& l) { - m_abbrev = l.m_abbrev; - m_englishName = l.m_englishName; - m_translatedName = l.m_translatedName; - - if (l.m_altAbbrevs) { //copy alternative abbrevs in a new list - m_altAbbrevs = new QStringList(*l.m_altAbbrevs); - //*m_altAbbrevs = *l.m_altAbbrevs; - } - else { - m_altAbbrevs = 0; - } -} - -CLanguageMgr::Language::Language( const QString& abbrev, const QString& name, const QString& translatedName, const QStringList& altAbbrevs ) : m_altAbbrevs(0) { - m_abbrev = abbrev; - m_englishName = name; - m_translatedName = translatedName; - - if (altAbbrevs.count() > 0) { - m_altAbbrevs = new QStringList(); - *m_altAbbrevs = altAbbrevs; - } -}; - -CLanguageMgr::Language::~Language() { - delete m_altAbbrevs; -}; - - -/****************************************************/ -/******************** CLanguageMgr ******************/ -/****************************************************/ -CLanguageMgr::CLanguageMgr() : m_langMap(0) { - m_availableModulesCache.moduleCount = 0; - - init(); -} - -CLanguageMgr::~CLanguageMgr() { - m_cleanupLangPtrs.setAutoDelete(true); - m_cleanupLangPtrs.clear(); - - m_langList.setAutoDelete(true); - m_langList.clear(); -} - -const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() { - ListCSwordModuleInfo mods = CPointers::backend()->moduleList(); - - if ( m_availableModulesCache.moduleCount != mods.count() ) { //we have to refill the cached map - m_availableModulesCache.availableLanguages.clear(); - m_availableModulesCache.moduleCount = mods.count(); - - //collect the languages abbrevs of all modules - QStrList abbrevs; - char *abbrev; - - ListCSwordModuleInfo::iterator end_it = mods.end(); - - for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) { - // for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) { - abbrev = (*it)->module()->Lang(); - - if (abbrev && !abbrevs.contains(abbrev)) { - abbrevs.append( abbrev ); - } - }; - - //now create a map of available langs - for ( abbrev = abbrevs.first(); abbrev; abbrev = abbrevs.next() ) { - const Language* const lang = languageForAbbrev(abbrev); - - if (lang->isValid()) { - m_availableModulesCache.availableLanguages.insert( abbrev, lang ); - } - else { //invalid lang used by a modules, create a new language using the abbrev - Language* newLang = new Language(abbrev, abbrev, abbrev); - m_cleanupLangPtrs.append(newLang); - - m_availableModulesCache.availableLanguages.insert( abbrev, newLang ); - } - }; - } - - return m_availableModulesCache.availableLanguages; -}; - -const CLanguageMgr::Language* const CLanguageMgr::languageForAbbrev( const QString& abbrev ) const { - Language* lang = m_langMap.find(abbrev); - - if (lang) { - return lang; - } - - //try to search in the alternative abbrevs - //const LangMapIterator end = m_langMap.constEnd(); - for ( LangMapIterator it( m_langMap ); it.current(); ++it ) { - if (it.current()->alternativeAbbrevs() && it.current()->alternativeAbbrevs()->contains(abbrev)) { - return it.current(); - } - } - - // Invalid lang used by a modules, create a new language using the abbrev - Language* newLang = new Language(abbrev, abbrev, abbrev); //return a language which holds the valid abbrev - m_cleanupLangPtrs.append(newLang); - - return newLang; -}; - -const CLanguageMgr::Language* const CLanguageMgr::languageForName( const QString& name ) const { - for ( LangMapIterator it( m_langMap ); it.current(); ++it ) { - if (it.current()->name() == name) { - return it.current(); - } - } - - return &m_defaultLanguage;//invalid language -}; - -const CLanguageMgr::Language* const CLanguageMgr::languageForTranslatedName( const QString& name ) const { - for ( LangMapIterator it( m_langMap ); it.current(); ++it ) { - if (it.current()->translatedName() == name) { - return it.current(); - } - } - - return &m_defaultLanguage; //invalid language -}; - -void CLanguageMgr::init() { - //if we've already inserted all items we do not proceed - - if (m_langMap.count() > 0) { - return; - } - - /* - * Chris explained in an eMail how language codes are build: - - Preference order for locale codes are: - - ISO 639-1 - ISO 639-2 - Ethnologue (http://www.ethnologue.org/) - - We intend to always follow OSIS locale conventions, which state that - Ethnologue codes will be encoded in the format x-E-??? where ??? - represents the 3-letter Ethnologue code in capital letters (though - capitalization really doesn't matter here). - - Some older modules maintain a former format for Ethnolgoue codes of - xx-???, including the AleWiesler module. - - --Chris - - */ - - // m_langList.append( new Language("aa" , "Afar" , i18n("Afar")) ); - // m_langList.append( new Language("ab" , "Abkhazian" , i18n("Abkhazian")) ); - // m_langList.append( new Language("ae" , "Avestan" , i18n("Avestan")) ); - m_langList.append( new Language("af" , "Afrikaans" , i18n("Afrikaans")) ); - - // m_langList.append( new Language("am" , "Amharic" , i18n("Amharic")) ); - m_langList.append( new Language("ang", "English, Old (ca.450-1100)", i18n("English, Old (ca.450-1100)")) ); - - m_langList.append( new Language("ar" , "Arabic" , i18n("Arabic")) ); - - // m_langList.append( new Language("as" , "Assamese" , i18n("Assamese")) ); - m_langList.append( new Language("az" , "Azerbaijani" , i18n("Azerbaijani")) ); - - // m_langList.append( new Language("ba" , "Bashkir" , i18n("Bashkir")) ); - m_langList.append( new Language("be" , "Belarusian" , i18n("Belarusian")) ); - - m_langList.append( new Language("bg" , "Bulgarian" , i18n("Bulgarian")) ); - - // m_langList.append( new Language("bh" , "Bihari" , i18n("Bihari")) ); - // m_langList.append( new Language("bi" , "Bislama" , i18n("Bislama")) ); - // m_langList.append( new Language("bn" , "Bengali" , i18n("Bengali")) ); - // m_langList.append( new Language("bo" , "Tibetan" , i18n("Tibetan")) ); - m_langList.append( new Language("br" , "Breton" , i18n("Breton")) ); - - m_langList.append( new Language("bs" , "Bosnian" , i18n("Bosnian")) ); - - m_langList.append( new Language("ca" , "Catalan" , i18n("Catalan")) ); - - // m_langList.append( new Language("ce" , "Chechen" , i18n("Chechen")) ); - m_langList.append( new Language("ceb" , "Cebuano" , i18n("Cebuano")) ); - - m_langList.append( new Language("ch" , "Chamorro" , i18n("Chamorro")) ); - - // m_langList.append( new Language("co" , "Corsican" , i18n("Corsican")) ); - m_langList.append( new Language("cop" , "Coptic" , i18n("Coptic")) ); - - m_langList.append( new Language("cs" , "Czech" , i18n("Czech")) ); - - m_langList.append( new Language("cu" , "Church Slavic" , i18n("Church Slavic")) ); - - // m_langList.append( new Language("cv" , "Chuvash" , i18n("Chuvash")) ); - m_langList.append( new Language("cy" , "Welsh" , i18n("Welsh")) ); - - m_langList.append( new Language("da" , "Danish" , i18n("Danish")) ); - - m_langList.append( new Language("de" , "German" , i18n("German")) ); - - // m_langList.append( new Language("dz" , "Dzongkha" , i18n("Dzongkha")) ); - - m_langList.append( new Language("el" , "Greek, Modern (1453-)" , i18n("Greek, Modern (1453-)"), makeStringList("gre;ell")) ); - - m_langList.append( new Language("en" , "English" , i18n("English")) ); - - m_langList.append( new Language("en_US","American English" , i18n("American English")) ); - - m_langList.append( new Language("enm" , "English, Middle (1100-1500)", i18n("English, Middle (1100-1500)")) ); - - m_langList.append( new Language("eo" , "Esperanto" , i18n("Esperanto")) ); - - m_langList.append( new Language("es" , "Spanish" , i18n("Spanish")) ); - - m_langList.append( new Language("et" , "Estonian" , i18n("Estonian")) ); - - m_langList.append( new Language("eu" , "Basque" , i18n("Basque")) ); - - // m_langList.append( new Language("fa" , "Persian" , i18n("Persian")) ); - m_langList.append( new Language("fi" , "Finnish" , i18n("Finnish")) ); - - // m_langList.append( new Language("fj" , "Fijian" , i18n("Fijian")) ); - // m_langList.append( new Language("fo" , "Faroese" , i18n("Faroese")) ); - m_langList.append( new Language("fr" , "French" , i18n("French")) ); - - m_langList.append( new Language("fy" , "Frisian" , i18n("Frisian")) ); - - m_langList.append( new Language("ga" , "Irish" , i18n("Irish")) ); - - m_langList.append( new Language("gd" , "Gaelic (Scots)", i18n("Gaelic (Scots)")) ); - - // m_langList.append( new Language("gl" , "Gallegan" , i18n("Gallegan")) ); - // m_langList.append( new Language("gn" , "Guarani" , i18n("Guarani")) ); - // m_langList.append( new Language("gn" , "Gujarati" , i18n("Gujarati")) ); - m_langList.append( new Language("got" , "Gothic" , i18n("Gothic")) ); - - m_langList.append( new Language("gv" , "Manx" , i18n("Manx")) ); - - m_langList.append( new Language("grc" , "Greek, Ancient (to 1453)" , i18n("Greek, Ancient (to 1453)")) ); - - m_langList.append( new Language("he" , "Hebrew" , i18n("Hebrew")) ); - - m_langList.append( new Language("hau" , "Hausa" , i18n("Hausa")) ); - - m_langList.append( new Language("haw" , "Hawaiian" , i18n("Hawaiian")) ); - - // m_langList.append( new Language("hi" , "Hindi" , i18n("Hindi")) ); - // m_langList.append( new Language("ho" , "Hiri Motu" , i18n("Hiri Motu")) ); - m_langList.append( new Language("hr" , "Croatian" , i18n("Croatian")) ); - - m_langList.append( new Language("hu" , "Hungarian" , i18n("Hungarian")) ); - - m_langList.append( new Language("hy" , "Armenian" , i18n("Armenian")) ); - - // m_langList.append( new Language("hz" , "Herero" , i18n("Herero")) ); - - // m_langList.append( new Language("ia" , "Interlingua" , i18n("Interlingua")) ); - m_langList.append( new Language("id" , "Indonesian" , i18n("Indonesian")) ); - - // m_langList.append( new Language("ie" , "Interlingue" , i18n("Interlingue")) ); - // m_langList.append( new Language("ik" , "Inupiaq" , i18n("Inupiaq")) ); - m_langList.append( new Language("is" , "Icelandic" , i18n("Icelandic")) ); - - m_langList.append( new Language("it" , "Italian" , i18n("Italian")) ); - - // m_langList.append( new Language("iu" , "Inuktitut" , i18n("Inuktitut")) ); - - m_langList.append( new Language("ja" , "Japanese" , i18n("Japanese")) ); - - m_langList.append( new Language("ka" , "Georgian" , i18n("Georgian")) ); - - // m_langList.append( new Language("x-E-KAB" , "Kabyle" , i18n("Kabyle")) ); - // m_langList.append( new Language("ki" , "Kikuyu" , i18n("Kikuyu")) ); - // m_langList.append( new Language("kj" , "Kuanyama" , i18n("Kuanyama")) ); - // m_langList.append( new Language("kk" , "Kazakh" , i18n("Kazakh")) ); - // m_langList.append( new Language("kl" , "Kalaallisut" , i18n("Kalaallisut")) ); - // m_langList.append( new Language("km" , "Khmer" , i18n("Khmer")) ); - // m_langList.append( new Language("kn" , "Kannada" , i18n("Kannada")) ); - m_langList.append( new Language("ko" , "Korean" , i18n("Korean")) ); - - // m_langList.append( new Language("ks" , "Kashmiri" , i18n("Kashmiri")) ); - m_langList.append( new Language("ku" , "Kurdish" , i18n("Kurdish")) ); - - // m_langList.append( new Language("kv" , "Komi" , i18n("Komi")) ); - // m_langList.append( new Language("kw" , "Cornish" , i18n("Cornish")) ); - m_langList.append( new Language("ky" , "Kirghiz" , i18n("Kirghiz")) ); - - m_langList.append( new Language("la" , "Latin" , i18n("Latin")) ); - - // m_langList.append( new Language("lb" , "Letzeburgesch" , i18n("Letzeburgesch")) ); - // m_langList.append( new Language("ln" , "Lingala" , i18n("Lingala")) ); - // m_langList.append( new Language("lo" , "Lao" , i18n("Lao")) ); - m_langList.append( new Language("lt" , "Lithuanian" , i18n("Lithuanian")) ); - - m_langList.append( new Language("lv" , "Latvian" , i18n("Latvian")) ); - - // m_langList.append( new Language("mg" , "Malagasy" , i18n("Malagasy")) ); - // m_langList.append( new Language("mh" , "Marshall" , i18n("Marshall")) ); - m_langList.append( new Language("mi" , "Maori" , i18n("Maori")) ); - - m_langList.append( new Language("mk" , "Macedonian" , i18n("Macedonian")) ); - - // m_langList.append( new Language("ml" , "Malayalam" , i18n("Malayalam")) ); - // m_langList.append( new Language("mn" , "Mongolian" , i18n("Mongolian")) ); - // m_langList.append( new Language("mo" , "Moldavian" , i18n("Moldavian")) ); - m_langList.append( new Language("mos" , "More" , i18n("More")) ); - - // m_langList.append( new Language("mr" , "Marathi" , i18n("Marathi")) ); - m_langList.append( new Language("ms" , "Malay" , i18n("Malay")) ); - - m_langList.append( new Language("mt" , "Maltese" , i18n("Maltese")) ); - - // m_langList.append( new Language("my" , "Burmese" , i18n("Burmese")) ); - - // m_langList.append( new Language("na" , "Nauru" , i18n("Nauru")) ); - // m_langList.append( new Language("nb" , "Norwegian Bokmål" , i18n("Norwegian Bokmål")) ); - // m_langList.append( new Language("nd" , "Ndebele, North" , i18n("Ndebele, North")) ); - m_langList.append( new Language("nds" , "Low German; Low Saxon" , i18n("Low German; Low Saxon")) ); - - // m_langList.append( new Language("ne" , "Nepali" , i18n("Nepali")) ); - // m_langList.append( new Language("ng" , "Ndonga" , i18n("Ndonga")) ); - m_langList.append( new Language("nl" , "Dutch" , i18n("Dutch")) ); - - // m_langList.append( new Language("nn" , "Norwegian Nynorsk" , i18n("Norwegian Nynorsk")) ); - m_langList.append( new Language("no" , "Norwegian" , i18n("Norwegian")) ); - - // m_langList.append( new Language("nr" , "Ndebele, South" , i18n("Ndebele, South")) ); - // m_langList.append( new Language("nv" , "Navajo" , i18n("Navajo")) ); - // m_langList.append( new Language("ny" , "Chichewa; Nyanja" , i18n("Chichewa; Nyanja")) ); - - // m_langList.append( new Language("oc" , "Occitan (post 1500); Provençal" , i18n("Occitan (post 1500); Provençal")) ); - // m_langList.append( new Language("om" , "Oromo" , i18n("Oromo")) ); - // m_langList.append( new Language("or" , "Oriya" , i18n("Oriya")) ); - // m_langList.append( new Language("os" , "Ossetian; Ossetic" , i18n("Ossetian; Ossetic")) ); - - // m_langList.append( new Language("pa" , "Panjabi" , i18n("Panjabi")) ); - m_langList.append( new Language("pap" , "Papiamento" , i18n("Papiamento")) ); - - // m_langList.append( new Language("pi" , "Pali" , i18n("Pali")) ); - m_langList.append( new Language("pl" , "Polish" , i18n("Polish")) ); - - // m_langList.append( new Language("ps" , "Pushto" , i18n("Pushto")) ); - m_langList.append( new Language("pt" , "Portuguese" , i18n("Portuguese")) ); - - m_langList.append( new Language("pt_BR" , "Brasilian Portuguese" , i18n("Brasilian Portuguese")) );//added by ourself - - // m_langList.append( new Language("qu" , "Quechua" , i18n("Quechua")) ); - - // m_langList.append( new Language("rm" , "Raeto-Romance" , i18n("Raeto-Romance")) ); - // m_langList.append( new Language("rn" , "Rundi" , i18n("Rundi")) ); - - m_langList.append( new Language("ro" , "Romanian" , i18n("Romanian")) ); - - m_langList.append( new Language("ru" , "Russian" , i18n("Russian")) ); - - // m_langList.append( new Language("rw" , "Kinyarwanda" , i18n("Kinyarwanda")) ); - - // m_langList.append( new Language("sa" , "Sanskrit" , i18n("Sanskrit")) ); - // m_langList.append( new Language("sc" , "Sardinian" , i18n("Sardinian")) ); - m_langList.append( new Language("sco" , "Scots" , i18n("Scots")) ); - - // m_langList.append( new Language("sd" , "Sindhi" , i18n("Sindhi")) ); - // m_langList.append( new Language("se" , "Northern Sami" , i18n("Northern Sami")) ); - // m_langList.append( new Language("sg" , "Sango" , i18n("Sango")) ); - // m_langList.append( new Language("si" , "Sinhalese" , i18n("Sinhalese")) ); - m_langList.append( new Language("sk" , "Slovak" , i18n("Slovak")) ); - - m_langList.append( new Language("sl" , "Slovenian" , i18n("Slovenian")) ); - - // m_langList.append( new Language("sm" , "Samoan" , i18n("Samoan")) ); - // m_langList.append( new Language("sn" , "Shona" , i18n("Shona")) ); - m_langList.append( new Language("so" , "Somali" , i18n("Somali")) ); - - m_langList.append( new Language("sq" , "Albanian" , i18n("Albanian")) ); - - // m_langList.append( new Language("sr" , "Serbian" , i18n("Serbian")) ); - // m_langList.append( new Language("ss" , "Swati" , i18n("Swati")) ); - // m_langList.append( new Language("st" , "Sotho, Southern" , i18n("Sotho, Southern")) ); - // m_langList.append( new Language("su" , "Sundanese" , i18n("Sundanese")) ); - m_langList.append( new Language("sv" , "Swedish" , i18n("Swedish")) ); - - m_langList.append( new Language("sw" , "Swahili" , i18n("Swahili")) ); - - m_langList.append( new Language("syr" , "Syriac" , i18n("Syriac")) ); - - m_langList.append( new Language("ta" , "Tamil" , i18n("Tamil")) ); - - // m_langList.append( new Language("te" , "Telugu" , i18n("Telugu")) ); - // m_langList.append( new Language("tg" , "Tajik" , i18n("Tajik")) ); - m_langList.append( new Language("th" , "Thai" , i18n("Thai")) ); - - // m_langList.append( new Language("tk" , "Turkmen" , i18n("Turkmen")) ); - m_langList.append( new Language("tl" , "Tagalog" , i18n("Tagalog")) ); - - m_langList.append( new Language("tn" , "Tswana" , i18n("Tswana")) ); - - m_langList.append( new Language("tr" , "Turkish" , i18n("Turkish")) ); - - // m_langList.append( new Language("ts" , "Tsonga" , i18n("Tsonga")) ); - // m_langList.append( new Language("tt" , "Tatar" , i18n("Tatar")) ); - // m_langList.append( new Language("tw" , "Twi" , i18n("Twi")) ); - m_langList.append( new Language("ty" , "Tahitian" , i18n("Tahitian")) ); - - // - // m_langList.append( new Language("ug" , "Uighur" , i18n("Uighur")) ); - m_langList.append( new Language("uk" , "Ukrainian" , i18n("Ukrainian")) ); - - // m_langList.append( new Language("ur" , "Urdu" , i18n("Urdu")) ); - // m_langList.append( new Language("uz" , "Uzbek" , i18n("Uzbek")) ); - - m_langList.append( new Language("vi" , "Vietnamese" , i18n("Vietnamese")) ); - - // m_langList.append( new Language("vo" , "Volapük" , i18n("Volapük")) ); - // - // m_langList.append( new Language("wo" , "Wolof" , i18n("Wolof")) ); - - m_langList.append( new Language("xh" , "Xhosa" , i18n("Xhosa")) ); - - m_langList.append( new Language("x-E-BAR" , "Bavarian" , i18n("Bavarian")) ); - - m_langList.append( new Language("x-E-DJE" , "Zarma" , i18n("Zarma")) ); - - m_langList.append( new Language("x-E-GSW" , "Alemannisch" , i18n("Alemannisch")) ); - - m_langList.append( new Language("x-E-HAT" , "Haitian Creole French" , i18n("Haitian Creole French")) ); - - m_langList.append( new Language("x-E-ITZ" , QString::fromUtf8("Itzá") , i18n("Itzá")) ); - - m_langList.append( new Language("x-E-JIV" , "Shuar" , i18n("Shuar")) ); - - m_langList.append( new Language("x-E-KEK" , QString::fromUtf8("Kekchí") , i18n("Kekchí")) ); - - m_langList.append( new Language("x-E-KAB" , "Kabyle" , i18n("Kabyle")) ); - - m_langList.append( new Language("x-E-LMO" , "Lombard" , i18n("Lombard")) ); - - m_langList.append( new Language("x-E-MKJ" , "Macedonian" , i18n("Macedonian")) ); - - m_langList.append( new Language("x-E-PDG" , "Tok Pisin" , i18n("Tok Pisin")) ); - - m_langList.append( new Language("x-E-PPK" , "Uma" , i18n("Uma")) ); - - m_langList.append( new Language("x-E-RMY" , "Romani, Vlax" , i18n("Romani, Vlax")) ); - - m_langList.append( new Language("x-E-SAJ" , "Sango" , i18n("Sango")) ); - - m_langList.append( new Language("x-E-SRN" , "Sranan" , i18n("Sranan")) ); - - // m_langList.append( new Language("yi" , "Yiddish" , i18n("Yiddish")) ); - // - // m_langList.append( new Language("za" , "Zhuang" , i18n("Zhuang")) ); - m_langList.append( new Language("zh" , "Chinese" , i18n("Chinese")) ); - - m_langList.append( new Language("zu" , "Zulu" , i18n("Zulu")) ); - - for ( Language* lang = m_langList.first(); lang; lang = m_langList.next() ) { - m_langMap.insert( lang->abbrev(), lang); - }; -}; diff --git a/bibletime/backend/clanguagemgr.h b/bibletime/backend/clanguagemgr.h deleted file mode 100644 index 2acc4c7..0000000 --- a/bibletime/backend/clanguagemgr.h +++ /dev/null @@ -1,172 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CLANGUAGEMGR_H -#define CLANGUAGEMGR_H - -//Qt includes -#include <qstring.h> -#include <qstringlist.h> -#include <qvaluelist.h> -#include <qmap.h> -#include <qdict.h> - -/** Manages the anguages of BibleTime and provides functions to work with them. - * @author The BibleTime team - */ - -class CLanguageMgr { - -public: - /** Language container. - * This class (Language) contains the information about the chosen language. - */ - class Language { - public: - /** Default constructor of a language object. - * Uses the abbreviation parameter to lookup the - * language name and to be able to return the name, flag etc. - * Possible values for abbrev are de, en, fr, it etc. - */ - Language(); - /** Copy constructor. - */ - Language(const Language&); - /** Constructor which takes all necessary data. - */ - Language(const QString& abbrev, const QString& englishName, const QString& translatedName, const QStringList& altAbbrevs = QStringList()); - /** Destructor. - */ - ~Language(); - /** Returns the abbreviation. - * @return The abbreviation of the chosen language. - */ - inline const QString& abbrev() const; - /** Returns the translated name. - * @return The translated name of the language. - */ - inline const QString& translatedName() const; - //always define inlines in the header file, or make them not inline. - /** The english name of the language. - * @return The english name of the chosen language. - */ - inline const QString& name() const { - return m_englishName; - } - - /** The alternative abbreviations which are avalable for this language. - * @return A pointer to the list of alternate abbreviations - */ - inline const QStringList* const alternativeAbbrevs() const { - return m_altAbbrevs; - }; - - /** - * Returns true if this language object is valid, i.e. has an abbrev and name. - * @return True if the data is valid for this language. - */ - inline const bool isValid() const; - - private: - QString m_abbrev; - QString m_englishName; - QString m_translatedName; - QStringList* m_altAbbrevs; - }; - - typedef QPtrList<CLanguageMgr::Language> LanguageList; - - typedef QDict<Language> LangMap; - typedef QDictIterator<Language> LangMapIterator; - - /** Constructor. - */ - CLanguageMgr(); - /** Destructor - */ - virtual ~CLanguageMgr(); - /** - * Returns the standard languages available as standard. Does nothing for Sword. - * @return A QDict<Language> map which contains all known languages - */ - inline const CLanguageMgr::LangMap* const languages() const; - /** - * Returns the languages which are available. The languages cover all available modules, but nothing more. - * @return A map of all languages with modules available for them - */ - const CLanguageMgr::LangMap& availableLanguages(); - /** Language for abbreviation. - * @param abbrev The language abbreviation - * @return Pointer to a language for the given string abbreviation. - */ - const CLanguageMgr::Language* const languageForAbbrev( const QString& abbrev ) const; - /** Language for english name. - * @param abbrev The english language name. - * @return Pointer to a language for the given name - */ - const CLanguageMgr::Language* const languageForName( const QString& language ) const; - /** Language for translated language name. - * @param abbrev The translated language name - * @return Pointer to a language for the given translated language name - */ - const CLanguageMgr::Language* const languageForTranslatedName( const QString& language ) const; - /** Default language so we don't return NULL pointers. - * @return Pointer to the default language - */ - inline const CLanguageMgr::Language* const defaultLanguage() const; - -private: - void init(); - inline const QStringList makeStringList(const QString& abbrevs) { - return QStringList::split( ";", abbrevs, false ); - } - - mutable LangMap m_langMap; - Language m_defaultLanguage; - - //typedef QPtrList<CLanguageMgr::Language> LanguageList; - static LanguageList m_langList; - static LanguageList m_cleanupLangPtrs; - - struct ModuleCache { - unsigned int moduleCount; - LangMap availableLanguages; - } - m_availableModulesCache; -}; - - -/** Returns true if this language object is valid, i.e. has an abbrev and name. */ -inline const bool CLanguageMgr::Language::isValid() const { - return (!abbrev().isEmpty() && !name().isEmpty()); -} - -inline const QString& CLanguageMgr::Language::abbrev() const { - if (m_altAbbrevs && m_abbrev.isEmpty() && m_altAbbrevs->count()) { //no standard abbrev but alternative ones - return m_altAbbrevs->first(); - } - - return m_abbrev; -} - -inline const QString& CLanguageMgr::Language::translatedName() const { - return m_translatedName; -} - -inline const CLanguageMgr::LangMap* const CLanguageMgr::languages() const { - return &m_langMap; -} - -inline const CLanguageMgr::Language* const CLanguageMgr::defaultLanguage() const { - return &m_defaultLanguage; -} - -#endif diff --git a/bibletime/backend/cplaintextexportrendering.cpp b/bibletime/backend/cplaintextexportrendering.cpp deleted file mode 100644 index 37d0fa0..0000000 --- a/bibletime/backend/cplaintextexportrendering.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// -// C++ Implementation: cplaintextexportrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -//Backend includes -#include "cplaintextexportrendering.h" -#include "cswordkey.h" - -//Util -#include "util/scoped_resource.h" - - - -namespace Rendering { - - CPlainTextExportRendering::CPlainTextExportRendering(const CPlainTextExportRendering::Settings& settings, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) -: CHTMLExportRendering(settings, displayOptions, filterOptions) {} - - CPlainTextExportRendering::~CPlainTextExportRendering() {} - - const QString CPlainTextExportRendering::renderEntry( const KeyTreeItem& i, CSwordKey* ) { - if (!m_settings.addText) { - return QString(i.key()).append("\n"); - } - - ListCSwordModuleInfo modules = i.modules(); - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(modules.first()) ); - QString renderedText = QString(i.key()).append(":\n"); - - QString entry; - // for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) { - ListCSwordModuleInfo::iterator end_it = modules.end(); - - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - key->module(*it); - key->key( i.key() ); - - //ToDo: Check this code - entry.append(key->strippedText()).append("\n"); - renderedText.append( entry ); - } - - return renderedText; - } - - const QString CPlainTextExportRendering::finishText( const QString& oldText, KeyTree& ) { - return oldText; - } - -}; diff --git a/bibletime/backend/cplaintextexportrendering.h b/bibletime/backend/cplaintextexportrendering.h deleted file mode 100644 index 95a1cae..0000000 --- a/bibletime/backend/cplaintextexportrendering.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// C++ Interface: cplaintextexportrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef RENDERINGCPLAINTEXTEXPORTRENDERING_H -#define RENDERINGCPLAINTEXTEXPORTRENDERING_H - -#include "chtmlexportrendering.h" - -namespace Rendering { - - /** - * This implementation can be used to export content as plain text. - * @short Text rendering as plain text. - * @author The BibleTime team - */ - -class CPlainTextExportRendering : public CHTMLExportRendering { - -public: - CPlainTextExportRendering( - const Settings& settings, - CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(), - CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults() - ); - virtual ~CPlainTextExportRendering(); - -protected: - virtual const QString renderEntry( const KeyTreeItem&, CSwordKey* = 0 ); - virtual const QString finishText( const QString&, KeyTree& tree ); - }; - -}; - -#endif diff --git a/bibletime/backend/creferencemanager.cpp b/bibletime/backend/creferencemanager.cpp deleted file mode 100644 index 7b41e7f..0000000 --- a/bibletime/backend/creferencemanager.cpp +++ /dev/null @@ -1,434 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "creferencemanager.h" -#include "cswordversekey.h" - -#include "../frontend/cbtconfig.h" - -//QT includes -#include <qregexp.h> - -//stl includes -#include <algorithm> // STL algorithms class library - -/** Returns a hyperlink used to be imbedded in the display windows. At the moment the format is sword://module/key */ -const QString CReferenceManager::encodeHyperlink( const QString moduleName, const QString key, const CReferenceManager::Type type) { - QString ret = QString::null; - - switch (type) { - - case Bible: - ret.setLatin1("sword://Bible/"); - break; - - case Commentary: - ret.setLatin1("sword://Commentary/"); - break; - - case Lexicon: - ret.setLatin1("sword://Lexicon/"); - break; - - case GenericBook: - ret.setLatin1("sword://Book/"); - break; - - case MorphHebrew: - ret.setLatin1("morph://Hebrew/"); - break; - - case MorphGreek: - ret.setLatin1("morph://Greek/"); - break; - - case StrongsHebrew: - ret.setLatin1("strongs://Hebrew/"); - break; - - case StrongsGreek: - ret.setLatin1("strongs://Greek/"); - break; - - default: - break; - } - - if (!moduleName.isEmpty()) { - ret.append( moduleName ).append('/'); - } - else { //if module is empty use fallback module - ret.append( preferredModule(type) ).append('/'); - } - - if (type == GenericBook) { - const QString s = (!key.isEmpty() ? key : QString::null); - QString newKey = QString::null; - //replace all / of the key (e.g. of a CSwordTreeKey) with - // the escape sequence \/ so we know it's a link internal divider (e.g. of CSwordTreeKey)! - - QChar c; - - for(unsigned int i = 0; i < s.length(); ++i) { - c = s.at(i); - - if (c == '/') { - newKey.append("\\/"); - } - else { - newKey.append(c); - } - } - - ret.append( newKey ); - } - else { //slashes do not appear in verses and dictionary entries - - switch (type) { - - case Bible: //bibles or commentary keys need parsing - - case Commentary: { -/* CSwordModuleInfo* mod = CPointers::backend()->findModuleByName(moduleName); - - ParseOptions options; - options.refDestinationModule = mod->name(); - options.refBase = - options.sourceLanguage = mod->module()->Lang(); - options.destinationLanguage = "en"; - - ret.append( parseVerseReference(key, options) ); //we add the english key, so drag and drop will work in all cases*/ - ret.append(key); - break; - } - - default: - ret.append( key ); //use the standard key, no parsing required - break; - } - } - - return ret; -} - -/** Decodes the given hyperlink to module and key. */ -const bool CReferenceManager::decodeHyperlink( const QString& hyperlink, QString& module, QString& key, CReferenceManager::Type& type ) { - /** - * We have to decide between three types of URLS: sword://Type/Module/Key, morph://Testament/key and strongs://Testament/Key - */ - module = QString::null; - key = QString::null; - - type = Unknown; //not yet known - QString ref = hyperlink; - //remove the trailing slash - - if (ref.right(1)=="/" && ref.right(2) != "\\/") //trailing slash, but not escaped - ref = ref.left(ref.length()-1); - - //find out which type we have by looking at the beginning (protocoll section of URL) - if (ref.left(8).lower() == "sword://") { //Bible, Commentary or Lexicon - ref = ref.mid(8); - - if (ref.left(5).lower() == "bible") { //a bible hyperlink - type = CReferenceManager::Bible; - ref = ref.mid(6); //inclusive trailing slash - } - else if (ref.left(10).lower() == "commentary") { // a Commentary hyperlink - type = CReferenceManager::Commentary; - ref = ref.mid(11); //inclusive trailing slash - } - else if (ref.left(7).lower() == "lexicon") { // a Lexicon hyperlink - type = CReferenceManager::Lexicon; - ref = ref.mid(8); //inclusive trailing slash - } - else if (ref.left(4).lower() == "book") { // a Book hyperlink - type = CReferenceManager::GenericBook; - ref = ref.mid(5); //inclusive trailing slash - } - - // string up to next slash is the modulename - if (ref.at(0) != '/' ) { //we have a module given - - while (true) { - const int pos = ref.find("/"); - - if ((pos>0) && ref.at(pos-1) != '\\') { //found a slash which is not escaped - module = ref.mid(0,pos); - ref = ref.mid(pos+1); - break; - } - else if (pos == -1) { - break; - } - } - - // the rest is the key - key = ref; - } - else { - key = ref.mid(1); - } - - //the key may be an osis key like "NASBLex:Moses", which sets the module, too - // const int modPos = key.find(":"); - // if (modPos != -1 && key.at(modPos-1).isLetter() && key.at(modPos+1).isLetter()) { - // module = key.left(modPos); - // key = key.mid(modPos+1); - // - // qWarning("found the module name %s with key %s", module.latin1(), key.latin1()); - // } - - //replace \/ escapes with / - key.replace(QRegExp("\\\\/"), "/"); - } - else if (ref.left(8).lower() == "morph://" || ref.left(10).lower() == "strongs://") { //strongs or morph URL have the same format - enum PreType {IsMorph, IsStrongs}; - PreType preType = IsMorph; - - if (ref.left(8).lower() == "morph://") { //morph code hyperlink - ref = ref.mid(8); - preType = IsMorph; - } - else if (ref.left(10).lower() == "strongs://") { - ref = ref.mid(10); - preType = IsStrongs; - } - - //part up to next slash is the language - const int pos = ref.find("/"); - - if (pos>0) { //found - const QString language = ref.mid(0,pos); - - if (language.lower() == "hebrew") { - switch (preType) { - - case IsMorph: - type = CReferenceManager::MorphHebrew; - break; - - case IsStrongs: - type = CReferenceManager::StrongsHebrew; - break; - } - } - else if (language.lower() == "greek") { - switch (preType) { - - case IsMorph: - type = CReferenceManager::MorphGreek; - break; - - case IsStrongs: - type = CReferenceManager::StrongsGreek; - break; - } - } - - ref = ref.mid(pos+1); - key = ref; //the remaining part is the key - - module = preferredModule(type); - } - } - - if (key.isEmpty() && module.isEmpty()) - return false; - - return true; -} - -const QString CReferenceManager::encodeReference(const QString &module, const QString &reference) { - //return QString("(%1)%2").arg(module).arg(reference); - return QString("(").append(module).append(")").append(reference); -} - -void CReferenceManager::decodeReference(QString &dragreference, QString &module, QString &reference) { - const int pos = dragreference.find(")"); - const QString fallbackModule = dragreference.mid( 1, pos - 1); - dragreference = dragreference.mid(pos+1); - - module = fallbackModule; - reference = dragreference; -} - -/** Returns true if the parameter is a hyperlink. */ -const bool CReferenceManager::isHyperlink( const QString& hyperlink ) { - return ( hyperlink.left(8) == "sword://") - || (hyperlink.left(10) == "strongs://") - || (hyperlink.left(8) == "morph://"); -} - -/** Returns the preferred module name for the given type. */ -const QString CReferenceManager::preferredModule( const CReferenceManager::Type type ) { - QString moduleName = QString::null; - CSwordModuleInfo* module = 0; - - switch (type) { - - case CReferenceManager::Bible: - - module = CBTConfig::get - ( CBTConfig::standardBible ); - - break; - - case CReferenceManager::Commentary: - module = CBTConfig::get - ( CBTConfig::standardCommentary ); - - break; - - case CReferenceManager::Lexicon: - module = CBTConfig::get - ( CBTConfig::standardLexicon ); - - break; - - case CReferenceManager::StrongsHebrew: - module = CBTConfig::get - ( CBTConfig::standardHebrewStrongsLexicon ); - - break; - - case CReferenceManager::StrongsGreek: - module = CBTConfig::get - ( CBTConfig::standardGreekStrongsLexicon ); - - break; - - case CReferenceManager::MorphHebrew: - module = CBTConfig::get - ( CBTConfig::standardHebrewMorphLexicon ); - - break; - - case CReferenceManager::MorphGreek: - module = CBTConfig::get - ( CBTConfig::standardGreekMorphLexicon ); - - break; - - default: - module = 0; - - break; - } - - return module ? module->name() : QString::null; -} - -/** No descriptions */ -CReferenceManager::Type CReferenceManager::typeFromModule( const CSwordModuleInfo::ModuleType type) { - switch (type) { - - case CSwordModuleInfo::Bible: - return CReferenceManager::Bible; - - case CSwordModuleInfo::Commentary: - return CReferenceManager::Commentary; - - case CSwordModuleInfo::Lexicon: - return CReferenceManager::Lexicon; - - case CSwordModuleInfo::GenericBook: - return CReferenceManager::GenericBook; - - default: - return CReferenceManager::Unknown; - } -} - -/** Parses the given verse references using the given language and the module.*/ -const QString CReferenceManager::parseVerseReference( const QString& ref, const CReferenceManager::ParseOptions& options) { - - CSwordModuleInfo* const mod = CPointers::backend()->findModuleByName(options.refDestinationModule); - Q_ASSERT(mod); - - if (!mod) { - //parsing of non-verse based references is not supported - return ref; - } - - if ((mod->type() != CSwordModuleInfo::Bible) && (mod->type() != CSwordModuleInfo::Commentary)) { - qDebug("CReferenceManager: Only verse based modules are supported as ref destination module"); - return QString::null; - } - - QString sourceLanguage = options.sourceLanguage; - QString destinationLanguage = options.destinationLanguage; - - StringList locales = sword::LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); - if (/*options.sourceLanguage == "en" ||*/ std::find(locales.begin(), locales.end(), sourceLanguage) == locales.end()) { //sourceLanguage not available - sourceLanguage = "en_US"; - } - - if (/*options.destinationLanguage == "en" ||*/ std::find(locales.begin(), locales.end(), sourceLanguage) == locales.end()) { //destination not available - destinationLanguage = "en_US"; - } - - - QString ret; - QStringList refList = QStringList::split(";", ref); - - CSwordVerseKey baseKey(0); - baseKey.setLocale( sourceLanguage.latin1() ); - baseKey.key( options.refBase ); //probably in the sourceLanguage - baseKey.setLocale( "en_US" ); //english works in all environments as base - -// CSwordVerseKey dummy(0); - //HACK: We have to workaround a Sword bug, we have to set the default locale to the same as the sourceLanguage ! - const QString oldLocaleName = CPointers::backend()->booknameLanguage(); - CPointers::backend()->booknameLanguage(sourceLanguage); - - VerseKey dummy; - dummy.setLocale( sourceLanguage.latin1() ); - Q_ASSERT( !strcmp(dummy.getLocale(), sourceLanguage.latin1()) ); - -// qDebug("Parsing '%s' in '%s' using '%s' as base, source lang '%s', dest lang '%s'", ref.latin1(), options.refDestinationModule.latin1(), baseKey.key().latin1(), sourceLanguage.latin1(), destinationLanguage.latin1()); - - for (QStringList::iterator it = refList.begin(); it != refList.end(); it++) { - //The listkey may contain more than one item, because a ref lik "Gen 1:3,5" is parsed into two single refs - ListKey lk = dummy.ParseVerseList((const char*)(*it).utf8(), (const char*)baseKey.key().utf8(), true); - Q_ASSERT(!dummy.Error()); - - Q_ASSERT(lk.Count()); - if (!lk.Count()) { - ret.append( *it ); //don't change the original - continue; - } - - for (int i = 0; i < lk.Count(); ++i) { - if (dynamic_cast<VerseKey*>(lk.getElement(i))) { // a range - VerseKey* k = dynamic_cast<VerseKey*>(lk.getElement(i)); - Q_ASSERT(k); - k->setLocale( destinationLanguage.latin1() ); - - ret.append( QString::fromUtf8(k->getRangeText()) ).append("; "); - } - else { // a single ref - VerseKey vk; - vk.setLocale( sourceLanguage.latin1() ); - vk = lk.getElement(i)->getText(); - vk.setLocale( destinationLanguage.latin1() ); - - ret.append( QString::fromUtf8(vk.getText()) ).append("; "); - } - } - - } - - CPointers::backend()->booknameLanguage(oldLocaleName); -// qDebug(" %s", ret.latin1()); - - return ret; -} diff --git a/bibletime/backend/creferencemanager.h b/bibletime/backend/creferencemanager.h deleted file mode 100644 index 343e3ef..0000000 --- a/bibletime/backend/creferencemanager.h +++ /dev/null @@ -1,112 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CREFERENCEMANAGER_H -#define CREFERENCEMANAGER_H - -//Qt includes -#include <qstring.h> - -#include "cswordmoduleinfo.h" - -/** Contains static functions to work with referneces used for Drag & Drop and for hyperlinks used in our - * rendered HTML code. - * @author The BibleTime team - */ - -class CReferenceManager { - -public: - enum Type { - Bible, /**< Bibles */ - Commentary, /**< Commentary */ - Lexicon, /**< Lexicon */ - GenericBook, /**< Generic Book */ - MorphHebrew, /**< Module for hebrew morphology*/ - MorphGreek, /**< Module for greek morphology */ - StrongsHebrew, /**< Module for hebrew strongs */ - StrongsGreek, /**< Module for greek strongs */ - Unknown /**< Unknown */ - }; - - /** Turn a hyperlink into module, key and type. - * Decodes the given hyperlink into module, key and type. - * @param hyperlink The hyperlink to decode - * @param module The string which will contain the module name after decoding - * @param key The string which will contain the key after decoding - * @param type The type param will contain the reference type after decoding - */ - static const bool decodeHyperlink( const QString& hyperlink, QString& module, QString& key, Type& type); - /** - * Returns a hyperlink used to be imbedded in the display windows. - * At the moment the format is sword://module/key - * @param module The module which is used to encode the hyperlink - * @param key The key which is used to encode the hyperlink - * @param type The type which is used to encode the hyperlink - * @return The encoded hyperlink - */ - static const QString encodeHyperlink( const QString module, const QString key, const Type type); - /** - * Puts a module Name and a Reference together in the 'draggable' form - * (module)reference - * @param module The name of the module - * @param reference The key reference as text - * @return The encoded reference using module and reference - * @author Martin Gruner - */ - static const QString encodeReference(const QString &module, const QString &reference); - /** - * decodes a 'draggable' reference into a modulename and a reference - * @author Martin Gruner - */ - static void decodeReference(QString &dragreference, QString &module, QString &reference); - /** - * Returns true if the parameter is a hyperlink. - * @param hyperlink The string which is tested - * @return True if the passed string is a hyperlink - */ - static const bool isHyperlink( const QString& hyperlink ); - /** - * Returns the preferred module name for the given type. - * @param type The type which is used to find the module - * @return The default module name for the passed type - */ - static const QString preferredModule( const Type type ); - /** - * Returns the type of the passed module type - * @param type The CSwordModuleInfo module typpe - * @return The ReferenceManager type - */ - static CReferenceManager::Type typeFromModule( const CSwordModuleInfo::ModuleType type ); - - - struct ParseOptions { - QString refDestinationModule; - QString refBase; /* only valid for verse based destination modules*/ - QString sourceLanguage; /* only valid for verse based destination modules*/ - QString destinationLanguage; /* only valid for verse based destination modules*/ - - ParseOptions() { - destinationLanguage = "en"; - }; - }; - - /** Parses the given verse references using the given language and the module. - * @param moduleName The name of the module to use. Required for the language checking before parsing the key. - * @param ref The verse reference. - * @param lang The language of the verse reference - * @param newLang The language of the reference, which will be returned. For example: If BibleTime using an english environment parses a spanish ref (lang=es) the returned ref should be in english (newLang=en), because his english standard module only understands en. - */ - static const QString parseVerseReference( const QString& ref, const ParseOptions& options); -}; - -#endif - diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp deleted file mode 100644 index f46b444..0000000 --- a/bibletime/backend/cswordbackend.cpp +++ /dev/null @@ -1,692 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordbackend.h" -#include "centrydisplay.h" -#include "cbookdisplay.h" -#include "cchapterdisplay.h" -#include "cswordbiblemoduleinfo.h" -#include "cswordcommentarymoduleinfo.h" -#include "cswordlexiconmoduleinfo.h" -#include "cswordbookmoduleinfo.h" - -#include "bt_thmlhtml.h" -#include "bt_thmlplain.h" -#include "bt_osishtml.h" -#include "bt_gbfhtml.h" -#include "bt_plainhtml.h" -#include "osismorphsegmentation.h" - -#include "frontend/cbtconfig.h" - -#include <dirent.h> -#include <unistd.h> -#include <ctype.h> - -//Qt includes -#include <qdir.h> -#include <qfileinfo.h> - -//KDE includes -#include <klocale.h> -#include <kstringhandler.h> - -//Sword includes -#include <swdisp.h> -#include <swfiltermgr.h> -#include <encfiltmgr.h> -#include <rtfhtml.h> -#include <filemgr.h> -#include <utilstr.h> -#include <swfilter.h> - -using std::string; - -using namespace Filters; - -using namespace Rendering; - -CSwordBackend::CSwordBackend() -: sword::SWMgr(0, 0, false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ), true) { - m_displays.entry = 0; - m_displays.chapter = 0; - m_displays.book = 0; - - m_filters.gbf = 0; - m_filters.thml = 0; - m_filters.osis = 0; - m_filters.plain = 0; - - filterInit(); -} - -CSwordBackend::CSwordBackend(const QString& path, const bool augmentHome) -: sword::SWMgr(!path.isEmpty() ? (const char*)path.local8Bit() : 0, false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ), false, augmentHome) // don't allow module renaming, because we load from a path -{ - qDebug("CSwordBackend::CSwordBackend for %s, using %s", path.latin1(), configPath); - m_displays.entry = 0; - m_displays.chapter = 0; - m_displays.book = 0; - - m_filters.gbf = 0; - m_filters.thml = 0; - m_filters.osis = 0; - m_filters.plain = 0; - - filterInit(); -} - -CSwordBackend::~CSwordBackend() { - shutdownModules(); - - delete m_filters.gbf; - delete m_filters.plain; - delete m_filters.thml; - delete m_filters.osis; - - delete m_displays.book; - delete m_displays.chapter; - delete m_displays.entry; -} - -/** Initializes the Sword modules. */ -const CSwordBackend::LoadError CSwordBackend::initModules() { - // qWarning("globalSwordConfigPath is %s", globalConfPath); - LoadError ret = NoError; - - shutdownModules(); //remove previous modules - m_moduleList.clear(); - - sword::ModMap::iterator end = Modules.end(); - ret = LoadError( Load() ); - - for (sword::ModMap::iterator it = Modules.begin(); it != end; it++) { - sword::SWModule* const curMod = (*it).second; - CSwordModuleInfo* newModule = 0; - - if (!strcmp(curMod->Type(), "Biblical Texts")) { - newModule = new CSwordBibleModuleInfo(curMod, this); - newModule->module()->Disp( - m_displays.chapter - ? m_displays.chapter - : (m_displays.chapter = new CChapterDisplay) - ); - } - else if (!strcmp(curMod->Type(), "Commentaries")) { - newModule = new CSwordCommentaryModuleInfo(curMod, this); - newModule->module()->Disp( - m_displays.entry - ? m_displays.entry - : (m_displays.entry = new CEntryDisplay) - ); - } - else if (!strcmp(curMod->Type(), "Lexicons / Dictionaries")) { - newModule = new CSwordLexiconModuleInfo(curMod, this); - newModule->module()->Disp( - m_displays.entry - ? m_displays.entry - : (m_displays.entry = new CEntryDisplay) - ); - } - else if (!strcmp(curMod->Type(), "Generic Books")) { - newModule = new CSwordBookModuleInfo(curMod, this); - newModule->module()->Disp( - m_displays.book - ? m_displays.book - : (m_displays.book = new CBookDisplay) - ); - } - - if (newModule) { - //append the new modules to our list, but only if it's supported - //the constructor of CSwordModuleInfo prints a waring on stdout - if (!newModule->hasVersion() || (newModule->minimumSwordVersion() <= sword::SWVersion::currentVersion)) { - m_moduleList.append( newModule ); - } - } - } - - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin() ; it != end_it; ++it) { - // for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) { - m_moduleDescriptionMap.insert( (*it)->config(CSwordModuleInfo::Description), (*it)->name() ); - } - - //unlock modules if keys are present - // ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin() ; it != end_it; ++it) { - // for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) { - - if ( (*it)->isEncrypted() ) { - const QString unlockKey = CBTConfig::getModuleEncryptionKey( (*it)->name() ).latin1(); - - if (!unlockKey.isNull()) { - setCipherKey( (*it)->name().latin1(), unlockKey.latin1() ); - } - } - } - - return ret; -} - -void CSwordBackend::AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap §ion) { - sword::SWBuf moduleDriver; - sword::SWBuf sourceformat; - sword::ConfigEntMap::iterator entry; - bool noDriver = true; - - sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (sword::SWBuf) ""; - moduleDriver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (sword::SWBuf) ""; - - if (sourceformat == "GBF") { - if (!m_filters.gbf) { - m_filters.gbf = new BT_GBFHTML(); - } - module->AddRenderFilter(m_filters.gbf); - noDriver = false; - } - else if (sourceformat == "PLAIN") { - if (!m_filters.plain) { - m_filters.plain = new BT_PLAINHTML(); - } - module->AddRenderFilter(m_filters.plain); - noDriver = false; - } - else if (sourceformat == "ThML") { - if (!m_filters.thml) { - m_filters.thml = new BT_ThMLHTML(); - } - module->AddRenderFilter(m_filters.thml); - noDriver = false; - } - else if (sourceformat == "OSIS") { - if (!m_filters.osis) { - m_filters.osis = new BT_OSISHTML(); - } - - module->AddRenderFilter(m_filters.osis); - noDriver = false; - } - - if (noDriver) { //no driver found - if ( (moduleDriver == "RawCom") || (moduleDriver == "RawLD") ) { - if (!m_filters.plain) { - m_filters.plain = new BT_PLAINHTML(); - } - module->AddRenderFilter(m_filters.plain); - noDriver = false; - } - } -} - -/** This function deinitializes the modules and deletes them. */ -const bool CSwordBackend::shutdownModules() { - ListCSwordModuleInfo::iterator it = m_moduleList.begin(); - ListCSwordModuleInfo::iterator end = m_moduleList.end(); - - while (it != end) { - CSwordModuleInfo* current = (*it); - it = m_moduleList.remove(it); - - delete current; - } - - Q_ASSERT(m_moduleList.count() == 0); - - //BT mods are deleted now, delete Sword mods, too. - DeleteMods(); - - return true; -} - -/** Returns true if the given option is enabled. */ -const bool CSwordBackend::isOptionEnabled( const CSwordModuleInfo::FilterTypes type) { - return (getGlobalOption( optionName(type).latin1() ) == "On"); -} - -/** Sets the given options enabled or disabled depending on the second parameter. */ -void CSwordBackend::setOption( const CSwordModuleInfo::FilterTypes type, const int state ) { - sword::SWBuf value; - - switch (type) { - - case CSwordModuleInfo::textualVariants: - - if (state == 0) { - value = "Primary Reading"; - } - else if (state == 1) { - value = "Secondary Reading"; - } - else { - value = "All Readings"; - } - - break; - - default: - value = state ? "On": "Off"; - break; - }; - - if (value.length()) - setGlobalOption(optionName(type).latin1(), value.c_str()); -} - -void CSwordBackend::setFilterOptions( const CSwordBackend::FilterOptions options) { - setOption( CSwordModuleInfo::footnotes, options.footnotes ); - setOption( CSwordModuleInfo::strongNumbers, options.strongNumbers ); - setOption( CSwordModuleInfo::headings, options.headings ); - setOption( CSwordModuleInfo::morphTags, options.morphTags ); - setOption( CSwordModuleInfo::lemmas, options.lemmas ); - setOption( CSwordModuleInfo::hebrewPoints, options.hebrewPoints ); - setOption( CSwordModuleInfo::hebrewCantillation, options.hebrewCantillation ); - setOption( CSwordModuleInfo::greekAccents, options.greekAccents ); - setOption( CSwordModuleInfo::redLetterWords, options.redLetterWords ); - setOption( CSwordModuleInfo::textualVariants, options.textualVariants ); - setOption( CSwordModuleInfo::morphSegmentation, options.morphSegmentation ); - // setOption( CSwordModuleInfo::transliteration, options.transliteration ); - setOption( CSwordModuleInfo::scriptureReferences, options.scriptureReferences); -} - -void CSwordBackend::setDisplayOptions( const CSwordBackend::DisplayOptions ) { - /* if (m_displays.entry) { - m_displays.entry->setDisplayOptions(options); - } - if (m_displays.chapter) { - m_displays.chapter->setDisplayOptions(options); - } - if (m_displays.book) { - m_displays.book->setDisplayOptions(options); - } - */ -} - -/** This function searches for a module with the specified description */ -CSwordModuleInfo* const CSwordBackend::findModuleByDescription(const QString& description) { - CSwordModuleInfo* ret = 0; - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin() ; it != end_it; ++it) { - if ( (*it)->config(CSwordModuleInfo::Description) == description ) { - ret = *it; - break; - } - } - - return ret; -} - -/** This function searches for a module with the specified description */ -const QString CSwordBackend::findModuleNameByDescription(const QString& description) { - if (m_moduleDescriptionMap.contains(description)) { - return m_moduleDescriptionMap[description]; - } - - return QString::null; -} - -/** This function searches for a module with the specified name */ -CSwordModuleInfo* const CSwordBackend::findModuleByName(const QString& name) { - CSwordModuleInfo* ret = 0; - - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin() ; it != end_it; ++it) { - if ( (*it)->name() == name ) { - ret = *it; - break; - } - } - - return ret; -} - -CSwordModuleInfo* const CSwordBackend::findSwordModuleByPointer(const sword::SWModule* const swmodule) { - CSwordModuleInfo* ret = 0; - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin() ; it != end_it; ++it) { - if ( (*it)->module() == swmodule ) { - ret = *it; - break; - } - } - - return ret; -} - -CSwordModuleInfo* const CSwordBackend::findModuleByPointer(const CSwordModuleInfo* const module) { - CSwordModuleInfo* ret = 0; - - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin() ; it != end_it; ++it) { - if ( (*it) == module ) { - ret = *it; - break; - } - } - - return ret; -} - -/** Returns our local config object to store the cipher keys etc. locally for each user. The values of the config are merged with the global config. */ -const bool CSwordBackend::moduleConfig(const QString& module, sword::SWConfig& moduleConfig) { - sword::SectionMap::iterator section; - DIR *dir = opendir(configPath); - - struct dirent *ent; - - bool foundConfig = false; - QString modFile; - - if (dir) { // find and update .conf file - rewinddir(dir); - - while ((ent = readdir(dir)) && !foundConfig) { - if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { - modFile.setLatin1(configPath); - modFile.append("/"); - modFile.append( QString::fromLocal8Bit(ent->d_name) ); - - moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() ); - section = moduleConfig.Sections.find( (const char*)module.local8Bit() ); - foundConfig = ( section != moduleConfig.Sections.end() ); - } - } - - closedir(dir); - } - else { //try to read mods.conf - moduleConfig = sword::SWConfig("");//global config - section = config->Sections.find( (const char*)module.local8Bit() ); - foundConfig = ( section != config->Sections.end() ); - - sword::ConfigEntMap::iterator entry; - - if (foundConfig) { //copy module section - - for (entry = (*section).second.begin(); entry != (*section).second.end(); entry++) { - moduleConfig.Sections[(*section).first].insert(sword::ConfigEntMap::value_type((*entry).first, (*entry).second)); - } - } - } - - if (!foundConfig && configType != 2) { //search in $HOME/.sword/ - QString myPath(getenv("HOME")); - myPath.append("/.sword/mods.d"); - dir = opendir(myPath.latin1()); - - if (dir) { - rewinddir(dir); - - while ((ent = readdir(dir)) && !foundConfig) { - if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { - modFile = myPath; - modFile.append('/'); - modFile.append(ent->d_name); - moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() ); - section = moduleConfig.Sections.find( (const char*)module.local8Bit() ); - foundConfig = ( section != moduleConfig.Sections.end() ); - } - } - - closedir(dir); - } - } - - return foundConfig; -} - -/** Returns the text used for the option given as parameter. */ -const QString CSwordBackend::optionName( const CSwordModuleInfo::FilterTypes option ) { - switch (option) { - - case CSwordModuleInfo::footnotes: - return QString("Footnotes"); - - case CSwordModuleInfo::strongNumbers: - return QString("Strong's Numbers"); - - case CSwordModuleInfo::headings: - return QString("Headings"); - - case CSwordModuleInfo::morphTags: - return QString("Morphological Tags"); - - case CSwordModuleInfo::lemmas: - return QString("Lemmas"); - - case CSwordModuleInfo::hebrewPoints: - return QString("Hebrew Vowel Points"); - - case CSwordModuleInfo::hebrewCantillation: - return QString("Hebrew Cantillation"); - - case CSwordModuleInfo::greekAccents: - return QString("Greek Accents"); - - case CSwordModuleInfo::redLetterWords: - return QString("Words of Christ in Red"); - - case CSwordModuleInfo::textualVariants: - return QString("Textual Variants"); - - case CSwordModuleInfo::scriptureReferences: - return QString("Cross-references"); - - case CSwordModuleInfo::morphSegmentation: - return QString("Morph Segmentation"); - // case CSwordModuleInfo::transliteration: - // return QString("Transliteration"); - } - - return QString::null; -} - -/** Returns the translated name of the option given as parameter. */ -const QString CSwordBackend::translatedOptionName(const CSwordModuleInfo::FilterTypes option) { - switch (option) { - - case CSwordModuleInfo::footnotes: - return i18n("Footnotes"); - - case CSwordModuleInfo::strongNumbers: - return i18n("Strong's numbers"); - - case CSwordModuleInfo::headings: - return i18n("Headings"); - - case CSwordModuleInfo::morphTags: - return i18n("Morphological tags"); - - case CSwordModuleInfo::lemmas: - return i18n("Lemmas"); - - case CSwordModuleInfo::hebrewPoints: - return i18n("Hebrew vowel points"); - - case CSwordModuleInfo::hebrewCantillation: - return i18n("Hebrew cantillation marks"); - - case CSwordModuleInfo::greekAccents: - return i18n("Greek accents"); - - case CSwordModuleInfo::redLetterWords: - return i18n("Red letter words"); - - case CSwordModuleInfo::textualVariants: - return i18n("Textual variants"); - - case CSwordModuleInfo::scriptureReferences: - return i18n("Scripture cross-references"); - - case CSwordModuleInfo::morphSegmentation: - return i18n("Morph segmentation"); - // case CSwordModuleInfo::transliteration: - // return i18n("Transliteration between scripts"); - } - - return QString::null; -} - - -const QString CSwordBackend::configOptionName( const CSwordModuleInfo::FilterTypes option ) { - switch (option) { - - case CSwordModuleInfo::footnotes: - return QString("Footnotes"); - - case CSwordModuleInfo::strongNumbers: - return QString("Strongs"); - - case CSwordModuleInfo::headings: - return QString("Headings"); - - case CSwordModuleInfo::morphTags: - return QString("Morph"); - - case CSwordModuleInfo::lemmas: - return QString("Lemma"); - - case CSwordModuleInfo::hebrewPoints: - return QString("HebrewPoints"); - - case CSwordModuleInfo::hebrewCantillation: - return QString("Cantillation"); - - case CSwordModuleInfo::greekAccents: - return QString("GreekAccents"); - - case CSwordModuleInfo::redLetterWords: - return QString("RedLetterWords"); - - case CSwordModuleInfo::textualVariants: - return QString("Variants"); - - case CSwordModuleInfo::scriptureReferences: - return QString("Scripref"); - - case CSwordModuleInfo::morphSegmentation: - return QString("MorphSegmentation"); - - default: - return QString::null; - } - - return QString::null; -} - -const QString CSwordBackend::booknameLanguage( const QString& language ) { - if (!language.isEmpty()) { - sword::LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName( language.latin1() ); - - //refresh the locale of all Bible and commentary modules! - const ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - - //use what sword returns, language may be different - QString newLocaleName( sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName() ); - - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin(); it != end_it; ++it) { - if ( ((*it)->type() == CSwordModuleInfo::Bible) || ((*it)->type() == CSwordModuleInfo::Commentary) ) { - //Create a new key, it will get the default bookname language - ((sword::VerseKey*)((*it)->module()->getKey()))->setLocale( newLocaleName.latin1() ); - } - } - - } - - return QString( sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName() ); -} - - -/** Reload all Sword modules. */ -void CSwordBackend::reloadModules() { - shutdownModules(); - - //delete Sword's config to make Sword reload it! - - if (myconfig) { // force reload on config object because we may have changed the paths - delete myconfig; - config = myconfig = 0; - loadConfigDir(configPath); - } - else if (config) { - config->Load(); - } - - initModules(); -} - -const QStringList CSwordBackend::swordDirList() { - QStringList ret; - const QString home = QString(getenv("HOME")); - - //return a list of used Sword dirs. Useful for the installer - QString configPath = QString("%1/.sword/sword.conf").arg(home); - - if (!QFile(configPath).exists()) { - configPath = globalConfPath; //e.g. /etc/sword.conf, /usr/local/etc/sword.conf - - - } - - - QStringList configs = QStringList::split(":", configPath); - - /*ToDo: Use the const iterator as soon as we switch to Qt > 3.1 - for (QStringList::const_iterator it = configs.constBegin(); it != configs.constEnd(); ++it) {*/ - - for (QStringList::const_iterator it = configs.begin(); it != configs.end(); ++it) { - if (!QFileInfo(*it).exists()) { - continue; - } - - //get all DataPath and AugmentPath entries from the config file and add them to the list - sword::SWConfig conf( (*it).latin1() ); - - ret << conf["Install"]["DataPath"].c_str(); - - sword::ConfigEntMap group = conf["Install"]; - - sword::ConfigEntMap::iterator start = group.equal_range("AugmentPath").first; - - sword::ConfigEntMap::iterator end = group.equal_range("AugmentPath").second; - - for (sword::ConfigEntMap::const_iterator it = start; it != end; ++it) { - ret << it->second.c_str(); //added augment path - } - } - - if (!home.isEmpty()) { - ret << home + "/.sword/"; - } - - return ret; -} - -void CSwordBackend::filterInit() { - // qWarning("## INIT"); - - SWOptionFilter* tmpFilter = new OSISMorphSegmentation(); - optionFilters.insert(OptionFilterMap::value_type("OSISMorphSegmentation", tmpFilter)); - cleanupFilters.push_back(tmpFilter); - - //HACK: replace Sword's ThML strip filter with our own version - //remove this hack as soon as Sword is fixed - cleanupFilters.remove(thmlplain); - delete thmlplain; - thmlplain = new BT_ThMLPlain(); - cleanupFilters.push_back(thmlplain); -} diff --git a/bibletime/backend/cswordbackend.h b/bibletime/backend/cswordbackend.h deleted file mode 100644 index 90d7031..0000000 --- a/bibletime/backend/cswordbackend.h +++ /dev/null @@ -1,266 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDBACKEND_H -#define CSWORDBACKEND_H - -//BibleTime includes -#include "cswordmoduleinfo.h" -//#include "centrydisplay.h" - -//Qt includes -#include <qptrlist.h> -#include <qmap.h> -#include <qstring.h> -#include <qstringlist.h> - -//Sword includes -#include <swmgr.h> -#include <swbuf.h> -#include <swmodule.h> -#include <swversion.h> -#include <localemgr.h> -#include <utilstr.h> - -using namespace sword; - -namespace Rendering { - - class CEntryDisplay; - - class CChapterDisplay; - - class CBookDisplay; -} - -/** The backend layer main class. - * This is the implementation of CBackend for Sword. It's additionally derived from SWMgr - * to provide functions of Sword. - * - * @short The backend implementation of Sword - * @author The BibleTime team - * @version $Id: cswordbackend.h,v 1.58 2007/03/14 21:32:47 joachim Exp $ - */ - -class CSwordBackend : public sword::SWMgr { - -public: - /** Filter options. Filter options to - * control the text display of modules. Uses int and not bool because not all - * options have just two toggle values. - */ - - struct FilterOptions { - int footnotes; /**< 0 for disabled, 1 for enabled */ - int strongNumbers; /**< 0 for disabled, 1 for enabled */ - int headings; /**< 0 for disabled, 1 for enabled */ - int morphTags; /**< 0 for disabled, 1 for enabled */ - int lemmas; /**< 0 for disabled, 1 for enabled */ - int hebrewPoints; /**< 0 for disabled, 1 for enabled */ - int hebrewCantillation; /**< 0 for disabled, 1 for enabled */ - int greekAccents; /**< 0 for disabled, 1 for enabled */ - int textualVariants; /**< Number n to enabled the n-th variant */ - int redLetterWords; /**< 0 for disabled, 1 for enabled */ - int scriptureReferences; /**< 0 for disabled, 1 for enabled */ - int morphSegmentation; /**< 0 for disabled, 1 for enabled */ - }; - - /** Control the display of a text. - */ - - struct DisplayOptions { - int lineBreaks; - int verseNumbers; - }; - - /** The error codes which may be returned by the @ref Load() call. - */ - enum LoadError { // the values exist to cast from the char return of SWMgr::Load - NoSwordConfig = -1, - NoError = 0, - NoModules = 1 - }; - /** - * The constructor of the Sword backend. - * It creates the SWModule objects using SWMgr's methods, it adds the necessary - * filters for the module format. - */ - CSwordBackend(); - /** - * The constructor of the Sword backend. - * @param path The path which is used to load modules - * @param augmentHome True if the $HOME/.sword/ modules should be augmented with the other modules - */ - CSwordBackend( const QString& path, const bool augmentHome = true ); - - /** - * The destrctor of this backend. This function shuts the modules down using @ref shutdownModules. - */ - virtual ~CSwordBackend(); - - /** - * This function returns the list of available modules managed by this backend. - * You have to call initModules() first; - * - * @return The list of modules managed by this backend - */ - inline virtual ListCSwordModuleInfo& moduleList(); - /** - * Initializes the Sword modules. - * - * @return True if the initializiation was succesful, otherwise return false. - */ - virtual const CSwordBackend::LoadError initModules(); - /** - * This function deinitializes the modules and deletes them. - * - * @return True if it was succesful, otherwise return false - */ - virtual const bool shutdownModules(); - /** - * Sets the given options enabled or disabled depending on the second parameter. - * - * @param type This is the type this function should set enabled or disabled - * @param enable If this is true the option will be enabled, otherwise it will be disabled. - */ - void setOption( const CSwordModuleInfo::FilterTypes type, const int state ); - void setFilterOptions( const CSwordBackend::FilterOptions options ); - void setDisplayOptions( const CSwordBackend::DisplayOptions options ); - /** - * Returns true if the given option is enabled. - * - * @return Returns true if the options given as aparameter is switched on at this time, otherwise return false. - */ - virtual const bool isOptionEnabled( const CSwordModuleInfo::FilterTypes type); - /** - * Sets the language for the international booknames of Sword. - * @param langName The abbreviation string which should be used for the Sword backend - */ - const QString booknameLanguage( const QString& langName = QString::null ); - /** - * This function searches for a module with the specified description - * @param description The description of the desired module - * @return pointer to the desired module; null if no module has the specified description - */ - virtual CSwordModuleInfo* const findModuleByDescription(const QString& description); - /** - * This function searches for a module with the specified description - * @param description The description of the desired module - * @return pointer to the desired module; null if no module has the specified description - */ - const QString findModuleNameByDescription(const QString& description); - /** - * This function searches for a module with the specified name - * @param name The name of the desired module - * @return Pointer to the desired module; null if no module has the specified name - */ - CSwordModuleInfo* const findModuleByName(const QString& name); - /** - * This function searches for a module with the specified sword module as module() object! - * @param swmodule to a Sword module - * @return pointer to the desired module; null if no module has the specified name - */ - CSwordModuleInfo* const findSwordModuleByPointer(const sword::SWModule* const swmodule); - /** - * This function searches for a module which is the same as the passed module. - * @param module The module which should be used for searching the new one. May be child of a different backend. - * @return Pointer to the desired module; null if no module has the specified name - */ - CSwordModuleInfo* const findModuleByPointer(const CSwordModuleInfo* const module); - /** - * @return Our global config object which contains the configs of all modules merged together. - */ - inline sword::SWConfig* const getConfig() const; - /** - * Tries to find the config object for the module. The second paramter will be the found config. - * @return True if the config was found, false if not. If false is returned the moduleConfig object is in undefined/unknwon state. - */ - const bool moduleConfig(const QString& module, sword::SWConfig& moduleConfig ); - /** - * Returns the text used for the option given as parameter. - * @param The paramter enum - * @return The name of the option given by the parameter - */ - static const QString optionName( const CSwordModuleInfo::FilterTypes option ); - /** - * Returns the text used for the option given as parameter. - */ - static const QString configOptionName( const CSwordModuleInfo::FilterTypes option ); - /** - * Returns the translated name of the option given as parameter. - * @param The translated option name - */ - static const QString translatedOptionName(const CSwordModuleInfo::FilterTypes option ); - /** - * Returns the version of the Sword library. - * @return The version used by this backend - */ - inline virtual const sword::SWVersion Version(); - /** - * Reload all Sword modules. - */ - void reloadModules(); - /** Sword prefix list. - * @return A list of all known Sword prefix dirs - */ - const QStringList swordDirList(); - -protected: - /** - * Adds a render filter to the module. - * @param module Add a render filter to this module! - */ - virtual void AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap §ion); - /** - * Initializes the filters provided by BibleTime. - */ - virtual void filterInit(); - -private: - // Filters - - struct Filters { - sword::SWFilter *gbf; - sword::SWFilter *plain; - sword::SWFilter *thml; - sword::SWFilter *osis; - } - - m_filters; - - struct Displays { - Rendering::CChapterDisplay* chapter; - Rendering::CEntryDisplay* entry; - Rendering::CBookDisplay* book; - } - - m_displays; - - ListCSwordModuleInfo m_moduleList; - QMap<QString, QString> m_moduleDescriptionMap; -}; - -/**Returns The list of modules managed by this backend*/ -inline ListCSwordModuleInfo& CSwordBackend::moduleList() { - return m_moduleList; -} - -/** Returns our local config object to store the cipher keys etc. locally for each user. The values of the config are merged with the global config. */ -inline sword::SWConfig* const CSwordBackend::getConfig() const { - return config; -} - -/** Returns the version of the Sword library. */ -inline const sword::SWVersion CSwordBackend::Version() { - return sword::SWVersion::currentVersion; -} - -#endif diff --git a/bibletime/backend/cswordbiblemoduleinfo.cpp b/bibletime/backend/cswordbiblemoduleinfo.cpp deleted file mode 100644 index d4a35e8..0000000 --- a/bibletime/backend/cswordbiblemoduleinfo.cpp +++ /dev/null @@ -1,262 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordbiblemoduleinfo.h" -#include "cswordbackend.h" -#include "cswordversekey.h" - -// #include "util/cpointers.h" - -//Qt includes -#include <qfile.h> - -//Sword includes -#include <versekey.h> - -static sword::VerseKey staticKey; - -CSwordBibleModuleInfo::CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend ) -: CSwordModuleInfo(module, usedBackend), -m_lowerBound(0), -m_upperBound(0), -m_bookList(0), -m_cachedLocale("unknown"), -m_hasOT(-1), -m_hasNT(-1) {} - -CSwordBibleModuleInfo::CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m ) : -CSwordModuleInfo(m), -m_lowerBound(0), -m_upperBound(0), -m_bookList(0) { - if (m.m_bookList) { - m_bookList = new QStringList(); - *m_bookList = *m.m_bookList; - } - - m_hasOT = m.m_hasOT; - m_hasNT = m.m_hasNT; - m_cachedLocale = m.m_cachedLocale; -} - -CSwordModuleInfo* CSwordBibleModuleInfo::clone() { - return new CSwordBibleModuleInfo(*this); -} - -CSwordBibleModuleInfo::~CSwordBibleModuleInfo() { - delete m_bookList; -} - -void CSwordBibleModuleInfo::initBounds() { - if (m_hasOT == -1) { - m_hasOT = hasTestament(OldTestament); - } - - if (m_hasNT == -1) { - m_hasNT = hasTestament(NewTestament); - } - - if (m_hasOT) { - m_lowerBound.key("Genesis 1:1"); - } - else { - m_lowerBound.key("Matthew 1:1"); - } - - if (!m_hasNT) { - m_upperBound.key("Malachi 4:6"); - } - else { - m_upperBound.key("Revelation of John 22:21"); - } -} - - -/** Returns the books available in this module */ -QStringList* const CSwordBibleModuleInfo::books() { - if (m_cachedLocale != backend()->booknameLanguage()) { //if the locale has changed - delete m_bookList; - m_bookList = 0; - } - - if (!m_bookList) { - m_bookList = new QStringList(); - - initBounds(); - int min = 0; - int max = 1; - - //find out if we have ot and nt, only ot or only nt - - if (m_hasOT>0 && m_hasNT>0) { //both - min = 0; - max = 1; - } - else if (m_hasOT>0 && !m_hasNT) { //only OT - min = 0; - max = 0; - } - else if (!m_hasOT && m_hasNT>0) { //only NT - min = 1; - max = 1; - } - else if (!m_hasOT && !m_hasNT) { //somethings wrong here! - no OT and no NT - qWarning("CSwordBibleModuleInfo (%s) no OT and not NT! Check your config!", module()->Name()); - min = 0; - max = -1; - } - - staticKey.setLocale(sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()); - - for (int i = min; i <= max; ++i) { - for ( int j = 0; j < staticKey.BMAX[i]; ++j) { - // if (backend()->useICU()) - // m_bookList->append( QString::fromUtf8(staticKey.books[i][j].name) ); - // else - // m_bookList->append( QString::fromLocal8Bit(staticKey.books[i][j].name) ); - m_bookList->append( QString::fromUtf8(staticKey.books[i][j].name) ); - } - } - - m_cachedLocale = backend()->booknameLanguage(); - } - - return m_bookList; -} - -/** Returns the number of chapters for the given book. */ -const unsigned int CSwordBibleModuleInfo::chapterCount(const unsigned int book) { - int result = 0; - - if ( (book >= 1) && book <= (unsigned int)staticKey.BMAX[0] && hasTestament(OldTestament)) { //Is the book in the old testament? - result = (staticKey.books[0][book-1].chapmax); - } - else if ((book >= 1) && (book - staticKey.BMAX[0]) <= (unsigned int)staticKey.BMAX[1] && hasTestament(NewTestament) ) { //is the book in the new testament? - result = (staticKey.books[1][book-1-staticKey.BMAX[0]].chapmax); - } - - return result; -} - -const unsigned int CSwordBibleModuleInfo::chapterCount(const QString& book) { - return chapterCount( bookNumber(book) ); -} - -/** Returns the number of verses for the given chapter. */ - -const unsigned int CSwordBibleModuleInfo::verseCount( const unsigned int book, const unsigned int chapter ) { - unsigned int result = 0; - - if (book>=1 && (book <= (unsigned int)staticKey.BMAX[0]) && hasTestament(OldTestament) ) { //Is the book in the old testament? - - if (chapter <= chapterCount(book) ) //does the chapter exist? - result = (staticKey.books[0][book-1].versemax[chapter-1]); - } - else if (book>=1 && (book - staticKey.BMAX[0]) <= (unsigned int)staticKey.BMAX[1] && hasTestament(NewTestament)) { //is the book in the new testament? - - if (chapter <= chapterCount(book) ) //does the chapter exist? - result = staticKey.books[1][book-1-staticKey.BMAX[0]].versemax[chapter-1]; - } - - return result; -} - -const unsigned int CSwordBibleModuleInfo::verseCount( const QString& book, const unsigned int chapter ) { - return verseCount( bookNumber(book), chapter ); -} - -const unsigned int CSwordBibleModuleInfo::bookNumber(const QString &book) { - unsigned int bookNumber = 0; - bool found = false; - staticKey.setLocale(sword::LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()); - int min = 0; - int max = 1; - - //find out if we have ot and nt, only ot or only nt - initBounds(); - - if ((m_hasOT>0 && m_hasNT>0) || (m_hasOT == m_hasNT == -1)) { - min = 0; - max = 1; - bookNumber = 0; - } - else if (m_hasOT>0 && !m_hasNT) { - min = 0; - max = 0; - bookNumber = 0; - } - else if (!m_hasOT && m_hasNT>0) { - min = 1; - max = 1; - bookNumber = staticKey.BMAX[0]; - } - else if (!m_hasOT && !m_hasNT) { - min = 0; - max = -1; //no loop - bookNumber = 0; - } - - for (int i = min; i <= max && !found; ++i) { - for ( int j = 0; j < staticKey.BMAX[i] && !found; ++j) { - ++bookNumber; - // if (book == QString::fromLocal8Bit( staticKey.books[i][j].name) ) - - if (book == QString::fromUtf8( staticKey.books[i][j].name) ) - found = true; - } - } - - return bookNumber; -} - -/** Returns true if his module has the text of desired type of testament */ -const bool CSwordBibleModuleInfo::hasTestament( CSwordBibleModuleInfo::Testament type ) { - if (m_hasOT == -1 || m_hasNT == -1) { - const bool oldStatus = module()->getSkipConsecutiveLinks(); - module()->setSkipConsecutiveLinks(true); - - *module() = sword::TOP; //position to first entry - sword::VerseKey key( module()->KeyText() ); - - if (key.Testament() == 1) { // OT && NT - m_hasOT = 1; - } - else if (key.Testament() == 2) { //no OT - m_hasOT = 0; - } - - *module() = sword::BOTTOM; - key = module()->KeyText(); - - if (key.Testament() == 1) { // only OT, no NT - m_hasNT = 0; - } - else if (key.Testament() == 2) { //has NT - m_hasNT = 1; - } - - module()->setSkipConsecutiveLinks(oldStatus); - } - - switch (type) { - - case OldTestament: - return m_hasOT>0; - - case NewTestament: - return m_hasNT>0; - - default: - return false; - } -} - diff --git a/bibletime/backend/cswordbiblemoduleinfo.h b/bibletime/backend/cswordbiblemoduleinfo.h deleted file mode 100644 index 1cd3784..0000000 --- a/bibletime/backend/cswordbiblemoduleinfo.h +++ /dev/null @@ -1,132 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDBIBLEMODULEINFO_H -#define CSWORDBIBLEMODULEINFO_H - -//own includes -#include "cswordmoduleinfo.h" -#include "cswordversekey.h" - -//Qt includes -#include <qstringlist.h> - -//Sword includes - - -/** - * This is the CModuleInfo imlementation for Bible modules managed by Sword. - * - * @short Implementation for Sword Bibles - * @author The BibleTime team - * @version $Id: cswordbiblemoduleinfo.h,v 1.18 2006/02/25 11:38:15 joachim Exp $ - */ - -class CSwordBibleModuleInfo : public CSwordModuleInfo { - -public: - enum Testament { - OldTestament = 1, - NewTestament = 2 - }; - - /** - * The constructor of this class - */ - CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() ); - /** The copy constructor for this Bible module. - */ - CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m ); - /** - * The destructor of this class - */ - ~CSwordBibleModuleInfo(); - /** - * Returns the number of avalable verses for the given chapter and book. - * - * @param book The number book we should use - * @param chapter The chapter we should use - * @return The number of verses for the given book and chapter - */ - virtual const unsigned int verseCount( const unsigned int book, const unsigned int chapter ); - /** - * Returns the number of avalable verses for the given chapter and book. - * - * @param book The name of the book we use - * @param chapter The number of the chapter we use - * @return The number of verses for the given book and chapter - */ - virtual const unsigned int verseCount( const QString& book, const unsigned int chapter ); - /** Information about the chapters in a book. - * @return The number of available chapters of the given book. - * @return The number of chapters for the given book - */ - virtual const unsigned int chapterCount( const unsigned int book ); - /** Information about the chapters in a book. - * @return The number of available chapters of the given book. - */ - virtual const unsigned int chapterCount( const QString& book ); - /** Return all book of this module. - * @return A QStringList containing the books which are available in this module. - */ - virtual QStringList* const books(); - /** - * Reimplementation, Returns the type - */ - virtual const CSwordModuleInfo::ModuleType type() const; - /** - * @return the book number, values starting with 1; 0 if not found - */ - const unsigned int bookNumber(const QString &book); - /** - * Returns true if his module has the text of desired type of testament - */ - const bool hasTestament( CSwordBibleModuleInfo::Testament ); - /** Reimplementation to clone this object. */ - virtual CSwordModuleInfo* clone(); - /** - * Returns the key which represents the lower bound of this module. - */ - inline const CSwordVerseKey& lowerBound(); - /** - * Returns the key which represents the upper bound of this module. - */ - inline const CSwordVerseKey& upperBound(); - -private: - void initBounds(); - - CSwordVerseKey m_lowerBound; - CSwordVerseKey m_upperBound; - - QStringList* m_bookList; //This booklist is cached - QString m_cachedLocale; - short int m_hasOT; - short int m_hasNT; -}; - -inline const CSwordModuleInfo::ModuleType CSwordBibleModuleInfo::type() const { - return CSwordModuleInfo::Bible; -} - -/** Returns the key which represents the lower bound of this module. */ -inline const CSwordVerseKey& CSwordBibleModuleInfo::lowerBound() { - initBounds(); - return m_lowerBound; -} - -/** Returns the key which represents the lower bound of this module. */ -inline const CSwordVerseKey& CSwordBibleModuleInfo::upperBound() { - initBounds(); - return m_upperBound; -} - -#endif diff --git a/bibletime/backend/cswordbookmoduleinfo.cpp b/bibletime/backend/cswordbookmoduleinfo.cpp deleted file mode 100644 index 17cfb28..0000000 --- a/bibletime/backend/cswordbookmoduleinfo.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordbookmoduleinfo.h" -#include "cswordtreekey.h" - -//Sword includes -#include <treekeyidx.h> -#include <treekey.h> - -#include <iostream> -#include <string> -using std::cout; -using std::endl; - -CSwordBookModuleInfo::CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend ) -: CSwordModuleInfo(module, usedBackend), -m_depth(-1) {} - -CSwordBookModuleInfo::CSwordBookModuleInfo( const CSwordBookModuleInfo& module ) -: CSwordModuleInfo(module) { - m_depth = module.m_depth; -} - -CSwordBookModuleInfo::~CSwordBookModuleInfo() {} - -const int CSwordBookModuleInfo::depth() { - if (m_depth == -1) { - sword::TreeKeyIdx* key = tree(); - - if (key) { - key->root(); - computeDepth(key, 0); - } - } - - return m_depth; -} - -void CSwordBookModuleInfo::computeDepth(sword::TreeKeyIdx* key, int level ) { - std::string savedKey; - // savedKey = key->getFullName(); //sword 1.5.8 - savedKey = key->getText(); - - if (level > m_depth) { - m_depth = level; - } - - if (key->hasChildren()) { - key->firstChild(); - computeDepth(key, level+1); - - key->setText( savedKey.c_str() );//return to the initial value - } - - if (key->nextSibling()) { - computeDepth(key, level); - } -} - -/** Returns a treekey filled with the structure of this module */ -sword::TreeKeyIdx* const CSwordBookModuleInfo::tree() const { - sword::TreeKeyIdx* treeKey = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey*)*(module())); - Q_ASSERT(treeKey); - return treeKey; -} diff --git a/bibletime/backend/cswordbookmoduleinfo.h b/bibletime/backend/cswordbookmoduleinfo.h deleted file mode 100644 index 28e9d75..0000000 --- a/bibletime/backend/cswordbookmoduleinfo.h +++ /dev/null @@ -1,67 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDGENBOOKMODULEINFO_H -#define CSWORDGENBOOKMODULEINFO_H - -//BibleTime includes -#include "cswordmoduleinfo.h" - -//Sword includes -#include <treekeyidx.h> - -/** Class for generic book support - * @author The BibleTime team - */ - -class CSwordBookModuleInfo : public CSwordModuleInfo { - -public: - /** Constructor. - * @param module The module which belongs to this object - * @param backend The parent backend for this book module. - */ - CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const backend = CPointers::backend() ); - /** Copy constructor. - * Copy constructor to copy the passed parameter. - * @param module The module which should be copied. - */ - CSwordBookModuleInfo( const CSwordBookModuleInfo& module ); - /** Destructor. - */ - ~CSwordBookModuleInfo(); - /** - * Returns the type of the module. - */ - virtual const CSwordModuleInfo::ModuleType type() const; - /** - * Returns the maximal depth of sections and subsections. - */ - const int depth(); - /** - * @return A treekey filled with the structure of this module. Don't delete the returned key because it's casted from the module object. - */ - sword::TreeKeyIdx* const tree() const; - -private: - /** - * A recursive helper function to help computng the module depth! - */ - void computeDepth(sword::TreeKeyIdx* key, int level = 0 ); - int m_depth; -}; - -inline const CSwordBookModuleInfo::ModuleType CSwordBookModuleInfo::type() const { - return CSwordModuleInfo::GenericBook; -} - - -#endif diff --git a/bibletime/backend/cswordcommentarymoduleinfo.cpp b/bibletime/backend/cswordcommentarymoduleinfo.cpp deleted file mode 100644 index 187ac65..0000000 --- a/bibletime/backend/cswordcommentarymoduleinfo.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cswordcommentarymoduleinfo.h" - -#include <string> - -CSwordCommentaryModuleInfo::CSwordCommentaryModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend) -: CSwordBibleModuleInfo(module, usedBackend) {} - -CSwordCommentaryModuleInfo::~CSwordCommentaryModuleInfo() {} - -/** No descriptions */ -CSwordModuleInfo* CSwordCommentaryModuleInfo::clone() { - return new CSwordCommentaryModuleInfo(*this); -} - -/** Returns true if this module may be written by the write display windows. */ -const bool CSwordCommentaryModuleInfo::isWritable() const { - // qWarning(module()->getConfigEntry("ModDrv")); - //a module is only writable if it's a RawFiles module with writable returning true - - if ( (std::string(module()->getConfigEntry("ModDrv")) == std::string("RawFiles")) && module()->isWritable()) { - return true; - }; - - return false; -} diff --git a/bibletime/backend/cswordcommentarymoduleinfo.h b/bibletime/backend/cswordcommentarymoduleinfo.h deleted file mode 100644 index c387ede..0000000 --- a/bibletime/backend/cswordcommentarymoduleinfo.h +++ /dev/null @@ -1,45 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDCOMMENTARYMODULEINFO_H -#define CSWORDCOMMENTARYMODULEINFO_H - -//own includes -#include "cswordbiblemoduleinfo.h" - -/** Commentary module implementation. - * This CSwordModule implementation provides access to Sword's commentary modules. - * @author The BibleTime team - * @version $Id: cswordcommentarymoduleinfo.h,v 1.13 2006/02/25 11:38:15 joachim Exp $ - */ - -class CSwordCommentaryModuleInfo : public CSwordBibleModuleInfo { - -public: - CSwordCommentaryModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() ); - ~CSwordCommentaryModuleInfo(); - /** Reimplementation to return the commentary type. - */ - virtual const CSwordModuleInfo::ModuleType type() const; - /** Reimplementation to clone the current object. - */ - virtual CSwordModuleInfo* clone(); - /** - * Returns true if this module may be written by the write display windows. - */ - virtual const bool isWritable() const; -}; - -inline const CSwordModuleInfo::ModuleType CSwordCommentaryModuleInfo::type() const { - return CSwordModuleInfo::Commentary; -} - -#endif diff --git a/bibletime/backend/cswordkey.cpp b/bibletime/backend/cswordkey.cpp deleted file mode 100644 index a939162..0000000 --- a/bibletime/backend/cswordkey.cpp +++ /dev/null @@ -1,193 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - - -//own includes -#include "cswordkey.h" -#include "cswordmoduleinfo.h" - -#include "cswordversekey.h" -#include "cswordldkey.h" -#include "cswordtreekey.h" - -#include "util/ctoolclass.h" - -//Sword includes -#include <swmodule.h> -#include <swkey.h> -#include <versekey.h> -#include <treekey.h> -#include <treekeyidx.h> - -//Qt includes -#include <qregexp.h> -#include <qstring.h> -#include <qtextcodec.h> - -CSwordKey::CSwordKey(CSwordModuleInfo* const module) : m_module(module) {} - -CSwordKey::CSwordKey(const CSwordKey& k) { - m_module = k.m_module; -} - -const QString CSwordKey::rawText() { - if (!m_module) { - return QString::null; - } - - if (dynamic_cast<sword::SWKey*>(this)) { - char * buffer = new char[strlen(rawKey()) + 1]; - strcpy(buffer, rawKey()); - m_module->module()->getKey()->setText( buffer ); - delete buffer; - } - - if (key().isNull()) { - return QString::null; - } - -// qWarning("rawText: %s", m_module->module()->getRawEntry()); - return QString::fromUtf8( m_module->module()->getRawEntry() ); -} - -const QString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) { - Q_ASSERT(m_module); - if (!m_module) { - return QString::null; - } - - using namespace sword; - SWKey* const k = dynamic_cast<SWKey*>(this); - - if (k) { - char * buffer = new char[strlen(rawKey()) + 1]; - strcpy(buffer, rawKey()); - VerseKey* vk_mod = dynamic_cast<VerseKey*>(m_module->module()->getKey()); - - if (vk_mod) { - vk_mod->Headings(1); - } - - m_module->module()->getKey()->setText( buffer ); - - if (m_module->type() == CSwordModuleInfo::Lexicon) { - m_module->snap(); - /* In lexicons make sure that our key (e.g. 123) was successfully set to the module, - i.e. the module key contains this key (e.g. 0123 contains 123) */ - - if ( strcasecmp(m_module->module()->getKey()->getText(), buffer) - && !strstr(m_module->module()->getKey()->getText(), buffer) - ) { - qDebug("return an empty key for %s", m_module->module()->getKey()->getText()); - return QString::null; - } - } - delete buffer; - } - - Q_ASSERT(!key().isNull()); - if (!key().isNull()) { //we have valid text - QString text = QString::fromUtf8( m_module->module()->RenderText() ); - - // This is yucky, but if we want strong lexicon refs we have to do it here. - if (m_module->type() == CSwordModuleInfo::Lexicon) { - QString t(text); - QRegExp rx("(GREEK|HEBREW) for 0*([1-9]\\d*)"); // ignore 0's before number - int pos = 0; - while( (pos = rx.search(t, pos)) != -1 ) { - QString language = rx.cap(1); - QString langcode = QString(language.at(0)); // "G" or "H" - QString number = rx.cap(2); - QString paddednumber = number.rightJustify(5, '0'); // Form 00123 - - text.replace( - QRegExp( QString( - "(>[^<>]+)" // Avoid replacing inside tags - "\\b(0*%1)\\b").arg(number) ), // And span around 0's - QString("\\1<span lemma=\"%1%2\"><a href=\"strongs://%3/%4\">\\2</a></span>") - .arg(langcode, paddednumber, language, paddednumber) - ); - pos += rx.matchedLength(); - } - } - - if (mode == HTMLEscaped) { - //we have to encode all UTF-8 in HTML escapes - // go though every character and write down the escaped HTML unicode entity - // form is &#<decimal unicode value here>; - QString ret; - QChar c; - const unsigned int length = text.length(); - - for (unsigned int i = 0; i < length; ++i) { - c = text.at(i); - - if (c.latin1()) { //normal latin1 character - ret.append(c); - } - else {//unicode character, needs to be escaped - ret.append("&#") - .append(c.unicode()) - .append(";"); - } - } - - return ret; - } - else { - return text; - } - } - - return QString::null; -} - -const QString CSwordKey::strippedText() { - if (!m_module) { - return QString::null; - } - - if (/*sword::SWKey* k =*/ dynamic_cast<sword::SWKey*>(this)) { - // m_module->module()->SetKey(k); - //m_module->module()->getKey()->setText( (const char*)key().utf8() ); - char * buffer = new char[strlen(rawKey()) + 1]; - strcpy(buffer, rawKey()); - m_module->module()->getKey()->setText(buffer); - delete buffer; - } - - return QString::fromUtf8( m_module->module()->StripText() ); -} - - -/** This will create a proper key object from a given module */ -CSwordKey* CSwordKey::createInstance( CSwordModuleInfo* const module ) { - if (!module) { - return 0; - } - - switch( module->type() ) { - - case CSwordModuleInfo::Bible://fall through - - case CSwordModuleInfo::Commentary: - return new CSwordVerseKey( (sword::VerseKey *) ( (sword::SWKey *)(*module->module()) ), module ); - - case CSwordModuleInfo::Lexicon: - return new CSwordLDKey( (sword::SWKey *)(*module->module()), module); - - case CSwordModuleInfo::GenericBook: - return new CSwordTreeKey( (sword::TreeKeyIdx*)((sword::SWKey *)(*module->module())), module ); - - default: - return 0; - } -} diff --git a/bibletime/backend/cswordkey.h b/bibletime/backend/cswordkey.h deleted file mode 100644 index 2b549f8..0000000 --- a/bibletime/backend/cswordkey.h +++ /dev/null @@ -1,121 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDKEY_H -#define CSWORDKEY_H - -//Own includes - - -//Qt includes -#include <qstring.h> -//forward declarations - -class CSwordModuleInfo; - -/** Base class for all keys. - * The base class for all Sword based keys. - * @author The BibleTime team - * @version $Id: cswordkey.h,v 1.28 2007/10/26 18:26:23 jerickson314 Exp $ - */ - -class CSwordKey { - -protected: - /** Constructor. May not be called because this class contains pure virtual methods. - * @param module The module which belongs to this key, may be NULL - */ - CSwordKey(CSwordModuleInfo* const module = 0); //protected constructor, because CSwordKey shouldn't be used (it's an abstract base class). - /** Copy constructor. - */ - CSwordKey(const CSwordKey&); //copy constructor - -public: - enum TextRenderType { - Normal = 0, - HTMLEscaped - }; - /** Destructor. - * Public, not protected like the constructor, because CSwordKey pointers may be deleted by all others. - */ - virtual ~CSwordKey() {} - - ; - - //pure virtual functions - /** Returns the current key. - * @return The current key which belongs to the current object. - */ - virtual const QString key() const = 0; - /** Sets the current key. Sets the key using a utf8 enabled QString. - * @param key The key which should be used to set the current one - */ - virtual const bool key(const QString& key) = 0; - /** Set the key using a utf8-decoded c-string - * @param key The key which should be used to set the current one - */ - virtual const bool key(const char* key) = 0; - /** Clone this object. Clone this current object and return it. - * @return A clone of the current object. - */ - virtual CSwordKey* copy() const = 0; - - //implemented functions - /** Set/get the module. Set and get the module which belongs to this key. - * @return The module which belongs to this key. - */ - inline virtual CSwordModuleInfo* const module(CSwordModuleInfo* const newModule = 0); - /** Returns the raw, unchanged text. Returns the text without any filter modifications, - * just in the way it comes out of the module. - */ - virtual const QString rawText(); - /** Returns the rendered text. Returns the text of the current key after passign it through the - * modules filters. - */ - virtual const QString renderedText( const CSwordKey::TextRenderType mode = CSwordKey::Normal ); - /** Stripped down text. Returns the text after removing all markup tags from it. - */ - virtual const QString strippedText(); - /** - * This returns a new object of the right CSwordKey* implementation - * (e.g. CSwordVerseKey or CSwordLDKey) - * The type is determined by the type of the module. - * @see CSwordModuleInfo, CSwordBibleModuleInfo, CSwordCommentaryModuleInfo, CSwordLexiconModukleInfo - */ - static CSwordKey* createInstance(CSwordModuleInfo * const module); - /** - * The assignment operator for more easy use of the key classes. - */ - inline virtual CSwordKey& operator = ( const QString& ); - -protected: - /** Returns the current key in raw format, for Sword. - * @return The current key which belongs to the current object. - */ - virtual const char* rawKey() const = 0; - CSwordModuleInfo* m_module; //module pointer used by all keys -}; - - -/** The assignment operator for more easy use of the key classes. */ -inline CSwordKey& CSwordKey::operator = ( const QString& newKey ) { - key(newKey); - return *this; -} - -inline CSwordModuleInfo* const CSwordKey::module(CSwordModuleInfo* const newModule) { - if (newModule) { - m_module = newModule; - } - return m_module; -} - -#endif diff --git a/bibletime/backend/cswordldkey.cpp b/bibletime/backend/cswordldkey.cpp deleted file mode 100644 index 0f189e9..0000000 --- a/bibletime/backend/cswordldkey.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2007 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordldkey.h" -#include "cswordlexiconmoduleinfo.h" - -//Qt includes -#include <qtextcodec.h> - -//Sword includes -#include <swmodule.h> -#include <swld.h> -#include <utilstr.h> - - -CSwordLDKey::CSwordLDKey( CSwordModuleInfo* module ) { - if ((m_module = dynamic_cast<CSwordLexiconModuleInfo*>(module))) { - // *(m_module->module()) = TOP; - } - - SWKey::operator = (" "); -} - -/** No descriptions */ -CSwordLDKey::CSwordLDKey( const CSwordLDKey &k ) : CSwordKey(k), SWKey((const char*)k) {} - -/** No descriptions */ -CSwordLDKey::CSwordLDKey( const SWKey *k, CSwordModuleInfo* module) : CSwordKey(module), SWKey(*k) {} - -/** Clones this object by copying the members. */ -CSwordLDKey* CSwordLDKey::copy() const { - return new CSwordLDKey(*this); -} - -/** Sets the module of this key. */ -CSwordModuleInfo* const CSwordLDKey::module(CSwordModuleInfo* const newModule) { - if (newModule && newModule->type() == CSwordModuleInfo::Lexicon) { - const QString oldKey = key(); - m_module = newModule; - key(oldKey); - } - - return m_module; -} - -/** Sets the key of this instance */ -const QString CSwordLDKey::key() const { - - if (!m_module || m_module->isUnicode()) { - return QString::fromUtf8((const char*)*this); - } else { - QTextCodec *codec = QTextCodec::codecForName("CP1252"); - return codec->toUnicode((const char*)*this); - } -} - -const char * CSwordLDKey::rawKey() const { - return (const char*)*this; -} - -const bool CSwordLDKey::key( const QString& newKey ) { - - Q_ASSERT(m_module); - - if (!m_module || m_module->isUnicode()) { - return key((const char*)newKey.utf8()); - } else { - QTextCodec *codec = QTextCodec::codecForName("CP1252"); - return key((const char*)codec->fromUnicode(newKey)); - } -} - - -/** Sets the key of this instance */ -const bool CSwordLDKey::key( const char* newKey ) { - Q_ASSERT(newKey); - - if (newKey) { - SWKey::operator = (newKey); //set the key - - m_module->module()->SetKey(this); - // m_module->module()->getKey()->setText( (const char*)key().utf8() ); - m_module->snap(); - // SWKey::operator = (m_module->module()->KeyText()); - } - - return !Error(); -} - -/** Uses the parameter to returns the next entry afer this key. */ -CSwordLDKey* CSwordLDKey::NextEntry() { - m_module->module()->SetKey(this); //use this key as base for the next one! - - m_module->module()->setSkipConsecutiveLinks(true); - ( *( m_module->module() ) )++; - m_module->module()->setSkipConsecutiveLinks(false); - - key(m_module->module()->KeyText()); - SWKey::operator = (m_module->module()->KeyText()); - - return this; -} - -/** Uses the parameter to returns the next entry afer this key. */ -CSwordLDKey* CSwordLDKey::PreviousEntry() { - m_module->module()->SetKey(this); //use this key as base for the next one! - - m_module->module()->setSkipConsecutiveLinks(true); - ( *( m_module->module() ) )--; - m_module->module()->setSkipConsecutiveLinks(false); - - SWKey::operator = (m_module->module()->KeyText()); - - return this; -} - -/** Assignment operator for more ease of use of this class. */ -CSwordLDKey& CSwordLDKey::operator = (const QString& keyname ) { - key(keyname); - return *this; -} diff --git a/bibletime/backend/cswordldkey.h b/bibletime/backend/cswordldkey.h deleted file mode 100644 index bd6b6ce..0000000 --- a/bibletime/backend/cswordldkey.h +++ /dev/null @@ -1,110 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDLDKEY_H -#define CSWORDLDKEY_H - - -//own includes -#include "cswordkey.h" -#include "cswordmoduleinfo.h" - -//Qt includes -#include <qstring.h> - -//Sword includes -#include <swkey.h> - -/** - * This class is the implementation of CSwordKey used for dictionaries and lexicons. - * - * CSwordLDKey is the implementation of CKey for Lexicons and dictionaries. - * It provides a simple interface to set the current key, - * to get the text for the key and functions to get the next and previous items - * of the used module in comparision to the current key.<BR> - * Here's an example how to use this class:<BR> - * @code - * CSwordLexiconModuleInfo* m_module = backend()->findModuleByName("ISBE"); - * CSwordLDKey ldKey(m_module); - * ldKey.key("Adam"); - * ldKey.nextEntry(); - * qDebug( QString("The current key is: %1").arg(ldKey.key())); - * @endcode - * - * Please not, that the result will be invalid if use the operator const char* - * on the adress of the object, use something like this - * - * @code - * CSwordLDKey* key = new CSwordLDKey( lexicon_module ); - * const QString keyname = key->getKey(); - * @endcode - * - * @author The BibleTime team - * @version $Id: cswordldkey.h,v 1.25 2007/10/26 18:26:23 jerickson314 Exp $ - */ - -class CSwordLDKey : public CSwordKey, public sword::SWKey { - -public: - /** - * Constructor of CSwordLDKey - */ - CSwordLDKey( CSwordModuleInfo* module ); - /** - * Copy constructor for this key class. - */ - CSwordLDKey( const CSwordLDKey &k ); - /** - * Copy constructor for this key class. - */ - CSwordLDKey( const sword::SWKey *k, CSwordModuleInfo* module); - /** - * Clones this object by copying the members. - */ - virtual CSwordLDKey* copy() const; - /** - * Uses the parameter to returns the next entry afer this key. - */ - CSwordLDKey* NextEntry( void ); - /** - * Uses the parameter to returns the previous entry afer this key. - */ - CSwordLDKey* PreviousEntry( void ); - /** - * Sets the module of this key. - */ - virtual CSwordModuleInfo* const module( CSwordModuleInfo* const module = 0 ); - /** - * Returns the current key as a QString - */ - virtual const QString key() const; - /** - * Set the current key - */ - virtual const bool key( const QString& newKey ); - /** - * Returns the current key as a QString - */ - virtual const bool key( const char* ); - /** - * Assignment operator for more ease of use of this class. - */ - virtual CSwordLDKey& operator = (const QString& keyname ); -protected: - /** - * The raw key for direct use with Sword. - */ - virtual const char * rawKey() const; -}; - - -#endif - diff --git a/bibletime/backend/cswordlexiconmoduleinfo.cpp b/bibletime/backend/cswordlexiconmoduleinfo.cpp deleted file mode 100644 index 26da0e7..0000000 --- a/bibletime/backend/cswordlexiconmoduleinfo.cpp +++ /dev/null @@ -1,183 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordlexiconmoduleinfo.h" -//#include "frontend/cbtconfig.h" - -//Qt includes -#include <qfile.h> -#include <qdatastream.h> -#include <qtextcodec.h> - -//Sword includes -#include <swmodule.h> - -#include <kglobal.h> -#include <kstandarddirs.h> - -//STL includes -#include <algorithm> - -//Change it once the format changed to make all -//systems rebuild their caches -#define CACHE_FORMAT "2" - -CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const backend ) : CSwordModuleInfo(module, backend) { - m_entryList = 0; -} - -CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( const CSwordLexiconModuleInfo& m ) : CSwordModuleInfo(m) { - delete m_entryList; - m_entryList = 0; - - if (m.m_entryList) { - m_entryList = new QStringList(); - *m_entryList = *m.m_entryList;//copy list items - } -} - -CSwordLexiconModuleInfo::~CSwordLexiconModuleInfo() { - delete m_entryList; - m_entryList = 0; -} - -/** Returns the entries of the module. */ -QStringList* const CSwordLexiconModuleInfo::entries() { - if (!module()) { - return 0; - } - - sword::SWModule* my_module = module(); - bool is_unicode = isUnicode(); - - if (!m_entryList) { - m_entryList = new QStringList(); - bool read = false; - - //Check for buggy modules! They will not be loaded any more. - - if ( name() == QString("ZhEnglish")) { - qWarning("Module ZhEnglish is buggy and will not be loaded."); - return m_entryList; - } - - QString dir( KGlobal::dirs()->saveLocation("data", "bibletime/cache/") ); - QFile f1( - QString(dir) - .append("/") - .append(name()) - ); - - if ( f1.open( IO_ReadOnly ) ) { - QDataStream s( &f1 ); - QString mod_ver, prog_ver; - s >> mod_ver; - s >> prog_ver; - - if ((mod_ver == config(ModuleVersion)) && (prog_ver == CACHE_FORMAT)) { - s >> *m_entryList; - read = true; - } - - f1.close(); - // qWarning("read entries %d",m_entryList->count()); - } - - // Q_ASSERT(read); - // Q_ASSERT(m_entryList->count()); - if (!read || !m_entryList->count()) { - my_module->setSkipConsecutiveLinks(true); - (*my_module) = sword::TOP; - snap(); //snap to top entry - - // qWarning("Reading in module" ); - int i = 0; - - do { - if ( is_unicode ) { - m_entryList->append(QString::fromUtf8(my_module->KeyText())); - // qWarning("Entry: %s", my_module->KeyText() ); - } - else { //for latin1 modules use fromLatin1 because of speed - // m_entryList->append(QString::fromLatin1(my_module->KeyText())); - - QTextCodec *codec = QTextCodec::codecForName("CP1252"); - m_entryList->append(codec->toUnicode(my_module->KeyText())); - } - - (*my_module)++; - i++; - } - while ( !my_module->Error() ); - - // qWarning("Reading finished. Module has %d entries.", i ); - - (*my_module) = sword::TOP; //back to the first entry - - my_module->setSkipConsecutiveLinks(false); - - if (m_entryList->count()) { - m_entryList->first().simplifyWhiteSpace(); - - if (m_entryList->first().stripWhiteSpace().isEmpty()) { - - m_entryList->remove - ( m_entryList->begin() ); - } - - //now sort the list, this is necesssary because Sword doesn't do Unicode ordering - - // qWarning("sorting"); - // QStringList::iterator start(m_entryList->begin()); - // QStringList::iterator end(m_entryList->end()); - // std::sort( start, end, myLocaleAwareCompare() ); //stl sort - // m_entryList->sort(); //make sure the module is sorted by utf-8 - } - - qWarning("Writing cache file."); - - if (m_entryList->count()) { - //create cache - QString dir = KGlobal::dirs()->saveLocation("data", "bibletime/cache/"); - //QFile f2( QString::fromLatin1("%1/%2").arg(dir).arg( name() ) ); - QFile f2( QString(dir).append("/").append(name()) ); - - - if (f2.open( IO_WriteOnly )) { - QDataStream s( &f2 ); - s << config(CSwordModuleInfo::ModuleVersion); //store module version - s << QString(CACHE_FORMAT); //store BT version -- format may change - s << *m_entryList; - f2.close(); - } - } - - // // qWarning("Writing finished." ); - } - } - - return m_entryList; -} - -/** Jumps to the closest entry in the module. */ -const bool CSwordLexiconModuleInfo::snap() { - if(module()->getRawEntry()) { // Snap to the current entry - return true; - } - - return false; -} - -/** No descriptions */ -CSwordModuleInfo* CSwordLexiconModuleInfo::clone() { - return new CSwordLexiconModuleInfo(*this); -} diff --git a/bibletime/backend/cswordlexiconmoduleinfo.h b/bibletime/backend/cswordlexiconmoduleinfo.h deleted file mode 100644 index 8b8e8fe..0000000 --- a/bibletime/backend/cswordlexiconmoduleinfo.h +++ /dev/null @@ -1,73 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDLEXICONMODULEINFO_H -#define CSWORDLEXICONMODULEINFO_H - -//own includes -#include "cswordmoduleinfo.h" - -//Qt includes -#include <qstringlist.h> - -/** - * The implementation of CModuleInfo for the Sword lexiccons and citionaries. - * @author The BibleTime team - * @version $Id: cswordlexiconmoduleinfo.h,v 1.12 2006/02/25 11:38:15 joachim Exp $ - */ - -class CSwordLexiconModuleInfo : public CSwordModuleInfo { - -public: - /** - * The standard constructor fot this object. - * A default constructor doesn't exist. Use this one. - */ - CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() ); - /** - * The copy constructor - */ - CSwordLexiconModuleInfo( const CSwordLexiconModuleInfo& m ); - /** Reimplementation to return a valid clone. - */ - virtual CSwordModuleInfo* clone(); - /** Destructor. - */ - virtual ~CSwordLexiconModuleInfo(); - /** - * Returns the entries of the module. - * This function returns the entries of the modules represented by this object. - * If this function is called for the first time the list is load from disk and stored in a list which cahes it. - * If the function is called again, the cached list is returned so we have a major speed improvement. - * @return The list of lexicon entries - */ - QStringList* const entries(); - /** - * Reimplementation, to return the right type for this lexicon. - */ - virtual const CSwordModuleInfo::ModuleType type() const; - /** - * Jumps to the closest entry in the module. - */ - const bool snap(); - -private: - /** - * This is the list which caches the entres of the module. - */ - QStringList* m_entryList; -}; - -inline const CSwordModuleInfo::ModuleType CSwordLexiconModuleInfo::type() const { - return CSwordModuleInfo::Lexicon; -} - -#endif diff --git a/bibletime/backend/cswordmoduleinfo.cpp b/bibletime/backend/cswordmoduleinfo.cpp deleted file mode 100644 index cb37426..0000000 --- a/bibletime/backend/cswordmoduleinfo.cpp +++ /dev/null @@ -1,888 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - -//BibleTime includes -#include "cswordmoduleinfo.h" -#include "cswordbackend.h" -#include "cswordmodulesearch.h" -#include "cswordkey.h" -#include "centrydisplay.h" -#include "clanguagemgr.h" - -#include "util/scoped_resource.h" -#include "util/directoryutil.h" -#include "util/cpointers.h" -#include "frontend/cbtconfig.h" - -#include <sys/types.h> -#include <unistd.h> -#include <stddef.h> -#include <dirent.h> -#include <regex.h> - -//Qt includes -#include <qregexp.h> -#include <qdir.h> -#include <qvariant.h> -#include <qfileinfo.h> - -//KDE includes -#include <klocale.h> -#include <kglobal.h> -#include <kstandarddirs.h> -#include <kconfig.h> - -//Sword includes -#include <swbuf.h> -#include <swkey.h> -#include <listkey.h> -#include <versekey.h> -#include <swconfig.h> -#include <rtfhtml.h> - -//Lucence includes -#include <CLucene.h> -#include <CLucene/util/Reader.h> -#include <CLucene/util/Misc.h> -#include <CLucene/util/dirent.h> - -//Increment this, if the index format changes -//Then indices on the user's systems will be rebuilt -const unsigned int INDEX_VERSION = 6; - -//Maximum index entry size, 1MiB for now -//Lucene default is too small -const unsigned long BT_MAX_LUCENE_FIELD_LENGTH = 1024*1024; - -CSwordModuleInfo::CSwordModuleInfo(sword::SWModule * module, CSwordBackend * const usedBackend) { - m_module = module; - Q_ASSERT(module); - - m_searchResult.ClearList(); - m_backend = usedBackend ? usedBackend : CPointers::backend(); - m_dataCache.name = module ? QString(module->Name()) : QString::null; - m_dataCache.isUnicode = module ? module->isUnicode() : false; - m_dataCache.category = UnknownCategory; - m_dataCache.language = 0; - m_dataCache.hasVersion = !QString((*m_backend->getConfig())[module->Name()]["Version"]).isEmpty(); - - if (backend()) { - if (hasVersion() && (minimumSwordVersion() > sword::SWVersion::currentVersion)) { - qWarning("The module \"%s\" requires a newer Sword library. Please update to \"Sword %s\".", - name().latin1(), (const char *)minimumSwordVersion()); - } - } -} - -CSwordModuleInfo::CSwordModuleInfo(const CSwordModuleInfo & m) { - m_module = m.m_module; - m_backend = m.m_backend; - m_dataCache = m.m_dataCache; - m_searchResult = m.m_searchResult; -} - -/** No descriptions */ -CSwordModuleInfo *CSwordModuleInfo::clone() { - return new CSwordModuleInfo(*this); -} - -CSwordModuleInfo::~CSwordModuleInfo() { - m_searchResult.ClearList(); - m_module = 0; //the Sword module object is deleted by the backend -} - -/** Sets the unlock key of the modules and writes the key into the cofig file.*/ -const bool CSwordModuleInfo::unlock(const QString & unlockKey) { - if (!isEncrypted()) { - return false; - } - - CBTConfig::setModuleEncryptionKey(name(), unlockKey); - backend()->setCipherKey(m_module->Name(), unlockKey.latin1()); - //TODO: write to Sword config as well - - return true; -} - -/** This function returns true if this module is locked, otherwise return false. */ -const bool CSwordModuleInfo::isLocked() { - //still works, but the cipherkey is stored in CBTConfig. - //Works because it is set in sword on program startup. - - if (isEncrypted()) { - if (unlockKeyIsValid()) { - return false; - } - return true; - } - return false; -} - -/** This functions returns true if this module is encrypted (locked or unlocked). */ -const bool CSwordModuleInfo::isEncrypted() const { - /** - * If we have the CipherKey entry the module - * is encrypted but not necessarily locked - */ - - //This code is still right, though we do no longer write to the module config files any more - sword::ConfigEntMap config = backend()->getConfig()->Sections.find(name().latin1())->second; - sword::ConfigEntMap::iterator it = config.find("CipherKey"); - - if (it != config.end()) { - return true; - } - - return false; -} - -/** This function makes an estimate if a module was properly unlocked. - * It returns true if the first entry of the module (parsed as Latin1 - * byte sequence) is not empty and contains only printable characters. - * If that is the case, we can safely assume that a) the module was properly - * unlocked and b) no buffer overflows will occur, which can happen when - * Sword filters process garbage text which was not properly decrypted. -*/ -const bool CSwordModuleInfo::unlockKeyIsValid() { - - (*m_module) = sword::TOP; - - // This needs to use ::fromLatin1 because if the text is still locked, - // a lot of garbage will show up. It will also work with properly decrypted - // Unicode text, because all non-ASCII Unicode chars consist of bytes >127 - // and therefore contain no control (nonprintable) characters, which are all <127. - QString test = isUnicode() - ? QString::fromUtf8(m_module->getRawEntryBuf().c_str()) - : QString::fromLatin1( m_module->getRawEntryBuf().c_str() ); - - if (test.isEmpty()) { - qWarning("Unlock key of module %s is NOT valid", name().latin1()); - return false; - } - - for (unsigned int i = 0; i <= test.length(); i++) { - if ( !test[i].isPrint() && !test[i].isNull() ) { - qWarning("Unlock key of module %s is NOT valid", name().latin1()); - return false; - } - } - - qDebug("Unlock key of module %s is valid", name().latin1()); - return true; -} - -const QString CSwordModuleInfo::getGlobalBaseIndexLocation() { - return KGlobal::dirs()->saveLocation("data", "bibletime/indices"); -} - -const QString CSwordModuleInfo::getModuleBaseIndexLocation() const { - return getGlobalBaseIndexLocation() + QString("/") + name().ascii(); -} - -const QString CSwordModuleInfo::getModuleStandardIndexLocation() const { //this for now returns the location of the main index - return getModuleBaseIndexLocation() + QString("/standard"); -} - -const bool CSwordModuleInfo::hasIndex() { //this will return true only - //if the index exists and has correct version information for both index and module - - QDir d; - if (!d.exists( getModuleStandardIndexLocation() )) { - return false; - } - - //first check if the index version and module version are ok - util::scoped_ptr<KConfig> indexconfig( - new KConfig( getModuleBaseIndexLocation() + QString("/bibletime-index.conf") ) - ); - - if (hasVersion()) { - if (indexconfig->readEntry("module-version") != QString(config(CSwordModuleInfo::ModuleVersion)) ) { - return false; - } - } - if (indexconfig->readEntry("index-version") != QString::number( INDEX_VERSION )) { - qDebug("%s: INDEX_VERSION is not compatible with this version of BibleTime.", name().latin1()); - return false; - } - - //then check if the index is there - return lucene::index::IndexReader::indexExists(getModuleStandardIndexLocation().ascii()); -} - - -void CSwordModuleInfo::buildIndex() { - wchar_t wcharBuffer[BT_MAX_LUCENE_FIELD_LENGTH + 1]; - - //we don't want the linked entries indexed again - module()->setSkipConsecutiveLinks(true); - - //Without this we don't get strongs, lemmas, etc - backend()->setFilterOptions ( CBTConfig::getFilterOptionDefaults() ); - //make sure we reset all important filter options which influcence the plain filters. - backend()->setOption( CSwordModuleInfo::strongNumbers, false ); - backend()->setOption( CSwordModuleInfo::morphTags, false ); - backend()->setOption( CSwordModuleInfo::morphSegmentation, false ); - backend()->setOption( CSwordModuleInfo::footnotes, false ); - backend()->setOption( CSwordModuleInfo::headings, false ); - backend()->setOption( CSwordModuleInfo::scriptureReferences, false ); - backend()->setOption( CSwordModuleInfo::redLetterWords, false ); - - // do not use any stop words - const TCHAR* stop_words[] = { - NULL - }; - lucene::analysis::standard::StandardAnalyzer an( stop_words ); - QString index = getModuleStandardIndexLocation(); - - QDir dir; - dir.mkdir( getGlobalBaseIndexLocation(), true ); - dir.mkdir( getModuleBaseIndexLocation(), true ); - dir.mkdir( getModuleStandardIndexLocation(), true ); - - - if (lucene::index::IndexReader::indexExists(index.ascii())) { - if (lucene::index::IndexReader::isLocked(index.ascii()) ) { - lucene::index::IndexReader::unlock(index.ascii()); - } - } - - util::scoped_ptr<lucene::index::IndexWriter> writer( new lucene::index::IndexWriter(index.ascii(), &an, true) ); //always create a new index - writer->setMaxFieldLength(BT_MAX_LUCENE_FIELD_LENGTH); - writer->setUseCompoundFile(true); //merge segments into a single file - writer->setMinMergeDocs(1000); - - *m_module = sword::TOP; - unsigned long verseLowIndex = m_module->Index(); - *m_module = sword::BOTTOM; - unsigned long verseHighIndex = m_module->Index(); - - //verseLowIndex is not 0 in all cases (i.e. NT-only modules) - unsigned long verseIndex = verseLowIndex + 1; - - - const bool isVerseModule = (type() == CSwordModuleInfo::Bible) || (type() == CSwordModuleInfo::Commentary); - - m_indexingProgress.setValue( QVariant((int)0) ); - m_indexingProgress.activate(); - - SWKey* key = m_module->getKey(); - //VerseKey for bibles - VerseKey* vk = dynamic_cast<VerseKey*>(key); - - if (vk) { - // we have to be sure to insert the english key into the index, otherwise we'd be in trouble if the language changes - vk->setLocale("en_US"); - //If we have a verse based module, we want to include the pre-chapter etc. headings in the search - vk->Headings(1); - } - - //holds UTF-8 data and is faster than QString - QCString textBuffer; - - // we start with the first module entry, key is automatically updated - // because key is a pointer to the modules key - for (*m_module = sword::TOP; !(key->Error()); (*key)++) { - - //If it is a sword-heading, store in buffer and index later in Verse X:1 - if (vk) { - if (vk->Verse() == 0) { - //qWarning("key is %s", key->getText()); - //qWarning("text is %s", m_module->StripText()); - textBuffer.append( m_module->StripText() ); - continue; - } - } - - util::scoped_ptr<lucene::document::Document> doc(new lucene::document::Document()); - - //index the key - lucene_utf8towcs(wcharBuffer, key->getText(), BT_MAX_LUCENE_FIELD_LENGTH); - doc->add(*lucene::document::Field::UnIndexed(_T("key"), wcharBuffer)); - - // index the main text - //at this point we have to make sure we disabled the strongs and the other options - //so the plain filters won't include the numbers somehow. - lucene_utf8towcs(wcharBuffer, (const char*) textBuffer.append(m_module->StripText()), BT_MAX_LUCENE_FIELD_LENGTH); - doc->add(*lucene::document::Field::UnStored(_T("content"), wcharBuffer)); - textBuffer.resize(0); //clean up - - // index attributes - AttributeList::iterator attListI; - AttributeValue::iterator attValueI; - // Footnotes - for (attListI = m_module->getEntryAttributes()["Footnote"].begin(); - attListI != m_module->getEntryAttributes()["Footnote"].end(); - attListI++) { - lucene_utf8towcs(wcharBuffer, attListI->second["body"], BT_MAX_LUCENE_FIELD_LENGTH); - doc->add(*lucene::document::Field::UnStored(_T("footnote"), wcharBuffer)); - } // for attListI - - // Headings - for (attValueI = m_module->getEntryAttributes()["Heading"]["Preverse"].begin(); - attValueI != m_module->getEntryAttributes()["Heading"]["Preverse"].end(); - attValueI++) { - lucene_utf8towcs(wcharBuffer, attValueI->second, BT_MAX_LUCENE_FIELD_LENGTH); - doc->add(*lucene::document::Field::UnStored(_T("heading"), wcharBuffer)); - } // for attValueI - - // Strongs/Morphs - for (attListI = m_module->getEntryAttributes()["Word"].begin(); - attListI != m_module->getEntryAttributes()["Word"].end(); - attListI++) { - // for each attribute - if (attListI->second["LemmaClass"] == "strong") { - lucene_utf8towcs(wcharBuffer, attListI->second["Lemma"], BT_MAX_LUCENE_FIELD_LENGTH); - doc->add(*lucene::document::Field::UnStored(_T("strong"), wcharBuffer)); - //qWarning("Adding strong %s", attListI->second["Lemma"].c_str()); - } - if (attListI->second.find("Morph") != attListI->second.end()) { - lucene_utf8towcs(wcharBuffer, attListI->second["Morph"], BT_MAX_LUCENE_FIELD_LENGTH); - doc->add(*lucene::document::Field::UnStored(_T("morph"), wcharBuffer)); - } - } // for attListI - - writer->addDocument(doc); - verseIndex = m_module->Index(); - - if (verseIndex % 200 == 0) { - if (verseHighIndex == verseLowIndex) { //prevent division by zero - m_indexingProgress.setValue( QVariant(0) ); - } else { - m_indexingProgress.setValue( QVariant((int)((100*(verseIndex-verseLowIndex))/(verseHighIndex-verseLowIndex))) ); - } - m_indexingProgress.activate(); - } - } - - writer->optimize(); - writer->close(); - - QString configFilename = getModuleStandardIndexLocation() + QString("/../bibletime-index.conf"); - util::scoped_ptr<KConfig> indexconfig( new KConfig( configFilename ) ); - if (hasVersion()) { - indexconfig->writeEntry("module-version", config(CSwordModuleInfo::ModuleVersion) ); - } - indexconfig->writeEntry("index-version", INDEX_VERSION); -} - -void CSwordModuleInfo::deleteIndexForModule( QString name ) { - util::filesystem::DirectoryUtil::removeRecursive( getGlobalBaseIndexLocation() + "/" + name ); -} - -unsigned long CSwordModuleInfo::indexSize() const { - return util::filesystem::DirectoryUtil::getDirSizeRecursive( getModuleBaseIndexLocation() ); -} - - -const bool CSwordModuleInfo::searchIndexed(const QString& searchedText, sword::ListKey& scope) { - char utfBuffer[BT_MAX_LUCENE_FIELD_LENGTH + 1]; - wchar_t wcharBuffer[BT_MAX_LUCENE_FIELD_LENGTH + 1]; - - // work around Swords thread insafety for Bibles and Commentaries - util::scoped_ptr < CSwordKey > key(CSwordKey::createInstance(this)); - sword::SWKey* s = dynamic_cast < sword::SWKey * >(key.get()); - QPtrList<VerseKey> list; - list.setAutoDelete( true ); // the list owns the objects - - const bool isVerseModule = (type() == CSwordModuleInfo::Bible) || (type() == CSwordModuleInfo::Commentary); - - if (s) { - m_module->SetKey(*s); - } - - m_searchResult.ClearList(); - - try { - // do not use any stop words - const TCHAR* stop_words[] = { - NULL - }; - lucene::analysis::standard::StandardAnalyzer analyzer( stop_words ); - lucene::search::IndexSearcher searcher(getModuleStandardIndexLocation().ascii()); - lucene_utf8towcs(wcharBuffer, searchedText.utf8(), BT_MAX_LUCENE_FIELD_LENGTH); - util::scoped_ptr<lucene::search::Query> q( lucene::queryParser::QueryParser::parse(wcharBuffer, _T("content"), &analyzer) ); - - util::scoped_ptr<lucene::search::Hits> h( searcher.search(q, lucene::search::Sort::INDEXORDER) ); - - const bool useScope = (scope.Count() > 0); -// const bool isVerseModule = (type() == CSwordModuleInfo::Bible) || (type() == CSwordModuleInfo::Commentary); - - lucene::document::Document* doc = 0; - util::scoped_ptr<SWKey> swKey( module()->CreateKey() ); - - - for (int i = 0; i < h->length(); ++i) { - doc = &h->doc(i); - lucene_wcstoutf8(utfBuffer, doc->get(_T("key")), BT_MAX_LUCENE_FIELD_LENGTH); - - swKey->setText(utfBuffer); - - // limit results based on scope - //if (searchOptions & CSwordModuleSearch::useScope && scope.Count() > 0){ - if (useScope) { - for (int j = 0; j < scope.Count(); j++) { - VerseKey* vkey = dynamic_cast<VerseKey*>(scope.getElement(j)); - if (vkey->LowerBound().compare(*swKey) <= 0 && vkey->UpperBound().compare(*swKey) >= 0) { - m_searchResult.add(*swKey); - } - } - } else { // no scope, give me all buffers - m_searchResult.add(*swKey); - } - } - } catch (...) { - qWarning("CLucene exception"); - return false; - } - - list.clear(); - - return (m_searchResult.Count() > 0); -} - -void CSwordModuleInfo::connectIndexingFinished(QObject* receiver, const char* slot) { - m_indexingFinished.connect(receiver, slot); -} - -void CSwordModuleInfo::connectIndexingProgress(QObject* receiver, const char* slot) { - m_indexingProgress.connect(receiver, slot); -} - -void CSwordModuleInfo::disconnectIndexingSignals(QObject* receiver) { - m_indexingProgress.disconnect(receiver); - m_indexingFinished.disconnect(receiver); -} - -/** Returns the last search result for this module. */ -sword::ListKey & CSwordModuleInfo::searchResult(const sword::ListKey * newResult) { - if (newResult) { - m_searchResult.copyFrom(*newResult); - } - - return m_searchResult; -} - -/** Clears the last search result. */ -void CSwordModuleInfo::clearSearchResult() { - m_searchResult.ClearList(); -} - -/** Returns the required Sword version for this module. Returns -1 if no special Sword version is required. */ -const sword::SWVersion CSwordModuleInfo::minimumSwordVersion() { - return sword::SWVersion(config(CSwordModuleInfo::MinimumSwordVersion).latin1()); -} - -const QString CSwordModuleInfo::config(const CSwordModuleInfo::ConfigEntry entry) const { - switch (entry) { - - case AboutInformation: { - return getFormattedConfigEntry("About"); - } - - case CipherKey: { - if (CBTConfig::getModuleEncryptionKey(name()).isNull()) { //fall back! - return QString(m_module->getConfigEntry("CipherKey")); - } else { - return CBTConfig::getModuleEncryptionKey(name()); - }; - } - - case AbsoluteDataPath: { - QString path( getSimpleConfigEntry("AbsoluteDataPath") ); - path.replace(QRegExp("/./"), "/"); // make /abs/path/./modules/ looking better - //make sure we have a trailing slash! - - if (path.right(1) != "/") { - path.append('/'); - } - - return path; - } - - case DataPath: { //make sure we remove the dataFile part if it's a Lexicon - QString path(getSimpleConfigEntry("DataPath")); - - if ((type() == CSwordModuleInfo::GenericBook) || (type() == CSwordModuleInfo::Lexicon)) { - int pos = path.findRev("/"); //last slash in the string - - if (pos != -1) { - path = path.left(pos + 1); //include the slash - } - } - - return path; - } - - case Description: - return getFormattedConfigEntry("Description"); - - case ModuleVersion: { - QString version(getSimpleConfigEntry("Version")); - - if (version.isEmpty()) { - version = "1.0"; - } - - return version; - } - - case MinimumSwordVersion: { - const QString minimumVersion(getSimpleConfigEntry("MinimumVersion")); - return !minimumVersion.isEmpty()? minimumVersion : QString("0.0"); - } - - case TextDir: { - const QString dir(getSimpleConfigEntry("Direction")); - return !dir.isEmpty()? dir : QString("LtoR"); - } - - case DisplayLevel: { - const QString level(getSimpleConfigEntry("DisplayLevel")); - return !level.isEmpty()? level : QString("1"); - } - - case GlossaryFrom: { - if (!category() == Glossary) { - return QString::null; - }; - - const QString lang(getSimpleConfigEntry("GlossaryFrom")); - - return !lang.isEmpty()? lang : QString::null; - } - - case GlossaryTo: { - if (!category() == Glossary) { - return QString::null; - }; - - const QString lang(getSimpleConfigEntry("GlossaryTo")); - - return !lang.isEmpty()? lang : QString::null; - } - - case Markup: { - const QString markup(getSimpleConfigEntry("SourceType")); - return !markup.isEmpty()? markup : QString("Unknown"); - } - - case DistributionLicense: - return getSimpleConfigEntry("DistributionLicense"); - - case DistributionSource: - return getSimpleConfigEntry("DistributionSource"); - - case DistributionNotes: - return getSimpleConfigEntry("DistributionNotes"); - - case TextSource: - return getSimpleConfigEntry("TextSource"); - - case CopyrightNotes: - return getSimpleConfigEntry("CopyrightNotes"); - - case CopyrightHolder: - return getSimpleConfigEntry("CopyrightHolder"); - - case CopyrightDate: - return getSimpleConfigEntry("CopyrightDate"); - - case CopyrightContactName: - return getSimpleConfigEntry("CopyrightContactName"); - - case CopyrightContactAddress: - return getSimpleConfigEntry("CopyrightContactAddress"); - - case CopyrightContactEmail: - return getSimpleConfigEntry("CopyrightContactEmail"); - - default: - return QString::null; - } -} - -/** Returns true if the module supports the feature given as parameter. */ -const bool CSwordModuleInfo::has(const CSwordModuleInfo::Feature feature) const { - switch (feature) { - - // case StrongsNumbers: - // return m_module->getConfig().has("Feature", "StrongsNumber"); - - case GreekDef: - return m_module->getConfig().has("Feature", "GreekDef"); - - case HebrewDef: - return m_module->getConfig().has("Feature", "HebrewDef"); - - case GreekParse: - return m_module->getConfig().has("Feature", "GreekParse"); - - case HebrewParse: - return m_module->getConfig().has("Feature", "HebrewParse"); - } - - return false; -} - -const bool CSwordModuleInfo::has(const CSwordModuleInfo::FilterTypes option) const { - //BAD workaround to see if the filter is GBF, OSIS or ThML! - const QString name = backend()->configOptionName(option); - - if (m_module->getConfig().has("GlobalOptionFilter", QString("OSIS").append(name).latin1())) { - return true; - } - - if (m_module->getConfig().has("GlobalOptionFilter", QString("GBF").append(name).latin1())) { - return true; - } - - if (m_module->getConfig().has("GlobalOptionFilter", QString("ThML").append(name).latin1())) { - return true; - } - - if (m_module->getConfig().has("GlobalOptionFilter", QString("UTF8").append(name).latin1())) { - return true; - } - - if (m_module->getConfig().has("GlobalOptionFilter", name.latin1())) { - return true; - } - - return false; -} - -/** Returns the text direction of the module's text., */ -const CSwordModuleInfo::TextDirection CSwordModuleInfo::textDirection() { - if (config(TextDir) == "RtoL") { - return CSwordModuleInfo::RightToLeft; - } else { - return CSwordModuleInfo::LeftToRight; - } -} - -/** Writes the new text at the given position into the module. This does only work for writable modules. */ -void CSwordModuleInfo::write(CSwordKey * key, const QString & newText) { - module()->KeyText((const char *)key->key().utf8()); - - //don't store a pointer to the const char* value somewhere because QCString doesn't keep the value of it - module()->setEntry(isUnicode()? (const char *)newText.utf8() : (const char *)newText.local8Bit()); -} - -/** Deletes the current entry and removes it from the module. */ -const bool CSwordModuleInfo::deleteEntry(CSwordKey * const key) { - module()->KeyText(isUnicode()? (const char *)key->key().utf8() : (const char *)key->key().local8Bit()); - - if (module()) { - module()->deleteEntry(); - return true; - }; - - return false; -} - -/** Returns the category of this module. See CSwordModuleInfo::Category for possible values. */ -const CSwordModuleInfo::Category CSwordModuleInfo::category() const { - if (m_dataCache.category == CSwordModuleInfo::UnknownCategory) { - const QString cat(m_module->getConfigEntry("Category")); - - if (cat == "Cults / Unorthodox / Questionable Material") { - m_dataCache.category = Cult; - } else if (cat == "Daily Devotional" || m_module->getConfig().has("Feature", "DailyDevotion")) { - m_dataCache.category = DailyDevotional; - } else if (cat == "Glossaries" || m_module->getConfig().has("Feature", "Glossary")) { //alow both - m_dataCache.category = Glossary; - }; - } - - return m_dataCache.category; -} - -/** Returns the display object for this module. */ -Rendering::CEntryDisplay * const CSwordModuleInfo::getDisplay() const { - return dynamic_cast < Rendering::CEntryDisplay * >(m_module->Disp()); -} - -QString CSwordModuleInfo::aboutText() const { - QString text; - text += "<font size=\"-1\"><table>"; - - text += QString("<tr><td><b>%1</b></td><td>%2</td><tr>") - .arg(i18n("Version")) - .arg(hasVersion()? config(CSwordModuleInfo::ModuleVersion) : i18n("unknown")); - - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("Markup")) - .arg(!QString(m_module->getConfigEntry("SourceType")).isEmpty()? m_module-> - getConfigEntry("SourceType") : i18n("unknown")); - - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("Location")) - .arg(config(CSwordModuleInfo::AbsoluteDataPath)); - - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("Language")) - .arg(language()->translatedName()); - - if (m_module->getConfigEntry("Category")) - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("Category")) - .arg(m_module->getConfigEntry("Category")); - - if (m_module->getConfigEntry("LCSH")) - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("LCSH")) - .arg(m_module->getConfigEntry("LCSH")); - - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("Writable")) - .arg(isWritable()? i18n("yes") : i18n("no")); - - if (isEncrypted()) - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("Unlock key")) - .arg(config(CSwordModuleInfo::CipherKey)); - - QString options; - - unsigned int opts; - - for (opts = CSwordModuleInfo::filterTypesMIN; opts <= CSwordModuleInfo::filterTypesMAX; ++opts) { - if (has(static_cast < CSwordModuleInfo::FilterTypes > (opts))) { - if (!options.isEmpty()) { - options += QString::fromLatin1(", "); - } - - options += CSwordBackend::translatedOptionName(static_cast < CSwordModuleInfo::FilterTypes > (opts)); - } - } - - if (!options.isEmpty()) { - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(i18n("Features")) - .arg(options); - } - - text += "</table><hr>"; - - if (category() == Cult) //clearly say the module contains cult/questionable materials - text += QString("<br/><b>%1</b><br/><br/>") - .arg(i18n("Take care, this work contains cult / questionable material!")); - - text += QString("<b>%1:</b><br><font size=\"-1\">%2</font>") - .arg(i18n("About")) - .arg(config(AboutInformation)); - - typedef QValueList<CSwordModuleInfo::ConfigEntry> ListConfigEntry; - - ListConfigEntry entries; - - entries.append(DistributionLicense); - - entries.append(DistributionSource); - - entries.append(DistributionNotes); - - entries.append(TextSource); - - entries.append(CopyrightNotes); - - entries.append(CopyrightHolder); - - entries.append(CopyrightDate); - - entries.append(CopyrightContactName); - - entries.append(CopyrightContactAddress); - - entries.append(CopyrightContactEmail); - - typedef QMap<CSwordModuleInfo::ConfigEntry, QString> MapConfigEntry; - - MapConfigEntry entryMap; - - entryMap[DistributionLicense] = i18n("Distribution license"); - - entryMap[DistributionSource] = i18n("Distribution source"); - - entryMap[DistributionNotes] = i18n("Distribution notes"); - - entryMap[TextSource] = i18n("Text source"); - - entryMap[CopyrightNotes] = i18n("Copyright notes"); - - entryMap[CopyrightHolder] = i18n("Copyright holder"); - - entryMap[CopyrightDate] = i18n("Copyright date"); - - entryMap[CopyrightContactName] = i18n("Copyright contact name"); - - entryMap[CopyrightContactAddress] = i18n("Copyright contact address"); - - entryMap[CopyrightContactEmail] = i18n("Copyright contact email"); - - text += ("<hr><table>"); - - for (ListConfigEntry::iterator it(entries.begin()); it != entries.end(); ++it) { - QString t( config(*it) ); - - if (!t.isEmpty()) { - text += QString("<tr><td><b>%1</b></td><td>%2</td></tr>") - .arg(entryMap[*it]) - .arg(config(*it)); - } - - } - - - text += "</table></font>"; - - return text; -} - -/** Returns the language of the module. */ -const CLanguageMgr::Language * const CSwordModuleInfo::language() const { - if (!m_dataCache.language) { - if (module()) { - if (category() == Glossary) { - //special handling for glossaries, we use the "from language" as language for the module - m_dataCache.language = (CPointers::languageMgr())->languageForAbbrev(config(GlossaryFrom)); - } else { - m_dataCache.language = (CPointers::languageMgr())->languageForAbbrev(module()->Lang()); - } - } else { - m_dataCache.language = (CPointers::languageMgr())->defaultLanguage(); //default language - } - } - - return m_dataCache.language; -} - - -/*! - \fn CSwordModuleInfo::getSimpleConfigEntry(char* name) - */ -QString CSwordModuleInfo::getSimpleConfigEntry(const QString& name) const { - QString ret = isUnicode() - ? QString::fromUtf8(m_module->getConfigEntry(name.latin1())) - : QString::fromLatin1(m_module->getConfigEntry(name.latin1())); - - return ret.isEmpty() ? QString::null : ret; -} - -QString CSwordModuleInfo::getFormattedConfigEntry(const QString& name) const { - SWBuf RTF_Buffer(m_module->getConfigEntry(name.latin1())); - sword::RTFHTML RTF_Filter; - RTF_Filter.processText(RTF_Buffer, 0, 0); - QString ret = isUnicode() - ? QString::fromUtf8(RTF_Buffer.c_str()) - : QString::fromLatin1(RTF_Buffer.c_str()); - - return ret.isEmpty() ? QString::null : ret; -} diff --git a/bibletime/backend/cswordmoduleinfo.h b/bibletime/backend/cswordmoduleinfo.h deleted file mode 100644 index 40112ec..0000000 --- a/bibletime/backend/cswordmoduleinfo.h +++ /dev/null @@ -1,373 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDMODULEINFO_H -#define CSWORDMODULEINFO_H - -//BibleTime includes -#include "clanguagemgr.h" - -//Qt includes -#include <qstring.h> -#include <qvaluelist.h> -#include <qsignal.h> - -//Sword includes -#include <listkey.h> -#include <swsearchable.h> -#include <swmodule.h> -#include <swversion.h> -#include <swdisp.h> - - -class CSwordBackend; - -class CSwordKey; - -namespace Rendering { - - class CEntryDisplay; -} - -/** - * Base class for Sword modules. - * This is the base class for all Sword modules. Every class handling a special Sword module type - * does inherit from this class. - * - * @author The BibleTime team - * @version $Id: cswordmoduleinfo.h,v 1.83 2007/02/04 23:12:32 joachim Exp $ - */ - -class CSwordModuleInfo { - -public: - /** - * These are the options which could be supported by modules and by this backend. - * It's used in @ref CSwordBackend::isOptionEnabled and @ref CSwordBackend::setOption. - */ - enum FilterTypes { - footnotes, /**< Footnotes embedded in the module's text */ - strongNumbers, /**< strong numbers, usually in the text for the info display */ - headings, /**< additional section headings */ - morphTags, /**< morphology */ - lemmas, /**< lemma tags */ - hebrewPoints,/**< Hebrew vowel points */ - hebrewCantillation, /**<Hewbrew caantillation points */ - greekAccents, /**< Greek accents may be switched on and off */ - scriptureReferences, /**< scripture references may be switched on and off, just makes sense in Bibles */ - redLetterWords, /**< Jesus words in red, color is template specific */ - textualVariants, /**< variants */ - morphSegmentation, /**< morph word segmentation, supported by OSIS */ - filterTypesMIN = footnotes, /**< first entry of this enum */ - filterTypesMAX = morphSegmentation /**< last item in this enum */ - // transliteration /* The following are handled in a special way */ - }; - /** The text direction of a module */ - enum TextDirection { /* The text direction of the modules's text */ - LeftToRight, /**< Left to right text direction, the default setting */ - RightToLeft /**< Right to left text directin, e.g. for hebrew */ - }; - /** The module type. - */ - enum ModuleType { - Bible, /**< Bible module */ - Commentary, /**< Commentary module */ - Lexicon, /**< Lexicon module */ - GenericBook, /**< Generic book module */ - Unknown /**< Fall back type for unknown modules */ - }; - /** - * This enum is used to give - * back an error code after unlocking the module - * BibleTime stores the unlock key not in the module's config file but in BibleTime's - * configuration file. - */ - enum UnlockErrorCode { - noError, /**< No error occured, everything worked ok. The key was written to the BibleTime config */ - wrongUnlockKey, /**< The wrong key was used. Module is not unlocked */ - notLocked, /**< The module was not locked so it can't be unlocked */ - noPermission /**< The key was not written to config because we have no permissions */ - }; - enum ConfigEntry { - AboutInformation, /**< The about information of a module which is stored in the config file*/ - AbsoluteDataPath, /**< The absolute data path stored in the config object */ - CipherKey, /**< The cipher key which was used to unlock the module. Not necessarily set.*/ - DataPath, /**< The relative path. See AbsoluteDataPath*/ - Description, /**< The module description stored in the config file */ - ModuleVersion, /**< The module's version.*/ - MinimumSwordVersion, /**< The required Sword Version of this module. Otherwise some things may not work (compression etc.).*/ - TextDir, /**< The text direction */ - DisplayLevel, /**< Mostly used for books. Gives the level which should contain the connected entries.*/ - GlossaryFrom, /**< lamguage from which the Glosaary tramslates */ - GlossaryTo, /**< lamguages to which the glossary maps to */ - DistributionLicense, - DistributionSource, - DistributionNotes, - TextSource, - CopyrightNotes, - CopyrightHolder, - CopyrightDate, - CopyrightContactName, - CopyrightContactAddress, - CopyrightContactEmail, - Markup /**< The markup of this module */ - }; - enum Feature { - //StrongsNumbers, /**< Use for Bibles which have embedded strong numbers */ - GreekDef, - HebrewDef, - GreekParse, - HebrewParse, - featureMin = GreekDef, - featureMax = HebrewParse - }; - enum Category { - UnknownCategory = 0, /**< The category wasn't set or has an unknwon value */ - Cult, /**< The module is a cult / sect / questionable module */ - DailyDevotional, - Glossary - }; - - /** - * Returns the base directory for search indices - */ - static const QString getGlobalBaseIndexLocation(); - /** - * Removes search index for this module, even if the module is not there any more - */ - static void deleteIndexForModule( QString name ); - - - /** - * Returns the config entry which is pecified by the parameter. - */ - const QString config( const CSwordModuleInfo::ConfigEntry entry ) const; - - CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const = 0 ); - /** Copy constructor to copy the passed parameter. - * @param m The module to be copied - */ - CSwordModuleInfo( const CSwordModuleInfo& m ); - /** Reimplementation to return a valid clone. - */ - virtual CSwordModuleInfo* clone(); - /** Destructor. - */ - virtual ~CSwordModuleInfo(); - - /** - * Returns the module object so all objects can access the original Sword module. - */ - inline sword::SWModule* const module() const; - /** - * Sets the unlock key of the modules and writes the key into the cofig file. - * @return True if the unlock process was succesful, if the key was wrong, or if the config file was write protected return false. - */ - const bool unlock( const QString& unlockKey ); - /** - * Returns the display object for this module. Normally every module should have a Display object. - * Please don't use module()->Display() because this function does return the Sword display and does - * render the text, too. - * This function performs some casts to return the correct display. If it returns 0 there's no valid - * display object. - */ - Rendering::CEntryDisplay* const getDisplay() const; - /** - * This function does return true if the data files of the module are encrypted by the module author - * (the on who made the module) no matter if it's locked or not. - * @return True if this module is encryped - */ - const bool isEncrypted() const; - /** - * This function returns true if this module is locked (encrypted + correct cipher key), - * otherwise return false. - * @return True if this module is locked, i.e. encrypted but without a key set - */ - const bool isLocked(); - - const bool unlockKeyIsValid(); - - /** The module version. - * @return true if this module has a version number and false if it doesn't have one. - */ - inline const bool hasVersion() const; - - /** - * Returns true if the module's index has been built. - */ - virtual const bool hasIndex(); - /** - * Returns the path to this module's index base dir - */ - virtual const QString getModuleBaseIndexLocation() const; - /** - * Returns the path to this module's standard index - */ - virtual const QString getModuleStandardIndexLocation() const; - /** - * Builds a search index for this module - */ - virtual void buildIndex(); - /** - * Returns index size - */ - virtual unsigned long indexSize() const; - - void connectIndexingFinished(QObject* receiver, const char* slot); - void connectIndexingProgress(QObject* receiver, const char* slot); - void disconnectIndexingSignals(QObject* receiver); - - /** - * Returns true if something was found, otherwise return false. - * This function uses CLucene to perform and index based search. It also - * overwrites the variable containing the last search result. - */ - virtual const bool searchIndexed(const QString& searchedText, sword::ListKey& scope); - /** - * Returns the last search result for this module. - * The last result is cleared by @ref search - */ - virtual sword::ListKey& searchResult( const sword::ListKey* newResult = 0 ); - /** - * Clears the last search result. - * This does immediately clean the last search result, - * no matter if search is in progress or not. - */ - void clearSearchResult(); - /** - * Returns the type of the module. - */ - virtual const CSwordModuleInfo::ModuleType type() const; - /** - * Returns the required Sword version for this module. - * Returns -1 if no special Sword version is required. - */ - const sword::SWVersion minimumSwordVersion(); - /** - * Returns the name of the module. - * @return The name of this module. - */ - inline const QString name() const; - /** - * Snaps to the closest entry in the module if the current key is - * not present in the data files. - */ - virtual const bool snap() { - return false; - }; - - const bool has( const CSwordModuleInfo::Feature ) const; - const bool has( const CSwordModuleInfo::FilterTypes ) const; - /** - * Returns the text direction of the module's text., - */ - virtual const CSwordModuleInfo::TextDirection textDirection(); - /** - * Writes the new text at the given position into the module. This does only work for writabe modules. - */ - virtual void write( CSwordKey* key, const QString& newText ); - /** - * Deletes the current entry and removes it from the module. - */ - const bool deleteEntry( CSwordKey* const key ); - /** - * Returns the language of the module. - */ - const CLanguageMgr::Language* const language() const; - /** - * Returns true if this module may be written by the write display windows. - */ - inline virtual const bool isWritable() const; - /** - * Returns the category of this module. See CSwordModuleInfo::Category for possible values. - */ - const CSwordModuleInfo::Category category() const; - /** - * The about text which belongs to this module. - */ - QString aboutText() const; - /** - * Returns true if this module is Unicode encoded. False if the charset is iso8859-1. - * Protected because it should not be used outside of the CSword*ModuleInfo classes. - */ - inline const bool isUnicode() const { - return m_dataCache.isUnicode; - } - -protected: - friend class CSwordBackend; - - inline CSwordBackend* backend() const { - return m_backend; - } - - inline void backend( CSwordBackend* newBackend ) { - if (newBackend) { - m_backend = newBackend; - } - } - - QString getSimpleConfigEntry(const QString& name) const; - QString getFormattedConfigEntry(const QString& name) const; - -private: - sword::SWModule* m_module; - sword::ListKey m_searchResult; - - mutable struct DataCache { - DataCache() { - language = 0; - } - - QString name; - bool isUnicode; - CSwordModuleInfo::Category category; - const CLanguageMgr::Language* language; - bool hasVersion; - } - - m_dataCache; - - CSwordBackend* m_backend; - - QSignal m_indexingFinished; - QSignal m_indexingProgress; -}; - -// typedef QPtrList<CSwordModuleInfo> ListCSwordModuleInfo; -typedef QValueList<CSwordModuleInfo*> ListCSwordModuleInfo; - -inline const CSwordModuleInfo::ModuleType CSwordModuleInfo::type() const { - return CSwordModuleInfo::Unknown; -} - -inline sword::SWModule* const CSwordModuleInfo::module() const { - return m_module; -} - -inline const bool CSwordModuleInfo::hasVersion() const { - return m_dataCache.hasVersion; -} - - -/** Returns the name of the module. */ -inline const QString CSwordModuleInfo::name() const { - return m_dataCache.name; -} - -/** Returns true if this module may be written by the write display windows. */ -inline const bool CSwordModuleInfo::isWritable() const { - return false; -} - -#include "util/cpointers.h" - -#endif diff --git a/bibletime/backend/cswordmodulesearch.cpp b/bibletime/backend/cswordmodulesearch.cpp deleted file mode 100644 index 3d00fd7..0000000 --- a/bibletime/backend/cswordmodulesearch.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordmodulesearch.h" -#include "cswordmoduleinfo.h" -#include "cswordbackend.h" -#include "../frontend/cbtconfig.h" - -//Sword includes -#include <swmodule.h> -#include <swkey.h> -#include <listkey.h> - - -CSwordModuleSearch* CSwordModuleSearch::searcher = 0; - -CSwordModuleSearch::CSwordModuleSearch() : -m_searchedText(QString::null), -m_searchOptions(0), -m_foundItems(false){ - searcher = this; -} - -CSwordModuleSearch::~CSwordModuleSearch() { - searcher = 0; -} - -/** This function sets the modules which should be searched. */ -void CSwordModuleSearch::setModules( const ListCSwordModuleInfo& list ) { - m_moduleList = list; -} - -/** Starts the search for the search text. */ -const bool CSwordModuleSearch::startSearch() { - backend()->setFilterOptions ( CBTConfig::getFilterOptionDefaults() ); - m_foundItems = false; - - bool foundItems = false; - - // for (m_moduleList.first(); m_moduleList.current() && !m_terminateSearch; m_moduleList.next()) { - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - - for (ListCSwordModuleInfo::iterator it = m_moduleList.begin(); it != end_it; ++it) { - if ( (*it)->searchIndexed(m_searchedText/*, m_searchOptions*/, m_searchScope) ) { - foundItems = true; - } - } - - m_foundItems = foundItems; - - m_finishedSig.activate(); - return true; -} - -/** Sets the text which should be search in the modules. */ -void CSwordModuleSearch::setSearchedText( const QString& text ) { - m_searchedText = text; -} - -/** Sets the search scope. */ -void CSwordModuleSearch::setSearchScope( const sword::ListKey& scope ) { - m_searchScope.copyFrom( scope ); - - if (!strlen(scope.getRangeText())) { //we can't search with an empty search scope, would crash - //reset the scope - resetSearchScope(); - - //disable searching with a scope! - // if (m_searchOptions | useScope) { - // qWarning("using the scope!"); - //set back the scope flag - // } - } -} - -/** Sets the search scope back. */ -void CSwordModuleSearch::resetSearchScope() { - m_searchScope.ClearList(); -} - -/** Returns true if in the last search the searcher found items, if no items were found return false. */ -const bool CSwordModuleSearch::foundItems() const { - return m_foundItems; -} - -/** Returns a copy of the used search scope. */ -const sword::ListKey& CSwordModuleSearch::searchScope() const { - return m_searchScope; -} - -void CSwordModuleSearch::connectFinished( QObject *receiver, const char *member ) { - m_finishedSig.connect(receiver, member); -} - -/** Should be called when the search finished. */ -void CSwordModuleSearch::searchFinished() { - m_finishedSig.activate(); -} - -const bool CSwordModuleSearch::modulesHaveIndices( const ListCSwordModuleInfo& modules ) -{ - bool hasIndices = true; - ListCSwordModuleInfo::const_iterator end_it = modules.end(); - for( ListCSwordModuleInfo::const_iterator it = modules.begin(); it != end_it; ++it) { - if (!(*it)->hasIndex()) { - hasIndices = false; - break; - } - } - return hasIndices; -} diff --git a/bibletime/backend/cswordmodulesearch.h b/bibletime/backend/cswordmodulesearch.h deleted file mode 100644 index 8c65d1c..0000000 --- a/bibletime/backend/cswordmodulesearch.h +++ /dev/null @@ -1,99 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDMODULESEARCH_H -#define CSWORDMODULESEARCH_H - -//BibleTime - backend -#include "cswordmoduleinfo.h" - -//BibleTime - utils -#include "util/cpointers.h" - -//Qt includes -#include <qptrlist.h> -#include <qstring.h> -#include <qsignal.h> - -//System includes -#include <pthread.h> - -//Sword includes -#include <listkey.h> - -/** - * CSwordModuleSearch manages the search on Sword modules. It manages the thread(s) - * and manages the different modules. - * - * @author The BibleTime team - * @version $Id: cswordmodulesearch.h,v 1.34 2006/08/08 19:32:48 joachim Exp $ - */ - -class CSwordModuleSearch: public CPointers { - -public: - CSwordModuleSearch(); - /** - * The destructor of this class. It cleans uop memory before it's deleted. - */ - virtual ~CSwordModuleSearch(); - /** - * Sets the text which should be search in the modules. - */ - void setSearchedText( const QString& ); - /** - * Starts the search for the search text. - */ - const bool startSearch(); - /** - * This function sets the modules which should be searched. - */ - void setModules( const ListCSwordModuleInfo& ); - /** - * Sets the search scope. - */ - void setSearchScope( const sword::ListKey& scope ); - /** - * Sets the seaech scope back. - */ - void resetSearchScope(); - /** - * @return "true" if in the last search the searcher found items, if no items were found return "false" - */ - const bool foundItems() const; - /** - * Returns a copy of the used search scope. - */ - const sword::ListKey& searchScope() const; - - void connectFinished( QObject * receiver, const char * member ); - void searchFinished(); - - /** - * Returns true if all of the specified modules have indices already built. - */ - const bool modulesHaveIndices( const ListCSwordModuleInfo& ); - -protected: - QString m_searchedText; - sword::ListKey m_searchScope; - ListCSwordModuleInfo m_moduleList; - - int m_searchOptions; - - bool m_foundItems; - -private: - QSignal m_finishedSig; - static CSwordModuleSearch* searcher; -}; - -#endif diff --git a/bibletime/backend/cswordtreekey.cpp b/bibletime/backend/cswordtreekey.cpp deleted file mode 100644 index 0b17996..0000000 --- a/bibletime/backend/cswordtreekey.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2007 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cswordtreekey.h" -#include "cswordbookmoduleinfo.h" - -#include <qtextcodec.h> - -CSwordTreeKey::CSwordTreeKey( const CSwordTreeKey& k ) : CSwordKey(k), TreeKeyIdx(k) {} - -CSwordTreeKey::CSwordTreeKey( const TreeKeyIdx *k, CSwordModuleInfo* module ) : CSwordKey(module), TreeKeyIdx(*k) {} - -CSwordTreeKey* CSwordTreeKey::copy() const { - return new CSwordTreeKey(*this); -} - -const QString CSwordTreeKey::getLocalNameUnicode() const -{ - Q_ASSERT(m_module); - CSwordTreeKey* nonconst_this = const_cast<CSwordTreeKey*>(this); - if (!m_module || m_module->isUnicode()) { - return QString::fromUtf8(nonconst_this->getLocalName()); - } else { - QTextCodec *codec = QTextCodec::codecForName("CP1252"); - return codec->toUnicode(nonconst_this->getLocalName()); - } -} - -/** Returns the key of this instance */ -const QString CSwordTreeKey::key() const { - Q_ASSERT(m_module); - if (!m_module || m_module->isUnicode()) { - return QString::fromUtf8(getText()); - } else { - QTextCodec *codec = QTextCodec::codecForName("CP1252"); - return codec->toUnicode(getText()); - } -} - -/** Returns the raw key for use by Sword */ -const char* CSwordTreeKey::rawKey() const { - return getText(); -} - -const bool CSwordTreeKey::key( const QString& newKey ) { - Q_ASSERT(m_module); - if (!m_module || m_module->isUnicode()) { - return key((const char*)newKey.utf8()); - } else { - QTextCodec *codec = QTextCodec::codecForName("CP1252"); - return key((const char*)codec->fromUnicode(newKey)); - } -} - -const bool CSwordTreeKey::key( const char* newKey ) { - Q_ASSERT(newKey); - - if (newKey) { - TreeKeyIdx::operator = (newKey); - } - else { - root(); - } - - return !Error(); -} - -CSwordModuleInfo* const CSwordTreeKey::module( CSwordModuleInfo* const newModule ) { - if (newModule && (newModule != m_module) && (newModule->type() == CSwordModuleInfo::GenericBook) ) { - m_module = newModule; - - const QString oldKey = key(); - - CSwordBookModuleInfo* newBook = dynamic_cast<CSwordBookModuleInfo*>(newModule); - copyFrom( *(newBook->tree()) ); - - key(oldKey); //try to restore our old key - - //set the key to the root node - root(); - firstChild(); - } - - return m_module; -} - -/** Assignment operator. */ -CSwordTreeKey& CSwordTreeKey::operator = (const QString& keyname ) { - key(keyname); - return *this; - } diff --git a/bibletime/backend/cswordtreekey.h b/bibletime/backend/cswordtreekey.h deleted file mode 100644 index 7ba563d..0000000 --- a/bibletime/backend/cswordtreekey.h +++ /dev/null @@ -1,74 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2007 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDTREEKEYIDX_H -#define CSWORDTREEKEYIDX_H - -//BibleTime includes -#include "cswordkey.h" - -//Sword includes -#include <treekeyidx.h> - -class CSwordModuleInfo; - -/** BibleTime's implementation of Sword's TreeKeyIdx class. - * @short CSwordKey implementation for Sword's TreeKey - * @author The BibleTime team - */ - -class CSwordTreeKey : public CSwordKey, public sword::TreeKeyIdx { - -public: - /** Constructor of this CSwordKey implementation. - * @param k The Sword tree key which belongs to this key - * @param module The module which belongs to this key - */ - CSwordTreeKey( const sword::TreeKeyIdx *k, CSwordModuleInfo* module ); - /** Copy constructor. - */ - CSwordTreeKey( const CSwordTreeKey& k ); - /** The module which belongs to this key. - * @return The module. - */ - virtual CSwordModuleInfo* const module( CSwordModuleInfo* const newModule ); - /** Copy method. - * @return A new copy of this object. - */ - virtual CSwordTreeKey* copy() const; - /** - * Returns the last part of the current key as unicode decoded QString. - * Use this instead of TreeKeyIdx::getLocalName() to avoid encoding problems. - */ - virtual const QString getLocalNameUnicode() const; - /** - * Returns the current key - */ - virtual const QString key() const; - /** - * Set the key. If the parameter is empty or null, the key will be set to "/" - */ - virtual const bool key( const QString& key ); - /** - * Set/get the key. If the parameter is not set (means equal to QString::null) - * the used key is returned. Otherwise the key is set and the new on ei returned. - */ - virtual const bool key( const char* key ); - /** - * Assignment operator. - */ - virtual CSwordTreeKey& operator = (const QString& keyname ); -protected: - /**Get the unencoded key for use by Sword.*/ - virtual const char * rawKey() const; -}; - -#endif diff --git a/bibletime/backend/cswordversekey.cpp b/bibletime/backend/cswordversekey.cpp deleted file mode 100644 index 3ab92d1..0000000 --- a/bibletime/backend/cswordversekey.cpp +++ /dev/null @@ -1,306 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cswordversekey.h" -#include "cswordbiblemoduleinfo.h" -#include "cswordcommentarymoduleinfo.h" - -//Qt includes -#include <qstringlist.h> - -//Sword includes -#include <swmodule.h> -#include <localemgr.h> - -CSwordVerseKey::CSwordVerseKey( CSwordModuleInfo* const module ) : CSwordKey(module) { - if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module) ) { - key( bible->lowerBound().key() ); - } -} - -CSwordVerseKey::CSwordVerseKey( const CSwordVerseKey& k ) : CSwordKey(k), VerseKey(k) {} - -CSwordVerseKey::CSwordVerseKey( const VerseKey* const k, CSwordModuleInfo* const module ) : CSwordKey(module), VerseKey(*k) {} - -/** Clones this object. */ -CSwordKey* CSwordVerseKey::copy() const { - return new CSwordVerseKey(*this); -} - -/** Sets the module for this key */ -CSwordModuleInfo* const CSwordVerseKey::module( CSwordModuleInfo* const newModule ) { - if (newModule && ((newModule->type() == CSwordModuleInfo::Bible) || (newModule->type() == CSwordModuleInfo::Commentary) ) ) { - m_module = newModule; - - //check if the module contains the key we present - CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(newModule); - - if (_compare(bible->lowerBound()) < 0) { - key( bible->lowerBound() ); - } - - if (_compare(bible->upperBound()) > 0) { - key( bible->upperBound() ); - } - } - - return dynamic_cast<CSwordBibleModuleInfo*>(m_module); -} - -/** Returns the current book as Text, not as integer. */ -const QString CSwordVerseKey::book( const QString& newBook ) { - int min = 0; - int max = 1; - - if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module())) { - const bool hasOT = bible->hasTestament(CSwordBibleModuleInfo::OldTestament); - const bool hasNT = bible->hasTestament(CSwordBibleModuleInfo::NewTestament); - - if (hasOT && hasNT) { - min = 0; - max = 1; - } - else if (hasOT && !hasNT) { - min = 0; - max = 0; - } - else if (!hasOT && hasNT) { - min = 1; - max = 1; - } - else if (!hasOT && !hasNT) { - min = 0; - max = -1; //no loop - } - } - - if (!newBook.isEmpty()) { - bool finished = false; - - for (int testament = min; testament <= max && !finished; ++testament) { - for (int book = 0; book < BMAX[testament] && !finished; ++book) { - if ( !strcmp((const char*)newBook.utf8(), books[testament][book].name ) ) { - Testament(testament+1); - Book(book+1); - finished = true; - } - } - } - } - - if ( (Testament() >= min+1) && (Testament() <= max+1) && (Book() <= BMAX[min]) ) { - return QString::fromUtf8( books[Testament()-1][Book()-1].name ); - } - - //return QString::fromUtf8( books[min][0].name ); //return the first book, i.e. Genesis - return QString::null; -} - -/** Sets the key we use to the parameter. */ -const QString CSwordVerseKey::key() const { - return QString::fromUtf8(getText()); -} - -const char * CSwordVerseKey::rawKey() const { - return getText(); -} - -const bool CSwordVerseKey::key( const QString& newKey ) { - return key( (const char*)newKey.utf8() ); -} - -const bool CSwordVerseKey::key( const char* newKey ) { - if (newKey && (strlen(newKey)>0) ) { - VerseKey::operator = (newKey); - } - else if (newKey && !strlen(newKey)) { - CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()); - - if ( bible ) { - VerseKey::operator = ((const char*)bible->lowerBound().key().utf8()); - } - } - - return !Error(); -} - -const bool CSwordVerseKey::next( const JumpType type ) { - Error(); //clear Error status - bool ret = true; - - switch (type) { - - case UseBook: { - const int currentTestament = Testament(); - const int currentBook = Book(); - - if ((currentTestament == 2) && (currentBook >= BMAX[currentTestament-1])) { //Revelation, i.e. end of navigation - return false; - } - else if ((currentTestament == 1) && (currentBook >= BMAX[currentTestament-1])) { //Malachi, switch to the NT - Testament(currentTestament+1); - Book(1); - } - else { - Book(Book()+1); - } - break; - } - - case UseChapter: { - Chapter(Chapter()+1); - break; - } - - case UseVerse: { - if (m_module && m_module->module()) { - const bool oldStatus = m_module->module()->getSkipConsecutiveLinks(); - m_module->module()->setSkipConsecutiveLinks(true); - - //disable headings for next verse - const bool useHeaders = (Verse() == 0); - const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders ); - //don't use setKey(), that would create a new key without Headings set - m_module->module()->getKey()->setText( (const char*)key().utf8() ); - - (*(m_module->module()) )++; - - ((VerseKey*)(m_module->module()->getKey()))->Headings(oldHeadingsStatus); - m_module->module()->setSkipConsecutiveLinks(oldStatus); - - if (!m_module->module()->Error()) { - key( QString::fromUtf8(m_module->module()->KeyText()) ); - } - else { - // Verse(Verse()+1); - //don't change the key, restore the module's position - m_module->module()->getKey()->setText( (const char*)key().utf8() ); - ret = false; - break; - } - - } - else { - Verse(Verse()+1); - } - - break; - } - - default: - return false; - } - - if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) { - if (_compare(bible->lowerBound()) < 0 ) { - key( bible->lowerBound() ); - ret = false; - } - - if (_compare(bible->upperBound()) > 0 ) { - key( bible->upperBound() ); - ret = false; - } - - return ret; - } - else if (Error()) { //we have no module, so take care of VerseKey::Error() - return false; - } - - return ret; -} - -const bool CSwordVerseKey::previous( const JumpType type ) { - bool ret = true; - - switch (type) { - - case UseBook: { - if ( (Book() == 1) && (Testament() == 1) ) { //Genesis - return false; - } - else if ( (Book() == 1) && (Testament() == 2) ){ //Matthew - Testament(1); - Book(BMAX[0]); - } - else{ - Book( Book()-1 ); - } - - break; - } - - case UseChapter: { - Chapter(Chapter()-1); - break; - } - - case UseVerse: { - if (m_module && m_module->module()) { - const bool useHeaders = (Verse() == 0); - const bool oldHeadingsStatus = ((VerseKey*)(m_module->module()->getKey()))->Headings( useHeaders ); - - m_module->module()->getKey()->setText( (const char*)key().utf8() ); - - const bool oldStatus = m_module->module()->getSkipConsecutiveLinks(); - m_module->module()->setSkipConsecutiveLinks(true); - ( *( m_module->module() ) )--; - - ((VerseKey*)(m_module->module()->getKey()))->Headings( oldHeadingsStatus ); - m_module->module()->setSkipConsecutiveLinks(oldStatus); - - if (!m_module->module()->Error()) { - key( QString::fromUtf8(m_module->module()->KeyText()) );//don't use fromUtf8 - } - else { - ret = false; - // Verse(Verse()-1); - m_module->module()->getKey()->setText( (const char*)key().utf8() ); //restore module's key - } - } - else { - Verse(Verse()-1); - } - - break; - } - - default: - return false; - } - - if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) { - if (_compare(bible->lowerBound()) < 0 ) { - key( bible->lowerBound() ); - ret = false; - } - - if (_compare(bible->upperBound()) > 0 ) { - key( bible->upperBound() ); - ret = false; - } - - return ret; - } - else if (Error()) { - return false; - } - - return ret; -} - -/** Assignment operator for more ease of use. */ -CSwordVerseKey& CSwordVerseKey::operator = (const QString& keyname) { - key(keyname); - return *this; -} diff --git a/bibletime/backend/cswordversekey.h b/bibletime/backend/cswordversekey.h deleted file mode 100644 index 79c9fe3..0000000 --- a/bibletime/backend/cswordversekey.h +++ /dev/null @@ -1,122 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDVERSEKEY_H -#define CSWORDVERSEKEY_H - -//own includes -#include "cswordkey.h" -#include "cswordmoduleinfo.h" - -//Qt includes -#include <qstring.h> - -//Sword includes -#include <versekey.h> - -/** - * The CSwordKey implementation for verse based modules (Bibles and Commentaries) - * - * This class is the implementation of CKey for verse based modules like - * Bibles and commentaries. - * This class provides the special functions to work with the verse based modules. - * - * Useful functions are - * @see NextBook() - * @see PreviousBook() - * @see NextChapter() - * @see PreviousChapter() - * @see NextVerse() - * @see PreviousVerse(). - * - * Call the constructor only with a valid verse based modules, otherwise this key will be invalid - * and the application will probably crash. - * - * @version $Id: cswordversekey.h,v 1.27 2007/10/26 18:26:23 jerickson314 Exp $ - * @short CSwordKey implementation for Sword's VerseKey. - * @author The BibleTime team - */ - -class CSwordVerseKey : public CSwordKey, public sword::VerseKey { - -public: - enum JumpType { - UseBook, - UseChapter, - UseVerse - }; - - /** - * Constructor of this class. - * - * This function will construct a versekey with the current module position - * and it will setup the m_module members. - * - */ - CSwordVerseKey( CSwordModuleInfo* const module ); - /** - * Copy constructor. - */ - CSwordVerseKey( const CSwordVerseKey& k ); - /** - * VerseKey based constructor. - */ - CSwordVerseKey( const sword::VerseKey* const k, CSwordModuleInfo* const module ); - /** - * Clones this object. - */ - virtual CSwordKey* copy() const; - /** - * Set/get the key. If the parameter is not set (means equal to QString::null) - * the used key is returned. Otherwise the key is set and the new on ei returned. - */ - virtual const QString key() const; - /** - * Set the current key. - */ - virtual const bool key( const QString& ); - /** - * Set/get the key. If the parameter is not set (means equal to QString::null) - * the used key is returned. Otherwise the key is set and the new on ei returned. - */ - virtual const bool key( const char* key ); - - /** - * Jumps to the next entry of the given type - */ - const bool next( const JumpType type ); - /** - * Jumps to the previous entry of the given type - */ - const bool previous ( const JumpType type ); - /** - * This functions returns the current book as localised text, not as book numer. - * - * Use "char Book()" to retrieve the book number of the current book. - * @return The name of the current book - */ - const QString book(const QString& newBook = QString::null); - /** - * Sets the module for this key - */ - virtual CSwordModuleInfo* const module( CSwordModuleInfo* const newModule = 0 ); - /** - * Assignment operator for more ease of use. - */ - virtual CSwordVerseKey& operator = (const QString& keyname); -protected: - /** - * Returns the raw key for use with Sword. - */ - virtual const char * rawKey() const; -}; - -#endif diff --git a/bibletime/backend/ctextrendering.cpp b/bibletime/backend/ctextrendering.cpp deleted file mode 100644 index f3f5a9c..0000000 --- a/bibletime/backend/ctextrendering.cpp +++ /dev/null @@ -1,278 +0,0 @@ -// -// C++ Implementation: ctextrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include "ctextrendering.h" - -//BibleTime includes -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/cdisplaytemplatemgr.h" -#include "backend/creferencemanager.h" - -#include "util/scoped_resource.h" -#include "util/ctoolclass.h" - -//Sword includes -#include <swkey.h> - -//Qt includes -#include <qregexp.h> - -//KDE includes -#include <klocale.h> -#include <kurl.h> - -using namespace Rendering; - -CTextRendering::KeyTreeItem::KeyTreeItem(const QString& key, CSwordModuleInfo const * mod, const Settings settings ) -: m_settings( settings ), -m_moduleList(), -m_key( key ), -m_childList( 0 ), -m_stopKey( QString::null ), -m_alternativeContent( QString::null ) { - m_moduleList.append( const_cast<CSwordModuleInfo*>(mod) ); //BAD CODE -} - -CTextRendering::KeyTreeItem::KeyTreeItem(const QString& content, const Settings settings ) -: m_settings( settings ), -m_moduleList(), -m_key( QString::null ), -m_childList( 0 ), -m_stopKey( QString::null ), -m_alternativeContent( content ) {} - -CTextRendering::KeyTreeItem::KeyTreeItem(const QString& key, const ListCSwordModuleInfo& mods, const Settings settings ) -: m_settings( settings ), -m_moduleList( mods ), -m_key( key ), -m_childList( 0 ), -m_stopKey( QString::null ), -m_alternativeContent( QString::null ) {} - -CTextRendering::KeyTreeItem::KeyTreeItem() -: m_settings(), -m_moduleList(), -m_key(QString::null), -m_childList(0), -m_stopKey(QString::null), -m_alternativeContent(QString::null) {} - -CTextRendering::KeyTreeItem::KeyTreeItem(const KeyTreeItem& i) -: m_settings( i.m_settings ), -m_moduleList( i.m_moduleList ), -m_key( i.m_key ), -m_childList( 0 ), -m_stopKey( i.m_stopKey ), -m_alternativeContent( i.m_alternativeContent ) { - if (i.hasChildItems()) { - m_childList = new KeyTree(); - *m_childList = *(i.childList()); //deep copy - } - -} - -CTextRendering::KeyTreeItem::~KeyTreeItem() { - delete m_childList; - m_childList = 0; -} - -CTextRendering::KeyTreeItem::KeyTreeItem(const QString& startKey, const QString& stopKey, CSwordModuleInfo* module, const Settings settings) -: m_settings( settings ), -m_moduleList(), -m_key( startKey ), -m_childList( 0 ), -m_stopKey( stopKey ), -m_alternativeContent( QString::null ) { - Q_ASSERT(module); - m_moduleList.append(module); - - //use the start and stop key to ceate our child items - - if (module->type() == CSwordModuleInfo::Bible) { - CSwordVerseKey start(module); - start = startKey; - - CSwordVerseKey stop(module); - stop = stopKey; - - if (!m_key.isEmpty() && !m_stopKey.isEmpty()) { //we have a range of keys - bool ok = true; - - while (ok && ((start < stop) || (start == stop)) ) { //range - childList()->append( - new KeyTreeItem(start.key(), module, KeyTreeItem::Settings(false, settings.keyRenderingFace)) - ); - - - ok = start.next(CSwordVerseKey::UseVerse); - } - } - else if (m_key.isEmpty()) { - childList()->append( new KeyTreeItem(startKey, module, KeyTreeItem::Settings(false, settings.keyRenderingFace)) ); - } - } - else if ((module->type() == CSwordModuleInfo::Lexicon) || (module->type() == CSwordModuleInfo::Commentary) ) { - childList()->append( new KeyTreeItem(startKey, module, KeyTreeItem::Settings(false, KeyTreeItem::Settings::NoKey)) ); - } - else if (module->type() == CSwordModuleInfo::GenericBook) { - childList()->append( new KeyTreeItem(startKey, module, KeyTreeItem::Settings(false, KeyTreeItem::Settings::NoKey)) ); - } - - //make it into "<simple|range> (modulename)" - - if (startKey == stopKey) { - m_alternativeContent = startKey; - } - else { - sword::VerseKey vk(startKey.utf8(), stopKey.utf8()); - - if (vk.LowerBound().Book() != vk.UpperBound().Book()) { - m_alternativeContent = QString::fromUtf8(vk.getRangeText()); - } - else if (vk.LowerBound().Chapter() != vk.UpperBound().Chapter()) { - m_alternativeContent = QString("%1 - %2:%3") - .arg(QString::fromUtf8(vk.LowerBound().getText())) - .arg(vk.UpperBound().Chapter()) - .arg(vk.UpperBound().Verse()); - } - else { //only verses differ (same book, same chapter) - m_alternativeContent = QString("%1 - %2") - .arg(QString::fromUtf8(vk.LowerBound().getText())) - .arg(vk.UpperBound().Verse()); - } - } - - m_alternativeContent.append(" (").append(module->name()).append(")"); - m_alternativeContent.prepend("<div class=\"rangeheading\" dir=\"ltr\">").append("</div>"); //insert the right tags -} - -const QString& CTextRendering::KeyTreeItem::getAlternativeContent() const { - return m_alternativeContent; -} - -ListCSwordModuleInfo CTextRendering::KeyTree::collectModules() const { - //collect all modules which are available and used by child items - ListCSwordModuleInfo modules; - - for (KeyTreeItem* c = first(); c; c = next()) { - Q_ASSERT(c); - - ListCSwordModuleInfo childMods = c->modules(); - - /*ToDo: Use the const iterators as soon as we use Qt > 3.1 - const ListCSwordModuleInfo::const_iterator c_end = childMods.end(); - for (ListCSwordModuleInfo::const_iterator c_it = childMods.constBegin(); c_it != c_end; ++c_it) { - if (!modules.contains(*c_it)) { - modules.append(*c_it); - } - }*/ - - // for (CSwordModuleInfo* m = childMods.first(); m; m = childMods.next()) { - ListCSwordModuleInfo::iterator end_it = childMods.end(); - - for (ListCSwordModuleInfo::iterator it(childMods.begin()); it != end_it; ++it) { - if (!modules.contains(*it)) { - modules.append(*it); - } - } - - } - - return modules; -} - -const QString CTextRendering::renderKeyTree( KeyTree& tree ) { - initRendering(); - - ListCSwordModuleInfo modules = tree.collectModules(); - QString t; - - //optimization for entries with the same key - util::scoped_ptr<CSwordKey> key( - (modules.count() == 1) ? CSwordKey::createInstance(modules.first()) : 0 - ); - - for (KeyTreeItem* c = tree.first(); c; c = tree.next()) { - if (modules.count() == 1) { //this optimizes the rendering, only one key created for all items - key->key( c->key() ); - t.append( renderEntry( *c, key) ); - } - else { - t.append( renderEntry( *c ) ); - } - } - - return finishText(t, tree); -} - -const QString CTextRendering::renderKeyRange( const QString& start, const QString& stop, const ListCSwordModuleInfo& modules, const QString& highlightKey, const KeyTreeItem::Settings& keySettings ) { - - CSwordModuleInfo* module = modules.first(); - //qWarning( "renderKeyRange start %s stop %s \n", start.latin1(), stop.latin1() ); - - util::scoped_ptr<CSwordKey> lowerBound( CSwordKey::createInstance(module) ); - lowerBound->key(start); - - util::scoped_ptr<CSwordKey> upperBound( CSwordKey::createInstance(module) ); - upperBound->key(stop); - - sword::SWKey* sw_start = dynamic_cast<sword::SWKey*>(lowerBound.get()); - sword::SWKey* sw_stop = dynamic_cast<sword::SWKey*>(upperBound.get()); - - Q_ASSERT((*sw_start == *sw_stop) || (*sw_start < *sw_stop)); - - if (*sw_start == *sw_stop) { //same key, render single key - return renderSingleKey(lowerBound->key(), modules); - } - else if (*sw_start < *sw_stop) { // Render range - KeyTree tree; - KeyTreeItem::Settings settings = keySettings; - - CSwordVerseKey* vk_start = dynamic_cast<CSwordVerseKey*>(lowerBound.get()); - Q_ASSERT(vk_start); - - CSwordVerseKey* vk_stop = dynamic_cast<CSwordVerseKey*>(upperBound.get()); - Q_ASSERT(vk_stop); - - bool ok = true; - while (ok && ((*vk_start < *vk_stop) || (*vk_start == *vk_stop))) { - //make sure the key given by highlightKey gets marked as current key - settings.highlight = (!highlightKey.isEmpty() ? (vk_start->key() == highlightKey) : false); - - /*TODO: We need to take care of linked verses if we render one or (esp) more modules - If the verses 2,3,4,5 are linked to 1, it should be displayed as one entry with the caption 1-5 */ - - if (vk_start->Chapter() == 0){ //range was 0:0-1:x, render 0:0 first and jump to 1:0 - vk_start->Verse(0); - tree.append( new KeyTreeItem(vk_start->key(), modules, settings) ); - vk_start->Chapter(1); - vk_start->Verse(0); - } - tree.append( new KeyTreeItem(vk_start->key(), modules, settings) ); - ok = vk_start->next(CSwordVerseKey::UseVerse); - } - - return renderKeyTree(tree); - } - - return QString::null; -} - -const QString CTextRendering::renderSingleKey( const QString& key, const ListCSwordModuleInfo& moduleList, const KeyTreeItem::Settings& settings ) { - KeyTree tree; - tree.append( new KeyTreeItem(key, moduleList, settings) ); - - return renderKeyTree(tree); -} - - diff --git a/bibletime/backend/ctextrendering.h b/bibletime/backend/ctextrendering.h deleted file mode 100644 index d034959..0000000 --- a/bibletime/backend/ctextrendering.h +++ /dev/null @@ -1,147 +0,0 @@ -// -// C++ Interface: ctextrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#ifndef CTEXTRENDERING_H -#define CTEXTRENDERING_H - -//BT includes -#include "backend/cswordmoduleinfo.h" - -#include "util/autoptrvector.h" - -//QT includes -#include <qstring.h> - -// class CSwordModuleInfo; - -class CSwordKey; - -/** - * CTextRendering is BibleTime's place where the actual rendering takes place. - * It provides several methods to convert an abstract tree of items - * into a string of html. - * - * See the implementations @ref CHTMLExportRendering and especially @ref CDisplayRendering. - * @short Text rendering based on trees - * @author The BibleTime team -*/ - -namespace Rendering { - - class CTextRendering { - -public: - - class KeyTreeItem; - - class KeyTree; - typedef util::AutoPtrVector<KeyTreeItem> KeyTreeItemList; - - class KeyTreeItem { - public: - - struct Settings { - enum KeyRenderingFace { - NoKey, //< means no key shown at all - SimpleKey, //< means only versenumber or only lexicon entry name - CompleteShort, //< means key like "Gen 1:1" - CompleteLong //< means "Genesis 1:1" - }; - - Settings(const bool highlight = false, KeyRenderingFace keyRendering = SimpleKey) : highlight(highlight), keyRenderingFace(keyRendering) {} - - bool highlight; - KeyRenderingFace keyRenderingFace; - }; - - KeyTreeItem(const QString& key, CSwordModuleInfo const * module, const Settings settings); - KeyTreeItem(const QString& key, const ListCSwordModuleInfo& modules, const Settings settings); - KeyTreeItem(const QString& startKey, const QString& stopKey, CSwordModuleInfo* module, const Settings settings); - KeyTreeItem(const QString& content, const Settings settings); - KeyTreeItem(const KeyTreeItem& i); - - virtual ~KeyTreeItem(); - - const QString& getAlternativeContent() const; - inline void setAlternativeContent(const QString& newContent) { - m_alternativeContent = newContent; - }; - - inline const bool hasAlternativeContent() const { - return !m_alternativeContent.isNull(); - }; - - inline const ListCSwordModuleInfo& modules() const { - return m_moduleList; - }; - - inline const QString& key() const { - return m_key; - }; - - inline const Settings& settings() const { - return m_settings; - }; - - inline KeyTree* const childList() const; - inline const bool hasChildItems() const; - - protected: - KeyTreeItem(); - - Settings m_settings; - ListCSwordModuleInfo m_moduleList; - QString m_key; - mutable KeyTree* m_childList; - - QString m_stopKey; - QString m_alternativeContent; - }; - - class KeyTree : public KeyTreeItemList { - public: - ListCSwordModuleInfo collectModules() const; - }; - - virtual ~CTextRendering() {} - - const QString renderKeyTree( KeyTree& ); - - const QString renderKeyRange( const QString& start, const QString& stop, const ListCSwordModuleInfo& modules, const QString& hightlightKey = QString::null, const KeyTreeItem::Settings& settings = KeyTreeItem::Settings() ); - - const QString renderSingleKey( const QString& key, const ListCSwordModuleInfo&, const KeyTreeItem::Settings& settings = KeyTreeItem::Settings() ); - -protected: - virtual const QString renderEntry( const KeyTreeItem&, CSwordKey* = 0 ) = 0; - virtual const QString finishText( const QString&, KeyTree& tree ) = 0; - virtual void initRendering() = 0; -}; - -inline CTextRendering::KeyTree* const CTextRendering::KeyTreeItem::childList() const { - if (!m_childList) { - m_childList = new KeyTree(); - } - - return m_childList; -} - -inline const bool CTextRendering::KeyTreeItem::hasChildItems() const { - if (!m_childList) { - return false; - } - - return !m_childList->isEmpty(); -} - -} - -#endif diff --git a/bibletime/backend/osismorphsegmentation.cpp b/bibletime/backend/osismorphsegmentation.cpp deleted file mode 100644 index 7aeb63c..0000000 --- a/bibletime/backend/osismorphsegmentation.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/****************************************************************************** - * - * osisfootnotes - SWFilter descendant to hide or show footnotes - * in an OSIS module. - */ - - -#include "osismorphsegmentation.h" - -#include <stdlib.h> -#include <swmodule.h> -#include <swbuf.h> -#include <versekey.h> -#include <utilxml.h> -#include <utilstr.h> - - - -namespace Filters { -const char OSISMorphSegmentation::oName[] = "Morph segmentation"; -const char OSISMorphSegmentation::oTip[] = "Toggles morph segmentation On and Off if they exist"; - -const SWBuf OSISMorphSegmentation::choices[3] = {"Off", "On", ""}; - -const StringList OSISMorphSegmentation::oValues(&choices[0], &choices[2]); - -OSISMorphSegmentation::OSISMorphSegmentation() : sword::SWOptionFilter(oName, oTip, &oValues) { - setOptionValue("Off"); - } - - - OSISMorphSegmentation::~OSISMorphSegmentation() {} - - - char OSISMorphSegmentation::processText(SWBuf &text, const SWKey */*key*/, const SWModule */*module*/) { - SWBuf token; - bool intoken = false; - bool hide = false; - - SWBuf orig( text ); - const char *from = orig.c_str(); - - XMLTag tag; - - for (text = ""; *from; ++from) { - if (*from == '<') { - intoken = true; - token = ""; - continue; - } - - if (*from == '>') { // process tokens - intoken = false; - - if (!strncmp(token.c_str(), "seg ", 4) || !strncmp(token.c_str(), "/seg", 4)) { - tag = token; - - if (!tag.isEndTag() && tag.getAttribute("type") && !strcmp("morph", tag.getAttribute("type"))) { //<seg type="morph"> start tag - hide = (option == 0); //only hide if option is Off - } - - if (hide) { //hides start and end tags as long as hide is set - - if (tag.isEndTag()) { //</seg> - hide = false; - } - - continue; //leave out the current token - } - } //end of seg tag handling - - text.append('<'); - text.append(token); - text.append('>'); - - // hide = false; //not right, because there may be child tags in seg. Only /seg may disable the seg hiding. - - continue; - } //end of intoken part - - if (intoken) { //copy token - token.append(*from); - } - else { //copy text which is not inside of a tag - text.append(*from); - } - } - - return 0; - } - -} diff --git a/bibletime/backend/osismorphsegmentation.h b/bibletime/backend/osismorphsegmentation.h deleted file mode 100644 index bc4ea0f..0000000 --- a/bibletime/backend/osismorphsegmentation.h +++ /dev/null @@ -1,48 +0,0 @@ -/****************************************************************************** - * - * $Id: osismorphsegmentation.h,v 1.4 2006/08/08 19:32:48 joachim Exp $ - * - * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) - * CrossWire Bible Society - * P. O. Box 2528 - * Tempe, AZ 85280-2528 - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation version 2. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - */ - -#ifndef OSISMORPHSEGMENTATION_H -#define OSISMORPHSEGMENTATION_H - -#include <swoptfilter.h> - -using namespace sword; - -namespace Filters { - -/** This Filter shows/hides headings in a OSIS text. - * @author Martin Gruner - */ -class OSISMorphSegmentation : public SWOptionFilter { - static const char oName[]; - static const char oTip[]; - static const SWBuf choices[3]; - static const StringList oValues; - -public: - OSISMorphSegmentation(); - virtual ~OSISMorphSegmentation(); - - virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); -}; - -} - -#endif diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp deleted file mode 100644 index 32030ff..0000000 --- a/bibletime/bibletime.cpp +++ /dev/null @@ -1,329 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//local includes -#include "config.h" -#include "bibletime.h" - -//frontend includes -#include "frontend/cmdiarea.h" -#include "frontend/kstartuplogo.h" -#include "frontend/mainindex/cmainindex.h" -#include "frontend/displaywindow/cdisplaywindow.h" -#include "frontend/displaywindow/creadwindow.h" -#include "frontend/displaywindow/cwritewindow.h" -#include "frontend/keychooser/ckeychooser.h" -#include "frontend/cbtconfig.h" - -#include "util/ctoolclass.h" -#include "util/cpointers.h" - -//backend includes -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbiblemoduleinfo.h" -#include "backend/cswordcommentarymoduleinfo.h" -#include "backend/cswordlexiconmoduleinfo.h" -#include "backend/cswordbookmoduleinfo.h" -#include "backend/cswordversekey.h" -#include "backend/cswordldkey.h" - - -//Qt includes -#include <qsplitter.h> - -//KDE includes -#include <kdeversion.h> -#include <kaction.h> -#include <kapplication.h> -#include <kconfig.h> -#include <kcmdlineargs.h> -#include <klocale.h> -#include <kaccel.h> -#include <kmenubar.h> -#include <ktoolbar.h> -#include <krandomsequence.h> - -using namespace Profile; - -BibleTime::BibleTime() -: BibleTimeInterface("BibleTimeInterface"), -#if KDE_VERSION >= 0x030200 -KMainWindow(KMainWindow::NoDCOPObject, 0,0, WType_TopLevel), -#else -KMainWindow(0,0, WType_TopLevel), -#endif -m_windowActionCollection(0), -m_initialized(false), -m_moduleList(0), -m_progress(0), -m_currentProfile(0), -m_mainSplitter(0), -m_leftPaneSplitter(0), -m_mdi(0), -m_profileMgr(), -m_backend(0), -m_mainIndex(0) { - setObjId("BibleTimeInterface"); - setHelpMenuEnabled(false); - - initBackends(); - initView(); - initActions(); - - createGUI("bibletimeui.rc"); - initMenubar(); - initConnections(); - - readSettings(); - - setPlainCaption("BibleTime " VERSION); - - // we don't save the geometry, it's stored in the startup profile - setAutoSaveSettings(QString("MainWindow"), false); -} - -BibleTime::~BibleTime() { - // delete m_dcopInterface; - // The backend is deleted by the BibleTimeApp instance -} - -/** Saves the properties of BibleTime to the application wide configfile */ -void BibleTime::saveSettings() { - if (m_mdi) { - m_mdi->saveSettings(); - } - - accel()->writeSettings(CBTConfig::getConfig()); - - CBTConfig::set - (CBTConfig::toolbar, m_viewToolbar_action->isChecked()); - CBTConfig::set - (CBTConfig::mainIndex, m_viewMainIndex_action->isChecked()); - CBTConfig::set - (CBTConfig::infoDisplay, m_viewInfoDisplay_action->isChecked()); - - CBTConfig::set - (CBTConfig::mainSplitterSizes, m_mainSplitter->sizes()); - CBTConfig::set - (CBTConfig::leftPaneSplitterSizes, m_leftPaneSplitter->sizes()); - - // set the default to false - /* CBTConfig::set(CBTConfig::autoTileVertical, false); - CBTConfig::set(CBTConfig::autoTileHorizontal, false); - CBTConfig::set(CBTConfig::autoCascade, false); - */ - CBTConfig::set - (CBTConfig::autoTileVertical, m_windowAutoTileVertical_action->isChecked()); - CBTConfig::set - (CBTConfig::autoTileHorizontal, m_windowAutoTileHorizontal_action->isChecked()); - CBTConfig::set - (CBTConfig::autoCascade, m_windowAutoCascade_action->isChecked()); - - - CProfile* p = m_profileMgr.startupProfile(); - if (p) { - saveProfile(p); - } -} - -/** Reads the settings from the configfile and sets the right properties. */ -void BibleTime::readSettings() { - // accel()->readSettings(CBTConfig::getConfig()); - CBTConfig::setupAccelSettings(CBTConfig::application, actionCollection()); - - m_viewToolbar_action->setChecked( CBTConfig::get - (CBTConfig::toolbar) ); - slotToggleToolbar(); - - m_viewMainIndex_action->setChecked( CBTConfig::get - (CBTConfig::mainIndex) ); - slotToggleMainIndex(); - - m_viewInfoDisplay_action->setChecked( CBTConfig::get - (CBTConfig::infoDisplay) ); - slotToggleInfoDisplay(); - - m_mainSplitter->setSizes( - CBTConfig::get - (CBTConfig::mainSplitterSizes) - ); - m_leftPaneSplitter->setSizes( - CBTConfig::get - (CBTConfig::leftPaneSplitterSizes) - ); - - if ( CBTConfig::get - (CBTConfig::autoTileVertical) ) { - m_windowAutoTileVertical_action->setChecked( true ); - m_windowManualMode_action->setChecked(false); - slotAutoTileVertical(); - } - else if ( CBTConfig::get - (CBTConfig::autoTileHorizontal) ) { - m_windowAutoTileHorizontal_action->setChecked( true ); - m_windowManualMode_action->setChecked(false); - slotAutoTileHorizontal(); - } - else if ( CBTConfig::get - (CBTConfig::autoCascade) ) { - m_windowAutoCascade_action->setChecked(true); - m_windowManualMode_action->setChecked(false); - slotAutoCascade(); - } - else { - m_windowManualMode_action->setChecked(true); - slotManualArrangementMode(); - } -} - -/** Creates a new presenter in the MDI area according to the type of the module. */ -CDisplayWindow* BibleTime::createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& key) { - kapp->setOverrideCursor( waitCursor ); - - CDisplayWindow* displayWindow = CDisplayWindow::createReadInstance(modules, m_mdi); - if ( displayWindow ) { - displayWindow->init(); - displayWindow->show(); - // if (!key.isEmpty()) - displayWindow->lookup(key); - } - - kapp->restoreOverrideCursor(); - return displayWindow; -} - - -/** Creates a new presenter in the MDI area according to the type of the module. */ -CDisplayWindow* BibleTime::createReadDisplayWindow(CSwordModuleInfo* module, const QString& key) { - ListCSwordModuleInfo list; - list.append(module); - - return createReadDisplayWindow(list, key); -} - -CDisplayWindow* BibleTime::createWriteDisplayWindow(CSwordModuleInfo* module, const QString& key, const CDisplayWindow::WriteWindowType& type) { - kapp->setOverrideCursor( waitCursor ); - - ListCSwordModuleInfo modules; - modules.append(module); - - CDisplayWindow* displayWindow = CDisplayWindow::createWriteInstance(modules, m_mdi, type); - if ( displayWindow ) { - displayWindow->init(); - displayWindow->show(); - displayWindow->lookup(key); - } - - kapp->restoreOverrideCursor(); - return displayWindow; -} - -/** Refreshes all presenters.*/ -void BibleTime::refreshDisplayWindows() { - unsigned int index; - for ( index = 0; index < m_mdi->windowList().count(); index++) { - CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index)); - if (window) { - window->reload(); - } - } -} - -/** Called before quit. */ -bool BibleTime::queryExit() { - bool ret = false; - if (m_initialized) { - saveSettings(); - ret = true; - } - - return ret; -} - -/** Called before a window is closed */ -bool BibleTime::queryClose() { - bool ret = true; - - for ( unsigned int index = 0; index < m_mdi->windowList().count(); ++index) { - if (CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index)) - ) { - ret = ret && window->queryClose(); - } - } - - return ret; -} - -/** Reimplementation used for sessions management. */ -void BibleTime::saveProperties(KConfig* /*myConfig*/) {} - -/** Reimplementation used for session management. */ -void BibleTime::readProperties(KConfig* /*myConfig*/) {} - -/** Restores the workspace if the flag for this is set in the config. */ -void BibleTime::restoreWorkspace() { - if (CProfile* p = m_profileMgr.startupProfile()) { - loadProfile(p); - } -} - -/** Sets the caption of the mainwindow */ -void BibleTime::setCaption( const QString& ) { - KMainWindow::setPlainCaption( KApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) ); -} - -/** Sets the plain caption of the main window */ -void BibleTime::setPlainCaption( const QString& ) { - KMainWindow::setPlainCaption( KApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) ); -} - -/** Processes the commandline options given to BibleTime. */ -void BibleTime::processCommandline() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - - // if (CBTConfig::get(CBTConfig::crashedLastTime)) { - if (!CBTConfig::get - (CBTConfig::crashedTwoTimes) && !args->isSet("ignore-session")) { //restore workspace if it crashed only once - restoreWorkspace(); - } - // } - - //open every time a module if the command line option was set. - if ( args->isSet("open-default-bible") && !CBTConfig::get - (CBTConfig::crashedLastTime) && !CBTConfig::get - (CBTConfig::crashedTwoTimes)) { //restore workspace if it crashed ony once - QString bibleKey = args->getOption("open-default-bible"); - CSwordModuleInfo* bible = CBTConfig::get - (CBTConfig::standardBible); - - if (bibleKey == "<random>") { - CSwordVerseKey vk(0); - const int maxIndex = 32400; - - KRandomSequence rs; - int newIndex = rs.getLong(maxIndex); - vk.setPosition(sword::TOP); - vk.Index(newIndex); - bibleKey = vk.key(); - } - createReadDisplayWindow(bible, bibleKey); - // if (isVisible()) - m_mdi->myTileVertical();//we are sure only one window is open, which should be displayed fullscreen in the working area - } -} - -void BibleTime::polish() { - m_initialized = true; - - KMainWindow::polish(); - applyMainWindowSettings(CBTConfig::getConfig(), QString::fromLatin1("MainWindow")); -} - diff --git a/bibletime/bibletime.h b/bibletime/bibletime.h deleted file mode 100644 index ff661e9..0000000 --- a/bibletime/bibletime.h +++ /dev/null @@ -1,421 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef BIBLETIME_H -#define BIBLETIME_H - -//Own includes -#include "bibletimeinterface.h" - -//Frontend includes -#include "frontend/cprofilemgr.h" -#include "frontend/cprofile.h" -#include "frontend/displaywindow/cdisplaywindow.h" - -//Backend includes -#include "backend/cswordmoduleinfo.h" - -//KDE includes -#include <kmainwindow.h> - -//forward: BT classes -class CMDIArea; -class CDisplayWindow; -class CMainIndex; - -namespace InfoDisplay { - class CInfoDisplay; -} - -//KDE classes -class KToggleAction; -class KAccel; -class KPopupMenu; -class KAction; -class KActionMenu; -class KActionCollection; - -//QT classes -class QPopupMenu; -class QProgressDialog; -class QSplitter; - -/** - * @page backend The structure of the backend - * <p> - * The backend implementation for Sword is called CSwordBackend, the classes we use - * to work with keys are called CSwordVerseKey and CSwordLDKey, both are derived from - * the class CSwordKey. - * The CSwordKey derived classes used for Sword do also inherit the classes - * VerseKey (CSwordVerseKey) - * and SWKey (CSwordLDKey). - * </p> - * <p> - * The classes used to handle all module based stuff are derived from CModuleInfo. - * The module classes are: CSwordModuleInfo (for Sword modules), - * CSwordBibleModuleInfo (for bibles), CSwordCommentaryModuleInfo (for commentaries) and - * CSwordLexiconModuleInfo (for lexicons). - * Have a look at the class documentation of the mentioned classes to learn how the - * structure of them looks like and which class inherits which other class. - * </p> - * <p> - * The first objects which should be created in the application is the backend - * (for Sword the class is called CSwordBackend). - * Then create all the different module classes for the correct Sword modules. - * Have a look at - * BibleTime::initBackens() to see how it's done in BibleTime.@br - * Later you can work with them for example by using the CSwordKey and - * CSwordModuleInfo derived class. - * </p> - */ - -/** - * @page frontend The structure of the frontend - * - * <p> - * The frontend contains the classes which interact with the user. For example the main index, - * the display windows, the searchdialog or the other parts. - * </p><p> - * The main index is implemented in the class CGroupManager, the items of the - * main index are implemented in the class CGroupManagerItem. - * Each CGroupManagerItem has a type() function which returns the type of - * the object (Module, Bookmark or Group).<BR> - * The display windows are all derived from the base class CPresenter. - * The display windows which handle Sword modules are all derived from the - * CSwordPresenter class. - * The display windows which provide functionality are CBiblePresenter for - * Bibles, CCommentaryPresenter for commentaries and CLexiconPresenter for - * lexicon and dictionaries. - * CSwordPresenter provides the essential base functions which are - * reimplemented in the derived classes (for example CSwordPresenter::lookup).<BR> - * </p><p> - * Another important part of the frontend are the keychoosers. - * They provide an interface to choose a key of a module. - * The interface for different module types is different. - * The base class is CKeyChooser which is the factory for the derived classes. - * Use the function CKeyChooser::createInstance to get the correct - * keychooser implementation for the desired module.<BR> - * </p> - */ - -/** @mainpage BibleTime - sourcecode documentation - * BibleTime main page. - * <p>This is the sourcecode documentation of BibleTime, a Bible study tool for KDE/Linux. - * BibleTime is devided in two major parts, the backend and the frontend. - * The backend is mainly a wrapper around Sword's classes to use Qt functionality - * to allow easy access to it's functionality and to have it in a (more or less :) - * object oriented structure.</p><BR> - * <p> - * -Introduction to the backend: @ref backend<BR> - * -Introduction to the frontend: @ref frontend.<BR> - * The main class of BibleTime is called @ref BibleTime, which is the main window - * and initializes all important parts at startup. The text display windows - * belong to the @ref frontend. - * </p> - */ - -/** BibleTime's main class. - * The main class of BibleTime. Here are the main widgets created. - * - * This is the main class of BibleTime! This class creates the GUI, the KAction objects - * and connects to some slots. Please insert the creation of actions in initActions, - * the creation of widgets into initView and the connect(...) calls into initConnections. - * Reading from a config file on creation time should go into readSettings(), saving into - * saveSettings(). - * This is the general way of all BibleTime classes. - */ -class BibleTime : public KMainWindow, virtual public BibleTimeInterface { - friend class CMDIArea; - Q_OBJECT -public: - /** - * construtor of BibleTime - */ - BibleTime(); - /** - * destrutor of BibleTime - */ - virtual ~BibleTime(); - - virtual void polish(); - /** - * Reads the settings from the configfile and sets the right properties. - */ - void readSettings(); - /** - * Saves the settings of this class - */ - void saveSettings(); - /** - * Restores the workspace if the flaf for this is set in the config. - */ - void restoreWorkspace(); - /** - * Apply the settings given by the profile p - */ - void applyProfileSettings( Profile::CProfile* p ); - /** - * Stores the settings of the mainwindow in the profile p - */ - void storeProfileSettings( Profile::CProfile* p ); - -public slots: - /** - * Shows the daily tip - */ - void slotHelpTipOfDay(); - /** - * Opens the optionsdialog of BibleTime. - */ - void slotSettingsOptions(); - /** - * Opens the optionsdialog of BibleTime. - */ - void slotSwordSetupDialog(); - /** - * Opens the handbook. - */ - void openOnlineHelp_Handbook(); - /** - * Opens the bible study howto. - */ - void openOnlineHelp_Howto(); - /** - * Sets the plain caption of the main window - */ - virtual void setPlainCaption( const QString& ); - /** - * Sets the caption of the mainwindow - */ - virtual void setCaption(const QString&); - /** - * Processes the commandline options given to BibleTime. - */ - void processCommandline(); - -protected: // Protected methods - /** - * Initializes the view of this widget - */ - void initView(); - /** - * Initializes the menubar of BibleTime. - */ - void initMenubar(); - /** - * Initializes the SIGNAL / SLOT connections - */ - void initConnections(); - /** - * Initializes the backend - */ - void initBackends(); - /** - * Initializes the action objects of the GUI - */ - void initActions(); - /** - * Refreshes all presenter supporting at least in of the features given as parameter. - */ - void refreshDisplayWindows(); - /** - * Called before a window is closed - */ - bool queryClose(); - /** - * Called before quit. - */ - bool queryExit(); - /** - * Reimplementation used for session management. - */ - void readProperties(KConfig* config); - /** - * Reimplementation used for sessions management. - */ - void saveProperties(KConfig* myConfig); - -protected slots: - /** - * Creates a new presenter in the MDI area according to the type of the module. - */ - CDisplayWindow* createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& key); - CDisplayWindow* createReadDisplayWindow(CSwordModuleInfo* module, const QString& key); - CDisplayWindow* createWriteDisplayWindow(CSwordModuleInfo* module, const QString& key, const CDisplayWindow::WriteWindowType& type); - /** - * Is called when the window menu is about to show ;-) - */ - void slotWindowMenuAboutToShow(); - /** - * This slot is connected with the windowAutoTile_action object - */ - void slotAutoTileVertical(); - /** - * This slot is connected with the windowAutoTile_action object - */ - void slotAutoTileHorizontal(); - /** - * This slot is connected with the windowAutoCascade_action object - */ - void slotAutoCascade(); - void slotUpdateWindowArrangementActions( KAction* ); - - void slotCascade(); - void slotTileVertical(); - void slotTileHorizontal(); - - void slotManualArrangementMode(); - - /** - * Is called when a client was selected in the window menu - */ - void slotWindowMenuActivated(); - /** - * Shows/hides the toolbar - */ - void slotToggleToolbar(); - /** - * Opens a toolbar editor - */ - void slotSettingsToolbar(); - /** - * Shows or hides the main index part - */ - void slotToggleMainIndex(); - /** - * Shows or hides the info display part. - */ - void slotToggleInfoDisplay(); - /** - * Saves to the profile with the menu id ID - */ - void saveProfile(int ID); - /** - * Saves the current settings into the currently activatred profile. - */ - void saveProfile(Profile::CProfile* p); - /** - * Deletes the chosen session from the menu and from disk. - */ - void deleteProfile(int ID); - /** - * Loads the profile with the menu id ID - */ - void loadProfile(int ID); - /** - * Loads the profile with the menu ID id - */ - void loadProfile(Profile::CProfile* p); - /** - * Toggles between normal and fullscreen mode. - */ - void toggleFullscreen(); - /** - * Is called when settings in the optionsdialog have been - * changed (ok or apply) - */ - void slotSettingsChanged(); - /** - * Is called when settings in the sword setup dialog have been - * changed (ok or apply) - */ - void slotSwordSetupChanged(); - /** - * Called when search button is pressed - **/ - void slotSearchModules(); - /** - * Called for search default bible - **/ - void slotSearchDefaultBible(); - /** - Saves current settings into a new profile. - */ - void saveToNewProfile(); - /** - * Slot to refresh the save profile and load profile menus. - */ - void refreshProfileMenus(); - - -private: - QPopupMenu* m_windowMenu; - QPopupMenu* m_editMenu; - - /** VIEW menu actions */ - KToggleAction* m_viewToolbar_action; - KToggleAction* m_viewMainIndex_action; - KToggleAction* m_viewInfoDisplay_action; - - /** WINDOW menu actions */ - KAction* m_windowCascade_action; - KAction* m_windowTileHorizontal_action; - KAction* m_windowTileVertical_action; - KActionMenu* m_windowArrangementMode_action; - KToggleAction* m_windowManualMode_action; - KToggleAction* m_windowAutoCascade_action; - KToggleAction* m_windowAutoTileVertical_action; - KToggleAction* m_windowAutoTileHorizontal_action; - KAction* m_windowCloseAll_action; - - KActionCollection* m_windowActionCollection; - - KActionMenu* m_windowSaveProfile_action; - KAction* m_windowSaveToNewProfile_action; - KActionMenu* m_windowLoadProfile_action; - KActionMenu* m_windowDeleteProfile_action; - KToggleAction* m_windowFullscreen_action; - - QPtrList<KAction> m_windowOpenWindowsList; - - KHelpMenu* m_helpMenu; - - - bool m_initialized; - /** - * The list of installed SWORD modules - */ - ListCSwordModuleInfo* m_moduleList; - QProgressDialog* m_progress; - - Profile::CProfile* m_currentProfile; - QSplitter* m_mainSplitter; - QSplitter* m_leftPaneSplitter; - CMDIArea* m_mdi; - - Profile::CProfileMgr m_profileMgr; - CSwordBackend* m_backend; - - CMainIndex* m_mainIndex; - - InfoDisplay::CInfoDisplay* m_infoDisplay; - -protected: //DCOP interface implementation - //helper function - void syncAllModulesByType(const CSwordModuleInfo::ModuleType type, const QString& key); - - //see bibletimeinterface.h for a documentation of these functions - virtual void closeAllModuleWindows(); - virtual void syncAllBibles(const QString& key); - virtual void syncAllCommentaries(const QString& key); - virtual void syncAllLexicons(const QString& key); - virtual void syncAllVerseBasedModules(const QString& key); - virtual void openWindow(const QString& moduleName, const QString& key); - virtual void openDefaultBible(const QString& key); - virtual QString getCurrentReference(); - virtual QStringList searchInModule(const QString& module, const QString& searchText); - virtual QStringList searchInOpenModules(const QString& searchText); - virtual QStringList searchInDefaultBible(const QString& searchText); - virtual QStringList getModulesOfType(const QString& type); - virtual void reloadModules(); -}; - -#endif diff --git a/bibletime/bibletime_dcop.cpp b/bibletime/bibletime_dcop.cpp deleted file mode 100644 index 69113d4..0000000 --- a/bibletime/bibletime_dcop.cpp +++ /dev/null @@ -1,220 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "bibletime.h" - -//frontend includes -#include "frontend/cmdiarea.h" -#include "frontend/cbtconfig.h" -#include "frontend/searchdialog/csearchdialog.h" - -//Sword includes -#include <versekey.h> -#include <listkey.h> - -//helper function -void BibleTime::syncAllModulesByType(const CSwordModuleInfo::ModuleType type, const QString& key) { - qDebug("Syncing modules by type to key %s", key.latin1()); - - QPtrList<QWidget> windows = m_mdi->usableWindowList(); - for (QWidget* w = windows.first(); w; w = windows.next()) { - CDisplayWindow* d = dynamic_cast<CDisplayWindow*>(w); - Q_ASSERT(d); - - if (d && d->modules().count() && d->modules().first()->type() == type) { - d->lookup(key); - } - } -} - -void BibleTime::closeAllModuleWindows() { - qDebug("DCOP: close all windows now..."); - - m_mdi->deleteAll(); -} - -void BibleTime::syncAllBibles(const QString& key) { - qDebug("DCOP: syncing all bibles ..."); - syncAllModulesByType(CSwordModuleInfo::Bible, key); -} - -void BibleTime::syncAllCommentaries(const QString& key) { - qDebug("DCOP: syncing all commentaries ..."); - syncAllModulesByType(CSwordModuleInfo::Commentary, key); -} - -void BibleTime::syncAllLexicons(const QString& key) { - qDebug("DCOP: syncing all lexicons ..."); - syncAllModulesByType(CSwordModuleInfo::Lexicon, key); -} - -void BibleTime::syncAllVerseBasedModules(const QString& key) { - qDebug("DCOP: syncing all verse based modules ..."); - syncAllModulesByType(CSwordModuleInfo::Bible, key); - syncAllModulesByType(CSwordModuleInfo::Commentary, key); -} - -void BibleTime::openWindow(const QString& moduleName, const QString& key) { - qDebug("DCOP: open window for module %s and key %s...", moduleName.latin1(), key.latin1()); - - CSwordModuleInfo* module = CPointers::backend()->findModuleByName(moduleName); - Q_ASSERT(module); - if (module) { - createReadDisplayWindow(module, key); - } -} - -void BibleTime::openDefaultBible(const QString& key) { - qDebug("DCOP: open default bible ..."); - CSwordModuleInfo* mod = CBTConfig::get - (CBTConfig::standardBible); - if (mod) { - openWindow(mod->name(), key); - } -} - -QStringList BibleTime::searchInModule(const QString& moduleName, const QString& searchText) { - qDebug("DCOP: searchInModule %s ...", moduleName.latin1()); - QStringList ret; - CSwordModuleInfo* mod = CPointers::backend()->findModuleByName(moduleName); - - //TODO: Check this - Q_ASSERT(mod); - if (mod) { - //mod->search(searchText, CSwordModuleSearch::multipleWords, sword::ListKey()); - sword::ListKey scope; - mod->searchIndexed( searchText, scope ); - - sword::ListKey result = mod->searchResult(); - const QString lead = QString("[%1] ").arg(moduleName); - ; - for ( int i = 0; i < result.Count(); ++i ) { - sword::SWKey* key = result.getElement(i); - Q_ASSERT(key); - - - if (mod->type() == CSwordModuleInfo::Bible || mod->type() == CSwordModuleInfo::Commentary) { - sword::VerseKey vk(key->getText()); - ret << lead + QString::fromUtf8( vk.getOSISRef() ); - } - else { - ret << lead + QString::fromUtf8( key->getText() ); - } - } - } - - return ret; - -} - -QStringList BibleTime::searchInOpenModules(const QString& searchText) { - qDebug("DCOP: search in open modules ..."); - QStringList ret; - - QWidgetList windows = m_mdi->windowList(); - for ( int i = 0; i < static_cast<int>(windows.count()); ++i ) { - CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.at(i)); - if (w) { - ListCSwordModuleInfo windowModules = w->modules(); - - ListCSwordModuleInfo::iterator end_it = windowModules.end(); - for (ListCSwordModuleInfo::iterator it(windowModules.begin()); it != end_it; ++it) { - ret += searchInModule((*it)->name(), searchText); - }; - }; - }; - - return ret; -} - -QStringList BibleTime::searchInDefaultBible(const QString& searchText) { - CSwordModuleInfo* bible = CBTConfig::get - (CBTConfig::standardBible); - return searchInModule(bible->name(), searchText); -} - -QString BibleTime::getCurrentReference() { - qDebug("BibleTime::getCurrentReference"); - QString ret = QString::null; - - CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(m_mdi->activeWindow()); - Q_ASSERT(w); - - if (w) { - QString modType; - Q_ASSERT(w->modules().first()); - switch (w->modules().first()->type()) { - case CSwordModuleInfo::Bible: - modType = "BIBLE"; - break; - case CSwordModuleInfo::Commentary: - modType = "COMMENTARY"; - break; - case CSwordModuleInfo::GenericBook: - modType = "BOOK"; - break; - case CSwordModuleInfo::Lexicon: - modType = "LEXICON"; - break; - default: - modType = "UNSUPPORTED"; - break; - } - - ret.append("[").append(w->modules().first()->name()).append("] "); - ret.append("[").append(modType).append("] "); - - CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>( w->key() ); - if (vk) { - ret.append( vk->getOSISRef() ); - } - else { - ret.append( w->key()->key() ); - } - } - - return ret; -} - -QStringList BibleTime::getModulesOfType(const QString& type) { - QStringList ret; - - CSwordModuleInfo::ModuleType modType = CSwordModuleInfo::Unknown; - if (type == "BIBLES") { - modType = CSwordModuleInfo::Bible; - } - else if (type == "COMMENTARIES") { - modType = CSwordModuleInfo::Commentary; - } - else if (type == "LEXICONS") { - modType = CSwordModuleInfo::Lexicon; - - } - else if (type == "BOOKS") { - modType = CSwordModuleInfo::GenericBook; - } - - ListCSwordModuleInfo modList = CPointers::backend()->moduleList(); - for (ListCSwordModuleInfo::iterator it( modList.begin() ); it != modList.end(); ++it) { - if ((*it)->type() == modType) { - ret.append( (*it)->name() ); - } - } - - return ret; -} - -void BibleTime::reloadModules() { - //m_backend->reloadModules(); - slotSwordSetupChanged(); -} - diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp deleted file mode 100644 index fb704bf..0000000 --- a/bibletime/bibletime_init.cpp +++ /dev/null @@ -1,609 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "bibletime.h" - -#include "backend/btstringmgr.h" -#include "backend/cswordbackend.h" - -#include "frontend/mainindex/cmainindex.h" -#include "frontend/cprofilemgr.h" -#include "frontend/cprofile.h" -#include "frontend/cmdiarea.h" -#include "frontend/kstartuplogo.h" -#include "frontend/cswordsetupdialog.h" -#include "frontend/cprinter.h" -#include "frontend/cmanageindiceswidget.h" - -#include "backend/clanguagemgr.h" - - -#include "config.h" -#include "frontend/cbtconfig.h" -#include "frontend/cinfodisplay.h" - -#include "util/cpointers.h" -#include "util/cresmgr.h" - -//system includes -#include <stdlib.h> - -//QT includes -#include <qpopupmenu.h> -#include <qsplitter.h> -#include <qguardedptr.h> -#include <qlistview.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qvbox.h> - -//KDE includes -#include <kaboutdata.h> -#include <kaccel.h> -#include <kaction.h> -#include <kapplication.h> -#include <kconfigbase.h> -#include <kdeversion.h> -#include <kglobal.h> -#include <khelpmenu.h> -#include <kiconloader.h> -#include <kmenubar.h> -#include <kstddirs.h> -#include <kstdaction.h> -#include <ktoolbar.h> -#include <klocale.h> -#include <kpopupmenu.h> -#include <kdeversion.h> - -//Sword includes -#include <swlog.h> - -using namespace InfoDisplay; -using namespace Profile; - -/**Initializes the view of this widget*/ -void BibleTime::initView() { - KStartupLogo::setStatusMessage(i18n("Creating BibleTime's GUI") + QString("...")); - - m_mainSplitter = new QSplitter(this, "mainsplitter"); - m_mainSplitter->setChildrenCollapsible(false); - setCentralWidget(m_mainSplitter); - - m_leftPaneSplitter = new QSplitter(Qt::Vertical, m_mainSplitter); - m_leftPaneSplitter->setChildrenCollapsible(false); - - QVBox* vBox = new QVBox(m_leftPaneSplitter); - vBox->setMinimumSize(100, 100); - - QLabel* bookshelfLabel = new QLabel( i18n("Bookshelf"), vBox ); - bookshelfLabel->setMargin(5); - - m_mainIndex = new CMainIndex(vBox); - - m_infoDisplay = new CInfoDisplay(m_leftPaneSplitter); - CPointers::setInfoDisplay(m_infoDisplay); - - m_mdi = new CMDIArea(m_mainSplitter, "mdiarea" ); - m_mdi->setMinimumSize(100, 100); - m_mdi->setFocusPolicy(ClickFocus); - - m_helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true, actionCollection()); -} - -/** Initializes the action objects of the GUI */ -void BibleTime::initActions() { - KStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + QString("...")); - KAction* action = 0; - - action = KStdAction::quit(kapp, SLOT( quit() ), actionCollection()); - action->setToolTip( CResMgr::mainMenu::file::quit::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - action = new KAction(i18n("Search in &open work(s)"), - CResMgr::mainMenu::mainIndex::search::icon, - CResMgr::mainMenu::mainIndex::search::accel, - this, SLOT(slotSearchModules()), actionCollection(), - CResMgr::mainMenu::mainIndex::search::actionName - ); - action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - action = new KAction(i18n("Search in standard &Bible"), - CResMgr::mainMenu::mainIndex::searchdefaultbible::icon, - CResMgr::mainMenu::mainIndex::searchdefaultbible::accel, - this, SLOT(slotSearchDefaultBible()), actionCollection(), - CResMgr::mainMenu::mainIndex::searchdefaultbible::actionName - ); - action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - m_viewToolbar_action = KStdAction::showToolbar(this, SLOT( slotToggleToolbar() ), actionCollection()); - m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - m_viewToolbar_action->plugAccel( accel() ); - #endif - - - m_viewMainIndex_action = new KToggleAction(i18n("&Show bookshelf"), - CResMgr::mainMenu::view::showMainIndex::icon, - CResMgr::mainMenu::view::showMainIndex::accel, - this, SLOT(slotToggleMainIndex()), actionCollection(), - CResMgr::mainMenu::view::showMainIndex::actionName); - m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - m_viewMainIndex_action->plugAccel( accel() ); - #endif - - m_viewInfoDisplay_action = new KToggleAction(i18n("Show &mag"), - CResMgr::mainMenu::view::showInfoDisplay::icon, - CResMgr::mainMenu::view::showInfoDisplay::accel, - this, SLOT(slotToggleInfoDisplay()), actionCollection(), - CResMgr::mainMenu::view::showInfoDisplay::actionName); - m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - m_viewInfoDisplay_action->plugAccel( accel() ); - #endif - - action = KStdAction::preferences(this, SLOT( slotSettingsOptions() ), actionCollection()); - action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - action = new KAction(i18n("Bookshelf &Manager"), - CResMgr::mainMenu::settings::swordSetupDialog::icon, - CResMgr::mainMenu::settings::swordSetupDialog::accel, - this, SLOT( slotSwordSetupDialog() ), actionCollection(), - CResMgr::mainMenu::settings::swordSetupDialog::actionName - ); - action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip ); - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - //delete help action if KDE created it - if ( actionCollection()->action( KStdAction::stdName(KStdAction::ConfigureToolbars) )) { - actionCollection()->remove - (actionCollection()->action( - KStdAction::stdName(KStdAction::ConfigureToolbars)) - ); - } - action = KStdAction::configureToolbars(this, SLOT( slotSettingsToolbar() ), actionCollection()); - action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip ); - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - m_windowArrangementMode_action = new KActionMenu(i18n("&Arrangement mode"), - CResMgr::mainMenu::window::arrangementMode::icon, - actionCollection(), - CResMgr::mainMenu::window::arrangementMode::actionName); - m_windowArrangementMode_action->setDelayed( false ); - - m_windowManualMode_action = new KToggleAction(i18n("&Manual mode"), - CResMgr::mainMenu::window::arrangementMode::manual::icon, - CResMgr::mainMenu::window::arrangementMode::manual::accel, - this, SLOT(slotManualArrangementMode()), actionCollection(), - CResMgr::mainMenu::window::arrangementMode::manual::actionName - ); - m_windowManualMode_action->setToolTip( - CResMgr::mainMenu::window::arrangementMode::manual::tooltip - ); - #if KDE_VERSION_MINOR < 1 - - m_windowManualMode_action->plugAccel( accel() ); - #endif - - m_windowArrangementMode_action->insert( m_windowManualMode_action ); - - - m_windowAutoTileVertical_action = new KToggleAction(i18n("Auto-tile &vertically"), - CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon, - CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel, - this, SLOT(slotAutoTileVertical()), actionCollection(), - CResMgr::mainMenu::window::arrangementMode::autoTileVertical::actionName - ); - m_windowAutoTileVertical_action->setToolTip( - CResMgr::mainMenu::window::arrangementMode::autoTileVertical::tooltip - ); - #if KDE_VERSION_MINOR < 1 - - m_windowAutoTileVertical_action->plugAccel( accel() ); - #endif - - m_windowArrangementMode_action->insert( m_windowAutoTileVertical_action ); - - - m_windowAutoTileHorizontal_action = new KToggleAction(i18n("Auto-tile &horizontally"), - CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon, - CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel, - this, SLOT(slotAutoTileHorizontal()), actionCollection(), - CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::actionName - ); - m_windowAutoTileHorizontal_action->setToolTip( - CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::tooltip - ); - #if KDE_VERSION_MINOR < 1 - - m_windowAutoTileHorizontal_action->plugAccel( accel() ); - #endif - - m_windowArrangementMode_action->insert( m_windowAutoTileHorizontal_action ); - - - m_windowAutoCascade_action = new KToggleAction(i18n("Auto-&cascade"), - CResMgr::mainMenu::window::arrangementMode::autoCascade::icon, - CResMgr::mainMenu::window::arrangementMode::autoCascade::accel, - this, SLOT(slotAutoCascade()), actionCollection(), - CResMgr::mainMenu::window::arrangementMode::autoCascade::actionName - ); - m_windowAutoCascade_action->setToolTip( - CResMgr::mainMenu::window::arrangementMode::autoCascade::tooltip - ); - #if KDE_VERSION_MINOR < 1 - // qWarning("Plug accel"); - m_windowAutoCascade_action->plugAccel( accel() ); - #endif - - m_windowArrangementMode_action->insert( m_windowAutoCascade_action ); - - m_windowCascade_action = new KAction(i18n("&Cascade"), - CResMgr::mainMenu::window::cascade::icon, - CResMgr::mainMenu::window::cascade::accel, - this, SLOT(slotCascade()), actionCollection(), - CResMgr::mainMenu::window::cascade::actionName - ); - m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - m_windowCascade_action->plugAccel( accel() ); - #endif - - - m_windowTileVertical_action = new KAction(i18n("Tile &vertically"), - CResMgr::mainMenu::window::tileVertical::icon, - CResMgr::mainMenu::window::tileVertical::accel, - this, SLOT(slotTileVertical()), actionCollection(), - CResMgr::mainMenu::window::tileVertical::actionName - ); - m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip ); - #if KDE_VERSION_MINOR < 1 - - m_windowTileVertical_action->plugAccel( accel() ); - #endif - - m_windowTileHorizontal_action = new KAction(i18n("Tile &horizontally"), - CResMgr::mainMenu::window::tileHorizontal::icon, - CResMgr::mainMenu::window::tileHorizontal::accel, - this, SLOT(slotTileHorizontal()), actionCollection(), - CResMgr::mainMenu::window::tileHorizontal::actionName - ); - m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - m_windowTileHorizontal_action->plugAccel( accel() ); - #endif - - - m_windowCloseAll_action = new KAction(i18n("Cl&ose all"), - CResMgr::mainMenu::window::closeAll::icon, - CResMgr::mainMenu::window::closeAll::accel, - m_mdi, SLOT(deleteAll()), actionCollection(), - CResMgr::mainMenu::window::closeAll::actionName - ); - m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip ); - #if KDE_VERSION_MINOR < 1 - - m_windowCloseAll_action->plugAccel( accel() ); - #endif - - - m_windowSaveProfile_action = new KActionMenu(i18n("&Save session"), - CResMgr::mainMenu::window::saveProfile::icon, - actionCollection(), - CResMgr::mainMenu::window::saveProfile::actionName - ); - m_windowSaveProfile_action->setToolTip( CResMgr::mainMenu::window::saveProfile::tooltip ); - m_windowSaveProfile_action->setDelayed( false ); - #if KDE_VERSION_MINOR < 1 - - m_windowSaveProfile_action->plugAccel( accel() ); - #endif - - - m_windowSaveToNewProfile_action = new KAction(i18n("Save as &new session"), - CResMgr::mainMenu::window::saveToNewProfile::icon, - CResMgr::mainMenu::window::saveToNewProfile::accel, - this, SLOT(saveToNewProfile()), actionCollection(), - CResMgr::mainMenu::window::saveToNewProfile::actionName - ); - m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip ); - #if KDE_VERSION_MINOR < 1 - - m_windowSaveToNewProfile_action->plugAccel( accel() ); - #endif - - - m_windowLoadProfile_action = new KActionMenu(i18n("&Load session"), - CResMgr::mainMenu::window::loadProfile::icon, - actionCollection(), - CResMgr::mainMenu::window::loadProfile::actionName - ); - m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::loadProfile::tooltip ); - m_windowLoadProfile_action->setDelayed( false ); - #if KDE_VERSION_MINOR < 1 - - m_windowLoadProfile_action->plugAccel( accel() ); - #endif - - m_windowDeleteProfile_action = new KActionMenu(i18n("&Delete session"), - CResMgr::mainMenu::window::deleteProfile::icon, - actionCollection(), - CResMgr::mainMenu::window::deleteProfile::actionName - ); - m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::deleteProfile::tooltip ); - m_windowLoadProfile_action->setDelayed( false ); - #if KDE_VERSION_MINOR < 1 - - m_windowDeleteProfile_action->plugAccel( accel() ); - #endif - - m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"), - CResMgr::mainMenu::window::showFullscreen::icon, - CResMgr::mainMenu::window::showFullscreen::accel, - this, SLOT(toggleFullscreen()), actionCollection(), - CResMgr::mainMenu::window::showFullscreen::actionName - ); - m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip ); - m_windowFullscreen_action->setShortcutConfigurable(true); - #if KDE_VERSION_MINOR < 1 - - m_windowFullscreen_action->plugAccel( accel() ); - #endif - - //connect the profile popups to the right slots - KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu(); - KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu(); - KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu(); - - connect(loadPopup, SIGNAL(activated(int)), SLOT(loadProfile(int))); - connect(savePopup, SIGNAL(activated(int)), SLOT(saveProfile(int))); - connect(deletePopup, SIGNAL(activated(int)), SLOT(deleteProfile(int))); - - refreshProfileMenus(); - - if ( actionCollection()->action( KStdAction::stdName(KStdAction::HelpContents) )) { //delete help action if KDE created it - actionCollection()->remove - (actionCollection()->action(KStdAction::stdName(KStdAction::HelpContents)) ); - } - - action = new KAction(i18n("&Handbook"), - CResMgr::mainMenu::help::handbook::icon, - CResMgr::mainMenu::help::handbook::accel, - this, SLOT(openOnlineHelp_Handbook()), actionCollection(), - CResMgr::mainMenu::help::handbook::actionName - ); - action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - action = new KAction(i18n("&Bible Study Howto"), - CResMgr::mainMenu::help::bibleStudyHowTo::icon, - CResMgr::mainMenu::help::bibleStudyHowTo::accel, - this, SLOT(openOnlineHelp_Howto()), actionCollection(), - CResMgr::mainMenu::help::bibleStudyHowTo::actionName - ); - action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip ); - - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - if ( actionCollection()->action( KStdAction::stdName( KStdAction::WhatsThis ) ) ) { //delete "What's this" action if KDE created it already - KAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis )); - actionCollection()->remove - ( action ); - } - - - if ( actionCollection()->action( KStdAction::stdName( KStdAction::ReportBug ) ) ) { //delete Report Bug action if KDE created it - actionCollection()->remove - (actionCollection()->action(KStdAction::stdName( KStdAction::ReportBug ))); - } - action = KStdAction::reportBug(m_helpMenu, SLOT(reportBug()), actionCollection()); - action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip); - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - action = new KAction(i18n("&Daily tip"), - CResMgr::mainMenu::help::dailyTip::icon, - CResMgr::mainMenu::help::dailyTip::accel, - this, SLOT(slotHelpTipOfDay()), actionCollection(), - CResMgr::mainMenu::help::dailyTip::actionName - ); - action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip); - #if KDE_VERSION_MINOR < 1 - - action->plugAccel( accel() ); - #endif - - if ( actionCollection()->action( KStdAction::stdName( KStdAction::AboutApp ) ) ) { //delete About KDE action if KDE created it - actionCollection()->remove - (actionCollection()->action(KStdAction::stdName( KStdAction::AboutApp ))); - } - action = KStdAction::aboutApp(m_helpMenu, SLOT(aboutApplication()), actionCollection()); - action->setToolTip(CResMgr::mainMenu::help::aboutBibleTime::tooltip); - - //delete About KDE action if KDE created it already - if ( actionCollection()->action( KStdAction::stdName( KStdAction::AboutKDE ) ) ) { //delete About KDE action if KDE created it - actionCollection()->remove - (actionCollection()->action(KStdAction::stdName( KStdAction::AboutKDE ))); - } - action = KStdAction::aboutKDE(m_helpMenu, SLOT(aboutKDE()), actionCollection()); - action->setToolTip(CResMgr::mainMenu::help::aboutKDE::tooltip); -} - -/** Initializes the menubar of BibleTime. */ -void BibleTime::initMenubar() { - //get the window and edit menus using the actions and their properties - m_windowMenu = dynamic_cast<QPopupMenu*>(m_windowCloseAll_action->container(0)); -} - -/** Initializes the SIGNAL / SLOT connections */ -void BibleTime::initConnections() { - connect(m_mdi, SIGNAL(sigSetToplevelCaption(const QString&)), - this, SLOT(setPlainCaption(const QString&))); - connect(m_mdi, SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)), - this, SLOT(createReadDisplayWindow(ListCSwordModuleInfo, const QString&))); - - Q_ASSERT(m_windowMenu); - if (m_windowMenu) { - connect(m_windowMenu, SIGNAL(aboutToShow()), - this, SLOT(slotWindowMenuAboutToShow())); - } - else { - qWarning("Main window: can't find window menu"); - } - - - connect( - m_mainIndex, SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)), - this, SLOT(createReadDisplayWindow(ListCSwordModuleInfo,const QString&)) - ); - connect( - m_mainIndex, SIGNAL(createWriteDisplayWindow(CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType&)), - this, SLOT(createWriteDisplayWindow(CSwordModuleInfo*,const QString&, const CDisplayWindow::WriteWindowType&)) - ); - connect(m_mainIndex, SIGNAL(signalSwordSetupChanged()), this, SLOT(slotSwordSetupChanged())); -} - -/** Initializes the backend */ -void BibleTime::initBackends() { - KStartupLogo::setStatusMessage(i18n("Initializing Sword") + QString("...")); - - StringMgr::setSystemStringMgr( new BTStringMgr() ); - SWLog::getSystemLog()->setLogLevel(1); - - m_backend = new CSwordBackend(); - m_backend->booknameLanguage( CBTConfig::get - (CBTConfig::language) ); - - CPointers::setBackend(m_backend); - const CSwordBackend::LoadError errorCode = m_backend->initModules(); - - m_moduleList = 0; - if ( errorCode == CSwordBackend::NoError ) { //no error - m_moduleList = &(m_backend->moduleList()); - } - else { - m_moduleList = 0; - //show error message that initBackend failed - switch (errorCode) { - case CSwordBackend::NoSwordConfig: //mods.d or mods.conf missing - { - KStartupLogo::hideSplash(); - BookshelfManager::CSwordSetupDialog dlg; - dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword ); - dlg.exec(); - break; - } - - case CSwordBackend::NoModules: //no modules installed, but config exists - { - KStartupLogo::hideSplash(); - BookshelfManager::CSwordSetupDialog dlg; - dlg.showPart( BookshelfManager::CSwordSetupDialog::Install ); - dlg.exec(); - break; - } - - default: //unknown error - { - KStartupLogo::hideSplash(); - BookshelfManager::CSwordSetupDialog dlg; - dlg.showPart( BookshelfManager::CSwordSetupDialog::Sword ); - dlg.exec(); - break; - } - } - } - - KStartupLogo::setStatusMessage(i18n("Checking indices") + QString("...")); - //This function will - // - delete all orphaned indexes (no module present) if autoDeleteOrphanedIndices is true - // - delete all indices of modules where hasIndex() returns false - BookshelfManager::CManageIndicesWidget::deleteOrphanedIndices(); - -} - -/** Apply the settings given by the profile p*/ -void BibleTime::applyProfileSettings( CProfile* p ) { - Q_ASSERT(p); - if (!p) return; - - if (m_initialized) { //on startup KDE sets the main geometry - //see polish(), where m_initialized is set and the KDE methods are called for window resize - - //first Main Window state - m_windowFullscreen_action->setChecked( p->fullscreen() ); //set the fullscreen button state - toggleFullscreen(); //either showFullscreen or showNormal - if (p->maximized()) KMainWindow::showMaximized(); //if maximized, then also call showMaximized - - //Then Main Window geometry - KMainWindow::resize( p->geometry().size() ); //Don't use KMainWindowInterface::resize - KMainWindow::move( p->geometry().topLeft() );//Don't use KMainWindowInterface::move -} -} - -/** Stores the settings of the mainwindow in the profile p */ -void BibleTime::storeProfileSettings( CProfile* p ) { - Q_ASSERT(p && m_windowFullscreen_action); - if (!p || !m_windowFullscreen_action) return; - - p->setFullscreen( m_windowFullscreen_action->isChecked() ); - p->setMaximized( this->KMainWindow::isMaximized() ); - - QRect geometry; - geometry.setTopLeft(pos()); - geometry.setSize(size()); - p->setGeometry(geometry); -} diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp deleted file mode 100644 index 8d9ad89..0000000 --- a/bibletime/bibletime_slots.cpp +++ /dev/null @@ -1,570 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//own includes -#include "bibletime.h" -#include "config.h" - -#include "backend/cswordversekey.h" - -#include "util/ctoolclass.h" - -#include "frontend/cmdiarea.h" -#include "frontend/cprofilemgr.h" -#include "frontend/cprofile.h" -#include "frontend/cprofilewindow.h" -#include "frontend/coptionsdialog.h" -#include "frontend/cswordsetupdialog.h" -#include "frontend/cbtconfig.h" -#include "frontend/cinputdialog.h" -#include "frontend/cinfodisplay.h" -#include "frontend/mainindex/cmainindex.h" -#include "frontend/mainindex/cindexitem.h" -#include "frontend/displaywindow/cdisplaywindow.h" -#include "frontend/displaywindow/cbiblereadwindow.h" -#include "frontend/searchdialog/csearchdialog.h" - -#include <errno.h> - -//QT includes -#include <qprogressdialog.h> -#include <qlistview.h> -#include <qvaluelist.h> -#include <qclipboard.h> -#include <qinputdialog.h> - -//KDE includes -#include <kaction.h> -#include <kapplication.h> -#include <kaboutkde.h> -#include <kaboutdialog.h> -#include <kbugreport.h> -#include <kaboutapplication.h> -#include <kstandarddirs.h> -#include <kmenubar.h> -#include <kaboutdata.h> -#include <kglobal.h> -#include <klocale.h> -#include <kedittoolbar.h> -#include <kpopupmenu.h> -#include <khelpmenu.h> -#include <ktip.h> - -//Sword includes -#include <versekey.h> - -using namespace Profile; - -/* An action which stores a user defined pointer to a widget. - * @author Joachim Ansorg - */ -class KUserDataAction : public KToggleAction { -public: - KUserDataAction( QString caption, const KShortcut& shortcut, const QObject* receiver, const char* slot, KActionCollection* actionCollection) -: KToggleAction(caption, shortcut, receiver, slot, actionCollection), m_userData(0) { /* no impl */ - }; - - void setUserData(QWidget* const data) { - m_userData = data; - }; - QWidget* const getUserData() const { - return m_userData; - }; - -private: - QWidget* m_userData; -}; - -/** Opens the optionsdialog of BibleTime. */ -void BibleTime::slotSettingsOptions() { - COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", actionCollection()); - connect(dlg, SIGNAL(signalSettingsChanged()), SLOT(slotSettingsChanged()) ); - - dlg->exec(); - dlg->delayedDestruct(); -} - -/** Is called when settings in the optionsdialog were changed (ok or apply) */ -void BibleTime::slotSettingsChanged() { - const QString language = CBTConfig::get - (CBTConfig::language); - m_backend->booknameLanguage(language); - - QListViewItemIterator it( m_mainIndex ); - CItemBase* item = 0; - for ( ; it.current(); ++it ) { - if ( (item = dynamic_cast<CItemBase*>(it.current())) ) { - item->update(); - } - } - - refreshDisplayWindows(); - refreshProfileMenus(); -} - -/** Opens the sword setup dialog of BibleTime. */ -void BibleTime::slotSwordSetupDialog() { - BookshelfManager::CSwordSetupDialog *dlg = new BookshelfManager::CSwordSetupDialog(this, "CSwordSetupDialog"); - connect(dlg, SIGNAL(signalSwordSetupChanged()), SLOT(slotSwordSetupChanged()) ); - - dlg->exec(); - dlg->delayedDestruct(); -} - -/** Is called when settings in the sword setup dialog were changed (ok or apply) */ -void BibleTime::slotSwordSetupChanged() { - /* - Refresh everything here what might have changed - these are the mainindex, the searchdialog, the displaywindows - But at first we have to reset the Sword backend to reload the modules - */ - m_mainIndex->saveBookmarks(); - - CPointers::deleteBackend(); - m_backend = new CSwordBackend(); - CPointers::setBackend(m_backend); - m_backend->initModules(); - - m_mainIndex->reloadSword(); - - // refresh display windows - refreshDisplayWindows(); -} - -/** Shows the daily tip */ -void BibleTime::slotHelpTipOfDay() { - KTipDialog::setShowOnStart( CBTConfig::get - (CBTConfig::tips) ); - KTipDialog::showTip(this, "bibletime/tips", true); -} - -/** Is called just before the window menu is ahown. */ -void BibleTime::slotWindowMenuAboutToShow() { - Q_ASSERT(m_windowMenu); - if (!m_windowMenu) { - return; - } - - if ( m_mdi->windowList().isEmpty() ) { - m_windowCascade_action->setEnabled(false); - m_windowTileVertical_action->setEnabled(false); - m_windowTileHorizontal_action->setEnabled(false); - m_windowCloseAll_action->setEnabled(false); - } - else if (m_mdi->windowList().count() == 1) { - m_windowTileVertical_action->setEnabled( false ); - m_windowTileHorizontal_action->setEnabled( false ); - m_windowCascade_action->setEnabled( false ); - m_windowCloseAll_action->setEnabled( true ); - // m_windowMenu->insertSeparator(); - } - else { - slotUpdateWindowArrangementActions(0); //update the window tile/cascade states - m_windowCloseAll_action->setEnabled( true ); - } - -#if QT_VERSION >= 0x030200 - QPtrList<KAction>::iterator end = m_windowOpenWindowsList.end(); - for (QPtrList<KAction>::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) { - (*it)->unplugAll(); - } -#else - QPtrListIterator<KAction> it(m_windowOpenWindowsList); - while (it.current() != 0){ - it.current()->unplugAll(); - ++it; - } -#endif - m_windowOpenWindowsList.setAutoDelete(true); - m_windowOpenWindowsList.clear(); - - if (!m_windowActionCollection) { - m_windowActionCollection = new KActionCollection(this); - } - - QWidgetList windows = m_mdi->windowList(); - const int count = windows.count(); - for ( int i = 0; i < count; ++i ) { - QWidget* w = windows.at(i); - Q_ASSERT(w); - - KUserDataAction* action = new KUserDataAction(w->caption(), KShortcut(), this, SLOT(slotWindowMenuActivated()), m_windowActionCollection); - Q_ASSERT(action); - action->setUserData(w); - - m_windowOpenWindowsList.append(action); - action->setChecked( w == m_mdi->activeWindow() ); - action->plug(m_windowMenu); - } -} - -/** This slot is connected with the windowAutoTile_action object */ -void BibleTime::slotUpdateWindowArrangementActions( KAction* clickedAction ) { - /* If a toggle action was clicked we see if it checked ot unchecked and - * enable/disable the simple cascade and tile options accordingly - */ - m_windowTileVertical_action->setEnabled( m_windowManualMode_action->isChecked() ); - m_windowTileHorizontal_action->setEnabled( m_windowManualMode_action->isChecked() ); - m_windowCascade_action->setEnabled( m_windowManualMode_action->isChecked() ); - - if (clickedAction) { - m_windowManualMode_action->setEnabled( - m_windowManualMode_action != clickedAction - && m_windowTileHorizontal_action != clickedAction - && m_windowTileVertical_action != clickedAction - && m_windowCascade_action != clickedAction - ); - m_windowAutoTileVertical_action->setEnabled( m_windowAutoTileVertical_action != clickedAction ); - m_windowAutoTileHorizontal_action->setEnabled( m_windowAutoTileHorizontal_action != clickedAction ); - m_windowAutoCascade_action->setEnabled( m_windowAutoCascade_action != clickedAction ); - } - - if (clickedAction == m_windowManualMode_action) { - m_windowAutoTileVertical_action->setChecked(false); - m_windowAutoTileHorizontal_action->setChecked(false); - m_windowAutoCascade_action->setChecked(false); - - m_mdi->setGUIOption( CMDIArea::Nothing ); - } - else if (clickedAction == m_windowAutoTileVertical_action) { - m_windowManualMode_action->setChecked(false); - m_windowAutoTileHorizontal_action->setChecked(false); - m_windowAutoCascade_action->setChecked(false); - - m_mdi->setGUIOption( CMDIArea::autoTileVertical ); - } - else if (clickedAction == m_windowAutoTileHorizontal_action) { - m_windowManualMode_action->setChecked(false); - m_windowAutoTileVertical_action->setChecked(false); - m_windowAutoCascade_action->setChecked(false); - - m_mdi->setGUIOption( CMDIArea::autoTileHorizontal ); - } - else if (clickedAction == m_windowAutoCascade_action) { - m_windowManualMode_action->setChecked(false); - m_windowAutoTileHorizontal_action->setChecked(false); - m_windowAutoTileVertical_action->setChecked(false); - - m_mdi->setGUIOption( CMDIArea::autoCascade ); - } - else if (clickedAction == m_windowCascade_action) { - m_mdi->setGUIOption( CMDIArea::Nothing ); - m_mdi->myCascade(); - } - else if (clickedAction == m_windowTileVertical_action) { - m_mdi->setGUIOption( CMDIArea::Nothing ); - m_mdi->myTileVertical(); - } - else if (clickedAction == m_windowTileHorizontal_action) { - m_mdi->setGUIOption( CMDIArea::Nothing ); - m_mdi->myTileHorizontal(); - } -} - -void BibleTime::slotManualArrangementMode() { - slotUpdateWindowArrangementActions( m_windowManualMode_action ); -} - -/** This slot is connected with the windowAutoTile_action object */ -void BibleTime::slotAutoTileHorizontal() { - slotUpdateWindowArrangementActions( m_windowAutoTileHorizontal_action ); -} - -/** This slot is connected with the windowAutoTile_action object */ -void BibleTime::slotAutoTileVertical() { - slotUpdateWindowArrangementActions( m_windowAutoTileVertical_action ); -} - -void BibleTime::slotCascade() { - slotUpdateWindowArrangementActions( m_windowCascade_action ); -} - -void BibleTime::slotTileVertical() { - slotUpdateWindowArrangementActions( m_windowTileVertical_action ); -} - -void BibleTime::slotTileHorizontal() { - slotUpdateWindowArrangementActions( m_windowTileHorizontal_action ); -} - -/** This slot is connected with the windowAutoCascade_action object */ -void BibleTime::slotAutoCascade() { - slotUpdateWindowArrangementActions( m_windowAutoCascade_action ); -} - -void BibleTime::slotWindowMenuActivated() { - if (!m_windowMenu) { - return; - } - - const KUserDataAction* action = dynamic_cast<const KUserDataAction*>(sender()); - Q_ASSERT(action); - if (action) { - QWidget* const window = action->getUserData(); - Q_ASSERT(window); - if ( window ) { - window->setFocus(); - } - } -} - - -/** Shows/hides the toolbar */ -void BibleTime::slotToggleToolbar() { - Q_ASSERT(toolBar("mainToolBar")); - - if (m_viewToolbar_action->isChecked()) { - toolBar("mainToolBar")->show(); - } - else { - toolBar("mainToolBar")->hide(); - } -} - -/** Shows or hides the groupmanager. -*/ -void BibleTime::slotToggleMainIndex() { - //we use the parent widget because the main index is enclosed in a layout which adds the label at the top - if (m_viewMainIndex_action->isChecked()) { - m_mainIndex->parentWidget()->show(); - } - else { - m_mainIndex->parentWidget()->hide(); - } -} - -/** Shows or hides the groupmanager. */ -void BibleTime::slotToggleInfoDisplay() { - if (m_viewInfoDisplay_action->isChecked()) { - m_infoDisplay->show(); - } - else { - m_infoDisplay->hide(); - } -} - -/** Opens a toolbar editor */ -void BibleTime::slotSettingsToolbar() { - KEditToolbar dlg(actionCollection()); - if (dlg.exec()) { - createGUI(); - } -} - -void BibleTime::slotSearchModules() { - //get the modules of the open windows - ListCSwordModuleInfo modules; - - QWidgetList windows = m_mdi->windowList(); - for ( int i = 0; i < static_cast<int>(windows.count()); ++i ) { - if (CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.at(i))) { - ListCSwordModuleInfo windowModules = w->modules(); - - ListCSwordModuleInfo::iterator end_it = windowModules.end(); - for (ListCSwordModuleInfo::iterator it(windowModules.begin()); it != end_it; ++it) { - modules.append(*it); - }; - }; - }; - - Search::CSearchDialog::openDialog(modules, QString::null); -} - -/* Search default Bible slot - * Call CSearchDialog::openDialog with only the default bible module - */ -void BibleTime::slotSearchDefaultBible() { - ListCSwordModuleInfo module; - CSwordModuleInfo* bible = CBTConfig::get - (CBTConfig::standardBible); - if (bible) { - module.append(bible); - } - - Search::CSearchDialog::openDialog(module, QString::null); -} - -void BibleTime::openOnlineHelp_Handbook() { - kapp->invokeHelp("", "bibletime/handbook/"); -} - -void BibleTime::openOnlineHelp_Howto() { - kapp->invokeHelp("", "bibletime/howto/"); -} - -/** Saves the current settings into the currently activatred profile. */ -void BibleTime::saveProfile(int ID) { - m_mdi->setUpdatesEnabled(false); - - KPopupMenu* popup = m_windowSaveProfile_action->popupMenu(); - const QString profileName = popup->text(ID).remove("&"); - CProfile* p = m_profileMgr.profile( profileName ); - Q_ASSERT(p); - if ( p ) { - saveProfile(p); - } - - m_mdi->setUpdatesEnabled(true); -} - -void BibleTime::saveProfile(CProfile* profile) { - if (!profile) { - return; - } - - //save mainwindow settings - storeProfileSettings(profile); - - QWidgetList windows = m_mdi->windowList(); - QPtrList<CProfileWindow> profileWindows; - for (QWidget* w = windows.first(); w; w = windows.next()) { - CDisplayWindow* displayWindow = dynamic_cast<CDisplayWindow*>(w); - if (!displayWindow) { - continue; - } - - CProfileWindow* profileWindow = new CProfileWindow(); - displayWindow->storeProfileSettings(profileWindow); - profileWindows.append(profileWindow); - } - profile->save(profileWindows); - - //clean up memory - delete all created profile windows - profileWindows.setAutoDelete(true); - profileWindows.clear(); -} - -void BibleTime::loadProfile(int ID) { - KPopupMenu* popup = m_windowLoadProfile_action->popupMenu(); - //HACK: workaround the inserted & char by KPopupMenu - const QString profileName = popup->text(ID).remove("&"); - CProfile* p = m_profileMgr.profile( profileName ); - // qWarning("requesting popup: %s", popup->text(ID).latin1()); - Q_ASSERT(p); - - if ( p ) { - m_mdi->deleteAll(); - loadProfile(p); - } -} - -void BibleTime::loadProfile(CProfile* p) { - Q_ASSERT(p); - if (!p) { - return; - } - - QPtrList<CProfileWindow> windows = p->load(); - Q_ASSERT(windows.count()); - - //load mainwindow setttings - applyProfileSettings(p); - - m_mdi->setUpdatesEnabled(false);//don't auto tile or auto cascade, this would mess up everything!! - - QWidget* focusWindow = 0; - - // for (CProfileWindow* w = windows.last(); w; w = windows.prev()) { //from the last one to make sure the order is right in the mdi area - for (CProfileWindow* w = windows.first(); w; w = windows.next()) { - const QString key = w->key(); - QStringList usedModules = w->modules(); - - ListCSwordModuleInfo modules; - for ( QStringList::Iterator it = usedModules.begin(); it != usedModules.end(); ++it ) { - if (CSwordModuleInfo* m = m_backend->findModuleByName(*it)) { - modules.append(m); - } - } - if (!modules.count()) { //are the modules still installed? If not continue wih next session window - continue; - } - - //is w->isWriteWindow is false we create a write window, otherwise a read window - CDisplayWindow* displayWindow = 0; - if (w->writeWindowType() > 0) { //create a write window - displayWindow = createWriteDisplayWindow(modules.first(), key, CDisplayWindow::WriteWindowType(w->writeWindowType()) ); - } - else { //create a read window - displayWindow = createReadDisplayWindow(modules, key); - } - - if (displayWindow) { //if a window was created initialize it. - if (w->hasFocus()) { - focusWindow = displayWindow; - } - - displayWindow->applyProfileSettings(w); - }; - } - - m_mdi->setUpdatesEnabled(true); - - if (focusWindow) { - focusWindow->setFocus(); - } -} - -void BibleTime::deleteProfile(int ID) { - KPopupMenu* popup = m_windowDeleteProfile_action->popupMenu(); - //HACK: work around the inserted & char by KPopupMenu - const QString profileName = popup->text(ID).remove("&"); - CProfile* p = m_profileMgr.profile( profileName ); - Q_ASSERT(p); - - if ( p ) { - m_profileMgr.remove(p); - } - refreshProfileMenus(); -} - -void BibleTime::toggleFullscreen() { - m_windowFullscreen_action->isChecked() ? showFullScreen() : showNormal(); - m_mdi->triggerWindowUpdate(); -} - -/** Saves current settings into a new profile. */ -void BibleTime::saveToNewProfile() { - bool ok = false; - const QString name = QInputDialog::getText(i18n("Session name:"), i18n("Please enter a name for the new session."), QLineEdit::Normal, QString::null, &ok, this); - if (ok && !name.isEmpty()) { - CProfile* profile = m_profileMgr.create(name); - saveProfile(profile); - }; - - refreshProfileMenus(); -} - -/** Slot to refresh the save profile and load profile menus. */ -void BibleTime::refreshProfileMenus() { - KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu(); - savePopup->clear(); - - KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu(); - loadPopup->clear(); - - KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu(); - deletePopup->clear(); - - //refresh the load, save and delete profile menus - m_profileMgr.refresh(); - QPtrList<CProfile> profiles = m_profileMgr.profiles(); - - const bool enableActions = bool(profiles.count() != 0); - m_windowSaveProfile_action->setEnabled(enableActions); - m_windowLoadProfile_action->setEnabled(enableActions); - m_windowDeleteProfile_action->setEnabled(enableActions); - - for (CProfile* p = profiles.first(); p; p = profiles.next()) { - savePopup->insertItem(p->name()); - loadPopup->insertItem(p->name()); - deletePopup->insertItem(p->name()); - } -} diff --git a/bibletime/bibletimeapp.cpp b/bibletime/bibletimeapp.cpp deleted file mode 100644 index 1a962f9..0000000 --- a/bibletime/bibletimeapp.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "bibletimeapp.h" - -#include "frontend/cbtconfig.h" - -#include "util/cresmgr.h" - -//KDE includes -#include <dcopclient.h> - -BibleTimeApp::BibleTimeApp() { - initDCOP(); - - CResMgr::init_i18n(); -} - -BibleTimeApp::~BibleTimeApp() { - - //we can set this safely now because we close now (hopyfully without crash) - CBTConfig::set(CBTConfig::crashedLastTime, false); - CBTConfig::set(CBTConfig::crashedTwoTimes, false); - - deleteDisplayTemplateMgr(); - deleteLanguageMgr(); - deleteBackend(); -} - -void BibleTimeApp::initDCOP() { - const bool dcopOk = dcopClient()->attach(); - Q_ASSERT(dcopOk); - - if (dcopOk) { - const QCString appId = dcopClient()->registerAs(kapp->name(), false); - // dcopClient()->setDefaultObject("BibleTimeInterface"); - } -} diff --git a/bibletime/bibletimeapp.h b/bibletime/bibletimeapp.h deleted file mode 100644 index b1ed010..0000000 --- a/bibletime/bibletimeapp.h +++ /dev/null @@ -1,33 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef BIBLETIMEAPP_H -#define BIBLETIMEAPP_H - -//BibleTime -#include "util/cpointers.h" - -//KDE -#include <kapplication.h> - -/** The BibleTimeApp class is used to clean up all instances of the backend and to delete all created module objects. - * @author The BibleTime team - */ -class BibleTimeApp : public KApplication, public CPointers { -public: - BibleTimeApp(); - virtual ~BibleTimeApp(); - -protected: - void initDCOP(); -}; - -#endif diff --git a/bibletime/bibletimeinterface.h b/bibletime/bibletimeinterface.h deleted file mode 100644 index 0bab1f6..0000000 --- a/bibletime/bibletimeinterface.h +++ /dev/null @@ -1,111 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef BIBLETIME_INTERFACE_H -#define BIBLETIME_INTERFACE_H - -//Qt includes -#include <qstring.h> -#include <qstringlist.h> - -//KDE includes -#include <dcopobject.h> -#include <kmainwindowiface.h> - -/** DCOP interface definition for BibleTime. -* This is the interface definition for BibleTime's DCOP client interface. The main window class "BibleTime" -* inherits from this class and re-implements these pure virtual functions. -* It uses virtual inheritance so that a widget which inherits twice from DCOPObject does not get mixed up. -* This file is turned into bibletimeinterface_skel.cpp by the KDE automake system. -* -* @author Joachim Ansorg -*/ -class BibleTimeInterface : virtual public DCOPObject { - //This K_DCOP line is required so that the k_dcop: and void are processed. - K_DCOP - -public: -BibleTimeInterface(QCString id) : DCOPObject(id) {} - -k_dcop: - /** Sync all open Bible windows to the key. - * @param key The key which is set to all Bible windows. - */ - virtual void syncAllBibles(const QString& key) = 0; - /** Sync all open commentary windows to the key. - * @param key The key which is set to all Commentary windows. - */ - virtual void syncAllCommentaries(const QString& key) = 0; - /** Sync all open lexicon windows to the key. - * @param key The key which is set to all Lexicon windows. - */ - virtual void syncAllLexicons(const QString& key) = 0; - /** Sync all open verse based (i.e. Bibles and commentaries) windows to the key. - * @param key The key which is set to all Bible and Commentary windows. - */ - virtual void syncAllVerseBasedModules(const QString& key) = 0; - /** Reload all modules - */ - virtual void reloadModules() = 0; - /** Open a new read window for the module moduleName using the given key - * @param moduleName The name of the module which is opened in a new module window. - * @param key The key to set to the newly opened window. - */ - virtual void openWindow(const QString& moduleName, const QString& key) = 0; - /** Open a new read window for the default Bible module using the given key - * @param key The key to set to the newly opened window. - */ - virtual void openDefaultBible(const QString& key) = 0; - /** Close all open windows. - */ - virtual void closeAllModuleWindows() = 0; - /** Returns the reference used in the current window. - * The format of the returned reference is - * [Module] [Type] OSIS_Reference, - * wtih type one of BIBLE/COMMENTARY/BOOK/LEXICON/UNSUPPORTED - * If the type is BIBLE or COMMENTARY the reference is an OSIS ref - * in the other cases it's the key name, for books /Chapter/Subsection - * for Lexicons just the plain key, e.g. "ADAM". - * e.g. - * [KJV] [BIBLE] Gen.1.1 - * [MHC] [COMMENTARY] Gen.1.1 - * [ISBE] [LEXICON] REDEMPTION - * @return The reference displayed in the currently active module window. Empty if none is active. - */ - virtual QString getCurrentReference() = 0; - /** Seach the searchText in the specified module. - * @param moduleName The module to search in - * @param searchText Search for this in the modules - * @return The search result. It's in the format [modulename] osis_ref_of_the_found_key. For example "[KJV] Gen.1.1". - */ - virtual QStringList searchInModule(const QString& moduleName, const QString& searchText) = 0; - /** Search in all open modules and return the search result. - * The result is in the same format as searchInModule - * @param searchText Search for this in the modules - * @return The search result for a searchin all opened module windows - * @see searchInModule For the search result format. - */ - virtual QStringList searchInOpenModules(const QString& searchText) = 0; - /** Search in the default Bible module and return the search result. - * The result is in the same format as searchInModule - * @param searchText Search for this in the modules - * @return The search result for a search in the default Bible - * @see searchInModule - */ - virtual QStringList searchInDefaultBible(const QString& searchText) = 0; - /** Return a list of modules of the given type. - * @param type One of BIBLES, COMMENTARIES, LEXICONS, BOOKS - * @return The list of modules of the given type, may be empty - */ - virtual QStringList getModulesOfType(const QString& type) = 0; -}; - -#endif diff --git a/bibletime/bibletimeinterface_skel.cpp b/bibletime/bibletimeinterface_skel.cpp deleted file mode 100644 index 7d956d6..0000000 --- a/bibletime/bibletimeinterface_skel.cpp +++ /dev/null @@ -1,188 +0,0 @@ -/**************************************************************************** -** -** DCOP Skeleton generated by dcopidl2cpp from bibletimeinterface.kidl -** -** WARNING! All changes made in this file will be lost! -** -*****************************************************************************/ - -#include "./bibletimeinterface.h" - -#include <kdatastream.h> -#include <qasciidict.h> - - -static const int BibleTimeInterface_fhash = 17; -static const char* const BibleTimeInterface_ftable[14][3] = { - { "void", "syncAllBibles(QString)", "syncAllBibles(QString key)" }, - { "void", "syncAllCommentaries(QString)", "syncAllCommentaries(QString key)" }, - { "void", "syncAllLexicons(QString)", "syncAllLexicons(QString key)" }, - { "void", "syncAllVerseBasedModules(QString)", "syncAllVerseBasedModules(QString key)" }, - { "void", "reloadModules()", "reloadModules()" }, - { "void", "openWindow(QString,QString)", "openWindow(QString moduleName,QString key)" }, - { "void", "openDefaultBible(QString)", "openDefaultBible(QString key)" }, - { "void", "closeAllModuleWindows()", "closeAllModuleWindows()" }, - { "QString", "getCurrentReference()", "getCurrentReference()" }, - { "QStringList", "searchInModule(QString,QString)", "searchInModule(QString moduleName,QString searchText)" }, - { "QStringList", "searchInOpenModules(QString)", "searchInOpenModules(QString searchText)" }, - { "QStringList", "searchInDefaultBible(QString)", "searchInDefaultBible(QString searchText)" }, - { "QStringList", "getModulesOfType(QString)", "getModulesOfType(QString type)" }, - { 0, 0, 0 } -}; -static const int BibleTimeInterface_ftable_hiddens[13] = { - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, -}; - -bool BibleTimeInterface::process(const QCString &fun, const QByteArray &data, QCString& replyType, QByteArray &replyData) -{ - static QAsciiDict<int>* fdict = 0; - if ( !fdict ) { - fdict = new QAsciiDict<int>( BibleTimeInterface_fhash, true, false ); - for ( int i = 0; BibleTimeInterface_ftable[i][1]; i++ ) - fdict->insert( BibleTimeInterface_ftable[i][1], new int( i ) ); - } - int* fp = fdict->find( fun ); - switch ( fp?*fp:-1) { - case 0: { // void syncAllBibles(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[0][0]; - syncAllBibles(arg0 ); - } break; - case 1: { // void syncAllCommentaries(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[1][0]; - syncAllCommentaries(arg0 ); - } break; - case 2: { // void syncAllLexicons(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[2][0]; - syncAllLexicons(arg0 ); - } break; - case 3: { // void syncAllVerseBasedModules(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[3][0]; - syncAllVerseBasedModules(arg0 ); - } break; - case 4: { // void reloadModules() - replyType = BibleTimeInterface_ftable[4][0]; - reloadModules( ); - } break; - case 5: { // void openWindow(QString,QString) - QString arg0; - QString arg1; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - if (arg.atEnd()) return false; - arg >> arg1; - replyType = BibleTimeInterface_ftable[5][0]; - openWindow(arg0, arg1 ); - } break; - case 6: { // void openDefaultBible(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[6][0]; - openDefaultBible(arg0 ); - } break; - case 7: { // void closeAllModuleWindows() - replyType = BibleTimeInterface_ftable[7][0]; - closeAllModuleWindows( ); - } break; - case 8: { // QString getCurrentReference() - replyType = BibleTimeInterface_ftable[8][0]; - QDataStream _replyStream( replyData, IO_WriteOnly ); - _replyStream << getCurrentReference( ); - } break; - case 9: { // QStringList searchInModule(QString,QString) - QString arg0; - QString arg1; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - if (arg.atEnd()) return false; - arg >> arg1; - replyType = BibleTimeInterface_ftable[9][0]; - QDataStream _replyStream( replyData, IO_WriteOnly ); - _replyStream << searchInModule(arg0, arg1 ); - } break; - case 10: { // QStringList searchInOpenModules(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[10][0]; - QDataStream _replyStream( replyData, IO_WriteOnly ); - _replyStream << searchInOpenModules(arg0 ); - } break; - case 11: { // QStringList searchInDefaultBible(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[11][0]; - QDataStream _replyStream( replyData, IO_WriteOnly ); - _replyStream << searchInDefaultBible(arg0 ); - } break; - case 12: { // QStringList getModulesOfType(QString) - QString arg0; - QDataStream arg( data, IO_ReadOnly ); - if (arg.atEnd()) return false; - arg >> arg0; - replyType = BibleTimeInterface_ftable[12][0]; - QDataStream _replyStream( replyData, IO_WriteOnly ); - _replyStream << getModulesOfType(arg0 ); - } break; - default: - return DCOPObject::process( fun, data, replyType, replyData ); - } - return true; -} - -QCStringList BibleTimeInterface::interfaces() -{ - QCStringList ifaces = DCOPObject::interfaces(); - ifaces += "BibleTimeInterface"; - return ifaces; -} - -QCStringList BibleTimeInterface::functions() -{ - QCStringList funcs = DCOPObject::functions(); - for ( int i = 0; BibleTimeInterface_ftable[i][2]; i++ ) { - if (BibleTimeInterface_ftable_hiddens[i]) - continue; - QCString func = BibleTimeInterface_ftable[i][0]; - func += ' '; - func += BibleTimeInterface_ftable[i][2]; - funcs << func; - } - return funcs; -} - - diff --git a/bibletime/display-templates/Blue.tmpl b/bibletime/display-templates/Blue.tmpl deleted file mode 100644 index f415b4c..0000000 --- a/bibletime/display-templates/Blue.tmpl +++ /dev/null @@ -1,349 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>#TITLE#</title> - <meta name="GENERATOR" content="BibleTime - www.bibletime.info" /> - <meta name="AUTHOR" content="BibleTime - www.bibletime.info" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - - <style type="text/css"> - /* <![CDATA[ */ - -#LANG_CSS# - -* { - /* To work around a KDE 3.2 bug / problem */ - background-color:transparent; -} - -#content { - background-color:transparent; - margin:10px; -} -#content > table { - margin: 0; - padding: 0; - border-spacing:10px; -} -#content > table th { - padding: 0 0 2px 0; - text-align: center; - font-weight: bold; - font-size: 110%; - border-bottom: 1px dotted #7B7B7B; -} - -a { - text-decoration:none; - font-weight:normal; - color: #7B7B7B; - padding:0 2px; - background-color:transparent; -} -a:hover { - text-decoration:none; - background-color:transparent; - color: #0000FF; - padding:0 2px; -} - - -/* Settings which apply to all entries in all modules */ -.entry { - padding: 2px; - /*vertical-align: middle;*/ - vertical-align: top; - text-align: justify; -} -td.entry { - vertical-align: top; - text-align: justify !important; -} -#printer .entry { - font-size: 90%; - text-align: left; -} -.entry[dir=rtl] { - text-align: right !important; -} -#printer .entry[dir=rtl] { - text-align:right !important; -} - -/* Keep the values the same as in .entry (take the border into account!) */ -.currententry { - padding: 2px; - vertical-align: middle; - text-align: justify; - background-color: #E6E4FF; -} -.currententry[dir=rtl] { - text-align:right !important; -} -div.currententry { -} -span.currententry { - background-color: #EDEFFF !important; -} - - -/* Space between the columns of modules displayed side by side */ -td.entry + td.entry { - margin-left: 5px; -} - -/* Several additional settings for display of modules*/ -#bible div.currententry, #bible td.currententry { - border: 1px solid #B7B7B7; - padding: 2px; -} - - -/*Same for books!*/ -#book div.currententry, #book td.currententry { - border: 1px solid #B7B7B7; - padding: 2px; -} -#book .entryname + .entry { - margin-top:2px; - padding-top:1px; -} -/* To remove the gap between the entrynam and the entry's content*/ -#book .entry > *, #book .currententry > * { - margin-top:0px; - padding-top:0px; -} - -.entryname { - font-size:80%; - padding:0 2px 0 0; - vertical-align:super; -} -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname { - padding: 0 0 0 2px; - font-size: 80%; - vertical-align: super; -} -.entryname a, #printer .entryname { -} - -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle { - padding-top: 0.05em; - margin-left: 10px; -} - -.footnote { - vertical-align:super; - font-weight: normal; - color: blue; - font-size: 80%; - cursor: help; - background-color:transparent; -} -.footnote:before { content:"("; } -.footnote:after { content:")"; } - -.footnotepre { - font-style: italic; -} - - -.crossreference { - font-size: 80%; - color: blue; -} -#bible .crossreference:before { content:" ["; } -#bible .crossreference:after { content:"]"; } - -.crossreference a { - color: blue; -} -.crossreference a:hover { - color: blue; -} - -.alternative {} -.alternative:before { content:"'"attr(alternative); } -.alternative:after{ content:"'";} - -.abbreviation { - -} - -.sectiontitle { - font-weight: bold; - font-size: 110%; -} -#printer .sectiontitle { - font-weight: bold; - font-size: 100%; -} -* + .sectiontitle { - margin-top:15px; -} - -.booktitle { - font-weight: bold; - font-size: 120%; - font-variant: small-caps; -} -#printer .booktitle { - font-weight: bold; - font-size: 120%; - font-variant: small-caps; -} -.foreign { -} -.jesuswords { - color:#9C2323; -} - -.introduction { - font-size:80%; - text-align:justify; -} - -.quotation { -} -.poetry { -} -.sup { - vertical-align: super; -} -.sub { - vertical-align: sub; -} -.right { - text-align: right; -} -.center { - text-align: center; -} - -.bold { - font-weight:bold; -} -.illuminated { -} -.italic { - font-style:italic; -} -.line-through { -} -.normal { -} -.small-caps{ -} -.underline { - font-style:underline; -} - -.inscription { -} -.mentioned { -} -.name > .geographic { -} -.name > .holiday { -} -.name > .nonhuman { -} -.name > .person { -} -.name > .ritual { -} -.name > .divine { - font-variant: small-caps; -} - -.transchange { - font-style:italic; -} -.transchange > .added { - background-color:inherit; -} -.transchange > .amplified { -} -.transchange > .changed { -} -.transchange > .deleted { -} -.transchange > .moved { -} -.transchange > .tenseChange { -} - -.morphSegmentation { - border-right: 2px solid grey; -} - -#infodisplay { - margin:0; - padding:0; -} - -#infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3 { - padding:4px 4px 2px 0; - color:darkGrey; - font-weight:bold; - border-bottom:1px solid grey; - font-size:90%; - text-align: right; -} - -#infodisplay > p, #infodisplay * > p, -#infodisplay > .para, #infodisplay * > .para -{ /* We only format the first p child in a special way */ - font-size:95%; - text-align:justify !important; - color:black; - margin:0px; - padding:0px; -} - -/*Required for cross references*/ -#infodisplay .entry { - padding:2px; - text-align:justify !important; - font-size:95%; - margin-bottom:10px; - margin-left:15px; -} -#infodisplay .entry[dir=rtl] { - text-align: right !important; -} -#infodisplay .entry .entry { /*No smaller font size for nested entries*/ - font-size:100%; - margin:0px; -} -#infodisplay .entry .entry[dir=rtl] { /*No smaller font size for nested entries*/ - text-align: right !important; -} -#infodisplay .entryname { - padding:2px; - margin:0px; - text-align:left !important; - font-weight:bold; - font-size:100%; -} - -#infodisplay .rangeheading { - color:black; - font-weight:bold; - margin-left:-10px; -} - -#printer .rangeheading { - border-bottom:1px solid black; - color:black; -} - - /* ]]> */ - </style> -</head> - -<body id="#DISPLAYTYPE#"> - <div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#" dir="#PAGE_DIRECTION#">#CONTENT#</div> -</body> -</html>
\ No newline at end of file diff --git a/bibletime/display-templates/Crazy.tmpl b/bibletime/display-templates/Crazy.tmpl deleted file mode 100644 index 84121b6..0000000 --- a/bibletime/display-templates/Crazy.tmpl +++ /dev/null @@ -1,326 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <!--TODO: This needs a better title than "Crazy"--> - <title>#TITLE#</title> - <meta name="GENERATOR" content="BibleTime - www.bibletime.info" /> - <meta name="AUTHOR" content="BibleTime - www.bibletime.info" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - - <style type="text/css"> -/* <![CDATA[ */ - -body { - margin:0px; - padding:0; - padding:1em; - background-color:transparent; -} - -* { - background-color:transparent; /* To work around a KDE 3.2 bug / problem */ -} - - -/* content wraps all of the displayed elements */ -#content { - margin:0px; - padding:0px; - font-size:12pt; - text-align:justify; -} - -/* The table contains the Bible verses, each verse on an own row, each Bible module in an own column */ -#content > table { - margin:0; - padding:3px; - border-spacing:0; - vertical-align:top; - text-align:justify; -} -/* The heading contains the name of the module and may contain additional information like the display keys */ -#content > table th { - text-shadow:black 1px 1px 3px; - font-size:1.3em; - background-color:#F0F0F0; - padding:8px; - border-bottom:1px solid black; -} - -#content tr:nth-child(odd) { background-color: white; } -#content div.entry:nth-child(odd) { background-color: white; } - -#content tr:nth-child(even) { background-color: #EDEDED; } -#content div.entry:nth-child(even) { background-color: #EDEDED; } -/*#content tr:nth-child(even) { background-color: #D0D0D0; } -#content div.entry:nth-child(even) { background-color: #D0D0D0; }*/ - - -/* The a links are the normal HTML hyperlinks. Links without a class attribute are hyperlinks into the web */ -a { color:#FF0004; padding:0; } -a:hover { } - -/* An entry is the generic element used for all content items. - In Bibles an entry contains a verse, in commentaries the comment to a verse range, - in lexicons an simple item and in book the text of an item with other .entry elements as childs. - - If just one module is chosen, all entries are put together in one sourrounding table column. In this case the elements div and span may have the class "entry". If it's a div each entry should be on it's own line. span.entry should not add a linebreak. - - If more than one module (Bibles) was chosen, the entry class applies to "td" elements, one column for a verse - */ -.entry { - padding:0.3em; - vertical-align: top; -} -table .entry:nth-child(odd) { - border-left:10px solid #DEE6F6; -} - -table .entry:nth-child(even) { - border-left:10px solid #E6EEFF; -} - -#printer .entry { text-indent:15px; } -/* Often needed to format BiDi text in the right way */ -/* .entry[dir=rtl] { text-align:right !important; } */b -/* #printer .entry[dir=rtl] { } */ - -/* Special formatting for the block element entries */ -div.entry, td.entry { } -td.entry { - vertical-align:top; -} - -/* Currententry is chosen when the entry should be highlighted as the current entry chosen by the user - currententry may apply to span, div, td (just like .entry) - */ -.currententry { - padding:0.3em; - line-height:1.6em; - background-color:#D3E5FF; - /*border: thin solid black;*/ - -} - -table .currententry:nth-child(1) { - margin-left:0; - border-left:10px solid #99B4FF; - /*border-left:10px solid #F5FF6A;*/ -} -/* .currententry[dir=rtl] { */ -/* } */ -div.currententry { } -span.currententry { } - -/* You may use this to format the space between two columns */ -td.entry + td.entry { - margin:0; -} - -/* Several additional settings for displaying Bible modules*/ -#bible div.entry { - border-left:10px solid white; -} -#bible div.entry[dir=rtl] { - border-left:none; - border-right:10px solid white; - text-align:right; -} -#bible div.currententry { - border-left:10px solid #99B4FF; -} -#bible div.currententry[dir=rtl] { - border-left:none; - border-right:10px solid #99B4FF; -} -#bible div.currententry, #bible td.currententry { } -#bible td.currententry { } - -/* Same for books! */ -#book div.currententry, #book td.currententry { } -#book .entryname + .entry { } -/* To remove the gap between the entryname and the entry's content*/ -#book .entry > *, #book .currententry > * { } - -/* An entryname is embedded in an .entry tag and contains the name of the key, which belongs to the text of the .entry */ -.entryname { size:60%; vertical-align:super;} -.entryname a { text-decoration:none !important; color:#8F2627 !important; font-style:italic; padding:0; } - -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname { } -.entryname a, #printer .entryname { } -/* As you can see #printer is used to format pages which are send to the printer. Printer pages should be clean and easy to read */ -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle { } - -/* Footnote formatting options */ -/* A footnote is displayed as an asterisk or another small character. You can set the colors, font-size, etc. for the footnote. */ -.footnote { color:#8F2627; vertical-align:super; font-size:70%;} -/* You may use this to add sourrounding brackets in Bible modules. To do this the content command of CSS */ -#bible .footnote:before { content:" ["; color:#8F2627; } -#bible .footnote:after { content:"]"; color:#8F2627; } - -/* Crossreferences. The same as footnotes */ -.crossreference { color:#8f2627;} -#bible .crossreference:before { content:" {" } -#bible .crossreference:after { content:"}" } - -/*Keep in mind that for cross references it is not enough to -*set only the cross reference colour, you must also set the -*cross reference anchor marker with .crossreference a -*This way both the non linked and linked text will show -*as desired. Additionally, you can have seperate formatting -*for linked and non linked text in the cross reference*/ -.crossreference a { - color:#8f2627; - /*Get rid of underlines on the notes when not hovered*/ - text-decoration: none; -} -.crossreference a:hover {} - -/* Alternative reading as defined in the OSIS specs. The information about the alternative text is displayed in the info display. It's -often a good idea to format this the same as footnotes -The text which is the alternative of the displayed text is available in the attribute "alternative" -so something like .alternative:before { content:"'"attr(alternative); } is possible -*/ -.alternative {} -.alternative:before { } -.alternative:after { } - -/* An abbreviation. */ -.abbreviation { } - -/* A title within the text. This is the formatting which applies to a title of a section, as you can find them in Bibles */ -.sectiontitle { - padding:0.3em; - /*text-shadow:gray 0px 0px 3px;*/ - font-size:1.3em; - font-weight:bold; - text-transform:uppercase; - padding-bottom:2px; -} -#printer .sectiontitle { } -/* You may want to format elements before section titles in a special way. */ -* + .sectiontitle { } - -/* The title of a book, e.g. "The gospel of Matthew" */ -.booktitle { } -#printer .booktitle { } - -/* A foreign word */ -.foreign { } - -/* Words spoken by Jesus Christ */ -/*.jesuswords { color: red; }*/ -.jesuswords { color: #B60000; } - -/* An introduction to a module, book or chapter */ -.introduction { } -/* A quotation without a special speaker */ -.quotation { } -/* Poetry formatting */ -.poetry { } -/* Text displayed above. It's like the sup tag in HTML */ -.sup { } -/* Sub text, the opposite of .sup */ -.sub { } -/* Display the text inside as right aligned text */ -.right { } -/* Display as centered text */ -.center { } - -/* Visual attributes to the text */ -.bold { - font-weight: bold; -} -.illuminated { } -.italic { - font-style: italic; -} -.line-through { } -.normal { } -.small-caps{ } -.underline { } - -/* An inscription */ -.inscription { } - -.mentioned { } - -/* Special formatting rules for names, see the OSIS specs for detailed information */ -.name {} -.name > .geographic { } -.name > .holiday { } -.name > .nonhuman { } -.name > .person { } -.name > .ritual { } -.name > .divine { font-variant: small-caps; } - -/* Information added by the translator */ -.transchange {} -.transchange > .added { } -.transchange > .amplified {} -.transchange > .changed { } -.transchange > .deleted { } -.transchange > .moved { } -.transchange > .tenseChange { } - -/* Special text markup */ -/* Morph segmentation is a special feature for hebrew to markup the word divisions in the text */ -/* .morphSegmentation { border-left:1px solid red; } */ -.morphSegmentation + .morphSegmentation { - border-right: 1px red solid; -} - -/* The formatting of all things displayed in the information window */ -#infodisplay {background:white; font-size:10pt; padding:5px; margin:0px;} - -/* The headings of a section, several sections may be displayed together at the same time */ -#infodisplay .footnoteinfo h3, -#infodisplay .strongsinfo h3, -#infodisplay .morphinfo h3, -#infodisplay .translationinfo h3, -#infodisplay .crossrefinfo h3 { - font-size:12pt; - font-weight:bold; - text-transform:uppercase; - text-align:right; - color:gray; - border-bottom:1px solid black; - padding:4px; -} - -#infodisplay > p, #infodisplay * > p { /* We only format the first p child in a special way */ - font-size:80%; -} - -/*Required for cross references*/ -#infodisplay .entry { - font-size:80%; -} -#infodisplay .entry .entry { /* No smaller font size for nested entries */ - font-size:100% !important; -} -#infodisplay .entryname { - font-weight:bold; -} -#infodisplay .rangeheading { - font-weight:bold; -} - -#printer .rangeheading {} - - -*[dir=rtl] { text-align:right !important; } - -/* Here's the marker for the language specific fotn information. BibleTime replaces this by the CSS for the fonts */ -#LANG_CSS# - -/* ]]> */ - </style> -</head> - -<!-- The display type may be bible, book, printer --> -<body id="#DISPLAYTYPE#"> - <div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#" dir="#PAGE_DIRECTION#">#CONTENT#</div> -</body> -</html>
\ No newline at end of file diff --git a/bibletime/display-templates/Green.tmpl b/bibletime/display-templates/Green.tmpl deleted file mode 100644 index 0bf4c3d..0000000 --- a/bibletime/display-templates/Green.tmpl +++ /dev/null @@ -1,328 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>#TITLE#</title> - <meta name="GENERATOR" content="BibleTime - www.bibletime.info" /> - <meta name="AUTHOR" content="BibleTime - www.bibletime.info" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - - <style type="text/css"> - /* <![CDATA[ */ - -* { - /* To work around a KDE 3.2 bug / problem */ - background-color:transparent; -} - -#content { - background-color:transparent; - margin:10px; -} -#content > table { - margin: 0; - padding: 0; - border-spacing:10px; - vertical-align:top; -} -#content > table th { - padding: 0 0 2px 0; - text-align: center; - font-weight: bold; - font-size: 110%; - border-bottom: 1px solid #6B6B6B; -} - -a { - text-decoration:none; - font-weight:normal; - color: #3B11AE; - background-color:transparent; - padding:0 2px; -} -a:hover { - background-color:transparent; - color: #AE1518; - padding:0 2px; -} - - -/* Settings which apply to all entries in all modules */ -.entry { - padding: 3px; -/* vertical-align: middle; */ - vertical-algin: top; - text-align: justify; -} -#printer .entry { - font-size:90%; - text-align:left; -} -.entry[dir=rtl] { - text-align:right !important; -} -#printer .entry[dir=rtl] { - text-align:right !important; -} -div.entry, td.entry { - vertical-align:top; -} - -/* Keep the values the same as in .entry (take the border into account!) */ -.currententry { - padding:3px; - vertical-align:middle; - text-align:justify; -} -.currententry[dir=rtl] { - text-align:right !important; -} -div.currententry { -} -span.currententry { - background-color:#D4FFCB; -} - - -/*Space between the columns of modules displayed side by side*/ -td.entry + td.entry { - margin-left: 5px; -} - -/* Several additional settings for display of modules*/ -#bible div.currententry, #bible td.currententry { - border:1px solid black; - padding:2px; - background-color:#F6FFF7; -} -#bible span.currententry { - background-color:#C8FFB6; -} - -/*Same for books!*/ -#book div.currententry, #book td.currententry { - border:1px solid black; - background-color:#F6FFF7; -} -#book span.currententry { - background-color:#C8FFB6; -} - - -.entryname { - font-size:80%; - padding:0 2px 0 0; - vertical-align:super; -} -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname { - padding: 0 0 0 2px; - font-size: 80%; - vertical-align:super; -} -.entryname a, #printer .entryname { - vertical-align: middle -} - -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle { - padding-top: 0.05em; - margin-left: 10px; -} - -.footnote { - vertical-align:super; - color: blue; - font-size: 70%; -} -.footnote:before { content:"("; } -.footnote:after { content:")"; } - -.crossreference { - font-size: 80%; - /*vertical-align:middle;*/ - color: blue; -} - -.crossreference a { - font-size: 80%; - /*vertical-align:middle;*/ - color: blue; -} - -.crossreference a:hover { - font-size: 80%; - /*vertical-align:middle;*/ - color: blue; -} - - - -.sectiontitle { - font-weight: bold; - font-size: 110%; -} -#printer .sectiontitle { - font-weight: bold; - font-size: 100%; -} -* + .sectiontitle { - margin-top:15px; -} - -.booktitle { - font-weight: bold; - font-size: 120%; - font-variant: small-caps; -} -#printer .booktitle { - font-weight: bold; - font-size: 120%; - font-variant: small-caps; -} -.foreign { -} -.jesuswords { - color:#9C2323; -} - -.quotation { -} -.poetry { -} -.sup { - vertical-align: super; -} -.sub { - vertical-align: sub; -} -.right { - text-align: right; -} -.center { - text-align: center; -} - -.bold { - font-weight:bold; -} -.illuminated { -} -.italic { - font-style:italic; -} -.line-through { -} -.normal { -} -.small-caps{ -} -.underline { - font-style:underline; -} - -.inscription { -} -.mentioned { -} -.name > .geographic { -} -.name > .holiday { -} -.name > .nonhuman { -} -.name > .person { -} -.name > .ritual { -} -.name > .divine { - font-variant: small-caps; -} - -.transchange { - font-style:italic; -} -.transchange > .added { - background-color:inherit; -} -.transchange > .amplified { -} -.transchange > .changed { -} -.transchange > .deleted { -} -.transchange > .moved { -} -.transchange > .tenseChange { -} - -.morphSegmentation { - border: 1px solid grey; - margin-top: 1px; /* Don`t let the boxes touch here, between the lines */ - margin-left: -1px; /* But here, for better reading of the text, - this will only occur within a word consisting of several segments.*/ - margin-right: 0px; -} - -#infodisplay { - margin:0; - padding:0; - font-size:100%; -} - -#infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3 { - padding:4px 4px 2px 0; - color:darkGrey; - font-weight:bold; - border-bottom:1px solid grey; - font-size:100%; - text-align:left !important; -} - -#infodisplay > p, #infodisplay * > p { /* We only format the first p child in a special way */ - font-size:100%; - text-align:justify; - color:black; - margin:0px; - padding:0px; -} - -/*Required for cross references*/ -#infodisplay .entry { - padding:2px; - text-align:justify; - font-size:100%; - margin-bottom:10px; - margin-left:15px; -} -#infodisplay .entry .entry { /*No smaller font size for nested entries*/ - font-size:100%; - margin:0px; -} -#infodisplay .entryname { - padding:2px; - margin:0px; - text-align:left; - font-weight:bold; - font-size:100%; -} - -#infodisplay .rangeheading { - color:black; - font-weight:bold; - margin-left:-10px; -} - -#printer .rangeheading { - border-bottom:1px solid black; - color:black; -} - -#LANG_CSS# - - /* ]]> */ - </style> -</head> - -<body id="#DISPLAYTYPE#"> - <div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#" dir="#PAGE_DIRECTION#">#CONTENT#</div> -</body> -</html>
\ No newline at end of file diff --git a/bibletime/display-templates/HighContrast.tmpl b/bibletime/display-templates/HighContrast.tmpl deleted file mode 100644 index 408dbf5..0000000 --- a/bibletime/display-templates/HighContrast.tmpl +++ /dev/null @@ -1,339 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>#TITLE#</title> - <meta name="GENERATOR" content="BibleTime - www.bibletime.info" /> - <meta name="AUTHOR" content="BibleTime - www.bibletime.info" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - - <style type="text/css"> - /* <![CDATA[ */ - -* { - /* To work around a KDE 3.2 bug / problem */ - background-color:transparent; -} - -#content { - /*background-color:white;*/ - margin:10px; -} -#content > table { - margin: 0; - padding: 0; - border-spacing:10px; - vertical-align:top; -} -#content > table th { - padding: 0 0 2px 0; - text-align: center; - /*font-weight: bold;*/ - font-size: 110%; - border-bottom: 1px solid #6B6B6B; -} - -a { - text-decoration:none; - font-weight:normal; - /*color: #F98100;*/ - padding:1px; - background-color:transparent; -} -a:hover { - background-color:transparent; - color: #FF0000; - padding:1px; - text-decoration:underline; -} - -/* Settings which apply to all entries in all modules */ -.entry { - padding: 2px; - vertical-align: top; - text-align: justify; -} -#printer .entry { - font-size: 90%; - text-align: left; -} -.entry[dir=rtl],#printer .entry[dir=rtl] { - text-align: right; -} -div.entry, td.entry { - vertical-align:top; -} - -/* Keep the values the same as in .entry (take the border into account!) */ -.currententry { - padding: 2px; - vertical-align: top; - text-align: justify; - /*font-weight: bolder;*/ - /*background-color:transparent;*/ - /*color:white;*/ - /*background-color:black;*/ - /*The background colour of selected text as of kde 3.5.2*/ - background-color: #A5A5FF; -} -.currententry[dir=rtl] { - text-align: right; -} -div.currententry { -} -span.currententry { - -} - - -/*Space between the columns of modules displayed side by side*/ -td.entry + td.entry { - margin-left: 5px; -} - -/* Several additional settings for display of modules*/ -#bible div.currententry, #bible td.currententry { - /*border: 1px solid black;*/ - padding: 4px; -} -#bible span.currententry { -} - -/*Same for books!*/ -#book div.currententry, #book td.currententry { - border: 1px solid black; -} -#book span.currententry { -} - - -.entryname { - font-size:70%; - padding:0 1px 0 0; - vertical-align:top; - /*color: #F98100;*/ - color: black; - /*font-style: italic;*/ -} -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname { - padding:0 0 0 1px; - font-size:60%; - /*vertical-align:top; */ -} -.entryname a, #printer .entryname { - vertical-align: top; - font-size: 100%; - font-weight: bold; - color: black; -} - -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle { - padding-top:0.05em; - margin-left:10px; -} - -.footnote { - vertical-align:super; - font-weight:bold; - /*color: #00B7FF;*/ /*This one is kind of blinding on white*/ - /*color: #F98100;*/ - font-size:80%; - color: black; -} - - -.footnote:before { - content: "("; -} - -.footnote:after { - content: ")"; -} - -.crossreference { - font-size: 80%; - /*vertical-align:middle;*/ - /*color: blue;*/ - /*color: #F98100;*/ -} - -.crossreference:before { - content: "["; -} - -.crosreference:after { - content: "]"; -} - -.sectiontitle { - font-weight: bold; - font-size: 110%; -} -#printer .sectiontitle { - font-weight: bold; - font-size: 100%; -} -* + .sectiontitle { - margin-top:15px; -} - -.booktitle { - font-weight: bold; - font-size: 120%; - font-variant: small-caps; -} -#printer .booktitle { - font-weight: bold; - font-size: 120%; - font-variant: small-caps; -} -.foreign { -} -.jesuswords { - /*color:red;*/ - /*color: #7500AC;*/ - /*color: #F98100;*/ - font-style:italic; - /*font-weight: bold;*/ - font-size:0.9em; -} - -.quotation { -} -.poetry { -} -.sup { - vertical-align: super; -} -.sub { - vertical-align: sub; -} -.right { - text-align: right; -} -.center { - text-align: center; -} - -.bold { - font-weight:bold; -} -.illuminated { -} -.italic { - font-style:italic; -} -.line-through { -} -.normal { -} -.small-caps{ -} -.underline { - font-style:underline; -} - -.inscription { -} -.mentioned { -} -.name > .geographic { -} -.name > .holiday { -} -.name > .nonhuman { -} -.name > .person { -} -.name > .ritual { -} -.name > .divine { - font-variant: small-caps; -} - -.transchange { - font-style:italic; -} -.transchange > .added { - background-color:inherit; -} -.transchange > .amplified { -} -.transchange > .changed { -} -.transchange > .deleted { -} -.transchange > .moved { -} -.transchange > .tenseChange { -} - -.morphSegmentation { - border: 1px solid grey; - margin-top: 1px; /* Don`t let the boxes touch here, between the lines */ - margin-left: -1px; /* But here, for better reading of the text, - this will only occur within a word consisting of several segments.*/ - margin-right: 0px; -} - -#infodisplay { - margin:0; - padding:0; -} - -#infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3 { - padding: 2px 0 0 0; - color: black; - font-weight: bold; - border-bottom: 1px solid black; - font-size: 90%; - margin: 0 0 3px 0; -} - -#infodisplay > p { /* We only format the first p child in a special way */ - font-size: 90%; - color: black; - margin: 0px; - padding: 0px; -} - -/*Required for cross references*/ -#infodisplay .entry { - padding: 2px; - text-align: justify; - font-size: 80%; - margin: 0 0 10px 10px; -} -#infodisplay .entry .entry { /*No smaller font size for nested entries*/ - font-size: 100%; - margin: 0px; -} -#infodisplay .entryname { - padding: 2px; - margin: 0px; - text-align: left; - font-weight: bold; - font-size: 90%; -} - -#infodisplay .rangeheading { - color: black; - font-weight: bold; - margin-left: -5px; -} - -#printer .rangeheading { - border-bottom: 1px solid black; - color: black; -} - -#LANG_CSS# - - /* ]]> */ - </style> -</head> - -<body id="#DISPLAYTYPE#"> - <div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#">#CONTENT#</div> -</body> -</html> diff --git a/bibletime/display-templates/Makefile.am b/bibletime/display-templates/Makefile.am deleted file mode 100644 index 276c1a4..0000000 --- a/bibletime/display-templates/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -#TEMPLATES = Default.tmpl Simple.tmpl -templdir = $(top_srcdir)/bibletime/display-templates -TEMPLATES = $(templdir)/*.tmpl - -EXTRA_DIST = template-init.cpp create_code.pl names.conf $(TEMPLATES) - -all: - perl $(templdir)/create_code.pl $(TEMPLATES) - -template-init.cpp: - perl $(templdir)/create_code.pl $(TEMPLATES) - -CLEANFILES = template-init.cpp diff --git a/bibletime/display-templates/Makefile.in b/bibletime/display-templates/Makefile.in deleted file mode 100644 index 14072ea..0000000 --- a/bibletime/display-templates/Makefile.in +++ /dev/null @@ -1,573 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/display-templates -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ - -#TEMPLATES = Default.tmpl Simple.tmpl -templdir = $(top_srcdir)/bibletime/display-templates -TEMPLATES = $(templdir)/*.tmpl -EXTRA_DIST = template-init.cpp create_code.pl names.conf $(TEMPLATES) -CLEANFILES = template-init.cpp -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/display-templates/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/display-templates/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/display-templates/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/display-templates/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/display-templates/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -all: - perl $(templdir)/create_code.pl $(TEMPLATES) - -template-init.cpp: - perl $(templdir)/create_code.pl $(TEMPLATES) -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=HighContrast.tmpl Simple.tmpl Makefile.in Green.tmpl Blue.tmpl Crazy.tmpl Makefile.am basic_template.txt - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/display-templates/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/display-templates/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/display-templates/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/display-templates/Simple.tmpl b/bibletime/display-templates/Simple.tmpl deleted file mode 100644 index 28e260e..0000000 --- a/bibletime/display-templates/Simple.tmpl +++ /dev/null @@ -1,134 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>#TITLE#</title> - <meta name="GENERATOR" content="BibleTime " VERSION "" /> - <meta name="AUTHOR" content="BibleTime " VERSION "" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - - <style type="text/css"> -/* <![CDATA[ */ -body { - margin:5px; -} -#content { - background-color:white; -} -#content table { - margin:0; - padding:0; - border-spacing:10px; - border-collapse: collapse; - vertical-align: top; -} -#content table th { - padding: 0 0 2px 0; - text-align: center; - font-weight: bold; - font-size: 115%; -} - -a { - text-decoration:none; - font-weight:normal; - color: blue; - padding:2px; -} - -td.entry, div.entry { - padding: 5px; - vertical-align: top; -} -span.entry { - padding: 5px; -} - -td.currententry, div.currententry { - padding: 5px; - vertical-align: top; - font-weight:bold; -} -td.entry + td.entry { - margin-left: 5px; -} -span.currententry { - font-weight:bold; - vertical-align: middle; - padding: 5px; -} - -.footnote { - color: gray; -} - -.strongnumber { - vertical-align: top; - font-size: 60%; - color: blue; -} -.morphcode { - vertical-align: top; - font-size: 60%; - color: blue; -} -.lemma { -} - -.sectiontitle { - font-weight: bold; - font-size: 120%; -} -.entry + .sectiontitle { - margin-top:35px; - padding-top:35px; -} - -.booktitle { - font-weight: bold; - font-size: 140%; -} -.foreign { -} -.jesuswords { - color: red; - font-size: 0.9em; -} - -.name > .divine { - font-variant: small-caps; -} - -.quotation { -} -.poetry { -} -.sup { - vertical-align: super; -} -.sub { - vertical-align: sub; -} -.right { - text-align: right; -} -.center { - text-align: center; -} -/*TODO: Think of something better here since this will get confusing*/ -/* on verses but, is needed for things inthe Mag/Info window*/ -.bold { - font-weight: bold; -} -.italic { - font-style: italic; -} -#LANG_CSS# -/* ]]> */ - </style> -</head> - -<body> - <div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#" dir="#PAGE_DIRECTION#">#CONTENT#</div> -</body> -</html>
\ No newline at end of file diff --git a/bibletime/display-templates/basic_template.txt b/bibletime/display-templates/basic_template.txt deleted file mode 100644 index 77c88cd..0000000 --- a/bibletime/display-templates/basic_template.txt +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> - <title>#TITLE#</title> - <meta name="GENERATOR" content="BibleTime - www.bibletime.info" /> - <meta name="AUTHOR" content="BibleTime - www.bibletime.info" /> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - - <style type="text/css"> -/* <![CDATA[ */ -* { - background-color:inherit; /* To work around a KDE 3.2 bug / problem */ -} - -/* content wraps all of the displayed elements */ -#content { } -/* The table contains the Bible verses, each verse on an own row, each Bible module in an own column */ -#content > table { } -/* The heading contains the name of the module and may contain additional information like the display keys */ -#content > table th { } - -/* The a links are the normal HTML hyperlinks. Links without a class attribute are hyperlinks into the web */ -a { } -a:hover { } - -/* An entry is the generic element used for all content items. - In Bibles an entry contains a verse, in commentaries the comment to a verse range, - in lexicons an simple item and in book the text of an item with other .entry elements as childs. - - If just one module is chosen, all entries are put together in one sourrounding table column. In this case the elements div and span may have the class "entry". If it's a div each entry should be on it's own line. span.entry should not add a linebreak. - - If more than one module (Bibles) was chosen, the entry class applies to "td" elements, one column for a verse - */ -.entry { } -#printer .entry { } -/* Often needed to format BiDi text in the right way */ -.entry[dir=rtl] { } -#printer .entry[dir=rtl] { } -/* Special formatting for the block element entries */ -div.entry, td.entry { } - -/* Currententry is chosen when the entry should be highlighted as the current entry chosen by the user - currententry may apply to span, div, td (just like .entry) - */ -.currententry { -} -.currententry[dir=rtl] { -} -div.currententry { } -span.currententry { } - -/* You may use this to format the space between two columns */ -td.entry + td.entry { } - -/* Several additional settings for displaying Bible modules*/ -#bible div.currententry, #bible td.currententry { } -#bible td.currententry { } - -/*Same for books!*/ -#book div.currententry, #book td.currententry { } -#book .entryname + .entry { } -/* To remove the gap between the entryname and the entry's content*/ -#book .entry > *, #book .currententry > * { } - -/* An entryname is embedded in an .entry tag and contains the name of the key, which belongs to the text of the .entry */ -.entryname { } -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname { } -.entryname a, #printer .entryname { } -/* As you can see #printer is used to format pages which are send to the printer. Printer pages should be clean and easy to read */ -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle { } - -/* Footnote formatting options */ -/* A footnote is displayed as an asterisk or another small character. You can set the colors, font-size, etc. for the footnote. */ -.footnote { } -/* You may use this to add sourrounding brackets in Bible modules. To do this the content command of CSS */ -#bible .footnote:before { } -#bible .footnote:after { } - -/* Crossreferences. The same as footnotes */ -.crossreference { } -#bible .crossreference:before { } -#bible .crossreference:after { } - -/*Keep in mind that for cross references it is not enough to -*set only the cross reference colour, you must also set the -*cross reference anchor marker with .crossreference a -*This way both the non linked and linked text will show -*as desired. Additionally, you can have seperate formatting -*for linked and non linked text in the cross reference*/ -.crossreference a { } -.crossreference a:hover { } - -/* Alternative reading as defined in the OSIS specs. The information about the alternative text is displayed in the info display. It's -often a good idea to format this the same as footnotes -The text which is the alternative of the displayed text is available in the attribute "alternative" -so something like .alternative:before { content:"'"attr(alternative); } is possible -*/ -.alternative {} -.alternative:before { } -.alternative:after { } - -/* An abbreviation. */ -.abbreviation { } - -/* A title within the text. This is the formatting which applies to a title of a section, as you can find them in Bibles */ -.sectiontitle { } -#printer .sectiontitle { } -/* You may want to format elements before section titles in a special way. */ -* + .sectiontitle { } - -/* The title of a book, e.g. "The gospel of Matthew" */ -.booktitle { } -#printer .booktitle { } - -/* A foreign word */ -.foreign { } - -/* Words spoken by Jesus Christ */ -.jesuswords { } - -/* An introduction to a module, book or chapter */ -.introduction { } -/* A quotation without a special speaker */ -.quotation { } -/* Poetry formatting */ -.poetry { } -/* Text displayed above. It's like the sup tag in HTML */ -.sup { } -/* Sub text, the opposite of .sup */ -.sub { } -/* Display the text inside as right aligned text */ -.right { } -/* Display as centered text */ -.center { } - -/* Visual attributes to the text */ -.bold { } -.illuminated { } -.italic { } -.line-through { } -.normal { } -.small-caps{ } -.underline { } - -/* An inscription */ -.inscription { } - -.mentioned { } - -/* Special formatting rules for names, see the OSIS specs for detailed information */ -.name {} -.name > .geographic { } -.name > .holiday { } -.name > .nonhuman { } -.name > .person { } -.name > .ritual { } -.name > .divine { } - -/* Information added by the translator */ -.transchange {} -.transchange > .added { } -.transchange > .amplified {} -.transchange > .changed { } -.transchange > .deleted { } -.transchange > .moved { } -.transchange > .tenseChange { } - -/* Special text markup */ -/* Morph segmentation is a special feature for hebrew to markup the word divisions in the text */ -.morphSegmentation {} - -/* The formatting of all things displayed in the information window */ -#infodisplay { } - -/* The headings of a section, several sections may be displayed together at the same time */ -#infodisplay .footnoteinfo h3, -#infodisplay .strongsinfo h3, -#infodisplay .morphinfo h3, -#infodisplay .translationinfo h3, -#infodisplay .crossrefinfo h3 { } - -#infodisplay > p, #infodisplay * > p { /* We only format the first p child in a special way */ } - -/*Required for cross references*/ -#infodisplay .entry { } -#infodisplay .entry .entry { /* No smaller font size for nested entries */ } -#infodisplay .entryname { } -#infodisplay .rangeheading {} - -#printer .rangeheading {} - -/* Here's the marker for the language specific fotn information. BibleTime replaces this by the CSS for the fonts */ -#LANG_CSS# - -/* ]]> */ - </style> -</head> - -<!-- The display type may be bible, book, printer --> -<body id="#DISPLAYTYPE#"> - <div id="content" lang="#LANG_ABBREV#" xml:lang="#LANG_ABBREV#">#CONTENT#</div></body> -</html>
\ No newline at end of file diff --git a/bibletime/display-templates/create_code.pl b/bibletime/display-templates/create_code.pl deleted file mode 100755 index f1912fa..0000000 --- a/bibletime/display-templates/create_code.pl +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/perl - -use strict; -use File::Compare; -use File::Copy; -use FindBin qw($RealBin); - -my %names; - -sub read_names() { - open(IN, "< " . $RealBin . "/names.conf"); - - while (<IN>) { - my $line = $_; - chomp $line; - - my ($filename, $description) = split("\t", $line); - $names{ $filename } = $description; - } - - close(IN); -} - -sub extract_data { - my $file = shift || die; - - my $name; - my $html; - - $file =~ /(?:.+\/)?(.+\..+)/; - my $tmpl_name = $1 || $file; - $name = $names{ $tmpl_name }; - - open(IN, "< $file"); - while( <IN> ) { - my $line = $_; - chomp($line); - $line .= "\\\n"; - - - $line =~ s/"/\\"/g; - $line =~ s/\s{2,}|\t/ /g; #replace spaces and tabs by space - - $html .= $line; - } - close(INT); - - - print "Found $name\n" if ($name); - return ($name, $html); -} - -my $dir = $RealBin; -#print $dir."\n"; - -&read_names; -my $code = ""; -foreach my $f (@ARGV) { - my ($name, $html) = &extract_data( $f ); - - if ($name) { - $code .= "\tm_templateMap[ i18n(\"$name\") ] = \"$html\";\n" - } -} - - -open(OUT, "> $RealBin/template-init.cpp-new"); -print OUT "void CDisplayTemplateMgr::init() {\n$code\n}\n"; -close(OUT); - -if (-e "$RealBin/template-init.cpp" && compare("$RealBin/template-init.cpp","$RealBin/template-init.cpp-new")) { #differ - move("$RealBin/template-init.cpp-new","$RealBin/template-init.cpp"); -} -elsif (!-e "$RealBin/template-init.cpp") { - move ("$RealBin/template-init.cpp-new","$RealBin/template-init.cpp"); -} -else { #make sure to remove the -new file - unlink("$RealBin/template-init.cpp-new"); -}
\ No newline at end of file diff --git a/bibletime/display-templates/names.conf b/bibletime/display-templates/names.conf deleted file mode 100644 index e49d742..0000000 --- a/bibletime/display-templates/names.conf +++ /dev/null @@ -1,5 +0,0 @@ -Blue.tmpl Default -Simple.tmpl Simple -Crazy.tmpl Crazy -HighContrast.tmpl High contrast -Green.tmpl Green diff --git a/bibletime/display-templates/template-init.cpp b/bibletime/display-templates/template-init.cpp deleted file mode 100644 index 7d72274..0000000 --- a/bibletime/display-templates/template-init.cpp +++ /dev/null @@ -1,1484 +0,0 @@ -void CDisplayTemplateMgr::init() { - m_templateMap[ i18n("Default") ] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ -<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\ -<html xmlns=\"http://www.w3.org/1999/xhtml\">\ -<head>\ - <title>#TITLE#</title>\ - <meta name=\"GENERATOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta name=\"AUTHOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\ - \ - <style type=\"text/css\">\ - /* <![CDATA[ */\ -\ -#LANG_CSS#\ -\ -* { \ - /* To work around a KDE 3.2 bug / problem */\ - background-color:transparent;\ -}\ -\ -#content {\ - background-color:transparent;\ - margin:10px;\ -}\ -#content > table {\ - margin: 0;\ - padding: 0;\ - border-spacing:10px;\ -}\ -#content > table th {\ - padding: 0 0 2px 0;\ - text-align: center;\ - font-weight: bold;\ - font-size: 110%;\ - border-bottom: 1px dotted #7B7B7B;\ -}\ -\ -a {\ - text-decoration:none;\ - font-weight:normal;\ - color: #7B7B7B;\ - padding:0 2px;\ - background-color:transparent;\ -}\ -a:hover {\ - text-decoration:none;\ - background-color:transparent;\ - color: #0000FF;\ - padding:0 2px;\ -}\ -\ -\ -/* Settings which apply to all entries in all modules */\ -.entry {\ - padding: 2px;\ - /*vertical-align: middle;*/\ - vertical-align: top;\ - text-align: justify;\ -}\ -td.entry {\ - vertical-align: top;\ - text-align: justify !important;\ -}\ -#printer .entry {\ - font-size: 90%;\ - text-align: left;\ -}\ -.entry[dir=rtl] {\ - text-align: right !important;\ -}\ -#printer .entry[dir=rtl] {\ - text-align:right !important;\ -}\ -\ -/* Keep the values the same as in .entry (take the border into account!) */\ -.currententry {\ - padding: 2px;\ - vertical-align: middle;\ - text-align: justify;\ - background-color: #E6E4FF;\ -}\ -.currententry[dir=rtl] {\ - text-align:right !important;\ -}\ -div.currententry {\ -}\ -span.currententry {\ - background-color: #EDEFFF !important;\ -}\ -\ -\ -/* Space between the columns of modules displayed side by side */\ -td.entry + td.entry { \ - margin-left: 5px;\ -}\ -\ -/* Several additional settings for display of modules*/\ -#bible div.currententry, #bible td.currententry {\ - border: 1px solid #B7B7B7;\ - padding: 2px;\ -}\ -\ -\ -/*Same for books!*/\ -#book div.currententry, #book td.currententry {\ - border: 1px solid #B7B7B7;\ - padding: 2px;\ -}\ -#book .entryname + .entry {\ - margin-top:2px;\ - padding-top:1px;\ -}\ -/* To remove the gap between the entrynam and the entry's content*/\ -#book .entry > *, #book .currententry > * {\ - margin-top:0px;\ - padding-top:0px;\ -}\ -\ -.entryname {\ - font-size:80%;\ - padding:0 2px 0 0;\ - vertical-align:super;\ -}\ -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname {\ - padding: 0 0 0 2px;\ - font-size: 80%;\ - vertical-align: super;\ -}\ -.entryname a, #printer .entryname {\ -}\ -\ -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle {\ - padding-top: 0.05em;\ - margin-left: 10px;\ -}\ -\ -.footnote {\ - vertical-align:super;\ - font-weight: normal;\ - color: blue;\ - font-size: 80%;\ - cursor: help;\ - background-color:transparent;\ -}\ -.footnote:before { content:\"(\"; }\ -.footnote:after { content:\")\"; }\ -\ -.footnotepre {\ - font-style: italic;\ -}\ -\ -\ -.crossreference {\ - font-size: 80%;\ - color: blue;\ -}\ -#bible .crossreference:before { content:\" [\"; }\ -#bible .crossreference:after { content:\"]\"; }\ -\ -.crossreference a {\ - color: blue;\ -}\ -.crossreference a:hover {\ - color: blue;\ -}\ -\ -.alternative {}\ -.alternative:before { content:\"'\"attr(alternative); }\ -.alternative:after{ content:\"'\";}\ -\ -.abbreviation {\ -\ -}\ -\ -.sectiontitle {\ - font-weight: bold;\ - font-size: 110%;\ -}\ -#printer .sectiontitle {\ - font-weight: bold;\ - font-size: 100%;\ -}\ -* + .sectiontitle {\ - margin-top:15px;\ -}\ -\ -.booktitle {\ - font-weight: bold;\ - font-size: 120%;\ - font-variant: small-caps;\ -}\ -#printer .booktitle {\ - font-weight: bold;\ - font-size: 120%;\ - font-variant: small-caps;\ -}\ -.foreign {\ -}\ -.jesuswords {\ - color:#9C2323;\ -}\ -\ -.introduction {\ - font-size:80%;\ - text-align:justify;\ -}\ -\ -.quotation {\ -}\ -.poetry {\ -}\ -.sup {\ - vertical-align: super;\ -}\ -.sub {\ - vertical-align: sub;\ -}\ -.right {\ - text-align: right;\ -}\ -.center {\ - text-align: center;\ -}\ -\ -.bold {\ - font-weight:bold;\ -}\ -.illuminated {\ -}\ -.italic {\ - font-style:italic;\ -}\ -.line-through {\ -}\ -.normal {\ -}\ -.small-caps{\ -}\ -.underline {\ - font-style:underline;\ -}\ -\ -.inscription {\ -}\ -.mentioned {\ -}\ -.name > .geographic {\ -}\ -.name > .holiday {\ -}\ -.name > .nonhuman {\ -}\ -.name > .person {\ -}\ -.name > .ritual {\ -}\ -.name > .divine {\ - font-variant: small-caps;\ -}\ -\ -.transchange { \ - font-style:italic; \ -}\ -.transchange > .added {\ - background-color:inherit;\ -}\ -.transchange > .amplified { \ -}\ -.transchange > .changed { \ -}\ -.transchange > .deleted {\ -}\ -.transchange > .moved {\ -}\ -.transchange > .tenseChange {\ -}\ -\ -.morphSegmentation {\ - border-right: 2px solid grey;\ -}\ -\ -#infodisplay {\ - margin:0;\ - padding:0;\ -}\ -\ -#infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3 {\ - padding:4px 4px 2px 0;\ - color:darkGrey;\ - font-weight:bold;\ - border-bottom:1px solid grey;\ - font-size:90%;\ - text-align: right;\ -}\ -\ -#infodisplay > p, #infodisplay * > p,\ -#infodisplay > .para, #infodisplay * > .para\ -{ /* We only format the first p child in a special way */\ - font-size:95%;\ - text-align:justify !important;\ - color:black;\ - margin:0px;\ - padding:0px;\ -}\ -\ -/*Required for cross references*/\ -#infodisplay .entry {\ - padding:2px;\ - text-align:justify !important;\ - font-size:95%;\ - margin-bottom:10px;\ - margin-left:15px;\ -}\ -#infodisplay .entry[dir=rtl] {\ - text-align: right !important;\ -}\ -#infodisplay .entry .entry { /*No smaller font size for nested entries*/\ - font-size:100%;\ - margin:0px;\ -}\ -#infodisplay .entry .entry[dir=rtl] { /*No smaller font size for nested entries*/\ - text-align: right !important;\ -}\ -#infodisplay .entryname {\ - padding:2px;\ - margin:0px;\ - text-align:left !important;\ - font-weight:bold; \ - font-size:100%;\ -}\ -\ -#infodisplay .rangeheading {\ - color:black;\ - font-weight:bold;\ - margin-left:-10px;\ -}\ -\ -#printer .rangeheading {\ - border-bottom:1px solid black;\ - color:black;\ -}\ -\ - /* ]]> */\ - </style>\ -</head>\ -\ -<body id=\"#DISPLAYTYPE#\">\ - <div id=\"content\" lang=\"#LANG_ABBREV#\" xml:lang=\"#LANG_ABBREV#\" dir=\"#PAGE_DIRECTION#\">#CONTENT#</div>\ -</body>\ -</html>\ -"; - m_templateMap[ i18n("Crazy") ] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ -<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\ -<html xmlns=\"http://www.w3.org/1999/xhtml\">\ -<head>\ - <!--TODO: This needs a better title than \"Crazy\"-->\ - <title>#TITLE#</title>\ - <meta name=\"GENERATOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta name=\"AUTHOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\ -\ - <style type=\"text/css\">\ -/* <![CDATA[ */\ -\ -body {\ - margin:0px;\ - padding:0;\ - padding:1em;\ - background-color:transparent;\ -}\ -\ -* {\ - background-color:transparent; /* To work around a KDE 3.2 bug / problem */\ -}\ -\ -\ -/* content wraps all of the displayed elements */\ -#content {\ - margin:0px;\ - padding:0px;\ - font-size:12pt;\ - text-align:justify;\ -}\ -\ -/* The table contains the Bible verses, each verse on an own row, each Bible module in an own column */\ -#content > table {\ - margin:0;\ - padding:3px;\ - border-spacing:0;\ - vertical-align:top;\ - text-align:justify;\ -}\ -/* The heading contains the name of the module and may contain additional information like the display keys */\ -#content > table th {\ - text-shadow:black 1px 1px 3px;\ - font-size:1.3em;\ - background-color:#F0F0F0;\ - padding:8px;\ - border-bottom:1px solid black;\ -}\ -\ -#content tr:nth-child(odd) { background-color: white; }\ -#content div.entry:nth-child(odd) { background-color: white; }\ -\ -#content tr:nth-child(even) { background-color: #EDEDED; }\ -#content div.entry:nth-child(even) { background-color: #EDEDED; }\ -/*#content tr:nth-child(even) { background-color: #D0D0D0; }\ -#content div.entry:nth-child(even) { background-color: #D0D0D0; }*/\ -\ -\ -/* The a links are the normal HTML hyperlinks. Links without a class attribute are hyperlinks into the web */\ -a { color:#FF0004; padding:0; }\ -a:hover { }\ -\ -/* An entry is the generic element used for all content items.\ - In Bibles an entry contains a verse, in commentaries the comment to a verse range,\ - in lexicons an simple item and in book the text of an item with other .entry elements as childs.\ -\ - If just one module is chosen, all entries are put together in one sourrounding table column. In this case the elements div and span may have the class \"entry\". If it's a div each entry should be on it's own line. span.entry should not add a linebreak.\ -\ - If more than one module (Bibles) was chosen, the entry class applies to \"td\" elements, one column for a verse\ - */\ -.entry {\ - padding:0.3em;\ - vertical-align: top;\ -}\ -table .entry:nth-child(odd) {\ - border-left:10px solid #DEE6F6;\ -}\ -\ -table .entry:nth-child(even) {\ - border-left:10px solid #E6EEFF;\ -}\ -\ -#printer .entry { text-indent:15px; }\ -/* Often needed to format BiDi text in the right way */\ -/* .entry[dir=rtl] { text-align:right !important; } */b\ -/* #printer .entry[dir=rtl] { } */\ -\ -/* Special formatting for the block element entries */\ -div.entry, td.entry { }\ -td.entry {\ - vertical-align:top;\ -}\ -\ -/* Currententry is chosen when the entry should be highlighted as the current entry chosen by the user\ - currententry may apply to span, div, td (just like .entry)\ - */\ -.currententry {\ - padding:0.3em;\ - line-height:1.6em;\ - background-color:#D3E5FF;\ - /*border: thin solid black;*/\ - \ -}\ -\ -table .currententry:nth-child(1) {\ - margin-left:0;\ - border-left:10px solid #99B4FF;\ - /*border-left:10px solid #F5FF6A;*/\ -}\ -/* .currententry[dir=rtl] { */\ -/* } */\ -div.currententry { }\ -span.currententry { }\ -\ -/* You may use this to format the space between two columns */\ -td.entry + td.entry {\ - margin:0;\ -}\ -\ -/* Several additional settings for displaying Bible modules*/\ -#bible div.entry {\ - border-left:10px solid white;\ -}\ -#bible div.entry[dir=rtl] {\ - border-left:none;\ - border-right:10px solid white;\ - text-align:right;\ -}\ -#bible div.currententry {\ - border-left:10px solid #99B4FF;\ -}\ -#bible div.currententry[dir=rtl] {\ - border-left:none;\ - border-right:10px solid #99B4FF;\ -}\ -#bible div.currententry, #bible td.currententry { }\ -#bible td.currententry { }\ -\ -/* Same for books! */\ -#book div.currententry, #book td.currententry { }\ -#book .entryname + .entry { }\ -/* To remove the gap between the entryname and the entry's content*/\ -#book .entry > *, #book .currententry > * { }\ -\ -/* An entryname is embedded in an .entry tag and contains the name of the key, which belongs to the text of the .entry */\ -.entryname { size:60%; vertical-align:super;}\ -.entryname a { text-decoration:none !important; color:#8F2627 !important; font-style:italic; padding:0; }\ -\ -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname { }\ -.entryname a, #printer .entryname { }\ -/* As you can see #printer is used to format pages which are send to the printer. Printer pages should be clean and easy to read */\ -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle { }\ -\ -/* Footnote formatting options */\ -/* A footnote is displayed as an asterisk or another small character. You can set the colors, font-size, etc. for the footnote. */\ -.footnote { color:#8F2627; vertical-align:super; font-size:70%;}\ -/* You may use this to add sourrounding brackets in Bible modules. To do this the content command of CSS */\ -#bible .footnote:before { content:\" [\"; color:#8F2627; }\ -#bible .footnote:after { content:\"]\"; color:#8F2627; }\ -\ -/* Crossreferences. The same as footnotes */\ -.crossreference { color:#8f2627;}\ -#bible .crossreference:before { content:\" {\" }\ -#bible .crossreference:after { content:\"}\" }\ -\ -/*Keep in mind that for cross references it is not enough to\ -*set only the cross reference colour, you must also set the\ -*cross reference anchor marker with .crossreference a\ -*This way both the non linked and linked text will show\ -*as desired. Additionally, you can have seperate formatting\ -*for linked and non linked text in the cross reference*/\ -.crossreference a {\ - color:#8f2627;\ - /*Get rid of underlines on the notes when not hovered*/\ - text-decoration: none;\ -}\ -.crossreference a:hover {}\ -\ -/* Alternative reading as defined in the OSIS specs. The information about the alternative text is displayed in the info display. It's\ -often a good idea to format this the same as footnotes\ -The text which is the alternative of the displayed text is available in the attribute \"alternative\"\ -so something like .alternative:before { content:\"'\"attr(alternative); } is possible\ -*/\ -.alternative {}\ -.alternative:before { }\ -.alternative:after { }\ -\ -/* An abbreviation. */\ -.abbreviation { }\ -\ -/* A title within the text. This is the formatting which applies to a title of a section, as you can find them in Bibles */\ -.sectiontitle {\ - padding:0.3em;\ - /*text-shadow:gray 0px 0px 3px;*/\ - font-size:1.3em;\ - font-weight:bold;\ - text-transform:uppercase;\ - padding-bottom:2px;\ -}\ -#printer .sectiontitle { }\ -/* You may want to format elements before section titles in a special way. */\ -* + .sectiontitle { }\ -\ -/* The title of a book, e.g. \"The gospel of Matthew\" */\ -.booktitle { }\ -#printer .booktitle { }\ -\ -/* A foreign word */\ -.foreign { }\ -\ -/* Words spoken by Jesus Christ */\ -/*.jesuswords { color: red; }*/\ -.jesuswords { color: #B60000; }\ -\ -/* An introduction to a module, book or chapter */\ -.introduction { }\ -/* A quotation without a special speaker */\ -.quotation { }\ -/* Poetry formatting */\ -.poetry { }\ -/* Text displayed above. It's like the sup tag in HTML */\ -.sup { }\ -/* Sub text, the opposite of .sup */\ -.sub { }\ -/* Display the text inside as right aligned text */\ -.right { }\ -/* Display as centered text */\ -.center { }\ -\ -/* Visual attributes to the text */\ -.bold {\ - font-weight: bold;\ -}\ -.illuminated { }\ -.italic {\ - font-style: italic;\ -}\ -.line-through { }\ -.normal { }\ -.small-caps{ }\ -.underline { }\ -\ -/* An inscription */\ -.inscription { }\ -\ -.mentioned { }\ -\ -/* Special formatting rules for names, see the OSIS specs for detailed information */\ -.name {}\ -.name > .geographic { }\ -.name > .holiday { }\ -.name > .nonhuman { }\ -.name > .person { }\ -.name > .ritual { }\ -.name > .divine { font-variant: small-caps; }\ -\ -/* Information added by the translator */\ -.transchange {}\ -.transchange > .added { }\ -.transchange > .amplified {}\ -.transchange > .changed { }\ -.transchange > .deleted { }\ -.transchange > .moved { }\ -.transchange > .tenseChange { }\ -\ -/* Special text markup */\ -/* Morph segmentation is a special feature for hebrew to markup the word divisions in the text */\ -/* .morphSegmentation { border-left:1px solid red; } */\ -.morphSegmentation + .morphSegmentation {\ - border-right: 1px red solid;\ -}\ -\ -/* The formatting of all things displayed in the information window */\ -#infodisplay {background:white; font-size:10pt; padding:5px; margin:0px;}\ -\ -/* The headings of a section, several sections may be displayed together at the same time */\ -#infodisplay .footnoteinfo h3,\ -#infodisplay .strongsinfo h3,\ -#infodisplay .morphinfo h3,\ -#infodisplay .translationinfo h3,\ -#infodisplay .crossrefinfo h3 {\ - font-size:12pt;\ - font-weight:bold;\ - text-transform:uppercase;\ - text-align:right;\ - color:gray;\ - border-bottom:1px solid black;\ - padding:4px;\ -}\ -\ -#infodisplay > p, #infodisplay * > p { /* We only format the first p child in a special way */\ - font-size:80%;\ -}\ -\ -/*Required for cross references*/\ -#infodisplay .entry {\ - font-size:80%;\ -}\ -#infodisplay .entry .entry { /* No smaller font size for nested entries */\ - font-size:100% !important;\ -}\ -#infodisplay .entryname {\ - font-weight:bold;\ -}\ -#infodisplay .rangeheading {\ - font-weight:bold;\ -}\ -\ -#printer .rangeheading {}\ -\ -\ -*[dir=rtl] { text-align:right !important; }\ -\ -/* Here's the marker for the language specific fotn information. BibleTime replaces this by the CSS for the fonts */\ -#LANG_CSS#\ -\ -/* ]]> */\ - </style>\ -</head>\ -\ -<!-- The display type may be bible, book, printer -->\ -<body id=\"#DISPLAYTYPE#\">\ - <div id=\"content\" lang=\"#LANG_ABBREV#\" xml:lang=\"#LANG_ABBREV#\" dir=\"#PAGE_DIRECTION#\">#CONTENT#</div>\ -</body>\ -</html>\ -"; - m_templateMap[ i18n("Green") ] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ -<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\ -<html xmlns=\"http://www.w3.org/1999/xhtml\">\ -<head>\ - <title>#TITLE#</title>\ - <meta name=\"GENERATOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta name=\"AUTHOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\ - \ - <style type=\"text/css\">\ - /* <![CDATA[ */\ -\ -* { \ - /* To work around a KDE 3.2 bug / problem */\ - background-color:transparent;\ -}\ -\ -#content {\ - background-color:transparent;\ - margin:10px;\ -}\ -#content > table {\ - margin: 0;\ - padding: 0;\ - border-spacing:10px;\ - vertical-align:top;\ -}\ -#content > table th {\ - padding: 0 0 2px 0;\ - text-align: center; \ - font-weight: bold;\ - font-size: 110%;\ - border-bottom: 1px solid #6B6B6B;\ -}\ -\ -a {\ - text-decoration:none;\ - font-weight:normal;\ - color: #3B11AE;\ - background-color:transparent; \ - padding:0 2px;\ -}\ -a:hover {\ - background-color:transparent;\ - color: #AE1518;\ - padding:0 2px;\ -}\ -\ -\ -/* Settings which apply to all entries in all modules */\ -.entry {\ - padding: 3px;\ -/* vertical-align: middle; */\ - vertical-algin: top;\ - text-align: justify;\ -}\ -#printer .entry {\ - font-size:90%;\ - text-align:left;\ -}\ -.entry[dir=rtl] {\ - text-align:right !important;\ -}\ -#printer .entry[dir=rtl] {\ - text-align:right !important;\ -}\ -div.entry, td.entry {\ - vertical-align:top;\ -}\ -\ -/* Keep the values the same as in .entry (take the border into account!) */\ -.currententry {\ - padding:3px;\ - vertical-align:middle;\ - text-align:justify;\ -}\ -.currententry[dir=rtl] {\ - text-align:right !important;\ -}\ -div.currententry {\ -}\ -span.currententry {\ - background-color:#D4FFCB;\ -}\ -\ -\ -/*Space between the columns of modules displayed side by side*/\ -td.entry + td.entry { \ - margin-left: 5px;\ -}\ -\ -/* Several additional settings for display of modules*/\ -#bible div.currententry, #bible td.currententry {\ - border:1px solid black;\ - padding:2px;\ - background-color:#F6FFF7;\ -}\ -#bible span.currententry {\ - background-color:#C8FFB6;\ -}\ -\ -/*Same for books!*/\ -#book div.currententry, #book td.currententry {\ - border:1px solid black;\ - background-color:#F6FFF7;\ -}\ -#book span.currententry {\ - background-color:#C8FFB6;\ -}\ -\ -\ -.entryname {\ - font-size:80%;\ - padding:0 2px 0 0;\ - vertical-align:super;\ -}\ -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname {\ - padding: 0 0 0 2px;\ - font-size: 80%;\ - vertical-align:super;\ -}\ -.entryname a, #printer .entryname {\ - vertical-align: middle\ -}\ -\ -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle {\ - padding-top: 0.05em;\ - margin-left: 10px;\ -}\ -\ -.footnote {\ - vertical-align:super;\ - color: blue;\ - font-size: 70%;\ -}\ -.footnote:before { content:\"(\"; }\ -.footnote:after { content:\")\"; }\ -\ -.crossreference {\ - font-size: 80%;\ - /*vertical-align:middle;*/\ - color: blue;\ -}\ -\ -.crossreference a {\ - font-size: 80%;\ - /*vertical-align:middle;*/\ - color: blue;\ -}\ -\ -.crossreference a:hover {\ - font-size: 80%;\ - /*vertical-align:middle;*/\ - color: blue;\ -}\ -\ -\ -\ -.sectiontitle {\ - font-weight: bold;\ - font-size: 110%;\ -}\ -#printer .sectiontitle {\ - font-weight: bold;\ - font-size: 100%;\ -}\ -* + .sectiontitle {\ - margin-top:15px;\ -}\ -\ -.booktitle {\ - font-weight: bold;\ - font-size: 120%;\ - font-variant: small-caps;\ -}\ -#printer .booktitle {\ - font-weight: bold;\ - font-size: 120%;\ - font-variant: small-caps;\ -}\ -.foreign {\ -}\ -.jesuswords {\ - color:#9C2323;\ -}\ -\ -.quotation {\ -}\ -.poetry {\ -}\ -.sup {\ - vertical-align: super;\ -}\ -.sub {\ - vertical-align: sub;\ -}\ -.right {\ - text-align: right;\ -}\ -.center {\ - text-align: center;\ -}\ -\ -.bold {\ - font-weight:bold;\ -}\ -.illuminated {\ -}\ -.italic {\ - font-style:italic;\ -}\ -.line-through {\ -}\ -.normal {\ -}\ -.small-caps{\ -}\ -.underline {\ - font-style:underline;\ -}\ -\ -.inscription {\ -}\ -.mentioned {\ -}\ -.name > .geographic {\ -}\ -.name > .holiday {\ -}\ -.name > .nonhuman {\ -}\ -.name > .person {\ -}\ -.name > .ritual {\ -}\ -.name > .divine {\ - font-variant: small-caps;\ -}\ -\ -.transchange { \ - font-style:italic; \ -}\ -.transchange > .added {\ - background-color:inherit;\ -}\ -.transchange > .amplified { \ -}\ -.transchange > .changed { \ -}\ -.transchange > .deleted {\ -}\ -.transchange > .moved {\ -}\ -.transchange > .tenseChange {\ -}\ -\ -.morphSegmentation {\ - border: 1px solid grey;\ - margin-top: 1px; /* Don`t let the boxes touch here, between the lines */\ - margin-left: -1px; /* But here, for better reading of the text, \ - this will only occur within a word consisting of several segments.*/\ - margin-right: 0px;\ -}\ -\ -#infodisplay {\ - margin:0;\ - padding:0;\ - font-size:100%;\ -}\ -\ -#infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3 {\ - padding:4px 4px 2px 0;\ - color:darkGrey;\ - font-weight:bold;\ - border-bottom:1px solid grey;\ - font-size:100%;\ - text-align:left !important;\ -}\ -\ -#infodisplay > p, #infodisplay * > p { /* We only format the first p child in a special way */\ - font-size:100%;\ - text-align:justify;\ - color:black;\ - margin:0px;\ - padding:0px;\ -}\ -\ -/*Required for cross references*/\ -#infodisplay .entry {\ - padding:2px;\ - text-align:justify;\ - font-size:100%;\ - margin-bottom:10px;\ - margin-left:15px;\ -}\ -#infodisplay .entry .entry { /*No smaller font size for nested entries*/\ - font-size:100%;\ - margin:0px;\ -}\ -#infodisplay .entryname {\ - padding:2px;\ - margin:0px;\ - text-align:left;\ - font-weight:bold; \ - font-size:100%;\ -}\ -\ -#infodisplay .rangeheading {\ - color:black;\ - font-weight:bold;\ - margin-left:-10px;\ -}\ -\ -#printer .rangeheading {\ - border-bottom:1px solid black;\ - color:black;\ -}\ -\ -#LANG_CSS#\ -\ - /* ]]> */\ - </style>\ -</head>\ -\ -<body id=\"#DISPLAYTYPE#\">\ - <div id=\"content\" lang=\"#LANG_ABBREV#\" xml:lang=\"#LANG_ABBREV#\" dir=\"#PAGE_DIRECTION#\">#CONTENT#</div>\ -</body>\ -</html>\ -"; - m_templateMap[ i18n("High contrast") ] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ -<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\ -<html xmlns=\"http://www.w3.org/1999/xhtml\">\ -<head>\ - <title>#TITLE#</title>\ - <meta name=\"GENERATOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta name=\"AUTHOR\" content=\"BibleTime - www.bibletime.info\" />\ - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\ - \ - <style type=\"text/css\">\ - /* <![CDATA[ */\ -\ -* { \ - /* To work around a KDE 3.2 bug / problem */\ - background-color:transparent;\ -}\ -\ -#content {\ - /*background-color:white;*/\ - margin:10px;\ -}\ -#content > table {\ - margin: 0;\ - padding: 0;\ - border-spacing:10px;\ - vertical-align:top;\ -}\ -#content > table th {\ - padding: 0 0 2px 0;\ - text-align: center; \ - /*font-weight: bold;*/\ - font-size: 110%;\ - border-bottom: 1px solid #6B6B6B;\ -}\ -\ -a {\ - text-decoration:none;\ - font-weight:normal;\ - /*color: #F98100;*/\ - padding:1px;\ - background-color:transparent;\ -}\ -a:hover {\ - background-color:transparent;\ - color: #FF0000;\ - padding:1px;\ - text-decoration:underline;\ -}\ -\ -/* Settings which apply to all entries in all modules */\ -.entry {\ - padding: 2px;\ - vertical-align: top;\ - text-align: justify;\ -}\ -#printer .entry {\ - font-size: 90%;\ - text-align: left;\ -}\ -.entry[dir=rtl],#printer .entry[dir=rtl] {\ - text-align: right;\ -}\ -div.entry, td.entry {\ - vertical-align:top; \ -}\ -\ -/* Keep the values the same as in .entry (take the border into account!) */\ -.currententry {\ - padding: 2px;\ - vertical-align: top;\ - text-align: justify;\ - /*font-weight: bolder;*/\ - /*background-color:transparent;*/\ - /*color:white;*/\ - /*background-color:black;*/\ - /*The background colour of selected text as of kde 3.5.2*/\ - background-color: #A5A5FF;\ -}\ -.currententry[dir=rtl] {\ - text-align: right;\ -}\ -div.currententry {\ -}\ -span.currententry {\ - \ -}\ -\ -\ -/*Space between the columns of modules displayed side by side*/\ -td.entry + td.entry { \ - margin-left: 5px;\ -}\ -\ -/* Several additional settings for display of modules*/\ -#bible div.currententry, #bible td.currententry {\ - /*border: 1px solid black;*/\ - padding: 4px;\ -}\ -#bible span.currententry {\ -}\ -\ -/*Same for books!*/\ -#book div.currententry, #book td.currententry {\ - border: 1px solid black;\ -}\ -#book span.currententry {\ -}\ -\ -\ -.entryname {\ - font-size:70%;\ - padding:0 1px 0 0;\ - vertical-align:top;\ - /*color: #F98100;*/\ - color: black;\ - /*font-style: italic;*/\ -}\ -.entry[dir=rtl] .entryname, .currententry[dir=rtl] .entryname {\ - padding:0 0 0 1px;\ - font-size:60%;\ - /*vertical-align:top; */\ -}\ -.entryname a, #printer .entryname {\ - vertical-align: top;\ - font-size: 100%;\ - font-weight: bold;\ - color: black;\ -}\ -\ -#printer .entry .entry, #printer .entry .sectiontitle , #printer .entry .booktitle {\ - padding-top:0.05em;\ - margin-left:10px;\ -}\ -\ -.footnote {\ - vertical-align:super;\ - font-weight:bold;\ - /*color: #00B7FF;*/ /*This one is kind of blinding on white*/\ - /*color: #F98100;*/\ - font-size:80%;\ - color: black;\ -}\ -\ -\ -.footnote:before {\ - content: \"(\";\ -}\ -\ -.footnote:after {\ - content: \")\";\ -}\ -\ -.crossreference {\ - font-size: 80%;\ - /*vertical-align:middle;*/\ - /*color: blue;*/\ - /*color: #F98100;*/\ -}\ -\ -.crossreference:before {\ - content: \"[\";\ -}\ -\ -.crosreference:after {\ - content: \"]\";\ -}\ -\ -.sectiontitle {\ - font-weight: bold;\ - font-size: 110%;\ -}\ -#printer .sectiontitle {\ - font-weight: bold;\ - font-size: 100%;\ -}\ -* + .sectiontitle {\ - margin-top:15px;\ -}\ -\ -.booktitle {\ - font-weight: bold;\ - font-size: 120%;\ - font-variant: small-caps;\ -}\ -#printer .booktitle {\ - font-weight: bold;\ - font-size: 120%;\ - font-variant: small-caps;\ -}\ -.foreign {\ -}\ -.jesuswords {\ - /*color:red;*/\ - /*color: #7500AC;*/\ - /*color: #F98100;*/\ - font-style:italic;\ - /*font-weight: bold;*/\ - font-size:0.9em;\ -}\ -\ -.quotation {\ -}\ -.poetry {\ -}\ -.sup {\ - vertical-align: super;\ -}\ -.sub {\ - vertical-align: sub;\ -}\ -.right {\ - text-align: right;\ -}\ -.center {\ - text-align: center;\ -}\ -\ -.bold {\ - font-weight:bold;\ -}\ -.illuminated {\ -}\ -.italic {\ - font-style:italic;\ -}\ -.line-through {\ -}\ -.normal {\ -}\ -.small-caps{\ -}\ -.underline {\ - font-style:underline;\ -}\ -\ -.inscription {\ -}\ -.mentioned {\ -}\ -.name > .geographic {\ -}\ -.name > .holiday {\ -}\ -.name > .nonhuman {\ -}\ -.name > .person {\ -}\ -.name > .ritual {\ -}\ -.name > .divine {\ - font-variant: small-caps;\ -}\ -\ -.transchange { \ - font-style:italic; \ -}\ -.transchange > .added {\ - background-color:inherit;\ -}\ -.transchange > .amplified { \ -}\ -.transchange > .changed { \ -}\ -.transchange > .deleted {\ -}\ -.transchange > .moved {\ -}\ -.transchange > .tenseChange {\ -}\ -\ -.morphSegmentation {\ - border: 1px solid grey;\ - margin-top: 1px; /* Don`t let the boxes touch here, between the lines */\ - margin-left: -1px; /* But here, for better reading of the text, \ - this will only occur within a word consisting of several segments.*/\ - margin-right: 0px;\ -}\ -\ -#infodisplay {\ - margin:0;\ - padding:0;\ -}\ -\ -#infodisplay .footnoteinfo h3, #infodisplay .strongsinfo h3, #infodisplay .morphinfo h3, #infodisplay .translationinfo h3, #infodisplay .crossrefinfo h3 {\ - padding: 2px 0 0 0;\ - color: black;\ - font-weight: bold;\ - border-bottom: 1px solid black;\ - font-size: 90%;\ - margin: 0 0 3px 0;\ -}\ -\ -#infodisplay > p { /* We only format the first p child in a special way */\ - font-size: 90%;\ - color: black;\ - margin: 0px;\ - padding: 0px;\ -}\ -\ -/*Required for cross references*/\ -#infodisplay .entry {\ - padding: 2px;\ - text-align: justify;\ - font-size: 80%;\ - margin: 0 0 10px 10px;\ -}\ -#infodisplay .entry .entry { /*No smaller font size for nested entries*/\ - font-size: 100%;\ - margin: 0px;\ -}\ -#infodisplay .entryname {\ - padding: 2px;\ - margin: 0px;\ - text-align: left;\ - font-weight: bold;\ - font-size: 90%;\ -}\ -\ -#infodisplay .rangeheading {\ - color: black;\ - font-weight: bold;\ - margin-left: -5px;\ -}\ -\ -#printer .rangeheading {\ - border-bottom: 1px solid black;\ - color: black;\ -}\ -\ -#LANG_CSS#\ -\ - /* ]]> */\ - </style>\ -</head>\ -\ -<body id=\"#DISPLAYTYPE#\">\ - <div id=\"content\" lang=\"#LANG_ABBREV#\" xml:lang=\"#LANG_ABBREV#\">#CONTENT#</div>\ -</body>\ -</html>\ -"; - m_templateMap[ i18n("Simple") ] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ -<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\ -<html xmlns=\"http://www.w3.org/1999/xhtml\">\ -<head>\ - <title>#TITLE#</title>\ - <meta name=\"GENERATOR\" content=\"BibleTime \" VERSION \"\" />\ - <meta name=\"AUTHOR\" content=\"BibleTime \" VERSION \"\" />\ - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\ - \ - <style type=\"text/css\">\ -/* <![CDATA[ */\ -body {\ - margin:5px;\ -}\ -#content {\ - background-color:white;\ -}\ -#content table {\ - margin:0;\ - padding:0;\ - border-spacing:10px;\ - border-collapse: collapse;\ - vertical-align: top;\ -}\ -#content table th {\ - padding: 0 0 2px 0;\ - text-align: center; \ - font-weight: bold;\ - font-size: 115%;\ -}\ -\ -a {\ - text-decoration:none;\ - font-weight:normal;\ - color: blue;\ - padding:2px;\ -}\ -\ -td.entry, div.entry {\ - padding: 5px;\ - vertical-align: top;\ -}\ -span.entry {\ - padding: 5px;\ -}\ -\ -td.currententry, div.currententry {\ - padding: 5px;\ - vertical-align: top;\ - font-weight:bold;\ -}\ -td.entry + td.entry {\ - margin-left: 5px;\ -}\ -span.currententry {\ - font-weight:bold;\ - vertical-align: middle;\ - padding: 5px;\ -}\ -\ -.footnote {\ - color: gray;\ -}\ -\ -.strongnumber {\ - vertical-align: top;\ - font-size: 60%;\ - color: blue;\ -}\ -.morphcode {\ - vertical-align: top;\ - font-size: 60%;\ - color: blue;\ -}\ -.lemma {\ -}\ -\ -.sectiontitle {\ - font-weight: bold;\ - font-size: 120%;\ -}\ -.entry + .sectiontitle {\ - margin-top:35px;\ - padding-top:35px;\ -}\ -\ -.booktitle {\ - font-weight: bold;\ - font-size: 140%;\ -}\ -.foreign {\ -}\ -.jesuswords {\ - color: red;\ - font-size: 0.9em;\ -}\ -\ -.name > .divine {\ - font-variant: small-caps;\ -}\ -\ -.quotation {\ -}\ -.poetry {\ -}\ -.sup {\ - vertical-align: super;\ -}\ -.sub {\ - vertical-align: sub;\ -}\ -.right {\ - text-align: right;\ -}\ -.center {\ - text-align: center;\ -}\ -/*TODO: Think of something better here since this will get confusing*/\ -/* on verses but, is needed for things inthe Mag/Info window*/\ -.bold {\ - font-weight: bold;\ -}\ -.italic {\ - font-style: italic;\ -}\ -#LANG_CSS#\ -/* ]]> */\ - </style>\ -</head>\ -\ -<body>\ - <div id=\"content\" lang=\"#LANG_ABBREV#\" xml:lang=\"#LANG_ABBREV#\" dir=\"#PAGE_DIRECTION#\">#CONTENT#</div>\ -</body>\ -</html>\ -"; - -} diff --git a/bibletime/frontend/Makefile.am b/bibletime/frontend/Makefile.am deleted file mode 100644 index 8f22646..0000000 --- a/bibletime/frontend/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -INCLUDES = $(all_includes) -libfrontend_a_METASOURCES = AUTO -noinst_LIBRARIES = libfrontend.a - -libfrontend_a_SOURCES = btinstallmgr.cpp cbtconfig.cpp cinputdialog.cpp \ - manageindicesform.ui cmanageindiceswidget.cpp coptionsdialog.cpp \ - cswordsetupdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp \ - cmdiarea.cpp kstartuplogo.cpp cdragdropmgr.cpp cinfodisplay.cpp cprinter.cpp \ - crossrefrendering.cpp cswordsetupmodulelistview.cpp \ - cswordsetupinstallsourcesdialog.cpp cmoduleindexdialog.cpp - -all_headers = cmdiarea.h \ -btinstallmgr.h \ -cbtconfig.h \ -cinputdialog.h \ -coptionsdialog.h \ -cmanageindiceswidget.h \ -cswordsetupdialog.h \ -cprofilemgr.h \ -cprofile.h \ -cprofilewindow.h \ -cexportmanager.h \ -cmdiarea.h \ -kstartuplogo.h \ -cdragdropmgr.h \ -cinfodisplay.h \ -cprinter.h \ -crossrefrendering.h \ -cswordsetupmodulelistview.h \ -cswordsetupinstallsourcesdialog.h - -EXTRA_DIST = $(libfrontend_a_SOURCES) $(all_headers) - -SUBDIRS = util searchdialog mainindex keychooser displaywindow display -noinst_HEADERS = cmoduleindexdialog.h diff --git a/bibletime/frontend/Makefile.in b/bibletime/frontend/Makefile.in deleted file mode 100644 index c083cb9..0000000 --- a/bibletime/frontend/Makefile.in +++ /dev/null @@ -1,1024 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/frontend -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libfrontend_a_AR = $(AR) $(ARFLAGS) -libfrontend_a_LIBADD = -am_libfrontend_a_OBJECTS = btinstallmgr.$(OBJEXT) cbtconfig.$(OBJEXT) \ - cinputdialog.$(OBJEXT) cmanageindiceswidget.$(OBJEXT) \ - coptionsdialog.$(OBJEXT) cswordsetupdialog.$(OBJEXT) \ - cprofilemgr.$(OBJEXT) cprofile.$(OBJEXT) \ - cprofilewindow.$(OBJEXT) cexportmanager.$(OBJEXT) \ - cmdiarea.$(OBJEXT) kstartuplogo.$(OBJEXT) \ - cdragdropmgr.$(OBJEXT) cinfodisplay.$(OBJEXT) \ - cprinter.$(OBJEXT) crossrefrendering.$(OBJEXT) \ - cswordsetupmodulelistview.$(OBJEXT) \ - cswordsetupinstallsourcesdialog.$(OBJEXT) \ - cmoduleindexdialog.$(OBJEXT) -#>- libfrontend_a_OBJECTS = $(am_libfrontend_a_OBJECTS) -#>+ 15 -libfrontend_a_final_OBJECTS = libfrontend_a.all_cpp.o -libfrontend_a_nofinal_OBJECTS = btinstallmgr.$(OBJEXT) cbtconfig.$(OBJEXT) \ - cinputdialog.$(OBJEXT) cmanageindiceswidget.$(OBJEXT) \ - coptionsdialog.$(OBJEXT) cswordsetupdialog.$(OBJEXT) \ - cprofilemgr.$(OBJEXT) cprofile.$(OBJEXT) \ - cprofilewindow.$(OBJEXT) cexportmanager.$(OBJEXT) \ - cmdiarea.$(OBJEXT) kstartuplogo.$(OBJEXT) \ - cdragdropmgr.$(OBJEXT) cinfodisplay.$(OBJEXT) \ - cprinter.$(OBJEXT) crossrefrendering.$(OBJEXT) \ - cswordsetupmodulelistview.$(OBJEXT) \ - cswordsetupinstallsourcesdialog.$(OBJEXT) \ - cmoduleindexdialog.$(OBJEXT) manageindicesform.$(OBJEXT)\ -cinputdialog.moc.o cmanageindiceswidget.moc.o cprinter.moc.o cinfodisplay.moc.o coptionsdialog.moc.o cmdiarea.moc.o cswordsetupdialog.moc.o cswordsetupmodulelistview.moc.o btinstallmgr.moc.o cswordsetupinstallsourcesdialog.moc.o cmoduleindexdialog.moc.o -@KDE_USE_FINAL_FALSE@libfrontend_a_OBJECTS = $(libfrontend_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libfrontend_a_OBJECTS = $(libfrontend_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libfrontend_a_SOURCES) -DIST_SOURCES = $(libfrontend_a_SOURCES) -#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -#>- html-recursive info-recursive install-data-recursive \ -#>- install-dvi-recursive install-exec-recursive \ -#>- install-html-recursive install-info-recursive \ -#>- install-pdf-recursive install-ps-recursive install-recursive \ -#>- installcheck-recursive installdirs-recursive pdf-recursive \ -#>- ps-recursive uninstall-recursive -#>+ 7 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive -HEADERS = $(noinst_HEADERS) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libfrontend_a_METASOURCES = AUTO -noinst_LIBRARIES = libfrontend.a -#>- libfrontend_a_SOURCES = btinstallmgr.cpp cbtconfig.cpp cinputdialog.cpp \ -#>- manageindicesform.ui cmanageindiceswidget.cpp coptionsdialog.cpp \ -#>- cswordsetupdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp \ -#>- cmdiarea.cpp kstartuplogo.cpp cdragdropmgr.cpp cinfodisplay.cpp cprinter.cpp \ -#>- crossrefrendering.cpp cswordsetupmodulelistview.cpp \ -#>- cswordsetupinstallsourcesdialog.cpp cmoduleindexdialog.cpp -#>+ 6 -libfrontend_a_SOURCES=btinstallmgr.cpp cbtconfig.cpp cinputdialog.cpp \ - cmanageindiceswidget.cpp coptionsdialog.cpp \ - cswordsetupdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp \ - cmdiarea.cpp kstartuplogo.cpp cdragdropmgr.cpp cinfodisplay.cpp cprinter.cpp \ - crossrefrendering.cpp cswordsetupmodulelistview.cpp \ - cswordsetupinstallsourcesdialog.cpp cmoduleindexdialog.cpp manageindicesform.cpp - -all_headers = cmdiarea.h \ -btinstallmgr.h \ -cbtconfig.h \ -cinputdialog.h \ -coptionsdialog.h \ -cmanageindiceswidget.h \ -cswordsetupdialog.h \ -cprofilemgr.h \ -cprofile.h \ -cprofilewindow.h \ -cexportmanager.h \ -cmdiarea.h \ -kstartuplogo.h \ -cdragdropmgr.h \ -cinfodisplay.h \ -cprinter.h \ -crossrefrendering.h \ -cswordsetupmodulelistview.h \ -cswordsetupinstallsourcesdialog.h - -EXTRA_DIST = $(libfrontend_a_SOURCES) $(all_headers) -SUBDIRS = util searchdialog mainindex keychooser displaywindow display -noinst_HEADERS = cmoduleindexdialog.h -#>- all: all-recursive -#>+ 1 -all: docs-am all-recursive - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/frontend/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libfrontend.a: $(libfrontend_a_OBJECTS) $(libfrontend_a_DEPENDENCIES) - -rm -f libfrontend.a - $(libfrontend_a_AR) libfrontend.a $(libfrontend_a_OBJECTS) $(libfrontend_a_LIBADD) - $(RANLIB) libfrontend.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btinstallmgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbtconfig.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdragdropmgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cexportmanager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cinfodisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cinputdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmanageindiceswidget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmdiarea.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmoduleindexdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coptionsdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprinter.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofilemgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofilewindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crossrefrendering.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordsetupdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordsetupinstallsourcesdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordsetupmodulelistview.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstartuplogo.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(LIBRARIES) $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-recursive -#>+ 1 -clean: kde-rpo-clean clean-recursive - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-metasources clean-ui clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLIBRARIES ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 3 -cinputdialog.moc.cpp: $(srcdir)/cinputdialog.h - $(MOC) $(srcdir)/cinputdialog.h -o cinputdialog.moc.cpp - -#>+ 2 -mocs: cinputdialog.moc.cpp - -#>+ 3 -cmanageindiceswidget.moc.cpp: $(srcdir)/cmanageindiceswidget.h - $(MOC) $(srcdir)/cmanageindiceswidget.h -o cmanageindiceswidget.moc.cpp - -#>+ 2 -mocs: cmanageindiceswidget.moc.cpp - -#>+ 3 -cprinter.moc.cpp: $(srcdir)/cprinter.h - $(MOC) $(srcdir)/cprinter.h -o cprinter.moc.cpp - -#>+ 2 -mocs: cprinter.moc.cpp - -#>+ 3 -cinfodisplay.moc.cpp: $(srcdir)/cinfodisplay.h - $(MOC) $(srcdir)/cinfodisplay.h -o cinfodisplay.moc.cpp - -#>+ 2 -mocs: cinfodisplay.moc.cpp - -#>+ 3 -coptionsdialog.moc.cpp: $(srcdir)/coptionsdialog.h - $(MOC) $(srcdir)/coptionsdialog.h -o coptionsdialog.moc.cpp - -#>+ 2 -mocs: coptionsdialog.moc.cpp - -#>+ 3 -cmdiarea.moc.cpp: $(srcdir)/cmdiarea.h - $(MOC) $(srcdir)/cmdiarea.h -o cmdiarea.moc.cpp - -#>+ 2 -mocs: cmdiarea.moc.cpp - -#>+ 3 -cswordsetupdialog.moc.cpp: $(srcdir)/cswordsetupdialog.h - $(MOC) $(srcdir)/cswordsetupdialog.h -o cswordsetupdialog.moc.cpp - -#>+ 2 -mocs: cswordsetupdialog.moc.cpp - -#>+ 3 -cswordsetupmodulelistview.moc.cpp: $(srcdir)/cswordsetupmodulelistview.h - $(MOC) $(srcdir)/cswordsetupmodulelistview.h -o cswordsetupmodulelistview.moc.cpp - -#>+ 2 -mocs: cswordsetupmodulelistview.moc.cpp - -#>+ 3 -btinstallmgr.moc.cpp: $(srcdir)/btinstallmgr.h - $(MOC) $(srcdir)/btinstallmgr.h -o btinstallmgr.moc.cpp - -#>+ 2 -mocs: btinstallmgr.moc.cpp - -#>+ 3 -cswordsetupinstallsourcesdialog.moc.cpp: $(srcdir)/cswordsetupinstallsourcesdialog.h - $(MOC) $(srcdir)/cswordsetupinstallsourcesdialog.h -o cswordsetupinstallsourcesdialog.moc.cpp - -#>+ 2 -mocs: cswordsetupinstallsourcesdialog.moc.cpp - -#>+ 3 -cmoduleindexdialog.moc.cpp: $(srcdir)/cmoduleindexdialog.h - $(MOC) $(srcdir)/cmoduleindexdialog.h -o cmoduleindexdialog.moc.cpp - -#>+ 2 -mocs: cmoduleindexdialog.moc.cpp - -#>+ 3 -clean-metasources: - -rm -f cinputdialog.moc.cpp cmanageindiceswidget.moc.cpp cprinter.moc.cpp cinfodisplay.moc.cpp coptionsdialog.moc.cpp cmdiarea.moc.cpp cswordsetupdialog.moc.cpp cswordsetupmodulelistview.moc.cpp btinstallmgr.moc.cpp cswordsetupinstallsourcesdialog.moc.cpp cmoduleindexdialog.moc.cpp - -#>+ 2 -KDE_DIST=cdragdropmgr.h cbtconfig.h btinstallmgr.h cprofile.h cprinter.h cswordsetupdialog.h cmdiarea.h cinfodisplay.h cswordsetupinstallsourcesdialog.h kstartuplogo.h cswordsetupmodulelistview.h cexportmanager.h cprofilewindow.h crossrefrendering.h Makefile.in coptionsdialog.h cinputdialog.h cprofilemgr.h cmanageindiceswidget.h Makefile.am manageindicesform.ui - -#>+ 4 -clean-ui: - -rm -f \ - manageindicesform.cpp manageindicesform.h manageindicesform.moc - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-recursive - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libfrontend_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/btinstallmgr.cpp $(srcdir)/cbtconfig.cpp $(srcdir)/cinputdialog.cpp $(srcdir)/cmanageindiceswidget.cpp $(srcdir)/coptionsdialog.cpp $(srcdir)/cswordsetupdialog.cpp $(srcdir)/cprofilemgr.cpp $(srcdir)/cprofile.cpp $(srcdir)/cprofilewindow.cpp $(srcdir)/cexportmanager.cpp $(srcdir)/cmdiarea.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/cdragdropmgr.cpp $(srcdir)/cinfodisplay.cpp $(srcdir)/cprinter.cpp $(srcdir)/crossrefrendering.cpp $(srcdir)/cswordsetupmodulelistview.cpp $(srcdir)/cswordsetupinstallsourcesdialog.cpp $(srcdir)/cmoduleindexdialog.cpp manageindicesform.cpp cinputdialog.moc.cpp cmanageindiceswidget.moc.cpp cprinter.moc.cpp cinfodisplay.moc.cpp coptionsdialog.moc.cpp cmdiarea.moc.cpp cswordsetupdialog.moc.cpp btinstallmgr.moc.cpp cswordsetupmodulelistview.moc.cpp cswordsetupinstallsourcesdialog.moc.cpp cmoduleindexdialog.moc.cpp manageindicesform.moc - @echo 'creating libfrontend_a.all_cpp.cpp ...'; \ - rm -f libfrontend_a.all_cpp.files libfrontend_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libfrontend_a.all_cpp.final; \ - for file in btinstallmgr.cpp cbtconfig.cpp cinputdialog.cpp cmanageindiceswidget.cpp coptionsdialog.cpp cswordsetupdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp cmdiarea.cpp kstartuplogo.cpp cdragdropmgr.cpp cinfodisplay.cpp cprinter.cpp crossrefrendering.cpp cswordsetupmodulelistview.cpp cswordsetupinstallsourcesdialog.cpp cmoduleindexdialog.cpp manageindicesform.cpp cinputdialog.moc.cpp cmanageindiceswidget.moc.cpp cprinter.moc.cpp cinfodisplay.moc.cpp coptionsdialog.moc.cpp cmdiarea.moc.cpp cswordsetupdialog.moc.cpp btinstallmgr.moc.cpp cswordsetupmodulelistview.moc.cpp cswordsetupinstallsourcesdialog.moc.cpp cmoduleindexdialog.moc.cpp ; do \ - echo "#include \"$$file\"" >> libfrontend_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libfrontend_a.all_cpp.final; \ - done; \ - cat libfrontend_a.all_cpp.final libfrontend_a.all_cpp.files > libfrontend_a.all_cpp.cpp; \ - rm -f libfrontend_a.all_cpp.final libfrontend_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libfrontend_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 22 -$(srcdir)/cmoduleindexdialog.cpp: manageindicesform.h -$(srcdir)/btinstallmgr.cpp: manageindicesform.h -$(srcdir)/cprofile.cpp: manageindicesform.h -$(srcdir)/cprinter.cpp: manageindicesform.h -$(srcdir)/cmanageindiceswidget.cpp: manageindicesform.h -$(srcdir)/cinfodisplay.cpp: manageindicesform.h -$(srcdir)/crossrefrendering.cpp: manageindicesform.h -$(srcdir)/cprofilewindow.cpp: manageindicesform.h -nmcheck: -$(srcdir)/cswordsetupinstallsourcesdialog.cpp: manageindicesform.h -$(srcdir)/cswordsetupmodulelistview.cpp: manageindicesform.h -$(srcdir)/cinputdialog.cpp: manageindicesform.h -$(srcdir)/coptionsdialog.cpp: manageindicesform.h -nmcheck-am: nmcheck -$(srcdir)/cprofilemgr.cpp: manageindicesform.h -$(srcdir)/cexportmanager.cpp: manageindicesform.h -$(srcdir)/kstartuplogo.cpp: manageindicesform.h -$(srcdir)/cdragdropmgr.cpp: manageindicesform.h -$(srcdir)/cbtconfig.cpp: manageindicesform.h -$(srcdir)/cswordsetupdialog.cpp: manageindicesform.h -$(srcdir)/cmdiarea.cpp: manageindicesform.h - -#>+ 15 -manageindicesform.cpp: $(srcdir)/manageindicesform.ui manageindicesform.h manageindicesform.moc - rm -f manageindicesform.cpp - echo '#include <kdialog.h>' > manageindicesform.cpp - echo '#include <klocale.h>' >> manageindicesform.cpp - $(UIC) -tr ${UIC_TR} -i manageindicesform.h $(srcdir)/manageindicesform.ui > manageindicesform.cpp.temp ; ret=$$?; \ - $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" manageindicesform.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_manageindicesform,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> manageindicesform.cpp ;\ - rm -f manageindicesform.cpp.temp ;\ - if test "$$ret" = 0; then echo '#include "manageindicesform.moc"' >> manageindicesform.cpp; else rm -f manageindicesform.cpp ; exit $$ret ; fi - -manageindicesform.h: $(srcdir)/manageindicesform.ui - rm -rf manageindicesform.h; - $(UIC) $(srcdir)/manageindicesform.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> manageindicesform.h ; -manageindicesform.moc: manageindicesform.h - $(MOC) manageindicesform.h -o manageindicesform.moc diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp deleted file mode 100644 index 1332d10..0000000 --- a/bibletime/frontend/btinstallmgr.cpp +++ /dev/null @@ -1,318 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - -//BibleTime includes -#include "btinstallmgr.h" -#include "util/cpointers.h" - -//Qt includes -#include <qfile.h> -#include <qfileinfo.h> - -//KDE includes -#include <kapplication.h> -#include <kglobal.h> -#include <kstandarddirs.h> -#include <kprocess.h> - -//Sword includes -#include <filemgr.h> -#include <swconfig.h> -#include <swbuf.h> -#include <map> -#include <utility> - -//Stl includes -#include <functional> - -using namespace sword; - -namespace BookshelfManager { - - const QString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() { - // Q_ASSERT( CPointers::backend()->sysconfig ); - return QString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME")); - } - - QStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) { - // qWarning("BTInstallMgr::Tool::sourceList( sword::InstallMgr* mgr )"); - Q_ASSERT(mgr); - Q_ASSERT(mgr->installConf); - - QStringList names; - - //add Sword remote sources - for (InstallSourceMap::iterator it = mgr->sources.begin(); it != mgr->sources.end(); it++) { - names << QString::fromLocal8Bit(it->second->caption); - } - - // Add local directory sources - SWConfig config(Tool::RemoteConfig::configFilename().latin1()); - sword::SectionMap::iterator sourcesSection = config.Sections.find("Sources"); - if (sourcesSection != config.Sections.end()) { - sword::ConfigEntMap::iterator sourceBegin = sourcesSection->second.lower_bound("DIRSource"); - sword::ConfigEntMap::iterator sourceEnd = sourcesSection->second.upper_bound("DIRSource"); - - while (sourceBegin != sourceEnd) { - InstallSource is("DIR", sourceBegin->second.c_str()); - names << QString::fromLatin1(is.caption.c_str()); - - sourceBegin++; - } - } - - return names; - } - - QStringList BTInstallMgr::Tool::LocalConfig::targetList() { - QStringList names = CPointers::backend()->swordDirList(); - return names; - } - - void BTInstallMgr::Tool::LocalConfig::setTargetList( const QStringList& targets ) { - //saves a new Sworc config using the provided target list - QString filename = KGlobal::dirs()->saveLocation("data", "bibletime/") + "sword.conf"; //default is to assume the real location isn't writable - bool directAccess = false; - - QFileInfo i(LocalConfig::swordConfigFilename()); - QFileInfo dirInfo(i.dirPath(true)); - - if ( i.exists() && i.isWritable() ) { //we can write to the file ourself - filename = LocalConfig::swordConfigFilename(); - directAccess = true; - } - else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th eparent is writable for us, create it - filename = LocalConfig::swordConfigFilename(); - directAccess = true; - } - - bool setDataPath = false; - SWConfig conf(filename.local8Bit()); - conf.Sections.clear(); - - for (QStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) { - QString t = *it; - if (t.contains( QString("%1/.sword").arg(getenv("HOME")) )) { - //we don't want HOME/.sword in the config - continue; - } - else { - conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit()) ); - - setDataPath = true; - } - } - conf.Save(); - - if (!directAccess) { //use kdesu to move the file to the right place - KProcess *proc = new KProcess; - *proc << "kdesu"; - *proc << QString::fromLatin1("-c") << QString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename()); - proc->start(KProcess::Block); - } - } - - sword::InstallSource BTInstallMgr::Tool::RemoteConfig::source( sword::InstallMgr* mgr, const QString& name ) { - Q_ASSERT(mgr); - - InstallSourceMap::iterator source = mgr->sources.find(name.latin1()); - if (source != mgr->sources.end()) { - return *(source->second); - } - else { //not found in Sword, may be a local DIR source - SWConfig config(Tool::RemoteConfig::configFilename().latin1()); - SectionMap::iterator sourcesSection = config.Sections.find("Sources"); - if (sourcesSection != config.Sections.end()) { - ConfigEntMap::iterator sourceBegin = - sourcesSection->second.lower_bound("DIRSource"); - ConfigEntMap::iterator sourceEnd = - sourcesSection->second.upper_bound("DIRSource"); - - while (sourceBegin != sourceEnd) { - InstallSource is("DIR", sourceBegin->second.c_str()); - if (!strcmp(is.caption, name.latin1()) ) { //found local dir source - return is; - } - - sourceBegin++;//next source - } - } - } - - InstallSource is("EMPTY"); //default return value - is.caption = "unknown caption"; - is.source = "unknown source"; - is.directory = "unknown dir"; - - return is; - } - - const bool BTInstallMgr::Tool::RemoteConfig::isRemoteSource( sword::InstallSource* is ) { - Q_ASSERT(is); - if (is) - return !strcmp(is->type, "FTP"); - else - return false; - } - - void BTInstallMgr::Tool::RemoteConfig::addSource( sword::InstallSource* is ) { - if (!is) { - return; - } - - SWConfig config(Tool::RemoteConfig::configFilename().latin1()); - if (!strcmp(is->type, "FTP")) { - //make sure the path doesn't have a trailing slash, sword doesn't like it - if (is->directory[ is->directory.length()-1 ] == '/') { - is->directory--; //make one char shorter - } - - config["Sources"].insert( std::make_pair(SWBuf("FTPSource"), is->getConfEnt()) ); - } - else if (!strcmp(is->type, "DIR")) { - config["Sources"].insert( std::make_pair(SWBuf("DIRSource"), is->getConfEnt()) ); - } - config.Save(); - } - - void BTInstallMgr::Tool::RemoteConfig::initConfig() { - SWConfig config(Tool::RemoteConfig::configFilename().latin1()); - config["General"]["PassiveFTP"] = "true"; - config.Save(); - } - - const QString BTInstallMgr::Tool::RemoteConfig::configPath() { - const char *envhomedir = getenv("HOME"); - QString confPath = QString(envhomedir ? envhomedir : "."); - confPath.append("/.sword/InstallMgr"); - - return confPath; - } - - const QString BTInstallMgr::Tool::RemoteConfig::configFilename() { - return (configPath() + "/InstallMgr.conf"); - } - - void BTInstallMgr::Tool::RemoteConfig::removeSource( sword::InstallMgr* mgr, sword::InstallSource* is) { - Q_ASSERT(mgr); - Q_ASSERT(is); - - SWConfig config(Tool::RemoteConfig::configFilename().latin1()); - - //this code can probably be shortened by using the stl remove_if functionality - std::pair< ConfigEntMap::iterator, ConfigEntMap::iterator > range = - isRemoteSource(is) - ? config["Sources"].equal_range("FTPSource") - : config["Sources"].equal_range("DIRSource"); - - ConfigEntMap::iterator it = range.first; - while (it != range.second) { - if (it->second == is->getConfEnt()) { - // qWarning("found the source!"); - config["Sources"].erase(it); - break; - } - - ++it; - } - - config.Save(); - } - - void BTInstallMgr::Tool::RemoteConfig::resetRemoteSources() { - SWConfig config(Tool::RemoteConfig::configFilename().latin1()); - config["Sources"].erase( //remove all FTP sources - config["Sources"].lower_bound("FTPSource"), - config["Sources"].upper_bound("FTPSource") - ); - config.Save(); - } - - void BTInstallMgr::Tool::RemoteConfig::resetLocalSources() { - SWConfig config(Tool::RemoteConfig::configFilename().latin1()); - config["Sources"].erase( //remove all FTP sources - config["Sources"].lower_bound("DIRSource"), - config["Sources"].upper_bound("DIRSource") - ); - config.Save(); - } - - CSwordBackend* BTInstallMgr::Tool::backend( sword::InstallSource* const is) { - Q_ASSERT(is); - if (!is) { - return 0; - } - - CSwordBackend* ret = 0; - if (RemoteConfig::isRemoteSource(is)) { - // qWarning("## remote backend for %s", is->localShadow.c_str()); - ret = new CSwordBackend( QString(is->localShadow.c_str()), false ); - } - else { - // qWarning("## local backend for %s", QString(is->directory.c_str()).latin1()); - ret = new CSwordBackend( QString(is->directory.c_str()) ); - } - - Q_ASSERT(ret); - if (ret) { - ret->initModules(); - } - - return ret; - } - - BTInstallMgr::BTInstallMgr() : InstallMgr(Tool::RemoteConfig::configPath().latin1(), this) { //use this class also as status reporter - this->setFTPPassive(true); - - } - - BTInstallMgr::~BTInstallMgr() { - terminate(); //make sure to close the connection - } - - void BTInstallMgr::statusUpdate(double dltotal, double dlnow) { - - if (dlnow > dltotal) - dlnow = dltotal; - - int totalPercent = (int)((float)(dlnow + m_completedBytes) / (float)(m_totalBytes) * 100.0); - - if (totalPercent > 100) { - totalPercent = 100; - } - else if (totalPercent < 0) { - totalPercent = 0; - } - - int filePercent = (int)((float)(dlnow) / (float)(dltotal+1) * 100.0); - if (filePercent > 100) { - filePercent = 100; - } - else if (filePercent < 0) { - filePercent = 0; - } - - emit completed(totalPercent, filePercent); - } - - void BTInstallMgr::preStatus(long totalBytes, long completedBytes, const char* /*message*/) { - qWarning("pre Status: %i / %i", (int)totalBytes, (int)completedBytes); - emit downloadStarted( "unknown filename" ); - - m_completedBytes = completedBytes; - m_totalBytes = (totalBytes > 0) ? totalBytes : 1; //avoid division by zero - } - -// FTPTransport *BTInstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) { -// return new KIO_FTPTransport(host, statusReporter); -// } - - -} - diff --git a/bibletime/frontend/btinstallmgr.h b/bibletime/frontend/btinstallmgr.h deleted file mode 100644 index 4a366d3..0000000 --- a/bibletime/frontend/btinstallmgr.h +++ /dev/null @@ -1,103 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef BTINSTALLMGR_H -#define BTINSTALLMGR_H - - -//BibleTIme includes -#include "backend/cswordbackend.h" - - -//sword includes -#include <installmgr.h> -#include <ftptrans.h> - -//Qt includes -#include <qobject.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qstringlist.h> - -namespace BookshelfManager { - - typedef QPtrList<sword::InstallSource> InstallSourceList; - - /**Our own reimplementation to provide status bar updates. - *@author The BibleTime team - */ -class BTInstallMgr : public QObject, public sword::InstallMgr, public sword::StatusReporter { - Q_OBJECT -public: - class Tool { -public: - class LocalConfig { -public: - static const QString swordConfigFilename(); - static QStringList targetList(); - static void setTargetList( const QStringList& ); -private: - LocalConfig() {} - ; - }; - - class RemoteConfig { -public: - static void initConfig(); - static const QString configPath(); - static const QString configFilename(); - - static void resetRemoteSources(); - static void resetLocalSources(); - - static QStringList sourceList( sword::InstallMgr* ); - static sword::InstallSource source( sword::InstallMgr*, const QString& name ); - static const bool isRemoteSource( sword::InstallSource* is ); - static void addSource( sword::InstallSource* ); - static void removeSource( sword::InstallMgr*, sword::InstallSource* ); - - -private: - RemoteConfig() {} - ; - }; - - static CSwordBackend* backend( sword::InstallSource* const ); - -private: - Tool() {} - ; - }; - - BTInstallMgr(); - virtual ~BTInstallMgr(); - -protected: - /* Reimplementations of method in StatusReporter */ - virtual void statusUpdate(double dltotal, double dlnow); - virtual void preStatus(long totalBytes, long completedBytes, const char *message); - -// virtual FTPTransport *createFTPTransport(const char *host, StatusReporter *statusReporter); - - long m_totalBytes; - long m_completedBytes; - -signals: // Signals - void completed( const int, const int ); - /** - * Emitted when a new file gets downloaded. - */ - void downloadStarted( const QString& ); - }; - -} - -#endif diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp deleted file mode 100644 index dbbec1e..0000000 --- a/bibletime/frontend/cbtconfig.cpp +++ /dev/null @@ -1,677 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cbtconfig.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cdisplaytemplatemgr.h" - -#include "util/cpointers.h" - -//Qt includes -#include <qapplication.h> -#include <qfontdatabase.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> - -//KDE includes -#include <kdeversion.h> -#include <kapplication.h> -#if KDE_VERSION >= 0x030200 -#include <kactioncollection.h> -#else -#include <kaction.h> -#endif -#include <kconfig.h> -#include <kcharsets.h> -#include <kglobal.h> -#include <klocale.h> -#include <kaccel.h> -#include <kstaticdeleter.h> - -#include <khtml_settings.h> - -//Sword includes -#include <versekey.h> - -//init statics -QFont* CBTConfig::m_defaultFont = 0; -CBTConfig::FontCache* CBTConfig::fontConfigMap = 0; - -/* No constructor and destructor, because this class only contains static methods. - It won't be instantiated. */ - -const QString CBTConfig::getKey( const CBTConfig::strings ID) { - switch ( ID ) { - case bibletimeVersion: return "bibletimeVersion"; - case language: return "language"; - case displayStyle: return "displayStyle"; - case bookshelfCurrentItem: return "bookshelfCurrentItem"; - } - return QString::null; -} - -const QString CBTConfig::getDefault( const CBTConfig::strings ID) { - switch ( ID ) { - case bibletimeVersion: return "NOT YET INSTALLED"; // main() will realize this and set the value to VERSION - case language: return (KGlobal::locale()->language()).local8Bit(); - case displayStyle: return CDisplayTemplateMgr::defaultTemplate(); - case bookshelfCurrentItem: return QString(); - } - return QString::null; -} - -const QString CBTConfig::getKey( const CBTConfig::modules ID) { - switch ( ID ) { - case standardBible: return "standardBible"; - case standardCommentary: return "standardCommentary"; - case standardLexicon: return "standardLexicon"; - case standardDailyDevotional: return "standardDailyDevotional"; - case standardHebrewStrongsLexicon: return "standardHebrewLexicon"; - case standardGreekStrongsLexicon: return "standardGreekLexicon"; - case standardHebrewMorphLexicon: return "standardHebrewMorphLexicon"; - case standardGreekMorphLexicon: return "standardGreekMorphLexicon"; - } - - return QString::null; -} - -const QString CBTConfig::getDefault( const CBTConfig::modules ID) { - // CSwordBackend* b = CPointers::backend(); - switch ( ID ) { - case standardBible: return "KJV"; - case standardCommentary: return "MHC"; - case standardLexicon: return "ISBE"; - case standardDailyDevotional: return ""; //no default - - case standardHebrewStrongsLexicon: return "StrongsHebrew"; - case standardGreekStrongsLexicon: return "StrongsGreek"; - case standardHebrewMorphLexicon: return "StrongsHebrew"; - case standardGreekMorphLexicon: return "StrongsGreek"; - } - - return QString::null; -} - -const QString CBTConfig::getKey( const CBTConfig::bools ID) { - switch ( ID ) { - case firstSearchDialog: return "firstSearchDialog"; - case readOldBookmarks: return "readOldBookmarks"; - - case toolbar: return "toolbar"; - case mainIndex: return "mainIndex"; - case infoDisplay: return "infoDisplay"; - - case autoTileVertical: return "autoTileVertical"; - case autoTileHorizontal: return "autoTileHorizontal"; - case autoCascade: return "autoCascade"; - - case lineBreaks: return "lineBreaks"; - case verseNumbers: return "verseNumbers"; - - case tips: return "RunOnStart"; - case logo: return "logo"; - case autoDeleteOrphanedIndices: return "autoDeleteOrphanedIndices"; - case crashedLastTime: return "crashedLastTime"; - case crashedTwoTimes: return "crashedTwoTimes"; - } - return QString::null; -} - -const QString CBTConfig::getKey( const CBTConfig::ints ID) { - switch ( ID ) { - case footnotes: return "footnotes"; - case strongNumbers: return "strongNumbers"; - case headings: return "headings"; - case morphTags: return "morphTags"; - case lemmas: return "lemmas"; - case hebrewPoints: return "hebrewPoints"; - case hebrewCantillation: return "hebrewCantillation"; - case greekAccents: return "greekAccents"; - case textualVariants: return "textualVariants"; - case scriptureReferences: return "scriptureReferences"; - case morphSegmentation: return "morphSegmentation"; - case bookshelfContentsX: return "bookshelfContentsX"; - case bookshelfContentsY: return "bookshelfContentsY"; - case magDelay: return "magDelay"; - } - return QString::null; -} - -const bool CBTConfig::getDefault( const CBTConfig::bools ID) { - switch ( ID ) { - case firstSearchDialog: return true; - case readOldBookmarks: return false; - - case toolbar: return true; - case mainIndex: return true; - case infoDisplay: return true; - - case autoTileVertical: return true; - case autoTileHorizontal: return false; - case autoCascade: return false; - - case lineBreaks: return false; - case verseNumbers: return true; - - case tips: return true; - case logo: return true; - case autoDeleteOrphanedIndices: return true; - case crashedLastTime: return false; - case crashedTwoTimes: return false; - } - return false; -} - -const int CBTConfig::getDefault( const CBTConfig::ints ID) { - switch ( ID ) { - case footnotes: return int(true); - case strongNumbers: return int(true); - case headings: return int(true); - case morphTags: return int(true); - case lemmas: return int(true); - case hebrewPoints: return int(true); - case hebrewCantillation: return int(true); - case greekAccents: return int(true); - case textualVariants: return int(false); - case scriptureReferences: return int(true); - case morphSegmentation: return int(true); - case bookshelfContentsX: return 0; - case bookshelfContentsY: return 0; - case magDelay: return 400; - } - return 0; -} - -const QString CBTConfig::getKey( const CBTConfig::intLists ID) { - switch ( ID ) { - case leftPaneSplitterSizes: return "leftPaneSplitterSizes"; - case mainSplitterSizes: return "mainSplitterSizes"; - } - - return QString::null; -} - -const QValueList<int> CBTConfig::getDefault( const CBTConfig::intLists ID) { - switch ( ID ) { - case leftPaneSplitterSizes: //fall through - case mainSplitterSizes: { - return QValueList<int>(); - } - } - - return QValueList<int>(); -} - -const QString CBTConfig::getKey( const CBTConfig::stringLists ID) { - switch ( ID ) { - case searchCompletionTexts: return QString("searchCompletionTexts"); - case searchTexts: return QString("searchTexts"); - case bookshelfOpenGroups: return QString("bookshelfOpenGroups"); - } - return QString::null; -} - -const QStringList CBTConfig::getDefault( const CBTConfig::stringLists ID) { - switch ( ID ) { - case searchTexts: { - QStringList list; - list.append(QString::null); - return list; - } - case searchCompletionTexts: - return QStringList(); - case bookshelfOpenGroups: - return QStringList(); - } - return QStringList(); -} - -const QString CBTConfig::getKey( const CBTConfig::stringMaps ID) { - switch (ID) { - case searchScopes: - return QString("SearchScopes"); - }; - return QString::null; -} - -const CBTConfig::StringMap CBTConfig::getDefault( const CBTConfig::stringMaps ID) { - switch ( ID ) { - case searchScopes: { - CBTConfig::StringMap map; - map.insert(i18n("Old testament"), QString("Gen - Mal")); - map.insert(i18n("Moses/Pentateuch/Torah"),QString("Gen - Deut")); - map.insert(i18n("History"), QString("Jos - Est")); - map.insert(i18n("Prophets"), QString("Isa - Mal")); - map.insert(i18n("New testament"), QString("Mat - Rev")); - map.insert(i18n("Gospels"), QString("Mat - Joh")); - map.insert(i18n("Letters/Epistles"), QString("Rom - Jude")); - map.insert(i18n("Paul's Epistles"), QString("Rom - Phile")); - - //make the list to the current bookname language! - CBTConfig::StringMap::Iterator it; - sword::VerseKey vk; - vk.setLocale("en_US"); - - for (it = map.begin(); it != map.end(); ++it) { - sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true); - QString data; - for (int i = 0; i < list.Count(); ++i) { - data += QString::fromUtf8(list.GetElement(i)->getRangeText()) + "; "; - } - map[it.key()] = data; //set the new data - }; - - return map; - }; - default: - return CBTConfig::StringMap(); - } - - return CBTConfig::StringMap(); -} - - -const QString CBTConfig::getKey( const CLanguageMgr::Language* const language ) { - return language->name(); -} - -const QFont& CBTConfig::getDefault( const CLanguageMgr::Language* const) { - //language specific lookup of the font name - //return KApplication::font(); - if (m_defaultFont) { - return *m_defaultFont; - } - - static KStaticDeleter<QFont> sd; - - //TODO: We need a better way to get the KDE konqueror KHTML settings - KConfig conf("konquerorrc"); - KHTMLSettings settings; - settings.init(&conf); - - const QString fontName = settings.stdFontName(); - const int fontSize = settings.mediumFontSize(); - - sd.setObject(m_defaultFont, new QFont(fontName, fontSize)); - - return *m_defaultFont; -} - - -const QString CBTConfig::get - ( const CBTConfig::strings ID) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "strings"); - return config->readEntry(getKey(ID),getDefault(ID)); -} - -CSwordModuleInfo* const CBTConfig::get - ( const CBTConfig::modules ID) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "modules"); - - QString name = config->readEntry(getKey(ID),getDefault(ID)); - return CPointers::backend()->findModuleByName(name); -} - - -const bool CBTConfig::get - ( const CBTConfig::bools ID) { - //special behaviour for the KTipDialog class - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, (ID == CBTConfig::tips) ? "TipOfDay" : "bools"); - return config->readBoolEntry(getKey(ID),getDefault(ID)); -} - -const int CBTConfig::get - ( const CBTConfig::ints ID) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "ints"); - return config->readNumEntry(getKey(ID), getDefault(ID)); -} - -const QValueList<int> CBTConfig::get - ( const CBTConfig::intLists ID ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "intlists"); - return config->readIntListEntry(getKey(ID)); -} - -const QStringList CBTConfig::get - ( const CBTConfig::stringLists ID ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "stringlists"); - return config->readListEntry(getKey(ID)); -} - -const CBTConfig::StringMap CBTConfig::get - ( const CBTConfig::stringMaps ID ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, getKey(ID)); - - if (config->hasGroup(getKey(ID))) { - CBTConfig::StringMap map = config->entryMap(getKey(ID)); - switch (ID) { - case searchScopes: { //make sure we return the scopes in the chosen language. saved keys are in english - CBTConfig::StringMap::Iterator it; - sword::VerseKey vk; - - for (it = map.begin(); it != map.end(); ++it) { - sword::ListKey list = vk.ParseVerseList(it.data().utf8(), "Genesis 1:1", true); - QString data; - for (int i = 0; i < list.Count(); ++i) { - data += QString::fromUtf8(list.GetElement(i)->getRangeText()) + "; "; - } - map[it.key()] = data; //set the new data - }; - return map; - } - default: - return getDefault(ID); - } - } - return getDefault(ID); -} - -const CBTConfig::FontSettingsPair CBTConfig::get - ( const CLanguageMgr::Language* const language ) { - if (fontConfigMap && fontConfigMap->contains(language)) { - return fontConfigMap->find(language).data(); - } - - if (!fontConfigMap) { - static KStaticDeleter<FontCache> sd; - sd.setObject(fontConfigMap, new FontCache()); - } - - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "font standard settings"); - - FontSettingsPair settings; - settings.first = config->readBoolEntry(getKey(language)); - - config->setGroup("fonts"); - - settings.second = - settings.first - ? config->readFontEntry(getKey(language)) - : getDefault(language); - - fontConfigMap->insert(language, settings); //cache the value - return settings; -} - -void CBTConfig::set - ( const CBTConfig::strings ID, const QString value ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "strings"); - config->writeEntry(getKey(ID), value); -} - -void CBTConfig::set - ( const CBTConfig::modules ID, CSwordModuleInfo* const value ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "modules"); - config->writeEntry(getKey(ID), value ? value->name() : QString::null); -} - -void CBTConfig::set - ( const CBTConfig::modules ID, const QString& value ) { - CSwordModuleInfo* module = CPointers::backend()->findModuleByName(value); - if (module) { - CBTConfig::set - (ID, module); - } -} - -void CBTConfig::set - (const CBTConfig::bools ID,const bool value ) { - KConfig* config = CBTConfig::getConfig(); - //special behaviour to work with KTipDialog class of KDE - KConfigGroupSaver groupSaver(config, (ID == CBTConfig::tips) ? "TipOfDay" : "bools"); - config->writeEntry(getKey(ID), value); -} - -void CBTConfig::set - (const CBTConfig::ints ID, const int value ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "ints"); - config->writeEntry(getKey(ID), value); -} - -void CBTConfig::set - ( const CBTConfig::intLists ID, const QValueList<int> value ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "intlists"); - config->writeEntry(getKey(ID), value); -} - -void CBTConfig::set - ( const CBTConfig::stringLists ID, const QStringList value ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "stringlists"); - config->writeEntry(getKey(ID), value); -} - -void CBTConfig::set - ( const CBTConfig::stringMaps ID, const CBTConfig::StringMap value ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, getKey(ID)); - config->deleteGroup(getKey(ID)); //make sure we only save the new entries and don't use old ones - config->sync(); - config->setGroup(getKey(ID)); - - switch (ID) { - case searchScopes: { - /** - * We want to make sure that the search scopes are saved with english key names so loading them - * will always work with each locale set. - */ - CBTConfig::StringMap::ConstIterator it; - QString data;// = QString::null; - - sword::VerseKey vk; - for (it = value.begin(); it != value.end(); ++it) { - sword::ListKey list = vk.ParseVerseList(it.data().utf8(), "Genesis 1:1", true); - data = QString::null; - for (int i = 0; i < list.Count(); ++i) { - if ( sword::VerseKey* range = dynamic_cast<sword::VerseKey*>(list.GetElement(i)) ) { - range->setLocale("en"); - data += QString::fromUtf8( range->getRangeText() ) + ";"; - } - } - config->writeEntry(it.key(), data); - } - break; - } - default: { - for (CBTConfig::StringMap::ConstIterator it = value.begin(); it != value.end(); ++it) { - config->writeEntry(it.key(), it.data()); - } - break; - } - }; -} - - -void CBTConfig::set - ( const CLanguageMgr::Language* const language, const FontSettingsPair& value ) { - KConfig* config = CBTConfig::getConfig(); - - KConfigGroupSaver groupSaver(config, "fonts"); - config->writeEntry(getKey(language), value.second); - - config->setGroup("font standard settings"); - config->writeEntry(getKey(language), value.first); - - if (fontConfigMap && fontConfigMap->contains(language)) { - fontConfigMap->remove - (language); //remove it from the cache - } -} - - -const CSwordBackend::DisplayOptions CBTConfig::getDisplayOptionDefaults() { - CSwordBackend::DisplayOptions options; - - options.lineBreaks = get - (CBTConfig::lineBreaks); - options.verseNumbers = get - (CBTConfig::verseNumbers); - - return options; -} - -const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults() { - CSwordBackend::FilterOptions options; - - options.footnotes = true; //required for the info display - - options.strongNumbers = true; //get(CBTConfig::strongNumbers); - options.headings = get(CBTConfig::headings); - - options.morphTags = true;//required for the info display - - options.lemmas = true;//required for the info display - - options.hebrewPoints = get(CBTConfig::hebrewPoints); - options.hebrewCantillation = get(CBTConfig::hebrewCantillation); - options.greekAccents = get(CBTConfig::greekAccents); - options.textualVariants = get(CBTConfig::textualVariants); - options.scriptureReferences = get(CBTConfig::scriptureReferences); - options.morphSegmentation = get(CBTConfig::morphSegmentation); - - return options; -} - -void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) { - QString groupName; - switch (type) { - case allWindows : { - groupName = "Displaywindow shortcuts"; - break; - }; - case writeWindow : { - groupName = "Writewindow shortcuts"; - break; - }; - case readWindow : { - groupName = "Readwindow shortcuts"; - break; - }; - case bookWindow : { - groupName = "Book shortcuts"; - break; - }; - case bibleWindow : { - groupName = "Bible shortcuts"; - break; - }; - case commentaryWindow : { - groupName = "Commentary shortcuts"; - break; - }; - case lexiconWindow : { - groupName = "Lexicon shortcuts"; - break; - }; - case application : { - groupName = "Application shortcuts"; - break; - }; - }; - - - actionCollection->readShortcutSettings(groupName, CBTConfig::getConfig()); -} - -void CBTConfig::saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) { - QString groupName; - switch (type) { - case allWindows : { - groupName = "Displaywindow shortcuts"; - break; - }; - case writeWindow : { - groupName = "Writewindow shortcuts"; - break; - }; - case readWindow : { - groupName = "Readwindow shortcuts"; - break; - }; - case bookWindow : { - groupName = "Book shortcuts"; - break; - }; - case bibleWindow : { - groupName = "Bible shortcuts"; - break; - }; - case commentaryWindow : { - groupName = "Commentary shortcuts"; - break; - }; - case lexiconWindow : { - groupName = "Lexicon shortcuts"; - break; - }; - case application : { - groupName = "Application shortcuts"; - break; - }; - }; - - - actionCollection->writeShortcutSettings(groupName, CBTConfig::getConfig()); -} - - -const QString CBTConfig::getModuleEncryptionKey( const QString& module ) { - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "Module keys"); - - return config->readEntry(module, QString::null); -} - -void CBTConfig::setModuleEncryptionKey( const QString& module, const QString& key ) { - // if (CSwordModuleInfo* const mod = CPointers::backend()->findModuleByName(module) ) { - // // if an empty key is set for an unencrypted module do nothing - // if (key.isEmpty() && !mod->isEncrypted()) { - // return; - // } - // } - // else if (key.isEmpty()) { - // return; - // }; - - KConfig* config = CBTConfig::getConfig(); - KConfigGroupSaver groupSaver(config, "Module keys"); - - config->writeEntry(module, key); -}; - -KConfig* const CBTConfig::getConfig() { - KConfig* config = KGlobal::config(); - - if (KApplication::kApplication()->sessionSaving()) { - qWarning("Using session config"); - // config = KApplication::kApplication()->sessionConfig(); - } - else if (KApplication::kApplication()->isRestored()) { - qWarning("isRestored(): Using session config"); - } - - return config; -} diff --git a/bibletime/frontend/cbtconfig.h b/bibletime/frontend/cbtconfig.h deleted file mode 100644 index 5c91c71..0000000 --- a/bibletime/frontend/cbtconfig.h +++ /dev/null @@ -1,193 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CBTCONFIG_H -#define CBTCONFIG_H - -#include "backend/cswordbackend.h" -#include "backend/clanguagemgr.h" - -//Qt includes -#include <qstring.h> -#include <qfont.h> -#include <qvaluelist.h> -#include <qmap.h> - -//Forward declarations -class KAccel; -class KActionCollection; -class KConfig; - -/** - * This class is the interface to the config object of BibleTime - * @author The BibleTime team - */ -class CBTConfig { -public: - typedef QMap<QString, QString> StringMap; - - enum strings { - bibletimeVersion, - language, - displayStyle, - bookshelfCurrentItem - }; - enum modules { - standardBible = 0, //just to make sure, default is IMHO 0, so that's redundant here - standardCommentary, - standardLexicon, - standardDailyDevotional, - standardHebrewStrongsLexicon, - standardGreekStrongsLexicon, - standardHebrewMorphLexicon, - standardGreekMorphLexicon, - lastModuleType = standardGreekMorphLexicon - }; - enum bools { - firstSearchDialog, - readOldBookmarks, - - toolbar, - mainIndex, - infoDisplay, - - autoTileVertical, - autoTileHorizontal, - autoCascade, - - lineBreaks, - verseNumbers, - - tips, - logo, - autoDeleteOrphanedIndices, - crashedLastTime, - crashedTwoTimes - }; - enum ints { - footnotes, - strongNumbers, - headings, - morphTags, - lemmas, - hebrewPoints, - hebrewCantillation, - greekAccents, - textualVariants, - scriptureReferences, - morphSegmentation, - bookshelfContentsX, - bookshelfContentsY, - magDelay /* The delay until a mouse move makes the content appear in the mag */ - }; - enum intLists { - leftPaneSplitterSizes, - mainSplitterSizes - }; - enum stringLists { - searchCompletionTexts, - searchTexts, - bookshelfOpenGroups - }; - enum keys { - allWindows, - readWindow, - writeWindow, - bookWindow, - bibleWindow, - commentaryWindow, - lexiconWindow, - application - }; - enum stringMaps { - searchScopes - }; - typedef std::pair<bool, QFont> FontSettingsPair; - typedef QMap<const CLanguageMgr::Language*, CBTConfig::FontSettingsPair> FontCache; - - static const QString get - ( const CBTConfig::strings ); - static CSwordModuleInfo* const get - ( const CBTConfig::modules ); - static const bool get - ( const CBTConfig::bools ); - static const int get - ( const CBTConfig::ints ); - static const QValueList<int> get - ( const CBTConfig::intLists ); - static const QStringList get - ( const CBTConfig::stringLists ); - static const CBTConfig::StringMap get - ( const CBTConfig::stringMaps ); - - static const FontSettingsPair get - ( const CLanguageMgr::Language* const ); - - static const QString getDefault( const CBTConfig::strings ); - static const QString getDefault( const CBTConfig::modules ); - static const bool getDefault( const CBTConfig::bools ); - static const int getDefault( const CBTConfig::ints ); - static const QValueList<int> getDefault( const CBTConfig::intLists ); - static const QStringList getDefault( const CBTConfig::stringLists ); - static const CBTConfig::StringMap getDefault( const CBTConfig::stringMaps ); - static const QFont& getDefault( const CLanguageMgr::Language* const ); - - static void set - ( const CBTConfig::strings, const QString value ); - static void set - ( const CBTConfig::modules, CSwordModuleInfo* const module ); - static void set - ( const CBTConfig::modules, const QString& moduleName ); - static void set - ( const CBTConfig::bools, const bool value ); - static void set - ( const CBTConfig::ints, const int value ); - static void set - ( const CBTConfig::intLists, const QValueList<int> value ); - static void set - ( const CBTConfig::stringLists, const QStringList value); - static void set - ( const CBTConfig::stringMaps, const CBTConfig::StringMap value); - static void set - ( const CLanguageMgr::Language* const language, const FontSettingsPair& fontSettings ); - - static const CSwordBackend::FilterOptions getFilterOptionDefaults(); - static const CSwordBackend::DisplayOptions getDisplayOptionDefaults(); - - static void setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection); - static void saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection); - - static const QString getModuleEncryptionKey( const QString& name ); - static void setModuleEncryptionKey( const QString& name, const QString& key ); - - /** The config object. - * @return A config object which is used currently, may be the global config or the session config - */ - static KConfig* const getConfig(); - -private: - static const QString getKey( const CBTConfig::strings ); - static const QString getKey( const CBTConfig::modules ); - static const QString getKey( const CBTConfig::bools ); - static const QString getKey( const CBTConfig::ints ); - static const QString getKey( const CBTConfig::intLists ); - static const QString getKey( const CBTConfig::stringLists ); - static const QString getKey( const CBTConfig::stringMaps ); - static const QString getKey( const CLanguageMgr::Language* const ); - - //static caches - static QFont* m_defaultFont; - - static FontCache* fontConfigMap; -}; - - -#endif diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp deleted file mode 100644 index c014eed..0000000 --- a/bibletime/frontend/cdragdropmgr.cpp +++ /dev/null @@ -1,256 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cdragdropmgr.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" -#include "backend/cswordversekey.h" -#include "util/cpointers.h" - -//Sword includes -#include "versekey.h" - -//Qt includes -#include <qevent.h> -#include <qdom.h> - -CDragDropMgr::BTDrag::BTDrag( const QString& xml, QWidget* dragSource, const char* name) -: QTextDrag(xml, dragSource, name) {} -; - -//static function to see whether we can decode tje given mime type -bool CDragDropMgr::BTDrag::canDecode( const QMimeSource * mime ) { - if ( mime->provides("BibleTime/DND") ) { //we can decode this type! - return true; - } - return false; //not yet implemented -}; - -bool CDragDropMgr::BTDrag::provides( const char* type ) const { - return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND -}; - -const char* CDragDropMgr::BTDrag::format( int i ) const { - if ( i == 0) { //we support only one format! - return "BibleTime/DND"; - }; - return 0; -}; - -bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str) { - if (canDecode(e)) { - str = QString( e->encodedData( "BibleTime/DND" ) ); - return true; - } - return false; -}; - -bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str, QCString& /*subtype*/) { - return decode(e, str); -}; - -QByteArray CDragDropMgr::BTDrag::encodedData( const char* /*type*/ ) const { - return QTextDrag::encodedData("text/plain"); //hack because QTextDrag only accepts text/plainand not our BibleTime/DND type -}; - -///////////////////////////// new class ////////////////////// - -CDragDropMgr::Item::Item( const QString& text ) -: m_type(Text), -m_bookmarkModuleName(QString::null), -m_bookmarkKey(QString::null), -m_bookmarkDescription(QString::null), -m_text(text) {} - -CDragDropMgr::Item::Item( const QString& moduleName, const QString& key, const QString& description ) -: m_type(Bookmark), -m_bookmarkModuleName(moduleName), -m_bookmarkKey(key), -m_bookmarkDescription(description), -m_text(QString::null) { - //we have to make sure the key is saved in it's english representation, so we convert it - if (CSwordModuleInfo* mod = CPointers::backend()->findModuleByName( moduleName )) { - if (mod->type() == CSwordModuleInfo::Bible || mod->type() == CSwordModuleInfo::Commentary) { - CSwordVerseKey vk(0); - vk.key( key ); - vk.setLocale("en"); - - m_bookmarkKey = vk.key(); - // qWarning("english key of %s is %s", key.latin1(), m_bookmarkKey.latin1()); - } - } -} - -CDragDropMgr::Item::~Item() {} - -const CDragDropMgr::Item::Type& CDragDropMgr::Item::type() const { - //returns the type of drag & drop action this item represents - return m_type; -} - -/** Returns the text which is used by this DragDrop Item, only valid if type() == Text */ -const QString& CDragDropMgr::Item::text() const { - // Q_ASSERT(!m_text.isEmpty()); - return m_text; -} - -/** Returns the key, ony valid if type() == Bookmark */ -const QString& CDragDropMgr::Item::bookmarkKey() const { - // Q_ASSERT(!m_bookmarkKey.isEmpty()); - return m_bookmarkKey; -} - -/** Returns the bookmark module, ony valid if type() == Bookmark */ -const QString& CDragDropMgr::Item::bookmarkModule() const { - // Q_ASSERT(!m_bookmarkModuleName.isEmpty()); - return m_bookmarkModuleName; -} - -/** Returns the bookmark description, ony valid if type() == Bookmark */ -const QString& CDragDropMgr::Item::bookmarkDescription() const { - // Q_ASSERT(!m_bookmarkDescription.isEmpty()); - return m_bookmarkDescription; -} - -////////////////////////////////// NEW CLASS ////////////////////////// - -CDragDropMgr::CDragDropMgr() {} - -CDragDropMgr::~CDragDropMgr() {} - -const bool CDragDropMgr::canDecode( const QMimeSource* const mime ) { - if (CDragDropMgr::BTDrag::canDecode(mime)) { - return true; - } - else if( QTextDrag::canDecode(mime) ) { - qWarning("QTextDrag can decode this mime!"); - return true; - }; - return false; -}; - -QDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource ) { - if ( items.count() ) { - //process the items and set the data to the dragobject we return later - QDomDocument doc("DOC"); - doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement content = doc.createElement("BibleTimeDND"); - content.setAttribute("syntaxVersion", "1.0"); - doc.appendChild(content); - - CDragDropMgr::ItemList::iterator it; - for ( it = items.begin(); it != items.end(); ++it ) { - Item item = (*it); - if (item.type() == Item::Bookmark) { //a bookmark was dragged - //append the XML stuff for a bookmark - QDomElement bookmark = doc.createElement("BOOKMARK"); - bookmark.setAttribute("key", item.bookmarkKey()); - bookmark.setAttribute("description", item.bookmarkDescription()); - bookmark.setAttribute("moduleName", item.bookmarkModule()); - - content.appendChild(bookmark); - } - else if (item.type() == Item::Text) { //plain text was dragged - //append the XML stuff for plain text - QDomElement plainText = doc.createElement("TEXT"); - plainText.setAttribute("text", item.text()); - - content.appendChild(plainText); - } - } - - BTDrag* dragObject = new BTDrag( doc.toString(), dragSource ); - // qWarning("DND data created: %s", (const char*)doc.toString().utf8()); - return dragObject; - }; - return 0; -}; - -CDragDropMgr::ItemList CDragDropMgr::decode( const QMimeSource* const src) { - //if the drag was started by another widget which doesn't use CDragDropMgr (a drag created by QTextDrag) - if (canDecode(src) && QTextDrag::canDecode(src)) { //if we can decode but it's a QTextDrag and not a BTDrag object - QString text; - QTextDrag::decode(src, text); - // qWarning(text.latin1()); - - CDragDropMgr::ItemList dndItems; - dndItems.append( Item(text) ); - return dndItems; - } - else if (!canDecode(src)) { //if we can't decode it - return CDragDropMgr::ItemList(); - }; - - QString xmlData; - BTDrag::decode(src, xmlData); - - if (xmlData.isEmpty()) { //something went wrong! - // qWarning("CDragDropMgr::decode: empty xml data!"); - return CDragDropMgr::ItemList(); - } - // else { - // qWarning("Drag&Drop data is: %s", xmlData.latin1()); - // } - - //we can handle the dropEvent and have xml data to work on! - ItemList dndItems; - - QDomDocument doc; - doc.setContent( xmlData ); - - QDomElement document = doc.documentElement(); - if( document.tagName() != "BibleTimeDND" ) { //BibleTime was used in syntax version 1.0 - qWarning("DragDropMgr::decode: Missing BibleTimeDND doc"); - return CDragDropMgr::ItemList(); - } - // see if there's a section with the name MAINWINDOW - QDomElement elem = document.firstChild().toElement(); - while (!elem.isNull()) { - if (elem.tagName() == "BOOKMARK") { //we found a bookmark! - // qWarning("found a bookmark!"); - const QString key = elem.hasAttribute("key") ? elem.attribute("key") : QString::null; - const QString moduleName = elem.hasAttribute("moduleName") ? elem.attribute("moduleName") : QString::null; - const QString description = elem.hasAttribute("description") ? elem.attribute("description") : QString::null; - - dndItems.append( CDragDropMgr::Item(moduleName, key, description) ); - } - else if (elem.tagName() == "TEXT") { //we found a plain text passage! - const QString text = elem.hasAttribute("text") ? elem.attribute("text") : QString::null; - dndItems.append( CDragDropMgr::Item(text) ); - }; - elem = elem.nextSibling().toElement(); - }; - - return dndItems; -}; - -/** Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text), which shouldn't happen, it return Item::Unknown. */ -CDragDropMgr::Item::Type CDragDropMgr::dndType( const QMimeSource* e ) { - ItemList dndItems = decode(e); - if (dndItems.isEmpty()) {//wrong dropEvent or something strange - return Item::Unknown; - }; - - //check whether all items have the ssame type, if they do return the type - //as soon as two items have different types return Item::Unknown - ItemList::Iterator it; - Item::Type type = Item::Unknown; - for( it = dndItems.begin(); it != dndItems.end(); ++it ) { - if( type == Item::Unknown) { //if Unknown is set this is the first loop, don't return Unknown - type = (*it).type(); - } - else if (type != (*it).type() ) {//items have different type, return Item::Unknown - return Item::Unknown; - }; - }; - return type; -} diff --git a/bibletime/frontend/cdragdropmgr.h b/bibletime/frontend/cdragdropmgr.h deleted file mode 100644 index 01f0ff3..0000000 --- a/bibletime/frontend/cdragdropmgr.h +++ /dev/null @@ -1,155 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CDRAGDROPMGR_H -#define CDRAGDROPMGR_H - -//Qt includes -#include <qstring.h> -#include <qcstring.h> -#include <qdragobject.h> -#include <qvaluelist.h> - -//forward declarations -class QDropEvent; -class QWidget; - -/** This class is the drag'n' drop manager for BibleTime. - * The dnd is managed by XML code, which defines the type of the drag/drop, the items and the action (moe, copy etc.). - * It's possible to create the XML code by passing a list of keys etc. - * - * Functions: - * - dnd_type(), returns either CDragDropMgr::Action_Drag or CDragDropMgr::Action_Drop - * - dnd_action(), returns either CDragDropMgr::Move or CDragDropMgr::Copy - * - dnd_acceptDrop(), returns true or false. True if the drop could be handled by the CDragDropMgr class, otherwise false - * - * - * The functions which create the XML stuff can't be reimplemented, too. Otherwise we could not guarantee for good XML code - * which works everywhere. - * - * @author The BibleTime team - */ -class CDragDropMgr { -public: - //The class which represents one single drag&drop entry (e.g. a bookmark or a portion of text) - class Item { -public: - /** - * The possible types of Drag&Drop actions. - */ - enum Type { - Bookmark = 0, /* A bookmark: Has a key, a module and a description*/ - Text, /* Simple text, e.g. can be dropped on a module to start a search in this module using the dropped text */ - Unknown /* For situatiosn like CDragDropMgr::dndType */ - }; - /** - * This function returns the type of drag this item has - */ - const CDragDropMgr::Item::Type& type() const; - /** - * Returns the key, ony valid if type() == Bookmark - */ - const QString& bookmarkKey() const; - /** - * Returns the module name, ony valid if type() == Bookmark - */ - const QString& bookmarkModule() const; - /** - * Returns the bookmark description, ony valid if type() == Bookmark - */ - const QString& bookmarkDescription() const; - /** - * Returns the text which is used by this DragDrop Item, only valid if type() == Text - */ - const QString& text() const; - - // protected: - friend class CDragDropMgr; - /* - * We use protected constructor and destructor because creation of objects - * of this class sould only be possible for CDragDropMgr - */ - - /** Constructor for a text item - * This constructor automatically sets the type member to Text - * This is also the default constructor - */ - Item(const QString& text = QString::null ); - /** Constructor for a Bookmark item - * This constructor automatically sets the type member to Bookmark - */ - Item(const QString& moduleName, const QString& key, const QString& description); - virtual ~Item(); - -private: - Type m_type; //the member to save the type of the action - QString m_bookmarkModuleName; //the modules which is used by this item, only valid for type() == Bookmark - QString m_bookmarkKey; //the key of a bookmark, only valid if type() == Bookmark - QString m_bookmarkDescription; //the description of a bookmark, only valid if type() == Bookmark - QString m_text; //the text of this item, only valid if type() == Text - } - ; //end of class CDragDropMgr::Item - - //the item list we're using - typedef QValueList<Item> ItemList; - - /** Return whether the drop should be accepted - * This functions tests whether the drop should be accepted or not. It returns true if the drop object - * is supported by the CDragDropMgr and if it cotains valid data. Oterwise this function returns false. - */ - static const bool canDecode( const QMimeSource* const mime ); - /** - * This function returns the drag object with the data which represents the items given as parameter - * If the list is invalid or empty we return NULL. - */ - static QDragObject* const dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource ); - - /** - * Decodes the XML stuff we passed to the dragObject at creation time. - * Returns a list of CDragDropMgr::Item objects. - * If it's a wrong dropEvent we return an empty ist - */ - static CDragDropMgr::ItemList decode( const QMimeSource* const src ); - /** - * Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text), - * which shouldn't happen, it return Item::Unknown. - * It also returns Unknown if the drop event is not supported. - */ - static CDragDropMgr::Item::Type dndType( const QMimeSource* e ); - -protected: - //The class which represents our XML drag object stuff -class BTDrag : public QTextDrag { -public: - BTDrag( const QString& xml, QWidget* dragSource = 0, const char* name = 0); - //reimplemented static publoc function to provide functionality for BibleTime XML drags - static bool canDecode( const QMimeSource * e ); - virtual bool provides( const char* type ) const; - virtual const char* format( int i = 0 ) const; - - virtual QByteArray encodedData( const char* type ) const; - -protected: - friend class CDragDropMgr; - //made protected because the BibleTime classes may not manage the data of BTDrag - // virtual void setText(const QString& text); - - //made protected because the BibleTime classes should not manage the DRag&Drop stuff themself - static bool decode(const QMimeSource* e, QString& str); - static bool decode(const QMimeSource* e, QString& str, QCString& subtype); - }; - - //protected constructor and destructor because we do not allow inheritance, functionality is provided by static functions - CDragDropMgr(); - virtual ~CDragDropMgr(); -}; - -#endif diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp deleted file mode 100644 index 1092e5c..0000000 --- a/bibletime/frontend/cexportmanager.cpp +++ /dev/null @@ -1,543 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cexportmanager.h" - -#include "backend/cswordkey.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/creferencemanager.h" -#include "backend/cswordversekey.h" -#include "backend/centrydisplay.h" -#include "backend/cdisplaytemplatemgr.h" -#include "backend/chtmlexportrendering.h" -#include "backend/cplaintextexportrendering.h" - -#include "frontend/cprinter.h" - -#include "util/ctoolclass.h" -#include "util/scoped_resource.h" - -//Qt includes -#include <qclipboard.h> -#include <qptrlist.h> -#include <qprogressdialog.h> - -//KDE includes -#include <kprogress.h> -#include <kfiledialog.h> -#include <klocale.h> -#include <kapplication.h> - -//Sword includes -#include <swkey.h> -#include <listkey.h> - -using namespace Rendering; -using namespace Printing; - -CExportManager::CExportManager(const QString& caption, const bool showProgress, const QString& progressLabel, const CSwordBackend::FilterOptions filterOptions, const CSwordBackend::DisplayOptions displayOptions) { - m_caption = !caption.isEmpty() ? caption : QString::fromLatin1("BibleTime"); - m_progressLabel = progressLabel; - m_filterOptions = filterOptions; - m_displayOptions = displayOptions; - m_showProgress = showProgress; - m_progressDialog = 0; -}; - -const bool CExportManager::saveKey(CSwordKey* key, const Format format, const bool addText) { - if (!key) { - return false; - } - if (!key->module()) { - return false; - } - const QString filename = getSaveFileName(format); - if (filename.isEmpty()) { - return false; - } - - CSwordBackend::FilterOptions filterOptions = m_filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CHTMLExportRendering::Settings settings(addText); - util::scoped_ptr<CTextRendering> render ( - (format == HTML) - ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) - : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) - ); - - QString text; - QString startKey; - QString stopKey; - - ListCSwordModuleInfo modules; - modules.append(key->module()); - - CSwordVerseKey *vk = dynamic_cast<CSwordVerseKey*>(key); - if (vk && vk->isBoundSet()) { - text = render->renderKeyRange( QString::fromUtf8(vk->LowerBound()), QString::fromUtf8(vk->UpperBound()), modules ); - } - else { //no range supported - text = render->renderSingleKey(key->key(), modules); - } - - if (!progressWasCancelled()) { - CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale); - closeProgressDialog(); - return true; - } - return false; -}; - -const bool CExportManager::saveKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText) { - if (!list->Count()) - return false; - - const QString filename = getSaveFileName(format); - if (filename.isEmpty()) { - return false; - } - - CSwordBackend::FilterOptions filterOptions = m_filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CHTMLExportRendering::Settings settings(addText); - util::scoped_ptr<CTextRendering> render ( - (format == HTML) - ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) - : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) - ); - - CTextRendering::KeyTree tree; - - setProgressRange(list->Count()); - CTextRendering::KeyTreeItem::Settings itemSettings; - itemSettings.highlight = false; - - *list = sword::TOP; - while (!list->Error() && !progressWasCancelled()) { - tree.append( new CTextRendering::KeyTreeItem(QString::fromLocal8Bit((const char*)(*list)) , module, itemSettings) ); - incProgress(); - - (*list)++; - } - - const QString text = render->renderKeyTree(tree); - - if (!progressWasCancelled()) { - CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale); - closeProgressDialog(); - return true; - } - return false; -}; - -const bool CExportManager::saveKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ) { - if (!list.count()) - return false; - - const QString filename = getSaveFileName(format); - if (filename.isEmpty()) { - return false; - } - - CSwordBackend::FilterOptions filterOptions = m_filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CHTMLExportRendering::Settings settings(addText); - util::scoped_ptr<CTextRendering> render ( - (format == HTML) - ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) - : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) - ); - - CTextRendering::KeyTree tree; - - setProgressRange(list.count()); - CTextRendering::KeyTreeItem::Settings itemSettings; - itemSettings.highlight = false; - - for (CSwordKey* k = list.first(); k && !progressWasCancelled(); k = list.next()) { - tree.append( new CTextRendering::KeyTreeItem(k->key(), k->module(), itemSettings) ); - incProgress(); - }; - - const QString text = render->renderKeyTree(tree); - - if (!progressWasCancelled()) { - CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale); - closeProgressDialog(); - return true; - } - return false; -}; - -const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bool addText) { - if (!key) { - return false; - } - if (!key->module()) { - return false; - } - - CSwordBackend::FilterOptions filterOptions = m_filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CHTMLExportRendering::Settings settings(addText); - util::scoped_ptr<CTextRendering> render ( - (format == HTML) - ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) - : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) - ); - - QString text; - QString startKey; - QString stopKey; - - ListCSwordModuleInfo modules; - modules.append(key->module()); - - CSwordVerseKey *vk = dynamic_cast<CSwordVerseKey*>(key); - if (vk && vk->isBoundSet()) { - text = render->renderKeyRange( - QString::fromUtf8(vk->LowerBound()), - QString::fromUtf8(vk->UpperBound()), - modules - ); - } - else { //no range supported - text = render->renderSingleKey(key->key(), modules); - } - - KApplication::clipboard()->setText(text); - return true; -}; - -const bool CExportManager::copyKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText) { - if (!list->Count()) - return false; - - CSwordBackend::FilterOptions filterOptions = m_filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CHTMLExportRendering::Settings settings(addText); - util::scoped_ptr<CTextRendering> render ( - (format == HTML) - ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) - : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) - ); - - CTextRendering::KeyTree tree; - CTextRendering::KeyTreeItem::Settings itemSettings; - itemSettings.highlight = false; - - *list = sword::TOP; - while (!list->Error() && !progressWasCancelled()) { - tree.append( new CTextRendering::KeyTreeItem(QString::fromLocal8Bit((const char*)(*list)) , module, itemSettings) ); - - (*list)++; - } - - const QString text = render->renderKeyTree(tree); - KApplication::clipboard()->setText(text); - return true; -}; - - -const bool CExportManager::copyKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ) { - if (!list.count()) - return false; - - CSwordBackend::FilterOptions filterOptions = m_filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CHTMLExportRendering::Settings settings(addText); - util::scoped_ptr<CTextRendering> render ( - (format == HTML) - ? new CHTMLExportRendering(settings, m_displayOptions, filterOptions) - : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) - ); - - CTextRendering::KeyTree tree; - - CTextRendering::KeyTreeItem::Settings itemSettings; - itemSettings.highlight = false; - for (CSwordKey* k = list.first(); k && !progressWasCancelled(); k = list.next()) { - tree.append( new CTextRendering::KeyTreeItem(k->key(), k->module(), itemSettings) ); - incProgress(); - }; - - const QString text = render->renderKeyTree(tree); - KApplication::clipboard()->setText(text); - return true; -}; - -const bool CExportManager::printKeyList(sword::ListKey* list, CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { - CPrinter::KeyTreeItem::Settings settings; - CPrinter::KeyTree tree; - - QString startKey, stopKey; - setProgressRange(list->Count()); - - (*list) = sword::TOP; - while (!list->Error() && !progressWasCancelled()) { - sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(list); - if (vk) { - startKey = QString::fromUtf8((const char*)(vk->LowerBound()) ); - stopKey = QString::fromUtf8((const char*)(vk->UpperBound()) ); - tree.append( new CPrinter::KeyTreeItem(startKey, stopKey, module, settings) ); - } - else { - startKey = QString::fromUtf8((const char*)*list); - tree.append( new CPrinter::KeyTreeItem(startKey, module, settings) ); - } - - (*list)++; - incProgress(); - } - - util::scoped_ptr<CPrinter> printer(new CPrinter(0, displayOptions, filterOptions)); - - if (!progressWasCancelled()) { - printer->printKeyTree(tree); - closeProgressDialog(); - return true; - } - - return false; -}; - -const bool CExportManager::printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { - CPrinter::KeyTreeItem::Settings settings; - settings.keyRenderingFace = - displayOptions.verseNumbers - ? CPrinter::KeyTreeItem::Settings::SimpleKey - : CPrinter::KeyTreeItem::Settings::NoKey; - - CPrinter::KeyTree tree; - if (startKey != stopKey) { - tree.append( new CPrinter::KeyTreeItem(startKey, stopKey, module, settings) ); - } - else { - tree.append( new CPrinter::KeyTreeItem(startKey, module, settings) ); - } - - util::scoped_ptr<CPrinter> printer(new CPrinter(0, displayOptions, filterOptions)); - printer->printKeyTree(tree); - return true; -} - -const bool CExportManager::printKey( CSwordKey* key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { - CPrinter::KeyTreeItem::Settings settings; - settings.keyRenderingFace = - displayOptions.verseNumbers - ? CPrinter::KeyTreeItem::Settings::SimpleKey - : CPrinter::KeyTreeItem::Settings::NoKey; - - CPrinter::KeyTree tree; - tree.append( new CPrinter::KeyTreeItem(key->key(), key->module(), settings) ); - - util::scoped_ptr<CPrinter> printer(new CPrinter(0, displayOptions, filterOptions)); - printer->printKeyTree(tree); - return true; -} - -/** Prints a key using the hyperlink created by CReferenceManager. */ -const bool CExportManager::printByHyperlink( const QString& hyperlink, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { - QString moduleName; - QString keyName; - CReferenceManager::Type type; - - CReferenceManager::decodeHyperlink(hyperlink, moduleName, keyName, type); - if (moduleName.isEmpty()) { - moduleName = CReferenceManager::preferredModule(type); - } - - CPrinter::KeyTree tree; - CPrinter::KeyTreeItem::Settings settings; - settings.keyRenderingFace = - displayOptions.verseNumbers - ? CPrinter::KeyTreeItem::Settings::SimpleKey - : CPrinter::KeyTreeItem::Settings::NoKey; - - CSwordModuleInfo* module = backend()->findModuleByName(moduleName); - Q_ASSERT(module); - - if (module) { - //check if we have a range of entries or a single one - if ((module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary)) { - sword::ListKey verses = sword::VerseKey().ParseVerseList((const char*)keyName.utf8(), "Genesis 1:1", true); - - for (int i = 0; i < verses.Count(); ++i) { - sword::VerseKey* element = dynamic_cast<sword::VerseKey*>(verses.GetElement(i)); - if (element) { - const QString startKey = QString::fromUtf8(element->LowerBound().getText()); - const QString stopKey = QString::fromUtf8(element->UpperBound().getText()); - - tree.append( new CPrinter::KeyTreeItem(startKey, stopKey, module, settings) ); - } - else if (verses.GetElement(i)) { - const QString key = QString::fromUtf8(verses.GetElement(i)->getText()); - - tree.append( new CPrinter::KeyTreeItem(key, module, settings) ); - } - } - } - else { - tree.append( new CPrinter::KeyTreeItem(keyName, module, settings) ); - } - } - - util::scoped_ptr<CPrinter> printer(new CPrinter(0, displayOptions, filterOptions)); - printer->printKeyTree(tree); - return true; -} - -const bool CExportManager::printKeyList(const QStringList& list,CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { - CPrinter::KeyTreeItem::Settings settings; - settings.keyRenderingFace = - displayOptions.verseNumbers - ? CPrinter::KeyTreeItem::Settings::SimpleKey - : CPrinter::KeyTreeItem::Settings::NoKey; - - CPrinter::KeyTree tree; - setProgressRange(list.count()); - - //ToDo: Fix that as soon as we use Qt > 3.1 - // const QStringList::const_iterator end = list.constEnd(); - const QStringList::const_iterator end = list.end(); - - //ToDo: Fix that as soon as we use Qt > 3.1 - // for (QStringList::const_iterator it = list.constBegin(); (it != end) && !progressWasCancelled(); ++it) { - - for (QStringList::const_iterator it = list.begin(); (it != end) && !progressWasCancelled(); ++it) { - tree.append( new CPrinter::KeyTreeItem(*it, module, settings) ); - - incProgress(); - } - - util::scoped_ptr<CPrinter> printer(new CPrinter(0, displayOptions, filterOptions)); - - if (!progressWasCancelled()) { - printer->printKeyTree(tree); - closeProgressDialog(); - return true; - } - - return false; -} - -/** Returns the string for the filedialogs to show the correct files. */ -const QString CExportManager::filterString( const Format format ) { - switch (format) { - case HTML: - return i18n("*.html *.htm | HTML files\n *.* | All files (*.*)"); - case Text: - return i18n("*.txt | Text files\n *.* | All files (*.*)"); - default: - return i18n("All files (*.*)"); - } -} - -/** Returns a filename to save a file. */ -const QString CExportManager::getSaveFileName(const Format format) { - return KFileDialog::getSaveFileName(QString::null, filterString(format), 0, m_caption); -} - -/** Returns a string containing the linebreak for the current format. */ -const QString CExportManager::lineBreak(const Format format) { - if (static_cast<bool>(m_displayOptions.lineBreaks)) - return (format == HTML) ? QString::fromLatin1("<br/>\n") : QString::fromLatin1("\n"); - - return QString::null; -} - -/** No descriptions */ -void CExportManager::setProgressRange( const int items ) { - if (QProgressDialog* dlg = progressDialog()) { - dlg->setTotalSteps(items); - dlg->setProgress(0); - dlg->setMinimumDuration(0); - dlg->show(); - // dlg->repaint(); - KApplication::kApplication()->processEvents(); //do not lock the GUI! - } -} - -/** Creates the progress dialog with the correct settings. */ -QProgressDialog* const CExportManager::progressDialog() { - if (!m_showProgress) { - return 0; - } - - if (!m_progressDialog) { - m_progressDialog = new QProgressDialog( m_caption, m_progressLabel, 1, 0, "progress", true ); - m_progressDialog->setCaption("BibleTime"); - } - - return m_progressDialog; -} - -/** Increments the progress by one item. */ -void CExportManager::incProgress() { - if (QProgressDialog* dlg = progressDialog()) { - dlg->setProgress( dlg->progress() + 1 ); - } -} - -/** No descriptions */ -const bool CExportManager::progressWasCancelled() { - if (QProgressDialog* dlg = progressDialog()) { - return dlg->wasCancelled(); - } - - return true; -} - -/** Closes the progress dialog immediatly. */ -void CExportManager::closeProgressDialog() { - if (QProgressDialog* dlg = progressDialog()) { - dlg->close(); - dlg->reset(); - } - - KApplication::kApplication()->processEvents(); //do not lock the GUI! -} diff --git a/bibletime/frontend/cexportmanager.h b/bibletime/frontend/cexportmanager.h deleted file mode 100644 index cc654f6..0000000 --- a/bibletime/frontend/cexportmanager.h +++ /dev/null @@ -1,100 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CEXPORTMANAGER_H -#define CEXPORTMANAGER_H - -//BibleTime includes -#include "backend/cswordbackend.h" -#include "cbtconfig.h" - -#include "util/cpointers.h" - -//Qt includes -#include <qstring.h> -#include <qptrlist.h> - -class ListKey; -class CSwordKey; -class CSwordModuleInfo; -class QProgressDialog; - -/** Contains the functions to export text to disk, clipboard or printer. - * @author The BibleTime team - */ -class CExportManager : CPointers { -public: - /** The format the export actions should have - */ - enum Format { - HTML, - Text - }; - - CExportManager(const QString& caption, const bool showProgress = true, const QString& progressLabel = QString::null, const CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(), const CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults()); - - const bool saveKey(CSwordKey* key, const Format format, const bool addText); - const bool saveKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText); - const bool saveKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ); - - const bool copyKey(CSwordKey* key, const Format format, const bool addText); - const bool copyKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText); - const bool copyKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ); - - const bool printKey(CSwordKey* key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - const bool printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ); -const bool printByHyperlink(const QString& hyperlink, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - const bool printKeyList(sword::ListKey* list, CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - const bool printKeyList(const QStringList& list,CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - -protected: // Protected methods - /** - * Returns the string for the filedialogs to show the correct files. - */ - const QString filterString( const Format format ); - /** - * Returns a filename to save a file. - */ - const QString getSaveFileName(const Format format); - /** - * Returns a string containing the linebreak for the current format. - */ - const QString lineBreak( const Format format ); - -private: - QString m_caption; - QString m_progressLabel; - bool m_showProgress; - CSwordBackend::FilterOptions m_filterOptions; - CSwordBackend::DisplayOptions m_displayOptions; - - QProgressDialog* m_progressDialog; - - /** - * Creates the progress dialog with the correct settings. - */ - QProgressDialog* const progressDialog(); - /** - * Returns the CSS string used in HTML pages. - */ - void setProgressRange( const int item ); - /** - * Increments the progress by one item. - */ - inline void incProgress(); - const bool progressWasCancelled(); - /** - * Closes the progress dialog immediatly. - */ - void closeProgressDialog(); -}; - -#endif diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp deleted file mode 100644 index 255a392..0000000 --- a/bibletime/frontend/cinfodisplay.cpp +++ /dev/null @@ -1,462 +0,0 @@ -// -// C++ Implementation: cinfodisplay -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -//BibleTime includes -#include "cinfodisplay.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" -#include "backend/creferencemanager.h" -#include "backend/cdisplaytemplatemgr.h" - -#include "frontend/cbtconfig.h" -#include "frontend/crossrefrendering.h" - -#include "frontend/display/cdisplay.h" -#include "frontend/display/creaddisplay.h" -#include "frontend/display/chtmlreaddisplay.h" - -#include "util/scoped_resource.h" - -//Sword includes -#include <listkey.h> - -//Qt includes -#include <qlayout.h> -#include <qlabel.h> -#include <qscrollview.h> -#include <qregexp.h> - -//KDE includes -#include <klocale.h> -#include <kstdaction.h> - - -using namespace Rendering; -using namespace sword; - -namespace InfoDisplay { - - CInfoDisplay::CInfoDisplay(QWidget *parent, const char *name) -: QWidget(parent, name) { - QVBoxLayout* layout = new QVBoxLayout(this); - QLabel* headingLabel = new QLabel(i18n("Mag (\"shift\" to lock)"),this); - headingLabel->setMargin(5); - - m_htmlPart = CDisplay::createReadInstance(0, this); - m_htmlPart->setMouseTracking(false); //we don't want strong/lemma/note mouse infos - KStdAction::copy(m_htmlPart->connectionsProxy(), SLOT(copySelection()), 0, "copyMagSelection"); - - connect( - m_htmlPart->connectionsProxy(), - SIGNAL(referenceClicked(const QString&, const QString&)), - SLOT(lookup(const QString&, const QString&)) - ); - - layout->addWidget(headingLabel); - layout->addWidget(m_htmlPart->view()); - } - - - CInfoDisplay::~CInfoDisplay() {} - - void CInfoDisplay::lookup(const QString &mod_name, const QString &key_text) { - qWarning("%s %s", mod_name.ascii(), key_text.ascii()); - CSwordModuleInfo* m = CPointers::backend()->findModuleByName(mod_name); - Q_ASSERT(m); - if (!m) - return; - - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(m) ); - key->key( key_text ); - - CDisplayTemplateMgr* mgr = CPointers::displayTemplateManager(); - CDisplayTemplateMgr::Settings settings; - settings.pageCSS_ID = "infodisplay"; - // settings.langAbbrev = ""; - QString content = mgr->fillTemplate(CBTConfig::get - (CBTConfig::displayStyle), key->renderedText(), settings); - - // qWarning("setting text:\n%s", content.latin1()); - - m_htmlPart->setText(content); // scroll to top - CHTMLReadDisplay *d = dynamic_cast<CHTMLReadDisplay *>(m_htmlPart); - d->view()->ensureVisible(0, 0); - - } - - void CInfoDisplay::setInfo(const InfoType type, const QString& data) { - ListInfoData list; - list.append( qMakePair(type, data) ); - - setInfo(list); - } - - - void CInfoDisplay::setInfo(const ListInfoData& list) { - //if the widget is hidden it would be inefficient to render and display the data - if (!isVisible()) { - return; - } - - if (list.count() == 0) { - m_htmlPart->setText("<html></html>"); - return; - } - - QString text; - - ListInfoData::const_iterator end = list.end(); - for (ListInfoData::const_iterator it = list.begin(); it != end; ++it) { - switch ( (*it).first ) { - case Lemma: - text.append( decodeStrongs( (*it).second ) ); - continue; - case Morph: - text.append( decodeMorph( (*it).second ) ); - continue; - case CrossReference: - text.append( decodeCrossReference( (*it).second ) ); - continue; - case Footnote: - text.append( decodeFootnote( (*it).second ) ); - continue; - case WordTranslation: - text.append( getWordTranslation( (*it).second ) ); - continue; - case WordGloss: - //text.append( getWordTranslation( (*it).second ) ); - continue; - case Abbreviation: - text.append( decodeAbbreviation( (*it).second ) ); - continue; - default: - continue; - }; - } - - CDisplayTemplateMgr* mgr = CPointers::displayTemplateManager(); - CDisplayTemplateMgr::Settings settings; - settings.pageCSS_ID = "infodisplay"; - // settings.langAbbrev = ""; - QString content = mgr->fillTemplate(CBTConfig::get - (CBTConfig::displayStyle), text, settings); - - // qWarning("setting text:\n%s", content.latin1()); - - m_htmlPart->setText(content); - } - - - const QString CInfoDisplay::decodeAbbreviation( const QString& data ) { - // QStringList strongs = QStringList::split("|", data); - QString ret; - QString text = data; - - ret.append( - QString("<div class=\"abbreviation\"><h3>%1: %2</h3><p>%3</p></div>") - .arg(i18n("Abbreviation")) - .arg("text") - .arg(text)); - - return ret; - } - - const QString CInfoDisplay::decodeCrossReference( const QString& data ) { - Q_ASSERT(!data.isEmpty()); - if (data.isEmpty()) { - return QString("<div class=\"crossrefinfo\"><h3>%1</h3></div>") - .arg(i18n("Cross references")); - } - - // qWarning("setting crossref %s", data.latin1()); - - CSwordBackend::DisplayOptions dispOpts; - dispOpts.lineBreaks = false; - dispOpts.verseNumbers = true; - - CSwordBackend::FilterOptions filterOpts; - filterOpts.headings = false; - filterOpts.strongNumbers = false; - filterOpts.morphTags = false; - filterOpts.lemmas = false; - filterOpts.footnotes = false; - filterOpts.scriptureReferences = false; - - CrossRefRendering renderer(dispOpts, filterOpts); - CTextRendering::KeyTree tree; - - // const bool isBible = true; - CSwordModuleInfo* module = CBTConfig::get - (CBTConfig::standardBible); - - //a prefixed module gives the module to look into - QRegExp re("^[^ ]+:"); - // re.setMinimal(true); - int pos = re.search(data,0); - if (pos != -1) { - pos += re.matchedLength()-1; - } - - if (pos > 0) { - const QString moduleName = data.left(pos); - // qWarning("found module %s", moduleName.latin1()); - module = CPointers::backend()->findModuleByName(moduleName); - if (!module) { - module = CBTConfig::get - (CBTConfig::standardBible); - } - // Q_ASSERT(module); - } - - Q_ASSERT(module); - CTextRendering::KeyTreeItem::Settings settings ( - false, - CTextRendering::KeyTreeItem::Settings::CompleteShort - ); - - if (module && (module->type() == CSwordModuleInfo::Bible)) { - VerseKey vk; - sword::ListKey refs = vk.ParseVerseList((const char*)data.mid((pos == -1) ? 0 : pos+1).utf8(), "Gen 1:1", true); - - for (int i = 0; i < refs.Count(); ++i) { - SWKey* key = refs.getElement(i); - Q_ASSERT(key); - VerseKey* vk = dynamic_cast<VerseKey*>(key); - - CTextRendering::KeyTreeItem* i = 0; - if (vk && vk->isBoundSet()) { //render a range of keys - i = new CTextRendering::KeyTreeItem( - QString::fromUtf8(vk->LowerBound().getText()), - QString::fromUtf8(vk->UpperBound().getText()), - module, - settings - ); - } - else { - i = new CTextRendering::KeyTreeItem( - QString::fromUtf8(key->getText()), - QString::fromUtf8(key->getText()), - module, - settings - ); - } - - Q_ASSERT(i); - - tree.append( i ); - } - } - else if (module) { - CTextRendering::KeyTreeItem* i = new CTextRendering::KeyTreeItem( - data.mid((pos == -1) ? 0 : pos+1), - module, - settings - ); - tree.append( i ); - } - - // qWarning("rendered the tree: %s", renderer.renderKeyTree(tree).latin1()); - //spanns containing rtl text need dir=rtl on their parent tag to be aligned properly - return QString("<div class=\"crossrefinfo\"><h3>%1</h3><div class=\"para\" dir=\"%2\">%3</div></div>") - .arg(i18n("Cross references")) - .arg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "") - .arg(renderer.renderKeyTree(tree)); - } - - /*! - \fn CInfoDisplay::decodeFootnote( const QString& data ) - */ - const QString CInfoDisplay::decodeFootnote( const QString& data ) { - QStringList list = QStringList::split("/", data); - Q_ASSERT(list.count() >= 3); - if (!list.count()) { - return QString::null; - } - - const QString modulename = list.first(); - const QString swordFootnote = list.last(); - - // remove the first and the last and then rejoin it to get a key - list.pop_back(); list.pop_front(); - const QString keyname = list.join("/"); - - CSwordModuleInfo* module = CPointers::backend()->findModuleByName(modulename); - if (!module) { - return QString::null; - } - - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); - key->key(keyname); - key->renderedText(); //force entryAttributes - - const char* note = module->module()->getEntryAttributes()["Footnote"][swordFootnote.latin1()]["body"].c_str(); - - QString text = module->isUnicode() ? QString::fromUtf8(note) : QString(note); - text = QString::fromUtf8(module->module()->RenderText( - module->isUnicode() - ? (const char*)text.utf8() - : (const char*)text.latin1() - )); - - return QString("<div class=\"footnoteinfo\"><h3>%1</h3><p>%2</p></div>") - .arg(i18n("Footnote")) - .arg(text); - } - - const QString CInfoDisplay::decodeStrongs( const QString& data ) { - QStringList strongs = QStringList::split("|", data); - QString ret; - - QStringList::const_iterator end = strongs.end(); - for (QStringList::const_iterator it = strongs.begin(); it != end; ++it) { - CSwordModuleInfo* const module = CBTConfig::get - ( - ((*it).left(1) == QString("H")) ? - CBTConfig::standardHebrewStrongsLexicon : - CBTConfig::standardGreekStrongsLexicon - ); - - QString text; - if (module) { - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); - key->key( (*it).mid(1) ); //skip H or G (language sign), will have to change later if we have better modules - text = key->renderedText(); - } - //if the module could not be found just display an empty lemma info - - ret.append( - QString("<div class=\"strongsinfo\"><h3>%1: %2</h3><p>%3</p></div>") - .arg(i18n("Strongs")) - .arg(*it) - .arg(text) - ); - } - - return ret; - } - - const QString CInfoDisplay::decodeMorph( const QString& data ) { - QStringList morphs = QStringList::split("|", data); - QString ret; - - for (QStringList::iterator it = morphs.begin(); it != morphs.end(); ++it) { - CSwordModuleInfo* module = 0; - bool skipFirstChar = false; - QString value = ""; - QString valueClass = ""; - - int valStart = (*it).find(':'); - if (valStart > -1) { - valueClass = (*it).mid(0, valStart); - module = CPointers::backend()->findModuleByName( valueClass ); - Q_ASSERT(module); - } - value = (*it).mid(valStart+1); //works for prepended module and without (-1 +1 == 0). - - // if we don't have a class assigned or desired one isn't installed... - if (!module) { - // Morphs usually don't have [GH] prepended, but some old OLB - // codes do. We should check if we're digit after first char - // to better guess this. - // No need to check len, if at(1) is > len QChar::null is - // returned which is ok to .isDigit() - if (value.at(1).isDigit()) { - switch (value.at(0).latin1()) { - case 'G': - module = CBTConfig::get - (CBTConfig::standardGreekMorphLexicon); - skipFirstChar = true; - break; - case 'H': - module = CBTConfig::get - (CBTConfig::standardHebrewMorphLexicon); - skipFirstChar = true; - break; - default: - skipFirstChar = false; - //TODO: we can't tell here if it's a greek or hebrew moprh code, that's a problem we have to solve - // module = CBTConfig::get(CBTConfig::standardGreekMorphLexicon); - break; - } - } - //if it is still not set use the default - if (!module) { - module = CBTConfig::get - (CBTConfig::standardGreekMorphLexicon); - } - } - - QString text; - Q_ASSERT(module); - if (module) { - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); - - //skip H or G (language sign) if we have to skip it - const bool isOk = key->key( skipFirstChar ? value.mid(1) : value ); - Q_ASSERT(isOk); - if (!isOk) { //try to use the other morph lexicon, because this one failed with the current morph code - key->module(CBTConfig::get - (CBTConfig::standardHebrewMorphLexicon)); - key->key( skipFirstChar ? value.mid(1) : value ); - } - - text = key->renderedText(); - } - - //if the module wasn't found just display an empty morph info - ret.append( QString("<div class=\"morphinfo\"><h3>%1: %2</h3><p>%3</p></div>") - .arg(i18n("Morphology")) - .arg(value) - .arg(text) - ); - } - - return ret; - } - - const QString CInfoDisplay::getWordTranslation( const QString& data ) { - CSwordModuleInfo* const module = CBTConfig::get - (CBTConfig::standardLexicon); - if (!module) { - return QString::null; - } - - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); - key->key( data ); - if (key->key().upper() != data.upper()) { //key not present in the lexicon - return QString::null; - } - - QString ret = QString("<div class=\"translationinfo\"><h3>%1: %2</h3><p>%3</p></div>") - .arg(i18n("Word lookup")) - .arg(data) - .arg(key->renderedText()); - - return ret; - } - - - /*! - \fn CInfoDisplay::clearInfo() - */ - void CInfoDisplay::clearInfo() { - CDisplayTemplateMgr* tmgr = CPointers::displayTemplateManager(); - CDisplayTemplateMgr::Settings settings; - settings.pageCSS_ID = "infodisplay"; - - m_htmlPart->setText( tmgr->fillTemplate(CBTConfig::get - (CBTConfig::displayStyle), QString::null, settings) ); - } - -} //end of namespace InfoDisplay diff --git a/bibletime/frontend/cinfodisplay.h b/bibletime/frontend/cinfodisplay.h deleted file mode 100644 index 789aab1..0000000 --- a/bibletime/frontend/cinfodisplay.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// C++ Interface: cinfodisplay -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#ifndef CINFODISPLAY_H -#define CINFODISPLAY_H - -//Backend -#include "backend/ctextrendering.h" - -//Qt includes -#include <qwidget.h> -#include <qvaluelist.h> -#include <qpair.h> - -//class forward declarations -class CReadDisplay; - -namespace InfoDisplay { - - /** - @author The BibleTime team - */ -class CInfoDisplay : public QWidget { - Q_OBJECT -public: - enum InfoType { - Abbreviation, - CrossReference, - Footnote, - Lemma, - Morph, - WordTranslation, - WordGloss - }; - - typedef QPair<InfoType, QString> InfoData; - typedef QValueList<InfoData> ListInfoData; - - CInfoDisplay(QWidget *parent = 0, const char *name = 0); - virtual ~CInfoDisplay(); - - void setInfo(const InfoType, const QString& data); - void setInfo(const ListInfoData&); - void clearInfo(); - -protected: - const QString decodeAbbreviation( const QString& data ); - const QString decodeCrossReference( const QString& data ); - const QString decodeFootnote( const QString& data ); - const QString decodeStrongs( const QString& data ); - const QString decodeMorph( const QString& data ); - const QString getWordTranslation( const QString& data ); - -protected slots: - void lookup(const QString &, const QString &); - -private: - CReadDisplay* m_htmlPart; - }; - -} //end of InfoDisplay namespace - -#endif diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp deleted file mode 100644 index 1d27a6b..0000000 --- a/bibletime/frontend/cinputdialog.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//own includes -#include "cinputdialog.h" - -//Qt includes -#include <qwidget.h> -#include <qlabel.h> -#include <qtextedit.h> -#include <qpushbutton.h> -#include <qlayout.h> - -//KDE includes -#include <klocale.h> -#include <kseparator.h> - -CInputDialog::CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) { - setPlainCaption(caption); - - QVBoxLayout* topLayout = new QVBoxLayout(this, 5,5); - - QLabel* l = new QLabel(description, this); - topLayout->addWidget(l); - - topLayout->addSpacing(10); - - m_editWidget = new QTextEdit(this, "edit widget"); - m_editWidget->setWordWrap( QTextEdit::WidgetWidth ); - m_editWidget->setText(text); - if (!text.isEmpty()) - m_editWidget->selectAll(); - - topLayout->addWidget(m_editWidget); - - KSeparator* separator = new KSeparator(KSeparator::HLine, this); - topLayout->addWidget(separator); - - QHBoxLayout* buttonLayout = new QHBoxLayout(topLayout); - - buttonLayout->addStretch(2); - - QPushButton* cancel = new QPushButton(this); - cancel->setText(i18n("&Cancel")); - connect(cancel, SIGNAL(clicked()), SLOT(reject())); - buttonLayout->addWidget(cancel,1); - - buttonLayout->addSpacing(15); - - QPushButton* clear = new QPushButton(this); - clear->setText(i18n("C&lear")); - connect(clear, SIGNAL(clicked()),m_editWidget, SLOT(clear())); - buttonLayout->addWidget(clear,1); - - buttonLayout->addSpacing(15); - - QPushButton* ok = new QPushButton(this); - ok->setText(i18n("&Ok")); - connect(ok, SIGNAL(clicked()), SLOT(accept())); - buttonLayout->addWidget(ok,1); - - m_editWidget->setFocus(); -} - -/** Returns the text entered at the moment. */ -const QString CInputDialog::text() { - return m_editWidget->text(); -} - -/** A static function to get some using CInputDialog. */ -const QString CInputDialog::getText( const QString& caption, const QString& description, const QString& text, bool* ok, QWidget* parent, bool modal) { - CInputDialog* dlg = new CInputDialog(caption, description, text, parent, "", modal); - QString ret = QString::null; - - const bool isOk = (dlg->exec() == CInputDialog::Accepted); - if (isOk) { - ret = dlg->text(); - } - - if (ok) { //change the ok param to return the value - *ok = isOk; - } - - delete dlg; - return ret; -} diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h deleted file mode 100644 index d4b0812..0000000 --- a/bibletime/frontend/cinputdialog.h +++ /dev/null @@ -1,43 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CINPUTDIALOG_H -#define CINPUTDIALOG_H - -//KDE includes -#include <kdialog.h> - -class QTextEdit; -class QWidget; - -/** This is a small input dialog with - * a multiline edit for the text input. - * @author The BibleTime team - */ -class CInputDialog : public KDialog { - Q_OBJECT -public: - CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent=0, const char *name=0, const bool modal = true); - /** - * A static function to get some using CInputDialog. - */ - static const QString getText( const QString& caption, const QString& description, const QString& text = QString::null, bool* ok = 0, QWidget* parent = 0, bool modal = true); - /** - * Returns the text entered at the moment. - */ - const QString text(); - // ~CInputDialog(); - -private: - QTextEdit* m_editWidget; -}; - -#endif diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp deleted file mode 100644 index 1b861b4..0000000 --- a/bibletime/frontend/cmanageindiceswidget.cpp +++ /dev/null @@ -1,193 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cmanageindiceswidget.h" - -#include "cmoduleindexdialog.h" - -#include "cbtconfig.h" - -#include "util/ctoolclass.h" -#include "util/cresmgr.h" -#include "util/cpointers.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" - -//Qt includes -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qlistview.h> -#include <qfileinfo.h> -#include <qcheckbox.h> - -//KDE includes -#include <klocale.h> -#include <klistview.h> -#include <kiconloader.h> - -namespace BookshelfManager { - -/** Constructor */ -CManageIndicesWidget::CManageIndicesWidget(QWidget* parent, const char* name) : - ManageIndicesForm(parent, name) { - - initView(); - populateModuleList(); -}; - -CManageIndicesWidget::~CManageIndicesWidget() -{ - CBTConfig::set( CBTConfig::autoDeleteOrphanedIndices, m_autoDeleteOrphanedIndicesBox->isChecked() ); - -} - -/** Initializes the look and feel of this page */ -void CManageIndicesWidget::initView() -{ - // Set description label - QVBoxLayout* box = new QVBoxLayout(m_labelFrame, 0, 0); - QLabel* mainLabel = CToolClass::explanationLabel(m_labelFrame, - i18n("Manage module search indices"), - i18n("You can use the list below to create and/or delete search indices for your installed works.")); - box->addWidget(mainLabel); - - // configure the list view - m_moduleList->addColumn(i18n("Module")); - m_moduleList->addColumn(i18n("Index size")); - m_moduleList->setRootIsDecorated(true); - m_moduleList->setColumnWidth(0, 150); - m_moduleList->setColumnAlignment(1, Qt::AlignRight); - m_moduleList->setSorting( -1 ); - - m_autoDeleteOrphanedIndicesBox->setChecked( CBTConfig::get( CBTConfig::autoDeleteOrphanedIndices ) ); - - // icons for our buttons - m_createIndicesButton->setIconSet(SmallIcon("folder_new", 16)); - m_deleteIndicesButton->setIconSet(SmallIcon("remove", 16)); - - // connect our signals/slots - connect(m_createIndicesButton, SIGNAL(clicked()), this, SLOT(createIndices())); - connect(m_deleteIndicesButton, SIGNAL(clicked()), this, SLOT(deleteIndices())); -} - -/** Populates the module list with installed modules and orphaned indices */ -void CManageIndicesWidget::populateModuleList() { - m_moduleList->clear(); - - // populate installed modules - m_modsWithIndices = new QCheckListItem(m_moduleList, i18n("Modules with indices"), - QCheckListItem::CheckBoxController); - m_modsWithIndices->setOpen(true); - - m_modsWithoutIndices = new QCheckListItem(m_moduleList, i18n("Modules without indices"), - QCheckListItem::CheckBoxController); - m_modsWithoutIndices->setOpen(true); - - ListCSwordModuleInfo& modules = CPointers::backend()->moduleList(); - ListCSwordModuleInfo::iterator end_it = modules.end(); - for (ListCSwordModuleInfo::iterator it = modules.begin(); it != end_it; ++it) { - QCheckListItem* item = 0; - - if ((*it)->hasIndex()) { - item = new QCheckListItem(m_modsWithIndices, (*it)->name(), - QCheckListItem::CheckBox); - item->setText(1, QString("%1 ").arg((*it)->indexSize() / 1024) + i18n("KiB")); - } - else { - item = new QCheckListItem(m_modsWithoutIndices, (*it)->name(), - QCheckListItem::CheckBox); - item->setText(1, QString("0 ") + i18n("KiB")); - } - } -} - -/** Creates indices for selected modules if no index currently exists */ -void CManageIndicesWidget::createIndices() -{ - QCheckListItem* top = m_modsWithoutIndices; - bool indicesCreated = false; - QCheckListItem* item = (QCheckListItem*)top->firstChild(); - - ListCSwordModuleInfo moduleList; - while (item) { - if (item->isOn()) { - CSwordModuleInfo* module = - CPointers::backend()->findModuleByName(item->text().utf8()); - - - if (module) { - moduleList.append( module ); - indicesCreated = true; - } - } - item = (QCheckListItem*)item->nextSibling(); - } - - //Shows the progress dialog - if (indicesCreated) { - CModuleIndexDialog::getInstance()->indexAllModules( moduleList ); - populateModuleList(); - } -} - -/** Deletes indices for selected modules and selected orphans */ -void CManageIndicesWidget::deleteIndices() -{ - // delete installed module indices - QCheckListItem* top = m_modsWithIndices; - bool indicesDeleted = false; - QCheckListItem* item = (QCheckListItem*)top->firstChild(); - while (item) { - if (item->isOn()) { - CSwordModuleInfo* module = - CPointers::backend()->findModuleByName(item->text().utf8()); - if (module) { - CSwordModuleInfo::deleteIndexForModule( module->name() ); - indicesDeleted = true; - } - } - item = (QCheckListItem*)item->nextSibling(); - } - - // repopulate the list if an action was taken - if (indicesDeleted) { - populateModuleList(); - } -} - -void CManageIndicesWidget::deleteOrphanedIndices() -{ - QDir dir(CSwordModuleInfo::getGlobalBaseIndexLocation()); - dir.setFilter(QDir::Dirs); - CSwordModuleInfo* module; - - for (unsigned int i = 0; i < dir.count(); i++) { - if (dir[i] != "." && dir[i] != "..") { - if (module = CPointers::backend()->findModuleByName( dir[i] ) ) { //mod exists - if (!module->hasIndex()){ //index files found, but wrong version etc. - CSwordModuleInfo::deleteIndexForModule( dir[i] ); - } - } - else{ //no module exists - if (CBTConfig::get( CBTConfig::autoDeleteOrphanedIndices ) ){ - CSwordModuleInfo::deleteIndexForModule( dir[i] ); - } - } - } - } -} - - -} diff --git a/bibletime/frontend/cmanageindiceswidget.h b/bibletime/frontend/cmanageindiceswidget.h deleted file mode 100644 index 47d9cd7..0000000 --- a/bibletime/frontend/cmanageindiceswidget.h +++ /dev/null @@ -1,77 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CMANAGEINDICESWIDGET_H -#define CMANAGEINDICESWIDGET_H - -#include "frontend/manageindicesform.h" // uic generated - -#include <qwidget.h> - -class QCheckListItem; - -namespace BookshelfManager { - -/** -* This class encapsulates the "Manage search indices" page of the Bookshelf -* Manager. It allows for creation and deletion of search indicies for each -* installed module. It also allows for deletion of orphaned indices. -*/ -class CManageIndicesWidget : public ManageIndicesForm -{ - Q_OBJECT - -public: - /** - * Constructor - */ - CManageIndicesWidget(QWidget* parent, const char* name = 0); - - /** - * Destructor - */ - ~CManageIndicesWidget(); - -protected: - /** - * Initializes the look and feel of this page - */ - void initView(); - /** - * Populates the module list with installed modules and orphaned indices - */ - void populateModuleList(); - - // member variables - QCheckListItem* m_modsWithIndices; - QCheckListItem* m_modsWithoutIndices; - -public slots: - /** - * Creates indices for selected modules if no index currently exists - */ - void createIndices(); - /** - * Deletes indices for selected modules - */ - void deleteIndices(); - -public: - /** - * Deletes orphaned indices if the autoDeleteOrphanedIndices is true - * Always deletes indices of existing modules where hasIndex() returns false - */ - static void deleteOrphanedIndices(); -}; - -} - -#endif diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp deleted file mode 100644 index 1584466..0000000 --- a/bibletime/frontend/cmdiarea.cpp +++ /dev/null @@ -1,358 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cmdiarea.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordversekey.h" - -#include "frontend/displaywindow/cdisplaywindow.h" -#include "frontend/keychooser/ckeychooser.h" - -#include "config.h" - -//KDE includes -#include <kpopupmenu.h> -#include <kapplication.h> -#include <klocale.h> - -//QT includes -#include <qobjectlist.h> -#include <qtimer.h> -#include <qevent.h> -#include <qtimer.h> -#if QT_VERSION < 0x030200 -//We need this to close all windows with Qt < 3.2 -#include <qwidgetlist.h> -#endif - - -CMDIArea::CMDIArea(QWidget *parent, const char *name ) -: QWorkspace(parent, name), -m_guiOption(Nothing), -m_childEvent(false), -m_appCaption(QString::null) { - initView(); - initConnections(); - readSettings(); -} - - -/** Initializes the view of the MDI area */ -void CMDIArea::initView() { - setPaletteBackgroundColor( parentWidget()->paletteBackgroundColor() ); //work around a KDE bug (IMHO was in KDE 2.x) -} - -/** Initilizes the connectiosn to SIGNALS */ -void CMDIArea::initConnections() { - connect(this, SIGNAL(windowActivated(QWidget*)), - this, SLOT(slotClientActivated(QWidget*))); -} - -/** Called whan a client window was activated */ -void CMDIArea::slotClientActivated(QWidget* client) { - if (!client || !isUpdatesEnabled()) { - return; - } - - CDisplayWindow* sp = dynamic_cast<CDisplayWindow*>(client); - Q_ASSERT(sp); - if (!sp || !sp->isReady()) { - return; - } - - QWidgetList windows = windowList(); - for ( QWidget* w = windows.first(); w; w = windows.next() ) { - //Don't use!! It would disable accel enabling for the active window, see CDisplayWindow::windowActivated - /* if (w == client) - continue; - */ - - CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(w); - window->windowActivated( (window == sp) ? true : false); - } - - emit sigSetToplevelCaption( ( m_appCaption = client->caption().stripWhiteSpace() ) ); -} - -/** Reimplementation. Used to make use of the fixedGUIOption part. */ -void CMDIArea::childEvent( QChildEvent * e ) { - QWorkspace::childEvent(e); - - if ( m_childEvent || !e) { - return; - } - - m_childEvent = true; - - if (!windowList().count()) { - m_appCaption = QString::null; - emit sigSetToplevelCaption( KApplication::kApplication()->makeStdCaption(m_appCaption) ); - emit sigLastPresenterClosed(); - } - - if ((e->inserted() || e->removed()) ) { - if (e->inserted() && e->child() && e->child()->inherits("CDisplayWindow")) { - e->child()->installEventFilter(this); //make sure we catch the events of the new window - } - else if (e->removed() && e->child() && e->child()->inherits("CDisplayWindow")) { - e->child()->removeEventFilter(this); //make sure we catch the events of the new window - } - - triggerWindowUpdate(); - } - - m_childEvent = false; -} - -/** Reimplementation */ -void CMDIArea::resizeEvent(QResizeEvent* e) { - QWorkspace::resizeEvent(e); - - if (isUpdatesEnabled()) { - triggerWindowUpdate(); - }; -} - -/** */ -void CMDIArea::saveSettings() {} - -/** */ -void CMDIArea::readSettings() {} - -/** Deletes all the presenters in the MDI area. */ -void CMDIArea::deleteAll() { -#if QT_VERSION >= 0x030200 - closeAllWindows(); -#else - QWidgetListIt it(windowList()); - while (it.current() != 0){ - it.current()->close(); - ++it; - } -#endif -} - -/** Enable / disable autoCascading */ -void CMDIArea::setGUIOption( const MDIOption& newOption ) { - //now do the initial action - m_guiOption = newOption; - - triggerWindowUpdate(); -} - -/** */ -void CMDIArea::myTileVertical() { - if (!isUpdatesEnabled() || !usableWindowList().count() ) { - return; - } - - QPtrList<QWidget> windows = usableWindowList(); - - if ((windows.count() == 1) && windows.at(0)) { - m_appCaption = windows.at(0)->caption(); - windows.at(0)->showMaximized(); - } - else { - QWidget* active = activeWindow(); - QWorkspace::tile(); - active->setFocus(); - } -} - -void CMDIArea::myTileHorizontal() { - if (!isUpdatesEnabled() || !usableWindowList().count() ) { - return; - } - - QPtrList<QWidget> windows = usableWindowList(); - - if ((windows.count() == 1) && windows.at(0)) { - m_appCaption = windows.at(0)->caption(); - windows.at(0)/*->parentWidget()*/->showMaximized(); - } - else { - - QWidget* active = activeWindow(); - if (active->isMaximized()) { - active->showNormal(); - } - - blockSignals(true); - setUpdatesEnabled(false); - int heightForEach = height() / windows.count(); - int y = 0; - for ( int i = 0; i < int(windows.count()); ++i ) { - QWidget *window = windows.at(i); - window->parentWidget()->showNormal(); - qApp->sendPostedEvents( 0, QEvent::ShowNormal ); - - const int preferredHeight = window->minimumHeight() + window->parentWidget()->baseSize().height(); - const int actHeight = QMAX(heightForEach, preferredHeight); - - window->parentWidget()->setGeometry( 0, y, width(), actHeight ); - y += actHeight; - } - - setUpdatesEnabled(true); - active->setFocus(); - blockSignals(false); - } - -} - -/** */ -void CMDIArea::myCascade() { - if (!isUpdatesEnabled() || !usableWindowList().count() ) { - return; - } - - QPtrList<QWidget> windows = usableWindowList(); - if ( !windows.count() ) { - return; - } - - if ((windows.count() == 1) && windows.at(0)) { - m_appCaption = windows.at(0)->caption(); - windows.at(0)->parentWidget()->showMaximized(); - } - else { - const int offsetX = 40; - const int offsetY = 40; - const int windowWidth = width() - (windows.count()-1)*offsetX; - const int windowHeight = height() - (windows.count()-1)*offsetY; - - int x = 0; - int y = 0; - - QWidget* const active = activeWindow(); - if (active->isMaximized()) { - active->showNormal(); - } - - blockSignals(true); - setUpdatesEnabled(false); - - for (int i(0); i < int(windows.count()); ++i) { - QWidget* window = windows.at(i); - if (window == active) { //leave out the active window which should be the top window - continue; - } - - window->setUpdatesEnabled(false); - - window->parentWidget()->raise(); //make it the on-top-of-window-stack window to make sure they're in the right order - window->parentWidget()->setGeometry(x, y, windowWidth, windowHeight); - x += offsetX; - y += offsetY; - - window->setUpdatesEnabled(true); - } - - setUpdatesEnabled(true); - - active->parentWidget()->setGeometry(x, y, windowWidth, windowHeight); - active->parentWidget()->raise(); - active->setActiveWindow(); - - blockSignals(false); - } -} - -/*! - \fn CMDIArea::emitWindowCaptionChanged() - */ -void CMDIArea::emitWindowCaptionChanged() { - if (activeWindow()) { - m_appCaption = activeWindow()->caption(); - } - - emit sigSetToplevelCaption(currentApplicationCaption()); -} - - -/*! - \fn CMDIArea::usableWindowsCount() - */ -QPtrList<QWidget> CMDIArea::usableWindowList() { - QPtrList<QWidget> ret; - - QWidgetList windows = windowList(); - for ( QWidget* w = windows.first(); w; w = windows.next() ) { - if (w->isMinimized() || w->isHidden()) { //not usable for us - continue; - } - - ret.append( w ); - } - - return ret; -} - -bool CMDIArea::eventFilter( QObject *o, QEvent *e ) { - Q_ASSERT(o); - Q_ASSERT(e); - - QWidget* w = dynamic_cast<QWidget*>( o ); - bool ret = QWorkspace::eventFilter(o,e); - -#if QT_VERSION >= 0x030300 - if ( w && (e->type() == QEvent::WindowStateChange) ) { - if (o->inherits("CDisplayWindow") && ((w->windowState() & Qt::WindowMinimized) || w->isHidden())) { //window was minimized, trigger a tile/cascade update if necessary - triggerWindowUpdate(); - ret = false; - } - else if (!o->inherits("CDisplayWindow")){ - qDebug("CMDIArea: bad mdi child classname: %s", o->className()); - //o->dumpObjectInfo(); - //o->dumpObjectTree(); - } - } -#else - if (w && o->inherits("CDisplayWindow")){ - if ((e->type() == QEvent::ShowMinimized) || - (e->type() == QEvent::Hide)){ - triggerWindowUpdate(); - ret = false; - } - } - else if (!o->inherits("CDisplayWindow")){ - qDebug("bad mdi child classname: %s", o->className()); - //o->dumpObjectInfo(); - //o->dumpObjectTree(); - } -#endif - return ret; // standard event processing -} - - -/*! - \fn CMDIArea::triggerWindowUpdate() - */ -void CMDIArea::triggerWindowUpdate() { - qDebug("CMDIArea::triggerWindowUpfdate"); - - if (isUpdatesEnabled() && usableWindowList().count() ) { - switch (m_guiOption) { - case autoTileVertical: - QTimer::singleShot(0, this, SLOT(myTileVertical())); - break; - case autoTileHorizontal: - QTimer::singleShot(0, this, SLOT(myTileHorizontal())); - break; - case autoCascade: - QTimer::singleShot(0, this, SLOT(myCascade())); - break; - default: - qDebug("CMDIArea::triggerWindowUpdate: no known m_guiType"); - break; - } - } -} diff --git a/bibletime/frontend/cmdiarea.h b/bibletime/frontend/cmdiarea.h deleted file mode 100644 index 4178b0a..0000000 --- a/bibletime/frontend/cmdiarea.h +++ /dev/null @@ -1,143 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CMDIAREA_H -#define CMDIAREA_H - -//BibleTime includes -#include "util/cpointers.h" -#include "backend/cswordmoduleinfo.h" - -//Qt includes -#include <qworkspace.h> -#include <qptrlist.h> -#include <qstrlist.h> -#include <qevent.h> - -class KPopupMenu; -class CSwordModuleInfo; -class CSwordKey; - -/** The MDI widget we use in BibleTime. - * Enhances QWorkspace. - * @author The BibleTime Team - */ -class CMDIArea : public QWorkspace, public CPointers { - Q_OBJECT - -public: - /** - * The options you can set for this widget. - */ - enum MDIOption { - autoTileVertical, - autoTileHorizontal, - autoCascade, - Nothing - }; - CMDIArea(QWidget *parent, const char *name = 0 ); - /** - */ - void readSettings(); - /** - */ - void saveSettings(); - /** - * Enable / disable autoCascading - */ - void setGUIOption( const MDIOption& newOption ); - /** - * This works around a problem/limitation in QWorkspace. QWorkspace sets every time the - * application caption on its on way. This confuses BibleTime - wrong captions are generated. - * This function returns the right caption (using the MDI child). - */ - inline const QString currentApplicationCaption() const; - void emitWindowCaptionChanged(); - /** - * Forces an update of the currently chosen window arrangement. - */ - void triggerWindowUpdate(); - QPtrList<QWidget> usableWindowList(); - -public slots: - /** - * Called whan a client window was activated - */ - void slotClientActivated(QWidget* client); - /** - * Deletes all the presenters in the MDI area. - */ - void deleteAll(); - /** Our own cascade version which, if only one window is left, shows this maximized. - * Also necessary for autoCasacde feature - */ - void myCascade(); - /** Our own cascade version which, if only one window is left, shows this maximized. - * Also necessary for autoTile feature - */ - void myTileVertical(); - /** Horizontal tile function - * This function was taken from Qt's MDI example. - */ - void myTileHorizontal(); - /** - * Emits the signal to create a new display window in the MDI area. - */ - inline void emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName ); - -protected: // Protected methods - /** - * Used to make use of the fixedGUIOption part. - */ - virtual void childEvent (QChildEvent * e); - /** - * Reimplementation - */ - virtual void resizeEvent(QResizeEvent* e); - /** - * Initializes the connectiosn to SIGNALS - */ - void initConnections(); - /** - * Initializes the view of the MDI area - */ - void initView(); - bool eventFilter( QObject *o, QEvent *e ); - -signals: // Signals - /** - * Emits a signal to set the acption of the toplevel widget. - */ - void sigSetToplevelCaption(const QString&); - /** - * Is emitted when the last presenter was closed. - */ - void sigLastPresenterClosed(); - void createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& keyName); - -private: - MDIOption m_guiOption; - bool m_childEvent; - QString m_appCaption; -}; - -/** This works around a problem/limitation in QWorkspace. QWorkspace sets every time the application caption on its on way. This confuses BibleTime - wrong captions are generated. This function returns the right caption (using the MDI child). */ -inline const QString CMDIArea::currentApplicationCaption() const { - return m_appCaption; -} - -/** Emits the signal to create a new display window in the MDI area. */ -inline void CMDIArea::emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName ) { - emit createReadDisplayWindow(modules, keyName); -} - - -#endif diff --git a/bibletime/frontend/cmoduleindexdialog.cpp b/bibletime/frontend/cmoduleindexdialog.cpp deleted file mode 100644 index 172ca41..0000000 --- a/bibletime/frontend/cmoduleindexdialog.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// -// C++ Implementation: cmoduleindexdialog -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#include "cmoduleindexdialog.h" - -#include "util/scoped_resource.h" - -//Qt includes -#include <qstring.h> - -//KDE includes -#include <kapplication.h> -#include <kprogress.h> -#include <klocale.h> - -CModuleIndexDialog* CModuleIndexDialog::getInstance() { - static CModuleIndexDialog* instance = 0; - if (instance == 0) { - instance = new CModuleIndexDialog(); - } - - return instance; -} - -void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules ) { - qDebug("indexAllModules"); - if (modules.count() == 0) { - return; - } - - m_currentModuleIndex = 0; - progress = new KProgressDialog(0, "progressDialog", i18n("Preparing instant search"), QString::null, true); - progress->setAllowCancel(false); - progress->progressBar()->setTotalSteps( modules.count() * 100 ); - progress->setMinimumDuration(0); -// progress->show(); -// progress->raise(); - - ListCSwordModuleInfo::const_iterator end_it = modules.end(); - for( ListCSwordModuleInfo::const_iterator it = modules.begin(); it != end_it; ++it) { - (*it)->connectIndexingFinished(this, SLOT(slotFinished())); - (*it)->connectIndexingProgress(this, SLOT(slotModuleProgress(int))); - - progress->setLabel(i18n("Creating index for work %1").arg((*it)->name())); - qDebug("Building index for work %s", (*it)->name().latin1()); - - (*it)->buildIndex(); - - m_currentModuleIndex++; - (*it)->disconnectIndexingSignals(this); - } - - delete progress; - progress = 0; -} - -void CModuleIndexDialog::indexUnindexedModules( const ListCSwordModuleInfo& modules ) { - qDebug("indexUnindexedModules"); - ListCSwordModuleInfo unindexedMods; - - ListCSwordModuleInfo::const_iterator end_it = modules.end(); - for( ListCSwordModuleInfo::const_iterator it = modules.begin(); it != end_it; ++it) { - if ((*it)->hasIndex()) { - continue; - } - - unindexedMods << (*it); - } - - indexAllModules(unindexedMods); -} - - -/*! - \fn CModuleIndexDialog::slotModuleProgress( int percentage ) - */ -void CModuleIndexDialog::slotModuleProgress( int percentage ) { -// qDebug("progress %d", percentage); - - progress->progressBar()->setProgress( m_currentModuleIndex * 100 + percentage ); - KApplication::kApplication()->processEvents( 10 ); //10 ms only -} - -void CModuleIndexDialog::slotFinished( ) { - qDebug("indexing finished()"); - - progress->progressBar()->setProgress( progress->progressBar()->totalSteps() ); - KApplication::kApplication()->processEvents( 1 ); //1 ms only -} diff --git a/bibletime/frontend/cmoduleindexdialog.h b/bibletime/frontend/cmoduleindexdialog.h deleted file mode 100644 index 6ff4798..0000000 --- a/bibletime/frontend/cmoduleindexdialog.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// C++ Interface: cmoduleindexdialog -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef CMODULEINDEXDIALOG_H -#define CMODULEINDEXDIALOG_H - -#include "backend/cswordmoduleinfo.h" - -//Qt includes -#include <qobject.h> - -//forward declaration -class KProgressDialog; - -/** - * This dialog is used to index a list of modules and to show progress for that.\ - * While the indexing is in progress it creates a blocking, top level dialog which shows the progress - * while the indexing is done. - * - * @author The BibleTime team <info@bibletime.info> -*/ -class CModuleIndexDialog : public QObject { - Q_OBJECT -public: - /** Get the singleton instance. - * - */ - static CModuleIndexDialog* getInstance(); - - /** Starts the actual indexing. It shows the dialog with progress information. - */ - void indexAllModules( const ListCSwordModuleInfo& modules ); - - /** Indexes all modules in the list which don't have an index yet. - */ - void indexUnindexedModules( const ListCSwordModuleInfo& modules ); - -private: - KProgressDialog* progress; - int m_currentModuleIndex; - -protected slots: - void slotModuleProgress( int percentage ); - void slotFinished(); -}; - -#endif diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp deleted file mode 100644 index af01965..0000000 --- a/bibletime/frontend/coptionsdialog.cpp +++ /dev/null @@ -1,1044 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "coptionsdialog.h" -#include "cprofile.h" - -#include "backend/cswordbackend.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/cdisplaytemplatemgr.h" -#include "backend/cdisplayrendering.h" - -#include "frontend/displaywindow/cbiblereadwindow.h" -#include "frontend/displaywindow/ccommentaryreadwindow.h" -#include "frontend/displaywindow/clexiconreadwindow.h" -#include "frontend/displaywindow/cbookreadwindow.h" -#include "frontend/displaywindow/creadwindow.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -#include <stdio.h> -#include <stdlib.h> - -//QT includes -#include <qhbox.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qdict.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qhbuttongroup.h> -#include <qradiobutton.h> -#include <qcolor.h> -#include <qtooltip.h> -#include <qwidgetstack.h> - -#include <qstringlist.h> -#include <qinputdialog.h> -#include <qdir.h> - -//KDE includes -#include <kapp.h> -#include <klocale.h> -#include <kglobal.h> -#include <kstandarddirs.h> -#include <kkeydialog.h> -#include <khtml_part.h> -#include <khtmlview.h> -#include <kiconloader.h> -#include <ktabctl.h> -#include <kapp.h> -#include <klistbox.h> -#include <kkeydialog.h> -#include <kaction.h> -#include <kconfigbase.h> -#include <kconfig.h> - -//Sword includes -#include <localemgr.h> -#include <swlocale.h> - -using std::string; -using std::list; - -COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KActionCollection* actionCollection ) -: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, QString::null, QString::null, QString::null) { - - m_settings.keys.application.actionCollection = actionCollection; - setIconListAllVisible(true); - - initDisplay(); - initLanguages(); - initSword(); - initAccelerators(); -} - -COptionsDialog::~COptionsDialog() { - //the actionCollections objects are deleted by their QWidget parent -} - -/** */ -void COptionsDialog::newDisplayWindowFontSelected(const QFont &newFont) { - CBTConfig::FontSettingsPair oldSettings = m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ]; - m_settings.fonts.fontMap.replace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) ); -} - -/** Called when the combobox contents is changed */ -void COptionsDialog::newDisplayWindowFontAreaSelected(const QString& usage) { - useOwnFontClicked( m_settings.fonts.fontMap[usage].first ); - m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[usage].first ); - - m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[usage].second ); -} - -/** Called if the OK button was clicked */ -void COptionsDialog::slotOk() { - saveAccelerators(); - saveLanguages(); - saveSword(); - saveDisplay(); - - KDialogBase::slotOk(); - emit signalSettingsChanged( ); -} - -/*called if the apply button was clicked*/ -void COptionsDialog::slotApply() { - saveAccelerators(); - saveLanguages(); - saveSword(); - saveDisplay(); - - KDialogBase::slotApply(); - emit signalSettingsChanged( ); -} - -/** Opens the page which contaisn the given part ID. */ -const bool COptionsDialog::showPart( COptionsDialog::Parts /*ID*/ ) { - bool ret = false; - /* switch (ID) { - default: - break; - }*/ - return ret; -} - -/** Initializes the startup section of the OD. */ -void COptionsDialog::initDisplay() { - QFrame* page = addPage(i18n("Display"), QString::null, DesktopIcon(CResMgr::settings::startup::icon,32)); - QVBoxLayout* layout = new QVBoxLayout(page); - layout->setSpacing( 5 ); - - {//daily tips - m_settings.startup.showTips = new QCheckBox(page); - m_settings.startup.showTips->setText(i18n("Show tip of the day")); - QToolTip::add - (m_settings.startup.showTips, CResMgr::settings::startup::dailyTip::tooltip ); - - - m_settings.startup.showTips->setChecked( CBTConfig::get - (CBTConfig::tips) ); - } - layout->addWidget(m_settings.startup.showTips); - layout->addSpacing(5); - - { //startup logo - m_settings.startup.showLogo = new QCheckBox(page); - m_settings.startup.showLogo->setText(i18n("Show startuplogo")); - QToolTip::add - (m_settings.startup.showLogo, CResMgr::settings::startup::showLogo::tooltip); - - - m_settings.startup.showLogo->setChecked(CBTConfig::get - (CBTConfig::logo)); - layout->addWidget(m_settings.startup.showLogo); - layout->addSpacing(20); - } - - layout->addWidget( - CToolClass::explanationLabel(page, i18n("Display templates"), - i18n("Display templates define how text is displayed. Please choose a template you like.") - ) - ); - - layout->addSpacing( 5 ); - - QHBoxLayout* hboxlayout = new QHBoxLayout(); - - m_settings.displayStyle.styleChooser = new QComboBox( page ); //create first to enable buddy for label - connect( m_settings.displayStyle.styleChooser, SIGNAL( activated( int ) ), - this, SLOT( updateStylePreview() ) ); - - hboxlayout->addWidget( - new QLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page) - ); - hboxlayout->addWidget( m_settings.displayStyle.styleChooser ); - hboxlayout->addStretch(); - layout->addLayout( hboxlayout ); - - m_settings.displayStyle.stylePreview = new KHTMLPart(page); - layout->addWidget( - new QLabel( - m_settings.displayStyle.stylePreview->view(), - i18n("Style preview"), page - ) - ); - layout->addWidget(m_settings.displayStyle.stylePreview->view()); - - m_settings.displayStyle.styleChooser->insertStringList( - CPointers::displayTemplateManager()->availableTemplates() - ); - - for (int i = 0; i < m_settings.displayStyle.styleChooser->count(); ++i) { - if ( m_settings.displayStyle.styleChooser->text(i) == CBTConfig::get(CBTConfig::displayStyle) ) { - m_settings.displayStyle.styleChooser->setCurrentItem( i ); - break; - } - } - - updateStylePreview(); //render it -} - -/** Init fonts section. */ -void COptionsDialog::initLanguages() { - QFrame* page = addPage(i18n("Languages"), QString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32)); - QVBoxLayout* layout = new QVBoxLayout(page,5); - layout->setResizeMode( QLayout::Minimum ); - - { //Sword locales - layout->addWidget( - CToolClass::explanationLabel(page, i18n("Specify a language for names of Bible books"), - i18n("Sword has a number of locales available which can be used to internationalize the \ - names of books of the Bible. You can specify which locale to use. If you want to \ - create a new locale, see http://www.crosswire.org/sword/develop for details.")) - ); - - m_settings.fonts.swordLocaleCombo = new QComboBox(page); - QLabel* label = new QLabel(m_settings.fonts.swordLocaleCombo, i18n("Language for names of Bible books"), page); - QToolTip::add - (m_settings.fonts.swordLocaleCombo, CResMgr::settings::sword::general::language::tooltip); - - - QHBoxLayout* hBoxLayout = new QHBoxLayout(); - hBoxLayout->addWidget(label); - hBoxLayout->addWidget(m_settings.fonts.swordLocaleCombo); - hBoxLayout->addStretch(); - layout->addLayout(hBoxLayout); - - QStringList languageNames; - languageNames.append( languageMgr()->languageForAbbrev("en_US")->translatedName() ); - // languageNames.append( i18n("English") ); - - list<sword::SWBuf> locales = sword::LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); - // locales.push_back(SWBuf("en_US")); - - for (list<sword::SWBuf>::const_iterator it = locales.begin(); it != locales.end(); it++) { - // qWarning("working on %s", (*it).c_str()); - const CLanguageMgr::Language* const l = CPointers::languageMgr()->languageForAbbrev( - sword::LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str())->getName() - ); - - if (l->isValid()) { - languageNames.append( l->translatedName() ); - } - else { - languageNames.append( - sword::LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str())->getDescription() - ); - } - } - - languageNames.sort(); - m_settings.fonts.swordLocaleCombo->insertStringList( languageNames ); - - const CLanguageMgr::Language* const l = CPointers::languageMgr()->languageForAbbrev( - CBTConfig::get - (CBTConfig::language) - ); - - QString currentLanguageName; - if ( l->isValid() && languageNames.contains(l->translatedName()) ) { //tranlated language name is in the box - currentLanguageName = l->translatedName(); - } - else { //a language like "German Abbrevs" might be the language to set - sword::SWLocale* locale = sword::LocaleMgr::LocaleMgr::getSystemLocaleMgr()->getLocale( - CBTConfig::get - (CBTConfig::language).local8Bit() - ); - if (locale) { - currentLanguageName = QString::fromLatin1(locale->getDescription()); - } - } - - if (currentLanguageName.isEmpty()) { // set english as default if nothing was chosen - // currentLanguageName = i18n("English"); - Q_ASSERT(languageMgr()->languageForAbbrev("en_US")); - currentLanguageName = languageMgr()->languageForAbbrev("en_US")->translatedName(); - } - - //now set the item with the right name as current item - for (int i = 0; i < m_settings.fonts.swordLocaleCombo->count(); ++i) { - if (currentLanguageName == m_settings.fonts.swordLocaleCombo->text(i)) { - m_settings.fonts.swordLocaleCombo->setCurrentItem(i); - break; //item found, finish the loop - } - } - - layout->addSpacing( 20 ); - } - { //Font settings - layout->addWidget( - CToolClass::explanationLabel( - page, - i18n("Select custom fonts per-language"), - i18n("Here you find a list of all languages of the installed works. \ - You can specify a custom font for each language that needs a special font \ - to be displayed correctly.") - ) - ); - layout->addSpacing(5); - QHBoxLayout* hLayout = new QHBoxLayout(); - - m_settings.fonts.usage = new QComboBox(page); - QToolTip::add - (m_settings.fonts.usage, CResMgr::settings::fonts::typeChooser::tooltip); - - - hLayout->addWidget(m_settings.fonts.usage); - - CLanguageMgr::LangMap langMap = languageMgr()->availableLanguages(); - - for ( CLanguageMgr::LangMapIterator it( langMap ); it.current(); ++it ) { - const QString name = it.current()->translatedName().isEmpty() ? - it.current()->abbrev() : it.current()->translatedName(); - m_settings.fonts.fontMap.insert(name, CBTConfig::get - (it.current()) ); - } - - for( QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { - if ( m_settings.fonts.fontMap[it.key()].first ) { //show font icon - m_settings.fonts.usage->insertItem(SmallIcon("fonts"), it.key() ); - } - else { //don't show icon for font - m_settings.fonts.usage->insertItem(it.key()); - } - } - - m_settings.fonts.useOwnFontBox = new QCheckBox(i18n("Use custom font"), page, "font checkbox"); - connect(m_settings.fonts.useOwnFontBox, SIGNAL(toggled(bool)), SLOT(useOwnFontClicked(bool))); - hLayout->addWidget(m_settings.fonts.useOwnFontBox); - - layout->addLayout(hLayout); - //#warning TODO: remember the last selected font and jump there. - - m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, QStringList(), true, 5); - m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog.")); - layout->addWidget(m_settings.fonts.fontChooser); - - connect(m_settings.fonts.fontChooser, SIGNAL(fontSelected(const QFont&)), SLOT(newDisplayWindowFontSelected(const QFont&))); - connect(m_settings.fonts.usage, SIGNAL(activated(const QString&)), SLOT(newDisplayWindowFontAreaSelected(const QString&))); - - m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second ); - useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first ); - m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first ); - m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->sizeHint()); - } -} - - -/** Init accel key section. */ -void COptionsDialog::initAccelerators() { - QVBox* page = addVBoxPage(i18n("HotKeys"), QString::null, DesktopIcon(CResMgr::settings::keys::icon,32)); - - CBTConfig::setupAccelSettings( - CBTConfig::application, - m_settings.keys.application.actionCollection - ); - - QHBox* hbox = new QHBox(page); - QLabel* label = new QLabel(i18n("Choose type:"), hbox); - m_settings.keys.typeChooser = new QComboBox(hbox); - connect( - m_settings.keys.typeChooser, SIGNAL(activated(const QString&)), - SLOT(slotKeyChooserTypeChanged(const QString&)) - ); - QLabel* dummy = new QLabel( hbox ); // empty label for stretch - - hbox->setStretchFactor(label, 0); - hbox->setStretchFactor(m_settings.keys.typeChooser, 0); - hbox->setStretchFactor(dummy, 1); - - page->setStretchFactor(hbox, 0); - - m_settings.keys.keyChooserStack = new QWidgetStack(page); - Q_ASSERT(m_settings.keys.keyChooserStack); - - page->setStretchFactor(m_settings.keys.keyChooserStack, 5); - - m_settings.keys.application.title = i18n("BibleTime"); //don't set the app action collection to NULL - m_settings.keys.general = Settings::KeySettings::WindowType(i18n("All text windows")); - m_settings.keys.bible = Settings::KeySettings::WindowType(i18n("Bible windows")); - m_settings.keys.commentary = Settings::KeySettings::WindowType(i18n("Commentary windows")); - m_settings.keys.lexicon = Settings::KeySettings::WindowType(i18n("Lexicon windows")); - m_settings.keys.book = Settings::KeySettings::WindowType(i18n("Book windows")); - - m_settings.keys.typeChooser->insertItem(m_settings.keys.application.title); - m_settings.keys.typeChooser->insertItem(m_settings.keys.general.title); - m_settings.keys.typeChooser->insertItem(m_settings.keys.bible.title); - m_settings.keys.typeChooser->insertItem(m_settings.keys.commentary.title); - m_settings.keys.typeChooser->insertItem(m_settings.keys.lexicon.title); - m_settings.keys.typeChooser->insertItem(m_settings.keys.book.title); - - - Q_ASSERT(m_settings.keys.application.actionCollection); - m_settings.keys.application.keyChooser = new KKeyChooser( - m_settings.keys.application.actionCollection, - m_settings.keys.keyChooserStack - ); - - // ----- All display windows ------ // - m_settings.keys.general.actionCollection = new KActionCollection(this, "displayActions", 0); - CDisplayWindow::insertKeyboardActions( m_settings.keys.general.actionCollection); - CBTConfig::setupAccelSettings( - CBTConfig::allWindows, - m_settings.keys.general.actionCollection - ); - m_settings.keys.general.keyChooser = new KKeyChooser( - m_settings.keys.general.actionCollection, - m_settings.keys.keyChooserStack - ); - - // ----- Bible windows ------ // - m_settings.keys.bible.actionCollection = new KActionCollection(this, "bibleActions", 0); - CBibleReadWindow::insertKeyboardActions( m_settings.keys.bible.actionCollection); - CBTConfig::setupAccelSettings( - CBTConfig::bibleWindow, - m_settings.keys.bible.actionCollection - ); - - // ----- Commentary windows ------ // - m_settings.keys.commentary.actionCollection= new KActionCollection(this, "commentaryActions", 0); - CCommentaryReadWindow::insertKeyboardActions( m_settings.keys.commentary.actionCollection); - CBTConfig::setupAccelSettings( - CBTConfig::commentaryWindow, - m_settings.keys.commentary.actionCollection - ); - - // ----- Lexicon windows ------ // - m_settings.keys.lexicon.actionCollection = new KActionCollection(this, "lexiconActions", 0); - CLexiconReadWindow::insertKeyboardActions( m_settings.keys.lexicon.actionCollection ); - CBTConfig::setupAccelSettings( - CBTConfig::lexiconWindow, - m_settings.keys.lexicon.actionCollection - ); - - // ----- Book windows ------ // - m_settings.keys.book.actionCollection= new KActionCollection(this, "bookActions", 0); - CBookReadWindow::insertKeyboardActions( m_settings.keys.book.actionCollection); - CBTConfig::setupAccelSettings( - CBTConfig::bookWindow, - m_settings.keys.book.actionCollection - ); - - slotKeyChooserTypeChanged(m_settings.keys.application.title); -} - -/** Init Sword section. */ -void COptionsDialog::initSword() { - QVBox* page = addVBoxPage(i18n("Desk"),QString::null, DesktopIcon(CResMgr::settings::sword::icon,32)); - KTabCtl* tabCtl = new KTabCtl(page); - - { //Standard works - QFrame* currentTab = new QFrame(tabCtl); - tabCtl->addTab(currentTab, i18n("Standard works")); - QGridLayout* gridLayout = new QGridLayout(currentTab,10,2, 5,5); //the last row is for stretching available space - gridLayout->setResizeMode(QLayout::Minimum); - - gridLayout->addMultiCellWidget( - CToolClass::explanationLabel(currentTab, i18n("Standard works"), - i18n("Standard works are used when no particular work is specified, \ - for example when a hyperlink into a Bible or lexicon was clicked .")), - 0,0,0,-1 /*fill the horizontal space*/ - ); - - m_settings.swords.standardBible = new QComboBox(currentTab); - QLabel* label = new QLabel(m_settings.swords.standardBible, i18n("Standard Bible"), currentTab); - label->setAutoResize(true); - QToolTip::add - (m_settings.swords.standardBible, CResMgr::settings::sword::modules::bible::tooltip); - - gridLayout->addWidget(label,1,0); - gridLayout->addWidget(m_settings.swords.standardBible,1,1); - - m_settings.swords.standardCommentary = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardCommentary, i18n("Standard Commentary"), currentTab); - label->setAutoResize(true); - QToolTip::add - (m_settings.swords.standardCommentary, CResMgr::settings::sword::modules::commentary::tooltip); - - gridLayout->addWidget(label,2,0); - gridLayout->addWidget(m_settings.swords.standardCommentary,2,1); - - - m_settings.swords.standardLexicon = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardLexicon, i18n("Standard Lexicon"), currentTab); - label->setAutoResize(true); - QToolTip::add - (m_settings.swords.standardLexicon, CResMgr::settings::sword::modules::lexicon::tooltip); - - gridLayout->addWidget(label,3,0); - gridLayout->addWidget(m_settings.swords.standardLexicon,3,1); - - m_settings.swords.standardDailyDevotional = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardDailyDevotional, i18n("Standard Daily Devotional"), currentTab); - label->setAutoResize(true); - QToolTip::add - (m_settings.swords.standardDailyDevotional, CResMgr::settings::sword::modules::dailyDevotional::tooltip); - - gridLayout->addWidget(label,4,0); - gridLayout->addWidget(m_settings.swords.standardDailyDevotional,4,1); - - m_settings.swords.standardHebrewStrong = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardHebrewStrong, i18n("Standard Hebrew Strong's Lexicon"), currentTab); - label->setAutoResize(true); - QToolTip::add - (m_settings.swords.standardHebrewStrong, CResMgr::settings::sword::modules::hebrewStrongs::tooltip); - - gridLayout->addWidget(label,5,0); - gridLayout->addWidget(m_settings.swords.standardHebrewStrong,5,1); - - m_settings.swords.standardGreekStrong = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardGreekStrong, i18n("Standard Greek Strong's Lexicon"), currentTab); - label->setAutoResize(true); - QToolTip::add - (m_settings.swords.standardGreekStrong, CResMgr::settings::sword::modules::greekStrongs::tooltip); - - gridLayout->addWidget(label,6,0); - gridLayout->addWidget(m_settings.swords.standardGreekStrong,6,1); - - m_settings.swords.standardHebrewMorph = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardHebrewMorph, i18n("Standard Hebrew Morphological Lexicon"), currentTab); - QToolTip::add - (m_settings.swords.standardHebrewMorph, CResMgr::settings::sword::modules::hebrewMorph::tooltip); - - gridLayout->addWidget(label,7,0); - gridLayout->addWidget(m_settings.swords.standardHebrewMorph,7,1); - - m_settings.swords.standardGreekMorph = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardGreekMorph, i18n("Standard Greek Morphological Lexicon"), currentTab); - label->setAutoResize(true); - QToolTip::add - (m_settings.swords.standardGreekMorph, CResMgr::settings::sword::modules::greekMorph::tooltip); - - gridLayout->addWidget(label,8,0); - gridLayout->addWidget(m_settings.swords.standardGreekMorph,8,1); - - gridLayout->setRowStretch(9,5); - - //fill the comboboxes with the right modules - ListCSwordModuleInfo& modules = backend()->moduleList(); - QString modDescript; - ListCSwordModuleInfo::iterator end_it = modules.end(); - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - modDescript = (*it)->config(CSwordModuleInfo::Description); - - switch ((*it)->type()) { - case CSwordModuleInfo::Bible: - m_settings.swords.standardBible->insertItem(modDescript); - break; - case CSwordModuleInfo::Commentary: - m_settings.swords.standardCommentary->insertItem(modDescript); - break; - case CSwordModuleInfo::Lexicon: { - bool inserted = false; - if ((*it)->has(CSwordModuleInfo::HebrewDef)) { - m_settings.swords.standardHebrewStrong->insertItem(modDescript); - inserted = true; - } - if ((*it)->has(CSwordModuleInfo::GreekDef)) { - m_settings.swords.standardGreekStrong->insertItem(modDescript); - inserted = true; - } - if ((*it)->has(CSwordModuleInfo::HebrewParse)) { - m_settings.swords.standardHebrewMorph->insertItem(modDescript); - inserted = true; - } - if ((*it)->has(CSwordModuleInfo::GreekParse)) { - m_settings.swords.standardGreekMorph->insertItem(modDescript); - inserted = true; - } - if ((*it)->category() == CSwordModuleInfo::DailyDevotional) { - m_settings.swords.standardDailyDevotional->insertItem(modDescript); - inserted = true; - } - - if (!inserted) {//daily dvotionals, striong lexicons etc. are not very useful for word lookups - m_settings.swords.standardLexicon->insertItem(modDescript); - } - - break; - } - default://unknown type - break; - } - } - - //using two lists and one loop is better than six loops with almost the same code :) - QPtrList<QComboBox> comboList; - comboList.setAutoDelete(false);//don't delete the combos accidentally - QStringList moduleList; - - for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) { - //fill the combobox list in the right order (i.e. same order as the CBTConfig::module enum list) - CBTConfig::modules moduleType = (CBTConfig::modules)(i); - switch (moduleType) { - case CBTConfig::standardBible: - comboList.append(m_settings.swords.standardBible); - break; - case CBTConfig::standardCommentary: - comboList.append(m_settings.swords.standardCommentary); - break; - case CBTConfig::standardLexicon: - comboList.append(m_settings.swords.standardLexicon); - break; - case CBTConfig::standardDailyDevotional: - comboList.append(m_settings.swords.standardDailyDevotional); - break; - case CBTConfig::standardHebrewStrongsLexicon: - comboList.append(m_settings.swords.standardHebrewStrong); - break; - case CBTConfig::standardGreekStrongsLexicon: - comboList.append(m_settings.swords.standardGreekStrong); - break; - case CBTConfig::standardHebrewMorphLexicon: - comboList.append(m_settings.swords.standardHebrewMorph); - break; - case CBTConfig::standardGreekMorphLexicon: - comboList.append(m_settings.swords.standardGreekMorph); - break; - }; - - //fill the module list - CSwordModuleInfo* const m = CBTConfig::get - ( (CBTConfig::modules)(i) ); - if (m) { - moduleList << m->config(CSwordModuleInfo::Description); - } - else { - moduleList << QString::null; - } - } - - QString module = QString::null; - int item = 0; - int count = 0; - for (QComboBox* combo = comboList.first(); combo; combo = comboList.next() ) { - module = moduleList[comboList.at()]; - count = combo->count(); - combo->setMaximumWidth(300); - - for (item = 0; item < count; item++) { - if (combo->text(item) == module ) { - combo->setCurrentItem(item); - break; - } - } - } - } - { // ---------- new tab: filters -------- // - QFrame* currentTab = new QFrame(tabCtl); - tabCtl->addTab(currentTab, i18n("Text filters")); - QVBoxLayout* layout = new QVBoxLayout(currentTab,5); - - layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"), - i18n("Filters control the appearance of text. \ -Here you can specify default settings for all filters. \ -You can change the filter settings in each display window, of course.")) ); - - layout->addSpacing(5); - - m_settings.swords.lineBreaks = new QCheckBox(currentTab); - m_settings.swords.lineBreaks->setText(i18n("Insert line break after each verse")); - m_settings.swords.lineBreaks->setChecked(CBTConfig::get - (CBTConfig::lineBreaks)); - layout->addWidget(m_settings.swords.lineBreaks); - - m_settings.swords.verseNumbers = new QCheckBox(currentTab); - m_settings.swords.verseNumbers->setText(i18n("Show verse numbers")); - m_settings.swords.verseNumbers->setChecked(CBTConfig::get - (CBTConfig::verseNumbers)); - layout->addWidget(m_settings.swords.verseNumbers); - - m_settings.swords.headings = new QCheckBox(currentTab); - m_settings.swords.headings->setText(i18n("Show section headings")); - m_settings.swords.headings->setChecked(CBTConfig::get - (CBTConfig::headings)); - layout->addWidget(m_settings.swords.headings); - - - m_settings.swords.scriptureReferences = new QCheckBox(currentTab); - m_settings.swords.scriptureReferences->setText(i18n("Show scripture cross-references")); - m_settings.swords.scriptureReferences->setChecked(CBTConfig::get - (CBTConfig::scriptureReferences)); - layout->addWidget(m_settings.swords.scriptureReferences); - - m_settings.swords.greekAccents = new QCheckBox(currentTab); - m_settings.swords.greekAccents->setText(i18n("Show Greek accents")); - m_settings.swords.greekAccents->setChecked(CBTConfig::get - (CBTConfig::greekAccents)); - layout->addWidget(m_settings.swords.greekAccents); - - m_settings.swords.hebrewPoints = new QCheckBox(currentTab); - m_settings.swords.hebrewPoints->setText(i18n("Show Hebrew vowel points")); - m_settings.swords.hebrewPoints->setChecked(CBTConfig::get - (CBTConfig::hebrewPoints)); - layout->addWidget(m_settings.swords.hebrewPoints); - - m_settings.swords.hebrewCantillation = new QCheckBox(currentTab); - m_settings.swords.hebrewCantillation->setText(i18n("Show Hebrew cantillation marks")); - m_settings.swords.hebrewCantillation->setChecked(CBTConfig::get - (CBTConfig::hebrewCantillation)); - layout->addWidget(m_settings.swords.hebrewCantillation); - - m_settings.swords.morphSegmentation = new QCheckBox(currentTab); - m_settings.swords.morphSegmentation->setText(i18n("Show morph segmentation")); - m_settings.swords.morphSegmentation->setChecked(CBTConfig::get - (CBTConfig::morphSegmentation)); - layout->addWidget(m_settings.swords.morphSegmentation); - - m_settings.swords.textualVariants = new QCheckBox(currentTab); - m_settings.swords.textualVariants->setText(i18n("Use textual variants")); - m_settings.swords.textualVariants->setChecked(CBTConfig::get - (CBTConfig::textualVariants)); - layout->addWidget(m_settings.swords.textualVariants); - - layout->addStretch(4); - } -} - -void COptionsDialog::saveAccelerators() { - if (m_settings.keys.general.keyChooser) { - m_settings.keys.general.keyChooser->commitChanges(); - } - - if (m_settings.keys.bible.keyChooser) { - m_settings.keys.bible.keyChooser->commitChanges(); - } - - if (m_settings.keys.commentary.keyChooser) { - m_settings.keys.commentary.keyChooser->commitChanges(); - } - - if (m_settings.keys.lexicon.keyChooser) { - m_settings.keys.lexicon.keyChooser->commitChanges(); - } - - if (m_settings.keys.book.keyChooser) { - m_settings.keys.book.keyChooser->commitChanges(); - } - - CBTConfig::saveAccelSettings( //application - CBTConfig::application, - m_settings.keys.application.actionCollection - ); - CBTConfig::saveAccelSettings( //read display windows - CBTConfig::allWindows, - m_settings.keys.general.actionCollection - ); - CBTConfig::saveAccelSettings( //bible - CBTConfig::bibleWindow, - m_settings.keys.bible.actionCollection - ); - CBTConfig::saveAccelSettings( //commentary - CBTConfig::commentaryWindow, - m_settings.keys.commentary.actionCollection - ); - CBTConfig::saveAccelSettings( //lexicon - CBTConfig::lexiconWindow, - m_settings.keys.lexicon.actionCollection - ); - CBTConfig::saveAccelSettings( //book - CBTConfig::bookWindow, - m_settings.keys.book.actionCollection - ); -} - -/** No descriptions */ -void COptionsDialog::saveLanguages() { - for(QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { - const CLanguageMgr::Language* const lang = languageMgr()->languageForTranslatedName(it.key()); - if (!lang->isValid()) { //we probably use a language, for which we have only the abbrev - CLanguageMgr::Language l(it.key(), it.key(), it.key()); //create a temp language - CBTConfig::set(&l, it.data()); - } - else { - CBTConfig::set(lang, it.data()); - } - } -} - -/** No descriptions */ -void COptionsDialog::saveDisplay() { - CBTConfig::set - ( CBTConfig::logo, m_settings.startup.showLogo->isChecked() ); - CBTConfig::set - ( CBTConfig::tips, m_settings.startup.showTips->isChecked() ); - CBTConfig::set - ( CBTConfig::displayStyle, m_settings.displayStyle.styleChooser->currentText() ); -} - -/** No descriptions */ -void COptionsDialog::saveSword() { - for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) { - QString moduleDescription = QString::null; - - CBTConfig::modules moduleType = (CBTConfig::modules)(i); - switch (moduleType) { - case CBTConfig::standardBible: - moduleDescription = m_settings.swords.standardBible->currentText(); - break; - case CBTConfig::standardCommentary: - moduleDescription = m_settings.swords.standardCommentary->currentText(); - break; - case CBTConfig::standardLexicon: - moduleDescription = m_settings.swords.standardLexicon->currentText(); - break; - case CBTConfig::standardDailyDevotional: - moduleDescription = m_settings.swords.standardDailyDevotional->currentText(); - break; - case CBTConfig::standardHebrewStrongsLexicon: - moduleDescription = m_settings.swords.standardHebrewStrong->currentText(); - break; - case CBTConfig::standardGreekStrongsLexicon: - moduleDescription = m_settings.swords.standardGreekStrong->currentText(); - break; - case CBTConfig::standardHebrewMorphLexicon: - moduleDescription = m_settings.swords.standardHebrewMorph->currentText(); - break; - case CBTConfig::standardGreekMorphLexicon: - moduleDescription = m_settings.swords.standardGreekMorph->currentText(); - break; - default: - qWarning("Unhandled module type."); - }; - - CSwordModuleInfo* const module = backend()->findModuleByDescription(moduleDescription); - CBTConfig::set - (moduleType, module); - } - - - QString languageAbbrev; - - const QString currentLanguageName = m_settings.fonts.swordLocaleCombo->currentText(); - const CLanguageMgr::Language* const l = CPointers::languageMgr()->languageForTranslatedName( currentLanguageName ); - - if (l && l->isValid()) { - languageAbbrev = l->abbrev(); - } - else { //it can be the lang abbrev like de_abbrev or the Sword description - list <sword::SWBuf> locales = sword::LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); - - for (list <sword::SWBuf>::iterator it = locales.begin(); it != locales.end(); it++) { - SWLocale* locale = LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str()); - Q_ASSERT(locale); - - if ( locale && (QString::fromLatin1(locale->getDescription()) == currentLanguageName) ) { - languageAbbrev = QString::fromLatin1(locale->getName()); //we found the abbrevation for the current language - break; - } - } - - if (languageAbbrev.isEmpty()) { - languageAbbrev = currentLanguageName; //probably a non-standard locale name like de_abbrev - } - } - - if (!languageAbbrev.isEmpty()) { - CBTConfig::set - (CBTConfig::language, languageAbbrev); - } - - CBTConfig::set - (CBTConfig::lineBreaks, m_settings.swords.lineBreaks->isChecked()); - CBTConfig::set - (CBTConfig::verseNumbers, m_settings.swords.verseNumbers->isChecked()); - CBTConfig::set - (CBTConfig::headings, m_settings.swords.headings->isChecked()); - CBTConfig::set - (CBTConfig::scriptureReferences, m_settings.swords.scriptureReferences->isChecked()); - CBTConfig::set - (CBTConfig::hebrewPoints, m_settings.swords.hebrewPoints->isChecked()); - CBTConfig::set - (CBTConfig::hebrewCantillation, m_settings.swords.hebrewCantillation->isChecked()); - CBTConfig::set - (CBTConfig::morphSegmentation, m_settings.swords.morphSegmentation->isChecked()); - CBTConfig::set - (CBTConfig::greekAccents, m_settings.swords.greekAccents->isChecked()); - CBTConfig::set - (CBTConfig::textualVariants, m_settings.swords.textualVariants->isChecked()); -} - -/** This slot is called when the "Use own font for language" bo was clicked. */ -void COptionsDialog::useOwnFontClicked( bool isOn ) { - m_settings.fonts.fontChooser->setEnabled(isOn); - m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ].first = isOn; - - if (isOn) { //show font icon - m_settings.fonts.usage->changeItem( - SmallIcon("fonts"), - m_settings.fonts.usage->currentText(), - m_settings.fonts.usage->currentItem() - ); - } - else { //don't show - m_settings.fonts.usage->changeItem( - m_settings.fonts.usage->currentText(), - m_settings.fonts.usage->currentItem() - ); - } -} - -void COptionsDialog::updateStylePreview() { - //update the style preview widget - using namespace Rendering; - - const QString styleName = m_settings.displayStyle.styleChooser->currentText(); - - CTextRendering::KeyTree tree; - - CTextRendering::KeyTreeItem::Settings settings; - settings.highlight = false; - - tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John316\" href=\"sword://Bible/WEB/John 3:16\">16</a></span>%1") - .arg(i18n("For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.")), - settings)); - - tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John317\" href=\"sword://Bible/WEB/John 3:17\">17</a></span>%1") - .arg(i18n("For God didn't send his Son into the world to judge the world, but that the world should be saved through him.")), - settings)); - - settings.highlight = true; - - tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John318\" href=\"sword://Bible/WEB/John 3:18\">18</a></span>%1") - .arg(i18n("He who believes in him is not judged. He who doesn't believe has been judged already, because he has not believed in the name of the one and only Son of God.")), - settings) ); - - settings.highlight = false; - - tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John319\" href=\"sword://Bible/WEB/John 3:19\">19</a></span>%1") - .arg(i18n("This is the judgment, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.")), - settings)); - - tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John320\" href=\"sword://Bible/WEB/John 3:20\">20</a></span>%1<br/>") - .arg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")), - settings)); - - tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John321\" href=\"sword://Bible/WEB/John 3:21\">21</a></span>%1") - .arg(i18n("But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.")), - settings)); - - const QString oldStyleName = CBTConfig::get - (CBTConfig::displayStyle); - CBTConfig::set - (CBTConfig::displayStyle, styleName); - - CDisplayRendering render; - m_settings.displayStyle.stylePreview->begin(); - m_settings.displayStyle.stylePreview->write( render.renderKeyTree(tree)); - m_settings.displayStyle.stylePreview->end(); - - CBTConfig::set - (CBTConfig::displayStyle, oldStyleName); -} - -void COptionsDialog::slotKeyChooserTypeChanged(const QString& title) { - //delete all KKeyChoosers which may not share accels, because this class checks in all instances for key conflicts - typedef QPtrList<KKeyChooser> KeyChooserList; - KeyChooserList list; - list.append(m_settings.keys.bible.keyChooser); - list.append(m_settings.keys.commentary.keyChooser); - list.append(m_settings.keys.lexicon.keyChooser); - list.append(m_settings.keys.book.keyChooser); - - //commit all changes in the keychoosers -#if QT_VERSION >= 0x030200 - for (KeyChooserList::iterator it(list.begin()); it != list.end(); ++it) { - if (*it) { //the list may contain NULL pointers - (*it)->commitChanges(); - } - } -#else - //Normally we know a QPtrListIterator is done when it.current() == 0 - //but now a value can actually be zero, which would be - //indistinguishable from the end condition. - //Therefore, more complex logic is needed. - QPtrListIterator<KKeyChooser> it(list); - if (!it.isEmpty()){ - while (!it.atLast()){ - if (it.current()){ - it.current()->commitChanges(); - } - ++it; - } - //We still have the last item to process. - if (it.current()){ - it.current()->commitChanges(); - } - } -#endif - /* Delete all the keychoosers in the list, - * the keychoosers are set to NULL, because they are QGuardedPtr - */ - list.setAutoDelete(true); - list.clear(); - - Settings::KeySettings::WindowType* t = 0; - if (title == m_settings.keys.application.title) { //Application wide - t = &m_settings.keys.application; - } - else if (title == m_settings.keys.general.title) { // All display windows - t = &m_settings.keys.general; - } - else if (title == m_settings.keys.bible.title) { // Bible windows - t = &m_settings.keys.bible; - } - else if (title == m_settings.keys.commentary.title) { // Commentary windows - t = &m_settings.keys.commentary; - } - else if (title == m_settings.keys.lexicon.title) { // Lexicon windows - t = &m_settings.keys.lexicon; - } - else if (title == m_settings.keys.book.title) { // Book windows - t = &m_settings.keys.book; - } - - Q_ASSERT(t); - if (!t->keyChooser) { //was deleted, create a new one - t->keyChooser = new KKeyChooser( - m_settings.keys.keyChooserStack - ); - t->keyChooser->insert( - t->actionCollection, - t->title - ); - } - - m_settings.keys.keyChooserStack->raiseWidget(t->keyChooser); -} diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h deleted file mode 100644 index b6431ca..0000000 --- a/bibletime/frontend/coptionsdialog.h +++ /dev/null @@ -1,214 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef COPTIONSDIALOG_H -#define COPTIONSDIALOG_H - -#include "cprofilemgr.h" -#include "cbtconfig.h" -#include "util/cpointers.h" - -//QT includes -#include <qwidget.h> -#include <qframe.h> -#include <qguardedptr.h> -#include <qlabel.h> -#include <qstring.h> -#include <qmap.h> -#include <qdict.h> -#include <qmap.h> - -//KDE includes -#include <kdialogbase.h> -#include <kfontdialog.h> -#include <kaccel.h> -#include <kcolorbutton.h> -#include <kapp.h> -#include <klocale.h> - -class QHBox; -class QCheckBox; -class QComboBox; -class QRadioButton; -class QWidgetStack; - -class KListBox; -class KKeyChooser; -class KTabCtl; -class KHTMLPart; -class KActionCollection; - -/** - * The optionsdialog of BibleTime - * @author The BibleTime Team - */ -class COptionsDialog : public KDialogBase, public CPointers { - Q_OBJECT - -public: - COptionsDialog(QWidget *parent, const char *name, KActionCollection* actionCollection); - virtual ~COptionsDialog(); - - enum Parts { - Startup, - Font, - DisplayTemplates, - Desk, - Hotkeys - }; - - /** Opens the page which contaisn the given part ID. */ - const bool showPart( COptionsDialog::Parts ID ); - -private: - struct Settings { - struct StartupSettings { - QCheckBox* showTips; - QCheckBox* showLogo; - } - startup; - - struct SwordSettings { - QComboBox* standardBible; - QComboBox* standardCommentary; - QComboBox* standardLexicon; - QComboBox* standardDailyDevotional; - QComboBox* standardHebrewStrong; - QComboBox* standardGreekStrong; - QComboBox* standardHebrewMorph; - QComboBox* standardGreekMorph; - QCheckBox* lineBreaks; - QCheckBox* verseNumbers; - QCheckBox* headings; - QCheckBox* hebrewPoints; - QCheckBox* hebrewCantillation; - QCheckBox* morphSegmentation; - QCheckBox* greekAccents; - QCheckBox* textualVariants; - QCheckBox* scriptureReferences; - } - swords; // not: sword instead of sword -> namespace error - - struct KeySettings { - QComboBox* typeChooser; - QWidgetStack* keyChooserStack; - - struct WindowType { - QGuardedPtr<KKeyChooser> keyChooser; - KActionCollection* actionCollection; - QString title; - - WindowType() { - keyChooser = 0; - actionCollection = 0; - }; - WindowType(const QString& newTitle) { - title = newTitle; - - keyChooser = 0; - actionCollection = 0; - } - }; - - WindowType application; - WindowType general; - WindowType bible; - WindowType commentary; - WindowType lexicon; - WindowType book; - } - keys; - - struct DisplayStyleSettings { - QComboBox* styleChooser; - KHTMLPart* stylePreview; - } - displayStyle; - - struct FontSettings { - QComboBox* swordLocaleCombo; - KFontChooser* fontChooser; - QComboBox* usage; - QCheckBox* useOwnFontBox; - //the pair os to check whether the standard font (bool == false) or whether an own font should be used (true) - QMap<QString,CBTConfig::FontSettingsPair> fontMap; - } - fonts; - } - m_settings; - -protected slots: // Protected slots - /** - * Called when a new font in the fonts page was selected. - */ - void newDisplayWindowFontSelected(const QFont &); - /** - * Called when the combobox contents is changed - */ - void newDisplayWindowFontAreaSelected(const QString&); - /** - * Called if the OK button was clicked - */ - void slotOk(); - /** - * Called if the Apply button was clicked - * commented out for the time being. ck - */ - void slotApply(); - /** - * This slot is called when the "Use own font for language" bo was clicked. - */ - void useOwnFontClicked(bool); - /** - * Update the style preview widget - */ - void updateStylePreview(); - /** - * The type of the keyaccel area changed - */ - void slotKeyChooserTypeChanged(const QString&); - -protected: // Protected methods - /** - * Initializes the startup section of the OD. - */ - void initDisplay(); - /** - * Init Sword section. - */ - void initSword(); - /** - * Init accel key section. - */ - void initAccelerators(); - /** - * Init fonts section. - */ - void initLanguages(); - - /** Save the display settings. - */ - void saveDisplay(); - /** Save the key accel settings. - */ - void saveAccelerators(); - /** Save the font settings. - */ - void saveLanguages(); - /** Save the Sword specific settings. - */ - void saveSword(); - -signals: // Signals - void signalSettingsChanged(); -}; - -#endif diff --git a/bibletime/frontend/cprinter.cpp b/bibletime/frontend/cprinter.cpp deleted file mode 100644 index 1fad2bc..0000000 --- a/bibletime/frontend/cprinter.cpp +++ /dev/null @@ -1,130 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cprinter.h" - -//BibleTime includes -#include "backend/cdisplaytemplatemgr.h" -#include "backend/cswordversekey.h" - -//KDE includes -#include <khtml_part.h> -#include <khtmlview.h> - -/* Class: CPrinter */ - -namespace Printing { - - CPrinter::CPrinter(QObject *, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) -: QObject(0), - CDisplayRendering(displayOptions, filterOptions), - m_htmlPart(new KHTMLPart(0, 0, this)) { - - //override the filteroptions set in the c-tor of CDisplayRendering - m_filterOptions.footnotes = false; - m_filterOptions.scriptureReferences = false; - m_filterOptions.strongNumbers = false; - m_filterOptions.morphTags = false; - m_filterOptions.headings = false; - - m_htmlPart->setJScriptEnabled(false); - m_htmlPart->setJavaEnabled(false); - m_htmlPart->setMetaRefreshEnabled(false); - m_htmlPart->setPluginsEnabled(false); - m_htmlPart->view()->resize(500,500); - m_htmlPart->view()->hide(); - } - - CPrinter::~CPrinter() { - delete m_htmlPart; - m_htmlPart = 0; - } - - void CPrinter::printKeyTree( KeyTree& tree ) { - m_htmlPart->begin(); - m_htmlPart->write(renderKeyTree(tree)); - m_htmlPart->end(); - - m_htmlPart->view()->layout(); - m_htmlPart->view()->print(); - } - - const QString CPrinter::entryLink(const KeyTreeItem& item, CSwordModuleInfo* module) { - Q_ASSERT(module); - - if (module->type() == CSwordModuleInfo::Bible) { - CSwordVerseKey vk(module); - vk = item.key(); - - switch (item.settings().keyRenderingFace) { - case KeyTreeItem::Settings::CompleteShort: - return QString::fromUtf8(vk.getShortText()); - - case KeyTreeItem::Settings::CompleteLong: - return vk.key(); - - case KeyTreeItem::Settings::NoKey: - return QString::null; - - case KeyTreeItem::Settings::SimpleKey: //fall through - default: - return QString::number(vk.Verse()); - } - - } - - return item.key(); - } - - const QString CPrinter::renderEntry( const KeyTreeItem& i, CSwordKey* ) { - const CPrinter::KeyTreeItem* printItem = dynamic_cast<const CPrinter::KeyTreeItem*>(&i); - Q_ASSERT(printItem); - - if (printItem && printItem->hasAlternativeContent()) { - QString ret = QString::fromLatin1("<div class=\"entry\"><div class=\"rangeheading\">%1</div>").arg(printItem->getAlternativeContent()); - - if (i.hasChildItems()) { - KeyTree const * tree = i.childList(); - - for ( KeyTreeItem* c = tree->first(); c; c = tree->next() ) { - ret.append( CDisplayRendering::renderEntry( *c ) ); - } - } - - ret.append("</div>"); - return ret; - } - - return CDisplayRendering::renderEntry(i); - } - - const QString CPrinter::finishText(const QString& text, KeyTree& tree) { - ListCSwordModuleInfo modules = tree.collectModules(); - Q_ASSERT(modules.count() > 0); - - const CLanguageMgr::Language* const lang = modules.first()->language(); - Q_ASSERT(lang); - - CDisplayTemplateMgr::Settings settings; - //settings.modules = modules; - settings.pageCSS_ID = "printer"; - settings.langAbbrev = (lang && (modules.count() == 1) && lang->isValid()) - ? lang->abbrev() - : "unknown"; - settings.pageDirection = (modules.count() == 1) - ? ((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") - : QString::null; - - CDisplayTemplateMgr* tMgr = CPointers::displayTemplateManager(); - return tMgr->fillTemplate(CBTConfig::get(CBTConfig::displayStyle), text, settings); - } - -} //end of namespace diff --git a/bibletime/frontend/cprinter.h b/bibletime/frontend/cprinter.h deleted file mode 100644 index fd28280..0000000 --- a/bibletime/frontend/cprinter.h +++ /dev/null @@ -1,56 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CPRINTER_H -#define CPRINTER_H - -//BibleTime backend -#include "backend/cswordbackend.h" -#include "backend/cdisplayrendering.h" - -//BibleTime frontend -#include "frontend/cbtconfig.h" - -//Qt includes -#include <qobject.h> - -class KHTMLPart; - -namespace Printing { - - /** - * The CPrinter class manages the print item queue and the printing of them to the printer. - * - * @author The BibleTime team - */ -class CPrinter : public QObject, public Rendering::CDisplayRendering { - Q_OBJECT -public: - CPrinter( - QObject *parent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions - ); - - virtual ~CPrinter(); - - void printKeyTree( KeyTree& ); - -protected: - virtual const QString entryLink(const KeyTreeItem& item, CSwordModuleInfo* const module); - virtual const QString renderEntry( const KeyTreeItem&, CSwordKey* = 0 ); - virtual const QString finishText(const QString& arg1, KeyTree& tree); - -private: - KHTMLPart* m_htmlPart; - }; - -} - -#endif diff --git a/bibletime/frontend/cprofile.cpp b/bibletime/frontend/cprofile.cpp deleted file mode 100644 index 309329e..0000000 --- a/bibletime/frontend/cprofile.cpp +++ /dev/null @@ -1,397 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cprofile.h" - -//Qt includes -#include <qdom.h> -#include <qfile.h> -#include <qstring.h> -#include <qtextstream.h> -#include <qregexp.h> - -//KDE includes -#include <kstandarddirs.h> -#include <klocale.h> - -#define CURRENT_SYNTAX_VERSION 2 - -namespace Profile { - -CProfile::CProfile( const QString& file, const QString& name ): -m_name(name.isEmpty() ? i18n("unknown") : name), -m_filename(file), -m_fullscreen(false), -m_geometry(10,20,640,480) { - - m_profileWindows.setAutoDelete(true); - if (!m_filename.isEmpty() && name.isEmpty()) { - loadBasics(); - } - else if (m_filename.isEmpty() && !name.isEmpty()) { - m_filename = name; - m_filename.replace(QRegExp("\\s=#."),"_"); - KStandardDirs stdDirs; - m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml"; - init(m_filename); - } - else { - qWarning("CProfile: empty file name!"); - } -} - -CProfile::~CProfile() { - m_profileWindows.clear(); //delete all CProfileWindows objects (autodelete is enabled) -} - -/** Loads the profile from the file given in the constructor. */ -QPtrList<CProfileWindow> CProfile::load() { - QFile file(m_filename); - if (!file.exists()) - return QPtrList<CProfileWindow>(); - - QDomDocument doc; - if (file.open(IO_ReadOnly)) { - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); - doc.setContent(t.read()); - file.close(); - } - - QDomElement document = doc.documentElement(); - if( document.tagName() != "BibleTimeProfile" && document.tagName() != "BibleTime" ) { //BibleTime was used in syntax version 1.0 - qWarning("CProfile::load: Missing BibleTime doc"); - return m_profileWindows; - } - if (document.hasAttribute("name")) { - m_name = document.attribute("name"); - } - - - //load settings of the main window - { - // see if there's a section with the name MAINWINDOW - QDomElement elem = document.firstChild().toElement(); - QDomElement mainWindow; - while (!elem.isNull()) { - if (elem.tagName() == "MAINWINDOW") { - mainWindow = elem; - break; //found the element - } - elem = elem.nextSibling().toElement(); - } - if (!mainWindow.isNull()) { //was found - setFullscreen( (bool)mainWindow.attribute("fullscreen").toInt()); - QDomElement object = mainWindow.namedItem("GEOMETRY").toElement(); - QRect rect; - if(!object.isNull()) { - if (object.hasAttribute("x")) { - rect.setX(object.attribute("x").toInt()); - } - if (object.hasAttribute("y")) { - rect.setY(object.attribute("y").toInt()); - } - if (object.hasAttribute("width")) { - rect.setWidth(object.attribute("width").toInt()); - } - if (object.hasAttribute("height")) { - rect.setHeight(object.attribute("height").toInt()); - } - if (object.hasAttribute("isMaximized")) { - this->setMaximized( static_cast<bool>(object.attribute("isMaximized").toInt()) ); - } - - } - setGeometry(rect); - } - } - - m_profileWindows.clear(); - QDomElement elem = document.firstChild().toElement(); - while (!elem.isNull()) { - CProfileWindow* p = 0; - if (elem.tagName() == "BIBLE") { - p = new CProfileWindow(CSwordModuleInfo::Bible); - } - else if (elem.tagName() == "COMMENTARY") { - p = new CProfileWindow(CSwordModuleInfo::Commentary); - } - else if (elem.tagName() == "LEXICON") { - p = new CProfileWindow(CSwordModuleInfo::Lexicon); - } - else if (elem.tagName() == "BOOK") { - p = new CProfileWindow(CSwordModuleInfo::GenericBook); - } - - if (p) { - m_profileWindows.append(p); - - if (elem.hasAttribute("windowSettings")) { - p->setWindowSettings( elem.attribute("windowSettings").toInt() ); - } - if (elem.hasAttribute("writeWindowType")) { - p->setWriteWindowType( elem.attribute("writeWindowType").toInt() ); - } - if (elem.hasAttribute("hasFocus")) { - p->setFocus( static_cast<bool>(elem.attribute("hasFocus").toInt()) ); - } - - QRect rect; - - QDomElement object = elem.namedItem("GEOMETRY").toElement(); - if(!object.isNull()) { - if (object.hasAttribute("x")) { - rect.setX(object.attribute("x").toInt()); - } - if (object.hasAttribute("y")) { - rect.setY(object.attribute("y").toInt()); - } - if (object.hasAttribute("width")) { - rect.setWidth(object.attribute("width").toInt()); - } - if (object.hasAttribute("height")) { - rect.setHeight(object.attribute("height").toInt()); - } - if (object.hasAttribute("isMaximized")) { - p->setMaximized( static_cast<bool>(object.attribute("isMaximized").toInt()) ); - } - } - p->setGeometry(rect); - - object = elem.namedItem("MODULES").toElement(); - if(!object.isNull()) { - if (object.hasAttribute("list")) { - const QString sep = object.hasAttribute("separator") ? object.attribute("separator") : "|"; - QStringList modules = QStringList::split(sep, object.attribute("list")); - p->setModules(modules); - } - } - - object = elem.namedItem("KEY").toElement(); - if(!object.isNull()) { - if (object.hasAttribute("name")) - p->setKey(object.attribute("name")); - } - - object = elem.namedItem("SCROLLBARS").toElement(); - if(!object.isNull()) { - int horizontal = 0, vertical = 0; - if (object.hasAttribute("horizontal")) - horizontal = object.attribute("horizontal").toInt(); - if (object.hasAttribute("vertical")) - vertical = object.attribute("vertical").toInt(); - - p->setScrollbarPositions(horizontal, vertical); - } - } - elem = elem.nextSibling().toElement(); - } - return m_profileWindows; -} - -/** Saves the profile to the file given in the constructor. */ -const bool CProfile::save(QPtrList<CProfileWindow> windows) { - /** Save the settings using a XML file - * Save the CProfileWindow objects using a XML file which name is in m_filename - */ - bool ret = false; - QDomDocument doc("DOC"); - doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - - QDomElement content = doc.createElement("BibleTimeProfile"); - content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION); - content.setAttribute("name", m_name); - doc.appendChild(content); - - //save mainwindow settings - { - QDomElement mainWindow = doc.createElement("MAINWINDOW"); - mainWindow.setAttribute("fullscreen", fullscreen()); - - QDomElement geometry = doc.createElement("GEOMETRY"); - mainWindow.appendChild(geometry); - const QRect r = this->geometry(); - geometry.setAttribute("x",r.x()); - geometry.setAttribute("y",r.y()); - geometry.setAttribute("width",r.width()); - geometry.setAttribute("height",r.height()); - geometry.setAttribute("isMaximized",static_cast<int>(this->maximized())); - - content.appendChild(mainWindow); - } - - for (CProfileWindow* p = windows.first(); p; p = windows.next()) { - QDomElement window; - switch (p->type()) { - case CSwordModuleInfo::Bible: - window = doc.createElement("BIBLE"); - break; - case CSwordModuleInfo::Commentary: - window = doc.createElement("COMMENTARY"); - break; - case CSwordModuleInfo::Lexicon: - window = doc.createElement("LEXICON"); - break; - case CSwordModuleInfo::GenericBook: - window = doc.createElement("BOOK"); - break; - default: - break; - } - if (window.isNull()) - break; - window.setAttribute("windowSettings", p->windowSettings()); - window.setAttribute("writeWindowType", p->writeWindowType()); - window.setAttribute("hasFocus", p->hasFocus()); - - //save geomtery - const QRect r = p->geometry(); - QDomElement geometry = doc.createElement("GEOMETRY"); - geometry.setAttribute("x",r.x()); - geometry.setAttribute("y",r.y()); - geometry.setAttribute("width",r.width()); - geometry.setAttribute("height",r.height()); - geometry.setAttribute("isMaximized",static_cast<int>(p->maximized())); - window.appendChild( geometry ); - - QDomElement modules = doc.createElement("MODULES"); - modules.setAttribute("separator", "|"); - modules.setAttribute("list", p->modules().join("|")); - window.appendChild( modules ); - - QDomElement key = doc.createElement("KEY"); - key.setAttribute("name", p->key()); - window.appendChild( key ); - - QDomElement scrollbars = doc.createElement("SCROLLBARS"); - scrollbars.setAttribute("horizontal", p->scrollbarPositions().horizontal); - scrollbars.setAttribute("vertical", p->scrollbarPositions().vertical); - window.appendChild( scrollbars ); - - content.appendChild( window ); - } - - QFile file(m_filename); - if ( file.open(IO_WriteOnly) ) { - ret = true; - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); - t << doc.toString(); - file.close(); - } - else - ret = false; - - return ret; -} - -/** Saves the profile to the file given in the constructor. */ -const bool CProfile::save() { - return save(m_profileWindows); -} - -/** Returns the filename used for this profile. */ -const QString& CProfile::filename() { - return m_filename; -} - -/** Returns the name of this profile. */ -const QString& CProfile::name() { - return m_name; -} - -/** Initializes the XML for the first time (use to create a new profile) */ -void CProfile::init(const QString file) { - const QString oldFile = m_filename; - m_filename = file; - save(QPtrList<CProfileWindow>()); - m_filename = oldFile; -} - -/** Changes the name of this profile. */ -void CProfile::setName( const QString& newName ) { - m_name = newName; - saveBasics(); //save chanegd name -} - -/** Loads the basic settings requires for proper operation. */ -void CProfile::loadBasics() { - QFile file(m_filename); - if (!file.exists()) - return; - - QDomDocument doc; - if (file.open(IO_ReadOnly)) { - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); - doc.setContent(t.read()); - file.close(); - } - QDomElement document = doc.documentElement(); - if (document.hasAttribute("name")) - m_name = document.attribute("name"); -} - -void CProfile::saveBasics() { - QFile file(m_filename); - if (!file.exists()) - return; - - QDomDocument doc; - if (file.open(IO_ReadOnly)) { - QTextStream t(&file); - t.setEncoding(QTextStream::UnicodeUTF8); - doc.setContent(t.read()); - file.close(); - } - - QDomElement document = doc.documentElement(); - document.setAttribute("name", m_name); - - if (file.open(IO_WriteOnly)) { - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); - t << doc.toString(); - file.close(); - } -} - -/** Returns true if the main window was in fullscreen mode as the profile was saved. */ -const bool CProfile::fullscreen() const { - return m_fullscreen; -} - -/** Set the parameter to true if the main window coveres the full screen size. */ -void CProfile::setFullscreen( const bool fullscreen ) { - m_fullscreen = fullscreen; -} - -/** Returns true if the main window was maximized as the profile was saved. */ -const bool CProfile::maximized() const { - return m_maximized; -} - -/** Set the parameter to true if the main window is maximized. */ -void CProfile::setMaximized( const bool maximized ) { - m_maximized = maximized; -} - -/** Returns the geometry of the main window */ -const QRect CProfile::geometry() { - return m_geometry; -} - -/** Stes the geoemtry of the main window */ -void CProfile::setGeometry( const QRect rect ) { - m_geometry = rect; -} - -} //end of namespace Profile diff --git a/bibletime/frontend/cprofile.h b/bibletime/frontend/cprofile.h deleted file mode 100644 index 711bdf5..0000000 --- a/bibletime/frontend/cprofile.h +++ /dev/null @@ -1,102 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CPROFILE_H -#define CPROFILE_H - -#include "cprofilewindow.h" - -//Qt includes -#include <qptrlist.h> - -namespace Profile { - -/** Manages one profile file. Provides functions to save and restore settings of the available display windows. - * @author The BibleTime team - */ -class CProfile { -public: - CProfile(const QString& fileName, const QString& name = QString::null); - ~CProfile(); - - /** - * Saves the profile to the file given in the constructor. - * @param windows The list of windows available in the profile. - */ - const bool save( QPtrList<CProfileWindow> windows ); - /** - * Saves the profile to the file given in the constructor. - */ - const bool save(); - /** - * Loads the profile from the file given in the constructor. - * @return The list of profiled window which exist in the profile. - */ - QPtrList<CProfileWindow> load(); - /** - * Returns the name of this profile. - */ - const QString& name(); - /** - * Returns the filename used for this profile. - */ - const QString& filename(); - /** - * Initializes the XML for the first time (use to create a new profile) - */ - void init(const QString); - /** - * Chnages the name of this profile. - */ - void setName( const QString& ); - /** - * Returns true if the main window was in fullscreen mode as the profile was saved. - */ - const bool fullscreen() const; - /** - * Set the parameter to true if the main window coveres the full screen size. - */ - void setFullscreen( const bool fullscreen ); - /** - * Returns true if the main window was maximized as the profile was saved. - */ - const bool maximized() const; - /** - * Set the parameter to true if the main window is maximized. - */ - void setMaximized( const bool maximized ); - /** - * Sets the geoemtry of the main window - */ - void setGeometry( const QRect rect ); - /** - * Returns the geometry of the main window - */ - const QRect geometry(); - -private: - /** - * Loads the basic settings requires for proper operation. - */ - void loadBasics(); - void saveBasics(); - - QPtrList<CProfileWindow> m_profileWindows; - QString m_name; - QString m_filename; - bool m_fullscreen; - bool m_maximized; - QRect m_geometry; -}; - -} //end of namespace Profile - -#endif diff --git a/bibletime/frontend/cprofilemgr.cpp b/bibletime/frontend/cprofilemgr.cpp deleted file mode 100644 index ef810a1..0000000 --- a/bibletime/frontend/cprofilemgr.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cprofilemgr.h" - -//Qt includes -#include <qdir.h> -#include <qfile.h> -#include <qptrlist.h> - -//KDE includes -#include <kstandarddirs.h> - -namespace Profile { - -CProfileMgr::CProfileMgr() : m_startupProfile(0) { - m_profiles.setAutoDelete(true); - - KStandardDirs stdDirs; - m_profilePath = stdDirs.saveLocation("data", "bibletime/sessions/"); - - QDir d( m_profilePath ); - QStringList files = d.entryList("*.xml"); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) { - if ((*it) != "_startup_.xml") { - m_profiles.append(new CProfile(m_profilePath + *it)); - } - else { - m_startupProfile = new CProfile(m_profilePath + *it); - } - } -} - -CProfileMgr::~CProfileMgr() { - m_profiles.clear(); // autoDelete is enabled, so all profiles are deleted - delete m_startupProfile; -} - -/** Returns a list of available profiles. */ -const QPtrList<CProfile>& CProfileMgr::profiles() { - return m_profiles; -} - -/** Creates a new profile with the name "name" (first parameter). @return The profile object */ -CProfile* CProfileMgr::create( const QString name ) { - CProfile* p = new CProfile(QString::null, name); - m_profiles.append(p); - - return p; -} - -/** Removes the profile from the list and from the directory containg the profile files. */ -const bool CProfileMgr::remove - ( CProfile* p ) { - bool ret = false; - QFile f( p->filename() ); - if (f.exists()) - f.remove(); - if(m_profiles.remove(p)) - ; //auto delete is enabled - ret = true; - return ret; -} - -const bool CProfileMgr::remove - ( const QString& profile) { - bool ret = false; - for (CProfile* p = m_profiles.first(); p; p = m_profiles.next()) { - if (p->name() == profile) { - remove - (p); - ret = true; - } - } - return ret; -} - -/** Returns the profile with the desired name. If there's no such profile 0 is returned. */ -CProfile* CProfileMgr::profile(const QString& name) { - for (m_profiles.first(); m_profiles.current(); m_profiles.next()) { - if (m_profiles.current()->name() == name) { - return m_profiles.current(); - } - } - - return 0; -} - -/** Returns the startup profile if it exists, otherwise return 0. */ -CProfile* CProfileMgr::startupProfile() { - if (!m_startupProfile) { - m_startupProfile = new CProfile(QString::null, "_startup_"); - } - - return m_startupProfile; -} - -/** Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile. */ -void CProfileMgr::refresh() { - m_profiles.clear(); //delete all profiles - QDir d( m_profilePath ); - QStringList files = d.entryList("*.xml"); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) { - CProfile p(m_profilePath + *it); - if (p.name() == "_startup_") { //new startup profile - if (!m_startupProfile) { //don't put this in the if clause above,it doesn't work! - m_startupProfile = new CProfile(m_profilePath + *it); - } - } - else if (!profile(p.name())) { //don't have it already - m_profiles.append(new CProfile(m_profilePath + *it)); - } - } -} - -} //end of namespace Profile diff --git a/bibletime/frontend/cprofilemgr.h b/bibletime/frontend/cprofilemgr.h deleted file mode 100644 index b1f55d9..0000000 --- a/bibletime/frontend/cprofilemgr.h +++ /dev/null @@ -1,69 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CPROFILEMGR_H -#define CPROFILEMGR_H - -#include "cprofile.h" - -//Qt includes -#include <qstring.h> - -namespace Profile { -/** The manager for profiles. - * Provides functions to create, delete, save and load profiles. - * @author The BibleTime team - */ -class CProfileMgr { -public: - CProfileMgr(); - ~CProfileMgr(); - - /** Creates a new profile with the name "name" (first parameter). - * @return The profile object - */ - CProfile* create( const QString name ); - /** - * @return a list of available profiles - */ - const QPtrList<CProfile>& profiles(); - /** - * Removes the profile from the list and from the directory containg the profile files. - */ - const bool remove - ( CProfile* p ); - /** - * Removes the profile from the list and from the directory containg the profile files. - */ - const bool remove - ( const QString& ); - /** - * Returns the profile with the desired name. If there's no such profile 0 is returned. - */ - CProfile* profile(const QString&); - /** - * Returns the startup profile if it exists, otherwise return 0. - */ - CProfile* startupProfile(); - /** - * Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile. - */ - void refresh(); - -protected: - QPtrList<CProfile> m_profiles; - QString m_profilePath; - CProfile* m_startupProfile; -}; - -} //end of namespace Profile - -#endif diff --git a/bibletime/frontend/cprofilewindow.cpp b/bibletime/frontend/cprofilewindow.cpp deleted file mode 100644 index 142dd41..0000000 --- a/bibletime/frontend/cprofilewindow.cpp +++ /dev/null @@ -1,125 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cprofilewindow.h" - -namespace Profile { - -CProfileWindow::CProfileWindow(CSwordModuleInfo::ModuleType type) -: m_type(type), -m_windowGeometry(), -m_moduleList(), -m_key(QString::null), -m_maximized(false), -m_hasFocus(false), -m_windowSettings(0), -m_writeWindowType(0) { - m_scrollbarPos.horizontal = 0; - m_scrollbarPos.vertical = 0; -} - -CProfileWindow::~CProfileWindow() {} - -/** Returns the size of the window including the x,y coordinates. */ -const QRect& CProfileWindow::geometry() const { - return m_windowGeometry; -} - -/** Sets the size of the window. */ -void CProfileWindow::setGeometry( const QRect& rect ) { - m_windowGeometry = rect; -} - -/** Returns the type of the managed window (bible window, commentary window or lexicon window). */ -const CSwordModuleInfo::ModuleType CProfileWindow::type() const { - if (m_type != CSwordModuleInfo::Unknown) - return m_type; - return CSwordModuleInfo::Unknown; -} - -/** Sets the modules. */ -void CProfileWindow::setModules( const QStringList& modules ) { - m_moduleList = modules; //copy module pointers into our own list -} - -/** Returns a list of module names which are chosen in the managed window profile. */ -const QStringList& CProfileWindow::modules() const { - return m_moduleList; -} - -/** Returns the current key set in the modules. */ -const QString& CProfileWindow::key() const { - return m_key; -} - -/** Set the key used in the modules. */ -void CProfileWindow::setKey( const QString& key ) { - m_key = key; -} - -/** Sets the current position of the scrollbars. */ -void CProfileWindow::setScrollbarPositions(const int& horizontal, const int& vertical) { - // m_scrollbarPos = {x,y}; - m_scrollbarPos.horizontal = horizontal; - m_scrollbarPos.vertical = vertical; -} - -/** Returns tghe position of the scrollbars */ -const CProfileWindow::ScrollbarPos& CProfileWindow::scrollbarPositions() const { - return m_scrollbarPos; -} - -/** Sets the type of the used modules. */ -void CProfileWindow::setType(const CSwordModuleInfo::ModuleType& type) { - m_type = type; -} - -/** Returns true if the window is maximized. */ -const bool& CProfileWindow::maximized() const { - return m_maximized; -} - -/** Sets the windows maximized state to true or false. */ -void CProfileWindow::setMaximized( const bool& maximized ) { - m_maximized = maximized; -} - -/** Returns true if the window is maximized. */ -const bool& CProfileWindow::hasFocus() const { - return m_hasFocus; -} - -/** Sets the windows maximized state to true or false. */ -void CProfileWindow::setFocus( const bool& hasFocus ) { - m_hasFocus = hasFocus; -} - -/** Returns an integer with the window specific settings */ -const int& CProfileWindow::windowSettings() const { - return m_windowSettings; -} - -/** Sets the window specific settings. */ -void CProfileWindow::setWindowSettings( const int& settings ) { - m_windowSettings = settings; -} - -/** Tells this profile window to represent a write window. */ -void CProfileWindow::setWriteWindowType( const int& writeWindowType ) { - m_writeWindowType = writeWindowType; -} - -/** Returns whether this profile window represents a write window. */ -const int& CProfileWindow::writeWindowType() const { - return m_writeWindowType; -} - -} //end of namespace Profile diff --git a/bibletime/frontend/cprofilewindow.h b/bibletime/frontend/cprofilewindow.h deleted file mode 100644 index ddc5059..0000000 --- a/bibletime/frontend/cprofilewindow.h +++ /dev/null @@ -1,126 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CPROFILEWINDOW_H -#define CPROFILEWINDOW_H - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" - -//Qt includes -#include <qstring.h> -#include <qrect.h> -#include <qstringlist.h> -#include <qptrlist.h> - -namespace Profile { - -/** Contains the settings for one window saved in the profile. - * @author The BibleTime team - */ -class CProfileWindow { -public: - struct ScrollbarPos { - int horizontal; //the position of the horizontal scrollbar - int vertical; //the position of the vertical scrollbar - }; - - CProfileWindow(CSwordModuleInfo::ModuleType type = CSwordModuleInfo::Unknown); - ~CProfileWindow(); - /** - * Sets the modules. - */ - void setModules( const QStringList& modules ); - /** - * Returns the type of the managed window (bible window, commentary window or lexicon window). - */ - const CSwordModuleInfo::ModuleType type() const; - /** - * Sets the type of the used modules. - */ - void setType(const CSwordModuleInfo::ModuleType& type); - /** - * Sets the size of the window. - */ - void setGeometry( const QRect& s ); - /** - * Returns the size of the window including the x,y coordinates. - */ - const QRect& geometry() const; - /** - * Returns a list of module names which are chosen in the managed window profile. - */ - const QStringList& modules() const; - /** - * Set the key used in the modules. - */ - void setKey( const QString& ); - /** - * Returns the current key set in the modules. - */ - const QString& key() const; - /** - * Sets the current position of the scrollbars. - */ - void setScrollbarPositions(const int& x, const int& y); - /** - * Sets the windows maximized state to true or false. - */ - void setMaximized( const bool& maximized ); - /** - * Sets the windows hasFocus state to true or false. - */ - void setFocus( const bool& hasFocus ); - /** - * Sets the window specific settings. - */ - void setWindowSettings( const int& settings ); - /** - * Returns an integer with the window specific settings - */ - const int& windowSettings() const; - /** - * Returns true if the window is maximized. - */ - const bool& maximized() const; - /** - * Returns true if the window has the focus in the MDI area. - */ - const bool& hasFocus() const; - /** - * Returns tghe position of the scrollbars - */ - const CProfileWindow::ScrollbarPos& scrollbarPositions() const; - /** - * Returns whether this profile window represents a write window. - */ - const int& writeWindowType() const; - /** - * Tells this profile window to represent a write window. - */ - void setWriteWindowType( const int& writeWindowType ); - -private: - CSwordModuleInfo::ModuleType m_type; - QRect m_windowGeometry; - QStringList m_moduleList; - QString m_key; - ScrollbarPos m_scrollbarPos; - bool m_maximized; - bool m_hasFocus; - int m_windowSettings; - int m_writeWindowType; -}; - -} //end of namespace Profile - -#endif - diff --git a/bibletime/frontend/crossrefrendering.cpp b/bibletime/frontend/crossrefrendering.cpp deleted file mode 100644 index aad9d44..0000000 --- a/bibletime/frontend/crossrefrendering.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// -// C++ Implementation: crossrefrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#include "crossrefrendering.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordversekey.h" -#include "backend/creferencemanager.h" - -namespace InfoDisplay { - - /** - */ - CrossRefRendering::CrossRefRendering( CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) -: CHTMLExportRendering(Settings(), displayOptions, filterOptions) {} - - const QString CrossRefRendering::finishText( const QString& text, KeyTree& ) { - // qDebug("CrossRefRendering::finishText"); - return text; - } - - const QString CrossRefRendering::entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ) { - QString linkText; - - const bool isBible = module && (module->type() == CSwordModuleInfo::Bible); - CSwordVerseKey vk(module); //only valid for bible modules, i.e. isBible == true - if (isBible) { - vk = item.key(); - } - - switch (item.settings().keyRenderingFace) { - case KeyTreeItem::Settings::NoKey: { - linkText = QString::null; - break; //no key is valid for all modules - } - case KeyTreeItem::Settings::CompleteShort: { - if (isBible) { - linkText = QString::fromUtf8(vk.getShortText()); - break; - } - //fall through for non-Bible modules - } - case KeyTreeItem::Settings::CompleteLong: { - if (isBible) { - linkText = vk.key(); - break; - } - //fall through for non-Bible modules - } - case KeyTreeItem::Settings::SimpleKey: { - if (isBible) { - linkText = QString::number(vk.Verse()); - break; - } - //fall through for non-Bible modules - } - default: { //default behaviour to return the passed key - linkText = item.key(); - break; - } - } - - if (!linkText.isEmpty()) { //if we have a valid link text - // qWarning("rendering"); - return QString("<a href=\"%1\">%2</a>") - .arg( - CReferenceManager::encodeHyperlink( - module->name(), - item.key(), - CReferenceManager::typeFromModule(module->type()) - ) - ) - .arg(linkText); - } - - return QString::null; - } - -}; diff --git a/bibletime/frontend/crossrefrendering.h b/bibletime/frontend/crossrefrendering.h deleted file mode 100644 index 144d9d0..0000000 --- a/bibletime/frontend/crossrefrendering.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// C++ Interface: crossrefrendering -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef INFODISPLAYCROSSREFRENDERING_H -#define INFODISPLAYCROSSREFRENDERING_H - -//Backend includes -#include "backend/chtmlexportrendering.h" - -namespace InfoDisplay { - -class CrossRefRendering : public Rendering::CHTMLExportRendering { -protected: - friend class CInfoDisplay; - - CrossRefRendering( - CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(), - CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults() - ); - - virtual const QString entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ); - virtual const QString finishText( const QString&, KeyTree& tree ); - }; - - -}; - -#endif diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp deleted file mode 100644 index d2b6950..0000000 --- a/bibletime/frontend/cswordsetupdialog.cpp +++ /dev/null @@ -1,918 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cswordsetupdialog.h" -#include "cswordsetupmodulelistview.h" -#include "cswordsetupinstallsourcesdialog.h" - -#include "backend/cswordbackend.h" -#include "backend/cswordmoduleinfo.h" -// #include "btinstallmgr.h" - -#include "cmanageindiceswidget.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" -#include "util/scoped_resource.h" - -//QT includes -#include <qdir.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qwidgetstack.h> -#include <qfileinfo.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qdict.h> - -//KDE includes -#include <kapplication.h> -#include <kconfig.h> -#include <kdirselectdialog.h> -#include <keditlistbox.h> -#include <klocale.h> -#include <kstandarddirs.h> -#include <kiconloader.h> -#include <kmessagebox.h> -#include <kprogress.h> -#include <kurl.h> - -//Sword includes -#include <installmgr.h> -#include <swmodule.h> -#include <swversion.h> - -using namespace sword; - -namespace BookshelfManager { - - CSwordSetupDialog::CSwordSetupDialog(QWidget *parent, const char *name ) -: KDialogBase(IconList, i18n("Bookshelf Manager"), Ok, Ok, parent, name, true, true, QString::null, QString::null, QString::null), - m_removeModuleListView(0), - m_installModuleListPage(0), - m_installModuleListView(0), - m_progressDialog(0), - m_refreshedRemoteSources(false) { - setIconListAllVisible(true); - m_swordSetupChanged = false; - - initSwordConfig(); - initInstall(); - initRemove(); - initManageIndices(); - } - - void CSwordSetupDialog::initSwordConfig() { - QFrame* page = m_swordConfigPage = addPage(i18n("Bookshelf path(s)"), QString::null, SmallIcon("bt_swordconfig",32)); - page->setMinimumSize(500,400); - - QGridLayout* layout = new QGridLayout(page, 6, 4); - layout->setMargin(5); - - layout->setSpacing(10); - layout->setColStretch(0,1); - layout->setRowStretch(5,1); - - QLabel* mainLabel = CToolClass::explanationLabel(page, - i18n("Configure bookshelf path(s)"), - i18n("You can store your bookshelfs in one or more directories, which you can specify here.") - ); - layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); - - - QString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename(); - QLabel* confPathLabel = new QLabel(i18n("Your bookshelf configuration file is <b>%1</b>").arg(swordConfPath), page); - layout->addMultiCellWidget(confPathLabel, 1,1,0,3); - - m_swordPathListBox = new QListView(page); - // m_swordPathListBox->setFullWidth(true); - m_swordPathListBox->addColumn(i18n("Path to bookshelf")); - connect(m_swordPathListBox, SIGNAL(selectionChanged()), this, SLOT(slot_swordPathSelected())); - layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1); - - m_swordEditPathButton = new QPushButton(i18n("Edit Entry"), page); - m_swordEditPathButton->setIconSet(SmallIcon("edit", 16)); - connect(m_swordEditPathButton, SIGNAL(clicked()), this, SLOT(slot_swordEditClicked())); - layout->addWidget(m_swordEditPathButton, 2, 3); - - m_swordAddPathButton = new QPushButton(i18n("Add Entry"), page); - m_swordAddPathButton->setIconSet(SmallIcon("edit_add", 16)); - connect(m_swordAddPathButton, SIGNAL(clicked()), this, SLOT(slot_swordAddClicked())); - layout->addWidget(m_swordAddPathButton, 3,3); - - m_swordRemovePathButton = new QPushButton(i18n("Remove Entry"), page); - m_swordRemovePathButton->setIconSet(SmallIcon("editdelete", 16)); - connect(m_swordRemovePathButton, SIGNAL(clicked()), this, SLOT(slot_swordRemoveClicked())); - layout->addWidget(m_swordRemovePathButton, 4,3); - - setupSwordPathListBox(); - } - - void CSwordSetupDialog::initInstall() { - m_installPage = addPage(i18n("Install/Update works"), QString::null, SmallIcon("bt_bible",32)); - - QVBoxLayout* vboxlayout = new QVBoxLayout(m_installPage); - QHBoxLayout* hboxlayout = new QHBoxLayout(); - hboxlayout->setAutoAdd( true ); - - vboxlayout->addLayout(hboxlayout); - - m_installWidgetStack = new QWidgetStack(m_installPage); - hboxlayout->addWidget(m_installWidgetStack); - - m_installSourcePage = new QWidget(0); - m_installWidgetStack->addWidget(m_installSourcePage); - - // m_installSourcePage->setMinimumSize(500,400); - - QGridLayout* layout = new QGridLayout(m_installSourcePage, 7, 3); - layout->setMargin(5); - layout->setSpacing(10); - layout->setRowStretch(6,5); - layout->setColStretch(0,5); - - QLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage, - i18n("Install/update works - Step 1"), - i18n("Please choose a (local or remote) library and a bookshelf path to install the work(s) to. \ -After that step click on the connect button.<br/>\ -<b>WARNING: If you live in a persecuted country and do not wish to risk detection you should NOT use \ -the module remote installation feature!</b>") - ); - layout->addMultiCellWidget(installLabel, 0,0,0,2); - - QLabel* sourceHeadingLabel = new QLabel(QString("<b>%1</b>").arg(i18n("Select library")), m_installSourcePage); - layout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1); - - m_sourceCombo = new QComboBox(m_installSourcePage); - layout->addWidget(m_sourceCombo, 2, 0); - - QPushButton* deleteSourceButton = new QPushButton(i18n("Delete library"), m_installSourcePage); - deleteSourceButton->setIconSet(SmallIcon("remove", 16)); - connect(deleteSourceButton, SIGNAL(clicked()), SLOT(slot_installDeleteSource())); - layout->addWidget(deleteSourceButton, 2, 1, Qt::AlignLeft); - - QPushButton* addSourceButton = new QPushButton(i18n("Add library"), m_installSourcePage); - addSourceButton->setIconSet(SmallIcon("folder_new", 16)); - connect(addSourceButton, SIGNAL(clicked()), SLOT(slot_installAddSource())); - layout->addWidget(addSourceButton, 2, 2, Qt::AlignLeft); - - m_sourceLabel = new QLabel(m_installSourcePage); - layout->addMultiCellWidget(m_sourceLabel, 3,3,0,1); - - QLabel* targetHeadingLabel = new QLabel(QString("<b>%1</b>").arg(i18n("Select bookshelf path")), m_installSourcePage); - layout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1); - - m_targetCombo = new QComboBox(m_installSourcePage); - layout->addWidget(m_targetCombo, 5, 0); - - m_targetLabel = new QLabel(m_installSourcePage); - layout->addMultiCellWidget(m_targetLabel, 6,6,0,0,Qt::AlignTop); - - //part beloew main layout with the back/next buttons - QHBoxLayout* myHBox = new QHBoxLayout(); - vboxlayout->addLayout(myHBox); - - m_installBackButton = new QPushButton(i18n("Back"), m_installPage); - m_installBackButton->setIconSet(SmallIcon("back",16)); - myHBox->addWidget(m_installBackButton); - - myHBox->addSpacing(10); - myHBox->addStretch(5); - - m_installContinueButton = new QPushButton(i18n("Connect to library"), m_installPage); - m_installContinueButton->setIconSet(SmallIcon("forward",16)); - connect(m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource())); - myHBox->addWidget(m_installContinueButton); - - m_installBackButton->setEnabled(false); - - connect(m_sourceCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_sourceSelected( const QString&) )); - connect(m_targetCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_targetSelected( const QString&) )); - populateInstallCombos(); - - slot_sourceSelected( m_sourceCombo->currentText() ); - } - - void CSwordSetupDialog::initRemove() { - QFrame* page = m_removePage = addPage(i18n("Remove works"), QString::null, SmallIcon("edittrash",32)); - - page->setMinimumSize(500,400); - - QGridLayout* layout = new QGridLayout(page, 4, 4); - layout->setMargin(5); - - layout->setSpacing(10); - layout->setColStretch(1,1); - layout->setRowStretch(2,1); - - QLabel* mainLabel= CToolClass::explanationLabel(page, - i18n("Remove installed work(s)"), - i18n("This dialog lets you remove installed works from your system. Choose the modules and then click on the remove button.") - ); - layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); - - QLabel* headingLabel = new QLabel(QString("<b>%1</b>").arg(i18n("Select works to be uninstalled")), page); - layout->addMultiCellWidget(headingLabel, 1, 1, 0, 3); - - m_removeModuleListView = new CSwordSetupModuleListView(page, false); - layout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3); - - m_removeRemoveButton = new QPushButton(i18n("Remove selected work(s)"), page); - m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) ); - layout->addWidget(m_removeRemoveButton, 3, 3, Qt::AlignRight); - - connect(m_removeRemoveButton, SIGNAL(clicked()), - this, SLOT(slot_doRemoveModules())); - - populateRemoveModuleListView(); - } - - void CSwordSetupDialog::initManageIndices() - { - QFrame* page = m_manageIndiciesPage = addPage(i18n("Manage search indicies"), - QString::null, SmallIcon("filefind",32)); - - page->setMinimumSize(500,400); - QVBoxLayout* box = new QVBoxLayout(page, 4, 4); - CManageIndicesWidget* mi = new CManageIndicesWidget(page); - box->addWidget(mi); - } - - void CSwordSetupDialog::slotOk() { - writeSwordConfig(); - KDialogBase::slotOk(); - emit signalSwordSetupChanged( ); - } - - void CSwordSetupDialog::writeSwordConfig() { - if (m_swordSetupChanged && m_swordPathListBox->childCount()) { - QStringList targets; - QListViewItemIterator it( m_swordPathListBox ); - while ( it.current() ) { - QListViewItem *item = it.current(); - if (!item->text(0).isEmpty()) { - targets << item->text(0); - } - ++it; - } - - BTInstallMgr::Tool::LocalConfig::setTargetList(targets); //creates new Sword config - } - } - - const bool CSwordSetupDialog::showPart( CSwordSetupDialog::Parts ID ) { - bool ret = false; - switch (ID) { - case CSwordSetupDialog::Sword: - showPage( pageIndex(m_swordConfigPage) ); - break; - case CSwordSetupDialog::Install: - showPage( pageIndex(m_installPage) ); - break; - case CSwordSetupDialog::Remove: - showPage( pageIndex(m_removePage) ); - break; - default: - break; - } - return ret; - } - - - void CSwordSetupDialog::populateInstallCombos() { - m_sourceCombo->clear(); - - BTInstallMgr::Tool::RemoteConfig::initConfig(); - - QStringList list; - { - BTInstallMgr mgr; - list = BTInstallMgr::Tool::RemoteConfig::sourceList(&mgr); - } - if (!list.count()) { //add Crosswire entry - InstallSource is("FTP"); //default return value - is.caption = "Crosswire"; - is.source = "ftp.crosswire.org"; - is.directory = "/pub/sword/raw"; - BTInstallMgr::Tool::RemoteConfig::addSource(&is); - - BTInstallMgr mgr; //make sure we're uptodate - list = BTInstallMgr::Tool::RemoteConfig::sourceList(&mgr); - - Q_ASSERT( list.count() > 0 ); - } - - BTInstallMgr mgr; - for (QStringList::iterator it = list.begin(); it != list.end(); ++it) { - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, *it); - - if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { - m_sourceCombo->insertItem( i18n("[Remote]") + " " + *it ); //remote source - } - else { // local source - QFileInfo fi( is.directory.c_str() ); - if (fi.isDir() && fi.isReadable()) { - m_sourceCombo->insertItem( i18n("[Local]") + " " + *it ); - } - } - } - - //Fill in the targets in the targets combobox - //list = (m_targetCombo->count()) ? m_swordPathListBox : BTInstallMgr::Tool::LocalConfig::targetList(); - if (m_targetCombo->count()) { //we already read in the list once, we have to use the Sword paths list items now because this list is newer - list.clear(); - QListViewItemIterator it2( m_swordPathListBox ); - while (it2.current()) { - list << it2.current()->text(0); - - ++it2; - } - } - else { - list = BTInstallMgr::Tool::LocalConfig::targetList(); - } - - m_targetCombo->clear(); - for (QStringList::iterator it = list.begin(); it != list.end(); ++it) { - QFileInfo fi(*it); - if (fi.isDir() && fi.isWritable()) { - m_targetCombo->insertItem( *it ); - } - } - - //init widget states - m_targetCombo->setEnabled( (m_targetCombo->count() > 0) ); - m_installContinueButton->setEnabled( - (m_sourceCombo->count() > 0) && (m_targetCombo->count() > 0) - ); - - slot_sourceSelected( m_sourceCombo->currentText() ); - } - - - void CSwordSetupDialog::slot_sourceSelected(const QString &sourceName) { - //remove status parta - QString source = sourceName; - - QString rep = i18n("[Local]") + " "; - int i = source.find(rep); - if (i>=0) { - source.remove(i, rep.length()); - } - rep = i18n("[Remote]") + " "; - i = source.find(rep); - if (i>=0) { - source.remove(i, rep.length()); - } - - BTInstallMgr mgr; - QString url; - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, source) ; - - if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { - url = QString("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str()); - } - else { - url = QString("%1").arg(is.directory.c_str()); - } - m_sourceLabel->setText( url ); - - m_refreshedRemoteSources = false; - } - - - void CSwordSetupDialog::slot_targetSelected(const QString &targetName) { - m_targetLabel->setText( m_targetMap[targetName] ); - target = m_targetMap[targetName]; - } - - - void CSwordSetupDialog::slot_doRemoveModules() { - - QStringList moduleList = m_removeModuleListView->selectedModules(); - - if ( moduleList.empty() ) { - return; //no message, just do nothing - } - - const QString message = i18n("You selected the following work(s): %1.\n\n" - "Do you really want to remove them from your system?").arg(moduleList.join(", ")); - - if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed. - sword::InstallMgr installMgr; - QDict<sword::SWMgr> mgrDict; //maps config paths to SWMgr objects - - for ( QStringList::Iterator it = moduleList.begin(); it != moduleList.end(); ++it ) { - if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { //module found? - QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/"; - QString dataPath = m->config(CSwordModuleInfo::DataPath); - - if (dataPath.left(2) == "./") { - dataPath = dataPath.mid(2); - } - - if (prefixPath.contains(dataPath)) { //remove module part to get the prefix path - prefixPath = prefixPath.remove( prefixPath.find(dataPath), dataPath.length() ); - } - else { //fall back to default Sword config path - prefixPath = QString::fromLatin1(backend()->prefixPath); - } - - sword::SWMgr* mgr = mgrDict[ prefixPath ]; - if (!mgr) { //create new mgr if it's not yet available - mgrDict.insert(prefixPath, new sword::SWMgr(prefixPath.local8Bit())); - mgr = mgrDict[ prefixPath ]; - } - - installMgr.removeModule(mgr, m->name().latin1()); - } - } - - CPointers::backend()->reloadModules(); - populateRemoveModuleListView(); //rebuild the tree - populateInstallModuleListView( currentInstallSource() ); //rebuild the tree - - //delete all mgrs - mgrDict.setAutoDelete(true); - mgrDict.clear(); - } - } - - void CSwordSetupDialog::populateRemoveModuleListView() { - CSwordBackend myBackend; - KApplication::kApplication()->processEvents(); - myBackend.initModules(); - - m_removeModuleListView->clear(); - - ListCSwordModuleInfo list = myBackend.moduleList(); - int mod = 0; - sword::SWConfig moduleConfig(""); - - mod = 1; - ListCSwordModuleInfo::iterator end_it = list.end(); - - for (ListCSwordModuleInfo::iterator it(list.begin()); it != end_it; ++it, ++mod) { - m_removeModuleListView->addModule( - (*it), - (*it)->config(CSwordModuleInfo::ModuleVersion) - ); - } - - m_removeModuleListView->finish(); - } - - const bool CSwordSetupDialog::refreshRemoteModuleCache( const QString& sourceName ) { - if (m_refreshedRemoteSources) { //the module info is up-to-date - return true; - } - - BTInstallMgr iMgr; - m_currentInstallMgr = &iMgr; //for the progress dialog - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, sourceName); - bool success = false; - - m_progressDialog = new KProgressDialog(this, 0, i18n("Download"), QString::null, true); - m_progressDialog->progressBar()->setTotalSteps(100); - m_progressDialog->setLabel( i18n("Downloading library information...") ); - m_progressDialog->setMinimumDuration(0); //show immediately - m_progressDialog->setAutoClose(false); - m_progressDialog->show(); - KApplication::kApplication()->processEvents(); - - connect( - m_progressDialog, SIGNAL(cancelClicked()), - SLOT(slot_moduleRefreshProgressCancelClicked()) - ); - connect( - &iMgr, SIGNAL(completed(const int, const int)), - SLOT(slot_moduleRefreshCompleted(const int, const int)) - ); - - - if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { - // int errorCode = 0; - if (!m_refreshedRemoteSources) { - if (!iMgr.refreshRemoteSource( &is ) ) { //make sure the sources were updates sucessfully - m_refreshedRemoteSources = true; - success = true; - } - else { //an error occurres, the KIO library should display an error message - qWarning("InstallMgr: refreshRemoteSources returned an error."); - m_refreshedRemoteSources = false; - success = false; - } - } - } - - m_progressDialog->close(); - delete m_progressDialog; - m_progressDialog = 0; - - return success; - } - - bool CSwordSetupDialog::populateInstallModuleListView( const QString& sourceName ) { - KApplication::kApplication()->processEvents(); - Q_ASSERT(m_installModuleListView); - if (!m_installModuleListView) { // this may be an update after removing modules - return false; - } - - m_installModuleListView->clear(); - - BTInstallMgr iMgr; - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, sourceName); - - if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is) - && !refreshRemoteModuleCache(sourceName)) { - // qWarning("finish"); - m_installModuleListView->finish(); - return false; - } - - //kind of a hack to provide a pointer to mgr next line - // qWarning("createing remote_backend"); - util::scoped_ptr<CSwordBackend> remote_backend( BTInstallMgr::Tool::backend(&is) ); - // qWarning("config path1 is %s", remote_backend->configPath); - // qWarning("config path2 is %s", BTInstallMgr::Tool::backend(&is)->configPath ); //mem leak - // qWarning("after creating remote_backend"); - Q_ASSERT(remote_backend); - Q_ASSERT( BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is) ); - if (!remote_backend) { - m_installModuleListView->finish(); - return false; - } - - CSwordBackend* local_backend = CPointers::backend(); - Q_ASSERT(local_backend); - // qWarning("local backend has path %s", local_backend->); - KApplication::kApplication()->processEvents(); - //local_backend.initModules(); - - // qWarning("config path3 is %s", remote_backend->configPath); - ListCSwordModuleInfo mods = remote_backend->moduleList(); - Q_ASSERT(mods.count() > 0); - - ListCSwordModuleInfo::iterator end_it = mods.end(); - for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) { - // qWarning("adding module %s (%s)", (*it)->name().latin1(), (*it)->config(CSwordModuleInfo::AbsoluteDataPath).latin1()); - bool isUpdate = false; - - CSwordModuleInfo* const installedModule = local_backend->findModuleByName((*it)->name()); - if (installedModule) { - // qWarning("module is already installed in %s", installedModule->config(CSwordModuleInfo::AbsoluteDataPath).latin1()); - } - // Q_ASSERT(installedModule); - - if (installedModule) { //module already installed? - //check whether it's an uodated module or just the same - const SWVersion installedVersion( - installedModule->config(CSwordModuleInfo::ModuleVersion).latin1() - ); - - const SWVersion newVersion( - (*it)->config(CSwordModuleInfo::ModuleVersion).latin1() - ); - - isUpdate = (newVersion > installedVersion); - if (!isUpdate) { - // qWarning(" mod %s is not an update", (*it)->name().latin1()); - continue; - } - } - - // Q_ASSERT(installedModule); - m_installModuleListView->addModule( - (*it), - installedModule - ? installedModule->config(CSwordModuleInfo::ModuleVersion) - : QString::null - ); - } - m_installModuleListView->finish(); - return true; - } - - void CSwordSetupDialog::slot_connectToSource() { - if (!m_installModuleListPage) { //the widgets are not yet created - m_installModuleListPage = new QWidget(0); - - QGridLayout* layout = new QGridLayout(m_installModuleListPage, 7, 2); - layout->setMargin(5); - layout->setSpacing(10); - - QLabel* installLabel = CToolClass::explanationLabel(m_installModuleListPage, - i18n("Install/update works - Step 2"), - i18n("Please choose the works which should be installed and/or updated and click the install button.") - ); - layout->addMultiCellWidget(installLabel, 0,0,0,1); - layout->setRowStretch(0,0); - - m_installWidgetStack->addWidget(m_installModuleListPage); - m_installModuleListPage->setMinimumSize(500,400); - - //insert a list box which contains all available remote modules - BTInstallMgr iMgr; - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource()); - - m_installModuleListView = new CSwordSetupModuleListView(m_installModuleListPage, true, &is); - layout->addMultiCellWidget( m_installModuleListView, 1,6,0,1); - layout->setColStretch(0,5); - layout->setRowStretch(1,5); - - connect(m_installModuleListView, SIGNAL(selectedModulesChanged()), SLOT(slot_installModulesChanged())); - } - - if (populateInstallModuleListView( currentInstallSource() ) ){ - - //code valid for already existing and newly created widgets - disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource())); - connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules())); - - m_installContinueButton->setText(i18n("Install works")); - m_installContinueButton->setEnabled(false); - - m_installWidgetStack->raiseWidget(m_installModuleListPage); - - connect( m_installBackButton, SIGNAL(clicked()), this, SLOT(slot_showInstallSourcePage())); - m_installBackButton->setEnabled(true); - } - } - - void CSwordSetupDialog::slot_installAddSource() { - - sword::InstallSource newSource = CSwordSetupInstallSourcesDialog::getSource(); - - if ( !((QString)newSource.type.c_str()).isEmpty() ) { // we have a valid source to add - BTInstallMgr::Tool::RemoteConfig::addSource( &newSource ); - } - - populateInstallCombos(); //make sure the items are updated - } - - void CSwordSetupDialog::slot_installDeleteSource() { - - BTInstallMgr iMgr; - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source( &iMgr, currentInstallSource() ); - BTInstallMgr::Tool::RemoteConfig::removeSource( &iMgr, &is ); - - populateInstallCombos(); - } - - void CSwordSetupDialog::slot_installModulesChanged() { - // This function enabled the Install modules button if modules are chosen - // If an item was clicked to be not chosen look if there are other selected items - // If the item was clicked to be chosen enable the button without looking at the other items - - const int moduleCount = m_installModuleListView->selectedModules().count(); - m_installContinueButton->setEnabled(moduleCount > 0); - } - - void CSwordSetupDialog::slot_installModules() { - qWarning("CSwordSetupDialog::slot_installModules()"); - // m_installContinueButton->setEnabled(false); - // m_installBackButton->setEnabled(false); - - //first get all chosen modules - QStringList moduleList = m_installModuleListView->selectedModules(); - Q_ASSERT(moduleList.count() != 0); - if (moduleList.count() == 0) { // no modules selected - return; - } - - const QString message = i18n("You selected the following works: %1.\n\n\ - Do you really want to install them on your system?").arg(moduleList.join(", ")); - - if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed. - BTInstallMgr iMgr; - m_currentInstallMgr = &iMgr; - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource()); - - qWarning("installing from %s/%s", is.source.c_str(), is.directory.c_str()); - QString target = m_targetCombo->currentText(); - - //make sure target/mods.d and target/modules exist - QDir dir(target.latin1()); - if (!dir.exists()) { - dir.mkdir(target, true); - } - if (!dir.exists("modules")) { - dir.mkdir("modules"); - } - if (!dir.exists("mods.d")) { - dir.mkdir("mods.d"); - } - - sword::SWMgr lMgr( target.latin1() ); - - //module are removed in this section of code - m_installedModuleCount = 0; - m_progressDialog = new KProgressDialog(this, 0, i18n("Download of work(s)"), QString::null, true); - m_progressDialog->progressBar()->setTotalSteps(100 * moduleList.count()); - m_progressDialog->setMinimumDuration(0); //show immediately - m_progressDialog->setAutoClose(false); - m_progressDialog->show(); - KApplication::kApplication()->processEvents(); - - connect( - m_progressDialog, SIGNAL(cancelClicked()), - SLOT(slot_installProgressCancelClicked()) - ); - connect( - &iMgr, SIGNAL(completed(const int, const int)), - SLOT(installCompleted(const int, const int)) - ); - - for ( QStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) { - - qWarning("installing %s", (*it).latin1()); - m_installingModule = *it; - - //check whether it's an update. If yes, remove existing module first - CSwordModuleInfo* m = backend()->findModuleByName(*it); - Q_ASSERT(!m); - if (m) { //module found? - QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/"; - QString dataPath = m->config(CSwordModuleInfo::DataPath); - if (dataPath.left(2) == "./") { - dataPath = dataPath.mid(2); - } - - if (prefixPath.contains(dataPath)) { - prefixPath.remove( prefixPath.find(dataPath), dataPath.length() ); //complicated to work with Qt 3.0 - //prefixPath = prefixPath.replace(dataPath, ""); //old code working with Qt 3.2 - } - else { - prefixPath = QString::fromLatin1(backend()->prefixPath); - } - - sword::SWMgr mgr(prefixPath.latin1()); - iMgr.removeModule(&mgr, m->name().latin1()); - } - - if (!m_progressDialog->wasCancelled() - && BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { - // qWarning("calling install"); - int status = iMgr.installModule(&lMgr, 0, (*it).latin1(), &is); - // qWarning("status: %d", status); - Q_ASSERT(status != -1); - } - else if (!m_progressDialog->wasCancelled()) { //local source - iMgr.installModule(&lMgr, is.directory.c_str(), (*it).latin1()); - } - } - - m_progressDialog->close(); - delete m_progressDialog; - m_progressDialog = 0; - - //reload our backend because modules may have changed - backend()->reloadModules(); - populateInstallModuleListView( currentInstallSource() ); //rebuild the tree - populateRemoveModuleListView(); - } - - m_currentInstallMgr = 0; - m_installBackButton->setEnabled(true); - slot_installModulesChanged(); - } - - void CSwordSetupDialog::installCompleted( const int total, const int /* file */) { - if (m_progressDialog) { - m_progressDialog->progressBar()->setProgress(total+100*m_installedModuleCount); - m_progressDialog->setLabel( i18n("[%1]: %2% complete").arg(m_installingModule).arg(total) ); - } - KApplication::kApplication()->processEvents(); - } - - void CSwordSetupDialog::slot_showInstallSourcePage() { - connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource())); - disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules())); - m_installBackButton->setEnabled(false); - - m_installContinueButton->setText(i18n("Connect to library")); - m_installContinueButton->setEnabled(true); - - m_installWidgetStack->raiseWidget(m_installSourcePage); - } - - void CSwordSetupDialog::slot_swordEditClicked() { - if (QListViewItem* i = m_swordPathListBox->currentItem()) { - KURL url = KDirSelectDialog::selectDirectory(i->text(0), true); - if (url.isValid()) { - const QFileInfo fi( url.path() ); - if (!fi.exists() || !fi.isWritable()) { - const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, so works \ - can not be installed here using BibleTime. \ - Do you want to use this directory instead of the previous value?")); - if (result == KMessageBox::No) { - return; - } - } - i->setText(0, url.path()); - m_swordSetupChanged = true; - writeSwordConfig(); //to make sure other parts work with the new setting - populateInstallCombos(); //update target list bof on install page - populateRemoveModuleListView(); - } - } - } - - void CSwordSetupDialog::slot_swordAddClicked() { - KURL url = KDirSelectDialog::selectDirectory(QString::null, true); - if (url.isValid()) { - const QFileInfo fi( url.path() ); - if (!fi.exists() || !fi.isWritable()) { - const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, \ - so works can not be installed here using BibleTime. \ - Do you want to add it to the list of module directories?")); - if (result == KMessageBox::No) { - return; - } - } - (void)new QListViewItem(m_swordPathListBox, url.path()); - m_swordSetupChanged = true; - writeSwordConfig(); //to make sure other parts work with the new setting - populateInstallCombos(); //update target list bof on install page - populateRemoveModuleListView(); - } - } - - void CSwordSetupDialog::slot_swordRemoveClicked() { - QListViewItem* i = m_swordPathListBox->currentItem(); - if (i) { - delete i; - - m_swordSetupChanged = true; - writeSwordConfig(); //to make sure other parts work with the new setting - populateInstallCombos(); //update target list bof on install page - populateRemoveModuleListView(); - } - } - - void CSwordSetupDialog::setupSwordPathListBox() { - QStringList targets = BTInstallMgr::Tool::LocalConfig::targetList(); - m_swordPathListBox->clear(); - - for (QStringList::iterator it = targets.begin(); it != targets.end(); ++it) { - if ((*it).isEmpty()) { - continue; - } - new QListViewItem(m_swordPathListBox, *it); - } - m_swordPathListBox->setCurrentItem( m_swordPathListBox->firstChild() ); - } - - void CSwordSetupDialog::slot_swordPathSelected() { - m_swordEditPathButton->setEnabled( m_swordPathListBox->currentItem() ); - } - - const QString CSwordSetupDialog::currentInstallSource() { - QString source = m_sourceCombo->currentText(); - QString rep = i18n("[Local]") + " "; - int i = source.find(rep); - if (i>=0) { - source.remove(i, rep.length()); - } - rep = i18n("[Remote]") + " "; - i = source.find(rep); - if (i>=0) { - source.remove(i, rep.length()); - } - return source; - } - - void CSwordSetupDialog::slot_installProgressCancelClicked() { - //cancel possible active module installation - Q_ASSERT(m_currentInstallMgr); - if (m_currentInstallMgr) { - m_currentInstallMgr->terminate(); - } - } - - void CSwordSetupDialog::slot_moduleRefreshProgressCancelClicked() { - Q_ASSERT(m_currentInstallMgr); - if (m_currentInstallMgr) { - m_currentInstallMgr->terminate(); - } - KApplication::kApplication()->processEvents(); - } - - void CSwordSetupDialog::slot_moduleRefreshCompleted(const int /*total*/, const int current) { - if (m_progressDialog) { - m_progressDialog->progressBar()->setProgress(current); - } - KApplication::kApplication()->processEvents(); - } - -} // NAMESPACE diff --git a/bibletime/frontend/cswordsetupdialog.h b/bibletime/frontend/cswordsetupdialog.h deleted file mode 100644 index a77a6e5..0000000 --- a/bibletime/frontend/cswordsetupdialog.h +++ /dev/null @@ -1,150 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDSETUPDIALOG_H -#define CSWORDSETUPDIALOG_H - -#include "cbtconfig.h" -#include "util/cpointers.h" -#include "btinstallmgr.h" - -//QT includes -#include <qstring.h> -#include <qmap.h> - -//KDE includes -#include <kdialogbase.h> - -class QWidget; -class QLabel; -class QComboBox; -class QWidgetStack; -class QButton; -class QPushButton; -class QLineEdit; -class QListView; - -class KProgressDialog; - -namespace BookshelfManager { - - class CSwordSetupModuleListView; - - /** - * The Sword configuration dialog of BibleTime - * @author The BibleTime Team - */ -class CSwordSetupDialog : public KDialogBase, public CPointers { - Q_OBJECT - -public: - CSwordSetupDialog(QWidget *parent=0, const char *name=0); - - enum Parts { - Sword, - Install, - Remove - }; - - /** Opens the page which contaisn the given part ID. */ - const bool showPart( CSwordSetupDialog::Parts ID ); - -private: - void initSwordConfig(); - void initInstall(); - void initRemove(); - void initManageIndices(); - - void writeSwordConfig(); - - void setupSwordPathListBox(); - void populateInstallCombos(); - - const QString currentInstallSource(); - - QFrame* m_swordConfigPage; - QListView* m_swordPathListBox; - QPushButton* m_swordEditPathButton; - QPushButton* m_swordAddPathButton; - QPushButton* m_swordRemovePathButton; - QStringList m_swordPathList; - bool m_swordSetupChanged; - - QFrame* m_removePage; - QFrame* m_manageIndiciesPage; - - QFrame* m_installPage; - QWidgetStack* m_installWidgetStack; - - QString source; - QString target; - - QLabel* m_sourceLabel; - QLabel* m_targetLabel; - QComboBox* m_sourceCombo; - QComboBox* m_targetCombo; - - QMap<QString, QString> m_targetMap; - - CSwordSetupModuleListView* m_removeModuleListView; - QPushButton* m_removeRemoveButton; - - const bool refreshRemoteModuleCache( const QString& sourceName ); - void populateRemoveModuleListView(); - bool populateInstallModuleListView(const QString& sourceName); - - //install module stuff - QPushButton* m_installBackButton; - QPushButton* m_installContinueButton; - - QWidget* m_installModuleListPage; - QWidget* m_installSourcePage; - - CSwordSetupModuleListView* m_installModuleListView; - KProgressDialog* m_progressDialog; - QString m_installingModule; - bool m_refreshedRemoteSources; - unsigned int m_installedModuleCount; - - BTInstallMgr* m_currentInstallMgr; //pointer to the current installmgr object so we can access it in the cancel install slot - -private slots: - void slot_sourceSelected(const QString &sourceName); - void slot_targetSelected(const QString &targetName); - - void slot_doRemoveModules(); - - void slotOk(); - - void slot_connectToSource(); - void slot_moduleRefreshProgressCancelClicked(); - void slot_moduleRefreshCompleted(const int, const int); - - void slot_installAddSource(); - void slot_installDeleteSource(); - void slot_installModules(); - void slot_installModulesChanged(); - void slot_installProgressCancelClicked(); - void slot_showInstallSourcePage(); - - void installCompleted( const int, const int ); - void slot_swordRemoveClicked(); - void slot_swordAddClicked(); - void slot_swordEditClicked(); - void slot_swordPathSelected(); - -signals: // Signals - void signalSwordSetupChanged(); - }; - -} - -#endif //CSWORDSETUPDIALOG_H diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp deleted file mode 100644 index 504ab7d..0000000 --- a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp +++ /dev/null @@ -1,172 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BT includes -#include "cswordsetupinstallsourcesdialog.h" -#include "util/scoped_resource.h" - -//Qt includes -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qmessagebox.h> -#include <qfileinfo.h> - - -#include <klocale.h> -#include <kdirselectdialog.h> - -namespace BookshelfManager { - - const QString PROTO_FILE( i18n("Local") ); //Local path - const QString PROTO_FTP( i18n("Remote") ); //Remote path - - - CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *parent*/) -: QDialog() { - - QVBoxLayout* mainLayout = new QVBoxLayout( this ); - mainLayout->setMargin( 10 ); - mainLayout->setSpacing( 5 ); - - QHBoxLayout *captionLayout = new QHBoxLayout( mainLayout ); - QLabel *label = new QLabel( i18n("Caption"), this ); - captionLayout->addWidget( label ); - - m_captionEdit = new QLineEdit( this ); - m_captionEdit->setText("Crosswire Bible Society"); - captionLayout->addWidget( m_captionEdit ); - - mainLayout->addSpacing( 10 ); - - QGridLayout* layout = new QGridLayout( mainLayout, 3, 3 ); - layout->setSpacing( 5 ); - - label = new QLabel(i18n("Type"), this); - layout->addWidget( label, 0, 0); - - m_serverLabel = new QLabel(i18n("Server"), this); - layout->addWidget( m_serverLabel, 0, 1); - - label = new QLabel(i18n("Path"), this); - layout->addWidget( label, 0, 2 ); - - m_protocolCombo = new QComboBox( this ); - layout->addWidget(m_protocolCombo, 1, 0); - m_protocolCombo->insertItem( PROTO_FTP ); - m_protocolCombo->insertItem( PROTO_FILE ); - - m_serverEdit = new QLineEdit( this ); - layout->addWidget( m_serverEdit, 1, 1 ); - m_serverEdit->setText("ftp.crosswire.org"); - - m_pathEdit = new QLineEdit( this ); - layout->addWidget( m_pathEdit, 1, 2 ); - m_pathEdit->setText("/pub/sword/raw"); - - mainLayout->addSpacing( 10 ); - - QHBoxLayout* buttonLayout = new QHBoxLayout( mainLayout ); - buttonLayout->addStretch(); - QPushButton* okButton = new QPushButton( i18n("Ok"), this); - QPushButton* discardButton = new QPushButton( i18n("Discard"), this); - buttonLayout->addWidget( discardButton); - buttonLayout->addWidget( okButton); - buttonLayout->addStretch(); - - connect( okButton, SIGNAL( clicked() ), this, SLOT( slotOk() ) ); - connect( discardButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); - connect( m_protocolCombo, SIGNAL( activated(int) ), this, SLOT( slotProtocolChanged() ) ); - - } - void CSwordSetupInstallSourcesDialog::slotOk() { - //run a few tests to validate the input first - if ( m_captionEdit->text().stripWhiteSpace().isEmpty() ) { //no caption - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a caption."), QMessageBox::Retry); - return; - } - - BTInstallMgr iMgr; - sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source( &iMgr, m_captionEdit->text() ); - if ( (QString)is.caption.c_str() == m_captionEdit->text() ) { //source already exists - QMessageBox::information( this, i18n( "Error" ), - i18n("A source with this caption already exists.<br>Please provide a different caption."), QMessageBox::Retry); - return; - } - - if ( m_protocolCombo->currentText() == PROTO_FTP && - m_serverEdit->text().stripWhiteSpace().isEmpty() ) { //no server name - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a server name."), QMessageBox::Retry); - return; - } - - if ( m_protocolCombo->currentText() == PROTO_FILE) { - const QFileInfo fi( m_pathEdit->text() ); - if (!fi.exists() || !fi.isReadable()) { //no valid and readable path - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a valid, readable path."), QMessageBox::Retry); - return; - } - else if ( m_pathEdit->text().isEmpty() ) { - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a path."), QMessageBox::Retry); - - } - } - - accept(); //only if nothing else failed - } - - void CSwordSetupInstallSourcesDialog::slotProtocolChanged() { - if (m_protocolCombo->currentText() == PROTO_FTP) { //REMOTE - m_serverLabel->show(); - m_serverEdit->show(); - } - else { //LOCAL, no server needed - m_serverLabel->hide(); - m_serverEdit->hide(); - - KURL url = KDirSelectDialog::selectDirectory(QString::null, true); - if (url.isValid()) { - m_pathEdit->setText( url.path() ); - } - } - - } - - sword::InstallSource CSwordSetupInstallSourcesDialog::getSource() { - - util::scoped_ptr<CSwordSetupInstallSourcesDialog> dlg( new CSwordSetupInstallSourcesDialog() ); - sword::InstallSource newSource(""); //empty, invalid Source - - if (dlg->exec() == QDialog::Accepted) { - if (dlg->m_protocolCombo->currentText() == PROTO_FTP) { - newSource.type = "FTP"; - newSource.source = dlg->m_serverEdit->text().utf8(); - - //a message to the user would be nice, but we're in message freeze right now (1.5.1) - if (dlg->m_serverEdit->text().right(1) == "/") { //remove a trailing slash - newSource.source = dlg->m_serverEdit->text().mid(0, dlg->m_serverEdit->text().length()-1).utf8(); - } - } - else { - newSource.type = "DIR"; - newSource.source = "local"; - } - newSource.caption = dlg->m_captionEdit->text().utf8(); - newSource.directory = dlg->m_pathEdit->text().utf8(); - } - - return newSource; - } - - -} //namespace diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.h b/bibletime/frontend/cswordsetupinstallsourcesdialog.h deleted file mode 100644 index a7d039a..0000000 --- a/bibletime/frontend/cswordsetupinstallsourcesdialog.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef CSWORDSETUPINSTALLSOURCESDIALOG_H -#define CSWORDSETUPINSTALLSOURCESDIALOG_H - -#include "btinstallmgr.h" -#include <qdialog.h> - -class QLabel; -class QComboBox; -class QLineEdit; - -namespace BookshelfManager { - -class CSwordSetupInstallSourcesDialog : public QDialog { - Q_OBJECT - -public: - static sword::InstallSource getSource(); - -protected: - CSwordSetupInstallSourcesDialog(); - -protected slots: - void slotOk(); - void slotProtocolChanged(); - -private: - QLabel *m_serverLabel; - QLineEdit *m_captionEdit, *m_serverEdit, *m_pathEdit; - QComboBox *m_protocolCombo; - }; - -} //namespace - -#endif //CSWORDSETUPINSTALLSOURCESDIALOG_H diff --git a/bibletime/frontend/cswordsetupmodulelistview.cpp b/bibletime/frontend/cswordsetupmodulelistview.cpp deleted file mode 100644 index e06dc9c..0000000 --- a/bibletime/frontend/cswordsetupmodulelistview.cpp +++ /dev/null @@ -1,288 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cswordsetupmodulelistview.h" -#include "btinstallmgr.h" - -#include "backend/cswordbackend.h" -#include "backend/cswordmoduleinfo.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -//QT includes -#include <qtooltip.h> - -//KDE includes -#include <klocale.h> -#include <kiconloader.h> - -using namespace sword; - -namespace BookshelfManager { - - /** Tooltip implementation for QListView widgets. - * @short Tooltip for InstallationManager listviews - * @author Joachim Ansorg - */ - class ToolTip : public QToolTip { - public: - /** Constructor which takes the listview to operate on. - * @param listview We operate on this widget to request tooltips from it'd child items. - * @short Constructor. - */ - ToolTip(CSwordSetupModuleListView* listview) - : QToolTip( listview->viewport() ), - m_parent( listview ) {} - - /** Reimplementation of QToolTip::maybeTip. It's requested if a new tooltip may be displayed. - * @short Display a tooltip if we're over an item - */ - virtual void maybeTip(const QPoint& pos) { - QListViewItem* i = m_parent->itemAt(pos); - Q_ASSERT(i); - - const QRect rect = m_parent->itemRect(i); - if (m_parent->showTooltip(i, pos, 0)) { - const QString tipText = m_parent->tooltip(i, 0); - tip(rect, tipText); - } - } - - protected: - CSwordSetupModuleListView* m_parent; - }; - - /** Listview specially made for the installation manager. - * @short InstallationManager module listviews - * @author Martin Gruner - */ - CSwordSetupModuleListView::CSwordSetupModuleListView(QWidget *parent, bool is_remote, sword::InstallSource* installSource) - : KListView(parent), m_is_remote( is_remote ) { - Q_ASSERT(installSource); - new BookshelfManager::ToolTip(this); - m_backend = installSource ? BTInstallMgr::Tool::backend(installSource) : CPointers::backend(); - - addColumn(i18n("Name")); - setColumnWidthMode( 0, QListView::Maximum ); - setColumnWidth( 0, 200 ); //don`t get too broad - - addColumn(i18n("Status")); - setColumnAlignment(1, Qt::AlignRight); - addColumn(i18n("Installed version")); //version - setColumnAlignment(2, Qt::AlignHCenter); - - if (m_is_remote) { - addColumn(i18n("Remote version")); //version - } else { - addColumn(i18n("Location")); - } - setColumnAlignment(3, Qt::AlignLeft); - - setAllColumnsShowFocus(true); - setFullWidth(true); - setRootIsDecorated(true); - setResizeMode(QListView::LastColumn); - setTooltipColumn(0); - - init(); - } - - CSwordSetupModuleListView::~CSwordSetupModuleListView() { - if (m_is_remote) { - delete m_backend; - } - } - - void CSwordSetupModuleListView::init() { -#if QT_VERSION >= 0x030200 - m_categoryBible = new QCheckListItem(this, i18n("Bibles"), QCheckListItem::CheckBoxController); - m_categoryCommentary = new QCheckListItem(this, i18n("Commentaries"), QCheckListItem::CheckBoxController); - m_categoryLexicon = new QCheckListItem(this, i18n("Lexicons"), QCheckListItem::CheckBoxController); - m_categoryBook = new QCheckListItem(this, i18n("Books"), QCheckListItem::CheckBoxController); - m_categoryDevotionals = new QCheckListItem(this, i18n("Daily Devotionals"), QCheckListItem::CheckBoxController); - m_categoryGlossaries = new QCheckListItem(this, i18n("Glossaries"), QCheckListItem::CheckBoxController); -#else - // Qt <= 3.1.x doesn't support the CheckBoxController!, remove the define as soon as we switch to the new Qt - m_categoryBible = new QCheckListItem(this, i18n("Bibles"), QCheckListItem::Controller); - m_categoryCommentary = new QCheckListItem(this, i18n("Commentaries"), QCheckListItem::Controller); - m_categoryLexicon = new QCheckListItem(this, i18n("Lexicons"), QCheckListItem::Controller); - m_categoryBook = new QCheckListItem(this, i18n("Books"), QCheckListItem::Controller); - m_categoryDevotionals = new QCheckListItem(this, i18n("Daily Devotionals"), QCheckListItem::Controller); - m_categoryGlossaries = new QCheckListItem(this, i18n("Glossaries"), QCheckListItem::Controller); -#endif - - m_categoryBible->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - m_categoryCommentary->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - m_categoryLexicon->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - m_categoryBook->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - m_categoryDevotionals->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - m_categoryGlossaries->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - - m_categoryBible->setOpen(true); - m_categoryCommentary->setOpen(true); - m_categoryLexicon->setOpen(true); - m_categoryBook->setOpen(true); - m_categoryDevotionals->setOpen(true); - m_categoryGlossaries->setOpen(true); - - // connect(this, SIGNAL(executed(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*))); - connect(this, SIGNAL(clicked(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*))); //items have to be clicked only once in double click mode - connect(this, SIGNAL(spacePressed(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*))); - } - - void CSwordSetupModuleListView::finish() { - if (!m_categoryBible->childCount()) - delete m_categoryBible; - if (!m_categoryCommentary->childCount()) - delete m_categoryCommentary; - if (!m_categoryBook->childCount()) - delete m_categoryBook; - if (!m_categoryLexicon->childCount()) - delete m_categoryLexicon; - if (!m_categoryDevotionals->childCount()) - delete m_categoryDevotionals; - if (!m_categoryGlossaries->childCount()) - delete m_categoryGlossaries; - } - - void CSwordSetupModuleListView::clear() { - QListView::clear(); - init(); - } - - void CSwordSetupModuleListView::addModule(CSwordModuleInfo* module, QString localVersion) { - - QListViewItem* parent = 0; - switch ( module->type() ) { - case CSwordModuleInfo::Bible: - parent = m_categoryBible; - break; - case CSwordModuleInfo::Commentary: - parent = m_categoryCommentary; - break; - case CSwordModuleInfo::Lexicon: - parent = m_categoryLexicon; - break; - case CSwordModuleInfo::GenericBook: - parent = m_categoryBook; - break; - default: - parent = 0; - break; - } - - //handling for special module types - if ((parent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::Glossary)) { - parent = m_categoryGlossaries; - } - if ((parent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::DailyDevotional)) { - parent = m_categoryDevotionals; - } - - //now we know the category, find the right language group in that category - const CLanguageMgr::Language* const lang = module->language(); - QString langName = lang->translatedName(); - if (!lang->isValid()) { - langName = QString(module->module()->Lang()); - } - - QListViewItem * langFolder = 0; - if (parent) { - langFolder = parent->firstChild(); - - while( langFolder ) { //try to find language folder if it exsists - if (langFolder->text(0) == langName) { //found right folder - break; - } - - langFolder = langFolder->nextSibling(); - } - } - - if (!langFolder) { //not yet there -#if QT_VERSION >= 0x030200 - langFolder = new QCheckListItem(parent, langName, QCheckListItem::CheckBoxController); -#else - - langFolder = new QCheckListItem(parent, langName, QCheckListItem::Controller); -#endif - - langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - langFolder->setOpen(false); - } - - Q_ASSERT(langFolder); - - QListViewItem* newItem = 0; - if (langFolder) { - newItem = new QCheckListItem(langFolder, module->name(), QCheckListItem::CheckBox); - } else { //shouldn't happen - newItem = new QCheckListItem(this, module->name(), QCheckListItem::CheckBox); - } - - newItem->setPixmap(0, CToolClass::getIconForModule(module)); - if (m_is_remote) { - newItem->setText(1, localVersion.isEmpty() ? i18n("New") : i18n("Updated")); - } else { - newItem->setText(1, i18n("Installed") ); - } - - newItem->setText(2, localVersion); - if (m_is_remote) { - newItem->setText(3, module->config(CSwordModuleInfo::ModuleVersion)); - } else { - newItem->setText(3, module->config(CSwordModuleInfo::AbsoluteDataPath)); - } - } - - QStringList CSwordSetupModuleListView::selectedModules() { - QStringList moduleList; - - QListViewItemIterator list_it( this ); - while ( list_it.current() ) { - QCheckListItem* i = dynamic_cast<QCheckListItem*>( list_it.current() ); - if (i && i->isOn() && i->type() == QCheckListItem::CheckBox ) { - moduleList << i->text(0); - } - ++list_it; - } - - return moduleList; - } - - void CSwordSetupModuleListView::slotItemClicked(QListViewItem*) { - emit selectedModulesChanged(); - } - - bool CSwordSetupModuleListView::showTooltip(QListViewItem* i, const QPoint&, int) const { - QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>( i ); - Q_ASSERT(checkItem); - - return (checkItem && (checkItem->type() == QCheckListItem::CheckBox)); - } - - QString CSwordSetupModuleListView::tooltip(QListViewItem* i, int /*column*/) const { - QString ret; - QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>( i ); - - if (checkItem && (checkItem->type() == QCheckListItem::CheckBox)) { - const QString moduleName = checkItem->text(0); - CSwordModuleInfo* module = m_backend->findModuleByName(moduleName); - - ret = CToolClass::moduleToolTip(module); - } - - return ret; - } - -} //NAMESPACE - diff --git a/bibletime/frontend/cswordsetupmodulelistview.h b/bibletime/frontend/cswordsetupmodulelistview.h deleted file mode 100644 index 1c7cac5..0000000 --- a/bibletime/frontend/cswordsetupmodulelistview.h +++ /dev/null @@ -1,67 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSWORDMODULELISTVIEW_H -#define CSWORDMODULELISTVIEW_H - -//Sword includes -#include <installmgr.h> - -//QT includes -#include <qstring.h> -#include <qmap.h> - -//KDE includes -#include <klistview.h> - -class CSwordModuleInfo; -class CSwordBackend; - -namespace BookshelfManager { - -class CSwordSetupModuleListView : public KListView { - Q_OBJECT - -public: - CSwordSetupModuleListView(QWidget* parent, bool is_remote, sword::InstallSource* installSource = 0); - virtual ~CSwordSetupModuleListView(); - - void addModule(CSwordModuleInfo *, QString localVersion); - void finish(); - QStringList selectedModules(); - void clear(); - - virtual QString tooltip(QListViewItem* i, int column) const; - virtual bool showTooltip(QListViewItem* i, const QPoint& pos, int column) const; - -protected slots: - void slotItemClicked(QListViewItem*); - -private: - void init(); - - CSwordBackend* m_backend; - bool m_is_remote; - - QListViewItem* m_categoryBible; - QListViewItem* m_categoryCommentary; - QListViewItem* m_categoryLexicon; - QListViewItem* m_categoryBook; - QListViewItem* m_categoryDevotionals; - QListViewItem* m_categoryGlossaries; - -signals: - void selectedModulesChanged(); -}; - -} //NAMESPACE - -#endif //CSWORDMODULELISTVIEW_H diff --git a/bibletime/frontend/display/Makefile.am b/bibletime/frontend/display/Makefile.am deleted file mode 100644 index 7a79921..0000000 --- a/bibletime/frontend/display/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDES = $(all_includes) - -libdisplay_a_METASOURCES = AUTO - -noinst_LIBRARIES = libdisplay.a - -libdisplay_a_SOURCES = \ -cdisplay.cpp \ -creaddisplay.cpp \ -chtmlreaddisplay.cpp \ -cwritedisplay.cpp \ -cplainwritedisplay.cpp \ -chtmlwritedisplay.cpp - -all_headers = \ -cdisplay.h \ -creaddisplay.h \ -chtmlreaddisplay.h \ -cwritedisplay.h \ -cplainwritedisplay.h \ -chtmlwritedisplay.h - -EXTRA_DIST = $(libdisplay_a_SOURCES) $(all_headers) - diff --git a/bibletime/frontend/display/Makefile.in b/bibletime/frontend/display/Makefile.in deleted file mode 100644 index 1356cea..0000000 --- a/bibletime/frontend/display/Makefile.in +++ /dev/null @@ -1,754 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/frontend/display -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libdisplay_a_AR = $(AR) $(ARFLAGS) -libdisplay_a_LIBADD = -am_libdisplay_a_OBJECTS = cdisplay.$(OBJEXT) creaddisplay.$(OBJEXT) \ - chtmlreaddisplay.$(OBJEXT) cwritedisplay.$(OBJEXT) \ - cplainwritedisplay.$(OBJEXT) chtmlwritedisplay.$(OBJEXT) -#>- libdisplay_a_OBJECTS = $(am_libdisplay_a_OBJECTS) -#>+ 7 -libdisplay_a_final_OBJECTS = libdisplay_a.all_cpp.o -libdisplay_a_nofinal_OBJECTS = cdisplay.$(OBJEXT) creaddisplay.$(OBJEXT) \ - chtmlreaddisplay.$(OBJEXT) cwritedisplay.$(OBJEXT) \ - cplainwritedisplay.$(OBJEXT) chtmlwritedisplay.$(OBJEXT)\ -chtmlreaddisplay.moc.o chtmlwritedisplay.moc.o cdisplay.moc.o -@KDE_USE_FINAL_FALSE@libdisplay_a_OBJECTS = $(libdisplay_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libdisplay_a_OBJECTS = $(libdisplay_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libdisplay_a_SOURCES) -DIST_SOURCES = $(libdisplay_a_SOURCES) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libdisplay_a_METASOURCES = AUTO -noinst_LIBRARIES = libdisplay.a -libdisplay_a_SOURCES = \ -cdisplay.cpp \ -creaddisplay.cpp \ -chtmlreaddisplay.cpp \ -cwritedisplay.cpp \ -cplainwritedisplay.cpp \ -chtmlwritedisplay.cpp - -all_headers = \ -cdisplay.h \ -creaddisplay.h \ -chtmlreaddisplay.h \ -cwritedisplay.h \ -cplainwritedisplay.h \ -chtmlwritedisplay.h - -EXTRA_DIST = $(libdisplay_a_SOURCES) $(all_headers) -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/display/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/frontend/display/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/display/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/display/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/display/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libdisplay.a: $(libdisplay_a_OBJECTS) $(libdisplay_a_DEPENDENCIES) - -rm -f libdisplay.a - $(libdisplay_a_AR) libdisplay.a $(libdisplay_a_OBJECTS) $(libdisplay_a_LIBADD) - $(RANLIB) libdisplay.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlreaddisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlwritedisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cplainwritedisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creaddisplay.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwritedisplay.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-metasources clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 3 -chtmlreaddisplay.moc.cpp: $(srcdir)/chtmlreaddisplay.h - $(MOC) $(srcdir)/chtmlreaddisplay.h -o chtmlreaddisplay.moc.cpp - -#>+ 2 -mocs: chtmlreaddisplay.moc.cpp - -#>+ 3 -chtmlwritedisplay.moc.cpp: $(srcdir)/chtmlwritedisplay.h - $(MOC) $(srcdir)/chtmlwritedisplay.h -o chtmlwritedisplay.moc.cpp - -#>+ 2 -mocs: chtmlwritedisplay.moc.cpp - -#>+ 3 -cdisplay.moc.cpp: $(srcdir)/cdisplay.h - $(MOC) $(srcdir)/cdisplay.h -o cdisplay.moc.cpp - -#>+ 2 -mocs: cdisplay.moc.cpp - -#>+ 3 -clean-metasources: - -rm -f chtmlreaddisplay.moc.cpp chtmlwritedisplay.moc.cpp cdisplay.moc.cpp - -#>+ 2 -KDE_DIST=creaddisplay.h chtmlwritedisplay.h cdisplay.h cwritedisplay.h Makefile.in cplainwritedisplay.h chtmlreaddisplay.h Makefile.am - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/display/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/display/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/display/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libdisplay_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cdisplay.cpp $(srcdir)/creaddisplay.cpp $(srcdir)/chtmlreaddisplay.cpp $(srcdir)/cwritedisplay.cpp $(srcdir)/cplainwritedisplay.cpp $(srcdir)/chtmlwritedisplay.cpp chtmlreaddisplay.moc.cpp chtmlwritedisplay.moc.cpp cdisplay.moc.cpp - @echo 'creating libdisplay_a.all_cpp.cpp ...'; \ - rm -f libdisplay_a.all_cpp.files libdisplay_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libdisplay_a.all_cpp.final; \ - for file in cdisplay.cpp creaddisplay.cpp chtmlreaddisplay.cpp cwritedisplay.cpp cplainwritedisplay.cpp chtmlwritedisplay.cpp chtmlreaddisplay.moc.cpp chtmlwritedisplay.moc.cpp cdisplay.moc.cpp ; do \ - echo "#include \"$$file\"" >> libdisplay_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdisplay_a.all_cpp.final; \ - done; \ - cat libdisplay_a.all_cpp.final libdisplay_a.all_cpp.files > libdisplay_a.all_cpp.cpp; \ - rm -f libdisplay_a.all_cpp.final libdisplay_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libdisplay_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp deleted file mode 100644 index ce97e02..0000000 --- a/bibletime/frontend/display/cdisplay.cpp +++ /dev/null @@ -1,216 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cdisplay.h" -#include "chtmlreaddisplay.h" -#include "cplainwritedisplay.h" -#include "chtmlwritedisplay.h" - -#include "backend/creferencemanager.h" - -#include "util/ctoolclass.h" - - -//Qt includes -#include <qclipboard.h> -#include <qpopupmenu.h> -#include <qtimer.h> - -//KDE includes -#include <kapplication.h> -#include <kfiledialog.h> -#include <klocale.h> - - -CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {} - -void CDisplayConnections::selectAll() { - m_display->selectAll(); -} - -void CDisplayConnections::saveAsHTML() { - m_display->save(CDisplay::HTMLText, CDisplay::Document); -} - -void CDisplayConnections::saveAsPlain() { - m_display->save(CDisplay::PlainText, CDisplay::Document); -} - -/** Emits the signal. */ -void CDisplayConnections::emitReferenceClicked( const QString& module, const QString& key) { - emit referenceClicked( module, key ); -} - -/** Emits the signal. */ -void CDisplayConnections::emitReferenceDropped( const QString& key) { - emit referenceDropped(key); -} - -/** Emits the signal. */ -void CDisplayConnections::emitTextChanged() { - emit textChanged(); -} - -void CDisplayConnections::copyAll() { - m_display->copy(CDisplay::PlainText, CDisplay::Document); -} - -/** No descriptions */ -void CDisplayConnections::copySelection() { - qWarning("copyign the selected text"); - m_display->copy(CDisplay::PlainText, CDisplay::SelectedText); -} - -void CDisplayConnections::printAll(CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { - m_display->print(CDisplay::Document, displayOptions, filterOptions); -} - -void CDisplayConnections::printAnchorWithText(CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { - m_display->print(CDisplay::AnchorWithText, displayOptions, filterOptions); -} - -void CDisplayConnections::copyAnchorOnly() { - m_display->copy(CDisplay::PlainText, CDisplay::AnchorOnly); -} - -void CDisplayConnections::copyAnchorTextOnly() { - m_display->copy(CDisplay::PlainText, CDisplay::AnchorTextOnly); -} - -void CDisplayConnections::copyAnchorWithText() { - m_display->copy(CDisplay::PlainText, CDisplay::AnchorWithText); -} - -void CDisplayConnections::saveAnchorWithText() { - m_display->save(CDisplay::PlainText, CDisplay::AnchorWithText); -} - -void CDisplayConnections::clear() { - m_display->setText(QString::null); -} - -void CDisplayConnections::zoomIn() { - m_display->zoomIn(); -} - -void CDisplayConnections::zoomOut() { - m_display->zoomOut(); -} - -void CDisplayConnections::openFindTextDialog() { - m_display->openFindTextDialog(); -} - - -/*----------------------*/ - -CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, QWidget* parent ) { - return new CHTMLReadDisplay(readWindow, parent); -} - -CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, QWidget* parent ) { - // qWarning("CDisplay::createWriteInstance"); - if (type == PlainTextDisplay) { - return new CPlainWriteDisplay(writeWindow, parent); - } - else { - return new CHTMLWriteDisplay(writeWindow, parent); - }; -} - - -CDisplay::CDisplay(CDisplayWindow* parent) : -m_parentWindow(parent), -m_connections( new CDisplayConnections( this ) ), -m_popup(0) {} - -CDisplay::~CDisplay() { - delete m_connections; -} - -const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part ) { - const QString content = text(format, part); - - QClipboard* cb = KApplication::clipboard(); - cb->setText(content); - return true; -} - -const bool CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part ) { - // qWarning("CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part )"); - const QString content = text(format, part); - QString filter = QString::null; - - switch (format) { - case HTMLText: - filter = QString("*.html *.htm | ") + i18n("HTML files") + QString("\n *.* | All files (*.*)"); - break; - case PlainText: - filter = QString("*.txt | ") + i18n("Text files") + QString("\n *.* | All files (*.*)"); - break; - }; - - const QString filename = KFileDialog::getSaveFileName(QString::null, filter, 0, i18n("Save document ...")); - - if (!filename.isEmpty()) { - CToolClass::savePlainFile(filename, content); - } - return true; -} - -/** Emits the signal which used when a reference was clicked. */ -void CDisplay::emitReferenceClicked( const QString& reference ) { - qWarning("reference clicked %s", reference.latin1()); - QString module; - QString key; - CReferenceManager::Type type; - /*const bool ok = */ - CReferenceManager::decodeHyperlink(reference, module, key, type); - if (module.isEmpty()) { - module = CReferenceManager::preferredModule( type ); - } - m_connections->emitReferenceClicked(module, key); -} - -/** Used when a reference was dropped onto the widget. */ -void CDisplay::emitReferenceDropped( const QString& reference ) { - QString module; - QString key; - CReferenceManager::Type type; - /*const bool ok = */ - CReferenceManager::decodeHyperlink(reference, module, key, type); - // if (module.isEmpty()) { - // module = CReferenceManager::preferredModule( type ); - // } - - m_connections->emitReferenceDropped(key); -} - -/** Returns the connections obect used for signas and slots. */ -CDisplayConnections* const CDisplay::connectionsProxy() const { - return m_connections; -} - -CDisplayWindow* const CDisplay::parentWindow() const { - return m_parentWindow; -} - -/** Installs the popup which should be opened when the right mouse button was pressed. */ -void CDisplay::installPopup( QPopupMenu* popup ) { - m_popup = popup; -} - -/** Returns the popup menu which was set by installPopupMenu() */ -QPopupMenu* const CDisplay::installedPopup() { - Q_ASSERT(m_popup); - return m_popup; -} - diff --git a/bibletime/frontend/display/cdisplay.h b/bibletime/frontend/display/cdisplay.h deleted file mode 100644 index d37692c..0000000 --- a/bibletime/frontend/display/cdisplay.h +++ /dev/null @@ -1,189 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CDISPLAY_H -#define CDISPLAY_H - -//BibleTime includes -#include "util/cpointers.h" -#include "backend/cswordbackend.h" - -//Qt includes -#include <qobject.h> -#include <qstring.h> -#include <qmap.h> - - -class CDisplayConnections; -class CReadWindow; -class CWriteWindow; - -class CDisplayWindow; -class CReadDisplay; -class CWriteDisplay; - - -class QPopupMenu; - -/** The base class for all display widgets. - * @author The BibleTime team - */ -class CDisplay : public CPointers { -public: - enum WriteDisplayType { - HTMLDisplay = 0, - PlainTextDisplay - }; - - static CReadDisplay* createReadInstance(CReadWindow* readWindow, QWidget* parent = 0); - static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, QWidget* parent = 0 ); - - enum TextType { - HTMLText, /* Used for HTML markup */ - PlainText /* Plain text without links etc. */ - }; - enum TextPart { - Document, /* All text */ - SelectedText, /* Only the selected text */ - AnchorOnly, - AnchorTextOnly, - AnchorWithText - }; - - /** - * Copies the given text with the specified format into the applications clipboard. - */ - virtual const bool copy( const CDisplay::TextType format, const CDisplay::TextPart part ); - /** - * Saves the given text with the specified format into the applications clipboard. - */ - virtual const bool save( const CDisplay::TextType format, const CDisplay::TextPart part ); - - //the pure virtual methods of this base class - - /** Returns the text in the given format. - * - */ - virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ) = 0; - /** - * Sets the new text for this display widget. - */ - virtual void setText( const QString& newText ) = 0; - /** - * Returns true if the display widget has a selection. Otherwise false. - */ - virtual const bool hasSelection() = 0; - /** - * Returns the view of this display widget. - */ - virtual QWidget* view() = 0; - /** - * Selects the document text. - */ - virtual void selectAll() = 0; - /** - * Returns the connections obect used for signas and slots. - */ - virtual CDisplayConnections* const connectionsProxy() const; - /** - * Returns the parent window used for this display widget. - */ - CDisplayWindow* const parentWindow() const; - virtual void print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) = 0; - /** - * Installs the popup which should be opened when the right mouse button was pressed. - */ - void installPopup( QPopupMenu* popup ); - /** - * Returns the popup menu which was set by installPopupMenu() - */ - QPopupMenu* const installedPopup(); - - virtual void zoomIn() {} - virtual void zoomOut() {} - virtual void openFindTextDialog() {} - - enum NodeInfoType { - Lemma - }; - - - virtual QMap<NodeInfoType, QString> getCurrentNodeInfo() { - return QMap<NodeInfoType, QString>(); - } - -protected: - /** - * Used when a reference was dropped onto the widget. - */ - void emitReferenceDropped( const QString& reference ); - /** - * Emits the signal which used when a reference was clicked. - */ - void emitReferenceClicked( const QString& reference ); - -protected: - CDisplay(CDisplayWindow* parent); - virtual ~CDisplay(); - -private: - CDisplayWindow* m_parentWindow; - CDisplayConnections* m_connections; - QPopupMenu* m_popup; -}; - -class CDisplayConnections : public QObject { - Q_OBJECT -public: - CDisplayConnections( CDisplay* parent ); - -public slots: - virtual void selectAll(); - void emitReferenceClicked( const QString& module, const QString& key); - void emitReferenceDropped( const QString& key ); - void emitTextChanged(); - - //stuff which works in every CDisplay - void saveAsPlain(); - void saveAsHTML(); - void saveAnchorWithText(); - - void printAll(CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - void printAnchorWithText(CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - - void copySelection(); - void copyAll(); - void copyAnchorWithText(); - void copyAnchorTextOnly(); - void copyAnchorOnly(); - - void clear(); - - void zoomIn(); - void zoomOut(); - - void openFindTextDialog(); - -signals: - void referenceClicked(const QString& module, const QString& key); - void referenceDropped(const QString& key); - void textChanged(); - -private: - CDisplay* m_display; - - struct { - QString module; - QString key; - } m_referenceClickedCache; -}; - -#endif diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp deleted file mode 100644 index 4219f33..0000000 --- a/bibletime/frontend/display/chtmlreaddisplay.cpp +++ /dev/null @@ -1,507 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "chtmlreaddisplay.h" - -#include "frontend/displaywindow/cdisplaywindow.h" -#include "frontend/displaywindow/creadwindow.h" -#include "backend/creferencemanager.h" -#include "backend/cswordkey.h" - -#include "frontend/cbtconfig.h" -#include "frontend/cdragdropmgr.h" -#include "frontend/cinfodisplay.h" - -#include "util/ctoolclass.h" -#include "util/cpointers.h" -#include "util/scoped_resource.h" - -//We will need to reference this in the Qt includes -#include <kdeversion.h> - -//Qt includes -#include <qcursor.h> -#include <qscrollview.h> -#include <qwidget.h> -#include <qdragobject.h> -#include <qpopupmenu.h> -#include <qlayout.h> -#include <qtimer.h> -#if KDE_VERSION < 0x030300 -//We will need to show the error message. -#include <qmessagebox.h> -#endif - -//KDE includes -#include <kapplication.h> -#include <khtmlview.h> -#include <kglobalsettings.h> -#include <khtml_events.h> - -#include <dom/dom2_range.h> -#include <dom/html_element.h> -#include <dom/dom2_traversal.h> - -using namespace InfoDisplay; - -CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, QWidget* parentWidget) -: KHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), readWindow ? readWindow : parentWidget), -CReadDisplay(readWindow), -m_currentAnchorCache(QString::null) { - setDNDEnabled(false); - setJavaEnabled(false); - setJScriptEnabled(false); - setPluginsEnabled(false); - - m_view->setDragAutoScroll(false); - -} - -CHTMLReadDisplay::~CHTMLReadDisplay() {} - -const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDisplay::TextPart part) { - - switch (part) { - case Document: { - if (format == HTMLText) { - return document().toHTML(); - } - else { - CDisplayWindow* window = parentWindow(); - CSwordKey* const key = window->key(); - CSwordModuleInfo* module = key->module(); - //return htmlDocument().body().innerText().string().latin1(); - //This function is never used for Bibles, so it is not - //implemented. If it should be, see CReadDisplay::print() for - //example code. - Q_ASSERT(module->type() == CSwordModuleInfo::Lexicon || module->type() == CSwordModuleInfo::Commentary || module->type() == CSwordModuleInfo::GenericBook); - if (module->type() == CSwordModuleInfo::Lexicon || module->type() == CSwordModuleInfo::Commentary || module->type() == CSwordModuleInfo::GenericBook) { - //TODO: This is a BAD HACK, we have to fnd a better solution to manage the settings now - CSwordBackend::FilterOptions filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CPointers::backend()->setFilterOptions(filterOptions); - - return QString(key->strippedText()).append("\n(") - .append(key->key()) - .append(", ") - .append(key->module()->name()) - .append(")"); - } - } - } - - case SelectedText: { - if (!hasSelection()) { - return QString::null; - } - else if (format == HTMLText) { - DOM::Range range = selection(); - return range.toHTML().string(); - } - else { //plain text requested - return selectedText(); - } - } - - case AnchorOnly: { - QString moduleName; - QString keyName; - CReferenceManager::Type type; - CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type); - - return keyName; - } - - case AnchorTextOnly: { - QString moduleName; - QString keyName; - CReferenceManager::Type type; - CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type); - - if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) { - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); - key->key( keyName ); - - return key->strippedText(); - } - return QString::null; - } - - case AnchorWithText: { - QString moduleName; - QString keyName; - CReferenceManager::Type type; - CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type); - - if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) { - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); - key->key( keyName ); - - //TODO: This is a BAD HACK, we have to fnd a better solution to manage the settings now - CSwordBackend::FilterOptions filterOptions; - filterOptions.footnotes = false; - filterOptions.strongNumbers = false; - filterOptions.morphTags = false; - filterOptions.lemmas = false; - filterOptions.scriptureReferences = false; - filterOptions.textualVariants = false; - - CPointers::backend()->setFilterOptions(filterOptions); - - return QString(key->strippedText()).append("\n(") - .append(key->key()) - .append(", ") - .append(key->module()->name()) - .append(")"); - /* ("%1\n(%2, %3)") - .arg() - .arg(key->key()) - .arg(key->module()->name());*/ - } - return QString::null; - } - default: - return QString::null; - } -} - -void CHTMLReadDisplay::setText( const QString& newText ) { - begin(); - write(newText); - end(); -} - -/** No descriptions */ -const bool CHTMLReadDisplay::hasSelection() { - return KHTMLPart::hasSelection(); -} - - -/** Reimplementation. */ -QScrollView* CHTMLReadDisplay::view() { - return KHTMLPart::view(); -} - -void CHTMLReadDisplay::selectAll() { - KHTMLPart::selectAll(); -} - -/** No descriptions */ -void CHTMLReadDisplay::moveToAnchor( const QString& anchor ) { - m_currentAnchorCache = anchor; - - //This is an ugly hack to work around a KDE problem in KDE including 3.3.1 (no later versions tested so far) - QTimer::singleShot(0, this, SLOT(slotGoToAnchor())); - - // instead of: - // slotGoToAnchor(); -} - -void CHTMLReadDisplay::urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args) { - KHTMLPart::urlSelected(url, button, state, _target, args); - m_urlWorkaroundData.doWorkaround = false; - // qWarning("clicked: %s", url.latin1()); - if (!url.isEmpty() && CReferenceManager::isHyperlink(url)) { - QString module; - QString key; - CReferenceManager::Type type; - - CReferenceManager::decodeHyperlink(url, module, key, type); - if (module.isEmpty()) { - module = CReferenceManager::preferredModule( type ); - } - - // we have to use this workaround, otherwise the widget would scroll because it was interrupted - // between mouseClick and mouseRelease (I guess) - m_urlWorkaroundData.doWorkaround = true; - m_urlWorkaroundData.url = url; - m_urlWorkaroundData.state = state; - m_urlWorkaroundData.button = button; - m_urlWorkaroundData.target = _target; - m_urlWorkaroundData.args = args; - m_urlWorkaroundData.module = module; - m_urlWorkaroundData.key = key; - } - else if (!url.isEmpty() && (url.left(1) == "#")) { //anchor - moveToAnchor(url.mid(1)); - } - else if (url.left(7) == "http://") { //open the bowser configured by kdeb - KApplication::kApplication()->invokeBrowser( url ); //ToDo: Not yet tested - } -} - -/** Reimplementation. */ -void CHTMLReadDisplay::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ) { - KHTMLPart::khtmlMouseReleaseEvent(event); - - m_dndData.mousePressed = false; - m_dndData.isDragging = false; - m_dndData.node = DOM::Node(); - m_dndData.anchor = DOM::DOMString(); - - if (m_urlWorkaroundData.doWorkaround) { - m_urlWorkaroundData.doWorkaround = false; - connectionsProxy()->emitReferenceClicked( - m_urlWorkaroundData.module, - m_urlWorkaroundData.key - ); - } -} - -void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ) { - m_dndData.node = DOM::Node(); - m_dndData.anchor = DOM::DOMString(); - m_dndData.mousePressed = false; - m_dndData.isDragging = false; - - if (event->qmouseEvent()->button() == Qt::RightButton) { - DOM::Node tmpNode = event->innerNode(); - DOM::Node attr; - m_nodeInfo[CDisplay::Lemma] = QString::null; - - do { - if (!tmpNode.isNull() && (tmpNode.nodeType() == - DOM::Node::ELEMENT_NODE) && tmpNode.hasAttributes()) { - attr = tmpNode.attributes().getNamedItem("lemma"); - if (!attr.isNull()) { - m_nodeInfo[ CDisplay::Lemma ] = attr.nodeValue().string(); - break; - } - } - tmpNode = tmpNode.parentNode(); - } while ( !tmpNode.isNull() ); - - setActiveAnchor( event->url().string() ); - } - else if (event->qmouseEvent()->button() == Qt::LeftButton) { - m_dndData.node = event->innerNode(); - m_dndData.anchor = event->url(); - m_dndData.mousePressed = true; - m_dndData.isDragging = false; - m_dndData.startPos = QPoint(event->x(), event->y()); - m_dndData.selection = selectedText(); - - if (!m_dndData.node.isNull()) { //we drag a valid link - m_dndData.dragType = DNDData::Link; - } - } - - KHTMLPart::khtmlMousePressEvent(event); -} - -/** Reimplementation for our drag&drop system. Also needed for the mouse tracking */ -void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) { - if( e->qmouseEvent()->state() & LeftButton == LeftButton) { //left mouse button pressed - const int delay = KGlobalSettings::dndEventDelay(); - QPoint newPos = QPoint(e->x(), e->y()); - - if ( (newPos.x() > m_dndData.startPos.x()+delay || newPos.x() < (m_dndData.startPos.x()-delay) || - newPos.y() > m_dndData.startPos.y()+delay || newPos.y() < (m_dndData.startPos.y()-delay)) && - !m_dndData.isDragging && m_dndData.mousePressed ) { - QDragObject* d = 0; - if (!m_dndData.anchor.isEmpty() && (m_dndData.dragType == DNDData::Link) && !m_dndData.node.isNull() ) { - // create a new bookmark drag! - QString module = QString::null; - QString key = QString::null; - CReferenceManager::Type type; - if ( !CReferenceManager::decodeHyperlink(m_dndData.anchor.string(), module, key, type) ) - return; - - CDragDropMgr::ItemList dndItems; - //no description! - dndItems.append( CDragDropMgr::Item(module, key, QString::null) ); - d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport()); - } - else if ((m_dndData.dragType == DNDData::Text) && !m_dndData.selection.isEmpty()) { - // create a new plain text drag! - CDragDropMgr::ItemList dndItems; - dndItems.append( CDragDropMgr::Item(m_dndData.selection) ); //no description! - d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport()); - } - - if (d) { - m_dndData.isDragging = true; - m_dndData.mousePressed = false; - - //first make a virtual mouse click to end the selection, it it's in progress - QMouseEvent e(QEvent::MouseButtonRelease, QPoint(0,0), Qt::LeftButton, Qt::LeftButton); - KApplication::sendEvent(view()->viewport(), &e); - d->drag(); - } - } - } - else if (getMouseTracking() && !(e->qmouseEvent()->state() & Qt::ShiftButton == Qt::ShiftButton)) { - //no mouse button pressed and tracking enabled - DOM::Node node = e->innerNode(); - //if no link was under the mouse try to find a title attribute - if (!node.isNull() && (m_previousEventNode != node)) { - // we want to avoid processing the node again - // After some millisecs the new timer activates the Mag window update, see timerEvent() - // SHIFT key not pressed, so we start timer - if ( !(e->qmouseEvent()->state() & Qt::ShiftButton)) { - // QObject has simple timer - killTimers(); - startTimer( CBTConfig::get(CBTConfig::magDelay) ); - } - - m_previousEventNode = node; - } - } - - KHTMLPart::khtmlMouseMoveEvent(e); -} - -/** The Mag window update happens here if the mouse has not moved to another node after starting the timer.*/ -void CHTMLReadDisplay::timerEvent( QTimerEvent *e ) { - killTimers(); - DOM::Node currentNode = nodeUnderMouse(); - CInfoDisplay::ListInfoData infoList; - - // Process the node under cursor if it is the same as at the start of the timer - if (!currentNode.isNull() && (currentNode != m_previousEventNode) && this->view()->hasMouse()) { - DOM::Node attr; - do { - if (!currentNode.isNull() && (currentNode.nodeType() == DOM::Node::ELEMENT_NODE) && currentNode.hasAttributes()) { //found right node - attr = currentNode.attributes().getNamedItem("note"); - if (!attr.isNull()) { - infoList.append( qMakePair(CInfoDisplay::Footnote, attr.nodeValue().string()) ); - } - - attr = currentNode.attributes().getNamedItem("lemma"); - if (!attr.isNull()) { - infoList.append( qMakePair(CInfoDisplay::Lemma, attr.nodeValue().string()) ); - } - - attr = currentNode.attributes().getNamedItem("morph"); - if (!attr.isNull()) { - infoList.append( qMakePair(CInfoDisplay::Morph, attr.nodeValue().string()) ); - } - - attr = currentNode.attributes().getNamedItem("expansion"); - if (!attr.isNull()) { - infoList.append( qMakePair(CInfoDisplay::Abbreviation, attr.nodeValue().string()) ); - } - - attr = currentNode.attributes().getNamedItem("crossrefs"); - if (!attr.isNull()) { - infoList.append( qMakePair(CInfoDisplay::CrossReference, attr.nodeValue().string()) ); - } - } - - currentNode = currentNode.parentNode(); - if (!currentNode.isNull() && currentNode.hasAttributes()) { - attr = currentNode.attributes().getNamedItem("class"); - if (!attr.isNull() && (attr.nodeValue().string() == "entry") || (attr.nodeValue().string() == "currententry") ) { - break; - } - } - } - while ( !currentNode.isNull() ); - } - - // Update the mag if there is new content - if (!(infoList.isEmpty())) { - CPointers::infoDisplay()->setInfo(infoList); - } - -} - -// --------------------- - -CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, QWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) { - viewport()->setAcceptDrops(true); - setMarginWidth(4); - setMarginHeight(4); -}; - - -/** Opens the popupmenu at the given position. */ -void CHTMLReadDisplayView::popupMenu( const QString& url, const QPoint& pos) { - if (!url.isEmpty()) { - m_display->setActiveAnchor(url); - } - if (QPopupMenu* popup = m_display->installedPopup()) { - popup->exec(pos); - } -} - -/** Reimplementation from QScrollView. Sets the right slots */ -void CHTMLReadDisplayView::polish() { - KHTMLView::polish(); - connect( part(), SIGNAL(popupMenu(const QString&, const QPoint&)), - this, SLOT(popupMenu(const QString&, const QPoint&))); -} - -/** Reimplementatiob from QScrollView. */ -void CHTMLReadDisplayView::contentsDropEvent( QDropEvent* e ) { - if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) { - CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e); - CDragDropMgr::Item item = dndItems.first(); - e->acceptAction(); - - m_display->connectionsProxy()->emitReferenceDropped(item.bookmarkKey()); - return; - }; - - //don't accept the action! - e->acceptAction(false); - e->ignore(); -} - -/** Reimplementation from QScrollView. */ -void CHTMLReadDisplayView::contentsDragEnterEvent( QDragEnterEvent* e ) { - if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) { - e->acceptAction(); - return; - } - - e->acceptAction(false); - e->ignore(); -} - -/*! -\fn CHTMLReadDisplay::slotPageLoaded() -*/ -void CHTMLReadDisplay::slotGoToAnchor() { - if (!m_currentAnchorCache.isEmpty()) { - if (!gotoAnchor( m_currentAnchorCache ) ) { - qDebug("anchor %s not present!", m_currentAnchorCache.latin1()); - } - } - m_currentAnchorCache = QString::null; -} - -void CHTMLReadDisplay::zoomIn() { - setZoomFactor( (int)((float)zoomFactor()*1.1) ); -} - -void CHTMLReadDisplay::zoomOut() { - setZoomFactor( (int)((float)zoomFactor()*(1.0/1.1)) ); -} - -void CHTMLReadDisplay::openFindTextDialog() { -#if KDE_VERSION >= 0x030300 - findText(); -#else - QMessageBox::information(0, "Not Supported", - "This copy of BibleTime was built against a version of KDE older\n" - "than 3.3 (probably due to your distro), so this search feature\n" - "does not work.\n\n" - "This is a known issue. If we do not have a fix for the next\n" - "version of BibleTime, we will remove the option."); -#endif -} diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h deleted file mode 100644 index 5b875cf..0000000 --- a/bibletime/frontend/display/chtmlreaddisplay.h +++ /dev/null @@ -1,144 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CHTMLREADDISPLAY_H -#define CHTMLREADDISPLAY_H - -//BibleTime includes -#include "creaddisplay.h" -//#include "frontend/ctooltip.h" - -//Qt includes -#include <qstring.h> -#include <qwidget.h> - -//KDE includes -#include <khtml_part.h> -#include <khtmlview.h> -#include <kparts/browserextension.h> - -class CHTMLReadDisplayView; - -/** The implementation for the HTML read display. - * @author The BibleTime team - */ -class CHTMLReadDisplay : public KHTMLPart, public CReadDisplay { - Q_OBJECT -public: - //reimplemented functions from CDisplay - /** - * Returns the right text part in the specified format. - */ - virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ); - /** - * Sets the new text for this display widget. - */ - virtual void setText( const QString& newText ); - virtual const bool hasSelection(); - /** - * Reimplementation. - */ - virtual QScrollView* view(); - virtual void selectAll(); - virtual void moveToAnchor( const QString& anchor ); - - virtual void zoomIn(); - virtual void zoomOut(); - virtual void openFindTextDialog(); - - virtual QMap<CDisplay::NodeInfoType, QString> getCurrentNodeInfo() { - return m_nodeInfo; - } - -protected: - friend class CDisplay; - CHTMLReadDisplay( CReadWindow* readWindow, QWidget* parent = 0 ); - virtual ~CHTMLReadDisplay(); - - virtual void urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args); - /** - * Reimplementation. - */ - virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ); - virtual void khtmlMousePressEvent( khtml::MousePressEvent* event ); - virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent* event ); - virtual void timerEvent(QTimerEvent *event); - - - struct DNDData { - bool mousePressed; - bool isDragging; - DOM::Node node; - DOM::DOMString anchor; - QString selection; - QPoint startPos; - enum DragType { - Link, - Text - } dragType; - } - m_dndData; - - QMap<NodeInfoType, QString> m_nodeInfo; - -private: - CHTMLReadDisplayView* m_view; - struct URLWorkaroundData { - bool doWorkaround; - QString url; - int button; - int state; - QString target; - KParts::URLArgs args; - - QString module; - QString key; - } - m_urlWorkaroundData; - - DOM::Node m_previousEventNode; - QString m_currentAnchorCache; - -protected slots: - void slotGoToAnchor(); -}; - -class CHTMLReadDisplayView : public KHTMLView, public CPointers { - Q_OBJECT -protected: // Protected methods - friend class CHTMLReadDisplay; - - - CHTMLReadDisplayView(CHTMLReadDisplay* display, QWidget* parent); - /** - * Reimplementation from QScrollView. Sets the right slots - */ - virtual void polish(); - /** - * Reimplementatiob from QScrollView. - */ - virtual void contentsDropEvent( QDropEvent* ); - /** - * Reimplementatiob from QScrollView. - */ - virtual void contentsDragEnterEvent( QDragEnterEvent* ); - -protected slots: // Protected slots - /** - * Opens the popupmenu at the given position. - */ - void popupMenu( const QString&, const QPoint& ); - -private: - CHTMLReadDisplay* m_display; -}; - -#endif diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp deleted file mode 100644 index e535f26..0000000 --- a/bibletime/frontend/display/chtmlwritedisplay.cpp +++ /dev/null @@ -1,266 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "chtmlwritedisplay.h" - -#include "frontend/displaywindow/cwritewindow.h" - -#include "util/cresmgr.h" - -//Qt includes -#include <qpopupmenu.h> -#include <qtooltip.h> - -//KDE includes -#include <kaction.h> -#include <ktoolbar.h> -#include <klocale.h> -#include <kfontcombo.h> -#include <kcolorbutton.h> -#include <kpopupmenu.h> - -CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) -: CPlainWriteDisplay(parentWindow,parent) { - m_actions.bold = 0; - m_actions.italic = 0; - m_actions.underline = 0; - m_actions.selectAll = 0; - - setTextFormat(Qt::RichText); - setAcceptDrops(true); - viewport()->setAcceptDrops(true); -} - -CHTMLWriteDisplay::~CHTMLWriteDisplay() {} - -void CHTMLWriteDisplay::setText( const QString& newText ) { - QString text = newText; -// text.replace("\n<br/><!-- BT newline -->\n", "\n"); - - QTextEdit::setText(text); -} - -const QString CHTMLWriteDisplay::plainText() { - return QTextEdit::text(); -}; - -void CHTMLWriteDisplay::toggleBold() { - setBold( m_actions.bold->isChecked() ); -}; - -void CHTMLWriteDisplay::toggleItalic() { - setItalic( m_actions.italic->isChecked() ); -}; - -void CHTMLWriteDisplay::toggleUnderline() { - setUnderline( m_actions.underline->isChecked() ); -}; - - -void CHTMLWriteDisplay::alignLeft() { - setAlignment(Qt::AlignLeft); -}; - -void CHTMLWriteDisplay::alignCenter() { - setAlignment(Qt::AlignHCenter); -}; - -void CHTMLWriteDisplay::alignRight() { - setAlignment(Qt::AlignRight); -}; - - -/** The text's alignment changed. Enable the right buttons. */ -void CHTMLWriteDisplay::slotAlignmentChanged( int a ) { - bool alignLeft = false; - bool alignCenter = false; - bool alignRight = false; - // bool alignJustify = false; - - if (a & Qt::AlignLeft) { - alignLeft = true; - } - else if ((a & Qt::AlignHCenter) || (a & Qt::AlignCenter)) { - alignCenter = true; - } - else if (a & Qt::AlignRight) { - alignRight = true; - } - // else if (a & Qt::AlignJustify) { - // alignJustify = true; - // } - else { - alignLeft = true; - qWarning("unknown alignment %i", a); - } - - m_actions.alignLeft->setChecked( alignLeft ); - m_actions.alignCenter->setChecked( alignCenter ); - m_actions.alignRight->setChecked( alignRight ); - // m_actions.alignJustify->setChecked( alignJustify ); -} - - -/** Is called when a new color was selected. */ -void CHTMLWriteDisplay::slotColorSelected( const QColor& c) { - setColor( c ); -} - -/** Is called when a text with another color was selected. */ -void CHTMLWriteDisplay::slotColorChanged(const QColor& c) { - m_colorButton->setColor(c); -} - - -void CHTMLWriteDisplay::slotFontChanged( const QFont& font ) { - m_actions.fontChooser->setFont( font.family() ); - m_actions.fontSizeChooser->setFontSize( font.pointSize() ); - - m_actions.bold->setChecked( font.bold() ); - m_actions.italic->setChecked( font.italic() ); - m_actions.underline->setChecked( font.underline() ); -}; - -void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions) { - m_actions.fontChooser = new KFontAction( i18n("Choose a font"), - CResMgr::displaywindows::writeWindow::underlinedText::accel, - actions, - CResMgr::displaywindows::writeWindow::fontFamily::actionName - ); - m_actions.fontChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontFamily::tooltip ); - - m_actions.fontChooser->plug(bar); - connect(m_actions.fontChooser, SIGNAL(activated(const QString&)), this, SLOT(setFamily(const QString&))); - - - m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"), - CResMgr::displaywindows::writeWindow::fontSize::accel, - actions, - CResMgr::displaywindows::writeWindow::fontSize::actionName - ); - m_actions.fontSizeChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontSize::tooltip ); - - m_actions.fontSizeChooser->plug(bar); - connect(m_actions.fontSizeChooser, SIGNAL(fontSizeChanged(int)), this, SLOT(setPointSize(int))); - - m_colorButton = new KColorButton(bar); - connect(m_colorButton, SIGNAL(changed(const QColor&)), this, SLOT(slotColorSelected(const QColor&))); - bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton); - QToolTip::add - (m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip ); - - - - (new KActionSeparator())->plug(bar); //seperate font options from formatting buttons - - m_actions.bold = new KToggleAction( i18n("Bold"), - CResMgr::displaywindows::writeWindow::boldText::icon, - CResMgr::displaywindows::writeWindow::boldText::accel, - this, SLOT(toggleBold()), - actions, - CResMgr::displaywindows::writeWindow::boldText::actionName - ); - m_actions.bold->setToolTip( CResMgr::displaywindows::writeWindow::boldText::tooltip ); - - m_actions.bold->plug(bar); - - m_actions.italic = new KToggleAction( i18n("Italic"), - CResMgr::displaywindows::writeWindow::italicText::icon, - CResMgr::displaywindows::writeWindow::italicText::accel, - this, SLOT(toggleItalic()), - actions, - CResMgr::displaywindows::writeWindow::italicText::actionName - ); - m_actions.italic->setToolTip( CResMgr::displaywindows::writeWindow::italicText::tooltip ); - - m_actions.italic->plug(bar); - - m_actions.underline = new KToggleAction( i18n("Underline"), - CResMgr::displaywindows::writeWindow::underlinedText::icon, - CResMgr::displaywindows::writeWindow::underlinedText::accel, - this, SLOT(toggleUnderline()), - actions, - CResMgr::displaywindows::writeWindow::underlinedText::actionName - ); - m_actions.underline->setToolTip( CResMgr::displaywindows::writeWindow::underlinedText::tooltip ); - - m_actions.underline->plug(bar); - - - (new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons - - m_actions.alignLeft = new KToggleAction( i18n("Left"), - CResMgr::displaywindows::writeWindow::alignLeft::icon, - CResMgr::displaywindows::writeWindow::alignLeft::accel, - this, SLOT( alignLeft() ), - actions, - CResMgr::displaywindows::writeWindow::alignLeft::actionName - ); - m_actions.alignLeft->setToolTip( CResMgr::displaywindows::writeWindow::alignLeft::tooltip ); - - m_actions.alignLeft->plug(bar); - - m_actions.alignCenter = new KToggleAction( i18n("Center"), - CResMgr::displaywindows::writeWindow::alignCenter::icon, - CResMgr::displaywindows::writeWindow::alignCenter::accel, - this, SLOT(alignCenter()), - actions, - CResMgr::displaywindows::writeWindow::alignCenter::actionName - ); - m_actions.alignCenter->setToolTip( CResMgr::displaywindows::writeWindow::alignCenter::tooltip ); - - m_actions.alignCenter->plug(bar); - - m_actions.alignRight = new KToggleAction( i18n("Right"), - CResMgr::displaywindows::writeWindow::alignRight::icon, - CResMgr::displaywindows::writeWindow::alignRight::accel, - this, SLOT(alignRight()), - actions, - CResMgr::displaywindows::writeWindow::alignRight::actionName - ); - m_actions.alignRight->setToolTip( CResMgr::displaywindows::writeWindow::alignRight::tooltip ); - - m_actions.alignRight->plug(bar); - - // m_actions.alignJustify = new KToggleAction( i18n("Justify"), - // CResMgr::displaywindows::writeWindow::alignJustify::icon, - // CResMgr::displaywindows::writeWindow::alignJustify::accel, - // this, SLOT( alignJustify() ), - // actions - // ); - // m_actions.alignJustify->setToolTip( CResMgr::displaywindows::writeWindow::alignJustify::tooltip ); - - // m_actions.alignJustify->plug(bar); - - - connect(this, SIGNAL(currentFontChanged(const QFont&)), SLOT(slotFontChanged(const QFont&))); - connect(this, SIGNAL(currentAlignmentChanged(int)), SLOT(slotAlignmentChanged(int))); - connect(this, SIGNAL(currentColorChanged(const QColor&)), SLOT(slotColorChanged(const QColor&))); - - - //set initial values for toolbar items - slotFontChanged( font() ); - slotAlignmentChanged( alignment() ); - slotColorChanged( color() ); -} - -/** Reimplementation to show a popup menu if the right mouse butoon was clicked. */ -QPopupMenu* CHTMLWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ) { - if (!m_actions.selectAll) { - m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), this, SLOT(selectAll()), this); - } - - KPopupMenu* popup = new KPopupMenu(this); - popup->insertTitle(i18n("HTML editor window")); - m_actions.selectAll->plug(popup); - - return popup; -}; diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h deleted file mode 100644 index ad5faa6..0000000 --- a/bibletime/frontend/display/chtmlwritedisplay.h +++ /dev/null @@ -1,104 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CHTMLWRITEDISPLAY_H -#define CHTMLWRITEDISPLAY_H - -//BibleTime includes -#include "cplainwritedisplay.h" - -//Qt includes -#include <qwidget.h> -#include <qtextedit.h> - -class CWriteWindow; - -class QPopupMenu; - -class KToggleAction; -class KFontAction; -class KFontSizeAction; - -class KColorButton; - -/** The WYSIWYG implementation of the write display interface. - * @author The BibleTime team - */ -class CHTMLWriteDisplay : public CPlainWriteDisplay { - Q_OBJECT -public: - /** - * Sets the new text for this display widget. - */ - virtual void setText( const QString& newText ); - /** - * Returns the text of this edit widget. - */ - virtual const QString plainText(); - - /** - * Creates the necessary action objects and puts them on the toolbar. - */ - virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection); - -protected: - friend class CDisplay; - CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent); - ~CHTMLWriteDisplay(); - /** - * Reimplementation to show a popup menu if the right mouse butoon was clicked. - */ - virtual QPopupMenu* createPopupMenu( const QPoint& pos ); - -protected slots: - void toggleBold(); - void toggleItalic(); - void toggleUnderline(); - - void alignLeft(); - void alignCenter(); - void alignRight(); - - void slotFontChanged( const QFont& ); - /** - * The text's alignment changed. Enable the right buttons. - */ - void slotAlignmentChanged( int ); - /** - * Is called when a new color was selected. - */ - void slotColorSelected( const QColor& ); - /** - * Is called when a text with another color was selected. - */ - void slotColorChanged( const QColor& ); - -private: - struct { - KToggleAction* bold; - KToggleAction* italic; - KToggleAction* underline; - - KToggleAction* alignLeft; - KToggleAction* alignCenter; - KToggleAction* alignRight; - - KFontAction* fontChooser; - KFontSizeAction* fontSizeChooser; - - //popup menu - KAction* selectAll; - } - m_actions; - KColorButton* m_colorButton; -}; - -#endif diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp deleted file mode 100644 index 2e81db0..0000000 --- a/bibletime/frontend/display/cplainwritedisplay.cpp +++ /dev/null @@ -1,157 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cplainwritedisplay.h" - -#include "frontend/cdragdropmgr.h" -#include "frontend/displaywindow/cdisplaywindow.h" -#include "frontend/displaywindow/cwritewindow.h" - -#include "util/scoped_resource.h" - -//Qt includes - -//KDE includes -#include <kaction.h> -#include <klocale.h> - -CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) : QTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) { - setTextFormat(Qt::PlainText); - setAcceptDrops(true); - viewport()->setAcceptDrops(true); - - connect(this, SIGNAL(textChanged()), - connectionsProxy(), SLOT(emitTextChanged())); -} - -CPlainWriteDisplay::~CPlainWriteDisplay() {} - -/** Reimplementation. */ -void CPlainWriteDisplay::selectAll() { - QTextEdit::selectAll(true); -} - -void CPlainWriteDisplay::setText( const QString& newText ) { - //make sure the text has been converted to show \n instead of <br/> - QString text = newText; -// text.replace("\n<br /><!-- BT newline -->\n", "\n"); - text.replace("<br />", "\n"); //inserted by BT or the Qt textedit widget - - QTextEdit::setText(text); -} - -const bool CPlainWriteDisplay::hasSelection() { - return hasSelectedText(); -} - -QWidget* CPlainWriteDisplay::view() { - qDebug("CPlainWriteDisplay::view()"); - return this; -} - -const QString CPlainWriteDisplay::text( const CDisplay::TextType /*format*/, const CDisplay::TextPart /*part*/) { - return QString::null; -} - -void CPlainWriteDisplay::print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { -} - -/** Sets the current status of the edit widget. */ -void CPlainWriteDisplay::setModified( const bool modified ) { - QTextEdit::setModified(modified); -} - -/** Reimplementation. */ -const bool CPlainWriteDisplay::isModified() const { - return QTextEdit::isModified(); -} - - -/** Returns the text of this edit widget. */ -const QString CPlainWriteDisplay::plainText() { - QString ret = QTextEdit::text(); - - //in plain text mode the text just contains newlines, convert them into <br/> before we return the text for display in a HTML widget - ret.replace("\n", "<br />"); - - return ret; -} - -/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */ -QPopupMenu* CPlainWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ) { - return installedPopup(); -} - -/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */ -QPopupMenu* CPlainWriteDisplay::createPopupMenu( ) { - return installedPopup(); -} - -/** Creates the necessary action objects and puts them on the toolbar. */ -void CPlainWriteDisplay::setupToolbar(KToolBar* /*bar*/, KActionCollection* /*actionCollection*/) {} - -/** Reimplementation to insert the text of a dragged reference into the edit view. */ -void CPlainWriteDisplay::contentsDragEnterEvent( QDragEnterEvent* e ) { - if (CDragDropMgr::canDecode(e)) { - e->accept(true); - } - else { - e->accept(false); - e->ignore(); - } -} - -/** Reimplementation to insert the text of a dragged reference into the edit view. */ -void CPlainWriteDisplay::contentsDragMoveEvent( QDragMoveEvent* e ) { - if (CDragDropMgr::canDecode(e)) { - placeCursor(e->pos()); - ensureCursorVisible(); - e->accept(true); - } - else { - e->accept(false); - e->ignore(); - } -} - -/** Reimplementation to manage drops of our drag and drop objects. */ -void CPlainWriteDisplay::contentsDropEvent( QDropEvent* e ) { - if ( CDragDropMgr::canDecode(e) ) { - e->acceptAction(); - - CDragDropMgr::ItemList items = CDragDropMgr::decode(e); - CDragDropMgr::ItemList::iterator it; - for (it = items.begin(); it != items.end(); ++it) { - switch ((*it).type()) { - case CDragDropMgr::Item::Bookmark: { - CSwordModuleInfo* module = backend()->findModuleByName((*it).bookmarkModule()); - util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); - key->key( (*it).bookmarkKey() ); - - QString moduleText = key->strippedText(); - - const QString text = QString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule()); - - placeCursor( e->pos() ); - insert( text ); - break; - } - case CDragDropMgr::Item::Text: { - placeCursor( e->pos() ); - insert( (*it).text() ); - break; - } - default: - break; - } - } - } -} diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h deleted file mode 100644 index 9219578..0000000 --- a/bibletime/frontend/display/cplainwritedisplay.h +++ /dev/null @@ -1,94 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CPLAINWRITEDISPLAY_H -#define CPLAINWRITEDISPLAY_H - -//Bibletime include files -#include "cwritedisplay.h" - -//Qt includes -#include <qwidget.h> -#include <qtextedit.h> - -class CHTMLWriteDisplay; -class KAction; - -/** The write display implementation for plain source code editing. - * @author The BibleTime team - */ -class CPlainWriteDisplay : public QTextEdit, public CWriteDisplay { -public: - /** - * Reimplementation. - */ - virtual void selectAll(); - /** - * Sets the new text for this display widget. - */ - virtual void setText( const QString& newText ); - /** - * Returns true if the display widget has a selection. Otherwise false. - */ - virtual const bool hasSelection(); - /** - * Returns the view of this display widget. - */ - virtual QWidget* view(); - virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ); - virtual void print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ); - /** - * Reimplementation. - */ - virtual const bool isModified() const; - /** - * Sets the current status of the edit widget. - */ - virtual void setModified( const bool modified ); - /** - * Returns the text of this edit widget. - */ - virtual const QString plainText(); - /** - * Creates the necessary action objects and puts them on the toolbar. - */ - virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection); - -protected: - friend class CDisplay; - friend class CHTMLWriteDisplay; - - CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent); - virtual ~CPlainWriteDisplay(); - /** - * Reimplementation from QTextEdit. Provides an popup menu for the given position. - */ - virtual QPopupMenu* createPopupMenu( const QPoint& pos ); - /** - * Reimplementation from QTextEdit. Provides an popup menu. - */ - virtual QPopupMenu* createPopupMenu(); - /** - * Reimplementation to manage drops of our drag and drop objects. - */ - virtual void contentsDropEvent( QDropEvent* e ); - /** - * Reimplementation to insert the text of a dragged reference into the edit view. - */ - virtual void contentsDragEnterEvent( QDragEnterEvent* e ); - /** - * Reimplementation to insert the text of a dragged reference into the edit view. - */ - virtual void contentsDragMoveEvent( QDragMoveEvent* e ); - -}; - -#endif diff --git a/bibletime/frontend/display/creaddisplay.cpp b/bibletime/frontend/display/creaddisplay.cpp deleted file mode 100644 index 24c4f76..0000000 --- a/bibletime/frontend/display/creaddisplay.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "creaddisplay.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbiblemoduleinfo.h" -#include "backend/cswordlexiconmoduleinfo.h" -#include "backend/cswordbookmoduleinfo.h" -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" -#include "backend/cswordtreekey.h" -#include "backend/cswordldkey.h" - -#include "frontend/displaywindow/cdisplaywindow.h" -#include "frontend/displaywindow/creadwindow.h" - -#include "frontend/cexportmanager.h" - -#include "util/scoped_resource.h" - -//Qt includes -#include <qpopupmenu.h> - -//KDE includes -#include <klocale.h> - -CReadDisplay::CReadDisplay(CReadWindow* readWindow) : -CDisplay(readWindow), -m_activeAnchor(QString::null), -m_useMouseTracking(true) {} - -CReadDisplay::~CReadDisplay() {} - -/** Returns the current active anchor. */ -const QString& CReadDisplay::activeAnchor() { - return m_activeAnchor; -} - -/** Sets the current anchor to the parameter. */ -void CReadDisplay::setActiveAnchor( const QString& anchor ) { - m_activeAnchor = anchor; -} - - -/** Returns true if the display has an active anchor. */ -const bool CReadDisplay::hasActiveAnchor() { - return !activeAnchor().isEmpty(); -} - - -void CReadDisplay::print(const CDisplay::TextPart type, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { - CDisplayWindow* window = parentWindow(); - CSwordKey* const key = window->key(); - CSwordModuleInfo* module = key->module(); - - - CExportManager mgr(i18n("Print keys"),false, QString::null, parentWindow()->filterOptions(), parentWindow()->displayOptions()); - - switch (type) { - case Document: { - if (module->type() == CSwordModuleInfo::Bible) { - CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key); - - CSwordVerseKey startKey(*vk); - startKey.Verse(1); - - CSwordVerseKey stopKey(*vk); - - CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module); - if (bible) { - stopKey.Verse( bible->verseCount( bible->bookNumber(startKey.book()), startKey.Chapter() ) ); - } - - mgr.printKey(module, startKey.key(), stopKey.key(), displayOptions, filterOptions); - } - else if (module->type() == CSwordModuleInfo::Lexicon || module->type() == CSwordModuleInfo::Commentary ) { - mgr.printKey(module, key->key(), key->key(), displayOptions, filterOptions); - } - else if (module->type() == CSwordModuleInfo::GenericBook) { - CSwordTreeKey* tree = dynamic_cast<CSwordTreeKey*>(key); - - CSwordTreeKey startKey(*tree); - // while (startKey.previousSibling()) { // go to first sibling on this level! - // } - - CSwordTreeKey stopKey(*tree); - // if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(module)) { - // while ( stopKey.nextSibling() ) { //go to last displayed sibling! - // } - // } - mgr.printKey(module, startKey.key(), stopKey.key(), displayOptions, filterOptions); - } - } - - case AnchorWithText: { - if (hasActiveAnchor()) { - mgr.printByHyperlink( activeAnchor(), displayOptions, filterOptions ); - } - } - - default: - break; - } -} - diff --git a/bibletime/frontend/display/creaddisplay.h b/bibletime/frontend/display/creaddisplay.h deleted file mode 100644 index de3e51d..0000000 --- a/bibletime/frontend/display/creaddisplay.h +++ /dev/null @@ -1,71 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CREADDISPLAY_H -#define CREADDISPLAY_H - -#include "cdisplay.h" -#include "backend/cswordbackend.h" - -class QPopupMenu; -class QWidget; - -/**The base class for all read-only widgets like KHTMLView. - *@author The BibleTime team - */ - -class CReadDisplay : public CDisplay { -public: - /** - * Returns true if the display has an active anchor. - */ - const bool hasActiveAnchor(); - /** - * Returns the current active anchor. - */ - const QString& activeAnchor(); - /** - * Moves the widget to the given anchor. - */ - virtual void moveToAnchor( const QString& ) = 0; - virtual void print(const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - - void setMouseTracking(const bool trackingEnabled) { - m_useMouseTracking = trackingEnabled; - }; - const bool getMouseTracking() const { - return m_useMouseTracking; - }; - -protected: // Protected methods - friend class CDisplay; - friend class CHTMLReadDisplay; - friend class CHTMLReadDisplayView; - - CReadDisplay( CReadWindow* readWindow ); - ~CReadDisplay(); - - /** - * Sets the current anchor to the parameter. - */ - void setActiveAnchor( const QString& ); - -private: // Public attributes - /** - * The member which hols the current anchor. - */ - - QString m_activeAnchor; - - bool m_useMouseTracking; -}; - -#endif diff --git a/bibletime/frontend/display/cwritedisplay.cpp b/bibletime/frontend/display/cwritedisplay.cpp deleted file mode 100644 index 1c3ad4e..0000000 --- a/bibletime/frontend/display/cwritedisplay.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cwritedisplay.h" - -#include "frontend/displaywindow/cwritewindow.h" - -//Qt includes -#include <qwidget.h> - -CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {} - -CWriteDisplay::~CWriteDisplay() {} - diff --git a/bibletime/frontend/display/cwritedisplay.h b/bibletime/frontend/display/cwritedisplay.h deleted file mode 100644 index b1222e8..0000000 --- a/bibletime/frontend/display/cwritedisplay.h +++ /dev/null @@ -1,50 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CWRITEDISPLAY_H -#define CWRITEDISPLAY_H - -#include "cdisplay.h" - -class KActionCollection; -class KToolBar; - -/**The base class for all read/write-display classes. - *@author The BibleTime team - */ - -class CWriteDisplay : public CDisplay { -protected: - friend class CDisplay; - friend class CPlainWriteDisplay; - CWriteDisplay( CWriteWindow* writeWindow ); - ~CWriteDisplay(); - -public: // Public methods - /** - * Sets the current modified status of the widget. - */ - virtual void setModified( const bool modified ) = 0; - /** - * Returns true if the current text was modified. - */ - virtual const bool isModified() const = 0; - /** - * Returns the text of this edit widget. - */ - virtual const QString plainText() = 0; - /** - * Creates the necessary action objects and puts them on the toolbar. - */ - virtual void setupToolbar( KToolBar* bar, KActionCollection* actionCollection ) = 0; -}; - -#endif diff --git a/bibletime/frontend/displaywindow/Makefile.am b/bibletime/frontend/displaywindow/Makefile.am deleted file mode 100644 index a86417c..0000000 --- a/bibletime/frontend/displaywindow/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDES = $(all_includes) - -libdisplaywindow_a_METASOURCES = AUTO - -noinst_LIBRARIES = libdisplaywindow.a - -libdisplaywindow_a_SOURCES = \ -cbiblereadwindow.cpp \ -cbookreadwindow.cpp \ -ccommentaryreadwindow.cpp \ -cdisplaywindow.cpp \ -clexiconreadwindow.cpp \ -cmodulechooserbar.cpp \ -cmodulechooserbutton.cpp \ -creadwindow.cpp \ -cwritewindow.cpp \ -cplainwritewindow.cpp \ -chtmlwritewindow.cpp \ -cbuttons.cpp - -all_headers = \ -cbiblereadwindow.h \ -cbookreadwindow.h \ -ccommentaryreadwindow.h \ -cdisplaywindow.h \ -clexiconreadwindow.h \ -cmodulechooserbar.h \ -cmodulechooserbutton.h \ -creadwindow.h \ -cwritewindow.h \ -cplainwritewindow.h \ -chtmlwritewindow.h \ -cbuttons.h - -EXTRA_DIST = $(libdisplaywindow_a_SOURCES) $(all_headers) - diff --git a/bibletime/frontend/displaywindow/Makefile.in b/bibletime/frontend/displaywindow/Makefile.in deleted file mode 100644 index 42b5b79..0000000 --- a/bibletime/frontend/displaywindow/Makefile.in +++ /dev/null @@ -1,843 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/frontend/displaywindow -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libdisplaywindow_a_AR = $(AR) $(ARFLAGS) -libdisplaywindow_a_LIBADD = -am_libdisplaywindow_a_OBJECTS = cbiblereadwindow.$(OBJEXT) \ - cbookreadwindow.$(OBJEXT) ccommentaryreadwindow.$(OBJEXT) \ - cdisplaywindow.$(OBJEXT) clexiconreadwindow.$(OBJEXT) \ - cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \ - creadwindow.$(OBJEXT) cwritewindow.$(OBJEXT) \ - cplainwritewindow.$(OBJEXT) chtmlwritewindow.$(OBJEXT) \ - cbuttons.$(OBJEXT) -#>- libdisplaywindow_a_OBJECTS = $(am_libdisplaywindow_a_OBJECTS) -#>+ 11 -libdisplaywindow_a_final_OBJECTS = libdisplaywindow_a.all_cpp.o -libdisplaywindow_a_nofinal_OBJECTS = cbiblereadwindow.$(OBJEXT) \ - cbookreadwindow.$(OBJEXT) ccommentaryreadwindow.$(OBJEXT) \ - cdisplaywindow.$(OBJEXT) clexiconreadwindow.$(OBJEXT) \ - cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \ - creadwindow.$(OBJEXT) cwritewindow.$(OBJEXT) \ - cplainwritewindow.$(OBJEXT) chtmlwritewindow.$(OBJEXT) \ - cbuttons.$(OBJEXT)\ -chtmlwritewindow.moc.o clexiconreadwindow.moc.o cbookreadwindow.moc.o cbuttons.moc.o cplainwritewindow.moc.o cmodulechooserbar.moc.o cbiblereadwindow.moc.o cwritewindow.moc.o cdisplaywindow.moc.o ccommentaryreadwindow.moc.o creadwindow.moc.o cmodulechooserbutton.moc.o -@KDE_USE_FINAL_FALSE@libdisplaywindow_a_OBJECTS = $(libdisplaywindow_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libdisplaywindow_a_OBJECTS = $(libdisplaywindow_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libdisplaywindow_a_SOURCES) -DIST_SOURCES = $(libdisplaywindow_a_SOURCES) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libdisplaywindow_a_METASOURCES = AUTO -noinst_LIBRARIES = libdisplaywindow.a -libdisplaywindow_a_SOURCES = \ -cbiblereadwindow.cpp \ -cbookreadwindow.cpp \ -ccommentaryreadwindow.cpp \ -cdisplaywindow.cpp \ -clexiconreadwindow.cpp \ -cmodulechooserbar.cpp \ -cmodulechooserbutton.cpp \ -creadwindow.cpp \ -cwritewindow.cpp \ -cplainwritewindow.cpp \ -chtmlwritewindow.cpp \ -cbuttons.cpp - -all_headers = \ -cbiblereadwindow.h \ -cbookreadwindow.h \ -ccommentaryreadwindow.h \ -cdisplaywindow.h \ -clexiconreadwindow.h \ -cmodulechooserbar.h \ -cmodulechooserbutton.h \ -creadwindow.h \ -cwritewindow.h \ -cplainwritewindow.h \ -chtmlwritewindow.h \ -cbuttons.h - -EXTRA_DIST = $(libdisplaywindow_a_SOURCES) $(all_headers) -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/displaywindow/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/frontend/displaywindow/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/displaywindow/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/displaywindow/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/displaywindow/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libdisplaywindow.a: $(libdisplaywindow_a_OBJECTS) $(libdisplaywindow_a_DEPENDENCIES) - -rm -f libdisplaywindow.a - $(libdisplaywindow_a_AR) libdisplaywindow.a $(libdisplaywindow_a_OBJECTS) $(libdisplaywindow_a_LIBADD) - $(RANLIB) libdisplaywindow.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbiblereadwindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbookreadwindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbuttons.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccommentaryreadwindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplaywindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlwritewindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clexiconreadwindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmodulechooserbar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmodulechooserbutton.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cplainwritewindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creadwindow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwritewindow.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-metasources clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 3 -chtmlwritewindow.moc.cpp: $(srcdir)/chtmlwritewindow.h - $(MOC) $(srcdir)/chtmlwritewindow.h -o chtmlwritewindow.moc.cpp - -#>+ 2 -mocs: chtmlwritewindow.moc.cpp - -#>+ 3 -clexiconreadwindow.moc.cpp: $(srcdir)/clexiconreadwindow.h - $(MOC) $(srcdir)/clexiconreadwindow.h -o clexiconreadwindow.moc.cpp - -#>+ 2 -mocs: clexiconreadwindow.moc.cpp - -#>+ 3 -cbookreadwindow.moc.cpp: $(srcdir)/cbookreadwindow.h - $(MOC) $(srcdir)/cbookreadwindow.h -o cbookreadwindow.moc.cpp - -#>+ 2 -mocs: cbookreadwindow.moc.cpp - -#>+ 3 -cbuttons.moc.cpp: $(srcdir)/cbuttons.h - $(MOC) $(srcdir)/cbuttons.h -o cbuttons.moc.cpp - -#>+ 2 -mocs: cbuttons.moc.cpp - -#>+ 3 -cplainwritewindow.moc.cpp: $(srcdir)/cplainwritewindow.h - $(MOC) $(srcdir)/cplainwritewindow.h -o cplainwritewindow.moc.cpp - -#>+ 2 -mocs: cplainwritewindow.moc.cpp - -#>+ 3 -cmodulechooserbar.moc.cpp: $(srcdir)/cmodulechooserbar.h - $(MOC) $(srcdir)/cmodulechooserbar.h -o cmodulechooserbar.moc.cpp - -#>+ 2 -mocs: cmodulechooserbar.moc.cpp - -#>+ 3 -cbiblereadwindow.moc.cpp: $(srcdir)/cbiblereadwindow.h - $(MOC) $(srcdir)/cbiblereadwindow.h -o cbiblereadwindow.moc.cpp - -#>+ 2 -mocs: cbiblereadwindow.moc.cpp - -#>+ 3 -cwritewindow.moc.cpp: $(srcdir)/cwritewindow.h - $(MOC) $(srcdir)/cwritewindow.h -o cwritewindow.moc.cpp - -#>+ 2 -mocs: cwritewindow.moc.cpp - -#>+ 3 -cdisplaywindow.moc.cpp: $(srcdir)/cdisplaywindow.h - $(MOC) $(srcdir)/cdisplaywindow.h -o cdisplaywindow.moc.cpp - -#>+ 2 -mocs: cdisplaywindow.moc.cpp - -#>+ 3 -ccommentaryreadwindow.moc.cpp: $(srcdir)/ccommentaryreadwindow.h - $(MOC) $(srcdir)/ccommentaryreadwindow.h -o ccommentaryreadwindow.moc.cpp - -#>+ 2 -mocs: ccommentaryreadwindow.moc.cpp - -#>+ 3 -creadwindow.moc.cpp: $(srcdir)/creadwindow.h - $(MOC) $(srcdir)/creadwindow.h -o creadwindow.moc.cpp - -#>+ 2 -mocs: creadwindow.moc.cpp - -#>+ 3 -cmodulechooserbutton.moc.cpp: $(srcdir)/cmodulechooserbutton.h - $(MOC) $(srcdir)/cmodulechooserbutton.h -o cmodulechooserbutton.moc.cpp - -#>+ 2 -mocs: cmodulechooserbutton.moc.cpp - -#>+ 3 -clean-metasources: - -rm -f chtmlwritewindow.moc.cpp clexiconreadwindow.moc.cpp cbookreadwindow.moc.cpp cbuttons.moc.cpp cplainwritewindow.moc.cpp cmodulechooserbar.moc.cpp cbiblereadwindow.moc.cpp cwritewindow.moc.cpp cdisplaywindow.moc.cpp ccommentaryreadwindow.moc.cpp creadwindow.moc.cpp cmodulechooserbutton.moc.cpp - -#>+ 2 -KDE_DIST=cmodulechooserbar.h chtmlwritewindow.h creadwindow.h cbookreadwindow.h clexiconreadwindow.h cdisplaywindow.h cwritewindow.h cbiblereadwindow.h Makefile.in cplainwritewindow.h cmodulechooserbutton.h cbuttons.h Makefile.am ccommentaryreadwindow.h - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/displaywindow/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/displaywindow/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/displaywindow/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libdisplaywindow_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cbiblereadwindow.cpp $(srcdir)/cbookreadwindow.cpp $(srcdir)/ccommentaryreadwindow.cpp $(srcdir)/cdisplaywindow.cpp $(srcdir)/clexiconreadwindow.cpp $(srcdir)/cmodulechooserbar.cpp $(srcdir)/cmodulechooserbutton.cpp $(srcdir)/creadwindow.cpp $(srcdir)/cwritewindow.cpp $(srcdir)/cplainwritewindow.cpp $(srcdir)/chtmlwritewindow.cpp $(srcdir)/cbuttons.cpp chtmlwritewindow.moc.cpp cbookreadwindow.moc.cpp clexiconreadwindow.moc.cpp cbuttons.moc.cpp cbiblereadwindow.moc.cpp cmodulechooserbar.moc.cpp cplainwritewindow.moc.cpp cwritewindow.moc.cpp cdisplaywindow.moc.cpp ccommentaryreadwindow.moc.cpp creadwindow.moc.cpp cmodulechooserbutton.moc.cpp - @echo 'creating libdisplaywindow_a.all_cpp.cpp ...'; \ - rm -f libdisplaywindow_a.all_cpp.files libdisplaywindow_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libdisplaywindow_a.all_cpp.final; \ - for file in cbiblereadwindow.cpp cbookreadwindow.cpp ccommentaryreadwindow.cpp cdisplaywindow.cpp clexiconreadwindow.cpp cmodulechooserbar.cpp cmodulechooserbutton.cpp creadwindow.cpp cwritewindow.cpp cplainwritewindow.cpp chtmlwritewindow.cpp cbuttons.cpp chtmlwritewindow.moc.cpp cbookreadwindow.moc.cpp clexiconreadwindow.moc.cpp cbuttons.moc.cpp cbiblereadwindow.moc.cpp cmodulechooserbar.moc.cpp cplainwritewindow.moc.cpp cwritewindow.moc.cpp cdisplaywindow.moc.cpp ccommentaryreadwindow.moc.cpp creadwindow.moc.cpp cmodulechooserbutton.moc.cpp ; do \ - echo "#include \"$$file\"" >> libdisplaywindow_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdisplaywindow_a.all_cpp.final; \ - done; \ - cat libdisplaywindow_a.all_cpp.final libdisplaywindow_a.all_cpp.files > libdisplaywindow_a.all_cpp.cpp; \ - rm -f libdisplaywindow_a.all_cpp.final libdisplaywindow_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libdisplaywindow_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp deleted file mode 100644 index 0e80a35..0000000 --- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp +++ /dev/null @@ -1,458 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cbiblereadwindow.h" -#include "ccommentaryreadwindow.h" -#include "cbuttons.h" - -#include "backend/cswordversekey.h" -#include "backend/cswordbiblemoduleinfo.h" - -#include "frontend/cprofilewindow.h" -#include "frontend/cexportmanager.h" -#include "frontend/cbtconfig.h" -#include "frontend/cmdiarea.h" -#include "util/cresmgr.h" - -#include "frontend/display/creaddisplay.h" -#include "frontend/keychooser/ckeychooser.h" - -#include "util/ctoolclass.h" - -#include <math.h> - -//Qt includes -#include <qwidgetlist.h> -#include <qtimer.h> - -//KDE includes -#include <kaccel.h> -#include <klocale.h> -#include <kpopupmenu.h> - -using namespace Profile; - -CBibleReadWindow::CBibleReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CLexiconReadWindow(moduleList, parent,name) { -} - -CBibleReadWindow::~CBibleReadWindow() {} - -void CBibleReadWindow::applyProfileSettings( CProfileWindow* const settings ) { - CLexiconReadWindow::applyProfileSettings(settings); - - const int count = displaySettingsButton()->menuItemCount(); - int result = settings->windowSettings(); - for (int i = count-1; i>=1; i--) { - if (result-(int)pow((double)2,i-1)>= 0) { //2^i was added before, so item with index i is set - result -= (int)pow((double)2,i-1); - displaySettingsButton()->setItemStatus(i,true); - } - else { - displaySettingsButton()->setItemStatus(i,false); - } - } - displaySettingsButton()->setChanged(); -}; - -void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) { - CLexiconReadWindow::storeProfileSettings(settings); - - const int count = displaySettingsButton()->menuItemCount(); - int result = 0; - //now check every item - for (int i = 1; i < count; i++) { //first item is a title - if (displaySettingsButton()->itemStatus(i)) //item is checked - result += (int)pow((double)2,i-1);//add 2^i (the i. digit in binary) - } - settings->setWindowSettings(result); -}; - - -/** Reimplementation. */ -void CBibleReadWindow::insertKeyboardActions( KActionCollection* const a ) { - new KAction( - i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel, - a, "nextBook" - ); - new KAction( - i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel, - a, "previousBook" - ); - new KAction( - i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel, - a, "nextChapter" - ); - new KAction( - i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel, - a, "previousChapter" - ); - new KAction( - i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel, - a, "nextVerse" - ); - new KAction( - i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel, - a, "previousVerse" - ); - - //popup menu items - // new KAction(i18n("Select all"), KStdAccel::selectAll(), a, "selectAll"); - - //copy menu items - // new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly"); - // new KAction(i18n("Text of reference"), KShortcut(0), a, "copyTextOfReference"); - // new KAction(i18n("Reference with text"), KShortcut(0), a, "copyReferenceWithText"); - new KAction(i18n("Copy chapter"), KShortcut(0), a, "copyChapter"); - // new KAction(i18n("Copy selected text"), KStdAccel::copy(), a, "copySelectedText"); - - //save menu - // new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText"); - new KAction(i18n("Save chapter as plain text"), KShortcut(0), a, "saveChapterAsPlainText"); - new KAction(i18n("Save chapter as HTML"), KShortcut(0), a, "saveChapterAsHTML"); - // new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText"); - - //print - new KAction(i18n("Print chapter"), KStdAccel::print(), a, "printChapter"); -} - -void CBibleReadWindow::initActions() { - CLexiconReadWindow::initActions(); //make sure the predefined actions are available - - //cleanup, not a clean oo-solution - actionCollection()->action("nextEntry")->setEnabled(false); - actionCollection()->action("previousEntry")->setEnabled(false); - - new KAction( - i18n("Next book"), - CResMgr::displaywindows::bibleWindow::nextBook::accel, - this, SLOT(nextBook()), - actionCollection(), "nextBook" - ); - new KAction( - i18n("Previous book"), - CResMgr::displaywindows::bibleWindow::previousBook::accel, - this, SLOT(previousBook()), - actionCollection(), "previousBook" - ); - new KAction( - i18n("Next chapter"), - CResMgr::displaywindows::bibleWindow::nextChapter::accel, - this, SLOT(nextChapter()), - actionCollection(), "nextChapter" - ); - new KAction( - i18n("Previous chapter"), - CResMgr::displaywindows::bibleWindow::previousChapter::accel, - this, SLOT(previousChapter()), - actionCollection(), "previousChapter" - ); - new KAction( - i18n("Next verse"), - CResMgr::displaywindows::bibleWindow::nextVerse::accel, - this, SLOT(nextVerse()), - actionCollection(), "nextVerse" - ); - new KAction( - i18n("Previous verse"), - CResMgr::displaywindows::bibleWindow::previousVerse::accel, - this, SLOT(previousVerse()), - actionCollection(), "previousVerse" - ); - - m_actions.selectAll = actionCollection()->action("selectAll"); - Q_ASSERT(m_actions.selectAll); - - m_actions.findText = actionCollection()->action("findText"); - Q_ASSERT(m_actions.findText); - - m_actions.findStrongs = new KAction( - i18n("Strong's Search"), - CResMgr::displaywindows::general::findStrongs::icon, - CResMgr::displaywindows::general::findStrongs::accel, - this, SLOT(openSearchStrongsDialog()), - actionCollection(), - CResMgr::displaywindows::general::findStrongs::actionName); - - - m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); - - m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference"); - - m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText"); - - m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(copyDisplayedText()), actionCollection(), "copyChapter"); - - m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); - Q_ASSERT(m_actions.copy.selectedText); - - m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText"); - - m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText"); - - m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML"); - - m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText"); - - m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(printAll()), actionCollection(), "printChapter"); - - CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection()); -} - -void CBibleReadWindow::initConnections() { - CLexiconReadWindow::initConnections(); - - /* if (m_transliterationButton) { // Transliteration is not always available - connect(m_transliterationButton, SIGNAL(sigChanged()), SLOT(lookup())); - }*/ -} - -void CBibleReadWindow::initToolbars() { - CLexiconReadWindow::initToolbars(); -} - -void CBibleReadWindow::initView() { - CLexiconReadWindow::initView(); - - parentWidget()->installEventFilter( this ); -} - -/** Reimplementation. */ -void CBibleReadWindow::setupPopupMenu() { - popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Bible window")); - - m_actions.findText->plug(popup()); - m_actions.findStrongs->plug(popup()); - m_actions.selectAll->plug(popup()); - - (new KActionSeparator(this))->plug( popup() ); - - m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, popup()); - m_actions.copyMenu->setDelayed( false ); - m_actions.copyMenu->insert(m_actions.copy.referenceOnly); - m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly); - m_actions.copyMenu->insert(m_actions.copy.referenceAndText); - m_actions.copyMenu->insert(m_actions.copy.chapter); - m_actions.copyMenu->insert(new KActionSeparator(this)); - m_actions.copyMenu->insert(m_actions.copy.selectedText); - m_actions.copyMenu->plug(popup()); - - m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon, popup()); - m_actions.saveMenu->setDelayed( false ); - m_actions.saveMenu->insert(m_actions.save.referenceAndText); - m_actions.saveMenu->insert(m_actions.save.chapterAsPlain); - m_actions.saveMenu->insert(m_actions.save.chapterAsHTML); - m_actions.saveMenu->plug(popup()); - - m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, popup()); - m_actions.printMenu->setDelayed(false); - m_actions.printMenu->insert(m_actions.print.reference); - m_actions.printMenu->insert(m_actions.print.chapter); - m_actions.printMenu->plug(popup()); -} - -/** Reimplemented. */ -void CBibleReadWindow::updatePopupMenu() { - qWarning("CBibleReadWindow::updatePopupMenu()"); - - //enable the action depending on the supported module features -// bool hasStrongs = false; -// ListCSwordModuleInfo mods = modules(); -// for (ListCSwordModuleInfo::iterator it = mods.begin(); it != mods.end(); ++it) { -// if ( (*it)->has( CSwordModuleInfo::strongNumbers ) ) { -// hasStrongs = true; -// break; -// } -// } -// -// m_actions.findStrongs->setEnabled( hasStrongs ); - m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null ); - - - m_actions.copy.referenceOnly->setEnabled( displayWidget()->hasActiveAnchor() ); - m_actions.copy.referenceTextOnly->setEnabled( displayWidget()->hasActiveAnchor() ); - m_actions.copy.referenceAndText->setEnabled( displayWidget()->hasActiveAnchor() ); - m_actions.copy.selectedText->setEnabled( displayWidget()->hasSelection() ); - - m_actions.save.referenceAndText->setEnabled( displayWidget()->hasActiveAnchor() ); - - m_actions.print.reference->setEnabled( displayWidget()->hasActiveAnchor() ); -} - -/** Moves to the next book. */ -void CBibleReadWindow::nextBook() { - if (verseKey()->next(CSwordVerseKey::UseBook)) { - keyChooser()->setKey(key()); - } -} - -/** Moves one book behind. */ -void CBibleReadWindow::previousBook() { - if (verseKey()->previous(CSwordVerseKey::UseBook)) { - keyChooser()->setKey(key()); - } -} - -/** Moves to the next book. */ -void CBibleReadWindow::nextChapter() { - if (verseKey()->next(CSwordVerseKey::UseChapter)) { - keyChooser()->setKey(key()); - } -} - -/** Moves one book behind. */ -void CBibleReadWindow::previousChapter() { - if (verseKey()->previous(CSwordVerseKey::UseChapter)) { - keyChooser()->setKey(key()); - } -} - -/** Moves to the next book. */ -void CBibleReadWindow::nextVerse() { - if (verseKey()->next(CSwordVerseKey::UseVerse)) { - keyChooser()->setKey(key()); - } -} - -/** Moves one book behind. */ -void CBibleReadWindow::previousVerse() { - if (verseKey()->previous(CSwordVerseKey::UseVerse)) { - keyChooser()->setKey(key()); - } -} - -/** rapper around key() to return the right type of key. */ -CSwordVerseKey* CBibleReadWindow::verseKey() { - CSwordVerseKey* k = dynamic_cast<CSwordVerseKey*>(CDisplayWindow::key()); - Q_ASSERT(k); - - return k; -} - -/** Copies the current chapter into the clipboard. */ -void CBibleReadWindow::copyDisplayedText() { - CSwordVerseKey dummy(*verseKey()); - dummy.Verse(1); - - CSwordVerseKey vk(*verseKey()); - vk.LowerBound(dummy); - - CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first()); - dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter())); - vk.UpperBound(dummy); - - CExportManager mgr(i18n("Copy chapter to clipboard ..."), false, i18n("Copying"), filterOptions(), displayOptions()); - mgr.copyKey(&vk, CExportManager::Text, true); -} - -/** Saves the chapter as valid HTML page. */ -void CBibleReadWindow::saveChapterHTML() { - //saves the complete chapter to disk - CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first()); - Q_ASSERT(bible); - if (!bible) //shouldn't happen - return; - - CSwordVerseKey dummy(*verseKey()); - dummy.Verse(1); - - CSwordVerseKey vk(*verseKey()); - vk.LowerBound(dummy); - - dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter())); - vk.UpperBound(dummy); - - CExportManager mgr(i18n("Saving chapter ..."), true, i18n("Saving"), filterOptions(), displayOptions()); - mgr.saveKey(&vk, CExportManager::HTML, true); -} - -/** Saves the chapter as valid HTML page. */ -void CBibleReadWindow::saveChapterPlain() { - //saves the complete chapter to disk - - CSwordVerseKey vk(*verseKey()); - CSwordVerseKey dummy(*verseKey()); - - dummy.Verse(1); - vk.LowerBound(dummy); - - CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first()); - dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter())); - vk.UpperBound(dummy); - - CExportManager mgr(i18n("Saving chapter ..."), true, i18n("Saving"), filterOptions(),displayOptions()); - mgr.saveKey(&vk, CExportManager::Text, true); -} - -void CBibleReadWindow::reload() { - CLexiconReadWindow::reload(); - - if (m_modules.count() == 0) { - close(); - return; - } - - //refresh the book lists -// qDebug("lang is %s",backend()->booknameLanguage().latin1()); - verseKey()->setLocale( backend()->booknameLanguage().latin1() ); - keyChooser()->refreshContent(); - - CBTConfig::setupAccelSettings(CBTConfig::readWindow, actionCollection()); //setup the predefined actions - CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection()); -} - -/** No descriptions */ -bool CBibleReadWindow::eventFilter( QObject* o, QEvent* e) { - const bool ret = CLexiconReadWindow::eventFilter(o,e); - - // Q_ASSERT(o->inherits("CDisplayWindow")); - // qWarning("class: %s", o->className()); - if (e && (e->type() == QEvent::FocusIn)) { //sync other windows to this active - - /* This is a hack to work around a KHTML problem (similair to the Drag&Drop problem we had): - * If new HTML content is loaded from inside a kHTML event handler - * the widget's state will be confused, i.e. it's scrolling without having - * the mousebutton clicked. - * - * This is not really in a KHTML event handler but works anyway. - * Sometime KDE/Qt is hard to use ... - */ - QTimer::singleShot(0, this, SLOT(syncWindows())); - } - - return ret; -} - -void CBibleReadWindow::lookup( CSwordKey* newKey ) { - CLexiconReadWindow::lookup(newKey); - - syncWindows(); -} - -void CBibleReadWindow::syncWindows() { - // qWarning("syncing windows"); - QWidgetList windows = mdi()->windowList(); - // Q_ASSERT(windows.count()); - if (!windows.count()) { - return; - } - - for (windows.first(); windows.current(); windows.next()) { - CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.current()); - // Q_ASSERT(w && w->syncAllowed()); - - if (w && w->syncAllowed()) { - w->lookup( key()->key() ); - } - /* else { - qWarning("class sync: %s", w->className()); - }*/ - } -} diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h deleted file mode 100644 index 2326700..0000000 --- a/bibletime/frontend/displaywindow/cbiblereadwindow.h +++ /dev/null @@ -1,141 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CBIBLEREADWINDOW_H -#define CBIBLEREADWINDOW_H - -//BibleTime includes -#include "clexiconreadwindow.h" - -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" - -//Qt includes -#include <qwidget.h> - -//KDE includes -#include <kaction.h> - - -class CTransliterationButton; - -/**The read display window for Bibles. - *@author The BibleTime team - */ - -class CBibleReadWindow : public CLexiconReadWindow { - Q_OBJECT -public: - CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); - virtual ~CBibleReadWindow(); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings( Profile::CProfileWindow* const settings ); - /** - * Store the settings of this window in the given profile window. - */ - virtual void applyProfileSettings( Profile::CProfileWindow* const settings ); - /** - * Reimplementation. - */ - static void insertKeyboardActions( KActionCollection* const a ); - -protected: - virtual void initActions(); - virtual void initToolbars(); - virtual void initConnections(); - virtual void initView(); - /** - * Reimplementation. - */ - virtual void setupPopupMenu(); - /** - * Reimplemented. - */ - virtual void updatePopupMenu(); - /** Event filter. - * Reimplementation of the event filter to filter out events like focus in. - */ - virtual bool eventFilter( QObject* o, QEvent* e); - - struct { - KAction* selectAll; - KAction* findText; - KAction* findStrongs; - - KActionMenu* copyMenu; - struct { - KAction* referenceOnly; - KAction* referenceTextOnly; - KAction* referenceAndText; - KAction* chapter; - KAction* selectedText; - } - copy; - - KActionMenu* saveMenu; - struct { - KAction* referenceAndText; - KAction* chapterAsPlain; - KAction* chapterAsHTML; - } - save; - - KActionMenu* printMenu; - struct { - KAction* reference; - KAction* chapter; - } - print; - } - m_actions; - - -public slots: - void nextBook(); - void previousBook(); - void nextChapter(); - void previousChapter(); - void nextVerse(); - void previousVerse(); - /** - * Refreshes the content of this display window and the content of the keychooser. - */ - virtual void reload(); - -protected slots: // Protected slots - /** - * Copies the current chapter into the clipboard. - */ - void copyDisplayedText(); - /** - * Saves the chapter as valid HTML page. - */ - void saveChapterHTML(); - /** - * Saves the chapter as valid HTML page. - */ - void saveChapterPlain(); - virtual void lookup( CSwordKey* newKey ); - void syncWindows(); - -private: - friend class CCommentaryReadWindow; - /** - * Wrapper around key() to return the right type of key. - */ - CSwordVerseKey* verseKey(); - - // CTransliterationButton* m_transliterationButton; -}; - -#endif diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp deleted file mode 100644 index c4a4627..0000000 --- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cbookreadwindow.h" -#include "cmodulechooserbar.h" -#include "cbuttons.h" - -#include "backend/cswordtreekey.h" - -#include "frontend/display/cdisplay.h" -#include "frontend/keychooser/cbooktreechooser.h" -#include "frontend/cprofilewindow.h" -#include "frontend/cbtconfig.h" - -#include "util/ctoolclass.h" -#include "util/cresmgr.h" - -//Qt includes -#include <qsplitter.h> - -//KDE includes -#include <kaction.h> -#include <klocale.h> -#include <kdeversion.h> - -using namespace Profile; - -CBookReadWindow::CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent, name) {} - -CBookReadWindow::~CBookReadWindow() {} - -void CBookReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) { - CLexiconReadWindow::applyProfileSettings(profileWindow); - - const bool enable = static_cast<bool>( profileWindow->windowSettings() ); - if (enable) { - m_treeAction->activate(); - } -}; - -void CBookReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) { - CLexiconReadWindow::storeProfileSettings(profileWindow); - - //store information about our show tree structure button - profileWindow->setWindowSettings( static_cast<int>( m_treeAction->isChecked() ) ); -}; - -void CBookReadWindow::initActions() { - CLexiconReadWindow::initActions(); - //cleanup, not a clean oo-solution - Q_ASSERT(actionCollection()->action("nextEntry")); - Q_ASSERT(actionCollection()->action("previousEntry")); - actionCollection()->action("nextEntry")->setEnabled(false); - actionCollection()->action("previousEntry")->setEnabled(false); - - m_treeAction = new KToggleAction( - i18n("Toggle tree view"), - CResMgr::displaywindows::bookWindow::toggleTree::icon, - CResMgr::displaywindows::bookWindow::toggleTree::accel, - this, SLOT(treeToggled()), - actionCollection(), "toggleTree"); - - CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection()); -}; - -void CBookReadWindow::insertKeyboardActions( KActionCollection* const a ) { - new KToggleAction( - i18n("Toggle tree view"), - CResMgr::displaywindows::bookWindow::toggleTree::icon, - CResMgr::displaywindows::bookWindow::toggleTree::accel, - a, "toggleTree"); - - // new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly"); - new KAction(i18n("Copy entry with text"), KShortcut(0), a, "copyEntryWithText"); - // new KAction(i18n("Copy selected text"), KShortcut(0), a, "copySelectedText"); - new KAction(i18n("Save entry as plain text"), KShortcut(0), a, "saveEntryAsPlainText"); - new KAction(i18n("Save entry as HTML"), KShortcut(0), a, "saveEntryAsHTML"); - // new KAction(i18n("Print reference only"), KShortcut(0), a, "printReferenceOnly"); - new KAction(i18n("Print entry with text"), KShortcut(0), a, "printEntryWithText"); - -} - -/** No descriptions */ -void CBookReadWindow::initConnections() { - CLexiconReadWindow::initConnections(); - - connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), - keyChooser(), SLOT(updateKey(CSwordKey*))); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - m_treeChooser, SLOT(updateKey(CSwordKey*))); -} - -/** Init the view */ -void CBookReadWindow::initView() { - QSplitter* splitter = new QSplitter(this); - - setMainToolBar( new KToolBar(this) ); - addDockWindow(mainToolBar()); - - m_treeChooser = new CBookTreeChooser(modules(), key(), splitter); - setDisplayWidget( CDisplay::createReadInstance(this, splitter) ); - - setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) ); - - setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) ); - moduleChooserBar()->setButtonLimit(1); - addDockWindow( moduleChooserBar() ); - - setButtonsToolBar( new KToolBar(this) ); - addDockWindow( buttonsToolBar() ); - setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), buttonsToolBar()) ); - - m_treeChooser->hide(); - - splitter->setResizeMode(m_treeChooser, QSplitter::Stretch); - setCentralWidget( splitter ); - setIcon(CToolClass::getIconForModule(modules().first())); -} - -void CBookReadWindow::initToolbars() { - Q_ASSERT(m_treeAction); - Q_ASSERT(m_actions.backInHistory); - - m_actions.backInHistory->plug( mainToolBar(), 0 ); - m_actions.forwardInHistory->plug( mainToolBar(), 1 ); - - mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser()); - - m_treeAction->plug(buttonsToolBar()); - m_treeAction->setChecked(false); - - buttonsToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton()); - - KAction* action = actionCollection()->action( - CResMgr::displaywindows::general::search::actionName ); - if (action) { - action->plug(buttonsToolBar()); - } - - #if KDE_VERSION_MINOR < 1 - action->plugAccel( accel() ); - #endif -} - -/** Is called when the action was executed to toggle the tree view. */ -void CBookReadWindow::treeToggled() { - if (m_treeAction->isChecked()) { - m_treeChooser->show(); - } - else { - m_treeChooser->hide(); - } -} - -/** Reimplementation to take care of the tree chooser. */ -void CBookReadWindow::modulesChanged() { - CLexiconReadWindow::modulesChanged(); - m_treeChooser->setModules(modules()); - lookup(key()); -} - -void CBookReadWindow::setupPopupMenu() { - CLexiconReadWindow::setupPopupMenu(); - - popup()->changeTitle(-1, CToolClass::getIconForModule(modules().first()), i18n("Book window")); -} diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.h b/bibletime/frontend/displaywindow/cbookreadwindow.h deleted file mode 100644 index 6effe83..0000000 --- a/bibletime/frontend/displaywindow/cbookreadwindow.h +++ /dev/null @@ -1,69 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CBOOKREADWINDOW_H -#define CBOOKREADWINDOW_H - -//BibleTime includes -#include "clexiconreadwindow.h" -#include "backend/cswordkey.h" -#include "backend/cswordtreekey.h" -#include "backend/cswordversekey.h" - -class KToggleAction; -class CBookTreeChooser; - -/** - * @author The BibleTime team - */ -class CBookReadWindow : public CLexiconReadWindow { - Q_OBJECT -public: - static void insertKeyboardActions( KActionCollection* const a ); - - CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); - - virtual ~CBookReadWindow(); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow ); - /** - * Store the settings of this window in the given profile window. - */ - virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow ); - -protected: - virtual void initActions(); - virtual void initToolbars(); - virtual void initConnections(); - virtual void initView(); - - virtual void setupPopupMenu(); - - protected slots: // Protected slots - /** - * Reimplementation to take care of the tree chooser. - */ - virtual void modulesChanged(); - -private: - KToggleAction* m_treeAction; - CBookTreeChooser* m_treeChooser; - -private slots: // Private slots - /** - * Is called when the action was executed to toggle the tree view. - */ - void treeToggled(); -}; - -#endif diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp deleted file mode 100644 index ddcfadf..0000000 --- a/bibletime/frontend/displaywindow/cbuttons.cpp +++ /dev/null @@ -1,218 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//HibleTime includes -#include "cbuttons.h" - -#include "util/cresmgr.h" - -#include "util/cpointers.h" - -//Qt includes -#include <qstring.h> -#include <qtooltip.h> - -//KDE includes -#include <kpopupmenu.h> -#include <klocale.h> - - -// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, QWidget *parent, const char *name ) -// : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) { -// m_filterOptions = filterOptions; -// m_filterOptions->transliteration = 0; -// -// m_popup = new KPopupMenu(this); -// setPopup(m_popup); -// setPopupDelay(0001); -// -// connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionSelected(int))); -// populateMenu(); -// } -// -// CTransliterationButton::~CTransliterationButton(){ -// -// } -// -// /** Resets the buttons with the list of used modules. */ -// void CTransliterationButton::reset( ListCSwordModuleInfo& /*modules*/ ){ -// m_popup->clear(); -// // popuplateMenu(); -// } -// -// /** Setup the menu entries. */ -// void CTransliterationButton::populateMenu(){ -// m_popup->clear(); -// m_popup->insertTitle(i18n("Transliteration")); -// m_popup->setCheckable(true); -// -// if (!CPointers::backend()->useICU()) -// return; -// -// Q_ASSERT(CPointers::backend()->transliterator()); -// if (!CPointers::backend()->transliterator()) -// return; -// -// sword::StringList options = CPointers::backend()->transliterator()->getOptionValues(); -// sword::StringList::iterator it; -// -// for (it = options.begin(); it != options.end(); ++it) { -// int id = m_popup->insertItem(QString::fromLatin1((*it).c_str())); -// if (m_filterOptions->transliteration == m_popup->indexOf(id)-1 ) { //workaround -// m_popup->setItemChecked(id, true); -// } -// } -// } -// -// /** No descriptions */ -// void CTransliterationButton::optionSelected(int ID){ -// for (unsigned int i = 0; i < m_popup->count(); i++) -// m_popup->setItemChecked(m_popup->idAt(i),false); -// m_popup->setItemChecked(ID, true); -// -// m_filterOptions->transliteration = m_popup->indexOf( ID )-1; //workaround -// emit sigChanged(); -// } - -/************************************************ - *********** CDisplaySettingsButton ************* - ************************************************/ - -CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,QWidget *parent, const char *name ) -: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) { - // qWarning("CDisplaySettingsButton::CDisplaySettingsButton"); - m_displaySettings = displaySettings; - m_moduleSettings = moduleSettings; - m_modules = useModules; - - m_popup = new KPopupMenu(this); - setPopup(m_popup); - setPopupDelay(0001); //Fix, O only opens menu on mouse release or move - - connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionToggled(int))); - populateMenu(); -} - -void CDisplaySettingsButton::reset(const ListCSwordModuleInfo& useModules) { - m_modules = useModules; - populateMenu(); - //disable the settings button if no options are available - if (!populateMenu()) { - setEnabled(false); - QToolTip::add - (this, i18n("Display settings: No options available")); - } - else { - setEnabled(true); - QToolTip::add - (this, i18n("Display settings")); - } -} - - -void CDisplaySettingsButton::optionToggled(int ID) { - m_popup->setItemChecked( ID, !(m_popup->isItemChecked(ID))); - if (!m_popup->text(ID).isEmpty()) - *(m_dict[m_popup->text(ID).remove('&')]) = m_popup->isItemChecked(ID); - emit sigChanged(); -} - -/** No descriptions */ -int CDisplaySettingsButton::populateMenu() { - int ret = 0; - - m_popup->clear(); - m_popup->insertTitle(i18n("Display options")); - m_popup->setCheckable(true); - - ret += addMenuEntry(i18n("Use linebreaks after each verse"), &m_displaySettings->lineBreaks, (m_modules.first()->type() == CSwordModuleInfo::Bible)); - - //only show the verse numbers option for bible modules - ret += addMenuEntry(i18n("Show versenumbers"), &m_displaySettings->verseNumbers, (m_modules.first()->type() == CSwordModuleInfo::Bible)); - - ret += addMenuEntry(i18n("Show headings"), &m_moduleSettings->headings, - isOptionAvailable(CSwordModuleInfo::headings)); - /* ret += addMenuEntry(i18n("Show footnotes"), &m_moduleSettings->footnotes, - isOptionAvailable(CSwordBackend::footnotes ));*/ - ret += addMenuEntry(i18n("Highlight words of Jesus"), &m_moduleSettings->redLetterWords, - isOptionAvailable(CSwordModuleInfo::redLetterWords )); - // ret += addMenuEntry(i18n("Show Strong's Numbers"), &m_moduleSettings->strongNumbers, - // isOptionAvailable(CSwordBackend::strongNumbers )); - - /* ret += addMenuEntry(i18n("Show morphologic tags"),&m_moduleSettings->morphTags, - isOptionAvailable(CSwordBackend::morphTags )); - ret += addMenuEntry(i18n("Show lemmas"),&m_moduleSettings->lemmas, - isOptionAvailable(CSwordBackend::lemmas ));*/ - ret += addMenuEntry(i18n("Show Hebrew vowel points"), &m_moduleSettings->hebrewPoints, - isOptionAvailable(CSwordModuleInfo::hebrewPoints )); - ret += addMenuEntry(i18n("Show Hebrew cantillation marks"), &m_moduleSettings->hebrewCantillation, - isOptionAvailable(CSwordModuleInfo::hebrewCantillation )); - ret += addMenuEntry(i18n("Show Greek accents"), &m_moduleSettings->greekAccents, - isOptionAvailable(CSwordModuleInfo::greekAccents )); - - ret += addMenuEntry(i18n("Use alternative textual variant"), &m_moduleSettings->textualVariants, - isOptionAvailable(CSwordModuleInfo::textualVariants )); - ret += addMenuEntry(i18n("Show scripture cross-references"), &m_moduleSettings->scriptureReferences, - isOptionAvailable(CSwordModuleInfo::scriptureReferences )); - ret += addMenuEntry(i18n("Show morph segmentation"), &m_moduleSettings->morphSegmentation, - isOptionAvailable(CSwordModuleInfo::morphSegmentation )); - - return ret; -} - -/** No descriptions */ -int CDisplaySettingsButton::addMenuEntry( const QString name, const int* option, const bool available) { - int ret = 0; - - if (available) { - m_dict.insert( name, option ); - m_popup->setItemChecked(m_popup->insertItem( name ), *option ); - ret = 1; - } - - return ret; -} - -bool CDisplaySettingsButton::isOptionAvailable( const CSwordModuleInfo::FilterTypes option ) { - bool ret = false; - // for (m_modules.first(); m_modules.current() && !ret; m_modules.next()) { - ListCSwordModuleInfo::iterator end_it = m_modules.end(); - for (ListCSwordModuleInfo::iterator it(m_modules.begin()); it != end_it; ++it) { - ret = ret || (*it)->has(option); - } - - return ret; -} - -/** Returns the number of usable menu items in the setttings menu. */ -const int CDisplaySettingsButton::menuItemCount() { - return m_popup->count(); -} - -/** Sets the item at position pos to the satet given as 2nd paramter. */ -void CDisplaySettingsButton::setItemStatus( const int index, const bool checked ) { - const int ID = m_popup->idAt(index); - m_popup->setItemChecked(ID, checked); - const QString text = m_popup->text(ID).remove('&'); - if (m_dict[text]) { - *(m_dict[text]) = checked; - } -} - -/** Returns the status of the item at position "index" */ -const bool CDisplaySettingsButton::itemStatus( const int index ) { - return m_popup->isItemChecked( m_popup->idAt(index) ); -} - -/** Sets the status to changed. The signal changed will be emitted. */ -void CDisplaySettingsButton::setChanged() { - emit sigChanged(); -} diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h deleted file mode 100644 index ac72f49..0000000 --- a/bibletime/frontend/displaywindow/cbuttons.h +++ /dev/null @@ -1,101 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CBUTTONS_H -#define CBUTTONS_H - -//BibleTime includes -#include "backend/cswordbackend.h" -#include "backend/cswordmoduleinfo.h" - -//QT includes -#include <qdict.h> - -//KDE includes -#include <ktoolbarbutton.h> - -class KPopupMenu; - -/** This class manages the transliteration of the selected modules. - * @author The BibleTime team - */ -// class CTransliterationButton : public KToolBarButton { -// Q_OBJECT -// public: -// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, QWidget *parent, const char *name=0); -// ~CTransliterationButton(); -// /** -// * Setup the menu entries. -// */ -// void populateMenu(); -// /** -// * Resets the buttons with the list of used modules. -// */ -// void reset( ListCSwordModuleInfo& modules ); -// -// protected slots: // Protected slots -// void optionSelected(int); -// -// private: -// KPopupMenu* m_popup; -// CSwordBackend::FilterOptions* m_filterOptions; -// -// signals: -// void sigChanged(); -// }; - -/** This class manages the display options of the selected modules. - * @author The BibleTime team - */ -class CDisplaySettingsButton : public KToolBarButton { - Q_OBJECT -public: - CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, QWidget *parent=0, const char *name=0); - void reset(const ListCSwordModuleInfo& useModules); - /** - * Sets the item at position pos to the satet given as 2nd paramter. - */ - void setItemStatus( const int pos, const bool checked ); - /** - * Returns the number of usable menu items in the setttings menu. - */ - const int menuItemCount(); - /** - * Returns the status of the item at position "index" - */ - const bool itemStatus( const int index ); - /** - * Sets the status to changed. The signal changed will be emitted. - */ - void setChanged(); - -signals: - void sigChanged(void); - -protected slots: - void optionToggled(int ID); - -protected: - CSwordBackend::FilterOptions* m_moduleSettings; - CSwordBackend::DisplayOptions* m_displaySettings; - CSwordBackend::FilterOptions m_available; - ListCSwordModuleInfo m_modules; - - QDict<int> m_dict; - - KPopupMenu* m_popup; - - int populateMenu(); - bool isOptionAvailable( const CSwordModuleInfo::FilterTypes option); - int addMenuEntry( const QString name, const int* option, const bool available); -}; - -#endif diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp deleted file mode 100644 index 9355831..0000000 --- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp +++ /dev/null @@ -1,198 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "ccommentaryreadwindow.h" - -#include "frontend/cprofilewindow.h" -#include "frontend/cbtconfig.h" -#include "frontend/keychooser/ckeychooser.h" -#include "frontend/display/cdisplay.h" -#include "frontend/display/creaddisplay.h" - -#include "util/ctoolclass.h" -#include "util/cresmgr.h" - -//Qt includes - -//KDE includes -#include <kaction.h> -#include <kaccel.h> -#include <klocale.h> -#include <kpopupmenu.h> - -using namespace Profile; - -CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent,name) {} - -void CCommentaryReadWindow::insertKeyboardActions( KActionCollection* const a ) { - new KAction( - i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel, - a, "nextBook" - ); - new KAction( - i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel, - a, "previousBook" - ); - new KAction( - i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel, - a, "nextChapter" - ); - new KAction( - i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel, - a, "previousChapter" - ); - new KAction( - i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel, - a, "nextVerse" - ); - new KAction( - i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel, - a, "previousVerse" - ); -} - -void CCommentaryReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) { - CLexiconReadWindow::applyProfileSettings(profileWindow); - if (profileWindow->windowSettings()) { - m_syncButton->setChecked(true); - } -}; - -void CCommentaryReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) { - CLexiconReadWindow::storeProfileSettings(profileWindow); - profileWindow->setWindowSettings( m_syncButton->isChecked() ); -}; - -void CCommentaryReadWindow::initToolbars() { - CLexiconReadWindow::initToolbars(); - - m_syncButton = new KToggleAction(i18n("Sync with active Bible"), - CResMgr::displaywindows::commentaryWindow::syncWindow::icon, - CResMgr::displaywindows::commentaryWindow::syncWindow::accel, - actionCollection(), - CResMgr::displaywindows::commentaryWindow::syncWindow::actionName - ); - m_syncButton->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); - m_syncButton->plug(buttonsToolBar()); -} - -/** Reimplementation to handle the keychooser refresh. */ -void CCommentaryReadWindow::reload() { - CLexiconReadWindow::reload(); - - //refresh the book lists - verseKey()->setLocale( backend()->booknameLanguage().latin1() ); - keyChooser()->refreshContent(); -} - -/** rapper around key() to return the right type of key. */ -CSwordVerseKey* CCommentaryReadWindow::verseKey() { - CSwordVerseKey* k = dynamic_cast<CSwordVerseKey*>(CDisplayWindow::key()); - Q_ASSERT(k); - return k; -} - -void CCommentaryReadWindow::initActions() { - CLexiconReadWindow::initActions(); //make sure the predefined actions are available - //cleanup, not a clean oo-solution - actionCollection()->action("nextEntry")->setEnabled(false); - actionCollection()->action("previousEntry")->setEnabled(false); - - new KAction( - i18n("Next book"), - CResMgr::displaywindows::bibleWindow::nextBook::accel, - this, SLOT(nextBook()), - actionCollection(), "nextBook" - ); - new KAction( - i18n("Previous book"), - CResMgr::displaywindows::bibleWindow::previousBook::accel, - this, SLOT(previousBook()), - actionCollection(), "previousBook" - ); - new KAction( - i18n("Next chapter"), - CResMgr::displaywindows::bibleWindow::nextChapter::accel, - this, SLOT(nextChapter()), - actionCollection(), "nextChapter" - ); - new KAction( - i18n("Previous chapter"), - CResMgr::displaywindows::bibleWindow::previousChapter::accel, - this, SLOT(previousChapter()), - actionCollection(), "previousChapter" - ); - new KAction( - i18n("Next verse"), - CResMgr::displaywindows::bibleWindow::nextVerse::accel, - this, SLOT(nextVerse()), - actionCollection(), "nextVerse" - ); - new KAction( - i18n("Previous verse"), - CResMgr::displaywindows::bibleWindow::previousVerse::accel, - this, SLOT(previousVerse()), - actionCollection(), "previousVerse" - ); - - CBTConfig::setupAccelSettings(CBTConfig::commentaryWindow, actionCollection()); -} - -/** Moves to the next book. */ -void CCommentaryReadWindow::nextBook() { - if (verseKey()->next(CSwordVerseKey::UseBook)) - keyChooser()->setKey(key()); -} - -/** Moves one book behind. */ -void CCommentaryReadWindow::previousBook() { - if (verseKey()->previous(CSwordVerseKey::UseBook)) - keyChooser()->setKey(key()); -} - -/** Moves to the next book. */ -void CCommentaryReadWindow::nextChapter() { - if (verseKey()->next(CSwordVerseKey::UseChapter)) - keyChooser()->setKey(key()); -} - -/** Moves one book behind. */ -void CCommentaryReadWindow::previousChapter() { - if (verseKey()->previous(CSwordVerseKey::UseChapter)) - keyChooser()->setKey(key()); -} - -/** Moves to the next book. */ -void CCommentaryReadWindow::nextVerse() { - if (verseKey()->next(CSwordVerseKey::UseVerse)) - keyChooser()->setKey(key()); -} - -/** Moves one book behind. */ -void CCommentaryReadWindow::previousVerse() { - if (verseKey()->previous(CSwordVerseKey::UseVerse)) - keyChooser()->setKey(key()); -} - -const bool CCommentaryReadWindow::syncAllowed() const { - return m_syncButton->isChecked(); -} - - -/*! - \fn CCommentaryReadWindow::setupPopupMenu() - */ -void CCommentaryReadWindow::setupPopupMenu() { - CLexiconReadWindow::setupPopupMenu(); - - popup()->changeTitle(-1, CToolClass::getIconForModule(modules().first()), i18n("Commentary window")); -} diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h deleted file mode 100644 index 8b13d72..0000000 --- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h +++ /dev/null @@ -1,67 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CCOMMENTARYREADWINDOW_H -#define CCOMMENTARYREADWINDOW_H - -//BibleTime includes -#include "cbiblereadwindow.h" - -//Qt includes -#include <qwidget.h> - -/** - *@author The BibleTime team - */ - -class CCommentaryReadWindow : public CLexiconReadWindow { - Q_OBJECT -public: - /** - * Reimplementation. - */ - static void insertKeyboardActions( KActionCollection* const a ); - - CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow ); - /** - * Store the settings of this window in the given profile window. - */ - virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow ); - virtual const bool syncAllowed() const; - -public slots: // Public slots - void nextBook(); - void previousBook(); - void nextChapter(); - void previousChapter(); - void nextVerse(); - void previousVerse(); - /** - * Reimplementation to handle the keychooser refresh. - */ - virtual void reload(); - -protected: - virtual void initActions(); - virtual void initToolbars(); - -private: - KToggleAction* m_syncButton; - CSwordVerseKey* verseKey(); -protected: - virtual void setupPopupMenu(); -}; - -#endif diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp deleted file mode 100644 index 1eebba7..0000000 --- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp +++ /dev/null @@ -1,498 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cdisplaywindow.h" -#include "creadwindow.h" -#include "cbiblereadwindow.h" -#include "ccommentaryreadwindow.h" -#include "clexiconreadwindow.h" -#include "cbookreadwindow.h" - -#include "cwritewindow.h" -#include "cplainwritewindow.h" -#include "chtmlwritewindow.h" - -#include "cmodulechooserbar.h" -#include "cbuttons.h" - -#include "backend/cswordkey.h" - -#include "frontend/keychooser/ckeychooser.h" - -#include "frontend/display/cdisplay.h" - -#include "frontend/cmdiarea.h" -#include "frontend/cprofilewindow.h" -#include "frontend/cbtconfig.h" - -#include "frontend/searchdialog/csearchdialog.h" - -#include "util/cresmgr.h" - - -//Qt includes - -//KDE includes -#include <kdeversion.h> -#include <kaccel.h> -#include <klocale.h> - -using namespace Profile; - -CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name) { - switch (modules.first()->type()) { - case CSwordModuleInfo::Bible: - return new CBibleReadWindow(modules, parent, name); - case CSwordModuleInfo::Commentary: - return new CCommentaryReadWindow(modules, parent, name); - case CSwordModuleInfo::Lexicon: - return new CLexiconReadWindow(modules, parent, name); - case CSwordModuleInfo::GenericBook: - return new CBookReadWindow(modules, parent, name); - default: - qWarning("unknown module type"); - break; - } - return 0; -} - - -CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const CDisplayWindow::WriteWindowType type, const char* name) { - if (type == HTMLWindow) { - return new CHTMLWriteWindow(modules, parent, name); - } - else { - return new CPlainWriteWindow(modules, parent, name); - } - return 0; -} - -CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name ) -#if KDE_VERSION >= 0x030200 -: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose), -#else -: KMainWindow(parent, name, WDestructiveClose), -#endif -m_mdi(parent), -m_filterOptions(), -m_displayOptions(), -m_displaySettingsButton(0), -m_keyChooser(0), -m_swordKey(0), -m_isReady(false), -m_moduleChooserBar(0), -m_mainToolBar(0), -m_popupMenu(0), -m_displayWidget(0) { - setModules(modules); -} - -CDisplayWindow::~CDisplayWindow() { - delete m_swordKey; - m_swordKey = 0; -} - -CMDIArea* const CDisplayWindow::mdi() const { - return m_mdi; -} - -/** Returns the right window caption. */ -const QString CDisplayWindow::windowCaption() { - if (!m_modules.count()) { - return QString::null; - } - - return QString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")"); -} - -/** Returns the used modules as a QPtrList */ -ListCSwordModuleInfo CDisplayWindow::modules() { - ListCSwordModuleInfo mods; - - for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { - Q_ASSERT(backend()->findModuleByName(*it)); - if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { - mods.append(m); - } - } - - return mods; -} - -/** Set the window caption. */ -void CDisplayWindow::setCaption( const QString& ) { - QWidget::setCaption( windowCaption() ); - m_mdi->emitWindowCaptionChanged(); -} - -void CDisplayWindow::insertKeyboardActions( KActionCollection* const a ) { - KStdAction::zoomIn(0, 0, a, "zoomIn"); //no slot - KStdAction::zoomOut(0, 0, a, "zoomOut"); //no slot - KStdAction::close(0, 0, a, "closeWindow"); //no slot - KStdAction::selectAll(0, 0, a, "selectAll"); - KStdAction::copy(0, 0, a, "copySelectedText"); - KStdAction::find(0, 0, a, "findText"); - - new KToolBarPopupAction( - i18n("Back in history"), - CResMgr::displaywindows::general::backInHistory::icon, - CResMgr::displaywindows::general::backInHistory::accel, - a, - CResMgr::displaywindows::general::backInHistory::actionName - ); - new KToolBarPopupAction( - i18n("Forward in history"), - CResMgr::displaywindows::general::forwardInHistory::icon, - CResMgr::displaywindows::general::forwardInHistory::accel, - a, CResMgr::displaywindows::general::forwardInHistory::actionName - ); -} - -void CDisplayWindow::initActions() { - new KAction(i18n("Search"), - CResMgr::displaywindows::general::search::icon, - CResMgr::displaywindows::general::search::accel, - this, SLOT(slotSearchInModules()), - actionCollection(), CResMgr::displaywindows::general::search::actionName - ); - - KStdAction::zoomIn( - displayWidget()->connectionsProxy(), SLOT(zoomIn()), - actionCollection(), "zoomIn" - ); - KStdAction::zoomOut( - displayWidget()->connectionsProxy(), SLOT(zoomOut()), - actionCollection(), "zoomOut" - ); - KStdAction::close( - this, SLOT(close()), - actionCollection(), "closeWindow" - ); - - KStdAction::selectAll( - displayWidget()->connectionsProxy(), SLOT(selectAll()), - actionCollection(), "selectAll" - ); - - KStdAction::copy( - displayWidget()->connectionsProxy(), SLOT(copySelection()), - actionCollection(), "copySelectedText" - ); - - KStdAction::find( - displayWidget()->connectionsProxy(), SLOT(openFindTextDialog()), - actionCollection(), "findText" - ); - - new KToolBarPopupAction( - i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel, - keyChooser(), SLOT( backInHistory() ), - actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName - ); - - new KToolBarPopupAction( - i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel, - keyChooser(), SLOT( forwardInHistory() ), - actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName - ); - - CBTConfig::setupAccelSettings(CBTConfig::allWindows, actionCollection()); -} - -/** Is called when this window gets the focus or looses the focus. */ -void CDisplayWindow::windowActivated( const bool hasFocus ) { - if (accel()) { - accel()->setEnabled(hasFocus); - } -} - -/** Refresh the settings of this window. */ -void CDisplayWindow::reload() { - //first make sure all used Sword modules are still present - for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { - if (!backend()->findModuleByName(*it)) { - it = m_modules.remove(it); - if (it == m_modules.end()) { - break; - } - } - } - if (m_modules.count() == 0){ - close(); - return; - } - - if (keyChooser()) keyChooser()->setModules( modules(), false ); - - if (m_moduleChooserBar) { //necessary for edit windows which have now chooser bar - m_moduleChooserBar->setModules(modules()); - } - modulesChanged(); - lookup(); -} - -/** Returns the filter options used by this window. */ -CSwordBackend::FilterOptions& CDisplayWindow::filterOptions() { - return m_filterOptions; -} - -/** Returns the display options used by this display window. */ -CSwordBackend::DisplayOptions& CDisplayWindow::displayOptions() { - return m_displayOptions; -} - -/** Sets the new display options for this window. */ -void CDisplayWindow::setDisplayOptions( const CSwordBackend::DisplayOptions& displayOptions ) { - m_displayOptions = displayOptions; -} - -/** Sets the new filter options of this window. */ -void CDisplayWindow::setFilterOptions( CSwordBackend::FilterOptions& filterOptions ) { - m_filterOptions = filterOptions; -} - -/** Returns true if the widget is ready for use. */ -const bool CDisplayWindow::isReady() const { - return m_isReady; -} - -/** Set the ready status */ -void CDisplayWindow::setReady( const bool& ready ) { - m_isReady = ready; -} - -/** Returns true if the window may be closed. */ -bool CDisplayWindow::queryClose() { - return true; -} - -/** Returns the keychooser widget of this display window. */ -CKeyChooser* const CDisplayWindow::keyChooser() const { - return m_keyChooser; -} - -/** Sets the keychooser widget for this display window. */ -void CDisplayWindow::setKeyChooser( CKeyChooser* ck ) { - m_keyChooser = ck; -} - -/** Returns the key of this display window. */ -CSwordKey* CDisplayWindow::key() const { - Q_ASSERT( m_swordKey ); - return m_swordKey; -} - -/** Sets the new sword key. */ -void CDisplayWindow::setKey( CSwordKey* key ) { - Q_ASSERT( key ); - m_swordKey = key; -} - -void CDisplayWindow::modulesChanged() { - if (moduleChooserBar()) { //necessary for write windows - setModules( m_moduleChooserBar->getModuleList() ); - } - - if (!modules().count()) { - close(); - } - else { - if (displaySettingsButton()) { - displaySettingsButton()->reset(modules()); - } - - key()->module(modules().first()); - keyChooser()->setModules(modules()); - } -} - -/** Returns the module chooser bar. */ -CModuleChooserBar* const CDisplayWindow::moduleChooserBar() const { - return m_moduleChooserBar; -} - -/** Sets the module chooser bar. */ -void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ) { - if (m_moduleChooserBar) { - disconnect(m_moduleChooserBar, SIGNAL(sigChanged()), this, SLOT(modulesChanged())); - } - - //if a new bar should be set! - if (bar) { - m_moduleChooserBar = bar; - connect(bar, SIGNAL(sigChanged()), SLOT(modulesChanged())); - } -} - -/** Sets the modules. */ -void CDisplayWindow::setModules( const ListCSwordModuleInfo& newModules ) { - m_modules.clear(); - - ListCSwordModuleInfo::const_iterator end_it = newModules.end(); - for (ListCSwordModuleInfo::const_iterator it(newModules.begin()); it != end_it; ++it) { - m_modules.append((*it)->name()); - } -} - -/** Initialize the window. Call this method from the outside, because calling this in the constructor is not possible! */ -const bool CDisplayWindow::init() { - //BibleTime::createReadDisplayWindow calls the show() method - initView(); - setMinimumSize( 250,200 ); - - setCaption(windowCaption()); - //setup focus stuff. - setFocusPolicy(QWidget::ClickFocus); - parentWidget()->setFocusPolicy(QWidget::ClickFocus); - - initActions(); - initToolbars(); - initConnections(); - setupPopupMenu(); - - m_filterOptions = CBTConfig::getFilterOptionDefaults(); - m_displayOptions = CBTConfig::getDisplayOptionDefaults(); - if (displaySettingsButton()) { - displaySettingsButton()->reset(modules()); - } - - setReady(true); - return true; -} - -/** Returns the main toolbar. */ -KToolBar* const CDisplayWindow::mainToolBar() const { - return m_mainToolBar; -} - -/** Returns the main toolbar. */ -KToolBar* const CDisplayWindow::buttonsToolBar() const { - return m_buttonsToolBar; -} - -/** Sets the main toolbar. */ -void CDisplayWindow::setMainToolBar( KToolBar* bar ) { - m_mainToolBar = bar; -} - -/** Sets the main toolbar. */ -void CDisplayWindow::setButtonsToolBar( KToolBar* bar ) { - m_buttonsToolBar = bar; -} - -/** Returns the display settings button */ -CDisplaySettingsButton* const CDisplayWindow::displaySettingsButton() const { - return m_displaySettingsButton; -} - -/** Sets the display settings button. */ -void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ) { - if (m_displaySettingsButton) - disconnect(m_displaySettingsButton, SIGNAL( sigChanged() ),this, SLOT(lookup() )); - - m_displaySettingsButton = button; - connect(m_displaySettingsButton, SIGNAL(sigChanged()),this, SLOT(lookup())); -} - -/** Lookup the current key. Used to refresh the display. */ -void CDisplayWindow::lookup() { - lookup( key() ); -} - -void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) { - Q_ASSERT(isReady()); - if (!isReady()) { - return; - } - - CSwordModuleInfo* m = backend()->findModuleByName(moduleName); - Q_ASSERT(m); - if (!m) { - return; - } - - //ToDo: check for containsRef compat - if (m && modules().contains(m)) { - key()->key(keyName); - keyChooser()->setKey(key()); //the key chooser does send an update signal - } - else { //given module not displayed in this window - //if the module is displayed in another display window we assume a wrong drop - bool found = false; - //create a new window for the given module - ListCSwordModuleInfo mList; - mList.append(m); - mdi()->emitCreateDisplayWindow(mList, keyName); - } -} - -void CDisplayWindow::lookup( const QString& keyName ) { - /* This function is called for example after a bookmark was dropped on this window - */ - Q_ASSERT(modules().first()); - - //qDebug("CDisplayWindow::lookup: %s", keyName.latin1()); - lookup(modules().first()->name(), keyName); -} - -/** Update the status of the popup menu entries. */ -void CDisplayWindow::updatePopupMenu() {} - - -///** Returns the installed popup menu. */ -KPopupMenu* const CDisplayWindow::popup() { - // qWarning("CReadWindow::popup()"); - if (!m_popupMenu) { - m_popupMenu = new KPopupMenu(this); - connect(m_popupMenu, SIGNAL(aboutToShow()), this, SLOT(updatePopupMenu())); - if (displayWidget()) { - displayWidget()->installPopup(m_popupMenu); - } - /* else { - qWarning("CDisplayWindow:: can't instal popup menu"); - }*/ - } - return m_popupMenu; -} - -/** Returns the display widget used by this implementation of CDisplayWindow. */ -CDisplay* const CDisplayWindow::displayWidget() const { - Q_ASSERT(m_displayWidget); - return m_displayWidget; -} - -/** Sets the display widget used by this display window. */ -void CDisplayWindow::setDisplayWidget( CDisplay* newDisplay ) { - m_displayWidget = newDisplay; -} - -void CDisplayWindow::closeEvent(QCloseEvent* e) { - if (!queryClose()) { - e->ignore(); - } - else { - e->accept(); - } -} - -void CDisplayWindow::slotSearchInModules() { - Search::CSearchDialog::openDialog(modules()); -} - -void CDisplayWindow::printAll() { - m_displayWidget->connectionsProxy()->printAll( m_displayOptions, m_filterOptions); -} - -void CDisplayWindow::printAnchorWithText() { - m_displayWidget->connectionsProxy()->printAnchorWithText( m_displayOptions, m_filterOptions); -} - diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h deleted file mode 100644 index c166687..0000000 --- a/bibletime/frontend/displaywindow/cdisplaywindow.h +++ /dev/null @@ -1,275 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CDISPLAYWINDOW_H -#define CDISPLAYWINDOW_H - -//BibleTime includes -#include "util/cpointers.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" -#include "backend/cswordtreekey.h" -#include "backend/cswordldkey.h" - -#include "frontend/cprofilewindow.h" - -//Qt includes -#include <qwidget.h> - -//KDE includes -#include <kmainwindow.h> - - -//Forward declarations -class CMDIArea; -class CReadWindow; -class CWriteWindow; -class CMDIArea; -class CDisplaySettingsButton; -class CDisplay; -class CKeyChooser; -class CModuleChooserBar; -class CDisplaySettingsButton; -class KAccel; -class KToolBar; -class KPopupMenu; - -/** The base class for all display windows of BibleTime. - * @author The BibleTime team - */ - -class CDisplayWindow : public KMainWindow, public CPointers { - Q_OBJECT -public: - enum WriteWindowType { - HTMLWindow = 1, - PlainTextWindow = 2 - }; - - static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name = 0); - static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const WriteWindowType type = HTMLWindow, const char* name = 0); - /** - * Insert the keyboard accelerators of this window into the given KAccel object. - */ - // static void insertKeyboardActions( KAccel* const accel ); - static void insertKeyboardActions( KActionCollection* const a ); - - CMDIArea* const mdi() const; - /** - * Returns the right window caption. - */ - const QString windowCaption(); - /** - * Returns the used modules as a QPtrList - */ - ListCSwordModuleInfo modules(); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow ) = 0; - /** - * Store the settings of this window in the given profile window. - */ - virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow ) = 0; - /** - * Set the window caption. - */ - virtual void setCaption( const QString& ); - /** - * Sets the new filter options of this window. - */ - void setFilterOptions( CSwordBackend::FilterOptions& filterOptions ); - /** - * Sets the new display options for this window. - */ - void setDisplayOptions( const CSwordBackend::DisplayOptions& displayOptions ); - /** - * Returns the display options used by this display window. - */ - CSwordBackend::DisplayOptions& displayOptions(); - /** - * Returns the filter options used by this window. - */ - CSwordBackend::FilterOptions& filterOptions(); - /** - * Set the ready status - */ - void setReady( const bool& ready ); - /** - * Returns true if the widget is ready for use. - */ - const bool isReady() const; - /** - * Returns true if the window may be closed. - */ - virtual bool queryClose(); - /** - * Returns the keychooser widget of this display window. - */ - CKeyChooser* const keyChooser() const; - /** - * Sets the new sword key. - */ - void setKey( CSwordKey* key ); - /** - * Returns the key of this display window. - */ - CSwordKey* key() const; - /** - * Initialize the window. Call this method from the outside, because calling this in the constructor is not possible! - */ - virtual const bool init(); - /** - * Sets the main toolbar. - */ - void setMainToolBar( KToolBar* bar ); - /** - * Sets the buttons toolbar. - */ - void setButtonsToolBar( KToolBar* bar ); - /** - * Returns the main toolbar. - */ - KToolBar* const mainToolBar() const; - /** - * Returns the buttons toolbar. - */ - KToolBar* const buttonsToolBar() const; - /** - * Initialize the toolbars - */ - virtual void initToolbars() = 0; - /** - * Returns the display settings button - */ - CDisplaySettingsButton* const displaySettingsButton() const; - /** - * Sets the display settings button. - */ - void setDisplaySettingsButton( CDisplaySettingsButton* button ); - virtual void setupPopupMenu() = 0; - /** - * Returns the display widget used by this implementation of CDisplayWindow. - */ - virtual CDisplay* const displayWidget() const; - /** - * Sets the display widget used by this display window. - */ - virtual void setDisplayWidget( CDisplay* newDisplay ); - - /** Returns whether syncs to the active window are allowed at this time for this display window - * @return boolean value whether sync is allowed - */ - virtual const bool syncAllowed() const { - return false; - }; - -public slots: - /** - * Lookup the specified key in the given module. If the module is not chosen withing - * this display window create a new displaywindow with the right module in it. - */ - virtual void lookup( const QString& module, const QString& key ); - /** - * Lookup the key in the chosen modules. - */ - virtual void lookup( const QString& key ); - /** - * Refresh the settings of this window. - */ - virtual void reload(); - -protected: - friend class CMDIArea; - friend class CBibleReadWindow; - - CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); - virtual ~CDisplayWindow(); - /** - * Initializes the intern keyboard actions. - */ - virtual void initActions(); - /** - Is called when this window gets the focus or looses the focus. - */ - virtual void windowActivated( const bool hasFocus ); - /** - * Sets the keychooser widget for this display window. - */ - void setKeyChooser( CKeyChooser* ck ); - /** - * Returns the module chooser bar. - */ - CModuleChooserBar* const moduleChooserBar() const; - /** - * Lookup the given key. - */ - virtual void lookup( CSwordKey* ) = 0; - /** - * Sets the module chooser bar. - */ - void setModuleChooserBar( CModuleChooserBar* bar ); - /** - * Sets the modules. - */ - void setModules( const ListCSwordModuleInfo& modules ); - /** - * Initializes the signal / slot connections of this display window. - */ - virtual void initConnections() = 0; - /** - * Initialize the view of this display window. - */ - virtual void initView() = 0; - /** - * Returns the installed popup menu. - */ - KPopupMenu* const popup(); - virtual void closeEvent(QCloseEvent* e); - -protected slots: - virtual void modulesChanged(); - /** - * Lookup the current key. Used to refresh the display. - */ - void lookup(); - virtual void updatePopupMenu(); - - void slotSearchInModules(); - - void printAll(); - void printAnchorWithText(); - - -private: - CMDIArea* m_mdi; - - //we may only cache the module names bacause after a backend relaod the pointers are invalid! - QStringList m_modules; - - CSwordBackend::FilterOptions m_filterOptions; - CSwordBackend::DisplayOptions m_displayOptions; - - CDisplaySettingsButton* m_displaySettingsButton; - CKeyChooser* m_keyChooser; - CSwordKey* m_swordKey; - bool m_isReady; - CModuleChooserBar* m_moduleChooserBar; - KToolBar* m_mainToolBar; - KToolBar* m_buttonsToolBar; - KPopupMenu* m_popupMenu; - CDisplay* m_displayWidget; -}; - -#endif diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp deleted file mode 100644 index e2e91e4..0000000 --- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "chtmlwritewindow.h" - -//frontend includes -#include "frontend/keychooser/ckeychooser.h" -#include "frontend/cprofilewindow.h" - -#include "util/cresmgr.h" - -//Qt includes - -//KDE includes -#include <kaction.h> -#include <klocale.h> - -using namespace Profile; - -CHTMLWriteWindow::CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) -: CPlainWriteWindow(modules, parent, name) {} - -CHTMLWriteWindow::~CHTMLWriteWindow() {} - -void CHTMLWriteWindow::initView() { - CWriteDisplay* writeDisplay = CDisplay::createWriteInstance(this, CDisplay::HTMLDisplay); - Q_ASSERT(writeDisplay); - setDisplayWidget( writeDisplay ); - setCentralWidget( displayWidget()->view() ); - - setMainToolBar( new KToolBar(this) ); - mainToolBar()->setFullSize(true); - addDockWindow(mainToolBar()); - - setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) ); - mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser()); - mainToolBar()->setFullSize(false); -}; - -void CHTMLWriteWindow::initConnections() { - CWriteWindow::initConnections(); - - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), - this, SLOT(textChanged()) ); -}; - -void CHTMLWriteWindow::initToolbars() { - //setup the toolbar - m_actions.syncWindow = new KToggleAction(i18n("Sync with active Bible"), - CResMgr::displaywindows::commentaryWindow::syncWindow::icon, - CResMgr::displaywindows::commentaryWindow::syncWindow::accel, - actionCollection(), - CResMgr::displaywindows::commentaryWindow::syncWindow::actionName - ); - m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); - m_actions.syncWindow->plug(mainToolBar()); - - m_actions.saveText = new KAction( i18n("Save text"), - CResMgr::displaywindows::writeWindow::saveText::icon, - CResMgr::displaywindows::writeWindow::saveText::accel, - this, SLOT( saveCurrentText() ), - actionCollection(), - CResMgr::displaywindows::writeWindow::saveText::actionName - ); - m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip ); - m_actions.saveText->plug(mainToolBar()); - - m_actions.deleteEntry = new KAction(i18n("Delete current entry"), - CResMgr::displaywindows::writeWindow::deleteEntry::icon, - CResMgr::displaywindows::writeWindow::deleteEntry::accel, - this, SLOT(deleteEntry()), - actionCollection(), - CResMgr::displaywindows::writeWindow::deleteEntry::actionName - ); - m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip ); - m_actions.deleteEntry->plug(mainToolBar()); - - m_actions.restoreText = new KAction(i18n("Restore original text"), - CResMgr::displaywindows::writeWindow::restoreText::icon, - CResMgr::displaywindows::writeWindow::restoreText::accel, - this, SLOT(restoreText()), actionCollection(), - CResMgr::displaywindows::writeWindow::restoreText::actionName - ); - m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip ); - m_actions.restoreText->plug(mainToolBar()); - - - KToolBar* bar = new KToolBar(this); - bar->setFullSize(true); - addDockWindow(bar); - - displayWidget()->setupToolbar( bar, actionCollection() ); -} - -void CHTMLWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) { - CWriteWindow::storeProfileSettings(profileWindow); - profileWindow->setWindowSettings( m_actions.syncWindow->isChecked() ); -}; - -void CHTMLWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) { - CWriteWindow::applyProfileSettings(profileWindow); - if (profileWindow->windowSettings()) { - m_actions.syncWindow->setChecked(true); - } -}; - -/** Is called when the current text was changed. */ -void CHTMLWriteWindow::textChanged() { - m_actions.saveText->setEnabled( displayWidget()->isModified() ); - m_actions.restoreText->setEnabled( displayWidget()->isModified() ); -} - -/** Loads the original text from the module. */ -void CHTMLWriteWindow::restoreText() { - lookup(key()); - displayWidget()->setModified(false); - textChanged(); -} - -const bool CHTMLWriteWindow::syncAllowed() const { - return m_actions.syncWindow->isChecked(); -} diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.h b/bibletime/frontend/displaywindow/chtmlwritewindow.h deleted file mode 100644 index 04b70f6..0000000 --- a/bibletime/frontend/displaywindow/chtmlwritewindow.h +++ /dev/null @@ -1,74 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CHTMLWRITEWINDOW_H -#define CHTMLWRITEWINDOW_H - -//BibleTime includes -#include "cplainwritewindow.h" - -//Qt includes -#include <qwidget.h> - -class KAction; - -/** The WYSIWYG implementation of the editor. - * @author The BibleTime team - */ -class CHTMLWriteWindow : public CPlainWriteWindow { - Q_OBJECT -public: - CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0); - virtual ~CHTMLWriteWindow(); - - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings( Profile::CProfileWindow* ); - /** - * Store the settings of this window in the given profile window. - */ - virtual void applyProfileSettings( Profile::CProfileWindow* ); - - virtual const bool syncAllowed() const; - -protected: // Protected methods - /** - * Initialize the state of this widget. - */ - virtual void initView(); - virtual void initConnections(); - virtual void initToolbars(); - virtual const CDisplayWindow::WriteWindowType writeWindowType() { - return CDisplayWindow::HTMLWindow; - }; - -protected slots: - /** - * Is called when the current text was changed. - */ - virtual void textChanged(); - /** - * Loads the original text from the module. - */ - virtual void restoreText(); - -private: - struct { - KAction* saveText; - KAction* restoreText; - KAction* deleteEntry; - KToggleAction* syncWindow; - } - m_actions; -}; - -#endif diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp deleted file mode 100644 index b36118d..0000000 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp +++ /dev/null @@ -1,317 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "clexiconreadwindow.h" -#include "cmodulechooserbar.h" -#include "cbuttons.h" - -#include "backend/cswordkey.h" -#include "backend/cswordldkey.h" - -#include "frontend/cbtconfig.h" -#include "frontend/cexportmanager.h" -#include "frontend/display/cdisplay.h" -#include "frontend/display/creaddisplay.h" -#include "frontend/keychooser/ckeychooser.h" - -#include "util/ctoolclass.h" -#include "util/cresmgr.h" - -//Qt includes - -//KDE includes -#include <kaccel.h> -#include <ktoolbar.h> -#include <klocale.h> -#include <kpopupmenu.h> -#include <kdeversion.h> -// #include <kactionclasses.h> - -CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) { - setKey( CSwordKey::createInstance(moduleList.first()) ); -} - -CLexiconReadWindow::~CLexiconReadWindow() {} - -void CLexiconReadWindow::insertKeyboardActions( KActionCollection* const a ) { - new KAction( - i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel, - a, "nextEntry" - ); - new KAction( - i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel, - a, "previousEntry" - ); - - // new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly"); - new KAction(i18n("Copy entry with text"), KShortcut(0), a, "copyEntryWithText"); - // new KAction(i18n("Copy selected text"), KShortcut(0), a, "copySelectedText"); - new KAction(i18n("Save entry as plain text"), KShortcut(0), a, "saveEntryAsPlainText"); - new KAction(i18n("Save entry as HTML"), KShortcut(0), a, "saveEntryAsHTML"); - // new KAction(i18n("Print reference only"), KShortcut(0), a, "printReferenceOnly"); - new KAction(i18n("Print entry with text"), KShortcut(0), a, "printEntryWithText"); -} - -void CLexiconReadWindow::initActions() { - CReadWindow::initActions(); - - m_actions.backInHistory = dynamic_cast<KToolBarPopupAction*>( - actionCollection()->action( - CResMgr::displaywindows::general::backInHistory::actionName - ) - ); - Q_ASSERT(m_actions.backInHistory); - - m_actions.forwardInHistory = dynamic_cast<KToolBarPopupAction*>( - actionCollection()->action( - CResMgr::displaywindows::general::forwardInHistory::actionName - ) - ); - - Q_ASSERT(m_actions.forwardInHistory); - - new KAction( - i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel, - this, SLOT( nextEntry() ), - actionCollection(), "nextEntry" - ); - new KAction( - i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel, - this, SLOT( previousEntry() ), - actionCollection(), "previousEntry" - ); - - m_actions.selectAll = actionCollection()->action("selectAll"); - Q_ASSERT(m_actions.selectAll); - - m_actions.findText = actionCollection()->action("findText"); - Q_ASSERT(m_actions.findText); - - //m_actions.findStrongs = new KAction(i18n("Strong's Search"), KShortcut(0),this, SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs"); - m_actions.findStrongs = new KAction( - i18n("Strong's Search"), - CResMgr::displaywindows::general::findStrongs::icon, - CResMgr::displaywindows::general::findStrongs::accel, - this, SLOT(openSearchStrongsDialog()), - actionCollection(), - CResMgr::displaywindows::general::findStrongs::actionName); - - m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); - - m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAll()), actionCollection(), "copyEntryWithText"); - - m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); - Q_ASSERT(m_actions.copy.selectedText); - - m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain"); - - m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML"); - - m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly"); - - m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, SLOT(printAll()), actionCollection(), "printEntryWithText"); - - // init with the user defined settings - CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection()); -}; - -/** No descriptions */ -void CLexiconReadWindow::initConnections() { - Q_ASSERT(keyChooser()); - - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(keyChooser(), SIGNAL(historyChanged()), - this, SLOT(slotUpdateHistoryButtons())); - - //connect the history actions to the right slots - connect( - m_actions.backInHistory->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFillBackHistory()) - ); - connect( - m_actions.backInHistory->popupMenu(), SIGNAL(activated(int)), - keyChooser(), SLOT(backInHistory(int)) - ); - connect( - m_actions.forwardInHistory->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFillForwardHistory()) - ); - connect( - m_actions.forwardInHistory->popupMenu(), SIGNAL(activated(int)), - keyChooser(), SLOT(forwardInHistory(int)) - ); - - -} - -void CLexiconReadWindow::initView() { - setDisplayWidget( CDisplay::createReadInstance(this) ); - - setMainToolBar( new KToolBar(this) ); - addDockWindow(mainToolBar()); - - setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) ); - - mainToolBar()->insertWidget(0, keyChooser()->sizeHint().width(), keyChooser()); - mainToolBar()->setFullSize(false); - - setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) ); - addDockWindow(moduleChooserBar()); - - setButtonsToolBar( new KToolBar(this) ); - addDockWindow(buttonsToolBar()); - - setIcon(CToolClass::getIconForModule(modules().first())); - setCentralWidget( displayWidget()->view() ); -} - -void CLexiconReadWindow::initToolbars() { - //main toolbar - Q_ASSERT(m_actions.backInHistory); - m_actions.backInHistory->plug( mainToolBar(),0 ); //1st button - m_actions.forwardInHistory->plug( mainToolBar(),1 ); //2nd button - - //buttons toolbar - KAction* action = actionCollection()->action( - CResMgr::displaywindows::general::search::actionName); - Q_ASSERT( action ); - if (action) { - action->plug(buttonsToolBar()); - } - #if KDE_VERSION_MINOR < 1 - action->plugAccel( accel() ); - #endif - - setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), buttonsToolBar()) ); - buttonsToolBar()->insertWidget(2,displaySettingsButton()->size().width(), displaySettingsButton()); -} - -void CLexiconReadWindow::setupPopupMenu() { - popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window")); - - // m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection()); - m_actions.findText->plug(popup()); - m_actions.findStrongs->plug(popup()); - - m_actions.selectAll->plug(popup()); - - - (new KActionSeparator(this))->plug( popup() ); - - m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon, actionCollection()); - m_actions.copyMenu->setDelayed(false); - - m_actions.copyMenu->insert(m_actions.copy.reference); - m_actions.copyMenu->insert(m_actions.copy.entry); - m_actions.copyMenu->insert(new KActionSeparator(this)); - m_actions.copyMenu->insert(m_actions.copy.selectedText); - m_actions.copyMenu->plug(popup()); - - m_actions.saveMenu = new KActionMenu(i18n("Save..."), CResMgr::displaywindows::lexiconWindow::saveMenu::icon, actionCollection()); - m_actions.saveMenu->setDelayed(false); - m_actions.saveMenu->insert(m_actions.save.entryAsPlain); - m_actions.saveMenu->insert(m_actions.save.entryAsHTML); - m_actions.saveMenu->plug(popup()); - - m_actions.printMenu = new KActionMenu(i18n("Print..."), CResMgr::displaywindows::lexiconWindow::printMenu::icon, actionCollection()); - m_actions.printMenu->setDelayed(false); - m_actions.printMenu->insert(m_actions.print.reference); - m_actions.printMenu->insert(m_actions.print.entry); - m_actions.printMenu->plug(popup()); -} - -/** Reimplemented. */ -void CLexiconReadWindow::updatePopupMenu() { - //enable the action depending on the supported module features -/* bool hasStrongs = false; - ListCSwordModuleInfo mods = modules(); - for (ListCSwordModuleInfo::iterator it = mods.begin(); it != mods.end(); ++it) { - if ( (*it)->has( CSwordModuleInfo::strongNumbers ) ) { - hasStrongs = true; - break; - } - } - m_actions.findStrongs->setEnabled( hasStrongs );*/ - m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null ); - - m_actions.copy.reference->setEnabled( displayWidget()->hasActiveAnchor() ); - //m_actions.copy.entry->setEnabled( displayWidget()->hasActiveAnchor() ); - m_actions.copy.selectedText->setEnabled( displayWidget()->hasSelection() ); - - m_actions.print.reference->setEnabled( displayWidget()->hasActiveAnchor() ); -} - -/** No descriptions */ -void CLexiconReadWindow::nextEntry() { - keyChooser()->setKey(ldKey()->NextEntry()); -} - -/** No descriptions */ -void CLexiconReadWindow::previousEntry() { - keyChooser()->setKey(ldKey()->PreviousEntry()); -} - -/** Reimplementation to return the right key. */ -CSwordLDKey* CLexiconReadWindow::ldKey() { - return dynamic_cast<CSwordLDKey*>(CDisplayWindow::key()); -} - -/** This function saves the entry as html using the CExportMgr class. */ -void CLexiconReadWindow::saveAsHTML() { - CExportManager mgr(i18n("Saving entry ..."), true, i18n("Saving"), filterOptions(), displayOptions()); - mgr.saveKey(key(), CExportManager::HTML, true); -} - -/** This function saves the entry as html using the CExportMgr class. */ -void CLexiconReadWindow::saveAsPlain() { - CExportManager mgr(i18n("Saving entry ..."), true, i18n("Saving"), filterOptions(), displayOptions()); - mgr.saveKey(key(), CExportManager::Text, true); -} - -void CLexiconReadWindow::slotFillBackHistory() { - // qWarning("fill back history"); - QStringList keyList = keyChooser()->getPreviousKeys(); - QPopupMenu* menu = m_actions.backInHistory->popupMenu(); - menu->clear(); - - QStringList::iterator it; - int index = 1; - for (it = keyList.begin(); it != keyList.end(); ++it) { - menu->insertItem(*it,index, index); - ++index; - } -} - -void CLexiconReadWindow::slotFillForwardHistory() { - // qWarning("fill forward history"); - QStringList keyList = keyChooser()->getNextKeys(); - QPopupMenu* menu = m_actions.forwardInHistory->popupMenu(); - menu->clear(); - - QStringList::iterator it; - int index = 1; - for (it = keyList.begin(); it != keyList.end(); ++it) { - menu->insertItem(*it,index, index); - ++index; - } -} - - -void CLexiconReadWindow::slotUpdateHistoryButtons() { - // qWarning("updating history buttons"); - Q_ASSERT(m_actions.backInHistory); - Q_ASSERT(keyChooser()); - - m_actions.backInHistory->setEnabled( keyChooser()->getPreviousKeys().size() > 0 ); - m_actions.forwardInHistory->setEnabled( keyChooser()->getNextKeys().size() > 0 ); -} diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h deleted file mode 100644 index a29e4d0..0000000 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.h +++ /dev/null @@ -1,117 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CLEXICONREADWINDOW_H -#define CLEXICONREADWINDOW_H - -//BibleTime includes -#include "creadwindow.h" - -//Qt includes -#include <qwidget.h> - -//KDE includes -#include <kaction.h> - -class CSwordKey; -class CSwordLDKey; -//KDE -class KToolBarPopupAction; - -/** - *@author The BibleTime team - */ - -class CLexiconReadWindow : public CReadWindow { - Q_OBJECT -public: - CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); - virtual ~CLexiconReadWindow(); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - // virtual void storeProfileSettings( CProfileWindow* profileWindow ); - /** - * Store the settings of this window in the given profile window. - */ - // virtual void applyProfileSettings( CProfileWindow* profileWindow ); - /** - * Reimplementation. - */ - // static void insertKeyboardActions( KAccel* a ); - static void insertKeyboardActions( KActionCollection* const a ); - -protected: - virtual void initActions(); - virtual void initToolbars(); - virtual void initConnections(); - virtual void initView(); - virtual void updatePopupMenu(); - virtual void setupPopupMenu(); - - - struct ActionsStruct { - KToolBarPopupAction* backInHistory; - KToolBarPopupAction* forwardInHistory; - - KAction* selectAll; - KAction* findText; - KAction* findStrongs; - - KActionMenu* copyMenu; - struct { - KAction* reference; - KAction* entry; - KAction* selectedText; - } - copy; - - KActionMenu* saveMenu; - struct { - KAction* reference; - KAction* entryAsPlain; - KAction* entryAsHTML; - } - save; - - KActionMenu* printMenu; - struct { - KAction* reference; - KAction* entry; - } - print; - } - m_actions; - -private: - /** - * Reimplementation to return the right key. - */ - CSwordLDKey* ldKey(); - -protected slots: // Protected slots - void previousEntry(); - void nextEntry(); - /** - * This function saves the entry as html using the CExportMgr class. - */ - void saveAsHTML(); - /** - * This function saves the entry as plain text using the CExportMgr class. - */ - void saveAsPlain(); - void slotFillBackHistory(); - void slotFillForwardHistory(); - - void slotUpdateHistoryButtons(); -}; - -#endif diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp deleted file mode 100644 index 11492b6..0000000 --- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cmodulechooserbar.h" -#include "cmodulechooserbutton.h" - -#include <qtimer.h> - -CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent, const char *name ) -: KToolBar(parent,name), -m_moduleType(type), -m_idCounter(0), -m_buttonLimit(-1) //-1 means no limit -{ - //insert buttons if useModules != 0 - // for (useModules.first(); useModules.current(); useModules.next()) { - ListCSwordModuleInfo::iterator end_it = useModules.end(); - for (ListCSwordModuleInfo::iterator it(useModules.begin()); it != end_it; ++it) { - - if ((m_buttonLimit != -1) && ( m_buttonLimit <= (int)m_buttonList.count()) ) { //we reached the button limit - break; - }; - - addButton( *it ); - } - - // We can add a button to choose an additional module - if ( (m_buttonLimit == -1) || (m_buttonLimit > (int)m_buttonList.count()) ) { - addButton(0); //add a button without module set - } -} - -/** Adds a button to the toolbar */ -CModuleChooserButton* const CModuleChooserBar::addButton( CSwordModuleInfo* const module ) { - CModuleChooserButton* b = new CModuleChooserButton(module, m_moduleType, ++m_idCounter, this); - insertWidget( m_idCounter, b->size().width(), b ); - m_buttonList.append(b); - - connect( b, SIGNAL(sigAddButton()), this, SLOT(addButton()) ); - - connect( b, SIGNAL(sigRemoveButton(const int)), this, SLOT(removeButton(const int)) ); - - connect( b, SIGNAL(sigChanged()), SIGNAL(sigChanged()) ); - connect( b, SIGNAL(sigChanged()), SLOT(updateMenuItems()) ); - - b->show(); - - updateMenuItems(); //make sure the items are up to date with the newest module list - - return b; -} - -void CModuleChooserBar::addButton( ) { - addButton(0); -} - -/** Removes a button from the toolbar */ -void CModuleChooserBar::removeButton( const int ID ) { - for (m_buttonList.first(); m_buttonList.current(); m_buttonList.next()) { - if (m_buttonList.current()->getId() == ID) { //found the right button to remove - CModuleChooserButton* b = m_buttonList.current(); - m_buttonList.remove(b); - - b->hide(); - b->deleteLater(); - break; - } - } - - emit sigChanged(); - - updateMenuItems(); //make sure the items are up to date with the newest module list -} - -/** Returns a list of selected modules. */ -ListCSwordModuleInfo CModuleChooserBar::getModuleList() { - const int currentItemIndex = m_buttonList.at(); //make sure we don't change the current list item - - ListCSwordModuleInfo list; - CSwordModuleInfo* m = 0; - for ( m_buttonList.first(); m_buttonList.current(); m_buttonList.next()) { - m = m_buttonList.current()->module(); - if ( m ) { - list.append( m ); - } - } - - m_buttonList.at( currentItemIndex ); - return list; -} - -/** Sets the number of the maximum count of buttons. */ -void CModuleChooserBar::setButtonLimit(const int limit) { - m_buttonLimit = limit; - if (limit == -1) //no need to delete buttons - return; - - const int tooMuch = m_buttonList.count() - limit; - for (int i = 0; i < tooMuch; ++i) { - CModuleChooserButton* b = m_buttonList.getLast(); - m_buttonList.remove(b); - b->hide(); - delete b; - } - - updateMenuItems(); -} - -/** Sets the modules which are chosen in this module chooser bar. */ -void CModuleChooserBar::setModules( ListCSwordModuleInfo useModules ) { - setButtonLimit(0); - setButtonLimit(-1); //these two lines clear the bar - - if (!useModules.count()) { - return; - } - - // for (useModules.first(); useModules.current(); useModules.next()) { - ListCSwordModuleInfo::iterator end_it = useModules.end(); - for (ListCSwordModuleInfo::iterator it(useModules.begin()); it != end_it; ++it) { - if ( (m_buttonLimit != -1) && (m_buttonLimit <= (int)m_buttonList.count()) ) { - break; - } - - addButton( *it ); - } - if ( (m_buttonLimit == -1) || (m_buttonLimit > (int)m_buttonList.count()) ) { - addButton(0);//add button without module set - } - - updateMenuItems(); -} - - -/*! - \fn CModuleChooserBar::updateMenuItems() - */ -void CModuleChooserBar::updateMenuItems() { - QPtrList<CModuleChooserButton> buttons = m_buttonList ; - - for (buttons.first(); buttons.current(); buttons.next()) { - buttons.current()->updateMenuItems(); - } -} diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h deleted file mode 100644 index 0ab2009..0000000 --- a/bibletime/frontend/displaywindow/cmodulechooserbar.h +++ /dev/null @@ -1,79 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CMODULECHOOSERBAR_H -#define CMODULECHOOSERBAR_H - -//BibleTime includes -#include "cmodulechooserbutton.h" - -#include "backend/cswordmoduleinfo.h" - -#include "util/cpointers.h" - -//Qt includes -#include <qwidget.h> -#include <qhbox.h> - -//KDE includes -#include <ktoolbar.h> - -/** - * @author The BibleTime team - */ -class CModuleChooserBar : public KToolBar { - Q_OBJECT -public: - /** - * Default constructor - */ - CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent=0, const char *name=0); - /** - * Returns a list of selected modules. - */ - ListCSwordModuleInfo getModuleList(); - /** - * Sets the number of the maximum count of buttons. - */ - void setButtonLimit( const int limit); - /** - * Sets the modules which are chosen in this module chooser bar. - */ - void setModules( ListCSwordModuleInfo modules ); - -protected: - /** - * Adds a button to the toolbar - */ - CModuleChooserButton* const addButton( CSwordModuleInfo* const module ); - -protected slots: // Protected slots - /* Add a button - * This slot calls the addButton function above to add a button. - */ - void addButton(); - /** - * Removes a button from the toolbar - */ - void removeButton( const int ID ); - void updateMenuItems(); - -private: - CSwordModuleInfo::ModuleType m_moduleType; - int m_idCounter; - int m_buttonLimit; - QPtrList<CModuleChooserButton> m_buttonList; - -signals: // Signals - void sigChanged(); -}; - -#endif diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp deleted file mode 100644 index 7f5eaa4..0000000 --- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp +++ /dev/null @@ -1,276 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cmodulechooserbutton.h" -#include "cmodulechooserbar.h" - -#include "backend/cswordbackend.h" - -#include "util/cresmgr.h" - -//Qt includes -#include <qstring.h> -#include <qtooltip.h> -#include <qdict.h> -#include <qvaluelist.h> - -//KDE includes -#include <klocale.h> -#include <kglobal.h> -#include <kiconloader.h> - -CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name ) -: KToolBarButton(iconName(), id, parent, name), -m_id(id), m_popup(0), m_moduleChooserBar(parent) { - m_moduleType = type; - m_module = useModule; - if (!m_module) { - m_hasModule = false; - } - else { - m_hasModule = true; - } - - setIcon( iconName() ); - setPopupDelay(1); - - populateMenu(); -} - -CModuleChooserButton::~CModuleChooserButton() { - m_submenus.setAutoDelete(true); //delete all submenus - m_submenus.clear(); - - delete m_popup; -} - -/** Returns the icon used for the current status. */ -const QString CModuleChooserButton::iconName() { - switch (m_moduleType) { - case CSwordModuleInfo::Bible: - if (m_hasModule) - return CResMgr::modules::bible::icon_unlocked; - else - return CResMgr::modules::bible::icon_add; - case CSwordModuleInfo::Commentary: - if (m_hasModule) - return CResMgr::modules::commentary::icon_unlocked; - else - return CResMgr::modules::commentary::icon_add; - case CSwordModuleInfo::Lexicon: - if (m_hasModule) - return CResMgr::modules::lexicon::icon_unlocked; - else - return CResMgr::modules::lexicon::icon_add; - case CSwordModuleInfo::GenericBook: - if (m_hasModule) - return CResMgr::modules::book::icon_unlocked; - else - return CResMgr::modules::book::icon_add; - default: //return as default the bible icon - return CResMgr::modules::bible::icon_unlocked; - } -} - -CSwordModuleInfo* CModuleChooserButton::module() { - for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) { - for (unsigned int i = 0; i < popup->count(); i++) { - if ( m_popup->isItemChecked(popup->idAt(i)) ) { - QString mod = popup->text(popup->idAt(i)).remove('&'); - return backend()->findModuleByName( mod.left(mod.find(" ")) ); - } - } - - } - return 0; //"none" selected -} - -/** Returns the id used for this button. */ -int CModuleChooserButton::getId() const { - return m_id; -} - -/** Is called after a module was selected in the popup */ -void CModuleChooserButton::moduleChosen( int ID ) { - for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) { - for (unsigned int i = 0; i < popup->count(); i++) { - popup->setItemChecked(popup->idAt(i),false); - } - popup->setItemChecked(ID, true); - } - - m_popup->setItemChecked(m_noneId, false); //uncheck the "none" item - - if (m_popup->text(ID).remove('&') == i18n("NONE")) { // note: this is for m_popup, the toplevel! - if (m_hasModule) { - emit sigRemoveButton(m_id); - return; - } - } - else { - if (!m_hasModule) { - emit sigAddButton(); - } - - m_hasModule = true; - m_module = module(); - setIcon( iconName() ); - emit sigChanged(); - - setText( i18n("Select a work") ); - m_popup->changeTitle(m_titleId, i18n("Select a work")); - - QToolTip::remove - (this); - if (module()) { - QToolTip::add - (this, module()->name()); - } - } -} - -/** No descriptions */ -void CModuleChooserButton::populateMenu() { - m_submenus.setAutoDelete(true); //delete all submenus - m_submenus.clear(); - - delete m_popup; - - //create a new, empty popup - m_popup = new KPopupMenu(this); - - if (m_module) { - m_titleId = m_popup->insertTitle( i18n("Select a work") ); - } - else { - m_titleId = m_popup->insertTitle( i18n("Select an additional work") ); - } - - m_popup->setCheckable(true); - - m_noneId = m_popup->insertItem(i18n("NONE")); - if ( !m_module ) { - m_popup->setItemChecked(m_noneId, true); - } - - m_popup->insertSeparator(); - connect(m_popup, SIGNAL(activated(int)), this, SLOT(moduleChosen(int))); - setPopup(m_popup, true); - - QStringList languages; - QDict<KPopupMenu> langdict; - - //the modules list contains only the modules we can use, i.e. same type and same features - ListCSwordModuleInfo modules; - ListCSwordModuleInfo allMods = backend()->moduleList(); - - // for (allMods.first(); allMods.current(); allMods.next()) { - ListCSwordModuleInfo::iterator end_it = allMods.end(); - for (ListCSwordModuleInfo::iterator it(allMods.begin()); it != end_it; ++it) { - if ((*it)->type() != m_moduleType) { - continue; - } - - modules.append( *it ); - }; - - //iterate through all found modules of the type we support - // for (modules.first(); modules.current(); modules.next()) { - /*ListCSwordModuleInfo::iterator*/ - end_it = modules.end(); - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - QString lang = (*it)->language()->translatedName(); - - if (lang.isEmpty()) { - //lang = QString::fromLatin1("xx"); //unknown language -- do not use English as default!! - lang = (*it)->language()->abbrev(); - if (lang.isEmpty()) { - lang = "xx"; - } - } - - if (languages.find( lang ) == languages.end() ) { //this lang was not yet added - languages += lang; - - KPopupMenu* menu = new KPopupMenu; - langdict.insert(lang, menu ); - m_submenus.append(menu); - connect(menu, SIGNAL(activated(int)), this, SLOT(moduleChosen(int))); - } - } - - - //Check the appropriate entry - // for (modules.first(); modules.current(); modules.next()) { - /*ListCSwordModuleInfo::iterator*/ end_it = modules.end(); - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - QString lang = (*it)->language()->translatedName(); - - if (lang.isEmpty()) { - lang = (*it)->language()->abbrev(); - if (lang.isEmpty()) { - lang = "xx"; - } - } - - QString name((*it)->name()); - name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : QString::null); - - const int id = langdict[lang]->insertItem( name ); - if ( m_module && (*it)->name() == m_module->name()) { - langdict[lang]->setItemChecked(id, true); - } - } - - languages.sort(); - for ( QStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) { - m_popup->insertItem( *it, langdict[*it]); - } - - if (module()) { - QToolTip::add - (this, module()->name()); - } - else { - QToolTip::add - (this, i18n("No work selected")); - } -} - - -/*! - \fn CModuleChooserButton::updateMenuItems() - */ -void CModuleChooserButton::updateMenuItems() { - QString moduleName; - CSwordModuleInfo* module = 0; - ListCSwordModuleInfo chosenModules = m_moduleChooserBar->getModuleList(); - - for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) { - - for (unsigned int i = 0; i < popup->count(); i++) { - moduleName = popup->text(popup->idAt(i)).remove('&'); - module = backend()->findModuleByName( moduleName.left(moduleName.findRev(" ")) ); - - Q_ASSERT(module); -// if (!module) { -// qWarning("Can't find module with name %s", moduleName.latin1()); -// } - - bool alreadyChosen = chosenModules.contains( module ); - if (m_module) { - alreadyChosen = alreadyChosen && (m_module->name() != moduleName); - } - - popup->setItemEnabled(popup->idAt(i), !alreadyChosen); //grey it out, it was chosen already - } - } -} diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h deleted file mode 100644 index 2bd9fa7..0000000 --- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h +++ /dev/null @@ -1,77 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CMODULECHOOSERBUTTON_H -#define CMODULECHOOSERBUTTON_H - -//BibleTime includes -#include "backend/cswordmoduleinfo.h" -#include "util/cpointers.h" - -//Qt includes -#include <qdict.h> -#include <qtoolbutton.h> - -//KDE includes -#include <ktoolbarbutton.h> -#include <kpopupmenu.h> - -class KPopupMenu; -class CModuleChooserBar; - -/** The CModuleChooserButton displays a list of submenus sorted by language which contain the possible modules - * which can be displayed together with the first one. - * @author The BibleTime team - */ -class CModuleChooserButton : public KToolBarButton, public CPointers { - Q_OBJECT -public: - CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name = 0 ); - ~CModuleChooserButton(); - - CSwordModuleInfo* module(); - /** - * Returns the id used for this button. - */ - int getId() const; - void updateMenuItems(); - -protected: // Protected methods - void populateMenu(); - -private: - /** - * Returns the icon used for the current status. - */ - const QString iconName(); - - bool m_hasModule; - int m_id; - int m_noneId; - int m_titleId; - CSwordModuleInfo::ModuleType m_moduleType; - CSwordModuleInfo* m_module; - - KPopupMenu* m_popup; - QPtrList<KPopupMenu> m_submenus; - - CModuleChooserBar* m_moduleChooserBar; - - -private slots: - void moduleChosen(int ID ); - -signals: - void sigRemoveButton(const int ID); - void sigAddButton(); - void sigChanged(); -}; -#endif diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp deleted file mode 100644 index ba95bec..0000000 --- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cplainwritewindow.h" - -#include "frontend/keychooser/ckeychooser.h" -#include "frontend/cprofilewindow.h" -#include "frontend/cbtconfig.h" - -#include "util/cresmgr.h" - -//Qt includes -#include <qregexp.h> - -//KDE includes -#include <kaction.h> -#include <kaccel.h> -#include <klocale.h> -#include <kmessagebox.h> - -using namespace Profile; - -CPlainWriteWindow::CPlainWriteWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CWriteWindow(moduleList, parent, name) { - setKey( CSwordKey::createInstance(moduleList.first()) ); -} - - -CPlainWriteWindow::~CPlainWriteWindow() {} - -/** Initialize the state of this widget. */ -void CPlainWriteWindow::initView() { - // qWarning("CPlainWriteWindow::initView()"); - setDisplayWidget( CDisplay::createWriteInstance(this) ); - setCentralWidget( displayWidget()->view() ); - - setMainToolBar( new KToolBar(this) ); - mainToolBar()->setFullSize(true); - addDockWindow(mainToolBar()); - - setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) ); - mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser()); - mainToolBar()->setFullSize(false); - -} - -void CPlainWriteWindow::initToolbars() { - m_actions.syncWindow = new KToggleAction(i18n("Sync with active Bible"), - CResMgr::displaywindows::commentaryWindow::syncWindow::icon, - CResMgr::displaywindows::commentaryWindow::syncWindow::accel, - actionCollection(), - CResMgr::displaywindows::commentaryWindow::syncWindow::actionName - ); - m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); - m_actions.syncWindow->plug(mainToolBar()); - - - m_actions.saveText = new KAction(i18n("Save text"), - CResMgr::displaywindows::writeWindow::saveText::icon, - CResMgr::displaywindows::writeWindow::saveText::accel, - this, SLOT(saveCurrentText()), - actionCollection(), - CResMgr::displaywindows::writeWindow::saveText::actionName - ); - m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip ); - m_actions.saveText->plug(mainToolBar()); - - - m_actions.deleteEntry = new KAction(i18n("Delete current entry"), - CResMgr::displaywindows::writeWindow::deleteEntry::icon, - CResMgr::displaywindows::writeWindow::deleteEntry::accel, - this, SLOT(deleteEntry()), - actionCollection(), - CResMgr::displaywindows::writeWindow::deleteEntry::actionName - ); - m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip ); - m_actions.deleteEntry->plug(mainToolBar()); - - - m_actions.restoreText = new KAction(i18n("Restore original text"), - CResMgr::displaywindows::writeWindow::restoreText::icon, - CResMgr::displaywindows::writeWindow::restoreText::accel, - this, SLOT(restoreText()), - actionCollection(), - CResMgr::displaywindows::writeWindow::restoreText::actionName - ); - m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip ); - m_actions.restoreText->plug(mainToolBar()); -} - -void CPlainWriteWindow::initConnections() { - CWriteWindow::initConnections(); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - - connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), - this, SLOT(textChanged()) ); -} - -void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) { - CWriteWindow::storeProfileSettings(profileWindow); - profileWindow->setWindowSettings( m_actions.syncWindow->isChecked() ); -}; - -void CPlainWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) { - CWriteWindow::applyProfileSettings(profileWindow); - if (profileWindow->windowSettings()) { - m_actions.syncWindow->setChecked(true); - } -}; - -/** Saves the text for the current key. Directly writes the changed text into the module. */ -void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) { - QString t = displayWidget()->plainText(); - //since t is a complete HTML page at the moment, strip away headers and footers of a HTML page - QRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive - re.setMinimal(true); - t.replace(re, ""); - t.replace(QRegExp("</body></html>", false), "");//remove footer - - const QString& oldKey = this->key()->key(); - if( modules().first()->isWritable() ) { - modules().first()->write(this->key(), t ); - this->key()->key( oldKey ); - - displayWidget()->setModified(false); - textChanged(); - } else { - KMessageBox::error( this, - QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>") - .arg( i18n("Module is not writable.") ) - .arg( i18n("Either the module may not be edited, or " - "you do not have write permission.") ), - i18n("Module not writable") ); - } -} - -/** Loads the original text from the module. */ -void CPlainWriteWindow::restoreText() { - lookup(key()); - displayWidget()->setModified(false); - textChanged(); -} - -/** Is called when the current text was changed. */ -void CPlainWriteWindow::textChanged() { - m_actions.saveText->setEnabled( displayWidget()->isModified() ); - m_actions.restoreText->setEnabled( displayWidget()->isModified() ); -} - -/** Deletes the module entry and clears the edit widget, */ -void CPlainWriteWindow::deleteEntry() { - modules().first()->deleteEntry( key() ); - lookup( key() ); - displayWidget()->setModified(false); -} - -/** Setups the popup menu of this display widget. */ -void CPlainWriteWindow::setupPopupMenu() {} - -const bool CPlainWriteWindow::syncAllowed() const { - return m_actions.syncWindow->isChecked(); -} - -void CPlainWriteWindow::initActions() { -} - -void CPlainWriteWindow::insertKeyboardActions( KActionCollection* const ) { -} diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.h b/bibletime/frontend/displaywindow/cplainwritewindow.h deleted file mode 100644 index 94f9b70..0000000 --- a/bibletime/frontend/displaywindow/cplainwritewindow.h +++ /dev/null @@ -1,97 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CPLAINWRITEWINDOW_H -#define CPLAINWRITEWINDOW_H - -//BibleTime includes -#include "cwritewindow.h" - -//Qt includes -#include <qwidget.h> - - -class KAction; -class KToggleAction; - -/** The write window class which offers a plain editor for source code editing. - * @author The BibleTime team - */ -class CPlainWriteWindow : public CWriteWindow { - Q_OBJECT -public: - CPlainWriteWindow( ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0 ); - virtual ~CPlainWriteWindow(); - - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings( Profile::CProfileWindow* profileWindow ); - /** - * Store the settings of this window in the given profile window. - */ - virtual void applyProfileSettings( Profile::CProfileWindow* profileWindow ); - - /** - * Setups the popup menu of this display widget. - */ - virtual void setupPopupMenu(); - virtual const bool syncAllowed() const; - -protected: // Protected methods - /** - * Initialize the state of this widget. - */ - virtual void initView(); - virtual void initConnections(); - virtual void initToolbars(); - virtual const CDisplayWindow::WriteWindowType writeWindowType() { - return CDisplayWindow::PlainTextWindow; - }; - - /** - * Initializes the intern keyboard actions. - */ - virtual void initActions(); - /** - * Insert the keyboard accelerators of this window into the given KAccel object. - */ - static void insertKeyboardActions( KActionCollection* const a ); - -private: - struct { - KAction* saveText; - KAction* deleteEntry; - KAction* restoreText; - KToggleAction* syncWindow; - } - m_actions; - -protected slots: // Protected slots - /** - * Saves the text for the current key. Directly writes the changed text into the module. - */ - virtual void saveCurrentText( const QString& ); - /** - * Is called when the current text was changed. - */ - virtual void textChanged(); - /** - * Loads the original text from the module. - */ - virtual void restoreText(); - /** - * Deletes the module entry and clears the edit widget. - */ - virtual void deleteEntry(); -}; - -#endif diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp deleted file mode 100644 index d1bcd11..0000000 --- a/bibletime/frontend/displaywindow/creadwindow.cpp +++ /dev/null @@ -1,195 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "creadwindow.h" - -#include "backend/centrydisplay.h" -#include "backend/cdisplayrendering.h" -#include "backend/cswordkey.h" - -#include "frontend/cbtconfig.h" -#include "frontend/cexportmanager.h" -#include "frontend/cmdiarea.h" -#include "frontend/cprofilewindow.h" -#include "frontend/displaywindow/cmodulechooserbar.h" -#include "frontend/keychooser/ckeychooser.h" -#include "frontend/searchdialog/csearchdialog.h" - -#include "util/cresmgr.h" - -//KDE includes -#include <kpopupmenu.h> -#include <kaction.h> -#include <kaccel.h> -#include <kstdaccel.h> -#include <klocale.h> - -using namespace Profile; - -CReadWindow::CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name ) -: CDisplayWindow(modules,parent,name), -m_displayWidget(0) { - - // installEventFilter(this); -} - -CReadWindow::~CReadWindow() { - // qWarning("destructor of CReadWindow"); -} - -/** Returns the display widget of this window. */ -CReadDisplay* const CReadWindow::displayWidget() { - return m_displayWidget; -} - -/** Sets the display widget of this display window. */ -void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ) { - CDisplayWindow::setDisplayWidget(newDisplay); - if (m_displayWidget) { - disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)), this, SLOT(lookup(const QString&, const QString&))); - - disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookup(const QString&))); - } - - m_displayWidget = newDisplay; - connect( - m_displayWidget->connectionsProxy(), - SIGNAL(referenceClicked(const QString&, const QString&)), - this, - SLOT(lookup(const QString&, const QString&)) - ); - - connect( - m_displayWidget->connectionsProxy(), - SIGNAL(referenceDropped(const QString&)), - this, - SLOT(lookup(const QString&)) - ); -} - -/** Lookup the given entry. */ -void CReadWindow::lookup( CSwordKey* newKey ) { - Q_ASSERT(newKey); - - using namespace Rendering; - - Q_ASSERT(isReady() && newKey && modules().first()); - if (!isReady() || !newKey || !modules().first()) { - return; - } - - Q_ASSERT(modules().first()->getDisplay()); - CEntryDisplay* display = modules().first()->getDisplay(); - if (display) { //do we have a display object? - displayWidget()->setText( - display->text( - modules(), - newKey->key(), - displayOptions(), - filterOptions() - ) - ); - } - - if (key() != newKey) { - key()->key(newKey->key()); - } - - setCaption( windowCaption() ); - - // qDebug("[CReadWindow::lookup] Moving to anchor %s", CDisplayRendering::keyToHTMLAnchor(key()->key()).latin1()); - - displayWidget()->moveToAnchor( CDisplayRendering::keyToHTMLAnchor(key()->key()) ); -} - -/** Store the settings of this window in the given CProfileWindow object. */ -void CReadWindow::storeProfileSettings(CProfileWindow * const settings) { - QRect rect; - rect.setX(parentWidget()->x()); - rect.setY(parentWidget()->y()); - rect.setWidth(width()); - rect.setHeight(height()); - settings->setGeometry(rect); - - // settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() ); - settings->setType(modules().first()->type()); - settings->setMaximized(isMaximized() || parentWidget()->isMaximized()); - settings->setFocus( (this == mdi()->activeWindow()) ); //set property to true if this window is the active one. - - if (key()) { - sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key()); - QString oldLang; - if (vk) { - oldLang = QString(vk->getLocale()); - vk->setLocale("en"); //save english locale names as default! - } - settings->setKey( key()->key() ); - if (vk) { - vk->setLocale(oldLang.latin1()); - } - } - - QStringList mods; - - ListCSwordModuleInfo allMods = modules(); - ListCSwordModuleInfo::iterator end_it = allMods.end(); - for (ListCSwordModuleInfo::iterator it(allMods.begin()); it != end_it; ++it) { - mods.append((*it)->name()); - } - settings->setModules(mods); -} - -void CReadWindow::applyProfileSettings(CProfileWindow * const settings) { - // parentWidget()->setUpdatesEnabled(false); - setUpdatesEnabled(false); - - if (settings->maximized()) { //maximize this window - // Use parentWidget() to call showMaximized. Otherwise we'd get lot's of X11 errors - parentWidget()->showMaximized(); - } - else { - const QRect rect = settings->geometry(); - resize(rect.width(), rect.height()); - parentWidget()->move(rect.x(), rect.y()); - } - - setUpdatesEnabled(true); -} - -void CReadWindow::insertKeyboardActions( KActionCollection* const ) {} - -/** No descriptions */ -void CReadWindow::copyDisplayedText() { - CExportManager mgr(QString::null); - mgr.copyKey(key(), CExportManager::Text, true); -} - - -/*! - \fn CReadWindow::resizeEvent(QResizeEvent* e) - */ -void CReadWindow::resizeEvent(QResizeEvent* /*e*/) { - displayWidget()->moveToAnchor( - Rendering::CDisplayRendering::keyToHTMLAnchor(key()->key()) - ); -} - -void CReadWindow::openSearchStrongsDialog() { -// qWarning("looking for lemma %s", displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma].latin1() ); - QString searchText = QString::null; - - if (displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null) { - searchText.append("strong:").append(displayWidget()->getCurrentNodeInfo() [CDisplay::Lemma]); - } - - Search::CSearchDialog::openDialog( modules(), searchText, 0 ); -} diff --git a/bibletime/frontend/displaywindow/creadwindow.h b/bibletime/frontend/displaywindow/creadwindow.h deleted file mode 100644 index 9dd36b0..0000000 --- a/bibletime/frontend/displaywindow/creadwindow.h +++ /dev/null @@ -1,74 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CREADWINDOW_H -#define CREADWINDOW_H - -//BibleTime includes -#include "cdisplaywindow.h" - -#include "frontend/display/cdisplay.h" -#include "frontend/display/creaddisplay.h" - -//Qt includes -#include <qwidget.h> -#include <qpopupmenu.h> - -class KPopupMenu; - -/** The base class for all read-only display windows. - * @author The BibleTime team - */ - -class CReadWindow : public CDisplayWindow { - Q_OBJECT -public: - // static void insertKeyboardActions( KAccel* const a ); - static void insertKeyboardActions( KActionCollection* const a ); - - CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); - virtual ~CReadWindow(); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings(Profile::CProfileWindow * const settings); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void applyProfileSettings(Profile::CProfileWindow * const settings); - -protected: // Protected methods - /** - * Sets the display widget of this display window. - */ - virtual void setDisplayWidget( CReadDisplay* newDisplay ); - /** - * Returns the display widget of this window. - */ - virtual CReadDisplay* const displayWidget(); - virtual void resizeEvent(QResizeEvent* e); - -protected slots: - virtual void lookup( CSwordKey* ); - /** - * Update the status of the popup menu entries. - */ - virtual void copyDisplayedText(); - /** Open the search dialog with the strong info of the last clicked word. - * - */ - void openSearchStrongsDialog(); - -private: - CReadDisplay* m_displayWidget; -}; - -#endif diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp deleted file mode 100644 index 34be15c..0000000 --- a/bibletime/frontend/displaywindow/cwritewindow.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cwritewindow.h" - -#include "backend/cswordmoduleinfo.h" - -#include "frontend/keychooser/ckeychooser.h" -#include "frontend/cprofilewindow.h" - -//KDE includes -#include <kmessagebox.h> -#include <klocale.h> - -using namespace Profile; - -CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name ) -: CDisplayWindow(modules, parent,name), m_writeDisplay(0) {} - -CWriteWindow::~CWriteWindow() {} - - -// void CWriteWindow::insertKeyboardActions( KAccel* const /*a*/ ) { -// -// }; -void CWriteWindow::insertKeyboardActions( KActionCollection* const ) { - /* new KAction( - i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel, - a, "nextBook" - );*/ -} - -void CWriteWindow::initConnections() { - // qWarning("CWriteWindow::initConnections()"); - Q_ASSERT(keyChooser()); - - connect(keyChooser(), SIGNAL(beforeKeyChange(const QString&)), - this, SLOT(beforeKeyChange(const QString&)) - ); -}; - -void CWriteWindow::initActions() {} -; - -void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) { - - settings->setWriteWindowType( writeWindowType() ); - - QRect rect; - rect.setX(parentWidget()->x()); - rect.setY(parentWidget()->y()); - rect.setWidth(width()); - rect.setHeight(height()); - settings->setGeometry(rect); - - // settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() ); - settings->setType(modules().first()->type()); - settings->setMaximized(isMaximized() || parentWidget()->isMaximized()); - - if (key()) { - sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key()); - QString oldLang; - if (vk) { - oldLang = QString::fromLatin1(vk->getLocale()); - vk->setLocale("en"); //save english locale names as default! - } - settings->setKey( key()->key() ); - if (vk) { - vk->setLocale(oldLang.latin1()); - } - } - - QStringList mods; - ListCSwordModuleInfo allMods = modules(); - // for (CSwordModuleInfo* m = modules().first(); m; m = modules().next()) { - ListCSwordModuleInfo::iterator end_it = allMods.end(); - for (ListCSwordModuleInfo::iterator it(allMods.begin()); it != end_it; ++it) { - mods.append((*it)->name()); - } - settings->setModules(mods); -}; - -void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) { - setUpdatesEnabled(false); - - if (settings->maximized()) { - parentWidget()->showMaximized(); - } - else { - const QRect rect = settings->geometry(); - resize(rect.width(), rect.height()); - parentWidget()->move(rect.x(), rect.y()); - //setGeometry( settings->geometry() ); - } - // displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal ); - // m_htmlWidget->view()->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical ); - - setUpdatesEnabled(true); -}; - -/** Sets the write display-widget for this write display window. */ -void CWriteWindow::setDisplayWidget( CWriteDisplay* display ) { - CDisplayWindow::setDisplayWidget(display); - m_writeDisplay = display; -} - -/** Look up the given key and display the text. In our case we offer to edit the text. */ -void CWriteWindow::lookup( CSwordKey* newKey ) { - //set the raw text to the display widget - if (!newKey) - return; - - if (key() != newKey) { //set passage of newKey to key() if they're different, otherwise we'd get mixed up if we look up newkey which may have a different module set - key()->key(newKey->key()); - } - - if ( modules().count() ) { - displayWidget()->setText( key()->rawText() ); - } - setCaption( windowCaption() ); -} - -/** Returns the write display widget used by this window. */ -CWriteDisplay* const CWriteWindow::displayWidget() { - return m_writeDisplay; -} - -/** Saves settings */ -bool CWriteWindow::queryClose() { - // qWarning("queryClose called!"); - //save the text if it has changed - if (m_writeDisplay->isModified()) { - switch (KMessageBox::warningYesNoCancel( this, i18n("Save text before closing?")) ) { - case KMessageBox::Yes: { //save and close - saveCurrentText(); - m_writeDisplay->setModified( false ); - return true; - } - case KMessageBox::No: //don't save and close - return true; - default: // cancel, don't close - return false; - } - } - return true; -} - -void CWriteWindow::beforeKeyChange(const QString& key) { - Q_ASSERT(displayWidget()); - Q_ASSERT(keyChooser()); - if (!isReady()) { - return; - } - - //If the text changed and we'd do a lookup ask the user if the text should be saved - if (modules().first() && displayWidget()->isModified()) { - switch (KMessageBox::warningYesNo( this, i18n("Save changed text?")) ) { - case KMessageBox::Yes: { //save the changes - saveCurrentText( key ); - break; - } - default: {// set modified to false so it won't ask again - displayWidget()->setModified(false); - break; - } - } - } -} diff --git a/bibletime/frontend/displaywindow/cwritewindow.h b/bibletime/frontend/displaywindow/cwritewindow.h deleted file mode 100644 index dfa4c1a..0000000 --- a/bibletime/frontend/displaywindow/cwritewindow.h +++ /dev/null @@ -1,79 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CWRITEWINDOW_H -#define CWRITEWINDOW_H - -//BibleTime includes -#include "frontend/display/cwritedisplay.h" -#include "cdisplaywindow.h" - -//Qt includes -#include <qwidget.h> - -/**The base class for all write-only display windows. - *@author The BibleTime team - */ - -class CWriteWindow : public CDisplayWindow { - Q_OBJECT -public: - static void insertKeyboardActions( KActionCollection* const a ); - - CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0); - virtual ~CWriteWindow(); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void storeProfileSettings(Profile::CProfileWindow * const settings); - /** - * Store the settings of this window in the given CProfileWindow object. - */ - virtual void applyProfileSettings(Profile::CProfileWindow * const settings); - /** - * Returns the write display widget used by this window. - */ - CWriteDisplay* const displayWidget(); - virtual void initConnections(); - virtual void initActions(); - -public slots: - /** - * Look up the given key and display the text. In our case we offer to edit the text. - */ - virtual void lookup( CSwordKey* key ); - - -protected: // Protected methods - /** - * Saves the given text as text of the given key. Use this function - * as backend in each write window implementation. - */ - void setDisplayWidget( CWriteDisplay* display ); - virtual const CDisplayWindow::WriteWindowType writeWindowType() = 0; - virtual bool queryClose(); - virtual void saveCurrentText( const QString& key ) = 0; - -protected slots: - /** Save text to the module - */ - void saveCurrentText() { - if(key()) { - saveCurrentText(key()->key()); - }; - }; - virtual void beforeKeyChange(const QString&); - -private: - CWriteDisplay* m_writeDisplay; -}; - -#endif diff --git a/bibletime/frontend/keychooser/Makefile.am b/bibletime/frontend/keychooser/Makefile.am deleted file mode 100644 index af817e7..0000000 --- a/bibletime/frontend/keychooser/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -INCLUDES = $(all_includes) - -libkeychooser_a_METASOURCES = AUTO - -noinst_LIBRARIES = libkeychooser.a - -libkeychooser_a_SOURCES = \ -cbiblekeychooser.cpp \ -clexiconkeychooser.cpp \ -ckeychooser.cpp \ -cscrollbutton.cpp \ -ckeychooserwidget.cpp \ -ckeyreferencewidget.cpp \ -cscrollerwidgetset.cpp \ -cbookkeychooser.cpp \ -cbooktreechooser.cpp - -all_headers = ckeychooserwidget.h \ -cscrollbutton.h \ -ckeychooser.h \ -clexiconkeychooser.h \ -cscrollerwidgetset.h \ -cbiblekeychooser.h \ -ckeyreferencewidget.h \ -cbookkeychooser.h \ -cbooktreechooser.h - -EXTRA_DIST = $(libkeychooser_a_SOURCES) $(all_headers) diff --git a/bibletime/frontend/keychooser/Makefile.in b/bibletime/frontend/keychooser/Makefile.in deleted file mode 100644 index c0fa4e6..0000000 --- a/bibletime/frontend/keychooser/Makefile.in +++ /dev/null @@ -1,815 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/frontend/keychooser -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libkeychooser_a_AR = $(AR) $(ARFLAGS) -libkeychooser_a_LIBADD = -am_libkeychooser_a_OBJECTS = cbiblekeychooser.$(OBJEXT) \ - clexiconkeychooser.$(OBJEXT) ckeychooser.$(OBJEXT) \ - cscrollbutton.$(OBJEXT) ckeychooserwidget.$(OBJEXT) \ - ckeyreferencewidget.$(OBJEXT) cscrollerwidgetset.$(OBJEXT) \ - cbookkeychooser.$(OBJEXT) cbooktreechooser.$(OBJEXT) -#>- libkeychooser_a_OBJECTS = $(am_libkeychooser_a_OBJECTS) -#>+ 9 -libkeychooser_a_final_OBJECTS = libkeychooser_a.all_cpp.o -libkeychooser_a_nofinal_OBJECTS = cbiblekeychooser.$(OBJEXT) \ - clexiconkeychooser.$(OBJEXT) ckeychooser.$(OBJEXT) \ - cscrollbutton.$(OBJEXT) ckeychooserwidget.$(OBJEXT) \ - ckeyreferencewidget.$(OBJEXT) cscrollerwidgetset.$(OBJEXT) \ - cbookkeychooser.$(OBJEXT) cbooktreechooser.$(OBJEXT)\ -ckeyreferencewidget.moc.o cbookkeychooser.moc.o cscrollbutton.moc.o crefselectdialog.moc.o cscrollerwidgetset.moc.o ckeychooserwidget.moc.o cbiblekeychooser.moc.o clexiconkeychooser.moc.o cbooktreechooser.moc.o ckeychooser.moc.o -@KDE_USE_FINAL_FALSE@libkeychooser_a_OBJECTS = $(libkeychooser_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libkeychooser_a_OBJECTS = $(libkeychooser_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libkeychooser_a_SOURCES) -DIST_SOURCES = $(libkeychooser_a_SOURCES) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libkeychooser_a_METASOURCES = AUTO -noinst_LIBRARIES = libkeychooser.a -libkeychooser_a_SOURCES = \ -cbiblekeychooser.cpp \ -clexiconkeychooser.cpp \ -ckeychooser.cpp \ -cscrollbutton.cpp \ -ckeychooserwidget.cpp \ -ckeyreferencewidget.cpp \ -cscrollerwidgetset.cpp \ -cbookkeychooser.cpp \ -cbooktreechooser.cpp - -all_headers = ckeychooserwidget.h \ -cscrollbutton.h \ -ckeychooser.h \ -clexiconkeychooser.h \ -cscrollerwidgetset.h \ -cbiblekeychooser.h \ -ckeyreferencewidget.h \ -cbookkeychooser.h \ -cbooktreechooser.h - -EXTRA_DIST = $(libkeychooser_a_SOURCES) $(all_headers) -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/keychooser/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libkeychooser.a: $(libkeychooser_a_OBJECTS) $(libkeychooser_a_DEPENDENCIES) - -rm -f libkeychooser.a - $(libkeychooser_a_AR) libkeychooser.a $(libkeychooser_a_OBJECTS) $(libkeychooser_a_LIBADD) - $(RANLIB) libkeychooser.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbiblekeychooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbookkeychooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbooktreechooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ckeychooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ckeychooserwidget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ckeyreferencewidget.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clexiconkeychooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cscrollbutton.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cscrollerwidgetset.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-metasources clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 3 -ckeyreferencewidget.moc.cpp: $(srcdir)/ckeyreferencewidget.h - $(MOC) $(srcdir)/ckeyreferencewidget.h -o ckeyreferencewidget.moc.cpp - -#>+ 2 -mocs: ckeyreferencewidget.moc.cpp - -#>+ 3 -cbookkeychooser.moc.cpp: $(srcdir)/cbookkeychooser.h - $(MOC) $(srcdir)/cbookkeychooser.h -o cbookkeychooser.moc.cpp - -#>+ 2 -mocs: cbookkeychooser.moc.cpp - -#>+ 3 -cscrollbutton.moc.cpp: $(srcdir)/cscrollbutton.h - $(MOC) $(srcdir)/cscrollbutton.h -o cscrollbutton.moc.cpp - -#>+ 2 -mocs: cscrollbutton.moc.cpp - -#>+ 3 -crefselectdialog.moc.cpp: $(srcdir)/crefselectdialog.h - $(MOC) $(srcdir)/crefselectdialog.h -o crefselectdialog.moc.cpp - -#>+ 2 -mocs: crefselectdialog.moc.cpp - -#>+ 3 -cscrollerwidgetset.moc.cpp: $(srcdir)/cscrollerwidgetset.h - $(MOC) $(srcdir)/cscrollerwidgetset.h -o cscrollerwidgetset.moc.cpp - -#>+ 2 -mocs: cscrollerwidgetset.moc.cpp - -#>+ 3 -ckeychooserwidget.moc.cpp: $(srcdir)/ckeychooserwidget.h - $(MOC) $(srcdir)/ckeychooserwidget.h -o ckeychooserwidget.moc.cpp - -#>+ 2 -mocs: ckeychooserwidget.moc.cpp - -#>+ 3 -cbiblekeychooser.moc.cpp: $(srcdir)/cbiblekeychooser.h - $(MOC) $(srcdir)/cbiblekeychooser.h -o cbiblekeychooser.moc.cpp - -#>+ 2 -mocs: cbiblekeychooser.moc.cpp - -#>+ 3 -clexiconkeychooser.moc.cpp: $(srcdir)/clexiconkeychooser.h - $(MOC) $(srcdir)/clexiconkeychooser.h -o clexiconkeychooser.moc.cpp - -#>+ 2 -mocs: clexiconkeychooser.moc.cpp - -#>+ 3 -cbooktreechooser.moc.cpp: $(srcdir)/cbooktreechooser.h - $(MOC) $(srcdir)/cbooktreechooser.h -o cbooktreechooser.moc.cpp - -#>+ 2 -mocs: cbooktreechooser.moc.cpp - -#>+ 3 -ckeychooser.moc.cpp: $(srcdir)/ckeychooser.h - $(MOC) $(srcdir)/ckeychooser.h -o ckeychooser.moc.cpp - -#>+ 2 -mocs: ckeychooser.moc.cpp - -#>+ 3 -clean-metasources: - -rm -f ckeyreferencewidget.moc.cpp cbookkeychooser.moc.cpp cscrollbutton.moc.cpp crefselectdialog.moc.cpp cscrollerwidgetset.moc.cpp ckeychooserwidget.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp - -#>+ 2 -KDE_DIST=cbiblekeychooser.h crefselectdialog.h ckeychooser.h cscrollbutton.h Makefile.in clexiconkeychooser.h cscrollerwidgetset.h cbooktreechooser.h cbookkeychooser.h ckeychooserwidget.h Makefile.am ckeyreferencewidget.h crefselectdialog.cpp - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/keychooser/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/keychooser/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libkeychooser_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cbiblekeychooser.cpp $(srcdir)/clexiconkeychooser.cpp $(srcdir)/ckeychooser.cpp $(srcdir)/cscrollbutton.cpp $(srcdir)/ckeychooserwidget.cpp $(srcdir)/ckeyreferencewidget.cpp $(srcdir)/cscrollerwidgetset.cpp $(srcdir)/cbookkeychooser.cpp $(srcdir)/cbooktreechooser.cpp cbookkeychooser.moc.cpp ckeyreferencewidget.moc.cpp cscrollerwidgetset.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp cscrollbutton.moc.cpp crefselectdialog.moc.cpp ckeychooserwidget.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp - @echo 'creating libkeychooser_a.all_cpp.cpp ...'; \ - rm -f libkeychooser_a.all_cpp.files libkeychooser_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libkeychooser_a.all_cpp.final; \ - for file in cbiblekeychooser.cpp clexiconkeychooser.cpp ckeychooser.cpp cscrollbutton.cpp ckeychooserwidget.cpp ckeyreferencewidget.cpp cscrollerwidgetset.cpp cbookkeychooser.cpp cbooktreechooser.cpp cbookkeychooser.moc.cpp ckeyreferencewidget.moc.cpp cscrollerwidgetset.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp cscrollbutton.moc.cpp crefselectdialog.moc.cpp ckeychooserwidget.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp ; do \ - echo "#include \"$$file\"" >> libkeychooser_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeychooser_a.all_cpp.final; \ - done; \ - cat libkeychooser_a.all_cpp.final libkeychooser_a.all_cpp.files > libkeychooser_a.all_cpp.cpp; \ - rm -f libkeychooser_a.all_cpp.final libkeychooser_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libkeychooser_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp deleted file mode 100644 index 88a2a51..0000000 --- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cbiblekeychooser.h" -#include "ckeyreferencewidget.h" -#include "cscrollbutton.h" - -#include "backend/cswordversekey.h" -#include "backend/cswordbiblemoduleinfo.h" -#include "backend/cswordmoduleinfo.h" - -#include "util/cresmgr.h" - -//Qt includes -#include <qcombobox.h> -#include <qlistbox.h> -#include <qpushbutton.h> - -//KDE includes -#include <klocale.h> - -CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name ) -: CKeyChooser(modules, key, parent, name), -m_key(dynamic_cast<CSwordVerseKey*>(key)) { - w_ref = 0; - setModules(modules, false); - if (!m_modules.count()) { - qWarning("CBibleKeyChooser: module is not a Bible or commentary!"); - m_key = 0; - return; - } - QHBoxLayout* layout = new QHBoxLayout(this); - layout->setDirection( QBoxLayout::LeftToRight ); - - w_ref = new CKeyReferenceWidget(dynamic_cast<CSwordBibleModuleInfo*>(m_modules.first()), m_key, this); - layout->addWidget(w_ref); - - connect(w_ref,SIGNAL(changed(CSwordVerseKey *)),SLOT(refChanged(CSwordVerseKey *))); - - setKey(m_key); //set the key without changing it, setKey(key()) would change it -} - -CSwordKey* const CBibleKeyChooser::key() { - return m_key; -} - -void CBibleKeyChooser::setKey(CSwordKey* key) { - Q_ASSERT(dynamic_cast<CSwordVerseKey*>(key)); - if (dynamic_cast<CSwordVerseKey*>(key) == 0) { - return; - } - - m_key = dynamic_cast<CSwordVerseKey*>(key); - emit (beforeKeyChange(m_key->key())); //required to make direct setKey calls work from the outside - - w_ref->setKey(m_key); - - emit keyChanged(m_key); -} - -void CBibleKeyChooser::refChanged(CSwordVerseKey* key) { - Q_ASSERT(m_key); - Q_ASSERT(key); - - if (!isUpdatesEnabled()) - return; - - setUpdatesEnabled(false); - if (m_key) - emit beforeKeyChange(m_key->key()); - - m_key = key; - emit keyChanged(m_key); - - setUpdatesEnabled(true); -} - -/** Sets te module and refreshes the combos */ -void CBibleKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool refresh) { - m_modules.clear(); - - // for (modules.first(); modules.current(); modules.next()) { - ListCSwordModuleInfo::const_iterator end_it = modules.end(); - for (ListCSwordModuleInfo::const_iterator it(modules.begin()); it != end_it; ++it) { - if ((*it)->type() == CSwordModuleInfo::Bible || (*it)->type() == CSwordModuleInfo::Commentary) { - if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(*it)) { - m_modules.append(bible); - } - } - } - - // First time this is called we havnt set up w_ref. - if (w_ref) w_ref->setModule(dynamic_cast<CSwordBibleModuleInfo*>(m_modules.first())); - if (refresh) refreshContent(); -} - -void CBibleKeyChooser::refreshContent() { - setKey (m_key); -} - - -/** No descriptions */ -void CBibleKeyChooser::updateKey(CSwordKey* /*key*/) {} -void CBibleKeyChooser::adjustFont() {} diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.h b/bibletime/frontend/keychooser/cbiblekeychooser.h deleted file mode 100644 index 88e987e..0000000 --- a/bibletime/frontend/keychooser/cbiblekeychooser.h +++ /dev/null @@ -1,73 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CBIBLEKEYCHOOSER_H -#define CBIBLEKEYCHOOSER_H - -#include <qwidget.h> -#include "ckeychooser.h" - -#include "backend/cswordbiblemoduleinfo.h" - -class CKeyReferenceWidget; -class CSwordVerseKey; -class CSwordBibleModuleInfo; - -/** This class implements the KeyChooser for bibles and commentaries - * - * it inhertits @ref CKeyChooser - * - * it uses a CKeyReferenceWidget 's to represent the bible keys - * - * @author The BibleTime team - */ - -class CBibleKeyChooser : public CKeyChooser { - Q_OBJECT - -public: - /** - * the constructor - * you should not need to use this, use @ref CKeyChooser::createInstance instead - */ - CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); - -public slots: - /** - * see @ref CKeyChooser::getKey - */ - CSwordKey* const key(); - /** - * see @ref CKeyChooser::setKey - */ - virtual void setKey(CSwordKey *key); - /** - * Sets the module - */ - virtual void setModules(const ListCSwordModuleInfo& modules, const bool refresh = true); - /** - * used to react to changes - * @param index not used - */ - void refChanged(CSwordVerseKey *key); - - void updateKey(CSwordKey* key); - void adjustFont(); - void refreshContent(); - - -private: - CKeyReferenceWidget* w_ref; - QPtrList<CSwordBibleModuleInfo> m_modules; - CSwordVerseKey *m_key; -}; - -#endif diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp deleted file mode 100644 index 0741bad..0000000 --- a/bibletime/frontend/keychooser/cbookkeychooser.cpp +++ /dev/null @@ -1,288 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2007 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cbookkeychooser.h" -#include "backend/cswordtreekey.h" -#include "backend/cswordbookmoduleinfo.h" -#include "frontend/cbtconfig.h" - -//Qt includes -#include <qlayout.h> -#include <qmap.h> - -QMap<QObject*, int> boxes; - -CBookKeyChooser::CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name) -: CKeyChooser(modules, key, parent,name), m_layout(0) { - - setModules(modules, false); - m_key = dynamic_cast<CSwordTreeKey*>(key); - if (!m_modules.count()) { - m_key = 0; - } - - setModules(modules, true); - setKey(key); - - adjustFont(); -} - -CBookKeyChooser::~CBookKeyChooser() {} - -void CBookKeyChooser::setKey(CSwordKey* newKey) { - setKey(newKey, true); -} - -/** Sets a new key to this keychooser */ -void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal) { - //qDebug("CBookKeyChooser::setKey"); - if (m_key != newKey) { - m_key = dynamic_cast<CSwordTreeKey*>(newKey); - } - - /*const */QString oldKey = m_key->key(); - - if (oldKey.isEmpty()) { //don't set keys equal to "/", always use a key which may have content - m_key->firstChild(); - oldKey = m_key->key(); - } - const int oldOffset = m_key->getOffset(); - - QStringList siblings; - if (m_key && !oldKey.isEmpty()) { - siblings = QStringList::split("/", oldKey, false); - } - - int depth = 0; - int index = 0; - - m_key->root(); - - while( m_key->firstChild() && (depth <= int(siblings.count())) ) { - const QString key = m_key->key(); - index = (depth == 0) ? -1 : 0; - const QString sibling = siblings[depth]; - - if (!sibling.isEmpty()) { //found it - bool found = false; - - do { - ++index; - //qDebug("set 'found'"); - //found = (QString::fromLocal8Bit(m_key->getLocalName()) == sibling); - found = (m_key->getLocalNameUnicode() == sibling); - } - while (!found && m_key->nextSibling()); - - if (!found) { - m_key->key( key ); - } - } - - setupCombo(key, depth, index); - depth++; - } - - //clear the combos which were not filled - for (; depth < m_modules.first()->depth(); ++depth) { - CKeyChooserWidget* chooser = m_chooserWidgets.at(depth); - if (chooser) { - chooser->reset(0,0,false); - } - } - - if (oldKey.isEmpty()) { - m_key->root(); - } - else { - //m_key->key(oldKey); - m_key->setOffset(oldOffset); - } - - if (emitSignal) { - emit keyChanged(m_key); - } -} - -/** Returns the key of this kechooser. */ -CSwordKey* const CBookKeyChooser::key() { - return m_key; -} - -/** Sets another module to this keychooser */ -void CBookKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool refresh) { - m_modules.clear(); - - // for (modules.first(); modules.current(); modules.next()) { - ListCSwordModuleInfo::const_iterator end_it = modules.end(); - for (ListCSwordModuleInfo::const_iterator it(modules.begin()); it != end_it; ++it) { - if ( (*it)->type() == CSwordModuleInfo::GenericBook ) { - if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(*it)) { - m_modules.append(book); - } - } - } - - //refresh the number of combos - if (refresh && m_modules.count() && m_key) { - if (!m_layout) { - m_layout = new QHBoxLayout(this); - } - - //delete old widgets - m_chooserWidgets.setAutoDelete(true); - m_chooserWidgets.clear(); - m_chooserWidgets.setAutoDelete(false); - - for (int i = 0; i < m_modules.first()->depth(); ++i) { - // Create an empty keychooser, don't handle next/prev signals - CKeyChooserWidget* w = new CKeyChooserWidget(0, false, this); - m_chooserWidgets.append( w ); - - //don't allow a too high width, try to keep as narrow as possible - //to aid users with smaller screen resolutions - int totalWidth = 200; //only 1 level - if (m_modules.first()->depth() > 1) { - if (m_modules.first()->depth() > 3) - totalWidth = 400; //4+ levels - else - totalWidth = 300; //2-3 levels - } - - int maxWidth = (int) ((float) totalWidth / (float) m_modules.first()->depth()); - - w->comboBox()->setMaximumWidth(maxWidth); - w->comboBox()->setCurrentItem(0); - - connect(w, SIGNAL(changed(int)), SLOT(keyChooserChanged(int))); - connect(w, SIGNAL(focusOut(int)), SLOT(keyChooserChanged(int))); - - m_layout->addWidget(w); - boxes[w] = i; - - w->show(); - } - - //set the tab order of the key chooser widgets - - CKeyChooserWidget* chooser = 0; - CKeyChooserWidget* chooser_prev = 0; - const int count = m_chooserWidgets.count(); - for (int i = 0; i < count; ++i) { - chooser = m_chooserWidgets.at(i); - Q_ASSERT(chooser); - - if (chooser && chooser_prev) { - QWidget::setTabOrder(chooser_prev, chooser); - } - - chooser_prev = chooser; - } - QWidget::setTabOrder(chooser, 0); - - updateKey(m_key); - adjustFont(); // only when refresh is set. - } -} - -/** No descriptions */ -void CBookKeyChooser::adjustFont() { - - //Make sure the entries are displayed correctly. - for ( CKeyChooserWidget* idx = m_chooserWidgets.first(); idx; idx = m_chooserWidgets.next() ) { - idx->comboBox()->setFont( CBTConfig::get - ( m_modules.first()->language() ).second ); - } -} - -/** Refreshes the content. */ -void CBookKeyChooser::refreshContent() { - if (m_key) { - updateKey( m_key ); //refresh with current key - } -} - -void CBookKeyChooser::setupCombo(const QString key, const int depth, const int currentItem) { - CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth); - - const unsigned long oldOffset = m_key->getOffset(); - m_key->key(key); - - if ((depth == 0) && chooserWidget && chooserWidget->comboBox()->count()) { //has already items - //set now the right item - if (CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth)) { - chooserWidget->setItem( chooserWidget->comboBox()->text(currentItem) ); - } - - m_key->setOffset(oldOffset); - return; - } - - - //insert an empty item at the top - QStringList items; - if (depth > 0) { - items << QString::null; - } - - do { - //items << QString::fromLocal8Bit(m_key->getLocalName()); - items << m_key->getLocalNameUnicode(); - } - while (m_key->nextSibling()); - - if (chooserWidget) { - chooserWidget->reset(items,currentItem,false); - } - - //restore old key - // m_key->key(oldKey); - m_key->setOffset( oldOffset ); -} - -/** A keychooser changed. Update and emit a signal if necessary. */ -void CBookKeyChooser::keyChooserChanged(int /*newIndex*/) { - const int activeID = boxes[const_cast<QObject*>(sender())]; //no so good code! - - QStringList items; - CKeyChooserWidget* chooser; - const int count = m_chooserWidgets.count(); - - for (int i = 0; i < count; ++i) { - chooser = m_chooserWidgets.at(i); - const QString currentText = - (chooser && chooser->comboBox()) - ? chooser->comboBox()->currentText() - : QString::null; - - if (currentText.isEmpty() || i > activeID) { - break; - } - - items << currentText; - } - - QString newKey("/"); - newKey.append(items.join("/")); - if (newKey.length() > 1) { - newKey.remove(newKey.length(),1); //remove the traling slash - } - - // qWarning("key changed: setting to %s", newKey.latin1()); - m_key->key(newKey); - setKey(m_key); -} - -/** Updates the keychoosers for the given key but emit no signal. */ -void CBookKeyChooser::updateKey(CSwordKey* key) { - setKey(key, false); -} - diff --git a/bibletime/frontend/keychooser/cbookkeychooser.h b/bibletime/frontend/keychooser/cbookkeychooser.h deleted file mode 100644 index 586996e..0000000 --- a/bibletime/frontend/keychooser/cbookkeychooser.h +++ /dev/null @@ -1,99 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CBOOKKEYCHOOSER_H -#define CBOOKKEYCHOOSER_H - -//BibleTime includes -#include "ckeychooser.h" -#include "ckeychooserwidget.h" - -//Sword includes - -//Qt includes -#include <qwidget.h> -#include <qsize.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qstringlist.h> - -class CSwordKey; -class CSwordBookModuleInfo; -class CSwordTreeKey; - -namespace sword { - class TreeKeyIdx; -} - -class QHBoxLayout; - -/** The keychooser implementation for books. - * @author The BibleTime team - */ -class CBookKeyChooser : public CKeyChooser { - Q_OBJECT -public: - CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); - ~CBookKeyChooser(); - /** - * Refreshes the content. - */ - virtual void refreshContent(); - /** - * Sets another module to this keychooser - */ - virtual void setModules(const ListCSwordModuleInfo& modules, const bool refresh = false); - /** - * Returns the key of this kechooser. - */ - virtual CSwordKey* const key(); - /** - * Sets a new key to this keychooser - */ - virtual void setKey(CSwordKey*); - /** - * Sets a new key to this keychooser - */ - void setKey(CSwordKey*, const bool emitSignal); - - -public slots: // Public slots - /** - * Updates the keychoosers for the given key but emit no signal. - */ - void updateKey(CSwordKey*); - -protected: // Protected methods - /** - * Fills the combo given by depth with the items from the key having depth "depth". - * The parent sibling is given by key. - */ - void setupCombo(const QString key, const int depth, const int currentItem); - /** No descriptions */ - virtual void adjustFont(); - -protected slots: - /** - * A keychooser changed. Update and emit a signal if necessary. - */ - void keyChooserChanged(int); - //is called when a keychooser widget wants to jump to the next/previous key - // void nextEntry(); - // void previousEntry(); - -private: - QPtrList<CKeyChooserWidget> m_chooserWidgets; - QPtrList<CSwordBookModuleInfo> m_modules; - CSwordTreeKey *m_key; - QHBoxLayout* m_layout; -}; - -#endif diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp deleted file mode 100644 index 33e95fa..0000000 --- a/bibletime/frontend/keychooser/cbooktreechooser.cpp +++ /dev/null @@ -1,321 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2007 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cbooktreechooser.h" -#include "backend/cswordtreekey.h" -#include "backend/cswordbookmoduleinfo.h" -#include "frontend/cbtconfig.h" - -//Qt includes -#include <qlayout.h> -#include <qheader.h> -#include <qlistview.h> -#include <qcursor.h> - -//KDE includes -#include <kapplication.h> - -//////////// - -CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName) -: KListViewItem(parent, after), -m_key(key), -m_keyName(keyName) { - //qDebug("first CBookTreeChooser::TreeItem ctor"); - const unsigned long offset = m_key->getOffset(); - - m_key->key(m_keyName); - //setText(0, QString::fromLocal8Bit(m_key->getLocalName()) ); - setText(0, m_key->getLocalNameUnicode() ); - - m_key->setOffset( offset ); -}; - -CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent,CSwordTreeKey* key, const QString keyName) -: KListViewItem(parent), -m_key(key), -m_keyName(keyName) { - //qDebug("second CBookTreeChooser::TreeItem ctor"); - const unsigned int offset = m_key->getOffset(); - - m_key->key(m_keyName); - //setText(0, QString::fromLocal8Bit(m_key->getLocalName()) ); - setText(0, m_key->getLocalNameUnicode() ); - - m_key->setOffset( offset ); -}; - -CBookTreeChooser::TreeItem::TreeItem(QListView* view, QListViewItem* after,CSwordTreeKey* key, const QString keyName) -: KListViewItem(view,after), -m_key(key), -m_keyName(keyName) { - //qDebug("third CBookTreeChooser::TreeItem ctor"); - const unsigned int offset = m_key->getOffset(); - - m_key->key(m_keyName); - //setText(0, QString::fromLocal8Bit(m_key->getLocalName()) ); - setText(0, m_key->getLocalNameUnicode() ); - - m_key->setOffset( offset ); -}; - -const QString& CBookTreeChooser::TreeItem::key() const { - return m_keyName; -}; - -/** Initializes this item with the correct caption. */ -void CBookTreeChooser::TreeItem::setup() { - const unsigned int offset = m_key->getOffset(); - - m_key->key(m_keyName); - setExpandable(m_key->hasChildren()); - - m_key->setOffset( offset ); - - KListViewItem::setup(); -} - -void CBookTreeChooser::TreeItem::createChilds() { - //make sure that we don't change the status of the key! - - const unsigned long offset = m_key->getOffset(); - - m_key->key(m_keyName); - - if (m_key->hasChildren()) { - m_key->firstChild(); //go to the first child - - QListViewItem* oldItem = 0; - - do { - if (oldItem) { - oldItem = new TreeItem(this, oldItem, m_key, m_key->key()); - } - else { - oldItem = new TreeItem(this, m_key, m_key->key()); - } - - // oldItem->setExpandable( m_key->hasChildren() ); - } - while (m_key->nextSibling()); - } - - m_key->setOffset( offset ); //restore the old state -} - -void CBookTreeChooser::TreeItem::setOpen(bool o) { - //setup the tree under this item - if ((!isOpen() && o) && childCount() == 0) { - listView()->viewport()->setCursor(WaitCursor); - createChilds(); - listView()->viewport()->unsetCursor(); - } - - KListViewItem::setOpen(o); -} - -////////////////////////////////// - -CBookTreeChooser::CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name) -: CKeyChooser(modules, key, parent,name), -m_key( dynamic_cast<CSwordTreeKey*>(key) ) { - setModules(modules, false); - - if (!modules.count()) { - m_modules.clear(); - m_key = 0; - } - - //now setup the keychooser widgets - QHBoxLayout* layout = new QHBoxLayout(this); - - m_treeView = new KListView(this); - layout->addWidget(m_treeView); - m_treeView->addColumn("Tree"); - m_treeView->header()->hide(); - m_treeView->setSorting(-1); - m_treeView->setRootIsDecorated(true); - m_treeView->setFullWidth(true); - connect(m_treeView, SIGNAL(executed(QListViewItem*)), SLOT(itemActivated(QListViewItem*))); - - setKey(key); - adjustFont(); -} - -CBookTreeChooser::~CBookTreeChooser() {} - -/** Sets a new key to this keychooser */ -void CBookTreeChooser::setKey(CSwordKey* key/*newKey*/) { - setKey(key, false); -} - -/** Sets a new key to this keychooser */ -void CBookTreeChooser::setKey(CSwordKey* newKey, const bool emitSignal) { - if (m_key != newKey ) { - m_key = dynamic_cast<CSwordTreeKey*>(newKey); - } - - const QString key = m_key->key(); - - QStringList siblings; - if (m_key && !key.isEmpty()) { - siblings = QStringList::split("/",key,false); - } - - //find the right listview item - const int count = siblings.count(); - int index = 0; - QString currentSibling = siblings[index]; - - QListViewItem* child = m_treeView->firstChild(); - while( child && index < count ) { - if (child->text(0) == currentSibling) { //found a parent of our item - //found right entry? - TreeItem* i = dynamic_cast<TreeItem*>(child); - if (!i || i->key() == key) { - break; - } - i->setOpen(true); //automatically creates childs - child = i->firstChild(); - currentSibling = siblings[++index]; - } - else { - child = child->nextSibling(); - } - } - - m_treeView->setCurrentItem( child ); - m_treeView->setSelected( child, true ); - m_treeView->ensureItemVisible(child); - - if (emitSignal) { - emit keyChanged(m_key); - } -} - -/** Returns the key of this kechooser. */ -CSwordKey* const CBookTreeChooser::key() { - return m_key; -} - -/** Sets another module to this keychooser */ -void CBookTreeChooser::setModules(const ListCSwordModuleInfo& modules, const bool refresh) { - m_modules.clear(); - - // for (modules.first(); modules.current(); modules.next()) { - ListCSwordModuleInfo::const_iterator end_it = modules.end(); - for (ListCSwordModuleInfo::const_iterator it(modules.begin()); it != end_it; ++it) { - if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(*it)) { - m_modules.append(book); - } - } - - if (refresh && m_modules.count() && m_key) { - const uint offset = m_key->getOffset(); - setupTree(); - m_key->setOffset( offset ); - - /* m_key->root(); - m_key->firstChild(); - setKey(m_key, true);*/ - - // m_treeView->clear(); - // - // const QString oldKey = m_key->key(); - // m_key->root(); - // m_key->firstChild(); - // setupTree(0,0,m_key); - // - // m_key->key(oldKey); - // - // updateKey(m_key); - adjustFont(); //only when refresh is set. - } -} - -/** No descriptions */ -void CBookTreeChooser::adjustFont() { - //Make sure the entries are displayed correctly. - // if ( m_modules.first()->isUnicode() ){ - m_treeView->setFont( CBTConfig::get - (m_modules.first()->language()).second ); - // qWarning("Unicode Book detected"); - // } - // else{ - // m_treeView->setFont( CBTConfig::get(CBTConfig::standard) ); - // qWarning("Standard Book detected"); - // } -} - - -/** Refreshes the content. */ -void CBookTreeChooser::refreshContent() { - if (m_key) { - updateKey( m_key ); //refresh with current key - } -} - -/** No descriptions */ -void CBookTreeChooser::itemActivated( QListViewItem* item ) { - TreeItem* i = dynamic_cast<TreeItem*>(item); - if (!i) { - return; - } - - m_key->key( i->key() ); - - if (i->childCount() > 0 || i->isExpandable()) { - i->setOpen(true); - } - - emit keyChanged(m_key); -} - -/** No descriptions */ -void CBookTreeChooser::updateKey( CSwordKey* key ) { - setKey(key, false); -} - -/** Reimplementationm to handle tree creation on show. */ -void CBookTreeChooser::show() { - CKeyChooser::show(); - - if (!m_treeView->childCount()) { - KApplication::setOverrideCursor(WaitCursor); - setupTree(); //create the first level of the tree structure - m_treeView->resize(m_treeView->sizeHint()); - KApplication::restoreOverrideCursor(); - } -} - -/** Creates the first level of the tree structure. */ -void CBookTreeChooser::setupTree() { - m_treeView->clear(); - - const unsigned long offset = m_key->getOffset(); - m_key->root(); - - if (m_key->hasChildren()) { - QListViewItem* item = 0; - - m_key->firstChild(); - do { - //the TreeItem constructor doesn't change the state of the key - item = new TreeItem(m_treeView, item, m_key, m_key->key()); - } - while (m_key->nextSibling()); - } - - /* m_key->root(); - m_key->firstChild();*/ - m_key->setOffset( offset ); - setKey(m_key, false); //the module may have changed -} diff --git a/bibletime/frontend/keychooser/cbooktreechooser.h b/bibletime/frontend/keychooser/cbooktreechooser.h deleted file mode 100644 index 43b03d5..0000000 --- a/bibletime/frontend/keychooser/cbooktreechooser.h +++ /dev/null @@ -1,112 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CBOOKTREECHOOSER_H -#define CBOOKTREECHOOSER_H - - -/** The treechooser implementation for books. - * @author The BibleTime team - */ -//BibleTime includes -#include "ckeychooser.h" -#include "ckeychooserwidget.h" - -//Sword includes - -//Qt includes -#include <qwidget.h> -#include <qsize.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qstringlist.h> - -//KDE includes -#include <klistview.h> - -class CSwordKey; -class CSwordBookModuleInfo; -class CSwordTreeKey; - -namespace sword { - class TreeKeyIdx; -} - -/** The keychooser implementeation for books. - * @author The BibleTime team - */ -class CBookTreeChooser : public CKeyChooser { - Q_OBJECT -public: - CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); - ~CBookTreeChooser(); - /** - * Refreshes the content. - */ - virtual void refreshContent(); - /** - * Sets another module to this keychooser - */ - virtual void setModules(const ListCSwordModuleInfo& modules, const bool refresh = true); - /** - * Returns the key of this kechooser. - */ - virtual CSwordKey* const key(); - /** - * Sets a new key to this keychooser - */ - virtual void setKey(CSwordKey*); - void setKey(CSwordKey*, const bool emitSinal); - -public slots: // Public slots - virtual void updateKey( CSwordKey* ); - /** - * Reimplementationm to handle tree creation on show. - */ - virtual void show(); - - -protected: // Protected methods - /** - * Creates the first level of the tree structure. - */ - void setupTree(); - virtual void adjustFont(); - -protected slots: // Protected slots - void itemActivated( QListViewItem* item ); - -private: -class TreeItem : public KListViewItem { -public: - TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName); - TreeItem(QListViewItem* parent, CSwordTreeKey* key, const QString keyName); - TreeItem(QListView* view,QListViewItem* after, CSwordTreeKey* key, const QString keyName); - const QString& key() const; - void createChilds(); - virtual void setOpen(bool); - -protected: - /** - * Initializes this item with the correct caption. - */ - virtual void setup(); -private: - CSwordTreeKey* m_key; - QString m_keyName; - }; - - QPtrList<CSwordBookModuleInfo> m_modules; - CSwordTreeKey* m_key; - KListView* m_treeView; -}; - -#endif diff --git a/bibletime/frontend/keychooser/ckeychooser.cpp b/bibletime/frontend/keychooser/ckeychooser.cpp deleted file mode 100644 index 4dcd878..0000000 --- a/bibletime/frontend/keychooser/ckeychooser.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "ckeychooser.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbiblemoduleinfo.h" -#include "backend/cswordcommentarymoduleinfo.h" -#include "backend/cswordlexiconmoduleinfo.h" - -#include "clexiconkeychooser.h" -#include "cbiblekeychooser.h" -#include "cbookkeychooser.h" - -CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, QWidget *parent, const char *name ) -: QWidget(parent, name), -m_inHistoryFunction(false) {} - -CKeyChooser::~CKeyChooser() {} - -CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent) { - if (!modules.count()) { - return 0; - } - - CKeyChooser* ck = 0; - switch ( modules.first()->type() ) { - case CSwordModuleInfo::Commentary: //Bibles and commentaries uise the same key chooser - case CSwordModuleInfo::Bible: - ck = new CBibleKeyChooser(modules,key,parent); - break; - case CSwordModuleInfo::Lexicon: - ck = new CLexiconKeyChooser(modules,key,parent); - break; - case CSwordModuleInfo::GenericBook: - ck = new CBookKeyChooser(modules,key,parent); - break; - default: - return 0; - } - return ck; -} - -void CKeyChooser::backInHistory() { - backInHistory(1); -} - -void CKeyChooser::backInHistory(int count) { - m_inHistoryFunction = true; - // qWarning("go back %d items in history", count); - - Q_ASSERT(m_prevKeyHistoryList.size()); - - QStringList::iterator it = m_prevKeyHistoryList.begin(); - - //pop_front count items, the top item is then the new current key - int index = count; - while ((index > 0) && (it != m_prevKeyHistoryList.end())) { - // qWarning("pop_front"); - - m_nextKeyHistoryList.prepend(*it); - it = m_prevKeyHistoryList.remove(it); - --index; - } - - //the first item is now the item which should be set as key - if (it != m_nextKeyHistoryList.end() && key()) { - CSwordKey* k = key(); - k->key(*it); - setKey(k); - } - - m_inHistoryFunction = false; -} - -void CKeyChooser::forwardInHistory() { - forwardInHistory(1); -} - -void CKeyChooser::forwardInHistory(int count) { - m_inHistoryFunction = true; - // qWarning("go forward %d items in history", count); - - Q_ASSERT(m_nextKeyHistoryList.size()); - - QStringList::iterator it = m_nextKeyHistoryList.begin(); - //pop_front count-1 items, the top item is then the new current key - int index = count; - while (index > 0 && it != m_nextKeyHistoryList.end()) { - // qWarning("pop_front"); - - m_prevKeyHistoryList.prepend(*it); - it = m_nextKeyHistoryList.remove(it); - --index; - } - - //the first item of the back list is now the new key - it = m_prevKeyHistoryList.begin(); - if (it != m_prevKeyHistoryList.end() && key()) { - CSwordKey* k = key(); - k->key(*it); - setKey(k); - } - - m_inHistoryFunction = false; -} - -void CKeyChooser::addToHistory(CSwordKey* k) { - // qWarning("addToHistory"); - - Q_ASSERT(!m_inHistoryFunction); - if (k && !m_inHistoryFunction) { - Q_ASSERT(k->key() == key()->key()); - m_prevKeyHistoryList.prepend(k->key()); - } - - emit historyChanged(); -} - -const QStringList CKeyChooser::getPreviousKeys() const { - QStringList ret = m_prevKeyHistoryList; - if (ret.size() >= 1) { - ret.pop_front(); //the first item always is equal to the current key - } - - return ret; -} - -const QStringList CKeyChooser::getNextKeys() const { - return m_nextKeyHistoryList; -} - - -/*! - \fn CKeyChooser::polish() - */ -void CKeyChooser::polish() { - QWidget::polish(); - - //connect the history calls just before we show, we want an empty history - connect(this, SIGNAL(keyChanged(CSwordKey*)), SLOT(addToHistory(CSwordKey*))); -} diff --git a/bibletime/frontend/keychooser/ckeychooser.h b/bibletime/frontend/keychooser/ckeychooser.h deleted file mode 100644 index c5ad246..0000000 --- a/bibletime/frontend/keychooser/ckeychooser.h +++ /dev/null @@ -1,114 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CKEYCHOOSER_H -#define CKEYCHOOSER_H - -#include <qwidget.h> - -#include "backend/cswordmoduleinfo.h" - -class CSwordModuleInfo; -class CSwordKey; - -/** - * The base class for the KeyChooser. - * Do not use directly, create a KeyChooser with - * @ref #createInstance , this will create the proper one - * of the classes that inherit from @ref CKeyChooser - * - * @author The BibleTime team - */ - -class CKeyChooser : public QWidget { - Q_OBJECT - -public: - /** - * Creates a proper Instance, either - * - @ref CLexiconKeyChooser or - * @ref CBibleKeyChooser - * @param info the @ref CModuleInfo to be represented by the KeyChooser - * @param key if not NULL, the @ref CKey the KeyChooser should be set to - * @param parent the parent of the widget to create - */ - static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent); - - const QStringList getPreviousKeys() const; - const QStringList getNextKeys() const; - -public slots: - /** - * sets the @ref CKey - * @param key the key which the widget should be set to - */ - virtual void setKey(CSwordKey* key) = 0; - /** - * sets the @ref CKey - * @param key the key which the widget should be set to - */ - virtual void updateKey(CSwordKey* key) = 0; - /** - * gets the current @ref CKey - * - * @return the current @ref CKey - */ - virtual CSwordKey* const key() = 0; - /** - * Sets the module of this keychooser and refreshes the comboboxes - */ - virtual void setModules( const ListCSwordModuleInfo& modules, const bool refresh = true ) = 0; - /** - * Freshes the content of the different key chooser parts. - */ - virtual void refreshContent() = 0; - - void addToHistory(CSwordKey*); - - void backInHistory(); - void backInHistory(int); - - void forwardInHistory(); - void forwardInHistory(int); - -signals: - /** - * is emitted if the @ref CKey was changed by the user - */ - void keyChanged(CSwordKey* key); - /** - * Is emitted before the key is changed! - */ - void beforeKeyChange(const QString& key); - void historyChanged(); - -protected: - /** - * the constructor - DO NOT USE! -- use @ref #createInstance instead! - */ - CKeyChooser(ListCSwordModuleInfo info, CSwordKey *key=0, QWidget *parent=0, const char *name=0); - virtual ~CKeyChooser(); - /** - * Set the appropriate font do display the modules - */ - virtual void adjustFont() = 0; - -private: - QStringList m_prevKeyHistoryList; - QStringList m_nextKeyHistoryList; - int m_currentKeyHistoryPos; - bool m_inHistoryFunction; -protected: - virtual void polish(); -}; - -#endif diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp deleted file mode 100644 index 64de499..0000000 --- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp +++ /dev/null @@ -1,303 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - -//BibleTime includes -#include "ckeychooserwidget.h" - -//BibleTime frontend includes -#include "frontend/cbtconfig.h" - - -//Qt includes -#include <qlineedit.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qlistbox.h> -#include <qtoolbutton.h> -#include <qevent.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qrect.h> - -CKCComboBox::CKCComboBox(bool rw,QWidget* parent,const char* name) -: QComboBox(rw,parent,name) { - setFocusPolicy(QWidget::WheelFocus); - if (lineEdit()) { - installEventFilter( lineEdit() ); - } -} - -/** Reimplementation. */ -bool CKCComboBox::eventFilter( QObject *o, QEvent *e ) { - if (e->type() == QEvent::FocusOut) { - QFocusEvent* f = static_cast<QFocusEvent*>(e); - - if (o == lineEdit() && f->reason() == QFocusEvent::Tab) { - int index = listBox()->index( listBox()->findItem(currentText()) ); - if (index == -1) { - index = 0;// return 0 if not found - } - setCurrentItem( index ); - emit focusOut( index ); - - return false; - } - else if (f->reason() == QFocusEvent::Popup) { - return false; - } - else if (f->reason() == QFocusEvent::ActiveWindow) { - emit activated(currentText()); - return false; - } - else if (f->reason() == QFocusEvent::Mouse) { - emit activated(currentText()); - return false; - } - else if (o == this) { - emit activated(currentText()); - return false; - } - } - - return QComboBox::eventFilter(o,e); -} - -/** Scrolls in the list if the wheel of the mouse was used. */ -void CKCComboBox::wheelEvent( QWheelEvent* e ) { - return QComboBox::wheelEvent(e); - - const signed int change = (int)((float)e->delta()/(float)120); - int current = currentItem(); - - if ((current+change >= 0) && (current+change<count()) ) { - setCurrentItem(current+change); - e->accept(); - emit activated( currentItem() ); - } - else { - e->ignore(); - } -} - -//**********************************************************************************/ - -CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals, QWidget *parent, const char *name) : QWidget(parent,name) { - m_useNextPrevSignals = useNextPrevSignals; - - for (int index=1; index <= count; index++) { - m_list.append( QString::number(index) ); - } - init(); - reset(m_list,0,false); -}; - -CKeyChooserWidget::CKeyChooserWidget(QStringList *list, const bool useNextPrevSignals, QWidget *parent, const char *name ) : QWidget(parent,name) { - m_useNextPrevSignals = useNextPrevSignals; - - if (list) { - m_list = *list; //deep copy the items of list - } - else { - m_list.clear(); - } - - init(); - reset(m_list,0,false); -} - -void CKeyChooserWidget::reset(const int count, int index, bool do_emit) { - if (!isUpdatesEnabled()) - return; - - m_list.clear(); - for (int i=1; i <= count; i++) { //TODO: CHECK - m_list.append( QString::number(i) ); - } - - reset(&m_list,index,do_emit); -} - -void CKeyChooserWidget::reset(QStringList& list, int index, bool do_emit) { - if (!isUpdatesEnabled()) - return; - - m_list = list; - reset(&m_list,index,do_emit); -} - - -void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit) { - if (isResetting || !isUpdatesEnabled()) - return; - - // qWarning("starting insert"); - isResetting = true; - - oldKey = QString::null; - - // m_comboBox->setUpdatesEnabled(false); - //DON'T REMOVE THE HIDE: Otherwise QComboBox's sizeHint() function won't work properly - m_comboBox->hide(); - m_comboBox->clear(); - if (list) { - m_comboBox->insertStringList(*list); - } - - if (!list || (list && !list->count())) { //nothing in the combobox - setEnabled(false); - } - else if (!isEnabled()) { //was disabled - setEnabled(true); - } - - if (list->count()) { - m_comboBox->setCurrentItem(index); - } - if (do_emit) { - emit changed(m_comboBox->currentItem()); - } - - const QSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized! - //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly! - m_comboBox->show(); - - // m_comboBox->setFont( m_comboBox->font() ); - // m_comboBox->setUpdatesEnabled(true); - - isResetting = false; - // qWarning("inserted"); -} - -/** Initializes this widget. We need this function because we have more than one constructor. */ -void CKeyChooserWidget::init() { - oldKey = QString::null; - - setFocusPolicy(QWidget::WheelFocus); - - m_comboBox = new CKCComboBox( true, this ); - m_comboBox->setAutoCompletion( true ); - m_comboBox->setInsertionPolicy(QComboBox::NoInsertion); - m_comboBox->setFocusPolicy(QWidget::WheelFocus); - - m_mainLayout = new QHBoxLayout( this ); - m_mainLayout->addWidget(m_comboBox,5); - - m_scroller = new CScrollerWidgetSet(this); - - m_mainLayout->addWidget( m_scroller ); - m_mainLayout->addSpacing(2); - - setTabOrder(m_comboBox, 0); - - connect(m_scroller, SIGNAL(scroller_pressed()), SLOT(lock())); - connect(m_scroller, SIGNAL(scroller_released()), SLOT(unlock())); - connect(m_scroller, SIGNAL(change(int)), SLOT(changeCombo(int)) ); - - connect(m_comboBox, SIGNAL(activated(int)), SLOT(slotComboChanged(int))); - // connect(m_comboBox, SIGNAL(activated(const QString&)), SLOT(slotReturnPressed(const QString&))); - connect(m_comboBox->lineEdit(), SIGNAL(returnPressed()), SLOT(slotReturnPressed())); - connect(m_comboBox, SIGNAL(focusOut(int)), SIGNAL(focusOut(int))); - - updatelock = false; - isResetting = false; -} - -/** Is called when the return key was presed in the combobox. */ -void CKeyChooserWidget::slotReturnPressed( /*const QString& text*/) { - Q_ASSERT(comboBox()->lineEdit()); - qWarning("return pressed"); - - QString text = comboBox()->lineEdit()->text(); - for (int index = 0; index < comboBox()->count(); ++index) { - if (comboBox()->text(index) == text) { -// emit changed(index); - emit focusOut(index); // a workaround because focusOut is not checked, the slot connected to changed to check - break; - } - } -} - -/** Is called when the current item of the combo box was changed. */ -void CKeyChooserWidget::slotComboChanged(int index) { - qWarning("CKeyChooserWidget::slotComboChanged(int index)"); - if (!isUpdatesEnabled()) { - return; - } - - setUpdatesEnabled(false); - - const QString key = comboBox()->text( index ); - if (oldKey.isNull() || (oldKey != key)) { - emit changed(index); - } - - oldKey = key; - - setUpdatesEnabled(true); -} - -/** Sets the tooltips for the given entries using the parameters as text. */ -void CKeyChooserWidget::setToolTips( const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip) { - QToolTip::add (comboBox(),comboTip); - m_scroller->setToolTips(nextEntryTip, scrollButtonTip, previousEntryTip); -} - -/** Sets the current item to the one with the given text */ -bool CKeyChooserWidget::setItem( const QString item ) { - bool ret = false; - const int count = comboBox()->count(); - for (int i = 0; i < count; ++i) { - if (comboBox()->text(i) == item) { - comboBox()->setCurrentItem(i); - ret = true; - break; - } - } - if (!ret) - comboBox()->setCurrentItem(-1); - return ret; -} - -/* Handlers for the various scroller widgetset. */ -void CKeyChooserWidget::lock() { - updatelock = true; - comboBox()->setEditable(false); - oldKey = comboBox()->currentText(); -} - -void CKeyChooserWidget::unlock() { - updatelock = false; - comboBox()->setEditable(true); - comboBox()->setEditText(comboBox()->text(comboBox()->currentItem())); - if (comboBox()->currentText() != oldKey) { - emit changed(comboBox()->currentItem()); - } -} - -void CKeyChooserWidget::changeCombo(int n) { - const int old_item = comboBox()->currentItem(); - int new_item = old_item + n; - - //index of highest Item - const int max = comboBox()->count()-1; - if(new_item > max) new_item = max; - if(new_item < 0) new_item = 0; - - if(new_item != old_item) { - comboBox()->setCurrentItem(new_item); - if(!updatelock) - emit changed(new_item); - } -} - diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.h b/bibletime/frontend/keychooser/ckeychooserwidget.h deleted file mode 100644 index e5893ce..0000000 --- a/bibletime/frontend/keychooser/ckeychooserwidget.h +++ /dev/null @@ -1,179 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CKEYCHOOSERWIDGET_H -#define CKEYCHOOSERWIDGET_H - -#include <qwidget.h> -#include <qmap.h> -#include <qstringlist.h> - -#include <kcombobox.h> -#include "cscrollerwidgetset.h" - - -class CLexiconKeyChooser; -//class CMinMaxLayout; - -class QIconSet; -//class QComboBox; -class QStringList; -class QPoint; -class QMouseEvent; -class QWheelEvent; -class QHBoxLayout; - -/* -* We use this class to conrtol the focus move in the combobox -* This class is used in the key chooser widgets -*/ -class CKCComboBox : public QComboBox { - Q_OBJECT - -public: - CKCComboBox(bool rw, QWidget * parent=0, const char * name=0 ); - /** - * Returns the size this widget would like to have. - */ - // virtual QSize sizeHint() const; - -protected: - /** - * Reimplementation. - */ - virtual bool eventFilter( QObject *o, QEvent *e ); - /** - * Scrolls in the list if the wheel of the mouse was used. - */ - virtual void wheelEvent( QWheelEvent* e); - -signals: - /** - * Emitted when the user moves the focus away from the combo by pressing tab - */ - void focusOut(int itemIndex); -}; - -/** - * This class implements the KeyCooser Widget, which - * consists of a @ref QComboBox, two normal ref @QToolButton - * and a enhanced @ref CScrollButton - * - * @author The BibleTime team - */ -class CKeyChooserWidget : public QWidget { - Q_OBJECT -public: - /** - * the constructor - */ - CKeyChooserWidget(QStringList *list=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0); - /** - * the constructor - */ - CKeyChooserWidget(int count=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0); - /** - * This function does clear the combobox, then fill in - * the StringList, set the ComboBox' current item to index - * and if do_emit is true, it will emit @ref #changed - * - * @param list the stringlist to be inserted - * @param index the index that the combobox is to jump to - * @param do_emit should we emit @ref #changed(int) - */ - void reset(const int count, int index, bool do_emit); - void reset(QStringList& list, int index, bool do_emit); - void reset(QStringList *list, int index, bool do_emit); - /** - * Initializes this widget. We need this function because - * we have more than one constructor. - */ - virtual void init(); - /** - * - */ - // virtual void adjustSize(); - /** - * Sets the tooltips for the given entries using the parameters as text. - */ - void setToolTips( const QString comboTip, const QString nextEntry, const QString scrollButton, const QString previousEntry); - /** - * Sets the current item to the one with the given text - */ - bool setItem( const QString item); - /** - * Return the combobox of this key chooser widget. - */ - QComboBox* comboBox() {return m_comboBox;}; - -public slots: - /** - * is called to lock the combobox - */ - void lock() - ; - /** - * is called to unlock the combobox - */ - void unlock(); - /** - * is called to move the combobox to a certain index - * @param index the index to jump to - */ - void changeCombo(int index); - void slotComboChanged(int index); - -signals: - /** - * Is emitted if the widget changed, but - * only if it is not locked or being reset - * - * @param the current ComboBox index - */ - void changed(int index); - /** - * Is emitted if the widget was left with a focus out event. - * @param index The new index of the ComboBox - */ - void focusOut(int index); - -protected: - /** - * indicates wheter we are resetting at the moment - */ - bool isResetting; - /** - * - */ - QString oldKey; - -protected slots: // Protected slots - /** - * Is called when the return key was presed in the combobox. - */ - void slotReturnPressed( /*const QString&*/ ); - - -private: - friend class CLexiconKeyChooser; - QStringList m_list; - bool m_useNextPrevSignals; - bool updatelock; - - /** - * Members should never be public!! - */ - CKCComboBox* m_comboBox; - QHBoxLayout *m_mainLayout; - CScrollerWidgetSet * m_scroller; -}; - -#endif diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp deleted file mode 100644 index b0fc7c9..0000000 --- a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp +++ /dev/null @@ -1,210 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - -//BibleTime includes -#include "ckeyreferencewidget.h" -#include "cscrollerwidgetset.h" - -//BibleTime frontend includes -#include "frontend/cbtconfig.h" -#include "backend/cswordversekey.h" -#include "util/cresmgr.h" - -//Qt includes -#include <klineedit.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <kcompletion.h> -#include <kglobalsettings.h> -#include <kcompletionbox.h> -#include <klocale.h> -#include <kpushbutton.h> -#include <kguiitem.h> - -/* Override the completion box for our references */ -CKeyReferenceCompletion::CKeyReferenceCompletion(CSwordBibleModuleInfo *mod) : KCompletion() -{ - m_key = new CSwordVerseKey(mod); - m_module = mod; -} - -QString CKeyReferenceCompletion::makeCompletion(const QString &text) { - if(!text.isEmpty() && m_key->key(text)) { - // XXX: key() does not check bounds properly if we only have eg the NT. - return m_key->key(); - } - - return QString::null; -} - -//**********************************************************************************/ -/* To get popup working we have to rework KLineEdit too */ -CKeyReferenceLineEdit::CKeyReferenceLineEdit(QWidget *parent, const char *name) : KLineEdit(parent,name) { -} - -void CKeyReferenceLineEdit::makeCompletion(const QString &text) { - KCompletion *comp = compObj(); - KGlobalSettings::Completion mode = completionMode(); - - if ( !comp || mode == KGlobalSettings::CompletionNone ) - return; // No completion object... - - QString match = comp->makeCompletion( text ); - if ( mode == KGlobalSettings::CompletionPopup || - mode == KGlobalSettings::CompletionPopupAuto ) - { - if ( match.isNull() ) - { - KCompletionBox *compbox = completionBox(); - compbox->hide(); - compbox->clear(); - } else { - QStringList t; - t.append(match); - setCompletedItems(t); - } - } else { - KLineEdit::makeCompletion(text); - } -} - -//**********************************************************************************/ - -CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVerseKey *key, QWidget *parent, const char *name) : QWidget(parent,name) { - - updatelock = false; - m_module = mod; - - setFocusPolicy(QWidget::WheelFocus); - - // Erase button - KGuiItem erase_picture; - erase_picture.setIconName("locationbar_erase"); - KPushButton *clearRef = new KPushButton(this); - clearRef->setGuiItem(erase_picture); - connect(clearRef, SIGNAL(clicked( ) ), SLOT(slotClearRef( ))); - - m_bookScroller = new CScrollerWidgetSet(this); - - m_textbox = new CKeyReferenceLineEdit( this ); - setKey(key); // The order of these two functions is important. - setModule(); - - m_chapterScroller = new CScrollerWidgetSet(this); - m_verseScroller = new CScrollerWidgetSet(this); - - m_mainLayout = new QHBoxLayout( this ); - m_mainLayout->addWidget(clearRef); - m_mainLayout->addWidget(m_bookScroller); - m_mainLayout->addWidget(m_textbox); - m_mainLayout->addWidget(m_chapterScroller); - m_mainLayout->addWidget(m_verseScroller); - - setTabOrder(m_textbox, 0); - - m_bookScroller->setToolTips( - CResMgr::displaywindows::bibleWindow::nextBook::tooltip, - CResMgr::displaywindows::general::scrollButton::tooltip, - CResMgr::displaywindows::bibleWindow::previousBook::tooltip - ); - m_chapterScroller->setToolTips( - CResMgr::displaywindows::bibleWindow::nextChapter::tooltip, - CResMgr::displaywindows::general::scrollButton::tooltip, - CResMgr::displaywindows::bibleWindow::previousChapter::tooltip - ); - m_verseScroller->setToolTips( - CResMgr::displaywindows::bibleWindow::nextVerse::tooltip, - CResMgr::displaywindows::general::scrollButton::tooltip, - CResMgr::displaywindows::bibleWindow::previousVerse::tooltip - ); - - - // signals and slots connections - - connect(m_bookScroller, SIGNAL(change(int)), SLOT(slotBookChange(int))); - connect(m_bookScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock())); - connect(m_bookScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock())); - connect(m_textbox, SIGNAL(returnPressed()), SLOT(slotReturnPressed())); - connect(m_chapterScroller, SIGNAL(change(int)), SLOT(slotChapterChange(int))); - connect(m_chapterScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock())); - connect(m_chapterScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock())); - connect(m_verseScroller, SIGNAL(change(int)), SLOT(slotVerseChange(int))); - connect(m_verseScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock())); - connect(m_verseScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock())); -} - -void CKeyReferenceWidget::setModule(CSwordBibleModuleInfo *m) { - if (m) - m_module = m; - - delete m_textbox->completionObject(); - CKeyReferenceCompletion *comp = new CKeyReferenceCompletion(m_module); - m_textbox->setCompletionObject(comp); - m_textbox->setCompletionMode(KGlobalSettings::CompletionPopup); -} - -void CKeyReferenceWidget::slotClearRef( ) { - m_textbox->setText(""); - m_textbox->setFocus(); -} - -void CKeyReferenceWidget::updateText() { - m_textbox->setText(m_key->key()); -} - -bool CKeyReferenceWidget::setKey(CSwordVerseKey *key) { - m_key = key; - updateText(); - - return true; -} - -KLineEdit* CKeyReferenceWidget::textbox() { - return m_textbox; -} - -void CKeyReferenceWidget::slotReturnPressed() { - m_key->key(m_textbox->text()); - updateText(); - - emit changed(m_key); -} - -/* Handlers for the various scroller widgetsets. Do we really want a verse scroller? */ -void CKeyReferenceWidget::slotUpdateLock() { - updatelock = true; - oldKey = m_key->key(); -} - -void CKeyReferenceWidget::slotUpdateUnlock() { - updatelock = false; - if (oldKey != m_key->key()) emit changed(m_key); -} - -void CKeyReferenceWidget::slotBookChange(int n) { - n > 0 ? m_key->next( CSwordVerseKey::UseBook ) : m_key->previous( CSwordVerseKey::UseBook ); - updateText(); - if (!updatelock) emit changed(m_key); -} - -void CKeyReferenceWidget::slotChapterChange(int n) { - n > 0 ? m_key->next( CSwordVerseKey::UseChapter ) : m_key->previous( CSwordVerseKey::UseChapter ); - updateText(); - if (!updatelock) emit changed(m_key); -} - -void CKeyReferenceWidget::slotVerseChange(int n) { - n > 0 ? m_key->next( CSwordVerseKey::UseVerse ) : m_key->previous( CSwordVerseKey::UseVerse ); - updateText(); - if (!updatelock) emit changed(m_key); -} diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.h b/bibletime/frontend/keychooser/ckeyreferencewidget.h deleted file mode 100644 index bcb6bb9..0000000 --- a/bibletime/frontend/keychooser/ckeyreferencewidget.h +++ /dev/null @@ -1,89 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CKEYREFERENCEWIDGET_H -#define CKEYREFERENCEWIDGET_H - -#include "cscrollerwidgetset.h" -#include "backend/cswordbiblemoduleinfo.h" - -#include <qwidget.h> -#include <qlayout.h> - -#include <klineedit.h> -#include <kcompletion.h> - -class CLexiconKeyChooser; -class CSwordVerseKey; - -class CKeyReferenceCompletion : public KCompletion { - Q_OBJECT -public: - CKeyReferenceCompletion(CSwordBibleModuleInfo*); - QString makeCompletion(const QString &); - QStringList allMatches(); -private: - CSwordVerseKey *m_key; - CSwordBibleModuleInfo *m_module; -}; - -class CKeyReferenceLineEdit : public KLineEdit { - Q_OBJECT -public: - CKeyReferenceLineEdit(QWidget *parent=0, const char *name=0); - void makeCompletion(const QString &); -}; - -class CKeyReferenceWidget : public QWidget { - Q_OBJECT -public: - /** - * the constructor - */ - CKeyReferenceWidget(CSwordBibleModuleInfo *, CSwordVerseKey*, QWidget *parent=0, const char *name=0); - bool setKey(CSwordVerseKey* key); - KLineEdit* textbox(); - void setModule(CSwordBibleModuleInfo *m = 0); - -signals: - void changed(CSwordVerseKey* key); - -protected: - void updateText(); - -protected slots: // Protected slots - /** - * Is called when the return key was presed in the textbox. - */ - void slotReturnPressed(); - - void slotClearRef(); - - void slotUpdateLock(); - void slotUpdateUnlock(); - void slotBookChange(int); - void slotChapterChange(int); - void slotVerseChange(int); - -private: - friend class CLexiconKeyChooser; - QHBoxLayout *m_mainLayout; - CKeyReferenceLineEdit *m_textbox; - CSwordVerseKey *m_key; - CScrollerWidgetSet *m_bookScroller; - CScrollerWidgetSet *m_chapterScroller; - CScrollerWidgetSet *m_verseScroller; - bool updatelock; - QString oldKey; - CSwordBibleModuleInfo *m_module; -}; - -#endif diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp deleted file mode 100644 index ff55602..0000000 --- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp +++ /dev/null @@ -1,176 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "clexiconkeychooser.h" -#include "ckeychooserwidget.h" -#include "cscrollbutton.h" - -#include "backend/cswordlexiconmoduleinfo.h" -#include "frontend/cbtconfig.h" - -#include "util/cresmgr.h" - -//STL headers -#include <algorithm> -#include <iterator> -#include <map> - -//Qt includes -#include <qcombobox.h> -#include <qlayout.h> -#include <qlistbox.h> - -//KDE includes -#include <klocale.h> - -CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name ) -: CKeyChooser(modules, key, parent, name), -m_key(dynamic_cast<CSwordLDKey*>(key)) { - - setModules(modules, false); - - //we use a layout because the key chooser should be resized to full size - m_layout = new QHBoxLayout(this, QBoxLayout::LeftToRight); - m_layout->setResizeMode(QLayout::FreeResize); - - m_widget = new CKeyChooserWidget(0, false, this); - - //don't allow a too high width, try to keep as narrow as possible - //to aid users with smaller screen resolutions - m_widget->comboBox()->setMaximumWidth(200); - - m_widget->setToolTips( - CResMgr::displaywindows::lexiconWindow::entryList::tooltip, - CResMgr::displaywindows::lexiconWindow::nextEntry::tooltip, - CResMgr::displaywindows::general::scrollButton::tooltip, - CResMgr::displaywindows::lexiconWindow::previousEntry::tooltip - ); - - m_layout->addWidget(m_widget,0,Qt::AlignLeft); - - connect(m_widget,SIGNAL(changed(int)),SLOT(activated(int))); - connect(m_widget,SIGNAL(focusOut(int)),SLOT(activated(int))); - - setModules(modules, true); - setKey(key); -} - -CSwordKey* const CLexiconKeyChooser::key() { - // qWarning("key"); - return m_key; -} - -void CLexiconKeyChooser::setKey(CSwordKey* key) { - if (!(m_key = dynamic_cast<CSwordLDKey*>(key))) { - return; - } - - // qWarning("setKey start"); - QString newKey = m_key->key(); - const int index = m_widget->comboBox()->listBox()->index(m_widget->comboBox()->listBox()->findItem( newKey )); - m_widget->comboBox()->setCurrentItem(index); - - // qWarning("setKey end"); - emit keyChanged( m_key ); -} - -void CLexiconKeyChooser::activated(int index) { - // qWarning("activated"); - const QString text = m_widget->comboBox()->text(index); - - // To prevent from eternal loop, because activated() is emitted again - if (m_key && m_key->key() != text) { - m_key->key(text); - setKey(m_key); - } - // qWarning("activated end"); -} - -inline const bool my_cmpEntries(const QString& a, const QString& b) { - return a < b; -}; - -/** Reimplementation. */ -void CLexiconKeyChooser::refreshContent() { - if (m_modules.count() == 1) { - m_widget->reset(m_modules.first()->entries(), 0, true); - // qWarning("resetted"); - } - else { - typedef std::multimap<unsigned int, QStringList*> EntryMap; - EntryMap entryMap; - QStringList* entries = 0; - for (m_modules.first(); m_modules.current(); m_modules.next()) { - entries = m_modules.current()->entries(); - entryMap.insert( std::make_pair(entries->count(), entries) ); - } - - QStringList goodEntries; //The string list which contains the entries which are available in all modules - - EntryMap::iterator it = entryMap.begin(); //iterator to go thoigh all selected modules - QStringList refEntries = *(it->second); //copy the items for the first time - QStringList* cmpEntries = ( ++it )->second; //list for comparision, starts with the second module in the map - - while(it != entryMap.end()) { - std::set_intersection( - refEntries.begin(), --(refEntries.end()), //--end() is the last valid entry - cmpEntries->begin(), --(cmpEntries->end()), - std::back_inserter(goodEntries), //append valid entries to the end of goodEntries - my_cmpEntries //ci_cmpEntries is the comparision function - ); - - cmpEntries = ( ++it )->second; //this is a pointer to the string list of a new module - - /* - * use the good entries for next comparision, - * because the final list can only have the entries of goodEntries as maxiumum - */ - refEntries = goodEntries; - }; - - m_widget->reset(goodEntries, 0, true); //write down the entries - } //end of ELSE - - //make sure the list sorted - /* This is not the best solution, module()->entries() should be sorted already */ - // Q_ASSERT(m_widget->comboBox()->listBox()); - // m_widget->comboBox()->listBox()->sort(); -} - -/** No descriptions */ -void CLexiconKeyChooser::adjustFont() { - // //Make sure the entries are displayed correctly. - // m_widget->comboBox()->setFont( CBTConfig::get( m_modules.first()->language() ).second ); -} - -/** Sets the module and refreshes the combo boxes */ -void CLexiconKeyChooser::setModules( const ListCSwordModuleInfo& modules, const bool refresh ) { - Q_ASSERT(!m_modules.autoDelete()); - m_modules.clear(); - Q_ASSERT(!m_modules.autoDelete()); - - // for (modules.first(); modules.current(); modules.next()) { - ListCSwordModuleInfo::const_iterator end_it = modules.end(); - for (ListCSwordModuleInfo::const_iterator it(modules.begin()); it != end_it; ++it) { - CSwordLexiconModuleInfo* lexicon = dynamic_cast<CSwordLexiconModuleInfo*>(*it); - if (lexicon) { - m_modules.append(lexicon); - } - } - - if (refresh) { - refreshContent(); - // adjustFont(); - } -} - -/** No descriptions */ -void CLexiconKeyChooser::updateKey(CSwordKey*) {} diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.h b/bibletime/frontend/keychooser/clexiconkeychooser.h deleted file mode 100644 index 10283eb..0000000 --- a/bibletime/frontend/keychooser/clexiconkeychooser.h +++ /dev/null @@ -1,79 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CLEXICONKEYCHOOSER_H -#define CLEXICONKEYCHOOSER_H - -#include <qwidget.h> -#include "ckeychooser.h" -#include "backend/cswordldkey.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordlexiconmoduleinfo.h" - -class CKeyChooserWidget; -class QHBoxLayout; - -/** - * This class implements the KeyChooser for lexicons - * - * it inhertits @ref CKeyChooser - * it uses 1 @ref CKeyChooserWidget to represent the lexicon keys - * - * @author The BibleTime team - */ -class CLexiconKeyChooser : public CKeyChooser { - Q_OBJECT -public: - /** - * The constructor - * - * you should not need to use this, use @ref CKeyChooser::createInstance instead - */ - CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); - -public slots: - /** - * see @ref CKeyChooser::getKey - * @return Return the key object we use. - */ - virtual CSwordKey* const key(); - /** - * see @ref CKeyChooser::setKey - */ - virtual void setKey(CSwordKey* key); - /** - * used to react to changes in the @ref CKeyChooserWidget - * - * @param index not used - **/ - virtual void activated(int index); - /** - * Reimplementatuion. - */ - virtual void refreshContent(); - /** - * Sets the module and refreshes the combo boxes of this keychooser. - */ - virtual void setModules( const ListCSwordModuleInfo& modules, const bool refresh = true ); - -protected: - CKeyChooserWidget *m_widget; - CSwordLDKey* m_key; - QPtrList<CSwordLexiconModuleInfo> m_modules; - QHBoxLayout *m_layout; - - virtual void adjustFont(); - -public slots: // Public slots - virtual void updateKey(CSwordKey* key); -}; - -#endif diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp deleted file mode 100644 index e0c0552..0000000 --- a/bibletime/frontend/keychooser/crefselectdialog.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "crefselectdialog.h" - -// QT -#include "qlayout.h" -#include "qlineedit.h" -#include "qlabel.h" - -// backend -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" - -//KDE includes -#include <klocale.h> - - -//CRefSelectDialog::CRefSelectDialog(QWidget *parent) -// : KDialogBase(parent, "Refenences", -// true, i18n("Refenence selector"), -// KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), -// m_oldPos(0,0) -// -//{ -// m_page = new QWidget( this ); -// m_placeholder = new QWidget( m_page); -// QVBoxLayout* layout = new QVBoxLayout( m_page, 0, spacingHint()); -// m_lineedit = new QLineEdit( QString::null, m_page, "select" ); -// m_lineedit->setMinimumWidth(fontMetrics().maxWidth()*8); -// -// QHBoxLayout* hlayout = new QHBoxLayout(m_page, 0, spacingHint()); -// hlayout->addWidget(new QLabel(i18n("Verse key:"), m_page)); -// hlayout->addWidget(m_lineedit); -// layout->addItem(hlayout); -// layout->addWidget(m_placeholder); -// -// m_chooser = NULL; -// m_oldParent = NULL; -// setMainWidget(m_page); -// -// connect(this, SIGNAL(okClicked()), SLOT(slotPressedOk())); -// connect(this, SIGNAL(cancelClicked()), SLOT(slotPressedCancel())); -//} -// -//CRefSelectDialog::~CRefSelectDialog() { -//} -// -// -//void CRefSelectDialog::setChooser(CKeyChooser* const chooser) { -// if (chooser && chooser != m_chooser) { -// if (m_chooser) restoreParent(); -// -// m_chooser = chooser; -// -// // store old owner and position -// m_oldParent = chooser->parentWidget(false); -// m_oldPos = chooser->pos(); -// -// // we temporary borrow chooser widget from the MDI window -// m_placeholder->setMinimumSize(chooser->size()); -// chooser->reparent(m_placeholder, QPoint(0,0), true); -// } -//} -// -//void CRefSelectDialog::slotPressedOk() { -// // go to proper key -// CSwordKey* key = m_chooser->key(); -// key->key(m_lineedit->text()); -// m_chooser->setKey(key); -// -// // restore parent of stolen widget -// restoreParent(); -//} -// -//void CRefSelectDialog::slotPressedCancel() { -// // restore parent of stolen widget -// restoreParent(); -//} -// -//void CRefSelectDialog::restoreParent() { -// if (m_chooser && m_oldParent) { -// m_chooser->reparent(m_oldParent, m_oldPos, true); -// } -// m_chooser = NULL; -//} - - - - - - diff --git a/bibletime/frontend/keychooser/crefselectdialog.h b/bibletime/frontend/keychooser/crefselectdialog.h deleted file mode 100644 index 3d78ffe..0000000 --- a/bibletime/frontend/keychooser/crefselectdialog.h +++ /dev/null @@ -1,56 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CREFSELECTDIALOG_H -#define CREFSELECTDIALOG_H -//Qt includes -#include <qwidget.h> -#include <qstring.h> -class QLineEdit; - -//KDE includes -#include <kdialog.h> -#include <kdialogbase.h> - - -// BT includes -#include "ckeychooser.h" - -//class CRefSelectDialog : public KDialogBase { -// Q_OBJECT -// public: -// CRefSelectDialog(QWidget *parent); -// virtual ~CRefSelectDialog(); -// -// void setChooser(CKeyChooser* const chooser); -// -// public slots: -// void slotPressedOk(); -// void slotPressedCancel(); -// -// -// protected: -// void restoreParent(); -// -// private: -// QWidget* m_page; -// QWidget* m_placeholder; -// QWidget* m_oldParent; -// CKeyChooser* m_chooser; -// QLineEdit* m_lineedit; -// QPoint m_oldPos; -//}; -#endif - - - - - diff --git a/bibletime/frontend/keychooser/cscrollbutton.cpp b/bibletime/frontend/keychooser/cscrollbutton.cpp deleted file mode 100644 index c9952cc..0000000 --- a/bibletime/frontend/keychooser/cscrollbutton.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cscrollbutton.h" - -#include "frontend/cbtconfig.h" - -#include <stdlib.h> -#include <math.h> - -//Qt includes -#include <qevent.h> -#include <qapplication.h> -#include <qcursor.h> - -CScrollButton::CScrollButton(QWidget *parent, const char *name ) : QToolButton(parent,name) { - setFocusPolicy(QWidget::WheelFocus); - setCursor( splitVCursor ); - - m_isLocked = false; - connect(this, SIGNAL(pressed() ), SLOT(was_pressed() )); - connect(this, SIGNAL(released()), SLOT(was_released())); -} - -const bool CScrollButton::isLocked( ) const { - return m_isLocked; -} - -void CScrollButton::was_pressed( ) { - QApplication::setOverrideCursor( BlankCursor ); - m_isLocked = true; - lock_Point = get_lock_Point(); - - emit lock() - ; -} - -void CScrollButton::was_released( ) { - QApplication::restoreOverrideCursor(); - m_isLocked = false; - - emit unlock(); -} - -const QPoint CScrollButton::get_lock_Point() const { - return mapToGlobal( QPoint( width()/2, height()/2 ) ); -} - -void CScrollButton::mouseMoveEvent( QMouseEvent* e ) { - if (m_isLocked) { - int vchange = (QCursor::pos().y() - lock_Point.y()); - - if (abs(vchange) < 10) { - vchange = (int)((vchange>0 ? 1 : -1) * pow(abs(vchange), 0.3)); - } - else if (abs(vchange) < 30) { - vchange = (int)((vchange>0 ? 1 : -1) * pow(abs(vchange), 0.6)); - } - else if (abs(vchange) < 40) { - vchange = (int)((vchange>0 ? 1 : -1) * pow(abs(vchange), 1.2)); - } - else { - vchange = (int)((vchange>0 ? 1 : -1) * pow(abs(vchange), 2.0)); - } - - if (vchange) { //not emit 0 - emit change_requested( vchange ); - } - - QCursor::setPos( lock_Point ); - } - else { - QToolButton::mouseMoveEvent(e); - } -} - - - -/** If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is scrolled like the mouse was pressed and moved. */ -void CScrollButton::wheelEvent( QWheelEvent* e ) { - /** - * The problem is, that wheel events do everytime have the delta value 120 - */ - const int vchange = ((e->delta() > 0) ? (1) : (-1)); - - if (vchange!=0) {//do not emit a change with value 0 - emit change_requested( vchange ); - e->accept(); - } - else { - e->ignore(); - } -} diff --git a/bibletime/frontend/keychooser/cscrollbutton.h b/bibletime/frontend/keychooser/cscrollbutton.h deleted file mode 100644 index bd6e900..0000000 --- a/bibletime/frontend/keychooser/cscrollbutton.h +++ /dev/null @@ -1,86 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSRCOLLBUTTON_H -#define CSRCOLLBUTTON_H - -#include <qwidget.h> -#include <qtoolbutton.h> - -class QMouseEvent; - -/** This Class implements the direct chooser button used in the KeyChooser Widget - * @author The BibleTime team - */ -class CScrollButton : public QToolButton { - Q_OBJECT -public: - /** - * The constructor - */ - CScrollButton(QWidget *parent=0, const char *name=0); - const bool isLocked() const; - -signals: - /** - * is emitted when the button enters locked state - */ - void lock() - ; - /** - * is emitted when the button leaves locked state - */ - void unlock(); - /** - * indicates a change the user made by moving the mouse - * @param count the number of items to be changed in the KeyChooser ComboBox - */ - void change_requested(int count); - -protected slots: - /* - * used to process the button press events - */ - void was_pressed(); - /** - * used to process the button release events - */ - void was_released(); - -protected: - /** - * Reimplementation from @ref QWidget#mouseMoveEvent - processes - * the mouse move events - */ - virtual void mouseMoveEvent( QMouseEvent* e ); - /** - * used to find the lock point - the middle of the button - * @return the lock point - */ - const QPoint get_lock_Point() const; - /** - * If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is - * scrolled like the mouse was pressed and moved. - */ - virtual void wheelEvent( QWheelEvent* e ); - -private: - /** - * Indicates whether the button is in locked state or not - */ - bool m_isLocked; - /** - * stores the lock point - */ - QPoint lock_Point; -}; - -#endif diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp deleted file mode 100644 index dd4201b..0000000 --- a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - -//BibleTime includes -#include "cscrollbutton.h" -#include "cscrollerwidgetset.h" - -//BibleTime frontend includes -#include "frontend/cbtconfig.h" - -//Qt includes -#include <qlineedit.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qlistbox.h> -#include <qtoolbutton.h> -#include <qevent.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qrect.h> -#include <qlayout.h> - -const unsigned int WIDTH = 16; -const unsigned int ARROW_HEIGHT = 12; -const unsigned int MOVER_HEIGHT = 6; - -CScrollerWidgetSet::CScrollerWidgetSet(QWidget *parent, const char *name) : QWidget(parent,name) { - m_layout = new QVBoxLayout(this); - m_layout->setAlignment(Qt::AlignHCenter | Qt::AlignCenter); - - //setAlignment(Qt::AlignHCenter | Qt::AlignCenter); - - btn_up = new QToolButton( UpArrow, this, "btn_up" ); - btn_up->setFixedSize(WIDTH, ARROW_HEIGHT); - btn_up->setFocusPolicy(QWidget::NoFocus); - - btn_fx = new CScrollButton( this, "btn_fx" ); - btn_fx->setFixedSize(WIDTH, MOVER_HEIGHT); - btn_fx->setFocusPolicy(QWidget::NoFocus); - - btn_down = new QToolButton( DownArrow, this, "btn_down" ); - btn_down->setFixedSize(WIDTH, ARROW_HEIGHT); - btn_down->setFocusPolicy(QWidget::NoFocus); - m_layout->addWidget( btn_up,0 ); - m_layout->addWidget( btn_fx,0 ); - m_layout->addWidget( btn_down,0 ); - setMinimumWidth(WIDTH+4); // Kludge to add some spacing but seems to work. - - connect(btn_fx, SIGNAL(lock()), SLOT(slotLock())); - connect(btn_fx, SIGNAL(unlock()), SLOT(slotUnlock())); - connect(btn_fx, SIGNAL(change_requested(int)), SLOT(slotScroller(int))); - connect(btn_up, SIGNAL(clicked()), SLOT(slotUpClick())); - connect(btn_down, SIGNAL(clicked()), SLOT(slotDownClick())); -} - -/** Sets the tooltips for the given entries using the parameters as text. */ -void CScrollerWidgetSet::setToolTips( const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip) { - QToolTip::add (btn_fx, scrollButtonTip); - QToolTip::add (btn_down, nextEntryTip); - QToolTip::add (btn_up, previousEntryTip); -} - -void CScrollerWidgetSet::slotLock() { emit scroller_pressed(); } -void CScrollerWidgetSet::slotUnlock() { emit scroller_released(); } -void CScrollerWidgetSet::slotScroller(int n) { emit change(n); } -void CScrollerWidgetSet::slotUpClick() { slotScroller(-1); } -void CScrollerWidgetSet::slotDownClick() { slotScroller(1); } diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.h b/bibletime/frontend/keychooser/cscrollerwidgetset.h deleted file mode 100644 index dd3e6d8..0000000 --- a/bibletime/frontend/keychooser/cscrollerwidgetset.h +++ /dev/null @@ -1,72 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSCROLLERWIDGETSET_H -#define CSCROLLERWIDGETSET_H - -#include <qwidget.h> -#include <qmap.h> -#include <qstringlist.h> -#include <qlayout.h> -#include <qlayout.h> - -#include <kcombobox.h> -#include "cscrollbutton.h" - -/** - * This class implements the Scroller Widget-set, which - * consists of two normal ref @QToolButton and a enhanced @ref CScrollButton - * - * @author The BibleTime team - */ -class CScrollerWidgetSet : public QWidget { - Q_OBJECT -public: - /** - * the constructor - */ - CScrollerWidgetSet(QWidget *parent=0, const char *name=0); - /** - * Sets the tooltips for the given entries using the parameters as text. - */ - void setToolTips( const QString nextEntry, const QString scrollButton, const QString previousEntry); - -signals: - /** - * is emitted to proceed to some other entry relative to the - * current, indicated by the int value - */ - void change(int count); - - /** - * These emit when the scroll button is pressed or released - */ - void scroller_pressed(); - void scroller_released(); - -protected: - QToolButton* btn_up; - QToolButton* btn_down; - CScrollButton* btn_fx; - -protected slots: - void slotLock(); - void slotUnlock(); - void slotUpClick(); - void slotDownClick(); - void slotScroller(int); - -private: - QVBoxLayout *m_layout; - -}; - -#endif diff --git a/bibletime/frontend/kstartuplogo.cpp b/bibletime/frontend/kstartuplogo.cpp deleted file mode 100644 index 62c01e9..0000000 --- a/bibletime/frontend/kstartuplogo.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//Own includes -#include "kstartuplogo.h" - -//Qt includes -#include <qapplication.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> - -//KDE includes -#include <kapplication.h> -#include <kstandarddirs.h> -//#include <kimageio.h> - -//static objects -KStartupLogo* KStartupLogo::startupLogo = 0; - -void KStartupLogo::createSplash() { - deleteSplash(); - startupLogo = new KStartupLogo(); -} - -void KStartupLogo::showSplash() { - if (KStartupLogo::startupLogo) { - KStartupLogo::startupLogo->show(); - } -} - -void KStartupLogo::hideSplash() { - if (startupLogo) { - startupLogo->hide(); - } -} - -void KStartupLogo::deleteSplash() { - delete startupLogo; - startupLogo = 0; -} - - -void KStartupLogo::setStatusMessage(const QString& message) { - if (startupLogo) { - startupLogo->setText(message); - } -} - -KStartupLogo::KStartupLogo() -: QWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) { - - QPixmap pm; - if ( !pm.load(locate("BT_pic","startuplogo.png")) ) { - qWarning("Can't load startuplogo! Check your installation."); - } - - setBackgroundPixmap(pm); - - //Please not change the margin - textLabel = new QLabel(this); - textLabel->setGeometry(0,pm.height(),pm.width(),textLabel->sizeHint().height()+10); - textLabel->setBackgroundColor( QColor("#0d6de9") ); - textLabel->setFrameStyle(QFrame::Panel | QFrame::Plain); - textLabel->setLineWidth(1); - textLabel->setScaledContents( true ); - - QFont f; - f.setBold( true ); - textLabel->setFont( f ); - - QPalette p = palette(); - p.setColor( QPalette::Inactive, QColorGroup::Text, Qt::white ); - p.setColor( QPalette::Inactive, QColorGroup::Foreground, Qt::white ); - p.setColor( QPalette::Normal, QColorGroup::Text, Qt::white ); - p.setColor( QPalette::Normal, QColorGroup::Foreground, Qt::white ); - setPalette( p ); - - setGeometry ( - (KApplication::desktop()->width()-pm.width())/2, - (KApplication::desktop()->height()-pm.height()-textLabel->height())/2, - pm.width(), - pm.height()+textLabel->height() - ); -} - -void KStartupLogo::setText(const QString text) { - //Please not make the text bold & let the first character be blank - textLabel->setText( QString::fromLatin1(" %1").arg(text) ); - KApplication::kApplication()->processEvents(); -} - -/** Makes the splashscreen the toplevel window. */ -void KStartupLogo::raiseSplash() { - if (startupLogo) { - startupLogo->raise(); - startupLogo->setActiveWindow(); - startupLogo->textLabel->show(); - } -} - -/** Lowers the splash screen one window down, so it's possible to make it not to hide tip windows or other startup stuff. */ -void KStartupLogo::lowerSplash() { - if (startupLogo) { - startupLogo->lower(); - } -} diff --git a/bibletime/frontend/kstartuplogo.h b/bibletime/frontend/kstartuplogo.h deleted file mode 100644 index d1a7af0..0000000 --- a/bibletime/frontend/kstartuplogo.h +++ /dev/null @@ -1,66 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef KSTARTUPLOGO_H -#define KSTARTUPLOGO_H - -#include <qwidget.h> - -//class forward declarations -class QLabel; - -/** - * This class provides a startuplogo. - * - * @author The team of BibleTime - */ -class KStartupLogo : public QWidget { -public: - /** - * Create the splash screen and show it on the screen. - * Use hideSplash, raiseSplash and lowerSplash() to control the visibility on screen. - */ - static void createSplash(); - /** - * Show the splash screen on the users desktop. - */ - static void showSplash(); - /** - * Hides the splash screen. - */ - static void hideSplash(); - /** - * Delete the splash screen if it exists. - */ - static void deleteSplash(); - /** - * Sets the text status message in the splash screen. - */ - static void setStatusMessage(const QString& message); - /** - * Makes the splashscreen the toplevel window. - */ - static void raiseSplash(); - /** - * Lowers the splash screen one window down, - * so it's possible to make it not to hide tip windows or other startup stuff. - */ - static void lowerSplash(); - -private: - KStartupLogo(); - void setText(const QString text); - QLabel* textLabel; - - static KStartupLogo* startupLogo; -}; - -#endif diff --git a/bibletime/frontend/mainindex/Makefile.am b/bibletime/frontend/mainindex/Makefile.am deleted file mode 100644 index e79b5b8..0000000 --- a/bibletime/frontend/mainindex/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDES = $(all_includes) -libmainindex_a_METASOURCES = AUTO -noinst_LIBRARIES = libmainindex.a - -libmainindex_a_SOURCES = \ -cmainindex.cpp \ -cindexitem.cpp - -all_headers = \ -cmainindex.h \ -cindexitem.h - -EXTRA_DIST = $(libmainindex_a_SOURCES) $(all_headers) - - - - - diff --git a/bibletime/frontend/mainindex/Makefile.in b/bibletime/frontend/mainindex/Makefile.in deleted file mode 100644 index 8f099fb..0000000 --- a/bibletime/frontend/mainindex/Makefile.in +++ /dev/null @@ -1,724 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/frontend/mainindex -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libmainindex_a_AR = $(AR) $(ARFLAGS) -libmainindex_a_LIBADD = -am_libmainindex_a_OBJECTS = cmainindex.$(OBJEXT) cindexitem.$(OBJEXT) -#>- libmainindex_a_OBJECTS = $(am_libmainindex_a_OBJECTS) -#>+ 5 -libmainindex_a_final_OBJECTS = libmainindex_a.all_cpp.o -libmainindex_a_nofinal_OBJECTS = cmainindex.$(OBJEXT) cindexitem.$(OBJEXT)\ -cmainindex.moc.o -@KDE_USE_FINAL_FALSE@libmainindex_a_OBJECTS = $(libmainindex_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libmainindex_a_OBJECTS = $(libmainindex_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libmainindex_a_SOURCES) -DIST_SOURCES = $(libmainindex_a_SOURCES) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libmainindex_a_METASOURCES = AUTO -noinst_LIBRARIES = libmainindex.a -libmainindex_a_SOURCES = \ -cmainindex.cpp \ -cindexitem.cpp - -all_headers = \ -cmainindex.h \ -cindexitem.h - -EXTRA_DIST = $(libmainindex_a_SOURCES) $(all_headers) -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/mainindex/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/frontend/mainindex/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/mainindex/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/mainindex/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/mainindex/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libmainindex.a: $(libmainindex_a_OBJECTS) $(libmainindex_a_DEPENDENCIES) - -rm -f libmainindex.a - $(libmainindex_a_AR) libmainindex.a $(libmainindex_a_OBJECTS) $(libmainindex_a_LIBADD) - $(RANLIB) libmainindex.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cindexitem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmainindex.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-metasources clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 3 -cmainindex.moc.cpp: $(srcdir)/cmainindex.h - $(MOC) $(srcdir)/cmainindex.h -o cmainindex.moc.cpp - -#>+ 2 -mocs: cmainindex.moc.cpp - -#>+ 3 -clean-metasources: - -rm -f cmainindex.moc.cpp - -#>+ 2 -KDE_DIST=cmainindex.h Makefile.in cindexitem.h Makefile.am - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/mainindex/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/mainindex/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/mainindex/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libmainindex_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cmainindex.cpp $(srcdir)/cindexitem.cpp cmainindex.moc.cpp - @echo 'creating libmainindex_a.all_cpp.cpp ...'; \ - rm -f libmainindex_a.all_cpp.files libmainindex_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libmainindex_a.all_cpp.final; \ - for file in cmainindex.cpp cindexitem.cpp cmainindex.moc.cpp ; do \ - echo "#include \"$$file\"" >> libmainindex_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libmainindex_a.all_cpp.final; \ - done; \ - cat libmainindex_a.all_cpp.final libmainindex_a.all_cpp.files > libmainindex_a.all_cpp.cpp; \ - rm -f libmainindex_a.all_cpp.final libmainindex_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libmainindex_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp deleted file mode 100644 index 4896e1b..0000000 --- a/bibletime/frontend/mainindex/cindexitem.cpp +++ /dev/null @@ -1,1228 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cindexitem.h" -#include "cmainindex.h" - -#include "backend/creferencemanager.h" -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" -#include "backend/clanguagemgr.h" - -#include "frontend/searchdialog/csearchdialog.h" -#include "frontend/cexportmanager.h" -#include "frontend/cbtconfig.h" -#include "frontend/cinputdialog.h" -#include "frontend/cexportmanager.h" -#include "frontend/cdragdropmgr.h" -#include "frontend/cprinter.h" - -#include "util/cresmgr.h" -#include "util/scoped_resource.h" -#include "util/ctoolclass.h" - -#include <string.h> - -//Qt includes -#include <qdragobject.h> -#include <qstringlist.h> -#include <qfile.h> -#include <qstring.h> -#include <qtextstream.h> - -//KDE includes -#include <kconfig.h> -#include <klocale.h> -#include <kfiledialog.h> -#include <kiconloader.h> -#include <kstandarddirs.h> - -#define CURRENT_SYNTAX_VERSION 1 - -using namespace Printing; -using std::string; - -CItemBase::CItemBase(CMainIndex* mainIndex, const Type type) -: KListViewItem(mainIndex), -m_type(type), -m_sortingEnabled(true) {} - -CItemBase::CItemBase(CItemBase* parentItem, const Type type) -: KListViewItem(parentItem), -m_type(type), -m_sortingEnabled(true) {} - -CItemBase::~CItemBase() {} - -const QString CItemBase::toolTip() { - return QString::null; -} - -/** Returns the used main index. */ -CMainIndex* CItemBase::listView() const { - return dynamic_cast<CMainIndex*>( QListViewItem::listView() ); -} - -void CItemBase::init() { - update(); -} - -void CItemBase::update() {} - -const CItemBase::Type& CItemBase::type() const { - return m_type; -}; - -void CItemBase::moveAfter( CItemBase* const item ) { - if (!item) - return; - - if ( parent() == item->parent() ) { //same parent means level - moveItem(item); //both items are on the same level, so we can use moveItem - } -} - -/** Returns true if the given action should be enabled in the popup menu. */ -const bool CItemBase::enableAction( const MenuAction /*action*/ ) { - return false; //this base class has no valif actions -} - -/** No descriptions */ -const bool CItemBase::isMovable() { - return false; -} - -const bool CItemBase::allowAutoOpen( const QMimeSource* ) const { - return false; -}; - -/** This function engables or disables sorting depending on the parameter. */ -void CItemBase::setSortingEnabled( const bool& enableSort ) { - m_sortingEnabled = enableSort; -} - -/** Returns true whether the sorting is enabled or not. */ -const bool CItemBase::isSortingEnabled() { - return m_sortingEnabled; -} - -/** Reimplementation which takes care of the our sortingEnabled setting. */ -void CItemBase::sortChildItems( int col, bool asc ) { - if (!isSortingEnabled()) { - return; - } - else { - KListViewItem::sortChildItems( col, asc ); - } -} - -/** Reimplementation which takes care of the our sortingEnabled setting. */ -void CItemBase::sort() { - if (!isSortingEnabled()) { - return; - } - else { - KListViewItem::sort(); - } -} - -/* ---------------------------------------------- */ -/* ---------- new class: CModuleItem ------------ */ -/* ---------------------------------------------- */ - -CModuleItem::CModuleItem(CTreeFolder* parentItem, CSwordModuleInfo* module) : CItemBase(parentItem), m_module(module) {} - -CModuleItem::~CModuleItem() {} - -/** No descriptions */ -void CModuleItem::update() { - if (m_module) { - setPixmap(0, CToolClass::getIconForModule(m_module)); - setText(0,m_module->name() ); - } -} - -void CModuleItem::init() { - setDragEnabled(false); - setDropEnabled(true); - - update(); -} - - -/** Reimplementation to handle text drops on a module. In this case open the searchdialog. In the case of a referebnce open the module at the given position. */ -bool CModuleItem::acceptDrop( const QMimeSource* src ) const { - if (CDragDropMgr::canDecode(src)) { - if (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark) { - CDragDropMgr::Item item = CDragDropMgr::decode(src).first(); - CSwordModuleInfo* m = CPointers::backend()->findModuleByName( item.bookmarkModule() ); - if (m && (module()->type() == m->type())) { //it makes only sense - return true; - } - //but we also allow drops from bibles on commentaries and the other way from commentaries - else if (m && (module()->type() == CSwordModuleInfo::Bible) && (m->type() == CSwordModuleInfo::Commentary)) { - return true; - } - else if (m && (module()->type() == CSwordModuleInfo::Commentary) && (m->type() == CSwordModuleInfo::Bible)) { - return true; - } - } - else if(CDragDropMgr::dndType(src) == CDragDropMgr::Item::Text) { //text drop on a module - return true; - }; - } - return false; //default return value -} - -/** No descriptions */ -void CModuleItem::dropped( QDropEvent* e, QListViewItem* /*after*/) { - /* Something was dropped on a module item - * - * 1. If the drop type is plain text open the searchdialog for this text and start the search - * 2. If the type is Bookmark, open the module at the specified position - * - * We support only the first drop item, more is not useful - */ - - if (acceptDrop(e)) { - CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e); - CDragDropMgr::Item item = dndItems.first(); - if (CDragDropMgr::dndType(e) == CDragDropMgr::Item::Text) { //open the searchdialog - // qWarning("Text dropped!"); - if ( module() ) { - ListCSwordModuleInfo modules; - modules.append(module()); - - Search::CSearchDialog::openDialog(modules, item.text()); - } - } - else if (CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) { //open the module - CSwordModuleInfo* m = CPointers::backend()->findModuleByName( item.bookmarkModule() ); - if (m) { //it makes only sense to create a new window for a module with the same type - if ((module()->type() == m->type()) || - ((module()->type() == CSwordModuleInfo::Bible || module()->type() == CSwordModuleInfo::Commentary) - && (m->type() == CSwordModuleInfo::Bible || m->type() == CSwordModuleInfo::Commentary))) { //same base type of module - ListCSwordModuleInfo modules; - modules.append(module()); - - listView()->emitModulesChosen(modules, item.bookmarkKey()); - }; - } - } - }; -} - - -/** Reimplementation. */ -const QString CModuleItem::toolTip() { - return CToolClass::moduleToolTip(module()); -} - -/** Returns the used module. */ -CSwordModuleInfo* const CModuleItem::module() const { - return m_module; -} - -/** Reimplementation from CItemBase. */ -const bool CModuleItem::enableAction( const MenuAction action ) { - if (action == EditModule) { - if (!module()) - return false; - return module()->isWritable(); - } - - if (action == SearchInModules || action == AboutModule) - return true; - if (module()->isEncrypted() && action == UnlockModule) - return true; - return false; -} - -/* ----------------------------------------------*/ -/* ---------- new class: CBookmarkItem ------------*/ -/* ----------------------------------------------*/ - -CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description) -: CItemBase(parentItem), -m_description(description), -m_moduleName(module ? module->name() : QString::null) { - if ((module && (module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary)) ) { - CSwordVerseKey vk(0); - vk = key; - vk.setLocale("en"); - m_key = vk.key(); //the m_key member is always the english key! - } - else { - m_key = key; - }; - - m_startupXML = QDomElement(); //empty XML code -} - -CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, QDomElement& xml ) -: CItemBase(parentItem), -m_key(QString::null), -m_description(QString::null), -m_moduleName(QString::null) { - m_startupXML = xml; -} - -CBookmarkItem::~CBookmarkItem() {} - -/** No descriptions */ -void CBookmarkItem::update() { - setMultiLinesEnabled(true); - setPixmap(0,SmallIcon(CResMgr::mainIndex::bookmark::icon,16)); - - const QString title = QString::fromLatin1("%1 (%2)") - .arg(key()) - .arg(module() ? module()->name() : i18n("unknown")); - setText(0, title); -} - -void CBookmarkItem::init() { - if (!m_startupXML.isNull()) { //we have some XML code to parse - loadFromXML(m_startupXML); - } - - update(); - setDropEnabled(false); - setDragEnabled(false); - - // if (!module()) - // setSelectable(false); -} - -/** Reimplementation. */ -const QString CBookmarkItem::toolTip() { - if (!module()) { - return QString::null; - } - - CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(); - filterOptions.footnotes = false; - filterOptions.scriptureReferences = false; - CPointers::backend()->setFilterOptions(filterOptions); - - QString ret; - util::scoped_ptr<CSwordKey> k( CSwordKey::createInstance(module()) ); - k->key(this->key()); - - const CLanguageMgr::Language* lang = module()->language(); - CBTConfig::FontSettingsPair fontPair = CBTConfig::get - (lang); - - Q_ASSERT(k.get()); - if (fontPair.first) { //use a special font - qWarning("using a font, %s", fontPair.second.family().latin1()); - ret = QString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr><font face=\"%4\" size=\"4\">%5</font>") - .arg(key()) - .arg(module()->name()) - .arg(description()) - .arg(fontPair.second.family()) - .arg(k->renderedText()); - } - else { - ret = QString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4") - .arg(key()) - .arg(module()->name()) - .arg(description()) - .arg(k->renderedText()); - } - - return ret; -} - -/** Returns the used module. */ -CSwordModuleInfo* const CBookmarkItem::module() { - CSwordModuleInfo* const m = CPointers::backend()->findModuleByName(m_moduleName); - Q_ASSERT(m); - return m; -} - -/** Returns the used key. */ -const QString CBookmarkItem::key() { - const QString englishKeyName = englishKey(); - if (!module()) { - return englishKeyName; - } - - QString returnKeyName = englishKeyName; - if ((module()->type() == CSwordModuleInfo::Bible) || (module()->type() == CSwordModuleInfo::Commentary)) { - CSwordVerseKey vk(0); - vk = englishKeyName; - vk.setLocale(CPointers::backend()->booknameLanguage().latin1() ); - - returnKeyName = vk.key(); //the returned key is always in the currently set bookname language - } - - return returnKeyName; -} - -/** Returns the used description. */ -const QString& CBookmarkItem::description() { - return m_description; -} - -/** No descriptions */ -const bool CBookmarkItem::isMovable() { - return true; -} - -/** Reimplementation to handle the menu entries of the main index. */ -const bool CBookmarkItem::enableAction(const MenuAction action) { - if (action == ChangeBookmark || (module() && (action == PrintBookmarks)) || action == DeleteEntries) - return true; - - return false; -} - -/** Changes this bookmark. */ -void CBookmarkItem::rename() { - bool ok = false; - const QString newDescription = CInputDialog::getText(i18n("Change description ..."), i18n("Enter a new description for the chosen bookmark."), description(), &ok, listView(), true); - - if (ok) { - m_description = newDescription; - update(); - } -} - -/** Reimplementation of CItemBase::saveToXML. */ -QDomElement CBookmarkItem::saveToXML( QDomDocument& doc ) { - QDomElement elem = doc.createElement("Bookmark"); - - elem.setAttribute("key", englishKey()); - elem.setAttribute("description", description()); - elem.setAttribute("modulename", m_moduleName); - elem.setAttribute("moduledescription", module() ? module()->config(CSwordModuleInfo::Description) : QString::null); - - return elem; -} - -void CBookmarkItem::loadFromXML( QDomElement& element ) { - if (element.isNull()) - return; - - //find the right module - if (element.hasAttribute("modulename")) { - //we use the name in all cases, even if the module isn't installed anymore - m_moduleName = element.attribute("modulename"); - } - - if (element.hasAttribute("key")) { - m_key = element.attribute("key"); - } - - if (element.hasAttribute("description")) { - m_description = element.attribute("description"); - } -} - -/** Returns the english key. */ -const QString& CBookmarkItem::englishKey() const { - return m_key; -} - -/** Reimplementation. Returns false everytime because a bookmarks has not possible drops. */ -bool CBookmarkItem::acceptDrop(const QMimeSource* /*src*/) const { - return false; -} - -/****************************************/ -/***** class: CItemFolder *************/ -/****************************************/ - -CFolderBase::CFolderBase(CMainIndex* mainIndex, const Type type) : CItemBase(mainIndex, type) {} - -CFolderBase::CFolderBase(CFolderBase* parentItem, const Type type) : CItemBase(parentItem, type) {} - -CFolderBase::CFolderBase(CFolderBase* parentFolder, const QString& caption) : CItemBase(parentFolder) { - setText(0, caption); -} - -CFolderBase::~CFolderBase() {} - -const bool CFolderBase::isFolder() { - return true; -} - -void CFolderBase::update() { - CItemBase::update(); - if (isOpen() && childCount()) - setPixmap(0, SmallIcon(CResMgr::mainIndex::openedFolder::icon, 16)); - else - setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); -} - -void CFolderBase::init() { - CItemBase::init(); - setDropEnabled(false); - setDragEnabled(false); -} - -/** No descriptions */ -void CFolderBase::setOpen( bool open ) { - KListViewItem::setOpen(open); - update(); -} - -/** The function which renames this folder. */ -void CFolderBase::rename() { - startRename(0); -} - -/** Creates a new sub folder of this folder. */ -void CFolderBase::newSubFolder() { - if (dynamic_cast<CBookmarkFolder*>(this) || dynamic_cast<Bookmarks::SubFolder*>(this) ) { - Bookmarks::SubFolder* f = new Bookmarks::SubFolder(this, i18n("New folder")); - f->init(); - - listView()->setCurrentItem(f); - listView()->ensureItemVisible(f); - f->rename(); - } -} - -/** Reimplementation. Returns true if the drop is accepted. */ -const bool CFolderBase::allowAutoOpen( const QMimeSource* ) const { - return true; -} - -/** Reimplementation. Returns false because folders have no use for drops (except for the bookmark folders) */ -bool CFolderBase::acceptDrop(const QMimeSource*) const { - return false; -} - -QPtrList<QListViewItem> CFolderBase::getChildList() { - QPtrList<QListViewItem> childs; - if (!childCount()) //no childs available - return childs; - - QListViewItem* i = firstChild(); - while (i && (i->parent() == this)) { - CItemBase* item = dynamic_cast<CItemBase*>(i); - if (item) { //we found a valid item - childs.append(item); - - CFolderBase* folder = dynamic_cast<CFolderBase*>(i); - if (folder) { - QPtrList<QListViewItem> subChilds = folder->getChildList(); - for (QListViewItem* ci = subChilds.first(); ci; ci = subChilds.next()) { - childs.append(ci); - } - } - } - - do { - i = i->nextSibling(); - } - while (i && (i->parent() != this)); - } - - return childs; -} - -/****************************************/ -/***** class: CTreeFolder *************/ -/****************************************/ - - -CTreeFolder::CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language) : CFolderBase(mainIndex, type) { - m_language = language; -} - -CTreeFolder::CTreeFolder(CFolderBase* item, const Type type, const QString& language) : CFolderBase(item, type) { - m_language = language; -} - -CTreeFolder::~CTreeFolder() {} - -void CTreeFolder::addGroup(const Type type, const QString language) { - CTreeFolder* i = 0; - if (type == BookmarkFolder) { - i = new CBookmarkFolder(this); - } - else if (type == OldBookmarkFolder) { - i = new Bookmarks::OldBookmarksFolder(this); - } - else { - i = new CTreeFolder(this, type, language); - } - i->init(); - if (!i->childCount()) - delete i; -} - -void CTreeFolder::addModule(CSwordModuleInfo* const module) { - CModuleItem* i = new CModuleItem(this, module); - i->init(); -} - -void CTreeFolder::addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description) { - CBookmarkItem* i = new CBookmarkItem(this, module, key, description); - i->init(); -} - -void CTreeFolder::update() { - CFolderBase::update(); -} - -void CTreeFolder::init() { - if (language() == "*") { - switch (type()) { - case BibleModuleFolder: - setText(0,i18n("Bibles")); - break; - case CommentaryModuleFolder: - setText(0,i18n("Commentaries")); - break; - case LexiconModuleFolder: - setText(0,i18n("Lexicons")); - break; - case BookModuleFolder: - setText(0,i18n("Books")); - break; - case DevotionalModuleFolder: - setText(0,i18n("Daily devotionals")); - break; - case GlossaryModuleFolder: - setText(0,i18n("Glossaries")); - break; - case BookmarkFolder: - setText(0,i18n("Bookmarks")); - break; - case OldBookmarkFolder: - setText(0,i18n("Old bookmarks")); - break; - default: - setText(0, i18n("Unknown")); - break; - }; - } - else { - const CLanguageMgr::Language* const lang = CPointers::languageMgr()->languageForAbbrev( language() ); - -setText(0, !language().isEmpty() ? ( lang->isValid() ? lang->translatedName() : language()) : i18n("Unknown language")); - } - initTree(); - update(); -} - -void CTreeFolder::initTree() { - // qWarning("CTreeMgr::initTree"); - if (type() == Unknown) - return; - - CSwordModuleInfo::ModuleType moduleType = CSwordModuleInfo::Unknown; - if (type() == BibleModuleFolder) - moduleType = CSwordModuleInfo::Bible; - else if (type() == CommentaryModuleFolder) - moduleType = CSwordModuleInfo::Commentary; - else if (type() == LexiconModuleFolder || type() == GlossaryModuleFolder || type() == DevotionalModuleFolder) - moduleType = CSwordModuleInfo::Lexicon; - else if (type() == BookModuleFolder) - moduleType = CSwordModuleInfo::GenericBook; - - //get all modules by using the given type - ListCSwordModuleInfo allModules =CPointers::backend()->moduleList(); - ListCSwordModuleInfo usedModules; - ListCSwordModuleInfo::iterator end_it = allModules.end(); - for (ListCSwordModuleInfo::iterator it(allModules.begin()); it != end_it; ++it) { - // for (CSwordModuleInfo* m = allModules.first(); m; m = allModules.next()) { - if ((*it)->type() == moduleType) { //found a module, check if the type is correct (devotional etc.) - if (type() == GlossaryModuleFolder && !(*it)->category() == CSwordModuleInfo::Glossary) { //not a gglossary - continue; - } - if (type() == DevotionalModuleFolder && ((*it)->category() != CSwordModuleInfo::DailyDevotional)) {//not a devotional - continue; - } - if (type() == LexiconModuleFolder && ( ((*it)->category() == CSwordModuleInfo::DailyDevotional) || ((*it)->category() == CSwordModuleInfo::Glossary) )) { - //while looking for lexicons glossaries and devotionals shouldn't be used - continue; - } - - if (language() == QString::fromLatin1("*") || (language() != QString::fromLatin1("*") && QString::fromLatin1((*it)->module()->Lang()) == language()) )//right type and language! - usedModules.append(*it); - } - } - - //we have now all modules we want to have - if (language() == QString::fromLatin1("*")) { //create subfolders for each language - QStringList usedLangs; - // for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) { - /*ListCSwordModuleInfo::iterator*/ - end_it = usedModules.end(); - for (ListCSwordModuleInfo::iterator it(usedModules.begin()); it != end_it; ++it) { - QString lang = QString::fromLatin1((*it)->module()->Lang()); - // if (lang.isEmpty()) - // lang = "); - if (!usedLangs.contains(lang)) { - usedLangs.append(lang); - } - } - - //ToDo:: Optimize the loop with const itrs - QStringList::iterator lang_it; - for (lang_it = usedLangs.begin(); lang_it != usedLangs.end(); ++lang_it) { - addGroup(/**lang_it,*/ type(), *lang_it); - } - } - else if (usedModules.count() > 0) { //create subitems with the given type and language - /*ListCSwordModuleInfo::iterator*/ end_it = usedModules.end(); - for (ListCSwordModuleInfo::iterator it(usedModules.begin()); it != end_it; ++it) { - // for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) { - addModule(*it); - } - } - - sortChildItems(0,true); -} - -const QString& CTreeFolder::language() const { - return m_language; -}; - -/* --------------------------------------------------*/ -/* ---------- new class: CBookmarkFolder::SubFolder--*/ -/* --------------------------------------------------*/ - -namespace Bookmarks { - /* --------------------------------------------------------------------------*/ - /* ---------- new class: CBookmarkFolder::OldBookmarkImport -----------------*/ - /* --------------------------------------------------------------------------*/ - const QString OldBookmarkImport::oldBookmarksXML( const QString& configFileName ) { - QString fileName = (configFileName.isEmpty()) ? "bt-groupmanager" : configFileName; - KConfig* config = new KSimpleConfig( fileName ); - - KConfigGroupSaver groupSaver(config, configFileName.isEmpty() ? "Groupmanager" : "Bookmarks"); - - QDomDocument doc("DOC"); - doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - - QDomElement content = doc.createElement("SwordBookmarks"); - content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION); - doc.appendChild(content); - - //first create the bookmark groups in the XML document, then add the bookmarks to each parent - QMap<int, QDomElement> parentMap; //maps parent ids to dom elements - - - QStringList groupList = config->readListEntry("Groups"); - QValueList<int> parentList = config->readIntListEntry("Group parents"); - - QStringList::Iterator it_groups = groupList.begin(); - QValueList<int>::Iterator it_parents = parentList.begin(); - - int parentIDCounter = 0; - while ( (it_groups != groupList.end()) && (it_parents != parentList.end()) ) { - QDomElement parentElement = (*it_parents == -1) ? content : parentMap[*it_parents]; - if (parentElement.isNull()) { - qWarning("EMPTY PARENT FOUND!"); - parentElement = content; - }; - - QDomElement elem = doc.createElement("Folder"); - elem.setAttribute("caption", (*it_groups)); - parentMap.insert(parentIDCounter, elem); - - parentElement.appendChild( elem ); - - - ++it_parents; - ++it_groups; - ++parentIDCounter; - } - - //groups are now read in, create now the bookmarks - parentList = config->readIntListEntry("Bookmark parents"); - QStringList bookmarkList = config->readListEntry("Bookmarks"); - QStringList bookmarkModulesList = config->readListEntry("Bookmark modules"); - QStringList bookmarkDescriptionsList = config->readListEntry("Bookmark descriptions"); - - it_parents = parentList.begin(); - QStringList::Iterator it_bookmarks = bookmarkList.begin(); - QStringList::Iterator it_modules = bookmarkModulesList.begin(); - QStringList::Iterator it_descriptions = bookmarkDescriptionsList.begin(); - - while ( it_bookmarks != bookmarkList.end() - && it_parents != parentList.end() - && it_modules != bookmarkModulesList.end() - ) { - QDomElement parentElement = ((*it_parents) == -1) ? content : parentMap[(*it_parents)]; - if (parentElement.isNull()) { - qWarning("EMPTY PARENT FOUND!"); - parentElement = content; - }; - QDomElement elem = doc.createElement("Bookmark"); - - elem.setAttribute("key", *it_bookmarks); - elem.setAttribute("description", *it_descriptions); - elem.setAttribute("modulename", *it_modules); - - CSwordModuleInfo* m = CPointers::backend()->findModuleByName( *it_modules ); - elem.setAttribute("moduledescription", m ? m->config(CSwordModuleInfo::Description) : QString::null); - - parentElement.appendChild( elem ); - - - ++it_parents; - ++it_modules; - ++it_descriptions; - ++it_bookmarks; - }; - - return doc.toString(); - }; - - /******************** - * New class: OldBookmarkFolder - *********************/ - -OldBookmarksFolder::OldBookmarksFolder(CTreeFolder* folder) : CBookmarkFolder(folder, OldBookmarkFolder) {} - - OldBookmarksFolder::~OldBookmarksFolder() {} - - /** Reimplementation to handle special bookmark tree. */ - void OldBookmarksFolder::initTree() { - // Import the bookmarks of the previous BibleTime versions - if (!CBTConfig::get - ( CBTConfig::readOldBookmarks )) { //if we havn't yet loaded the old bookmarks - loadBookmarksFromXML( Bookmarks::OldBookmarkImport::oldBookmarksXML() ); - } - } - - - QDomElement OldBookmarksFolder::saveToXML( QDomDocument& doc ) { - QDomElement elem = doc.createElement("Folder"); - elem.setAttribute("caption", text(0)); - - // Append the XML nodes of all child items - CItemBase* i = dynamic_cast<CItemBase*>(firstChild()); - while( i ) { - if (i->parent() == this) { - QDomElement newElem = i->saveToXML( doc ); - if (!newElem.isNull()) { - elem.appendChild( newElem ); //append to this folder - } - } - i = dynamic_cast<CItemBase*>( i->nextSibling() ); - } - - // Save to config, that we imported the old bookmarks and that we have them on disk - CBTConfig::set - ( CBTConfig::readOldBookmarks, true ); - - return elem; - } - - void OldBookmarksFolder::loadFromXML( QDomElement& /*element*/ ) { - //this function is empty because the folder imports the old 1.2 bookmarks from the bt-groupmanager config file - } - - - // New class SubFolder - -SubFolder::SubFolder(CFolderBase* parentItem, const QString& caption) : CBookmarkFolder(parentItem, BookmarkFolder) { - m_startupXML = QDomElement(); - setText( 0, caption ); - } - -SubFolder::SubFolder(CFolderBase* parentItem, QDomElement& xml ) : CBookmarkFolder(parentItem, BookmarkFolder) { - m_startupXML = xml; - } - - SubFolder::~SubFolder() {} - - void SubFolder::init() { - CFolderBase::init(); - if (!m_startupXML.isNull()) - loadFromXML(m_startupXML); - - setDropEnabled(true); - setRenameEnabled(0,true); - } - - /** Reimplementation from CItemBase. */ - const bool SubFolder::enableAction(const MenuAction action) { - if (action == ChangeFolder || action == NewFolder || action == DeleteEntries || action == ImportBookmarks ) - return true; - - if (action == ExportBookmarks || action == ImportBookmarks ) - return true; //not yet implemented - - if ((action == PrintBookmarks) && childCount()){ - CPrinter::KeyTree tree; - CPrinter::KeyTreeItem::Settings settings; - - QPtrList<QListViewItem> items = getChildList(); - - //create a tree of keytreeitems using the bookmark hierarchy. - for (items.first(); items.current(); items.next()) { - CBookmarkItem* i = dynamic_cast<CBookmarkItem*>(items.current()); - if (i) { - tree.append( new CPrinter::KeyTreeItem( i->key(), i->module(), settings ) ); - } - } - return tree.collectModules().count() > 0; - } - - return false; - } - - /** Returns the XML code which represents the content of this folder. */ - QDomElement SubFolder::saveToXML( QDomDocument& doc ) { - /** - * Save all subitems (bookmarks and folders) to the XML file. - * We get the XML code for the items by calling their own saveToXML implementations. - */ - QDomElement elem = doc.createElement("Folder"); - elem.setAttribute("caption", text(0)); - - //append the XML nodes of all child items - CItemBase* i = dynamic_cast<CItemBase*>(firstChild()); - while( i ) { - if (i->parent() == this) { - QDomElement newElem = i->saveToXML( doc ); - if (!newElem.isNull()) { - elem.appendChild( newElem ); //append to this folder - } - } - i = dynamic_cast<CItemBase*>( i->nextSibling() ); - } - return elem; - } - - /** Loads the content of this folder from the XML code passed as argument to this function. */ - void SubFolder::loadFromXML( QDomElement& elem ) { - //get the caption and restore all child items! - if (elem.hasAttribute("caption")) - setText(0, elem.attribute("caption")); - - //restore all child items - QDomElement child = elem.firstChild().toElement(); - CItemBase* oldItem = 0; - while ( !child.isNull() && child.parentNode() == elem ) { - CItemBase* i = 0; - if (child.tagName() == "Folder") { - i = new Bookmarks::SubFolder(this, child); - } - else if (child.tagName() == "Bookmark") { - i = new CBookmarkItem(this, child); - } - i->init(); - if (oldItem) - i->moveAfter(oldItem); - oldItem = i; - - child = child.nextSibling().toElement(); - } - } -}; - - -/* --------------------------------------------------*/ -/* ---------- new class: CBookmarkFolder ------------*/ -/* --------------------------------------------------*/ - -CBookmarkFolder::CBookmarkFolder(CMainIndex* mainIndex, const Type type) : CTreeFolder(mainIndex, type, "*") { - setSortingEnabled(false); -} - -CBookmarkFolder::CBookmarkFolder(CFolderBase* parentItem, const Type type) : CTreeFolder(parentItem, type, "*") { - setSortingEnabled(false); -} - -CBookmarkFolder::~CBookmarkFolder() {} - -void CBookmarkFolder::initTree() { - addGroup(OldBookmarkFolder, "*"); - - KStandardDirs stdDirs; - const QString path = stdDirs.saveLocation("data", "bibletime/"); - if (!path.isEmpty()) { - loadBookmarks(path + "bookmarks.xml"); - } -} - -/** Reimplementation. */ -const bool CBookmarkFolder::enableAction(const MenuAction action) { - if ((action == NewFolder) || (action == ImportBookmarks)) - return true; - - if ((action == ExportBookmarks) && childCount()) - return true; - - if ((action == PrintBookmarks) && childCount()) - return true; - - return false; -} - - -void CBookmarkFolder::exportBookmarks() { - QString fileName = KFileDialog::getSaveFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Export bookmarks")); - if (!fileName.isEmpty()) { - saveBookmarks( fileName, false ); //false means we don't want to overwrite the file without asking the user - }; -} - - -void CBookmarkFolder::importBookmarks() { - QString fileName = KFileDialog::getOpenFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Import bookmarks")); - if (!fileName.isEmpty()) { - //we have to decide if we should load an old bookmark file from 1.2 or earlier or the new XML format of > 1.3 - if ( !loadBookmarks(fileName) ) { //if this failed try to load it as old bookmark file - loadBookmarksFromXML( Bookmarks::OldBookmarkImport::oldBookmarksXML( fileName ) ); - }; - }; -} - -bool CBookmarkFolder::acceptDrop(const QMimeSource * src) const { - // qWarning("bool CBookmarkFolder::acceptDrop(const QMimeSource * src): return%ii", (CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark))); - - return CDragDropMgr::canDecode(src) - && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark); -} - -void CBookmarkFolder::dropped(QDropEvent *e, QListViewItem* after) { - if (acceptDrop(e)) { - CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e); - CDragDropMgr::ItemList::Iterator it; - CItemBase* previousItem = dynamic_cast<CItemBase*>(after); - - for( it = dndItems.begin(); it != dndItems.end(); ++it) { - CSwordModuleInfo* module = CPointers::backend()->findModuleByName( - (*it).bookmarkModule() - ); - - CBookmarkItem* i = new CBookmarkItem( - this, - module, - (*it).bookmarkKey(), - (*it).bookmarkDescription() - ); - - if (previousItem) { - i->moveAfter( previousItem ); - } - - i->init(); - previousItem = i; - }; - }; -} - -/** Saves the bookmarks in a file. */ -const bool CBookmarkFolder::saveBookmarks( const QString& filename, const bool& forceOverwrite ) { - QDomDocument doc("DOC"); - doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - - QDomElement content = doc.createElement("SwordBookmarks"); - content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION); - doc.appendChild(content); - - //append the XML nodes of all child items - CItemBase* i = dynamic_cast<CItemBase*>( firstChild() ); - while( i ) { - if (i->parent() == this) { //only one level under this folder - QDomElement newElem = i->saveToXML( doc ); // the cild creates it's own XML code - if (!newElem.isNull()) { - content.appendChild( newElem ); //append to this folder - } - } - i = dynamic_cast<CItemBase*>( i->nextSibling() ); - } - - return CToolClass::savePlainFile(filename, doc.toString(), forceOverwrite, QTextStream::UnicodeUTF8); -} - -const bool CBookmarkFolder::loadBookmarksFromXML( const QString& xml ) { - QDomDocument doc; - doc.setContent(xml); - QDomElement document = doc.documentElement(); - if( document.tagName() != "SwordBookmarks" ) { - qWarning("Not a BibleTime Bookmark XML file"); - return false; - } - - CItemBase* oldItem = 0; - //restore all child items - QDomElement child = document.firstChild().toElement(); - while ( !child.isNull() && child.parentNode() == document) { - CItemBase* i = 0; - if (child.tagName() == "Folder") { - i = new Bookmarks::SubFolder(this, child); - } - else if (child.tagName() == "Bookmark") { - i = new CBookmarkItem(this, child); - } - if (!i) { - break; - } - - i->init(); - if (oldItem) { - i->moveAfter(oldItem); - } - oldItem = i; - - if (!child.nextSibling().isNull()) { - child = child.nextSibling().toElement(); - } - else { - break; - } - } - return true; -} - -/** Loads bookmarks from a file. */ -const bool CBookmarkFolder::loadBookmarks( const QString& filename ) { - QFile file(filename); - if (!file.exists()) - return false; - - QString xml; - if (file.open(IO_ReadOnly)) { - QTextStream t; - t.setEncoding(QTextStream::UnicodeUTF8); //set encoding before file is used for input! - t.setDevice(&file); - xml = t.read(); - file.close(); - } - - return loadBookmarksFromXML( xml ); -} - -/* NEW CLASS */ - -CGlossaryFolder::CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage) -: CTreeFolder(mainIndex, type, fromLanguage) { - m_fromLanguage = fromLanguage; - m_toLanguage = toLanguage; -} - -CGlossaryFolder::CGlossaryFolder(CFolderBase* item, const Type type, const QString& fromLanguage, const QString& toLanguage) -: CTreeFolder(item, type, fromLanguage) { - m_fromLanguage = fromLanguage; - m_toLanguage = toLanguage; -} - -CGlossaryFolder::~CGlossaryFolder() {} - -void CGlossaryFolder::initTree() { - if (type() == Unknown) - return; - - //get all modules by using the lexicon type - ListCSwordModuleInfo allModules =CPointers::backend()->moduleList(); - ListCSwordModuleInfo usedModules; - // for (CSwordModuleInfo* m = allModules.first(); m; m = allModules.next()) { - - ListCSwordModuleInfo::iterator end_it = allModules.end(); - for (ListCSwordModuleInfo::iterator it(allModules.begin()); it != end_it; ++it) { - if ((*it)->type() == CSwordModuleInfo::Lexicon) { //found a module, check if the type is correct (devotional etc.) - if ((type() == GlossaryModuleFolder) && ((*it)->category() != CSwordModuleInfo::Glossary)) { //not a glossary - continue; - } - //found a glossary - //ToDo: this is ugly code - if (language() == QString::fromLatin1("*") - || (language() != QString::fromLatin1("*") - && (*it)->config(CSwordModuleInfo::GlossaryFrom) == fromLanguage() - && (*it)->config(CSwordModuleInfo::GlossaryTo) == toLanguage() - ) - ) { //right type and language! - usedModules.append(*it); - } - } - } - - //we have now all modules we want to have - if (language() == QString::fromLatin1("*")) { //create subfolders for each language - typedef std::pair<QString, QString> LanguagePair; - typedef QValueList<LanguagePair> LanguagePairList; - - LanguagePairList usedLangs; - // for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) { - ListCSwordModuleInfo::iterator end_it = usedModules.end(); - for (ListCSwordModuleInfo::iterator it(usedModules.begin()); it != end_it; ++it) { - LanguagePair langPair( - (*it)->config(CSwordModuleInfo::GlossaryFrom), - (*it)->config(CSwordModuleInfo::GlossaryTo) - ); - - if (!usedLangs.contains(langPair)) { - usedLangs.append(langPair); - } - } - - LanguagePairList::iterator lang_it; - for (lang_it = usedLangs.begin(); lang_it != usedLangs.end(); ++lang_it) { - addGroup(type(), (*lang_it).first, (*lang_it).second); - } - } - else if (usedModules.count() > 0) { //create subitems with the given type and languages - // for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) { - ListCSwordModuleInfo::iterator end_it = usedModules.end(); - for (ListCSwordModuleInfo::iterator it(usedModules.begin()); it != end_it; ++it) { - addModule(*it); - } - } - - sortChildItems(0,true); -} - -void CGlossaryFolder::init() { - if (language() == "*") { - setText(0,i18n("Glossaries")); - } - else { - const CLanguageMgr::Language* const fromLang = CPointers::languageMgr()->languageForAbbrev( m_fromLanguage ); - const CLanguageMgr::Language* const toLang = CPointers::languageMgr()->languageForAbbrev( m_toLanguage ); - - QString fromLangString = fromLang->translatedName(); - QString toLangString = toLang->translatedName(); - - if (fromLangString.isEmpty()) { //use abbrev! - fromLangString = m_fromLanguage; - }; - if (toLangString.isEmpty()) { //use abbrev! - toLangString = m_toLanguage; - }; - - setText(0, fromLangString + " - " + toLangString ); - } - initTree(); - update(); -} - -/** Returns the language this glossary folder maps from. */ -const QString& CGlossaryFolder::fromLanguage() const { - return m_fromLanguage; -} - -/** Returns the language this glossary folder maps to. */ -const QString& CGlossaryFolder::toLanguage() const { - return m_toLanguage; -} - -void CGlossaryFolder::addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage) { - CTreeFolder* i = new CGlossaryFolder(this, type, fromLanguage, toLanguage); - i->init(); - if (!i->childCount()) { - delete i; - } -} - diff --git a/bibletime/frontend/mainindex/cindexitem.h b/bibletime/frontend/mainindex/cindexitem.h deleted file mode 100644 index ab7de5e..0000000 --- a/bibletime/frontend/mainindex/cindexitem.h +++ /dev/null @@ -1,390 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CINDEXITEM_H -#define CINDEXITEM_H - -//BibleTime includes -#include "util/cpointers.h" - -#include "backend/cswordmoduleinfo.h" - -//Qt includes -#include <qdom.h> - -//KDE includes -#include <klistview.h> - -class KConfig; -class CFolderBase; -class CTreeFolder; -class CMainIndex; - -class CItemBase : public KListViewItem/*, public CPointers */ { -public: - enum Type { - Unknown = 0, - BookmarkFolder, - Bookmark, - OldBookmarkFolder, /* Bookmarks in the old format from BibleTime 1.1.x and 1.2.x */ - BibleModuleFolder, - CommentaryModuleFolder, - LexiconModuleFolder, - BookModuleFolder, - DevotionalModuleFolder, - GlossaryModuleFolder, - ModuleLanguageFolder, - Module - }; - enum MenuAction { - NewFolder = 0, - ChangeFolder, - - ChangeBookmark, - ImportBookmarks, - ExportBookmarks, - PrintBookmarks, - - DeleteEntries, - - EditModule, - SearchInModules, - UnlockModule, - AboutModule, - - ActionBegin = NewFolder, - ActionEnd = AboutModule - }; - - CItemBase(CMainIndex* mainIndex, const Type type = Unknown); - CItemBase(CItemBase* item, const Type type = Unknown); - virtual ~CItemBase(); - - virtual const QString toolTip(); - virtual CMainIndex* listView() const; - /** - * Returns if the implementation of this class is a folder item or not. - * Reimplement this function to return the correct value. - */ - virtual const bool isFolder() { - return false; - }; - const Type& type() const; - - virtual void init(); - virtual void update(); - void moveAfter( CItemBase* const item ); - /** - * Returns true if the given action should be enabled in the popup menu. - */ - virtual const bool enableAction( const MenuAction action ); - virtual const bool isMovable(); - - /** - * Returns the XML code which represents the content of this folder. - */ - virtual QDomElement saveToXML( QDomDocument& /*document*/ ) { - return QDomElement(); - }; - /** - * Loads the content of this folder from the XML code passed as argument to this function. - */ - virtual void loadFromXML( QDomElement& /*element*/ ) {} - ; - /** - * Returns true whether the sorting is enabled or not. - */ - const bool isSortingEnabled(); - /** - * This function engables or disables sorting depending on the parameter. - */ - void setSortingEnabled( const bool& enableSorting ); - /** - * Reimplementation which takes care of the our isSortingEnabled() setting. - */ - virtual void sortChildItems( int col, bool asc ); - /** - * Reimplementation which takes care of the our isSortingEnabled() setting. - */ - virtual void sort(); - -protected: - friend class CMainIndex; - - /** Reimplementation which uses our extended version of dropped (see below). - */ - virtual void dropped( QDropEvent* e) { - dropped(e,0); - }; - /** Our extended version of the dropped method to include a item above the point we dropped the stuff. - */ - virtual void dropped( QDropEvent* /*e*/, QListViewItem* /*after*/) {} - ; - /** - * Reimplementation. Returns true if the auto opening of this folder is allowd - * The default return value is "false" - */ - virtual const bool allowAutoOpen( const QMimeSource* src ) const; - -private: - Type m_type; - bool m_sortingEnabled; -}; - -class CModuleItem : public CItemBase { -public: - CModuleItem(CTreeFolder* item, CSwordModuleInfo* module); - virtual ~CModuleItem(); - virtual CSwordModuleInfo* const module() const; - virtual const QString toolTip(); - - /** - * Reimplementation from CItemBase. - */ - virtual const bool enableAction( const MenuAction action ); - virtual void update(); - virtual void init(); - -protected: // Protected methods - /** - * Reimplementation to handle text drops on a module. - * In this case open the searchdialog. In the case of a referebnce open the module at the given position. - */ - virtual bool acceptDrop( const QMimeSource* src ) const; - virtual void dropped( QDropEvent* e, QListViewItem* after ); - -private: - CSwordModuleInfo* m_module; -}; - -class CBookmarkItem : public CItemBase { -public: - CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description); - CBookmarkItem(CFolderBase* parentItem, QDomElement& xml); - virtual ~CBookmarkItem(); - CSwordModuleInfo* const module(); - const QString key(); - const QString& description(); - virtual const QString toolTip(); - - //virtual int compare( QListViewItem * i, int col, bool ascending ) const; - - virtual void update(); - virtual void init(); - virtual const bool isMovable(); - /** - * Reimplementation to handle the menu entries of the main index. - */ - virtual const bool enableAction(const MenuAction action); - /** - * Prints this bookmark. - */ - // void print(); - /** - * Changes this bookmark. - */ - void rename(); - /** - * Reimplementation of CItemBase::saveToXML. - */ - virtual QDomElement saveToXML( QDomDocument& document ); - /** - * Loads the content of this folder from the XML code passed as argument to this function. - */ - virtual void loadFromXML( QDomElement& element ); - -private: - QString m_key; - QString m_description; - QString m_moduleName; - - QDomElement m_startupXML; - -protected: // Protected methods - /** - * Reimplementation. Returns false everytime - * because a bookmarks - * has not possible drops. - */ - virtual bool acceptDrop(const QMimeSource * src) const; - -private: // Private methods - /** - * Returns the english key. - * Only used internal of this class implementation. - */ - const QString& englishKey() const; -}; - - -class CFolderBase : public CItemBase { -public: - CFolderBase(CMainIndex* mainIndex, const Type type); - CFolderBase(CFolderBase* parentFolder, const Type type); - CFolderBase(CFolderBase* parentFolder, const QString& caption); - virtual ~CFolderBase(); - - virtual const bool isFolder(); - - virtual void update(); - virtual void init(); - virtual void setOpen( bool open ); - /** - * The function which renames this folder. - */ - void rename(); - virtual void newSubFolder(); - - QPtrList<QListViewItem> getChildList(); - -protected: - /** - * Reimplementation. Returns true if the auto opening of this folder is allowd - */ - virtual const bool allowAutoOpen( const QMimeSource* src ) const; - /** - * Reimplementation. Returns false because folders have no use for drops - * (except for the bookmark folders) - */ - bool acceptDrop(const QMimeSource * src) const; -}; - -/** The base class for all items in the tree. Subclasses for module folders, modules and bookmarks exist. - * @author The BibleTime team - */ -class CTreeFolder : public CFolderBase { -public: - CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language ); - CTreeFolder(CFolderBase* parentFolder, const Type type, const QString& language ); - virtual ~CTreeFolder(); - - virtual void addGroup(const Type type, const QString language); - virtual void addModule(CSwordModuleInfo* const); - virtual void addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description); - - virtual void initTree(); - - virtual void update(); - virtual void init(); - - virtual const QString& language() const; - -private: - QString m_language; -}; - -class CGlossaryFolder : public CTreeFolder { -public: - CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage ); - CGlossaryFolder(CFolderBase* parentFolder, const Type type, const QString& fromLanguage, const QString& toLanguage ); - virtual ~CGlossaryFolder(); - - virtual void initTree(); - virtual void init(); - virtual void addGroup(const Type /*type*/, const QString& /*fromLanguage*/) {} - ; //standard reimpl to overload the old one right - virtual void addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage); - /** - * Returns the language this glossary folder maps from. - */ - const QString& fromLanguage() const; - /** - * Returns the language this glossary folder maps from. - */ - const QString& toLanguage() const; - -private: - QString m_fromLanguage; - QString m_toLanguage; -}; - -class CBookmarkFolder : public CTreeFolder { -public: - CBookmarkFolder(CMainIndex* mainIndex, const Type type = BookmarkFolder); - CBookmarkFolder(CFolderBase* parentItem, const Type type = BookmarkFolder); - virtual ~CBookmarkFolder(); - virtual const bool enableAction(const MenuAction action); - virtual void exportBookmarks(); - virtual void importBookmarks(); - virtual bool acceptDrop(const QMimeSource * src) const; - virtual void dropped(QDropEvent *e, QListViewItem* after); - - /** - * Loads bookmarks from XML content - */ - const bool loadBookmarksFromXML( const QString& xml ); - /** - * Loads bookmarks from a file. - */ - const bool loadBookmarks( const QString& ); - /** - * Saves the bookmarks in a file. - */ - const bool saveBookmarks( const QString& filename, const bool& forceOverwrite = true ); - -protected: // Protected methods - virtual void initTree(); -}; - - -namespace Bookmarks { -class OldBookmarksFolder : public CBookmarkFolder { -public: - OldBookmarksFolder(CTreeFolder* item); - virtual ~OldBookmarksFolder(); - virtual void initTree(); - /** - * Returns the XML code which represents the content of this folder. - */ - virtual QDomElement saveToXML( QDomDocument& document ); - /** - * Loads the content of this folder from the XML code passed as argument to this function. - */ - virtual void loadFromXML( QDomElement& element ); - }; - - class OldBookmarkImport { -public: - /** - * This function converts the old config based bookmarks into a valid 1.3 XML file, so importing is easy - */ - static const QString oldBookmarksXML( const QString& configFileName = QString::null ); -private: - // made provate because we offer one static functions which doesn't need constructor and destructor - OldBookmarkImport(); - virtual ~OldBookmarkImport(); - }; - -class SubFolder : public CBookmarkFolder { -public: - SubFolder(CFolderBase* parentItem, const QString& caption); - SubFolder(CFolderBase* parentItem, QDomElement& xml); - virtual ~SubFolder(); - virtual void init(); - /** - * Reimplementation from CItemBase. - */ - const bool enableAction(const MenuAction action); - /** - * Returns the XML code which represents the content of this folder. - */ - virtual QDomElement saveToXML( QDomDocument& document ); - /** - * Loads the content of this folder from the XML code passed as argument to this function. - */ - virtual void loadFromXML( QDomElement& element ); - -private: - QDomElement m_startupXML; - }; -} //end of namespace Bookmarks - -#endif diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp deleted file mode 100644 index b6c2e41..0000000 --- a/bibletime/frontend/mainindex/cmainindex.cpp +++ /dev/null @@ -1,869 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//BibleTime includes -#include "cmainindex.h" -#include "cindexitem.h" - -#include "backend/creferencemanager.h" -#include "backend/cswordmoduleinfo.h" - -#include "frontend/searchdialog/csearchdialog.h" -#include "frontend/cbtconfig.h" -#include "frontend/cdragdropmgr.h" -#include "frontend/cinfodisplay.h" - -#include "frontend/cprinter.h" - -#include "util/cresmgr.h" -#include "util/scoped_resource.h" - -//Qt includes -#include <qheader.h> -#include <qlistview.h> -#include <qdragobject.h> -#include <qinputdialog.h> -#include <qregexp.h> - -//KDE includes -#include <klocale.h> -#include <kstandarddirs.h> -#include <kpopupmenu.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> - -using namespace Printing; - -CMainIndex::ToolTip::ToolTip(CMainIndex* parent) : QToolTip(parent->viewport()), m_mainIndex(parent) {} - -void CMainIndex::ToolTip::maybeTip(const QPoint& p) { - CItemBase* i = dynamic_cast<CItemBase*>(m_mainIndex->itemAt(p)); - Q_ASSERT(i); - if ( !i ) { - return; - } - - QRect r = m_mainIndex->itemRect(i); - if (!r.isValid()) { - return; - } - - //get type of item and display correct text - const QString text = i->toolTip(); - if (!text.isEmpty()) { - CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>(i); - if (bookmark) { - (CPointers::infoDisplay())->setInfo( - InfoDisplay::CInfoDisplay::CrossReference, - bookmark->module()->name() + ":" + bookmark->key() - ); - } - else { - CPointers::infoDisplay()->clearInfo(); - } - - tip(r, text); - } - else { - CPointers::infoDisplay()->clearInfo(); - } -} - -CMainIndex::CMainIndex(QWidget *parent) : KListView(parent), -m_searchDialog(0), m_toolTip(0), m_itemsMovable(false), m_autoOpenFolder(0), m_autoOpenTimer(this) { - initView(); - initConnections(); - //initTree() is called in polish() -} - -CMainIndex::~CMainIndex() { - saveSettings(); - saveBookmarks(); - - m_toolTip->remove(this); - delete m_toolTip; -} - -/** Reimplementation. Adds the given group to the tree. */ -void CMainIndex::addGroup(const CItemBase::Type type, const QString language) { - CTreeFolder *i = 0; - switch (type) { - case CItemBase::BookmarkFolder: - i = new CBookmarkFolder(this); - break; - case CItemBase::GlossaryModuleFolder: - //we have no second language - i = new CGlossaryFolder(this, type, language, QString::null); - break; - default: - i = new CTreeFolder(this, type, language); - break; - } - - if (i) { - i->init(); - if (i->childCount() == 0 && type != CItemBase::BookmarkFolder) { - delete i; - } - } -} - - -/** Initializes the view. */ -void CMainIndex::initView() { - addColumn(QString::null); - header()->hide(); - - m_toolTip = new ToolTip(this); - setTooltipColumn(-1); - //to disable Qt's tooltips - setShowToolTips(false); - - setBackgroundMode(PaletteBase); - setFullWidth(true); - setFocusPolicy(WheelFocus); - - setAcceptDrops( true ); - setDragEnabled( true ); - setDropVisualizer( true ); - setDropHighlighter( true ); - setAutoOpen(true); - viewport()->setAcceptDrops(true); - setRootIsDecorated(false); - setAllColumnsShowFocus(true); - setItemsMovable(false); - setSelectionModeExt(Extended); - - //setup the popup menu - m_popup = new KPopupMenu(viewport()); - m_popup->insertTitle(i18n("Bookshelf")); - - m_actions.newFolder = new KAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, SLOT(createNewFolder()), this); - m_actions.changeFolder = new KAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, SLOT(changeFolder()), this); - - m_actions.changeBookmark = new KAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, this, SLOT(changeBookmark()), this); - m_actions.importBookmarks = new KAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, SLOT(importBookmarks()), this); - m_actions.exportBookmarks = new KAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, SLOT(exportBookmarks()), this); - m_actions.printBookmarks = new KAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, SLOT(printBookmarks()), this); - - m_actions.deleteEntries = new KAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, SLOT(deleteEntries()), this); - - m_actions.editModuleMenu = new KActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, this); - m_actions.editModuleMenu->setDelayed(false); - m_actions.editModulePlain = new KAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, SLOT(editModulePlain()), this); - m_actions.editModuleHTML = new KAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, SLOT(editModuleHTML()), this); - - m_actions.searchInModules = new KAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, this, SLOT(searchInModules()), this); - m_actions.unlockModule = new KAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, this, SLOT(unlockModule()), this); - m_actions.aboutModule = new KAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, this, SLOT(aboutModule()), this); - - - //fill the popup menu itself - m_actions.newFolder->plug(m_popup); - m_actions.changeFolder->plug(m_popup); - (new KActionSeparator(this))->plug(m_popup); - m_actions.changeBookmark->plug(m_popup); - m_actions.importBookmarks->plug(m_popup); - m_actions.exportBookmarks->plug(m_popup); - m_actions.printBookmarks->plug(m_popup); - (new KActionSeparator(this))->plug(m_popup); - m_actions.deleteEntries->plug(m_popup); - (new KActionSeparator(this))->plug(m_popup); - m_actions.editModuleMenu->plug(m_popup); - //sub item of edit module menu - m_actions.editModuleMenu->insert(m_actions.editModulePlain); - //sub item of edit module menu - m_actions.editModuleMenu->insert(m_actions.editModuleHTML); - - m_actions.searchInModules->plug(m_popup); - m_actions.unlockModule->plug(m_popup); - m_actions.aboutModule->plug(m_popup); -} - -/** Initialize the SIGNAL<->SLOT connections */ -void CMainIndex::initConnections() { - connect(this, SIGNAL(executed(QListViewItem*)), - SLOT(slotExecuted(QListViewItem*))); - connect(this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - SLOT(dropped(QDropEvent*, QListViewItem*, QListViewItem*))); - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - SLOT(contextMenu(KListView*, QListViewItem*, const QPoint&))); - connect(&m_autoOpenTimer, SIGNAL(timeout()), - this, SLOT(autoOpenTimeout())); -} - -/** Is called when an item was clicked/double clicked. */ -void CMainIndex::slotExecuted( QListViewItem* i ) { - CItemBase* ci = dynamic_cast<CItemBase*>(i); - if (!ci) { - return; - } - - if (ci->isFolder()) { - i->setOpen(!i->isOpen()); - } - else if (CModuleItem* m = dynamic_cast<CModuleItem*>(i)) { //clicked on a module - CSwordModuleInfo* mod = m->module(); - ListCSwordModuleInfo modules; - modules.append(mod); - emit createReadDisplayWindow(modules, QString::null); - } - else if (CBookmarkItem* b = dynamic_cast<CBookmarkItem*>(i) ) { //clicked on a bookmark - if (CSwordModuleInfo* mod = b->module()) { - ListCSwordModuleInfo modules; - modules.append(mod); - emit createReadDisplayWindow(modules, b->key()); - } - } -} - -/** Reimplementation. Returns the drag object for the current selection. */ -QDragObject* CMainIndex::dragObject() { - if (!m_itemsMovable) { - return false; - } - - CDragDropMgr::ItemList dndItems; - - QPtrList<QListViewItem> items = selectedItems(); - for (items.first(); items.current(); items.next()) { - if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) { - //we can move this item! - if (!i->isMovable()) { //we can only drag items which allow us to do it, e.g. which are movable - continue; - } - - if (CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>( items.current() )) { - //take care of bookmarks which have no valid module any more, e.g. if it was uninstalled - const QString moduleName = bookmark->module() ? bookmark->module()->name() : QString::null; - dndItems.append( CDragDropMgr::Item(moduleName, bookmark->key(), bookmark->description()) ); - } - } - } - - return CDragDropMgr::dragObject( dndItems, viewport() ); -} - -/** Reimplementation from KListView. Returns true if the drag is acceptable for the listview. */ -bool CMainIndex::acceptDrag( QDropEvent* event ) const { - const QPoint pos = contentsToViewport(event->pos()); - - CItemBase* i = dynamic_cast<CItemBase*>(itemAt(pos)); - return i ? (i->acceptDrop(event) || i->isMovable()) : false; -} - -/** No descriptions */ -void CMainIndex::initTree() { - addGroup(CItemBase::BookmarkFolder, QString("*")); - addGroup(CItemBase::BibleModuleFolder, QString("*")); - addGroup(CItemBase::BookModuleFolder, QString("*")); - addGroup(CItemBase::CommentaryModuleFolder, QString("*")); - addGroup(CItemBase::DevotionalModuleFolder, QString("*")); - addGroup(CItemBase::GlossaryModuleFolder, QString("*")); - addGroup(CItemBase::LexiconModuleFolder, QString("*")); -} - -/** No descriptions */ -void CMainIndex::dropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after) { - Q_ASSERT(after); - Q_ASSERT(parent); - - //the drop was started in this main index widget - if (m_itemsMovable && ((e->source()) == (viewport()))) { - /* - * If the drag was started from the main index and should move items and if the destination is the bookmark - * folder or one of its subfolders - * we remove the current items because the new ones will be inserted soon. - */ - if (dynamic_cast<CBookmarkFolder*>(parent) || dynamic_cast<Bookmarks::SubFolder*>(parent)) { - // we drop onto the bookmark folder or one of it's subfolders - // QPtrList<QListViewItem> items = selectedItems(); - // items.setAutoDelete(true); - // items.clear(); //delete the selected items we dragged - } - } - - //finally do the drop, either with external drop data or with the moved items' data - CItemBase* const parentItem = dynamic_cast<CItemBase*>(parent); - CItemBase* const afterItem = dynamic_cast<CItemBase*>(after); - - bool removeSelectedItems = true; - bool moveSelectedItems = false; - - if (afterItem && afterItem->isFolder()) { - moveSelectedItems = false; - removeSelectedItems = false; //why TRUE? - - afterItem->setOpen(true); - afterItem->dropped(e); //inserts new items, moving only works on the same level - } - else if (afterItem && !afterItem->isFolder() && parentItem) { - const bool justMoveSelected = - (e->source() == viewport()) - && m_itemsMovable - && parentItem->acceptDrop(e) - && !afterItem->acceptDrop(e); - - if (justMoveSelected) { - moveSelectedItems = true; - removeSelectedItems = false; - } - else { - moveSelectedItems = false; - removeSelectedItems = false; - - if (afterItem->acceptDrop(e)) { - afterItem->dropped(e, after); - } - else { //insert in the parent folder and then move the inserted items - parentItem->dropped(e, after); - } - } - - parentItem->setOpen(true); - } - else if (parentItem) { //no after item present, but a parent is there - moveSelectedItems = false; - removeSelectedItems = false; - - parentItem->setOpen(true); - parentItem->dropped(e); - } - - if (moveSelectedItems) { - //move all selected items after the afterItem - if (m_itemsMovable) { - QPtrList<QListViewItem> items = selectedItems(); - QListViewItem* i = items.first(); - QListViewItem* after = afterItem; - while (i && afterItem) { - i->moveItem(after); - after = i; - - i = items.next(); - } - } - } - - if (removeSelectedItems) { - QPtrList<QListViewItem> items = selectedItems(); - items.setAutoDelete(true); - items.clear(); //delete the selected items we dragged - } -} - -/** No descriptions */ -void CMainIndex::emitModulesChosen( ListCSwordModuleInfo modules, QString key ) { - emit createReadDisplayWindow(modules, key); -} - -/** Returns the correct KAction object for the given type of action. */ -KAction* const CMainIndex::action( const CItemBase::MenuAction type ) const { - switch (type) { - case CItemBase::NewFolder: - return m_actions.newFolder; - case CItemBase::ChangeFolder: - return m_actions.changeFolder; - - case CItemBase::ChangeBookmark: - return m_actions.changeBookmark; - case CItemBase::ImportBookmarks: - return m_actions.importBookmarks; - case CItemBase::ExportBookmarks: - return m_actions.exportBookmarks; - case CItemBase::PrintBookmarks: - return m_actions.printBookmarks; - - case CItemBase::DeleteEntries: - return m_actions.deleteEntries; - - case CItemBase::EditModule: - return m_actions.editModuleMenu; - case CItemBase::SearchInModules: - return m_actions.searchInModules; - case CItemBase::UnlockModule: - return m_actions.unlockModule; - case CItemBase::AboutModule: - return m_actions.aboutModule; - default: - return 0; - } -} - -/** Shows the context menu at the given position. */ -void CMainIndex::contextMenu(KListView* /*list*/, QListViewItem* i, const QPoint& p) { - //setup menu entries depending on current selection - QPtrList<QListViewItem> items = selectedItems(); - - if (items.count() == 0) { - //special handling for no selection - } - else if (items.count() == 1) { - //special handling for one selected item - - CItemBase* item = dynamic_cast<CItemBase*>(i); - CItemBase::MenuAction actionType; - for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) { - actionType = static_cast<CItemBase::MenuAction>(index); - if (KAction* a = action(actionType)) - a->setEnabled( item->enableAction(actionType) ); - } - } - else { - //first disable all actions - CItemBase::MenuAction actionType; - for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) { - actionType = static_cast<CItemBase::MenuAction>(index); - if (KAction* a = action(actionType)) - a->setEnabled(false); - } - - //enable the menu items depending on the types of the selected items. - for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) { - actionType = static_cast<CItemBase::MenuAction>(index); - bool enableAction = isMultiAction(actionType); - for (items.first(); items.current(); items.next()) { - CItemBase* i = dynamic_cast<CItemBase*>(items.current()); - enableAction = enableAction && i->enableAction(actionType); - } - if (enableAction) { - KAction* a = action(actionType) ; - if (i && a) - a->setEnabled(enableAction); - } - } - } - - //finally, open the popup - m_popup->exec(p); -} - -/** Adds a new subfolder to the current item. */ -void CMainIndex::createNewFolder() { - CFolderBase* i = dynamic_cast<CFolderBase*>(currentItem()); - Q_ASSERT(i); - - if (i) { - i->newSubFolder(); - } -} - -/** Opens a dialog to change the current folder. */ -void CMainIndex::changeFolder() { - CFolderBase* i = dynamic_cast<CFolderBase*>(currentItem()); - Q_ASSERT(i); - if (i) { - i->rename(); - } -} - -/** Changes the current bookmark. */ -void CMainIndex::changeBookmark() { - CBookmarkItem* i = dynamic_cast<CBookmarkItem*>(currentItem()); - Q_ASSERT(i); - - if (i) { - i->rename(); - } -} - -/** Exports the bookmarks being in the selected folder. */ -void CMainIndex::exportBookmarks() { - CBookmarkFolder* i = dynamic_cast<CBookmarkFolder*>(currentItem()); - Q_ASSERT(i); - - if (i) { - i->exportBookmarks(); - } -} - -/** Import bookmarks from a file and add them to the selected folder. */ -void CMainIndex::importBookmarks() { - CBookmarkFolder* i = dynamic_cast<CBookmarkFolder*>(currentItem()); - Q_ASSERT(i); - - if (i) { - i->importBookmarks(); - } -} - -/** Prints the selected bookmarks. */ -void CMainIndex::printBookmarks() { - CPrinter::KeyTree tree; - CPrinter::KeyTreeItem::Settings settings; - settings.keyRenderingFace = CPrinter::KeyTreeItem::Settings::CompleteShort; - - QPtrList<QListViewItem> items; - CBookmarkFolder* bf = dynamic_cast<CBookmarkFolder*>(currentItem()); - - if (bf) { - items = bf->getChildList(); - } - else { - items = selectedItems(); - } - - //create a tree of keytreeitems using the bookmark hierarchy. - for (items.first(); items.current(); items.next()) { - CBookmarkItem* i = dynamic_cast<CBookmarkItem*>(items.current()); - if (i) { - tree.append( new CPrinter::KeyTreeItem( i->key(), i->module(), settings ) ); - } - } - - util::scoped_ptr<CPrinter> printer( - new CPrinter( this, CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() ) - ); - printer->printKeyTree(tree); -} - -/** Deletes the selected entries. */ -void CMainIndex::deleteEntries() { - QPtrList<QListViewItem> items = selectedItems(); - if (!items.count()) - return; - - if (KMessageBox::warningYesNo(this, i18n("Do you really want to delete the selected items and child-items?"), i18n("Delete Items")) != KMessageBox::Yes) { - return; - } - - // We have to go backwards because otherwise deleting folders would delete their childs => crash before we delete those - for (items.last(); items.current(); items.prev()) { - if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) { - if (i->enableAction(CItemBase::DeleteEntries)) { - delete i; - } - } - } -} - -/** Opens the searchdialog for the selected modules. */ -void CMainIndex::searchInModules() { - QPtrList<QListViewItem> items = selectedItems(); - ListCSwordModuleInfo modules; - for (items.first(); items.current(); items.next()) { - if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) { - if (i->module()) { - modules.append(i->module()); - } - } - } - - if (modules.isEmpty()) { //get a list of useful default modules for the search if no modules were selected - CSwordModuleInfo* m = CBTConfig::get(CBTConfig::standardBible); - if (m) { - modules.append(m); - } - } - - Search::CSearchDialog::openDialog(modules, QString::null); -} - -/** Unlocks the current module. */ -void CMainIndex::unlockModule() { - if (CModuleItem* i = dynamic_cast<CModuleItem*>(currentItem())) { - bool ok = false; - const QString unlockKey = QInputDialog::getText(i18n("BibleTime - Unlock work"), - i18n("Enter the unlock key for this work."), - QLineEdit::Normal, i->module()->config(CSwordModuleInfo::CipherKey), &ok); - - if (ok) { - i->module()->unlock( unlockKey ); - emit signalSwordSetupChanged(); - } - } -} - -/** Shows information about the current module. */ -void CMainIndex::aboutModule() { - if (CModuleItem* i = dynamic_cast<CModuleItem*>(currentItem())) { - KMessageBox::about(this, i->module()->aboutText(), i->module()->config(CSwordModuleInfo::Description), false); - } -} - -/** Reimplementation. Takes care of movable items. */ -void CMainIndex::startDrag() { - QPtrList<QListViewItem> items = selectedItems(); - m_itemsMovable = true; - - for (items.first(); items.current() && m_itemsMovable; items.next()) { - if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) { - m_itemsMovable = (m_itemsMovable && i->isMovable()); - } - else { - m_itemsMovable = false; - } - } - - KListView::startDrag(); -} - -/** Reimplementation to support the items dragEnter and dragLeave functions. */ -void CMainIndex::contentsDragMoveEvent( QDragMoveEvent* event ) { - // qWarning("void CMainIndex:: drag move event ( QDragLeaveEvent* e )"); - CItemBase* i = dynamic_cast<CItemBase*>( itemAt( contentsToViewport(event->pos())) ); - if (i) { - if (i->allowAutoOpen(event) || (i->acceptDrop(event) && i->isFolder() && i->allowAutoOpen(event) && !i->isOpen() && autoOpen()) ) { - if (m_autoOpenFolder != i) { - m_autoOpenTimer.stop(); - } - - m_autoOpenFolder = i; - m_autoOpenTimer.start( 400, true ); - } - else { - m_autoOpenFolder = 0; - } - } - else { - m_autoOpenFolder = 0; - } - - KListView::contentsDragMoveEvent(event); -} - -QRect CMainIndex::drawItemHighlighter(QPainter* painter, QListViewItem* item) { - CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>(item); - if (bookmark) { - //no drops on bookmarks allowed, just moving items after it - return QRect(); - } - - return KListView::drawItemHighlighter(painter, item); -} - - -void CMainIndex::autoOpenTimeout() { - m_autoOpenTimer.stop(); - if (m_autoOpenFolder && !m_autoOpenFolder->isOpen() && m_autoOpenFolder->childCount()) { - m_autoOpenFolder->setOpen(true); - } -} - -/** No descriptions */ -void CMainIndex::contentsDragLeaveEvent( QDragLeaveEvent* e ) { - m_autoOpenTimer.stop(); - KListView::contentsDragLeaveEvent(e); -} - -/** Returns true if more than one netry is supported by this action type. Returns false for actions which support only one entry, e.g. about module etc. */ -const bool CMainIndex::isMultiAction( const CItemBase::MenuAction type ) const { - switch (type) { - case CItemBase::NewFolder: - return false; - case CItemBase::ChangeFolder: - return false; - - case CItemBase::ChangeBookmark: - return false; - case CItemBase::ImportBookmarks: - return false; - case CItemBase::ExportBookmarks: - return false; - case CItemBase::PrintBookmarks: - return true; - - case CItemBase::DeleteEntries: - return true; - - case CItemBase::EditModule: - return false; - case CItemBase::SearchInModules: - return true; - case CItemBase::UnlockModule: - return false; - case CItemBase::AboutModule: - return false; - } - - return false; -} - -/** Is called when items should be moved. */ -void CMainIndex::moved( QPtrList<QListViewItem>& /*items*/, QPtrList<QListViewItem>& /*afterFirst*/, QPtrList<QListViewItem>& /*afterNow*/) { - qDebug("move items"); -} - -/** Opens an editor window to edit the modules content. */ -void CMainIndex::editModulePlain() { - QPtrList<QListViewItem> items = selectedItems(); - ListCSwordModuleInfo modules; - for (items.first(); items.current(); items.next()) { - if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) { - modules.append(i->module()); - } - } - if (modules.count() == 1) { - emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::PlainTextWindow); - }; -} - -/** Opens an editor window to edit the modules content. */ -void CMainIndex::editModuleHTML() { - QPtrList<QListViewItem> items = selectedItems(); - ListCSwordModuleInfo modules; - for (items.first(); items.current(); items.next()) { - if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) { - modules.append(i->module()); - } - } - - if (modules.count() == 1) { - emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::HTMLWindow); - } -} - -/** Reloads the main index's Sword dependend things like modules */ -void CMainIndex::reloadSword() { - //reload the modules, save the open groups before removing the items - saveSettings(); - clear(); - initTree(); - readSettings(); -} - -/** Saves the bookmarks to disk */ -void CMainIndex::saveBookmarks() { - //find the bookmark folder - CItemBase* i = 0; - - QListViewItemIterator it( this ); - while ( it.current() ) { - i = dynamic_cast<CItemBase*>( it.current() ); - - if (i && (i->type() == CItemBase::BookmarkFolder)) { - //found the bookmark folder - KStandardDirs stdDirs; - - const QString path = stdDirs.saveLocation("data", "bibletime/"); - if (!path.isEmpty()) { - //save the bookmarks to the right file - if (CBookmarkFolder* f = dynamic_cast<CBookmarkFolder*>(i)) { - f->saveBookmarks( path + "bookmarks.xml" ); - } - } - break; - } - - ++it; - } -} - -void CMainIndex::readSettings() { - qDebug("CMainIndex::readSettings"); - - QStringList openGroups = CBTConfig::get(CBTConfig::bookshelfOpenGroups); - for (QStringList::Iterator it( openGroups.begin() ); it != openGroups.end(); ++it) { - QStringList path = QStringList::split("/", (*it)); //e.g. with items parent, child - QListViewItem* item = firstChild(); //begin on the top for each item - Q_ASSERT(item); - unsigned int index = 1; - - for (QStringList::Iterator p_it( path.begin() ); p_it != path.end(); ++p_it) { - QString itemName = (*p_it).replace("\\/", "/"); - - while (item && (item->text(0) != itemName)) { - item = item->nextSibling(); - } - - if (item && (item->text(0) == itemName)) { - if (index < path.count()) { //don't call firstChild on the right, i.e. last item of the list - item = item->firstChild(); - } - - ++index; - } - } - - if (item) { - item->setOpen(true); - } - } - - //restore the content position -// setContentsPos( -// CBTConfig::get(CBTConfig::bookshelfContentsX), -// CBTConfig::get(CBTConfig::bookshelfContentsY) -// ); -// horizontalScrollBar()->setValue(CBTConfig::get(CBTConfig::bookshelfContentsX)); -// verticalScrollBar()->setValue(CBTConfig::get(CBTConfig::bookshelfContentsY)); - - - //restore the selected item - QStringList path = QStringList::split("/", CBTConfig::get(CBTConfig::bookshelfCurrentItem)); - QListViewItem* item = firstChild(); - Q_ASSERT(item); - unsigned int index = 1; - for (QStringList::iterator it( path.begin() ); it != path.end(); ++it) { - //search for the current caption and go down to it's childs - while (item && (item->text(0) != (*it)) ) { - item = item->nextSibling(); - } - - if (item && ((*it) == item->text(0))) { - if (index == path.count()) { //last item reached - setCurrentItem( item ); - setSelected( item, true ); - break;//for loop - } - else { - item = item->firstChild(); - } - - index++; - } - } -} - -void CMainIndex::saveSettings() { - //save the complete names of all open groups to the settings file (e.g. Bibles/German/,Bookmarks/Jeuss Christ - QStringList openGroups; - - QListViewItemIterator it( this ); - while ( it.current() ) { - if ( it.current()->isOpen() ) { //is a group and open - //it.current()'s full name needs to be added to the list - QListViewItem* i = it.current(); - QString fullName = i->text(0); - while (i->parent()) { - i = i->parent(); - fullName.prepend("/").prepend( i->text(0).replace("/", "\\/")); // parent / child - } - openGroups << fullName; - } - - ++it; - } - - CBTConfig::set(CBTConfig::bookshelfOpenGroups, openGroups); - - //now save the position of the scrollbars -// CBTConfig::set(CBTConfig::bookshelfContentsX, -// horizontalScrollBar() ? horizontalScrollBar()->value() : 0); -// CBTConfig::set(CBTConfig::bookshelfContentsY, -// verticalScrollBar() ? verticalScrollBar()->value() : 0); - - //save the currently selected item - QListViewItem* item = currentItem(); - QString path; - while (item) { - path.prepend( item->text(0) + "/" ); - item = item->parent(); - } - CBTConfig::set(CBTConfig::bookshelfCurrentItem, path); -} - -void CMainIndex::polish() -{ - KListView::polish(); - initTree(); - readSettings(); -} diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h deleted file mode 100644 index be9f9f4..0000000 --- a/bibletime/frontend/mainindex/cmainindex.h +++ /dev/null @@ -1,232 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CMAININDEX_H -#define CMAININDEX_H - -//BibleTime includes -#include "cindexitem.h" - -#include "backend/cswordmoduleinfo.h" -#include "frontend/displaywindow/cdisplaywindow.h" - -#include "util/cpointers.h" - -//Qt includes -#include <qwidget.h> -#include <qtimer.h> -#include <qtooltip.h> - -//KDE includes -#include <kaction.h> -#include <klistview.h> - -class CSearchDialog; - -/** The class which manages all bookmarks and modules. The modules are put into own, fixed subfolders sorted by language. - * @author The BibleTime team - */ -class CMainIndex : public KListView { - Q_OBJECT - - class ToolTip : public QToolTip { - public: - ToolTip(CMainIndex* parent); - virtual ~ToolTip() {} - /** - * Displays a tooltip for position p using the getToolTip() function of CGroupManagerItem - */ - virtual void maybeTip( const QPoint &pos); - - private: - CMainIndex* m_mainIndex; - }; - -public: - CMainIndex(QWidget *parent); - virtual ~CMainIndex(); - - void initTree(); - /** - * Opens the searchdialog using the given modules using the given search text. - */ - void emitModulesChosen( ListCSwordModuleInfo modules, QString key ); - /** - * Saves the bookmarks to disk - */ - void saveBookmarks(); - /** - * Reloads the main index's Sword dependend things like modules - */ - void reloadSword(); - -public slots: - /** - * Opens the searchdialog for the selected modules. - */ - void searchInModules(); - -protected: // Protected methods - /** - * Reimplementation. Adds the given group to the tree. - */ - virtual void addGroup( const CItemBase::Type type, const QString language); - /** - * Initialize the SIGNAL<->SLOT connections - */ - void initConnections(); - /** - * Reimplementation. Returns the drag object for the current selection. - */ - virtual QDragObject* dragObject(); - /** - * Reimplementation from KListView. Returns true if the drag is acceptable for the listview. - */ - virtual bool acceptDrag( QDropEvent* event ) const; - /** - * Returns the correct KAction object for the given type of action. - */ - KAction* const action( const CItemBase::MenuAction type ) const; - /** - * Reimplementation. Takes care of movable items. - */ - virtual void startDrag(); - /** - * Reimplementation to support the items dragEnter and dragLeave functions. - */ - virtual void contentsDragMoveEvent( QDragMoveEvent* event ); - /** - * Reimplementation. - */ - virtual void contentsDragLeaveEvent( QDragLeaveEvent* e ); - QRect drawItemHighlighter(QPainter* painter, QListViewItem * item ); - /** Read settings like open groups or scrollbar position and restore them - */ - void readSettings(); - /** Save settings like roups close/open status to the settings file. - */ - void saveSettings(); - /** Reimplementation. - */ - virtual void polish(); - -protected slots: // Protected slots - /** - * Is called when an item was clicked/double clicked. - */ - void slotExecuted( QListViewItem* ); - void dropped( QDropEvent*, QListViewItem*, QListViewItem*); - /** - * Shows the context menu at the given position. - */ - void contextMenu(KListView*, QListViewItem*, const QPoint&); - /** - * Adds a new subfolder to the current item. - */ - void createNewFolder(); - /** - * Opens a dialog to change the current folder. - */ - void changeFolder(); - /** - * Exports the bookmarks being in the selected folder. - */ - void exportBookmarks(); - /** - * Changes the current bookmark. - */ - void changeBookmark(); - /** - * Import bookmarks from a file and add them to the selected folder. - */ - void importBookmarks(); - /** - * Deletes the selected entries. - */ - void deleteEntries(); - /** - * Prints the selected bookmarks. - */ - void printBookmarks(); - /** - * Shows information about the current module. - */ - void aboutModule(); - /** - * Unlocks the current module. - */ - void unlockModule(); - void autoOpenTimeout(); - /** - * Is called when items should be moved. - */ - void moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow); - /** - * Opens a plain text editor window to edit the modules content. - */ - void editModulePlain(); - /** - * Opens an HTML editor window to edit the modules content. - */ - void editModuleHTML(); - -private: - CSearchDialog* m_searchDialog; - ToolTip* m_toolTip; - bool m_itemsMovable; - QListViewItem* m_autoOpenFolder; - QTimer m_autoOpenTimer; - - /** - * Initializes the view. - */ - void initView(); - /** - * Returns true if more than one netry is supported by this action type. - * Returns false for actions which support only one entry, e.g. about module etc. - */ - const bool isMultiAction( const CItemBase::MenuAction type ) const; - - struct Actions { - KAction* newFolder; - KAction* changeFolder; - - KAction* changeBookmark; - KAction* importBookmarks; - KAction* exportBookmarks; - KAction* printBookmarks; - - KAction* deleteEntries; - - KActionMenu* editModuleMenu; - KAction* editModulePlain; - KAction* editModuleHTML; - - KAction* searchInModules; - KAction* unlockModule; - KAction* aboutModule; - } - m_actions; - KPopupMenu* m_popup; - -signals: - /** - * Is emitted when a module should be opened, - */ - void createReadDisplayWindow( ListCSwordModuleInfo, const QString& ); - /** - * Is emitted when a write window should be created. - */ - void createWriteDisplayWindow( CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType& ); - void signalSwordSetupChanged(); -}; - -#endif diff --git a/bibletime/frontend/manageindicesform.cpp b/bibletime/frontend/manageindicesform.cpp deleted file mode 100644 index c74ecd5..0000000 --- a/bibletime/frontend/manageindicesform.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include <kdialog.h> -#include <klocale.h> -/**************************************************************************** -** Form implementation generated from reading ui file './manageindicesform.ui' -** -** Created: Sa Mai 10 13:52:34 2008 -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ - -#include "manageindicesform.h" - -#include <qvariant.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qheader.h> -#include <klistview.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> - -/* - * Constructs a ManageIndicesForm as a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -ManageIndicesForm::ManageIndicesForm( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "ManageIndicesForm" ); - ManageIndicesFormLayout = new QVBoxLayout( this, 0, 8, "ManageIndicesFormLayout"); - - m_labelFrame = new QFrame( this, "m_labelFrame" ); - m_labelFrame->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)5, 0, 0, m_labelFrame->sizePolicy().hasHeightForWidth() ) ); - m_labelFrame->setFrameShape( QFrame::NoFrame ); - m_labelFrame->setFrameShadow( QFrame::Plain ); - ManageIndicesFormLayout->addWidget( m_labelFrame ); - - m_autoDeleteOrphanedIndicesBox = new QCheckBox( this, "m_autoDeleteOrphanedIndicesBox" ); - ManageIndicesFormLayout->addWidget( m_autoDeleteOrphanedIndicesBox ); - - m_moduleList = new KListView( this, "m_moduleList" ); - ManageIndicesFormLayout->addWidget( m_moduleList ); - - layout1 = new QHBoxLayout( 0, 0, 6, "layout1"); - spacer1 = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); - layout1->addItem( spacer1 ); - - m_createIndicesButton = new QPushButton( this, "m_createIndicesButton" ); - layout1->addWidget( m_createIndicesButton ); - - m_deleteIndicesButton = new QPushButton( this, "m_deleteIndicesButton" ); - layout1->addWidget( m_deleteIndicesButton ); - ManageIndicesFormLayout->addLayout( layout1 ); - languageChange(); - resize( QSize(415, 404).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); -} - -/* - * Destroys the object and frees any allocated resources - */ -ManageIndicesForm::~ManageIndicesForm() -{ - // no need to delete child widgets, Qt does it all for us -} - -/* - * Sets the strings of the subwidgets using the current - * language. - */ -void ManageIndicesForm::languageChange() -{ - setCaption( tr2i18n( "Manage Indicies" ) ); - m_autoDeleteOrphanedIndicesBox->setText( tr2i18n( "Automaticall&y delete orphaned indices when BibleTime starts" ) ); - m_autoDeleteOrphanedIndicesBox->setAccel( QKeySequence( tr2i18n( "Alt+Y" ) ) ); - m_createIndicesButton->setText( tr2i18n( "&Create selected indices" ) ); - m_deleteIndicesButton->setText( tr2i18n( "De&lete selected indices" ) ); -} - -#include "manageindicesform.moc" diff --git a/bibletime/frontend/manageindicesform.ui b/bibletime/frontend/manageindicesform.ui deleted file mode 100644 index bfd51c9..0000000 --- a/bibletime/frontend/manageindicesform.ui +++ /dev/null @@ -1,114 +0,0 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>ManageIndicesForm</class> -<widget class="QWidget"> - <property name="name"> - <cstring>ManageIndicesForm</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>415</width> - <height>404</height> - </rect> - </property> - <property name="caption"> - <string>Manage Indicies</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>8</number> - </property> - <widget class="QFrame"> - <property name="name"> - <cstring>m_labelFrame</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>Plain</enum> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>m_autoDeleteOrphanedIndicesBox</cstring> - </property> - <property name="text"> - <string>Automaticall&y delete orphaned indices when BibleTime starts</string> - </property> - <property name="accel"> - <string>Alt+Y</string> - </property> - </widget> - <widget class="KListView"> - <property name="name"> - <cstring>m_moduleList</cstring> - </property> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>layout1</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <spacer> - <property name="name"> - <cstring>spacer1</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - <widget class="QPushButton"> - <property name="name"> - <cstring>m_createIndicesButton</cstring> - </property> - <property name="text"> - <string>&Create selected indices</string> - </property> - </widget> - <widget class="QPushButton"> - <property name="name"> - <cstring>m_deleteIndicesButton</cstring> - </property> - <property name="text"> - <string>De&lete selected indices</string> - </property> - </widget> - </hbox> - </widget> - </vbox> -</widget> -<customwidgets> -</customwidgets> -<layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klistview.h</includehint> -</includehints> -</UI> diff --git a/bibletime/frontend/searchdialog/Makefile.am b/bibletime/frontend/searchdialog/Makefile.am deleted file mode 100644 index e78f647..0000000 --- a/bibletime/frontend/searchdialog/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -INCLUDES = $(all_includes) - -libsearchdialog_a_METASOURCES = AUTO - -noinst_LIBRARIES = libsearchdialog.a - -libsearchdialog_a_SOURCES = \ -searchoptionsform.ui \ -searchresultsform.ui \ -csearchdialog.cpp \ -csearchdialogpages.cpp \ -csearchanalysis.cpp \ -cmodulechooser.cpp \ -crangechooser.cpp \ -cmoduleresultview.cpp \ -csearchresultview.cpp - -all_headers = \ -csearchdialog.h \ -csearchdialogpages.h \ -csearchanalysis.h \ -cmodulechooser.h \ -crangechooser.h - - -EXTRA_DIST = $(libsearchdialog_a_SOURCES) $(all_headers) - - diff --git a/bibletime/frontend/searchdialog/Makefile.in b/bibletime/frontend/searchdialog/Makefile.in deleted file mode 100644 index eb0a029..0000000 --- a/bibletime/frontend/searchdialog/Makefile.in +++ /dev/null @@ -1,842 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/frontend/searchdialog -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libsearchdialog_a_AR = $(AR) $(ARFLAGS) -libsearchdialog_a_LIBADD = -am_libsearchdialog_a_OBJECTS = csearchdialog.$(OBJEXT) \ - csearchdialogpages.$(OBJEXT) csearchanalysis.$(OBJEXT) \ - cmodulechooser.$(OBJEXT) crangechooser.$(OBJEXT) \ - cmoduleresultview.$(OBJEXT) csearchresultview.$(OBJEXT) -#>- libsearchdialog_a_OBJECTS = $(am_libsearchdialog_a_OBJECTS) -#>+ 8 -libsearchdialog_a_final_OBJECTS = libsearchdialog_a.all_cpp.o -libsearchdialog_a_nofinal_OBJECTS = csearchdialog.$(OBJEXT) \ - csearchdialogpages.$(OBJEXT) csearchanalysis.$(OBJEXT) \ - cmodulechooser.$(OBJEXT) crangechooser.$(OBJEXT) \ - cmoduleresultview.$(OBJEXT) csearchresultview.$(OBJEXT) searchoptionsform.$(OBJEXT) searchresultsform.$(OBJEXT)\ -csearchanalysis.moc.o csearchdialog.moc.o cmoduleresultview.moc.o csearchdialogpages.moc.o crangechooser.moc.o cmodulechooser.moc.o csearchresultview.moc.o -@KDE_USE_FINAL_FALSE@libsearchdialog_a_OBJECTS = $(libsearchdialog_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libsearchdialog_a_OBJECTS = $(libsearchdialog_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libsearchdialog_a_SOURCES) -DIST_SOURCES = $(libsearchdialog_a_SOURCES) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libsearchdialog_a_METASOURCES = AUTO -noinst_LIBRARIES = libsearchdialog.a -#>- libsearchdialog_a_SOURCES = \ -#>- searchoptionsform.ui \ -#>- searchresultsform.ui \ -#>- csearchdialog.cpp \ -#>- csearchdialogpages.cpp \ -#>- csearchanalysis.cpp \ -#>- cmodulechooser.cpp \ -#>- crangechooser.cpp \ -#>- cmoduleresultview.cpp \ -#>- csearchresultview.cpp -#>+ 10 -libsearchdialog_a_SOURCES=\ - \ - \ -csearchdialog.cpp \ -csearchdialogpages.cpp \ -csearchanalysis.cpp \ -cmodulechooser.cpp \ -crangechooser.cpp \ -cmoduleresultview.cpp \ -csearchresultview.cpp searchoptionsform.cpp searchresultsform.cpp - -all_headers = \ -csearchdialog.h \ -csearchdialogpages.h \ -csearchanalysis.h \ -cmodulechooser.h \ -crangechooser.h - -EXTRA_DIST = $(libsearchdialog_a_SOURCES) $(all_headers) -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/searchdialog/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libsearchdialog.a: $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_DEPENDENCIES) - -rm -f libsearchdialog.a - $(libsearchdialog_a_AR) libsearchdialog.a $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_LIBADD) - $(RANLIB) libsearchdialog.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmodulechooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmoduleresultview.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crangechooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchanalysis.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchdialogpages.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchresultview.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-metasources clean-ui clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 3 -csearchanalysis.moc.cpp: $(srcdir)/csearchanalysis.h - $(MOC) $(srcdir)/csearchanalysis.h -o csearchanalysis.moc.cpp - -#>+ 2 -mocs: csearchanalysis.moc.cpp - -#>+ 3 -csearchdialog.moc.cpp: $(srcdir)/csearchdialog.h - $(MOC) $(srcdir)/csearchdialog.h -o csearchdialog.moc.cpp - -#>+ 2 -mocs: csearchdialog.moc.cpp - -#>+ 3 -cmoduleresultview.moc.cpp: $(srcdir)/cmoduleresultview.h - $(MOC) $(srcdir)/cmoduleresultview.h -o cmoduleresultview.moc.cpp - -#>+ 2 -mocs: cmoduleresultview.moc.cpp - -#>+ 3 -csearchdialogpages.moc.cpp: $(srcdir)/csearchdialogpages.h - $(MOC) $(srcdir)/csearchdialogpages.h -o csearchdialogpages.moc.cpp - -#>+ 2 -mocs: csearchdialogpages.moc.cpp - -#>+ 3 -crangechooser.moc.cpp: $(srcdir)/crangechooser.h - $(MOC) $(srcdir)/crangechooser.h -o crangechooser.moc.cpp - -#>+ 2 -mocs: crangechooser.moc.cpp - -#>+ 3 -cmodulechooser.moc.cpp: $(srcdir)/cmodulechooser.h - $(MOC) $(srcdir)/cmodulechooser.h -o cmodulechooser.moc.cpp - -#>+ 2 -mocs: cmodulechooser.moc.cpp - -#>+ 3 -csearchresultview.moc.cpp: $(srcdir)/csearchresultview.h - $(MOC) $(srcdir)/csearchresultview.h -o csearchresultview.moc.cpp - -#>+ 2 -mocs: csearchresultview.moc.cpp - -#>+ 3 -clean-metasources: - -rm -f csearchanalysis.moc.cpp csearchdialog.moc.cpp cmoduleresultview.moc.cpp csearchdialogpages.moc.cpp crangechooser.moc.cpp cmodulechooser.moc.cpp csearchresultview.moc.cpp - -#>+ 2 -KDE_DIST=csearchresultview.h searchresultsform.ui csearchdialog.h cmodulechooser.h Makefile.in csearchanalysis.h cmoduleresultview.h csearchdialogpages.h searchoptionsform.ui crangechooser.h Makefile.am - -#>+ 5 -clean-ui: - -rm -f \ - searchoptionsform.cpp searchoptionsform.h searchoptionsform.moc \ - searchresultsform.cpp searchresultsform.h searchresultsform.moc - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/searchdialog/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/searchdialog/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libsearchdialog_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/csearchdialog.cpp $(srcdir)/csearchdialogpages.cpp $(srcdir)/csearchanalysis.cpp $(srcdir)/cmodulechooser.cpp $(srcdir)/crangechooser.cpp $(srcdir)/cmoduleresultview.cpp $(srcdir)/csearchresultview.cpp searchoptionsform.cpp searchresultsform.cpp cmoduleresultview.moc.cpp csearchdialogpages.moc.cpp csearchanalysis.moc.cpp csearchdialog.moc.cpp crangechooser.moc.cpp cmodulechooser.moc.cpp csearchresultview.moc.cpp searchresultsform.moc searchoptionsform.moc - @echo 'creating libsearchdialog_a.all_cpp.cpp ...'; \ - rm -f libsearchdialog_a.all_cpp.files libsearchdialog_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libsearchdialog_a.all_cpp.final; \ - for file in csearchdialog.cpp csearchdialogpages.cpp csearchanalysis.cpp cmodulechooser.cpp crangechooser.cpp cmoduleresultview.cpp csearchresultview.cpp searchoptionsform.cpp searchresultsform.cpp cmoduleresultview.moc.cpp csearchdialogpages.moc.cpp csearchanalysis.moc.cpp csearchdialog.moc.cpp crangechooser.moc.cpp cmodulechooser.moc.cpp csearchresultview.moc.cpp ; do \ - echo "#include \"$$file\"" >> libsearchdialog_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsearchdialog_a.all_cpp.final; \ - done; \ - cat libsearchdialog_a.all_cpp.final libsearchdialog_a.all_cpp.files > libsearchdialog_a.all_cpp.cpp; \ - rm -f libsearchdialog_a.all_cpp.final libsearchdialog_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libsearchdialog_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 10 -nmcheck: -$(srcdir)/csearchresultview.cpp: searchoptionsform.h searchresultsform.h -$(srcdir)/cmodulechooser.cpp: searchoptionsform.h searchresultsform.h -$(srcdir)/csearchdialogpages.cpp: searchoptionsform.h searchresultsform.h -nmcheck-am: nmcheck -$(srcdir)/crangechooser.cpp: searchoptionsform.h searchresultsform.h -$(srcdir)/cmoduleresultview.cpp: searchoptionsform.h searchresultsform.h -$(srcdir)/csearchdialog.cpp: searchoptionsform.h searchresultsform.h -$(srcdir)/csearchanalysis.cpp: searchoptionsform.h searchresultsform.h - -#>+ 30 -searchoptionsform.cpp: $(srcdir)/searchoptionsform.ui searchoptionsform.h searchoptionsform.moc - rm -f searchoptionsform.cpp - echo '#include <kdialog.h>' > searchoptionsform.cpp - echo '#include <klocale.h>' >> searchoptionsform.cpp - $(UIC) -tr ${UIC_TR} -i searchoptionsform.h $(srcdir)/searchoptionsform.ui > searchoptionsform.cpp.temp ; ret=$$?; \ - $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" searchoptionsform.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_searchoptionsform,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> searchoptionsform.cpp ;\ - rm -f searchoptionsform.cpp.temp ;\ - if test "$$ret" = 0; then echo '#include "searchoptionsform.moc"' >> searchoptionsform.cpp; else rm -f searchoptionsform.cpp ; exit $$ret ; fi - -searchoptionsform.h: $(srcdir)/searchoptionsform.ui - rm -rf searchoptionsform.h; - $(UIC) $(srcdir)/searchoptionsform.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> searchoptionsform.h ; -searchoptionsform.moc: searchoptionsform.h - $(MOC) searchoptionsform.h -o searchoptionsform.moc - -searchresultsform.cpp: $(srcdir)/searchresultsform.ui searchresultsform.h searchresultsform.moc - rm -f searchresultsform.cpp - echo '#include <kdialog.h>' > searchresultsform.cpp - echo '#include <klocale.h>' >> searchresultsform.cpp - $(UIC) -tr ${UIC_TR} -i searchresultsform.h $(srcdir)/searchresultsform.ui > searchresultsform.cpp.temp ; ret=$$?; \ - $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" searchresultsform.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_searchresultsform,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> searchresultsform.cpp ;\ - rm -f searchresultsform.cpp.temp ;\ - if test "$$ret" = 0; then echo '#include "searchresultsform.moc"' >> searchresultsform.cpp; else rm -f searchresultsform.cpp ; exit $$ret ; fi - -searchresultsform.h: $(srcdir)/searchresultsform.ui - rm -rf searchresultsform.h; - $(UIC) $(srcdir)/searchresultsform.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> searchresultsform.h ; -searchresultsform.moc: searchresultsform.h - $(MOC) searchresultsform.h -o searchresultsform.moc diff --git a/bibletime/frontend/searchdialog/cmodulechooser.cpp b/bibletime/frontend/searchdialog/cmodulechooser.cpp deleted file mode 100644 index 5670d91..0000000 --- a/bibletime/frontend/searchdialog/cmodulechooser.cpp +++ /dev/null @@ -1,303 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cmodulechooser.h" - -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" - -#include "frontend/cbtconfig.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -//Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> - -//KDE includes -#include <kapplication.h> -#include <kfiledialog.h> -#include <klocale.h> -#include <kiconloader.h> - -namespace Search { - namespace Options { - -/****************************/ -/****************************/ -/****************************/ - -CModuleChooser::ModuleCheckBoxItem::ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module) : QCheckListItem(item, QString::null, QCheckListItem::CheckBox) { - m_module = module; - setText(0,m_module->name()); -}; - -CModuleChooser::ModuleCheckBoxItem::~ModuleCheckBoxItem() {} -; - -/** Returns the used module. */ -CSwordModuleInfo* const CModuleChooser::ModuleCheckBoxItem::module() const { - return m_module; -} - - -/****************************/ -/****************************/ -/****************************/ - -CModuleChooser::CModuleChooser(QWidget* parent) : KListView(parent) { - initView(); - initTree(); -} - -CModuleChooser::~CModuleChooser() {} - -void CModuleChooser::show() { - KListView::show(); - - //open module items - QListViewItemIterator it( this ); - for ( ; it.current(); ++it ) { - if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) { - if (i->isOn()) { - ensureItemVisible(i); - }; - } - } -} - -/** Initializes this widget and the childs of it. */ -void CModuleChooser::initView() { - addColumn( i18n("Work") ); - setRootIsDecorated(true); - // header()->hide(); - setFullWidth(true); -} - -/** Initializes the tree of this widget. */ -void CModuleChooser::initTree() { - ListCSwordModuleInfo mods = backend()->moduleList(); - /** - * The next steps: - * 1. Sort by type - * 2. Sort the modules of this type by their language - * 3. Create the subfolders for this - */ - - QMap<CSwordModuleInfo::ModuleType, QString> typenameMap; - typenameMap.insert(CSwordModuleInfo::Bible, i18n("Bibles")); - typenameMap.insert(CSwordModuleInfo::Commentary, i18n("Commentaries")); - typenameMap.insert(CSwordModuleInfo::Lexicon, i18n("Lexicons")); - typenameMap.insert(CSwordModuleInfo::GenericBook, i18n("Books")); - - int type = CSwordModuleInfo::Bible; - bool ok = true; - bool addedDevotionals = false; - bool addedGlossaries = false; - bool addedLexs = false; - bool incType = false; - - while (ok) { - ListCSwordModuleInfo modsForType; - QString typeFolderCaption = QString::null; - incType = false; - if (static_cast<CSwordModuleInfo::ModuleType>(type) == CSwordModuleInfo::Lexicon) { - if (!addedLexs) { - // for (mods.first(); mods.current(); mods.next()) { - ListCSwordModuleInfo::iterator end_it = mods.end(); - for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) { - if (((*it)->type() == CSwordModuleInfo::Lexicon) - && ((*it)->category() != CSwordModuleInfo::DailyDevotional) - && ((*it)->category() != CSwordModuleInfo::Glossary) - ) { - modsForType.append( *it ); - }; - }; - - addedLexs = true; - typeFolderCaption = QString::null; - } - else if (!addedDevotionals) { - // for (mods.first(); mods.current(); mods.next()) { - ListCSwordModuleInfo::iterator end_it = mods.end(); - for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) { - if ((*it)->category() == CSwordModuleInfo::DailyDevotional) { - modsForType.append(*it); - }; - }; - addedDevotionals = true; - typeFolderCaption = i18n("Daily Devotionals"); - } - else if (!addedGlossaries) { - // for (mods.first(); mods.current(); mods.next()) { - ListCSwordModuleInfo::iterator end_it = mods.end(); - for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) { - if ((*it)->category() == CSwordModuleInfo::Glossary) { - modsForType.append(*it); - }; - }; - addedGlossaries = true; - typeFolderCaption = i18n("Glossaries"); - }; - - if (addedLexs && addedDevotionals && addedGlossaries) - incType = true; - } - else if (type == CSwordModuleInfo::Bible || type == CSwordModuleInfo::Commentary || type == CSwordModuleInfo::GenericBook) { - // for (mods.first(); mods.current(); mods.next()) { - ListCSwordModuleInfo::iterator end_it = mods.end(); - for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) { - if ((*it)->type() == type) { - modsForType.append(*it); - }; - }; - incType = true; - } - else - ok = false; - - if (typeFolderCaption.isEmpty()) { - typeFolderCaption = typenameMap[static_cast<CSwordModuleInfo::ModuleType>(type)]; - } - - //get the available languages of the selected modules - QStringList langs; - // for (modsForType.first(); modsForType.current(); modsForType.next()) { - ListCSwordModuleInfo::iterator end_it = modsForType.end(); - for (ListCSwordModuleInfo::iterator it(modsForType.begin()); it != end_it; ++it) { - if ( !langs.contains(QString( (*it)->module()->Lang() ))) { - langs.append( (*it)->module()->Lang() ); - } - }; - langs.sort(); - - //go through the list of languages and create subfolders for each language and the modules of the language - QListViewItem* typeFolder = 0; - if (modsForType.count()) { - typeFolder = new QListViewItem(this, typeFolder, typeFolderCaption); - } - else { - if (incType) { - type++; - } - continue; - }; - - - QString language = QString::null; - CLanguageMgr* langMgr = languageMgr(); - for ( QStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { - language = langMgr->languageForAbbrev(*it)->translatedName(); - if (language.isEmpty()) { - language = (*it); - } - - QListViewItem* langFolder = new QListViewItem(typeFolder,language); - langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - - //create the module items of this lang folder - // for (modsForType.first(); modsForType.current(); modsForType.next()) { - ListCSwordModuleInfo::iterator end_modItr = modsForType.end(); - for (ListCSwordModuleInfo::iterator mod_Itr(modsForType.begin()); mod_Itr != end_modItr; ++mod_Itr) { - if (QString( (*mod_Itr)->module()->Lang() ) == (*it) ) { //found correct language - ModuleCheckBoxItem* i = new ModuleCheckBoxItem(langFolder, *mod_Itr); - i->setPixmap(0, CToolClass::getIconForModule(*mod_Itr)); - }; - }; - }; - typeFolder->setPixmap(0,SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); - - if (incType) { - ++type; - } - }; -} - -/** Returns a list of selected modules. */ -ListCSwordModuleInfo CModuleChooser::modules() { - ListCSwordModuleInfo mods; - QListViewItemIterator it( this ); - for ( ; it.current(); ++it ) { - if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) { - //add the module if the box is checked - if (i->isOn()) { - mods.append(i->module()); - }; - }; - }; - - return mods; -} - -/** Sets the list of modules and updates the state of the checkbox items. */ -void CModuleChooser::setModules( ListCSwordModuleInfo modules ) { - // qWarning("CModuleChooser::setModules( ListCSwordModuleInfo modules )"); - QListViewItemIterator it( this ); - for ( ; it.current(); ++it ) { - if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) { - i->setOn(modules.contains(i->module())); //set the status for the module checkbox item - // if (i->isOn()) { //if it's checked, show the item - // qWarning("show item!"); - // ensureItemVisible(i); - // } - } - }; -} - -/****************************/ - -CModuleChooserDialog::CModuleChooserDialog( QWidget* parentDialog, ListCSwordModuleInfo modules ) : -KDialogBase(Plain, i18n("Choose work(s)"), Ok, Ok, parentDialog, "CModuleChooser", false, true) { - initView(); - initConnections(); - - m_moduleChooser->setModules(modules); -}; - -CModuleChooserDialog::~CModuleChooserDialog() {} -; - -/** Initializes the view of this dialog */ -void CModuleChooserDialog::initView() { - setButtonOKText(i18n("Use chosen work(s)")); - - QFrame* page = plainPage(); - QHBoxLayout* layout = new QHBoxLayout(page); - m_moduleChooser = new CModuleChooser(page); - m_moduleChooser->setMinimumSize(320,400); - layout->addWidget(m_moduleChooser); -} - -/** Initializes the connections of this dialog. */ -void CModuleChooserDialog::initConnections() {} - -/** Reimplementation to handle the modules. */ -void CModuleChooserDialog::slotOk() { - emit modulesChanged( m_moduleChooser->modules() ); - - KDialogBase::slotOk(); -} - - } //end of namespace Search::Options -} //end of namespace Search diff --git a/bibletime/frontend/searchdialog/cmodulechooser.h b/bibletime/frontend/searchdialog/cmodulechooser.h deleted file mode 100644 index b40010e..0000000 --- a/bibletime/frontend/searchdialog/cmodulechooser.h +++ /dev/null @@ -1,117 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CMODULECHOOSER_H -#define CMODULECHOOSER_H - -//BibleTime includes - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" -#include "backend/cswordmodulesearch.h" - -#include "util/cpointers.h" - -//Sword includes - - -//Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> - -//KDE includes -#include <kdialog.h> -#include <kdialogbase.h> -#include <klistview.h> - -namespace Search { - namespace Options { - -class CModuleChooser : public KListView, public CPointers { - Q_OBJECT -public: - class ModuleCheckBoxItem : virtual public QCheckListItem { - public: - ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module); - ~ModuleCheckBoxItem(); - /** - * Returns the used module. - */ - CSwordModuleInfo* const module() const; - private: - CSwordModuleInfo* m_module; - }; - - CModuleChooser(QWidget* parent); - ~CModuleChooser(); - /** - * Sets the list of modules and updates the state of the checkbox items. - */ - void setModules( ListCSwordModuleInfo modules ); - /** - * Returns a list of selected modules. - */ - ListCSwordModuleInfo modules(); - -public slots: - /** - * Reimplemented to open the folders which contain checked module items - */ - virtual void show(); - - -protected: // Protected methods - /** - * Initializes this widget and the childs of it. - */ - void initView(); - /** - * Initializes the tree of this widget. - */ - void initTree(); -}; - -class CModuleChooserDialog : public KDialogBase { - Q_OBJECT -public: - CModuleChooserDialog(QWidget* parentDialog, ListCSwordModuleInfo modules); - ~CModuleChooserDialog(); - -signals: - void modulesChanged(ListCSwordModuleInfo modules); - -protected: // Protected methods - /** - * Initializes the view of this dialog - */ - void initView(); - /** - * Initializes the connections of this dialog. - */ - void initConnections(); - -protected slots: // Protected slots - /** - * Reimplementation to handle the modules. - */ - virtual void slotOk(); - -private: - CModuleChooser* m_moduleChooser; -}; - - } //end of namespace Search.Options -} //end of namespace Search - -#endif diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.cpp b/bibletime/frontend/searchdialog/cmoduleresultview.cpp deleted file mode 100644 index a3e1463..0000000 --- a/bibletime/frontend/searchdialog/cmoduleresultview.cpp +++ /dev/null @@ -1,269 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cmoduleresultview.h" - -#include "backend/cswordmoduleinfo.h" - -#include "frontend/util/csortlistviewitem.h" -#include "frontend/cexportmanager.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -//Qt includes - -//KDE includes -#include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> - - -namespace Search { - namespace Result { - -/******************************************** -************ ModuleResultList ************** -********************************************/ - -CModuleResultView::CModuleResultView(QWidget* parent, const char* name) : - KListView(parent, name) { - initView(); - initConnections(); - strongsResults = 0; -}; - -CModuleResultView::~CModuleResultView() {} -; - -/** Initializes this widget. */ -void CModuleResultView::initView() { - addColumn(i18n("Work")); - addColumn(i18n("Hits")); - setFullWidth(true); - - // setFullWidth(true); - setSorting(0, true); - setSorting(1, true); - setAllColumnsShowFocus(true); - - - //setup the popup menu - m_popup = new KPopupMenu(this); - // m_popup->insertTitle(i18n("Bible window")); - - m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, m_popup); - m_actions.copyMenu->setDelayed(false); - m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyResult()), this); - m_actions.copyMenu->insert(m_actions.copy.result); - m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyResultWithText()), this); - m_actions.copyMenu->insert(m_actions.copy.resultWithText); - m_actions.copyMenu->plug(m_popup); - - m_actions.saveMenu = new KActionMenu(i18n("Save..."), CResMgr::searchdialog::result::moduleList::saveMenu::icon, m_popup); - m_actions.saveMenu->setDelayed( false ); - m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveResult()), this); - m_actions.saveMenu->insert(m_actions.save.result); - m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveResultWithText()), this); - m_actions.saveMenu->insert(m_actions.save.resultWithText); - m_actions.saveMenu->plug(m_popup); - - m_actions.printMenu = new KActionMenu(i18n("Print..."), CResMgr::searchdialog::result::moduleList::printMenu::icon, m_popup); - m_actions.printMenu->setDelayed(false); - m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printResult()), this); - m_actions.printMenu->insert(m_actions.print.result); - - - m_actions.printMenu->plug(m_popup); -} - -/** Initializes the connections of this widget, */ -void CModuleResultView::initConnections() { - connect(this, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(executed(QListViewItem*))); - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&))); -} - -/** Setups the tree using the given list of modules. */ -void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const QString& searchedText ) { - clear(); - - util::CSortListViewItem* item = 0; - util::CSortListViewItem* oldItem = 0; - sword::ListKey result; - - if (strongsResults) { - delete strongsResults; - strongsResults = 0; - } - - bool strongsAvailable = false; - - ListCSwordModuleInfo::iterator end_it = modules.end(); - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - // for (modules.first(); modules.current(); modules.next()) { - result = (*it)->searchResult(); - - item = new util::CSortListViewItem(this, (*it)->name(), QString::number(result.Count()) ); - item->setColumnSorting(1, util::CSortListViewItem::Number); - - item->setPixmap(0,CToolClass::getIconForModule(*it) ); - oldItem = item; - //---------------------------------------------------------------------- - // we need to make a decision here. Either don't show any Strong's - // number translations, or show the first one in the search text, or - // figure out how to show them all. - // I choose option number 2 at this time. - //---------------------------------------------------------------------- - int sstIndex, sTokenIndex; // strong search text index for finding "strong:" - if ((sstIndex = searchedText.find("strong:", 0)) != -1) { - QString sNumber; - //-------------------------------------------------- - // get the strongs number from the search text - //-------------------------------------------------- - // first find the first space after "strong:" - // this should indicate a change in search token - sstIndex = sstIndex + 7; - sTokenIndex = searchedText.find(" ", sstIndex); - sNumber = searchedText.mid(sstIndex, sTokenIndex - sstIndex); - - setupStrongsResults((*it), item, sNumber); - - item->setOpen(true); - strongsAvailable = true; - } - }; - - //Allow to hide the module strongs if there are any available - setRootIsDecorated( strongsAvailable ); - - setSelected(currentItem(), true); - executed(currentItem()); -} - -void CModuleResultView::setupStrongsResults(CSwordModuleInfo* module, QListViewItem* parent, - const QString& sNumber) { - QString lText; - util::CSortListViewItem* item = 0; - - strongsResults = new StrongsResultClass(module, sNumber); - - for (int cnt = 0; cnt < strongsResults->Count(); ++cnt) { - lText = strongsResults->keyText(cnt); - - item = new util::CSortListViewItem(parent, lText, QString::number(strongsResults->keyCount(cnt))); - item->setColumnSorting(1, util::CSortListViewItem::Number); - } -} - - -/** Is executed when an item was selected in the list. */ -void CModuleResultView::executed( QListViewItem* i ) { - QString itemText, lText; - - if (CSwordModuleInfo* m = CPointers::backend()->findModuleByName(i->text(0))) { - emit moduleChanged(); - emit moduleSelected(m); - return; - } - - if (!strongsResults) { - return; - } - - itemText = i->text(0); - for (int cnt = 0; cnt < strongsResults->Count(); cnt++) { - lText = strongsResults->keyText(cnt); - if (lText == itemText) { - //clear the verses list - emit moduleChanged(); - emit strongsSelected(activeModule(), strongsResults->getKeyList(cnt)); - return; - } - } -} - -/** Returns the currently active module. */ -CSwordModuleInfo* const CModuleResultView::activeModule() { - Q_ASSERT(currentItem()); - - QListViewItem* item = currentItem(); - if (!item) { - return 0; - } - - // we need to find the parent most node because that is the node - // that is the module name. - while (item->parent()) { - item = item->parent(); - } - - if (item) { - return CPointers::backend()->findModuleByName(item->text(0)); - } - - return 0; -} - -/** No descriptions */ -void CModuleResultView::showPopup(KListView*, QListViewItem*, const QPoint& point) { - //make sure that all entries have the correct status - m_popup->exec(point); -} - -/** Copies the whole search result into the clipboard. */ -void CModuleResultView::copyResult() { - if (CSwordModuleInfo* m = activeModule()) { - sword::ListKey result = m->searchResult(); - CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result")); - mgr.copyKeyList(&result,m,CExportManager::Text,false); - }; -} - -/** Copies the whole search result with the text into the clipboard. */ -void CModuleResultView::copyResultWithText() { - if (CSwordModuleInfo* m = activeModule()) { - sword::ListKey result = m->searchResult(); - CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result")); - mgr.copyKeyList(&result,m,CExportManager::Text,true); - }; -} - -/** Saves the search result keys. */ -void CModuleResultView::saveResult() { - if (CSwordModuleInfo* m = activeModule()) { - sword::ListKey result = m->searchResult(); - CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result")); - mgr.saveKeyList(&result,m,CExportManager::Text,false); - }; -} - -/** Saves the search result with it's text. */ -void CModuleResultView::saveResultWithText() { - if (CSwordModuleInfo* m = activeModule()) { - sword::ListKey result = m->searchResult(); - CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result")); - mgr.saveKeyList(&result,m,CExportManager::Text,true); - }; -} - -/** Appends the whole search result to the printer queue. */ -void CModuleResultView::printResult() { - if (CSwordModuleInfo* m = activeModule()) { - sword::ListKey result = m->searchResult(); - CExportManager mgr(i18n("Print search result..."), true, i18n("Printing search result")); - mgr.printKeyList(&result,m,CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults()); - }; -} - - } //end of namespace Search.Result -} //end of namespace Search diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.h b/bibletime/frontend/searchdialog/cmoduleresultview.h deleted file mode 100644 index 7153f6f..0000000 --- a/bibletime/frontend/searchdialog/cmoduleresultview.h +++ /dev/null @@ -1,135 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CMODULERESULTSVIEW_H -#define CMODULERESULTSVIEW_H - -//BibleTime includes -#include "backend/cswordmoduleinfo.h" -#include "csearchdialogpages.h" - -//Qt includes - -//KDE includes -#include <klistview.h> - -//forward declarations -class QLabel; -class QCheckBox; -class QPushButton; -class QRadioButton; - -class KComboBox; -class KActionMenu; -class KAction; -class KHistoryCombo; -class KProgress; -class KPopupMenu; - -class CReadDisplay; - -namespace Search { - namespace Result { - -class CModuleResultView : public KListView { - Q_OBJECT -public: - CModuleResultView(QWidget* parent, const char* name = 0); - ~CModuleResultView(); - - /** - * Setups the tree using the given list of modules. - */ - void setupTree( ListCSwordModuleInfo modules, const QString& searchedText ); - /** - * Returns the currently active module. - */ - CSwordModuleInfo* const activeModule(); - -protected: // Protected methods - /** - * Initializes this widget. - */ - void initView(); - /** - * Initializes the connections of this widget - */ - void initConnections(); - - void setupStrongsResults(CSwordModuleInfo* module, QListViewItem* parent, const QString& searchedText); - -protected slots: // Protected slots - /** - * Is executed when an item was selected in the list. - */ - void executed( QListViewItem* ); - /** - * Copies the whole search result with the text into the clipboard. - */ - void copyResultWithText(); - /** - * Copies the whole search result into the clipboard. - */ - void copyResult(); - /** - * This slot opens the popup menu at the given position - */ - void showPopup(KListView*, QListViewItem*, const QPoint&); - /** - * Appends the whole search result to the printer queue. - */ - void printResult(); - /** - * Saves the search result with it's text. - */ - void saveResultWithText(); - /** - * Saves the search result keys. - */ - void saveResult(); - -signals: - void moduleSelected(CSwordModuleInfo*); - void moduleChanged(); - void strongsSelected(CSwordModuleInfo*, QStringList*); - -private: - struct { - KActionMenu* saveMenu; - struct { - KAction* result; - KAction* resultWithText; - } - save; - - KActionMenu* printMenu; - struct { - KAction* result; - } - print; - - KActionMenu* copyMenu; - struct { - KAction* result; - KAction* resultWithText; - } - copy; - - } m_actions; - - KPopupMenu* m_popup; - StrongsResultClass* strongsResults; -}; - - } //end of namespace Search::Result -} //end of namespace Search - -#endif diff --git a/bibletime/frontend/searchdialog/crangechooser.cpp b/bibletime/frontend/searchdialog/crangechooser.cpp deleted file mode 100644 index ca9aac9..0000000 --- a/bibletime/frontend/searchdialog/crangechooser.cpp +++ /dev/null @@ -1,287 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "crangechooser.h" - -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" - -#include "frontend/cbtconfig.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -//Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> - -//KDE includes -#include <kapplication.h> -#include <kfiledialog.h> -#include <klocale.h> -#include <kiconloader.h> - -namespace Search { - namespace Options { - -/****************************/ -CRangeChooserDialog::RangeItem::RangeItem(QListView* view, QListViewItem* afterThis, const QString caption, const QString range) : KListViewItem(view, afterThis) { - setCaption(caption); - setRange(range); -} - -CRangeChooserDialog::RangeItem::~RangeItem() {} - -const QString& CRangeChooserDialog::RangeItem::range() { - // qWarning("ange is %s", (const char*)m_range.utf8()); - return m_range; -} - -void CRangeChooserDialog::RangeItem::setRange(QString newRange) { - m_range = newRange; -} - -const QString CRangeChooserDialog::RangeItem::caption() { - return text(0); -} - -void CRangeChooserDialog::RangeItem::setCaption(const QString newCaption) { - setText(0, newCaption); -} - - -/**************************/ -CRangeChooserDialog::CRangeChooserDialog( QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search range editor"), Default | Ok | Cancel, Ok, parentDialog, "CRangeChooserDialog", false, true) { - initView(); - initConnections(); - - //add the existing scopes - CBTConfig::StringMap map = CBTConfig::get - (CBTConfig::searchScopes); - CBTConfig::StringMap::Iterator it; - for (it = map.begin(); it != map.end(); ++it) { - new RangeItem(m_rangeList, 0, it.key(), it.data()); - }; - - editRange(0); - if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) - ) { - nameChanged(i->caption()); - } -} - -CRangeChooserDialog::~CRangeChooserDialog() {} - -/** Initializes the view of this object. */ -void CRangeChooserDialog::initView() { - // setButtonOKText(i18n("")); - - QGridLayout* grid = new QGridLayout(plainPage(),6,5,0,3); - - m_rangeList = new KListView(plainPage()); - m_rangeList->addColumn(i18n("Search range")); - m_rangeList->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding)); - m_rangeList->setFullWidth(true); - m_rangeList->setSorting(0, true); - m_rangeList->header()->setClickEnabled(false); - m_rangeList->header()->setMovingEnabled(false); - grid->addMultiCellWidget(m_rangeList,0,4,0,1); - - m_newRangeButton = new QPushButton(i18n("Add new range"),plainPage()); - connect(m_newRangeButton, SIGNAL(clicked()), this, SLOT(addNewRange())); - grid->addWidget(m_newRangeButton,5,0); - - m_deleteRangeButton = new QPushButton(i18n("Delete current range"),plainPage()); - connect(m_deleteRangeButton, SIGNAL(clicked()), this, SLOT(deleteCurrentRange())); - grid->addWidget(m_deleteRangeButton,5,1); - - grid->addColSpacing(2, 5); - - QLabel* label = new QLabel(i18n("Name:"), plainPage()); - m_nameEdit = new QLineEdit(plainPage()); - grid->addWidget(label,0,3); - grid->addWidget(m_nameEdit,0,4); - - label = new QLabel(i18n("Edit current search range:"), plainPage()); - label->setFixedSize(label->sizeHint()); - m_rangeEdit = new QTextEdit(plainPage()); - m_rangeEdit->setTextFormat(Qt::PlainText); - grid->addMultiCellWidget(label,1,1,3,4); - grid->addMultiCellWidget(m_rangeEdit,2,2,3,4); - - grid->addRowSpacing(3, 10); - - m_resultList = new KListView(plainPage()); - m_resultList->addColumn(i18n("Parsed search range:")); - m_resultList->setFullWidth(true); - m_resultList->setSorting(-1); - m_resultList->setShowSortIndicator(false); - m_resultList->header()->setClickEnabled(false); - m_resultList->header()->setMovingEnabled(false); - m_resultList->setSelectionModeExt(KListView::NoSelection); - - grid->addMultiCellWidget(m_resultList, 4,5,3,4); - - grid->setRowStretch(4,5); -} - -/** Initializes the connections of this widget. */ -void CRangeChooserDialog::initConnections() { - connect(m_rangeList, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(editRange(QListViewItem*))); - - connect(m_rangeEdit, SIGNAL(textChanged()), - this, SLOT(parseRange())); - connect(m_rangeEdit, SIGNAL(textChanged()), - this, SLOT(rangeChanged())); - - connect(m_nameEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(nameChanged(const QString&))); -} - -/** Adds a new range to the list. */ -void CRangeChooserDialog::addNewRange() { - RangeItem* i = new RangeItem(m_rangeList, m_rangeList->lastItem(), i18n("New range")); - m_rangeList->setSelected(i, true); - m_rangeList->setCurrentItem(i); - editRange(i); - - m_nameEdit->setFocus(); -} - -/** No descriptions */ -void CRangeChooserDialog::editRange(QListViewItem* item) { - RangeItem* const range = dynamic_cast<RangeItem*>(item); - - m_nameEdit->setEnabled( range ); //only if an item is selected enable the edit part - m_rangeEdit->setEnabled( range ); - m_resultList->setEnabled( range ); - m_deleteRangeButton->setEnabled( range ); - - if (range) { - m_nameEdit->setText(range->caption()); - m_rangeEdit->setText(range->range()); - } -} - -/** Parses the entered text and prints out the result in the list box below the edit area. */ -void CRangeChooserDialog::parseRange() { - m_resultList->clear(); - - //hack: repair range to work with Sword 1.5.6 - QString range( m_rangeEdit->text() ); - range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" ); - - sword::VerseKey key; - sword::ListKey verses = key.ParseVerseList((const char*)range.utf8(), "Genesis 1:1", true); - for (int i = 0; i < verses.Count(); ++i) { - new KListViewItem(m_resultList, QString::fromUtf8(verses.GetElement(i)->getRangeText())); - // qWarning("range=%s, text=%s",verses.GetElement(i)->getRangeText(), verses.GetElement(i)->getText() ); - } - -} - -/** No descriptions */ -void CRangeChooserDialog::rangeChanged() { - if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) - ) { - QString range( m_rangeEdit->text() ); - //hack: repair range to work with Sword 1.5.6 - range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" ); - i->setRange(range); - }; -} - -/** No descriptions */ -void CRangeChooserDialog::nameChanged(const QString& newCaption) { - m_rangeEdit->setEnabled(!newCaption.isEmpty()); - m_resultList->setEnabled(!newCaption.isEmpty()); - m_resultList->header()->setEnabled(!newCaption.isEmpty()); - - if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) - ) { - if (!newCaption.isEmpty()) { - m_newRangeButton->setEnabled(true); - i->setCaption(newCaption); - m_rangeList->sort(); - } - else { //invalid name - i->setCaption(i18n("<invalid name of search range>")); - m_newRangeButton->setEnabled(false); - }; - }; -} - -/** Deletes the selected range. */ -void CRangeChooserDialog::deleteCurrentRange() { - if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) - ) { - if (QListViewItem* selection = i->itemBelow() ? i->itemBelow() : i->itemAbove()) { - m_rangeList->setSelected(selection, true); - m_rangeList->setCurrentItem(selection); - } - else { - m_rangeList->setSelected(m_rangeList->firstChild(), true); - m_rangeList->setCurrentItem(m_rangeList->firstChild()); - } - delete i; - } - editRange(m_rangeList->currentItem()); -} - -void CRangeChooserDialog::slotOk() { - //save the new map of search scopes - CBTConfig::StringMap map; - QListViewItemIterator it( m_rangeList ); - for (;it.current(); ++it) { - if ( RangeItem* i = dynamic_cast<RangeItem*>(it.current()) ) { - map[i->caption()] = i->range(); - }; - }; - CBTConfig::set - (CBTConfig::searchScopes, map); - - KDialogBase::slotOk(); -} - -void CRangeChooserDialog::slotDefault() { - m_rangeList->clear(); - CBTConfig::StringMap map = CBTConfig::getDefault(CBTConfig::searchScopes); - CBTConfig::StringMap::Iterator it; - for (it = map.begin(); it != map.end(); ++it) { - new RangeItem(m_rangeList, 0, it.key(), it.data()); - }; - m_rangeList->setSelected(m_rangeList->selectedItem(), false); - m_rangeList->setCurrentItem(0); - - editRange(0); - if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) - ) { - nameChanged(i->caption()); - } - - KDialogBase::slotDefault(); -} - - } //end of namespace Search::Options -} //end of namespace Search diff --git a/bibletime/frontend/searchdialog/crangechooser.h b/bibletime/frontend/searchdialog/crangechooser.h deleted file mode 100644 index 8acb0c6..0000000 --- a/bibletime/frontend/searchdialog/crangechooser.h +++ /dev/null @@ -1,106 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CRANGECHOOSER_H -#define CRANGECHOOSER_H - -//BibleTime includes -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" - -#include "util/cpointers.h" - -//Sword includes - - -//Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> - -//KDE includes -#include <kdialog.h> -#include <kdialogbase.h> -#include <klistview.h> - -//forward declarations -class CSearchAnalysisItem; -class CSearchAnalysisLegendItem; -class CSearchAnalysis; -class CSearchAnalysisView; - -class QTextEdit; - -namespace Search { - namespace Options { - -class CRangeChooserDialog : public KDialogBase { - Q_OBJECT -public: - CRangeChooserDialog(QWidget* parentDialog); - ~CRangeChooserDialog(); - -protected: // Protected methods -class RangeItem : public KListViewItem { -public: - RangeItem(QListView*, QListViewItem* afterThis = 0, const QString caption = QString::null, const QString range = QString::null); - ~RangeItem(); - const QString& range(); - const QString caption(); - void setRange(QString range); - void setCaption(const QString); -private: - QString m_range; - }; - - /** - * Initializes the connections of this widget. - */ - void initConnections(); - /** - * Initializes the view of this object. - */ - void initView(); - -protected slots: // Protected slots - /** - * Adds a new range to the list. - */ - void addNewRange(); - void editRange(QListViewItem*); - /** - * Parses the entered text and prints out the result in the list box below the edit area. - */ - void parseRange(); - void nameChanged(const QString&); - void rangeChanged(); - /** - * Deletes the selected range. - */ - void deleteCurrentRange(); - virtual void slotDefault(); - virtual void slotOk(); - -private: - KListView* m_rangeList; - KListView* m_resultList; - QLineEdit* m_nameEdit; - QTextEdit* m_rangeEdit; - QPushButton* m_newRangeButton; - QPushButton* m_deleteRangeButton; -}; - - } //end of namespace Search.Options -} //end of namespace Search - -#endif diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp deleted file mode 100644 index 2c64f21..0000000 --- a/bibletime/frontend/searchdialog/csearchanalysis.cpp +++ /dev/null @@ -1,587 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "csearchanalysis.h" -#include "csearchdialog.h" - -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" - -#include "frontend/cbtconfig.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -//Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> - -//KDE includes -#include <kapplication.h> -#include <kfiledialog.h> -#include <klocale.h> -#include <kiconloader.h> - -namespace Search { - namespace Analysis { - -const int SPACE_BETWEEN_PARTS = 5; -const int RIGHT_BORDER = 15; -const int LEFT_BORDER = 15; -const int LOWER_BORDER = 10; -const int UPPER_BORDER = 10; - -const int ITEM_TEXT_SIZE = 8; -const int LABEL_TEXT_SIZE = 6; - -//used for the shift between the bars -const int BAR_DELTAX = 4; -const int BAR_DELTAY = 2; -const int BAR_WIDTH = 2 + (2*BAR_DELTAX); //should be equal or bigger than the label font size -// Used for the text below the bars -const int BAR_LOWER_BORDER = 100; - -const int LEGEND_INNER_BORDER = 5; -const int LEGEND_DELTAY = 4; -const int LEGEND_WIDTH = 85; - -/****************************/ - -CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true) { - initView(); - initConnections(); - m_analysis->reset(); - m_analysis->analyse(modules); - showMaximized(); -}; - -CSearchAnalysisDialog::~CSearchAnalysisDialog() {} -; - -/** Initializes this dialog. */ -void CSearchAnalysisDialog::initView() { - QVBoxLayout* layout = new QVBoxLayout(plainPage(),0); - - QPushButton* button = new QPushButton(plainPage(), "button"); - button->setIconSet(SmallIconSet("filesave")); - button->setText(i18n("Save search analysis as HTML")); - button->setFixedSize(button->sizeHint()); - layout->addWidget(button); - layout->addSpacing(10); - - m_analysis = new CSearchAnalysis(plainPage()); - m_analysisView = new CSearchAnalysisView(m_analysis, plainPage()); - m_analysisView->show(); - layout->addWidget(m_analysisView); - - connect(button, SIGNAL(clicked()), m_analysis, SLOT(saveAsHTML())); -} - -/** Initializes the widgets SIGNAL and SLOT connections,. */ -void CSearchAnalysisDialog::initConnections() {} - -/****************************/ -/* CSearchAnalysis */ -/****************************/ - -CSearchAnalysis::CSearchAnalysis(QObject *parent, const char *name ) -: QCanvas(parent,name) { - - m_scaleFactor = 0.0; - m_legend = 0; - setBackgroundColor(Qt::white); - m_canvasItemList.resize(67); - m_canvasItemList.setAutoDelete(true); - resize(1,1); - connect(this, SIGNAL(resized()), SLOT(slotResized())); -} - -CSearchAnalysis::~CSearchAnalysis() {} - -QDict<CSearchAnalysisItem>* CSearchAnalysis::getSearchAnalysisItemList() { - // Returns pointer to the search analysis items - return &m_canvasItemList; -} - -/** Starts the analysis of the search result. This should be called only once because QCanvas handles the updates automatically. */ -void CSearchAnalysis::analyse(ListCSwordModuleInfo modules) { - /** - * Steps of analysing our search result; - * -Create the items for all available books ("Genesis" - "Revelation") - * -Iterate through all modules we analyse - * -Go through all books of this module - * -Find out how many times we found the book - * -Set the count to the items which belongs to the book - */ - setModules(modules); - - m_lastPosList.clear(); - const int numberOfModules = m_moduleList.count(); - if (!numberOfModules) - return; - m_legend = new CSearchAnalysisLegendItem(this, &m_moduleList); - m_legend->setX(LEFT_BORDER); - m_legend->setY(UPPER_BORDER); - m_legend->setSize(LEGEND_WIDTH, - LEGEND_INNER_BORDER*2 + ITEM_TEXT_SIZE*numberOfModules + LEGEND_DELTAY*(numberOfModules-1)); - m_legend->show(); - - int xPos = LEFT_BORDER + m_legend->width() + SPACE_BETWEEN_PARTS; - int moduleIndex = 0; - m_maxCount = 0; - int count = 0; - CSwordVerseKey key(0); - key.key("Genesis 1:1"); - - CSearchAnalysisItem* analysisItem = m_canvasItemList[key.book()]; - bool ok = true; - while (ok && analysisItem) { - // for (moduleIndex = 0,m_moduleList.first(); m_moduleList.current(); m_moduleList.next(),++moduleIndex) { - moduleIndex = 0; - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) { - KApplication::kApplication()->processEvents( 10 ); //10 ms only - if (!m_lastPosList.contains(*it)) { - m_lastPosList.insert(*it,0); - } - - analysisItem->setCountForModule(moduleIndex, (count = getCount(key.book(), *it))); - m_maxCount = (count > m_maxCount) ? count : m_maxCount; - - ++moduleIndex; - } - analysisItem->setX(xPos); - analysisItem->setY(UPPER_BORDER); - analysisItem->show(); - - xPos += (int)analysisItem->width() + SPACE_BETWEEN_PARTS; - ok = key.next(CSwordVerseKey::UseBook); - analysisItem = m_canvasItemList[key.book()]; - } - resize(xPos+BAR_WIDTH+(m_moduleList.count()-1)*BAR_DELTAX+RIGHT_BORDER, height() ); - slotResized(); -} - -/** Sets te module list used for the analysis. */ -void CSearchAnalysis::setModules(ListCSwordModuleInfo modules) { - m_moduleList.clear(); - // for (modules.first(); modules.current(); modules.next()) { - ListCSwordModuleInfo::iterator end_it = modules.end(); - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - if ( ((*it)->type() == CSwordModuleInfo::Bible) || ((*it)->type() == CSwordModuleInfo::Commentary) ) { //a Bible or an commentary - m_moduleList.append(*it); - } - } - - m_canvasItemList.clear(); - CSearchAnalysisItem* analysisItem = 0; - CSwordVerseKey key(0); - key.key("Genesis 1:1"); - do { - analysisItem = new CSearchAnalysisItem(this, m_moduleList.count(), key.book(), &m_scaleFactor, &m_moduleList); - analysisItem->hide(); - m_canvasItemList.insert(key.book(), analysisItem); - } - while (key.next(CSwordVerseKey::UseBook)); - update(); -} - -/** Sets back the items and deletes things to cleanup */ -void CSearchAnalysis::reset() { - m_scaleFactor = 0.0; - - QDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); // iterator for items - while ( it.current() ) { - it.current()->hide(); - ++it; - } - m_lastPosList.clear(); - - if (m_legend) { - m_legend->hide(); - } - - delete m_legend; - m_legend = 0; - - update(); -} - -/** No descriptions */ -void CSearchAnalysis::slotResized() { - m_scaleFactor = (double)( (double)(height()-UPPER_BORDER-LOWER_BORDER-BAR_LOWER_BORDER-(m_moduleList.count()-1)*BAR_DELTAY) - /(double)m_maxCount); - QDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); - while ( it.current() ) { - it.current()->setSize(BAR_WIDTH + (m_moduleList.count()-1)*BAR_DELTAX, height()-UPPER_BORDER-LOWER_BORDER); - it.current()->setY(UPPER_BORDER); - ++it; - } - update(); -} - -/** This function returns a color for each module */ -QColor CSearchAnalysis::getColor(int index) { - switch (index) { - case 0: - return Qt::red; - case 1: - return Qt::darkGreen; - case 2: - return Qt::blue; - case 3: - return Qt::cyan; - case 4: - return Qt::magenta; - case 5: - return Qt::darkRed; - case 6: - return Qt::darkGray; - case 7: - return Qt::black; - case 8: - return Qt::darkCyan; - case 9: - return Qt::darkMagenta; - default: - return Qt::red; - } -} - -/** Returns the count of the book in the module */ -const unsigned int CSearchAnalysis::getCount( const QString book, CSwordModuleInfo* module ) { - sword::ListKey& result = module->searchResult(); - const int length = book.length(); - unsigned int i = m_lastPosList[module]; - unsigned int count = 0; - const unsigned int resultCount = result.Count(); - while (i < resultCount) { - if ( strncmp(book.utf8(), (const char*)*result.GetElement(i), length) ) - break; - i++; - ++count; - } - m_lastPosList.contains(module) ? m_lastPosList.replace(module,i) : m_lastPosList.insert(module,i); - - return count; -} - - -//------------------------------------------------------------------ -//------------------------------------------------------------------ - -CSearchAnalysisItem::CSearchAnalysisItem(QCanvas *parent, const int moduleCount, const QString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules) -: QCanvasRectangle(parent), -m_moduleList( modules ), -m_scaleFactor(scaleFactor), -m_bookName(bookname), -m_moduleCount(moduleCount), -m_bufferPixmap(0) { - m_resultCountArray.resize(m_moduleCount); - int index = 0; - for (index = 0; index < m_moduleCount; ++index) - m_resultCountArray[index] = 0; -} - -CSearchAnalysisItem::~CSearchAnalysisItem() { - delete m_bufferPixmap; -} - -/** Sets the resultcount of this item for the given module */ -void CSearchAnalysisItem::setCountForModule( const int moduleIndex, const int count) { - m_resultCountArray[moduleIndex] = count; -} - -/** Returns the resultcount of this item for the given module */ -int CSearchAnalysisItem::getCountForModule( const int moduleIndex) { - return m_resultCountArray[moduleIndex]; -} - -/** Reimplementation. Draws the content of this item. */ -void CSearchAnalysisItem::draw(QPainter& painter) { - QFont f = painter.font(); - f.setPointSize(ITEM_TEXT_SIZE); - painter.setFont(f); - - setPen(QPen(black,1)); - setBrush(Qt::red); - /** - * We have to paint so many bars as we have modules available (we use m_moduleCount) - * We paint inside the area which is given by height and width of this rectangle item - */ - int index = 0; - int drawn = 0; - int Value = 0; - - //find out the biggest value - for (index=0;index < m_moduleCount; index++) { - if (m_resultCountArray[index] > Value) { - Value = m_resultCountArray[index]; - } - }; - - while (drawn < m_moduleCount) { - for (index = 0; index < m_moduleCount; index++) { - if (m_resultCountArray[index] == Value) { - QPoint p1((int)x() + (m_moduleCount-drawn-1)*BAR_DELTAX, - (int)height() + (int)y() - BAR_LOWER_BORDER - (m_moduleCount-drawn)*BAR_DELTAY); - QPoint p2(p1.x() + BAR_WIDTH, - p1.y() - (int)( !m_resultCountArray[index] ? 0 : ((m_resultCountArray[index])*(*m_scaleFactor))) ); - QRect r(p1, p2); - painter.fillRect(r, QBrush(CSearchAnalysis::getColor(index)) ); - painter.drawRect(r); - drawn++; - } - } - //finds the next smaller value - int newValue = 0; - for (index=0;index < m_moduleCount; index++) - if (m_resultCountArray[index] < Value && m_resultCountArray[index] >= newValue) - newValue = m_resultCountArray[index]; - Value = newValue; - } - if (!m_bufferPixmap) { - m_bufferPixmap = new QPixmap(); - m_bufferPixmap->resize(width(),BAR_LOWER_BORDER); - m_bufferPixmap->fill(); - QPainter p(m_bufferPixmap); - f = p.font(); - f.setPointSize(ITEM_TEXT_SIZE); - p.setFont(f); - p.rotate(90); - p.drawText(QPoint(5,0), m_bookName); - } - painter.drawPixmap(QPoint(int(x()),int(height()+y()-BAR_LOWER_BORDER)), *m_bufferPixmap); -} - -/** Returns the width of this item. */ -int CSearchAnalysisItem::width() { - return m_moduleCount*(m_moduleCount>1 ? BAR_DELTAX : 0) + BAR_WIDTH; -} - -/** Returns the tooltip for this item. */ -const QString CSearchAnalysisItem::getToolTip() { - QString ret = QString("<center><b>%1</b></center><hr/>").arg(m_bookName); - ret += "<table cellspacing=\"0\" cellpadding=\"3\" width=\"100%\" height=\"100%\" align=\"center\">"; - - //ToDo: Fix that loop - int i = 0; - ListCSwordModuleInfo::iterator end_it = m_moduleList->end(); - - for (ListCSwordModuleInfo::iterator it(m_moduleList->begin()); it != end_it; ++it) { - // for (int i = 0; i < m_moduleCount; ++i) { - CSwordModuleInfo* info = (*it); - const QColor c = CSearchAnalysis::getColor(i); - - ret.append( - QString("<tr bgcolor=\"white\"><td><b><font color=\"#%1\">%2</font></b></td><td>%3 (%4%)</td></tr>") - .arg(QString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue())) - .arg(info ? info->name() : QString::null) - .arg( m_resultCountArray[i] ) - .arg( (info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2) - ); - ++i; - } - - ret += "</table>"; - - return ret; -} - -//------------------------------------------------------------------ -//------------------------------------------------------------------ - -CSearchAnalysisView::CSearchAnalysisView(QCanvas* canvas, QWidget* parent) -: QCanvasView(canvas, parent) { - setFocusPolicy(QWidget::WheelFocus); - m_toolTip = new ToolTip(this); - resize(sizeHint()); -} - -/** Returns the sizeHint for this view */ -QSize CSearchAnalysisView::sizeHint() { - if ( parentWidget() ) - return parentWidget()->sizeHint(); - return QCanvasView::sizeHint(); -} - -/** No descriptions */ -void CSearchAnalysisView::resizeEvent( QResizeEvent* e) { - QCanvasView::resizeEvent(e); - canvas()->resize( canvas()->width(), viewport()->height() ); -} - -CSearchAnalysisView::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {} - -void CSearchAnalysisView::ToolTip::maybeTip(const QPoint& p) { - CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(parentWidget()); - if (!view) - return; - QPoint point(p); - point = view->viewport()->mapFrom(view, point); - CSearchAnalysisItem* i = view->itemAt( view->viewportToContents(point) ); - if (!i) - return; - - //get type of item and display correct text - QString text = i->getToolTip(); - if (text.isEmpty()) - return; - - QPoint p1 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().topLeft())); - p1.setY(0); - QPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight())); - p2.setY(view->height()); - QRect r = QRect( p1, p2 ); - if (r.contains(p)) - tip(r, text); -} - - -/** Returns the item at position p. If there no item at that point return 0. */ -CSearchAnalysisItem* CSearchAnalysisView::itemAt( const QPoint& p ) { - QCanvasItemList l = canvas()->collisions(p); - if (!l.count()) - return 0; - return dynamic_cast<CSearchAnalysisItem*>(l.first()); -} - -//------------------------------------------------------------------ -//------------------------------------------------------------------ - -CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(QCanvas *parent, ListCSwordModuleInfo *list ) -: QCanvasRectangle(parent) { - m_moduleList = list; -} - -/** Reimplementation. Draws the content of this item. */ -void CSearchAnalysisLegendItem::draw (QPainter& painter) { - painter.save(); - - setPen( QPen(black,2) ); - setBrush( Qt::white ); - //the outer rectangle - QPoint p1( (int)x(), (int)y() ); - QPoint p2( (int)x()+width(), (int)y() + height() ); - QRect r(p1, p2); - r.normalize(); - painter.drawRect(r); - - QFont f = painter.font(); - f.setPointSize(ITEM_TEXT_SIZE); - painter.setFont(f); - - // for (unsigned int index=0; index < m_moduleList->count(); index++){ - int moduleIndex = 0; - ListCSwordModuleInfo::iterator end_it = m_moduleList->end(); - for (ListCSwordModuleInfo::iterator it(m_moduleList->begin()); it != end_it; ++it) { - // the module color indicators - QPoint p1( (int)x() + LEGEND_INNER_BORDER, (int)y() + LEGEND_INNER_BORDER + moduleIndex*(LEGEND_DELTAY + ITEM_TEXT_SIZE) ); - QPoint p2(p1.x() + ITEM_TEXT_SIZE, p1.y() + ITEM_TEXT_SIZE); - QRect r(p1,p2); - painter.fillRect(r, QBrush(CSearchAnalysis::getColor(moduleIndex)) ); - r.normalize(); - painter.drawRect(r); - - QPoint p3( p2.x() + LEGEND_INNER_BORDER, p2.y() ); - painter.drawText(p3, (*it)->name() ); - - ++moduleIndex; - } - painter.restore(); -} - -/** No descriptions */ -void CSearchAnalysis::saveAsHTML() { - const QString file = KFileDialog::getSaveFileName(QString::null, - QString("*.html | %1").arg(i18n("HTML files")), - 0, - i18n("Save Search Analysis")); - if (file.isNull()) { - return; - } - - int moduleIndex = 0; - int count = 0; - QString countStr = ""; - QString m_searchAnalysisHTML = ""; - QString tableTitle = ""; - QString tableTotals = ""; - QString VerseRange = ""; - const QString txtCSS = QString("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n"); - const QString metaEncoding = QString("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">"); - CSwordVerseKey key(0); - sword::ListKey searchResult; - - key.key("Genesis 1:1"); - - CSearchAnalysisItem* analysisItem = m_canvasItemList.find( key.book() ); - - QString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n"; - text += "<table>\n<tr><th>" + i18n("Search text :") + "</th><th>" + CSearchDialog::getSearchDialog()->searchText() + "</th></tr>\n"; - - tableTitle = "<tr><th align=\"left\">" + i18n("Book") + "</th>"; - tableTotals = "<tr><td align=\"left\">" + i18n("Total hits") + "</td>"; - // for (moduleIndex = 0,m_moduleList.first(); m_moduleList.current(); m_moduleList.next(),++moduleIndex) { - moduleIndex = 0; - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) { - tableTitle += QString("<th align=\"left\">") + (*it)->name() + QString("</th>"); - searchResult = (*it)->searchResult(); - countStr.setNum(searchResult.Count()); - - tableTotals += QString("<td align=\"right\">") + countStr + QString("</td>"); - ++moduleIndex; - } - tableTitle += QString("</tr>\n"); - tableTotals += QString("</tr>\n"); - - m_searchAnalysisHTML = ""; - bool ok = true; - while (ok) { - m_searchAnalysisHTML += QString("<tr><td>") + key.book() + QString("</td>"); - analysisItem = m_canvasItemList.find( key.book() ); - - // for (moduleIndex = 0, m_moduleList.first(); m_moduleList.current(); m_moduleList.next(), ++moduleIndex) { - moduleIndex = 0; - ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); - for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) { - count = analysisItem->getCountForModule(moduleIndex); - countStr.setNum(count); - m_searchAnalysisHTML += QString("<td align=\"right\">") + countStr + QString("</td>"); - - ++moduleIndex; - } - m_searchAnalysisHTML += QString("</tr>\n"); - ok = key.next(CSwordVerseKey::UseBook); - } - - text += QString("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + QString("</table>\n"); - text += QString("<center>") + i18n("Created by") + QString(" <a href=\"http://www.bibletime.info/\">BibleTime</a></center>"); - text += QString("</body></html>"); - - CToolClass::savePlainFile(file, text, false, QTextStream::UnicodeUTF8); -} - - } //end of namespace Search::Analysis -} //end of namespace Search diff --git a/bibletime/frontend/searchdialog/csearchanalysis.h b/bibletime/frontend/searchdialog/csearchanalysis.h deleted file mode 100644 index 013efaa..0000000 --- a/bibletime/frontend/searchdialog/csearchanalysis.h +++ /dev/null @@ -1,222 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSEARCHANALYSIS_H -#define CSEARCHANALYSIS_H - -//BibleTime includes - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" -#include "backend/cswordmodulesearch.h" - -#include "util/cpointers.h" - -//Sword includes - - -//Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> - -//KDE includes -#include <kdialog.h> -#include <kdialogbase.h> -#include <klistview.h> - - -class QTextEdit; - -namespace Search { - namespace Analysis { - -//forward declarations -class CSearchAnalysisItem; -class CSearchAnalysisLegendItem; -class CSearchAnalysisView; - -/** - * CSearchDialogAnaylsis shows the graphical analysis of the search result. - * @author The BibleTime Team - */ -class CSearchAnalysis : public QCanvas { - Q_OBJECT -public: - CSearchAnalysis(QObject *parent=0, const char *name=0); - virtual ~CSearchAnalysis(); - /** - * Starts the analysis of the search result. - * This should be called only once because - * QCanvas handles the updates automatically. - */ - void analyse(ListCSwordModuleInfo modules); - /** - * This function returns a color for each module - * @return The color at position index in the list - */ - static QColor getColor(int index); - /* - * This function returns a pointer to the list of AnalysisItems - */ - QDict<CSearchAnalysisItem>* getSearchAnalysisItemList(); - void reset(); - -protected slots: // Protected slots - /** - * No descriptions - */ - void slotResized(); - -protected: - void setModules(ListCSwordModuleInfo modules); - -private: - /** - * Returns the count of the book in the module - */ - const unsigned int getCount( const QString book, CSwordModuleInfo* module ); - - ListCSwordModuleInfo m_moduleList; - QDict<CSearchAnalysisItem> m_canvasItemList; - QMap<CSwordModuleInfo*,unsigned int> m_lastPosList; - int m_maxCount; - double m_scaleFactor; - CSearchAnalysisLegendItem* m_legend; - -public slots: // Public slots - void saveAsHTML(); -}; - - -class CSearchAnalysisDialog : public KDialogBase { - Q_OBJECT -public: - CSearchAnalysisDialog(ListCSwordModuleInfo modules, QWidget* parentDialog); - ~CSearchAnalysisDialog(); - -protected: // Protected methods - /** - * Initializes the widgets SIGNAL and SLOT connections,. - */ - void initConnections(); - - /** - * Initializes this dialog. - */ - void initView(); - -private: - CSearchAnalysis* m_analysis; - CSearchAnalysisView* m_analysisView; -}; - - -//---------------------------------------------------------- -//---------------------------------------------------------- - -/** Paints the bars for one book for one or more modules - * - */ -class CSearchAnalysisItem : public QCanvasRectangle { -public: - /** - * Standard constructor. - */ - CSearchAnalysisItem(QCanvas* parent, const int moduleCount, const QString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules); - virtual ~CSearchAnalysisItem(); - /** - * Sets the resultcount of this item - */ - void setCountForModule( const int moduleIndex, const int count); - - /** - * Returns the resultcount of this item - */ - int getCountForModule( const int moduleIndex); - /** - * Returns the width of this item. - */ - virtual int width(); - /** - * Returns the tooltip for this item. - */ - const QString getToolTip(); - -private: - virtual void draw (QPainter & painter); - - ListCSwordModuleInfo* m_moduleList; - double *m_scaleFactor; - QString m_bookName; - int m_moduleCount; - QMemArray<int> m_resultCountArray; - QPixmap* m_bufferPixmap; -}; - -class CSearchAnalysisLegendItem : public QCanvasRectangle { - -public: - CSearchAnalysisLegendItem(QCanvas* parent, ListCSwordModuleInfo* list ); - -private: - virtual void draw (QPainter & painter); - ListCSwordModuleInfo* m_moduleList; -}; - -//---------------------------------------------------------- -//---------------------------------------------------------- -class CSearchAnalysisView : public QCanvasView { - Q_OBJECT -public: - /** - * Standard constructor - */ - CSearchAnalysisView(QCanvas* canvas, QWidget* parent); - /** - * Returns the sizeHint for this view - * We give back the size of the parent widgetas default. - * This is a reimplementation from QCanvasView::sizeHint(). - */ - virtual QSize sizeHint(); - /** - * Returns the item at position p. - * If there no item at that point return 0. - */ - CSearchAnalysisItem* itemAt( const QPoint& p ); - -protected: - /** - * Reimplementation. - */ - virtual void resizeEvent(QResizeEvent* e); - -private: - class ToolTip : public QToolTip { - public: - ToolTip(QWidget* parent); - virtual ~ToolTip() {} - ; - /** - * Displays a tooltip for position p - */ - virtual void maybeTip(const QPoint &pos); - }; - - ToolTip* m_toolTip; -}; - - } //end of namespace Search::Analysis -} //end of namespace Search - -#endif diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp deleted file mode 100644 index beef7c4..0000000 --- a/bibletime/frontend/searchdialog/csearchdialog.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "csearchdialog.h" -#include "csearchanalysis.h" -#include "backend/cswordmodulesearch.h" - - -#include "backend/cswordkey.h" -#include "backend/cswordversekey.h" - -#include "frontend/cbtconfig.h" -#include "frontend/cmoduleindexdialog.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -//Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> - -//KDE includes -#include <kapplication.h> -#include <kfiledialog.h> -#include <klocale.h> -#include <kiconloader.h> - -namespace Search { - -static CSearchDialog* m_staticDialog = 0; - -void CSearchDialog::openDialog(const ListCSwordModuleInfo modules, const QString& searchText, QWidget* parentDialog) { - if (!m_staticDialog) { - m_staticDialog = new CSearchDialog(parentDialog); - }; - m_staticDialog->reset(); - - if (modules.count()) { - m_staticDialog->setModules(modules); - } - else { - m_staticDialog->showModulesSelector(); - } - - m_staticDialog->setSearchText(searchText); - if (m_staticDialog->isHidden()) { - m_staticDialog->show(); - } - - if (modules.count() && !searchText.isEmpty()) { - m_staticDialog->startSearch(); - } - // moved these to after the startSearch() because - // the progress dialog caused them to loose focus. - m_staticDialog->raise(); - m_staticDialog->setActiveWindow(); -}; - -CSearchDialog* const CSearchDialog::getSearchDialog() { - Q_ASSERT(m_staticDialog); - return m_staticDialog; -}; - -CSearchDialog::CSearchDialog(QWidget *parent) -: KDialogBase(Plain, i18n("Search dialog"), Close | User1, User1, parent, "CSearchDialog", false, true, i18n("Search")) { - - setWFlags( getWFlags() | Qt::WStyle_MinMax ); - setIcon(CResMgr::searchdialog::icon); - - m_searcher.connectFinished( this, SLOT(searchFinished())); - - initView(); - initConnections(); -} - -CSearchDialog::~CSearchDialog(){ - // Added code for saving last size of dialog - saveDialogSize("CSearchDialog"); -} - -/** Starts the search with the set modules and the set search text. */ -void CSearchDialog::startSearch() { - QString searchText(m_searchOptionsPage->searchText()); - - if (searchText.isEmpty()) { - return; - } - - // check that we have the indices we need for searching - if (!m_searcher.modulesHaveIndices( modules() ) ) { - int result = QMessageBox::question(this, i18n("Missing indices"), - i18n("One or more modules need indexing before they can be searched.\n" - "This could take a long time. Proceed with indexing?"), - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No | QMessageBox::Escape); - // In SuSE 10.0 the result is the logical or of the button type, just like it is - // inputed into the QMessageBox. - if ( (result == (QMessageBox::Yes | QMessageBox::Default)) || - (result == QMessageBox::Yes) || (result == QMessageBox::Default) ) { - CModuleIndexDialog* dlg = CModuleIndexDialog::getInstance(); - dlg->indexUnindexedModules( modules() ); - } - else { - return; - } - } - - m_searchResultPage->reset(); - -// const int searchFlags = m_searchOptionsPage->searchFlags(); - -// const CSwordModuleSearch::scopeType scopeType = m_searchOptionsPage->scopeType(); -// if (scopeType == CSwordModuleSearch::Scope_LastSearch) { -// searchFlags |= CSwordModuleSearch::useLastResult; -// } -// else if ( (scopeType == CSwordModuleSearch::Scope_Bounds) -// && strlen(m_searchOptionsPage->searchScope().getRangeText())) { -// //we need the scope flag and a valid scope! -// searchFlags |= CSwordModuleSearch::useScope; -// m_searcher.setSearchScope( m_searchOptionsPage->searchScope() ); -// } - - if (m_searchOptionsPage->hasSearchScope()) { - m_searcher.setSearchScope( m_searchOptionsPage->searchScope() ); - } - else { - m_searcher.resetSearchScope(); - } - - m_searcher.setModules( modules() ); - m_searcher.setSearchedText(searchText); -// m_searcher.setSearchOptions(searchFlags); - - m_searcher.startSearch(); -} - -/** Starts the search with the given module list and given search text. */ -void CSearchDialog::startSearch( const ListCSwordModuleInfo modules, const QString& searchText) { - m_searchResultPage->reset(); - m_searchOptionsPage->reset(); - setModules(modules); - setSearchText(searchText); - - startSearch(); -} - -/** Returns the list of used modules. */ -const ListCSwordModuleInfo CSearchDialog::modules() { - return m_searchOptionsPage->modules(); -} - -/** Sets the list of modules for the search. */ -void CSearchDialog::setModules( const ListCSwordModuleInfo modules ) { - m_searchOptionsPage->setModules(modules); - resize( sizeHint() ); -} - -/** Returns the search text which is set currently. */ -const QString CSearchDialog::searchText() { - return m_searchOptionsPage->searchText(); -} - -sword::ListKey CSearchDialog::searchScope() { - return m_searchOptionsPage->searchScope(); -}; - -/** Returns true if the search used a scope, otherwise false. */ -// const CSwordModuleSearch::scopeType CSearchDialog::searchScopeType() const { -// return m_searchOptionsPage->scopeType(); -// } - -/** Returns true if the search used a scope, otherwise false. */ -// const int CSearchDialog::searchFlags() const { -// return m_searchOptionsPage->searchFlags(); -// } - -/** Returns the search text which is used for the search. */ -void CSearchDialog::setSearchText( const QString searchText ) { - m_searchOptionsPage->setSearchText(searchText); -} - -/** Initializes this object. */ -void CSearchDialog::initView() { - setButtonTip(User1, CResMgr::searchdialog::searchButton::tooltip); - - QVBoxLayout *box = new QVBoxLayout( plainPage(), 0, spacingHint() ); - - m_searchOptionsPage = new Options::CSearchOptionsPage(plainPage()); - box->addWidget( m_searchOptionsPage ); - - m_searchResultPage = new Result::CSearchResultPage(plainPage()); - box->addWidget( m_searchResultPage ); - - // The dialog doesn't resize properly if the minimum size of the - // plain page is lower than the minimumsize of our two widgets. - // You can resize the dialog, but it just starts covering up the - // button bar and the two widgets instead of stopping at the - // minimum size. The following code sets the minimum with some - // margin. If you know of a better way to do this, do it! - int w = m_searchOptionsPage->minimumWidth(); - int h = m_searchOptionsPage->minimumHeight() + - m_searchResultPage->minimumHeight(); - plainPage()->setMinimumSize(w+10, h+100); - // Added code for loading last size of dialog - setInitialSize(configDialogSize("CSearchDialog")); -} - -void CSearchDialog::searchFinished() { -// qWarning("CSearchDialog::searchFinished()"); - - if ( m_searcher.foundItems() ) { - m_searchResultPage->setSearchResult(modules()); - } - else { - m_searchResultPage->reset(); - } - m_staticDialog->raise(); - m_staticDialog->setActiveWindow(); -} - -void CSearchDialog::showModulesSelector() { - m_searchOptionsPage->chooseModules(); -} - -/** Initializes the signal slot connections */ -void CSearchDialog::initConnections() { - connect(this, SIGNAL(user1Clicked()), SLOT(startSearch())); - connect(this, SIGNAL(closeClicked()), SLOT(slotDelayedDestruct())); -} - -/** Resets the parts to the default. */ -void CSearchDialog::reset() { - m_searchOptionsPage->reset(); - m_searchResultPage->reset(); -} - -/** Reimplementation. */ -void CSearchDialog::slotClose() { - delayedDestruct(); - m_staticDialog = 0; -} - -} //end of namespace Search diff --git a/bibletime/frontend/searchdialog/csearchdialog.h b/bibletime/frontend/searchdialog/csearchdialog.h deleted file mode 100644 index c64ff44..0000000 --- a/bibletime/frontend/searchdialog/csearchdialog.h +++ /dev/null @@ -1,138 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSEARCHDIALOG_H -#define CSEARCHDIALOG_H - -//BibleTime includes -#include "csearchdialogpages.h" -#include "csearchanalysis.h" - -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" - -#include "util/cpointers.h" - -//Sword includes - - -//Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> - -//KDE includes -#include <kdialog.h> -#include <kdialogbase.h> - -//forward declarations - -class QLineEdit; -class QTextEdit; - -namespace Search { -/** - *@author The BibleTime team - */ -class CSearchDialog : public KDialogBase { - Q_OBJECT - -public: - static void openDialog(const ListCSwordModuleInfo modules, const QString& searchText = QString::null, QWidget* parentDialog = 0); - -protected: - friend class Analysis::CSearchAnalysis; - friend class Result::CSearchResultPage; - friend class BibleTime; - - /** - * Only interesting for the class members! Useful to get the searched text etc. - */ - static CSearchDialog* const getSearchDialog(); - - /** - * The cinstructor of the dialog. It's protected because you should use the static public function openDialog. - * The dialog destroys itself if it was closed. - */ - CSearchDialog(QWidget *parent); - ~CSearchDialog(); - - /** - * Initializes this object. - */ - void initView(); - /** - * Starts the search with the given module list and given search text. - * Doesn't wait for the start button press, starts immediatly - */ - void startSearch( const ListCSwordModuleInfo modules, const QString& searchText); - /** - * Sets the list of modules for the search. - */ - void setModules( const ListCSwordModuleInfo modules ); - /** - * Returns the list of used modules. - */ - const ListCSwordModuleInfo modules(); - /** - * Returns the search text which is used for the search. - */ - void setSearchText( const QString searchText ); - /** - * Returns the search text which is set currently. - */ - const QString searchText(); - /** - * Returns the used search scope as a list key - */ - sword::ListKey searchScope(); - /** - * Returns true if the search used a scope, otherwise false. - */ - //const CSwordModuleSearch::scopeType searchScopeType() const; - /** - * Returns they type of search which is set - */ -// const int searchFlags() const; - /** - * Resets the parts to the default. - */ - void reset(); - -protected slots: - /** - * Starts the search with the set modules and the set search text. - */ - void startSearch(); - void searchFinished(); - void showModulesSelector(); - /** - * Initializes the signal slot connections - */ - void initConnections(); - /** - * Reimplementation. - */ - virtual void slotClose(); - -private: - Result::CSearchResultPage* m_searchResultPage; - Options::CSearchOptionsPage* m_searchOptionsPage; - - CSwordModuleSearch m_searcher; -}; - - -} //end of namespace Search - -#endif diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp deleted file mode 100644 index 473dc91..0000000 --- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp +++ /dev/null @@ -1,784 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "csearchdialogpages.h" - -#include "csearchdialog.h" -#include "csearchanalysis.h" -#include "crangechooser.h" -#include "cmoduleresultview.h" -#include "csearchresultview.h" -#include "cmodulechooser.h" - -#include "backend/cswordversekey.h" -#include "backend/cdisplayrendering.h" - -#include "frontend/display/cdisplay.h" -#include "frontend/display/creaddisplay.h" - -#include "util/cresmgr.h" -#include "util/ctoolclass.h" - -//Qt includes -#include <qlayout.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qregexp.h> -#include <qeventloop.h> - -//KDE includes -#include <klocale.h> -#include <kcombobox.h> -#include <kiconloader.h> -#include <kmessagebox.h> -#include <kprogress.h> -#include <kapplication.h> - -//Lucence includes -//#include "CLucene.h" -//#include "CLucene/util/Reader.h" -//#include "CLucene/util/Misc.h" -//#include "CLucene/util/dirent.h" - -namespace Search { - namespace Result { - -/******************************************** -************ StrongsResulClass ************* -********************************************/ -void StrongsResultClass::initStrongsResults(void) { - using namespace Rendering; - - CDisplayRendering render; - ListCSwordModuleInfo modules; - CTextRendering::KeyTreeItem::Settings settings; - QString rText, lText, key; - bool found; - int sIndex; - int count; - int index; - QString text; - - modules.append(srModule); - sword::ListKey& result = srModule->searchResult(); - - count = result.Count(); - if (!count) - return; -KApplication::kApplication()->processEvents( 1 ); //1 ms only - srList.clear(); - // for whatever reason the text "Parsing...translations." does not appear. - // this is not critical but the text is necessary to get the dialog box - // to be wide enough. - KProgressDialog* progress = new KProgressDialog(0, "progressDialog", i18n("Parsing Stong's Numbers"), i18n("Parsing Stong's numbers for translations."), true); - progress->setAllowCancel(false); - progress->setMinimumDuration(0); - progress->show(); - progress->raise(); - for (index = 0; index < count; index++){ - progress->progressBar()->setProgress( int( (index*100) / count ) ); - KApplication::kApplication()->processEvents( 1 ); //1 ms only - - key = QString::fromUtf8(result.GetElement(index)->getText()); - text = render.renderSingleKey(key, modules, settings); - sIndex = 0; - while ((rText = getStrongsNumberText(text, &sIndex)) != "") - { - StrongsResultList::iterator it; - found = FALSE; - for ( it = srList.begin(); it != srList.end(); ++it ) - { - lText = (*it).keyText(); - if (lText == rText) - { - found = TRUE; - (*it).addKeyName(key); - break; - } - } - if (found == FALSE) - srList.append( StrongsResult(rText, key) ); - } - } - delete progress; - progress = 0; - //qHeapSort(srList); - } - -QString StrongsResultClass::getStrongsNumberText(const QString& verseContent, int *startIndex) { - // get the strongs text - int idx1, idx2, index; - QString sNumber, strongsText; - //const bool cs = CSwordModuleSearch::caseSensitive; - const bool cs = false; - - if (*startIndex == 0) { - index = verseContent.find("<body", 0); - } - else { - index = *startIndex; - } - - // find all the "lemma=" inside the the content - while((index = verseContent.find("lemma=", index, cs)) != -1) { - // get the strongs number after the lemma and compare it with the - // strongs number we are looking for - idx1 = verseContent.find("\"", index) + 1; - idx2 = verseContent.find("\"", idx1 + 1); - sNumber = verseContent.mid(idx1, idx2 - idx1); - if (sNumber == lemmaText) { - // strongs number is found now we need to get the text of this node - // search right until the ">" is found. Get the text from here to - // the next "<". - index = verseContent.find(">", index, cs) + 1; - idx2 = verseContent.find("<", index, cs); - strongsText = verseContent.mid(index, idx2 - index); - index = idx2; - *startIndex = index; - - return(strongsText); - } - else { - index += 6; // 6 is the length of "lemma=" - } - } - return QString::null; -} - -/******************************************** -********** CSearchDialogResultPage ********* -********************************************/ - -CSearchResultPage::CSearchResultPage(QWidget *parent, const char *name ) : - SearchResultsForm(parent, name) { - initView(); - initConnections(); -} - -CSearchResultPage::~CSearchResultPage() {} - -/** Initializes the view of this widget. */ -void CSearchResultPage::initView() { - QVBoxLayout* frameLayout = new QVBoxLayout(m_displayFrame, 0, 6, "frameLayout"); - m_previewDisplay = CDisplay::createReadInstance(0, m_displayFrame); - frameLayout->addWidget(m_previewDisplay->view()); -} - -/** Sets the modules which contain the result of each. */ -void CSearchResultPage::setSearchResult(ListCSwordModuleInfo modules) { - const QString searchedText = CSearchDialog::getSearchDialog()->searchText(); - reset(); //clear current modules - - m_modules = modules; - m_moduleListBox->setupTree(modules, searchedText); - - //have a Bible or commentary in the modules? - bool enable = false; - // for (modules.first(); !enable && modules.current(); modules.next()) { - ListCSwordModuleInfo::iterator end_it = modules.end(); - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - if ((*it)->type() == CSwordModuleInfo::Bible ) { - enable = true; - break; - }; - }; - m_analyseButton->setEnabled(enable); -} - - -/** Resets the current list of modules and the displayed list of found entries. */ -void CSearchResultPage::reset() { - m_moduleListBox->clear(); - m_resultListBox->clear(); - m_previewDisplay->setText(QString::null); - m_analyseButton->setEnabled(false); - // m_modules.setAutoDelete(false); //make sure we don't delete modules accidentally - m_modules.clear(); -} - - -/** Update the preview of the selected key. */ -void CSearchResultPage::updatePreview(const QString& key) { - using namespace Rendering; - - CSwordModuleInfo* module = m_moduleListBox->activeModule(); - if ( module ) { - const QString searchedText = CSearchDialog::getSearchDialog()->searchText(); - //const int searchFlags = CSearchDialog::getSearchDialog()->searchFlags(); - - QString text; - CDisplayRendering render; - - ListCSwordModuleInfo modules; - modules.append(module); - - CTextRendering::KeyTreeItem::Settings settings; - - //for bibles render 5 context verses - if (module->type() == CSwordModuleInfo::Bible) { - CSwordVerseKey vk(module); - vk.Headings(1); - vk.key(key); - - ((VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys - - //first go back and then go forward the keys to be in context - vk.previous(CSwordVerseKey::UseVerse); - vk.previous(CSwordVerseKey::UseVerse); - - //include Headings in display, they are indexed and searched too - if (vk.Verse() == 1){ - if (vk.Chapter() == 1){ - vk.Chapter(0); - } - vk.Verse(0); - } - - const QString startKey = vk.key(); - - vk.key(key); - - vk.next(CSwordVerseKey::UseVerse); - vk.next(CSwordVerseKey::UseVerse); - const QString endKey = vk.key(); - - settings.keyRenderingFace = CTextRendering::KeyTreeItem::Settings::CompleteShort; - text = render.renderKeyRange(startKey, endKey, modules, key, settings); - } - //for commentaries only one verse, but with heading - else if (module->type() == CSwordModuleInfo::Commentary) { - CSwordVerseKey vk(module); - vk.Headings(1); - vk.key(key); - - ((VerseKey*)(module->module()->getKey()))->Headings(1); //HACK: enable headings for VerseKeys - - //include Headings in display, they are indexed and searched too - if (vk.Verse() == 1){ - if (vk.Chapter() == 1){ - vk.Chapter(0); - } - vk.Verse(0); - } - const QString startKey = vk.key(); - - vk.key(key); - const QString endKey = vk.key(); - - settings.keyRenderingFace = CTextRendering::KeyTreeItem::Settings::NoKey; - text = render.renderKeyRange(startKey, endKey, modules, key, settings); - } - else { - text = render.renderSingleKey(key, modules, settings); - } - - m_previewDisplay->setText( highlightSearchedText(text, searchedText/*, searchFlags*/) ); - m_previewDisplay->moveToAnchor( CDisplayRendering::keyToHTMLAnchor(key) ); - } -} - -QStringList CSearchResultPage::QueryParser(const QString& queryString) { - QString token; - QStringList tokenList; - int cnt, pos; - - token = ""; - cnt = 0; - while(cnt < queryString.length()) { - // add to token - if ((queryString[cnt]).isLetterOrNumber() || (queryString[cnt] == '*')) { - token = token + queryString[cnt]; - cnt++; - } - // token break - else if (queryString[cnt] == ' ') { - token = token.stripWhiteSpace(); - if ((token != "*") && (token != "")) - tokenList.append(token); - token = ""; - cnt++; - } - // clucene appears to ignore quoted strings in the sence - // that it treats all the words within quoted strings as - // regular tokens and not as a single token. - else if (queryString[cnt] == '"') { - cnt++; - } - // wild card - treat as a special token break - //else if (queryString[cnt] == '*') { - // token = token + queryString[cnt]; - // token = token.stripWhiteSpace(); - // if ((token != "*") && (token != "")) - // tokenList.append(token); - // // start next token with wildcard (kin*m -> kin* *m) - // token = "*"; - // cnt++; - //} - // the ! token is also a token break - else if (queryString[cnt] == '!') { - // store away current token - token = token.stripWhiteSpace(); - if ((token != "*") && (token != "")) - tokenList.append(token); - // add the ! token - tokenList.append("!"); - token = ""; - cnt++; - } - // the - token is also a token break - else if (queryString[cnt] == '-') { - // store away current token - token = token.stripWhiteSpace(); - if ((token != "*") && (token != "")) - tokenList.append(token); - // add the ! token - tokenList.append("-"); - token = ""; - cnt++; - } - // the + token is also a token break - else if (queryString[cnt] == '+') { - // store away current token - token = token.stripWhiteSpace(); - if ((token != "*") && (token != "")) - tokenList.append(token); - // add the + token - tokenList.append("+"); - token = ""; - cnt++; - } - // the || token is also a token break - else if ((queryString[cnt] == '|') && (queryString[cnt+1] == '|')) { - // store away current token - token = token.stripWhiteSpace(); - if ((token != "*") && (token != "")) - tokenList.append(token); - // add the || token - tokenList.append("||"); - token = ""; - cnt += 2; - } - // the && token is also a token break - else if ((queryString[cnt] == '&') && (queryString[cnt+1] == '&')) { - // store away current token - token = token.stripWhiteSpace(); - if ((token != "*") && (token != "")) - tokenList.append(token); - // add the || token - tokenList.append("&&"); - token = ""; - cnt += 2; - } - else cnt++; - } - token = token.stripWhiteSpace(); - if ((token != "*") && (token != "")) - tokenList.append(token); - - cnt = 0; - QStringList::iterator it; - for ( it = tokenList.begin(); it != tokenList.end(); it++ ) { - //----------------------------------------------------------- - // remove all the NOT(!) tokens - these do not need to be - // highlighted in the highlighter - //----------------------------------------------------------- - if (((*it) == "!") || ((*it) == "NOT") || ((*it) == "-")) { - it = tokenList.remove(it); - if (it == tokenList.end()) - break; - it = tokenList.remove(it); - if (it == tokenList.end()) - break; - it--; - } - //----------------------------------------------------------- - // remove all the operator tokens - these do not need to be - // highlighted in the highlighter - //----------------------------------------------------------- - else if ( ((*it) == "||") || ((*it) == "OR") || ((*it) == "+") || - ((*it) == "AND") || ((*it) == "&&") ) - { - it = tokenList.remove(it); - if (it == tokenList.end()) - break; - it--; - } - // if the token contains a ^ then trim the remainder of the - // token from the ^ - else if ( (pos = (*it).contains("^")) >= 0 ) { - (*it) = (*it).left(pos - 1); - } - // if the token contains a ~ then trim the remainder of the - // token from the ~ - else if ( (pos = (*it).contains("~")) >= 0 ) { - (*it) = (*it).left(pos - 2) + "*"; - } - } - return(tokenList); -} - -const QString CSearchResultPage::highlightSearchedText(const QString& content, const QString& searchedText/*, const int searchFlags*/) { - QString ret = content; - - //const bool cs = (searchFlags & CSwordModuleSearch::caseSensitive); - const bool cs = false; - - // int index = 0; - int index = ret.find("<body", 0); - int matchLen = 0; - int length = searchedText.length(); - - const QString rep1("<span style=\"background-color:#FFFF66;\">"); - const QString rep2("</span>"); - const unsigned int repLength = rep1.length() + rep1.length(); - int sstIndex; // strong search text index for finding "strong:" - bool inQuote; - QString newSearchText; - - newSearchText = searchedText; - //--------------------------------------------------------------------- - // find the strongs search lemma and highlight it - //--------------------------------------------------------------------- - // search the searched text for "strong:" until it is not found anymore - sstIndex = 0; - while ((sstIndex = newSearchText.find("strong:", sstIndex)) != -1) { - int idx1, idx2, sTokenIndex, sTokenIndex2; - QString sNumber, lemmaText; - const QString rep3("style=\"background-color:#FFFF66;\" "); - const unsigned int rep3Length = rep3.length(); - int strongIndex = index; - //-------------------------------------------------- - // get the strongs number from the search text - //-------------------------------------------------- - // first find the first space after "strong:" - // this should indicate a change in search token - sstIndex = sstIndex + 7; - sTokenIndex = newSearchText.find(" ", sstIndex); - sTokenIndex2 = newSearchText.find("|", sstIndex); - if ((sTokenIndex2 != -1) && (sTokenIndex2 < sTokenIndex)) { - sNumber = newSearchText.mid(sstIndex, sTokenIndex2 - sstIndex); - } - else { - sNumber = newSearchText.mid(sstIndex, sTokenIndex - sstIndex); - } - // remove this strong entry - sstIndex -= 7; - newSearchText.replace(sstIndex, sTokenIndex - sstIndex, ""); - // find all the "lemma=" inside the the content - while((strongIndex = ret.find("lemma=", strongIndex, cs)) != -1) { - // get the strongs number after the lemma and compare it with the - // strongs number we are looking for - idx1 = ret.find("\"", strongIndex) + 1; - idx2 = ret.find("\"", idx1 + 1); - lemmaText = ret.mid(idx1, idx2 - idx1); - if (lemmaText == sNumber) { - // strongs number is found now we need to highlight it - // I believe the easiest way is to insert rep3 just before "lemma=" - ret = ret.insert(strongIndex, rep3); - strongIndex += rep3Length; - } - strongIndex += 6; // 6 is the length of "lemma=" - } - } - //--------------------------------------------------------------------- - // now that the strong: stuff is out of the way continue with - // other search options - //--------------------------------------------------------------------- - //----------------------------------------------------------- - // try to figure out how to use the lucene query parser - //----------------------------------------------------------- - //using namespace lucene::queryParser; - //using namespace lucene::search; - //using namespace lucene::analysis; - //using namespace lucene::util; - - //wchar_t *buf; - //char buf8[1000]; - //standard::WhitespaceAnalyzer analyzer; - //lucene_utf8towcs(m_wcharBuffer, searchedText.utf8(), MAX_CONV_SIZE); - //util::scoped_ptr<Query> q( QueryParser::parse(m_wcharBuffer, _T("content"), &analyzer) ); - //StringReader reader(m_wcharBuffer); - //TokenStream* tokenStream = analyzer.tokenStream( _T("field"), &reader); - //Token token; - //while(tokenStream->next(&token) != 0) { - // lucene_wcstoutf8(buf8, token.termText(), 1000); - // printf("%s\n", buf8); - //} - - //=========================================================== - // since I could not figure out the lucene query parser, I - // made a simple parser. - //=========================================================== - QStringList words = QueryParser(newSearchText); - for ( int wi = 0; (unsigned int)wi < words.count(); ++wi ) { //search for every word in the list - QRegExp findExp; - QString word = words[ wi ]; - if (word.contains("*")) { - length = word.length() - 1; - word.replace('*', "\\S*"); //match within a word - findExp = QRegExp(word); - findExp.setMinimal(TRUE); - } - else { - length = word.length(); - findExp = QRegExp("\\b" + word + "\\b"); - } - - // index = 0; //for every word start at the beginning - index = ret.find("<body", 0); - findExp.setCaseSensitive(cs); - //while ( (index = ret.find(findExp, index)) != -1 ) { //while we found the word - while ( (index = findExp.search(ret, index)) != -1 ) { //while we found the word - matchLen = findExp.matchedLength(); - if (!CToolClass::inHTMLTag(index, ret)) { - length = matchLen; - ret = ret.insert( index+length, rep2 ); - ret = ret.insert( index, rep1 ); - index += repLength; - } - index += length; - } - } - //qWarning("\n\n\n%s", ret.latin1()); - return ret; -}; - -/** Initializes the signal slot conections of the child widgets, */ -void CSearchResultPage::initConnections() { - connect(m_resultListBox, SIGNAL(keySelected(const QString&)), - this, SLOT(updatePreview(const QString&))); - connect(m_moduleListBox, SIGNAL(moduleSelected(CSwordModuleInfo*)), - m_resultListBox, SLOT(setupTree(CSwordModuleInfo*))); - connect(m_moduleListBox, SIGNAL(moduleChanged()), - m_previewDisplay->connectionsProxy(), SLOT(clear())); - connect(m_analyseButton, SIGNAL(clicked()), SLOT(showAnalysis())); - // connect the strongs list - connect(m_moduleListBox, SIGNAL(strongsSelected(CSwordModuleInfo*, QStringList*)), - m_resultListBox, SLOT(setupStrongsTree(CSwordModuleInfo*, QStringList*))); -} - -/** Shows a dialog with the search analysis of the current search. */ -void CSearchResultPage::showAnalysis() { - Analysis::CSearchAnalysisDialog dlg(m_modules, this); - dlg.exec(); -} - - } //end of namespace Search.Result - - /*************************/ - - namespace Options { - -CSearchOptionsPage::CSearchOptionsPage(QWidget *parent, const char *name ) : - SearchOptionsForm(parent,name) { - initView(); - readSettings(); -} - -CSearchOptionsPage::~CSearchOptionsPage() { - saveSettings(); -} - -/** Returns the search text set in this page. */ -const QString CSearchOptionsPage::searchText() { - return m_searchTextCombo->currentText(); -} - -/** Sets the search text used in the page. */ -void CSearchOptionsPage::setSearchText(const QString& text) { - bool found = false; - int i = 0; - for (i = 0; !found && i < m_searchTextCombo->count(); ++i) { - if (m_searchTextCombo->text(i) == text) { - found = true; - } - } - // This is needed because in the for loop i is incremented before the comparison (++i) - // As a result the index i is actually one greater than expected. - i--; - if (!found) { - i = 0; - m_searchTextCombo->insertItem( text,0 ); - } - - m_searchTextCombo->setCurrentItem(i); - m_searchTextCombo->reset(); - m_searchTextCombo->setFocus(); -} - -/** Initializes this page. */ -void CSearchOptionsPage::initView() { - connect( m_searchTextCombo, SIGNAL(activated( const QString& )), - m_searchTextCombo, SLOT( addToHistory( const QString& )) - ); - connect( m_searchTextCombo, SIGNAL(returnPressed ( const QString& )), - m_searchTextCombo, SLOT(addToHistory(const QString&)) - ); - QToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip); - - m_syntaxButton->setIconSet(SmallIconSet("contexthelp")); - connect( m_syntaxButton, SIGNAL(clicked()), this, SLOT(syntaxHelp())); - - m_chooseModulesButton->setIconSet(SmallIconSet("wizard")); - connect(m_chooseModulesButton, SIGNAL(clicked()), - this, SLOT(chooseModules())); - QToolTip::add - (m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::tooltip); - - QToolTip::add - (m_rangeChooserCombo, CResMgr::searchdialog::options::chooseScope::tooltip); - refreshRanges(); - - m_chooseRangeButton->setIconSet(SmallIconSet("configure")); - connect(m_chooseRangeButton, SIGNAL(clicked()), - this, SLOT(setupRanges())); - - //set the initial focus - m_searchTextCombo->setFocus(); -} - -/** Sets the modules used by the search. */ -void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) { - QString t = i18n("Searching in: "); - - m_modules.clear(); //remove old modules - ListCSwordModuleInfo::iterator end_it = modules.end(); - - for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - //ToDo: Check for containsRef compat - if (*it == 0) { //don't operate on null modules. - continue; - } - - if ( !m_modules.contains(*it) ) { - m_modules.append( *it ); - t.append( (*it)->name() ); - if (*it != modules.last()) { - t += QString::fromLatin1(", "); // so that it will become a readable list (WLC, LXX, GerLut...) - } - } - }; - m_modulesLabel->setText(t); - emit( sigSetSearchButtonStatus( (modules.count() != 0) ) ); -} - -/** Opens the modules chooser dialog. */ -void CSearchOptionsPage::chooseModules() { - CModuleChooserDialog* dlg = new CModuleChooserDialog(this, modules()); - connect(dlg, SIGNAL(modulesChanged(ListCSwordModuleInfo)), - this, SLOT(setModules(ListCSwordModuleInfo))); - dlg->exec(); -} - -/** Returns the list of used modules. */ -const ListCSwordModuleInfo CSearchOptionsPage::modules() { - return m_modules; -} - -/** Sets all options back to the default. */ -void CSearchOptionsPage::reset() { - m_rangeChooserCombo->setCurrentItem(0); //no scope - m_searchTextCombo->clearEdit(); -} - -/** Reads the settings for the searchdialog from disk. */ -void CSearchOptionsPage::saveSettings() { - CBTConfig::set - (CBTConfig::searchCompletionTexts, m_searchTextCombo->completionObject()->items()); - CBTConfig::set - (CBTConfig::searchTexts, m_searchTextCombo->historyItems()); -} - -/** Reads the settings of the last searchdialog session. */ -void CSearchOptionsPage::readSettings() { - m_searchTextCombo->completionObject()->setItems( CBTConfig::get - (CBTConfig::searchCompletionTexts) ); - m_searchTextCombo->setHistoryItems( CBTConfig::get - (CBTConfig::searchTexts) ); -} - -void CSearchOptionsPage::aboutToShow() { - m_searchTextCombo->setFocus(); -} - -/** No descriptions */ -void CSearchOptionsPage::setupRanges() { - CRangeChooserDialog* chooser = new CRangeChooserDialog(this); - chooser->exec(); - - refreshRanges(); -} - -/** No descriptions */ -void CSearchOptionsPage::syntaxHelp() { - QString syntax = i18n ( - "<p>Enter search terms separated by spaces. By default the search " - "function will return results that match any of the search terms (OR). " - "To search for all the terms separate the terms by AND.</p>") + i18n( - "<p>You can use wildcards: '*' matches any sequence of characters, " - "while '?' matches any single character. The use of brackets allows you to " - "group your search terms, e.g. '(Jesus OR spirit) AND God'.</p>") + i18n( - "<p>To search text other than the main text, enter the text type followed " - "by \":\", and then the search term. For example, to search for the Strong's " - "number H8077, use 'strong:H8077'.</p>") + i18n( - "<p>Available text types:<br><table>" - "<tr><td>heading:</td><td>searches headings</td></tr>" - "<tr><td>footnote:</td><td>searches footnotes</td></tr>" - "<tr><td>strong:</td><td>searches Strong's Numbers</td></tr>" - "<tr><td>morph:</td><td>searches morphology codes</td></tr></table></p>") + i18n( - "<p>BibleTime uses the Lucene search engine to perform your searches. " - "It has many advanced features, and you can read more about it here: " - "<a href=\"http://lucene.apache.org/java/docs/queryparsersyntax.html\">" - "http://lucene.apache.org/java/docs/queryparsersyntax.html</a></p>"); - - KMessageBox::about( this, syntax, i18n("Basic Search Syntax Introduction")); -} - - -/** refreshes the listof ranges and the range combobox. */ -void CSearchOptionsPage::refreshRanges() { - //the first two options are fixed, the others can be edited using the "Setup ranges" button. - m_rangeChooserCombo->clear(); - m_rangeChooserCombo->insertItem(i18n("No search scope")); - //m_rangeChooserCombo->insertItem(i18n("Last search result")); - - //insert the user-defined ranges - CBTConfig::StringMap map = CBTConfig::get - (CBTConfig::searchScopes); - CBTConfig::StringMap::Iterator it; - for (it = map.begin(); it != map.end(); ++it) { - m_rangeChooserCombo->insertItem(it.key()); - }; -} - -/** Returns the selected search scope if a search scope was selected. */ -sword::ListKey CSearchOptionsPage::searchScope() { - if (m_rangeChooserCombo->currentItem() > 0) { //is not "no scope" - CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes); - - QString scope = map[ m_rangeChooserCombo->currentText() ]; - if (!scope.isEmpty()) { - return sword::VerseKey().ParseVerseList( (const char*)scope.utf8(), "Genesis 1:1", true); - } - } - - return sword::ListKey(); -} - -/*! - \fn CSearchOptionsPage::hasSearchScope() - */ -bool CSearchOptionsPage::hasSearchScope() { - return (searchScope().Count() > 0); -} - - } //end of namespace Options -} //end of namespace Search diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.h b/bibletime/frontend/searchdialog/csearchdialogpages.h deleted file mode 100644 index 7949a1b..0000000 --- a/bibletime/frontend/searchdialog/csearchdialogpages.h +++ /dev/null @@ -1,292 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSEARCHDIALOGPAGES_H -#define CSEARCHDIALOGPAGES_H - -//BibleTime includes -#include "backend/cswordmoduleinfo.h" -#include "backend/cswordbackend.h" -#include "backend/cswordmodulesearch.h" - -#include "frontend/searchdialog/searchoptionsform.h" // uic generated -#include "frontend/searchdialog/searchresultsform.h" // uic generated - -//Qt includes -#include <qwidget.h> -#include <qvgroupbox.h> - -//KDE includes -#include <klistview.h> - -//forward declarations -class QLabel; -class QCheckBox; -class QPushButton; -class QRadioButton; - -class KComboBox; -class KActionMenu; -class KAction; -class KHistoryCombo; -class KProgress; -class KPopupMenu; - -class CReadDisplay; - -namespace Search { - namespace Result { - -/** -* This class is used to keep track of the text strongs results. -* It only keeps track of one instance of a strongs text result. -* -* The functions of the class are: -* - Store an instance of a strongs text result. -* - Each strongs text result will contain a list of verses (keyNames). -* - The number of verses (keyNames) is returned by keyCount(). -* - The text for the strongs text result is returned by keyText(). -* - The list of verses (keyNames) is returned by getKeyList() [as QStringList]. -* -* To add a new verse to a strongs text result use addKeyName. -*/ -class StrongsResult { -public: - StrongsResult() /*: text(QString::null)*/ { - //keyNameList.clear(); - } - - StrongsResult(const QString& text, const QString &keyName) - : text(text) - { - //keyNameList.clear(); - keyNameList.append(keyName); - } - - QString keyText() const { - return text; - } - int keyCount() const { - return keyNameList.count(); - } - void addKeyName(const QString& keyName) { - if (keyNameList.findIndex(keyName) == -1) - keyNameList.append(keyName); - } - QStringList* getKeyList() { - return & keyNameList; - } - - /* ???? - bool operator==(const StrongsResult &l, const StrongsResult &r) - { return (l.keyText() == r.keyText()); } - - bool operator<(const StrongsResult &l, const StrongsResult &r) - { return (l->keyText() < r->keyText()); } - - bool operator>(const StrongsResult &l, const StrongsResult &r) - { return (l->keyText() > r->keyText()); } - */ -private: - QString text; - QStringList keyNameList; -}; - -typedef QValueList<StrongsResult> StrongsResultList; - -/** -* This class is used to keep track of the text strongs results. -* It keeps track of all instances of all strongs text results. -* This class makes use of the above class StrongsResult. -* -* The functions of the class are: -* - Store an instance of a strongs text result. -* - Each strongs text result will contain a list of verses (keyNames). -* - The number of verses (keyNames) is returned by keyCount(). -* - The text for the strongs text result is returned by keyText(). -* - The list of verses (keyNames) is returned by getKeyList() [as QStringList]. -* -* To add a new verse to a strongs text result use addKeyName. -*/ -class StrongsResultClass { -public: - StrongsResultClass(CSwordModuleInfo* module, const QString& strongsNumber) - : srModule(module), lemmaText(strongsNumber) - { - initStrongsResults(); - } - - QString keyText(int index) const { - return srList[index].keyText(); - } - int keyCount(int index) const { - return srList[index].keyCount(); - } - QStringList* getKeyList(int index) { - return srList[index].getKeyList(); - } - int Count() const { - return srList.count(); - } - -private: - void initStrongsResults(void); - QString getStrongsNumberText(const QString& verseContent, int *startIndex); - - StrongsResultList srList; - CSwordModuleInfo* srModule; - QString lemmaText; -}; - -/** The page of the search dialog which contains the search result part. - * @author The BibleTime team - */ -class CSearchResultPage : public SearchResultsForm { - Q_OBJECT -public: - CSearchResultPage(QWidget *parent=0, const char *name=0); - ~CSearchResultPage(); - /** - * Sets the modules which contain the result of each. - */ - void setSearchResult(ListCSwordModuleInfo modules); - - QSize sizeHint() const { return baseSize(); } - QSize minimumSizeHint() const { return minimumSize(); } - -public slots: // Public slots - /** - * Resets the current l�st of modules and the displayed list of found entries. - */ - void reset(); - -protected: // Protected methods - /** - * Initializes the view of this widget. - */ - void initView(); - /** - * Initializes the signal slot conections of the child widgets - */ - void initConnections(); - /** - * This function breakes the queryString into clucene tokens - */ - QStringList QueryParser(const QString& queryString); - /** - * This function highlights the searched text in the content using the search type given by search flags - */ - const QString highlightSearchedText(const QString& content, const QString& searchedText/*, const int searchFlags*/); - -private: - CReadDisplay* m_previewDisplay; - ListCSwordModuleInfo m_modules; - -protected slots: // Protected slots - /** - * Update the preview of the selected key. - */ - void updatePreview(const QString& key); - /** - * Shows a dialog with the search analysis of the current search. - */ - void showAnalysis(); - -}; - } //end of namespace Search::Result - - namespace Options { - -class CSearchOptionsPage : public SearchOptionsForm { - Q_OBJECT -public: - CSearchOptionsPage(QWidget *parent=0, const char *name=0); - ~CSearchOptionsPage(); - /** - * Sets the search text used in the page. - */ - void setSearchText(const QString& text); - /** - * Returns the search text set in this page. - */ - const QString searchText(); - /** - * Returns the list of used modules. - */ - const ListCSwordModuleInfo modules(); - /** - * Return the selected search type,. - */ -// const int searchFlags(); - /** - * Sets all options back to the default. - */ - void reset(); - /** - * Returns the selected search scope if a search scope was selected. - */ - sword::ListKey searchScope(); - /** - * Returns the selected scope type. - */ - //const CSwordModuleSearch::scopeType scopeType(); - - QSize sizeHint() const { return baseSize(); } - QSize minimumSizeHint() const { return minimumSize(); } - bool hasSearchScope(); - -private: - ListCSwordModuleInfo m_modules; - -protected: // Protected methods - /** - * Initializes this page. - */ - void initView(); - /** - * Reads the settings of the last searchdialog session. - */ - void readSettings(); - /** - * Reads the settings for the searchdialog from disk. - */ - void saveSettings(); - -public slots: // Public slots - /** - * Sets the modules used by the search. - */ - void setModules( ListCSwordModuleInfo modules ); - /** - * Reimplementation. - */ - void aboutToShow(); - /** - * Refreshes the list of ranges and the range combobox. - */ - void refreshRanges(); - /** - * Opens the modules chooser dialog. - */ - void chooseModules(); - -protected slots: // Protected slots - void setupRanges(); - void syntaxHelp(); - -signals: - void sigSetSearchButtonStatus(bool); -}; - - } //end of namespace Search::Options -} //end of namespace Search - -#endif diff --git a/bibletime/frontend/searchdialog/csearchresultview.cpp b/bibletime/frontend/searchdialog/csearchresultview.cpp deleted file mode 100644 index cbb2ee1..0000000 --- a/bibletime/frontend/searchdialog/csearchresultview.cpp +++ /dev/null @@ -1,271 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "csearchresultview.h" - -#include "backend/cswordversekey.h" - -#include "frontend/cdragdropmgr.h" -#include "frontend/cexportmanager.h" - -#include "util/cresmgr.h" - -//Qt includes - -//KDE includes -#include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> - -namespace Search { - namespace Result { - -CSearchResultView::CSearchResultView(QWidget* parent, const char* name) : - KListView(parent, name), m_module(0) { - initView(); - initConnections(); -} - -CSearchResultView::~CSearchResultView() {} - -/** Initializes the view of this widget. */ -void CSearchResultView::initView() { - addColumn(i18n("Results")); - setFullWidth(true); - - setSorting(-1); - setDragEnabled(true); - setSelectionModeExt(KListView::Extended); - - //setup the popup menu - m_popup = new KPopupMenu(this); - - m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, m_popup); - m_actions.copyMenu->setDelayed(false); - m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyItems()), this); - m_actions.copyMenu->insert(m_actions.copy.result); - m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyItemsWithText()), this); - m_actions.copyMenu->insert(m_actions.copy.resultWithText); - m_actions.copyMenu->plug(m_popup); - - m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon, m_popup); - m_actions.saveMenu->setDelayed( false ); - m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveItems()), this); - m_actions.saveMenu->insert(m_actions.save.result); - m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveItemsWithText()), this); - m_actions.saveMenu->insert(m_actions.save.resultWithText); - m_actions.saveMenu->plug(m_popup); - - m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon, m_popup); - m_actions.printMenu->setDelayed(false); - m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printItems()), this); - m_actions.printMenu->insert(m_actions.print.result); - m_actions.printMenu->plug(m_popup); -} - -/** No descriptions */ -void CSearchResultView::initConnections() { - // connect(this, SIGNAL(executed(QListViewItem*)), - // this, SLOT(executed(QListViewItem*))); - connect(this, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(executed(QListViewItem*))); - - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&))); -} - -/** Setups the list with the given module. */ -void CSearchResultView::setupTree(CSwordModuleInfo* m) { - clear(); - - if (!m) { - return; - } - - m_module = m; - - sword::ListKey& result = m->searchResult(); - const int count = result.Count(); - if (!count) { - return; - } - - setUpdatesEnabled(false); - - QListViewItem* oldItem = 0; - KListViewItem* item = 0; - for (int index = 0; index < count; index++) { - item = new KListViewItem(this, oldItem); - item->setText(0, QString::fromUtf8(result.GetElement(index)->getText())); - - oldItem = item; - } - - setUpdatesEnabled(true); - - setSelected(firstChild(), true); - executed(currentItem()); -} - -void CSearchResultView::setupStrongsTree(CSwordModuleInfo* m, QStringList* vList) { - clear(); - if (!m) { - return; - } - - m_module = m; - - if (vList->count() <= 0) { - return; - } - - setUpdatesEnabled(false); - - KListViewItem* oldItem = 0; - KListViewItem* item = 0; - - for ( QStringList::Iterator it = vList->begin(); it != vList->end(); ++it ) { - item = new KListViewItem(this, oldItem); - item->setText(0, (*it)); - - oldItem = item; - } - - setUpdatesEnabled(true); - - setSelected(firstChild(), true); - executed(currentItem()); -} - -/** Is connected to the signal executed, which is emitted when a mew item was chosen. */ -void CSearchResultView::executed(QListViewItem* item) { - // Q_ASSERT(item); - // qWarning("executed"); - emit keySelected(item->text(0)); -} - -/** Reimplementation to show the popup menu. */ -void CSearchResultView::showPopup(KListView*, QListViewItem*, const QPoint& point) { - m_popup->exec(point); -} - -/** No descriptions */ -void CSearchResultView::printItems() { - QPtrList<QListViewItem> items = selectedItems(); - CExportManager mgr(i18n("Print search result..."), true, i18n("Printing search result")); - - QStringList list; - for (QListViewItem* k = items.first(); k; k = items.next()) { - list.append( k->text(0) ); - }; - mgr.printKeyList( list, module(), CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() ); -} - -/** No descriptions */ -void CSearchResultView::saveItems() { - CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result")); - - CSwordModuleInfo* m = module(); - CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { - k = CSwordKey::createInstance( m ); - k->key(i->text(0)); - keys.append( k ); - }; - mgr.saveKeyList( keys, CExportManager::Text, false); - - keys.setAutoDelete(true); - keys.clear(); //delete all the keys we created -} - -/** No descriptions */ -void CSearchResultView::saveItemsWithText() { - CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result")); - - CSwordModuleInfo* m = module(); - CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { - k = CSwordKey::createInstance( m ); - k->key(i->text(0)); - keys.append( k ); - }; - mgr.saveKeyList( keys, CExportManager::Text, true); - - keys.setAutoDelete(true); - keys.clear(); //delete all the keys we created -} - -/** No descriptions */ -void CSearchResultView::copyItems() { - CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result")); - - CSwordModuleInfo* m = module(); - CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { - k = CSwordKey::createInstance( m ); - k->key(i->text(0)); - keys.append( k ); - }; - mgr.copyKeyList( keys, CExportManager::Text, false); - - keys.setAutoDelete(true); - keys.clear(); //delete all the keys we created -} - -/** No descriptions */ -void CSearchResultView::copyItemsWithText() { - CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result")); - - CSwordModuleInfo* m = module(); - CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { - k = CSwordKey::createInstance( m ); - k->key(i->text(0)); - keys.append( k ); - }; - mgr.copyKeyList( keys, CExportManager::Text, true); - - keys.setAutoDelete(true); - keys.clear(); //delete all the keys we created -} - -/** Returns the module which is currently used. */ -CSwordModuleInfo* const CSearchResultView::module() { - return m_module; -} - -QDragObject* CSearchResultView::dragObject() { - //return a valid DragObject to make DnD possible! - - /* - * First get all selected items and fill with them the dndItems list. The return the QDragObject we got from CDRagDropMgr - */ - CDragDropMgr::ItemList dndItems; - - QPtrList<QListViewItem> items = selectedItems(); - for (items.first(); items.current(); items.next()) { - dndItems.append( CDragDropMgr::Item(m_module->name(), items.current()->text(0), QString::null) ); //no description - }; - - return CDragDropMgr::dragObject(dndItems, viewport()); -} - - } //end of namespace Search::Result -} //end of namespace - diff --git a/bibletime/frontend/searchdialog/csearchresultview.h b/bibletime/frontend/searchdialog/csearchresultview.h deleted file mode 100644 index b3f4dc4..0000000 --- a/bibletime/frontend/searchdialog/csearchresultview.h +++ /dev/null @@ -1,112 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CSEARCHRESULTSVIEW_H -#define CSEARCHRESULTSVIEW_H - -//BibleTime includes -#include "backend/cswordmoduleinfo.h" - -//KDE includes -#include <klistview.h> - -//forward declarations -class QLabel; -class QCheckBox; -class QPushButton; -class QRadioButton; - -class KComboBox; -class KActionMenu; -class KAction; -class KHistoryCombo; -class KProgress; -class KPopupMenu; - -class CReadDisplay; - -namespace Search { - namespace Result { - -class CSearchResultView : public KListView { - Q_OBJECT -public: - CSearchResultView(QWidget* parent, const char* name = 0); - virtual ~CSearchResultView(); - /** Returns the module which is currently used. */ - CSwordModuleInfo* const module(); - -protected: // Protected methods - /** - * Initializes the view of this widget. - */ - void initView(); - void initConnections(); - virtual QDragObject* dragObject(); - -public slots: // Public slots - void saveItems(); - /** - * Setups the list with the given module. - */ - void setupTree(CSwordModuleInfo*); - void setupStrongsTree(CSwordModuleInfo*, QStringList*); - void copyItemsWithText(); - void copyItems(); - void saveItemsWithText(); - /** - * Reimplementation to show the popup menu. - */ - virtual void showPopup(KListView*, QListViewItem* i, const QPoint& point); - -protected slots: // Protected slots - void printItems(); - /** - * Is connected to the signal executed, which is emitted when a mew item was chosen. - */ - void executed(QListViewItem*); - -private: - struct { - KActionMenu* saveMenu; - struct { - KAction* result; - KAction* resultWithText; - } - save; - - KActionMenu* printMenu; - struct { - KAction* result; - } - print; - - KActionMenu* copyMenu; - struct { - KAction* result; - KAction* resultWithText; - } - copy; - } - m_actions; - - KPopupMenu* m_popup; - CSwordModuleInfo* m_module; - -signals: // Signals - void keySelected(const QString&); -}; - - } //end of namespace Result -} //end of namespace Search - -#endif - diff --git a/bibletime/frontend/searchdialog/searchoptionsform.cpp b/bibletime/frontend/searchdialog/searchoptionsform.cpp deleted file mode 100644 index 18035c8..0000000 --- a/bibletime/frontend/searchdialog/searchoptionsform.cpp +++ /dev/null @@ -1,119 +0,0 @@ -#include <kdialog.h> -#include <klocale.h> -/**************************************************************************** -** Form implementation generated from reading ui file './searchoptionsform.ui' -** -** Created: Sa Mai 10 13:52:35 2008 -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ - -#include "searchoptionsform.h" - -#include <qvariant.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <kcombobox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> - -/* - * Constructs a SearchOptionsForm as a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -SearchOptionsForm::SearchOptionsForm( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "SearchOptionsForm" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 260, 130 ) ); - setBaseSize( QSize( 420, 150 ) ); - SearchOptionsFormLayout = new QHBoxLayout( this, 0, 3, "SearchOptionsFormLayout"); - - searchGroupBox = new QGroupBox( this, "searchGroupBox" ); - searchGroupBox->setMargin( 0 ); - searchGroupBox->setColumnLayout(0, Qt::Vertical ); - searchGroupBox->layout()->setSpacing( 3 ); - searchGroupBox->layout()->setMargin( 6 ); - searchGroupBoxLayout = new QGridLayout( searchGroupBox->layout() ); - searchGroupBoxLayout->setAlignment( Qt::AlignTop ); - - m_searchTextLabel = new QLabel( searchGroupBox, "m_searchTextLabel" ); - m_searchTextLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_searchTextLabel->sizePolicy().hasHeightForWidth() ) ); - - searchGroupBoxLayout->addWidget( m_searchTextLabel, 0, 0 ); - - m_syntaxButton = new QPushButton( searchGroupBox, "m_syntaxButton" ); - - searchGroupBoxLayout->addWidget( m_syntaxButton, 0, 2 ); - - m_chooseModulesButton = new QPushButton( searchGroupBox, "m_chooseModulesButton" ); - - searchGroupBoxLayout->addWidget( m_chooseModulesButton, 1, 2 ); - - m_chooseRangeButton = new QPushButton( searchGroupBox, "m_chooseRangeButton" ); - - searchGroupBoxLayout->addWidget( m_chooseRangeButton, 2, 2 ); - - m_searchScopeLabel = new QLabel( searchGroupBox, "m_searchScopeLabel" ); - m_searchScopeLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_searchScopeLabel->sizePolicy().hasHeightForWidth() ) ); - - searchGroupBoxLayout->addWidget( m_searchScopeLabel, 2, 0 ); - - m_rangeChooserCombo = new KComboBox( FALSE, searchGroupBox, "m_rangeChooserCombo" ); - m_rangeChooserCombo->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, m_rangeChooserCombo->sizePolicy().hasHeightForWidth() ) ); - - searchGroupBoxLayout->addWidget( m_rangeChooserCombo, 2, 1 ); - - m_searchTextCombo = new KHistoryCombo( searchGroupBox, "m_searchTextCombo" ); - m_searchTextCombo->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, m_searchTextCombo->sizePolicy().hasHeightForWidth() ) ); - m_searchTextCombo->setFocusPolicy( KHistoryCombo::WheelFocus ); - m_searchTextCombo->setSizeLimit( 25 ); - m_searchTextCombo->setInsertionPolicy( KHistoryCombo::AtBottom ); - m_searchTextCombo->setDuplicatesEnabled( FALSE ); - - searchGroupBoxLayout->addWidget( m_searchTextCombo, 0, 1 ); - - m_modulesLabel = new QLabel( searchGroupBox, "m_modulesLabel" ); - m_modulesLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_modulesLabel->sizePolicy().hasHeightForWidth() ) ); - m_modulesLabel->setTextFormat( QLabel::RichText ); - m_modulesLabel->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter | QLabel::AlignLeft ) ); - - searchGroupBoxLayout->addMultiCellWidget( m_modulesLabel, 1, 1, 0, 1 ); - SearchOptionsFormLayout->addWidget( searchGroupBox ); - languageChange(); - resize( QSize(648, 130).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); -} - -/* - * Destroys the object and frees any allocated resources - */ -SearchOptionsForm::~SearchOptionsForm() -{ - // no need to delete child widgets, Qt does it all for us -} - -/* - * Sets the strings of the subwidgets using the current - * language. - */ -void SearchOptionsForm::languageChange() -{ - setCaption( tr2i18n( "Search Options" ) ); - searchGroupBox->setTitle( tr2i18n( "Search parameters" ) ); - m_searchTextLabel->setText( tr2i18n( "Search for:" ) ); - m_syntaxButton->setText( tr2i18n( "&Help" ) ); - m_syntaxButton->setAccel( QKeySequence( tr2i18n( "Alt+H" ) ) ); - m_chooseModulesButton->setText( tr2i18n( "&Choose" ) ); - m_chooseModulesButton->setAccel( QKeySequence( tr2i18n( "Alt+C" ) ) ); - m_chooseRangeButton->setText( tr2i18n( "&Setup" ) ); - m_chooseRangeButton->setAccel( QKeySequence( tr2i18n( "Alt+S" ) ) ); - m_searchScopeLabel->setText( tr2i18n( "Search scope:" ) ); - m_modulesLabel->setText( tr2i18n( "Search in:" ) ); -} - -#include "searchoptionsform.moc" diff --git a/bibletime/frontend/searchdialog/searchoptionsform.ui b/bibletime/frontend/searchdialog/searchoptionsform.ui deleted file mode 100644 index 1e31b9c..0000000 --- a/bibletime/frontend/searchdialog/searchoptionsform.ui +++ /dev/null @@ -1,199 +0,0 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>SearchOptionsForm</class> -<widget class="QWidget"> - <property name="name"> - <cstring>SearchOptionsForm</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>648</width> - <height>130</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>260</width> - <height>130</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>420</width> - <height>150</height> - </size> - </property> - <property name="caption"> - <string>Search Options</string> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QGroupBox"> - <property name="name"> - <cstring>searchGroupBox</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="title"> - <string>Search parameters</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>6</number> - </property> - <property name="spacing"> - <number>3</number> - </property> - <widget class="QLabel" row="0" column="0"> - <property name="name"> - <cstring>m_searchTextLabel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Search for:</string> - </property> - </widget> - <widget class="QPushButton" row="0" column="2"> - <property name="name"> - <cstring>m_syntaxButton</cstring> - </property> - <property name="text"> - <string>&Help</string> - </property> - <property name="accel"> - <string>Alt+H</string> - </property> - </widget> - <widget class="QPushButton" row="1" column="2"> - <property name="name"> - <cstring>m_chooseModulesButton</cstring> - </property> - <property name="text"> - <string>&Choose</string> - </property> - <property name="accel"> - <string>Alt+C</string> - </property> - </widget> - <widget class="QPushButton" row="2" column="2"> - <property name="name"> - <cstring>m_chooseRangeButton</cstring> - </property> - <property name="text"> - <string>&Setup</string> - </property> - <property name="accel"> - <string>Alt+S</string> - </property> - </widget> - <widget class="QLabel" row="2" column="0"> - <property name="name"> - <cstring>m_searchScopeLabel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Search scope:</string> - </property> - </widget> - <widget class="KComboBox" row="2" column="1"> - <property name="name"> - <cstring>m_rangeChooserCombo</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - <widget class="KHistoryCombo" row="0" column="1"> - <property name="name"> - <cstring>m_searchTextCombo</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>WheelFocus</enum> - </property> - <property name="sizeLimit"> - <number>25</number> - </property> - <property name="insertionPolicy"> - <enum>AtBottom</enum> - </property> - <property name="duplicatesEnabled"> - <bool>false</bool> - </property> - </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>m_modulesLabel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>1</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Search in:</string> - </property> - <property name="textFormat"> - <enum>RichText</enum> - </property> - <property name="alignment"> - <set>WordBreak|AlignVCenter|AlignLeft</set> - </property> - </widget> - </grid> - </widget> - </hbox> -</widget> -<customwidgets> -</customwidgets> -<layoutdefaults spacing="3" margin="0"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> -</UI> diff --git a/bibletime/frontend/searchdialog/searchresultsform.cpp b/bibletime/frontend/searchdialog/searchresultsform.cpp deleted file mode 100644 index cf1f77b..0000000 --- a/bibletime/frontend/searchdialog/searchresultsform.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include <kdialog.h> -#include <klocale.h> -/**************************************************************************** -** Form implementation generated from reading ui file './searchresultsform.ui' -** -** Created: Sa Mai 10 13:52:35 2008 -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ - -#include "searchresultsform.h" - -#include <qvariant.h> -#include <qpushbutton.h> -#include <qsplitter.h> -#include <qframe.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include "cmoduleresultview.h" -#include "csearchresultview.h" - -/* - * Constructs a SearchResultsForm as a child of 'parent', with the - * name 'name' and widget flags set to 'f'. - */ -SearchResultsForm::SearchResultsForm( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) -{ - if ( !name ) - setName( "SearchResultsForm" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 300, 220 ) ); - setBaseSize( QSize( 440, 290 ) ); - SearchResultsFormLayout = new QVBoxLayout( this, 0, 3, "SearchResultsFormLayout"); - - displaySplitter = new QSplitter( this, "displaySplitter" ); - displaySplitter->setMinimumSize( QSize( 134, 44 ) ); - displaySplitter->setOrientation( QSplitter::Horizontal ); - - QWidget* privateLayoutWidget = new QWidget( displaySplitter, "rightSideBox" ); - rightSideBox = new QVBoxLayout( privateLayoutWidget, 0, 6, "rightSideBox"); - - resultSplitter = new QSplitter( privateLayoutWidget, "resultSplitter" ); - resultSplitter->setOrientation( QSplitter::Vertical ); - - m_moduleListBox = new Search::Result::CModuleResultView( resultSplitter, "m_moduleListBox" ); - - m_resultListBox = new Search::Result::CSearchResultView( resultSplitter, "m_resultListBox" ); - rightSideBox->addWidget( resultSplitter ); - - buttonLayout = new QHBoxLayout( 0, 0, 6, "buttonLayout"); - - m_analyseButton = new QPushButton( privateLayoutWidget, "m_analyseButton" ); - buttonLayout->addWidget( m_analyseButton ); - buttonSpacer = new QSpacerItem( 10, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); - buttonLayout->addItem( buttonSpacer ); - rightSideBox->addLayout( buttonLayout ); - - m_displayFrame = new QFrame( displaySplitter, "m_displayFrame" ); - m_displayFrame->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, m_displayFrame->sizePolicy().hasHeightForWidth() ) ); - m_displayFrame->setFrameShape( QFrame::NoFrame ); - m_displayFrame->setFrameShadow( QFrame::Plain ); - SearchResultsFormLayout->addWidget( displaySplitter ); - languageChange(); - resize( QSize(300, 220).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); -} - -/* - * Destroys the object and frees any allocated resources - */ -SearchResultsForm::~SearchResultsForm() -{ - // no need to delete child widgets, Qt does it all for us -} - -/* - * Sets the strings of the subwidgets using the current - * language. - */ -void SearchResultsForm::languageChange() -{ - setCaption( tr2i18n( "SearchResults" ) ); - m_analyseButton->setText( tr2i18n( "Analyze search" ) ); -} - -#include "searchresultsform.moc" diff --git a/bibletime/frontend/searchdialog/searchresultsform.ui b/bibletime/frontend/searchdialog/searchresultsform.ui deleted file mode 100644 index 5001d0a..0000000 --- a/bibletime/frontend/searchdialog/searchresultsform.ui +++ /dev/null @@ -1,196 +0,0 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>SearchResultsForm</class> -<widget class="QWidget"> - <property name="name"> - <cstring>SearchResultsForm</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>300</width> - <height>220</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>300</width> - <height>220</height> - </size> - </property> - <property name="baseSize"> - <size> - <width>440</width> - <height>290</height> - </size> - </property> - <property name="caption"> - <string>SearchResults</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> - <number>3</number> - </property> - <widget class="QSplitter"> - <property name="name"> - <cstring>displaySplitter</cstring> - </property> - <property name="minimumSize"> - <size> - <width>134</width> - <height>44</height> - </size> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>rightSideBox</cstring> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <widget class="QSplitter"> - <property name="name"> - <cstring>resultSplitter</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <widget class="Search::Result::CModuleResultView"> - <property name="name"> - <cstring>m_moduleListBox</cstring> - </property> - </widget> - <widget class="Search::Result::CSearchResultView"> - <property name="name"> - <cstring>m_resultListBox</cstring> - </property> - </widget> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> - <cstring>buttonLayout</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>0</number> - </property> - <widget class="QPushButton"> - <property name="name"> - <cstring>m_analyseButton</cstring> - </property> - <property name="text"> - <string>Analyze search</string> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>buttonSpacer</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>10</width> - <height>20</height> - </size> - </property> - </spacer> - </hbox> - </widget> - </vbox> - </widget> - <widget class="QFrame"> - <property name="name"> - <cstring>m_displayFrame</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>7</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>Plain</enum> - </property> - </widget> - </widget> - </vbox> -</widget> -<customwidgets> - <customwidget> - <class>Search::Result::CModuleResultView</class> - <header location="local">cmoduleresultview.h</header> - <sizehint> - <width>50</width> - <height>50</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>5</hordata> - <verdata>7</verdata> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> - <customwidget> - <class>Search::Result::CSearchResultView</class> - <header location="local">csearchresultview.h</header> - <sizehint> - <width>50</width> - <height>50</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>5</hordata> - <verdata>7</verdata> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> -</customwidgets> -<images> - <image name="image0"> - <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> - </image> -</images> -<layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>cmoduleresultview.h</includehint> - <includehint>csearchresultview.h</includehint> -</includehints> -</UI> diff --git a/bibletime/frontend/util/Makefile.am b/bibletime/frontend/util/Makefile.am deleted file mode 100644 index 3ad0794..0000000 --- a/bibletime/frontend/util/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDES = $(all_includes) - -libfrontendutil_a_METASOURCES = AUTO - -noinst_LIBRARIES = libfrontendutil.a - -libfrontendutil_a_SOURCES = \ -csortlistviewitem.cpp - -all_headers = \ -csortlistviewitem.h - -EXTRA_DIST = $(libfrontendutil_a_SOURCES) $(all_headers) - - -noinst_HEADERS = csortlistviewitem.h diff --git a/bibletime/frontend/util/Makefile.in b/bibletime/frontend/util/Makefile.in deleted file mode 100644 index e524245..0000000 --- a/bibletime/frontend/util/Makefile.in +++ /dev/null @@ -1,694 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/frontend/util -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libfrontendutil_a_AR = $(AR) $(ARFLAGS) -libfrontendutil_a_LIBADD = -am_libfrontendutil_a_OBJECTS = csortlistviewitem.$(OBJEXT) -#>- libfrontendutil_a_OBJECTS = $(am_libfrontendutil_a_OBJECTS) -#>+ 1 -libfrontendutil_a_OBJECTS = csortlistviewitem.$(OBJEXT) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libfrontendutil_a_SOURCES) -DIST_SOURCES = $(libfrontendutil_a_SOURCES) -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libfrontendutil_a_METASOURCES = AUTO -noinst_LIBRARIES = libfrontendutil.a -libfrontendutil_a_SOURCES = \ -csortlistviewitem.cpp - -all_headers = \ -csortlistviewitem.h - -EXTRA_DIST = $(libfrontendutil_a_SOURCES) $(all_headers) -noinst_HEADERS = csortlistviewitem.h -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/util/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/frontend/util/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/util/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/util/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/util/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libfrontendutil.a: $(libfrontendutil_a_OBJECTS) $(libfrontendutil_a_DEPENDENCIES) - -rm -f libfrontendutil.a - $(libfrontendutil_a_AR) libfrontendutil.a $(libfrontendutil_a_OBJECTS) $(libfrontendutil_a_LIBADD) - $(RANLIB) libfrontendutil.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csortlistviewitem.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-bcheck clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=Makefile.in Makefile.am - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/frontend/util/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/frontend/util/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/util/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/frontend/util/csortlistviewitem.cpp b/bibletime/frontend/util/csortlistviewitem.cpp deleted file mode 100644 index 1bc089f..0000000 --- a/bibletime/frontend/util/csortlistviewitem.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "csortlistviewitem.h" - -//#include <versekey.h> - -namespace util { - -CSortListViewItem::CSortListViewItem(QListViewItem* parent) : KListViewItem(parent) -{ -} - -CSortListViewItem::CSortListViewItem( QListView * parent, QListViewItem * after ) - : KListViewItem ( parent, after ) -{ -} - -CSortListViewItem::CSortListViewItem( QListViewItem * parent, QListViewItem * after ) - : KListViewItem ( parent, after ) -{ -} - -CSortListViewItem::CSortListViewItem( QListView * parent, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) - : KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 ) -{ -} - -CSortListViewItem::CSortListViewItem( QListViewItem * parent, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) - : KListViewItem ( parent, label1, label2, label3, label4, label5, label6, label7, label8 ) -{ -} - -CSortListViewItem::CSortListViewItem( QListView * parent, QListViewItem * after, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) - : KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 ) -{ -} - -CSortListViewItem::CSortListViewItem( QListViewItem * parent, QListViewItem * after, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) - : KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 ) -{ - -} - - -CSortListViewItem::~CSortListViewItem() { -} - -int CSortListViewItem::compare( QListViewItem* i, int col, bool ascending ) const { - int ret = 0; - - if ( !columnSorting.contains(col) ) { - return KListViewItem::compare(i, col, ascending); - } - - Type t = columnSorting[col]; - if (t == String) { - ret = KListViewItem::compare(i, col, ascending); - } - else if (t == Number) { - ret = (int) (text(col).toLong() - (i->text(col).toLong())); - } -// else if (t == BibleKey) { -// //ret = (int) (text(col).toLong() - (i->text(col).toLong())); -// ret = sword::VerseKey( (const char*) text(col).utf8() )._compare( sword::VerseKey( (const char*) i->text(col).utf8()) ); -// } - - return ret; -} - -void CSortListViewItem::setColumnSorting(int column, CSortListViewItem::Type type) { - columnSorting[ column ] = type; -} - -} - diff --git a/bibletime/frontend/util/csortlistviewitem.h b/bibletime/frontend/util/csortlistviewitem.h deleted file mode 100644 index b1f66ce..0000000 --- a/bibletime/frontend/util/csortlistviewitem.h +++ /dev/null @@ -1,58 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef UTILCSORTLISTVIEWITEM_H -#define UTILCSORTLISTVIEWITEM_H - - -#include <qmap.h> - -#include <klistview.h> - -namespace util { - -/** - * A implementation of a QListViewItem to allow special sort orders for it's columns. - * @author The BibleTime team <info@bibletime.info> -*/ -class CSortListViewItem : public KListViewItem { -public: - enum Type { - Number, String/*, BibleKey*/ - }; - - CSortListViewItem( QListViewItem* parent ); - - CSortListViewItem( QListView * parent, QListViewItem * after ); - - CSortListViewItem( QListViewItem * parent, QListViewItem * after ); - - CSortListViewItem( QListView * parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); - - CSortListViewItem( QListViewItem * parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); - - CSortListViewItem( QListView * parent, QListViewItem * after, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); - - CSortListViewItem( QListViewItem * parent, QListViewItem * after, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); - - virtual ~CSortListViewItem(); - - virtual int compare( QListViewItem* i, int col, bool ascending ) const; - - void setColumnSorting(int column, Type type); - -private: - QMap<int, Type> columnSorting; -}; - -} - -#endif diff --git a/bibletime/main.cpp b/bibletime/main.cpp deleted file mode 100644 index 71690b9..0000000 --- a/bibletime/main.cpp +++ /dev/null @@ -1,311 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -/* $Header: /cvsroot/bibletime/bibletime/bibletime/main.cpp,v 1.144 2007/10/26 21:19:27 eelik Exp $ */ -/* $Revision: 1.144 $ */ - -//standard includes -#include <stdlib.h> -#include <stdio.h> -#include <signal.h> - -//own includes -#include "bibletimeapp.h" -#include "bibletime.h" -#include "config.h" - -//util includes -#include "util/scoped_resource.h" -#include "util/cresmgr.h" - -//frontend includes -#include "frontend/kstartuplogo.h" -#include "frontend/cbtconfig.h" - -//Qt includes -#include <qdir.h> - -//KDE includes -#include <kcmdlineargs.h> -#include <kcrash.h> -#include <kglobal.h> -#include <kapplication.h> -#include <kstandarddirs.h> -#include <kinstance.h> -#include <kaboutdata.h> -#include <klocale.h> - -bool showDebugMessages = false; -BibleTime* bibletime_ptr = 0; - -void myMessageOutput( QtMsgType type, const char *msg ) { - //we use this messagehandler to switch debugging off in final releases - switch ( type ) { - case QtDebugMsg: - if (showDebugMessages) { //only show messages if they are enabled! - fprintf( stderr,"(BibleTime %s) Debug: %s\n",VERSION, msg ); - } - break; - case QtWarningMsg: - //if (showDebugMessages) //comment out for releases so users don't get our debug warnings - fprintf( stderr,"(BibleTime %s) WARNING: %s\n",VERSION, msg ); - break; - case QtFatalMsg: - fprintf( stderr,"(BibleTime %s) _FATAL_: %s\nPlease contact info@bibletime.de and report this bug!",VERSION, msg ); - abort(); // dump core on purpose - } -} - -extern "C" { - static void setSignalHandler(void (*handler)(int)); - - // Crash recovery signal handler - static void signalHandler(int sigId) { - setSignalHandler(SIG_DFL); - fprintf(stderr, "*** BibleTime got signal %d (Exiting)\n", sigId); - // try to cleanup all windows - if (CBTConfig::get(CBTConfig::crashedLastTime)) { - //crashed this time and the execution before this one, probably a bug which occurs every time - CBTConfig::set(CBTConfig::crashedTwoTimes, true); - } - else { - //try to restore next time. - CBTConfig::set(CBTConfig::crashedLastTime, true); - } - if (bibletime_ptr) { - bibletime_ptr->saveSettings(); - fprintf(stderr, "*** Saving seemed to be successful. If restoring does not work on next startup please use the option --ignore-session\n"); - } - ::exit(-1); //exit BibleTime - } - - // Crash recovery signal handler - static void crashHandler(int sigId) { - setSignalHandler(SIG_DFL); - fprintf(stderr, "*** BibleTime got signal %d (Crashing). Trying to save settings.\n", sigId); - if (CBTConfig::get(CBTConfig::crashedLastTime)) { - // crashed this time and the execution before this one, - // probably a bug which occurs every time - CBTConfig::set(CBTConfig::crashedTwoTimes, true); - } - else { - //try to restore next time. - CBTConfig::set(CBTConfig::crashedLastTime, true); - } - if (bibletime_ptr) { - bibletime_ptr->saveSettings(); - fprintf(stderr, "*** Saving seemed to be successful. If restoring does not work on next startup please use the option --ignore-session\n"); - } - // Return to DrKonqi. - } - - static void setSignalHandler(void (*handler)(int)) { - signal(SIGKILL, handler); - signal(SIGTERM, handler); - signal(SIGHUP, handler); - KCrash::setEmergencySaveFunction(crashHandler); - } -} - -int main(int argc, char* argv[]) { - qInstallMsgHandler( myMessageOutput ); - - //create about data for this application - static KCmdLineOptions options[] = - { - {"debug", I18N_NOOP("Enable debug messages"),0}, - {"ignore-session", I18N_NOOP("Ignore the startup session that was saved when BibleTime was closed the last time."),0}, - {"open-default-bible <key>", I18N_NOOP("Open the standard Bible with the given key. Use <random> to open at a random position."),0}, - //{"install-local <path>", I18N_NOOP("Open the SwordSetup dialog to install works from <path>"),0}, - {0,0,0} - }; - - KAboutData aboutData( - PACKAGE, - "BibleTime", - VERSION, - I18N_NOOP("Bible study tool for KDE"), - KAboutData::License_GPL_V2, - I18N_NOOP("(c)1999-2007, The BibleTime Team"), - I18N_NOOP("BibleTime is an easy to use but powerful Bible study tool for KDE.\n\nWe are looking for developers and translators.\nIf you'd like to join our team, please send an email to info@bibletime.info."), - "http://www.bibletime.info/", - "info@bibletime.info" - ); - - /*********************************************** - * Active developers (sorted by last name) * - ************************************************/ - // Project coordination - aboutData.addAuthor("Joachim Ansorg", I18N_NOOP("Project coordinator"), "nospam@joachim-ansorg.de", "http://www.joachim-ansorg.de/"); - // Second main developer - aboutData.addAuthor("Martin Gruner", I18N_NOOP("Frontend, backend"), "mg.pub@gmx.net", ""); - // artwork - aboutData.addAuthor("James Ots", I18N_NOOP("Crystal icons, crystal startlogo, webpage"), "me@jamesots.com", "http://www.jamesots.com"); - - //inactiv - - /*********************************************** - * Credits (sorted by last name) * - ************************************************/ - // Update to the Romanian GUI translation - aboutData.addCredit("Horatiu Alexe", I18N_NOOP("Romanian translation"), ""); - //highcolor icons, startlogo for BT <= 1.4 - aboutData.addCredit("David Blue", I18N_NOOP("High contrast template"), "davidslists@gmx.net"); - //helped out with the installation manager - aboutData.addCredit("Tim Brodie", I18N_NOOP("Installation manager"),"tbrodie@displayworksinc.com", ""); - //first set of icons and the first startup logos - aboutData.addCredit("Timothy R. Butler", I18N_NOOP("Icons, startlogo"), "tbutler@uninetsolutions.com", "http://www.uninetsolutions.com"); - //GUI improvements - aboutData.addCredit("Jim Campbell", I18N_NOOP("GUI"), "jdc.email@gmail.com", ""); - //Indexed search, gui improvements - aboutData.addCredit("Lee Carpenter", I18N_NOOP("GUI, instant search"),"Lee Carpenter <elc@carpie.net>", "http://www.carpie.net"); - //Translations into Traditional and Simplified Chinese - aboutData.addCredit("Chun-shek Chan", I18N_NOOP("GUI translations into Traditional and Simplified Chinese"), "chunshek@gmail.com", ""); - //Binary packages of CLucene, BibleTime and Sword for Fedore, SUSE, Mandriva - aboutData.addCredit("Jeremy Erickson", I18N_NOOP("Binary packages"), "", ""); - //Started the Crosswire porject, also contributed some code - aboutData.addCredit("Troy A. Griffits", I18N_NOOP("Founder of the Sword project"), "scribe@crosswire.org", "http://www.crosswire.org/"); - //Sponsored many years the www.bibletime.de domain! - aboutData.addCredit("Thomas Hagedorn", I18N_NOOP("Sponsored our internet domain for many years"), "tom@theta-consulting.de", ""); - //He provided us with the Bible Study HowTo - aboutData.addCredit("Bob Harman", I18N_NOOP("Bible Study HowTo"), "ncc@ncchampton.org", ""); - // and / or search for multiple words, other fixes and improvements - aboutData.addCredit("Nikolay Igotti", I18N_NOOP("Search dialog enhancements"), "olonho@hotmail.com", ""); - // Language codes iso639-1, iso639-2 and SIL language codes - aboutData.addCredit("SIL International", I18N_NOOP("Language codes and names"), "", "http://www.ethnologue.com/iso639"); - //Patch for the mag delay (2007-03-22) - aboutData.addCredit("Eeli Kaikkonen", I18N_NOOP("GUI improvements"),"eekaikko@mail.student.oulu.fi", ""); - //Update the the Finnish GUI translation - aboutData.addCredit("Ilpo Kantonen", I18N_NOOP("Finnish translation"),"", ""); - //Smaller frontend enhancements - aboutData.addCredit("Chris Kujawa", I18N_NOOP("Frontend"),"christopher.kujawa@verizon.net", ""); - //Update to the Czech GUI translation - aboutData.addCredit("Pavel Lauko", I18N_NOOP("Czech translation"),"", ""); - //Smaller searchdialog enhancements - aboutData.addCredit("Mark Lybarger", I18N_NOOP("Searchdialog"), "mlybarge@insight.rr.com",""); - //Polish GUI translation update - aboutData.addCredit("Piotr Markiewicz", I18N_NOOP("Polish translation"), "pmarki@o2.pl", ""); - //Smaller frontend enhancements - aboutData.addCredit("Luke Mauldin", I18N_NOOP("Frontend"), "lukeskyfly@txk.net", ""); - //translated parts of the russian website files - aboutData.addCredit("Igor Rykhlin", I18N_NOOP("Russian website translation"), "", ""); - // update to the Spanish website translation - aboutData.addCredit("Gabriel Pérez", I18N_NOOP("Spanish website translation updates"), "", ""); - //Update to the russian website translation - aboutData.addCredit("Igor Plisco", I18N_NOOP("Update to the russian website translation"), "", ""); - // handbook documentation - aboutData.addCredit("Fred Saalbach", I18N_NOOP("Documentation"), "saalbach@sybercom.net", ""); - // Original Russian website translator - aboutData.addCredit("Vlad Savitsky", I18N_NOOP("Russian website translation"), "", ""); - // comitted search in default bible, opened modules, other smaller things - aboutData.addCredit("Gary Sims", I18N_NOOP("Search dialog enhancements"), "gary@garysims.co.uk", ""); - // Very helpful testing - aboutData.addCredit("Wolfgang Stradner", I18N_NOOP("Very helpful and detailed testing"), "wolfgang_stradner@wycliffe.org", ""); - //The first lead developer - aboutData.addCredit("Torsten Uhlmann", I18N_NOOP("The first lead developer"), "", ""); - //Update of the dutch website translation - aboutData.addCredit("Johan van der Lingen", I18N_NOOP("Translation updates for the Dutch GUI, the website and the handbook"), "", ""); - //French handbook translation - aboutData.addCredit("Jean Van Schaftingen", I18N_NOOP("French handbook translation"), "", ""); - //scoped_ptr and related classes - aboutData.addCredit("David White", I18N_NOOP("Helpful source code additions"), "", "http://www.wesnoth.org/"); - //Translated the GUI into Russian - aboutData.addCredit("Dmitry Yurevich", I18N_NOOP("Translated the GUI into Russian"), "", ""); - //The new keychooser for Bible modules - aboutData.addCredit("Mark Zealey", I18N_NOOP("New Bible key choosers"), "mspam@zealey.org", ""); - //Update to the Spanish GUI translation - aboutData.addCredit("Esteban Zeller", I18N_NOOP("Spanish translation"), "", ""); - - - //special message so the translator get his credits in the about box, don't remove this! - QString dummy = I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"); //translator's name - dummy = I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"); //translators eMail - - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); - - BibleTimeApp app; - KGlobal::dirs()->addResourceType("BT_pic", "share/apps/bibletime/pics"); - KGlobal::dirs()->addResourceType("BT_DisplayTemplates", "share/apps/bibletime/display-templates"); - - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - - // A binary option (on / off) - if (args->isSet("debug")) { - showDebugMessages = true; - } - - if (kapp->isRestored()) { - // qWarning("Restoring BibleTime"); - //RESTORE( BibleTime ); - int n = 1; - while (KMainWindow::canBeRestored(n)){ - if (KMainWindow::classNameOfToplevel(n) == QString("BibleTime")) { - bibletime_ptr = new BibleTime; - bibletime_ptr->restore(n); - } - n++; - } - bibletime_ptr->restoreWorkspace(); - } - else { - const bool showIt = CBTConfig::get(CBTConfig::logo); - - if(showIt) { - KStartupLogo::createSplash(); - KStartupLogo::showSplash(); - KStartupLogo::setStatusMessage( i18n("Starting BibleTime") + QString("...") ); - } - - setSignalHandler(signalHandler); - - // compatibility stuff for 1.3, needs to be moved to better place later - if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) { - KStandardDirs stdDirs; - QDir dir(stdDirs.saveLocation("data", "bibletime/")); - if (!dir.exists("sessions/") && dir.exists("profiles/")) { //only old dir exists - dir.rename("profiles", "sessions"); - } - } - - bibletime_ptr = new BibleTime(); - - // a new BibleTime version was installed (maybe a completely new installation) - if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) { - KStartupLogo::hideSplash(); - - CBTConfig::set(CBTConfig::bibletimeVersion, VERSION); - bibletime_ptr->slotSettingsOptions(); - } - - //The tip of the day - if (CBTConfig::get(CBTConfig::tips)) { - KStartupLogo::hideSplash(); - bibletime_ptr->slotHelpTipOfDay(); - } - - // restore the workspace and process command line options - app.setMainWidget(bibletime_ptr); - bibletime_ptr->show(); - bibletime_ptr->processCommandline(); //must be done after the bibletime window is visible - - if (showIt) { - KStartupLogo::hideSplash(); - KStartupLogo::deleteSplash(); - } - } - - const int ret = app.exec(); - - delete bibletime_ptr; - return ret; -} - diff --git a/bibletime/pics/16x16/Makefile.am b/bibletime/pics/16x16/Makefile.am deleted file mode 100644 index fd4e41f..0000000 --- a/bibletime/pics/16x16/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update - - -EXTRA_DIST = hi16-action-bt_bible.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book.png hi16-action-bt_book_add.png hi16-action-bt_book_locked.png hi16-action-bt_cascade.png hi16-action-bt_cascade_auto.png hi16-action-bt_commentary.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_displaytranslit.png hi16-action-bt_lexicon.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_swordconfig.png hi16-action-bt_sync.png hi16-action-bt_tile.png hi16-action-bt_tile_auto.png hi16-app-bibletime.png hi16-action-bt_findstrongs.png - -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_findstrongs
\ No newline at end of file diff --git a/bibletime/pics/16x16/Makefile.in b/bibletime/pics/16x16/Makefile.in deleted file mode 100644 index a13b949..0000000 --- a/bibletime/pics/16x16/Makefile.in +++ /dev/null @@ -1,622 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/pics/16x16 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -EXTRA_DIST = hi16-action-bt_bible.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book.png hi16-action-bt_book_add.png hi16-action-bt_book_locked.png hi16-action-bt_cascade.png hi16-action-bt_cascade_auto.png hi16-action-bt_commentary.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_displaytranslit.png hi16-action-bt_lexicon.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_swordconfig.png hi16-action-bt_sync.png hi16-action-bt_tile.png hi16-action-bt_tile_auto.png hi16-app-bibletime.png hi16-action-bt_findstrongs.png -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_findstrongs -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/16x16/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/pics/16x16/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/16x16/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/16x16/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/16x16/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -#>- install-data-am: -#>+ 1 -install-data-am: install-kde-icons - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -#>- uninstall-am: -#>+ 1 -uninstall-am: uninstall-kde-icons - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=Makefile.in Makefile.am - -#>+ 2 -docs-am: - -#>+ 52 -install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_add.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_locked.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_add.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade_auto.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_add.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_locked.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displayconfig.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displaytranslit.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_findstrongs.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_findstrongs.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_add.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_locked.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_startconfig.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_swordconfig.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_sync.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png - $(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps - $(INSTALL_DATA) $(srcdir)/hi16-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png - -uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displayconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displaytranslit.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_findstrongs.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_startconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_swordconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_sync.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/16x16/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/16x16/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/16x16/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/pics/16x16/hi16-action-bt_bible.png b/bibletime/pics/16x16/hi16-action-bt_bible.png Binary files differdeleted file mode 100644 index 59e09c2..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_bible.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_add.png b/bibletime/pics/16x16/hi16-action-bt_bible_add.png Binary files differdeleted file mode 100644 index a90a655..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_bible_add.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_locked.png b/bibletime/pics/16x16/hi16-action-bt_bible_locked.png Binary files differdeleted file mode 100644 index 060626f..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_bible_locked.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_book.png b/bibletime/pics/16x16/hi16-action-bt_book.png Binary files differdeleted file mode 100644 index 0ec5e3b..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_book.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_book_add.png b/bibletime/pics/16x16/hi16-action-bt_book_add.png Binary files differdeleted file mode 100644 index ac5fb3f..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_book_add.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_book_locked.png b/bibletime/pics/16x16/hi16-action-bt_book_locked.png Binary files differdeleted file mode 100644 index 83784a8..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_book_locked.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade.png b/bibletime/pics/16x16/hi16-action-bt_cascade.png Binary files differdeleted file mode 100644 index d2d4002..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_cascade.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png b/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png Binary files differdeleted file mode 100644 index a16ad9a..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary.png b/bibletime/pics/16x16/hi16-action-bt_commentary.png Binary files differdeleted file mode 100644 index b9f198e..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_commentary.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_add.png b/bibletime/pics/16x16/hi16-action-bt_commentary_add.png Binary files differdeleted file mode 100644 index af1e044..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_commentary_add.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png b/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png Binary files differdeleted file mode 100644 index 9b019dc..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_displayconfig.png b/bibletime/pics/16x16/hi16-action-bt_displayconfig.png Binary files differdeleted file mode 100644 index 735af2f..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_displayconfig.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png b/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png Binary files differdeleted file mode 100644 index 85c7e98..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_findstrongs.png b/bibletime/pics/16x16/hi16-action-bt_findstrongs.png Binary files differdeleted file mode 100644 index 52a8416..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_findstrongs.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon.png b/bibletime/pics/16x16/hi16-action-bt_lexicon.png Binary files differdeleted file mode 100644 index 4a0fe15..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_lexicon.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png Binary files differdeleted file mode 100644 index 78a0ba2..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png Binary files differdeleted file mode 100644 index ff7d87f..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_startconfig.png b/bibletime/pics/16x16/hi16-action-bt_startconfig.png Binary files differdeleted file mode 100644 index 21e4865..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_startconfig.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_swordconfig.png b/bibletime/pics/16x16/hi16-action-bt_swordconfig.png Binary files differdeleted file mode 100644 index 3c33de6..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_swordconfig.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_sync.png b/bibletime/pics/16x16/hi16-action-bt_sync.png Binary files differdeleted file mode 100644 index 6820542..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_sync.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_tile.png b/bibletime/pics/16x16/hi16-action-bt_tile.png Binary files differdeleted file mode 100644 index 10854d8..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_tile.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-action-bt_tile_auto.png b/bibletime/pics/16x16/hi16-action-bt_tile_auto.png Binary files differdeleted file mode 100644 index f4ab245..0000000 --- a/bibletime/pics/16x16/hi16-action-bt_tile_auto.png +++ /dev/null diff --git a/bibletime/pics/16x16/hi16-app-bibletime.png b/bibletime/pics/16x16/hi16-app-bibletime.png Binary files differdeleted file mode 100644 index 1fe6a4d..0000000 --- a/bibletime/pics/16x16/hi16-app-bibletime.png +++ /dev/null diff --git a/bibletime/pics/22x22/Makefile.am b/bibletime/pics/22x22/Makefile.am deleted file mode 100644 index e7d2521..0000000 --- a/bibletime/pics/22x22/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update - - -EXTRA_DIST = hi22-action-bt_bible.png hi22-action-bt_bible_add.png hi22-action-bt_bible_locked.png hi22-action-bt_book.png hi22-action-bt_book_add.png hi22-action-bt_book_locked.png hi22-action-bt_cascade.png hi22-action-bt_cascade_auto.png hi22-action-bt_commentary.png hi22-action-bt_commentary_add.png hi22-action-bt_commentary_locked.png hi22-action-bt_displayconfig.png hi22-action-bt_displaytranslit.png hi22-action-bt_lexicon.png hi22-action-bt_lexicon_add.png hi22-action-bt_lexicon_locked.png hi22-action-bt_parallel.png hi22-action-bt_startconfig.png hi22-action-bt_swordconfig.png hi22-action-bt_sync.png hi22-action-bt_tile.png hi22-action-bt_tile_auto.png hi22-app-bibletime.png hi22-action-bt_findstrongs.png - -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_parallel bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_findstrongs
\ No newline at end of file diff --git a/bibletime/pics/22x22/Makefile.in b/bibletime/pics/22x22/Makefile.in deleted file mode 100644 index 40b4dc2..0000000 --- a/bibletime/pics/22x22/Makefile.in +++ /dev/null @@ -1,624 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/pics/22x22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -EXTRA_DIST = hi22-action-bt_bible.png hi22-action-bt_bible_add.png hi22-action-bt_bible_locked.png hi22-action-bt_book.png hi22-action-bt_book_add.png hi22-action-bt_book_locked.png hi22-action-bt_cascade.png hi22-action-bt_cascade_auto.png hi22-action-bt_commentary.png hi22-action-bt_commentary_add.png hi22-action-bt_commentary_locked.png hi22-action-bt_displayconfig.png hi22-action-bt_displaytranslit.png hi22-action-bt_lexicon.png hi22-action-bt_lexicon_add.png hi22-action-bt_lexicon_locked.png hi22-action-bt_parallel.png hi22-action-bt_startconfig.png hi22-action-bt_swordconfig.png hi22-action-bt_sync.png hi22-action-bt_tile.png hi22-action-bt_tile_auto.png hi22-app-bibletime.png hi22-action-bt_findstrongs.png -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_parallel bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_findstrongs -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/22x22/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/pics/22x22/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/22x22/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/22x22/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/22x22/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -#>- install-data-am: -#>+ 1 -install-data-am: install-kde-icons - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -#>- uninstall-am: -#>+ 1 -uninstall-am: uninstall-kde-icons - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=Makefile.in Makefile.am - -#>+ 2 -docs-am: - -#>+ 54 -install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_add.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_locked.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_add.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_locked.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade_auto.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_add.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_locked.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displayconfig.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displaytranslit.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_findstrongs.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_findstrongs.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_add.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_locked.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_parallel.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_parallel.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_startconfig.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_swordconfig.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_sync.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile.png - $(INSTALL_DATA) $(srcdir)/hi22-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile_auto.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps - $(INSTALL_DATA) $(srcdir)/hi22-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/bibletime.png - -uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displayconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displaytranslit.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_findstrongs.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_parallel.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_startconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_swordconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_sync.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/bibletime.png - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/22x22/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/22x22/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/22x22/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/pics/22x22/hi22-action-bt_bible.png b/bibletime/pics/22x22/hi22-action-bt_bible.png Binary files differdeleted file mode 100644 index 20c9785..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_bible.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_add.png b/bibletime/pics/22x22/hi22-action-bt_bible_add.png Binary files differdeleted file mode 100644 index 7684364..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_bible_add.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_locked.png b/bibletime/pics/22x22/hi22-action-bt_bible_locked.png Binary files differdeleted file mode 100644 index c88f9f7..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_bible_locked.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_book.png b/bibletime/pics/22x22/hi22-action-bt_book.png Binary files differdeleted file mode 100644 index 7d50365..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_book.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_book_add.png b/bibletime/pics/22x22/hi22-action-bt_book_add.png Binary files differdeleted file mode 100644 index 60d345f..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_book_add.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_book_locked.png b/bibletime/pics/22x22/hi22-action-bt_book_locked.png Binary files differdeleted file mode 100644 index 8c0861a..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_book_locked.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade.png b/bibletime/pics/22x22/hi22-action-bt_cascade.png Binary files differdeleted file mode 100644 index 07068c6..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_cascade.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png b/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png Binary files differdeleted file mode 100644 index 8b3a0a8..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary.png b/bibletime/pics/22x22/hi22-action-bt_commentary.png Binary files differdeleted file mode 100644 index 4711ca2..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_commentary.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_add.png b/bibletime/pics/22x22/hi22-action-bt_commentary_add.png Binary files differdeleted file mode 100644 index d58bb17..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_commentary_add.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png b/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png Binary files differdeleted file mode 100644 index b9b3615..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_displayconfig.png b/bibletime/pics/22x22/hi22-action-bt_displayconfig.png Binary files differdeleted file mode 100644 index eaa67d1..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_displayconfig.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png b/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png Binary files differdeleted file mode 100644 index 5eada70..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_findstrongs.png b/bibletime/pics/22x22/hi22-action-bt_findstrongs.png Binary files differdeleted file mode 100644 index c709b21..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_findstrongs.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon.png b/bibletime/pics/22x22/hi22-action-bt_lexicon.png Binary files differdeleted file mode 100644 index 437cb50..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_lexicon.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png Binary files differdeleted file mode 100644 index 924ea64..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png Binary files differdeleted file mode 100644 index 0b3fa30..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_parallel.png b/bibletime/pics/22x22/hi22-action-bt_parallel.png Binary files differdeleted file mode 100644 index b1d3ea1..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_parallel.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_startconfig.png b/bibletime/pics/22x22/hi22-action-bt_startconfig.png Binary files differdeleted file mode 100644 index 6f4b900..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_startconfig.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_swordconfig.png b/bibletime/pics/22x22/hi22-action-bt_swordconfig.png Binary files differdeleted file mode 100644 index 4c87bb5..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_swordconfig.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_sync.png b/bibletime/pics/22x22/hi22-action-bt_sync.png Binary files differdeleted file mode 100644 index 71f6df7..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_sync.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_tile.png b/bibletime/pics/22x22/hi22-action-bt_tile.png Binary files differdeleted file mode 100644 index 01d406d..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_tile.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-action-bt_tile_auto.png b/bibletime/pics/22x22/hi22-action-bt_tile_auto.png Binary files differdeleted file mode 100644 index e826540..0000000 --- a/bibletime/pics/22x22/hi22-action-bt_tile_auto.png +++ /dev/null diff --git a/bibletime/pics/22x22/hi22-app-bibletime.png b/bibletime/pics/22x22/hi22-app-bibletime.png Binary files differdeleted file mode 100644 index acf2585..0000000 --- a/bibletime/pics/22x22/hi22-app-bibletime.png +++ /dev/null diff --git a/bibletime/pics/32x32/Makefile.am b/bibletime/pics/32x32/Makefile.am deleted file mode 100644 index 14d0802..0000000 --- a/bibletime/pics/32x32/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update - - -EXTRA_DIST = hi32-action-bt_bible.png hi32-action-bt_bible_add.png hi32-action-bt_bible_locked.png hi32-action-bt_book.png hi32-action-bt_book_add.png hi32-action-bt_book_locked.png hi32-action-bt_cascade.png hi32-action-bt_cascade_auto.png hi32-action-bt_commentary.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary_locked.png hi32-action-bt_displayconfig.png hi32-action-bt_displaytranslit.png hi32-action-bt_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon_locked.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png hi32-action-bt_findstrongs.png - -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_findstrongs
\ No newline at end of file diff --git a/bibletime/pics/32x32/Makefile.in b/bibletime/pics/32x32/Makefile.in deleted file mode 100644 index c994426..0000000 --- a/bibletime/pics/32x32/Makefile.in +++ /dev/null @@ -1,622 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/pics/32x32 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -EXTRA_DIST = hi32-action-bt_bible.png hi32-action-bt_bible_add.png hi32-action-bt_bible_locked.png hi32-action-bt_book.png hi32-action-bt_book_add.png hi32-action-bt_book_locked.png hi32-action-bt_cascade.png hi32-action-bt_cascade_auto.png hi32-action-bt_commentary.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary_locked.png hi32-action-bt_displayconfig.png hi32-action-bt_displaytranslit.png hi32-action-bt_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon_locked.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png hi32-action-bt_findstrongs.png -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_findstrongs -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/32x32/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/pics/32x32/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/32x32/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/32x32/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/32x32/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -#>- install-data-am: -#>+ 1 -install-data-am: install-kde-icons - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -#>- uninstall-am: -#>+ 1 -uninstall-am: uninstall-kde-icons - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=Makefile.in Makefile.am - -#>+ 2 -docs-am: - -#>+ 52 -install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_add.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_locked.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_add.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_locked.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade_auto.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_add.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_locked.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displayconfig.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displaytranslit.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_findstrongs.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_findstrongs.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_add.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_locked.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_startconfig.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_swordconfig.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_sync.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile.png - $(INSTALL_DATA) $(srcdir)/hi32-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile_auto.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps - $(INSTALL_DATA) $(srcdir)/hi32-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/bibletime.png - -uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displayconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displaytranslit.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_findstrongs.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_startconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_swordconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_sync.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/bibletime.png - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/32x32/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/32x32/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/32x32/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/pics/32x32/hi32-action-bt_bible.png b/bibletime/pics/32x32/hi32-action-bt_bible.png Binary files differdeleted file mode 100644 index b949de7..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_bible.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_add.png b/bibletime/pics/32x32/hi32-action-bt_bible_add.png Binary files differdeleted file mode 100644 index 48c63e8..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_bible_add.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_locked.png b/bibletime/pics/32x32/hi32-action-bt_bible_locked.png Binary files differdeleted file mode 100644 index 259e08f..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_bible_locked.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_book.png b/bibletime/pics/32x32/hi32-action-bt_book.png Binary files differdeleted file mode 100644 index 84887db..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_book.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_book_add.png b/bibletime/pics/32x32/hi32-action-bt_book_add.png Binary files differdeleted file mode 100644 index 8d35be9..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_book_add.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_book_locked.png b/bibletime/pics/32x32/hi32-action-bt_book_locked.png Binary files differdeleted file mode 100644 index ce746b8..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_book_locked.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade.png b/bibletime/pics/32x32/hi32-action-bt_cascade.png Binary files differdeleted file mode 100644 index 070f5d1..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_cascade.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png b/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png Binary files differdeleted file mode 100644 index 4171ffc..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary.png b/bibletime/pics/32x32/hi32-action-bt_commentary.png Binary files differdeleted file mode 100644 index fa29810..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_commentary.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_add.png b/bibletime/pics/32x32/hi32-action-bt_commentary_add.png Binary files differdeleted file mode 100644 index 18b31a8..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_commentary_add.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png b/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png Binary files differdeleted file mode 100644 index f615a88..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_displayconfig.png b/bibletime/pics/32x32/hi32-action-bt_displayconfig.png Binary files differdeleted file mode 100644 index 2478bf9..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_displayconfig.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png b/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png Binary files differdeleted file mode 100644 index 91f97a2..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_findstrongs.png b/bibletime/pics/32x32/hi32-action-bt_findstrongs.png Binary files differdeleted file mode 100644 index ea7c769..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_findstrongs.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon.png b/bibletime/pics/32x32/hi32-action-bt_lexicon.png Binary files differdeleted file mode 100644 index 0357308..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_lexicon.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png Binary files differdeleted file mode 100644 index 9c8ad16..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png Binary files differdeleted file mode 100644 index e239f7f..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_startconfig.png b/bibletime/pics/32x32/hi32-action-bt_startconfig.png Binary files differdeleted file mode 100644 index c64200d..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_startconfig.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_swordconfig.png b/bibletime/pics/32x32/hi32-action-bt_swordconfig.png Binary files differdeleted file mode 100644 index b8f3d30..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_swordconfig.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_sync.png b/bibletime/pics/32x32/hi32-action-bt_sync.png Binary files differdeleted file mode 100644 index 25fdb0f..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_sync.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_tile.png b/bibletime/pics/32x32/hi32-action-bt_tile.png Binary files differdeleted file mode 100644 index 3cab67e..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_tile.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-action-bt_tile_auto.png b/bibletime/pics/32x32/hi32-action-bt_tile_auto.png Binary files differdeleted file mode 100644 index e92e26d..0000000 --- a/bibletime/pics/32x32/hi32-action-bt_tile_auto.png +++ /dev/null diff --git a/bibletime/pics/32x32/hi32-app-bibletime.png b/bibletime/pics/32x32/hi32-app-bibletime.png Binary files differdeleted file mode 100644 index 7dcbc90..0000000 --- a/bibletime/pics/32x32/hi32-app-bibletime.png +++ /dev/null diff --git a/bibletime/pics/48x48/Makefile.am b/bibletime/pics/48x48/Makefile.am deleted file mode 100644 index c9e723a..0000000 --- a/bibletime/pics/48x48/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update - - -EXTRA_DIST = hi48-action-bt_bible.png hi48-action-bt_bible_add.png hi48-action-bt_bible_locked.png hi48-action-bt_book.png hi48-action-bt_book_add.png hi48-action-bt_book_locked.png hi48-action-bt_cascade.png hi48-action-bt_cascade_auto.png hi48-action-bt_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_commentary_locked.png hi48-action-bt_displayconfig.png hi48-action-bt_displaytranslit.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_lexicon_locked.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-action-bt_sync.png hi48-action-bt_tile.png hi48-action-bt_tile_auto.png hi48-app-bibletime.png - -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime
\ No newline at end of file diff --git a/bibletime/pics/48x48/Makefile.in b/bibletime/pics/48x48/Makefile.in deleted file mode 100644 index 87b25fd..0000000 --- a/bibletime/pics/48x48/Makefile.in +++ /dev/null @@ -1,620 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/pics/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -EXTRA_DIST = hi48-action-bt_bible.png hi48-action-bt_bible_add.png hi48-action-bt_bible_locked.png hi48-action-bt_book.png hi48-action-bt_book_add.png hi48-action-bt_book_locked.png hi48-action-bt_cascade.png hi48-action-bt_cascade_auto.png hi48-action-bt_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_commentary_locked.png hi48-action-bt_displayconfig.png hi48-action-bt_displaytranslit.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_lexicon_locked.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-action-bt_sync.png hi48-action-bt_tile.png hi48-action-bt_tile_auto.png hi48-app-bibletime.png -KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/48x48/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/pics/48x48/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/48x48/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/48x48/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/48x48/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -#>- install-data-am: -#>+ 1 -install-data-am: install-kde-icons - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -#>- uninstall-am: -#>+ 1 -uninstall-am: uninstall-kde-icons - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=Makefile.in Makefile.am - -#>+ 2 -docs-am: - -#>+ 50 -install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_add.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_locked.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_add.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_locked.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade_auto.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_add.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_locked.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displayconfig.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displaytranslit.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_add.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_locked.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_startconfig.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_swordconfig.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_sync.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile.png - $(INSTALL_DATA) $(srcdir)/hi48-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile_auto.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps - $(INSTALL_DATA) $(srcdir)/hi48-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/bibletime.png - -uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displayconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displaytranslit.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_add.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_locked.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_startconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_swordconfig.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_sync.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile_auto.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/bibletime.png - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/48x48/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/48x48/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/48x48/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/pics/48x48/hi48-action-bt_bible.png b/bibletime/pics/48x48/hi48-action-bt_bible.png Binary files differdeleted file mode 100644 index d813bd7..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_bible.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_add.png b/bibletime/pics/48x48/hi48-action-bt_bible_add.png Binary files differdeleted file mode 100644 index c16456b..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_bible_add.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_locked.png b/bibletime/pics/48x48/hi48-action-bt_bible_locked.png Binary files differdeleted file mode 100644 index 1333584..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_bible_locked.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_book.png b/bibletime/pics/48x48/hi48-action-bt_book.png Binary files differdeleted file mode 100644 index b3f5fb0..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_book.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_book_add.png b/bibletime/pics/48x48/hi48-action-bt_book_add.png Binary files differdeleted file mode 100644 index 4fe4cd4..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_book_add.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_book_locked.png b/bibletime/pics/48x48/hi48-action-bt_book_locked.png Binary files differdeleted file mode 100644 index c76f2a0..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_book_locked.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade.png b/bibletime/pics/48x48/hi48-action-bt_cascade.png Binary files differdeleted file mode 100644 index 0ea1fe8..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_cascade.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png b/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png Binary files differdeleted file mode 100644 index 6dfc9f5..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary.png b/bibletime/pics/48x48/hi48-action-bt_commentary.png Binary files differdeleted file mode 100644 index 966b0c6..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_commentary.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_add.png b/bibletime/pics/48x48/hi48-action-bt_commentary_add.png Binary files differdeleted file mode 100644 index 3fb2cdd..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_commentary_add.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png b/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png Binary files differdeleted file mode 100644 index 8dd23fb..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_displayconfig.png b/bibletime/pics/48x48/hi48-action-bt_displayconfig.png Binary files differdeleted file mode 100644 index adb2706..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_displayconfig.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png b/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png Binary files differdeleted file mode 100644 index 30384fd..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon.png b/bibletime/pics/48x48/hi48-action-bt_lexicon.png Binary files differdeleted file mode 100644 index 623c564..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_lexicon.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png Binary files differdeleted file mode 100644 index 9d2cfaf..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png Binary files differdeleted file mode 100644 index dbdafbe..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_startconfig.png b/bibletime/pics/48x48/hi48-action-bt_startconfig.png Binary files differdeleted file mode 100644 index 805bf8b..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_startconfig.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_swordconfig.png b/bibletime/pics/48x48/hi48-action-bt_swordconfig.png Binary files differdeleted file mode 100644 index fb518ed..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_swordconfig.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_sync.png b/bibletime/pics/48x48/hi48-action-bt_sync.png Binary files differdeleted file mode 100644 index 3dcf17a..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_sync.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_tile.png b/bibletime/pics/48x48/hi48-action-bt_tile.png Binary files differdeleted file mode 100644 index f49a7b4..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_tile.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-action-bt_tile_auto.png b/bibletime/pics/48x48/hi48-action-bt_tile_auto.png Binary files differdeleted file mode 100644 index 02436d9..0000000 --- a/bibletime/pics/48x48/hi48-action-bt_tile_auto.png +++ /dev/null diff --git a/bibletime/pics/48x48/hi48-app-bibletime.png b/bibletime/pics/48x48/hi48-app-bibletime.png Binary files differdeleted file mode 100644 index 768f3b9..0000000 --- a/bibletime/pics/48x48/hi48-app-bibletime.png +++ /dev/null diff --git a/bibletime/pics/64x64/Makefile.am b/bibletime/pics/64x64/Makefile.am deleted file mode 100644 index 02a3ff1..0000000 --- a/bibletime/pics/64x64/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update - - -EXTRA_DIST = hi64-app-bibletime.png - -KDE_ICON = bibletime
\ No newline at end of file diff --git a/bibletime/pics/64x64/Makefile.in b/bibletime/pics/64x64/Makefile.in deleted file mode 100644 index 16aebbe..0000000 --- a/bibletime/pics/64x64/Makefile.in +++ /dev/null @@ -1,577 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl" -# Please do not edit this file but rather run the script to update -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/pics/64x64 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -EXTRA_DIST = hi64-app-bibletime.png -KDE_ICON = bibletime -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/64x64/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/pics/64x64/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/64x64/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/64x64/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/64x64/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -#>- install-data-am: -#>+ 1 -install-data-am: install-kde-icons - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -#>- uninstall-am: -#>+ 1 -uninstall-am: uninstall-kde-icons - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=Makefile.in Makefile.am - -#>+ 2 -docs-am: - -#>+ 7 -install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps - $(INSTALL_DATA) $(srcdir)/hi64-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/bibletime.png - -uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/bibletime.png - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/64x64/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/64x64/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/64x64/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/pics/64x64/hi64-app-bibletime.png b/bibletime/pics/64x64/hi64-app-bibletime.png Binary files differdeleted file mode 100644 index 05b859d..0000000 --- a/bibletime/pics/64x64/hi64-app-bibletime.png +++ /dev/null diff --git a/bibletime/pics/Makefile.am b/bibletime/pics/Makefile.am deleted file mode 100644 index 2e5a25a..0000000 --- a/bibletime/pics/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -KDE_OPTIONS = noautodist - -SUBDIRS = \ -16x16 \ -22x22 \ -32x32 \ -48x48 \ -64x64 \ -. - -BIBLETIME_PICS = \ -startuplogo.png - -EXTRA_DIST = $(BIBLETIME_PICS) - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/bibletime/pics/ - chmod 755 $(DESTDIR)$(kde_datadir)/bibletime/pics/; - @for file in $(BIBLETIME_PICS); do \ - echo Installing $$file; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - done - -uninstall-local: - @for file in $(BIBLETIME_PICS); do \ - echo Removing $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - rm -f $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - done diff --git a/bibletime/pics/Makefile.in b/bibletime/pics/Makefile.in deleted file mode 100644 index 213ce8d..0000000 --- a/bibletime/pics/Makefile.in +++ /dev/null @@ -1,749 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/pics -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -#>- html-recursive info-recursive install-data-recursive \ -#>- install-dvi-recursive install-exec-recursive \ -#>- install-html-recursive install-info-recursive \ -#>- install-pdf-recursive install-ps-recursive install-recursive \ -#>- installcheck-recursive installdirs-recursive pdf-recursive \ -#>- ps-recursive uninstall-recursive -#>+ 7 -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -KDE_OPTIONS = noautodist -SUBDIRS = \ -16x16 \ -22x22 \ -32x32 \ -48x48 \ -64x64 \ -. - -BIBLETIME_PICS = \ -startuplogo.png - -EXTRA_DIST = $(BIBLETIME_PICS) -#>- all: all-recursive -#>+ 1 -all: docs-am all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/pics/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-recursive -#>+ 1 -clean: kde-rpo-clean clean-recursive - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-data-local - -install-dvi: install-dvi-recursive - -install-exec-am: - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-local - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-local - - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/bibletime/pics/ - chmod 755 $(DESTDIR)$(kde_datadir)/bibletime/pics/; - @for file in $(BIBLETIME_PICS); do \ - echo Installing $$file; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - done - -uninstall-local: - @for file in $(BIBLETIME_PICS); do \ - echo Removing $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - rm -f $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/pics/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/pics/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/pics/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-recursive - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/pics/startuplogo.png b/bibletime/pics/startuplogo.png Binary files differdeleted file mode 100644 index ff7db20..0000000 --- a/bibletime/pics/startuplogo.png +++ /dev/null diff --git a/bibletime/util/Makefile.am b/bibletime/util/Makefile.am deleted file mode 100644 index 7a4ba4e..0000000 --- a/bibletime/util/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDES = $(all_includes) -libutil_a_METASOURCES = AUTO -noinst_LIBRARIES = libutil.a - -libutil_a_SOURCES = cpointers.cpp cresmgr.cpp ctoolclass.cpp directoryutil.cpp - -all_headers = \ -scoped_resource.h \ -cpointers.h \ -cresmgr.h \ -ctoolclass.h \ -autoptrvector.h - -EXTRA_DIST = $(libutil_a_SOURCES) $(all_headers) - -noinst_HEADERS = directoryutil.h diff --git a/bibletime/util/Makefile.in b/bibletime/util/Makefile.in deleted file mode 100644 index e1bed5e..0000000 --- a/bibletime/util/Makefile.in +++ /dev/null @@ -1,720 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/util -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libutil_a_AR = $(AR) $(ARFLAGS) -libutil_a_LIBADD = -am_libutil_a_OBJECTS = cpointers.$(OBJEXT) cresmgr.$(OBJEXT) \ - ctoolclass.$(OBJEXT) directoryutil.$(OBJEXT) -#>- libutil_a_OBJECTS = $(am_libutil_a_OBJECTS) -#>+ 5 -libutil_a_final_OBJECTS = libutil_a.all_cpp.o -libutil_a_nofinal_OBJECTS = cpointers.$(OBJEXT) cresmgr.$(OBJEXT) \ - ctoolclass.$(OBJEXT) directoryutil.$(OBJEXT) -@KDE_USE_FINAL_FALSE@libutil_a_OBJECTS = $(libutil_a_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libutil_a_OBJECTS = $(libutil_a_final_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -am__depfiles_maybe = depfiles -#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 2 -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -#>- $(LDFLAGS) -o $@ -#>+ 3 -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libutil_a_SOURCES) -DIST_SOURCES = $(libutil_a_SOURCES) -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -INCLUDES = $(all_includes) -#>- libutil_a_METASOURCES = AUTO -noinst_LIBRARIES = libutil.a -libutil_a_SOURCES = cpointers.cpp cresmgr.cpp ctoolclass.cpp directoryutil.cpp -all_headers = \ -scoped_resource.h \ -cpointers.h \ -cresmgr.h \ -ctoolclass.h \ -autoptrvector.h - -EXTRA_DIST = $(libutil_a_SOURCES) $(all_headers) -noinst_HEADERS = directoryutil.h -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -.SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/util/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/util/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/util/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/util/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/util/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libutil.a: $(libutil_a_OBJECTS) $(libutil_a_DEPENDENCIES) - -rm -f libutil.a - $(libutil_a_AR) libutil.a $(libutil_a_OBJECTS) $(libutil_a_LIBADD) - $(RANLIB) libutil.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpointers.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cresmgr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctoolclass.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/directoryutil.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) $(HEADERS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -#>- mostlyclean-am -#>+ 2 -clean-am: clean-bcheck clean-final clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=cpointers.h scoped_resource.h ctoolclass.h autoptrvector.h Makefile.in cresmgr.h Makefile.am - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/util/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/util/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/util/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 11 -libutil_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cpointers.cpp $(srcdir)/cresmgr.cpp $(srcdir)/ctoolclass.cpp $(srcdir)/directoryutil.cpp - @echo 'creating libutil_a.all_cpp.cpp ...'; \ - rm -f libutil_a.all_cpp.files libutil_a.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libutil_a.all_cpp.final; \ - for file in cpointers.cpp cresmgr.cpp ctoolclass.cpp directoryutil.cpp ; do \ - echo "#include \"$$file\"" >> libutil_a.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libutil_a.all_cpp.final; \ - done; \ - cat libutil_a.all_cpp.final libutil_a.all_cpp.files > libutil_a.all_cpp.cpp; \ - rm -f libutil_a.all_cpp.final libutil_a.all_cpp.files - -#>+ 3 -clean-final: - -rm -f libutil_a.all_cpp.cpp - -#>+ 3 -final: - $(MAKE) libutil_a_OBJECTS="$(libutil_a_final_OBJECTS)" all-am - -#>+ 3 -final-install: - $(MAKE) libutil_a_OBJECTS="$(libutil_a_final_OBJECTS)" install-am - -#>+ 3 -no-final: - $(MAKE) libutil_a_OBJECTS="$(libutil_a_nofinal_OBJECTS)" all-am - -#>+ 3 -no-final-install: - $(MAKE) libutil_a_OBJECTS="$(libutil_a_nofinal_OBJECTS)" install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/util/autoptrvector.h b/bibletime/util/autoptrvector.h deleted file mode 100644 index 4e8f82b..0000000 --- a/bibletime/util/autoptrvector.h +++ /dev/null @@ -1,176 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef UTILAUTOPTRVECTOR_H -#define UTILAUTOPTRVECTOR_H - -namespace util { - - /** - * This class provides a simple vector which works on pointers. - * All pointer are deeted at destruction time of an AutoPtrVector object. - * This vector uses a single linked list to store the pointers. - * This class provides the methods first(), current() and next() for navigation. - * - * @author Joachim Ansorg - */ - template<class T> - class AutoPtrVector { -public: - /** Default constructor. - * The default constructor. This creates an empty vector. - */ -explicit AutoPtrVector() : m_first(0), m_current(0), m_end(0) {} - ; - - /** Copy constructor using deep copy. - * This does a deep copy of the passed AutoPtrVector. - * @param old The vector to be copied. - */ -AutoPtrVector(AutoPtrVector& old) : m_first(0), m_current(0), m_end(0) { - this->operator=(old); //share the code with the copy operator - /* if (this != &old) { - Item* last = m_first; - Item* prev = 0; - - for (T* c = old.first(); c; c = old.next()) { - last = new Item( new T(*c) ); - - if (prev) { - prev->next = last; - } - - prev = last; - } - }*/ - }; - - AutoPtrVector& operator=(AutoPtrVector& old) { - //at first delete all items, then copy old into new items - clear(); - - if (this != &old) { //only copy if the two pointers are different - Item* last = m_first; - Item* prev = 0; - - for (T* c = old.first(); c; c = old.next()) { - last = new Item( new T(*c) ); - - if (prev) { - prev->next = last; - } - - prev = last; - } - } - - return *this; - }; - - /** Destructor. - * Deletes all the objects which belong to the stored pointers - * @see clear() - */ - virtual ~AutoPtrVector() { - clear(); - }; - - - /** Append an item - * - * Append a new item to this vector. - */ - inline void append(T* type) { - if (!m_first) { //handle the first item special - m_first = new Item( type ); - m_end = m_first; - } - else { - m_end->next = new Item( type ); - m_end = m_end->next; - } - }; - - /** The first item of this vector. - * - * @return The first item of this vector. Null of there are no items. - */ - inline T* const first() const { - m_current = m_first; - return m_current ? m_current->value : 0; - }; - - /** The current item. - * - * @return The current item reached by first() and next() calls - */ - inline T* const current() const { - return m_current->value; - }; - - /** Moves to the next item. - * - * @return Moves to the next item - */ - inline T* const next() const { - if (m_current && m_current->next) { - m_current = m_current->next; - return m_current->value; - } - - return 0; - }; - - /** Returns if this conainer is empty. - * - * @return If this vector has items or not. True if there are no items, false if there are any - */ - inline const bool isEmpty() const { - return bool(m_first == 0); - }; - - /** Clear this vector. - * This deletes all objects which belong to the stored pointers. - */ - inline void clear() { - Item* i = m_first; - Item* current = 0; - - while (i) { - delete i->value; //delete the object which belongs to the stored pointer - - current = i; - i = current->next; - delete current; //delete the current item after we got the next list item - } - }; - -private: - /** - * Our internal helper class to store the pointers in a linked list. - */ - struct Item { -Item(T* t = 0) : value(t), next(0) {} - ; - - T* value; - Item* next; - }; - - mutable Item* m_first; - mutable Item* m_current; - mutable Item* m_end; - }; - -} //end of namespace - - -#endif diff --git a/bibletime/util/cpointers.cpp b/bibletime/util/cpointers.cpp deleted file mode 100644 index f795bba..0000000 --- a/bibletime/util/cpointers.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#include "cpointers.h" - -//BibleTime's backend -#include "backend/cswordbackend.h" -#include "backend/cdisplaytemplatemgr.h" - -//BibleTime's frontend -#include "frontend/cprinter.h" - - -CPointers::PointerCache m_pointerCache; - -void CPointers::setBackend(CSwordBackend* const backend) { - Q_ASSERT( m_pointerCache.backend == 0); - CPointers::deleteBackend(); - m_pointerCache.backend = backend; -} - -void CPointers::setInfoDisplay(InfoDisplay::CInfoDisplay* const infoDisplay) { - Q_ASSERT( m_pointerCache.infoDisplay == 0); - m_pointerCache.infoDisplay = infoDisplay; -} - -void CPointers::deleteBackend() { - delete m_pointerCache.backend; - m_pointerCache.backend = 0; -} - -void CPointers::deleteLanguageMgr() { - delete m_pointerCache.langMgr; - m_pointerCache.langMgr = 0; -} - -void CPointers::deleteDisplayTemplateMgr() { - delete m_pointerCache.displayTemplateMgr; - m_pointerCache.displayTemplateMgr = 0; -} - -/** Returns a pointer to the printer object. */ -CDisplayTemplateMgr* const CPointers::displayTemplateManager() { - if (!m_pointerCache.displayTemplateMgr) { - m_pointerCache.displayTemplateMgr = new CDisplayTemplateMgr(); - } - - return m_pointerCache.displayTemplateMgr; -} - diff --git a/bibletime/util/cpointers.h b/bibletime/util/cpointers.h deleted file mode 100644 index 822002f..0000000 --- a/bibletime/util/cpointers.h +++ /dev/null @@ -1,120 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CPOINTERS_H -#define CPOINTERS_H - -//BibleTime includes -#include "backend/clanguagemgr.h" - -#include "frontend/cinfodisplay.h" - -class CSwordBackend; -class CLanguageMgr; -class CDisplayTemplateMgr; - -namespace InfoDisplay { - class CInfoDisplay; -} - -/** Holds the pointers to important classes like modules, backend etc. - * @author The BibleTime team - */ -class CPointers { -protected: - friend class BibleTime; //BibleTime may initialize this object - friend class BibleTimeApp; //BibleTimeApp may initialize this object - friend int main(int argc, char* argv[]); //main may set the printer - - //Empty virtuaual destructor - virtual ~CPointers() {} - - /** Set the backend. - * @param backend Pointer to the new application-wide Sword backend - */ - static void setBackend(CSwordBackend* const backend); - /** Set the info display. - * @param iDisplay The pointer to the new info display. - */ - static void setInfoDisplay(InfoDisplay::CInfoDisplay* const iDisplay); - - /** Delete the backend. Should be called by BibleTimeApp, - * because the backend should be deleted as late as possible. - */ - static void deleteBackend(); - /** Delete the printer. Should be called by BibleTimeApp, - * because the printer should be deleted as late as possible. - */ - static void deletePrinter(); - /** Delete the language manager. Should be called by BibleTimeApp, - * because the language manager should be deleted as late as possible. - */ - static void deleteLanguageMgr(); - /** Delete the display template manager. Should be called by BibleTimeApp, - * because the template manager should be deleted as late as possible. - */ - static void deleteDisplayTemplateMgr(); - -public: // Public methods - /** Returns a pointer to the backend - * @return The backend pointer. - */ - inline static CSwordBackend* const backend(); - /** Returns a pointer to the language manager - * @return The language manager - */ - inline static CLanguageMgr* const languageMgr(); - /** Returns a pointer to the info display. - * @return The backend pointer. - */ - inline static InfoDisplay::CInfoDisplay* const infoDisplay(); - /** Returns a pointer to the application's display template manager - * @return The backend pointer. - */ - static CDisplayTemplateMgr* const displayTemplateManager(); - - struct PointerCache { - PointerCache() { - backend = 0; - langMgr = 0; - infoDisplay = 0; - displayTemplateMgr = 0; - }; - - CSwordBackend* backend; - CLanguageMgr* langMgr; - InfoDisplay::CInfoDisplay* infoDisplay; - CDisplayTemplateMgr* displayTemplateMgr; - }; -}; - -extern CPointers::PointerCache m_pointerCache; - -/** Returns a pointer to the backend ... */ -inline CSwordBackend* const CPointers::backend() { - return m_pointerCache.backend; -} - -/** Returns a pointer to the backend ... */ -inline CLanguageMgr* const CPointers::languageMgr() { - if (!m_pointerCache.langMgr) { - m_pointerCache.langMgr = new CLanguageMgr(); - } - return m_pointerCache.langMgr; -} - -/** Returns a pointer to the printer object. */ -inline InfoDisplay::CInfoDisplay* const CPointers::infoDisplay() { - return m_pointerCache.infoDisplay; -} - - -#endif diff --git a/bibletime/util/cresmgr.cpp b/bibletime/util/cresmgr.cpp deleted file mode 100644 index 8defb77..0000000 --- a/bibletime/util/cresmgr.cpp +++ /dev/null @@ -1,1198 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//own includes -#include "cresmgr.h" - -#include "backend/cswordbackend.h" - -//KDE includes -#include <kglobal.h> -#include <klocale.h> - -namespace CResMgr { - namespace modules { - namespace bible { - const QString icon_unlocked = "bt_bible"; - const QString icon_locked = "bt_bible_locked"; - const QString icon_add = "bt_bible_add"; - } - namespace commentary { - const QString icon_unlocked = "bt_commentary"; - const QString icon_locked = "bt_commentary_locked"; - const QString icon_add = "bt_commentary_add"; - } - namespace lexicon { - const QString icon_unlocked = "bt_lexicon"; - const QString icon_locked = "bt_lexicon_locked"; - const QString icon_add = "bt_lexicon_add"; - } - namespace book { - const QString icon_unlocked = "bt_book"; - const QString icon_locked = "bt_book_locked"; - const QString icon_add = "bt_book_add"; - } - } - - namespace mainMenu { //Main menu - namespace file { //Main menu->File - namespace print { //a standard action - QString tooltip; - - } - namespace quit { //a standard action - QString tooltip; - - } - } - - namespace view { //Main menu->View - namespace showMainIndex { - QString tooltip; - - const QString icon = "view_sidetree"; - const KShortcut accel = Qt::Key_F9; - const char* actionName = "viewMainIndex_action"; - } - namespace showInfoDisplay { - QString tooltip; - - const QString icon = "view_sidetree"; - const KShortcut accel = Qt::Key_F8; - const char* actionName = "viewInfoDisplay_action"; - } - namespace showToolBar { //a standard action - QString tooltip; - - } - } - - namespace mainIndex { //Main menu->Settings - namespace search { - QString tooltip; - - const QString icon = "find"; - const KShortcut accel = Qt::CTRL + Qt::Key_O; - const char* actionName = "mainindex_search_action"; - } - namespace searchdefaultbible { - QString tooltip; - - const QString icon = "find"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_F; - const char* actionName = "mainindex_searchdefaultbible_action"; - } - } - - namespace window { //Main menu->Window - namespace loadProfile { - QString tooltip; - - const QString icon = "view_sidetree"; - const char* actionName = "windowLoadProfile_action"; - } - namespace saveProfile { - QString tooltip; - - const QString icon = "view_sidetree"; - const char* actionName = "windowSaveProfile_action"; - } - namespace saveToNewProfile { - QString tooltip; - - const QString icon = "view_sidetree"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_S; - const char* actionName = "windowSaveToNewProfile_action"; - } - namespace deleteProfile { - QString tooltip; - - const QString icon = "view_sidetree"; - const char* actionName = "windowDeleteProfile_action"; - } - namespace showFullscreen { - QString tooltip; - - const QString icon = "window_fullscreen"; - const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_F; - const char* actionName = "windowFullscreen_action"; - } - namespace arrangementMode { - QString tooltip; - - const QString icon = "bt_cascade_auto"; - const KShortcut accel = KKeySequence(); - const char* actionName = "windowArrangementMode_action"; - - namespace manual { - QString tooltip; - - const QString icon = "bt_tile"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_M; - const char* actionName = "windowArrangementManual_action"; - } - namespace autoTileHorizontal { - QString tooltip; - - const QString icon = "bt_tile_auto"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_H; - const char* actionName = "windowAutoTileHorizontal_action"; - } - namespace autoTileVertical { - QString tooltip; - - const QString icon = "bt_tile_auto"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_G; - const char* actionName = "windowAutoTileVertical_action"; - } - namespace autoCascade { - QString tooltip; - - const QString icon = "bt_cascade_auto"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_J; - const char* actionName = "windowAutoCascade_action"; - } - } - namespace tileHorizontal { - QString tooltip; - - const QString icon = "bt_tile"; - const KShortcut accel = Qt::CTRL + Qt::Key_H; - const char* actionName = "windowTileHorizontal_action"; - } - namespace tileVertical { - QString tooltip; - - const QString icon = "bt_tile"; - const KShortcut accel = Qt::CTRL + Qt::Key_G; - const char* actionName = "windowTileVertical_action"; - } - namespace cascade { - QString tooltip; - - const QString icon = "bt_cascade"; - const KShortcut accel = Qt::CTRL + Qt::Key_J; - const char* actionName = "windowCascade_action"; - } - namespace closeAll { - QString tooltip; - - const QString icon = "fileclose"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_W; - const char* actionName = "windowCloseAll_action"; - } - } - - namespace settings { //Main menu->Settings - namespace editToolBar { // available as KStdAction - QString tooltip; - - } - namespace optionsDialog { // available as KStdAction - QString tooltip; - - } - namespace swordSetupDialog { - QString tooltip; - - const QString icon = "bt_swordconfig"; - const KShortcut accel = Qt::Key_F4; - const char* actionName = "options_sword_setup"; - } - - } - - namespace help { //Main menu->Help - namespace handbook { - QString tooltip; - - const QString icon = "contents"; - const KShortcut accel = Qt::Key_F1; - const char* actionName = "helpHandbook_action"; - } - namespace bibleStudyHowTo { - QString tooltip; - - const QString icon = "contents"; - const KShortcut accel = Qt::Key_F2; - const char* actionName = "helpHowTo_action"; - } - namespace bugreport { // available as KStdAction - QString tooltip; - - } - namespace dailyTip { - QString tooltip; - - const QString icon = "idea"; - const KShortcut accel = Qt::Key_F3; - const char* actionName = "helpDailyTip_action"; - } - namespace aboutBibleTime { // available as KStdAction - QString tooltip; - - } - namespace aboutKDE { // available as KStdAction - QString tooltip; - - } - } - } //end of main menu - - namespace searchdialog { - const QString icon = "find"; - - namespace searchButton { - QString tooltip; - - } - namespace cancelSearchButton { - QString tooltip; - - } - - namespace options { - namespace moduleChooserButton { - QString tooltip; - - } - namespace searchedText { - QString tooltip; - - } - namespace searchType { - namespace multipleWords_and { - QString tooltip; - - } - namespace multipleWords_or { - QString tooltip; - - } - namespace exactMatch { - QString tooltip; - - } - namespace regExp { - QString tooltip; - - } - } - - namespace searchOptions { - namespace caseSensitive { - QString tooltip; - - } - } - namespace chooseScope { - QString tooltip; - - } - namespace scopeEditor { - namespace rangeList { - QString tooltip; - - } - namespace nameEdit { - QString tooltip; - - } - namespace editRange { - QString tooltip; - - } - namespace parsedResult { - QString tooltip; - - } - namespace addNewRange { - QString tooltip; - - } - namespace deleteCurrentRange { - QString tooltip; - - } - - } - } - namespace result { - namespace moduleList { - QString tooltip; - - - namespace copyMenu { - const QString icon = "editcopy"; - } - namespace saveMenu { - const QString icon = "filesave"; - } - namespace printMenu { - const QString icon = "fileprint"; - } - } - namespace foundItems { - QString tooltip; - - - namespace copyMenu { - const QString icon = "editcopy"; - } - namespace saveMenu { - const QString icon = "filesave"; - } - namespace printMenu { - const QString icon = "fileprint"; - } - } - namespace textPreview { - QString tooltip; - - } - } - } - - namespace workspace {} - - namespace displaywindows { -/* namespace transliteration { - const QString icon = "bt_displaytranslit"; - }*/ - namespace displaySettings { - const QString icon = "bt_displayconfig"; - } - - namespace general { - namespace scrollButton { - QString tooltip; - } - - namespace search { - QString tooltip; - - const QString icon = "find"; - const KShortcut accel = Qt::CTRL + Qt::Key_L; - const char* actionName = "window_search_action"; - } - - namespace backInHistory { - QString tooltip; - - const QString icon = "previous"; - const KShortcut accel = Qt::ALT + Qt::Key_Left; - const char* actionName = "window_history_back_action"; - } - namespace forwardInHistory { - QString tooltip; - - const QString icon = "next"; - const KShortcut accel = Qt::ALT + Qt::Key_Right; - const char* actionName = "window_history_forward_action"; - } - namespace findStrongs { - QString tooltip; - - const QString icon = "bt_findstrongs"; - const KShortcut accel = KShortcut(0); - const char* actionName = "window_find_strongs_action"; - } - - } - namespace bibleWindow { - namespace bookList { - QString tooltip; - - } - namespace nextBook { - QString tooltip; - - const KShortcut accel = Qt::CTRL + Qt::Key_Y; - } - namespace previousBook { - QString tooltip; - - const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_Y; - } - - namespace chapterList { - QString tooltip; - } - namespace nextChapter { - QString tooltip; - const KShortcut accel = Qt::CTRL + Qt::Key_X; - } - namespace previousChapter { - QString tooltip; - const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_X; - } - namespace verseList { - QString tooltip; - } - namespace nextVerse { - QString tooltip; - const KShortcut accel = Qt::CTRL + Qt::Key_V; - } - namespace previousVerse { - QString tooltip; - const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_V; - } - - namespace copyMenu { - const QString icon = "editcopy"; - } - namespace saveMenu { - const QString icon = "filesave"; - } - namespace printMenu { - const QString icon = "fileprint"; - } - } - namespace commentaryWindow { - namespace syncWindow { - QString tooltip; - const QString icon = "bt_sync"; - const KShortcut accel = KKeySequence(); - const char* actionName = "commentary_syncWindow"; - } - } - namespace lexiconWindow { - namespace entryList { - QString tooltip; - } - namespace nextEntry { - QString tooltip; - const KShortcut accel = Qt::CTRL + Qt::Key_V; - } - namespace previousEntry { - QString tooltip; - const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_V; - } - - namespace copyMenu { - const QString icon = "editcopy"; - } - namespace saveMenu { - const QString icon = "filesave"; - } - namespace printMenu { - const QString icon = "fileprint"; - } - } - namespace bookWindow { - namespace toggleTree { - const QString icon = "view_sidetree"; - const KShortcut accel = KKeySequence(); - } - } - - namespace writeWindow { - namespace saveText { - QString tooltip; - - const QString icon = "filesave"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_saveText"; - } - namespace restoreText { - QString tooltip; - - const QString icon = "undo"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_restoreText"; - } - namespace deleteEntry { - QString tooltip; - - const QString icon = "editdelete"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_deleteEntry"; - } - - //formatting buttons - namespace boldText { - QString tooltip; - - const QString icon = "text_bold"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_boldText"; - } - namespace italicText { - QString tooltip; - - const QString icon = "text_italic"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_italicText"; - } - namespace underlinedText { - QString tooltip; - - const QString icon = "text_under"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_underlineText"; - } - - namespace alignLeft { - QString tooltip; - - const QString icon = "text_left"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_alignLeft"; - } - namespace alignCenter { - QString tooltip; - - const QString icon = "text_center"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_alignCenter"; - } - namespace alignRight { - QString tooltip; - - const QString icon = "rightjust"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_alignRight"; - } - namespace alignJustify { - QString tooltip; - - const QString icon = "text_block"; - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_alignJustify"; - } - - namespace fontFamily { - QString tooltip; - - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_fontFamily"; - } - namespace fontSize { - QString tooltip; - - const KShortcut accel = KKeySequence(); - const char* actionName = "writeWindow_fontSize"; - } - namespace fontColor { - QString tooltip; - } - } - } - - namespace settings { - namespace startup { - const QString icon = "bt_startconfig"; - namespace dailyTip { - QString tooltip; - } - namespace showLogo { - QString tooltip; - } - namespace restoreWorkingArea { - QString tooltip; - } - } - namespace fonts { - const QString icon = "fonts"; - - namespace typeChooser { - QString tooltip; - } - } - namespace profiles { - const QString icon = "view_sidetree"; - - namespace list { - QString tooltip; - } - namespace createNew { - QString tooltip; - } - namespace deleteCurrent { - QString tooltip; - } - namespace renameCurrent { - QString tooltip; - } - } - namespace sword { - const QString icon = "bt_swordconfig"; - - namespace general { - namespace language { - QString tooltip; - } - } - namespace modules { - namespace bible { - QString tooltip; - } - namespace commentary { - QString tooltip; - } - namespace lexicon { - QString tooltip; - - } - namespace dailyDevotional { - QString tooltip; - } - namespace hebrewStrongs { - QString tooltip; - } - namespace greekStrongs { - QString tooltip; - } - namespace hebrewMorph { - QString tooltip; - } - namespace greekMorph { - QString tooltip; - } - } - } - namespace keys { - const QString icon = "key_bindings"; - } - } - - namespace mainIndex { //Main menu->Settings - namespace search { - QString tooltip; - - const QString icon = "find"; - const KShortcut accel = Qt::CTRL + Qt::ALT + Qt::Key_M; - const char* actionName = "GMsearch_action"; - } - namespace newFolder { - const QString icon = "folder_new"; - } - namespace changeFolder { - const QString icon = "folder"; - } - namespace openedFolder { - const QString icon = "folder_open"; - } - namespace closedFolder { - const QString icon = "folder"; - } - - namespace bookmark { - const QString icon = "bookmark"; - } - namespace changeBookmark { - const QString icon = "bookmark"; - } - namespace importBookmarks { - const QString icon = "bookmark"; - } - namespace exportBookmarks { - const QString icon = "bookmark"; - } - namespace printBookmarks { - const QString icon = "fileprint"; - } - namespace deleteItems { - const QString icon = "filedelete"; - } - - namespace editModuleMenu { - const QString icon = "pencil"; - } - namespace editModulePlain { - const QString icon = "pencil"; - } - namespace editModuleHTML { - const QString icon = "pencil"; - } - - namespace unlockModule { - const QString icon = "unlock"; - } - namespace aboutModule { - const QString icon = "info"; - } - } -} - - - -namespace CResMgr { - void init_i18n() { - using namespace CResMgr; - { - using namespace mainMenu; - { - using namespace file; - { - using namespace print; - tooltip = i18n ("Open the printer dialog of BibleTime, where you can edit the print queue, assign styles to the items and print them.") ; - } - { - using namespace quit; - tooltip = i18n ("Close BibleTime and save the settings.") ; - } - - { - using namespace view; - { - using namespace showMainIndex; - tooltip = i18n ("Show or hide the bookshelf.") ; - } - { - using namespace showToolBar; - tooltip = i18n ("Toggle the main toolbar view.") ; - } - } - - { - using namespace mainMenu::mainIndex; - { - using namespace search; - tooltip = i18n ("Open the search dialog to search in all works that are currently open.") ; - } - { - using namespace searchdefaultbible; - tooltip = i18n ("Open the search dialog to search in the standard Bible.") ; - } - }; - - { - using namespace window; - { - using namespace loadProfile; - tooltip = i18n ("Restore a saved BibleTime session.") ; - } - { - using namespace saveProfile; - tooltip = i18n ("Save current BibleTime session so that it can be reused later.") ; - } - { - using namespace saveToNewProfile; - tooltip = i18n ("Create and save a new session.") ; - } - { - using namespace deleteProfile; - tooltip = i18n ("Delete a BibleTime session.") ; - } - { - using namespace showFullscreen; - tooltip = i18n ("Toggle fullscreen mode of the main window.") ; - } - { - using namespace tileVertical; - tooltip = i18n ("Vertically tile the open windows.") ; - } - { - using namespace tileHorizontal; - tooltip = i18n ("Horizontally tile the open windows.") ; - } - { - using namespace cascade; - tooltip = i18n ("Cascade the open windows.") ; - } - { - { - using namespace arrangementMode; - tooltip = i18n ("Choose the way that is used to arrange the windows.") ; - } - { - using namespace arrangementMode::autoTileVertical; - tooltip = i18n ("Automatically tile the open windows vertically.") ; - } - { - using namespace arrangementMode::autoTileHorizontal; - tooltip = i18n ("Automatically tile the open windows horizontally.") ; - } - { - using namespace arrangementMode::autoCascade; - tooltip = i18n ("Automatically cascade the open windows.") ; - } - } - { - using namespace closeAll; - tooltip = i18n ("Close all open windows.") ; - } - } - - { - using namespace mainMenu::settings; - { - using namespace editToolBar; - tooltip = i18n ("Open BibleTime's toolbar editor.") ; - } - { - using namespace optionsDialog; - tooltip = i18n ("Open the dialog to set most of BibleTime's preferences.") ; - }; - { - using namespace swordSetupDialog; - tooltip = i18n ("Open the dialog to configure your bookshelf and install/update/remove works.") ; - } - - } - - { - using namespace help; - { - using namespace handbook; - tooltip = i18n ("Open BibleTime's handbook in the KDE helpbrowser.") ; - } - { - using namespace bibleStudyHowTo; - tooltip = i18n ("Open the Bible study HowTo included with BibleTime in the KDE helpbrowser. <BR>This HowTo is an introduction on how to study the Bible in an efficient way.") ; - } - { - using namespace bugreport; - tooltip = i18n ("Send a bugreport to the developers of BibleTime.") ; - } - { - using namespace dailyTip; - tooltip = i18n ("Show a daily tip each time BibleTime starts. <BR>The tips contain important Bible quotations and helpful tips for using BibleTime.") ; - } - { - using namespace aboutBibleTime; - tooltip = i18n ("Show detailed information about BibleTime.") ; - } - { - using namespace aboutKDE; - tooltip = i18n ("Show detailed information about the KDE project.") ; - } - } - } - } - - { - using namespace searchdialog; - { - using namespace searchButton; - tooltip = i18n ("Start to search the text in each of the chosen work(s).") ; - } - { - using namespace cancelSearchButton; - tooltip = i18n ("Stop the active search.") ; - } - - { - using namespace options; - { - using namespace moduleChooserButton; - tooltip = i18n ("Open a dialog to choose work(s) for the search.") ; - } - { - using namespace searchedText; - tooltip = i18n ("Enter the text you want to search in the chosen work(s) here.") ; - } - { - using namespace searchType; - { - using namespace multipleWords_and; - tooltip = i18n ("Treat the search text as multiple words. A text must contain all of the words to match. The order of the words is unimportant.") ; - } - { - using namespace multipleWords_or; - tooltip = i18n ("Treat the search text as multiple words. A text must contain one or more words of to match. The order is unimportant.") ; - } - { - using namespace exactMatch; - tooltip = i18n ("The search text will be used exactly as entered.") ; - } - { - using namespace regExp; - tooltip = i18n ("Treat the search string as a GNU regular expression. The BibleTime handbook contains an introduction to regular expressions.") ; - } - } - - { - using namespace searchOptions; - { - using namespace caseSensitive; - tooltip = i18n ("If you choose this option the search will distinguish between upper and lowercase characters.") ; - } - } - { - using namespace chooseScope; - tooltip = i18n ("Choose a scope from the list. \ -Select the first item to use no scope, the second one is to use each work's last search result as search scope. \ -The others are user defined search scopes."); - } - { - using namespace scopeEditor; - { - using namespace rangeList; - tooltip = i18n ("Select an item from the list to edit the search scope.") ; - } - { - using namespace nameEdit; - tooltip = i18n ("Change the name of the selected search scope.") ; - } - { - using namespace editRange; - tooltip = i18n ("Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed.") ; - } - { - using namespace parsedResult; - tooltip = i18n ("Contains the search ranges which will be used for the search.") ; - } - { - using namespace addNewRange; - tooltip = i18n ("Add a new search scope. First enter an appropriate name, then edit the search ranges.") ; - } - { - using namespace deleteCurrentRange; - tooltip = i18n ("Deletes the selected search scope. If you close the dialog using Cancel the settings won't be saved.") ; - } - } - } - { - using namespace result; - { - using namespace moduleList; - tooltip = i18n ("The list of works chosen for the search.") ; - } - { - using namespace foundItems; - tooltip = i18n ("This list contains the search result of the selected work.") ; - } - { - using namespace textPreview; - tooltip = i18n ("The text preview of the selected search result item.") ; - } - } - } - - { - using namespace displaywindows; - { - using namespace general; - { - { - using namespace scrollButton; - tooltip = i18n ("This button is useful to scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item.") ; - } - { - using namespace search; - tooltip = i18n ("This button opens the search dialog with the work(s) of this window.") ; - - } - { - using namespace backInHistory; - tooltip = i18n ("Go back one item in the display history.") ; - } - { - using namespace forwardInHistory; - tooltip = i18n ("Go forward one item in the display history.") ; - - } - { - using namespace findStrongs; - tooltip = i18n ("Show all occurences of the Strong number currently under the mouse cursor.") ; - } - } - using namespace bibleWindow; - { - using namespace bookList; - tooltip = i18n ("This list contains the books which are available in this work.") ; - } - { - using namespace nextBook; - tooltip = i18n ("Show the next book of this work.") ; - } - { - using namespace previousBook; - tooltip = i18n ("Show the previous book of this work.") ; - } - { - using namespace chapterList; - tooltip = i18n ("This list contains the chapters which are available in the current book.") ; - } - { - using namespace nextChapter; - tooltip = i18n ("Show the next chapter of the work.") ; - } - { - using namespace previousChapter; - tooltip = i18n ("Show the previous chapter of the work.") ; - } - { - using namespace verseList; - tooltip = i18n ("This list contains the verses which are available in the current chapter.") ; - } - { - using namespace nextVerse; - tooltip = i18n ("In Bible texts, the next verse will be highlighted. In commentaries, the next entry will be shown.") ; - - } - { - using namespace previousVerse; - tooltip = i18n ("In Bible texts, the previous verse will be highlighted. In commentaries, the previous entry will be shown.") ; - } - } - { - using namespace commentaryWindow; - { - using namespace syncWindow; - tooltip = i18n ("Synchronize the displayed entry of this work with the active Bible window.") ; - } - } - { - using namespace lexiconWindow; - { - using namespace entryList; - tooltip = i18n ("This list contains the entries of the current work.") ; - } - { - using namespace nextEntry; - tooltip = i18n ("The next entry of the work will be shown.") ; - } - { - using namespace previousEntry; - tooltip = i18n ("The previous entry of the work will be shown.") ; - } - } - - { - using namespace writeWindow; - { - using namespace saveText; - tooltip = i18n ("Save the curent text into the work. The old text will be overwritten.") ; - } - { - using namespace restoreText; - tooltip = i18n ("Loads the old text from the work and loads it into the edit area. The unsaved text will be lost.") ; - } - { - using namespace deleteEntry; - tooltip = i18n ("Deletes the current entry out of the work. The text will be lost.") ; - } - - //formatting buttons - { - using namespace boldText; - tooltip = i18n ("Toggle bold formatting of the selected text.") ; - } - { - using namespace italicText; - tooltip = i18n ("Toggle italic formatting of the selected text.") ; - } - { - using namespace underlinedText; - tooltip = i18n ("Toggle underlined formatting of the selected text.") ; - } - - { - using namespace alignLeft; - tooltip = i18n ("The text will be aligned on the left side of the page.") ; - } - { - using namespace alignCenter; - tooltip = i18n ("Centers the text horizontally.") ; - } - { - using namespace alignRight; - tooltip = i18n ("Aligns the text on the right side of the page.") ; - } - { - using namespace alignJustify; - tooltip = i18n ("Justifies the text on the page.") ; - } - - { - using namespace fontFamily; - tooltip = i18n ("Choose a new font for the selected text.") ; - } - { using namespace fontSize; - tooltip = i18n ("Choose a new font size for the selected text.") ; - } - { using namespace fontColor; - tooltip = i18n ("Choose a new color for the selected text.") ; - } - } - } - { - using namespace settings; - { - using namespace startup; - { - using namespace dailyTip; - tooltip = i18n ("Activate this box to see a daily tip on startup.") ; - } - { - using namespace showLogo; - tooltip = i18n ("Activate this to see the BibleTime logo on startup.") ; - } - { - using namespace restoreWorkingArea; - tooltip = i18n ("Save the user's session when BibleTime is closed and restore it on the next startup.") ; - } - } - { - using namespace fonts; - { - using namespace typeChooser; - tooltip = i18n ("The font selection below will apply to all texts in this language.") ; - } - } - { - using namespace settings::sword; - { - using namespace general; - { - using namespace language; - tooltip = i18n ("Contains the languages which can be used for the biblical booknames.") ; - } - } - { - using namespace settings::sword::modules; - { - using namespace bible; - tooltip = i18n ("The standard Bible is used when a hyperlink into a Bible is clicked.") ; - } - { - using namespace commentary; - tooltip = i18n ("The standard commentary is used when a hyperlink into a commentary is clicked.") ; - } - { - using namespace lexicon; - tooltip = i18n ("The standard lexicon is used when a hyperlink into a lexicon is clicked.") ; - } - { - using namespace dailyDevotional; - tooltip = i18n ("The standard devotional will be used to display a short start up devotional.") ; - } - { - using namespace hebrewStrongs; - tooltip = i18n ("The standard Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked.") ; - } - { - using namespace greekStrongs; - tooltip = i18n ("The standard Greek lexicon is used when a hyperlink into a Greek lexicon is clicked.") ; - } - { - using namespace hebrewMorph; - tooltip = i18n ("The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked.") ; - } - { - using namespace greekMorph; - tooltip = i18n ("The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked.") ; - } - } - } - } - { - using namespace mainIndex; - { - using namespace search; - tooltip = i18n ("Opens the search dialog to search in the work(s) that are currently open.") ; - } - } - } -} diff --git a/bibletime/util/cresmgr.h b/bibletime/util/cresmgr.h deleted file mode 100644 index a5e16ab..0000000 --- a/bibletime/util/cresmgr.h +++ /dev/null @@ -1,733 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef CRESMGR_H -#define CRESMGR_H - -//Qt includes -#include <qstring.h> -#include <qkeysequence.h> - -//KDE includes -#include <kshortcut.h> - -/** Provides static functions to easily access the Tooltip texts for all the frontend parts. - * @author The BibleTime team - */ -namespace CResMgr { - void init_i18n(); - - namespace modules { - namespace bible { - extern const QString icon_unlocked; - extern const QString icon_locked; - extern const QString icon_add; - } - namespace commentary { - extern const QString icon_unlocked; - extern const QString icon_locked; - extern const QString icon_add; - }; - namespace lexicon { - extern const QString icon_unlocked; - extern const QString icon_locked; - extern const QString icon_add; - }; - namespace book { - extern const QString icon_unlocked; - extern const QString icon_locked; - extern const QString icon_add; - }; - }; - - namespace mainMenu { //Main menu - namespace file { //Main menu->File - namespace print { //a standard action - extern QString tooltip; - - } - namespace quit { //a standard action - extern QString tooltip; - } - } - - namespace view { //Main menu->View - namespace showMainIndex { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace showInfoDisplay { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace showToolBar { //a standard action - extern QString tooltip; - } - } - - namespace mainIndex { //configuration for the main index and the view->search menu - namespace search { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace searchdefaultbible { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - } - - namespace window { //Main menu->Window - namespace loadProfile { - extern QString tooltip; - - extern const QString icon; - extern const char* actionName; - } - namespace saveProfile { - extern QString tooltip; - - extern const QString icon; - extern const char* actionName; - } - namespace saveToNewProfile { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace deleteProfile { - extern QString tooltip; - - extern const QString icon; - extern const char* actionName; - } - namespace showFullscreen { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace arrangementMode { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - - namespace manual { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace autoTileVertical { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace autoTileHorizontal { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace autoCascade { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - } - namespace tileVertical { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace tileHorizontal { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace cascade { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace closeAll { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - } - - namespace settings { //Main menu->Settings - namespace editToolBar { // available as KStdAction - extern QString tooltip; - - } - namespace optionsDialog { // available as KStdAction - extern QString tooltip; - - } - namespace swordSetupDialog { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - } - - namespace help { //Main menu->Help - namespace handbook { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace bibleStudyHowTo { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace bugreport { // available as KStdAction - extern QString tooltip; - } - namespace dailyTip { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace aboutBibleTime { // available as KStdAction - extern QString tooltip; - } - namespace aboutKDE { // available as KStdAction - extern QString tooltip; - } - } - } //end of main menu - - namespace searchdialog { - extern const QString icon; - - namespace searchButton { - extern QString tooltip; - } - namespace cancelSearchButton { - extern QString tooltip; - } - - namespace options { - namespace moduleChooserButton { - extern QString tooltip; - } - namespace searchedText { - extern QString tooltip; - } - namespace searchType { - namespace multipleWords_and { - extern QString tooltip; - } - namespace multipleWords_or { - extern QString tooltip; - } - namespace exactMatch { - extern QString tooltip; - } - namespace regExp { - extern QString tooltip; - } - } - - namespace searchOptions { - namespace caseSensitive { - extern QString tooltip; - } - } - namespace chooseScope { - extern QString tooltip; - } - namespace scopeEditor { - namespace rangeList { - extern QString tooltip; - } - namespace nameEdit { - extern QString tooltip; - } - namespace editRange { - extern QString tooltip; - } - namespace parsedResult { - extern QString tooltip; - } - namespace addNewRange { - extern QString tooltip; - } - namespace deleteCurrentRange { - extern QString tooltip; - } - - } - } - namespace result { - namespace moduleList { - extern QString tooltip; - - namespace copyMenu { - extern const QString icon; - } - namespace saveMenu { - extern const QString icon; - } - namespace printMenu { - extern const QString icon; - } - } - namespace foundItems { - extern QString tooltip; - - namespace copyMenu { - extern const QString icon; - } - namespace saveMenu { - extern const QString icon; - } - namespace printMenu { - extern const QString icon; - } - - } - namespace textPreview { - extern QString tooltip; - } - } - } - -namespace workspace {} - - namespace displaywindows { - namespace transliteration { - extern const QString icon; - } - namespace displaySettings { - extern const QString icon; - } - - namespace general { - namespace scrollButton { - extern QString tooltip; - } - namespace search { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - - namespace backInHistory { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace forwardInHistory { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - - namespace findStrongs { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - } - - namespace bibleWindow { - namespace bookList { - extern QString tooltip; - - } - namespace nextBook { - extern QString tooltip; - - extern const KShortcut accel; - } - namespace previousBook { - extern QString tooltip; - - extern const KShortcut accel; - } - - namespace chapterList { - extern QString tooltip; - - } - namespace nextChapter { - extern QString tooltip; - - extern const KShortcut accel; - } - namespace previousChapter { - extern QString tooltip; - - extern const KShortcut accel; - } - - namespace verseList { - extern QString tooltip; - - } - namespace nextVerse { - extern QString tooltip; - - extern const KShortcut accel; - } - namespace previousVerse { - extern QString tooltip; - - extern const KShortcut accel; - } - - namespace copyMenu { - extern const QString icon; - } - namespace saveMenu { - extern const QString icon; - } - namespace printMenu { - extern const QString icon; - } - } - namespace commentaryWindow { - namespace syncWindow { - extern const QString icon; - extern QString tooltip; - - extern const KShortcut accel; - extern const char* actionName; - } - - } - - namespace lexiconWindow { - namespace entryList { - extern QString tooltip; - - } - namespace nextEntry { - extern QString tooltip; - - extern const KShortcut accel; - } - namespace previousEntry { - extern QString tooltip; - - extern const KShortcut accel; - } - - namespace copyMenu { - extern const QString icon; - } - namespace saveMenu { - extern const QString icon; - } - namespace printMenu { - extern const QString icon; - } - } - namespace bookWindow { - namespace toggleTree { - extern const QString icon; - extern const KShortcut accel; - } - } - - - namespace writeWindow { - namespace saveText { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace restoreText { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace deleteEntry { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - - //formatting buttons - namespace boldText { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace italicText { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace underlinedText { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - - namespace alignLeft { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace alignCenter { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace alignRight { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace alignJustify { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - - namespace fontFamily { - extern QString tooltip; - - extern const KShortcut accel; - extern const char* actionName; - } - namespace fontSize { - extern QString tooltip; - - extern const KShortcut accel; - extern const char* actionName; - } - namespace fontColor { - extern QString tooltip; - - } - - } - } - - namespace settings { - namespace startup { - extern const QString icon; - - namespace dailyTip { - extern QString tooltip; - - } - namespace showLogo { - extern QString tooltip; - - } - namespace restoreWorkingArea { - extern QString tooltip; - - } - } - namespace fonts { - extern const QString icon; - - namespace typeChooser { - extern QString tooltip; - - } - } - namespace profiles { - extern const QString icon; - - namespace list { - extern QString tooltip; - - } - namespace createNew { - extern QString tooltip; - - } - namespace deleteCurrent { - extern QString tooltip; - - } - namespace renameCurrent { - extern QString tooltip; - - } - } - namespace sword { - extern const QString icon; - - namespace general { - - namespace language { - extern QString tooltip; - } - } - namespace modules { - namespace bible { - extern QString tooltip; - } - namespace commentary { - extern QString tooltip; - } - namespace lexicon { - extern QString tooltip; - } - namespace dailyDevotional { - extern QString tooltip; - } - namespace hebrewStrongs { - extern QString tooltip; - } - namespace greekStrongs { - extern QString tooltip; - } - namespace hebrewMorph { - extern QString tooltip; - } - namespace greekMorph { - extern QString tooltip; - } - } - } - namespace keys { - extern const QString icon; - } - } - - namespace mainIndex { //configuration for the main index and the view->search menu - namespace search { - extern QString tooltip; - - extern const QString icon; - extern const KShortcut accel; - extern const char* actionName; - } - namespace newFolder { - extern const QString icon; - } - namespace changeFolder { - extern const QString icon; - } - namespace openedFolder { - extern const QString icon; - } - namespace closedFolder { - extern const QString icon; - } - - namespace bookmark { - extern const QString icon; - } - namespace changeBookmark { - extern const QString icon; - } - namespace importBookmarks { - extern const QString icon; - } - namespace exportBookmarks { - extern const QString icon; - } - namespace printBookmarks { - extern const QString icon; - } - namespace deleteItems { - extern const QString icon; - } - - namespace editModuleMenu { - extern const QString icon; - } - namespace editModulePlain { - extern const QString icon; - } - namespace editModuleHTML { - extern const QString icon; - } - - namespace unlockModule { - extern const QString icon; - } - namespace aboutModule { - extern const QString icon; - } - } -} - -#endif diff --git a/bibletime/util/ctoolclass.cpp b/bibletime/util/ctoolclass.cpp deleted file mode 100644 index d00f335..0000000 --- a/bibletime/util/ctoolclass.cpp +++ /dev/null @@ -1,239 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//own includes -#include "ctoolclass.h" - -#include "util/cresmgr.h" -#include "backend/cswordbackend.h" -#include "backend/cswordmoduleinfo.h" - -//QT includes -#include <qlabel.h> -#include <qfile.h> -#include <qfiledialog.h> -#include <qtextstream.h> -#include <qregexp.h> - -//KDE includes -#include <klocale.h> -#include <kglobal.h> -#include <kiconloader.h> -#include <kstandarddirs.h> -#include <kmessagebox.h> -#include <kurl.h> -#include <kfiledialog.h> -#include <kapplication.h> - - -QString CToolClass::locatehtml(const QString &filename) { - QString path = locate("html", KGlobal::locale()->language() + '/' + filename); - if (path.isNull()) - path = locate("html", "default/" + filename); - if (path.isNull()) - path = locate("html", "en/" + filename); - return path; -} - -/** Converts HTML text to plain text */ -QString CToolClass::htmlToText(const QString& html) { - QString newText = html; - // convert some tags we need in code - newText.replace( QRegExp(" "),"#SPACE#" ); - newText.replace( QRegExp("<br/?>\\s*"), "<br/>\n" ); - newText.replace( QRegExp("#SPACE#")," " ); - - QRegExp re("<.+>"); - re.setMinimal(true); - newText.replace( re,"" ); - return newText; -} - -/** Converts text to HTML (\n to <BR>) */ -QString CToolClass::textToHTML(const QString& text) { - QString newText = text; - newText.replace( QRegExp("<BR>\n"),"#NEWLINE#" ); - newText.replace( QRegExp("\n"),"<BR>\n" ); - newText.replace( QRegExp("#NEWLINE#"),"<BR>\n"); - return newText; -} - -/** Creates the file filename and put text into the file. - */ -bool CToolClass::savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite, const QTextStream::Encoding& fileEncoding) { - QFile saveFile(filename); - bool ret; - - if (saveFile.exists()) { - if (!forceOverwrite && KMessageBox::warningYesNo(0, - QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>") - .arg( i18n("The file already exists.") ) - .arg( i18n("Do you want to overwrite it?") - ) - ) == KMessageBox::No - ) { - return false; - } - else { //either the user chose yes or forceOverwrite is set - saveFile.remove(); - } - }; - - if ( saveFile.open(IO_ReadWrite) ) { - QTextStream textstream( &saveFile ); - textstream.setEncoding(fileEncoding); - textstream << text; - saveFile.close(); - ret = true; - } - else { - KMessageBox::error(0, QString::fromLatin1("<qt>%1<BR><B>%2</B></qt>") - .arg( i18n("The file couldn't be saved.") ) - .arg( i18n("Please check permissions etc."))); - saveFile.close(); - ret = false; - } - return ret; -} - - -/** Returns the icon used for the module given as aparameter. */ -QPixmap CToolClass::getIconForModule( CSwordModuleInfo* module_info ) { - if (!module_info) - return SmallIcon(CResMgr::modules::book::icon_locked, 16); - - if (module_info->category() == CSwordModuleInfo::Cult) { - return SmallIcon("stop.png", 16); - }; - - - QPixmap img; - - switch (module_info->type()) { - case CSwordModuleInfo::Bible: - if (module_info->isLocked()) - img = SmallIcon(CResMgr::modules::bible::icon_locked, 16); - else - img = SmallIcon(CResMgr::modules::bible::icon_unlocked, 16); - break; - - case CSwordModuleInfo::Lexicon: - if (module_info->isLocked()) - img = SmallIcon(CResMgr::modules::lexicon::icon_locked, 16); - else - img = SmallIcon(CResMgr::modules::lexicon::icon_unlocked, 16); - break; - - case CSwordModuleInfo::Commentary: - if (module_info->isLocked()) - img = SmallIcon(CResMgr::modules::commentary::icon_locked, 16); - else - img = SmallIcon(CResMgr::modules::commentary::icon_unlocked, 16); - break; - - case CSwordModuleInfo::GenericBook: - if (module_info->isLocked()) - img = SmallIcon(CResMgr::modules::book::icon_locked, 16); - else - img = SmallIcon(CResMgr::modules::book::icon_unlocked, 16); - break; - - case CSwordModuleInfo::Unknown: //fall though to default - default: - if (module_info->isLocked()) - img = SmallIcon(CResMgr::modules::book::icon_locked, 16); - else - img = SmallIcon(CResMgr::modules::book::icon_unlocked, 16); - break; - } - - - return img; -} - -QLabel* CToolClass::explanationLabel(QWidget* parent, const QString& heading, const QString& text ) { - QLabel* label = new QLabel( QString::fromLatin1("<B>%1</B><BR>%2").arg(heading).arg(text),parent ); - label->setAutoResize(true); - label->setMargin(1); - label->setFrameStyle(QFrame::Box | QFrame::Plain); - return label; -} - -/** No descriptions */ -bool CToolClass::inHTMLTag(int pos, QString & text) { - int i1=text.findRev("<",pos); - int i2=text.findRev(">",pos); - int i3=text.find(">",pos); - int i4=text.find("<",pos); - - - // if ((i1>0) && (i2==-1)) //we're in th first html tag - // i2=i1; // not ncessary, just for explanation - - if ((i3>0) && (i4==-1)) //we're in the last html tag - i4=i3+1; - - // qWarning("%d > %d && %d < %d",i1,i2,i3,i4); - - if ( (i1>i2) && (i3<i4) ) - return true; //yes, we're in a tag - - return false; -} - -QString CToolClass::moduleToolTip(CSwordModuleInfo* module) { - Q_ASSERT(module); - if (!module) { - return QString::null; - } - - QString text; - - text = QString("<b>%1</b> ").arg( module->name() ) - + ((module->category() == CSwordModuleInfo::Cult) ? QString::fromLatin1("<small><b>%1</b></small><br>").arg(i18n("Take care, this work contains cult / questionable material!")) : QString::null); - - text += QString("<small>(") + module->config(CSwordModuleInfo::Description) + QString(")</small><hr>"); - - text += i18n("Language") + QString(": %1<br>").arg( module->language()->translatedName() ); - - if (module->isEncrypted()) { - text += i18n("Unlock key") + QString(": %1<br>") - .arg(!module->config(CSwordModuleInfo::CipherKey).isEmpty() ? module->config(CSwordModuleInfo::CipherKey) : QString("<font COLOR=\"red\">%1</font>").arg(i18n("not set"))); - } - - if (module->hasVersion()) { - text += i18n("Version") + QString(": %1<br>").arg( module->config(CSwordModuleInfo::ModuleVersion) ); - } - - QString options; - unsigned int opts; - for (opts = CSwordModuleInfo::filterTypesMIN; opts <= CSwordModuleInfo::filterTypesMAX; ++opts) { - if (module->has( static_cast<CSwordModuleInfo::FilterTypes>(opts) )) { - if (!options.isEmpty()) { - options += QString::fromLatin1(", "); - } - - options += CSwordBackend::translatedOptionName( - static_cast<CSwordModuleInfo::FilterTypes>(opts) - ); - } - } - - if (!options.isEmpty()) { - text += i18n("Options") + QString::fromLatin1(": <small>") + options + QString("</small>"); - } - - if (text.right(4) == QString::fromLatin1("<br>")) { - text = text.left(text.length()-4); - } - - return text; -} diff --git a/bibletime/util/ctoolclass.h b/bibletime/util/ctoolclass.h deleted file mode 100644 index 80d0ae8..0000000 --- a/bibletime/util/ctoolclass.h +++ /dev/null @@ -1,80 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -//Qt includes -#include <qstring.h> -#include <qpixmap.h> -#include <qtextstream.h> - - -#ifndef CTOOLCLASS_H -#define CTOOLCLASS_H - - -class CSwordModuleInfo; -class QLabel; - -/** - * Provides some useful functions which would be normally global. - * - * Some methods,that would be normaly global, but I hate global functions :-) - * (the function locateHTML is from Sandy Meier (KDevelop)) - * - * @short A class which contains static members to do small things. - * @author Joachim Ansorg <info@bibletime.info> - */ -class CToolClass { -public: - /** - * @return The path of the HTML file "filename". This function searches only in $KDEDIR. - * @author Sandy Meier of the KDevelop team. - */ - static QString locatehtml(const QString &filename); - /** - * Converts HTML text to plain text. - * This function converts some HTML tags in text (e.g. <BR> to \n) - * @return The text withput HTML tags and with converted <BR> to \n - * @author Joachim Ansorg - */ - static QString htmlToText(const QString&); - /** - * Converts text to HTML converting some text commands into HTML tags (e.g. \n to <BR>) - * @return The HTML formatted text we got after changing \n to <BR> - * @author Joachim Ansorg - */ - static QString textToHTML(const QString&); - /** - * Creates the file filename and put the text of parameter "text" into the file. - * @return True if saving was sucessful, otherwise false - * @author Joachim Ansorg - */ - static bool savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite = false, const QTextStream::Encoding& fileEncoding = QTextStream::Locale); - /** - * Returns the icon used for the module given as aparameter. - */ - static QPixmap getIconForModule( CSwordModuleInfo* ); - /** Returns a label to explain difficult things of dialogs. - * This function returns a label with heading "heading" and explanation "text". This label should be used to - * explain difficult things of the GUI, e.g. in the optionsdialog. - */ - static QLabel* explanationLabel(QWidget* parent, const QString& heading, const QString& text ); - /** - * Returns true if the character at position "pos" of text is inside an HTML tag. Returns false if it's not inside an HTML tag. - */ - static bool inHTMLTag(int pos, QString & text); - /** Return the module's tooltip text - * @param module The module required for the toolip - * @return The tooltip text for the passed module - */ - static QString moduleToolTip(CSwordModuleInfo* module); -}; - -#endif diff --git a/bibletime/util/directoryutil.cpp b/bibletime/util/directoryutil.cpp deleted file mode 100644 index c55ca96..0000000 --- a/bibletime/util/directoryutil.cpp +++ /dev/null @@ -1,111 +0,0 @@ -// -// C++ Implementation: directoryutil -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#include "directoryutil.h" - -//Qt includes -#include <qdir.h> - -namespace util { - -namespace filesystem { - -void DirectoryUtil::removeRecursive(const QString& dir) { - qWarning("removeRecursive(%s)", dir.latin1()); - if (dir == QString::null) { - return; - } - - QDir d(dir); - if (!d.exists()) { - return; - } - - QFileInfo *fi = 0; - - //remove all files in this dir - d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); - - const QFileInfoList *fileList = d.entryInfoList(); - QFileInfoListIterator it_file( *fileList ); - while ( (fi = it_file.current()) != 0 ) { - ++it_file; - - qDebug("Removing %s", fi->absFilePath().latin1() ); - d.remove( fi->fileName() ) ; - } - - //remove all subdirs recursively - d.setFilter( QDir::Dirs | QDir::NoSymLinks ); - const QFileInfoList *dirList = d.entryInfoList(); - QFileInfoListIterator it_dir( *dirList ); - - while ( (fi = it_dir.current()) != 0 ) { - ++it_dir; - - if ( !fi->isDir() || fi->fileName() == "." || fi->fileName() == ".." ) { - continue; - } - - qDebug("Removing dir %s", fi->absFilePath().latin1() ); - //d.remove( fi->fileName() ) ; - - removeRecursive( fi->absFilePath() ); - } - - d.rmdir(dir); -} - -/** Returns the size of the directory including the size of all it's files and it's subdirs. - */ -unsigned long DirectoryUtil::getDirSizeRecursive(const QString& dir) { - qWarning("Getting size for %s", dir.latin1()); - - QDir d(dir); - if (!d.exists()) { - return 0; - } - - d.setFilter(QDir::Files); - - unsigned long size = 0; - - const QFileInfoList* infoList = d.entryInfoList(); - QFileInfoListIterator it(*infoList); - QFileInfo* info = 0; - while ((info = it.current()) != 0) { - ++it; - - size += info->size(); - } - - d.setFilter(QDir::Dirs); - const QFileInfoList* dirInfoList = d.entryInfoList(); - QFileInfoListIterator it_dir(*dirInfoList); - while ((info = it_dir.current()) != 0) { - ++it_dir; - - if ( !info->isDir() || info->fileName() == "." || info->fileName() == ".." ) { - continue; - } - - size += getDirSizeRecursive( info->absFilePath() ); - } - - return size; -} - - -} //end of namespace util::filesystem - -} //end of namespace util - diff --git a/bibletime/util/directoryutil.h b/bibletime/util/directoryutil.h deleted file mode 100644 index 68a6e88..0000000 --- a/bibletime/util/directoryutil.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// C++ Interface: directoryutil -// -// Description: -// -// -// Author: The BibleTime team <info@bibletime.info>, (C) 2006 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef UTIL_FILESDIRECTORYUTIL_H -#define UTIL_FILESDIRECTORYUTIL_H - -#include <qstring.h> - -namespace util { - -namespace filesystem { - -/** - * Tools for working with directories. - * @author The BibleTime team <info@bibletime.info> -*/ -class DirectoryUtil { -private: - DirectoryUtil() {}; - ~DirectoryUtil() {}; - -public: - /** Removes the given dir with all it's files and subdirs. - * - * TODO: Check if it's suitable for huge dir trees, as it holds a QDir object - * for each of it at the same time in the deepest recursion. - * For really deep dir tree this may lead to a stack overflow. - */ - static void removeRecursive(const QString& dir); - - /** Returns the size of the directory including the size of all it's files - * and it's subdirs. - * - * TODO: Check if it's suitable for huge dir trees, as it holds a QDir object - * for each of it at the same time in the deepest recursion. - * For really deep dir tree this may lead to a stack overflow. - * - * @return The size of the dir in bytes - */ - static unsigned long getDirSizeRecursive(const QString& dir); -}; - -} - -} - -#endif diff --git a/bibletime/util/scoped_resource.h b/bibletime/util/scoped_resource.h deleted file mode 100644 index 2032038..0000000 --- a/bibletime/util/scoped_resource.h +++ /dev/null @@ -1,181 +0,0 @@ -/********* -* -* This file is part of BibleTime's source code, http://www.bibletime.info/. -* -* Copyright 1999-2006 by the BibleTime developers. -* The BibleTime source code is licensed under the GNU General Public License version 2.0. -* -**********/ - - - -#ifndef SCOPED_RESOURCE_H_INCLUDED -#define SCOPED_RESOURCE_H_INCLUDED - -/** -* The util namespace should take all classes which are of a generic type, -* used to perform common tasks which are not BibleTime-specific. See -* @ref scoped_resource for an example. -*/ -namespace util { - /** - * A class template, scoped_resource, designed to - * implement the Resource Acquisition Is Initialization (RAII) approach - * to resource management. scoped_resource is designed to be used when - * a resource is initialized at the beginning or middle of a scope, - * and released at the end of the scope. The template argument - * ReleasePolicy is a functor which takes an argument of the - * type of the resource, and releases it. - * - * Usage example, for working with files: - * - * @code - * struct close_file { void operator(int fd) const {close(fd);} }; - * ... - * { - * const scoped_resource<int,close_file> file(open("file.txt",O_RDONLY)); - * read(file, buf, 1000); - * } // file is automatically closed here - * @endcode - * - * Note that scoped_resource has an explicit constructor, and prohibits - * copy-construction, and thus the initialization syntax, rather than - * the assignment syntax must be used when initializing. - * - * i.e. using scoped_resource<int,close_file> file = open("file.txt",O_RDONLY); - * in the above example is illegal. - * - */ - template<typename T,typename ReleasePolicy> - class scoped_resource { - T resource; - ReleasePolicy release; - - //prohibited operations - scoped_resource(const scoped_resource&); - scoped_resource& operator=(const scoped_resource&); -public: - typedef T resource_type; - typedef ReleasePolicy release_type; - - /** - * Constructor - * - * @ param res This is the resource to be managed - * @ param rel This is the functor to release the object - */ - explicit scoped_resource(resource_type res,release_type rel=release_type()) -: resource(res), release(rel) {} - - /** - * The destructor is the main point in this class. It takes care of proper - * deletion of the resource, using the provided release policy. - */ - ~scoped_resource() { - release(resource); - } - - /** - * This operator makes sure you can access and use the scoped_resource - * just like you were using the resource itself. - * - * @ret the underlying resource - */ - operator resource_type() const { - return resource; - } - - /** - * This function provides explicit access to the resource. Its behaviour - * is identical to operator resource_type() - * - * @ret the underlying resource - */ - resource_type get - () const { - return resource; - } - - /** - * This function provides convenient direct access to the -> operator - * if the underlying resource is a pointer. Only call this function - * if resource_type is a pointer type. - */ - resource_type operator->() const { - return resource; - } - - }; - - /** - * A helper policy for scoped_ptr. - * It will call the delete operator on a pointer, and assign the pointer to 0 - */ - struct delete_item { - template<typename T> - void operator()(T*& p) const { - delete p; - p = 0; - } - }; - /** - * A helper policy for scoped_array. - * It will call the delete[] operator on a pointer, and assign the pointer to 0 - */ - struct delete_array { - template<typename T> - void operator()(T*& p) const { - delete [] p; - p = 0; - } - }; - - /** - * A class which implements an approximation of - * template<typename T> - * typedef scoped_resource<T*,delete_item> scoped_ptr<T>; - * - * It is a convenient synonym for a common usage of @ref scoped_resource. - * See scoped_resource for more details on how this class behaves. - * - * Usage example: - * @code - * { - * const scoped_ptr<Object> ptr(new Object); - * ...use ptr as you would a normal Object*... - * } // ptr is automatically deleted here - * @endcode - * - * NOTE: use this class only to manage a single object, *never* an array. - * Use scoped_array to manage arrays. This distinction is because you - * may call delete only on objects allocated with new, delete[] only - * on objects allocated with new[]. - */ - template<typename T> -struct scoped_ptr : public scoped_resource<T*,delete_item> { -explicit scoped_ptr(T* p) : scoped_resource<T*,delete_item>(p) {} - } - ; - - /** - * This class has identical behaviour to @ref scoped_ptr, except it manages - * heap-allocated arrays instead of heap-allocated single objects - * - * Usage example: - * @code - * { - * const scoped_array<char> ptr(new char[n]); - * ...use ptr as you would a normal char*... - * } // ptr is automatically deleted here - * @endcode - * - */ - template<typename T> -struct scoped_array : public scoped_resource<T*,delete_array> { -explicit scoped_array(T* p) : scoped_resource<T*,delete_array>(p) {} - } - ; - -} - -#endif diff --git a/bibletime/xml/Makefile.am b/bibletime/xml/Makefile.am deleted file mode 100644 index acb432e..0000000 --- a/bibletime/xml/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = bibletimeui.rc -rcdir = $(kde_datadir)/bibletime -rc_DATA = bibletimeui.rc diff --git a/bibletime/xml/Makefile.in b/bibletime/xml/Makefile.in deleted file mode 100644 index f3823fc..0000000 --- a/bibletime/xml/Makefile.in +++ /dev/null @@ -1,594 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 1.31 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = bibletime/xml -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(rcdir)" -rcDATA_INSTALL = $(INSTALL_DATA) -DATA = $(rc_DATA) -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BT_LDFLAGS = @BT_LDFLAGS@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUCENE_INCLUDES = @CLUCENE_INCLUDES@ -CLUCENE_LIBRARY_PATH = @CLUCENE_LIBRARY_PATH@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTRIBUTION = @DISTRIBUTION@ -DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -HOWTODIR = @HOWTODIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_CLUCENE = @LIB_CLUCENE@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_SWORD = @LIB_SWORD@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MKDIR_P = @MKDIR_P@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -RPM_GROUP = @RPM_GROUP@ -RPM_PREFIX = @RPM_PREFIX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -SWORD_INCLUDES = @SWORD_INCLUDES@ -SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -EXTRA_DIST = bibletimeui.rc -rcdir = $(kde_datadir)/bibletime -rc_DATA = bibletimeui.rc -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/xml/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu bibletime/xml/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/xml/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/xml/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/xml/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-rcDATA: $(rc_DATA) - @$(NORMAL_INSTALL) - test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)" - @list='$(rc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \ - $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \ - done - -uninstall-rcDATA: - @$(NORMAL_UNINSTALL) - @list='$(rc_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \ - rm -f "$(DESTDIR)$(rcdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(rcdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-rcDATA - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-rcDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-rcDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-rcDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=Makefile.in Makefile.am - -#>+ 2 -docs-am: - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu bibletime/xml/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu bibletime/xml/Makefile - cd $(top_srcdir) && perl admin/am_edit bibletime/xml/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck diff --git a/bibletime/xml/bibletimeui.rc b/bibletime/xml/bibletimeui.rc deleted file mode 100644 index fa8f4e2..0000000 --- a/bibletime/xml/bibletimeui.rc +++ /dev/null @@ -1,70 +0,0 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="BibleTime" version="27"> -<MenuBar> - <Menu name="file" noMerge="1"><text>&File</text> - <Action name="file_clear_queue_action"/> - <Action name="file_print"/> - <Separator/> - <Action name="file_quit"/> - </Menu> - <Menu name="search" noMerge="1"><Text>&Search</Text> - <Action name="mainindex_searchdefaultbible_action"/> - <Action name="mainindex_search_action"/> - </Menu> - <Menu name="view" noMerge="1"><Text>&View</Text> - <Action name="options_show_toolbar"/> - <Separator/> - <Action name="viewMainIndex_action"/> - <Action name="viewInfoDisplay_action"/> - </Menu> - <Menu name="settings" noMerge="1"><Text>Se&ttings</Text> - <Action name="options_configure_toolbars"/> - <Separator/> - <Action name="options_configure"/> - <Separator/> - <Action name="options_sword_setup"/> - </Menu> - <Menu name="window"><Text>&Window</Text> - <Action name="windowSaveProfile_action"/> - <Action name="windowSaveToNewProfile_action"/> - <Action name="windowLoadProfile_action"/> - <Action name="windowDeleteProfile_action"/> - <Separator/> - <Action name="windowFullscreen_action"/> - <Separator/> - <Action name="windowArrangementMode_action"/> - <Action name="windowTileVertical_action"/> - <Action name="windowTileHorizontal_action"/> - <Action name="windowCascade_action"/> - <Separator/> - <Action name="windowCloseAll_action"/> - <Separator/> - </Menu> - <Menu name="help" noMerge="1"><Text>&Help</Text> - <Action name="helpHandbook_action"/> - <Action name="helpHowTo_action"/> - <Separator/> - <Action name="help_whats_this"/> - <Action name="help_report_bug"/> - <Action name="helpDailyTip_action"/> - <Separator/> - <Action name="help_about_app"/> - <Action name="help_about_kde"/> - </Menu> -</MenuBar> - -<ToolBar name="mainToolBar" fullWidth="true" noMerge="1" newLine="1"> - <Action name="file_quit"/> - <Separator/> - <Action name="mainindex_search_action"/> - <Separator/> - <Action name="viewMainIndex_action"/> - <Action name="windowFullscreen_action"/> - <Separator/> - <Action name="windowLoadProfile_action"/> - <Action name="windowSaveToNewProfile_action"/> - <Separator/> - <Action name="windowArrangementMode_action"/> - <Separator/> - <Action name="help_whats_this"/> -</ToolBar> -</kpartgui> |
