[KBear-cvs] kbear/kbear/plugins/ftpfind ftpfindtreeview.cpp,1.6,1.7 Makefile.am,1.2,1.3
Brought to you by:
kbjorn
|
From: <kb...@us...> - 2003-07-23 18:38:03
|
Update of /cvsroot/kbear/kbear/kbear/plugins/ftpfind
In directory sc8-pr-cvs1:/tmp/cvs-serv13799/kbear/plugins/ftpfind
Modified Files:
ftpfindtreeview.cpp Makefile.am
Log Message:
Bugfixes and feature improvements
Index: ftpfindtreeview.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/ftpfindtreeview.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ftpfindtreeview.cpp 21 Jul 2003 18:06:51 -0000 1.6
--- ftpfindtreeview.cpp 23 Jul 2003 18:27:26 -0000 1.7
***************
*** 60,65 ****
//-----------------------------------------------
void FTPFindTreeViewItem::stop() {
! if( m_worker )
m_worker->stop();
}
//-----------------------------------------------
--- 60,67 ----
//-----------------------------------------------
void FTPFindTreeViewItem::stop() {
! if( m_worker ) {
m_worker->stop();
+ m_worker->deleteLater();
+ }
}
//-----------------------------------------------
***************
*** 72,82 ****
}
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;
}
--- 74,86 ----
}
case ScanDomainEvent::LoginAccepted: {
m_currentItem->setPixmap( 0, QPixmap( started_xpm ) );
+ m_currentItem->setPixmap( 1, QPixmap( started_xpm ) );
+ m_currentItem->setText( 1, event->message() );
break;
}
case ScanDomainEvent::LoginDenied: {
m_currentItem->setPixmap( 0, QPixmap( stopped_xpm ) );
+ m_currentItem->setPixmap( 1, QPixmap( stopped_xpm ) );
+ m_currentItem->setText( 1, event->message() );
break;
}
***************
*** 104,108 ****
}
case ScanDomainEvent::Done: {
! delete m_worker;
m_worker = 0L;
break;
--- 108,113 ----
}
case ScanDomainEvent::Done: {
! m_worker->stop(); // just in case
! m_worker->deleteLater();
m_worker = 0L;
break;
***************
*** 118,122 ****
setText( 1, event->message() );
KMessageBox::error( listView(), event->message(), i18n("Error...") );
! delete m_worker;
m_worker = 0L;
}
--- 123,128 ----
setText( 1, event->message() );
KMessageBox::error( listView(), event->message(), i18n("Error...") );
! m_worker->stop();
! m_worker->deleteLater();
m_worker = 0L;
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/plugins/ftpfind/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 20 Jul 2003 19:35:34 -0000 1.2
--- Makefile.am 23 Jul 2003 18:27:26 -0000 1.3
***************
*** 1,8 ****
INCLUDES = -I$(top_srcdir)/kbear/lib/interfaces $(all_includes)
kde_module_LTLIBRARIES = kbearftpfind.la
kbearftpfind_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
kbearftpfind_la_LIBADD = $(top_builddir)/kbear/lib/libkbearcore.la
kbearftpfind_la_SOURCES = kbearftpfindplugin.cpp kbearftpfindoutputwidget.cpp scandomainwidget.ui scandomainwidget.ui.h scandomainworker.h scandomainworker.cpp ftpfindtreeview.cpp
- METASOURCES = AUTO
noinst_HEADERS = kbearftpfindoutputwidget.h kbearftpfindoutputwidget.h kbearftpfindplugin.h kbearftpfindplugin.h kbearftpfindoutputwidget.h scandomainwidget.ui.h kbearftpfindplugin.h scandomainwidget.h scandomainwidget.ui.h scandomainworker.h ftpfindtreeview.h
kbearftpfindservicedir = $(kde_servicesdir)
--- 1,8 ----
INCLUDES = -I$(top_srcdir)/kbear/lib/interfaces $(all_includes)
+ METASOURCES = AUTO
kde_module_LTLIBRARIES = kbearftpfind.la
kbearftpfind_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
kbearftpfind_la_LIBADD = $(top_builddir)/kbear/lib/libkbearcore.la
kbearftpfind_la_SOURCES = kbearftpfindplugin.cpp kbearftpfindoutputwidget.cpp scandomainwidget.ui scandomainwidget.ui.h scandomainworker.h scandomainworker.cpp ftpfindtreeview.cpp
noinst_HEADERS = kbearftpfindoutputwidget.h kbearftpfindoutputwidget.h kbearftpfindplugin.h kbearftpfindplugin.h kbearftpfindoutputwidget.h scandomainwidget.ui.h kbearftpfindplugin.h scandomainwidget.h scandomainwidget.ui.h scandomainworker.h ftpfindtreeview.h
kbearftpfindservicedir = $(kde_servicesdir)
***************
*** 10,14 ****
kbearftpfindrc_DATA = kbearftpfind.rc
kbearftpfindrcdir = $(kde_datadir)/kbearftpfind
-
AM_CFLAGS =
AM_CXXFLAGS = -DQT_CLEAN_NAMESPACE -UQT_NO_COMPAT -DQT_NO_ASCII_CAST
--- 10,13 ----
|