tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more qt4, unfinished

Browse Source
This commit is contained in:
dockes 2006-06-24 07:40:05 +00:00
parent a845c7b55b
commit 38f409beac
8 changed files with 79 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Makefile.in
View File

@ -1,4 +1,4 @@
# @(#$Id: Makefile.in,v 1.6 2006-04-30 07:26:59 dockes Exp $ (C) 2005 J.F.Dockes
# @(#$Id: Makefile.in,v 1.7 2006-06-24 07:40:04 dockes Exp $ (C) 2005 J.F.Dockes
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -8,12 +8,13 @@ datadir = @datadir@
mandir = @mandir@
QMAKE = @QMAKE@
QTGUI = @QTGUI@
all: mk/sysconf common/rclversion.h
cd lib; ${MAKE}
cd bincimapmime; ${MAKE}
cd index; ${MAKE} recollindex
cd qtgui; ${QMAKE} recoll.pro; ${MAKE} depth=..
cd $(QTGUI); ${QMAKE} recoll.pro; ${MAKE} depth=..
mk/sysconf:
@echo "You need to run configure first" ; exit 1
@ -27,7 +28,7 @@ static:
cd bincimapmime; ${MAKE}
cd index; rm -f recollindex; \
${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic recollindex
cd qtgui; $(QMAKE) recoll.pro; \
cd $(QTGUI); $(QMAKE) recoll.pro; \
rm -f recoll; \
${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic depth=..
@ -39,12 +40,12 @@ clean:
cd query; ${MAKE} clean
cd utils; ${MAKE} clean
#cd doc/user; ${MAKE} clean
@-cd qtgui; ${MAKE} clean
rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll
@-cd $(QTGUI); ${MAKE} clean
rm -f $(QTGUI)/Makefile $(QTGUI)/preview/Makefile $(QTGUI)/recoll
distclean: clean
rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \
qtgui/recoll.pro Makefile config.log config.status \
$(QTGUI)/recoll.pro Makefile config.log config.status \
recollinstall \
doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest \
lib/*.dep

2
src/VERSION
View File

@ -1 +1 @@
1.4.3
1.4.4

31
src/configure vendored
View File

@ -780,6 +780,11 @@ if test -n "$ac_init_help"; then
esac
cat <<\_ACEOF
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-qt4 Use qt version 4
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
@ -2218,6 +2223,24 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
# mkspecs directory, so that QMAKESPEC is not needed.
# If QMAKESPEC is not set and needed, the qmake test at the previous test
# will have failed, and we tell the user to check his environment.
#
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
# QTDIR variable are inconsistent, too bad.
#
# Check whether --enable-qt4 or --disable-qt4 was given.
if test "${enable_qt4+set}" = set; then
enableval="$enable_qt4"
rcl_cv_qt4=$enableval
else
rcl_cv_qt4=no
fi;
{ echo "$as_me:$LINENO: rcl_cv_qt4 $rcl_cv_qt4" >&5
echo "$as_me: rcl_cv_qt4 $rcl_cv_qt4" >&6;}
if test X$rcl_cv_qt4 = Xyes ; then
QTGUI=qt4gui
else
QTGUI=qtgui
fi
if test X$QTDIR != X ; then
PATH=$QTDIR/bin:$PATH
@ -2272,7 +2295,7 @@ it and/or set the QTDIR environment variable?" >&2;}
{ (exit 1); exit 1; }; }
fi
cd qtgui
cd $QTGUI
# We just want a .pro file: no problem with unsubstituted variables
cp recoll.pro.in recoll.pro
${QMAKE} recoll.pro
@ -2314,6 +2337,7 @@ QTRECOLL_DATADIR=${m_datadir}/recoll
ac_config_files="$ac_config_files mk/localdefs"
ac_config_files="$ac_config_files recollinstall"
@ -2322,7 +2346,7 @@ ac_config_files="$ac_config_files Makefile"
ac_config_files="$ac_config_files sampleconf/recoll.conf"
ac_config_files="$ac_config_files qtgui/recoll.pro"
ac_config_files="$ac_config_files $QTGUI/recoll.pro"
for d in bincimapmime index lib query
@ -2833,7 +2857,7 @@ do
"recollinstall" ) CONFIG_FILES="$CONFIG_FILES recollinstall" ;;
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"sampleconf/recoll.conf" ) CONFIG_FILES="$CONFIG_FILES sampleconf/recoll.conf" ;;
"qtgui/recoll.pro" ) CONFIG_FILES="$CONFIG_FILES qtgui/recoll.pro" ;;
"$QTGUI/recoll.pro" ) CONFIG_FILES="$CONFIG_FILES $QTGUI/recoll.pro" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
@ -2928,6 +2952,7 @@ s,@XAPIANCXXFLAGS@,$XAPIANCXXFLAGS,;t t
s,@LIBICONV@,$LIBICONV,;t t
s,@INCICONV@,$INCICONV,;t t
s,@QTRECOLL_DATADIR@,$QTRECOLL_DATADIR,;t t
s,@QTGUI@,$QTGUI,;t t
CEOF
_ACEOF

19
src/configure.ac
View File

@ -89,6 +89,20 @@ XAPIANCXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
# mkspecs directory, so that QMAKESPEC is not needed.
# If QMAKESPEC is not set and needed, the qmake test at the previous test
# will have failed, and we tell the user to check his environment.
#
# Note about qt4: if --enable-qt4 (enables the qt4gui directory), and the
# QTDIR variable are inconsistent, too bad.
#
AC_ARG_ENABLE(qt4,
AC_HELP_STRING([--enable-qt4],
[Use qt version 4]),
rcl_cv_qt4=$enableval, rcl_cv_qt4=no)
AC_MSG_NOTICE(rcl_cv_qt4 $rcl_cv_qt4)
if test X$rcl_cv_qt4 = Xyes ; then
QTGUI=qt4gui
else
QTGUI=qtgui
fi
if test X$QTDIR != X ; then
PATH=$QTDIR/bin:$PATH
@ -101,7 +115,7 @@ if test X$QMAKE = XNOTFOUND ; then
it and/or set the QTDIR environment variable?])
fi
cd qtgui
cd $QTGUI
# We just want a .pro file: no problem with unsubstituted variables
cp recoll.pro.in recoll.pro
${QMAKE} recoll.pro
@ -136,12 +150,13 @@ AC_SUBST(LIBICONV)
AC_SUBST(INCICONV)
AC_SUBST(QTRECOLL_DATADIR)
AC_SUBST(QMAKE)
AC_SUBST(QTGUI)
AC_CONFIG_FILES(mk/localdefs)
AC_CONFIG_FILES(recollinstall)
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(sampleconf/recoll.conf)
AC_CONFIG_FILES(qtgui/recoll.pro)
AC_CONFIG_FILES($QTGUI/recoll.pro)
for d in bincimapmime index lib query
do

19
src/doc/user/usermanual.sgml
View File

@ -24,7 +24,7 @@
Dockes</holder>
</copyright>
<releaseinfo>$Id: usermanual.sgml,v 1.13 2006-04-27 09:23:10 dockes Exp $</releaseinfo>
<releaseinfo>$Id: usermanual.sgml,v 1.14 2006-06-24 07:40:04 dockes Exp $</releaseinfo>
<abstract>
<para>This document introduces full text search notions
@ -292,6 +292,11 @@
linkend="rcl.install.config.recollconf">installation chapter</link> of
this document, or in the recoll.conf(5) man page.</para>
<para>The applications needed to index file types other than
text, html or email (ie: pdf, postscript, ms-word...) are
described in the <link linkend="rcl.install.external">external
packages section</link></para>
</sect1>
<sect1 id="rcl.indexing.exec">
@ -511,7 +516,7 @@
<listitem><para><guilabel>Edit</guilabel></para></listitem>
<listitem><para><guilabel>Copy File Name</guilabel></para></listitem>
<listitem><para><guilabel>Copy Url</guilabel></para></listitem>
<listitem><para><guilabel>More like this</guilabel></para></listitem>
<listitem><para><guilabel>Find similar</guilabel></para></listitem>
</itemizedlist>
<para>The <guilabel>Preview</guilabel> and
@ -520,7 +525,7 @@
an url or the file path to the clipboard, for pasting into
another application.</para>
<para>The <guilabel>More like this</guilabel> entry will select
<para>The <guilabel>Find similar</guilabel> entry will select
a number of relevant term from the current document and enter
them into the simple search field. You can then start a simple
search, with a good chance of finding documents related to the
@ -593,10 +598,10 @@
close the application.</para>
</formalpara>
<formalpara><title>Closing previews</title>
<para>Entering <keycap>^W</keycap> in a preview tab will
close it (and, for the last tab, close the preview
window).</para>
<formalpara><title>Closing previews</title>
<para>Entering <keycap>Esc</keycap> will close the preview
window and all its tabs. Entering <keycap>^W</keycap> in a tab will
close it (and, for the last tab, close the preview window).</para>
</formalpara>
</sect1>

8
src/qt4gui/recoll.pro.in
View File

@ -26,13 +26,7 @@ FORMS = sort.ui \
uiprefs.ui \
ssearchb.ui
IMAGES = images/asearch.png \
images/history.png \
images/d_nextpage.png \
images/nextpage.png \
images/d_prevpage.png \
images/prevpage.png \
images/sortparms.png
RESOURCES += icons.qrc
unix {
UI_DIR = .ui

4
src/qt4gui/recollmain.ui
View File

@ -307,7 +307,9 @@
<include location="local" >ssearchb.h</include>
<include location="local" >rclreslist.h</include>
</includes>
<resources/>
<resources>
<include location="icons.qrc" />
</resources>
<connections>
<connection>
<sender>prevPageAction</sender>

15
src/recollinstall.in
View File

@ -18,7 +18,12 @@ elif test $# -eq 1 ; then
else
usage
fi
QTGUI=@QTGUI@
if test X$QTGUI = Xqtgui ; then
I18N=$QTGUI
else
I18N=${QTGUI}/i18n
fi
test -n "$bindir" || bindir=${PREFIX}/bin
test -n "$datadir" || datadir=${PREFIX}/share
@ -43,7 +48,7 @@ echo "Installing to $PREFIX"
INSTALL=${INSTALL:="install -c"}
STRIP=${STRIP:=strip}
test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \
test -x ${QTGUI}/recoll || fatal "${QTGUI}/recoll does not exist." \
" You need to build first (type 'make')."
for d in \
@ -69,7 +74,7 @@ ${INSTALL} -m 0444 doc/user/usermanual.html doc/user/docbook.css \
${INSTALL} -m 0444 doc/man/recoll.1 doc/man/recollindex.1 ${mandir}/man1/
${INSTALL} -m 0444 doc/man/recoll.conf.5 ${mandir}/man5/
${INSTALL} -m 0755 qtgui/recoll index/recollindex ${bindir} || exit 1
${INSTALL} -m 0755 ${QTGUI}/recoll index/recollindex ${bindir} || exit 1
${STRIP} ${bindir}/recoll ${bindir}/recollindex
${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1
@ -80,5 +85,5 @@ rm -f ${datadir}/recoll/examples/rcl*
${INSTALL} -m 0444 sampleconf/recoll.conf sampleconf/mimeconf \
sampleconf/mimemap ${datadir}/recoll/examples/ || exit 1
${INSTALL} -m 0444 qtgui/mtpics/*.png ${datadir}/recoll/images || exit 1
${INSTALL} -m 0444 qtgui/recoll*.qm ${datadir}/recoll/translations || exit 1
${INSTALL} -m 0444 ${QTGUI}/mtpics/*.png ${datadir}/recoll/images || exit 1
${INSTALL} -m 0444 ${I18N}/recoll*.qm ${datadir}/recoll/translations || exit 1