kbear-cvs Mailing List for KBear, a graphical ftp client for KDE (Page 7)
Brought to you by:
kbjorn
Menu
▾
▴
kbear-cvs — Generated messages about CVS commits.
You can subscribe to this list here.
| 2003 |
Jan
(113) |
Feb
(143) |
Mar
(31) |
Apr
(88) |
May
(126) |
Jun
(163) |
Jul
(209) |
Aug
(36) |
Sep
(6) |
Oct
(4) |
Nov
(35) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(11) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
|
Dec
|
|
From: <kb...@us...> - 2003-07-20 19:36:04
|
Update of /cvsroot/kbear/kbear/kbear/plugins/wizard In directory sc8-pr-cvs1:/tmp/cvs-serv23710/kbear/plugins/wizard Modified Files: Makefile.am Log Message: Bugfixes Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/wizard/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 19 Jul 2003 18:45:40 -0000 1.8 --- Makefile.am 20 Jul 2003 19:35:31 -0000 1.9 *************** *** 1,8 **** INCLUDES = -I$(top_srcdir)/kbear/lib/interfaces $(all_includes) kde_module_LTLIBRARIES = kbearwizard.la ! kbearwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version -no-undefined kbearwizard_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kbear/lib/libkbearcore.la kbearwizard_la_SOURCES = kbearwizardplugin.cpp kbearwizard.cpp ! kbearwizard_la_METASOURCES = AUTO noinst_HEADERS=kbearwizardplugin.h kbearwizard.h kbearwizard_DATA = kbearwizard.desktop --- 1,8 ---- INCLUDES = -I$(top_srcdir)/kbear/lib/interfaces $(all_includes) kde_module_LTLIBRARIES = kbearwizard.la ! kbearwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version kbearwizard_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kbear/lib/libkbearcore.la kbearwizard_la_SOURCES = kbearwizardplugin.cpp kbearwizard.cpp ! METASOURCES = AUTO noinst_HEADERS=kbearwizardplugin.h kbearwizard.h kbearwizard_DATA = kbearwizard.desktop |
|
From: <kb...@us...> - 2003-07-20 19:36:03
|
Update of /cvsroot/kbear/kbear In directory sc8-pr-cvs1:/tmp/cvs-serv23710 Modified Files: configure.in.in Makefile.am Makefile.cvs Log Message: Bugfixes Index: configure.in.in =================================================================== RCS file: /cvsroot/kbear/kbear/configure.in.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** configure.in.in 19 Jul 2003 18:45:39 -0000 1.21 --- configure.in.in 20 Jul 2003 19:35:30 -0000 1.22 *************** *** 2,5 **** --- 2,7 ---- AM_INIT_AUTOMAKE(kbear, 3.0alpha2) + AC_C_BIGENDIAN + AC_CHECK_KDEMAXPATHLEN KBEAR_CHECK_KDEVERSION Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/Makefile.am,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Makefile.am 16 Jul 2003 00:02:58 -0000 1.37 --- Makefile.am 20 Jul 2003 19:35:30 -0000 1.38 *************** *** 58,59 **** --- 58,61 ---- + + Index: Makefile.cvs =================================================================== RCS file: /cvsroot/kbear/kbear/Makefile.cvs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.cvs 22 Sep 2001 23:14:49 -0000 1.1 --- Makefile.cvs 20 Jul 2003 19:35:30 -0000 1.2 *************** *** 4,15 **** @echo "This will be deleted before making the distribution" @echo "" - @if test ! -d admin; then \ - echo "Please recheckout this module!" ;\ - echo "for cvs: use checkout once and after that update again" ;\ - echo "for cvsup: checkout kde-common from cvsup and" ;\ - echo " link kde-common/admin to ./admin" ;\ - exit 1 ;\ - fi $(MAKE) -f admin/Makefile.common cvs .SILENT: --- 4,11 ---- @echo "This will be deleted before making the distribution" @echo "" $(MAKE) -f admin/Makefile.common cvs + + dist: + $(MAKE) -f admin/Makefile.common dist .SILENT: |
|
From: <kb...@us...> - 2003-07-20 19:36:03
|
Update of /cvsroot/kbear/kbear/kbear In directory sc8-pr-cvs1:/tmp/cvs-serv23710/kbear Modified Files: Makefile.am Log Message: Bugfixes Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/Makefile.am,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** Makefile.am 16 Jul 2003 00:03:05 -0000 1.68 --- Makefile.am 20 Jul 2003 19:35:31 -0000 1.69 *************** *** 27,36 **** # let automoc handle all of the meta source files (moc) ! kbear_METASOURCES = AUTO # the application source, library search path, and link libraries kbear_SOURCES = main.cpp kbearsplash.cpp kbearmainwindow.cpp pluginmanager.h pluginmanager.cpp pluginselectwidget.h pluginselectwidget.cpp api.h api.cpp kbearoutputtoolbar.h kbearoutputtoolbar.cpp kbearoutputframe.h kbearoutputframe.cpp core.h core.cpp kbearquickconnectdlg.h kbearquickconnectdlg.cpp kbeartoplevel.cpp kbeartoplevel.h kbearpartmanager.h kbearpartmanager.cpp kbearclassicmainwindow.cpp kbearclassicmainwindow.h uisettingswidget.cpp uisettingswidget.h kbearmainwindowshared.cpp kbearmainwindowshared.h kbearchildview.cpp kbearchildview.h miscsettingswidget.cpp miscsettingswidget.h ! kbear_LDFLAGS = $(all_libraries) # this is where the desktop file will go kbeardesktopdir = $(kde_appsdir)/Internet --- 27,36 ---- # let automoc handle all of the meta source files (moc) ! METASOURCES = AUTO # the application source, library search path, and link libraries kbear_SOURCES = main.cpp kbearsplash.cpp kbearmainwindow.cpp pluginmanager.h pluginmanager.cpp pluginselectwidget.h pluginselectwidget.cpp api.h api.cpp kbearoutputtoolbar.h kbearoutputtoolbar.cpp kbearoutputframe.h kbearoutputframe.cpp core.h core.cpp kbearquickconnectdlg.h kbearquickconnectdlg.cpp kbeartoplevel.cpp kbeartoplevel.h kbearpartmanager.h kbearpartmanager.cpp kbearclassicmainwindow.cpp kbearclassicmainwindow.h uisettingswidget.cpp uisettingswidget.h kbearmainwindowshared.cpp kbearmainwindowshared.h kbearchildview.cpp kbearchildview.h miscsettingswidget.cpp miscsettingswidget.h ! kbear_LDFLAGS = $(KDE_RPATH) $(all_libraries) # this is where the desktop file will go kbeardesktopdir = $(kde_appsdir)/Internet |
|
From: <kb...@us...> - 2003-07-20 19:27:04
|
Update of /cvsroot/kbear/kbear In directory sc8-pr-cvs1:/tmp/cvs-serv22375 Removed Files: configure.in.bot Log Message: not used --- configure.in.bot DELETED --- |
|
From: <kb...@us...> - 2003-07-19 20:02:23
|
Update of /cvsroot/kbear/kbear/kbear/plugins/ftpfind
In directory sc8-pr-cvs1:/tmp/cvs-serv19641/kbear/plugins/ftpfind
Modified Files:
ftpfindtreeview.cpp
Log Message:
forgot this one
Index: ftpfindtreeview.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/ftpfindtreeview.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ftpfindtreeview.cpp 18 Jul 2003 21:13:59 -0000 1.3
--- ftpfindtreeview.cpp 19 Jul 2003 20:02:20 -0000 1.4
***************
*** 80,84 ****
}
case ScanDomainEvent::Info: {
! m_currentItem = new QListViewItem( this, m_currentItem, event->message() );
m_currentItem->setPixmap( 0, QPixmap( uninitialized_xpm ) );
m_currentItem->setExpandable( true );
--- 80,84 ----
}
case ScanDomainEvent::Info: {
! m_currentItem = new FTPFindTreeViewItem( this, m_currentItem, event->message() );
m_currentItem->setPixmap( 0, QPixmap( uninitialized_xpm ) );
m_currentItem->setExpandable( true );
|
|
From: <kb...@us...> - 2003-07-19 18:45:45
|
Update of /cvsroot/kbear/kbear/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv7097/admin
Modified Files:
acinclude.m4.in am_edit cvs.sh debianrules detect-autoconf.sh
libtool.m4.in
Log Message:
Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/kbear/kbear/admin/acinclude.m4.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** acinclude.m4.in 1 Feb 2003 23:52:18 -0000 1.16
--- acinclude.m4.in 19 Jul 2003 18:45:40 -0000 1.17
***************
*** 1130,1134 ****
if test "$kde_qtver" = "3"; then
if test $kde_qtsubver -gt 0; then
! kde_qt_minversion=">= Qt 3.1 (20021021)"
else
kde_qt_minversion=">= Qt 3.0"
--- 1130,1134 ----
if test "$kde_qtver" = "3"; then
if test $kde_qtsubver -gt 0; then
! kde_qt_minversion=">= Qt 3.1.0 and < Qt 3.2.0"
else
kde_qt_minversion=">= Qt 3.0"
***************
*** 1144,1151 ****
if test -z "$3"; then
if test $kde_qtver = 3; then
! if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x030100"
! else
! kde_qt_verstring="QT_VERSION >= 300"
fi
fi
--- 1144,1155 ----
if test -z "$3"; then
if test $kde_qtver = 3; then
! if test $kde_qtsubver -gt 1; then
kde_qt_verstring="QT_VERSION >= 0x030100"
! else
! if test $kde_qtsubver = 1; then
! kde_qt_verstring="QT_VERSION >= 0x030100 && QT_VERSION < 0x030200"
! else
! kde_qt_verstring="QT_VERSION >= 300"
! fi
fi
fi
***************
*** 1165,1169 ****
if test $kde_qtver = 3; then
! kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt"
fi
if test $kde_qtver = 2; then
--- 1169,1173 ----
if test $kde_qtver = 3; then
! kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
fi
if test $kde_qtver = 2; then
***************
*** 2050,2054 ****
else
case "$1" in
! setenv|unsetenv|usleep|getdomainname|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes"
;;
--- 2054,2058 ----
else
case "$1" in
! setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes"
;;
***************
*** 2248,2252 ****
[ AC_MSG_RESULT(no) ]
)
! LIBS=$kde_libs_safe
AC_SUBST(LIBRESOLV)
--- 2252,2256 ----
[ AC_MSG_RESULT(no) ]
)
! LIBS="$kde_libs_safe"
AC_SUBST(LIBRESOLV)
***************
*** 2742,2745 ****
--- 2746,2754 ----
)
+ AC_ARG_ENABLE(gcov,[ --enable-gcov enables gcov test coverage support [default=no]],
+ [kde_use_gcov=$enableval],
+ [kde_use_gcov=no]
+ )
+
dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
CFLAGS=" $CFLAGS"
***************
*** 2751,2755 ****
if test "$GCC" = "yes"; then
if test "$kde_use_debug_code" != "no"; then
! if test $kde_use_debug_code = "full"; then
CFLAGS="-g3 $CFLAGS"
else
--- 2760,2764 ----
if test "$GCC" = "yes"; then
if test "$kde_use_debug_code" != "no"; then
! if test $kde_use_debug_code = "full" || test $kde_use_gcov = "yes"; then
CFLAGS="-g3 $CFLAGS"
else
***************
*** 2782,2786 ****
if test "$kde_use_debug_code" != "no"; then
if test "$CXX" = "KCC"; then
! CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
else
if test "$kde_use_debug_code" = "full"; then
--- 2791,2795 ----
if test "$kde_use_debug_code" != "no"; then
if test "$CXX" = "KCC"; then
! CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
else
if test "$kde_use_debug_code" = "full"; then
***************
*** 2816,2819 ****
--- 2825,2836 ----
fi
+ if test "$kde_use_gcov" = "yes"; then
+ KDE_CHECK_COMPILER_FLAG(fprofile-arcs,
+ [
+ CFLAGS="-fprofile-arcs -ftest-coverage $CFLAGS"
+ CXXFLAGS="-fprofile-arcs -ftest-coverage $CXXFLAGS"
+ ])
+ fi
+
if test "$kde_use_warnings" = "yes"; then
if test "$GCC" = "yes"; then
***************
*** 2824,2828 ****
;;
esac
! CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
--- 2841,2845 ----
;;
esac
! CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
***************
*** 2962,2973 ****
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
! [/lib directory suffix (64,32,none)]),
kdelibsuff=$enableval)
if test "$kdelibsuff" = "none"; then
! if test -d /lib64 ; then
! kdelibsuff=64
! else
! kdelibsuff=
! fi
fi
if test -z "$kdelibsuff"; then
--- 2979,2988 ----
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
! [/lib directory suffix (64,32,none[=default])]),
kdelibsuff=$enableval)
+ # TODO: add an auto case that compiles a little C app to check
+ # where the glibc is
if test "$kdelibsuff" = "none"; then
! kdelibsuff=
fi
if test -z "$kdelibsuff"; then
***************
*** 3020,3024 ****
dnl $x_libraries is set to /usr/lib in case
if test -n "$X_LDFLAGS"; then
! KDE_RPATH="$KDE_RPATH -R \$(x_libraries)"
fi
if test -n "$KDE_EXTRA_RPATH"; then
--- 3035,3040 ----
dnl $x_libraries is set to /usr/lib in case
if test -n "$X_LDFLAGS"; then
! X_RPATH="-R \$(x_libraries)"
! KDE_RPATH="$KDE_RPATH $X_RPATH"
fi
if test -n "$KDE_EXTRA_RPATH"; then
***************
*** 3028,3031 ****
--- 3044,3048 ----
AC_SUBST(KDE_EXTRA_RPATH)
AC_SUBST(KDE_RPATH)
+ AC_SUBST(X_RPATH)
AC_MSG_RESULT($USE_RPATH)
])
***************
*** 3232,3236 ****
[
kde_safe_cxxflags=$CXXFLAGS
! CXXFLAGS="-Wmissing-prototypes -Werror"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
--- 3249,3253 ----
[
kde_safe_cxxflags=$CXXFLAGS
! CXXFLAGS="-Werror"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
***************
*** 4174,4181 ****
AC_DEFUN(KDE_CHECK_PYTHON,
[
! KDE_CHECK_PYTHON_INTERN("2.2",
! [KDE_CHECK_PYTHON_INTERN("2.1",
! [KDE_CHECK_PYTHON_INTERN("2.0", [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
! ])])
])
--- 4191,4199 ----
AC_DEFUN(KDE_CHECK_PYTHON,
[
! KDE_CHECK_PYTHON_INTERN("2.3",
! [KDE_CHECK_PYTHON_INTERN("2.2",
! [KDE_CHECK_PYTHON_INTERN("2.1",
! [KDE_CHECK_PYTHON_INTERN("2.0", [ KDE_CHECK_PYTHON_INTERN($1, $2) ])
! ])])])
])
***************
*** 4759,4762 ****
--- 4777,4782 ----
KDE_JAVA_PREFIX(/usr/lib/java*)
KDE_JAVA_PREFIX(/usr/java*)
+ KDE_JAVA_PREFIX(/usr/java/j*dk*)
+ KDE_JAVA_PREFIX(/usr/java/j*re*)
KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
KDE_JAVA_PREFIX(/usr/lib/SunJava*)
***************
*** 5058,5062 ****
fi
! AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
--- 5078,5082 ----
fi
! AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
***************
*** 5118,5124 ****
else
! cxx_shared_flags=
KDE_CHECK_COMPILER_FLAG(shared, [
! cxx_shared_flag="-shared"
])
--- 5138,5148 ----
else
! cxx_shared_flag=
! ld_shared_flag=
KDE_CHECK_COMPILER_FLAG(shared, [
! ld_shared_flag="-shared"
! ])
! KDE_CHECK_COMPILER_FLAG(fPIC, [
! cxx_shared_flag="-fPIC"
])
***************
*** 5126,5134 ****
AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
[
! AC_LANG_C
kde_save_LIBS="$LIBS"
! LIBS="$all_libraries $USER_LDFLAGS $cxx_shared_flag -lbz2 $LIBSOCKET"
! kde_save_CFLAGS="$CFLAGS"
! CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(dnl
--- 5150,5158 ----
AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
[
! AC_LANG_CPLUSPLUS
kde_save_LIBS="$LIBS"
! LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
! kde_save_CXXFLAGS="$CXXFLAGS"
! CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
AC_TRY_LINK(dnl
***************
*** 5141,5145 ****
eval "ac_cv_lib_bzip2_prefix=no")
LIBS="$kde_save_LIBS"
! CFLAGS="$kde_save_CFLAGS"
])dnl
--- 5165,5169 ----
eval "ac_cv_lib_bzip2_prefix=no")
LIBS="$kde_save_LIBS"
! CXXFLAGS="$kde_save_CXXFLAGS"
])dnl
Index: am_edit
===================================================================
RCS file: /cvsroot/kbear/kbear/admin/am_edit,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** am_edit 1 Feb 2003 23:52:18 -0000 1.15
--- am_edit 19 Jul 2003 18:45:40 -0000 1.16
***************
*** 534,538 ****
if ($MakefileData =~ /\nKDE_OPTIONS\s*=\s*([^\n]*)\n/) {
! local @kde_options = split(/[\s\034]/, $1);
if (grep(/^foreign$/, @kde_options)) {
push(@foreignfiles, $makefileDir . "/");
--- 534,539 ----
if ($MakefileData =~ /\nKDE_OPTIONS\s*=\s*([^\n]*)\n/) {
! my $kde_options_str = $1;
! local @kde_options = split(/[\034\s]+/, $kde_options_str);
if (grep(/^foreign$/, @kde_options)) {
push(@foreignfiles, $makefileDir . "/");
***************
*** 561,565 ****
while ($MakefileData =~ /\n\.SUFFIXES:([^\n]+)\n/g) {
! my @list=split(' ', $1);
foreach $ext (@list) {
if ($ext =~ /^\.$cppExt$/) {
--- 562,567 ----
while ($MakefileData =~ /\n\.SUFFIXES:([^\n]+)\n/g) {
! my $suffixes_str = $1;
! my @list=split(' ', $suffixes_str);
foreach $ext (@list) {
if ($ext =~ /^\.$cppExt$/) {
***************
*** 572,576 ****
}
! while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[ \t\034]*([^\n]*)\n/g) {
my $program = $1;
--- 574,578 ----
}
! while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[\034\s]*([^\n]*)\n/g) {
my $program = $1;
***************
*** 579,583 ****
my $ocv = 0;
! my @objlist = split(/[\s\034]+/, $objs);
foreach $obj (@objlist) {
if ($obj =~ /(\S*)\$\((\S+)\)/ ) {
--- 581,585 ----
my $ocv = 0;
! my @objlist = split(/[\034\s]+/, $objs);
foreach $obj (@objlist) {
if ($obj =~ /(\S*)\$\((\S+)\)/ ) {
***************
*** 585,589 ****
my $variable = $2;
if ($pre eq '' && exists($varcontent{$variable})) {
! my @addlist = split(/[\s\034]+/, $varcontent{$variable});
push(@objlist, @addlist);
} elsif ($variable !~ 'OBJEXT') {
--- 587,591 ----
my $variable = $2;
if ($pre eq '' && exists($varcontent{$variable})) {
! my @addlist = split(/[\034\s]+/, $varcontent{$variable});
push(@objlist, @addlist);
} elsif ($variable !~ 'OBJEXT') {
***************
*** 623,630 ****
}
! my $lookup = '\nDEPDIR\s*=.*';
! if ($MakefileData !~ /($lookup)\n/o) {
! $lookup = '\nbindir\s*=.*';
! if ($MakefileData =~ /($lookup)\n/) {
substituteLine ($lookup, "DEPDIR = .deps\n$1");
}
--- 625,632 ----
}
! my $lookup = 'DEPDIR\s*=.*';
! if ($MakefileData !~ /\n($lookup)\n/o) {
! $lookup = 'bindir\s*=.*';
! if ($MakefileData =~ /\n($lookup)\n/) {
substituteLine ($lookup, "DEPDIR = .deps\n$1");
}
***************
*** 634,638 ****
foreach $mark (@marks) {
while ($MakefileData =~ /\n($mark)\s*=\s*([^\n]*)/g) {
! foreach $file (split('[\034\s]', $2)) {
$file =~ s/\.\///;
push(@cleanfiles, $file);
--- 636,641 ----
foreach $mark (@marks) {
while ($MakefileData =~ /\n($mark)\s*=\s*([^\n]*)/g) {
! my $clean_str = $2;
! foreach $file (split('[\034\s]+', $clean_str)) {
$file =~ s/\.\///;
push(@cleanfiles, $file);
***************
*** 660,665 ****
removeLine ($lookup, $1);
! $headerStr =~ tr/\034/ /;
! my @headerlist = split(' ', $headerStr);
foreach $dir (@headerlist)
--- 663,667 ----
removeLine ($lookup, $1);
! my @headerlist = split(/[\034\s]+/, $headerStr);
foreach $dir (@headerlist)
***************
*** 697,701 ****
# no other .cpp file including the .moc one.
! my @progsources = split(/[\s\034]+/, $sources{$program});
my %shash = ();
@shash{@progsources} = 1; # we are only interested in the existence
--- 699,703 ----
# no other .cpp file including the .moc one.
! my @progsources = split(/[\034\s]+/, $sources{$program});
my %shash = ();
@shash{@progsources} = 1; # we are only interested in the existence
***************
*** 729,738 ****
my $mocfiles_in = ($suffix eq $cxxsuffix) && $moc_cpp_added;
! my @sourcelist = split(/[\s\034]+/, $sourcelist{$suffix});
if ((@sourcelist == 1 && !$mocfiles_in) || $suffix_is_cxx != 1 ) {
# we support IDL on our own
! if ($suffix eq "skel" || $suffix =~ /^stub/ || $suffix =~ /^signals/
|| $suffix eq "h" || $suffix eq "ui" ) {
next;
--- 731,741 ----
my $mocfiles_in = ($suffix eq $cxxsuffix) && $moc_cpp_added;
! my @sourcelist = split(/[\034\s]+/, $sourcelist{$suffix});
if ((@sourcelist == 1 && !$mocfiles_in) || $suffix_is_cxx != 1 ) {
# we support IDL on our own
! if ($suffix eq "skel" || $suffix =~ /^stub/
! || $suffix =~ /^signals/ # obsolete, remove in KDE-4
|| $suffix eq "h" || $suffix eq "ui" ) {
next;
***************
*** 806,811 ****
my $lookup = "$program" . '_COMPILE_FIRST\s*=\s*(.*)';
if ($MakefileData =~ m/\n$lookup\n/) {
! my @compilefirst = split(/[\s\034]+/, $1);
! my @progsources = split(/[\s\034]+/, $sources{$program});
my %donesources = ();
$handling = "";
--- 809,815 ----
my $lookup = "$program" . '_COMPILE_FIRST\s*=\s*(.*)';
if ($MakefileData =~ m/\n$lookup\n/) {
! my $compilefirst_str = $1;
! my @compilefirst = split(/[\034\s]+/, $compilefirst_str);
! my @progsources = split(/[\034\s]+/, $sources{$program});
my %donesources = ();
$handling = "";
***************
*** 918,922 ****
sub tag_AUTOMAKE ()
{
! my $lookup = '.*cd \$\(top_srcdir\)\s+&&[\s\034]+\$\(AUTOMAKE\)(.*)';
return 1 if ($MakefileData !~ /\n($lookup)\n/);
print STDOUT "AUTOMAKE processing <$1>\n" if ($verbose);
--- 922,926 ----
sub tag_AUTOMAKE ()
{
! my $lookup = '.*cd \$\(top_srcdir\)\s+&&[\034\s]+\$\(AUTOMAKE\)(.*)';
return 1 if ($MakefileData !~ /\n($lookup)\n/);
print STDOUT "AUTOMAKE processing <$1>\n" if ($verbose);
***************
*** 1000,1004 ****
my $skel = ($source =~ m/\.skel$/);
my $stub = ($source =~ m/\.stub$/);
! my $signals = ($source =~ m/\.signals$/);
if ($stub || $skel || $signals) {
--- 1004,1008 ----
my $skel = ($source =~ m/\.skel$/);
my $stub = ($source =~ m/\.stub$/);
! my $signals = ($source =~ m/\.signals$/); # obsolete, remove in KDE-4
if ($stub || $skel || $signals) {
***************
*** 1035,1039 ****
$dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
! $dep_lines .= "\t\$(DCOPIDL) $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; /bin/false )\n";
$allidls .= $source . "_kidl ";
--- 1039,1043 ----
$dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
! $dep_lines .= "\t\$(DCOPIDL) $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
$allidls .= $source . "_kidl ";
***************
*** 1049,1053 ****
} elsif ($stub) {
$dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
! } else { # signals
$dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
}
--- 1053,1057 ----
} elsif ($stub) {
$dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
! } else { # signals - obsolete, remove in KDE 4
$dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
}
***************
*** 1187,1191 ****
my @appnames = ();
if ( ! $iconauto ) {
! my @_appnames = split(" ", $2);
print STDOUT "KDE_ICON processing <@_appnames>\n" if ($verbose);
foreach $appname (@_appnames) {
--- 1191,1196 ----
my @appnames = ();
if ( ! $iconauto ) {
! my $appicon_str = $2;
! my @_appnames = split(" ", $appicon_str);
print STDOUT "KDE_ICON processing <@_appnames>\n" if ($verbose);
foreach $appname (@_appnames) {
***************
*** 1559,1563 ****
foreach $mark (@marks) {
while ($MakefileData =~ /\n($mark)\s*=\s*([^\n]*)/g) {
! foreach $file (split('[\034\s]', $2)) {
$file =~ s/\.\///;
$foundfiles{$file} = 0 if (defined $foundfiles{$file});
--- 1564,1569 ----
foreach $mark (@marks) {
while ($MakefileData =~ /\n($mark)\s*=\s*([^\n]*)/g) {
! my $cleanfiles_str = $2;
! foreach $file (split('[\034\s]+', $cleanfiles_str)) {
$file =~ s/\.\///;
$foundfiles{$file} = 0 if (defined $foundfiles{$file});
***************
*** 1647,1651 ****
if ($MakefileData !~ /\n($lookup)/) {
$lines .= "index.cache.bz2: \$(srcdir)/index.docbook \$(KDE_XSL_STYLESHEET) $files\n";
! $lines .= "\t\@if test -n \"\$(MEINPROC)\"; then echo \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; fi\n";
$lines .= "\n";
}
--- 1653,1657 ----
if ($MakefileData !~ /\n($lookup)/) {
$lines .= "index.cache.bz2: \$(srcdir)/index.docbook \$(KDE_XSL_STYLESHEET) $files\n";
! $lines .= "\t\@if test -n \"\$(MEINPROC)\"; then echo \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook || true; fi\n";
$lines .= "\n";
}
***************
*** 1748,1753 ****
close HFIN;
# push (@list, $hf) if(index($hfData, "Q_OBJECT") >= 0); ### fast but doesn't handle //Q_OBJECT
! if ( $hfData =~ /{([^}]*)Q_OBJECT/s ) { ## handle " { friend class blah; Q_OBJECT "
! push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s; ## handle "// Q_OBJECT"
}
}
--- 1754,1760 ----
close HFIN;
# push (@list, $hf) if(index($hfData, "Q_OBJECT") >= 0); ### fast but doesn't handle //Q_OBJECT
! # handle " { friend class blah; Q_OBJECT ", but don't match antlarr_Q_OBJECT (\b).
! if ( $hfData =~ /{([^}]*)\bQ_OBJECT/s ) {
! push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s; ## reject "// Q_OBJECT"
}
}
***************
*** 1881,1884 ****
--- 1888,1892 ----
appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile.moc\n");
$cleanMoc .= " $mocFile.moc";
+ appendLines ("mocs: $mocFile.moc");
}
else
***************
*** 1886,1889 ****
--- 1894,1898 ----
appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile$mocExt\n");
$cleanMoc .= " $mocFile$mocExt";
+ appendLines ("mocs: $mocFile$mocExt");
}
}
***************
*** 1899,1903 ****
foreach $program (@programs) {
my $mocs = "";
! my @progsources = split(/[\s\034]+/, $sources{$program});
my @depmocs = split(' ', $depedmocs{$program});
my %shash = (), %mhash = ();
--- 1908,1912 ----
foreach $program (@programs) {
my $mocs = "";
! my @progsources = split(/[\034\s]+/, $sources{$program});
my @depmocs = split(' ', $depedmocs{$program});
my %shash = (), %mhash = ();
***************
*** 1987,1992 ****
$old = $1;
$old =~ s/\034/\\\n#>\- /g; # Fix continuation lines
! $new =~ s/\034/\\\n/g;
! my $newCount = ($new =~ tr/\n//) + 1;
$MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/;
} else {
--- 1996,2001 ----
$old = $1;
$old =~ s/\034/\\\n#>\- /g; # Fix continuation lines
! my $newCount = ($new =~ tr/\034//) + ($new =~ tr/\n//) + 1;
! $new =~ s/\\\n/\034/g;
$MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/;
} else {
***************
*** 2001,2006 ****
{
my ($new) = @_;
! $new =~ s/\034/\\\n/g; # Fix continuation lines
! my $newCount = ($new =~ tr/\n//) + 1;
$MakefileData .= "\n#>\+ $newCount\n$new";
}
--- 2010,2015 ----
{
my ($new) = @_;
! my $newCount = ($new =~ tr/\034//) + ($new =~ tr/\n//) + 1;
! $new =~ s/\\\n/\034/g; # Fix continuation lines
$MakefileData .= "\n#>\+ $newCount\n$new";
}
Index: cvs.sh
===================================================================
RCS file: /cvsroot/kbear/kbear/admin/cvs.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cvs.sh 1 Feb 2003 23:52:18 -0000 1.4
--- cvs.sh 19 Jul 2003 18:45:40 -0000 1.5
***************
*** 28,32 ****
check_autotool_versions()
{
! AUTOCONF_VERSION=`$AUTOCONF --version | head -1`
case $AUTOCONF_VERSION in
Autoconf*2.5* | autoconf*2.5* ) : ;;
--- 28,32 ----
check_autotool_versions()
{
! AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
Autoconf*2.5* | autoconf*2.5* ) : ;;
***************
*** 43,47 ****
esac
! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -1`
case $AUTOHEADER_VERSION in
Autoconf*2.5* | autoheader*2.5* ) : ;;
--- 43,47 ----
esac
! AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
Autoconf*2.5* | autoheader*2.5* ) : ;;
***************
*** 58,72 ****
esac
! AUTOMAKE_STRING=`$AUTOMAKE --version | head -1`
case $AUTOMAKE_STRING in
automake*1.5d* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake 1.5"
exit 1
;;
! automake*1.5* | automake*1.5-* | automake*1.6.* | automake*1.7* ) : ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
! echo "*** KDE requires automake 1.5"
exit 1
;;
--- 58,72 ----
esac
! AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
case $AUTOMAKE_STRING in
automake*1.5d* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake 1.6"
exit 1
;;
! automake*1.6.* | automake*1.7* ) : ;;
"" )
echo "*** AUTOMAKE NOT FOUND!."
! echo "*** KDE requires automake 1.6"
exit 1
;;
***************
*** 77,81 ****
* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake 1.5"
exit 1
;;
--- 77,81 ----
* )
echo "*** YOU'RE USING $AUTOMAKE_STRING."
! echo "*** KDE requires automake 1.6"
exit 1
;;
***************
*** 190,193 ****
--- 190,194 ----
perl -w ../admin/am_edit
call_and_fix_autoconf
+ touch stamp-h.in
}
***************
*** 248,255 ****
modulename=
if test -f configure.in.in; then
! if head -2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
fi
! if head -2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
if test -n "$line"; then
--- 249,256 ----
modulename=
if test -f configure.in.in; then
! if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
fi
! if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
if test -n "$line"; then
***************
*** 262,266 ****
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
! VERSION="\"3.1.0\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
--- 263,267 ----
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
! VERSION="\"3.1.3\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
***************
*** 291,299 ****
rm -f configure.files
touch configure.files
! if test -f configure.in.in && head -2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
echo $admindir/configure.in.min >> configure.files
fi
test -f configure.in.in && echo configure.in.in >> configure.files
! list=`find . -name "configure.in.in" -o -name "configure.in.bot" | sort`
for i in $list; do if test -f $i && test `dirname $i` != "." ; then
echo $i >> configure.files
--- 292,301 ----
rm -f configure.files
touch configure.files
! if test -f configure.in.in && head -n 2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
echo $admindir/configure.in.min >> configure.files
fi
test -f configure.in.in && echo configure.in.in >> configure.files
! list=`find . -name "configure.in.in" -o -name "configure.in.bot" | \
! sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`
for i in $list; do if test -f $i && test `dirname $i` != "." ; then
echo $i >> configure.files
***************
*** 306,311 ****
{
dirs=
! compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -1`
! compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -1`
for i in `ls -1`; do
if test -f $i/Makefile.am; then
--- 308,313 ----
{
dirs=
! compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -n 1`
! compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n 1`
for i in `ls -1`; do
if test -f $i/Makefile.am; then
***************
*** 324,332 ****
(for d in $dirs; do
! list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
for s in $list; do
echo $s $d
done
! list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -1`
for s in $list; do
echo $d $s
--- 326,334 ----
(for d in $dirs; do
! list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
for s in $list; do
echo $s $d
done
! list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
for s in $list; do
echo $d $s
***************
*** 340,344 ****
if test -f Makefile.am.in; then
! cp Makefile.am.in Makefile.am
if test -n "$UNSERMAKE"; then
topsubdirs=
--- 342,347 ----
if test -f Makefile.am.in; then
! rm -f Makefile.am
! cat Makefile.am.in > Makefile.am
if test -n "$UNSERMAKE"; then
topsubdirs=
Index: debianrules
===================================================================
RCS file: /cvsroot/kbear/kbear/admin/debianrules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** debianrules 18 Jul 2002 22:02:43 -0000 1.8
--- debianrules 19 Jul 2003 18:45:40 -0000 1.9
***************
*** 31,35 ****
$sysconfdir = "/etc";
! $QTDIR = "/usr/share/qt";
$IDL = "$kde_bindir/cuteidl";
$DCOPIDL = "$kde_bindir/dcopidl";
--- 31,35 ----
$sysconfdir = "/etc";
! $QTDIR = "/usr/share/qt3";
$IDL = "$kde_bindir/cuteidl";
$DCOPIDL = "$kde_bindir/dcopidl";
***************
*** 82,88 ****
print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
! print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
! print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html\n";
! print STDOUT "configkdepim=$enable_debug $enable_final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt --mandir=\$(mandir) --infodir=\$(infodir)\n";
exit
--- 82,88 ----
print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
! print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n";
! print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html --with-xinerama\n";
! print STDOUT "configkdepim=$enable_debug $enable_final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n";
exit
Index: detect-autoconf.sh
===================================================================
RCS file: /cvsroot/kbear/kbear/admin/detect-autoconf.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** detect-autoconf.sh 1 Feb 2003 23:52:18 -0000 1.3
--- detect-autoconf.sh 19 Jul 2003 18:45:40 -0000 1.4
***************
*** 53,62 ****
{
if test -z "$UNSERMAKE"; then
! if test -x "`$WHICH automake-1.5`" ; then
! AUTOMAKE="`$WHICH automake-1.5`"
! ACLOCAL="`$WHICH aclocal-1.5`"
! elif test -x "`$WHICH automake-1.6`" ; then
AUTOMAKE="`$WHICH automake-1.6`"
ACLOCAL="`$WHICH aclocal-1.6`"
fi
else
--- 53,62 ----
{
if test -z "$UNSERMAKE"; then
! if test -x "`$WHICH automake-1.6`" ; then
AUTOMAKE="`$WHICH automake-1.6`"
ACLOCAL="`$WHICH aclocal-1.6`"
+ elif test -x "`$WHICH automake-1.7`" ; then
+ AUTOMAKE="`$WHICH automake-1.7`"
+ ACLOCAL="`$WHICH aclocal-1.7`"
fi
else
Index: libtool.m4.in
===================================================================
RCS file: /cvsroot/kbear/kbear/admin/libtool.m4.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** libtool.m4.in 8 Oct 2002 18:12:24 -0000 1.7
--- libtool.m4.in 19 Jul 2003 18:45:40 -0000 1.8
***************
*** 1971,1974 ****
--- 1971,1977 ----
alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64* )
lt_cv_deplibs_check_method=pass_all ;;
+ # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+ arm* )
+ lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
|
|
From: <kb...@us...> - 2003-07-19 18:45:43
|
Update of /cvsroot/kbear/kbear/kbear/lib/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv7097/kbear/lib/interfaces
Modified Files:
kbearcore.cpp kbearcore.h kbearpluginmanageriface.h
Log Message:
Index: kbearcore.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearcore.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** kbearcore.cpp 1 Jul 2003 23:24:22 -0000 1.18
--- kbearcore.cpp 19 Jul 2003 18:45:40 -0000 1.19
***************
*** 31,36 ****
class KBearCore::KBearCorePrivate {
public:
! KBearCorePrivate() : m_abortShutDown( false ) {}
bool m_abortShutDown;
};
//-----------------------------------------------
--- 31,37 ----
class KBearCore::KBearCorePrivate {
public:
! KBearCorePrivate() : m_abortShutDown( false ),m_isShuttingDown( false ) {}
bool m_abortShutDown;
+ bool m_isShuttingDown;
};
//-----------------------------------------------
***************
*** 66,77 ****
}
//-----------------------------------------------
! void KBearCore::requestShutDown() {
d->m_abortShutDown = false;
emit shutDownRequested();
// this will be true if any object have reqested to abort shutdown see KBearCore::abortShutDown()
! if( ! d->m_abortShutDown ) {
slotQuit();
}
- d->m_abortShutDown = false;
}
//-----------------------------------------------
--- 67,84 ----
}
//-----------------------------------------------
! bool KBearCore::isShuttingDown() const {
! return d->m_isShuttingDown;
! }
! //-----------------------------------------------
! void KBearCore::requestShutDown( bool force ) {
d->m_abortShutDown = false;
+ d->m_isShuttingDown = false;
emit shutDownRequested();
// this will be true if any object have reqested to abort shutdown see KBearCore::abortShutDown()
! // if force is true we ignore any cancellation of the shutdown
! if( force || ! d->m_abortShutDown ) {
! d->m_isShuttingDown = true;
slotQuit();
}
}
//-----------------------------------------------
Index: kbearcore.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearcore.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** kbearcore.h 1 Jul 2003 23:24:22 -0000 1.21
--- kbearcore.h 19 Jul 2003 18:45:40 -0000 1.22
***************
*** 85,93 ****
*/
bool shutDownAborted() const;
public slots:
/**
* Call this when you want to request an application shut down
*/
! void requestShutDown();
/*
* Connect to this slot when you want to open a new site.
--- 85,97 ----
*/
bool shutDownAborted() const;
+ /**
+ * @return true if application is shutting down
+ */
+ bool isShuttingDown() const;
public slots:
/**
* Call this when you want to request an application shut down
*/
! void requestShutDown( bool force = false );
/*
* Connect to this slot when you want to open a new site.
Index: kbearpluginmanageriface.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearpluginmanageriface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kbearpluginmanageriface.h 1 Jul 2003 23:24:22 -0000 1.3
--- kbearpluginmanageriface.h 19 Jul 2003 18:45:40 -0000 1.4
***************
*** 43,49 ****
/** */
virtual void removePlugin( KBear::KBearPlugin* client ) = 0;
signals:
/**
! Emitted after a new @ref KBearPlugin has been loaded
*/
void loadingPlugin( const QString& );
--- 43,51 ----
/** */
virtual void removePlugin( KBear::KBearPlugin* client ) = 0;
+ /** */
+ virtual bool queryUnload( QWidget* parent, const QString& serviceName ) = 0;
signals:
/**
! Emitted when a new @ref KBearPlugin is being loaded
*/
void loadingPlugin( const QString& );
|
|
From: <kb...@us...> - 2003-07-19 18:45:43
|
Update of /cvsroot/kbear/kbear/kbear/plugins/recentconnections In directory sc8-pr-cvs1:/tmp/cvs-serv7097/kbear/plugins/recentconnections Modified Files: Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/recentconnections/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 16 Jul 2003 00:03:06 -0000 1.4 --- Makefile.am 19 Jul 2003 18:45:40 -0000 1.5 *************** *** 18,20 **** AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -UQT_NO_COMPAT -DQT_NO_ASCII_CAST AM_FFLAGS = ! kbearrecentconnections_la_LIBADD = $(top_builddir)/kbear/lib/libkbearcore.la --- 18,20 ---- AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -UQT_NO_COMPAT -DQT_NO_ASCII_CAST AM_FFLAGS = ! kbearrecentconnections_la_LIBADD = $(top_builddir)/kbear/lib/libkbearcore.la $(LIB_KPARTS) |
|
From: <kb...@us...> - 2003-07-19 18:45:43
|
Update of /cvsroot/kbear/kbear/kbear/plugins/wizard In directory sc8-pr-cvs1:/tmp/cvs-serv7097/kbear/plugins/wizard Modified Files: Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/wizard/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 8 Jul 2003 17:04:20 -0000 1.7 --- Makefile.am 19 Jul 2003 18:45:40 -0000 1.8 *************** *** 1,6 **** ! INCLUDES = -I$(top_srcdir)/kbear/lib -I$(top_srcdir)/kbear/lib/interfaces $(all_includes) kde_module_LTLIBRARIES = kbearwizard.la kbearwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version -no-undefined ! kbearwizard_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/kbear/lib/libkbearcore.la kbearwizard_la_SOURCES = kbearwizardplugin.cpp kbearwizard.cpp kbearwizard_la_METASOURCES = AUTO --- 1,6 ---- ! INCLUDES = -I$(top_srcdir)/kbear/lib/interfaces $(all_includes) kde_module_LTLIBRARIES = kbearwizard.la kbearwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version -no-undefined ! kbearwizard_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kbear/lib/libkbearcore.la kbearwizard_la_SOURCES = kbearwizardplugin.cpp kbearwizard.cpp kbearwizard_la_METASOURCES = AUTO |
|
From: <kb...@us...> - 2003-07-19 18:45:43
|
Update of /cvsroot/kbear/kbear/kbear
In directory sc8-pr-cvs1:/tmp/cvs-serv7097/kbear
Modified Files:
kbearchildview.cpp kbearrc main.cpp miscsettingswidget.cpp
miscsettingswidget.h pluginmanager.cpp pluginmanager.h
pluginselectwidget.cpp pluginselectwidget.h
Log Message:
Index: kbearchildview.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearchildview.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** kbearchildview.cpp 1 Jul 2003 23:24:18 -0000 1.14
--- kbearchildview.cpp 19 Jul 2003 18:45:39 -0000 1.15
***************
*** 121,125 ****
"Example for BASH users:\nexport KDEDIRS=/path/to/kbear:$KDEDIRS && kbuildsycoca\n"),
i18n("Unable to find a filesys part") );
! parent->close();
}
}
--- 121,126 ----
"Example for BASH users:\nexport KDEDIRS=/path/to/kbear:$KDEDIRS && kbuildsycoca\n"),
i18n("Unable to find a filesys part") );
!
! API::getInstance()->core()->requestShutDown( true );
}
}
***************
*** 204,208 ****
//-----------------------------------------------
bool KBearChildView::isLocal() const {
! return m_part->isLocal();
}
//-----------------------------------------------
--- 205,209 ----
//-----------------------------------------------
bool KBearChildView::isLocal() const {
! return m_part ? m_part->isLocal() : true;
}
//-----------------------------------------------
Index: kbearrc
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/kbearrc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kbearrc 1 Jun 2003 20:38:57 -0000 1.8
--- kbearrc 19 Jul 2003 18:45:39 -0000 1.9
***************
*** 45,48 ****
--- 45,51 ----
Position=Bottom
+ [Notification Messages]
+ &Fråga inte igen=true
+
[Plugins]
KBearFireWall=false
Index: main.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/main.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** main.cpp 5 Jun 2003 16:53:20 -0000 1.65
--- main.cpp 19 Jul 2003 18:45:39 -0000 1.66
***************
*** 69,72 ****
--- 69,74 ----
app.processEvents();
+ if( API::getInstance()->core()->isShuttingDown() )
+ return 0;
// splash->raise();
Index: miscsettingswidget.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/miscsettingswidget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** miscsettingswidget.cpp 4 May 2003 13:19:33 -0000 1.3
--- miscsettingswidget.cpp 19 Jul 2003 18:45:39 -0000 1.4
***************
*** 83,94 ****
KConfig* config = kapp->config();
KConfigGroupSaver( config, config->group() );
- config->setGroup("General");
if( defaultSettings ) {
config->deleteEntry( QString::fromLatin1("Run Time Settings" ) );
config->deleteEntry( QString::fromLatin1("Default Email" ) );
config->sync();
}
m_runtimeSettingsCheckBox->setChecked( config->readBoolEntry( "Run Time Settings", true) );
setDefaultEmail( config->readEntry( "Default Email", QString::null ) );
}
//-----------------------------------------------
--- 83,99 ----
KConfig* config = kapp->config();
KConfigGroupSaver( config, config->group() );
if( defaultSettings ) {
+ config->setGroup("General");
config->deleteEntry( QString::fromLatin1("Run Time Settings" ) );
config->deleteEntry( QString::fromLatin1("Default Email" ) );
+ config->setGroup("Notification Messages");
+ config->deleteEntry( QString::fromLatin1("&Fråga inte igen" ) );
config->sync();
}
+ config->setGroup("General");
m_runtimeSettingsCheckBox->setChecked( config->readBoolEntry( "Run Time Settings", true) );
setDefaultEmail( config->readEntry( "Default Email", QString::null ) );
+ config->setGroup("Notification Messages");
+ m_confirmPluginUnloadCheckBox->setChecked( config->readBoolEntry( "&Fråga inte igen", true) );
}
//-----------------------------------------------
***************
*** 101,104 ****
--- 106,111 ----
kapp->config()->writeEntry( "Default Email", m_emailComboBox->currentText() );
+ config->setGroup("Notification Messages");
+ config->writeEntry( "&Fråga inte igen", m_confirmPluginUnloadCheckBox->isChecked() );
config->sync();
***************
*** 158,162 ****
--- 165,177 ----
QWhatsThis::add( m_runtimeSettingsCheckBox, tmp );
+ m_confirmPluginUnloadCheckBox = new QCheckBox( saveSettingsGroupBox, "m_confirmPluginUnloadCheckBox" );
+ m_confirmPluginUnloadCheckBox->setText( i18n( "Always ask for confirmation before unloading plugins." ) );
+ m_confirmPluginUnloadCheckBox->setChecked( true );
+ tmp = i18n( "Uncheck this option if don't want to be warned before plugins are unloaded." );
+ QToolTip::add( m_confirmPluginUnloadCheckBox, tmp );
+ QWhatsThis::add( m_confirmPluginUnloadCheckBox, tmp );
+
saveSettingsGroupBoxLayout->addWidget( m_runtimeSettingsCheckBox, 0, 0 );
+ saveSettingsGroupBoxLayout->addWidget( m_confirmPluginUnloadCheckBox, 1, 0 );
m_layout->addWidget( saveSettingsGroupBox );
Index: miscsettingswidget.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/miscsettingswidget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** miscsettingswidget.h 30 Apr 2003 13:51:53 -0000 1.3
--- miscsettingswidget.h 19 Jul 2003 18:45:39 -0000 1.4
***************
*** 59,62 ****
--- 59,63 ----
QGroupBox* saveSettingsGroupBox;
QCheckBox* m_runtimeSettingsCheckBox;
+ QCheckBox* m_confirmPluginUnloadCheckBox;
QVBoxLayout* m_layout;
QSpacerItem* m_endSpacer;
Index: pluginmanager.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/pluginmanager.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pluginmanager.cpp 1 Jul 2003 23:24:18 -0000 1.18
--- pluginmanager.cpp 19 Jul 2003 18:45:39 -0000 1.19
***************
*** 45,49 ****
using namespace KBear;
//-----------------------------------------------
! PluginManager* PluginManager::s_instance = 0L;
//-----------------------------------------------
PluginManager::PluginManager()
--- 45,49 ----
using namespace KBear;
//-----------------------------------------------
! KBear::KBearPluginManagerInterface* PluginManager::s_instance = 0L;
//-----------------------------------------------
PluginManager::PluginManager()
***************
*** 61,65 ****
}
//-----------------------------------------------
! PluginManager* PluginManager::getInstance() {
if( ! s_instance )
s_instance = new PluginManager();
--- 61,65 ----
}
//-----------------------------------------------
! KBearPluginManagerInterface* PluginManager::getInstance() {
if( ! s_instance )
s_instance = new PluginManager();
***************
*** 80,91 ****
KBearPlugin* plugin = m_plugins[name];
if( plugin ) {
! QString warning = plugin->unloadWarning();
! if( warning.isEmpty() || queryUnload( warning ) ) {
! removePlugin( plugin );
! m_plugins.remove( name );
! plugin->deleteLater();
! }
! else
! config->writeEntry( name, true);
}
continue;
--- 80,86 ----
KBearPlugin* plugin = m_plugins[name];
if( plugin ) {
! removePlugin( plugin );
! m_plugins.remove( name );
! plugin->deleteLater();
}
continue;
***************
*** 146,150 ****
//-----------------------------------------------
void PluginManager::addPlugin( KBearPlugin* plugin ) {
! API::getInstance()->mainWindow()->mainWindow()->guiFactory()->addClient( plugin );
}
//-----------------------------------------------
--- 141,146 ----
//-----------------------------------------------
void PluginManager::addPlugin( KBearPlugin* plugin ) {
! if( ! API::getInstance()->core()->isShuttingDown() )
! API::getInstance()->mainWindow()->mainWindow()->guiFactory()->addClient( plugin );
}
//-----------------------------------------------
***************
*** 154,160 ****
}
//-----------------------------------------------
! bool PluginManager::queryUnload( const QString& text ) {
! int value = KMessageBox::warningContinueCancel( API::getInstance()->mainWindow()->mainWindow(), text );
! return ( value == KMessageBox::Continue );
}
//-----------------------------------------------
--- 150,162 ----
}
//-----------------------------------------------
! bool PluginManager::queryUnload( QWidget* parent, const QString& serviceName ) {
! KBearPlugin* plugin = m_plugins[ serviceName ];
! if( plugin ) {
! QString warning = plugin->unloadWarning();
!
! if( ! warning.isEmpty() )
! return ( KMessageBox::Continue == KMessageBox::warningContinueCancel( parent, warning, QString::null, KStdGuiItem::cont(), i18n( "&Don't ask me again" ) ) );
! }
! return true;
}
//-----------------------------------------------
Index: pluginmanager.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/pluginmanager.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pluginmanager.h 1 Jul 2003 23:24:18 -0000 1.7
--- pluginmanager.h 19 Jul 2003 18:45:40 -0000 1.8
***************
*** 41,45 ****
~PluginManager();
/** */
! static PluginManager* getInstance();
/** */
virtual void loadPlugins( bool initializePlugins = false );
--- 41,45 ----
~PluginManager();
/** */
! static KBear::KBearPluginManagerInterface* getInstance();
/** */
virtual void loadPlugins( bool initializePlugins = false );
***************
*** 48,51 ****
--- 48,53 ----
/** */
virtual void removePlugin( KBear::KBearPlugin* client );
+ /** */
+ virtual bool queryUnload( QWidget* parent, const QString& serviceName );
private slots:
void slotConfigWidget( KDialogBase* );
***************
*** 55,62 ****
private:
KBear::KBearPlugin* loadPlugin( const KService::Ptr& service );
- bool queryUnload( const QString& warning );
PluginManager();
private:
! static PluginManager* s_instance;
QDict<KBear::KBearPlugin> m_plugins;
};
--- 57,63 ----
private:
KBear::KBearPlugin* loadPlugin( const KService::Ptr& service );
PluginManager();
private:
! static KBear::KBearPluginManagerInterface* s_instance;
QDict<KBear::KBearPlugin> m_plugins;
};
Index: pluginselectwidget.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/pluginselectwidget.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pluginselectwidget.cpp 1 Jul 2003 23:24:18 -0000 1.7
--- pluginselectwidget.cpp 19 Jul 2003 18:45:40 -0000 1.8
***************
*** 30,33 ****
--- 30,35 ----
// Application specific include files
#include "pluginselectwidget.h"
+ #include "kbearpluginmanageriface.h"
+ #include "api.h"
#include "pluginselectwidget.moc"
***************
*** 77,80 ****
--- 79,83 ----
connect( m_listView, SIGNAL( selectionChanged( QListViewItem* ) ), this, SLOT( slotSelectionChanged( QListViewItem* ) ) );
+ connect( m_listView, SIGNAL( clicked( QListViewItem* ) ), this, SLOT( slotItemClicked( QListViewItem* ) ) );
// layout->addWidget( label );
***************
*** 97,100 ****
--- 100,114 ----
layout->activate();
+ }
+ //-----------------------------------------------
+ void PluginSelectWidget::slotItemClicked( QListViewItem* i ) {
+ if( ! i )
+ return;
+ PluginSelectWidgetItem* item = dynamic_cast<PluginSelectWidgetItem*>( i );
+ if( item && ! item->isOn() ) {
+ if( ! API::getInstance()->pluginManager()->queryUnload( this, item->m_name ) ) {
+ item->setOn( true );
+ }
+ }
}
//-----------------------------------------------
Index: pluginselectwidget.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/pluginselectwidget.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pluginselectwidget.h 1 Jul 2003 23:24:18 -0000 1.5
--- pluginselectwidget.h 19 Jul 2003 18:45:40 -0000 1.6
***************
*** 14,17 ****
--- 14,18 ----
// Qt specific include files
#include <qwidget.h>
+ #include <qpoint.h>
//////////////////////////////////////////////////////////////////////
// KDE specific include files
***************
*** 46,49 ****
--- 47,51 ----
private slots:
void slotSelectionChanged( QListViewItem* );
+ void slotItemClicked( QListViewItem* );
private:
void init();
|
|
From: <kb...@us...> - 2003-07-19 18:45:43
|
Update of /cvsroot/kbear/kbear/kbear/plugins/transferoutput In directory sc8-pr-cvs1:/tmp/cvs-serv7097/kbear/plugins/transferoutput Modified Files: Makefile.am Log Message: Index: Makefile.am =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/transferoutput/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 16 Jul 2003 00:03:05 -0000 1.8 --- Makefile.am 19 Jul 2003 18:45:40 -0000 1.9 *************** *** 2,6 **** kde_module_LTLIBRARIES = kbeartransferoutput.la kbeartransferoutput_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version -no-undefined ! kbeartransferoutput_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(top_builddir)/kbear/lib/libkbearcore.la kbeartransferoutput_la_SOURCES = kbeartransferoutputplugin.cpp kbeartransferview.cpp transferviewpage.cpp transfergroupitem.cpp transferitem.cpp kbeartransferoutput_la_METASOURCES = AUTO --- 2,6 ---- kde_module_LTLIBRARIES = kbeartransferoutput.la kbeartransferoutput_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -avoid-version -no-undefined ! kbeartransferoutput_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/kbear/lib/libkbearcore.la kbeartransferoutput_la_SOURCES = kbeartransferoutputplugin.cpp kbeartransferview.cpp transferviewpage.cpp transfergroupitem.cpp transferitem.cpp kbeartransferoutput_la_METASOURCES = AUTO |
|
From: <kb...@us...> - 2003-07-19 18:45:42
|
Update of /cvsroot/kbear/kbear In directory sc8-pr-cvs1:/tmp/cvs-serv7097 Modified Files: ChangeLog configure.in.in Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/kbear/kbear/ChangeLog,v retrieving revision 1.159 retrieving revision 1.160 diff -C2 -d -r1.159 -r1.160 *** ChangeLog 16 Jul 2003 00:02:58 -0000 1.159 --- ChangeLog 19 Jul 2003 18:45:39 -0000 1.160 *************** *** 1,5 **** 2003-07-16 Björn Sahlström <kb...@us...> * Fixed so we can take advantage of kmdi lib from kdelibs ! when available * Added new plugin to search a domain for anonymous servers 2003-07-09 Björn Sahlström <kb...@us...> --- 1,8 ---- + 2003-07-19 Björn Sahlström <kb...@us...> + * Fixed so warning when unloading plugins works correctly + Also added about this in miscsettings widget. 2003-07-16 Björn Sahlström <kb...@us...> * Fixed so we can take advantage of kmdi lib from kdelibs ! when available * Added new plugin to search a domain for anonymous servers 2003-07-09 Björn Sahlström <kb...@us...> Index: configure.in.in =================================================================== RCS file: /cvsroot/kbear/kbear/configure.in.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** configure.in.in 16 Jul 2003 00:02:58 -0000 1.20 --- configure.in.in 19 Jul 2003 18:45:39 -0000 1.21 *************** *** 1,5 **** #MIN_CONFIG(3.1) ! AM_INIT_AUTOMAKE(kbear,3.0alpha2) KBEAR_CHECK_KDEVERSION --- 1,5 ---- #MIN_CONFIG(3.1) ! AM_INIT_AUTOMAKE(kbear, 3.0alpha2) KBEAR_CHECK_KDEVERSION |
|
From: <kb...@us...> - 2003-07-18 21:14:03
|
Update of /cvsroot/kbear/kbear/databasedeamon
In directory sc8-pr-cvs1:/tmp/cvs-serv27651/databasedeamon
Modified Files:
sitemanagerdb.cpp sitemanagerdb.h
Log Message:
Bugfixes
Index: sitemanagerdb.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/databasedeamon/sitemanagerdb.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** sitemanagerdb.cpp 1 Jul 2003 23:24:22 -0000 1.45
--- sitemanagerdb.cpp 18 Jul 2003 21:13:59 -0000 1.46
***************
*** 45,56 ****
m_oldSiteManagerFile( QString::null ),
m_encoding( KGlobal::locale()->encoding() ),
! m_private( new SiteManagerDBSignaler(this) )
// m_dockWindow( 0L )
{
kapp->dcopClient()->setDefaultObject( objId() );
- // create the system tray icon
- // m_dockWindow = new KSystemTray( kapp->mainWidget(), "SiteManagerDockWindow" );
- // m_dockWindow->setPixmap( KGlobal::iconLoader()->loadIcon("kbearsitemanager", KIcon::Small ) );
/*
--- 45,53 ----
m_oldSiteManagerFile( QString::null ),
m_encoding( KGlobal::locale()->encoding() ),
! m_sig( new SiteManagerDBSignaler(this) )
// m_dockWindow( 0L )
{
kapp->dcopClient()->setDefaultObject( objId() );
/*
***************
*** 100,114 ****
}
! QObject::connect( m_private->timer(), SIGNAL( timeout() ), m_private, SLOT( slotTimeout() ) );
! m_private->m_timer.start( 30000 );
! // if( kapp->isRestored() ) {
! KConfig c( "kbearsitemanagerrc" );
! // showSystemTrayIcon( c.readBoolEntry( "ShowSysemTrayIcon", true ) );
! setPlugInKonq( c.readBoolEntry( "PlugInKonq", false ) );
! // }
}
//-----------------------------------------------
SiteManagerDB::~SiteManagerDB(){
! delete m_private;
/*
if( m_dockWindow )
--- 97,110 ----
}
! QObject::connect( m_sig->timer(), SIGNAL( timeout() ), m_sig, SLOT( slotTimeout() ) );
! m_sig->m_timer.start( 30000 );
!
! // KConfig c( "kbearsitemanagerrc" );
! // c.setGroup("PlugInKonq");
! // setPlugInKonq( c.readBoolEntry( "PlugInKonq", false ) );
}
//-----------------------------------------------
SiteManagerDB::~SiteManagerDB(){
! delete m_sig;
/*
if( m_dockWindow )
***************
*** 118,122 ****
//-----------------------------------------------
bool SiteManagerDB::ping() {
! m_private->m_gotPing = true;
return true;
}
--- 114,118 ----
//-----------------------------------------------
bool SiteManagerDB::ping() {
! m_sig->m_gotPing = true;
return true;
}
Index: sitemanagerdb.h
===================================================================
RCS file: /cvsroot/kbear/kbear/databasedeamon/sitemanagerdb.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** sitemanagerdb.h 1 Jul 2003 23:24:22 -0000 1.21
--- sitemanagerdb.h 18 Jul 2003 21:13:59 -0000 1.22
***************
*** 158,162 ****
virtual void importDomDocument( QString domDocument );
/** */
- // virtual void showSystemTrayIcon(bool);
/** */
virtual void setPlugInKonq(bool);
--- 158,161 ----
***************
*** 185,190 ****
QString m_encoding;
QValueList<QCString> m_referers;
! SiteManagerDBSignaler* m_private;
! // KSystemTray* m_dockWindow;
};
--- 184,188 ----
QString m_encoding;
QValueList<QCString> m_referers;
! SiteManagerDBSignaler* m_sig;
};
|
|
From: <kb...@us...> - 2003-07-18 21:14:02
|
Update of /cvsroot/kbear/kbear/kbear/plugins/ftpfind In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/ftpfind Modified Files: ftpfindtreeview.cpp Log Message: Bugfixes Index: ftpfindtreeview.cpp =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/ftpfindtreeview.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ftpfindtreeview.cpp 17 Jul 2003 20:21:02 -0000 1.2 --- ftpfindtreeview.cpp 18 Jul 2003 21:13:59 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- ////////////////////////////////////////////////////////////////////// // Qt specific include files + #include <qcolor.h> #include <qpixmap.h> ////////////////////////////////////////////////////////////////////// |
|
From: <kb...@us...> - 2003-07-18 21:14:02
|
Update of /cvsroot/kbear/kbear/kbear/plugins/sitemanager
In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/sitemanager
Modified Files:
kbearsitemanagerplugin.cpp kbearsitemanagerui.rc
Log Message:
Bugfixes
Index: kbearsitemanagerplugin.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** kbearsitemanagerplugin.cpp 17 Jul 2003 18:58:22 -0000 1.68
--- kbearsitemanagerplugin.cpp 18 Jul 2003 21:13:59 -0000 1.69
***************
*** 62,65 ****
--- 62,67 ----
using namespace KBear;
+
+ #include "kbearsitemanagerplugin.moc"
//-----------------------------------------------
typedef KGenericFactory<KBearSiteManagerPlugin> KBearSiteManagerPluginFactory;
***************
*** 74,78 ****
m_pendingSelectedSite( 0L )
{
! KRun::run( "kbearsitemanagerdb", KURL::List() );
(void) KGlobal::locale()->insertCatalogue("kbear");
setInstance( KBearSiteManagerPluginFactory::instance() );
--- 76,82 ----
m_pendingSelectedSite( 0L )
{
! if( ! kapp->dcopClient()->isApplicationRegistered( m_DB_DCOP_Name ) ) {
! KRun::run( "kbearsitemanagerdb", KURL::List() );
! }
(void) KGlobal::locale()->insertCatalogue("kbear");
setInstance( KBearSiteManagerPluginFactory::instance() );
***************
*** 175,181 ****
KConfig config( "kbearsitemanagerrc" );
config.setGroup("PlugInKonq");
- // setShowSystemTray( config.readBoolEntry( "ShowSysemTrayIcon", true ) );
setPlugInKonq( config.readBoolEntry( "PlugInKonq", false ) );
!
// this will check every 5 second if sitemanager database is up and running
--- 179,184 ----
KConfig config( "kbearsitemanagerrc" );
config.setGroup("PlugInKonq");
setPlugInKonq( config.readBoolEntry( "PlugInKonq", false ) );
!
// this will check every 5 second if sitemanager database is up and running
***************
*** 230,238 ****
connectDCOPSignal( m_DB_DCOP_Name, m_DB_DCOP_ID, "newEncoding(QString)", "slotEncodingChanged(QString)", false );
connectDCOPSignal( m_DB_DCOP_Name, m_DB_DCOP_ID, "importOldSitemanager(QString)", "slotImportOldSitemanager(QString)", false );
- // connectDCOPSignal( m_DB_DCOP_Name, m_DB_DCOP_ID, "showSystemTray(bool)", "setShowSystemTray(bool)", false );
connectDCOPSignal( m_DB_DCOP_Name, m_DB_DCOP_ID, "plugInKonq(bool)", "setPlugInKonq(bool)", false );
//Ordinary connections
- // connect( m_siteManager, SIGNAL( showSystemTray(bool) ),
- // this, SLOT( slotShowSystemTray( bool ) ) );
connect( m_siteManager, SIGNAL( plugInKonq(bool) ),
this, SLOT( slotPlugInKonq( bool ) ) );
--- 233,238 ----
***************
*** 269,295 ****
}
//-----------------------------------------------
- /*
- void KBearSiteManagerPlugin::setShowSystemTray(bool show) {
- kdDebug()<<"KBearSiteManagerPlugin::setShowSystemTray="<<show<<endl;
- // m_siteManager->p_showSystemTrayCheckBox->setChecked( show );
- }
- */
- //-----------------------------------------------
- /*
- void KBearSiteManagerPlugin::slotShowSystemTray(bool show) {
- kdDebug()<<"KBearSiteManagerPlugin::slotShowSystemTray="<<show<<endl;
- QByteArray data;
- QDataStream arg( data, IO_WriteOnly );
- arg << show;
- DCOPClient* client = kapp->dcopClient();
- if( ! client->send( m_DB_DCOP_Name, m_DB_DCOP_ID, "showSystemTrayIcon(bool)", data ) ) {
- kdDebug()<<"DCOP send showSystemTrayIcon(bool) failed !!!!"<<endl;
- slotIdleTimeout();
- }
- KConfig config( "kbearsitemanagerrc" );
- config.writeEntry( "ShowSysemTrayIcon", show );
- config.sync();
- }
- */
//-----------------------------------------------
void KBearSiteManagerPlugin::setPlugInKonq(bool plug) {
--- 269,272 ----
***************
*** 298,301 ****
--- 275,282 ----
//-----------------------------------------------
void KBearSiteManagerPlugin::slotPlugInKonq(bool plug ) {
+ KConfig config( "kbearsitemanagerrc" );
+ config.setGroup("PlugInKonq");
+ config.writeEntry( "PlugInKonq", plug );
+ config.sync();
QByteArray data;
QDataStream arg( data, IO_WriteOnly );
***************
*** 306,313 ****
slotIdleTimeout();
}
- KConfig config( "kbearsitemanagerrc" );
- config.setGroup("PlugInKonq");
- config.writeEntry( "PlugInKonq", plug );
- config.sync();
}
//-----------------------------------------------
--- 287,290 ----
***************
*** 774,778 ****
//-----------------------------------------------
- #ifndef NO_INCLUDE_MOCFILES
- #include "kbearsitemanagerplugin.moc"
- #endif
--- 751,752 ----
Index: kbearsitemanagerui.rc
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/sitemanager/kbearsitemanagerui.rc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** kbearsitemanagerui.rc 28 Jun 2003 16:38:55 -0000 1.9
--- kbearsitemanagerui.rc 18 Jul 2003 21:13:59 -0000 1.10
***************
*** 1,4 ****
<!DOCTYPE kpartgui >
! <kpartgui library="libkbearsitemanager" name="KBearSiteManager" version="4" >
<MenuBar>
<Action name="kbearsitemanager_menu"/>
--- 1,4 ----
<!DOCTYPE kpartgui >
! <kpartgui library="kbearsitemanager" name="KBearSiteManager" version="5" >
<MenuBar>
<Action name="kbearsitemanager_menu"/>
|
|
From: <kb...@us...> - 2003-07-18 21:14:02
|
Update of /cvsroot/kbear/kbear/kbear/plugins/recentconnections In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/recentconnections Modified Files: kbearrecentconnections.rc Log Message: Bugfixes Index: kbearrecentconnections.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/recentconnections/kbearrecentconnections.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kbearrecentconnections.rc 28 Jun 2003 16:13:51 -0000 1.1 --- kbearrecentconnections.rc 18 Jul 2003 21:13:59 -0000 1.2 *************** *** 1,4 **** <!DOCTYPE kpartgui> ! <kpartplugin name="recentconnections" library="librecentconnections" version="1"> <MenuBar> <Menu noMerge="1" name="file"> --- 1,4 ---- <!DOCTYPE kpartgui> ! <kpartplugin name="recentconnections" library="kbearrecentconnections" version="1"> <MenuBar> <Menu noMerge="1" name="file"> |
|
From: <kb...@us...> - 2003-07-18 21:14:02
|
Update of /cvsroot/kbear/kbear/kbear/plugins/filediff In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/filediff Modified Files: kbearfilediff.rc Log Message: Bugfixes Index: kbearfilediff.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/filediff/kbearfilediff.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kbearfilediff.rc 17 Jul 2003 20:21:02 -0000 1.2 --- kbearfilediff.rc 18 Jul 2003 21:13:59 -0000 1.3 *************** *** 1,4 **** <!DOCTYPE kpartgui > ! <kpartplugin name="KBearFileDiffPlugin" library="libkbearfilediffplugin" version="1"> <MenuBar> <Menu noMerge="1" name="tools"> --- 1,4 ---- <!DOCTYPE kpartgui > ! <kpartplugin name="KBearFileDiffPlugin" library="kbearfilediffplugin" version="1"> <MenuBar> <Menu noMerge="1" name="tools"> |
|
From: <kb...@us...> - 2003-07-18 21:14:02
|
Update of /cvsroot/kbear/kbear/kbear/plugins/systemtraydock In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/systemtraydock Modified Files: kbearsystemtraydockplugin.rc Log Message: Bugfixes Index: kbearsystemtraydockplugin.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/systemtraydock/kbearsystemtraydockplugin.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kbearsystemtraydockplugin.rc 22 Apr 2003 21:07:35 -0000 1.1 --- kbearsystemtraydockplugin.rc 18 Jul 2003 21:13:58 -0000 1.2 *************** *** 1,4 **** <!DOCTYPE kpartgui> ! <kpartplugin name="KBearSystemTrayDock" library="libkbearsystemtraydock" version="1"> <MenuBar> <Menu name="settings"> --- 1,4 ---- <!DOCTYPE kpartgui> ! <kpartplugin name="KBearSystemTrayDock" library="kbearsystemtraydock" version="1"> <MenuBar> <Menu name="settings"> |
|
From: <kb...@us...> - 2003-07-18 21:14:01
|
Update of /cvsroot/kbear/kbear/kbear/plugins/tools In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/tools Modified Files: kbeartoolsplugin.rc Log Message: Bugfixes Index: kbeartoolsplugin.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/tools/kbeartoolsplugin.rc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kbeartoolsplugin.rc 23 Jun 2003 02:02:25 -0000 1.8 --- kbeartoolsplugin.rc 18 Jul 2003 21:13:58 -0000 1.9 *************** *** 1,4 **** <!DOCTYPE kpartgui > ! <kpartplugin name="Tools" library="libkbeartools" version="4"> <MenuBar> <Menu noMerge="1" name="tools"> --- 1,4 ---- <!DOCTYPE kpartgui > ! <kpartplugin name="Tools" library="kbeartools" version="4"> <MenuBar> <Menu noMerge="1" name="tools"> |
|
From: <kb...@us...> - 2003-07-18 21:14:01
|
Update of /cvsroot/kbear/kbear/kbear/plugins/tipofday In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/tipofday Modified Files: kbeartipofdayplugin.rc Log Message: Bugfixes Index: kbeartipofdayplugin.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/tipofday/kbeartipofdayplugin.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kbeartipofdayplugin.rc 26 Jan 2003 00:43:32 -0000 1.3 --- kbeartipofdayplugin.rc 18 Jul 2003 21:13:58 -0000 1.4 *************** *** 1,4 **** <!DOCTYPE kpartgui > ! <kpartplugin name="TipOfDay" library="libkbeartipofday" version="1"> <MenuBar> <Menu noMerge="1" name="help"> --- 1,4 ---- <!DOCTYPE kpartgui > ! <kpartplugin name="TipOfDay" library="kbeartipofday" version="1"> <MenuBar> <Menu noMerge="1" name="help"> |
|
From: <kb...@us...> - 2003-07-18 21:14:01
|
Update of /cvsroot/kbear/kbear/kbear/plugins/transferqueue In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/transferqueue Modified Files: kbeartransferqueueplugin.rc Log Message: Bugfixes Index: kbeartransferqueueplugin.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/transferqueue/kbeartransferqueueplugin.rc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** kbeartransferqueueplugin.rc 11 Jun 2003 23:29:09 -0000 1.9 --- kbeartransferqueueplugin.rc 18 Jul 2003 21:13:58 -0000 1.10 *************** *** 1,4 **** <!DOCTYPE kpartgui > ! <kpartplugin name="TransferQueue" library="libkbeartransferqueue" version="5"> <MenuBar> <Menu noMerge="1" name="transfer"> --- 1,4 ---- <!DOCTYPE kpartgui > ! <kpartplugin name="TransferQueue" library="kbeartransferqueue" version="5"> <MenuBar> <Menu noMerge="1" name="transfer"> |
|
From: <kb...@us...> - 2003-07-18 21:14:01
|
Update of /cvsroot/kbear/kbear/kbear/plugins/transferoutput In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/transferoutput Modified Files: kbeartransferoutputplugin.rc Log Message: Bugfixes Index: kbeartransferoutputplugin.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/transferoutput/kbeartransferoutputplugin.rc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kbeartransferoutputplugin.rc 5 Jun 2003 20:35:05 -0000 1.6 --- kbeartransferoutputplugin.rc 18 Jul 2003 21:13:58 -0000 1.7 *************** *** 1,4 **** <!DOCTYPE kpartgui > ! <kpartplugin name="TransferOutPut" library="libkbeartransferoutput" version="3"> <MenuBar> <Menu noMerge="1" name="transfer"> --- 1,4 ---- <!DOCTYPE kpartgui > ! <kpartplugin name="TransferOutPut" library="kbeartransferoutput" version="3"> <MenuBar> <Menu noMerge="1" name="transfer"> |
|
From: <kb...@us...> - 2003-07-18 21:14:01
|
Update of /cvsroot/kbear/kbear/kbear/plugins/wizard In directory sc8-pr-cvs1:/tmp/cvs-serv27651/kbear/plugins/wizard Modified Files: kbearwizardplugin.rc Log Message: Bugfixes Index: kbearwizardplugin.rc =================================================================== RCS file: /cvsroot/kbear/kbear/kbear/plugins/wizard/kbearwizardplugin.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kbearwizardplugin.rc 26 Jan 2003 00:43:32 -0000 1.2 --- kbearwizardplugin.rc 18 Jul 2003 21:13:58 -0000 1.3 *************** *** 1,4 **** <!DOCTYPE kpartgui > ! <kpartplugin name="ApplicationWizard" library="libkbearwizard" version="1"> <MenuBar> <Menu noMerge="1" name="settings"> --- 1,4 ---- <!DOCTYPE kpartgui > ! <kpartplugin name="ApplicationWizard" library="kbearwizard" version="1"> <MenuBar> <Menu noMerge="1" name="settings"> |
|
From: <kb...@us...> - 2003-07-17 20:21:08
|
Update of /cvsroot/kbear/kbear/po In directory sc8-pr-cvs1:/tmp/cvs-serv15007/po Modified Files: cs.po de.po es.po fr.po he.po id.po it.po ja.po kbear.pot nl.po pl.po pt_BR.po pt.po ro.po ru.po sv.po zh_TW.po Log Message: Index: cs.po =================================================================== RCS file: /cvsroot/kbear/kbear/po/cs.po,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** cs.po 16 Jul 2003 00:02:59 -0000 1.52 --- cs.po 17 Jul 2003 20:20:56 -0000 1.53 *************** *** 6,10 **** msgstr "" "Project-Id-Version: cs\n" ! "POT-Creation-Date: 2003-07-16 00:57+0200\n" "PO-Revision-Date: 2003-07-06 20:45+0200\n" "Last-Translator: MatÄj Hausenblas <ma...@us...>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: cs\n" ! "POT-Creation-Date: 2003-07-17 20:58+0200\n" "PO-Revision-Date: 2003-07-06 20:45+0200\n" "Last-Translator: MatÄj Hausenblas <ma...@us...>\n" *************** *** 851,855 **** msgstr "<b>%1</b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:39 msgid "&FTP" msgstr "&FTP" --- 851,855 ---- msgstr "<b>%1</b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:40 msgid "&FTP" msgstr "&FTP" *************** *** 1728,1732 **** #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:127 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" --- 1728,1732 ---- #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:138 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" *************** *** 2810,2824 **** #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:412 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:671 msgid "&New Group" msgstr "&Nová skupina" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:438 #, c-format msgid "Open the site %1" msgstr "OtevÃrám stránky %1" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:765 msgid "" "If you unload the Sitemanager plugin you can't access the site database." --- 2810,2824 ---- #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:414 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:673 msgid "&New Group" msgstr "&Nová skupina" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:440 #, c-format msgid "Open the site %1" msgstr "OtevÃrám stránky %1" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:767 msgid "" "If you unload the Sitemanager plugin you can't access the site database." *************** *** 3007,3011 **** msgstr "Typ informace" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:128 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" --- 3007,3011 ---- msgstr "Typ informace" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:139 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" *************** *** 3085,3089 **** msgstr "%1/s" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:84 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 --- 3085,3089 ---- msgstr "%1/s" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:94 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 *************** *** 3362,3388 **** "%2 %" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:86 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:101 msgid "Reset File Difference view" msgstr "Vynulovat Pohled rozdÃlů souborů" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:90 msgid "Drop source file here" msgstr "Upustit zdrojový soubor zde" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:91 msgid "Drop destination file here" msgstr "Upustit cÃlový soubor zde" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Highlight syntax" msgstr "Zvýraznit syntax" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:134 #, c-format msgid "Show in %1" msgstr "Zobrazit v %1" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 #, c-format msgid "" --- 3362,3388 ---- "%2 %" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:88 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Reset File Difference view" msgstr "Vynulovat Pohled rozdÃlů souborů" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:92 msgid "Drop source file here" msgstr "Upustit zdrojový soubor zde" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:93 msgid "Drop destination file here" msgstr "Upustit cÃlový soubor zde" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:105 msgid "Highlight syntax" msgstr "Zvýraznit syntax" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:136 #, c-format msgid "Show in %1" msgstr "Zobrazit v %1" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 #, c-format msgid "" *************** *** 3393,3452 **** "%1" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "File Difference" msgstr "RozdÃl souborů" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "Display the difference of two files." msgstr "Zobrazit rozdÃl dvou souborů." ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:382 msgid "Could not invoke the \"diff\" command." msgstr "Nebylo možno spustit pÅÃkaz \"diff\"." ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:389 msgid "<h1>Executing \"diff\" command</h1>" msgstr "<h1>Vykonávánà pÅÃkazu \"diff\"</h1>" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:398 msgid "No differences found." msgstr "Nebyly nalezeny žádné rozdÃly." ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:417 msgid "Diff command failed (%1):\n" msgstr "PÅÃkaz diff selhal (%1):\n" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:45 ! msgid "Search a domain for anonymous servers" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:60 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:96 msgid "Scan domain..." msgstr "" #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy msgid "FTP Find" msgstr "NajÃt" ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 ! msgid "Search a domain for FTP servers" ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:97 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:98 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:99 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:100 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." --- 3393,3474 ---- "%1" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "File Difference" msgstr "RozdÃl souborů" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "Display the difference of two files." msgstr "Zobrazit rozdÃl dvou souborů." ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:384 msgid "Could not invoke the \"diff\" command." msgstr "Nebylo možno spustit pÅÃkaz \"diff\"." ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:391 msgid "<h1>Executing \"diff\" command</h1>" msgstr "<h1>Vykonávánà pÅÃkazu \"diff\"</h1>" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:400 msgid "No differences found." msgstr "Nebyly nalezeny žádné rozdÃly." ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:419 msgid "Diff command failed (%1):\n" msgstr "PÅÃkaz diff selhal (%1):\n" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:48 ! msgid "Specify domain to search." msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:53 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:49 ! #, fuzzy ! msgid "Stop selected domain search." ! msgstr "Zastavà vybraný pÅenos." ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:57 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:57 ! msgid "Clear output view." ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:78 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:108 msgid "Scan domain..." msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:48 + #, fuzzy + msgid "&Stop domain search" + msgstr "Zas&tavit pÅenos" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:52 + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + msgid "Search a domain for anonymous FTP servers." + msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy + msgid "&Clear view" + msgstr "&VyÄistit seznam" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + #, fuzzy msgid "FTP Find" msgstr "NajÃt" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:109 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:110 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:111 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:112 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." *************** *** 3454,3493 **** "Vyberte tuto možnost jestli chcete aby KBear ukládal záznamy do souborů." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:101 #, fuzzy msgid "Start:" msgstr "SpuÅ¡tÄné" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:102 #, fuzzy msgid "Stop:" msgstr "Zas&tavit" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:86 ! msgid "Failed to resolve: %1! %2" msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:119 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:150 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:227 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:260 #, fuzzy msgid "Anonymous login denied!" msgstr "Anonymnà pÅihlášenÃ" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:246 #, fuzzy msgid "Anonymous login accepted." msgstr "Anonymnà pÅihlášenÃ" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, c-format msgid "System type: %1" --- 3476,3519 ---- "Vyberte tuto možnost jestli chcete aby KBear ukládal záznamy do souborů." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:113 #, fuzzy msgid "Start:" msgstr "SpuÅ¡tÄné" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:114 #, fuzzy msgid "Stop:" msgstr "Zas&tavit" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:116 ! msgid "Error..." msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 + msgid "Failed to resolve: %1! %2" + msgstr "" + + #: ../kbear/plugins/ftpfind/scandomainworker.cpp:108 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:130 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:161 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:240 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:267 #, fuzzy msgid "Anonymous login denied!" msgstr "Anonymnà pÅihlášenÃ" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, fuzzy msgid "Anonymous login accepted." msgstr "Anonymnà pÅihlášenÃ" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:262 #, c-format msgid "System type: %1" *************** *** 4050,4056 **** #~ msgid "S&ynchronize current directory" #~ msgstr "S&ynchronizovat souÄasný adresáÅ" - - #~ msgid "&Clear List" - #~ msgstr "&VyÄistit seznam" #~ msgid "Directories: " --- 4076,4079 ---- Index: de.po =================================================================== RCS file: /cvsroot/kbear/kbear/po/de.po,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** de.po 16 Jul 2003 00:02:59 -0000 1.38 --- de.po 17 Jul 2003 20:20:58 -0000 1.39 *************** *** 7,11 **** msgstr "" "Project-Id-Version: KBear 1.2.1\n" ! "POT-Creation-Date: 2003-07-16 00:57+0200\n" "PO-Revision-Date: 2002-11-30 15:02+0100\n" "Last-Translator: Frithjof Engel <fri...@us...>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: KBear 1.2.1\n" ! "POT-Creation-Date: 2003-07-17 20:58+0200\n" "PO-Revision-Date: 2002-11-30 15:02+0100\n" "Last-Translator: Frithjof Engel <fri...@us...>\n" *************** *** 856,860 **** msgstr "<b> %1 </b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:39 msgid "&FTP" msgstr "&FTP" --- 856,860 ---- msgstr "<b> %1 </b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:40 msgid "&FTP" msgstr "&FTP" *************** *** 1749,1753 **** #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:127 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" --- 1749,1753 ---- #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:138 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" *************** *** 2860,2874 **** #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:412 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:671 msgid "&New Group" msgstr "&Neue Gruppe" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:438 #, fuzzy, c-format msgid "Open the site %1" msgstr "Datei %1 öffnen" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:765 msgid "" "If you unload the Sitemanager plugin you can't access the site database." --- 2860,2874 ---- #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:414 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:673 msgid "&New Group" msgstr "&Neue Gruppe" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:440 #, fuzzy, c-format msgid "Open the site %1" msgstr "Datei %1 öffnen" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:767 msgid "" "If you unload the Sitemanager plugin you can't access the site database." *************** *** 3069,3073 **** msgstr "Info-Typ" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:128 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" --- 3069,3073 ---- msgstr "Info-Typ" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:139 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" *************** *** 3149,3153 **** msgstr "%1/sek" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:84 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 --- 3149,3153 ---- msgstr "%1/sek" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:94 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 *************** *** 3434,3460 **** msgstr "Ziel" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:86 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:101 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:90 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:91 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:134 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 #, fuzzy, c-format msgid "" --- 3434,3460 ---- msgstr "Ziel" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:88 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:92 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:93 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:105 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:136 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 #, fuzzy, c-format msgid "" *************** *** 3463,3522 **** msgstr "Ziel" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "File Difference" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:382 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:389 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:398 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:417 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:45 ! msgid "Search a domain for anonymous servers" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:60 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:96 msgid "Scan domain..." msgstr "" #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy msgid "FTP Find" msgstr "Fenster" ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 ! msgid "Search a domain for FTP servers" ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:97 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:98 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:99 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:100 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." --- 3463,3544 ---- msgstr "Ziel" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "File Difference" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:384 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:391 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:400 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:419 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:48 ! msgid "Specify domain to search." msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:53 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:49 ! #, fuzzy ! msgid "Stop selected domain search." ! msgstr "Ãbertragungsansicht An/Ausschalten..." ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:57 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:57 ! msgid "Clear output view." ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:78 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:108 msgid "Scan domain..." msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:48 + #, fuzzy + msgid "&Stop domain search" + msgstr "Ãbertragungsansicht anzeigen" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:52 + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + msgid "Search a domain for anonymous FTP servers." + msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy + msgid "&Clear view" + msgstr "Liste &Löschen" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + #, fuzzy msgid "FTP Find" msgstr "Fenster" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:109 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:110 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:111 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:112 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." *************** *** 3525,3564 **** "Informationen erstellt." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:101 #, fuzzy msgid "Start:" msgstr "Verzögert" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:102 #, fuzzy msgid "Stop:" msgstr "S&toppen" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:86 ! msgid "Failed to resolve: %1! %2" msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:119 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:150 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:227 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:260 #, fuzzy msgid "Anonymous login denied!" msgstr "Anonymer Login" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:246 #, fuzzy msgid "Anonymous login accepted." msgstr "Anonymer Login" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, c-format msgid "System type: %1" --- 3547,3590 ---- "Informationen erstellt." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:113 #, fuzzy msgid "Start:" msgstr "Verzögert" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:114 #, fuzzy msgid "Stop:" msgstr "S&toppen" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:116 ! msgid "Error..." msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 + msgid "Failed to resolve: %1! %2" + msgstr "" + + #: ../kbear/plugins/ftpfind/scandomainworker.cpp:108 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:130 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:161 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:240 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:267 #, fuzzy msgid "Anonymous login denied!" msgstr "Anonymer Login" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, fuzzy msgid "Anonymous login accepted." msgstr "Anonymer Login" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:262 #, c-format msgid "System type: %1" *************** *** 4131,4137 **** #~ msgid "S&ynchronize current directory" #~ msgstr "Aktuelles Verzeichnis sy&nchronisieren" - - #~ msgid "&Clear List" - #~ msgstr "Liste &Löschen" #~ msgid "Directories: " --- 4157,4160 ---- Index: es.po =================================================================== RCS file: /cvsroot/kbear/kbear/po/es.po,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** es.po 16 Jul 2003 00:02:59 -0000 1.34 --- es.po 17 Jul 2003 20:20:59 -0000 1.35 *************** *** 5,9 **** msgstr "" "Project-Id-Version: kbear\n" ! "POT-Creation-Date: 2003-07-16 00:57+0200\n" "PO-Revision-Date: 2003-03-20 10:35CET\n" "Last-Translator: Quique <qu...@si...>\n" --- 5,9 ---- msgstr "" "Project-Id-Version: kbear\n" ! "POT-Creation-Date: 2003-07-17 20:58+0200\n" "PO-Revision-Date: 2003-03-20 10:35CET\n" "Last-Translator: Quique <qu...@si...>\n" *************** *** 849,853 **** msgstr "" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:39 msgid "&FTP" msgstr "&FTP" --- 849,853 ---- msgstr "" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:40 msgid "&FTP" msgstr "&FTP" *************** *** 1729,1733 **** #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:127 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" --- 1729,1733 ---- #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:138 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" *************** *** 2791,2806 **** #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:412 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:671 #, fuzzy msgid "&New Group" msgstr "Grupo Nuevo" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:438 #, c-format msgid "Open the site %1" msgstr "" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:765 msgid "" "If you unload the Sitemanager plugin you can't access the site database." --- 2791,2806 ---- #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:414 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:673 #, fuzzy msgid "&New Group" msgstr "Grupo Nuevo" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:440 #, c-format msgid "Open the site %1" msgstr "" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:767 msgid "" "If you unload the Sitemanager plugin you can't access the site database." *************** *** 2991,2995 **** msgstr "" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:128 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" --- 2991,2995 ---- msgstr "" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:139 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" *************** *** 3075,3079 **** msgstr "%1/seg" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:84 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 --- 3075,3079 ---- msgstr "%1/seg" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:94 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 *************** *** 3351,3377 **** msgstr "Destino" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:86 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:101 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:90 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:91 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:134 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 #, fuzzy, c-format msgid "" --- 3351,3377 ---- msgstr "Destino" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:88 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:92 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:93 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:105 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:136 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 #, fuzzy, c-format msgid "" *************** *** 3380,3439 **** msgstr "Destino" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "File Difference" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:382 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:389 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:398 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:417 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:45 ! msgid "Search a domain for anonymous servers" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:60 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:96 msgid "Scan domain..." msgstr "" #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy msgid "FTP Find" msgstr "Ventana" ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 ! msgid "Search a domain for FTP servers" ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:97 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:98 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:99 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:100 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." --- 3380,3461 ---- msgstr "Destino" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "File Difference" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:384 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:391 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:400 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:419 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:48 ! msgid "Specify domain to search." msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:53 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:49 ! #, fuzzy ! msgid "Stop selected domain search." ! msgstr "Mostrar/Ocultar la vista de transferencias..." ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:57 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:57 ! msgid "Clear output view." ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:78 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:108 msgid "Scan domain..." msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:48 + #, fuzzy + msgid "&Stop domain search" + msgstr "Mostrar la vista de transferencia" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:52 + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + msgid "Search a domain for anonymous FTP servers." + msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy + msgid "&Clear view" + msgstr "&Limpiar Selección" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + #, fuzzy msgid "FTP Find" msgstr "Ventana" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:109 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:110 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:111 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:112 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." *************** *** 3442,3471 **** "Maestra por defecto." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:101 #, fuzzy msgid "Start:" msgstr "&Eliminar Definitivamente" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:102 #, fuzzy msgid "Stop:" msgstr "Velocidad" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:86 ! msgid "Failed to resolve: %1! %2" msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:119 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:150 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:227 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:260 #, fuzzy msgid "Anonymous login denied!" --- 3464,3497 ---- "Maestra por defecto." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:113 #, fuzzy msgid "Start:" msgstr "&Eliminar Definitivamente" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:114 #, fuzzy msgid "Stop:" msgstr "Velocidad" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:116 ! msgid "Error..." msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 + msgid "Failed to resolve: %1! %2" + msgstr "" + + #: ../kbear/plugins/ftpfind/scandomainworker.cpp:108 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:130 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:161 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:240 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:267 #, fuzzy msgid "Anonymous login denied!" *************** *** 3474,3478 **** "Si lo dejas en blanco se conecatará como usuario anónimo!!!" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:246 #, fuzzy msgid "Anonymous login accepted." --- 3500,3504 ---- "Si lo dejas en blanco se conecatará como usuario anónimo!!!" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, fuzzy msgid "Anonymous login accepted." *************** *** 3481,3485 **** "Si lo dejas en blanco se conecatará como usuario anónimo!!!" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, c-format msgid "System type: %1" --- 3507,3511 ---- "Si lo dejas en blanco se conecatará como usuario anónimo!!!" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:262 #, c-format msgid "System type: %1" *************** *** 3918,3925 **** #~ msgid "S&ynchronize current directory" #~ msgstr "Este botón recarga el directorio actual" - - #, fuzzy - #~ msgid "&Clear List" - #~ msgstr "&Limpiar Selección" #~ msgid "Directories: " --- 3944,3947 ---- Index: fr.po =================================================================== RCS file: /cvsroot/kbear/kbear/po/fr.po,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** fr.po 16 Jul 2003 00:03:00 -0000 1.83 --- fr.po 17 Jul 2003 20:20:59 -0000 1.84 *************** *** 6,10 **** msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2003-07-16 00:57+0200\n" "PO-Revision-Date: 2002-12-14 18:40GMT\n" "Last-Translator: CAULIER Gilles <cau...@fr...>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2003-07-17 20:58+0200\n" "PO-Revision-Date: 2002-12-14 18:40GMT\n" "Last-Translator: CAULIER Gilles <cau...@fr...>\n" *************** *** 867,871 **** msgstr "<b>%1</b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:39 msgid "&FTP" msgstr "&FTP" --- 867,871 ---- msgstr "<b>%1</b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:40 msgid "&FTP" msgstr "&FTP" *************** *** 1778,1782 **** #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:127 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" --- 1778,1782 ---- #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:138 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" *************** *** 2914,2928 **** #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:412 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:671 msgid "&New Group" msgstr "&Nouveau groupe" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:438 #, fuzzy, c-format msgid "Open the site %1" msgstr "Ouvrir le fichier : %1" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:765 msgid "" "If you unload the Sitemanager plugin you can't access the site database." --- 2914,2928 ---- #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:414 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:673 msgid "&New Group" msgstr "&Nouveau groupe" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:440 #, fuzzy, c-format msgid "Open the site %1" msgstr "Ouvrir le fichier : %1" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:767 msgid "" "If you unload the Sitemanager plugin you can't access the site database." *************** *** 3125,3129 **** msgstr "type d'information" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:128 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" --- 3125,3129 ---- msgstr "type d'information" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:139 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" *************** *** 3205,3209 **** msgstr "%1/s" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:84 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 --- 3205,3209 ---- msgstr "%1/s" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:94 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 *************** *** 3489,3515 **** msgstr "Destination" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:86 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:101 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:90 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:91 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:134 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 #, fuzzy, c-format msgid "" --- 3489,3515 ---- msgstr "Destination" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:88 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:92 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:93 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:105 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:136 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 #, fuzzy, c-format msgid "" *************** *** 3518,3578 **** msgstr "Destination" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 #, fuzzy msgid "File Difference" msgstr "Différence de temps :" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:382 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:389 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:398 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:417 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:45 ! msgid "Search a domain for anonymous servers" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:60 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:96 msgid "Scan domain..." msgstr "" #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy msgid "FTP Find" msgstr "Fenêtre" ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 ! msgid "Search a domain for FTP servers" ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:97 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:98 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:99 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:100 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." --- 3518,3600 ---- msgstr "Destination" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 #, fuzzy msgid "File Difference" msgstr "Différence de temps :" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:384 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:391 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:400 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:419 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:48 ! msgid "Specify domain to search." msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:53 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:49 ! #, fuzzy ! msgid "Stop selected domain search." ! msgstr "Activer/désactiver la vue des transferts..." ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:57 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:57 ! msgid "Clear output view." ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:78 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:108 msgid "Scan domain..." msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:48 + #, fuzzy + msgid "&Stop domain search" + msgstr "Afficher la vue des transferts" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:52 + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + msgid "Search a domain for anonymous FTP servers." + msgstr "" + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 #, fuzzy + msgid "&Clear view" + msgstr "&Effacer la liste" + + #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 + #, fuzzy msgid "FTP Find" msgstr "Fenêtre" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:109 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:110 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:111 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:112 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." *************** *** 3581,3620 **** "connexion." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:101 #, fuzzy msgid "Start:" msgstr "Transfert bloqué" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:102 #, fuzzy msgid "Stop:" msgstr "S&top" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:86 ! msgid "Failed to resolve: %1! %2" msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:119 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:150 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:227 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:260 #, fuzzy msgid "Anonymous login denied!" msgstr "Connexion anonyme" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:246 #, fuzzy msgid "Anonymous login accepted." msgstr "Connexion anonyme" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, c-format msgid "System type: %1" --- 3603,3646 ---- "connexion." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:113 #, fuzzy msgid "Start:" msgstr "Transfert bloqué" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:114 #, fuzzy msgid "Stop:" msgstr "S&top" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:116 ! msgid "Error..." msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 + msgid "Failed to resolve: %1! %2" + msgstr "" + + #: ../kbear/plugins/ftpfind/scandomainworker.cpp:108 #, fuzzy msgid "%1 (%2)" msgstr "%1 %" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:130 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:161 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:240 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:267 #, fuzzy msgid "Anonymous login denied!" msgstr "Connexion anonyme" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, fuzzy msgid "Anonymous login accepted." msgstr "Connexion anonyme" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:262 #, c-format msgid "System type: %1" *************** *** 4199,4205 **** #~ msgid "S&ynchronize current directory" #~ msgstr "S&ynchroniser le dossier courant" - - #~ msgid "&Clear List" - #~ msgstr "&Effacer la liste" #~ msgid "Directories: " --- 4225,4228 ---- Index: he.po =================================================================== RCS file: /cvsroot/kbear/kbear/po/he.po,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** he.po 16 Jul 2003 00:03:00 -0000 1.21 --- he.po 17 Jul 2003 20:21:00 -0000 1.22 *************** *** 6,10 **** msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2003-07-16 00:57+0200\n" "PO-Revision-Date: 2002-10-19 05:37+0200\n" "Last-Translator: Aviv Rosental <av...@fi...>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2003-07-17 20:58+0200\n" "PO-Revision-Date: 2002-10-19 05:37+0200\n" "Last-Translator: Aviv Rosental <av...@fi...>\n" *************** *** 824,828 **** msgstr "" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:39 msgid "&FTP" msgstr "" --- 824,828 ---- msgstr "" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:40 msgid "&FTP" msgstr "" *************** *** 1657,1661 **** #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:127 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" --- 1657,1661 ---- #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:138 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" *************** *** 2712,2726 **** #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:412 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:671 msgid "&New Group" msgstr "ק&×××¦× ××ש×" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:438 #, fuzzy, c-format msgid "Open the site %1" msgstr "פ××ª× ×§×××¥: %1" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:765 msgid "" "If you unload the Sitemanager plugin you can't access the site database." --- 2712,2726 ---- #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:414 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:673 msgid "&New Group" msgstr "ק&×××¦× ××ש×" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:440 #, fuzzy, c-format msgid "Open the site %1" msgstr "פ××ª× ×§×××¥: %1" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:767 msgid "" "If you unload the Sitemanager plugin you can't access the site database." *************** *** 2909,2913 **** msgstr "ס×× ××××¢" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:128 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" --- 2909,2913 ---- msgstr "ס×× ××××¢" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:139 #: ../kbear/plugins/transferoutput/transferviewpage.cpp:36 msgid "Info" *************** *** 2987,2991 **** msgstr "%1/×©× ××" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:84 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 --- 2987,2991 ---- msgstr "%1/×©× ××" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:94 #: ../kbear/plugins/transferoutput/transferitem.cpp:193 #: ../kbear/plugins/transferqueue/transferqueuewidget.cpp:102 *************** *** 3253,3279 **** msgstr "××¢×" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:86 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:101 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:90 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:91 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:134 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 #, fuzzy, c-format msgid "" --- 3253,3279 ---- msgstr "××¢×" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:88 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:103 msgid "Reset File Difference view" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:92 msgid "Drop source file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:93 msgid "Drop destination file here" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:105 msgid "Highlight syntax" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:136 #, c-format msgid "Show in %1" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 #, fuzzy, c-format msgid "" *************** *** 3282,3379 **** msgstr "××¢×" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:197 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "File Difference" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:232 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:382 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:389 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:398 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:417 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:45 ! msgid "Search a domain for anonymous servers" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:60 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:96 msgid "Scan domain..." msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 ! msgid "FTP Find" msgstr "" #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 ! msgid "Search a domain for FTP servers" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:97 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:98 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:99 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:100 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." msgstr "ס×× ×פשר×ת ×× ×× ××ª× ×× ×¨××¦× ×© KBear ×צ×ר ר×ש×× ××××¢." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:101 #, fuzzy msgid "Start:" msgstr "××ש××" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:102 #, fuzzy msgid "Stop:" msgstr "×¢&צ×ר" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:86 ! msgid "Failed to resolve: %1! %2" msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 msgid "%1 (%2)" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:119 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:150 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:227 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:260 #, fuzzy msgid "Anonymous login denied!" msgstr "×× ××¡× ×× ×× ×××ת" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:246 #, fuzzy msgid "Anonymous login accepted." msgstr "×× ××¡× ×× ×× ×××ת" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, c-format msgid "System type: %1" --- 3282,3405 ---- msgstr "××¢×" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:199 ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "File Difference" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:234 msgid "Display the difference of two files." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:384 msgid "Could not invoke the \"diff\" command." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:391 msgid "<h1>Executing \"diff\" command</h1>" msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:400 msgid "No differences found." msgstr "" ! #: ../kbear/plugins/filediff/kbearfilediffplugin.cpp:419 msgid "Diff command failed (%1):\n" msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:48 ! msgid "Specify domain to search." msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:53 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:49 ! #, fuzzy ! msgid "Stop selected domain search." ! msgstr "×××× ×ת תצ××ת ×××¢×ר×ת..." ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:57 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:57 ! msgid "Clear output view." ! msgstr "" ! ! #: ../kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp:78 ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:108 msgid "Scan domain..." msgstr "" ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:48 ! #, fuzzy ! msgid "&Stop domain search" ! msgstr "×ר×× ×ª×¢××ר×" ! ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:52 ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 ! msgid "Search a domain for anonymous FTP servers." msgstr "" #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:56 ! #, fuzzy ! msgid "&Clear view" ! msgstr "× &ק×" ! ! #: ../kbear/plugins/ftpfind/kbearftpfindplugin.cpp:72 ! msgid "FTP Find" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:109 msgid "Specify domain to scan:" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:110 msgid "Specify ports to scan" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:111 msgid "Only scan port 21" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:112 #, fuzzy msgid "Uncheck this option if you want to scan other ports than 21 (slow)." msgstr "ס×× ×פשר×ת ×× ×× ××ª× ×× ×¨××¦× ×© KBear ×צ×ר ר×ש×× ××××¢." ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:113 #, fuzzy msgid "Start:" msgstr "××ש××" ! #: ../kbear/plugins/ftpfind/scandomainwidget.cpp:114 #, fuzzy msgid "Stop:" msgstr "×¢&צ×ר" ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:116 ! msgid "Error..." msgstr "" #: ../kbear/plugins/ftpfind/scandomainworker.cpp:97 + msgid "Failed to resolve: %1! %2" + msgstr "" + + #: ../kbear/plugins/ftpfind/scandomainworker.cpp:108 msgid "%1 (%2)" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:130 msgid "%1 (%2) port=%3" msgstr "" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:161 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:240 ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:267 #, fuzzy msgid "Anonymous login denied!" msgstr "×× ××¡× ×× ×× ×××ת" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:255 #, fuzzy msgid "Anonymous login accepted." msgstr "×× ××¡× ×× ×× ×××ת" ! #: ../kbear/plugins/ftpfind/scandomainworker.cpp:262 #, c-format msgid "System type: %1" *************** *** 3837,3844 **** #~ msgid "Are you sure you want to clear the list ?" #~ msgstr "××× ××ª× ×××ת ר××¦× ×צ×ת ?" - - #, fuzzy - #~ msgid "&Clear" - #~ msgstr "× &ק×" #~ msgid "Search next..." --- 3863,3866 ---- Index: id.po =================================================================== RCS file: /cvsroot/kbear/kbear/po/id.po,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** id.po 16 Jul 2003 00:03:00 -0000 1.17 --- id.po 17 Jul 2003 20:21:00 -0000 1.18 *************** *** 6,10 **** msgstr "" "Project-Id-Version: id\n" ! "POT-Creation-Date: 2003-07-16 00:57+0200\n" "PO-Revision-Date: 2002-10-16 11:55+0200\n" "Last-Translator: Muhammad Panji <sum...@ya...>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: id\n" ! "POT-Creation-Date: 2003-07-17 20:58+0200\n" "PO-Revision-Date: 2002-10-16 11:55+0200\n" "Last-Translator: Muhammad Panji <sum...@ya...>\n" *************** *** 853,857 **** msgstr "<b>%1</b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:39 msgid "&FTP" msgstr "&FTP" --- 853,857 ---- msgstr "<b>%1</b>" ! #: ../kbear/rc.cpp:1 ../kbear/rc.cpp:12 ../kbear/rc.cpp:40 msgid "&FTP" msgstr "&FTP" *************** *** 1690,1694 **** #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:127 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" --- 1690,1694 ---- #: ../kbear/lib/widgets/kbeartreeview.cpp:50 ! #: ../kbear/plugins/ftpfind/ftpfindtreeview.cpp:138 #: ../kbear/plugins/sitemanager/kbearsitemanagertreeview.cpp:99 msgid "Name" *************** *** 2775,2789 **** #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:412 ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:671 msgid "&New Group" msgstr "Grup &baru" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:438 #, fuzzy, c-format msgid "Open the site %1" msgstr "membuka file: %1" ! #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:765 msgid "" "If you unload the Sitemanager plugin you can't access the site database." --- 2775,2789 ---- #: ../kbear/plugins/sitemanager/kbearsitemanagerplugin.cpp:139 ! #: ../kbear/plugins/... [truncated message content] |
|
From: <kb...@us...> - 2003-07-17 20:21:07
|
Update of /cvsroot/kbear/kbear/kbear/plugins/ftpfind
In directory sc8-pr-cvs1:/tmp/cvs-serv15007/kbear/plugins/ftpfind
Modified Files:
ftpfindtreeview.cpp ftpfindtreeview.h
kbearftpfindoutputwidget.cpp kbearftpfindoutputwidget.h
kbearftpfindplugin.cpp kbearftpfindplugin.h kbearftpfind.rc
scandomainwidget.ui scandomainworker.cpp scandomainworker.h
Log Message:
Index: ftpfindtreeview.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/ftpfindtreeview.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ftpfindtreeview.cpp 15 Jul 2003 23:46:34 -0000 1.1
--- ftpfindtreeview.cpp 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 15,18 ****
--- 15,19 ----
#include <kmimetype.h>
#include <kiconloader.h>
+ #include <kmessagebox.h>
#include <kglobal.h>
//////////////////////////////////////////////////////////////////////
***************
*** 34,38 ****
m_currentItem( this )
{
! setPixmap( 0, KMimeType::mimeType("inode/directory")->pixmap(KIcon::Small) );
setExpandable( true );
m_worker = new ScanDomainWorker( this, domain, startPort, stopPort );
--- 35,39 ----
m_currentItem( this )
{
! setPixmap( 0, SmallIcon ( "network" ) );
setExpandable( true );
m_worker = new ScanDomainWorker( this, domain, startPort, stopPort );
***************
*** 43,51 ****
if( m_worker ) {
m_worker->stop();
! delete m_worker;
m_worker = 0L;
}
}
//-----------------------------------------------
void FTPFindTreeViewItem::stop() {
if( m_worker )
--- 44,59 ----
if( m_worker ) {
m_worker->stop();
! m_worker->deleteLater();
m_worker = 0L;
}
}
//-----------------------------------------------
+ bool FTPFindTreeViewItem::isActive() const {
+ if( m_worker )
+ return m_worker->isActive();
+
+ return false;
+ }
+ //-----------------------------------------------
void FTPFindTreeViewItem::stop() {
if( m_worker )
***************
*** 62,74 ****
case ScanDomainEvent::LoginAccepted: {
m_currentItem->setText( 1, event->message() );
break;
}
case ScanDomainEvent::LoginDenied: {
m_currentItem->setText( 1, event->message() );
break;
}
case ScanDomainEvent::Info: {
m_currentItem = new QListViewItem( this, m_currentItem, event->message() );
! m_currentItem->setPixmap( 0, KGlobal::iconLoader()->loadIcon("ftp", KIcon::Small ) );
m_currentItem->setExpandable( true );
break;
--- 70,84 ----
case ScanDomainEvent::LoginAccepted: {
m_currentItem->setText( 1, event->message() );
+ m_currentItem->setPixmap( 0, QPixmap( started_xpm ) );
break;
}
case ScanDomainEvent::LoginDenied: {
m_currentItem->setText( 1, event->message() );
+ m_currentItem->setPixmap( 0, QPixmap( stopped_xpm ) );
break;
}
case ScanDomainEvent::Info: {
m_currentItem = new QListViewItem( this, m_currentItem, event->message() );
! m_currentItem->setPixmap( 0, QPixmap( uninitialized_xpm ) );
m_currentItem->setExpandable( true );
break;
***************
*** 104,107 ****
--- 114,118 ----
if( event->errType() == ScanDomainEvent::ResolveError ) {
setText( 1, event->message() );
+ KMessageBox::error( listView(), event->message(), i18n("Error...") );
delete m_worker;
m_worker = 0L;
***************
*** 127,135 ****
--- 138,160 ----
addColumn( i18n("Name") );
addColumn( i18n("Info") );
+ setColumnWidthMode( 0, QListView::Manual );
setRootIsDecorated( true );
+ setSelectionModeExt( Single );
setSorting( -1 ); // no sorting
}
//-----------------------------------------------
FTPFindTreeView::~FTPFindTreeView() {
+ }
+ //-----------------------------------------------
+ void FTPFindTreeView::slotClear() {
+ QListViewItemIterator it( this );
+ while ( it.current() ) {
+ FTPFindTreeViewItem* item = dynamic_cast<FTPFindTreeViewItem*>( it.current() );
+ if( item ) {
+ item->stop();
+ }
+ ++it;
+ }
+ clear();
}
//-----------------------------------------------
Index: ftpfindtreeview.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/ftpfindtreeview.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ftpfindtreeview.h 15 Jul 2003 23:46:34 -0000 1.1
--- ftpfindtreeview.h 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 37,40 ****
--- 37,42 ----
/** */
void stop();
+ /** */
+ bool isActive() const;
protected:
/** */
***************
*** 51,55 ****
/** */
~FTPFindTreeView();
!
};
--- 53,58 ----
/** */
~FTPFindTreeView();
! public slots:
! void slotClear();
};
Index: kbearftpfindoutputwidget.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/kbearftpfindoutputwidget.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbearftpfindoutputwidget.cpp 15 Jul 2003 23:46:34 -0000 1.1
--- kbearftpfindoutputwidget.cpp 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 28,31 ****
--- 28,32 ----
// Application specific include files
#include "kbearftpfindoutputwidget.h"
+ #include "kbearftpfindplugin.h"
#include "scandomainwidget.h"
#include "ftpfindtreeview.h"
***************
*** 36,47 ****
#include "kbearftpfindoutputwidget.moc"
//-----------------------------------------------
! KBearFTPFindOutputWidget::KBearFTPFindOutputWidget(QWidget* parent, const char* name )
! : QWidget( parent, name )
{
QHBoxLayout* layout = new QHBoxLayout( this );
QButtonGroup* toolbar = new QVButtonGroup( this );
m_searchButton = new QToolButton( toolbar, "m_searchButton" );
m_searchButton->setPixmap ( SmallIcon ( "find" ) );
! QToolTip::add ( m_searchButton, i18n ( "Search a domain for anonymous servers" ) );
layout->addWidget( toolbar );
--- 37,59 ----
#include "kbearftpfindoutputwidget.moc"
//-----------------------------------------------
! KBearFTPFindOutputWidget::KBearFTPFindOutputWidget( KBearFTPFindPlugin* plugin, QWidget* parent, const char* name )
! : QWidget( parent, name ), m_plugin( plugin )
{
QHBoxLayout* layout = new QHBoxLayout( this );
QButtonGroup* toolbar = new QVButtonGroup( this );
+ toolbar->setFrameShape( QFrame::ToolBarPanel );
+
m_searchButton = new QToolButton( toolbar, "m_searchButton" );
m_searchButton->setPixmap ( SmallIcon ( "find" ) );
! QToolTip::add ( m_searchButton, i18n ( "Specify domain to search." ) );
!
! m_stopButton = new QToolButton( toolbar, "m_stopButton" );
! m_stopButton->setPixmap ( SmallIcon ( "stop" ) );
! m_stopButton->setEnabled( false );
! QToolTip::add ( m_stopButton, i18n ( "Stop selected domain search." ) );
!
! m_clearButton = new QToolButton( toolbar, "m_clearButton" );
! m_clearButton->setPixmap ( SmallIcon ( "editclear" ) );
! QToolTip::add ( m_clearButton, i18n ( "Clear output view." ) );
layout->addWidget( toolbar );
***************
*** 52,58 ****
--- 64,76 ----
connect( m_searchButton, SIGNAL( clicked() ), this, SLOT( slotSearch() ) );
+ connect( m_stopButton, SIGNAL( clicked() ), m_plugin, SLOT( slotStop() ) );
+ connect( m_clearButton, SIGNAL( clicked() ), m_searchView, SLOT( slotClear() ) );
}
//-----------------------------------------------
KBearFTPFindOutputWidget::~KBearFTPFindOutputWidget() {
+ }
+ //-----------------------------------------------
+ void KBearFTPFindOutputWidget::setStopEnabled( bool enable ) {
+ m_stopButton->setEnabled( enable );
}
//-----------------------------------------------
Index: kbearftpfindoutputwidget.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/kbearftpfindoutputwidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbearftpfindoutputwidget.h 15 Jul 2003 23:46:34 -0000 1.1
--- kbearftpfindoutputwidget.h 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 28,31 ****
--- 28,32 ----
namespace KBear {
class FTPFindTreeView;
+ class KBearFTPFindPlugin;
/**
***************
*** 36,47 ****
public:
/** */
! KBearFTPFindOutputWidget( QWidget* parent = 0, const char* name = 0 );
/** */
virtual ~KBearFTPFindOutputWidget();
private slots:
void slotSearch();
private:
QToolButton* m_searchButton;
FTPFindTreeView* m_searchView;
};
};
--- 37,55 ----
public:
/** */
! KBearFTPFindOutputWidget( KBearFTPFindPlugin* plugin, QWidget* parent = 0, const char* name = 0 );
/** */
virtual ~KBearFTPFindOutputWidget();
+ /** */
+ const FTPFindTreeView* searchView() const { return m_searchView; };
+ /** */
+ void setStopEnabled( bool enable );
private slots:
void slotSearch();
private:
QToolButton* m_searchButton;
+ QToolButton* m_stopButton;
+ QToolButton* m_clearButton;
FTPFindTreeView* m_searchView;
+ KBearFTPFindPlugin* m_plugin;
};
};
Index: kbearftpfindplugin.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/kbearftpfindplugin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbearftpfindplugin.cpp 15 Jul 2003 23:46:34 -0000 1.1
--- kbearftpfindplugin.cpp 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 10,13 ****
--- 10,14 ----
//////////////////////////////////////////////////////////////////////
// Qt specific include files
+ #include <qpopupmenu.h>
#include <qvbox.h>
//////////////////////////////////////////////////////////////////////
***************
*** 15,18 ****
--- 16,20 ----
#include <klocale.h>
#include <kglobal.h>
+ #include <kaction.h>
#include <kinstance.h>
#include <kiconloader.h>
***************
*** 22,25 ****
--- 24,28 ----
//////////////////////////////////////////////////////////////////////
// Application specific include files
+ #include "kbearftpfindplugin.h"
#include "misc.h"
#include "kbearapi.h"
***************
*** 27,33 ****
#include "kbearmainwiniface.h"
#include "kbearftpfindoutputwidget.h"
!
! #include "kbearftpfindplugin.h"
!
using namespace KBear;
--- 30,34 ----
#include "kbearmainwiniface.h"
#include "kbearftpfindoutputwidget.h"
! #include "ftpfindtreeview.h"
using namespace KBear;
***************
*** 43,49 ****
KGlobal::locale()->insertCatalogue("kbear");
setInstance(KBearFTPFindPluginFactory::instance());
! setXMLFile( "kbearftpfind.rc" );
! m_outputWidget = new KBearFTPFindOutputWidget( 0L, "KBearFTPFindOutputWidget" );
}
//-----------------------------------------------
--- 44,65 ----
KGlobal::locale()->insertCatalogue("kbear");
setInstance(KBearFTPFindPluginFactory::instance());
! m_outputWidget = new KBearFTPFindOutputWidget( this, 0L, "KBearFTPFindOutputWidget" );
!
! KAction* action = new KAction( i18n("&Stop domain search"),"stop", 0, this, SLOT( slotStop() ), actionCollection(), "ftpfind_stop" );
! action->setToolTip( i18n("Stop selected domain search.") );
! action->setEnabled( false );
+ QString tmp = i18n("Search a domain for anonymous FTP servers.");
+ action = new KAction( tmp,"find", 0, m_outputWidget, SLOT( slotSearch() ), actionCollection(), "ftpfind_find" );
+ action->setToolTip( tmp );
+
+ action = new KAction( i18n("&Clear view"), "editclear", 0, m_outputWidget->searchView(), SLOT( slotClear() ), actionCollection(), "ftpfind_clear" );
+ action->setToolTip( i18n("Clear output view.") );
+
+ setXMLFile( "kbearftpfind.rc" );
+ connect( m_outputWidget->searchView(), SIGNAL( contextMenu(KListView*, QListViewItem*, const QPoint& ) ),
+ this, SLOT( slotContextMenu( KListView*, QListViewItem*, const QPoint& ) ) );
+ connect( m_outputWidget->searchView(), SIGNAL( selectionChanged( QListViewItem* ) ),
+ this, SLOT( slotSelectionChanged( QListViewItem* ) ) );
}
//-----------------------------------------------
***************
*** 54,58 ****
//-----------------------------------------------
void KBearFTPFindPlugin::slotInit() {
! mainWindow()->embedOutputPluginView( m_outputWidget, i18n("FTP Find"), i18n("Search a domain for FTP servers" ) );
}
//-----------------------------------------------
--- 70,108 ----
//-----------------------------------------------
void KBearFTPFindPlugin::slotInit() {
! mainWindow()->embedOutputPluginView( m_outputWidget, i18n("FTP Find"), i18n("Search a domain for anonymous FTP servers." ) );
! }
! //-----------------------------------------------
! void KBearFTPFindPlugin::slotStop() {
! FTPFindTreeViewItem* item = dynamic_cast<FTPFindTreeViewItem*>( m_outputWidget->searchView()->selectedItem() );
! if( item )
! item->stop();
! }
! //-----------------------------------------------
! void KBearFTPFindPlugin::slotSelectionChanged( QListViewItem* i ) {
! FTPFindTreeViewItem* item = dynamic_cast<FTPFindTreeViewItem*>( i );
! if( item && item->isActive() ) {
! stateChanged( QString::fromLatin1("ItemSelectedState") );
! m_outputWidget->setStopEnabled( true );
! }
! else {
! stateChanged( QString::fromLatin1("ItemSelectedState", StateReverse ) );
! m_outputWidget->setStopEnabled( false );
! }
! }
! //-----------------------------------------------
! void KBearFTPFindPlugin::slotContextMenu( KListView*, QListViewItem* i, const QPoint& p ) {
! QPopupMenu* menu = ( factory() ? static_cast<QPopupMenu*>(factory()->container("ftpfind_popup", this)) : 0 );
! if( menu ) {
! FTPFindTreeViewItem* item = dynamic_cast<FTPFindTreeViewItem*>( i );
! if( item && item->isActive() ) {
! stateChanged( QString::fromLatin1("ItemSelectedState") );
! m_outputWidget->setStopEnabled( true );
! }
! else {
! stateChanged( QString::fromLatin1("ItemSelectedState", StateReverse ) );
! m_outputWidget->setStopEnabled( false );
! }
! menu->popup( p );
! }
}
//-----------------------------------------------
Index: kbearftpfindplugin.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/kbearftpfindplugin.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbearftpfindplugin.h 15 Jul 2003 23:46:34 -0000 1.1
--- kbearftpfindplugin.h 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 14,17 ****
--- 14,18 ----
//////////////////////////////////////////////////////////////////////
// Qt specific include files
+ #include <qpoint.h>
//////////////////////////////////////////////////////////////////////
// KDE specific include files
***************
*** 23,29 ****
! class KBearFTPFindWidget;
namespace KBear {
/**
--- 24,32 ----
! class KListView;
! class QListViewItem;
namespace KBear {
+ class KBearFTPFindOutputWidget;
/**
***************
*** 40,43 ****
--- 43,51 ----
/** */
virtual void slotInit();
+ /** */
+ void slotStop();
+ private slots:
+ void slotSelectionChanged( QListViewItem* i );
+ void slotContextMenu( KListView*, QListViewItem*, const QPoint& );
private:
KBearFTPFindOutputWidget* m_outputWidget;
Index: kbearftpfind.rc
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/kbearftpfind.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kbearftpfind.rc 15 Jul 2003 23:46:34 -0000 1.1
--- kbearftpfind.rc 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 1,5 ****
<!DOCTYPE kpartgui >
<kpartplugin name="KBearFTPFind" library="kbearftpfind" version="1">
! <Menu noMerge="1" name="ftpfind_popup">
</Menu>
</kpartplugin>
--- 1,23 ----
<!DOCTYPE kpartgui >
<kpartplugin name="KBearFTPFind" library="kbearftpfind" version="1">
! <MenuBar>
! <Menu noMerge="1" name="tools">
! <text>&Tools</text>
! <Action name="ftpfind_find"/>
! <Action name="ftpfind_stop"/>
! <Separator/>
! <Merge/>
! </Menu>
! </MenuBar>
! <Menu name="ftpfind_popup">
! <Action name="ftpfind_stop"/>
! <Separator/>
! <Action name="ftpfind_find"/>
! <Action name="ftpfind_clear"/>
</Menu>
+ <State name="ItemSelectedState">
+ <Enable>
+ <Action name="ftpfind_stop"/>
+ </Enable>
+ </State>
</kpartplugin>
Index: scandomainwidget.ui
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/scandomainwidget.ui,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scandomainwidget.ui 15 Jul 2003 23:46:34 -0000 1.1
--- scandomainwidget.ui 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 62,68 ****
--- 62,74 ----
<cstring>m_startLabel</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Start:</string>
</property>
+ <property name="alignment">
+ <set>AlignVCenter|AlignRight</set>
+ </property>
</widget>
<widget class="KIntSpinBox">
***************
*** 70,73 ****
--- 76,82 ----
<cstring>m_startSpinBox</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="maxValue">
<number>35535</number>
***************
*** 84,90 ****
--- 93,105 ----
<cstring>m_stopLabel</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Stop:</string>
</property>
+ <property name="alignment">
+ <set>AlignVCenter|AlignRight</set>
+ </property>
</widget>
<widget class="KIntSpinBox">
***************
*** 92,95 ****
--- 107,113 ----
<cstring>m_stopSpinBox</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="maxValue">
<number>35535</number>
***************
*** 123,126 ****
--- 141,170 ----
</grid>
</widget>
+ <connections>
+ <connection>
+ <sender>m_portCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>m_startSpinBox</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>m_portCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>m_stopSpinBox</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>m_portCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>m_startLabel</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>m_portCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>m_stopLabel</receiver>
+ <slot>setDisabled(bool)</slot>
+ </connection>
+ </connections>
<tabstops>
<tabstop>m_domainEdit</tabstop>
Index: scandomainworker.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/scandomainworker.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scandomainworker.cpp 15 Jul 2003 23:46:34 -0000 1.1
--- scandomainworker.cpp 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 44,48 ****
: m_msgReceiver( receiver ), m_domain( domain ),
m_startPort( startPort ), m_stopPort( stopPort ),
! m_extSocket( 0L ), m_stopped( false )
{
}
--- 44,49 ----
: m_msgReceiver( receiver ), m_domain( domain ),
m_startPort( startPort ), m_stopPort( stopPort ),
! m_extSocket( 0L ), m_stopped( false ),
! m_isActive( false )
{
}
***************
*** 72,76 ****
--- 73,87 ----
}
//-----------------------------------------------
+ bool ScanDomainWorker::isActive() {
+ m_accessMutex.lock();
+ bool isActive = m_isActive;
+ m_accessMutex.unlock();
+ return isActive;
+ }
+ //-----------------------------------------------
void ScanDomainWorker::run() {
+ m_accessMutex.lock();
+ m_isActive = true;
+ m_accessMutex.unlock();
// We run through all IP:s of the domain and map them
// to a host name if possible
***************
*** 80,87 ****
m_systemMutex.lock();
! resolv = gethostbyname( m_domain.latin1() );
m_systemMutex.unlock();
! if( resolv == NULL ) {
QString msg = i18n("Failed to resolve: %1! %2").arg( m_domain ).arg( strerror( errno ) );
kdDebug() << k_funcinfo << msg << endl;
--- 91,98 ----
m_systemMutex.lock();
! m_resolv = gethostbyname( m_domain.latin1() );
m_systemMutex.unlock();
! if( m_resolv == NULL ) {
QString msg = i18n("Failed to resolve: %1! %2").arg( m_domain ).arg( strerror( errno ) );
kdDebug() << k_funcinfo << msg << endl;
***************
*** 91,99 ****
}
! m_IP = *(unsigned long *)resolv->h_addr_list[0];
m_systemMutex.lock();
m_IP = ntohl( m_IP ) & 0xFFFFFF00;
! addr.sin_addr.s_addr = htonl( m_IP );
! QString msg = i18n("%1 (%2)" ).arg( resolv->h_name ).arg( inet_ntoa( addr.sin_addr ) );
m_systemMutex.unlock();
--- 102,110 ----
}
! m_IP = *(unsigned long *)m_resolv->h_addr_list[0];
m_systemMutex.lock();
m_IP = ntohl( m_IP ) & 0xFFFFFF00;
! m_addr.sin_addr.s_addr = htonl( m_IP );
! QString msg = i18n("%1 (%2)" ).arg( m_resolv->h_name ).arg( inet_ntoa( m_addr.sin_addr ) );
m_systemMutex.unlock();
***************
*** 110,121 ****
rsv.sin_port = htons( port );
rsv.sin_addr.s_addr = htonl( m_IP + i );
! resolv = gethostbyaddr( (char *)&rsv.sin_addr.s_addr, 4, AF_INET);
m_systemMutex.unlock();
! if( resolv != NULL ) {
if( checkIP( rsv ) != 0L ) {
m_systemMutex.lock();
! QString msg = i18n("%1 (%2) port=%3").arg( resolv->h_name ).arg( inet_ntoa( rsv.sin_addr ) ).arg( port );
m_systemMutex.unlock();
ScanDomainEvent* event = new ScanDomainEvent( this, ScanDomainEvent::Info, msg );
--- 121,132 ----
rsv.sin_port = htons( port );
rsv.sin_addr.s_addr = htonl( m_IP + i );
! m_resolv = gethostbyaddr( (char *)&rsv.sin_addr.s_addr, 4, AF_INET);
m_systemMutex.unlock();
! if( m_resolv != NULL ) {
if( checkIP( rsv ) != 0L ) {
m_systemMutex.lock();
! QString msg = i18n("%1 (%2) port=%3").arg( m_resolv->h_name ).arg( inet_ntoa( rsv.sin_addr ) ).arg( port );
m_systemMutex.unlock();
ScanDomainEvent* event = new ScanDomainEvent( this, ScanDomainEvent::Info, msg );
***************
*** 159,173 ****
}
}
- int tmp = int( float( float( i + ( port - m_startPort ) ) / float( 254 + ( m_stopPort - m_startPort ) ) ) * 100);
- if( tmp > 100 )
- tmp = 100;
- else if( tmp < 0 )
- tmp = 0;
- event = new ScanDomainEvent( this, ScanDomainEvent::Progress, QString::number( tmp ) );
- QApplication::postEvent( m_msgReceiver, event );
}
}
event = new ScanDomainEvent( this, ScanDomainEvent::Done, QString::null );
QApplication::postEvent( m_msgReceiver, event );
}
//-----------------------------------------------
--- 170,187 ----
}
}
}
+ int tmp = int( float( float( i+1 ) / float( 255 ) ) * 100);
+ if( tmp > 100 )
+ tmp = 100;
+ else if( tmp < 0 )
+ tmp = 0;
+ event = new ScanDomainEvent( this, ScanDomainEvent::Progress, QString::number( tmp ) );
+ QApplication::postEvent( m_msgReceiver, event );
}
event = new ScanDomainEvent( this, ScanDomainEvent::Done, QString::null );
QApplication::postEvent( m_msgReceiver, event );
+ m_accessMutex.lock();
+ m_isActive = false;
+ m_accessMutex.unlock();
}
//-----------------------------------------------
***************
*** 181,185 ****
KExtendedSocket* ScanDomainWorker::checkIP( const struct sockaddr_in& addr ) {
! int flags = KExtendedSocket::inetSocket | KExtendedSocket::streamSocket //| KExtendedSocket::bufferedSocket
| KExtendedSocket::ipv4Socket | KExtendedSocket::ipv6Socket ;
m_systemMutex.lock();
--- 195,199 ----
KExtendedSocket* ScanDomainWorker::checkIP( const struct sockaddr_in& addr ) {
! int flags = KExtendedSocket::inetSocket | KExtendedSocket::streamSocket | KExtendedSocket::bufferedSocket
| KExtendedSocket::ipv4Socket | KExtendedSocket::ipv6Socket ;
m_systemMutex.lock();
***************
*** 217,221 ****
// send USER command
- m_systemMutex.lock();
m_extSocket->writeBlock( user,strlen( user ) );
memset( buffer, 0x00, 1024 );
--- 231,234 ----
***************
*** 228,238 ****
ScanDomainEvent* event = new ScanDomainEvent( this, ScanDomainEvent::LoginDenied, msg );
QApplication::postEvent( m_msgReceiver, event );
- m_systemMutex.unlock();
return;
}
- m_systemMutex.unlock();
clearBuffer();
- m_systemMutex.lock();
// send PASS command
--- 241,248 ----
***************
*** 240,256 ****
memset( buffer, 0x00, 1024 );
m_extSocket->readBlock( buffer, 1024 );
- m_systemMutex.unlock();
// Check for a positive return code to see if the login really went through okay.
if (strncmp( buffer, "230", 3) == 0) {
msg = i18n("Anonymous login accepted.");
! ScanDomainEvent* event = new ScanDomainEvent( this, ScanDomainEvent::LoginDenied, msg );
QApplication::postEvent( m_msgReceiver, event );
// Now retrieve the System information
- m_systemMutex.lock();
m_extSocket->writeBlock( syst,strlen( syst ) );
memset( buffer, 0x00, 1024 );
m_extSocket->readBlock( buffer, 1024 );
- m_systemMutex.unlock();
msg = i18n("System type: %1").arg( buffer );
event = new ScanDomainEvent( this, ScanDomainEvent::SystemType, msg );
--- 250,263 ----
memset( buffer, 0x00, 1024 );
m_extSocket->readBlock( buffer, 1024 );
// Check for a positive return code to see if the login really went through okay.
if (strncmp( buffer, "230", 3) == 0) {
msg = i18n("Anonymous login accepted.");
! ScanDomainEvent* event = new ScanDomainEvent( this, ScanDomainEvent::LoginAccepted, msg );
QApplication::postEvent( m_msgReceiver, event );
// Now retrieve the System information
m_extSocket->writeBlock( syst,strlen( syst ) );
memset( buffer, 0x00, 1024 );
m_extSocket->readBlock( buffer, 1024 );
msg = i18n("System type: %1").arg( buffer );
event = new ScanDomainEvent( this, ScanDomainEvent::SystemType, msg );
Index: scandomainworker.h
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/scandomainworker.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scandomainworker.h 15 Jul 2003 23:46:34 -0000 1.1
--- scandomainworker.h 17 Jul 2003 20:21:02 -0000 1.2
***************
*** 78,82 ****
};
! class ScanDomainWorker : public QThread {
public:
/** */
--- 78,83 ----
};
! class ScanDomainWorker : public QObject, public QThread {
! Q_OBJECT
public:
/** */
***************
*** 88,91 ****
--- 89,94 ----
/** */
bool isStopped();
+ /** */
+ bool isActive();
protected:
/** */
***************
*** 100,105 ****
unsigned int m_startPort;
unsigned int m_stopPort;
! struct sockaddr_in addr;
! struct hostent* resolv;
unsigned int m_IP;
KExtendedSocket* m_extSocket;
--- 103,108 ----
unsigned int m_startPort;
unsigned int m_stopPort;
! struct sockaddr_in m_addr;
! struct hostent* m_resolv;
unsigned int m_IP;
KExtendedSocket* m_extSocket;
***************
*** 107,110 ****
--- 110,114 ----
static QMutex m_systemMutex;
bool m_stopped;
+ bool m_isActive;
};
|
1 message has been excluded from this view by a project administrator.
