diff options
Diffstat (limited to 'Swift/QtUI/QtWebKitChatView.cpp')
| -rw-r--r-- | Swift/QtUI/QtWebKitChatView.cpp | 14 | 
1 files changed, 9 insertions, 5 deletions
| diff --git a/Swift/QtUI/QtWebKitChatView.cpp b/Swift/QtUI/QtWebKitChatView.cpp index d6dc6f5..b7f96f6 100644 --- a/Swift/QtUI/QtWebKitChatView.cpp +++ b/Swift/QtUI/QtWebKitChatView.cpp @@ -435,24 +435,28 @@ void QtWebKitChatView::setFileTransferStatus(QString id, const ChatWindow::FileT  	if (ftElement.isNull()) {  		SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl;  		return;  	}  	QString newInnerHTML = ""; -	if (state == ChatWindow::WaitingForAccept) { -		newInnerHTML =	tr("Waiting for other side to accept the transfer.") + "<br/>" + +	if (state == ChatWindow::Initialisation) { +		newInnerHTML = tr("Preparing to send.") + "<br/>" +  			buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id);  	} -	if (state == ChatWindow::Negotiating) { +	else if (state == ChatWindow::WaitingForAccept) { +		newInnerHTML = tr("Waiting for other side to accept the transfer.") + "<br/>" + +			buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id); +	} +	else if (state == ChatWindow::Negotiating) {  		// replace with text "Negotiaging" + Cancel button -		newInnerHTML =	tr("Negotiating...") + "<br/>" + +		newInnerHTML = tr("Negotiating...") + "<br/>" +  			buildChatWindowButton(tr("Cancel"), ButtonFileTransferCancel, id);  	}  	else if (state == ChatWindow::Transferring) {  		// progress bar + Cancel Button -		newInnerHTML =	"<div style=\"position: relative; width: 90%; height: 20px; border: 2px solid grey; -webkit-border-radius: 10px;\">" +		newInnerHTML = "<div style=\"position: relative; width: 90%; height: 20px; border: 2px solid grey; -webkit-border-radius: 10px;\">"  							"<div class=\"progressbar\" style=\"width: 0%; height: 100%; background: #AAA; -webkit-border-radius: 6px;\">"  								"<div class=\"progressbar-value\" style=\"position: absolute; top: 0px; left: 0px; width: 100%; text-align: center; padding-top: 2px;\">"  									"0%"  								"</div>"  							"</div>"  						"</div>" + | 
 Swift
 Swift