diff options
Diffstat (limited to 'kftpgrabber/src')
53 files changed, 691 insertions, 35 deletions
diff --git a/kftpgrabber/src/CMakeLists.txt b/kftpgrabber/src/CMakeLists.txt new file mode 100644 index 0000000..a358109 --- /dev/null +++ b/kftpgrabber/src/CMakeLists.txt @@ -0,0 +1,81 @@ +add_subdirectory( misc ) +add_subdirectory( engine ) +add_subdirectory( ui ) +add_subdirectory( widgets ) + + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets + ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpgrabber (executable) + +tde_add_executable( ${PROJECT_NAME} AUTOMOC + + SOURCES + main.cpp + mainwindow.cpp + checksumverifier.cpp + kftpbookmarks.cpp + kftpqueue.cpp + mainactions.cpp + kftpbookmarkaction.cpp + kftpqueueprocessor.cpp + kftpsession.cpp + kftpqueueconverter.cpp + kftptransfer.cpp + kftptransferfile.cpp + kftptransferdir.cpp + kftpfileexistsactions.cpp + statistics.cpp site.cpp + queueobject.cpp + queuegroup.cpp + directoryscanner.cpp + LINK + tdeui-shared + tdeio-shared + tdecore-shared + tdeparts-shared + tdednssd-shared + bookmarkwidgets-static + browser-static + queueviewwidget-static + widgets-static + engine-static + kftpgrabbercore-static + customcommands-static + ui-static + kftpinterfaces-shared + tdewalletclient-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### icons + +tde_install_icons( ${PROJECT_NAME} ) + + +##### other data + +tde_create_translated_desktop( ${PROJECT_NAME}.desktop ) + + +install( + FILES kftpgrabber-bi-wizard.png kftpgrabber-logo.png kftpgrabberui.rc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/kftpgrabber/src/directoryscanner.cpp b/kftpgrabber/src/directoryscanner.cpp index 6c64b1d..1e0ac97 100644 --- a/kftpgrabber/src/directoryscanner.cpp +++ b/kftpgrabber/src/directoryscanner.cpp @@ -36,7 +36,7 @@ #include "directoryscanner.h" #include "kftpqueue.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/filter.h" #include <tdefileitem.h> diff --git a/kftpgrabber/src/engine/CMakeLists.txt b/kftpgrabber/src/engine/CMakeLists.txt new file mode 100644 index 0000000..e5e2f3b --- /dev/null +++ b/kftpgrabber/src/engine/CMakeLists.txt @@ -0,0 +1,40 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${CMAKE_BINARY_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### engine (static) + +tde_add_library( engine STATIC_PIC AUTOMOC + + SOURCES + socket.cpp + thread.cpp + directorylisting.cpp + commands.cpp + event.cpp + ftpsocket.cpp + ftpdirectoryparser.cpp + cache.cpp + sftpsocket.cpp + connectionretry.cpp + speedlimiter.cpp + ssl.cpp + LINK + ssh-static + + DEPENDENCIES kftpgrabbercore-static +) diff --git a/kftpgrabber/src/engine/connectionretry.cpp b/kftpgrabber/src/engine/connectionretry.cpp index d682fbe..bddb796 100644 --- a/kftpgrabber/src/engine/connectionretry.cpp +++ b/kftpgrabber/src/engine/connectionretry.cpp @@ -110,3 +110,5 @@ void ConnectionRetry::slotEngineEvent(KFTPEngine::Event *event) } } + +#include "connectionretry.moc" diff --git a/kftpgrabber/src/engine/directorylisting.h b/kftpgrabber/src/engine/directorylisting.h index 51112f5..58b2f3f 100644 --- a/kftpgrabber/src/engine/directorylisting.h +++ b/kftpgrabber/src/engine/directorylisting.h @@ -37,14 +37,26 @@ #ifndef KFTPNETWORKDIRECTORYLISTING_H #define KFTPNETWORKDIRECTORYLISTING_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <tdeio/global.h> #include <kurl.h> #include <ntqvaluelist.h> #include <ntqptrlist.h> -#include <time.h> +#if TIME_WITH_SYS_TIME +# include <sys/time.h> +# include <time.h> +#else +#if HAVE_SYS_TIME_H #include <sys/time.h> +#else +#include <time.h> +#endif // HAVE_SYS_TIME_H +#endif // TIME_WITH_SYS_TIME typedef unsigned long long int filesize_t; diff --git a/kftpgrabber/src/engine/event.cpp b/kftpgrabber/src/engine/event.cpp index 844bffc..d49f4bc 100644 --- a/kftpgrabber/src/engine/event.cpp +++ b/kftpgrabber/src/engine/event.cpp @@ -164,3 +164,5 @@ void EventHandler::customEvent(TQCustomEvent *e) } } + +#include "event.moc" diff --git a/kftpgrabber/src/engine/ftpsocket.cpp b/kftpgrabber/src/engine/ftpsocket.cpp index dce9f99..8912874 100644 --- a/kftpgrabber/src/engine/ftpsocket.cpp +++ b/kftpgrabber/src/engine/ftpsocket.cpp @@ -42,7 +42,7 @@ #include "ssl.h" #include "misc/kftpotpgenerator.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <ntqdir.h> @@ -2749,3 +2749,5 @@ void FtpSocket::protoKeepAlive() } } + +#include "ftpsocket.moc" diff --git a/kftpgrabber/src/engine/sftpsocket.cpp b/kftpgrabber/src/engine/sftpsocket.cpp index cbde3fa..58b6f0a 100644 --- a/kftpgrabber/src/engine/sftpsocket.cpp +++ b/kftpgrabber/src/engine/sftpsocket.cpp @@ -36,7 +36,7 @@ #include "sftpsocket.h" #include "cache.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <ntqdir.h> diff --git a/kftpgrabber/src/engine/socket.cpp b/kftpgrabber/src/engine/socket.cpp index afc5341..736164c 100644 --- a/kftpgrabber/src/engine/socket.cpp +++ b/kftpgrabber/src/engine/socket.cpp @@ -39,7 +39,7 @@ #include "speedlimiter.h" #include "cache.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <tdelocale.h> diff --git a/kftpgrabber/src/engine/speedlimiter.cpp b/kftpgrabber/src/engine/speedlimiter.cpp index fba03c0..27b3a87 100644 --- a/kftpgrabber/src/engine/speedlimiter.cpp +++ b/kftpgrabber/src/engine/speedlimiter.cpp @@ -34,7 +34,7 @@ * files in the program, then also delete it here. */ #include "speedlimiter.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <kstaticdeleter.h> diff --git a/kftpgrabber/src/kftpbookmarks.cpp b/kftpgrabber/src/kftpbookmarks.cpp index 144ad37..0f221c5 100644 --- a/kftpgrabber/src/kftpbookmarks.cpp +++ b/kftpgrabber/src/kftpbookmarks.cpp @@ -44,7 +44,7 @@ #include "kftpsession.h" #include "bookmarks/listview.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "engine/thread.h" #include "engine/ftpsocket.h" diff --git a/kftpgrabber/src/kftpqueue.cpp b/kftpgrabber/src/kftpqueue.cpp index 3d0f7ff..679c45f 100644 --- a/kftpgrabber/src/kftpqueue.cpp +++ b/kftpgrabber/src/kftpqueue.cpp @@ -41,7 +41,7 @@ #include "kftpqueueprocessor.h" #include "kftpsession.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/filter.h" #include <tdemessagebox.h> diff --git a/kftpgrabber/src/kftpsession.cpp b/kftpgrabber/src/kftpsession.cpp index 23cd64a..c6697bd 100644 --- a/kftpgrabber/src/kftpsession.cpp +++ b/kftpgrabber/src/kftpsession.cpp @@ -43,7 +43,7 @@ #include "widgets/systemtray.h" #include "mainactions.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/filter.h" #include <ntqdir.h> diff --git a/kftpgrabber/src/kftptransfer.cpp b/kftpgrabber/src/kftptransfer.cpp index ba23c3d..82d44b7 100644 --- a/kftpgrabber/src/kftptransfer.cpp +++ b/kftpgrabber/src/kftptransfer.cpp @@ -39,7 +39,7 @@ #include "kftpqueue.h" #include "kftpsession.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <tdelocale.h> diff --git a/kftpgrabber/src/kftptransferfile.cpp b/kftpgrabber/src/kftptransferfile.cpp index bbc2b5d..fa8d9c2 100644 --- a/kftpgrabber/src/kftptransferfile.cpp +++ b/kftpgrabber/src/kftptransferfile.cpp @@ -40,7 +40,7 @@ #include "engine/thread.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <tdemessagebox.h> #include <tdelocale.h> diff --git a/kftpgrabber/src/main.cpp b/kftpgrabber/src/main.cpp index 346671f..3af1a3d 100644 --- a/kftpgrabber/src/main.cpp +++ b/kftpgrabber/src/main.cpp @@ -35,7 +35,7 @@ */ #include "mainwindow.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <kuniqueapplication.h> #include <tdeaboutdata.h> diff --git a/kftpgrabber/src/mainactions.cpp b/kftpgrabber/src/mainactions.cpp index a00335a..b40c655 100644 --- a/kftpgrabber/src/mainactions.cpp +++ b/kftpgrabber/src/mainactions.cpp @@ -34,9 +34,11 @@ * files in the program, then also delete it here. */ -#include "mainactions.h" -#include <config.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include "mainactions.h" #include "misc.h" #include "kftpapi.h" #include "kftpqueue.h" @@ -48,7 +50,7 @@ #include "widgets/browser/detailsview.h" #include "widgets/browser/propsplugin.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/filter.h" #include <tdemainwindow.h> diff --git a/kftpgrabber/src/mainwindow.cpp b/kftpgrabber/src/mainwindow.cpp index add3751..6ebb5c6 100644 --- a/kftpgrabber/src/mainwindow.cpp +++ b/kftpgrabber/src/mainwindow.cpp @@ -83,7 +83,7 @@ #include "sidebar.h" // Other KFTPGrabber stuff -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/customcommands/manager.h" #include "mainwindow.h" diff --git a/kftpgrabber/src/mainwindow.h b/kftpgrabber/src/mainwindow.h index ac860a6..5b9bcb7 100644 --- a/kftpgrabber/src/mainwindow.h +++ b/kftpgrabber/src/mainwindow.h @@ -38,7 +38,7 @@ #define MAINWINDOW_H_ #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include <ntqtimer.h> diff --git a/kftpgrabber/src/misc/CMakeLists.txt b/kftpgrabber/src/misc/CMakeLists.txt new file mode 100644 index 0000000..a9b5cbf --- /dev/null +++ b/kftpgrabber/src/misc/CMakeLists.txt @@ -0,0 +1,52 @@ +add_subdirectory( interfaces ) +add_subdirectory( plugins ) +add_subdirectory( libs ) +add_subdirectory( customcommands ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces + ${OPENSSL_INCLUDE_DIR} + ${X11_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpgrabbercore (static) + +tde_add_library( kftpgrabbercore STATIC_PIC AUTOMOC + + SOURCES + misc.cpp + kftpotpgenerator.cpp + kftpapi.cpp + desencryptor.cpp + kftpwalletconnection.cpp + kftppluginmanager.cpp + kftpzeroconf.cpp + kftpconfig.kcfgc + configbase.cpp + filter.cpp + filterwidgethandler.cpp + LINK + kftpinterfaces-shared + customcommands-static + ${OPENSSL_LIBRARIES} +) + + +##### other data + +install( + FILES kftpgrabber.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/Makefile.am b/kftpgrabber/src/misc/Makefile.am index b334505..7da83f8 100644 --- a/kftpgrabber/src/misc/Makefile.am +++ b/kftpgrabber/src/misc/Makefile.am @@ -10,7 +10,7 @@ noinst_LIBRARIES = libkftpgrabbercore.a libkftpgrabbercore_a_SOURCES = misc.cpp kftpotpgenerator.cpp \ kftpapi.cpp desencryptor.cpp kftpwalletconnection.cpp \ kftppluginmanager.cpp \ - kftpzeroconf.cpp config.kcfgc configbase.cpp filter.cpp \ + kftpzeroconf.cpp kftpconfig.kcfgc configbase.cpp filter.cpp \ filterwidgethandler.cpp libkftpgrabbercore_a_LIBADD = interfaces/libkftpinterfaces.la customcommands/libcustomcommands.a diff --git a/kftpgrabber/src/misc/configbase.cpp b/kftpgrabber/src/misc/configbase.cpp index e2a81f4..c9632e3 100644 --- a/kftpgrabber/src/misc/configbase.cpp +++ b/kftpgrabber/src/misc/configbase.cpp @@ -35,7 +35,7 @@ */ #include "configbase.h" -#include "config.h" +#include "kftpconfig.h" #include "kftpapi.h" #include "filter.h" diff --git a/kftpgrabber/src/misc/customcommands/CMakeLists.txt b/kftpgrabber/src/misc/customcommands/CMakeLists.txt new file mode 100644 index 0000000..0253b11 --- /dev/null +++ b/kftpgrabber/src/misc/customcommands/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### customcommands (static) + +tde_add_library( customcommands STATIC_PIC AUTOMOC + + SOURCES + handlers.cpp + entry.cpp + manager.cpp + parameterentrydialog.cpp + responsedialog.cpp +) + + +##### other data + +install( + FILES commands.xml + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/kftpgrabber/src/misc/interfaces/CMakeLists.txt b/kftpgrabber/src/misc/interfaces/CMakeLists.txt new file mode 100644 index 0000000..0f2f983 --- /dev/null +++ b/kftpgrabber/src/misc/interfaces/CMakeLists.txt @@ -0,0 +1,44 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpinterfaces (shared) + +tde_add_library( kftpinterfaces SHARED AUTOMOC + + SOURCES + kftpbookmarkimportplugin.cpp + LINK + tdecore-shared + tdeui-shared + tdeparts-shared + + VERSION 0.0.0 + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpbookmarkimportplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) + + +install( + FILES kftpbookmarkimportplugin.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h index 5f42ccf..033ce2b 100644 --- a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h +++ b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h @@ -43,7 +43,7 @@ * * @author Jernej Kos */ -class KFTPBookmarkImportPlugin : public KParts::Plugin { +class KDE_EXPORT KFTPBookmarkImportPlugin : public KParts::Plugin { Q_OBJECT public: KFTPBookmarkImportPlugin(TQObject *parent, const char *name = 0); diff --git a/kftpgrabber/src/misc/config.kcfgc b/kftpgrabber/src/misc/kftpconfig.kcfgc index d8ca269..d8ca269 100644 --- a/kftpgrabber/src/misc/config.kcfgc +++ b/kftpgrabber/src/misc/kftpconfig.kcfgc diff --git a/kftpgrabber/src/misc/libs/CMakeLists.txt b/kftpgrabber/src/misc/libs/CMakeLists.txt new file mode 100644 index 0000000..ebd49d3 --- /dev/null +++ b/kftpgrabber/src/misc/libs/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( ssh ) diff --git a/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt b/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt new file mode 100644 index 0000000..8af7109 --- /dev/null +++ b/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### ssh (static) + +tde_add_library( ssh STATIC_PIC + + SOURCES + auth.c base64.c buffer.c channels.c client.c connect.c + crypt.c dh.c error.c gzip.c kex.c keyfiles.c keys.c misc.c + options.c packet.c sftp.c string.c wrapper.c +) diff --git a/kftpgrabber/src/misc/libs/ssh/libssh.h b/kftpgrabber/src/misc/libs/ssh/libssh.h index 7fdc939..81c586d 100644 --- a/kftpgrabber/src/misc/libs/ssh/libssh.h +++ b/kftpgrabber/src/misc/libs/ssh/libssh.h @@ -20,7 +20,11 @@ MA 02110-1301, USA. */ #ifndef _LIBSSH_H #define _LIBSSH_H + +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include <unistd.h> #include <sys/select.h> /* for fd_set * */ #include <sys/types.h> diff --git a/kftpgrabber/src/misc/libs/ssh/priv.h b/kftpgrabber/src/misc/libs/ssh/priv.h index 2c93081..95e43bc 100644 --- a/kftpgrabber/src/misc/libs/ssh/priv.h +++ b/kftpgrabber/src/misc/libs/ssh/priv.h @@ -25,6 +25,11 @@ MA 02110-1301, USA. */ #ifndef _LIBSSH_PRIV_H #define _LIBSSH_PRIV_H + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "libssh.h" /* Debugging constants */ @@ -43,11 +48,10 @@ MA 02110-1301, USA. */ #define TYPE_RSA 2 #define TYPE_RSA1 3 -/* profiling constants. Don't touch them unless you know what you do */ +/* profiling constants. Don't touch them unless you know what you do */ #define OPENSSL_CRYPTO #define OPENSSL_BIGNUMS - #ifdef __cplusplus extern "C" { #endif @@ -88,11 +92,18 @@ typedef BN_CTX* bignum_CTX; #define bignum_num_bits(num) BN_num_bits(num) #define bignum_is_bit_set(num,bit) BN_is_bit_set(num,bit) #define bignum_bn2bin(num,ptr) BN_bn2bin(num,ptr) - #endif /* OPENSSL_BIGNUMS */ -#ifdef HAVE_SYS_TIME_H + +#if TIME_WITH_SYS_TIME +# include <sys/time.h> +# include <time.h> +#else +#if HAVE_SYS_TIME_H #include <sys/time.h> -#endif +#else +#include <time.h> +#endif // HAVE_SYS_TIME_H +#endif // TIME_WITH_SYS_TIME /* wrapper.c */ MD5CTX *md5_init(void); diff --git a/kftpgrabber/src/misc/plugins/CMakeLists.txt b/kftpgrabber/src/misc/plugins/CMakeLists.txt new file mode 100644 index 0000000..45d895c --- /dev/null +++ b/kftpgrabber/src/misc/plugins/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( bookmarkimport ) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt new file mode 100644 index 0000000..8969a38 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory( gftp ) +add_subdirectory( ncftp ) +add_subdirectory( kftp ) +add_subdirectory( filezilla3 ) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt new file mode 100644 index 0000000..7fd9672 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_filezilla3 (kpart) + +tde_add_kpart( kftpimportplugin_filezilla3 AUTOMOC + + SOURCES + kftpimportfz3plugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_filezilla3.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt new file mode 100644 index 0000000..e777c1b --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_gftp (kpart) + +tde_add_kpart( kftpimportplugin_gftp AUTOMOC + + SOURCES + kftpimportgftpplugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_gftp.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt new file mode 100644 index 0000000..8337c19 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_kftp (kpart) + +tde_add_kpart( kftpimportplugin_kftp AUTOMOC + + SOURCES + kftpimportkftpplugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_kftp.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt new file mode 100644 index 0000000..f669049 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_ncftp (kpart) + +tde_add_kpart( kftpimportplugin_ncftp AUTOMOC + + SOURCES + kftpimportncftpplugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_ncftp.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kftpgrabber/src/queuegroup.cpp b/kftpgrabber/src/queuegroup.cpp index d13da15..ae8caf8 100644 --- a/kftpgrabber/src/queuegroup.cpp +++ b/kftpgrabber/src/queuegroup.cpp @@ -126,3 +126,5 @@ void QueueGroup::incrementAndExecute() } } + +#include "queuegroup.moc" diff --git a/kftpgrabber/src/ui/CMakeLists.txt b/kftpgrabber/src/ui/CMakeLists.txt new file mode 100644 index 0000000..d06df85 --- /dev/null +++ b/kftpgrabber/src/ui/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets + ${CMAKE_SOURCE_DIR}/kftpgrabber/src +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### ui (static) + +tde_add_library( ui STATIC_PIC AUTOMOC + + SOURCES + bookmark_properties.ui + kftpfilteraddpatternlayout.ui + kftpquickconnectlayout.ui + kftpqueueeditorlayout.ui + kftpsearchlayout.ui + kftpbookmarkimportlayout.ui + kftpbookmarkeditortlswidget.ui + config_general.ui + config_transfers.ui + config_log.ui + config_display.ui + config_filters.ui + foobar.cpp + checksum_verifier.ui +) diff --git a/kftpgrabber/src/widgets/CMakeLists.txt b/kftpgrabber/src/widgets/CMakeLists.txt new file mode 100644 index 0000000..46f2d80 --- /dev/null +++ b/kftpgrabber/src/widgets/CMakeLists.txt @@ -0,0 +1,52 @@ +add_subdirectory( queueview ) +add_subdirectory( browser ) +add_subdirectory( bookmarks ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc + ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### widgets (static) + +tde_add_library( widgets STATIC_PIC AUTOMOC + + SOURCES + logview.cpp + kftpselectserverdialog.cpp + kftpserverlineedit.cpp + listview.cpp + quickconnect.cpp + systemtray.cpp + balloon.cpp + searchdialog.cpp + kftpzeroconflistview.cpp + trafficgraph.cpp + kftptabwidget.cpp + failedtransfers.cpp + listviewitem.cpp + sidebar.cpp + multitabbar.cpp + configdialog.cpp + configfilter.cpp + verifier.cpp + filtereditor.cpp + widgetlister.cpp + overlaywidget.cpp + popupmessage.cpp + + DEPENDENCIES kftpgrabbercore-static ui-static +) diff --git a/kftpgrabber/src/widgets/bookmarks/CMakeLists.txt b/kftpgrabber/src/widgets/bookmarks/CMakeLists.txt new file mode 100644 index 0000000..834698d --- /dev/null +++ b/kftpgrabber/src/widgets/bookmarks/CMakeLists.txt @@ -0,0 +1,32 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets + ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### bookmarkwidgets (static) + +tde_add_library( bookmarkwidgets STATIC_PIC AUTOMOC + + SOURCES + editor.cpp + editortls.cpp + listview.cpp + importwizard.cpp + sidebar.cpp + + DEPENDENCIES kftpgrabbercore-static ui-static +) diff --git a/kftpgrabber/src/widgets/bookmarks/editor.cpp b/kftpgrabber/src/widgets/bookmarks/editor.cpp index d5bc467..a7cd7cc 100644 --- a/kftpgrabber/src/widgets/bookmarks/editor.cpp +++ b/kftpgrabber/src/widgets/bookmarks/editor.cpp @@ -59,7 +59,7 @@ #include "kftpapi.h" #include "kftpbookmarks.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc.h" #include "editor.h" diff --git a/kftpgrabber/src/widgets/browser/CMakeLists.txt b/kftpgrabber/src/widgets/browser/CMakeLists.txt new file mode 100644 index 0000000..593c243 --- /dev/null +++ b/kftpgrabber/src/widgets/browser/CMakeLists.txt @@ -0,0 +1,35 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/engine + ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### browser (static) + +tde_add_library( browser STATIC_PIC AUTOMOC + + SOURCES + view.cpp actions.cpp + treeview.cpp + propsplugin.cpp + filterwidget.cpp + detailsview.cpp + locationnavigator.cpp + dirlister.cpp + + DEPENDENCIES kftpgrabbercore-static ui-static +) diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp index 11fb08c..ba9c663 100644 --- a/kftpgrabber/src/widgets/browser/actions.cpp +++ b/kftpgrabber/src/widgets/browser/actions.cpp @@ -50,7 +50,7 @@ #include "mainactions.h" #include "misc.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/filter.h" #include "misc/customcommands/manager.h" diff --git a/kftpgrabber/src/widgets/browser/detailsview.cpp b/kftpgrabber/src/widgets/browser/detailsview.cpp index 80f8588..29bcf69 100644 --- a/kftpgrabber/src/widgets/browser/detailsview.cpp +++ b/kftpgrabber/src/widgets/browser/detailsview.cpp @@ -40,7 +40,7 @@ #include "browser/dirlister.h" #include "browser/actions.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc/kftpapi.h" #include "misc/filter.h" diff --git a/kftpgrabber/src/widgets/browser/view.cpp b/kftpgrabber/src/widgets/browser/view.cpp index f4b1393..da031d6 100644 --- a/kftpgrabber/src/widgets/browser/view.cpp +++ b/kftpgrabber/src/widgets/browser/view.cpp @@ -40,7 +40,7 @@ #include "browser/filterwidget.h" #include "kftpbookmarks.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "kftpsession.h" #include "ftpsocket.h" diff --git a/kftpgrabber/src/widgets/configdialog.cpp b/kftpgrabber/src/widgets/configdialog.cpp index bd3170e..d3f0acb 100644 --- a/kftpgrabber/src/widgets/configdialog.cpp +++ b/kftpgrabber/src/widgets/configdialog.cpp @@ -35,7 +35,7 @@ #include "configdialog.h" #include "misc.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "widgets/systemtray.h" #include <tdelocale.h> diff --git a/kftpgrabber/src/widgets/configfilter.cpp b/kftpgrabber/src/widgets/configfilter.cpp index 48f068a..38360e9 100644 --- a/kftpgrabber/src/widgets/configfilter.cpp +++ b/kftpgrabber/src/widgets/configfilter.cpp @@ -37,7 +37,7 @@ #include "configfilter.h" #include "filtereditor.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "misc.h" #include <tdelistview.h> diff --git a/kftpgrabber/src/widgets/logview.cpp b/kftpgrabber/src/widgets/logview.cpp index 1d1c57f..a3db4c7 100644 --- a/kftpgrabber/src/widgets/logview.cpp +++ b/kftpgrabber/src/widgets/logview.cpp @@ -34,7 +34,7 @@ */ #include "logview.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "kftpapi.h" #include <tdelocale.h> diff --git a/kftpgrabber/src/widgets/queueview/CMakeLists.txt b/kftpgrabber/src/widgets/queueview/CMakeLists.txt new file mode 100644 index 0000000..bd4af3c --- /dev/null +++ b/kftpgrabber/src/widgets/queueview/CMakeLists.txt @@ -0,0 +1,31 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${CMAKE_BINARY_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets + ${CMAKE_BINARY_DIR}/kftpgrabber/src/ui +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### queueviewwidget (static) + +tde_add_library( queueviewwidget STATIC_PIC AUTOMOC + + SOURCES + queueeditor.cpp + queueview.cpp + threadview.cpp + + DEPENDENCIES kftpgrabbercore-static ui-static +) diff --git a/kftpgrabber/src/widgets/queueview/queueview.cpp b/kftpgrabber/src/widgets/queueview/queueview.cpp index daec26e..756ac36 100644 --- a/kftpgrabber/src/widgets/queueview/queueview.cpp +++ b/kftpgrabber/src/widgets/queueview/queueview.cpp @@ -42,7 +42,7 @@ #include "kftpapi.h" #include "queueeditor.h" #include "widgets/searchdialog.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include <tdeapplication.h> #include <tdefiledialog.h> diff --git a/kftpgrabber/src/widgets/quickconnect.cpp b/kftpgrabber/src/widgets/quickconnect.cpp index 0a62f8d..ad17a5c 100644 --- a/kftpgrabber/src/widgets/quickconnect.cpp +++ b/kftpgrabber/src/widgets/quickconnect.cpp @@ -36,7 +36,7 @@ #include "widgets/quickconnect.h" #include "bookmarks/editortls.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" #include "kftpbookmarks.h" #include "misc.h" diff --git a/kftpgrabber/src/widgets/systemtray.cpp b/kftpgrabber/src/widgets/systemtray.cpp index 7cd851d..ca4c91d 100644 --- a/kftpgrabber/src/widgets/systemtray.cpp +++ b/kftpgrabber/src/widgets/systemtray.cpp @@ -44,7 +44,7 @@ #include "kftpbookmarks.h" #include "kftpqueue.h" #include "misc.h" -#include "misc/config.h" +#include "misc/kftpconfig.h" using namespace KFTPGrabberBase; diff --git a/kftpgrabber/src/widgets/widgetlister.cpp b/kftpgrabber/src/widgets/widgetlister.cpp index 933101e..dc0ca29 100644 --- a/kftpgrabber/src/widgets/widgetlister.cpp +++ b/kftpgrabber/src/widgets/widgetlister.cpp @@ -170,3 +170,5 @@ void WidgetLister::enableControls() } } + +#include "widgetlister.moc" |