--- a/filemanager/src/filemanager/src/operationservice/fmoperationthread.cpp	Fri Apr 16 14:53:38 2010 +0300
+++ b/filemanager/src/filemanager/src/operationservice/fmoperationthread.cpp	Mon May 03 12:24:39 2010 +0300
@@ -23,7 +23,7 @@
 #include "fmoperationcopy.h"
 #include "fmoperationmove.h"
 #include "fmoperationremove.h"
-
+#include "fmoperationformat.h"
 
 #include <QDir>
 #include <QStack>
@@ -49,6 +49,8 @@
     QMetaObject::connectSlotsByName( this );
     connect( mOperationBase, SIGNAL( askForRename( QString, QString* ) ),
         this, SLOT( onAskForRename( QString, QString* )), Qt::BlockingQueuedConnection );
+    connect( mOperationBase, SIGNAL( askForReplace( QString, QString, bool* ) ),
+        this, SLOT( onAskForReplace( QString, QString, bool* )), Qt::BlockingQueuedConnection );
 
     start();
     return FmErrNone;
@@ -65,6 +67,9 @@
     QMetaObject::connectSlotsByName( this );
     connect( mOperationBase, SIGNAL( askForRename( QString, QString* ) ),
         this, SLOT( onAskForRename( QString, QString* )), Qt::BlockingQueuedConnection );
+    connect( mOperationBase, SIGNAL( askForReplace( QString, QString, bool* ) ),
+        this, SLOT( onAskForReplace( QString, QString, bool* )), Qt::BlockingQueuedConnection );
+
 
     start();
     return FmErrNone;
@@ -135,6 +140,10 @@
 {
     emit askForRename( srcFile, destFile );
 }
+void FmOperationThread::onAskForReplace( const QString &srcFile, const QString &destFile, bool *isAccepted )
+{
+    emit askForReplace( srcFile, destFile, isAccepted );
+}
 void FmOperationThread::on_operationElement_notifyPreparing( bool cancelable )
 {
     emit notifyPreparing( cancelable );
@@ -226,13 +235,14 @@
         }
     case FmOperationService::EOperationTypeFormat:
         {
-        emit notifyWaiting( false );
+//        emit notifyWaiting( false );
         FmLogger::log(QString("start format"));
         FmOperationFormat *operationFormat = static_cast<FmOperationFormat*>( mOperationBase );
         FmLogger::log(QString("get param and start format"));
 
         QString refreshSrcPath = operationFormat->driverName();
-        if ( FmErrNone != FmUtils::formatDrive( operationFormat->driverName() ) ) {
+//        if ( FmErrNone != FmUtils::formatDrive( operationFormat->driverName() ) ) {
+        if ( FmErrNone != operationFormat->start() ) {
             emit notifyError(  FmErrTypeFormatFailed, operationFormat->driverName() );
             return;
         }