[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/konversation/src
From:       Shintaro Matsuoka <shin () shoegazed ! org>
Date:       2007-03-05 13:21:48
Message-ID: 1173100908.310155.27606.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 639610 by shin:

show server name on which the partner is in DccTransferDetailedPanel

 M  +5 -0      dcctransfer.cpp  
 M  +1 -0      dcctransfer.h  
 M  +9 -5      dcctransferdetailedinfopanel.cpp  


--- trunk/extragear/network/konversation/src/dcctransfer.cpp #639609:639610
@@ -235,6 +235,11 @@
     return m_timeOffer; 
 }
 
+int DccTransfer::getServerGroupId() const
+{
+    return m_serverGroupId;
+}
+
 QString DccTransfer::getOwnIp() const 
 {
     return m_ownIp; 
--- trunk/extragear/network/konversation/src/dcctransfer.h #639609:639610
@@ -66,6 +66,7 @@
         DccStatus          getStatus()                const;
         const QString&     getStatusDetail()          const;
         QDateTime          getTimeOffer()             const;
+        int                getServerGroupId()         const;
         QString            getOwnIp()                 const;
         QString            getOwnPort()               const;
         QString            getPartnerNick()           const;
--- trunk/extragear/network/konversation/src/dcctransferdetailedinfopanel.cpp \
#639609:639610 @@ -20,6 +20,8 @@
 #include "dcctransfer.h"
 #include "dcctransferrecv.h"
 #include "dcctransferpanelitem.h"
+#include "konversationapplication.h"
+#include "server.h"
 
 #include "dcctransferdetailedinfopanel.h"
 
@@ -71,11 +73,13 @@
     m_urlreqLocation->button()->setEnabled( transfer->getStatus() == \
DccTransfer::Queued );  
     // Partner:
-    // FIXME: also display the server which the nick belongs to
-    if ( transfer->getPartnerNick().isEmpty() )
-        m_labelPartner->setText( "" );
-    else
-        m_labelPartner->setText( i18n( "%1 %2 (port %3)" ).arg( \
transfer->getPartnerNick(), transfer->getPartnerIp(), transfer->getPartnerPort() ) ); \
+    QString partnerInfo( i18n( "%1 on %2" ) +        .arg( \
transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() ) +        \
.arg( transfer->getServerGroupId() == -1 ? i18n( "unknown server" ) +            : \
KonversationApplication::instance()->getServerByServerGroupId( \
transfer->getServerGroupId() )->getServerName() ) ); +    if ( \
!transfer->getPartnerIp().isEmpty() ) +        partnerInfo += i18n( ", %1 (port %2)" \
).arg( transfer->getPartnerIp() ).arg( transfer->getPartnerPort() ); +    \
m_labelPartner->setText( partnerInfo );  
     // Self:
     if ( transfer->getOwnIp().isEmpty() )


[prev in list] [next in list] [prev in thread] [next in thread]