diff -Nru kepas-0.9+repack/CMakeLists.txt kepas-0.9+svn080923/CMakeLists.txt --- kepas-0.9+repack/CMakeLists.txt 2008-01-29 17:36:05.000000000 +0100 +++ kepas-0.9+svn080923/CMakeLists.txt 2008-08-26 09:30:54.000000000 +0200 @@ -28,3 +28,4 @@ add_subdirectory ( src ) +add_subdirectory ( icons ) diff -Nru kepas-0.9+repack/debian/cdbs/cmake.mk kepas-0.9+svn080923/debian/cdbs/cmake.mk --- kepas-0.9+repack/debian/cdbs/cmake.mk 2008-09-23 14:14:01.000000000 +0200 +++ kepas-0.9+svn080923/debian/cdbs/cmake.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright (C) 2006 Peter Rockai -# Copyright (C) 2006 Fathi Boudra -# Description: A class for cmake packages -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. - -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_class_cmake -_cdbs_class_cmake := 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -ifdef _cdbs_tarball_dir -DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE) -else -DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE) -endif - -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR) -DEB_CMAKE_PREFIX =/usr - -# Overriden from makefile-vars.mk -# We pass CFLAGS and friends to ./configure, so no need to pass them to make -DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR) - -include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix) - -common-configure-arch common-configure-indep:: common-configure-impl -common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt -$(DEB_BUILDDIR)/CMakeCache.txt: - cd $(DEB_BUILDDIR) && cmake $(CURDIR)/$(DEB_SRCDIR) \ - -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \ - $(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \ - -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON - mkdir -p $(DEB_DESTDIR) - -cleanbuilddir:: - -if test "$(DEB_BUILDDIR)" != "$(DEB_SRCDIR)"; then rm -rf $(DEB_BUILDDIR); fi - -endif - diff -Nru kepas-0.9+repack/debian/cdbs/kde.mk kepas-0.9+svn080923/debian/cdbs/kde.mk --- kepas-0.9+repack/debian/cdbs/kde.mk 2008-09-23 14:14:01.000000000 +0200 +++ kepas-0.9+svn080923/debian/cdbs/kde.mk 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -# until bug 377524 resolved. -include debian/cdbs/cmake.mk -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el -DEB_CMAKE_EXTRA_FLAGS += \ - $(DEB_CMAKE_DEBUG_FLAGS) \ - $(KDE4-ENABLE-FINAL) \ - -DKDE4_BUILD_TESTS=true \ - -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" \ - -DXDG_APPS_INSTALL_DIR=/usr/share/applications/kde4/ \ - -DCONFIG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/etc/kde4 \ - -DDATA_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/apps \ - -DHTML_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/doc/kde4/HTML \ - -DKCFG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/config.kcfg \ - -DLIB_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/lib \ - -DSYSCONF_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/etc \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" - -DEB_CMAKE_PREFIX = /usr/lib/kde4 -DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/ -DEB_KDE_ENABLE_FINAL ?= -#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share -#DEB_STRIP_EXCLUDE = so - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - KDE4-ENABLE-FINAL = $(if $(DEB_KDE_ENABLE_FINAL),-DKDE4_ENABLE_FINAL=true,) - else - KDE4-ENABLE-FINAL = - endif -endif - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - #no optimizations, full debug - DEB_CMAKE_DEBUG_FLAGS = -DCMAKE_BUILD_TYPE=debugfull -else - #This is around -O2 -g - DEB_CMAKE_DEBUG_FLAGS = -DCMAKE_BUILD_TYPE=relwithdebinfo -endif - -common-build-arch:: debian/stamp-man-pages -debian/stamp-man-pages: - if ! test -d debian/man/out; then mkdir -p debian/man/out; fi - for f in $$(find debian/man -name '*.sgml'); do \ - docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ - done - for f in $$(find debian/man -name '*.man'); do \ - soelim -I debian/man $$f \ - > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ - done - touch debian/stamp-man-pages - -clean:: -ifndef THIS_SHOULD_GO_TO_UNSTABLE - #guard against experimental uploads to unstable - #dpkg-parsechangelog | grep ^Distribution | grep -q experimental -endif - rm -rf debian/man/out - -rmdir debian/man - rm -f debian/stamp-man-pages - rm -f CMakeCache.txt - - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi - if test -e debian/$(cdbs_curpkg).lintian; then \ - install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ - fi - if test -e debian/$(cdbs_curpkg).presubj; then \ - install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ - fi - -binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: - set -e; \ - for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \ - pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ - echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ - meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \ - done - for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ - done - -#For Kubuntu paths create custom binary wrapper and .desktop menu files -kde4-wrapper-creation: - if [ -e $(DEB_DESTDIR)/usr/share/applications/kde4/ ]; then \ - for file in `ls $(DEB_DESTDIR)/usr/share/applications/kde4/`; do \ - sed -i 's,Exec=,Exec=/usr/lib/kde4/bin/,' $(DEB_DESTDIR)/usr/share/applications/kde4/$${file}; \ - done; \ - fi - -common-install-indep:: kde4-wrapper-creation -common-install-arch:: kde4-wrapper-creation diff -Nru kepas-0.9+repack/debian/changelog kepas-0.9+svn080923/debian/changelog --- kepas-0.9+repack/debian/changelog 2008-09-23 14:14:01.000000000 +0200 +++ kepas-0.9+svn080923/debian/changelog 2008-09-23 14:14:02.000000000 +0200 @@ -1,3 +1,28 @@ +kepas (0.9+svn080923-0ubuntu1) intrepid; urgency=low + + [ Guillaume Martres ] + * New upstream snapshot, compatible with Plasma from KDE 4.1 + * debian/rules: + - use kde4.mk + - removed get-orig-source, not necessary anymore + - added get-orig-svn + * debian/control: + - ensure cdbs version is (>= 0.4.52ubuntu7) for kde4.mk + - bumped Standards-Version to 3.8.0 + for transition + - added binary package plasmoid-kepas, kepastray binary is now + in the kepas binary package + - added Vcs-* fields + * removed debian/cdbs, not needed with kde4.mk + * added debian/kepas.postinst to fix lintian postinst-must-call-ldconfig + * added debian/{plasmoid-kepas,kepas}.install and debian/not-installed + + [ Harald Sitter ] + * Due to kde4.mk build dependency on quilt is necessary + * Don't exceed 80 characters in debian/control + + -- Guillaume Martres Tue, 23 Sep 2008 13:22:53 +0200 + kepas (0.9+repack-0ubuntu1) hardy; urgency=low * Initial release (LP: #185010) diff -Nru kepas-0.9+repack/debian/control kepas-0.9+svn080923/debian/control --- kepas-0.9+repack/debian/control 2008-09-23 14:14:01.000000000 +0200 +++ kepas-0.9+svn080923/debian/control 2008-09-23 14:14:02.000000000 +0200 @@ -3,16 +3,34 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Guillaume Martres -Build-Depends: cdbs, debhelper (>= 6), cmake, kdebase-workspace-dev -Standards-Version: 3.7.3 +Build-Depends: cdbs (>= 0.4.52ubuntu7), debhelper (>= 6), cmake, quilt, + kdebase-workspace-dev +Standards-Version: 3.8.0 Homepage: http://sourceforge.net/projects/kepas/ +Vcs-Bzr: lp:~kubuntu-members/kepas/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kepas/ubuntu/files -Package: kepas +Package: plasmoid-kepas Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, kepas (>= 0.9+svn080903) +Conflicts: kepas (<= 0.9) Description: KDE Easy Publish and Share Kepas is a zeroconf KDE4 filetransfer tool. It discovers your local LAN for buddies (KDNSSD) and Kopete ICQ contacts and lets you transfer files or Klipper entries from a trayicon or via drag'n drop with the Kepas plasmoid. + . + This package contains the Kepas plasmoid + +Package: kepas +Architecture: any +Depends: ${shlibs:Depends}, plasmoid-kepas +Description: KDE Easy Publish and Share (dummy package) + Kepas is a zeroconf KDE4 filetransfer tool. + It discovers your local LAN for buddies (KDNSSD) and + Kopete ICQ contacts and lets you transfer files or + Klipper entries from a trayicon or via drag'n drop + with the Kepas plasmoid. + . + This package contains the Kepas tray icon diff -Nru kepas-0.9+repack/debian/kepas.install kepas-0.9+svn080923/debian/kepas.install --- kepas-0.9+repack/debian/kepas.install 1970-01-01 01:00:00.000000000 +0100 +++ kepas-0.9+svn080923/debian/kepas.install 2008-09-23 14:14:02.000000000 +0200 @@ -0,0 +1,7 @@ +/usr/share/applications/kde4/kepas.desktop +/usr/share/icons/* +/usr/share/kde4/apps/kepas/kepas.notifyrc +/usr/bin/kepastray +/usr/lib/libkpf.so +/usr/lib/libkepas.so + diff -Nru kepas-0.9+repack/debian/kepas.postinst kepas-0.9+svn080923/debian/kepas.postinst --- kepas-0.9+repack/debian/kepas.postinst 1970-01-01 01:00:00.000000000 +0100 +++ kepas-0.9+svn080923/debian/kepas.postinst 2008-09-23 14:14:02.000000000 +0200 @@ -0,0 +1,42 @@ +#!/bin/sh +# postinst script for kepas +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ldconfig + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff -Nru kepas-0.9+repack/debian/not-installed kepas-0.9+svn080923/debian/not-installed --- kepas-0.9+repack/debian/not-installed 1970-01-01 01:00:00.000000000 +0100 +++ kepas-0.9+svn080923/debian/not-installed 2008-09-23 14:14:02.000000000 +0200 @@ -0,0 +1,2 @@ +# seems to be the same than /usr/share/kde4/apps/kepas/kepas.notifyrc +./usr/share/kde4/apps/plasma/plasma.notifyrc diff -Nru kepas-0.9+repack/debian/plasmoid-kepas.install kepas-0.9+svn080923/debian/plasmoid-kepas.install --- kepas-0.9+repack/debian/plasmoid-kepas.install 1970-01-01 01:00:00.000000000 +0100 +++ kepas-0.9+svn080923/debian/plasmoid-kepas.install 2008-09-23 14:14:02.000000000 +0200 @@ -0,0 +1,3 @@ +/usr/share/kde4/services/plasma-applet-kepas.desktop +/usr/lib/kde4/plasma_applet_kepas.so + diff -Nru kepas-0.9+repack/debian/rules kepas-0.9+svn080923/debian/rules --- kepas-0.9+repack/debian/rules 2008-09-23 14:14:01.000000000 +0200 +++ kepas-0.9+svn080923/debian/rules 2008-09-23 14:14:02.000000000 +0200 @@ -1,15 +1,16 @@ #!/usr/bin/make -f -include debian/cdbs/kde.mk +include /usr/share/cdbs/1/class/kde4.mk -# Path to the debian directory DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname ) -get-orig-source: - cd ${DEBIAN_DIR}/.. && \ - version=$$(uscan --force-download --dehs | \ - sed -n 's/.*\(.*\)<\/upstream-version>.*/\1/p') && \ - tar xf ../kepas-$${version}.tar.bz2 && \ - cp /usr/share/common-licenses/GPL-2 kepas-$${version}/COPYING && \ - tar czf ${CURDIR}/${DEB_SOURCE_PACKAGE}_$${version}.orig.tar.gz kepas-$${version} && \ - rm -r kepas-$${version} +DATE := $(shell date +%y%m%d) +VERSION := $(word 1, $(subst +, ,$(DEB_UPSTREAM_VERSION))) +DIR := ${DEB_SOURCE_PACKAGE}-${VERSION}+svn${DATE} +TAR := ${DEB_SOURCE_PACKAGE}_${VERSION}+svn${DATE}.orig.tar.gz + +get-orig-svn: + cd ${DEBIAN_DIR}/.. && \ + svn export svn://anonsvn.kde.org/home/kde/trunk/playground/network/kepas ${DIR} && \ + tar czf ${CURDIR}/${TAR} ${DIR} && \ + rm -r ${DIR} diff -Nru kepas-0.9+repack/icons/CMakeLists.txt kepas-0.9+svn080923/icons/CMakeLists.txt --- kepas-0.9+repack/icons/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ kepas-0.9+svn080923/icons/CMakeLists.txt 2008-08-26 09:30:54.000000000 +0200 @@ -0,0 +1 @@ +kde4_install_icons( ${ICON_INSTALL_DIR} ) Binary files /tmp/YHc293vFBj/kepas-0.9+repack/icons/hi16-app-kepas.png and /tmp/jehoAYjM9Z/kepas-0.9+svn080923/icons/hi16-app-kepas.png differ Binary files /tmp/YHc293vFBj/kepas-0.9+repack/icons/hi32-app-kepas.png and /tmp/jehoAYjM9Z/kepas-0.9+svn080923/icons/hi32-app-kepas.png differ diff -Nru kepas-0.9+repack/src/CMakeLists.txt kepas-0.9+svn080923/src/CMakeLists.txt --- kepas-0.9+repack/src/CMakeLists.txt 2008-01-29 17:36:05.000000000 +0100 +++ kepas-0.9+svn080923/src/CMakeLists.txt 2008-08-26 09:30:54.000000000 +0200 @@ -18,6 +18,7 @@ if(PLASMA_FOUND) + #MESSAGE(STATUS "Plasma applets was disable until it will ported to new API") add_subdirectory(plasma) endif(PLASMA_FOUND) @@ -34,4 +35,5 @@ install( FILES kepas.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kepas) install( FILES plasma.notifyrc DESTINATION ${DATA_INSTALL_DIR}/plasma) +install(FILES kepas.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff -Nru kepas-0.9+repack/src/kepas.desktop kepas-0.9+svn080923/src/kepas.desktop --- kepas-0.9+repack/src/kepas.desktop 1970-01-01 01:00:00.000000000 +0100 +++ kepas-0.9+svn080923/src/kepas.desktop 2008-09-23 09:15:22.000000000 +0200 @@ -0,0 +1,15 @@ +[Desktop Entry] +Name=Kepas +Exec=kepastray +Icon=kepas +Type=Application +Terminal=false +Categories=Qt;KDE;Network;FileTransfer; +Comment=Kepas - KDE Easy Publish and Share +Comment[es]=Kepas. Publicar y compartir fácil para KDE +Comment[et]=Kepas - KDE lihtne avaldamine ja jagamine +Comment[it]=Kepas - Pubblica e condividi in maniera semplice su KDE +Comment[pt]=Kepas - Publicação e Partilha Simples no KDE +Comment[sv]=Kepas - publicera och dela enkelt i KDE +X-DBUS-StartupType=Unique +X-KDE-StartupNotify=false diff -Nru kepas-0.9+repack/src/kepas.notifyrc kepas-0.9+svn080923/src/kepas.notifyrc --- kepas-0.9+repack/src/kepas.notifyrc 2008-01-08 20:34:44.000000000 +0100 +++ kepas-0.9+svn080923/src/kepas.notifyrc 2008-09-20 14:12:50.000000000 +0200 @@ -1,9 +1,37 @@ [Global] IconName=folder-remote Comment=Kepas +Comment[x-test]=xxKepasxx [Event/incommingFileTransfer] Name=FileTransfer +Name[be]=Перадача файлу +Name[es]=TransferenciaArchivos +Name[et]=Failiülekanne +Name[ga]=Aistriú Comhaid +Name[km]=ការ​ផ្ទេរ​ឯកសារ +Name[nl]=Bestandenoverdracht +Name[pt]=Transferência de Ficheiros +Name[pt_BR]=Transferência de arquivo +Name[sv]=Filöverföring +Name[tr]=Dosya Aktarımı +Name[uk]=Перенесення файла +Name[x-test]=xxFileTransferxx Comment=Incomming File Transfer +Comment[be]=Уваходная перадача файла +Comment[el]=Εισερχόμενες μεταφορές αρχείων +Comment[es]=Transferencia de archivos entrante +Comment[et]=Sisenev failiülekanne +Comment[fr]=Arrivée d'un transfert de fichier +Comment[ga]=Aistriú Comhaid Isteach +Comment[gl]=Transferencia de ficheiro entrante +Comment[km]=ការ​ផ្ទេរ​ឯកសារ​ចូល +Comment[nl]=Inkomende bestandenoverdracht +Comment[pt]=Transferência de Ficheiro Recebida +Comment[pt_BR]=Transferência de arquivo recebido +Comment[sv]=Inkommande filöverföring +Comment[tr]=Gelen dosya aktarımı +Comment[uk]=Вхідне перенесення файла +Comment[x-test]=xxIncomming File Transferxx Action=Popup Persistent=true diff -Nru kepas-0.9+repack/src/lib/buddylist.ui kepas-0.9+svn080923/src/lib/buddylist.ui --- kepas-0.9+repack/src/lib/buddylist.ui 2008-01-06 23:27:11.000000000 +0100 +++ kepas-0.9+svn080923/src/lib/buddylist.ui 2008-06-02 13:18:14.000000000 +0200 @@ -370,9 +370,6 @@ - - BuddyList - diff -Nru kepas-0.9+repack/src/lib/CMakeLists.txt kepas-0.9+svn080923/src/lib/CMakeLists.txt --- kepas-0.9+repack/src/lib/CMakeLists.txt 2008-01-24 01:02:31.000000000 +0100 +++ kepas-0.9+svn080923/src/lib/CMakeLists.txt 2008-07-22 02:45:12.000000000 +0200 @@ -36,8 +36,8 @@ kde4_add_library(kepas SHARED ${libkifer_SRCS}) target_link_libraries(kepas - ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS}) + ${QT_QTNETWORK_LIBRARY} ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS}) install(TARGETS kepas - DESTINATION ${LIB_INSTALL_DIR}) + ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -Nru kepas-0.9+repack/src/lib/config.ui kepas-0.9+svn080923/src/lib/config.ui --- kepas-0.9+repack/src/lib/config.ui 2007-12-13 14:31:48.000000000 +0100 +++ kepas-0.9+svn080923/src/lib/config.ui 2008-03-04 12:47:19.000000000 +0100 @@ -9,9 +9,6 @@ 98 - - Form - diff -Nru kepas-0.9+repack/src/lib/servicelocator.cpp kepas-0.9+svn080923/src/lib/servicelocator.cpp --- kepas-0.9+repack/src/lib/servicelocator.cpp 2008-02-01 14:23:24.000000000 +0100 +++ kepas-0.9+svn080923/src/lib/servicelocator.cpp 2008-04-10 17:46:24.000000000 +0200 @@ -76,6 +76,7 @@ kDebug() << "user " << username; kDebug() << "homedir " << receiver->getTargetPath(); + kDebug() << "serverPort " << server->serverPort(); // QMap serviceID; // QByteArray dataID; @@ -98,13 +99,20 @@ service = new DNSSD::PublicService("kepas on " + username + "@" + hostname,"_giver._tcp",server->serverPort(),"local."); service->setTextData(serviceID); - bool isOK = service->publish(); + + //we need to publish asynchron, otherwise plasma will crash on login, when loading kepas!! + connect(service,SIGNAL(published(bool)),this,SLOT(wasPublished(bool))); + service->publishAsync(); + + +} +void ServiceLocator::wasPublished(bool isOK) +{ if (isOK) kDebug() << "Service published on port " << server->serverPort(); else kDebug() << "Service not published"; - } bool ServiceLocator::restartPublish() diff -Nru kepas-0.9+repack/src/lib/servicelocator.h kepas-0.9+svn080923/src/lib/servicelocator.h --- kepas-0.9+repack/src/lib/servicelocator.h 2008-02-01 01:17:34.000000000 +0100 +++ kepas-0.9+svn080923/src/lib/servicelocator.h 2008-04-10 17:46:24.000000000 +0200 @@ -57,8 +57,6 @@ private: -// const AvahiPoll* avahiPoll; -// AvahiClient* client; DNSSD::ServiceBrowser* browser; DNSSD::ServiceBrowser* httpBrowser; QTcpServer* server; @@ -83,6 +81,7 @@ void slotNewConnection(); void launchReceiver(); void checkBrowseFinished(); + void wasPublished(bool); signals: diff -Nru kepas-0.9+repack/src/libkpf/CMakeLists.txt kepas-0.9+svn080923/src/libkpf/CMakeLists.txt --- kepas-0.9+repack/src/libkpf/CMakeLists.txt 2008-01-29 17:36:05.000000000 +0100 +++ kepas-0.9+svn080923/src/libkpf/CMakeLists.txt 2008-05-26 22:11:02.000000000 +0200 @@ -72,5 +72,5 @@ ${QT_QT3SUPPORT_LIBRARIES} ${KDE4_KDNSSD_LIBRARY}) install(TARGETS kpf - DESTINATION ${LIB_INSTALL_DIR}) + ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -Nru kepas-0.9+repack/src/libkpf/PropertiesDialogPlugin.cpp kepas-0.9+svn080923/src/libkpf/PropertiesDialogPlugin.cpp --- kepas-0.9+repack/src/libkpf/PropertiesDialogPlugin.cpp 2008-01-29 17:36:05.000000000 +0100 +++ kepas-0.9+svn080923/src/libkpf/PropertiesDialogPlugin.cpp 2008-03-07 11:39:39.000000000 +0100 @@ -787,8 +787,9 @@ { case Enable: { - // DCOPRef ref = - // d->webServerManagerInterface->createServer +#if 0 + DCOPRef ref = + d->webServerManagerInterface->createServer ( d->url.path(), d->wantedState.listenPort, @@ -797,6 +798,7 @@ d->wantedState.followSymlinks, d->wantedState.serverName ); +#endif /* if (ref.isNull()) { diff -Nru kepas-0.9+repack/src/libkpf/StartingKPFDialog.cpp kepas-0.9+svn080923/src/libkpf/StartingKPFDialog.cpp --- kepas-0.9+repack/src/libkpf/StartingKPFDialog.cpp 2008-01-29 17:36:05.000000000 +0100 +++ kepas-0.9+svn080923/src/libkpf/StartingKPFDialog.cpp 2008-03-07 11:39:39.000000000 +0100 @@ -106,21 +106,6 @@ { enableButtonOk(true); enableButtonCancel(false); - - if (kpfRunning()) - { - kpfDebug << "slotTimeout: kpf is running now" << endl; - } - else - { - kpfDebug << "slotTimeout: kpf still not running" << endl; - } - } - - bool - StartingKPFDialog::kpfRunning() - { -// return kapp->dcopClient()->isApplicationRegistered("kpf"); } void diff -Nru kepas-0.9+repack/src/libkpf/StartingKPFDialog.h kepas-0.9+svn080923/src/libkpf/StartingKPFDialog.h --- kepas-0.9+repack/src/libkpf/StartingKPFDialog.h 2008-01-29 17:36:05.000000000 +0100 +++ kepas-0.9+svn080923/src/libkpf/StartingKPFDialog.h 2008-03-07 11:39:39.000000000 +0100 @@ -49,10 +49,6 @@ void slotTimeout(); void slotApplicationRegistered(const Q3CString &); - protected: - - bool kpfRunning(); - private: class Private; diff -Nru kepas-0.9+repack/src/plasma/CMakeLists.txt kepas-0.9+svn080923/src/plasma/CMakeLists.txt --- kepas-0.9+repack/src/plasma/CMakeLists.txt 2008-02-01 01:17:34.000000000 +0100 +++ kepas-0.9+svn080923/src/plasma/CMakeLists.txt 2008-08-25 13:40:37.000000000 +0200 @@ -12,7 +12,7 @@ kde4_add_plugin(plasma_applet_kepas ${kifer-plasma_SRCS}) target_link_libraries(plasma_applet_kepas - ${KDE4_KIO_LIBRARY} ${PLASMA_LIBS} ${KDE4_KDEUI_LIBS} kepas kpf) + ${KDE4_KIO_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${PLASMA_LIBS} ${KDE4_KDEUI_LIBS} kepas kpf) install(TARGETS plasma_applet_kepas DESTINATION ${PLUGIN_INSTALL_DIR}) diff -Nru kepas-0.9+repack/src/plasma/plasma-applet-kepas.desktop kepas-0.9+svn080923/src/plasma/plasma-applet-kepas.desktop --- kepas-0.9+repack/src/plasma/plasma-applet-kepas.desktop 2008-01-19 13:11:46.000000000 +0100 +++ kepas-0.9+svn080923/src/plasma/plasma-applet-kepas.desktop 2008-09-23 09:15:22.000000000 +0200 @@ -2,6 +2,9 @@ Encoding=UTF-8 Name=Kepas Comment=Kepas - KDE Easy Publish and Share +Comment[es]=Kepas. Publicar y compartir fácil para KDE +Comment[et]=Kepas - KDE lihtne avaldamine ja jagamine +Comment[it]=Kepas - Pubblica e condividi in maniera semplice su KDE Comment[pt]=Kepas - Publicação e Partilha Simples no KDE Comment[sv]=Kepas - publicera och dela enkelt i KDE Icon=folder-remote diff -Nru kepas-0.9+repack/src/plasma/plasma-kifer.cpp kepas-0.9+svn080923/src/plasma/plasma-kifer.cpp --- kepas-0.9+repack/src/plasma/plasma-kifer.cpp 2008-02-01 01:17:34.000000000 +0100 +++ kepas-0.9+svn080923/src/plasma/plasma-kifer.cpp 2008-07-28 16:19:49.000000000 +0200 @@ -36,10 +36,25 @@ PlasmaKifer::PlasmaKifer(QObject *parent, const QVariantList &args) : Plasma::Applet(parent, args), -// m_svg("widgets/background", this), -// m_size(100,100), m_icon(0) { + setHasConfigurationInterface(true); + m_dialog = 0; + publicServerWiz = 0; + configDialog = 0; + + setAspectRatioMode(Plasma::ConstrainedSquare); + setBackgroundHints(NoBackground); + m_icon = new Plasma::Icon(KIcon("folder-remote"),QString(),this); + m_icon->setNumDisplayLines(1); + m_icon->setDrawBackground(true); + QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(this); + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); + + layout->addItem(m_icon); + + resize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Desktop))); } @@ -49,30 +64,20 @@ avahiClient = new ServiceLocator(this); // connect(avahiClient, SIGNAL(serviceRuns()),this, SLOT(failedToStart())); - m_icon = new Plasma::Icon(KIcon("folder-remote"),QString(),this); -// m_icon->setDrawBackground(true); - m_icon->installSceneEventFilter(this); - -// icon = (KIcon*)m_icon; createMenu(); connect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); connect(&m_menu, SIGNAL(aboutToHide()),m_icon, SLOT(setUnpressed())); - setHasConfigurationInterface(true); setAcceptDrops(true); setAcceptsHoverEvents(true); - setDrawStandardBackground(false); - m_svg.setContentType(Plasma::Svg::SingleImage); - m_dialog = 0; - publicServerWiz = 0; - configDialog = 0; webServerHash = new QHash; webServerMenuHash = new QHash; actionHash = new QHash; config = new KConfig("kepasrc"); confGroup = new KConfigGroup(config,"General"); + if (confGroup->exists()) { avahiClient->receiver->setTargetPath(confGroup->readEntry("Path",avahiClient->receiver->getTargetPath())); avahiClient->setUserName(confGroup->readEntry("Nick",avahiClient->getUserName())); @@ -83,11 +88,6 @@ PlasmaKifer::~PlasmaKifer() { - if (failedToLaunch()) { - // Do some cleanup here - } else { - // Save settings - } if (m_dialog) delete m_dialog; @@ -120,44 +120,33 @@ void PlasmaKifer::failedToStart() { - - m_icon->setIcon(KIcon("dialog-information")); + m_icon->setIcon(KIcon("dialog-information")); m_icon->setText("Service already running"); m_menu.clear(); } -void PlasmaKifer::constraintsUpdated(Plasma::Constraints constraints) +void PlasmaKifer::constraintsEvent(Plasma::Constraints constraints) { - setDrawStandardBackground(false); + setBackgroundHints(NoBackground); + if (constraints & Plasma::FormFactorConstraint) { + disconnect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); + if (formFactor() == Plasma::Planar || formFactor() == Plasma::MediaCenter) { + connect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); m_icon->setText(i18n("Kepas")); - setMinimumContentSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Desktop))); + m_icon->setDrawBackground(true); + setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Desktop))); } else { - m_icon->setText(0); - m_icon->setInfoText(0); - setMinimumContentSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Panel))); + connect(m_icon, SIGNAL(pressed(bool)),this, SLOT(popup(bool))); + m_icon->setText(QString()); +// m_icon->setInfoText(QString()); + setMinimumSize(m_icon->sizeFromIconSize(IconSize(KIconLoader::Small))); + m_icon->setDrawBackground(false); } -// m_icon->setIcon(KIcon("applications-internet")); - } - if (constraints & Plasma::SizeConstraint && m_icon) { - setContentSize(size()); - m_icon->resize(size()); } - updateGeometry(); -} - - -void PlasmaKifer::setContentSize(const QSizeF& size) -{ - m_size = size; -} - -QSizeF PlasmaKifer::contentSizeHint() const -{ - return m_size; } void PlasmaKifer::createMenu() @@ -188,7 +177,7 @@ m_menu.hide(); return; } - +/* QPointF scenePos = mapToScene(boundingRect().topLeft()); QGraphicsView *viewWidget = view(); QDesktopWidget *desktop = QApplication::desktop(); @@ -202,33 +191,18 @@ if (globalPos.y() + size.height() + menuHeight < desktopRect.bottom()) { - globalPos.ry() += contentSize().height(); + globalPos.ry() += geometry().size().height(); }else{ globalPos.ry() -= menuHeight; } - m_menu.popup(globalPos); +// m_menu.popup(globalPos); +*/ + m_menu.popup(popupPosition(m_menu.sizeHint())); m_icon->setPressed(); - } - addClipEntries(); +// } + addClipEntries(); } -/* -void PlasmaKifer::paintInterface(QPainter *p, - const QStyleOptionGraphicsItem *option, const QRect &contentsRect) -{ - p->setRenderHint(QPainter::SmoothPixmapTransform); - p->setRenderHint(QPainter::Antialiasing); - - m_svg.resize((int)contentsRect.width(), (int)contentsRect.height()); - m_svg.paint(p, (int)contentsRect.left(), (int)contentsRect.top()); - - p->drawPixmap(20, 0, icon.pixmap((int)contentsRect.width() - 40)); - p->save(); - - p->restore(); -} -*/ - void PlasmaKifer::dragEnterEvent(QGraphicsSceneDragDropEvent *event) { kDebug() << event->mimeData()->formats(); diff -Nru kepas-0.9+repack/src/plasma/plasma-kifer.h kepas-0.9+svn080923/src/plasma/plasma-kifer.h --- kepas-0.9+repack/src/plasma/plasma-kifer.h 2008-02-01 01:17:34.000000000 +0100 +++ kepas-0.9+svn080923/src/plasma/plasma-kifer.h 2008-07-28 16:19:49.000000000 +0200 @@ -65,21 +65,16 @@ PlasmaKifer(QObject *parent, const QVariantList &args); ~PlasmaKifer(); -// void paintInterface(QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect& contentsRect); - void setContentSize(const QSizeF& size); - QSizeF contentSizeHint() const; void init(); - void dragEnterEvent(QGraphicsSceneDragDropEvent *event); void dropEvent(QGraphicsSceneDragDropEvent *event); void showConfigurationInterface(); - void constraintsUpdated(Plasma::Constraints constraints); + void constraintsEvent(Plasma::Constraints constraints); private: Plasma::Svg m_svg; Plasma::Icon* m_icon; -// KIcon icon; QSizeF m_size; BuddyList* buddylist; ServiceLocator* avahiClient; diff -Nru kepas-0.9+repack/src/plasma.notifyrc kepas-0.9+svn080923/src/plasma.notifyrc --- kepas-0.9+repack/src/plasma.notifyrc 2008-01-10 16:08:00.000000000 +0100 +++ kepas-0.9+svn080923/src/plasma.notifyrc 2008-09-20 14:12:50.000000000 +0200 @@ -1,9 +1,37 @@ [Global] IconName=folder-remote Comment=Kepas +Comment[x-test]=xxKepasxx [Event/incommingFileTransfer] Name=FileTransfer +Name[be]=Перадача файлу +Name[es]=TransferenciaArchivos +Name[et]=Failiülekanne +Name[ga]=Aistriú Comhaid +Name[km]=ការ​ផ្ទេរ​ឯកសារ +Name[nl]=Bestandenoverdracht +Name[pt]=Transferência de Ficheiros +Name[pt_BR]=Transferência de arquivo +Name[sv]=Filöverföring +Name[tr]=Dosya Aktarımı +Name[uk]=Перенесення файла +Name[x-test]=xxFileTransferxx Comment=Incomming File Transfer +Comment[be]=Уваходная перадача файла +Comment[el]=Εισερχόμενες μεταφορές αρχείων +Comment[es]=Transferencia de archivos entrante +Comment[et]=Sisenev failiülekanne +Comment[fr]=Arrivée d'un transfert de fichier +Comment[ga]=Aistriú Comhaid Isteach +Comment[gl]=Transferencia de ficheiro entrante +Comment[km]=ការ​ផ្ទេរ​ឯកសារ​ចូល +Comment[nl]=Inkomende bestandenoverdracht +Comment[pt]=Transferência de Ficheiro Recebida +Comment[pt_BR]=Transferência de arquivo recebido +Comment[sv]=Inkommande filöverföring +Comment[tr]=Gelen dosya aktarımı +Comment[uk]=Вхідне перенесення файла +Comment[x-test]=xxIncomming File Transferxx Action=Popup Persistent=true