@ -42,6 +42,8 @@ enum class SystemMessageType
incomingCall ,
incomingCall ,
callEnd ,
callEnd ,
messageSendFailed ,
messageSendFailed ,
selfJoinedGroup ,
selfLeftGroup ,
} ;
} ;
struct SystemMessage
struct SystemMessage
@ -53,62 +55,36 @@ struct SystemMessage
QString toString ( ) const
QString toString ( ) const
{
{
QString translated ;
size_t numArgs = 0 ;
switch ( messageType ) {
switch ( messageType ) {
case SystemMessageType : : fileSendFailed :
case SystemMessageType : : fileSendFailed :
translated = QObject : : tr ( " Failed to send file \" %1 \" " ) ;
return QObject : : tr ( " Failed to send file \" %1 \" " ) . arg ( args [ 0 ] ) ;
numArgs = 1 ;
break ;
case SystemMessageType : : userJoinedGroup :
case SystemMessageType : : userJoinedGroup :
translated = QObject : : tr ( " %1 has joined the group " ) ;
return QObject : : tr ( " %1 has joined the group " ) . arg ( args [ 0 ] ) ;
numArgs = 1 ;
break ;
case SystemMessageType : : userLeftGroup :
case SystemMessageType : : userLeftGroup :
translated = QObject : : tr ( " %1 has left the group " ) ;
return QObject : : tr ( " %1 has left the group " ) . arg ( args [ 0 ] ) ;
numArgs = 1 ;
break ;
case SystemMessageType : : peerNameChanged :
case SystemMessageType : : peerNameChanged :
translated = QObject : : tr ( " %1 is now known as %2 " ) ;
return QObject : : tr ( " %1 is now known as %2 " ) . arg ( args [ 0 ] ) . arg ( args [ 1 ] ) ;
numArgs = 2 ;
break ;
case SystemMessageType : : titleChanged :
case SystemMessageType : : titleChanged :
translated = QObject : : tr ( " %1 has set the title to %2 " ) ;
return QObject : : tr ( " %1 has set the title to %2 " ) . arg ( args [ 0 ] ) . arg ( args [ 1 ] ) ;
numArgs = 2 ;
break ;
case SystemMessageType : : cleared :
case SystemMessageType : : cleared :
translated = QObject : : tr ( " Cleared " ) ;
return QObject : : tr ( " Cleared " ) ;
break ;
case SystemMessageType : : unexpectedCallEnd :
case SystemMessageType : : unexpectedCallEnd :
translated = QObject : : tr ( " Call with %1 ended unexpectedly. %2 " ) ;
return QObject : : tr ( " Call with %1 ended unexpectedly. %2 " ) . arg ( args [ 0 ] ) . arg ( args [ 1 ] ) ;
numArgs = 2 ;
break ;
case SystemMessageType : : callEnd :
case SystemMessageType : : callEnd :
translated = QObject : : tr ( " Call with %1 ended. %2 " ) ;
return QObject : : tr ( " Call with %1 ended. %2 " ) . arg ( args [ 0 ] ) . arg ( args [ 1 ] ) ;
numArgs = 2 ;
break ;
case SystemMessageType : : peerStateChange :
case SystemMessageType : : peerStateChange :
translated = QObject : : tr ( " %1 is now %2 " , " e.g. \" Dubslow is now online \" " ) ;
return QObject : : tr ( " %1 is now %2 " , " e.g. \" Dubslow is now online \" " ) . arg ( args [ 0 ] ) . arg ( args [ 1 ] ) ;
numArgs = 2 ;
break ;
case SystemMessageType : : outgoingCall :
case SystemMessageType : : outgoingCall :
translated = QObject : : tr ( " Calling %1 " ) ;
return QObject : : tr ( " Calling %1 " ) . arg ( args [ 0 ] ) ;
numArgs = 1 ;
break ;
case SystemMessageType : : incomingCall :
case SystemMessageType : : incomingCall :
translated = QObject : : tr ( " %1 calling " ) ;
return QObject : : tr ( " %1 calling " ) . arg ( args [ 0 ] ) ;
numArgs = 1 ;
break ;
case SystemMessageType : : messageSendFailed :
case SystemMessageType : : messageSendFailed :
translated = QObject : : tr ( " Message failed to send " ) ;
return QObject : : tr ( " Message failed to send " ) ;
break ;
case SystemMessageType : : selfJoinedGroup :
}
return QObject : : tr ( " You have joined the group " ) ;
case SystemMessageType : : selfLeftGroup :
for ( size_t i = 0 ; i < numArgs ; + + i ) {
return QObject : : tr ( " You have left the group " ) ;
translated = translated . arg ( args [ i ] ) ;
}
}
return { } ;
return translated ;
}
}
} ;
} ;