Compare commits

...

105 Commits

Author SHA1 Message Date
Michele Calgaro ad9384981b
Remove unnecessary backup translations.
2 years ago
Michele Calgaro b611f47008
Use TDE cmake macro to set version
2 years ago
TDE Gitea 9085e964e4 Merge translation files from master branch.
2 years ago
Michele Calgaro 754712c2f5
Remove obsolete setting of CMAKE_MODULE_PATH in cmake files.
2 years ago
Slávek Banko aa5b26716f
Update version number to the upcoming R14.0.13.
2 years ago
TDE Gitea 5c6bd3c83b Merge translation files from master branch.
2 years ago
TDE Gitea 5294ab598d Reset submodule main/applications/office/kpilot/admin to latest HEAD
2 years ago
Slávek Banko 4cd13d38af
Raise the minimum required version of CMake to 3.1 in CMakeL10n rules.
2 years ago
Slávek Banko b6ae76e333
Raise the minimum required version of CMake to 3.1.
2 years ago
Slávek Banko 5721219889
Update version number to R14.0.12.
3 years ago
TDE Gitea 6f4d487dbe Update translation template.
3 years ago
TDE Gitea dd9f7a876b Merge translation files from master branch.
3 years ago
TDE Gitea b9c626eeec Update translation template.
3 years ago
Michele Calgaro e26dfc7231 Renaming of files in preparation for code style tools.
3 years ago
Slávek Banko 6dcc291edf
Remove cmake submodule since it has now been replaced by cmake-trinity dependency.
3 years ago
TDE Gitea da9f12fb1b Reset submodule main/applications/kpilot/cmake to latest HEAD
3 years ago
François Andriot 56a28b57ea
Fix ftbfs on Fedora 34
3 years ago
Slávek Banko e33521544b
Update version number to R14.0.11.
3 years ago
TDE Gitea 63c777f867 Reset submodule main/applications/kpilot/cmake to latest HEAD
3 years ago
TDE Gitea 499d732d99 Reset submodule main/applications/kpilot/admin to latest HEAD
3 years ago
TDE Gitea 3205f30c2c Reset submodule main/applications/kpilot/cmake to latest HEAD
3 years ago
TDE Gitea 0df4f4fba7 Reset submodule main/applications/kpilot/cmake to latest HEAD
3 years ago
TDE Gitea 272272f178 Reset submodule main/applications/kpilot/admin to latest HEAD
3 years ago
Slávek Banko 40cbf43523
Raise the minimum required version of CMake to 2.8.12.
3 years ago
TDE Gitea 9251d47bf0 Reset submodule main/applications/kpilot/cmake to latest HEAD
3 years ago
TDE Gitea 817525cdd5 Reset submodule main/applications/kpilot/cmake to latest HEAD
3 years ago
TDE Gitea 72166ec502 Reset submodule main/applications/kpilot/admin to latest HEAD
3 years ago
Slávek Banko cc07705b52
Update version number to R14.0.10.
4 years ago
TDE Gitea 79b8b70817 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea baad056a63 Reset submodule main/applications/kpilot/admin to latest HEAD
4 years ago
Slávek Banko c518e743aa Merge translation files from master branch.
4 years ago
Slávek Banko 144a62c4fc Update translation template.
4 years ago
Michele Calgaro bebe1cb532
Removed code formatting modelines.
4 years ago
TDE Gitea ab66690130 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea e8fbd0e661 Reset submodule main/applications/kpilot/admin to latest HEAD
4 years ago
TDE Gitea 556b8bbd51 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea c75a275293 Reset submodule main/applications/kpilot/admin to latest HEAD
4 years ago
Slávek Banko 1641d5a12d
Fix plural form of translations.
4 years ago
TDE Gitea 20d41ed6f7 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 16d27f70d6 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea df5e327d79 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 4fdee9a557 Reset submodule main/applications/kpilot/admin to latest HEAD
4 years ago
TDE Gitea 7404d100a4 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 4ef44ed3ea Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 345b7f0ca1 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 27100b56e4 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea a84c993acf Reset submodule main/applications/kpilot/admin to latest HEAD
4 years ago
TDE Gitea d43cdd94c9 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 334d80557d Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
Michele Calgaro 82b53ce2da
Update release version number to R14.0.9.
4 years ago
TDE Gitea f85c46a593 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
Slávek Banko cd7f9f0955 Merge translation files from master branch.
4 years ago
Slávek Banko 24ee694f4b Update translation template.
4 years ago
TDE Gitea 67508c7db0 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea c38644373e Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 658ab6069c Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
Slávek Banko f07fb76589
Update version number for R14.0.8 final release.
4 years ago
TDE Gitea c32da72ad0 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea d8212f8205 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
TDE Gitea 20196fb66f Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
Slávek Banko 89493dbefc Merge translation files from master branch.
4 years ago
Slávek Banko 115ac151c3 Merge translation files from master branch.
4 years ago
Slávek Banko d5297fc945 Merge translation files from master branch.
4 years ago
Slávek Banko e3f7423b59 Merge translation files from master branch.
4 years ago
Slávek Banko b5c0332f2f
Update version number for R14.0.7 final release.
4 years ago
Slávek Banko 82a73ce496 Merge translation files from master branch.
4 years ago
TDE Gitea 0eafde4f27 Reset submodule main/applications/kpilot/cmake to latest HEAD
4 years ago
Slávek Banko 1088568bcf
Switch all submodules to https.
4 years ago
Slávek Banko e59cd13c8c Merge translation files from master branch.
4 years ago
Chris d55298c017
Fix branding of KPilot and also translations, for fuzzy prevention.
5 years ago
Slávek Banko 188a9f8860 Merge translation files from master branch.
5 years ago
TDE Gitea 82b8ff9413 Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
TDE Gitea 503f578894 Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
Michele Calgaro 2d2d8bba9f
Fixed support for tests in cmake.
5 years ago
TDE Gitea 2ec4f38c78 Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
Michele Calgaro 1d1af7fdc7
Updated VERSION reference to R14.0.6 in CMakeLists.txt
5 years ago
TDE Gitea 53e7303ec1 Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
TDE Gitea 281219d749 Reset submodule main/applications/kpilot/admin to latest HEAD
5 years ago
Slávek Banko 44874f4c3e
Use common CMake tests.
5 years ago
TDE Gitea 9e1245d265 Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
Slávek Banko ed8fceaadf
Add KDE_EXPORT on PluginUtility namespace.
5 years ago
TDE Gitea c603a9dfaa Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
TDE Weblate bf36bd7e82
Update translation files
5 years ago
Slávek Banko f3b1494966
Update translation template.
5 years ago
TDE Gitea 6377bb31cf Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
TDE Gitea 2511cdfccf Reset submodule main/applications/kpilot/cmake to latest HEAD
5 years ago
Slávek Banko e7382dc6ca
Fix FTBFS from commit c2446367.
5 years ago
TDE Weblate bbcd9e250b
Update translation files
5 years ago
Slávek Banko 15f63232cb
Add CMakeL10n rules.
5 years ago
Slávek Banko 7d4da1a03d
Migration to standard TDE CMake build system.
5 years ago
Slávek Banko 6d8083e2a6
Fix export of symbols to work properly with hidden visibility.
5 years ago
Slávek Banko 2d2db589f2
Move translations from tde-i18n/tdepim.
5 years ago
TDE Gitea a15ae92436 Reset submodule main/applications/kpilot/admin to latest HEAD
5 years ago
TDE Gitea 3755c6f56b Reset submodule main/applications/kpilot/admin to latest HEAD
6 years ago
Michele Calgaro a16a6a2618
Fixed typedef-related warnings from compiler.
6 years ago
Michele Calgaro 37d5e3678d Removed unused define which could have caused issue because of double
6 years ago
Slávek Banko 09893ce4c2 Reset submodule main/applications/kpilot/admin to latest HEAD
6 years ago
Slávek Banko bb1d827eb3 Reset submodule main/applications/kpilot/admin to latest HEAD
6 years ago
Slávek Banko d7e46a1d4a Reset submodule main/applications/kpilot/admin to latest HEAD
6 years ago
Slávek Banko 19a9434f54 Reset submodule main/applications/kpilot/admin to latest HEAD
7 years ago
Slávek Banko cfe3d6941c cmake: add tde_add_check_executable macro
7 years ago
Slávek Banko 8a84993475 Fix FTBFS with GCC6
8 years ago
Slávek Banko 1c1a7f0a8f Reset submodule main/applications/kpilot/admin to latest HEAD
8 years ago
Timothy Pearson 61ec3a6c2e Fix invalid headers in PNG files and optimize for size
8 years ago
Slávek Banko 2f7edb4a85 Reset submodule main/applications/kpilot/admin to latest HEAD
9 years ago

2
.gitmodules vendored

@ -1,3 +1,3 @@
[submodule "admin"]
path = admin
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

@ -0,0 +1,25 @@
#################################################
#
# (C) 2018 Slávek Banko
# slavek.banko (AT) axis.cz
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 2
#
#################################################
cmake_minimum_required( VERSION 3.1 )
##### include our cmake modules #################
include( TDEL10n )
##### create translation templates ##############
tde_l10n_create_template(
CATALOG "kpilot"
EXCLUDES "^tests/"
)

@ -1,104 +1,87 @@
project(kpilot)
if(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
include(${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
else(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
message(FATAL_ERROR "CMakeOptions.txt not found! Run configure first.")
endif(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt)
# Search our own cmake modules path first
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
# Need 2.4.3 for its KDE3 support
# Need 2.4.4 for its fixed KDE3 support
cmake_minimum_required(VERSION 2.8 )
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
# Disallow in-source build
STRING(COMPARE EQUAL "${kpilot_SOURCE_DIR}" "${kpilot_BINARY_DIR}" insource)
if(insource)
MESSAGE(FATAL_ERROR
"KPilot requires an out of source build. Please create a separate build
directory and run 'cmake path_to_kpilot [options]' there."
)
endif(insource)
find_package(Qt3) # find and setup Qt3 for this project
if (NOT QT_INCLUDE_DIR)
MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4")
SET(QT_INCLUDE_DIR "/usr/include/qt4" CACHE PATH "" FORCE)
endif (NOT QT_INCLUDE_DIR)
SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt")
SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc")
find_package(KDE3 REQUIRED) # find and setup KDE3 for this project
find_package(Pilotlink REQUIRED)
find_package(Mal) # see if mal is available, but it's not required
add_definitions(
${QT_DEFINITIONS}
${KDE3_DEFINITIONS}
-DQT_THREAD_SUPPORT
)
STRING(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "debug" builddebug)
if (NOT builddebug)
add_definitions(-DNDEBUG)
endif(NOT builddebug)
# Get the trinity dir. This is a bit tricky, i'm not sure how well
# this works on other systems.
STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR})
# TODO: INSTALL PREFIX. RIGHT NOW EVERYTHING IS INSTALLED IN $TDEDIR
if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX ${KDE3_DIR})
endif(NOT CMAKE_INSTALL_PREFIX)
set(KDE3_KCFG_DIR ${CMAKE_INSTALL_PREFIX}/share/config.kcfg)
set(KDE3_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes)
set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services)
set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/tde)
set(KDE3_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/trinity)
# tell cmake where to search for libraries:
link_directories(${KDE3_LIB_DIR})
# tell cmake where to search for Qt/KDE headers:
include_directories(${PILOTLINK_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
# include custom macros
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/modules/KPilotCustom.cmake)
# tell cmake to process CMakeLists.txt in that subdirectory
add_subdirectory(lib)
add_subdirectory(kpilot)
add_subdirectory(conduits)
STRING(COMPARE EQUAL "${ENABLE_TESTS}" "YES" buildtests)
if (buildtests)
MESSAGE(STATUS "BUILD: Test suite enabled.")
enable_testing()
add_subdirectory(tests)
else (buildtests)
MESSAGE(STATUS "BUILD: Test suite disabled.")
endif(buildtests)
if (builddebug)
MESSAGE(STATUS "BUILD: Debug build selected.")
else(builddebug)
MESSAGE(STATUS "BUILD: Normal build selected.")
endif(builddebug)
MESSAGE(STATUS "BUILD: Install prefix set to ${CMAKE_INSTALL_PREFIX} .")
#################################################
#
# (C) 2019 Slávek Banko
# slavek.banko (AT) axis.cz
#
# Improvements and feedbacks are welcome
#
# This file is released under GPL >= 3
#
#################################################
cmake_minimum_required( VERSION 3.1 )
#### general package setup ######################
project( kpilot )
#### include essential cmake modules ############
include( FindPkgConfig )
include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles )
include( CheckIncludeFile )
include( CheckFunctionExists )
include( CheckLibraryExists )
include( CheckSymbolExists )
enable_testing( )
#### include our cmake modules ##################
include( TDEMacros )
##### set version number ########################
tde_set_project_version( )
##### setup install paths #######################
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" ON )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
##### configure checks ##########################
include( ConfigureChecks.cmake )
###### global compiler settings #################
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" )
set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
##### directories ###############################
add_subdirectory( lib )
add_subdirectory( kpilot )
add_subdirectory( conduits )
add_subdirectory( tests )
tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
##### write configure files #####################
configure_file( config.h.cmake config.h @ONLY )

@ -31,8 +31,8 @@ TODO: only re-write a local database if it is changed.
removed code from KDE 3.5.6's kpilot for usb workaround code and fit it
into the new threaded model. This fixes syncing for me on my Palm Treo
700p.
* Reformatting and cleaning up kpilotdevicelink.cc.
* New Private.h to hold the bits of kpilotdevicelink.cc that should not be
* Reformatting and cleaning up kpilotdevicelink.cpp.
* New Private.h to hold the bits of kpilotdevicelink.cpp that should not be
exposed via kpilotdevicelink.h. Also, DeviceCommThread extends QObject
and QThread, so we need to have automoc run on it.
* Switching from using QCustomEvent to using QEvent for device tickle
@ -582,8 +582,8 @@ TODO: only re-write a local database if it is changed.
* Fixed double dialog when cancelling a change in the selection in the config
dialog. Took patch from Joern to fix resize problem in abbrowser resolution
dialog. Minor constructor mod in pilotMemo.h, and a much more nasty problem
in pilotMemo.cc, which seems to use a wrong memo length. Added some
docs. Removed a warning in addressWidget.cc.
in pilotMemo.cpp, which seems to use a wrong memo length. Added some
docs. Removed a warning in addressWidget.cpp.
* [conduitConfigWizard] Can't assign copyright except in writing, and even then
in the EU you can't renounce your copyright. Added a "None" sync setting,
for the use-case described on 4-11.
@ -1096,7 +1096,7 @@ KPilot Developer's notes for July 9th
2003-6-20 Adriaan de Groot
* Updated the hardware lists on the website.
* Updated some "What's This?" texts.
* Removed evil static QStrings in kpilotConfigDialog.cc.
* Removed evil static QStrings in kpilotConfigDialog.cpp.
* Discovered that the "start at login" functionality has been broken forever.
* Added a workaround for KTimeWidget not present in KDE 3.1.x.
@ -1179,7 +1179,7 @@ KPilot Developer's notes for June 15th, 2003
2003-6-1 Adriaan de Groot
* pilotComponent.cc Another fix for 52138 - I'd missed the category
* pilotComponent.cpp Another fix for 52138 - I'd missed the category
drop-down box.
* Woo. After months of wrestling, I actually managed to run KPilotTest
and list the contents of my m500. Sometimes, there is something
@ -1224,7 +1224,7 @@ KPilot Developer's notes for May 30th, 2003
2003-5-11 Adriaan de Groot
* kpilotDCOP.h Changed enum values so that you can distinguish
between call failed and normal operation.
* conduitConfigDialog.cc When closing config dialog, release last
* conduitConfigDialog.cpp When closing config dialog, release last
selected conduit.
2003-5-9 Adriaan de Groot
@ -1242,7 +1242,7 @@ KPilot Developer's notes for May 30th, 2003
* Spent lots of time panicing my system and causing fatal exceptions
on my Pilot by playing with pilot-link 0.11.7 and FreeBSD's USB
stack.
* kpilotlink.cc Suppress printing the "accidentally in acceptDevice"
* kpilotlink.cpp Suppress printing the "accidentally in acceptDevice"
more than once. Try to escape from the infinite socketnotifier loop.
@ -1293,7 +1293,7 @@ KPilot Developer's notes for April 30th, 2003
* Added the sources for a generic DB viewer and a datebook viewer.
These don't show up anywhere yet though. The datebook viewer has
no functionality yet.
* kpilot.cc Minor change to detect non-functioning daemon better.
* kpilot.cpp Minor change to detect non-functioning daemon better.
* Restored the tooltip code to the conduit config dialog. Removed
the "description" column again.
* uiDialog.{h,cc} Moved the addAboutPage() code to a static function so
@ -1357,10 +1357,10 @@ KPilot Developer's notes for March 26th, 2003
=============================================
2003-3-26 Adriaan de Groot
* pilotLocalDatabase.cc [BOTH] Qt 3.0 compatibility.
* pilotLocalDatabase.cpp [BOTH] Qt 3.0 compatibility.
* More merging: lib/ just spacing fixes.
* kpilot/ In HEAD, muck about with the toggle actions that were removed
from kpilot.cc. This stuff is supposed to build in all KDE 3.x.
from kpilot.cpp. This stuff is supposed to build in all KDE 3.x.
* I've been thinking about _where_ to hack next. HEAD is evolving
further under Reinhold's influence, and I feel pretty much stymied
in BRANCH because I can't touch strings and the like. However, I'm
@ -1414,28 +1414,28 @@ KPilot Developer's notes for March 26th, 2003
2003-3-20 Adriaan de Groot
* Merging between BRANCH and HEAD.
* options.h [BRANCH] Upped the version number again.
* lib/ [BOTH] Merged documentation, fixed minor bug in plugin.cc in HEAD.
* lib/ [BOTH] Merged documentation, fixed minor bug in plugin.cpp in HEAD.
* kpilot/ [BOTH] Merged stuff.
* pilotDaemon.{h,cc} [HEAD] The daemon has extra DCOP features and kroupware.
* kpilot.h [HEAD] Extra in-use code and Ben's removal of toolbars
(supported by standards in KDE 3.2 - this needs backporting and
#ifdeffing).
* conduitConfigDialog.cc [HEAD] Has all the setup stuff for the checkbox
* conduitConfigDialog.cpp [HEAD] Has all the setup stuff for the checkbox
list conversion (a GJJ) but #if 0'ed out.
* kpilotConfig{Dialog,}.{h,cc} [HEAD] Adds a GUI for the pilot encoding.
* kpilotDCOP.h [HEAD] Extra configure methods from David.
* listCat.h [BOTH] One-up the spelling mafia.
2003-3-17 Adriaan de Groot
* [fileInstallWidget.cc] Applied file-installer multiselect patch
* [fileInstallWidget.cpp] Applied file-installer multiselect patch
from Ulrik Mikaelsson.
* [pilotDaemon.cc] Applied DCOP interface additions from David Mott.
* [pilotDaemon.cpp] Applied DCOP interface additions from David Mott.
2003-3-15 Adriaan de Groot
* The popmail conduit runs in backup mode during syncs. So do all the
other conduits. What's going on? Thanks to Tobia Baier for spotting this.
Worse still, the bug comes from the difference between & and &&. Fixed.
* syncStack.cc [BOTH] Fixed --backup bug.
* syncStack.cpp [BOTH] Fixed --backup bug.
* David Mott is back with more patches, but he's got competition from
Ulrik Mikaelsson, who's also doing GJJs.
@ -1451,7 +1451,7 @@ KPilot Developer's notes for March 12th, 2003
2003-3-4 Adriaan de Groot
* Welcome back to David Mott, author of several patches already and
ready to dive into the code again for GJJs. Happy distraction, dude.
* [vcal-conduitbase.cc] Checked against wrong TDE_VERSION. [BRANCH]
* [vcal-conduitbase.cpp] Checked against wrong TDE_VERSION. [BRANCH]
* Various merging from BRANCH to HEAD. Layout fixups here and there.
* Test mode in the vcal conduit by default uses local databases from
/tmp.
@ -1506,7 +1506,7 @@ KPilot Developer's notes for March 12th, 2003
KDE to actually maintain it in the docs.
* Updated version to 4.3.9 now that 4.3.8 is out.
* Started work on a real test mode for the vcal conduit.
* syncStack.cc [BRANCH] Set conduit action name to the conduit's name.
* syncStack.cpp [BRANCH] Set conduit action name to the conduit's name.
KPilot Developer's notes for February 26th, 2003
================================================
@ -1532,7 +1532,7 @@ KPilot Developer's notes for February 14th, 2003
2003-2-12 Adriaan de Groot
* Applied David Mott's DCOP patches to HEAD. Also applied his RMB
patches to HEAD. This takes care of some GJJs.
* memoWidget.cc [BOTH] Replaced the label "Memos:" beside the
* memoWidget.cpp [BOTH] Replaced the label "Memos:" beside the
category combobox by "Category:" which is also used by the
address widget. Kept the old string around for safekeeping.
* Dealing with non-latin1 Pilots again, now in Russian. And it
@ -1541,19 +1541,19 @@ KPilot Developer's notes for February 14th, 2003
from the JPilot source.
2003-2-10 Adriaan de Groot
* popmail-conduit.cc [HEAD] Did some actual TODO_I18N work,
* popmail-conduit.cpp [HEAD] Did some actual TODO_I18N work,
removed printfs from the message construction in the conduit.
Added a GJJ for it.
* pilotDaemon.cc has lots of Kroupware additions in HEAD and
* pilotDaemon.cpp has lots of Kroupware additions in HEAD and
also changes "unix" -> "KDE" in the about box.
* conduitConfigDialog.cc has lots of new code for changing the
* conduitConfigDialog.cpp has lots of new code for changing the
conduit list to a list of checkboxes.
* kpilotConfigDialog_base has been edited in HEAD for new Kroupware
options. Same with kpilotConfigDialog.cc, kpilotConfig.{h,cc}.
* conduitSetup.cc may be deprecated, but there was a minor difference
options. Same with kpilotConfigDialog.cpp, kpilotConfig.{h,cc}.
* conduitSetup.cpp may be deprecated, but there was a minor difference
between files. HEAD <- BRANCH (ie. HEAD gets BRANCH version).
* hotSync.cc variable names changed, BRANCH <- HEAD.
* interactiveSync.cc typos and latin1() fixes. BRANCH <-> HEAD.
* hotSync.cpp variable names changed, BRANCH <- HEAD.
* interactiveSync.cpp typos and latin1() fixes. BRANCH <-> HEAD.
* logWidgetDCOP.h still had Log: tag in it,. removed [HEAD,BRANCH]
* abbrowser conduit has new custom field code. Did BRANCH <- HEAD
for the includes, though, just to normalize 'em. But, to quote
@ -1617,22 +1617,22 @@ KPilot Developer's notes for February 7th, 2003
operator <<s and do it all by hand.
2003-2-2 Adriaan de Groot
* conduitConfigDialog.cc [HEAD] Started inserting code for improved
* conduitConfigDialog.cpp [HEAD] Started inserting code for improved
conduit selection and activation.
* kpilot.cc [BRANCH] Improve perceived startup time by delaying
* kpilot.cpp [BRANCH] Improve perceived startup time by delaying
the loading of databases till the GUI is up.
* options.h [BRANCH] To enforce discipline, use NO_ASCII_CAST.
NOT COMMITTED - it'll break a lot of debug stuff as well.
However, as an occasional test, it's a good idea.
* {many files} [BRANCH] Clean up random char * conversions.
* kpilotConfig.{h,cc} [BRANCH] Introduce config entry for encoding.
* kpilot.cc pilotDaemon.cc pilotAppCategory.h pilotRecord.cc [BRANCH]
* kpilot.cpp pilotDaemon.cpp pilotAppCategory.h pilotRecord.cpp [BRANCH]
Use the config entry for encoding. Applications that use any
PilotAppCategory derived class - ie. that interpret data from the
Pilot in any way - should call setupPilotCodec() beforehand with
the name of the encoding (QString::null == "ISO8859-1", the default,
or use something like "Shift-JIS").
* pilotMemo.{h,cc} memoWidget.cc [BRANCH] Use the codec for the returned
* pilotMemo.{h,cc} memoWidget.cpp [BRANCH] Use the codec for the returned
title of the memo. This is the first step on making PilotMemo return
everything in QString format suitable for any encoding. In order to
change the encoding, add
@ -1649,10 +1649,10 @@ KPilot Developer's notes for February 7th, 2003
as well related to slotUpdateButtons(). Reverted the multiple-select.
* options.h [BRANCH] Added the TODO_I18N macro to BRANCH as well,
where it's more important.
* kpilotlink.cc [BRANCH] Reordered ReadSysInfo and ReadUserInfo to
* kpilotlink.cpp [BRANCH] Reordered ReadSysInfo and ReadUserInfo to
copy JPilot's setup, maybe that will help with password issues.
* kpilot.cc [BRANCH] Cleaned up deprecated headers.
* conduitConfigDialog.cc [BRANCH] Preparing to repair the clumsy
* kpilot.cpp [BRANCH] Cleaned up deprecated headers.
* conduitConfigDialog.cpp [BRANCH] Preparing to repair the clumsy
conduit selection and activation
@ -1767,16 +1767,16 @@ KPilot Developer's notes for January 17th, 2003
* Weirdness comes in threes: after a while the debug output stops printing.
Even when it's sent to cerr directly. Hmm .. has something to do with
printing NULL QStrings.
* [hotSync.cc] Every "Backing up:" message was logged twice.
* [logWidget.cc] Added more version information. Discovered that
* [hotSync.cpp] Every "Backing up:" message was logged twice.
* [logWidget.cpp] Added more version information. Discovered that
QTextView is obsolete. Fixed log tailing problem. #ifdeffed it to
Qt 3.1 and later.
2003-1-10 Adriaan de Groot
* [kpilot/interactivesync.cc] Some strlcpy problems when compiling HEAD
* [kpilot/interactivesync.cpp] Some strlcpy problems when compiling HEAD
(or BRANCH) KPilot on a KDE 3.0 system. Since we don't maintain branches,
backwards compatibility in HEAD is essential. Added #if TDE_VERSION < 310.
* [lib/kpilotlink.cc] Might have found the source of the KPilot-hangs-with-USB
* [lib/kpilotlink.cpp] Might have found the source of the KPilot-hangs-with-USB
problems. There's a note in the QSocketNotifier docs saying not to disable
read-notifiers. I did anyway, and it never caused problems before.
Added some workaround crud.
@ -1936,20 +1936,20 @@ KPilot Developer's notes for september 19th, 2002
* Add a "Fail Now" mode to the NULL conduit to help debugging.
2002-08-24 Adriaan de Groot
* (syncAction.cc) Whoops, forgot to implement the timeout feature
* (syncAction.cpp) Whoops, forgot to implement the timeout feature
in interactive questionYesNo.
* One more go through all the sources removing warnings.
2002-08-23 Adriaan de Groot
* (addressWidget.cc) Added more debugging output in response to bug #45977.
* (addressWidget.cpp) Added more debugging output in response to bug #45977.
Gosh, it's even a FreeBSD user. This basically means that the database
can't be opened, and I have no idea why.
* (kpilotlink.cc) Added more debugging output in KPilotLink::acceptDevice()
* (kpilotlink.cpp) Added more debugging output in KPilotLink::acceptDevice()
to deal with problems from Chris Cowell and Beat Straehl.
* (kpilotlink.cc) (Perhaps) check pilot-link version more gracefully.
* (kpilotlink.cpp) (Perhaps) check pilot-link version more gracefully.
* (pilotUser.h) bzero() new KPilotUser data structures, just in case.
* (interactiveSync.cc) Fix compile warnings.
* (knotes-action.cc) Fix bug that causes the KNotes conduit to hang
* (interactiveSync.cpp) Fix compile warnings.
* (knotes-action.cpp) Fix bug that causes the KNotes conduit to hang
when KNotes isn't running.
* (everything dependent on SyncAction) Changed the type of exec() to virtual
bool, and removed it from the slots. Added a new slot execConduit() which
@ -2162,7 +2162,7 @@ KPilot Developer's notes for sometime in march 2002
2002-03-09 Adriaan de Groot
* Sanitized syncStack so that nextAction isn't so ambiguous.
* Fixed missing default (--list) in kpilotTest.
* Some neatness fixes in pilotDaemon.cc and pilotDaemonDCOP.h.
* Some neatness fixes in pilotDaemon.cpp and pilotDaemonDCOP.h.
* Test syncs shouldn't run conduits or install files. Fixed in pilotDaemon.
* The daemon leaked 2 FD's on every sync, which is bad. Added some extra
::close() calls, which fixes this (under p-l 0.9.5 and 0.10.1).
@ -2197,11 +2197,11 @@ KPilot Developer's notes for february 11th 2002
===============================================
2002-02-06 Adriaan de Groot
* kpilot/listItems.cc lib/pilotRecord.cc
* kpilot/listItems.cpp lib/pilotRecord.cpp
- Removed some FUNCTIONSETUPs, since they were really clogging debugging
output and not adding anything interesting. Changes some other
debug output as well.
* kpilot/addressWidget.cc
* kpilot/addressWidget.cpp
- I *think* I squashed a memory leak, caused by createTitle which
was still returning char * instead of QString. Moved to QString anyway.
@ -2229,7 +2229,7 @@ from KPilot (which should be just a viewer). Opinions?
2002-01-27 Adriaan de Groot
* Wherever
- Got rid of the remaining dlp_ functions in code outside
of kpilotlink.cc and pilotSerialDatabase.cc. This leaves the pi_ stuff.
of kpilotlink.cpp and pilotSerialDatabase.cpp. This leaves the pi_ stuff.
Development of KPilot is now done on a 80x25 serial terminal running at
38400 baud. I have no idea what kind of effect this will have, but it means
@ -2239,10 +2239,10 @@ I can sit on the couch and do devel work :)
* lib/kpilotlink.{h,cc}
- Continue moving pilot-link related things (pi_*) into the KPilotLink
class, so that Dag might have an easier time of it.
* lib/options.cc
* lib/options.cpp
- Removed some messy #ifdef DEBUG stuff, with debugging enabled
call tracing is now default on.
* kpilot/logWidget.cc
* kpilot/logWidget.cpp
- Added some text stating that KPilot is really alpha. No-one will read
this, of course, and it will only piss off the translators.
@ -2262,12 +2262,12 @@ PilotTodoEntry, etc. could use a good dose of sanity.
2002-01-21 Adriaan de Groot
* conduits/vcalconduit/*
- Some serious rewriting going on.
* kpilot/hotSync.cc
* kpilot/hotSync.cpp
- Removed old KPilotLink code
- Moved calls from dlp_OpenConduit to KPilotDeviceLink::openConduit()
* lib/syncAction.h lib/kpilotlink.{h,cc}
- Added openConduit to abstract the underlying lib interface more.
* kpilot/logWidget.cc
* kpilot/logWidget.cpp
- suppress empty log lines.
* lib/pilotLocalDatabase.{h,cc}
- Added a hook for UserCheck to set the default search path for
@ -2299,9 +2299,9 @@ will be leaving us for tdelibs, where weird and wonderful things await ...
- Of course the daemon was exiting after each sync .. I forgot to initialize
fQuitAfterSync (which isn't used, BTW, except if you use DCOP to call
quitNow()) to false.
* kpilot/kpilot.cc
* kpilot/kpilot.cpp
- Forgot to inform daemon of changing settings.
* kpilot/syncStack.cc
* kpilot/syncStack.cpp
- All conduits now put *something* in the Sync log.
@ -2373,10 +2373,10 @@ things, like closing the device handle, allowing multiple syncs, and
running file install correctly. After that, testing testing testing.
2001-12-28 Adriaan de Groot
* kpilot/main-test.cc
* kpilot/main-test.cpp
- Added one-letter cmd-line-options, sanity checking.
- Switched to SyncStack integrated syncing (see below).
* kpilot/main-config.cc
* kpilot/main-config.cpp
- Removed unused new-style option.
* kpilot/syncStack.{h,cc}
- New files encapsulating sync sequence knowledge.
@ -2384,9 +2384,9 @@ running file install correctly. After that, testing testing testing.
2001-12-29 Adriaan de Groot
* kpilot/pilotDaemon.{h,cc}
- Switched to SyncStack.
* lib/kpilotlink.cc
* lib/kpilotlink.cpp
- Work around an off-by-one bug in pilot-link versions < 0.9.6.
* kpilot/interactiveSync.cc
* kpilot/interactiveSync.cpp
- Added support for don't ask again in the check-user questions.
This changes the API of questionYesNo, but only inserts a
(defaulted) parameter, so "regular" calls of this should be
@ -2457,16 +2457,16 @@ thing you know, I'll be using KPilot to sync my Pilot. Ewwwww.
from the name in KPilot. Gotta fix that.
2001-12-30 Aaron J Seigo
* kpilot/logWidget.cc
* kpilot/kpilot.cc
* kpilot/logWidget.cpp
* kpilot/kpilot.cpp
- Paint the KPilot version number in the splash screen.
2001-12-30 Adriaan de Groot
* conduits/vcalconduit/vcal-conduit.cc
* conduits/vcalconduit/vcalBase.cc
* conduits/vcalconduit/vcal-conduit.cpp
* conduits/vcalconduit/vcalBase.cpp
- Removed some __FUNCTION__ things, added #ifdef DEBUG to debug code.
In some other files, too.
- The code in vcalBase.cc is in heavy need of an invocation of indent.
- The code in vcalBase.cpp is in heavy need of an invocation of indent.
It's horrible and ugly in other ways, too, but this is a start.
2001-12-31 Adriaan de Groot
@ -2592,7 +2592,7 @@ sync part which has not been tested at all.
* Makefile.am
- Fixed up includes, removed old PISOCK_INCLUDE.
* abbrowser-conduit.cc
* abbrowser-conduit.cpp
- Changed kdDebug() to DEBUGCONDUIT, applied indent style, #ifdef DEBUGs
- Replaced static QString objects by const char * (TDEConfig keys)
- Removed old files
@ -2605,9 +2605,9 @@ And in other news, little bugfixes and other neat stuff sometimes shows up
in my mailbox. Martin Junius is a long-time contributor, and he's volunteered
(again) to make new KPilot rpms for RH 7.2 once the system is stable again.
* kpilot/addressWidget.cc
* kpilot/addressWidget.cpp
setupWidget() - Martin Junius found a display bug and sent a patch.
* conduits/vcalconduit/vcal-conduit.cc
* conduits/vcalconduit/vcal-conduit.cpp
setRepetition() - Philipp Hullmann noticed that the Pilot's week starts
on day 0 = sunday, and in KDE day 0 = monday.
@ -2618,11 +2618,11 @@ More work on the expense conduit. In conduits/expense:
* setupDialog.h
- Added an #include <qwidget.h> to make header self-contained.
* setupDialog.cc
* setupDialog.cpp
- Disabled MySQL button, since there's no code to make it work.
- Disabled "logRotate" stuff, since I can't remember what was
wanted there and there's no code for it.
* expense.cc
* expense.cpp
- Reordered #includes, removed extra #ifdeffing. Removed extra #includes.
- Split up actions into CSV, MySQL and Postgres specific parts.
- Made the other-db methods also write CSV files if needed.
@ -2637,13 +2637,13 @@ More work on the expense conduit. In conduits/expense:
In other news:
* conduits/knotes/knotes-action.cc
* conduits/knotes/knotes-action.cpp
listNotes() - Removed spurious #ifdef DEBUG. Test mode should always work.
And oh, wow, thanks to messing around with the logWidget for KPilot,
KPilotTest now also has a funky splash screen :)
* kpilot/main-test.cc
* kpilot/main-test.cpp
main() - connect signals from the test action to the log widget.
KPilot Developer's notes for november 25th 2001
@ -2677,7 +2677,7 @@ Shuffling the DCOP interfaces and cleaning up the UI, by [ade]:
* kpilot.{h,cc}
Removed the inheritance from kpilotDCOP.h, moved the DCOP interface to
LogWidget. Removed the status bar, since it's all in the LogWidget anyway.
* pilotDaemon.cc
* pilotDaemon.cpp
Renamed KPilotDCOP interface, removed filesChanged DCOP signal.
* Makefile.am
Now logWidget requires kpilotDCOP, so moved that.
@ -2802,7 +2802,7 @@ complete.
* lib/options.h
Upped the version number to 4.2.9b just because.
* kpilot/kpilot.cc
* kpilot/kpilot.cpp
Changed some credits around, copyright notice, etc.
* kpilot/Makefile.am kpilot/Makefile-standalone
Fixed some breakage caused by all the moving around of files. You may
@ -2932,7 +2932,7 @@ existing conduits.
2001-09-24 Adriaan de Groot
* kpilot/uiDialog.{h,cc}
* kpilot/kpilotConfigDialog.cc
* kpilot/kpilotConfigDialog.cpp
* kpilot/kpilotConfigDialog_base.ui
Minor changes to get the dialog to size correctly when other fonts / other
settings are used. This solves David's complaint about ugly dialogs.
@ -2953,7 +2953,7 @@ existing conduits.
Made exec() pure virtual for SyncActions, since that makes more sense
than having an empty default action.
* kpilot/Makefile.am
Added interactiveSync.cc to the list of sources.
Added interactiveSync.cpp to the list of sources.
* kpilot/pilotUser.h
Squashed a buffer overflow. Squashed several buffer overflows. Yowk!
This code has been around since 1996?
@ -2976,19 +2976,19 @@ KPilot dialogs with something sensible made with designer.
* kpilot/options.h
* kpilot/kpilotConfig.{h,cc}
* kpilot/kpilot.cc kpilot/kpilotDaemon.cc kpilot/main-*.cc
* kpilot/kpilot.cpp kpilot/kpilotDaemon.cpp kpilot/main-*.cpp
Factored out the --debug flags from each individual app, now in
options.cc. This means each file with a main() was modified too.
options.cpp. This means each file with a main() was modified too.
I must say it was a real bitch figuring out exactly which sequence of
calls were needed for TDECmdLineArgs::addCmdLineOptions(), and then
finding out that ParsedArgs() also needed help.
* kpilot/kpilotDaemon.cc
* kpilot/kpilotDaemon.cpp
Sneaking in the QStack<> stuff just under the wire was a bad idea.
Fixed an uninitialized pointer bug.
* kpilot/hotSync.cc
* kpilot/hotSync.cpp
Fixed missing syncDone() signal in FileInstallAction; added some
logProgress() calls, extra debugging.
* kpilot/kpilot.cc
* kpilot/kpilot.cpp
Added KillDaemonOnExit logic to KPilotInstaller.
2001-09-23 Adriaan de Groot
@ -3009,9 +3009,9 @@ KPilot dialogs with something sensible made with designer.
* kpilot/kpilotOptions.{h,cc}
Is deprecated and removed. Say hello to the new world of .ui files.
* kpilot/kpilot.{h,cc}
* kpilot/memoWidget.cc
* kpilot/addressWidget.cc
* kpilot/conduitSetup.cc
* kpilot/memoWidget.cpp
* kpilot/addressWidget.cpp
* kpilot/conduitSetup.cpp
Lots of little changes to reflect the KPilotConfig changes. Mostly
removing calls to setGroup() and readEntry(), which are now safely
encapsulated.
@ -3068,7 +3068,7 @@ take another look at Qt3 -- I saw Cornelius has already put some changes in.
variants to deal with.
() Added functions installFiles() and installFile() to handle
the installation (!) of files to the Pilot.
* kpilot/pilotDaemon.cc
* kpilot/pilotDaemon.cpp
() Finally dealt with all the changed classes and methods of the
device link.
(slotEndHotSync) No need to tell the link to end the Sync, since
@ -3079,7 +3079,7 @@ take another look at Qt3 -- I saw Cornelius has already put some changes in.
() I've installed RH 7.1 and gone back to KDE 2.1.1. Whee. They've
somehow utterly broken kdDebug() and kdWarning(). Added compile flag
DEBUG_CERR to make all the debugging info go to cerr instead.
* kpilot/kpilot.cc
* kpilot/kpilot.cpp
() Startup notification was added to startService...() in 2.2, so now
there's an #ifdef handling that case.
@ -3093,8 +3093,8 @@ take another look at Qt3 -- I saw Cornelius has already put some changes in.
2001-09-06 Adriaan de Groot
* kpilot/Makefile.am
() Forgot to add logWidget.cc to kpilot_SOURCES
* kpilot/kpilotOptions.cc
() Forgot to add logWidget.cpp to kpilot_SOURCES
* kpilot/kpilotOptions.cpp
() Added more tooltips, switched most to <qt></qt> rich text.
() Changed default value for SyncFiles to true.
* kpilot/kpilotlink.{h,cc}
@ -3197,17 +3197,17 @@ udirng the freeze, so it may not get in into KDE 2.2.
2001-08-01 Adriaan de Groot
* kpilot/pilotDaemon.cc
* kpilot/pilotDaemon.cpp
(PilotSystemTray) Fix for bug #29764 -- I'd forgotten to initialize some
pointers in the constuctor again.
* conduits/abbrowser/abbrowser-conduit.cc
* conduits/abbrowser/abbrowser-conduit.cpp
(main) Workaround for bug #28104 allowing abbrowser to start from the conduit.
* conduits/abbrowser/Makefile.am
Minuscule change enabling --enable-final builds here.
2001-07-23 Martin Junius <mj@m-j-s.net>
* kpilot/addressEditor.cc (MakeField, MakeFieldL): removed i18n(),
* kpilot/addressEditor.cpp (MakeField, MakeFieldL): removed i18n(),
now done in initLayout().
(initLayout): use i18n() for label strings passed to
MakeField. This is IMHO a cleaner approach than using I18N_NOOP()
@ -3220,13 +3220,13 @@ udirng the freeze, so it may not get in into KDE 2.2.
2001-07-21 Martin Junius <mj@m-j-s.net>
* kpilot/addressEditor.cc (initLayout): use m_phoneLabel[] for
* kpilot/addressEditor.cpp (initLayout): use m_phoneLabel[] for
display phone labels because this change from entry to entry and
cannot be set to fixed texts.
(fillFields): update phone labels for editor dialog.
(initLayout): reworked and hopefully ;-) improved spacing.
* kpilot/addressWidget.cc (setupWidget): replaced QMultiLineEdit
* kpilot/addressWidget.cpp (setupWidget): replaced QMultiLineEdit
with QTextView for address info widget.
(slotShowAddress): function totally rewritten to use QTextView
and the Qt pseudo-XHTML code for formatted display of the
@ -3277,7 +3277,7 @@ doing silly things (like moving).
mostly splits the large sync functions into smaller pieces, simplifies the
code for recurring events a lot, and moves some more code to vcalBase.
* kpilot/pilot*Entry.cc
* kpilot/pilot*Entry.cpp
... and one more patch to PilotDateEntry and PilotTodoEntry: replace
notes of length 0 with empty ones.
@ -3290,7 +3290,7 @@ doing silly things (like moving).
2001-05-25 Adriaan de Groot
* *.cc, options.h
* *.cpp, options.h
Simplified the debugging code, no more #ifdef DEBUG if (debug_level &)
stuff, just straightforward DEBUGXXX statements which get optimized
aay for free when debugging is turned off.
@ -3331,14 +3331,14 @@ listed here, please let me know.
2001-04-28 Martin Junius <mj@m-j-s.net>
* kpilot/kpilot.cc
* kpilot/kpilot.cpp
(initMenu): use TDEToggleAction and setExclusiveGroup for view menu.
(addComponentPage): same here for the other components.
(initMenu): setChecked for view_kpilot action.
2001-05-07 Philipp Hullmann
* conduits/vcalconduit/todo-conduit.cc
* conduits/vcalconduit/todo-conduit.cpp
(): fixed missing due-date bugs
@ -4159,7 +4159,7 @@ Some other minor issues have been fixed as well:
And new questions raised for people who know the code (I'm thinking
Preston or Cornelius may be able to explain):
* vcal-conduit.cc line 522, what's the purpose of voStatus there?
* vcal-conduit.cpp line 522, what's the purpose of voStatus there?
@ -4182,13 +4182,13 @@ A whole slew of minor fixes:
* Added quit icon into file menu
* Added hotsync and backup icons into file menu
* Cleaned up include files in conduitSetup.h
* Cleaned up dialog code in conduitSetup.cc for KDE2 compliance
* Fixed conduits-not-running-during-sync bug in kpilotlink.cc
* Fixed a minor Qt2 incompatibility in messageDialog.cc
* Fixed some i18n issues in kpilotlink.cc
* Replaced sprintf stuff with QString operations in kpilotlink.cc
* Cleaned up dialog code in conduitSetup.cpp for KDE2 compliance
* Fixed conduits-not-running-during-sync bug in kpilotlink.cpp
* Fixed a minor Qt2 incompatibility in messageDialog.cpp
* Fixed some i18n issues in kpilotlink.cpp
* Replaced sprintf stuff with QString operations in kpilotlink.cpp
* Added hot-sync to file menu for consistency (it's in the toolbar)
* Added logic in showTitlePage in kpilot.cc to reduce flicker
* Added logic in showTitlePage in kpilot.cpp to reduce flicker
Some remaining issues:
@ -4197,7 +4197,7 @@ Some remaining issues:
Some questions:
* Is there a memory leak with the config file in kpilotOptions.cc?
* Is there a memory leak with the config file in kpilotOptions.cpp?
* Do we really want to be new() and delete()ing the config file so
often? Perhaps getConfig() should do some caching.
* Should we add icons for the other menu items?

@ -0,0 +1,45 @@
#################################################
#
# (C) 2019 Slávek Banko
# slavek.banko (AT) axis.cz
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 3
#
#################################################
# required stuff
find_package( TQt )
find_package( TDE )
tde_setup_architecture_flags( )
include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
tde_setup_largefiles( )
##### check for gcc visibility support #########
if( WITH_GCC_VISIBILITY )
tde_setup_gcc_visibility( )
endif( )
##### check headers #############################
check_function_exists( strlcat HAVE_STRLCAT )
check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
check_function_exists( strlcpy HAVE_STRLCPY )
check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
##### check libraries ###########################
pkg_search_module( PILOTLINK pilot-link )
if( NOT PILOTLINK_FOUND)
tde_message_fatal( "PilotLink is required but not found on your system." )
endif( )

@ -217,9 +217,9 @@ service_DATA = mal_conduit.desktop
kde_module_LTLIBRARIES = libmalconduit.la
libmalconduit_la_SOURCES = \
mal-factory.cc \
mal-setup.cc \
mal-conduit.cc \
mal-factory.cpp \
mal-setup.cpp \
mal-conduit.cpp \
mal-setup_dialog.ui
libmalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib
libmalconduit_la_LIBADD = -lkpilot $(MAL_LIB)
@ -281,7 +281,7 @@ always returns a pointer to a \class{KLibFactory} instance. Whenever a program n
the conduit, it calls the \code{createObject} of the \class{KLibFactory} to get an appropriate object.
Furthermore, the conduit factory initializes the about dialog of the conduit.
The factories of all conduits are very similar, so you best just copy the .h and .cc file of an existing conduit
The factories of all conduits are very similar, so you best just copy the .h and .cpp file of an existing conduit
for your conduit. All you need to do is to change the copyright notices for the about dialog, and
change the class names of the \class{ConduitAction} and \class{ConduitSetup} to your own class names. Also,
the factory is a good place to define the strings for the config settings' entries to the config file.
@ -297,7 +297,7 @@ private:
} ;
\end{verbatim}
}
and in the .cc file
and in the .cpp file
{\small\begin{verbatim}
const char*MALConduitFactory::fConfigSetting1="NameOfSetting";
\end{verbatim}
@ -311,7 +311,7 @@ Everything else in the factory can stay as it is.
Here is an example of the malsync's factory:
\begin{htmlonly}
\htmladdnormallink{Source code of mal-factory.h}{mal-factory.h}
\htmladdnormallink{Source code of mal-factory.cc}{mal-factory.cc}
\htmladdnormallink{Source code of mal-factory.cpp}{mal-factory.cpp}
\end{htmlonly}
@ -320,9 +320,9 @@ Here is an example of the malsync's factory:
{\scriptsize
\verbatiminput{mal-factory.h}
}
\subsubsection{mal-factory.cc}
\subsubsection{mal-factory.cpp}
{\scriptsize
\verbatiminput{mal-factory.cc}
\verbatiminput{mal-factory.cpp}
}
\end{latexonly}

@ -1,4 +1,4 @@
/* Time-factory.cc KPilot
/* Time-factory.cpp KPilot
**
** Copyright (C) 2002 by Reinhold Kainhofer
**

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 80 KiB

@ -6,7 +6,7 @@ SUBDIRS = lib kpilot conduits doc
messages:
$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` > rc.cpp
$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp"` -o $(podir)/kpilot.pot
$(XGETTEXT) `find . -name "*.cpp" -o $(podir)/kpilot.pot
-rm -f rc.cpp
DOXYGEN_REFERENCES = kpilot/lib kpilot/kpilot
@ -16,5 +16,5 @@ include $(top_srcdir)/admin/Doxyfile.am
devel-pot :
extractrc `find . -name "*.rc" -o -name "*.ui"` > /tmp/rc.cpp
xgettext -C --keyword=i18n --keyword=I18N_NOOP -o /tmp/kpilot.po \
`find . -name "*.cc"` /tmp/rc.cpp
`find . -name "*.cpp"` /tmp/rc.cpp

@ -47,9 +47,9 @@ build-check:
test -f "$(BUILD_DIR)/Makefile" || (cd "$(BUILD_DIR)" && $(CMAKE) .. )
messages:
extractrc `find . -name *.rc` > rc.cc
extractrc `find . -name *.ui` >> rc.cc
xgettext -o kpilot.po --keyword=i18n rc.cc `find . -name *.h` `find . -name *.cc`
extractrc `find . -name *.rc` > rc.cpp
extractrc `find . -name *.ui` >> rc.cpp
xgettext -o kpilot.po --keyword=i18n rc.cpp `find . -name *.h` `find . -name *.cpp`
clean:
@rm -rf $(BUILD_DIR)

@ -158,7 +158,7 @@ FINISHED TODO jobs
+(28) GJJ: The question asked when kpilot and the pilot's usernames don't
match isn't very intuitive. It should be changed to a yes/no/cancel
with "Use KPilot name" "Use Pilot name" "Cancel". This is in
interactiveSync.cc.
interactiveSync.cpp.
-(29) Fix the NULL conduit's tooltip - OR - make it actually do what the
current tooltip says.
RESOLUTION: The NULL conduit is no longer needed at all, so I disabled

@ -1 +1 @@
Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

@ -1,62 +0,0 @@
INCLUDE(CheckCXXSourceCompiles)
set(CMAKE_INCLUDE_PATH "${MAL_BASE}/include")
FIND_PATH(MAL_INCLUDE_DIR libmal.h
${MAL_BASE}/include
${MAL_BASE}/include/libmal
/usr/include
/usr/include/libmal
/usr/local/include
/usr/local/include/libmal
)
set(CMAKE_LIBRARY_PATH "${MAL_BASE}/lib")
FIND_LIBRARY(MAL_LIBRARY mal
${MAL_BASE}/lib
/usr/lib
/usr/lib/libmal
/usr/local/lib
/usr/local/lib/libmal
)
IF (NOT MAL_INCLUDE_DIR)
MESSAGE(STATUS "Could not find libmal.h")
ELSE (NOT MAL_INCLUDE_DIR)
MESSAGE(STATUS "Found libmal.h in ${MAL_INCLUDE_DIR}")
ENDIF (NOT MAL_INCLUDE_DIR)
IF (NOT MAL_LIBRARY)
MESSAGE(STATUS "Could not find libmal")
ELSE (NOT MAL_LIBRARY)
MESSAGE(STATUS "Found libmal in ${MAL_LIBRARY}")
ENDIF (NOT MAL_LIBRARY)
IF (MAL_INCLUDE_DIR AND MAL_LIBRARY)
SET(MAL_FOUND TRUE)
ENDIF (MAL_INCLUDE_DIR AND MAL_LIBRARY)
IF (MAL_FOUND)
SET(CMAKE_REQUIRED_INCLUDES ${MAL_INCLUDE_DIR} ${PILOTLINK_INCLUDE_DIR})
CHECK_CXX_SOURCE_COMPILES("
#include <libmal.h>
#define LIBMAL_IS(a,b) ((LIBMAL_VERSION > a) || ((LIBMAL_VERSION == a) && ((LIBMAL_MAJOR > b) || (LIBMAL_MAJOR == b))))
#if !LIBMAL_IS(0,40)
#error \"Libmal version is < 0.40\"
#else
int main() { return 0; }
#endif
"
MAL_VERSION_OK)
ENDIF (MAL_FOUND)
IF (NOT MAL_VERSION_OK)
SET(MAL_FOUND FALSE)
MESSAGE(STATUS "Found mal, but it's not at least version 0.40.")
ENDIF (NOT MAL_VERSION_OK)
IF (MAL_FOUND)
MESSAGE(STATUS "Found mal: ${MAL_LIBRARY}")
ELSE (MAL_FOUND)
MESSAGE(STATUS "Couldn't find acceptable mal version. Won't be able to build malconduit")
ENDIF (MAL_FOUND)

@ -1,55 +0,0 @@
INCLUDE(CheckCXXSourceCompiles)
set(CMAKE_INCLUDE_PATH "${PILOTLINK_BASE}/include")
FIND_PATH(PILOTLINK_INCLUDE_DIR pi-dlp.h
/usr/include
/usr/include/libpisock
/usr/local/include
)
set(CMAKE_LIBRARY_PATH "${PILOTLINK_BASE}/lib")
FIND_LIBRARY(PILOTLINK_LIBRARY pisock
/usr/lib
/usr/local/lib
)
IF (NOT PILOTLINK_INCLUDE_DIR)
MESSAGE(STATUS "Could not find pilot-link (pi-dlp.h)")
ELSE (NOT PILOTLINK_INCLUDE_DIR)
MESSAGE(STATUS "Found pilot-link includes in ${PILOTLINK_INCLUDE_DIR}")
ENDIF (NOT PILOTLINK_INCLUDE_DIR)
IF (NOT PILOTLINK_LIBRARY)
MESSAGE(STATUS "Could not find pilot-link (libpisock.so)")
ELSE (NOT PILOTLINK_LIBRARY)
MESSAGE(STATUS "Found pilot-link libraries in ${PILOTLINK_LIBRARY}")
ENDIF (NOT PILOTLINK_LIBRARY)
IF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY)
SET(PILOTLINK_FOUND TRUE)
ENDIF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY)
IF (PILOTLINK_FOUND)
SET(CMAKE_REQUIRED_INCLUDES ${PILOTLINK_INCLUDE_DIR})
CHECK_CXX_SOURCE_COMPILES("
#include <pi-version.h>
#if !PILOT_LINK_IS(0,12,0)
#error \"Pilot-link version is < 0.12.0\"
#else
int main() { return 0; }
#endif
"
PILOTLINK_VERSION_OK)
ENDIF (PILOTLINK_FOUND)
IF (NOT PILOTLINK_VERSION_OK)
SET(PILOTLINK_FOUND FALSE)
ENDIF (NOT PILOTLINK_VERSION_OK)
IF (NOT PILOTLINK_FOUND)
IF (Pilotlink_FIND_REQUIRED)
MESSAGE(STATUS "KPilot requires pilot-link 0.12.0 or later. Pilot-link is available from pilot-link.org and is packaged by most distributions. Remember to install the development package with the compilation headers as well.")
MESSAGE(FATAL_ERROR "Could not find pilot-link.")
ENDIF (Pilotlink_FIND_REQUIRED)
ENDIF (NOT PILOTLINK_FOUND)

@ -1,53 +0,0 @@
MACRO(KDE3_INSTALL_ICONS_CUSTOM _theme)
ADD_CUSTOM_TARGET(install_icons )
SET_TARGET_PROPERTIES(install_icons PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake )
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n")
FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n")
FILE(GLOB _icons *.png)
FOREACH(_current_ICON ${_icons} )
STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}")
STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}")
SET(_icon_GROUP "unknown")
IF(${_group} STREQUAL "mime")
SET(_icon_GROUP "mimetypes")
ENDIF(${_group} STREQUAL "mime")
IF(${_group} STREQUAL "filesys")
SET(_icon_GROUP "filesystems")
ENDIF(${_group} STREQUAL "filesys")
IF(${_group} STREQUAL "device")
SET(_icon_GROUP "devices")
ENDIF(${_group} STREQUAL "device")
IF(${_group} STREQUAL "app")
SET(_icon_GROUP "apps")
ENDIF(${_group} STREQUAL "app")
IF(${_group} STREQUAL "action")
SET(_icon_GROUP "actions")
ENDIF(${_group} STREQUAL "action")
IF( NOT ${_icon_GROUP} STREQUAL "unknown")
# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" )
SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name})
FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n")
FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n")
ELSE( NOT ${_icon_GROUP} STREQUAL "unknown")
message(STATUS "icon: ${_current_ICON} doesn't fit naming conventions. ignoring." )
ENDIF( NOT ${_icon_GROUP} STREQUAL "unknown")
ENDFOREACH (_current_ICON)
ENDMACRO(KDE3_INSTALL_ICONS_CUSTOM)
MACRO(KPILOT_RPATH _thing)
set_target_properties(${_thing} PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib;${KDE3_DIR}/lib;${PILOTLINK_LIBRARY}
INSTALL_RPATH_USE_LINK_PATH true
)
ENDMACRO(KPILOT_RPATH _thing)

@ -1,23 +0,0 @@
IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
MESSAGE(FATAL_ERROR "Cannot find install manifest:
\"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
STRING(REGEX REPLACE "\n" ";" files "${files}")
FOREACH(file ${files})
MESSAGE(STATUS "Uninstalling \"${file}\"")
IF(EXISTS "${file}")
EXEC_PROGRAM(
"@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
OUTPUT_VARIABLE rm_out
RETURN_VALUE rm_retval
)
IF("${rm_retval}" STREQUAL 0)
ELSE("${rm_retval}" STREQUAL 0)
MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
ENDIF("${rm_retval}" STREQUAL 0)
ELSE(EXISTS "${file}")
MESSAGE(STATUS "File \"${file}\" does not exist.")
ENDIF(EXISTS "${file}")
ENDFOREACH(file)

@ -1,35 +1,11 @@
include_directories(
${CMAKE_BINARY_DIR}/lib
${CMAKE_SOURCE_DIR}/lib
${CMAKE_CURRENT_BINARY_DIR}
)
add_subdirectory(abbrowserconduit)
add_subdirectory(docconduit)
add_subdirectory(knotes)
add_subdirectory(memofileconduit)
add_subdirectory(notepadconduit)
add_subdirectory(null)
add_subdirectory(popmail)
add_subdirectory(sysinfoconduit)
add_subdirectory(timeconduit)
FIND_PATH( HAVE_CALENDARLOCAL_H "libkcal/calendarlocal.h" ${KDE3_INCLUDE_DIR} )
IF (HAVE_CALENDARLOCAL_H)
add_subdirectory(vcalconduit)
ELSE (HAVE_CALENDARLOCAL_H)
MESSAGE(STATUS "No KDE PIM development headers were found.")
ENDIF (HAVE_CALENDARLOCAL_H)
###
#
# MAL seems to be broken, or the MAL API has changed somewhat
# since the last time that the conduit was compiled by the development
# team. Since we don't use the conduit it is disabled.
IF (MAL_FOUND)
add_subdirectory(malconduit)
ELSE (MAL_FOUND)
MESSAGE(STATUS "Couldn't find mal. Won't be able to build malconduit")
ENDIF (MAL_FOUND)
##### directories ###############################
add_subdirectory( abbrowserconduit )
add_subdirectory( docconduit )
add_subdirectory( knotes )
add_subdirectory( memofileconduit )
add_subdirectory( notepadconduit )
add_subdirectory( popmail )
add_subdirectory( sysinfoconduit )
add_subdirectory( timeconduit )
add_subdirectory( vcalconduit )

@ -1,46 +1,39 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_abbrowser_SRCS
resolutionDialog.cc
abbrowser-factory.cc
abbrowser-setup.cc
tdeabcRecord.cc
abbrowser-conduit.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_abbrowser_UIS
resolutionDialog_base.ui
kaddressbookConduit.ui
)
set(conduit_abbrowser_KCFGS
abbrowserSettings.kcfgc
)
##### conduit_address (kpart) ###################
kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS})
trinity_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS})
trinity_automoc(${conduit_abbrowser_SRCS})
add_library(conduit_address SHARED ${conduit_abbrowser_SRCS})
target_link_libraries(conduit_address tdeabc_file tdeabc)
set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
tde_add_kpart( conduit_address AUTOMOC
SOURCES resolutionDialog_base.ui kaddressbookConduit.ui
abbrowserSettings.kcfgc resolutionDialog.cpp abbrowser-factory.cpp
abbrowser-setup.cpp tdeabcRecord.cpp abbrowser-conduit.cpp
LINK kpilot-shared tdeabc-shared tdeabc_file-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_address)
install(
TARGETS conduit_address
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES abbrowser_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES KPilotCustomFieldEditor.ui
DESTINATION ${DATA_INSTALL_DIR}/kaddressbook/contacteditorpages
)
install(
FILES abbrowserconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES abbrowser_conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install( FILES abbrowserconduit.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -6,11 +6,11 @@ conduit_address_la_SOURCES = \
resolutionDialog_base.ui \
kaddressbookConduit.ui \
abbrowserSettings.kcfgc \
resolutionDialog.cc \
abbrowser-factory.cc \
abbrowser-setup.cc \
tdeabcRecord.cc \
abbrowser-conduit.cc
resolutionDialog.cpp \
abbrowser-factory.cpp \
abbrowser-setup.cpp \
tdeabcRecord.cpp \
abbrowser-conduit.cpp
conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_address_la_LIBADD = ../../lib/libkpilot.la -ltdeabc -ltdeabc_file

@ -146,7 +146,7 @@ private:
{
return (str1.isEmpty() && str2.isEmpty()) || (str1 == str2);
} ;
typedef enum eqFlagsType
enum eqFlagsType
{
eqFlagsName=0x1,
eqFlagsAdress=0x2,

@ -2,7 +2,7 @@
**
** Copyright (C) 2002-2003 by Reinhold Kainhofer
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -4,7 +4,7 @@
**
** Copyright (C) 2002-2003 by Reinhold Kainhofer
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -4,7 +4,7 @@
**
** Copyright (C) 2003 by Reinhold Kainhofer
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*
@ -32,7 +32,7 @@
#include <tqvaluelist.h>
#include "syncAction.h"
typedef enum eExistItems {
enum eExistItems {
eExistsPC=0x1, eExistsPalm=0x2, eExistsBackup=0x4,
eExistsAll=eExistsPC|eExistsPalm|eExistsBackup
};

@ -1,87 +1,63 @@
add_subdirectory( Icons )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(doc_shared_SRCS
makedoc9.cc
pilotDOCHead.cc
pilotDOCEntry.cc
pilotDOCBookmark.cc
DOC-converter.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_doc_SRCS
${doc_shared_SRCS}
kpalmdoc_dlg.cc
kpalmdoc.cpp
doc-factory.cc
doc-setup.cc
doc-conduit.cc
doc-conflictdialog.cc
)
set(conduit_doc_UIS
kpalmdoc_dlgbase.ui
doc-setupdialog.ui
)
##### palmdoc (static) ##########################
set(conduit_doc_KCFGS
docconduitSettings.kcfgc
kpalmdocSettings.kcfgc
tde_add_library( palmdoc STATIC_PIC AUTOMOC
SOURCES makedoc9.cpp pilotDOCHead.cpp
pilotDOCEntry.cpp pilotDOCBookmark.cpp
DOC-converter.cpp
)
kde3_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS})
trinity_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS})
trinity_automoc(${conduit_doc_SRCS})
add_library(conduit_doc SHARED ${conduit_doc_SRCS})
kpilot_rpath(conduit_doc)
##### kpalmdoc (executable) #####################
set_target_properties(
conduit_doc PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
PREFIX ""
tde_add_executable( kpalmdoc AUTOMOC
SOURCES kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cpp
kpalmdoc.cpp
LINK tdecore-shared tdeui-shared tdeio-shared kpilot-shared palmdoc-static
DESTINATION ${BIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_doc)
install(
TARGETS conduit_doc
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### conduit_doc (kpart) #######################
set(kpalmdoc_SRCS
${doc_shared_SRCS}
kpalmdoc_dlg.cc
kpalmdoc.cpp
)
kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc)
trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui)
trinity_automoc(${kpalmdoc_SRCS})
add_executable(kpalmdoc ${kpalmdoc_SRCS})
target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot tdeui tdeio)
kpilot_rpath(kpalmdoc)
install(
TARGETS kpalmdoc conduit_doc
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
tde_add_kpart( conduit_doc AUTOMOC
SOURCES docconduitSettings.kcfgc doc-factory.cpp doc-setup.cpp doc-conduit.cpp
doc-setupdialog.ui doc-conflictdialog.cpp
LINK kpilot-shared tdeui-shared palmdoc-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
install(
FILES doc_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
)
install(
FILES docconduit.kcfg kpalmdoc.kcfg DESTINATION ${KDE3_KCFG_DIR}
##### other data ################################
install( FILES kpalmdoc.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
install(
FILES kpalmdoc.desktop DESTINATION ${KDE3_XDG_APPS_DIR}
install( FILES kpalmdoc.upd
DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
)
install(
FILES kpalmdoc.upd
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update
install( FILES doc_conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
add_subdirectory(Icons)
install( FILES docconduit.kcfg kpalmdoc.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -1,3 +1,3 @@
##### install icons #############################
trinity_install_icons_custom( hicolor )
tde_install_icons( kpalmdoc )

Binary file not shown.

Before

Width:  |  Height:  |  Size: 747 B

After

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 919 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

@ -16,18 +16,18 @@ noinst_LTLIBRARIES = libpalmdoc_shared.la
kde_module_LTLIBRARIES = conduit_doc.la
bin_PROGRAMS = kpalmdoc
libpalmdoc_shared_la_SOURCES = makedoc9.cc pilotDOCHead.cc pilotDOCEntry.cc pilotDOCBookmark.cc DOC-converter.cc
libpalmdoc_shared_la_SOURCES = makedoc9.cpp pilotDOCHead.cpp pilotDOCEntry.cpp pilotDOCBookmark.cpp DOC-converter.cpp
libpalmdoc_shared_la_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
libpalmdoc_shared_la_LIBADD = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc
conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cpp doc-setup.cpp doc-conduit.cpp doc-setupdialog.ui doc-conflictdialog.cpp
conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
$(LIB_TDEUI) $(LIB_TDEFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB)
##libpalmdoc_shared.la
kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp
kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cpp kpalmdoc.cpp
kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kpalmdoc_LDADD = $(LIB_TDEFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la

@ -33,7 +33,7 @@
class docSyncInfo;
typedef TQValueList<docSyncInfo> syncInfoList;
typedef enum eSyncDirectionEnum {
enum eSyncDirectionEnum {
eSyncNone,
// eSyncAll,
eSyncPDAToPC,
@ -41,7 +41,8 @@ typedef enum eSyncDirectionEnum {
eSyncDelete,
eSyncConflict
};
typedef enum eTexStatus {
enum eTexStatus {
eStatNone=0,
eStatNew=1,
eStatChanged=2,

@ -42,7 +42,7 @@ class TQTimer;
class KPilotLink;
typedef struct conflictEntry {
struct conflictEntry {
TQLabel*dbname;
TQComboBox* resolution;
TQPushButton*info;

@ -61,7 +61,7 @@ class tBuf {
// int hicharnum;
// bool space;
byte * buf;
::byte * buf;
unsigned len;
bool isCompressed;
public:
@ -81,9 +81,9 @@ class tBuf {
delete[]buf;
buf = 0L;
}
void setText(const byte * text, unsigned int txtlen =
void setText(const ::byte * text, unsigned int txtlen =
0, bool txtcomp = false);
byte *text() const {
::byte *text() const {
return buf;
}
unsigned Len() const {
@ -102,7 +102,7 @@ class tBuf {
unsigned Compress();
private:
unsigned Issue(byte src, int &bSpace);
unsigned Issue(::byte src, int &bSpace);
void Dump() const {
printf("\nbuffer len=%d", len);
}};

@ -1,8 +1,8 @@
/* pilotDOCBookmark.h -*- C++ -*- KPilot
/* pilotDOCBookmark.h KPilot
**
** Copyright (C) 2003 by Reinhold Kainhofer
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -1,8 +1,8 @@
/* pilotDOCEntry.h -*- C++ -*- KPilot
/* pilotDOCEntry.h KPilot
**
** Copyright (C) 2002 by Reinhold Kainhofer
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -1,8 +1,8 @@
/* pilotDOCHead.h -*- C++ -*- KPilot
/* pilotDOCHead.h KPilot
**
** Copyright (C) 2002 by Reinhold Kainhofer
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -1,52 +1,38 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
set(conduit_knotes_SRCS
knotes-factory.cc
knotes-setup.cc
knotes-action.cc
)
set(conduit_knotes_UIS
setup_base.ui
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_knotes_KCFGS
knotesconduitSettings.kcfgc
link_directories(
${TQT_LIBRARY_DIRS}
)
#set(conduit_knotes_STUBS
# KNotesIface.h
#)
#kde3_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS})
#kde3_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS})
tde_import( libkmime )
tde_import( ktnef )
tde_import( libkcal )
kde3_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS})
trinity_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS})
trinity_automoc(${conduit_knotes_SRCS})
add_library(conduit_knotes SHARED ${conduit_knotes_SRCS})
target_link_libraries(conduit_knotes kcal)
##### conduit_knotes (kpart) ####################
set_target_properties(conduit_knotes PROPERTIES
LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
tde_add_kpart( conduit_knotes AUTOMOC
SOURCES knotesconduitSettings.kcfgc knotes-factory.cpp
knotes-setup.cpp knotes-action.cpp setup_base.ui
LINK kpilot-shared tdeui-shared kcal-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_knotes)
install(
TARGETS conduit_knotes
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES knotes-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES knotes-conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES knotesconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES knotesconduit.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -10,9 +10,9 @@ kde_module_LTLIBRARIES = conduit_knotes.la
conduit_knotes_la_SOURCES = \
knotesconduitSettings.kcfgc \
knotes-factory.cc \
knotes-setup.cc \
knotes-action.cc \
knotes-factory.cpp \
knotes-setup.cpp \
knotes-action.cpp \
setup_base.ui
conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal

Binary file not shown.

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

@ -1,48 +1,34 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${MAL_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_mal_SRCS
mal-factory.cc
mal-setup.cc
mal-conduit.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_mal_UIS
mal-setup_dialog.ui
)
set(conduit_mal_KCFGS
malconduitSettings.kcfgc
)
##### conduit_mal (kpart) #######################
kde3_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS})
trinity_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS})
trinity_automoc(${conduit_mal_SRCS})
add_library(conduit_mal SHARED ${conduit_mal_SRCS})
target_link_libraries(conduit_mal ${MAL_LIBRARY})
set_target_properties(
conduit_mal PROPERTIES
LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
PREFIX ""
INSTALL_RPATH "${MAL_LIBRARY}"
INSTALL_RPATH_USE_LINK_PATH true
tde_add_kpart( conduit_mal AUTOMOC
SOURCES malconduitSettings.kcfgc mal-setup_dialog.ui
mal-factory.cpp mal-setup.cpp mal-conduit.cpp
LINK kpilot-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_mal)
install(
TARGETS conduit_mal
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES mal_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES mal_conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES malconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES malconduit.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -12,7 +12,7 @@ kde_kcfg_DATA = malconduit.kcfg
kde_module_LTLIBRARIES = conduit_mal.la
conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc
conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cpp mal-setup.cpp mal-conduit.cpp
conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_TDEUI)

@ -1,4 +1,4 @@
/* Time-factory.cc KPilot
/* Time-factory.cpp KPilot
**
** Copyright (C) 2002 by Reinhold Kainhofer
**

@ -1,4 +1,4 @@
/* MAL-setup.cc KPilot
/* MAL-setup.cpp KPilot
**
** Copyright (C) 2002 by Reinhold Kainhofer
**

@ -1,44 +1,34 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_memofile_SRCS
memofile-factory.cc
memofile.cc
memofiles.cc
memofile-conduit.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_memofile_UIS
setup_base.ui
)
set(conduit_memofile_KCFGS
memofileSettings.kcfgc
)
##### conduit_memofile (kpart) ##################
kde3_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS})
trinity_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS})
trinity_automoc(${conduit_memofile_SRCS})
add_library(conduit_memofile SHARED ${conduit_memofile_SRCS})
set_target_properties(
conduit_memofile PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
tde_add_kpart( conduit_memofile AUTOMOC
SOURCES memofileSettings.kcfgc setup_base.ui memofile-factory.cpp
memofile.cpp memofiles.cpp memofile-conduit.cpp
LINK kpilot-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_memofile)
install(
TARGETS conduit_memofile
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES memofile-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES memofile-conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES memofileconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES memofileconduit.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la
conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc
memofile-factory.cpp memofile.cpp memofiles.cpp memofile-conduit.cpp
conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEFILE)

@ -1,4 +1,4 @@
/* memofile-conduit.cc KPilot
/* memofile-conduit.cpp KPilot
**
** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
**

@ -1,4 +1,4 @@
/* memofile-factory.cc KPilot
/* memofile-factory.cpp KPilot
**
** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
**

@ -1,4 +1,4 @@
/* memofile.cc KPilot
/* memofile.cpp KPilot
**
** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
**

@ -1,4 +1,4 @@
/* memofile-conduit.cc KPilot
/* memofile-conduit.cpp KPilot
**
** Copyright (C) 2004-2007 by Jason 'vanRijn' Kasper
**

@ -1,38 +1,30 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_notepad_SRCS
notepad-factory.cc
notepad-conduit.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_notepad_UIS
notepad-setup.ui
)
set(conduit_notepad_KCFGS
notepadconduit.kcfgc
)
##### conduit_notepad (kpart) ###################
kde3_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS})
trinity_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS})
trinity_automoc(${conduit_notepad_SRCS})
add_library(conduit_notepad SHARED ${conduit_notepad_SRCS})
set_target_properties(
conduit_notepad PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
tde_add_kpart( conduit_notepad AUTOMOC
SOURCES notepadconduit.kcfgc notepad-setup.ui
notepad-conduit.cpp notepad-factory.cpp
LINK kpilot-shared tdeui-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_notepad)
install(
TARGETS conduit_notepad
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES notepad-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES notepad-conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)

@ -8,7 +8,7 @@ service_DATA = notepad-conduit.desktop
kde_module_LTLIBRARIES = conduit_notepad.la
conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \
notepad-conduit.cc notepad-factory.cc
notepad-conduit.cpp notepad-factory.cpp
conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO)

@ -1,38 +1,33 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_null_SRCS
null-conduit.cc
null-factory.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_null_UIS
setup_base.ui
)
set(conduit_null_KCFGS
nullSettings.kcfgc
)
##### conduit_null (kpart) ######################
kde3_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS})
trinity_add_ui_files(conduit_null_SRCS ${conduit_null_UIS})
trinity_automoc(${conduit_null_SRCS})
add_library(conduit_null SHARED ${conduit_null_SRCS})
set_target_properties(
conduit_null PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
tde_add_kpart( conduit_null AUTOMOC
SOURCES nullSettings.kcfgc setup_base.ui null-conduit.cpp null-factory.cpp
LINK kpilot-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_null)
install(
TARGETS conduit_null
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
##### other data ################################
install( FILES null-conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES null-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES nullconduit.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -8,7 +8,7 @@ service_DATA = null-conduit.desktop
kde_module_LTLIBRARIES = conduit_null.la
conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc
conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cpp null-factory.cpp
conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)

@ -1,43 +1,34 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_popmail_SRCS
popmail-factory.cc
popmail-conduit.cc
setupDialog.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_popmail_UIS
setup-dialog.ui
)
set(conduit_popmail_KCFGS
popmailSettings.kcfgc
)
##### conduit_popmail (kpart) ###################
kde3_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS})
trinity_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS})
trinity_automoc(${conduit_popmail_SRCS})
add_library(conduit_popmail SHARED ${conduit_popmail_SRCS})
set_target_properties(
conduit_popmail PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
tde_add_kpart( conduit_popmail AUTOMOC
SOURCES popmailSettings.kcfgc setup-dialog.ui popmail-factory.cpp
setupDialog.cpp popmail-conduit.cpp
LINK kpilot-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_popmail)
install(
TARGETS conduit_popmail
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES popmail-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES popmail-conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES popmail.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES popmail.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -14,8 +14,8 @@ kde_module_LTLIBRARIES = conduit_popmail.la
# Which sources should be compiled for popmail_conduit
conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \
popmail-factory.cc setupDialog.cc \
popmail-conduit.cc
popmail-factory.cpp setupDialog.cpp \
popmail-conduit.cpp
conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lDCOP
conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEIO)

@ -0,0 +1,33 @@
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
link_directories(
${TQT_LIBRARY_DIRS}
)
##### conduit_record (kpart) ####################
tde_add_kpart( conduit_record AUTOMOC
SOURCES settings.kcfgc setup_base.ui factory.cpp
LINK kpilot-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
##### other data ################################
install( FILES record-conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install( FILES settings.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -8,7 +8,7 @@ service_DATA = record-conduit.desktop
kde_module_LTLIBRARIES = conduit_record.la
conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc
conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cpp
conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)

@ -1,50 +1,38 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
set(conduit_sysinfo_SRCS
sysinfo-setup.cc
sysinfo-factory.cc
sysinfo-conduit.cc
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_sysinfo_UIS
sysinfo-setup_dialog.ui
link_directories(
${TQT_LIBRARY_DIRS}
)
set(conduit_sysinfo_KCFGS
sysinfoSettings.kcfgc
)
kde3_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS})
trinity_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS})
trinity_automoc(${conduit_sysinfo_SRCS})
add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS})
##### conduit_sysinfo (kpart) ###################
set_target_properties(
conduit_sysinfo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
tde_add_kpart( conduit_sysinfo AUTOMOC
SOURCES sysinfoSettings.kcfgc sysinfo-factory.cpp sysinfo-setup.cpp
sysinfo-conduit.cpp sysinfo-setup_dialog.ui
LINK kpilot-shared tdeui-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_sysinfo)
install(
TARGETS conduit_sysinfo
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES sysinfo_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES Template.html Template.txt
DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/sysinfoconduit
)
install(
FILES sysinfoSettings.kcfgc sysinfoconduit.kcfg
DESTINATION ${KDE3_KCFG_DIR}
install( FILES sysinfo_conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES Template.html Template.txt
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/sysinfoconduit
install( FILES sysinfoconduit.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -11,9 +11,9 @@ service_DATA = sysinfo_conduit.desktop
kde_module_LTLIBRARIES = conduit_sysinfo.la
conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \
sysinfo-factory.cc \
sysinfo-setup.cc \
sysinfo-conduit.cc \
sysinfo-factory.cpp \
sysinfo-setup.cpp \
sysinfo-conduit.cpp \
sysinfo-setup_dialog.ui
conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO)

@ -1,4 +1,4 @@
/* SysInfo-factory.cc KPilot
/* SysInfo-factory.cpp KPilot
**
** Copyright (C) 2003 by Reinhold Kainhofer
**

@ -1,4 +1,4 @@
/* SysInfo-setup.cc KPilot
/* SysInfo-setup.cpp KPilot
**
** Copyright (C) 2003 by Reinhold Kainhofer
**

@ -56,7 +56,7 @@
<default>true</default>
</entry>
<entry name="KDEVersion" key="KDE Version" type="Bool">
<label>Version of KPilot, pilot-link and KDE</label>
<label>Version of KPilot, pilot-link and TDE</label>
<default>true</default>
</entry>
</group>

@ -1,44 +1,34 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
set(conduit_time_SRCS
time-conduit.cc
time-factory.cc
time-setup.cc
)
set(conduit_time_UIS
time-setup_dialog.ui
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_time_KCFGS
timeConduitSettings.kcfgc
link_directories(
${TQT_LIBRARY_DIRS}
)
kde3_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS})
trinity_add_ui_files(conduit_time_SRCS ${conduit_time_UIS})
trinity_automoc(${conduit_time_SRCS})
add_library(conduit_time SHARED ${conduit_time_SRCS})
kpilot_rpath(conduit_time)
##### conduit_time (kpart) ######################
set_target_properties(
conduit_time PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
PREFIX ""
tde_add_kpart( conduit_time AUTOMOC
SOURCES timeConduitSettings.kcfgc time-factory.cpp time-setup.cpp
time-conduit.cpp time-setup_dialog.ui
LINK kpilot-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_time)
install(
TARGETS conduit_time
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
)
##### other data ################################
install(
FILES time_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES time_conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES timeconduit.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES timeconduit.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -12,9 +12,9 @@ kde_module_LTLIBRARIES = conduit_time.la
conduit_time_la_SOURCES = timeConduitSettings.kcfgc \
time-factory.cc \
time-setup.cc \
time-conduit.cc \
time-factory.cpp \
time-setup.cpp \
time-conduit.cpp \
time-setup_dialog.ui
conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui
conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)

@ -1,4 +1,4 @@
/* Time-factory.cc KPilot
/* Time-factory.cpp KPilot
**
** Copyright (C) 2002 by Reinhold Kainhofer
**

@ -1,4 +1,4 @@
/* Time-setup.cc KPilot
/* Time-setup.cpp KPilot
**
** Copyright (C) 2002 by Reinhold Kainhofer
**

@ -1,75 +1,57 @@
set(conduit_LIBS kcal)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
set(conduit_SHARED
vcal-setupbase.cc
vcal-conduitbase.cc
teststate.cc
initstate.cc
pctohhstate.cc
hhtopcstate.cc
cleanupstate.cc
deleteunsyncedpcstate.cc
deleteunsyncedhhstate.cc
kcalRecord.cc
vcalRecord.cc
todoRecord.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
kde3_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc)
trinity_add_ui_files(conduit_SHARED korganizerConduit.ui)
tde_import( libkmime )
tde_import( ktnef )
tde_import( libkcal )
set(conduit_vcal_SRCS
${conduit_SHARED}
vcal-conduit.cc
vcal-factory.cc
vcal-setup.cc
)
trinity_automoc(${conduit_vcal_SRCS})
add_library(conduit_vcal SHARED ${conduit_vcal_SRCS})
target_link_libraries(conduit_vcal kcal)
##### vcalconduit (static) ######################
set(conduit_todo_SRCS
${conduit_SHARED}
todo-factory.cc
todo-setup.cc
todo-conduit.cc
tde_add_library( vcalconduit STATIC_PIC AUTOMOC
SOURCES vcalconduitSettings.kcfgc korganizerConduit.ui
kcalRecord.cpp vcal-setupbase.cpp vcal-conduitbase.cpp
cleanupstate.cpp deleteunsyncedhhstate.cpp
deleteunsyncedpcstate.cpp hhtopcstate.cpp
initstate.cpp pctohhstate.cpp teststate.cpp
)
trinity_automoc(${conduit_todo_SRCS})
add_library(conduit_todo SHARED ${conduit_todo_SRCS})
target_link_libraries(conduit_todo kcal)
set_target_properties(
conduit_vcal PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
)
set_target_properties(
conduit_todo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
PREFIX ""
##### conduit_vcal (kpart) ######################
tde_add_kpart( conduit_vcal AUTOMOC
SOURCES vcal-conduit.cpp vcalRecord.cpp vcal-factory.cpp vcal-setup.cpp
LINK kpilot-shared kcal-shared tderesources-shared vcalconduit-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_vcal)
install(
TARGETS conduit_vcal conduit_todo
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
##### conduit_todo (kpart) ######################
tde_add_kpart( conduit_todo AUTOMOC
SOURCES todo-conduit.cpp todoRecord.cpp todo-factory.cpp todo-setup.cpp
LINK kpilot-shared kcal-shared tderesources-shared vcalconduit-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
trinity_install_libtool_file(conduit_todo)
install(
FILES vcal-conduit.desktop todo-conduit.desktop
DESTINATION ${KDE3_SERVICES_DIR}
##### other data ################################
install( FILES vcal-conduit.desktop todo-conduit.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES vcalconduitbase.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES vcalconduitbase.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -16,21 +16,21 @@ noinst_LTLIBRARIES = libvcalconduit_shared.la
libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
korganizerConduit.ui \
kcalRecord.cc \
vcal-setupbase.cc \
vcal-conduitbase.cc \
cleanupstate.cc deleteunsyncedhhstate.cc deleteunsyncedpcstate.cc \
hhtopcstate.cc initstate.cc pctohhstate.cc teststate.cc
conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \
vcal-factory.cc vcal-setup.cc
kcalRecord.cpp \
vcal-setupbase.cpp \
vcal-conduitbase.cpp \
cleanupstate.cpp deleteunsyncedhhstate.cpp deleteunsyncedpcstate.cpp \
hhtopcstate.cpp initstate.cpp pctohhstate.cpp teststate.cpp
conduit_vcal_la_SOURCES = vcal-conduit.cpp vcalRecord.cpp \
vcal-factory.cpp vcal-setup.cpp
conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
libvcalconduit_shared.la
conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \
todo-factory.cc todo-setup.cc
conduit_todo_la_SOURCES = todo-conduit.cpp todoRecord.cpp \
todo-factory.cpp todo-setup.cpp
conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
libvcalconduit_shared.la

@ -1,4 +1,4 @@
/* kcalRecord.cc KPilot
/* kcalRecord.cpp KPilot
**
** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
** Copyright (C) 2002-2003 by Reinhold Kainhofer

@ -1,4 +1,4 @@
/* vcalRecord.cc KPilot
/* vcalRecord.cpp KPilot
**
** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
** Copyright (C) 2002-2003 by Reinhold Kainhofer

@ -302,8 +302,3 @@ VCalConduitSettings *VCalConduit::theConfig()
VCalConduitSettings *VCalConduit::config() {
return theConfig();
}
// vim: ts=4:sw=4:noexpandtab:

@ -1,4 +1,4 @@
/* vcal-setup.cc KPilot
/* vcal-setup.cpp KPilot
**
** Copyright (C) 2002-2003 Reinhold Kainhofer
** Copyright (C) 2001 by Dan Pilone

@ -1,4 +1,4 @@
/* vcalRecord.cc KPilot
/* vcalRecord.cpp KPilot
**
** Copyright (C) 2006 by Adriaan de Groot <groot@kde.org>
** Copyright (C) 2002-2003 by Reinhold Kainhofer

@ -1,24 +1,26 @@
#cmakedefine HAVE_STDINT_H
#cmakedefine HAVE_ALLOCA_H
#cmakedefine HAVE_SYS_TIME_H
#cmakedefine HAVE_SYS_STAT_H
#cmakedefine HAVE_CFSETSPEED
#cmakedefine HAVE_STRDUP
#cmakedefine HAVE_SETENV
#cmakedefine HAVE_UNSETENV
#cmakedefine HAVE_USLEEP
#cmakedefine HAVE_RANDOM
#cmakedefine HAVE_PUTENV
#cmakedefine HAVE_SETEUID
#cmakedefine HAVE_MKSTEMPS
#cmakedefine HAVE_MKSTEMP
#cmakedefine HAVE_MKDTEMP
#cmakedefine HAVE_REVOKE
#cmakedefine HAVE_STRLCPY
#cmakedefine HAVE_STRLCAT
#cmakedefine HAVE_INET_ATON
#if !defined(HAVE_STRLCAT)
#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@
/* Define if you have strlcat */
#cmakedefine HAVE_STRLCAT 1
/* Define if you have the strlcat prototype */
#cmakedefine HAVE_STRLCAT_PROTO 1
/* Define if you have strlcpy */
#cmakedefine HAVE_STRLCPY 1
/* Define if you have the strlcpy prototype */
#cmakedefine HAVE_STRLCPY_PROTO 1
/* Provide strlcat prototype if missing */
#if !defined(HAVE_STRLCAT_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
@ -28,9 +30,8 @@ unsigned long strlcat(char*, const char*, unsigned long);
#endif
#endif
#if !defined(HAVE_STRLCPY)
/* Provide strlcpy prototype if missing */
#if !defined(HAVE_STRLCPY_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
@ -39,5 +40,3 @@ unsigned long strlcpy(char*, const char*, unsigned long);
}
#endif
#endif

@ -0,0 +1,3 @@
##### directories ###############################
tde_auto_add_subdirectories( )

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 51 KiB

@ -271,10 +271,3 @@ Documentation copyright 2004,2005 Carlos Leonhard Woelz
&documentation.index;
</book>
<!--
Local Variables:
sgml-minimize-attributes: nil
sgml-general-insert-case: lower
End:
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 984 B

After

Width:  |  Height:  |  Size: 932 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 22 KiB

@ -1,180 +1,94 @@
link_directories(${CMAKE_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
# Don't forget to include output directory, otherwise
# the UI file won't be wrapped!
add_subdirectory( Icons )
include_directories(
${CMAKE_BINARY_DIR}/lib
${CMAKE_SOURCE_DIR}/lib
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
###
#
# Settings (TDEConfigXT) shared between various parts of KPilot
#
set(settings_SRC
kpilotConfig.cc
link_directories(
${TQT_LIBRARY_DIRS}
)
kde3_add_kcfg_files(settings_SRC kpilotSettings.kcfgc)
###
#
# The KCM for KPilot, used by the config dialog and the embedding in Kontact
#
set(kcmpilot_SRCS
${settings_SRC}
kpilotConfigWizard.cc
dbSelectionDialog.cc
kpilotConfigDialog.cc
conduitConfigDialog.cc
kpilotProbeDialog.cc
)
set(kcmpilot_KCFGS
kpilotConfigWizard_address.kcfgc
kpilotConfigWizard_notes.kcfgc
kpilotConfigWizard_vcal.kcfgc
)
##### configuration (static) ####################
set(kcmpilot_UIS
kpilotConfigDialog_device.ui
kpilotConfigDialog_sync.ui
kpilotConfigDialog_startup.ui
kpilotConfigDialog_viewers.ui
kpilotConfigDialog_backup.ui
kpilotConfigWizard_user.ui
kpilotConfigWizard_app.ui
dbSelection_base.ui
tde_add_library( configuration STATIC_PIC AUTOMOC
SOURCES kpilotConfig.cpp kpilotSettings.kcfgc
LINK tdecore-shared tdeui-shared tdeio-shared
)
trinity_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS})
kde3_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS})
kde3_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h)
trinity_automoc(${kcmpilot_SRCS})
# Now add these generated files to the ADD_LIBRARY step
# If this is NOT done, then the ui_*.h files will not be generated
add_library(kcm_kpilot SHARED ${kcmpilot_SRCS})
set_target_properties(kcm_kpilot PROPERTIES
LOCATION ${KDE3_PLUGIN_INSTALL_DIR}
PREFIX ""
)
###
#
# Most simple daemon-like application: kpilotTest, which
# runs whatever the command-line tells it to.
#
set(kpilotTest_SRCS
${settings_SRC}
hotSync.cc
logWidget.cc
pilotComponent.cc
main-test.cc
)
# Acts as a receiver for DCOP log messages
kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h)
trinity_automoc(${kpilotTest_SRCS})
add_executable(kpilotTest ${kpilotTest_SRCS})
target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot tdeui tdeio)
kpilot_rpath(kpilotTest)
###
#
# The real KPilot daemon.
#
set(kpilotDaemon_SRCS
${settings_SRC}
hotSync.cc
fileInstaller.cc
internalEditorAction.cc
logFile.cc
pilotDaemon.cc
)
# Both sends and receives DCOP log messages. Talks to KPilot.
kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h)
kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h)
trinity_automoc(${kpilotDaemon_SRCS})
add_executable(kpilotDaemon ${kpilotDaemon_SRCS})
target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot tdeui tdeio)
kpilot_rpath(kpilotDaemon)
###
#
# The KPilot executable (viewer / editor / configuration).
#
set(kpilot_SRCS
${settings_SRC}
logWidget.cc
kpilot.cc
dbviewerWidget.cc
dbFlagsEditor.cc
dbRecordEditor.cc
dbAppInfoEditor.cc
pilotComponent.cc
memoWidget.cc
addressWidget.cc
addressEditor.cc
datebookWidget.cc
todoWidget.cc
todoEditor.cc
fileInstaller.cc
fileInstallWidget.cc
listItems.cc
)
##### kpilot (executable) #######################
set(kpilot_UIS
dbFlagsEditor_base.ui
todoEditor_base.ui
tde_add_executable( kpilot AUTOMOC
SOURCES pilotDaemonDCOP.stub kpilotDCOP.skel loggerDCOP.skel kpilot.cpp
pilotComponent.cpp logWidget.cpp memoWidget.cpp addressWidget.cpp
addressEditor.cpp dbviewerWidget.cpp dbFlagsEditor.cpp dbFlagsEditor_base.ui
dbRecordEditor.cpp dbAppInfoEditor.cpp datebookWidget.cpp todoWidget.cpp
todoEditor.cpp todoEditor_base.ui fileInstaller.cpp fileInstallWidget.cpp
listItems.cpp
LINK tdecore-shared tdeui-shared tdeio-shared tdeutils-shared
kpilot-shared configuration-static
DESTINATION ${BIN_INSTALL_DIR}
)
trinity_add_ui_files(kpilot_SRCS ${kpilot_UIS})
# Talks to the daemon. Listens as itself.
kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h)
kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h)
trinity_automoc(${kpilot_SRCS})
add_executable(kpilot_bin ${kpilot_SRCS})
target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot tdeutils tdeui tdeio)
kpilot_rpath(kpilot_bin)
set_target_properties(kpilot_bin PROPERTIES
OUTPUT_NAME kpilot
##### kpilotDaemon (executable) #################
tde_add_executable( kpilotDaemon AUTOMOC
SOURCES pilotDaemonDCOP.skel kpilotDCOP.stub loggerDCOP.stub loggerDCOP.skel
pilotDaemon.cpp logFile.cpp hotSync.cpp internalEditorAction.cpp
fileInstaller.cpp
LINK tdecore-shared tdeui-shared tdeio-shared kpilot-shared
configuration-static
DESTINATION ${BIN_INSTALL_DIR}
)
######################### INSTALL STUFF #######################################
trinity_install_libtool_file(kcm_kpilot)
##### kcm_kpilot (kpart) ########################
install(
TARGETS kcm_kpilot kpilot_bin kpilotDaemon
LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
tde_add_kpart( kcm_kpilot AUTOMOC
SOURCES pilotDaemonDCOP.stub kpilotConfigDialog.cpp
kpilotConfigDialog_device.ui kpilotConfigDialog_sync.ui
kpilotConfigDialog_startup.ui kpilotConfigDialog_viewers.ui
kpilotConfigDialog_backup.ui conduitConfigDialog.cpp kpilotProbeDialog.cpp
kpilotConfigWizard_address.kcfgc kpilotConfigWizard_notes.kcfgc
kpilotConfigWizard_vcal.kcfgc kpilotConfigWizard_user.ui
kpilotConfigWizard_app.ui kpilotConfigWizard.cpp dbSelectionDialog.cpp
dbSelection_base.ui
LINK tdecore-shared tdeui-shared tdeio-shared kpilot-shared
configuration-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
install( FILES kpilotui.rc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot)
install(
FILES kpilot.desktop kpilotdaemon.desktop DESTINATION ${KDE3_XDG_APPS_DIR}
##### other data ################################
install( FILES kpilotui.rc
DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
)
install(
FILES kpilotconduit.desktop DESTINATION ${KDE3_SERVICETYPES_DIR}
install( FILES kpilot.desktop kpilotdaemon.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
install(
FILES kpilot_config.desktop DESTINATION ${KDE3_SERVICES_DIR}
install( FILES kpilot.upd
DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update
)
install (
FILES kpilot.upd
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update
install( FILES kpilot_config.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
install(
FILES kpilot.kcfg DESTINATION ${KDE3_KCFG_DIR}
install( FILES kpilotconduit.desktop
DESTINATION ${SERVICETYPES_INSTALL_DIR}
)
add_subdirectory(Icons)
install( FILES kpilot.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)

@ -1,4 +1,31 @@
##### install icons #############################
trinity_install_icons_custom( hicolor )
tde_install_icons( kpilot kpilotDaemon )
install( FILES kpilot-splash.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/pics/)
##### install other icons #######################
unset( _other_icons )
file( GLOB _icon_files *-*.png *-*.mng *-*.svg* )
foreach( _icon_file ${_icon_files} )
string( REGEX REPLACE ".*-([^.]*)\\.(png|mng|svg.*)$" "\\1" _icon ${_icon_file} )
if( NOT "${_icon}" STREQUAL "kpilot"
AND NOT "${_icon}" STREQUAL "kpilotDaemon"
AND NOT "${_icon}" STREQUAL "splash" )
list( APPEND _other_icons "${_icon}" )
endif( )
endforeach( )
if( _other_icons )
list( SORT _other_icons )
list( REMOVE_DUPLICATES _other_icons )
tde_install_icons( ${_other_icons} DESTINATION "${DATA_INSTALL_DIR}/${PROJECT_NAME}/icons" )
endif( )
##### other data ################################
install( FILES kpilot-splash.png
DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics
)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 747 B

After

Width:  |  Height:  |  Size: 742 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 685 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 645 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 674 B

After

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 844 B

After

Width:  |  Height:  |  Size: 754 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 775 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 982 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 994 B

After

Width:  |  Height:  |  Size: 930 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 984 B

After

Width:  |  Height:  |  Size: 932 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 972 B

After

Width:  |  Height:  |  Size: 929 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 982 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 712 B

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 844 B

After

Width:  |  Height:  |  Size: 754 B

@ -96,7 +96,7 @@ kpilotConfig.tar.gz :
test -d $(CONFIG_DISTDIR) || mkdir $(CONFIG_DISTDIR)
sed -e 's/^all *:.*/all : kpilotConfig/' Makefile-standalone \
> $(CONFIG_DISTDIR)/Makefile
-cp $(CONFIG_OBJS:%.o=%.cc) $(CONFIG_OBJS:%.o=%.h) $(CONFIG_DISTDIR)
-cp $(CONFIG_OBJS:%.o=%.cpp) $(CONFIG_OBJS:%.o=%.h) $(CONFIG_DISTDIR)
-cp $(CONFIG_EXTRA) $(CONFIG_DISTDIR)
tar cvzf $@ $(CONFIG_DISTDIR)
-rm -f $(CONFIG_DISTDIR)/*
@ -106,7 +106,7 @@ kpilotTest.tar.gz :
test -d $(TEST_DISTDIR) || mkdir $(TEST_DISTDIR)
sed -e 's/^all *:.*/all : kpilotTest/' Makefile-standalone \
> $(TEST_DISTDIR)/Makefile
-cp $(TEST_OBJS:%.o=%.cc) $(TEST_OBJS:%.o=%.h) $(TEST_DISTDIR)
-cp $(TEST_OBJS:%.o=%.cpp) $(TEST_OBJS:%.o=%.h) $(TEST_DISTDIR)
-cp $(TEST_EXTRA) $(TEST_DISTDIR)
tar cvzf $@ $(TEST_DISTDIR)
-rm -f $(TEST_DISTDIR)/*
@ -116,7 +116,7 @@ kpilot.tar.gz :
test -d $(KPILOT_DISTDIR) || mkdir $(KPILOT_DISTDIR)
sed -e 's/^all *:.*/all : kpilot/' Makefile-standalone \
> $(KPILOT_DISTDIR)/Makefile
-cp $(KPILOT_OBJS:%.o=%.cc) $(KPILOT_OBJS:%.o=%.h) $(KPILOT_DISTDIR)
-cp $(KPILOT_OBJS:%.o=%.cpp) $(KPILOT_OBJS:%.o=%.h) $(KPILOT_DISTDIR)
-cp $(KPILOT_EXTRA) $(KPILOT_DISTDIR)
tar cvzf $@ $(KPILOT_DISTDIR)
-rm -f $(KPILOT_DISTDIR)/*
@ -126,13 +126,13 @@ kpilotDaemon.tar.gz :
test -d $(DAEMON_DISTDIR) || mkdir $(DAEMON_DISTDIR)
sed -e 's/^all *:.*/all : kpilotDaemon/' Makefile-standalone \
> $(DAEMON_DISTDIR)/Makefile
-cp $(DAEMON_OBJS:%.o=%.cc) $(DAEMON_OBJS:%.o=%.h) $(DAEMON_DISTDIR)
-cp $(DAEMON_OBJS:%.o=%.cpp) $(DAEMON_OBJS:%.o=%.h) $(DAEMON_DISTDIR)
-cp $(DAEMON_EXTRA) $(DAEMON_DISTDIR)
tar cvzf $@ $(DAEMON_DISTDIR)
-rm -f $(DAEMON_DISTDIR)/*
-rmdir $(DAEMON_DISTDIR)
conduitConfigDialog_base.cc : conduitConfigDialog_base.h conduitConfigDialog_base.ui
conduitConfigDialog_base.cpp : conduitConfigDialog_base.h conduitConfigDialog_base.ui
echo '#include <tdelocale.h>' > $@
$(UIC) -tr i18n -i conduitConfigDialog_base.h conduitConfigDialog_base.ui | \
sed -e "s,i18n( \"\" ),QString::null,g" >> $@
@ -141,7 +141,7 @@ conduitConfigDialog_base.cc : conduitConfigDialog_base.h conduitConfigDialog_bas
conduitConfigDialog_base.h : conduitConfigDialog_base.ui
$(UIC) -o $@ $<
kpilotConfigDialog_base.cc : kpilotConfigDialog_base.h kpilotConfigDialog_base.ui
kpilotConfigDialog_base.cpp : kpilotConfigDialog_base.h kpilotConfigDialog_base.ui
echo '#include <tdelocale.h>' > $@
$(UIC) -tr i18n -i kpilotConfigDialog_base.h kpilotConfigDialog_base.ui | \
sed -e "s,i18n( \"\" ),QString::null,g" >> $@
@ -154,13 +154,13 @@ kpilotConfigDialog_base.h : kpilotConfigDialog_base.ui
%.kidl : %.h
$(DCOPIDL) $< > $@ || ( rm -f $@ ; /bin/false )
%_stub.cc : %.kidl
%_stub.cpp : %.kidl
$(DCOPIDL2CPP) --c++-suffix cc --no-skel $<
%_skel.cc : %.kidl
%_skel.cpp : %.kidl
$(DCOPIDL2CPP) --c++-suffix cc --no-stub $<
%.o : %.cc
%.o : %.cpp
g++ -c $(CXXFLAGS) $(INCLUDES) -o $@ $<
%.moc : %.h

@ -17,24 +17,24 @@ METASOURCES = AUTO
INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc
libconfiguration_la_SOURCES = kpilotConfig.cpp kpilotSettings.kcfgc
libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \
kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cpp \
kpilotConfigDialog_device.ui \
kpilotConfigDialog_sync.ui \
kpilotConfigDialog_startup.ui \
kpilotConfigDialog_viewers.ui \
kpilotConfigDialog_backup.ui \
conduitConfigDialog.cc \
kpilotProbeDialog.cc \
conduitConfigDialog.cpp \
kpilotProbeDialog.cpp \
kpilotConfigWizard_address.kcfgc \
kpilotConfigWizard_notes.kcfgc \
kpilotConfigWizard_vcal.kcfgc \
kpilotConfigWizard_user.ui \
kpilotConfigWizard_app.ui \
kpilotConfigWizard.cc \
dbSelectionDialog.cc dbSelection_base.ui
kpilotConfigWizard.cpp \
dbSelectionDialog.cpp dbSelection_base.ui
kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module -avoid-version -no-undefined
kcm_kpilot_la_LIBADD = $(LIB_TDEFILE) $(PISOCK_LIB) \
../lib/libkpilot.la \
@ -43,29 +43,29 @@ kcm_kpilot_la_LIBADD = $(LIB_TDEFILE) $(PISOCK_LIB) \
kpilot_SOURCES = \
pilotDaemonDCOP.stub kpilotDCOP.skel loggerDCOP.skel \
kpilot.cc \
pilotComponent.cc logWidget.cc memoWidget.cc \
addressWidget.cc addressEditor.cc \
dbviewerWidget.cc dbFlagsEditor.cc dbFlagsEditor_base.ui \
dbRecordEditor.cc dbAppInfoEditor.cc \
datebookWidget.cc \
todoWidget.cc todoEditor.cc todoEditor_base.ui \
fileInstaller.cc fileInstallWidget.cc \
listItems.cc
kpilot.cpp \
pilotComponent.cpp logWidget.cpp memoWidget.cpp \
addressWidget.cpp addressEditor.cpp \
dbviewerWidget.cpp dbFlagsEditor.cpp dbFlagsEditor_base.ui \
dbRecordEditor.cpp dbAppInfoEditor.cpp \
datebookWidget.cpp \
todoWidget.cpp todoEditor.cpp todoEditor_base.ui \
fileInstaller.cpp fileInstallWidget.cpp \
listItems.cpp
kpilot_COMPILE_FIRST = kpilotSettings.h
kpilotDaemon_SOURCES = \
pilotDaemonDCOP.skel kpilotDCOP.stub loggerDCOP.stub loggerDCOP.skel \
pilotDaemon.cc logFile.cc \
hotSync.cc internalEditorAction.cc \
fileInstaller.cc
pilotDaemon.cpp logFile.cpp \
hotSync.cpp internalEditorAction.cpp \
fileInstaller.cpp
kpilotTest_SOURCES = \
logWidget.cc pilotComponent.cc \
hotSync.cc internalEditorAction.cc \
logWidget.cpp pilotComponent.cpp \
hotSync.cpp internalEditorAction.cpp \
loggerDCOP.skel \
main-test.cc
main-test.cpp
kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor

@ -1,4 +1,3 @@
// -*- C++ -*-
/* KPilot
**
** Copyright (C) 2000 by Dan Pilone

@ -1,4 +1,3 @@
// -*- C++ -*-
/* addressEditor.h KPilot
**
** Copyright (C) 1998-2000 by Dan Pilone

@ -1,4 +1,4 @@
/* dbRecordEditor.cc KPilot
/* dbRecordEditor.cpp KPilot
**
** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>
**

@ -1,4 +1,4 @@
/* dbViewerWidget.cc KPilot
/* dbViewerWidget.cpp KPilot
**
** Copyright (C) 2003 by Dan Pilone.
** Copyright (C) 2003 Reinhold Kainhofer <reinhold@kainhofer.com>

@ -94,7 +94,7 @@ void InternalEditorAction::syncDirtyDB()
// changed record from the PC to the handheld
PilotRecord*rec=0L;
PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter, false);
PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter);
PilotDatabase *serialDB= deviceLink()->database(*dbIter);
if (!localDB->isOpen() || !serialDB->isOpen())
{
@ -334,7 +334,7 @@ emit logError(i18n("Setting the database flags on the handheld is not yet suppor
TQTimer::singleShot(0, this, TQT_SLOT(syncAppBlockChangedDB()));
return;
PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter, false);
PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter);
PilotDatabase *serialDB=deviceLink()->database(*dbIter);
// open the local and the serial database and copy the flags over
@ -371,7 +371,7 @@ void InternalEditorAction::syncAppBlockChangedDB()
DEBUGKPILOT<<"syncAppBlockChangedDB for DB "<<(*dbIter)<<endl;
#endif
PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter, false);
PilotLocalDatabase*localDB=new PilotLocalDatabase(*dbIter);
PilotDatabase *serialDB=deviceLink()->database(*dbIter);
unsigned char*appBlock=new unsigned char[0xFFFF];

@ -521,7 +521,7 @@ void KPilotInstaller::initMenu()
connect(syncPopup, TQT_SIGNAL(activated()),
TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()));
// File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc
// File actions, keep this list synced with kpilotui.rc and pilotDaemon.cpp
a = new TDEAction(i18n("&HotSync"), CSL1("hotsync"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()),
actionCollection(), "file_hotsync");
@ -972,7 +972,7 @@ void KPilotInstaller::componentUpdate()
//
if (kind)
{
return "kpilot.cc";
return "kpilot.cpp";
}
else
{

@ -139,7 +139,7 @@
when the screen is locked. This is a security measure
to prevent people from stealing your data through physical
access to a Pilot device link to your machine.
It doesn't work with screensavers other than KDE, though,
It doesn't work with screensavers other than TDE, though,
so you will need to turn it off for other environments.</whatsthis>
<default>true</default>
</entry>

@ -102,7 +102,7 @@ public:
* but might return ConfigureAndContinue as well.
*
* This function can call functions to update from different versions
* to current; these are static in kpilotConfig.cc.
* to current; these are static in kpilotConfig.cpp.
*/
static RunMode interactiveUpdate();

@ -1,4 +1,4 @@
/* conduitConfigDialog.cc KPilot
/* conduitConfigDialog.cpp KPilot
**
** Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
**

@ -3,7 +3,7 @@
<kpartgui name="kpilot" version="5">
<MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text>
<!-- Keep this list synchronized with pilotDaemon.cc and kpilot.cc -->
<!-- Keep this list synchronized with pilotDaemon.cpp and kpilot.cpp -->
<Action name="file_hotsync" />
<Action name="file_fullsync" />
<Action name="file_backup" />
@ -40,14 +40,3 @@
</ToolBar>
</kpartgui>
<!--
Local Variables:
mode: xml
sgml-omittag: nil
sgml-shorttag: t
sgml-general-insert-case: lower
End:
-->

@ -5,7 +5,7 @@
** Copyright (C) 1998-2001 by Dan Pilone
** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -170,7 +170,7 @@ void PilotDaemonTray::setupWidget()
0);
fSyncTypeMenu->insertSeparator();
// Keep this synchronized with kpilotui.rc and kpilot.cc if at all possible.
// Keep this synchronized with kpilotui.rc and kpilot.cpp if at all possible.
MI(eHotSync);
MI(eFullSync);
MI(eBackup);

@ -5,7 +5,7 @@
** Copyright (C) 1998-2001 by Dan Pilone
** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -1,4 +1,3 @@
// -*- C++ -*-
/* KPilot
**
** Copyright (C) 2000 by Dan Pilone

@ -1,4 +1,3 @@
// -*- C++ -*-
/* todoEditor.h KPilot
**
** Copyright (C) 1998-2000 by Dan Pilone

@ -1,90 +1,47 @@
include(CheckIncludeFiles)
include(CheckFunctionExists)
check_include_files( stdint.h HAVE_STDINT_H )
check_include_files( alloca.h HAVE_ALLOCA_H )
check_include_files( "sys/time.h" HAVE_SYS_TIME_H )
check_include_files( "sys/stat.h" HAVE_SYS_STAT_H )
check_function_exists( cfsetspeed HAVE_CFSETSPEED )
check_function_exists( strdup HAVE_STRDUP )
check_function_exists( setenv HAVE_SETENV )
check_function_exists( unsetenv HAVE_UNSETENV )
check_function_exists( usleep HAVE_USLEEP )
check_function_exists( random HAVE_RANDOM )
check_function_exists( putenv HAVE_PUTENV )
check_function_exists( seteuid HAVE_SETEUID )
check_function_exists( mkstemps HAVE_MKSTEMPS )
check_function_exists( mkstemp HAVE_MKSTEMP )
check_function_exists( mkdtemp HAVE_MKDTEMP )
check_function_exists( revoke HAVE_REVOKE )
check_function_exists( strlcpy HAVE_STRLCPY )
check_function_exists( strlcat HAVE_STRLCAT )
check_function_exists( inet_aton HAVE_INET_ATON )
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
configure_file(
${CMAKE_SOURCE_DIR}/config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config.h
link_directories(
${TQT_LIBRARY_DIRS}
)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
tde_import( libkmime )
tde_import( ktnef )
tde_import( libkcal )
set(lib_SRCS
options.cc
plugin.cc
syncAction.cc
actions.cc
actionQueue.cc
idmapping.cc
idmapperxml.cc
idmapper.cc
kpilotlink.cc
kpilotdevicelink.cc
kpilotlocallink.cc
pilot.cc
pilotAppInfo.cc
pilotRecord.cc
pilotDatabase.cc
pilotLocalDatabase.cc
pilotSerialDatabase.cc
pilotMemo.cc
pilotAddress.cc
pilotDateEntry.cc
pilotTodoEntry.cc
)
trinity_automoc(${lib_SRCS})
kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc)
add_library(kpilot SHARED ${lib_SRCS})
target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} tdeui tdeio)
kpilot_rpath(kpilot)
##### kpilot (shared) ###########################
#---------- INSTALL -----------------------*
set(kpilotinclude_HEADERS
kpilotlink.h
kpilotdevicelink.h
kpilotlocallink.h
pilot.h
pilotDatabase.h
pilotLinkVersion.h
pilotLocalDatabase.h
pilotRecord.h
pilotSerialDatabase.h
plugin.h
pluginfactory.h
syncAction.h
tde_add_library( kpilot SHARED AUTOMOC
SOURCES kpilotlibSettings.kcfgc options.cpp plugin.cpp syncAction.cpp
kpilotlink.cpp kpilotdevicelink.cpp kpilotlocallink.cpp actions.cpp
actionQueue.cpp pilot.cpp pilotAppInfo.cpp pilotRecord.cpp pilotDatabase.cpp
pilotLocalDatabase.cpp pilotSerialDatabase.cpp pilotMemo.cpp pilotAddress.cpp
pilotDateEntry.cpp pilotTodoEntry.cpp
LINK tdeui-shared tdecore-shared tdeio-shared tdeabc-shared kcal-shared
${PILOTLINK_LIBRARIES}
VERSION 0.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
install(
TARGETS kpilot
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
)
install(
FILES ${kpilotinclude_HEADERS}
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/kpilot
##### other data ################################
install( FILES kpilotlib.kcfg
DESTINATION ${KCFG_INSTALL_DIR}
)
install(
FILES kpilotlib.kcfg DESTINATION ${KDE3_KCFG_DIR}
FILES
kpilotlink.h kpilotlocallink.h kpilotdevicelink.h pilot.h pilotDatabase.h
pilotLinkVersion.h pilotLocalDatabase.h pilotRecord.h pilotSerialDatabase.h
plugin.h pluginfactory.h syncAction.h
DESTINATION
${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}
)

@ -17,16 +17,16 @@ INCLUDES = $(PISOCK_INCLUDE) -I$(top_srcdir) $(all_includes)
lib_LTLIBRARIES = libkpilot.la
libkpilot_la_SOURCES = kpilotlibSettings.kcfgc \
options.cc plugin.cc syncAction.cc \
kpilotlink.cc kpilotdevicelink.cc kpilotlocallink.cc \
actions.cc actionQueue.cc \
pilot.cc \
pilotAppInfo.cc pilotRecord.cc pilotDatabase.cc \
pilotLocalDatabase.cc pilotSerialDatabase.cc \
pilotMemo.cc \
pilotAddress.cc \
pilotDateEntry.cc \
pilotTodoEntry.cc
options.cpp plugin.cpp syncAction.cpp \
kpilotlink.cpp kpilotdevicelink.cpp kpilotlocallink.cpp \
actions.cpp actionQueue.cpp \
pilot.cpp \
pilotAppInfo.cpp pilotRecord.cpp pilotDatabase.cpp \
pilotLocalDatabase.cpp pilotSerialDatabase.cpp \
pilotMemo.cpp \
pilotAddress.cpp \
pilotDateEntry.cpp \
pilotTodoEntry.cpp
libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_TDEUI) $(LIB_TDEABC) -lkcal $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEIO)
@ -50,9 +50,9 @@ kde_kcfg_DATA = kpilotlib.kcfg
check-local:
rm -f FAILED
for i in $(srcdir)/*.h ; do \
( echo "#include <kdemacros.h>" ; echo "#include \"$$i\"" ; echo "int main(int argc,char **argv){return 0;}" ) > header-test.cc; \
( echo "#include <kdemacros.h>" ; echo "#include \"$$i\"" ; echo "int main(int argc,char **argv){return 0;}" ) > header-test.cpp; \
echo "$$i" ; \
g++ $(all_includes) -I$(top_builddir) -DQT_THREAD_SUPPORT -c header-test.cc || echo "$$i" >> FAILED; \
g++ $(all_includes) -I$(top_builddir) -DQT_THREAD_SUPPORT -c header-test.cpp || echo "$$i" >> FAILED; \
done
test ! -e FAILED

@ -54,7 +54,7 @@
* actions in the queue in sequence.
*
*/
KDE_EXPORT class ActionQueue : public SyncAction
class KDE_EXPORT ActionQueue : public SyncAction
{
Q_OBJECT

@ -42,7 +42,7 @@
* It is added automatically to a ActionQueue by queueInit() in order
* to inform the user of the sync.
*/
KDE_EXPORT class WelcomeAction : public SyncAction
class KDE_EXPORT WelcomeAction : public SyncAction
{
public:
/** Constructor. */
@ -58,7 +58,7 @@ protected:
* in cases when the hotsync starts while KPilot is busy configuring
* something and can't be interrupted.
*/
KDE_EXPORT class SorryAction : public SyncAction
class KDE_EXPORT SorryAction : public SyncAction
{
public:
/**
@ -84,7 +84,7 @@ protected:
* device that the HotSync is over, it should be the last
* action executed.
*/
KDE_EXPORT class CleanupAction : public SyncAction
class KDE_EXPORT CleanupAction : public SyncAction
{
public:
/** Constructor. */
@ -100,7 +100,7 @@ protected:
* and not do anything spectacular. It lists all the databases
* on the handheld in the sync log.
*/
KDE_EXPORT class TestLink : public SyncAction
class KDE_EXPORT TestLink : public SyncAction
{
public:
/** Constructor. */

@ -32,7 +32,7 @@
#include "kpilotlink.h"
/** @file
* Definition of the local link class; implemented in kpilotlink.cc .
* Definition of the local link class; implemented in kpilotlink.cpp .
*/

@ -1,4 +1,4 @@
/* pilot.cc KPilot
/* pilot.cpp KPilot
**
** Copyright (C) 1998-2001 by Dan Pilone
** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>

@ -60,7 +60,7 @@ class PilotCategoryInfo; // ... and category information
* as mapping user-visible strings from UTF8 (KDE side) to
* the encoding used on the handheld.
*/
namespace Pilot
namespace Pilot KDE_EXPORT
{
/** Maximum size of an AppInfo block, taken roughly from the pilot-link source. */
static const int MAX_APPINFO_SIZE=8192;

@ -59,7 +59,7 @@ typedef PilotAppInfo<
* A phone slot value may be invalid. If so, operations on it will
* fail (yielding invalid again) and isValid() will return @c false.
*/
class PhoneSlot
class KDE_EXPORT PhoneSlot
{
friend class PilotAddress;
protected:
@ -125,7 +125,7 @@ private:
} ;
class PilotAddressInfo : public PilotAddressInfo_
class KDE_EXPORT PilotAddressInfo : public PilotAddressInfo_
{
public:
PilotAddressInfo(PilotDatabase *d) : PilotAddressInfo_(d)

@ -1,4 +1,4 @@
/* pilotAppInfo.cc KPilot
/* pilotAppInfo.cpp KPilot
**
** Copyright (C) 2005-2006 Adriaan de Groot <groot@kde.org>
**

@ -1,11 +1,11 @@
#ifndef _KPILOT_PILOTDATEENTRY_H
#define _KPILOT_PILOTDATEENTRY_H
/* pilotDateEntry.h -*- C++ -*- KPilot
/* pilotDateEntry.h KPilot
**
** Copyright (C) 1998-2001 by Dan Pilone
** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/** @file pilotDateEntry.h defines a wrapper for datebook entries. */

@ -4,7 +4,7 @@
**
** Copyright (C) 1998-2001 by Dan Pilone
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -6,7 +6,7 @@
** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
** Copyright (C) 2006 Adriaan de Groot <groot@kde.org>
**
** See the .cc file for an explanation of what this file is for.
** See the .cpp file for an explanation of what this file is for.
*/
/*

@ -1,6 +1,6 @@
#ifndef _KPILOT_PILOTTODOENTRY_H
#define _KPILOT_PILOTTODOENTRY_H
/* pilotTodoEntry.h -*- C++ -*- KPilot
/* pilotTodoEntry.h KPilot
**
** Copyright (C) 1998-2001 by Dan Pilone
** Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>

@ -388,7 +388,7 @@ protected:
} ;
/** A namespace containing only static helper methods. */
namespace PluginUtility
namespace PluginUtility KDE_EXPORT
{
/** Searches the argument list for --foo=bar and returns bar, TQString() if not found.
* Don't include the -- in the argname. */

@ -337,7 +337,7 @@ int SyncAction::questionYesNo(const TQString & text,
0);
#else
// The following code is taken from KDialogBase.cc,
// The following code is taken from KDialogBase.cpp,
// part of the KDE 2.2 libraries. Copyright 2001
// by Waldo Bastian.
//
@ -449,7 +449,7 @@ int SyncAction::questionYesNoCancel(const TQString & text,
&checkboxReturn,
0);
#else
// The following code is taken from KDialogBase.cc,
// The following code is taken from KDialogBase.cpp,
// part of the KDE 2.2 libraries. Copyright 2001
// by Waldo Bastian.
//

@ -0,0 +1,6 @@
# build translations if some are already available
file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
if( _srcs )
tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
endif( )

7129
po/af.po

File diff suppressed because it is too large Load Diff

6120
po/ar.po

File diff suppressed because it is too large Load Diff

7296
po/az.po

File diff suppressed because it is too large Load Diff

6357
po/bg.po

File diff suppressed because it is too large Load Diff

5749
po/br.po

File diff suppressed because it is too large Load Diff

6951
po/bs.po

File diff suppressed because it is too large Load Diff

6510
po/ca.po

File diff suppressed because it is too large Load Diff

5949
po/cs.po

File diff suppressed because it is too large Load Diff

5725
po/cy.po

File diff suppressed because it is too large Load Diff

6560
po/da.po

File diff suppressed because it is too large Load Diff

6501
po/de.po

File diff suppressed because it is too large Load Diff

6600
po/el.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

6509
po/es.po

File diff suppressed because it is too large Load Diff

6508
po/et.po

File diff suppressed because it is too large Load Diff

6604
po/eu.po

File diff suppressed because it is too large Load Diff

6409
po/fa.po

File diff suppressed because it is too large Load Diff

7582
po/fi.po

File diff suppressed because it is too large Load Diff

6533
po/fr.po

File diff suppressed because it is too large Load Diff

6545
po/fy.po

File diff suppressed because it is too large Load Diff

5762
po/ga.po

File diff suppressed because it is too large Load Diff

6531
po/gl.po

File diff suppressed because it is too large Load Diff

7226
po/he.po

File diff suppressed because it is too large Load Diff

6384
po/hi.po

File diff suppressed because it is too large Load Diff

6857
po/hr.po

File diff suppressed because it is too large Load Diff

6438
po/hu.po

File diff suppressed because it is too large Load Diff

6224
po/is.po

File diff suppressed because it is too large Load Diff

6628
po/it.po

File diff suppressed because it is too large Load Diff

6345
po/ja.po

File diff suppressed because it is too large Load Diff

6340
po/kk.po

File diff suppressed because it is too large Load Diff

5784
po/km.po

File diff suppressed because it is too large Load Diff

6300
po/ko.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

5782
po/lt.po

File diff suppressed because it is too large Load Diff

6254
po/lv.po

File diff suppressed because it is too large Load Diff

5794
po/mk.po

File diff suppressed because it is too large Load Diff

6604
po/ms.po

File diff suppressed because it is too large Load Diff

6476
po/nb.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

6532
po/nl.po

File diff suppressed because it is too large Load Diff

6589
po/nn.po

File diff suppressed because it is too large Load Diff

5717
po/pa.po

File diff suppressed because it is too large Load Diff

6438
po/pl.po

File diff suppressed because it is too large Load Diff

6506
po/pt.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

6385
po/ro.po

File diff suppressed because it is too large Load Diff

6375
po/ru.po

File diff suppressed because it is too large Load Diff

6873
po/rw.po

File diff suppressed because it is too large Load Diff

5702
po/se.po

File diff suppressed because it is too large Load Diff

6384
po/sk.po

File diff suppressed because it is too large Load Diff

6238
po/sl.po

File diff suppressed because it is too large Load Diff

6421
po/sr.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

6429
po/sv.po

File diff suppressed because it is too large Load Diff

6290
po/ta.po

File diff suppressed because it is too large Load Diff

6685
po/tg.po

File diff suppressed because it is too large Load Diff

6640
po/tr.po

File diff suppressed because it is too large Load Diff

6458
po/uk.po

File diff suppressed because it is too large Load Diff

5705
po/uz.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,55 +1,79 @@
link_directories(${CMAKE_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_BINARY_DIR}/lib)
#################################################
#
# (C) 2019 Michele Calgaro
# michele (DOT) calgaro (AT) yahoo (DOT) it
#
# Improvements and feedbacks are welcome
#
# This file is released under GPL >= 3
#
#################################################
# Tests don't need to go into toplevel/bin, they are fine in the current dir.
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories(
${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/lib
${CMAKE_BINARY_DIR}/lib
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
# This can be used for finding data files in the source dir
add_definitions( -DTDESRCDIR=\\"${CMAKE_CURRENT_SOURCE_DIR}\\" )
link_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/lib
)
# Tests don't need to go into toplevel/bin, they are fine in the current dir.
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(testconstants_SRCS testconstants.cc)
trinity_add_executable(testconstants ${testconstants_SRCS})
target_link_libraries(testconstants kpilot ${QT_LIBRARIES})
add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants)
tde_add_check_executable( testconstants
SOURCES testconstants.cpp
LINK kpilot-shared ${TQT_LIBRARIES}
TEST
)
set(testcategories_SRCS testcategories.cc)
trinity_add_executable(testcategories ${testcategories_SRCS})
target_link_libraries(testcategories kpilot ${QT_LIBRARIES})
add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories)
tde_add_check_executable( testcategories
SOURCES testcategories.cpp
LINK kpilot-shared ${TQT_LIBRARIES}
TEST
)
set(testaddresses_SRCS testaddress.cc)
trinity_add_executable(testaddresses ${testaddresses_SRCS})
target_link_libraries(testaddresses kpilot ${QT_LIBRARIES})
add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses)
tde_add_check_executable( testaddresses
SOURCES testaddress.cpp
LINK kpilot-shared ${TQT_LIBRARIES}
TEST
)
set(testdatebook_SRCS testdatebook.cc)
trinity_add_executable(testdatebook ${testdatebook_SRCS})
target_link_libraries(testdatebook kpilot ${QT_LIBRARIES})
add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook)
tde_add_check_executable( testdatebook
SOURCES testdatebook.cpp
LINK kpilot-shared ${TQT_LIBRARIES}
TEST
)
set(testidmapper_SRCS testidmapper.cc)
trinity_add_executable(testidmapper ${testidmapper_SRCS})
target_link_libraries(testidmapper kpilot ${QT_LIBRARIES})
add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper)
tde_add_check_executable( importaddresses
SOURCES importaddresses.cpp
LINK kpilot-shared tdeabc-shared tdeabc_file-shared ${TQT_LIBRARIES}
)
add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses --data-dir "${CMAKE_CURRENT_BINARY_DIR}" --address-file "${CMAKE_CURRENT_SOURCE_DIR}/data/AddressDB.pdb")
if (HAVE_CALENDARLOCAL_H)
set(importdatebook_SRCS importdatebook.cc)
set(exportdatebook_SRCS exportdatebook.cc)
set(mergecalendars_SRCS mergecalendars.cc)
trinity_add_executable(importdatebook ${importdatebook_SRCS})
trinity_add_executable(exportdatebook ${exportdatebook_SRCS})
trinity_add_executable(mergecalendars ${mergecalendars_SRCS})
target_link_libraries(importdatebook kpilot ${QT_LIBRARIES} kcal)
target_link_libraries(exportdatebook kpilot ${QT_LIBRARIES} kcal)
target_link_libraries(mergecalendars ${QT_LIBRARIES} kcal)
add_test(importdatebook ${EXECUTABLE_OUTPUT_PATH}/importdatebook)
add_test(exportdatebook ${EXECUTABLE_OUTPUT_PATH}/exportdatebook)
add_test(mergecalendars ${EXECUTABLE_OUTPUT_PATH}/mergecalendars)
endif (HAVE_CALENDARLOCAL_H)
tde_add_check_executable( importdatebook
SOURCES importdatebook.cpp
LINK kpilot-shared kcal-shared ${TQT_LIBRARIES}
TEST
)
set(importaddresses_SRCS importaddresses.cc)
trinity_add_executable(importaddresses ${importaddresses_SRCS})
target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} tdeabc tdeabc_file)
add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses)
tde_add_check_executable( exportdatebook
SOURCES exportdatebook.cpp
LINK kpilot-shared kcal-shared ${TQT_LIBRARIES}
TEST
)
tde_add_check_executable( mergecalendars
SOURCES mergecalendars.cpp
LINK kpilot-shared kcal-shared ${TQT_LIBRARIES}
TEST
)
endif (HAVE_CALENDARLOCAL_H)

@ -41,8 +41,8 @@
#include "pilot.h"
#include "pilotDateEntry.h"
#include "pilotLocalDatabase.h"
#include "../conduits/vcalconduit/kcalRecord.cc"
#include "../conduits/vcalconduit/vcalRecord.cc"
#include "../conduits/vcalconduit/kcalRecord.cpp"
#include "../conduits/vcalconduit/vcalRecord.cpp"
static const TDECmdLineOptions options[] =
{

@ -41,7 +41,7 @@
#include "pilotLocalDatabase.h"
#include "pilotAddress.h"
#include "../conduits/abbrowserconduit/tdeabcRecord.h"
#include "../conduits/abbrowserconduit/tdeabcRecord.cc"
#include "../conduits/abbrowserconduit/tdeabcRecord.cpp"
static const TDECmdLineOptions options[] =
{
@ -59,8 +59,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc,argv,&aboutData);
TDECmdLineArgs::addCmdLineOptions( options );
// TDEApplication app( false, false );
TDEApplication app;
TDEApplication app( false, false );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

@ -40,8 +40,8 @@
#include "pilot.h"
#include "pilotDateEntry.h"
#include "pilotLocalDatabase.h"
#include "../conduits/vcalconduit/kcalRecord.cc"
#include "../conduits/vcalconduit/vcalRecord.cc"
#include "../conduits/vcalconduit/kcalRecord.cpp"
#include "../conduits/vcalconduit/vcalRecord.cpp"
static const TDECmdLineOptions options[] =
{
Loading…
Cancel
Save