[Konversation-devel] [Bug 116721] Show new name of renamed incoming DCC file

[Eike Hein]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=116721         
sho eikehein com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From sho eikehein com  2006-01-07 11:26 -------
SVN commit 495144 by hein:

Show local file name in DCC GET DccPanel entry and DccStatus::Done message.
BUG:116721


 M  +1 -1      dcctransfer.cpp  
 M  +3 -3      dcctransferrecv.cpp  


--- trunk/extragear/network/konversation/src/dcctransfer.cpp #495143:495144
 @ -100,7 +100,7  @
 
     setText( DccPanel::Column::OfferDate,     m_timeOffer.toString( "hh:mm:ss" ) );
     setText( DccPanel::Column::Status,        getStatusText() );
-    setText( DccPanel::Column::FileName,      m_fileName );
+    setText( DccPanel::Column::FileName,      m_fileURL.fileName() );
     setText( DccPanel::Column::PartnerNick,   m_partnerNick );
     setText( DccPanel::Column::Position,      getPositionPrettyText() );
     setText( DccPanel::Column::TimeRemaining, getTimeRemainingPrettyText() );
--- trunk/extragear/network/konversation/src/dcctransferrecv.cpp #495143:495144
 @ -298,7 +298,7  @
         if ( Preferences::dccAutoResume() )
             prepareLocalKio( false, true, size );
         else
-            askAndPrepareLocalKio( i18n( "<b>A partial file is existing.</b><br>"
+            askAndPrepareLocalKio( i18n( "<b>A partial file exists.</b><br>"
                 "%1<br>"
                 "Size of the partial file: %2 bytes<br>" )
                 .arg( m_fileURL.prettyURL() )
 @ -325,7 +325,7  @
                 << "DccTransferRecv::slotLocalGotResult(): Why was I called in spite of no error?" << endl;
             break;
         case KIO::ERR_FILE_ALREADY_EXIST:
-            askAndPrepareLocalKio( i18n( "<b>The file is already existing.</b><br>"
+            askAndPrepareLocalKio( i18n( "<b>The file already exists.</b><br>"
                 "%1<br>" )
                 .arg( m_fileURL.prettyURL() ),
                 DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
 @ -489,7 +489,7  @
     setStatus( Done );
     updateView();
     cleanUp();
-    emit done( m_fileName );
+    emit done( m_fileURL.fileName() );
 }
 
                                                   // <- WriteCacheHandler::gotError()