June 2008 - openSUSE Commits - openSUSE Mailing Lists

commit libgphoto2
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package libgphoto2 checked in at Mon Jun 30 18:25:42 CEST 2008. -------- --- GNOME/libgphoto2/libgphoto2.changes 2008-04-13 18:34:40.000000000 +0200 +++ libgphoto2/libgphoto2.changes 2008-06-28 10:04:28.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 28 10:04:02 CEST 2008 - meissner(a)suse.de + +- updated to current 2.4.1.3 branch state + - ptp2 driver backmerged + - bugfixes for new libtool/automake/autoconf + - bugfixes and translations + +------------------------------------------------------------------- Old: ---- libgphoto2-2.4.1.2.tar.bz2 New: ---- libgphoto2-2.4.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.J15513/_old 2008-06-30 18:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.J15513/_new 2008-06-30 18:24:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.4.1.2) +# spec file for package libgphoto2 (Version 2.4.1.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,8 +18,8 @@ License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library -Version: 2.4.1.2 -Release: 3 +Version: 2.4.1.3 +Release: 1 Source0: libgphoto2-%{version}.tar.bz2 Patch0: conf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -226,6 +226,11 @@ /sbin/ldconfig %changelog +* Sat Jun 28 2008 meissner(a)suse.de +- updated to current 2.4.1.3 branch state + - ptp2 driver backmerged + - bugfixes for new libtool/automake/autoconf + - bugfixes and translations * Sun Apr 13 2008 meissner(a)suse.de - fixed glibc 2.8 problem with re_compile_pattern. - fixed one topfield problem ++++++ conf.diff ++++++ --- /var/tmp/diff_new_pack.J15513/_old 2008-06-30 18:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.J15513/_new 2008-06-30 18:24:27.000000000 +0200 @@ -22,25 +22,3 @@ # report on compiler/libtool setup -@@ -337,7 +338,7 @@ dnl libusb - dnl --------------------------------------------------------------------------- - GP_CONFIG_MSG([USB ports]) - GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5], -- [usb.h],[usb_busses],[ -+ [usb.h],[usb_open],[ - IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb" - ],[], - [disable-explicitly], -Index: gphoto2-port-info-list.c -=================================================================== ---- libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c (Revision 11060) -+++ libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c (Arbeitskopie) -@@ -21,6 +21,8 @@ - * Boston, MA 02111-1307, USA. - */ - -+#define _GNU_SOURCE -+ - #include "config.h" - - #include <gphoto2/gphoto2-port-info-list.h> ++++++ libgphoto2-2.4.1.2.tar.bz2 -> libgphoto2-2.4.1.3.tar.bz2 ++++++ ++++ 94296 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lirc
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package lirc checked in at Mon Jun 30 18:21:33 CEST 2008. -------- --- lirc/lirc.changes 2008-05-07 10:40:37.000000000 +0200 +++ lirc/lirc.changes 2008-06-26 09:04:52.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 26 09:03:24 CEST 2008 - lnussel(a)suse.de + +- fix build of hw_i2cuser on 11.0+ (bnc#387587) + +------------------------------------------------------------------- New: ---- lirc-0.8.3-hw_i2cuser_header.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lirc-kernel.spec ++++++ --- /var/tmp/diff_new_pack.oT6612/_old 2008-06-30 18:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.oT6612/_new 2008-06-30 18:19:22.000000000 +0200 @@ -18,7 +18,7 @@ Group: System/Kernel Summary: LIRC kernel modules Version: 0.8.3 -Release: 2 +Release: 3 Source0: lirc-%{version}.tar.bz2 Source1: Makefile.module Source2: Makefile.modsub ++++++ lirc.spec ++++++ --- /var/tmp/diff_new_pack.oT6612/_old 2008-06-30 18:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.oT6612/_new 2008-06-30 18:19:22.000000000 +0200 @@ -14,10 +14,20 @@ Name: lirc BuildRequires: alsa-devel xorg-x11-devel # for hw_atilibusb driver +%if 0%suse_version > 1020 BuildRequires: libusb-devel +%else +BuildRequires: libusb +%endif # for hw_i2cuser driver +%if 0%suse_version > 1010 BuildRequires: linux-kernel-headers -%if %suse_version > 1020 +%if 0%suse_version > 1030 +# i2c-dev.h now moved to that package +BuildRequires: i2c-tools +%endif +%endif +%if 0%suse_version > 1020 BuildRequires: fdupes %endif Url: http://www.lirc.org/ @@ -25,7 +35,7 @@ Group: Hardware/Other AutoReqProv: on Version: 0.8.3 -Release: 2 +Release: 11 PreReq: %fillup_prereq %insserv_prereq Summary: Tools for Infrared Receivers Source0: lirc-0.8.3.tar.bz2 @@ -39,10 +49,12 @@ Patch1: lirc-sockets-in-var.diff Patch2: imon2_conf.patch Patch3: lirc-0.8.3-hw_i2cuser.diff +Patch4: lirc-0.8.3-hw_i2cuser_header.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev Suggests: lirc-kmp Provides: lirc-devel +Supplements: lirc-kmp %description LIRC is a package that supports receiving and sending IR signals with @@ -59,11 +71,16 @@ %patch1 -p1 -b .var %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE8} . #find . -type d -name CVS -print0 | xargs -0 -- rm -rf #find . -name .cvsignore -print0 | xargs -0 -- rm -rf %build +%if 0%suse_version < 1020 +# XXX: hw_i2cuser doesn't build on sles10 +sed -i -e 's/linux\/i2c-dev\.h/foobarblah.h/' configure.ac +%endif %{?suse_update_config:%{suse_update_config -fl}} autoreconf -vfi CFLAGS="%{optflags}" ./configure \ @@ -114,7 +131,7 @@ # # get rid of useless contrib stuff rm contrib/lirc.* -%if %suse_version > 1020 +%if 0%suse_version > 1020 %fdupes $RPM_BUILD_ROOT %endif # @@ -161,6 +178,8 @@ rm -rf %{buildroot} %changelog +* Thu Jun 26 2008 lnussel(a)suse.de +- fix build of hw_i2cuser on 11.0+ (bnc#387587) * Wed May 07 2008 lnussel(a)suse.de - fix build - BuildRequire linux-kernel-headers and libusb-devel to enable ++++++ lirc-0.8.3-hw_i2cuser_header.diff ++++++ Index: lirc-0.8.3/daemons/hw_i2cuser.c =================================================================== --- lirc-0.8.3.orig/daemons/hw_i2cuser.c +++ lirc-0.8.3/daemons/hw_i2cuser.c @@ -52,8 +52,10 @@ #include <dirent.h> #include <time.h> #include <signal.h> -#include <linux/i2c.h> #include <linux/i2c-dev.h> +#ifndef I2C_SLAVE /* hack */ +#include <linux/i2c.h> +#endif #include "hardware.h" #include "ir_remote.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glade
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package glade checked in at Mon Jun 30 18:17:08 CEST 2008. -------- --- GNOME/glade/glade.changes 2008-03-31 20:23:36.000000000 +0200 +++ glade/glade.changes 2008-06-30 18:12:29.639083000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 30 18:16:30 CEST 2008 - maw(a)suse.de + +- Add glade-gtk-clist.patch. + +------------------------------------------------------------------- New: ---- glade-gtk-clist.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glade.spec ++++++ --- /var/tmp/diff_new_pack.uU2333/_old 2008-06-30 18:17:00.000000000 +0200 +++ /var/tmp/diff_new_pack.uU2333/_new 2008-06-30 18:17:00.000000000 +0200 @@ -19,9 +19,11 @@ Obsoletes: glade2 AutoReqProv: on Version: 2.12.2 -Release: 1 +Release: 29 Summary: Glade is a GTK2+ User Interface Builder Source: ftp://ftp.gnome.org/pub/gnome/sources/glade/2.10/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM glade-gtk-clist.patch -- See https://bugs.launchpad.net/inkscape/+bug/238223 +Patch0: glade-gtk-clist.patch Url: http://glade.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1020 @@ -37,6 +39,7 @@ %lang_package %prep %setup -q +%patch0 %build autoreconf -f -i @@ -73,6 +76,8 @@ %files lang -f %{name}-2.0.lang %changelog +* Mon Jun 30 2008 maw(a)suse.de +- Add glade-gtk-clist.patch. * Mon Mar 31 2008 vuntz(a)suse.de - Update to version 2.12.2: + Build fix for bonobo-i18n deprecation ++++++ glade-gtk-clist.patch ++++++ === modified file 'glade/gbwidgets/gbclist.c' --- glade/gbwidgets/gbclist.c 2008-06-30 16:04:57 +0000 +++ glade/gbwidgets/gbclist.c 2008-06-30 16:07:04 +0000 @@ -19,6 +19,7 @@ #include <string.h> +#include <gtk/gtk.h> #include <gtk/gtkclist.h> #include <gtk/gtkhbox.h> #include <gtk/gtkmain.h> === modified file 'glade/glade_keys_dialog.c' --- glade/glade_keys_dialog.c 2008-06-30 16:04:57 +0000 +++ glade/glade_keys_dialog.c 2008-06-30 16:09:48 +0000 @@ -23,6 +23,7 @@ #include <string.h> +#include <gtk/gtk.h> #include <gtk/gtkbox.h> #include <gtk/gtkbutton.h> #include <gtk/gtkclist.h> === modified file 'glade/glade_menu_editor.c' --- glade/glade_menu_editor.c 2008-06-30 16:04:57 +0000 +++ glade/glade_menu_editor.c 2008-06-30 16:10:12 +0000 @@ -25,6 +25,7 @@ #include <string.h> #include <time.h> +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtkarrow.h> #include <gtk/gtkaccellabel.h> === modified file 'glade/glade_project_view.c' --- glade/glade_project_view.c 2008-06-30 16:04:57 +0000 +++ glade/glade_project_view.c 2008-06-30 16:11:12 +0000 @@ -18,6 +18,8 @@ #include "gladeconfig.h" +#include <gtk/gtk.h> + #include "editor.h" #include "glade_project_view.h" #include "utils.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcalctool
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package gcalctool checked in at Mon Jun 30 18:15:47 CEST 2008. -------- --- GNOME/gcalctool/gcalctool.changes 2008-06-21 01:53:37.000000000 +0200 +++ gcalctool/gcalctool.changes 2008-06-30 17:59:37.744829000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 30 18:07:11 CEST 2008 - maw(a)suse.de + +- Fix the installation of an icon. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcalctool.spec ++++++ --- /var/tmp/diff_new_pack.D31835/_old 2008-06-30 18:15:14.000000000 +0200 +++ /var/tmp/diff_new_pack.D31835/_new 2008-06-30 18:15:14.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL v2 or later Group: Productivity/Scientific/Math Version: 5.23.4 -Release: 1 +Release: 3 Summary: A GNOME Calculator Application Source: ftp://ftp.gnome.org/pub/gnome/sources/gcalctool/5.22/%{name}-%{version}.tar… # PATCH-NEEDS-REBASE gcalctool-59753_59377_59378.patch -- was PATCH-FIX-OPENSUSE @@ -80,7 +80,7 @@ # gnome-calculator is not generally visible icon # http://bugzilla.gnome.org/show_bug.cgi?id=413443 mkdir $RPM_BUILD_ROOT/usr/share/pixmaps -ln -s ../icons/gnome/scalable/apps/gnome-calculator.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +ln -s ../icons/gnome/scalable/apps/accessories-calculator.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/ # FIXME: --disable-scrollkeeper is not implemented rm -r $RPM_BUILD_ROOT/var/scrollkeeper %suse_update_desktop_file -N "Gnome Calculator" -G Calculator %name Calculator @@ -112,6 +112,8 @@ %files lang -f %{name}.lang %changelog +* Mon Jun 30 2008 maw(a)suse.de +- Fix the installation of an icon. * Sat Jun 21 2008 maw(a)suse.de - Update to version 5.23.4: + Bugs fixed: bgo#524602, bgo#524091, bgo#527669, bgo#527669, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit krb5-ticket-watcher
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package krb5-ticket-watcher checked in at Mon Jun 30 18:14:22 CEST 2008. -------- --- krb5-ticket-watcher/krb5-ticket-watcher.changes 2008-01-13 17:55:05.000000000 +0100 +++ krb5-ticket-watcher/krb5-ticket-watcher.changes 2008-06-30 10:03:32.587659000 +0200 @@ -1,0 +2,10 @@ +Mon Jun 30 10:00:53 CEST 2008 - mc(a)suse.de + +- update to version 0.9.2 + * add change password menu item + * better error messages + * show the remaining time of the krbtgt in the tooltip + * show message if tgt was renewed + * ported to QT4 + +------------------------------------------------------------------- Old: ---- krb5-ticket-watcher-0.1.3.diff krb5-ticket-watcher-0.2.1-desktop-file.dif krb5-ticket-watcher-0.2.1.diff krb5-ticket-watcher-0.2.1-icon.dif krb5-ticket-watcher-0.2.1.tar.bz2 krb5-ticket-watcher.png New: ---- krb5-ticket-watcher0.9.2.tar.gz krb5-ticket-watcher-disable-strip.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-ticket-watcher.spec ++++++ --- /var/tmp/diff_new_pack.v24281/_old 2008-06-30 18:12:00.000000000 +0200 +++ /var/tmp/diff_new_pack.v24281/_new 2008-06-30 18:12:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package krb5-ticket-watcher (Version 0.2.1) +# spec file for package krb5-ticket-watcher (Version 0.9.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,29 +10,30 @@ # norootforbuild + Name: krb5-ticket-watcher Url: http://sourceforge.net/projects/krb5ticketwatch %if 0%{?suse_version} -BuildRequires: krb5-devel qt3-devel qt3-devel-tools update-desktop-files +BuildRequires: krb5-devel libqt4-devel update-desktop-files %endif %if 0%{?fedora_version} -BuildRequires: gcc-c++ krb5-devel qt3-devel +BuildRequires: gcc-c++ krb5-devel qt-devel %endif %if 0%{?mandriva_version} -BuildRequires: gcc-c++ libkrb53-devel libqt3-devel +%ifarch x86_64 +BuildRequires: gcc-c++ lib64krb53-devel lib64qt4-devel qt4-linguist +%else +BuildRequires: gcc-c++ libkrb53-devel libqt4-devel qt4-linguist +%endif %endif License: GPL v2 or later Group: System/GUI/Other AutoReqProv: on Summary: A Tray Applet for Watching, Renewing, and Reinitializing Kerberos Tickets -Version: 0.2.1 -Release: 96 -Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}.png -Patch: krb5-ticket-watcher-0.1.3.diff -Patch1: krb5-ticket-watcher-0.2.1.diff -Patch2: krb5-ticket-watcher-0.2.1-desktop-file.dif -Patch3: krb5-ticket-watcher-0.2.1-icon.dif +Version: 0.9.2 +Release: 1 +Source0: %{name}%{version}.tar.gz +Patch: krb5-ticket-watcher-disable-strip.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,33 +46,49 @@ -------- Michael Calmer <Michael.Calmer(a)gmx.de> +%if 0%{?suse_version} +%endif + %prep -%setup -%patch -%patch1 -%patch2 -%patch3 +%setup -n %{name}%{version} +%patch -p1 %build -export CFLAGS=$RPM_OPT_FLAGS -if [ -z $QTDIR ]; then - export QTDIR=%{_libdir}/qt3/ +%if 0%{?fedora_version} +if [ -z "$QT4DIR" ] ; then + # rpm is more correct multilib-wise, provided /etc/rpm/platform doesn't get in the way. + QT4DIR="$(/bin/rpm --eval "%{_libdir}/qt4" 2>/dev/null || /usr/bin/pkg-config --variable=prefix QtCore )" + export QT4DIR +fi +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi -export PATH=$PATH:$QTDIR/bin +%endif +%if 0%{?mandriva_version} +export PATH=/usr/lib/qt4/bin:${PATH} +%endif +export CFLAGS=$RPM_OPT_FLAGS qmake krb5-ticket-watcher.pro make %install -rm -rf $RPM_BUILD_ROOT -# This is required to install the binary -if [ -z $QTDIR ]; then - export QTDIR=%{_libdir}/qt3/ +%if 0%{?fedora_version} +if [ -z "$QT4DIR" ] ; then + # rpm is more correct multilib-wise, provided /etc/rpm/platform doesn't get in the way. + QT4DIR="$(/bin/rpm --eval "%{_libdir}/qt4" 2>/dev/null || /usr/bin/pkg-config --variable=prefix QtCore )" + export QT4DIR +fi +if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then + PATH=${QT4DIR}/bin:${PATH} + export PATH fi -export PATH=$PATH:$QTDIR/bin +%endif +%if 0%{?mandriva_version} +export PATH=/usr/lib/qt4/bin:${PATH} +%endif qmake krb5-ticket-watcher.pro -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/pixmaps/ -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/share/pixmaps/ +make INSTALL_ROOT=$RPM_BUILD_ROOT install %if 0%{?suse_version} %suse_update_desktop_file %{name} System Network %endif @@ -86,28 +103,38 @@ /usr/share/applications/krb5-ticket-watcher.desktop /usr/share/pixmaps/*.png +%clean +rm -rf $RPM_BUILD_ROOT + %changelog -* Sun Jan 13 2008 - coolo(a)suse.de +* Mon Jun 30 2008 mc(a)suse.de +- update to version 0.9.2 + * add change password menu item + * better error messages + * show the remaining time of the krbtgt in the tooltip + * show message if tgt was renewed + * ported to QT4 +* Sun Jan 13 2008 coolo(a)suse.de - remove desktop-data from buildrequires -* Wed May 02 2007 - mc(a)suse.de +* Wed May 02 2007 mc(a)suse.de - add "Name" key to desktop file - add icon -* Mon Apr 16 2007 - mc(a)suse.de +* Mon Apr 16 2007 mc(a)suse.de - version 0.2.1 * use qt linguist for translations * add "restore" to the menu * add kdestroy functionality * calculate renewtime from ticket if available * move some krb5 library function calls to v5.cpp -* Mon Nov 06 2006 - schwab(a)suse.de +* Mon Nov 06 2006 schwab(a)suse.de - Don't strip binaries. -* Thu Nov 02 2006 - mc(a)suse.de +* Thu Nov 02 2006 mc(a)suse.de - version 0.1.3 - implement more options for kinit dialog (tkt_lifetime, renewtime) - hide options in kinit dialog by default - update translation -* Mon Oct 23 2006 - mc(a)suse.de +* Mon Oct 23 2006 mc(a)suse.de - version 0.1.2 - use TicketListItem to show the status of the ticket - add column 'Time Remaining' to listview @@ -117,7 +144,7 @@ - show available realms in a combobox in kinitdialog - fix some memleaks - change look of the password change dialog -* Mon Jul 17 2006 - mc(a)suse.de +* Mon Jul 17 2006 mc(a)suse.de - add german translation -* Mon Jul 10 2006 - mc(a)suse.de +* Mon Jul 10 2006 mc(a)suse.de - initial release ++++++ krb5-ticket-watcher-disable-strip.dif ++++++ Index: krb5-ticket-watcher0.9.0/krb5-ticket-watcher.pro =================================================================== --- krb5-ticket-watcher0.9.0.orig/krb5-ticket-watcher.pro +++ krb5-ticket-watcher0.9.0/krb5-ticket-watcher.pro @@ -38,6 +38,7 @@ DISTFILES += po/*.ts Changes News COPYIN SUBDIRS += src po QMAKE_CLEAN += src/*~ krb5-ticket-watcher$${VERSION}.tar.* krb5-ticket-watcher +QMAKE_STRIP = pot.target = pot pot.commands = lupdate $(TARGET).pro ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package kiwi checked in at Mon Jun 30 18:11:51 CEST 2008. -------- --- kiwi/kiwi.changes 2008-06-27 14:28:59.000000000 +0200 +++ kiwi/kiwi.changes 2008-06-30 15:51:17.927122000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 30 15:42:45 CEST 2008 - ms(a)suse.de + +- v2.48 +- support this:// url type in boot attribute (bnc #404460) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.T22979/_old 2008-06-30 18:11:02.000000000 +0200 +++ /var/tmp/diff_new_pack.T22979/_new 2008-06-30 18:11:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 2.47) +# spec file for package kiwi (Version 2.48) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -42,7 +42,7 @@ Summary: OpenSuSE - KIWI Image System Provides: kiwi2 <= 2.14 Obsoletes: kiwi2 <= 2.14 -Version: 2.47 +Version: 2.48 Release: 1 Group: System/Management License: GPL v2 or later @@ -524,6 +524,9 @@ %endif %changelog +* Mon Jun 30 2008 ms(a)suse.de +- v2.48 +- support this:// url type in boot attribute (bnc #404460) * Fri Jun 27 2008 ms(a)suse.de - v2.47 - fixed xenboot images.sh, don't remove mandatory files ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 kiwi/kiwi.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdewebdev4
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package kdewebdev4 checked in at Mon Jun 30 18:09:37 CEST 2008. -------- --- KDE/kdewebdev4/kdewebdev4.changes 2008-06-10 14:29:05.000000000 +0200 +++ kdewebdev4/kdewebdev4.changes 2008-06-26 17:51:38.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Jun 26 17:51:27 CEST 2008 - dmueller(a)suse.de + +- update to 4.0.84 + +------------------------------------------------------------------- +Wed Jun 18 21:23:59 CEST 2008 - dmueller(a)suse.de + +- update to 4.0.83 + +------------------------------------------------------------------- Old: ---- kdewebdev-4.0.82.tar.bz2 New: ---- kdewebdev-4.0.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev4.spec ++++++ --- /var/tmp/diff_new_pack.O17192/_old 2008-06-30 18:09:11.000000000 +0200 +++ /var/tmp/diff_new_pack.O17192/_new 2008-06-30 18:09:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdewebdev4 (Version 4.0.82) +# spec file for package kdewebdev4 (Version 4.0.84) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,11 +16,11 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPL v2 or later +License: GPL v2 only; GPL v2 or later Group: System/GUI/KDE Summary: kdewebdev base package Url: http://quanta.sf.net -Version: 4.0.82 +Version: 4.0.84 Release: 1 Source0: kdewebdev-%version.tar.bz2 Source1: _upstream @@ -216,6 +216,10 @@ %{_mandir}/man1/xsldbg.1* %changelog +* Thu Jun 26 2008 dmueller(a)suse.de +- update to 4.0.84 +* Wed Jun 18 2008 dmueller(a)suse.de +- update to 4.0.83 * Tue Jun 10 2008 dmueller(a)suse.de - update to 4.0.82 * Tue Jun 10 2008 dmueller(a)suse.de ++++++ kdewebdev-4.0.82.tar.bz2 -> kdewebdev-4.0.84.tar.bz2 ++++++ ++++ 3156 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeutils4
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package kdeutils4 checked in at Mon Jun 30 18:09:01 CEST 2008. -------- --- KDE/kdeutils4/kdeutils4.changes 2008-06-23 23:35:56.000000000 +0200 +++ kdeutils4/kdeutils4.changes 2008-06-26 17:51:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 26 17:50:49 CEST 2008 - dmueller(a)suse.de + +- update to 4.0.84 + +------------------------------------------------------------------- Old: ---- kdeutils-4.0.83.tar.bz2 New: ---- kdeutils-4.0.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.N15410/_old 2008-06-30 18:08:06.000000000 +0200 +++ /var/tmp/diff_new_pack.N15410/_new 2008-06-30 18:08:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdeutils4 (Version 4.0.83) +# spec file for package kdeutils4 (Version 4.0.84) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,7 +23,7 @@ Group: Productivity/Other Summary: Base Package of KDE Utility Programs Url: http://www.kde.org -Version: 4.0.83 +Version: 4.0.84 Release: 1 Source0: kdeutils-%version.tar.bz2 Source1: _upstream @@ -429,6 +429,8 @@ %doc AUTHORS COPYING COPYING.DOC README %changelog +* Thu Jun 26 2008 dmueller(a)suse.de +- update to 4.0.84 * Wed Jun 18 2008 dmueller(a)suse.de - update to 4.0.83 * Tue Jun 10 2008 dmueller(a)suse.de ++++++ kdeutils-4.0.83.tar.bz2 -> kdeutils-4.0.84.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/ark/plugins/rarplugin/kerfuffle_rar.desktop new/kdeutils-4.0.84/ark/plugins/rarplugin/kerfuffle_rar.desktop --- old/kdeutils-4.0.83/ark/plugins/rarplugin/kerfuffle_rar.desktop 2008-06-11 10:33:12.000000000 +0200 +++ new/kdeutils-4.0.84/ark/plugins/rarplugin/kerfuffle_rar.desktop 2008-06-25 09:59:12.000000000 +0200 @@ -15,6 +15,7 @@ Name[sv]=Kerfuffle Rar Name[x-test]=xxkerfuffle_rarxx Comment=rar plugin for Kerfuffle +Comment[ca]=Connector del rar pel Kerfuffle Comment[da]=rar-plugin til Kerfuffle Comment[de]=RAR-Modul für Kerfuffle Comment[el]=πρόσθετο rar για τη Kerfuffle diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/CMakeLists.txt new/kdeutils-4.0.84/CMakeLists.txt --- old/kdeutils-4.0.83/CMakeLists.txt 2008-05-15 20:37:10.000000000 +0200 +++ new/kdeutils-4.0.84/CMakeLists.txt 2008-06-25 09:59:12.000000000 +0200 @@ -47,7 +47,6 @@ macro_optional_add_subdirectory( kfloppy ) endif( NOT WIN32 ) macro_optional_add_subdirectory( kgpg ) -macro_optional_add_subdirectory( kjots ) macro_optional_add_subdirectory( ktimer ) macro_optional_add_subdirectory( kwallet ) macro_optional_add_subdirectory( okteta ) Files old/kdeutils-4.0.83/doc/ark/index.cache.bz2 and new/kdeutils-4.0.84/doc/ark/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/kcalc/index.cache.bz2 and new/kdeutils-4.0.84/doc/kcalc/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/kcharselect/index.cache.bz2 and new/kdeutils-4.0.84/doc/kcharselect/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/kdf/index.cache.bz2 and new/kdeutils-4.0.84/doc/kdf/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/kfloppy/index.cache.bz2 and new/kdeutils-4.0.84/doc/kfloppy/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/kgpg/index.cache.bz2 and new/kdeutils-4.0.84/doc/kgpg/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/ktimer/index.cache.bz2 and new/kdeutils-4.0.84/doc/ktimer/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/kwallet/index.cache.bz2 and new/kdeutils-4.0.84/doc/kwallet/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/okteta/index.cache.bz2 and new/kdeutils-4.0.84/doc/okteta/index.cache.bz2 differ Files old/kdeutils-4.0.83/doc/superkaramba/index.cache.bz2 and new/kdeutils-4.0.84/doc/superkaramba/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kcalc/kcalc_core.cpp new/kdeutils-4.0.84/kcalc/kcalc_core.cpp --- old/kdeutils-4.0.83/kcalc/kcalc_core.cpp 2008-02-07 14:18:56.000000000 +0100 +++ new/kdeutils-4.0.84/kcalc/kcalc_core.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -240,7 +240,7 @@ // handler to trap the errors that the code can/has not been // written to trap. // - +#ifndef Q_OS_WIN struct sigaction fpe_trap; sigemptyset(&fpe_trap.sa_mask); @@ -249,7 +249,7 @@ fpe_trap.sa_flags = SA_RESTART; #endif sigaction(SIGFPE, &fpe_trap, NULL); - +#endif _last_number = KNumber::Zero; _error = false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kcalc/knumber/knumber_priv.cpp new/kdeutils-4.0.84/kcalc/knumber/knumber_priv.cpp --- old/kdeutils-4.0.83/kcalc/knumber/knumber_priv.cpp 2008-02-07 14:18:56.000000000 +0100 +++ new/kdeutils-4.0.84/kcalc/knumber/knumber_priv.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -341,7 +341,11 @@ #endif static void _cbrt(mpf_t &num) { +#ifdef Q_CC_MSVC + double tmp_num = pow(mpf_get_d(num), 1./3.); +#else double tmp_num = cbrt(mpf_get_d(num)); +#endif mpf_init_set_d(num, tmp_num); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kdf/kdfwidget.cpp new/kdeutils-4.0.84/kdf/kdfwidget.cpp --- old/kdeutils-4.0.83/kdf/kdfwidget.cpp 2008-02-14 15:36:01.000000000 +0100 +++ new/kdeutils-4.0.84/kdf/kdfwidget.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -169,6 +169,8 @@ // for( int i=0; i<mTabProp.size(); mList->removeColumn(i++) ); // mList->clear(); + int columns = mList->columns(); + for (int i=0; i<columns; ++i) mList->removeColumn(0); for( int i=0; i<mTabProp.size(); i++ ) { CTabEntry &e = *mTabProp[i]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kfloppy/floppy.cpp new/kdeutils-4.0.84/kfloppy/floppy.cpp --- old/kdeutils-4.0.83/kfloppy/floppy.cpp 2008-01-29 10:15:03.000000000 +0100 +++ new/kdeutils-4.0.84/kfloppy/floppy.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -531,7 +531,7 @@ else if ( userDevice ) { // The user has selected full formatting on a user-given device. That is not supported yet! - KMessageBox::error( this, "Full formatting of a user-given device is not possible!" ); + KMessageBox::error( this, i18n("Full formatting of a user-given device is not possible!") ); return; } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/encryptfolder.desktop new/kdeutils-4.0.84/kgpg/encryptfolder.desktop --- old/kdeutils-4.0.83/kgpg/encryptfolder.desktop 2008-06-18 14:41:09.000000000 +0200 +++ new/kdeutils-4.0.84/kgpg/encryptfolder.desktop 2008-06-25 09:59:12.000000000 +0200 @@ -38,7 +38,7 @@ Name[pa]=ਆਕੀਵੀ & ਇੰਕਰਿਪਟ ਫੋਲਡਰ Name[pl]=Zarchiwizuj i zaszyfruj katalog Name[pt]=Arquivar e Cifrar a Pasta -Name[pt_BR]=Arquivar & Criptografar Pasta +Name[pt_BR]=Arquivar e criptografar pasta Name[ru]=Архивировать и зашифровать папку Name[sk]=Archivovať a šifrovať priečinok Name[sl]=Arhiviranje in ši&friranje imenika diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpg.cpp new/kdeutils-4.0.84/kgpg/kgpg.cpp --- old/kdeutils-4.0.83/kgpg/kgpg.cpp 2008-05-15 20:37:10.000000000 +0200 +++ new/kdeutils-4.0.84/kgpg/kgpg.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -445,20 +445,26 @@ void MyView::decryptDroppedFile() { - //bool isFolder=false; // droppedUrls - KUrl swapname; + m_decryptionFailed.clear(); - if (!droppedUrls.first().isLocalFile()) - { - showDroppedFile(); - decryptNextFile(); - } + decryptFile(new KgpgLibrary(0)); +} - QString oldname = droppedUrls.first().fileName(); - if (oldname.endsWith(".gpg") || oldname.endsWith(".asc") || oldname.endsWith(".pgp")) - oldname.truncate(oldname.length()-4); - else - oldname.append(".clear"); +void MyView::decryptFile(KgpgLibrary *lib) +{ + //bool isFolder=false; // droppedUrls + KUrl swapname; + + if (!droppedUrls.first().isLocalFile()) { + showDroppedFile(); + decryptNextFile(lib, KUrl()); + } + + QString oldname = droppedUrls.first().fileName(); + if (oldname.toLower().endsWith(".gpg") || oldname.toLower().endsWith(".asc") || oldname.toLower().endsWith(".pgp")) + oldname.truncate(oldname.length() - 4); + else + oldname.append(".clear"); /* if (oldname.endsWith(".tar.gz")) { isFolder=true; @@ -477,7 +483,7 @@ KIO::RenameDialog over(0,i18n("File Already Exists"),KUrl(),swapname,KIO::M_OVERWRITE); if (over.exec()==QDialog::Rejected) { - decryptNextFile(); + decryptNextFile(lib, KUrl()); return; } @@ -485,24 +491,30 @@ } } - KgpgLibrary *lib=new KgpgLibrary(0); QStringList custdecr; if (!KGpgSettings::customDecrypt().isEmpty()) custdecr = QStringList(KGpgSettings::customDecrypt()); - lib->slotFileDec(droppedUrls.first(), swapname, custdecr); - connect(lib,SIGNAL(importOver(QStringList)),this,SIGNAL(importedKeys(QStringList))); - connect(lib,SIGNAL(systemMessage(QString,bool)),this,SLOT(busyMessage(QString,bool))); -// if (isFolder) - connect(lib,SIGNAL(decryptionOver()),this,SLOT(decryptNextFile())); -} - -void MyView::decryptNextFile() -{ - if (droppedUrls.count() > 1) - { - droppedUrls.pop_front(); - decryptDroppedFile(); - } + lib->slotFileDec(droppedUrls.first(), swapname, custdecr); + connect(lib, SIGNAL(importOver(QStringList)), this, SIGNAL(importedKeys(QStringList))); + connect(lib, SIGNAL(systemMessage(QString, bool)), this, SLOT(busyMessage(QString, bool))); + connect(lib, SIGNAL(decryptionOver(KgpgLibrary *, KUrl)), this, SLOT(decryptNextFile(KgpgLibrary *, KUrl))); +} + +void MyView::decryptNextFile(KgpgLibrary *lib, const KUrl &failed) +{ + if (!failed.isEmpty()) + m_decryptionFailed << failed; + + if (droppedUrls.count() > 1) { + droppedUrls.pop_front(); + decryptFile(lib); + } else if ((droppedUrls.count() <= 1) && (m_decryptionFailed.count() > 0)) { + delete lib; + // FIXME: introduce better error message when string freeze is lifted + KMessageBox::errorList(NULL, i18n("Decryption failed."), m_decryptionFailed.toStringList(), i18n("Decryption failed.")); + } else { + delete lib; + } } void MyView::unArchive() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpg.desktop new/kdeutils-4.0.84/kgpg/kgpg.desktop --- old/kdeutils-4.0.83/kgpg/kgpg.desktop 2008-06-03 11:34:14.000000000 +0200 +++ new/kdeutils-4.0.84/kgpg/kgpg.desktop 2008-06-25 09:59:12.000000000 +0200 @@ -32,7 +32,7 @@ GenericName[km]=ឧបករណ៍អ៊ីនគ្រិប GenericName[ko]=암호화 도구 GenericName[lt]=Šifravimo įrankis -GenericName[lv]=Šifrēšana rīks +GenericName[lv]=Šifrēšanas rīks GenericName[mk]=Алатка за криптирање GenericName[nb]=Krypteringsverktøy GenericName[nds]=Verslötel-Warktüüch diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpg.h new/kdeutils-4.0.84/kgpg/kgpg.h --- old/kdeutils-4.0.83/kgpg/kgpg.h 2008-02-07 14:18:54.000000000 +0100 +++ new/kdeutils-4.0.84/kgpg/kgpg.h 2008-06-25 09:59:12.000000000 +0200 @@ -40,6 +40,7 @@ class KgpgSelectPublicKeyDlg; class KGpgTextInterface; class KeysManager; +class KgpgLibrary; class KgpgWizard : public Q3Wizard, public Ui::KgpgWizard { @@ -119,6 +120,8 @@ int startWizard(); int firstRun(); + KUrl::List m_decryptionFailed; + private slots: void slotWizardClose(); void slotWizardChange(); @@ -135,7 +138,8 @@ void droppedtext(const QString &inputText, bool allowEncrypt = true); void unArchive(); void slotSetCompression(int cp); - void decryptNextFile(); + void decryptNextFile(KgpgLibrary *lib, const KUrl &failed); + void decryptFile(KgpgLibrary *lib); }; class kgpgapplet : public KSystemTrayIcon diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpginterface.cpp new/kdeutils-4.0.84/kgpg/kgpginterface.cpp --- old/kdeutils-4.0.83/kgpg/kgpginterface.cpp 2008-06-10 13:40:56.000000000 +0200 +++ new/kdeutils-4.0.84/kgpg/kgpginterface.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -1109,7 +1109,7 @@ KgpgDetailedConsole *q = new KgpgDetailedConsole(0, i18n("<qt><b>Changing expiration failed.</b><br />" "Do you want to try changing the key expiration in console mode?</qt>"),output); if (q->exec() == QDialog::Accepted) - KMessageBox::sorry(0, "work in progress..."); + KMessageBox::sorry(0, i18n("work in progress...")); else emit keyExpireFinished(3, this); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpglibrary.cpp new/kdeutils-4.0.84/kgpg/kgpglibrary.cpp --- old/kdeutils-4.0.83/kgpg/kgpglibrary.cpp 2008-05-29 13:18:38.000000000 +0200 +++ new/kdeutils-4.0.84/kgpg/kgpglibrary.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -181,7 +181,10 @@ emit systemMessage(QString()); delete m_pop; delete iface; - emit decryptionOver(); + if (ret != 0) + emit decryptionOver(this, m_urlselected); + else + emit decryptionOver(this, KUrl()); } void KgpgLibrary::processDecError(const QString &mssge) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpglibrary.h new/kdeutils-4.0.84/kgpg/kgpglibrary.h --- old/kdeutils-4.0.83/kgpg/kgpglibrary.h 2008-05-29 13:18:38.000000000 +0200 +++ new/kdeutils-4.0.84/kgpg/kgpglibrary.h 2008-06-25 09:59:12.000000000 +0200 @@ -42,7 +42,7 @@ signals: void encryptionOver(); - void decryptionOver(); + void decryptionOver(KgpgLibrary *, KUrl); void importOver(QStringList); void systemMessage(QString, bool reset = false); void photoAdded(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kgpg/kgpgtextinterface.cpp new/kdeutils-4.0.84/kgpg/kgpgtextinterface.cpp --- old/kdeutils-4.0.83/kgpg/kgpgtextinterface.cpp 2008-06-18 14:41:09.000000000 +0200 +++ new/kdeutils-4.0.84/kgpg/kgpgtextinterface.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -46,6 +46,7 @@ QByteArray m_tmpmessage; QByteArray m_readin; KUrl m_file; + KUrl m_dest; KUrl::List m_files; KUrl::List m_errfiles; @@ -475,6 +476,7 @@ *d->m_process << options; + d->m_dest = dest; if (!dest.fileName().isEmpty()) *d->m_process << "-o" << dest.path(); *d->m_process << "-d" << src.path(); @@ -520,11 +522,19 @@ void KGpgTextInterface::decryptFileFin(int res, QProcess::ExitStatus status) { - if (status == QProcess::CrashExit) + if (status == QProcess::CrashExit) { + if (d->m_dest.isLocalFile()) + QFile(d->m_dest.toLocalFile()).remove(); emit decryptFileFinished(2, this); + return; + } - if (res != 0) + if (res != 0) { + if (d->m_dest.isLocalFile()) + QFile(d->m_dest.toLocalFile()).remove(); emit decryptFileFinished(3, this); + return; + } if (d->m_message.contains("DECRYPTION_OKAY") && d->m_message.contains("END_DECRYPTION")) emit decryptFileFinished(0, this); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.cpp new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.cpp --- old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.cpp 2008-06-03 11:34:14.000000000 +0200 +++ new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -21,7 +21,7 @@ #include <QtDBus/QtDBus> #include <kaboutdata.h> #include <kapplication.h> -#include <kconfig.h> +#include <ksharedconfig.h> #include <kdialog.h> #include <kpluginfactory.h> #include <kpluginloader.h> @@ -43,7 +43,8 @@ KWalletConfig::KWalletConfig(QWidget *parent, const QVariantList& args) -: KCModule(KWalletFactory::componentData(), parent, args) { +: KCModule(KWalletFactory::componentData(), parent, args), + _cfg(KSharedConfig::openConfig("kwalletrc", KConfig::NoGlobals)) { KAboutData *about = new KAboutData(I18N_NOOP("kcmkwallet"), 0, @@ -53,8 +54,6 @@ about->addAuthor(ki18n("George Staikos"), KLocalizedString(), "staikos(a)kde.org"); setAboutData( about ); - _cfg = new KConfig("kwalletrc", KConfig::NoGlobals); - QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setSpacing(KDialog::spacingHint()); vbox->setMargin(0); @@ -89,8 +88,6 @@ KWalletConfig::~KWalletConfig() { - delete _cfg; - _cfg = 0L; } @@ -282,8 +279,12 @@ } _cfg->sync(); - QDBusInterface kwalletd("org.kde.kded", "/modules/kwalletd", KWALLETMANAGERINTERFACE); - kwalletd.call( "reconfigure" ); + + // this restarts kwalletd if neccessary + if (KWallet::Wallet::isEnabled()) { + QDBusInterface kwalletd("org.kde.kwalletd", "/modules/kwalletd", KWALLETMANAGERINTERFACE); + kwalletd.call( "reconfigure" ); + } emit changed(false); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.h new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.h --- old/kdeutils-4.0.83/kwallet/konfigurator/konfigurator.h 2008-01-05 00:53:26.000000000 +0100 +++ new/kdeutils-4.0.84/kwallet/konfigurator/konfigurator.h 2008-06-25 09:59:12.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef _KWALLETKONFIGURATOR_H #define _KWALLETKONFIGURATOR_H #include <kcmodule.h> +#include <ksharedconfig.h> #include "ui_walletconfigwidget.h" -class KConfig; class Q3ListViewItem; class WalletConfigWidget : public QWidget, public Ui::WalletConfigWidget @@ -57,7 +57,7 @@ private: WalletConfigWidget *_wcw; - KConfig *_cfg; + KSharedConfig::Ptr _cfg; }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/kwalletmanager.cpp new/kdeutils-4.0.84/kwallet/kwalletmanager.cpp --- old/kdeutils-4.0.83/kwallet/kwalletmanager.cpp 2008-06-18 14:41:09.000000000 +0200 +++ new/kdeutils-4.0.84/kwallet/kwalletmanager.cpp 2008-06-25 09:59:12.000000000 +0200 @@ -93,7 +93,7 @@ setCentralWidget(_iconView); _iconView->setMinimumSize(320, 200); - m_kwalletdModule = new org::kde::KWallet("org.kde.kded", "/modules/kwalletd", QDBusConnection::sessionBus()); + m_kwalletdModule = new org::kde::KWallet("org.kde.kwalletd", "/modules/kwalletd", QDBusConnection::sessionBus()); connect(QDBusConnection::sessionBus().interface(), SIGNAL(serviceOwnerChanged(QString,QString,QString)), this, @@ -353,7 +353,7 @@ void KWalletManager::possiblyRescan(const QString& app, const QString& oldOwner, const QString& newOwner) { Q_UNUSED( oldOwner ); Q_UNUSED( newOwner ); - if (app == "org.kde.kded") { + if (app == "org.kde.kwalletd") { updateWalletDisplay(); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/kwalletmanager.desktop new/kdeutils-4.0.84/kwallet/kwalletmanager.desktop --- old/kdeutils-4.0.83/kwallet/kwalletmanager.desktop 2008-06-18 14:41:09.000000000 +0200 +++ new/kdeutils-4.0.84/kwallet/kwalletmanager.desktop 2008-06-26 03:33:04.000000000 +0200 @@ -8,7 +8,9 @@ Name[x-test]=xxKWalletManagerxx Name[zh_TW]=KDE 錢包管理員 GenericName=Wallet Management Tool +GenericName[ca]=Eina de gestió de carteres GenericName[cs]=Nástroj pro správu úschovny +GenericName[da]=Værktøj til håndtering af tegnebog GenericName[de]=Verwaltung für digitale Brieftasche GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού GenericName[es]=Herramienta de gestión de carteras @@ -19,6 +21,7 @@ GenericName[ja]=ウォレット管理ツール GenericName[km]=ឧបករណ៍គ្រប់គ្រងកាបូប GenericName[ko]=지갑 관리 도구 +GenericName[lv]=Maka pārvaldības rīks GenericName[nds]=Knippenpleger GenericName[pt]=Ferramenta de Gestão da Carteira GenericName[pt_BR]=Ferramenta de Gerenciamento de Carteira @@ -26,6 +29,7 @@ GenericName[tr]=KWallet Yönetim Aracı GenericName[uk]=Засіб керування торбинками GenericName[x-test]=xxWallet Management Toolxx +GenericName[zh_CN]=钱包管理工具 GenericName[zh_TW]=錢包管理工具 Exec=kwalletmanager %u MimeType=application/x-kde-wallet; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/kwallet/walletwidget.ui new/kdeutils-4.0.84/kwallet/walletwidget.ui --- old/kdeutils-4.0.83/kwallet/walletwidget.ui 2008-06-18 14:41:09.000000000 +0200 +++ new/kdeutils-4.0.84/kwallet/walletwidget.ui 2008-06-25 09:59:12.000000000 +0200 @@ -157,7 +157,7 @@ </sizepolicy> </property> <property name="currentIndex" > - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="page" > <property name="geometry" > diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.cpp new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.cpp --- old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.cpp 2008-04-18 09:21:22.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -1,7 +1,7 @@ /* This file is part of the Okteta Core library, part of the KDE project. - Copyright 2003 Friedrich W. H. Kossebau <kossebau(a)kde.org> + Copyright 2003,2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -22,11 +22,11 @@ #include "kabstractbytearraymodel.h" -// C -#include <ctype.h> +namespace KHECore +{ -namespace KHECore { +static const int SearchedByteCountSignalLimit = 10000; KAbstractByteArrayModel::KAbstractByteArrayModel() {} @@ -67,13 +67,22 @@ int result = -1; const int lastFrom = size() - patternLength; + int searchedBytesCount = 0; for( int i=fromOffset; i<=lastFrom ; ++i ) { + ++searchedBytesCount; int c = 0; for( ; c<patternLength; ++c ) if( pattern[c] != datum(i+c) ) break; + + if( searchedBytesCount >= SearchedByteCountSignalLimit ) + { + searchedBytesCount = 0; + emit searchedBytes( i-fromOffset+1 ); + } + if( c == patternLength ) { result = i; @@ -89,6 +98,7 @@ int result = -1; const int lastFrom = size() - patternLength; + int searchedBytesCount = 0; if( fromOffset < 0 ) fromOffset = lastFrom + 1 + fromOffset; @@ -97,10 +107,18 @@ for( int i=fromOffset; i>=0 ; --i ) { + ++searchedBytesCount; int c = 0; for( ; c<patternLength; ++c ) if( pattern[c] != datum(i+c) ) break; + + if( searchedBytesCount >= SearchedByteCountSignalLimit ) + { + searchedBytesCount = 0; + emit searchedBytes( i-fromOffset+1 ); + } + if( c == patternLength ) { result = i; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.h new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.h --- old/kdeutils-4.0.83/okteta/core/kabstractbytearraymodel.h 2008-05-15 20:37:10.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/core/kabstractbytearraymodel.h 2008-06-25 09:59:11.000000000 +0200 @@ -260,6 +260,8 @@ void readOnlyChanged( bool isReadOnly ); void modificationChanged( bool isModified ); + + void searchedBytes( int bytes ) const; }; inline int KAbstractByteArrayModel::insert( int Pos, const QByteArray &Source ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/okteta.desktop new/kdeutils-4.0.84/okteta/program/okteta.desktop --- old/kdeutils-4.0.83/okteta/program/okteta.desktop 2008-06-18 14:41:09.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/okteta.desktop 2008-06-26 03:33:03.000000000 +0200 @@ -2,55 +2,22 @@ Name=Okteta Name[x-test]=xxOktetaxx GenericName=Hex Editor -GenericName[af]=Binêre Redigeerder -GenericName[ar]=محرر ثنائى -GenericName[br]=Aozer binarel -GenericName[ca]=Editor binari -GenericName[cs]=Binární editor -GenericName[cy]=Golygydd Deuaidd -GenericName[de]=Binäreditor -GenericName[el]=Δυαδικός επεξεργαστής -GenericName[eo]=Deksesuma redaktilo -GenericName[es]=Editor binario +GenericName[ca]=Editor hexadecimal +GenericName[da]=Hex-editor +GenericName[es]=Editor hexadecimal GenericName[et]=Binaarfailide redaktor -GenericName[eu]=Editore Binarioa -GenericName[fa]=ویرایشگر دوگانی -GenericName[fr]=Éditeur binaire -GenericName[ga]=Eagarthóir Dénártha -GenericName[gl]=Editor binario -GenericName[he]=עורך בינרי -GenericName[hr]=Binarni uređivač -GenericName[is]=Tvíunda-ritill -GenericName[it]=Editor binario +GenericName[fr]=Éditeur hexadécimal +GenericName[ga]=Eagarthóir Heicsidheachúlach +GenericName[gl]=Editor de hexadecimal GenericName[ja]=バイナリエディタ -GenericName[kk]=Бинарлық редактор -GenericName[km]=កម្មវិធីកែសម្រួលប្រព័ន្ធគោលពីរ -GenericName[ko]=바이너리 편집기 -GenericName[lt]=Dvejetainio kodo redaktorius -GenericName[lv]=Binārais redaktors -GenericName[mk]=Бинарен уредувач -GenericName[ms]=Penyunting Binari +GenericName[km]=កម្មវិធីកែសម្រួលប្រព័ន្ធគោលដប់ប្រាំមួយ +GenericName[lv]=Heksadecimālais redaktors GenericName[nds]=Hexeditor -GenericName[ne]=बाइनरी सम्पादक -GenericName[nl]=Binaire bestanden bewerken -GenericName[nn]=Program for binærredingerig -GenericName[pl]=Editor Binarny -GenericName[pt]=Editor Binário -GenericName[pt_BR]=Editor Binário -GenericName[ro]=Editor date binare -GenericName[ru]=Двоичный редактор -GenericName[sk]=Binárny editor -GenericName[sv]=Binäreditor -GenericName[ta]=இருநிலை தொகுப்பான் -GenericName[tg]=Муҳаррири Дуӣ -GenericName[tr]=İkili Dosya Düzenleyici -GenericName[uk]=Двійковий редактор -GenericName[vi]=Trình biên tập nhị phân -GenericName[wa]=Aspougneu binaire -GenericName[x-test]=xxBinary Editorxx -GenericName[xh]=Umphathi Webhetri -GenericName[zh_CN]=二进制编辑器 -GenericName[zh_TW]=二進位資料編輯器 +GenericName[pt]=Editor Hexadecimal +GenericName[pt_BR]=Editor hexadecimal +GenericName[uk]=Шістнадцятковий редактор +GenericName[zh_CN]=十六进制编辑器 +GenericName[zh_TW]=十六進位資料編輯器 Icon=okteta Exec=okteta -caption "%c" %U Type=Application diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/CMakeLists.txt new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/CMakeLists.txt --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/CMakeLists.txt 2008-05-07 11:05:17.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/CMakeLists.txt 2008-06-25 09:59:11.000000000 +0200 @@ -55,6 +55,7 @@ ) set( SEARCHCONTROLLER_SRCS view/search/ksearchdialog.cpp + view/search/searchjob.cpp view/search/searchcontroller.cpp ) set( REPLACECONTROLLER_SRCS @@ -88,6 +89,7 @@ view/libbytearrayfilter/filter/rotatebytearrayfilterparametersetedit.cpp ) set( FILTERCONTROLLER_SRCS + view/filter/filterjob.cpp view/filter/filtertool.cpp view/filter/filterview.cpp view/filter/filtercontroller.cpp @@ -107,6 +109,7 @@ set( PRINTCONTROLLER_SRCS view/print/printcontroller.cpp view/print/printtool.cpp + view/print/printjob.cpp view/print/abstractcolumnrenderer.cpp view/print/abstractcolumnframerenderer.cpp view/print/offsetcolumnrenderer.cpp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -0,0 +1,47 @@ +/* + This file is part of the Okteta Kakao module, part of the KDE project. + + Copyright 2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "filterjob.h" + +// filter +#include <abstractbytearrayfilter.h> +// Qt +#include <QtGui/QApplication> + +static const int MaxEventProcessTimeInMS = 100; + +bool FilterJob::exec() +{ + //TODO: what kind of signal could a filter send? + connect( mByteArrayFilter, SIGNAL(filteredBytes(int)), SLOT(onFilteredBytes()) ); + + const bool result = mByteArrayFilter->filter( mResult, mModel, mSection ); + + deleteLater(); + + return result; +} + +void FilterJob::onFilteredBytes() +{ + QApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers, MaxEventProcessTimeInMS ); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.h --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filterjob.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filterjob.h 2008-06-25 09:59:11.000000000 +0200 @@ -0,0 +1,63 @@ +/* + This file is part of the Okteta Kakao module, part of the KDE project. + + Copyright 2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef FILTERJOB_H +#define FILTERJOB_H + +// Okteta core +#include <ksection.h> +// Qt +#include <QtCore/QObject> + +class AbstractByteArrayFilter; +namespace KHECore { +class KAbstractByteArrayModel; +} + +class FilterJob : public QObject // not yet: KJob +{ + Q_OBJECT + + public: + FilterJob( AbstractByteArrayFilter *byteArrayFilter, + char *result, KHECore::KAbstractByteArrayModel *model, const KHE::KSection &section ); + + public: + bool exec(); + + protected Q_SLOTS: + void onFilteredBytes(); + + protected: + AbstractByteArrayFilter *mByteArrayFilter; + + char *mResult; + KHECore::KAbstractByteArrayModel *mModel; + const KHE::KSection mSection; +}; + +inline FilterJob::FilterJob( AbstractByteArrayFilter *byteArrayFilter, + char *result, KHECore::KAbstractByteArrayModel *model, const KHE::KSection &section ) + : mByteArrayFilter( byteArrayFilter ), mResult( result ), mModel( model ), mSection( section ) +{} + +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp 2008-05-21 10:32:38.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/filter/filtertool.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -22,6 +22,8 @@ #include "filtertool.h" +// tool +#include "filterjob.h" // filter #include <abstractbytearrayfilter.h> // lib @@ -34,6 +36,7 @@ #include <kabstractbytearraymodel.h> #include <changesdescribable.h> // Qt +#include <QtGui/QApplication> #include <QtCore/QByteArray> @@ -99,7 +102,12 @@ QByteArray filterResult; filterResult.resize( filteredSection.width() ); - const bool success = byteArrayFilter->filter( filterResult.data(), mByteArrayModel, filteredSection ); + QApplication::setOverrideCursor( Qt::WaitCursor ); + + FilterJob *filterJob = new FilterJob( byteArrayFilter, filterResult.data(), mByteArrayModel, filteredSection ); + const bool success = filterJob->exec(); + + QApplication::restoreOverrideCursor(); if( success ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h 2008-04-18 09:21:18.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/abstractbytearrayfilter.h 2008-06-25 09:59:11.000000000 +0200 @@ -23,6 +23,9 @@ #ifndef ABSTRACTBYTEARRAYFILTER_H #define ABSTRACTBYTEARRAYFILTER_H +// Qt +#include <QtCore/QObject> + class AbstractByteArrayFilterParameterSet; namespace KHECore { class KAbstractByteArrayModel; @@ -33,8 +36,12 @@ class QString; -class AbstractByteArrayFilter +class AbstractByteArrayFilter : public QObject { + Q_OBJECT + + protected: + static const int FilteredByteCountSignalLimit = 10000; protected: explicit AbstractByteArrayFilter( const QString &name ); public: @@ -48,6 +55,9 @@ public: QString name() const; + Q_SIGNALS: // TODO: add check for signal to tests + void filteredBytes( int bytes ) const; + protected: class Private; Private * const d; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp 2008-05-15 20:37:09.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/andbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -41,6 +41,7 @@ { const QByteArray operand = mParameterSet.operand(); const int operandSize = operand.size(); + int filteredBytesCount = 0; if( mParameterSet.alignAtEnd() ) { @@ -52,6 +53,13 @@ int o = operandSize; while( m > 0 && o > 0 ) result[(r--)-1] = model->datum( (m--)-1 ) & operand[(o--)-1]; + + filteredBytesCount += (operandSize-o); + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( section.end()-m ); + } } } else @@ -64,6 +72,13 @@ int o = 0; while( m <= section.end() && o < operandSize ) result[r++] = model->datum( m++ ) & operand[o++]; + + filteredBytesCount += o; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp 2008-04-23 17:51:17.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/invertbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -41,9 +41,17 @@ { int r = 0; int m = section.start(); + int filteredBytesCount = 0; while( m <= section.end() ) + { result[r++] = ~model->datum( m++ ); - + ++filteredBytesCount; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } + } return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp 2008-05-15 20:37:09.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/orbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -41,6 +41,7 @@ { const QByteArray operand = mParameterSet.operand(); const int operandSize = operand.size(); + int filteredBytesCount = 0; if( mParameterSet.alignAtEnd() ) { @@ -52,6 +53,13 @@ int o = operandSize; while( m > 0 && o > 0 ) result[(r--)-1] = model->datum( (m--)-1 ) | operand[(o--)-1]; + + filteredBytesCount += (operandSize-o); + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( section.end()-m ); + } } } else @@ -64,6 +72,13 @@ int o = 0; while( m <= section.end() && o < operandSize ) result[r++] = model->datum( m++ ) | operand[o++]; + + filteredBytesCount += o; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp 2008-04-23 17:51:17.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/reversebytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -41,6 +41,7 @@ { int r = section.width()-1; int m = section.start(); + int filteredBytesCount = 0; while( m <= section.end() ) { unsigned char byte = (unsigned char)model->datum( m++ ); @@ -57,6 +58,13 @@ else reverseByte = byte; result[r--] = reverseByte; + + ++filteredBytesCount; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp 2008-06-10 13:40:56.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -49,6 +49,7 @@ const int shiftByteWidth = groupShiftBitWidth / RotateBitsPerByte; const int shiftBitWidth = groupShiftBitWidth - shiftByteWidth * RotateBitsPerByte; const int otherShiftBitWidth = RotateBitsPerByte - shiftBitWidth; + int filteredBytesCount = 0; const bool toRight = ( mParameterSet.moveBitWidth() > 0 ); if( toRight ) @@ -81,6 +82,13 @@ else if( g == groupSize ) result[r-b] |= last<<otherShiftBitWidth; } + + filteredBytesCount += g; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } } else @@ -113,6 +121,13 @@ else if( g == groupSize ) result[r-b] |= first >> otherShiftBitWidth; } + + filteredBytesCount += g; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp 2008-06-10 13:40:56.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -49,6 +49,7 @@ const int shiftByteWidth = groupShiftBitWidth / ShiftBitsPerByte; const int shiftBitWidth = groupShiftBitWidth - shiftByteWidth * ShiftBitsPerByte; const int otherShiftBitWidth = ShiftBitsPerByte - shiftBitWidth; + int filteredBytesCount = 0; const bool toRight = ( mParameterSet.moveBitWidth() > 0 ); if( toRight ) @@ -78,6 +79,13 @@ if( b < g ) result[r-b] |= (unsigned char)result[r-b-1] << otherShiftBitWidth; } + + filteredBytesCount += g; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } } else @@ -108,6 +116,13 @@ if( b>1 ) result[r-b] |= (unsigned char)result[r-b+1] >> otherShiftBitWidth; } + + filteredBytesCount += g; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp 2008-05-15 20:37:09.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libbytearrayfilter/filter/xorbytearrayfilter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -41,6 +41,7 @@ { const QByteArray operand = mParameterSet.operand(); const int operandSize = operand.size(); + int filteredBytesCount = 0; if( mParameterSet.alignAtEnd() ) { @@ -52,6 +53,13 @@ int o = operandSize; while( m > 0 && o > 0 ) result[(r--)-1] = model->datum( (m--)-1 ) ^ operand[(o--)-1]; + + filteredBytesCount += (operandSize-o); + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( section.end()-m ); + } } } else @@ -64,6 +72,13 @@ int o = 0; while( m <= section.end() && o < operandSize ) result[r++] = model->datum( m++ ) ^ operand[o++]; + + filteredBytesCount += o; + if( filteredBytesCount >= FilteredByteCountSignalLimit ) + { + filteredBytesCount = 0; + emit filteredBytes( m-section.start() ); + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp 2008-04-18 09:21:17.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -1,7 +1,7 @@ /* This file is part of the Okteta Kakao module, part of the KDE project. - Copyright 2007 Friedrich W. H. Kossebau <kossebau(a)kde.org> + Copyright 2007-2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -62,6 +62,7 @@ frameRenderer->renderFrame( &painter, pageIndex ); painter.translate( -x, -y ); } + emit printedPage( pageIndex ); if( pageIndex < lastPageIndex ) { printer->newPage(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h 2008-04-18 09:21:17.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/libframesprint/framestopaperprinter.h 2008-06-25 09:59:11.000000000 +0200 @@ -1,7 +1,7 @@ /* This file is part of the Okteta Kakao module, part of the KDE project. - Copyright 2007 Friedrich W. H. Kossebau <kossebau(a)kde.org> + Copyright 2007-2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -24,14 +24,17 @@ #define FRAMESTOPAPERPRINTER_H // Qt +#include <QtCore/QObject> #include <QtCore/QList> #include <QtCore/QRect> class QPrinter; class AbstractFrameRenderer; -class FramesToPaperPrinter +class FramesToPaperPrinter : public QObject { + Q_OBJECT + public: FramesToPaperPrinter(); ~FramesToPaperPrinter(); @@ -47,6 +50,9 @@ public: QRect pageRect() const; + Q_SIGNALS: + void printedPage( int pageIndex ); + protected: QList<AbstractFrameRenderer*> mFrameRendererList; QRect mPaperRect; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -0,0 +1,70 @@ +/* + This file is part of the Okteta Kakao module, part of the KDE project. + + Copyright 2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "printjob.h" + +// controller +#include "framestopaperprinter.h" +// #include "printthread.h" +// Qt +#include <QtGui/QApplication> +// #include <QtGui/QFontDatabase> + + +static const int MaxEventProcessTimeInMS = 100; + +#if 0 +PrintJob::PrintJob( FramesToPaperPrinter *framesPrinter, int firstPage, int lastPage, QPrinter *printer ) + : mPrintThread( new PrintThread(this,framesPrinter, firstPage, lastPage, printer) ) +{ + connect( mPrintThread, SIGNAL(finished()), SLOT(onFinished()) ); +} + +void PrintJob::start() +{ + if( QFontDatabase::supportsThreadedFontRendering() ) + mPrintThread->start(); +} +#endif + +bool PrintJob::exec() +{ + connect( mFramesPrinter, SIGNAL(printedPage(int)), SLOT(onPagePrinted()) ); + + const bool result = mFramesPrinter->print( mPrinter, mFirstPage, mLastPage ); + + deleteLater(); + + return result; +} + +void PrintJob::onPagePrinted() +{ + QApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers, MaxEventProcessTimeInMS ); +} + +#if 0 +void PrintJob::onFinished() +{ + emitResult(); +} +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.h --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printjob.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printjob.h 2008-06-25 09:59:11.000000000 +0200 @@ -0,0 +1,65 @@ +/* + This file is part of the Okteta Kakao module, part of the KDE project. + + Copyright 2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef PRINTJOB_H +#define PRINTJOB_H + +// KDE +// #include <KJob> +// Qt +#include <QtCore/QObject> + +class PrintThread; +class FramesToPaperPrinter; +class QPrinter; + +class PrintJob : public QObject // not yet: KJob +{ + Q_OBJECT + + public: + PrintJob( FramesToPaperPrinter *framesPrinter, int firstPage, int lastPage, QPrinter *printer ); + + public: // KJob API +// virtual void start(); + + public: + bool exec(); + + protected Q_SLOTS: +// void onFinished(); + void onPagePrinted(); + + protected: +// PrintThread *mPrintThread; + FramesToPaperPrinter *mFramesPrinter; + const int mFirstPage; + const int mLastPage; + + QPrinter *mPrinter; +}; + +inline PrintJob::PrintJob( FramesToPaperPrinter *framesPrinter, int firstPage, int lastPage, QPrinter *printer ) + : mFramesPrinter( framesPrinter ), mFirstPage( firstPage ), mLastPage( lastPage ), mPrinter( printer ) +{} + +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printtool.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printtool.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/print/printtool.cpp 2008-05-21 10:32:39.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/print/printtool.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -23,6 +23,7 @@ #include "printtool.h" // controller +#include "printjob.h" #include "framestopaperprinter.h" #include "headerfooterframerenderer.h" #include "bytearrayframerenderer.h" @@ -40,6 +41,7 @@ #include <kdeprintdialog.h> #include <kdeversion.h> // Qt +#include <QtGui/QApplication> #include <QtGui/QPrintDialog> #include <QtGui/QPrinter> #include <QtGui/QFont> @@ -155,7 +157,12 @@ info.setNoOfPages( byteArrayFrameRenderer->framesCount() ); info.setUrl( mDocument->title() ); //TODO: get the url from synchronizer!!! - const bool success = framesPrinter.print( &printer, 0, byteArrayFrameRenderer->framesCount()-1 ); + QApplication::setOverrideCursor( Qt::WaitCursor ); + + PrintJob *printJob = new PrintJob( &framesPrinter, 0, byteArrayFrameRenderer->framesCount()-1, &printer ); + const bool success = printJob->exec(); + + QApplication::restoreOverrideCursor(); if( !success ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp 2008-04-18 09:21:18.000000000 +0200 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchcontroller.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -24,6 +24,7 @@ // controller #include "ksearchdialog.h" +#include "searchjob.h" // lib #include <kbytearraydocument.h> // Kakao gui @@ -40,6 +41,8 @@ #include <KActionCollection> #include <KStandardAction> #include <KMessageBox> +// Qt +#include <QtGui/QApplication> // TODO: for docked widgets signal widgets if embedded or floating, if horizontal/vertical @@ -157,10 +160,14 @@ while( true ) { - // TODO: support ignorecase - int Pos = ( Direction == FindForward ) ? - ByteArray->indexOf( SearchData, StartIndex ) : - ByteArray->lastIndexOf( SearchData, StartIndex-SearchData.size()+1 ); + + QApplication::setOverrideCursor( Qt::WaitCursor ); + + SearchJob *searchJob = new SearchJob( ByteArray, SearchData, StartIndex, (Direction==FindForward) ); + const int Pos = searchJob->exec(); + + QApplication::restoreOverrideCursor(); + if( Pos != -1 ) { PreviousFound = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.cpp 2008-06-25 09:59:11.000000000 +0200 @@ -0,0 +1,52 @@ +/* + This file is part of the Okteta Kakao module, part of the KDE project. + + Copyright 2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "searchjob.h" + +// filter +#include <abstractbytearrayfilter.h> +// Okteta core +#include <kabstractbytearraymodel.h> +// Qt +#include <QtGui/QApplication> + +static const int MaxEventProcessTimeInMS = 100; + +int SearchJob::exec() +{ + //TODO: what kind of signal could a filter send? + connect( mByteArrayModel, SIGNAL(searchedBytes(int)), SLOT(onBytesSearched()) ); + + // TODO: support ignorecase + const int result = mFindForward ? + mByteArrayModel->indexOf( mSearchData, mStartIndex ) : + mByteArrayModel->lastIndexOf( mSearchData, mStartIndex-mSearchData.size()+1 ); + + deleteLater(); // TODO: could be reused on next search + + return result; +} + +void SearchJob::onBytesSearched() +{ + QApplication::processEvents( QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers, MaxEventProcessTimeInMS ); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.h new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.h --- old/kdeutils-4.0.83/okteta/program/oktetakakao/controllers/view/search/searchjob.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdeutils-4.0.84/okteta/program/oktetakakao/controllers/view/search/searchjob.h 2008-06-25 09:59:11.000000000 +0200 @@ -0,0 +1,61 @@ +/* + This file is part of the Okteta Kakao module, part of the KDE project. + + Copyright 2008 Friedrich W. H. Kossebau <kossebau(a)kde.org> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef SEARCHJOB_H +#define SEARCHJOB_H + +// Qt +#include <QtCore/QObject> +#include <QtCore/QByteArray> + +namespace KHECore { +class KAbstractByteArrayModel; +} + +class SearchJob : public QObject // not yet: KJob +{ + Q_OBJECT + + public: + SearchJob( const KHECore::KAbstractByteArrayModel *model, + const QByteArray &searchData, int startIndex, bool findForward ); + + public: + int exec(); + + protected Q_SLOTS: + void onBytesSearched(); + + protected: + const KHECore::KAbstractByteArrayModel *mByteArrayModel; + + const QByteArray mSearchData; + int mStartIndex; + bool mFindForward; +}; + +inline SearchJob::SearchJob( const KHECore::KAbstractByteArrayModel *model, + const QByteArray &searchData, int startIndex, bool findForward ) + : mByteArrayModel( model ), mSearchData( searchData ), mStartIndex( startIndex), mFindForward( findForward ) +{} + +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/printer-applet/CMakeLists.txt new/kdeutils-4.0.84/printer-applet/CMakeLists.txt --- old/kdeutils-4.0.83/printer-applet/CMakeLists.txt 2008-06-03 11:34:14.000000000 +0200 +++ new/kdeutils-4.0.84/printer-applet/CMakeLists.txt 2008-06-25 09:59:12.000000000 +0200 @@ -18,9 +18,9 @@ ENDIF(NOT PYKDE_FOUND) find_package(PyCups) -IF(NOT PYQT4_FOUND) +IF(NOT PYCUPS_FOUND) macro_log_feature(PYCUPS_FOUND "PyCups" "PyCups was not found. It is needed by printer-applet to run. (Use -DINSTALL_PRINTER_APPLET=TRUE to install anyway)" "http://cyberelk.net/tim/software/pycups/" FALSE) -ENDIF(NOT PYQT4_FOUND) +ENDIF(NOT PYCUPS_FOUND) IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND) SET(INSTALL_PRINTER_APPLET TRUE) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/printer-applet/printer-applet.desktop new/kdeutils-4.0.84/printer-applet/printer-applet.desktop --- old/kdeutils-4.0.83/printer-applet/printer-applet.desktop 2008-06-18 14:41:09.000000000 +0200 +++ new/kdeutils-4.0.84/printer-applet/printer-applet.desktop 2008-06-25 09:59:12.000000000 +0200 @@ -1,7 +1,9 @@ [Desktop Entry] Encoding=UTF-8 Name=Printer Applet +Name[ca]=Miniaplicació d'impressió Name[cs]=Tiskový applet +Name[da]=Printerapplet Name[de]=Drucker-Miniprogramm Name[el]=Μικροεφαρμογή εκτυπωτή Name[es]=Applet para la impresora @@ -23,6 +25,8 @@ Name[zh_CN]=打印机小程序 Name[zh_TW]=印表機小程式 Comment=System tray icon for managing print jobs +Comment[ca]=Icona de la safata del sistema per gestionar els treballs d'impressió +Comment[da]=statusikon til håndtering af udskriftsjob Comment[de]=Symbol für die Druckerverwaltung, dargestellt im Systemabschnitt der Kontrollleiste Comment[el]=Εικονίδιο πλαισίου συστήματος για διαχείριση εργασιών εκτύπωσης Comment[es]=Icono de la bandeja del sistema para la gestión de trabajos de impresión diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/superkaramba/plasma/plasma-package-superkaramba.desktop new/kdeutils-4.0.84/superkaramba/plasma/plasma-package-superkaramba.desktop --- old/kdeutils-4.0.83/superkaramba/plasma/plasma-package-superkaramba.desktop 2008-06-11 10:33:12.000000000 +0200 +++ new/kdeutils-4.0.84/superkaramba/plasma/plasma-package-superkaramba.desktop 2008-06-25 09:59:12.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=SuperKaramba Theme Files +Name[ca]=Fitxers de temes del SuperKaramba Name[da]=SuperKaramba temafiler Name[de]=SuperKaramba Design-Dateien Name[el]=Αρχεία θεμάτων του SuperKaramba @@ -23,6 +24,7 @@ Name[zh_CN]=SuperKaramba 主题文件 Name[zh_TW]=SuperKaramba 主題檔案 Comment=Karamba Desktop Themes +Comment[ca]=Temes d'escriptori del Karamba Comment[da]=Karamba desktoptemaer Comment[de]=Karamba Arbeitsflächendesigns Comment[el]=Θέματα επιφάνειας εργασίας του Karamba diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeutils-4.0.83/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop new/kdeutils-4.0.84/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop --- old/kdeutils-4.0.83/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop 2008-06-11 10:33:12.000000000 +0200 +++ new/kdeutils-4.0.84/superkaramba/plasma/plasma-scriptengine-superkaramba.desktop 2008-06-25 09:59:12.000000000 +0200 @@ -7,6 +7,7 @@ Name[ta]=சூப்பர் கரம்பா Name[x-test]=xxSuperKarambaxx Comment=Karamba Desktop Theme +Comment[ca]=Tema d'escriptori del Karamba Comment[da]=Karamba desktoptema Comment[de]=Karamba Arbeitsflächendesign Comment[el]=Θέμα επιφάνειας εργασίας του Karamba ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdetoys4
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package kdetoys4 checked in at Mon Jun 30 18:07:54 CEST 2008. -------- --- KDE/kdetoys4/kdetoys4.changes 2008-06-23 23:29:58.000000000 +0200 +++ kdetoys4/kdetoys4.changes 2008-06-26 17:50:33.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 26 17:50:25 CEST 2008 - dmueller(a)suse.de + +- update to 4.0.84 + +------------------------------------------------------------------- Old: ---- kdetoys-4.0.83.tar.bz2 New: ---- kdetoys-4.0.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdetoys4.spec ++++++ --- /var/tmp/diff_new_pack.Q14542/_old 2008-06-30 18:07:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Q14542/_new 2008-06-30 18:07:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdetoys4 (Version 4.0.83) +# spec file for package kdetoys4 (Version 4.0.84) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ Group: System/GUI/KDE Summary: Kdetoys Base Package Url: http://www.kde.org -Version: 4.0.83 +Version: 4.0.84 Release: 1 Source0: kdetoys-%version.tar.bz2 Source1: _upstream @@ -167,6 +167,8 @@ %doc COPYING COPYING.DOC README %changelog +* Thu Jun 26 2008 dmueller(a)suse.de +- update to 4.0.84 * Wed Jun 18 2008 dmueller(a)suse.de - update to 4.0.83 * Tue Jun 10 2008 dmueller(a)suse.de ++++++ kdetoys-4.0.83.tar.bz2 -> kdetoys-4.0.84.tar.bz2 ++++++ Files old/kdetoys-4.0.83/doc/amor/index.cache.bz2 and new/kdetoys-4.0.84/doc/amor/index.cache.bz2 differ Files old/kdetoys-4.0.83/doc/kteatime/index.cache.bz2 and new/kdetoys-4.0.84/doc/kteatime/index.cache.bz2 differ Files old/kdetoys-4.0.83/doc/kweather/index.cache.bz2 and new/kdetoys-4.0.84/doc/kweather/index.cache.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesdk4
by root＠Hilbert.suse.de 30 Jun '08

30 Jun '08

Hello community, here is the log from the commit of package kdesdk4 checked in at Mon Jun 30 18:07:22 CEST 2008. -------- --- KDE/kdesdk4/kdesdk4.changes 2008-06-23 23:33:45.000000000 +0200 +++ kdesdk4/kdesdk4.changes 2008-06-26 17:50:07.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 26 17:49:57 CEST 2008 - dmueller(a)suse.de + +- update to 4.0.84 + +------------------------------------------------------------------- Old: ---- kdesdk-4.0.83.tar.bz2 New: ---- kdesdk-4.0.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4.spec ++++++ --- /var/tmp/diff_new_pack.c11679/_old 2008-06-30 18:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c11679/_new 2008-06-30 18:06:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdesdk4 (Version 4.0.83) +# spec file for package kdesdk4 (Version 4.0.84) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,11 +13,11 @@ Name: kdesdk4 BuildRequires: db-devel flex kdebase4-workspace-devel BuildRequires: libkdepimlibs4-devel oxygen-icon-theme subversion-devel -License: GPL v2 or later +License: GPL v2 only; GPL v2 or later Group: System/GUI/KDE Summary: KDE SDK Package Url: http://www.kde.org/ -Version: 4.0.83 +Version: 4.0.84 Release: 1 Source0: kdesdk-%version.tar.bz2 Source1: _upstream @@ -495,6 +495,8 @@ /usr/share/strigi/fieldproperties/strigi_translation.fieldproperties %changelog +* Thu Jun 26 2008 dmueller(a)suse.de +- update to 4.0.84 * Wed Jun 18 2008 dmueller(a)suse.de - update to 4.0.83 * Sat Jun 14 2008 schwab(a)suse.de ++++++ kdesdk-4.0.83.tar.bz2 -> kdesdk-4.0.84.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/cervisia/updateview.cpp new/kdesdk-4.0.84/cervisia/updateview.cpp --- old/kdesdk-4.0.83/cervisia/updateview.cpp 2008-02-28 18:55:19.000000000 +0100 +++ new/kdesdk-4.0.84/cervisia/updateview.cpp 2008-06-25 09:58:52.000000000 +0200 @@ -181,6 +181,16 @@ } +// updates internal data +void UpdateView::replaceItem(Q3ListViewItem* oldItem, + Q3ListViewItem* newItem) +{ + const int index(relevantSelection.indexOf(oldItem)); + if (index >= 0) + relevantSelection.replace(index, newItem); +} + + void UpdateView::unfoldSelectedFolders() { QApplication::setOverrideCursor(Qt::WaitCursor); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/cervisia/updateview.h new/kdesdk-4.0.84/cervisia/updateview.h --- old/kdesdk-4.0.83/cervisia/updateview.h 2008-02-28 18:55:19.000000000 +0100 +++ new/kdesdk-4.0.84/cervisia/updateview.h 2008-06-25 09:58:52.000000000 +0200 @@ -69,6 +69,8 @@ */ bool isUnfoldingTree() const; + void replaceItem(Q3ListViewItem*, Q3ListViewItem*); + signals: void fileOpened(QString filename); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/cervisia/updateview_items.cpp new/kdesdk-4.0.84/cervisia/updateview_items.cpp --- old/kdesdk-4.0.83/cervisia/updateview_items.cpp 2008-06-18 14:42:06.000000000 +0200 +++ new/kdesdk-4.0.84/cervisia/updateview_items.cpp 2008-06-25 09:58:52.000000000 +0200 @@ -216,19 +216,6 @@ } -// delete the item with name itemName and remove it from m_itemsByName -void UpdateDirItem::deleteItem(const QString& name) -{ - const TMapItemsByName::iterator it = m_itemsByName.find(name); - if (it != m_itemsByName.end()) - { - UpdateItem* item = *it; - m_itemsByName.erase(it); - delete item; - } -} - - UpdateItem* UpdateDirItem::insertItem(UpdateItem* item) { const TMapItemsByName::iterator it = m_itemsByName.find(item->entry().m_name); @@ -244,6 +231,9 @@ } else { + // avoid dangling pointers in the view + updateView()->replaceItem(existingItem, item); + delete existingItem; *it = item; } @@ -760,7 +750,9 @@ // - add new directory in Cervisia // - update status kDebug(8050) << "file changed to dir " << dirName; - dirItem->deleteItem(dirName); + + // just create a new dir item, createDirItem() will delete the + // file item and update the m_itemsByName map item = 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/cervisia/updateview_items.h new/kdesdk-4.0.84/cervisia/updateview_items.h --- old/kdesdk-4.0.83/cervisia/updateview_items.h 2008-06-18 14:42:06.000000000 +0200 +++ new/kdesdk-4.0.84/cervisia/updateview_items.h 2008-06-25 09:58:52.000000000 +0200 @@ -101,8 +101,6 @@ UpdateDirItem* createDirItem(const Cervisia::Entry& entry); UpdateFileItem* createFileItem(const Cervisia::Entry& entry); - void deleteItem(const QString& name); - UpdateItem* insertItem(UpdateItem* item); UpdateItem* findItem(const QString& name) const; Files old/kdesdk-4.0.83/doc/cervisia/index.cache.bz2 and new/kdesdk-4.0.84/doc/cervisia/index.cache.bz2 differ Files old/kdesdk-4.0.83/doc/kapptemplate/index.cache.bz2 and new/kdesdk-4.0.84/doc/kapptemplate/index.cache.bz2 differ Files old/kdesdk-4.0.83/doc/kate/index.cache.bz2 and new/kdesdk-4.0.84/doc/kate/index.cache.bz2 differ Files old/kdesdk-4.0.83/doc/kate-plugins/index.cache.bz2 and new/kdesdk-4.0.84/doc/kate-plugins/index.cache.bz2 differ Files old/kdesdk-4.0.83/doc/kbugbuster/index.cache.bz2 and new/kdesdk-4.0.84/doc/kbugbuster/index.cache.bz2 differ Files old/kdesdk-4.0.83/doc/kcachegrind/index.cache.bz2 and new/kdesdk-4.0.84/doc/kcachegrind/index.cache.bz2 differ Files old/kdesdk-4.0.83/doc/kompare/index.cache.bz2 and new/kdesdk-4.0.84/doc/kompare/index.cache.bz2 differ Files old/kdesdk-4.0.83/doc/lokalize/index.cache.bz2 and new/kdesdk-4.0.84/doc/lokalize/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/doc/lokalize/index.docbook new/kdesdk-4.0.84/doc/lokalize/index.docbook --- old/kdesdk-4.0.83/doc/lokalize/index.docbook 2008-06-03 11:34:37.000000000 +0200 +++ new/kdesdk-4.0.84/doc/lokalize/index.docbook 2008-06-25 09:58:52.000000000 +0200 @@ -225,7 +225,7 @@ works with the <ulink url="http://www.google.com/language_tools?hl=en">Google Language Tools</ulink> as well as the project file for it, at <ulink -url="http://websvn.kde.org/kde/trunk/l10n-kde4/ru/" />. +url="http://websvn.kde.org/trunk/l10n-kde4/ru/" />. </para> </chapter> Files old/kdesdk-4.0.83/doc/scripts/kdesvn-build/index.cache.bz2 and new/kdesdk-4.0.84/doc/scripts/kdesvn-build/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/doc/scripts/man-create_makefile.1.docbook new/kdesdk-4.0.84/doc/scripts/man-create_makefile.1.docbook --- old/kdesdk-4.0.83/doc/scripts/man-create_makefile.1.docbook 2008-05-21 10:33:37.000000000 +0200 +++ new/kdesdk-4.0.84/doc/scripts/man-create_makefile.1.docbook 2008-06-25 09:58:52.000000000 +0200 @@ -70,7 +70,7 @@ </varlistentry> <varlistentry> <term><envar>OBJ_REPLACEMENT</envar></term> -<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory. For instance, if the source directory is <filename class="directory">~/src/kdesdk</filename> and the build directory is <filename class="directory">~/src/kdesdk-obj</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <paramater>s#kdesdk#kdesdk-obj#</parameter>.</para></listitem> +<listitem><para>A <command>sed</command> expression that is used to transform the source directory into the build directory. For instance, if the source directory is <filename class="directory">~/src/kdesdk</filename> and the build directory is <filename class="directory">~/src/kdesdk-obj</filename>, then <envar>OBJ_REPLACEMENT</envar> should be set to <parameter>s#kdesdk#kdesdk-obj#</parameter>.</para></listitem> </varlistentry> </variablelist> Files old/kdesdk-4.0.83/doc/umbrello/index.cache.bz2 and new/kdesdk-4.0.84/doc/umbrello/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/C++/akonadiresource/akonadiresource.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/C++/akonadiresource/akonadiresource.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/C++/akonadiresource/akonadiresource.kdevtemplate 2008-05-29 13:19:26.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/C++/akonadiresource/akonadiresource.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,6 +1,24 @@ # KDE Config File [General] Name=Akonadi Resource Template +Name[es]=Plantilla de recursos de Akonadi +Name[et]=Akonadi ressursi mall +Name[gl]=Modelo de recurso de Akonadi +Name[nds]=Akonadi-Ressourcevörlaag +Name[pt]=Modelo de Recurso do Akonadi +Name[pt_BR]=Modelo de Recurso do Akonadi +Name[uk]=Шаблон ресурсу Akonadi +Name[zh_CN]=Akonadi 资源模板 +Name[zh_TW]=Aknoadi 資源樣本 Comment=A template for an Akonadi PIM data resource +Comment[es]=Una plantilla para un recurso de datos PIM de Akonadi +Comment[et]=Akonadi PIM andmete ressursi mall +Comment[gl]=Un modelo de recurso de datos de PIM para Akonadi +Comment[nds]=En Akonadi-Vörlaag för en PIM-Datenressource +Comment[pt]=Um modelo para um recurso de dados PIM do Akonadi +Comment[pt_BR]=Um modelo para um recurso de dados PIM do Akonadi +Comment[uk]=Шаблон для ресурсу даних PIM Akonadi +Comment[zh_CN]=Akonadi 个人信息管理数据资源模板 +Comment[zh_TW]=Akonadi PIM 資料資源樣本 Category=C++/KDE Icon=akonadi-resources.png diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/C++/kapp4/kapp4.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/C++/kapp4/kapp4.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/C++/kapp4/kapp4.kdevtemplate 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/C++/kapp4/kapp4.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,7 +1,25 @@ # KDE Config File [General] Name=KDE 4 GUI Application +Name[es]=Una aplicación para el entorno gráfico de KDE 4 +Name[et]=KDE4 GUI rakendus +Name[gl]=Un programa con GUI de KDE4 +Name[nds]=KDE4-Böversiet-Programm +Name[pt]=Aplicação Gráfica do KDE 4 +Name[pt_BR]=Aplicação Gráfica do KDE 4 +Name[uk]=Програма з графічним інтерфейсом для KDE4 +Name[zh_CN]=KDE 4 图形用户界面应用程序 +Name[zh_TW]=KDE 4 圖形介面應用程式 Comment=KDE4 simple template based on CMake, inherits from XMLGuiWindow and demonstrates how to use KConfig XT +Comment[es]=Sencilla plantilla para KDE 4 basada en CMake, que hereda de XMLGuiWindow y demuestra cómo usar KConfig XT +Comment[et]=Lihtne KDE4 mall CMake'i põhjal, XMLGuiWindow järglane, mis näitab, kuidas kasutada KConfig XT-d +Comment[gl]=Modelo simples para KDE4 baseado en CMake, herda de XMLGuiWindow e demonstra como empregar KConfig XT +Comment[nds]=Eenfach KDE4-Vörlaag, opbuut op CMake, arvt vun XMLGuiWindow un wiest, wodennig KConfigXT bruukt warrt +Comment[pt]=Um modelo simples para KDE4 com base no CMake, que herda do XMLGuiWindow e demonstra como utilizar o KConfig XT +Comment[pt_BR]=Um modelo simples para KDE4 com base no CMake, que herda do XMLGuiWindow e demonstra como utilizar o KConfig XT +Comment[uk]=Простий шаблон програми для KDE4, заснований на CMake, успадковує клас XMLGuiWindow і демонструє використання KConfig XT +Comment[zh_CN]=基于 CMake，继承自 XMLGuiWindow 和演示如何使用 KConfig XT 的 KDE4 简单模板 +Comment[zh_TW]=基於 CMake 的 KDE4 簡單應用程式樣本，從 XMLGuiWindow 繼承而來，用於展示如何使用 KConfig XT Category=C++/KDE Icon=kapp4.png -ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp \ No newline at end of file +ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/C++/kapp4/src/%{APPNAMELC}.desktop new/kdesdk-4.0.84/kapptemplate/templates/C++/kapp4/src/%{APPNAMELC}.desktop --- old/kdesdk-4.0.83/kapptemplate/templates/C++/kapp4/src/%{APPNAMELC}.desktop 2008-06-18 14:42:03.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/C++/kapp4/src/%{APPNAMELC}.desktop 2008-06-25 09:58:52.000000000 +0200 @@ -7,6 +7,7 @@ Type=Application DocPath=%{APPNAMELC}/index.html GenericName=A KDE4 Application +GenericName[da]=Et KDE4-program GenericName[el]=Μια εφαρμογή KDE4 GenericName[es]=Una aplicación de KDE4 GenericName[et]=KDE4 rakendus diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/C++/kpartapp/kpartapp.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/C++/kpartapp/kpartapp.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/C++/kpartapp/kpartapp.kdevtemplate 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/C++/kpartapp/kpartapp.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,7 +1,25 @@ # KDE Config File [General] -Name=KDE 4 KPart Application +Name=KDE 4 KPart Application +Name[es]=Una aplicación KPart de KDE 4 +Name[et]=KDE 4 KPart rakendus +Name[gl]=Unha programa KPart de KDE4 +Name[nds]=KPart-Programm för KDE4 +Name[pt]=Aplicação KPart do KDE 4 +Name[pt_BR]=Aplicação KPart do KDE 4 +Name[uk]=Програма KPart для KDE 4 +Name[zh_CN]=KDE 4 KPart 应用程序 +Name[zh_TW]=KDE 4 KPart 應用程式 Comment=KDE4 simple template based on CMake, inherits from XMLGuiWindow and demonstrates how to use KPart +Comment[es]=Sencilla plantilla para KDE4 basada en CMake, que hereda de XMLGuiWindow y demuestra cómo usar KPart +Comment[et]=Lihtne KDE4 rakendus CMake'i põhjal, XMLGuiWindow järglane, mis näitab, kuidas kasutada KParti +Comment[gl]=Un modelo simples de KDE4 baseado en CMake, herda de XMLGuiWindow e demonstra como empregar KPart +Comment[nds]=Eenfach KDE4-Vörlaag, opbuut op CMake, arvt vun XMLGuiWindow un wiest, wodennig KPart bruukt warrt +Comment[pt]=Um modelo simples para KDE4 com base no CMake, que herda do XMLGuiWindow e demonstra como utilizar o KPart +Comment[pt_BR]=Um modelo simples para KDE4 com base no CMake, que herda do XMLGuiWindow e demonstra como utilizar o KPart +Comment[uk]=Простий шаблон програми для KDE4, заснований на CMake, успадковує клас XMLGuiWindow і демонструє використання KPart +Comment[zh_CN]=基于 CMake，继承自 XMLGuiWindow 和演示如何使用 KPart 的 KDE4 简单模板 +Comment[zh_TW]=基於 CMake 的 KDE4 簡單應用程式樣本，從 XMLGuiWindow 繼承而來，用於展示如何使用 KPart Category=C++/KDE Icon=kpartapp.png -ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp \ No newline at end of file +ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/C++/kpartapp/src/%{APPNAMELC}.desktop new/kdesdk-4.0.84/kapptemplate/templates/C++/kpartapp/src/%{APPNAMELC}.desktop --- old/kdesdk-4.0.83/kapptemplate/templates/C++/kpartapp/src/%{APPNAMELC}.desktop 2008-06-18 14:42:03.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/C++/kpartapp/src/%{APPNAMELC}.desktop 2008-06-25 09:58:52.000000000 +0200 @@ -7,6 +7,7 @@ Type=Application DocPath=%{APPNAMELC}/index.html GenericName=A KDE KPart Application +GenericName[da]=Et KDE KPart-program GenericName[el]=Μια εφαρμογή KDE KPart GenericName[es]=Una aplicación KPart de KDE GenericName[et]=KDE KPart rakendus diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/C++/plasmoid/plasmoid.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/C++/plasmoid/plasmoid.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/C++/plasmoid/plasmoid.kdevtemplate 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/C++/plasmoid/plasmoid.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,6 +1,24 @@ # KDE Config File [General] Name=Plasma Applet Template +Name[es]=Plantilla de applet para Plasma +Name[et]=Plasma apleti mall +Name[gl]=Modelo de applet de Plasma +Name[nds]=Plasma-Lüttprogrammvörlaag +Name[pt]=Modelo de 'Applet' do Plasma +Name[pt_BR]=Modelo de 'Applet' do Plasma +Name[uk]=Шаблон аплету Plasma +Name[zh_CN]=Plasma 小程序模板 +Name[zh_TW]=Plasma 小程式樣本 Comment=A plasma applet template displaying an icon and a text +Comment[es]=Una plantilla de applet para Plasma que muestra un icono y un texto +Comment[et]=Plasma apleti mall, näitab ikooni ja teksti +Comment[gl]=Un modelo de applet de plasma que mostra un ícone e un texto +Comment[nds]=En Lüttprogramm-Vörlaag för Plasma, wiest en Lüttbild un en Text +Comment[pt]=Um modelo de 'applet' do Plasma que mostra um ícone e algum texto +Comment[pt_BR]=Um modelo de 'applet' do Plasma que mostra um ícone e algum texto +Comment[uk]=Шаблон аплету plasma, який показу піктограму і текст +Comment[zh_CN]=显示图标和文本的 plasma 小程序模板 +Comment[zh_TW]=Plasma 小程式樣本，用於顯示圖示與文字 Category=C++/KDE Icon=plasma-applet.png diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/C++/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/C++/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/C++/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/C++/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,50 +1,25 @@ # KDE Config File [General] Name=Qt4 GUI Application -Name[de]=Qt4 Anwendung mit graphischer Oberfläche -Name[el]=Εφαρμογή GUI της Qt4 -Name[es]=Aplicación con interfaz gráfica Qt4 -Name[fa]=کاربرد ونک Qt4 -Name[fr]=Application avec interface graphique Qtopia -Name[ga]=Feidhmchlár Grafach Qt4 -Name[gl]=Aplicación Qt4 con GUI -Name[hi]=क्यूटी४ जीयूआई अनुप्रयोग -Name[it]=Applicazione GUI Qt4 -Name[ja]=Qt4 GUI アプリケーション -Name[ko]=Qt4 GUI 프로그램 -Name[nds]=Qt4-Böversietprogramm -Name[ne]=Qt4 GUI अनुप्रयोग -Name[pl]=Aplikacja (GUI) QT4 +Name[es]=Aplicación Qt4 para interfaz gráfica +Name[et]=Qt4 GUI rakendus +Name[gl]=Un programa con GUI de Qt4 +Name[nds]=Qt4-Böversiet-Programm Name[pt]=Aplicação GUI do Qt4 -Name[pt_BR]=Aplicativo Gráfico do Qt4 -Name[sv]=Qt4-program med grafiskt gränssnitt -Name[tr]=Qt4 Grafiksel Kullanıcı Arayüzü Uygulaması -Name[uk]=Програма з GUI на Qt4 -Name[x-test]=xxQt4 GUI Applicationxx -Name[zh_CN]=Qt4 图形界面应用程序 -Name[zh_TW]=Qt4 使用者介面應用程式 +Name[pt_BR]=Aplicação GUI do Qt4 +Name[uk]=Програма з графічним інтерфейсом на Qt4 +Name[zh_CN]=Qt4 图形用户界面应用程序 +Name[zh_TW]=Qt4 圖形介面應用程式 Category=C++/Qt (qmake) Comment=Generate a QMake/Qt4 based application with graphical user interface (crossplatform compatible) -Comment[de]=Erstellt eine QMake/Qt4 basierte Anwendung mit graphischer Benutzeroberfläche (Crossplattform kompatibel) -Comment[el]=Δημιουργία μιας εφαρμογής με βάση τα QMake/Qt4 με γραφικό περιβάλλον (συμβατή με πολλαπλές πλατφόρμες) -Comment[es]=Genera una aplicación basada en QMake/Qt4 con interfaz gráfica (compatible multiplataforma) -Comment[fa]=یک کاربرد بر مبنای QMake/Qt4 با واسط کاربر نگاره‌ای تولید می‌کند )همساز بین سکویی( -Comment[fr]=Générer une application basée sur QMake / Qt4 avec interface graphique (compatible multiplate-forme) -Comment[ga]=Cruthaigh feidhmchlár bunaithe ar QMake/Qt4 le comhéadan grafach (feidhmchlár trasardáin) -Comment[gl]=Xera un programa baseado en QMake/Qt4 con inteface gráfica para o usuario (compatíbel con multiplataforma) -Comment[it]=Genera un'applicazione basata su QMake/Qt4 con interfaccia utente grafica (compatibile multipiattaforma) -Comment[ja]=グラフィカルユーザインターフェースを持つ QMake/Qt4 ベースのアプリケーションを作成 (クロスプラットフォーム) -Comment[ko]=크로스 플랫폼 호환 QMake/Qt4 그래픽 사용자 인터페이스 프로그램을 만듭니다 -Comment[nds]=En Programm mit graafsch Böversiet opstellen, dat op QMake un Qt4 opbuut (över Bedriefümgeven weg kompatibel) -Comment[ne]=(क्रसप्लेटफर्मसँग मिल्दोजुल्दो) ग्राफिकल प्रयोगकर्ता इन्टरफेससँग QMake/Qt4 आधारित अनुप्रयोग सिर्जना गर्नुहोस् -Comment[pl]=Generuje program używający QMake i Qt/4 z graficznym interfejsem użytkownika (wieloplatformowy) +Comment[es]=Genera una aplicación basada en QMake/Qt4 con interfaz gráfica de usuario (compatible multiplataforma) +Comment[et]=QMake/Qt4 põhise rakenduse loomine graafilise kasutajaliidesega (ühildub paljude platvormidega) +Comment[gl]=Xera un programa baseado en QMake/Qt4 con interface gráfica de usuario (compatíbel con multiplataforma) +Comment[nds]=En op QMake/Qt4 opbuen Programm mit graafsch Böversiet opstellen (lett sik op mehr Systemen kompileren) Comment[pt]=Gera uma aplicação baseada no QMake/Qt4 com uma interface gráfica (compatível com várias plataformas) -Comment[pt_BR]=Gera um aplicativo baseado no QMake/Qt4 com uma interface gráfica (compatível com várias plataformas) -Comment[sv]=Skapar ett QMake- och Qt4-baserat program med ett grafiskt användargränssnitt (som fungerar på flera plattformar) -Comment[tr]=Grafiksel Kullancı Arayüzü Tabanlı QMake/Qt4 tabanlı bir uygulama yarat (Platformlararası geçimli) +Comment[pt_BR]=Gera uma aplicação baseada no QMake/Qt4 com uma interface gráfica (compatível com várias plataformas) Comment[uk]=Створення програми, заснованої на QMake/Qt4, з графічним інтерфейсом (годиться для декількох платформ) -Comment[x-test]=xxGenerate a QMake/Qt4 based application with graphical user interface (crossplatform compatible)xx -Comment[zh_CN]=生成基于 QMake/Qt4 的图形界面应用程序(跨平台兼容) -Comment[zh_TW]=產生一個 QMake/Qt4 為基礎的使用者介面應用程式（跨平台相容） +Comment[zh_CN]=生成一个基于 QMake/Qt4 的图形用户应用程序模板(跨平台兼容) +Comment[zh_TW]=產生以 QMake/Qt4 為基礎的應用程式，含圖形介面，並且跨平台 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp Icon=qmake4gui.png diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,6 +1,24 @@ # KDE Config File [General] Name=PyKDE4 GUI Application +Name[es]=Aplicación PyKDE4 con interfaz gráfica +Name[et]=PyKDE4 GUI rakendus +Name[gl]=Un programa con GUI de PyKDE4 +Name[nds]=PyKDE4-Böversiet-Programm +Name[pt]=Aplicação Gráfica do PyKDE4 +Name[pt_BR]=Aplicação Gráfica do PyKDE4 +Name[uk]=Програма з графічним інтерфейсом на PyKDE4 +Name[zh_CN]=PyKDE4 图形用户界面应用程序 +Name[zh_TW]=PyKDE4 圖形介面應用程式 Comment=PyKDE4 template - needs PyKDE4 +Comment[es]=Plantilla PyKDE4 (necesita PyKDE4) +Comment[et]=PyKDE4 mall - vajalik on PyKDE4 +Comment[gl]=Modelo de PyKDE4, precisa de PyKDE4 +Comment[nds]=PyKDE4-Vörlaag - PyKDE4 deit noot +Comment[pt]=Modelo do PyKDE4 - necessita do PyKDE4 +Comment[pt_BR]=Modelo do PyKDE4 - necessita do PyKDE4 +Comment[uk]=Шаблон PyKDE4 — потрібен PyKDE4 +Comment[zh_CN]=PyKDE4 模板 - 需要 PyKDE4 +Comment[zh_TW]=PyKDE4 樣本─需要 PyKDE4 Category=PyKDE4 Icon=pykde4.png diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,6 +1,24 @@ # KDE Config File [General] Name=PyQt4 GUI Application +Name[es]=Aplicación PyQt4 con interfaz gráfica +Name[et]=PyQt4 GUI rakendus +Name[gl]=Un programa con GUI de PyQt4 +Name[nds]=PyQt4-Böversiet-Programm +Name[pt]=Aplicação Gráfica do PyQt4 +Name[pt_BR]=Aplicação Gráfica do PyQt4 +Name[uk]=Програма з графічним інтерфейсом на PyQt4 +Name[zh_CN]=PyQt4 图形用户界面应用程序 +Name[zh_TW]=PyQt4 圖形介面應用程式 Comment=PyQt template using a Designer file - needs PyQt4 +Comment[es]=Plantilla PyQt que usa un archivo de Designer (necesita PyQt4) +Comment[et]=PyQt mall Disaineri faili põhjal - vajalik on PyQt4 +Comment[gl]=Modelo de PyQt que emprega un ficheiro do Designer, precisa de PyQt4 +Comment[nds]=PyQt-Vörlaag, bruukt en Designer-Datei - PyQt4 deit noot +Comment[pt]=Um modelo para o PyQt que usa um ficheiro do Designer - necessita do PyQt4 +Comment[pt_BR]=Um modelo para o PyQt que usa um ficheiro do Designer - necessita do PyQt4 +Comment[uk]=Шаблон PyQt, з використанням файла Designer — потрібен PyQt4 +Comment[zh_CN]=使用 Designer 文件的 PyQt 模板 - 需要 PyQt4 +Comment[zh_TW]=使用設計家檔案的 PyQt 樣本─需要 PyQt4 Category=PyQt4 Icon=pyqt4app.png diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate new/kdesdk-4.0.84/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate --- old/kdesdk-4.0.83/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate 2008-05-21 10:33:33.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate 2008-06-26 03:33:14.000000000 +0200 @@ -1,7 +1,25 @@ # KDE Config File [General] Name=KDE 4 Ruby GUI Application +Name[es]=Aplicación Ruby para KDE 4 con interfaz gráfica +Name[et]=KDE 4 Ruby GUI rakendus +Name[gl]=Un programa en ruby con GUI de KDE4 +Name[nds]=KDE4Ruby-Böversiet-Programm +Name[pt]=Aplicação Gráfica em Ruby para o KDE 4 +Name[pt_BR]=Aplicação Gráfica em Ruby para o KDE 4 +Name[uk]=Програма з графічним інтерфейсом для KDE 4 на Ruby +Name[zh_CN]=KDE 4 Ruby 图形用户界面应用程序 +Name[zh_TW]=KDE4 Ruby 圖形介面應用程式 Comment=KDE4 simple ruby template, inherits from XMLGuiWindow - needs korundum4 -Category=Ruby +Comment[es]=Sencilla plantilla Ruby para KDE4, que hereda de XMLGuiWindow (necesita korundum4) +Comment[et]=Lihtne KDE4 Ruby mall, XMLGuiWindow järglane - vajalik on korundum4 +Comment[gl]=Un modelo simples en ruby baseado en KDE4, herda de XMLGuiWindow, precisa de korundum4 +Comment[nds]=Eenfach KDE4-Ruby-Vörlaag, arvt vun XMLGuiWindow - Korundum4 deit noot +Comment[pt]=Um modelo simples em Ruby para o KDE4, que herda do XMLGuiWindow - necessita do korundum4 +Comment[pt_BR]=Um modelo simples em Ruby para o KDE4, que herda do XMLGuiWindow - necessita do korundum4 +Comment[uk]=Простий шаблон KDE4 на ruby, успадковує клас XMLGuiWindow — потрібен korundum4 +Comment[zh_CN]=KDE4 简单 ruby 模板，继承自 XMLGuiWindow - 需要 korundum4 +Comment[zh_TW]=KDE4 的簡單 ruby 樣本，從 XMLGuiWindow 繼承而來─需要 korundum4 +Category=Ruby Icon=kderubyapp.png -ShowFilesAfterGeneration=%{dest}/src/main.rb \ No newline at end of file +ShowFilesAfterGeneration=%{dest}/src/main.rb diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kapptemplate/templates/ruby/kderubyapp/src/%{APPNAMELC}.desktop new/kdesdk-4.0.84/kapptemplate/templates/ruby/kderubyapp/src/%{APPNAMELC}.desktop --- old/kdesdk-4.0.83/kapptemplate/templates/ruby/kderubyapp/src/%{APPNAMELC}.desktop 2008-06-18 14:42:03.000000000 +0200 +++ new/kdesdk-4.0.84/kapptemplate/templates/ruby/kderubyapp/src/%{APPNAMELC}.desktop 2008-06-25 09:58:52.000000000 +0200 @@ -7,6 +7,7 @@ Type=Application DocPath=%{APPNAMELC}/index.html GenericName=A KDE4 Ruby Application +GenericName[da]=Et KDE4 Ruby-program GenericName[el]=Μια εφαρμογή KDE4 Ruby GenericName[es]=Una aplicación Ruby de KDE4 GenericName[et]=KDE4 Ruby rakendus diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kioslave/svn/svnhelper/kio_svn_helper.cpp new/kdesdk-4.0.84/kioslave/svn/svnhelper/kio_svn_helper.cpp --- old/kdesdk-4.0.83/kioslave/svn/svnhelper/kio_svn_helper.cpp 2008-01-05 00:57:53.000000000 +0100 +++ new/kdesdk-4.0.84/kioslave/svn/svnhelper/kio_svn_helper.cpp 2008-06-25 09:58:52.000000000 +0200 @@ -248,7 +248,7 @@ } } } else { - KMessageBox::sorry(0, "Sorry, request not recognised. Perhaps not implemented yet?", "Feature Not Implemented"); + KMessageBox::sorry(0, i18n("Sorry, request not recognised. Perhaps not implemented yet?"), i18n("Feature Not Implemented")); } QTimer::singleShot( 0, this, SLOT( finished() ) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/kmtrace/kminspector.cmake new/kdesdk-4.0.84/kmtrace/kminspector.cmake --- old/kdesdk-4.0.83/kmtrace/kminspector.cmake 2008-01-05 00:57:40.000000000 +0100 +++ new/kdesdk-4.0.84/kmtrace/kminspector.cmake 2008-06-26 10:12:38.000000000 +0200 @@ -2,7 +2,7 @@ export MALLOC_TREE=kminspector.tree export MALLOC_THRESHOLD=2000 -export LD_PRELOAD=${CMAKE_INSTALL_PREFIX}${LIB_INSTALL_DIR}/libktrace.so +export LD_PRELOAD=${LIB_INSTALL_DIR}/libktrace.so $* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/lokalize/src/catalog/gettextheader.cpp new/kdesdk-4.0.84/lokalize/src/catalog/gettextheader.cpp --- old/kdesdk-4.0.83/lokalize/src/catalog/gettextheader.cpp 2008-06-10 13:41:20.000000000 +0200 +++ new/kdesdk-4.0.84/lokalize/src/catalog/gettextheader.cpp 2008-06-25 09:58:52.000000000 +0200 @@ -42,7 +42,7 @@ #if 0 pInfo.insert("cs", "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"); pInfo.insert("da", "nplurals=2; plural=(n != 1);"); -pInfo.insert("de", "nplurals=2; plural=(n != 1);"); +pInfo.insert("de", "nplurals=2; plural=n != 1;"); pInfo.insert("el", "nplurals=2; plural=(n != 1);"); pInfo.insert("en", "nplurals=2; plural=(n != 1);"); pInfo.insert("en_GB", "nplurals=2; plural=(n != 1);"); @@ -130,7 +130,7 @@ static const char* pInfo[NUM_LANG_WITH_INFO]={ "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;", "nplurals=2; plural=(n != 1);", -"nplurals=2; plural=(n != 1);", +"nplurals=2; plural=n != 1;", "nplurals=2; plural=(n != 1);", "nplurals=2; plural=(n != 1);", "nplurals=2; plural=(n != 1);", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/lokalize/src/webquery/myactioncollectionview.h new/kdesdk-4.0.84/lokalize/src/webquery/myactioncollectionview.h --- old/kdesdk-4.0.83/lokalize/src/webquery/myactioncollectionview.h 2008-01-29 10:18:13.000000000 +0100 +++ new/kdesdk-4.0.84/lokalize/src/webquery/myactioncollectionview.h 2008-06-25 09:58:52.000000000 +0200 @@ -51,7 +51,7 @@ public slots: void triggerSelectedActions(); - void reset(){Kross::ActionCollectionView::reset();selectAll();} + void reset(){Kross::ActionCollectionView::reset();/*selectAll();*/} signals: void query(const CatalogData& data); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/umbrello/.krazy new/kdesdk-4.0.84/umbrello/.krazy --- old/kdesdk-4.0.83/umbrello/.krazy 1970-01-01 01:00:00.000000000 +0100 +++ new/kdesdk-4.0.84/umbrello/.krazy 2008-06-25 09:58:51.000000000 +0200 @@ -0,0 +1 @@ +SKIP /umbrello/headings/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/umbrello/umbrello/headings/.krazy new/kdesdk-4.0.84/umbrello/umbrello/headings/.krazy --- old/kdesdk-4.0.83/umbrello/umbrello/headings/.krazy 2008-06-03 11:34:36.000000000 +0200 +++ new/kdesdk-4.0.84/umbrello/umbrello/headings/.krazy 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -EXCLUDE copyright,license,includes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/umbrello/umbrello/uml.cpp new/kdesdk-4.0.84/umbrello/umbrello/uml.cpp --- old/kdesdk-4.0.83/umbrello/umbrello/uml.cpp 2008-06-03 11:34:37.000000000 +0200 +++ new/kdesdk-4.0.84/umbrello/umbrello/uml.cpp 2008-06-25 09:58:51.000000000 +0200 @@ -1271,7 +1271,8 @@ { QStringList supportedFormats = mimeData->formats(); foreach( const QString &format, supportedFormats ) { - const char* f = format.toAscii().constData(); + QByteArray fba = format.toAscii(); + const char* f = fba.constData(); if ( !qstrnicmp(f,"application/x-uml-clip", 22) ) { //FIXME need to test for clip1, clip2, clip3, clip4 or clip5 //(the only valid clip types) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.83/umbrello/umbrello/umlviewimageexportermodel.cpp new/kdesdk-4.0.84/umbrello/umbrello/umlviewimageexportermodel.cpp --- old/kdesdk-4.0.83/umbrello/umbrello/umlviewimageexportermodel.cpp 2008-02-21 10:28:19.000000000 +0100 +++ new/kdesdk-4.0.84/umbrello/umbrello/umlviewimageexportermodel.cpp 2008-06-25 09:58:51.000000000 +0200 @@ -25,6 +25,7 @@ #include <QtGui/QPrinter> #include <QtCore/QDir> #include <QtCore/QRegExp> +#include <QtSvg/QSvgGenerator> // kde include files #include <kdebug.h> @@ -323,30 +324,29 @@ return true; } -bool UMLViewImageExporterModel::exportViewToSvg(UMLView* view, const QString &fileName) const { +bool UMLViewImageExporterModel::exportViewToSvg(UMLView* view, const QString &fileName) const +{ bool exportSuccessful; + QRect rect = view->getDiagramRect(); - QPicture* diagram = new QPicture(); - - // do not call printer.setup(); because we want no user - // interaction here - QPainter* painter = new QPainter(); - painter->begin( diagram ); + QSvgGenerator generator; + generator.setFileName(fileName); + generator.setSize(rect.size()); + QPainter painter(&generator); // make sure the widget sizes will be according to the // actually used printer font, important for getDiagramRect() // and the actual painting - view->forceUpdateWidgetFontMetrics(painter); + view->forceUpdateWidgetFontMetrics(&painter); - QRect rect = view->getDiagramRect(); - painter->translate(-rect.x(),-rect.y()); - view->getDiagram(rect,*painter); - painter->end(); - exportSuccessful = diagram->save(fileName); - // delete painter and printer before we try to open and fix the file - delete painter; - delete diagram; + painter.translate(-rect.x(),-rect.y()); + view->getDiagram(rect, painter); + painter.end(); + + //FIXME: Determine the status of svg generation. + exportSuccessful = true; + // next painting will most probably be to a different device (i.e. the screen) view->forceUpdateWidgetFontMetrics(0); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0