summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--CMakeL10n.txt7
-rw-r--r--CMakeLists.txt25
-rw-r--r--ConfigureChecks.cmake23
-rw-r--r--INSTALL29
-rw-r--r--README.md32
m---------admin0
m---------cmake0
-rw-r--r--config.h.cmake15
-rw-r--r--doc/en/CMakeLists.txt12
-rw-r--r--doc/en/tdeioslave/locate/index.docbook (renamed from doc/en/index.docbook)0
-rw-r--r--doc/en/tdeioslave/locate/screenshot.png (renamed from doc/en/screenshot.png)bin22602 -> 22602 bytes
-rw-r--r--po/CMakeLists.txt17
-rwxr-xr-xpo/messages.sh69
-rw-r--r--src/CMakeL10n.txt9
-rw-r--r--src/CMakeLists.txt15
-rw-r--r--src/locate.desktop3
-rw-r--r--src/locate.protocol9
-rw-r--r--src/locater.cpp26
-rw-r--r--src/locater.h5
-rw-r--r--src/locater.protocol9
-rw-r--r--src/rlocate.protocol9
-rw-r--r--src/tdeio_locate.cpp58
-rw-r--r--src/tdeio_locate.h2
-rw-r--r--templates/cpp22
-rw-r--r--templates/h22
-rw-r--r--translations/desktop_files/ru.po25
-rw-r--r--translations/desktop_files/tdeio-locate-desktops.pot27
-rw-r--r--translations/messages/de.po (renamed from po/de/tdeio-locate.po)2
-rw-r--r--translations/messages/fr.po (renamed from po/fr/tdeio-locate.po)2
-rw-r--r--translations/messages/pt.po (renamed from po/tdeio-locate.pot)41
-rw-r--r--translations/messages/tdeio-locate.pot (renamed from po/pt/tdeio-locate.po)13
32 files changed, 253 insertions, 281 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 72195e5..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "cmake"]
- path = cmake
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
-[submodule "admin"]
- path = admin
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index a525b71..0176702 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,12 +9,15 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEL10n )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bf908b..ac44bac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,17 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8.12 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
##### general package setup #####################
-project( tdeio-locate )
+project( tdeio_locate )
##### include essential cmake modules ###########
@@ -31,7 +36,6 @@ include( FindPkgConfig )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
@@ -41,6 +45,12 @@ include( TDESetupPaths )
tde_setup_paths( )
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
##### user requested modules ####################
option( BUILD_ALL "Build all" OFF )
@@ -55,10 +65,7 @@ include( ConfigureChecks.cmake )
###### global compiler settings #################
-add_definitions(
- -DHAVE_CONFIG_H
- -D_LARGEFILE64_SOURCE
-)
+add_definitions( -DHAVE_CONFIG_H )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
@@ -68,8 +75,8 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
##### source directories ########################
add_subdirectory( src )
-tde_conditional_add_subdirectory( BUILD_DOC doc )
-tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
+tde_conditional_add_project_docs( BUILD_DOC )
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
##### write configure files #####################
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 3128330..23277d3 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -29,11 +29,18 @@ if( WITH_GCC_VISIBILITY )
endif( WITH_GCC_VISIBILITY )
-check_type_size( "int" SIZEOF_INT BUILTIN_TYPES_ONLY )
-check_type_size( "long" SIZEOF_LONG BUILTIN_TYPES_ONLY )
-
-check_include_file( stdint.h HAVE_STDINT_H )
-check_include_file( systems.h HAVE_SYSTEMS_H )
-check_include_file( linux/inotify.h HAVE_INOTIFY )
-
-check_function_exists( statvfs HAVE_STATVFS )
+##### check for TDEIO::UDS_HIDDEN
+
+tde_save_and_set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} )
+tde_save_and_set( CMAKE_REQUIRED_LIBRARIES tdeio-shared )
+check_cxx_source_compiles( "
+ #include <tdeio/global.h>
+
+ int main()
+ {
+ int val = TDEIO::UDS_HIDDEN;
+ return 1;
+ }"
+ HAVE_UDS_HIDDEN
+)
+tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
diff --git a/INSTALL b/INSTALL
index 890226d..3c687d6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,16 @@
-This package requires CMake and tdelibs to build
+Basic Installation
+==================
-==================== BUILDING ====================
+tdeio-locate relies on cmake to build.
-mkdir /tmp/tdeio-locate
-cd /tmp/tdeio-locate
+Here are suggested default options:
-cmake <this source directory> \
- -DCMAKE_INSTALL_PREFIX=/opt/trinity \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DWITH_QT3=ON \
- -DTQTDIR=/opt/qt \
- -DTQT_LIBRARY_DIRS=/opt/qt/lib \
- -DBUILD_ALL=ON
-make VERBOSE=1
-
-================== INSTALLATION ===================
-
-make install
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f7b778f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,32 @@
+TDEIO locate
+
+The TDEIO locate slave adds support for the "locate:" and "locater:"
+protocols to Konqueror and other TDE applications.
+
+This enables to perform locate searches as they would be done in a terminal.
+The result is displayed just as a directory.
+
+.
+
+Contributing
+--------------
+
+If you wish to contribute to tdeio-locate, you might do so:
+
+- TDE Gitea Workspace (TGW) collaboration tool.
+ https://mirror.git.trinitydesktop.org/gitea
+
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+ https://mirror.git.trinitydesktop.org/weblate
+
+
+Translations status
+---------------------
+
+### messages
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tdeio-locate/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tdeio-locate/)
+
+### desktop files
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/tdeio-locate-desktop-files/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/tdeio-locate-desktop-files/)
diff --git a/admin b/admin
deleted file mode 160000
-Subproject c23f9f693475149602b052e66e7e9d9e726e299
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject f0a5bcc7600c36f8fe59754d1167d1bbc70a495
diff --git a/config.h.cmake b/config.h.cmake
index d81a482..3dd54e5 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,5 +1,10 @@
-#cmakedefine SIZEOF_INT @SIZEOF_INT@
-#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
-#cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_SYSTEMS_H 1
-#cmakedefine HAVE_STATVFS 1 \ No newline at end of file
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+#cmakedefine HAVE_UDS_HIDDEN 1
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
deleted file mode 100644
index df19cbd..0000000
--- a/doc/en/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################
-#
-# (C) 2011 Timothy Pearson
-# kb9vqf (AT) pearsoncomputing.net
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION tdeio-locate )
diff --git a/doc/en/index.docbook b/doc/en/tdeioslave/locate/index.docbook
index 723a557..723a557 100644
--- a/doc/en/index.docbook
+++ b/doc/en/tdeioslave/locate/index.docbook
diff --git a/doc/en/screenshot.png b/doc/en/tdeioslave/locate/screenshot.png
index 330565c..330565c 100644
--- a/doc/en/screenshot.png
+++ b/doc/en/tdeioslave/locate/screenshot.png
Binary files differ
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
deleted file mode 100644
index 7d2e422..0000000
--- a/po/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#################################################
-#
-# (C) 2011 Timothy Pearson
-# kb9vqf (AT) pearsoncomputing.net
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tdeio-locate.po )
-
-foreach( _po ${po_files} )
- get_filename_component( _lang ${_po} PATH )
- tde_create_translation( FILES ${_po} LANG ${_lang} )
-endforeach( )
diff --git a/po/messages.sh b/po/messages.sh
deleted file mode 100755
index dfddc84..0000000
--- a/po/messages.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# Modified by Tobi Vollebregt for use with tdeio-locate.
-
-# Inspired by Makefile.common from coolo
-# this script is used to update the .po files
-
-# To update the translations, you will need a specific gettext
-# patched for kde and a lot of patience, tenacity, luck, time ..
-
-
-# I guess one should only update the .po files when all .cpp files
-# are generated (after a make or scons)
-
-# If you have a better way to do this, do not keep that info
-# for yourself and help me to improve this script, thanks
-# (tnagyemail-mail tat yahoo d0tt fr)
-#
-
-SRCDIR=../src
-TIPSDIR=$SRCDIR/appdata
-
-TDEDIR=`tde-config --prefix`
-EXTRACTRC=extractrc
-KDEPOT=`tde-config --prefix`/include/tde/kde.pot
-XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT "
-
-## check that kde.pot is available
-if ! test -e $KDEPOT; then
- echo "$KDEPOT does not exist, there may be something wrong with your installation!"
- XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale "
-fi
-
-## extract the strings
-echo "extracting the strings"
-
-echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp
-
-## bad hack to get strings from *.ui files
-# Armin Straub <linux@arminstraub.de>
-UIC="uic -tr i18n"
-TMPHACK="$SRCDIR/tmphack"
-mkdir $TMPHACK || exit 1
-for F in "$SRCDIR/"*.ui; do
- echo ".. preparing $F"
- FN=$TMPHACK/$(basename "$F")
- $UIC "$F" > "$FN.h" && $UIC -impl "$FN.h" "$F" > "$FN.cpp"
-done
-tdeconfig_compiler -d $TMPHACK $SRCDIR/*.kcfg $SRCDIR/*.kcfgc
-## bad hack to get strings from *.ui files
-
-$XGETTEXT `find $SRCDIR -name "*.cpp"` -o tdeio_locate.pot
-
-## bad hack to get strings from *.ui files
-rm -rf "$TMPHACK"
-## bad hack to get strings from *.ui files
-
-# remove the intermediate files
-rm -f $SRCDIR/_translatorinfo.cpp
-
-## now merge the .po files ..
-echo "merging the .po files"
-
-for i in `ls *.po`; do
- msgmerge $i tdeio_locate.pot -o $i || exit 1
-done
-
-## finished
-echo "Done"
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt
index b95d5c5..ab9a2bc 100644
--- a/src/CMakeL10n.txt
+++ b/src/CMakeL10n.txt
@@ -1,3 +1,10 @@
##### create translation templates ##############
-tde_l10n_create_template( "tdeio-locate" )
+tde_l10n_create_template( "messages/tdeio-locate" )
+
+tde_l10n_create_template(
+ CATALOG "desktop_files/tdeio-locate-desktops"
+ SOURCES
+ *.desktop
+ *.protocol
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e58011..7943241 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,10 +25,17 @@ link_directories(
##### other data ################################
-install( FILES locate.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES locater.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES rlocate.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES locate.desktop DESTINATION ${SERVICES_INSTALL_DIR}/searchproviders )
+tde_create_translated_desktop(
+ SOURCE
+ locate.protocol
+ locater.protocol
+ rlocate.protocol
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
+tde_create_translated_desktop(
+ SOURCE locate.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/searchproviders
+)
##### tdeio_locate ##############################
diff --git a/src/locate.desktop b/src/locate.desktop
index a218ffa..000c7ed 100644
--- a/src/locate.desktop
+++ b/src/locate.desktop
@@ -1,7 +1,8 @@
[Desktop Entry]
+Name=locate - Search for local files
+
Encoding=UTF-8
Type=Service
-Name=locate - Search for local files
X-TDE-ServiceTypes=SearchProvider
Keys=locate
Query=locate:\\{@}
diff --git a/src/locate.protocol b/src/locate.protocol
index c9d6057..c69bcc1 100644
--- a/src/locate.protocol
+++ b/src/locate.protocol
@@ -1,12 +1,13 @@
[Protocol]
-exec=tdeio_locate
+Description=TDE I/O Slave for the locate command
+
protocol=locate
+Icon=edit-find
+exec=tdeio_locate
input=none
output=filesystem
listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
reading=true
-Icon=edit-find
-Description=TDE I/O Slave for the locate command
# Using this will e.g. display previews etc.
Class=:local
@@ -15,4 +16,4 @@ Class=:local
URIMode=rawuri
# Our very sophisticated documentation
-X-DocPath=tdeio-locate/index.html
+X-DocPath=tdeioslave/locate/index.html
diff --git a/src/locater.cpp b/src/locater.cpp
index 68c1d75..d6764d0 100644
--- a/src/locater.cpp
+++ b/src/locater.cpp
@@ -34,12 +34,12 @@
Locater::Locater(TQObject *parent, const char *name)
: TQObject(parent, name), m_process(TQTextCodec::codecForLocale())
{
- DEBUGSTR << "Locater::Locater" << endl;
+ kdDebug(7134) << "Locater::Locater" << endl;
- connect(&m_process, TQT_SIGNAL(processExited(TDEProcess*)),
- this, TQT_SLOT(finished(TDEProcess*)));
- connect(&m_process, TQT_SIGNAL(readReady(KProcIO*)),
- this, TQT_SLOT(gotOutput(KProcIO*)));
+ connect(&m_process, TQ_SIGNAL(processExited(TDEProcess*)),
+ this, TQ_SLOT(finished(TDEProcess*)));
+ connect(&m_process, TQ_SIGNAL(readReady(KProcIO*)),
+ this, TQ_SLOT(gotOutput(KProcIO*)));
setupLocate();
}
@@ -47,13 +47,13 @@ Locater::Locater(TQObject *parent, const char *name)
Locater::~Locater()
{
- DEBUGSTR << "Locater::~Locater" << endl;
+ kdDebug(7134) << "Locater::~Locater" << endl;
}
void Locater::setupLocate(const TQString& binary, const TQString& additionalArguments)
{
- DEBUGSTR << "Locater::setupLocate(" << binary << ", " << additionalArguments << ")" << endl;
+ kdDebug(7134) << "Locater::setupLocate(" << binary << ", " << additionalArguments << ")" << endl;
// Automatically choose the correct binary if not specified.
if (binary.isEmpty()) {
@@ -64,7 +64,7 @@ void Locater::setupLocate(const TQString& binary, const TQString& additionalArgu
} else {
m_binary = "locate";
}
- DEBUGSTR << "Using binary:" << m_binary << endl;
+ kdDebug(7134) << "Using binary:" << m_binary << endl;
} else {
m_binary = binary;
}
@@ -75,7 +75,7 @@ void Locater::setupLocate(const TQString& binary, const TQString& additionalArgu
bool Locater::locate(const TQString& pattern, bool ignoreCase, bool regExp)
{
- DEBUGSTR << "Locater::locate(" << pattern << "," << ignoreCase << "," << regExp << ")" << endl;
+ kdDebug(7134) << "Locater::locate(" << pattern << "," << ignoreCase << "," << regExp << ")" << endl;
m_process.resetAll();
m_process << m_binary;
@@ -96,7 +96,7 @@ bool Locater::locate(const TQString& pattern, bool ignoreCase, bool regExp)
void Locater::stop()
{
- DEBUGSTR << "Locater::stop()" << endl;
+ kdDebug(7134) << "Locater::stop()" << endl;
m_process.kill();
emit finished();
@@ -105,13 +105,13 @@ void Locater::stop()
void Locater::gotOutput(KProcIO* /*proc*/)
{
- //DEBUGSTR << "Locater::gotOutput" << endl;
+ //kdDebug(7134) << "Locater::gotOutput" << endl;
TQStringList items;
TQString line;
while (m_process.readln(line) != -1) {
- //DEBUGSTR << "OUTPUT>> '" << line << "'" << endl;
+ //kdDebug(7134) << "OUTPUT>> '" << line << "'" << endl;
items << line;
}
@@ -122,7 +122,7 @@ void Locater::gotOutput(KProcIO* /*proc*/)
void Locater::finished(TDEProcess* /*proc*/)
{
- DEBUGSTR << "Locater::finished" << endl;
+ kdDebug(7134) << "Locater::finished" << endl;
emit finished();
}
diff --git a/src/locater.h b/src/locater.h
index 229f3f2..5580133 100644
--- a/src/locater.h
+++ b/src/locater.h
@@ -32,9 +32,6 @@
#include <kprocio.h>
-#define DEBUGSTR kdDebug(7199)
-
-
/**
* Interface to the locate command.
*
@@ -46,7 +43,7 @@
*/
class Locater : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/src/locater.protocol b/src/locater.protocol
index e7f8bf2..ac40189 100644
--- a/src/locater.protocol
+++ b/src/locater.protocol
@@ -1,15 +1,16 @@
[Protocol]
-exec=tdeio_locate
+Description=TDE I/O Slave for the locate command
+
protocol=locater
+Icon=edit-find
+exec=tdeio_locate
input=none
output=filesystem
listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
reading=true
-Icon=edit-find
-Description=TDE I/O Slave for the locate command
# Using this will e.g. display previews etc.
Class=:local
# Our very sophisticated documentation
-X-DocPath=tdeio-locate/index.html
+X-DocPath=tdeioslave/locate/index.html
diff --git a/src/rlocate.protocol b/src/rlocate.protocol
index aefcc5d..1cbfa88 100644
--- a/src/rlocate.protocol
+++ b/src/rlocate.protocol
@@ -1,12 +1,13 @@
[Protocol]
-exec=tdeio_locate
+Description=TDE I/O Slave for the locate command
+
protocol=rlocate
+Icon=edit-find
+exec=tdeio_locate
input=none
output=filesystem
listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
reading=true
-Icon=edit-find
-Description=TDE I/O Slave for the locate command
# Using this will e.g. display previews etc.
Class=:local
@@ -15,4 +16,4 @@ Class=:local
URIMode=rawuri
# Our very sophisticated documentation
-X-DocPath=tdeio-locate/index.html
+X-DocPath=tdeioslave/locate/index.html
diff --git a/src/tdeio_locate.cpp b/src/tdeio_locate.cpp
index ff4d7b2..fd5db89 100644
--- a/src/tdeio_locate.cpp
+++ b/src/tdeio_locate.cpp
@@ -98,7 +98,7 @@ static TQString convertWildcardsToRegExp(TQString s)
// Walk through the string, converting \wildcard to regexp and
// \\\wildcard back to \wildcard.
for (unsigned i = 1; i < s.length(); ++i) {
- //DEBUGSTR << s.left(i+1) << endl;
+ //kdDebug(7134) << s.left(i+1) << endl;
if (i < 3 || s[i-3] != '\\' || s[i-2] != '\\') {
// If it was an unescaped character (now possibly escaped once)
if (s[i-1] == '\\') {
@@ -266,12 +266,12 @@ static const UDSEntry pathToUDSEntry(const TQString& path, const TQString& displ
LocateProtocol::LocateProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("tdeio_locate", pool_socket, app_socket)
{
- DEBUGSTR << "LocateProtocol::LocateProtocol()" << endl;
+ kdDebug(7134) << "LocateProtocol::LocateProtocol()" << endl;
- connect(&m_locater, TQT_SIGNAL(found(const TQStringList&)),
- this, TQT_SLOT(processLocateOutput(const TQStringList&)));
- connect(&m_locater, TQT_SIGNAL(finished()),
- this, TQT_SLOT(locateFinished()));
+ connect(&m_locater, TQ_SIGNAL(found(const TQStringList&)),
+ this, TQ_SLOT(processLocateOutput(const TQStringList&)));
+ connect(&m_locater, TQ_SIGNAL(finished()),
+ this, TQ_SLOT(locateFinished()));
m_baseDir = NULL;
m_curDir = NULL;
@@ -280,7 +280,7 @@ LocateProtocol::LocateProtocol(const TQCString &pool_socket, const TQCString &ap
LocateProtocol::~LocateProtocol()
{
- DEBUGSTR << "LocateProtocol::~LocateProtocol()" << endl;
+ kdDebug(7134) << "LocateProtocol::~LocateProtocol()" << endl;
delete m_baseDir;
}
@@ -330,7 +330,7 @@ void LocateProtocol::setUrl(const KURL& url)
}
m_url = newUrl;
- DEBUGSTR << "Redirect: " << m_url << endl;
+ kdDebug(7134) << "Redirect: " << m_url << endl;
} else {
m_url = url;
}
@@ -340,7 +340,7 @@ void LocateProtocol::setUrl(const KURL& url)
void LocateProtocol::get(const KURL& url)
{
- DEBUGSTR << "LocateProtocol::get(" << url << ")" << endl;
+ kdDebug(7134) << "LocateProtocol::get(" << url << ")" << endl;
setUrl(url);
@@ -364,7 +364,7 @@ void LocateProtocol::get(const KURL& url)
void LocateProtocol::stat(const KURL& url)
{
- DEBUGSTR << "LocateProtocol::stat(" << url << ")" << endl ;
+ kdDebug(7134) << "LocateProtocol::stat(" << url << ")" << endl ;
setUrl(url);
@@ -388,7 +388,7 @@ void LocateProtocol::stat(const KURL& url)
void LocateProtocol::listDir(const KURL& url)
{
- DEBUGSTR << "LocateProtocol::listDir(" << url << ")" << endl ;
+ kdDebug(7134) << "LocateProtocol::listDir(" << url << ")" << endl ;
setUrl(url);
@@ -405,7 +405,7 @@ void LocateProtocol::listDir(const KURL& url)
void LocateProtocol::mimetype(const KURL& url)
{
- DEBUGSTR << "LocateProtocol::mimetype(" << url << ")" << endl ;
+ kdDebug(7134) << "LocateProtocol::mimetype(" << url << ")" << endl ;
setUrl(url);
@@ -505,8 +505,8 @@ void LocateProtocol::searchRequest()
}
}
- DEBUGSTR << "Pattern: " << m_locatePattern << endl;
- DEBUGSTR << "Directory: " << m_locateDirectory << endl;
+ kdDebug(7134) << "Pattern: " << m_locatePattern << endl;
+ kdDebug(7134) << "Directory: " << m_locateDirectory << endl;
// We set up the regexp used to see whether the match was in the
// directory part or the filename part of a path.
@@ -518,7 +518,7 @@ void LocateProtocol::searchRequest()
bool started = m_locater.locate(m_locatePattern, !isCaseSensitive(m_locatePattern), regexp);
if (!started) {
- DEBUGSTR << "Locate could not be found." << endl;
+ kdDebug(7134) << "Locate could not be found." << endl;
finished();
}
}
@@ -542,7 +542,7 @@ bool LocateProtocol::isCaseSensitive(const TQString& text)
void LocateProtocol::addHit(const TQString& path, int subItems)
{
- // DEBUGSTR << "LocateProtocol::addHit( " << path << ", " << subItems << " )" << endl;
+ // kdDebug(7134) << "LocateProtocol::addHit( " << path << ", " << subItems << " )" << endl;
if (TQFile::exists(path)) {
if (subItems > 0) {
m_entries += pathToUDSEntry(path, pathToDisplay(path, subItems), makeLocaterUrl(path), iconToStringTable[m_config.m_collapsedIcon]);
@@ -632,7 +632,7 @@ void LocateProtocol::locateFinished()
}
addPreviousLocateOutput();
- DEBUGSTR << "LocateProtocol::locateFinished" << endl;
+ kdDebug(7134) << "LocateProtocol::locateFinished" << endl;
infoMessage(i18n("Finished."));
finished();
}
@@ -640,7 +640,7 @@ void LocateProtocol::locateFinished()
TQString LocateProtocol::partToPattern(const TQString& part, bool forLocate)
{
- DEBUGSTR << "BEG part: " << part << endl;
+ kdDebug(7134) << "BEG part: " << part << endl;
TQString pattern = part;
// Unescape whitespace.
pattern.replace("\\ ", " ");
@@ -690,7 +690,7 @@ TQString LocateProtocol::partToPattern(const TQString& part, bool forLocate)
}
pattern.replace("\\~", "~");
}
- DEBUGSTR << "END part: " << pattern << endl;
+ kdDebug(7134) << "END part: " << pattern << endl;
return pattern;
}
@@ -779,8 +779,8 @@ void LocateProtocol::configRequest()
dialog->addPage(new KLocateConfigLocateWidget(), i18n("Locate"), "edit-find");
// React on user's actions.
- connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateConfig()));
- connect(dialog, TQT_SIGNAL(finished()), this, TQT_SLOT(configFinished()));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateConfig()));
+ connect(dialog, TQ_SIGNAL(finished()), this, TQ_SLOT(configFinished()));
dialog->show();
tqApp->enter_loop();
@@ -790,7 +790,7 @@ void LocateProtocol::configRequest()
void LocateProtocol::configFinished()
{
- DEBUGSTR << "LocateProtocol::configFinished" << endl;
+ kdDebug(7134) << "LocateProtocol::configFinished" << endl;
tqApp->exit_loop();
@@ -807,7 +807,7 @@ void LocateProtocol::configFinished()
void LocateProtocol::updateConfig()
{
// It's not needed to update the config if it's still up to date.
- DEBUGSTR << "LocateProtocol::updateConfig" << endl;
+ kdDebug(7134) << "LocateProtocol::updateConfig" << endl;
KLocateConfig::self()->readConfig();
m_config.m_caseSensitivity = (LocateCaseSensitivity) KLocateConfig::caseSensitivity();
@@ -836,7 +836,7 @@ bool LocateProtocol::isHelpRequest()
void LocateProtocol::helpRequest()
{
// Redirect the user to our help documents.
- redirection("help:/tdeio-locate/");
+ redirection("help:/tdeioslave/locate/");
finished();
}
@@ -982,10 +982,10 @@ void LocateDirectory::debugTrace(int level)
{
TQString ws;
ws.fill(' ', level);
- DEBUGSTR << ws << m_path << endl;
+ kdDebug(7134) << ws << m_path << endl;
LocateItems::ConstIterator item = m_items.begin();
for (; item != m_items.end(); ++item) {
- DEBUGSTR << ws << "+ " << (*item).m_path << endl;
+ kdDebug(7134) << ws << "+ " << (*item).m_path << endl;
}
LocateDirectoriesIterator child(m_childs);
for (; child.current(); ++child) {
@@ -1020,17 +1020,17 @@ extern "C"
TDEApplication::disableAutoDcopRegistration();
TDEApplication app(argc, argv, "tdeio_locate", false, true, false);
- DEBUGSTR << "*** Starting tdeio_locate " << endl;
+ kdDebug(7134) << "*** Starting tdeio_locate " << endl;
if (argc != 4) {
- DEBUGSTR << "Usage: tdeio_locate protocol domain-socket1 domain-socket2" << endl;
+ kdDebug(7134) << "Usage: tdeio_locate protocol domain-socket1 domain-socket2" << endl;
exit(-1);
}
LocateProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
- DEBUGSTR << "*** tdeio_locate Done" << endl;
+ kdDebug(7134) << "*** tdeio_locate Done" << endl;
return 0;
}
}
diff --git a/src/tdeio_locate.h b/src/tdeio_locate.h
index 0afcf03..f776f76 100644
--- a/src/tdeio_locate.h
+++ b/src/tdeio_locate.h
@@ -95,7 +95,7 @@ enum LocateCollapsedIcon { iconBlue, iconGreen, iconGrey, iconOrange, iconRed, i
*/
class LocateProtocol : public TQObject, public TDEIO::SlaveBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/templates/cpp b/templates/cpp
deleted file mode 100644
index e81a459..0000000
--- a/templates/cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************
- * tdeio-locate: KDE I/O Slave for the locate command *
- * *
- * Copyright (C) 2005 by Tobi Vollebregt *
- * tobivollebregt@gmail.com *
- * *
- * Copyright (C) 2004 by Armin Straub *
- * linux@arminstraub.de *
- * *
- * This program was initially written by Michael Schuerig. *
- * Although I have completely rewritten it, most ideas are adopted *
- * from his original work. *
- * *
- * Copyright (C) 2002 by Michael Schuerig *
- * michael@schuerig.de *
- * *
- * *
- * 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; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
diff --git a/templates/h b/templates/h
deleted file mode 100644
index e81a459..0000000
--- a/templates/h
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************
- * tdeio-locate: KDE I/O Slave for the locate command *
- * *
- * Copyright (C) 2005 by Tobi Vollebregt *
- * tobivollebregt@gmail.com *
- * *
- * Copyright (C) 2004 by Armin Straub *
- * linux@arminstraub.de *
- * *
- * This program was initially written by Michael Schuerig. *
- * Although I have completely rewritten it, most ideas are adopted *
- * from his original work. *
- * *
- * Copyright (C) 2002 by Michael Schuerig *
- * michael@schuerig.de *
- * *
- * *
- * 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; either version 2 of the License, or *
- * (at your option) any later version. *
- ***************************************************************************/
diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po
new file mode 100644
index 0000000..26a34e3
--- /dev/null
+++ b/translations/desktop_files/ru.po
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-08-27 14:58+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: locate.desktop:2
+msgid "locate - Search for local files"
+msgstr ""
+
+#. Description
+#: locate.protocol:2 locater.protocol:2 rlocate.protocol:2
+msgid "TDE I/O Slave for the locate command"
+msgstr ""
diff --git a/translations/desktop_files/tdeio-locate-desktops.pot b/translations/desktop_files/tdeio-locate-desktops.pot
new file mode 100644
index 0000000..e0188cf
--- /dev/null
+++ b/translations/desktop_files/tdeio-locate-desktops.pot
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-08-27 14:58+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: locate.desktop:2
+msgid "locate - Search for local files"
+msgstr ""
+
+#. Description
+#: locate.protocol:2 locater.protocol:2 rlocate.protocol:2
+msgid "TDE I/O Slave for the locate command"
+msgstr ""
diff --git a/po/de/tdeio-locate.po b/translations/messages/de.po
index 7ce13a5..aec623d 100644
--- a/po/de/tdeio-locate.po
+++ b/translations/messages/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tdeio-locate\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:30+0200\n"
+"POT-Creation-Date: 2021-07-07 18:33+0000\n"
"PO-Revision-Date: 2019-12-23 23:40+0000\n"
"Last-Translator: Chris <xchrisx@uber.space>\n"
"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
diff --git a/po/fr/tdeio-locate.po b/translations/messages/fr.po
index c4f7724..1b920ef 100644
--- a/po/fr/tdeio-locate.po
+++ b/translations/messages/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tdeio_locate\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:30+0200\n"
+"POT-Creation-Date: 2021-07-07 18:33+0000\n"
"PO-Revision-Date: 2004-10-21 16:52+0200\n"
"Last-Translator: Laurent Rathle <lrathle@kde-france.org>\n"
"Language-Team: French <kde-francophone@kde.org>\n"
diff --git a/po/tdeio-locate.pot b/translations/messages/pt.po
index fb30f56..f4e3040 100644
--- a/po/tdeio-locate.pot
+++ b/translations/messages/pt.po
@@ -1,31 +1,31 @@
# SOME DESCRIPTIVE TITLE.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020, 2021.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 04:30+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2021-07-07 18:33+0000\n"
+"PO-Revision-Date: 2021-12-12 18:00+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/tdeio-locate/pt/>\n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.9.1\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
-#, ignore-inconsistent
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr ""
+msgstr "Hugo Carvalho"
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
-#, ignore-inconsistent
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr ""
+msgstr "hugokarvalho@hotmail.com"
#: tdeio_locate.cpp:351
msgid ""
@@ -33,10 +33,10 @@ msgid ""
"be used on its own. You need an additional program for doing searches. "
"Typically this is the command line tool <i>locate</i> that can be found in "
"many distributions by default. You can check if the correct tool is used by "
-"looking at the <a href=\"locater:config\">setting</a> \"Locate "
-"Binary\".<p>Besides the mentioned tool <i>locate</i>, tdeio-locate can use "
-"any tool that uses the same syntax. In particular, it was reported to work "
-"with <i>slocate</i> and <i>rlocate</i>."
+"looking at the <a href=\"locater:config\">setting</a> \"Locate Binary\"."
+"<p>Besides the mentioned tool <i>locate</i>, tdeio-locate can use any tool "
+"that uses the same syntax. In particular, it was reported to work with "
+"<i>slocate</i> and <i>rlocate</i>."
msgstr ""
#: tdeio_locate.cpp:516
@@ -53,15 +53,15 @@ msgstr ""
#: tdeio_locate.cpp:777
msgid "General"
-msgstr ""
+msgstr "Geral"
#: tdeio_locate.cpp:778
msgid "Filters"
-msgstr ""
+msgstr "Filtros"
#: tdeio_locate.cpp:779
msgid "Locate"
-msgstr ""
+msgstr "Localizar"
#: tdeio_locate.cpp:799
msgid "Configuration succesfully updated."
@@ -164,9 +164,8 @@ msgstr ""
#: klocateconfiglocatewidget.ui:134
#, no-c-format
msgid ""
-"<i>Hint:</i> If you don't specify a value here (which is the default), "
-"tdeio-locate will automatically pick slocate, rlocate or locate (in that "
-"order)."
+"<i>Hint:</i> If you don't specify a value here (which is the default), tdeio-"
+"locate will automatically pick slocate, rlocate or locate (in that order)."
msgstr ""
#: klocateconfiglocatewidget.ui:150
diff --git a/po/pt/tdeio-locate.po b/translations/messages/tdeio-locate.pot
index a6e5eda..c80cb9a 100644
--- a/po/pt/tdeio-locate.po
+++ b/translations/messages/tdeio-locate.pot
@@ -1,24 +1,27 @@
# SOME DESCRIPTIVE TITLE.
-# Hugo Carvalho <hugokarvalho@hotmail.com>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 04:30+0200\n"
+"POT-Creation-Date: 2021-07-07 18:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pt\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
+#, ignore-inconsistent
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr ""
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
+#, ignore-inconsistent
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"