diff --git a/ChangeLog b/ChangeLog index d55c01a..4743fdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -569,7 +569,7 @@ ADDED: popular urls is now persistent ADDED: popular-urls - krusader's answer to google-ranking ;-) ADDED: better completion in the origin box: constructs such as ~/src and - $QTDIR/bin should work now. + $TQTDIR/bin should work now. ADDED: Slovenian translation (thanks Matej Urbancic) ADDED: bookmarks can now be placed into toolbars ADDED: searcher, feed to listbox (with virtual folders) diff --git a/FAQ b/FAQ index 0cb7a44..fb5e8da 100644 --- a/FAQ +++ b/FAQ @@ -236,7 +236,7 @@ Installation FAQ copy the krusaderui.rc file from the package krusader_trinity/krusader/ krusaderui.rc to $TDEDIR/share/apps/krusader/krusaderui.rc and ~/.trinity/ share/apps/krusader/krusaderui.rc and re-run Krusader. If you have compiled - Krusader from sources this is often caused if the TDEDIR_-_QTDIR + Krusader from sources this is often caused if the TDEDIR_-_TQTDIR environment variables are not correctly set. The result is that the krusaderui.rc file is installed in the wrong directory. Please read the following question, as well. diff --git a/INSTALL b/INSTALL index 0783e7f..9b6f746 100644 --- a/INSTALL +++ b/INSTALL @@ -250,7 +250,7 @@ If you are looking for older releases we recommend the Sourceforge_mirrors, available from our project page. Compiling and Installing Compiling Krusader. What now? -Check the environment variables TDEDIR_-_QTDIR. +Check the environment variables TDEDIR_-_TQTDIR. To compile and install Krusader on your system, type the following in the base directory of the Krusader package: $ ./configure @@ -268,7 +268,7 @@ Debian These instructions should work as well on Debian® based distributions like: Ubuntu®, Kubuntu®, Linspire®, Kanotix®, ... Add the next lines in the ~/.bashrc configuration file -export QTDIR=/usr +export TQTDIR=/usr export TDEDIR=/usr export export TDEDIRS=/opt/krusader:/usr Install the build_dependencies for Krusader @@ -347,14 +347,14 @@ the FAQ. If the problem persists, use the help_request to ask for help. $ rm krusader-x.xx.tar.gz 6. Change to the directory containing the sources. $ cd krusader-x.xx - 7. Check the environment variables QTDIRand TDEDIR. Krusader's ./configure + 7. Check the environment variables TQTDIRand TDEDIR. Krusader's ./configure script needs to know where the Qt™ and KDE directories are. - QTDIR: e.g. /usr/lib/qt3 or /usr/qt3 + TQTDIR: e.g. /usr/lib/qt3 or /usr/qt3 TDEDIR: e.g. /usr or /opt/trinity Normally your distribution will set them for you, but experience has shown that some do not. You can easily check the values with the echo command. - $ echo $QTDIR/usr/lib/qt3 + $ echo $TQTDIR/usr/lib/qt3 $ echo $TDEDIR/usr If both commands give an output, the enviroment variables are set (the above example are the settings of Mandriva®-Linux®). In case you receive @@ -366,10 +366,10 @@ the FAQ. If the problem persists, use the help_request to ask for help. /usr/lib/qt3/bin/qtconfig $ find /usr /opt -name tdeinit -type f 2>/dev/null /usr/bin/tdeinit - In this case /usr/lib/qt3 is your QTDIR and /usr is your TDEDIR. The + In this case /usr/lib/qt3 is your TQTDIR and /usr is your TDEDIR. The installed binaries will go to /usr/bin. Now we will set the enviroment variables with the export command. - $ export QTDIR= + $ export TQTDIR= $ export TDEDIR= **** Note **** These enviroment variables are only set for the lifetime of your current @@ -434,7 +434,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. qt_libraries: /usr/lib/qt3/lib tqt_includes: /usr/lib/qt3/include TDEDIR: /usr - QTDIR: /usr/lib/qt3 + TQTDIR: /usr/lib/qt3 Install path: /usr/local/bin krusader version: 1.80.0 krusader binary: /usr/local/bin/krusader (after 'make install') @@ -448,7 +448,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. At the end of the ./configure script you will find a summary of the most important settings, e.g. where the Krusader binary will be installed (after the 'make install' command). This part will also display a warning - if the environment variables TDEDIR_-_QTDIR are empty. + if the environment variables TDEDIR_-_TQTDIR are empty. Since Krusader-1.70.0 ./configure has two specific Krusader options: * ./configure --without-konqueror: build Krusader without support Konqueror's servicemenus, default=with. This means that Konqueror's diff --git a/README b/README index c30c3e2..e2f6da4 100644 --- a/README +++ b/README @@ -119,7 +119,7 @@ Notice: if you've got bugs to report, please do so using Krusader's Installation ============ -Check the environment variables TDEDIR - QTDIR. +Check the environment variables TDEDIR - TQTDIR. Unpack the tarball and go to the Krusader source directory. If you have downloaded from CVS you will have to run the following diff --git a/acinclude.m4 b/acinclude.m4 index 6873c3d..717a256 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -296,7 +296,7 @@ EOT dnl ------------------------------------------------------------------------ dnl Find the meta object compiler and the ui compiler in the PATH, -dnl in $QTDIR/bin, and some more usual places +dnl in $TQTDIR/bin, and some more usual places dnl ------------------------------------------------------------------------ dnl AC_DEFUN([AC_PATH_TQT_MOC_UIC], @@ -1223,16 +1223,16 @@ else fi if test $kde_qtver = 4; then - kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" + kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" fi if test $kde_qtver = 2; then - kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt" fi if test $kde_qtver = 1; then - kde_qt_dirs="$QTDIR /usr/lib/qt" + kde_qt_dirs="$TQTDIR /usr/lib/qt" fi ]) @@ -5533,10 +5533,10 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) -AC_MSG_RESULT($QTDOCDIR) +AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR) +AC_MSG_RESULT($TQTDOCDIR) -AC_SUBST(QTDOCDIR) +AC_SUBST(TQTDOCDIR) KDE_FIND_PATH(dot, DOT, [], []) if test -n "$DOT"; then @@ -5554,7 +5554,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/configure.in b/configure.in index d349031..5f63fd7 100644 --- a/configure.in +++ b/configure.in @@ -209,7 +209,7 @@ AC_CONFIG_FILES([ tar/Makefile ]) AC_CONFIG_FILES([ virt/Makefile ]) AC_OUTPUT # added manualy, it dumps a summary of the most important settings -# and displays a warning if the TDEDIR or QTDIR is empty +# and displays a warning if the TDEDIR or TQTDIR is empty echo " Krusader Project: ----------------- @@ -224,7 +224,7 @@ Krusader Project: qt_libraries: ${ac_qt_libraries} tqt_includes: ${ac_tqt_includes} TDEDIR: ${TDEDIR} - QTDIR: ${QTDIR} + TQTDIR: ${TQTDIR} Install path: ${prefix}/bin krusader version: ${VERSION} krusader binary: ${prefix}/bin/${PACKAGE} (after 'make install') @@ -288,8 +288,8 @@ if (test -z "$TDEDIR"); then echo "WARNING: TDEDIR enviroment variable is empty! Please read Krusader FAQ" fi -if (test -z "$QTDIR"); - then echo "WARNING: QTDIR enviroment variable is empty! Please read Krusader FAQ" +if (test -z "$TQTDIR"); + then echo "WARNING: TQTDIR enviroment variable is empty! Please read Krusader FAQ" fi echo "" echo "Good - your configure finished. Start make now" diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 7906f2d..137df12 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -217,7 +217,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf Synchronize Directories'> Split file'> Combine files'> -TDEDIR - QTDIR'> +TDEDIR - TQTDIR'> UserActions'> User Menu'> FAQ'> diff --git a/doc/en/installation.docbook b/doc/en/installation.docbook index d340f2d..fc18774 100644 --- a/doc/en/installation.docbook +++ b/doc/en/installation.docbook @@ -430,7 +430,7 @@ Add the next lines in the ~/.bashrc configuration file -export +export export export @@ -595,13 +595,13 @@ Please don't use the /usr/local directory as it simply won' Check the environment variables - QTDIRand + TQTDIRand TDEDIR. &krusader;'s ./configure script needs to know where the &Qt; and &kde; directories are. - QTDIR: + TQTDIR: <path to your Qt installation> ⪚ /usr/lib/qt3 or @@ -616,7 +616,7 @@ Please don't use the /usr/local directory as it simply won' but experience has shown that some do not. You can easily check the values with the echo command. - $ echo $QTDIR/usr/lib/qt3 + $ echo $TQTDIR/usr/lib/qt3 $ echo $TDEDIR/usr If both commands give an output, the enviroment variables @@ -634,13 +634,13 @@ Please don't use the /usr/local directory as it simply won' /usr/bin/tdeinit In this case /usr/lib/qt3 is your - QTDIR and + TQTDIR and /usr is your TDEDIR. The installed binaries will go to /usr/bin. Now we will set the enviroment variables with the export command. - $ export QTDIR=<replace with your QTDIR> + $ export TQTDIR=<replace with your TQTDIR> $ export TDEDIR=<replace with your TDEDIR> @@ -748,7 +748,7 @@ kde_locale: /usr/share/locale qt_libraries: /usr/lib/qt3/lib tqt_includes: /usr/lib/qt3/include TDEDIR: /usr -QTDIR: /usr/lib/qt3 +TQTDIR: /usr/lib/qt3 Install path: /usr/local/bin krusader version: 1.80.0 krusader binary: /usr/local/bin/krusader (after 'make install') diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook index 469a16c..255f539 100644 --- a/doc/ru/index.docbook +++ b/doc/ru/index.docbook @@ -515,7 +515,7 @@ since the Entity Backspace is not defined in >TDEDIR - QTDIRTQTDIR'> Check the environment variables QTDIRTQTDIR and TDEDIR. &krusader;'s QTDIRTQTDIR : <path to your Qt installation> ⪚ Normally your distribution will set them for you, but experience has shown that some don't. You can easily check the values with the echo command. $ echo $QTDIR +>$ echo $TQTDIR /usr/lib/qt3 $ echo $TDEDIR /usr In this case /usr/lib/qt3 is your QTDIRTQTDIR and /usr is your . Now we will set the enviroment variables with the export command. $ export QTDIR=<replace with your QTDIR> +>$ export TQTDIR=<replace with your TQTDIR> $ export TDEDIR=<replace with your TDEDIR> @@ -674,7 +674,7 @@ kde_locale: /usr/share/locale qt_libraries: /usr/lib/qt3/lib tqt_includes: /usr/lib/qt3/include TDEDIR: /usr -QTDIR: /usr/lib/qt3 +TQTDIR: /usr/lib/qt3 Install path: /usr/local/bin krusader version: 1.51 krusader binary: /usr/local/bin/krusader (after 'make install') diff --git a/krusader.SlackBuild b/krusader.SlackBuild index 34369b4..d0fa58a 100755 --- a/krusader.SlackBuild +++ b/krusader.SlackBuild @@ -43,7 +43,7 @@ fi # Avoid a version number in .la files: if [ -d /usr/lib/qt ]; then - QTDIR=/usr/lib/qt + TQTDIR=/usr/lib/qt fi PKG=$TMP/package-krusader diff --git a/krusader.spec b/krusader.spec index 51a2d04..2a7f9c5 100644 --- a/krusader.spec +++ b/krusader.spec @@ -34,7 +34,7 @@ friendly, fast and looks great on your desktop! You should give it a try. %setup -q %build -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh +unset TQTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh %configure \ --disable-rpath \