Swiftdiff options
| author | Remko Tronçon <remko@synopsys.com> | 2011-09-30 17:10:20 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-30 17:15:59 (GMT) |
| commit | 75818abb4baa26649baf8d3bf6709aefcda7195f (patch) | |
| tree | 25cf8cc224100688d813ab57f3ccf32771f1bdf1 /Swift/QtUI/QtChatView.cpp | |
| parent | a98f648f5cfbf474c566bd63193047e5381e7d5e (diff) | |
| download | swift-contrib-75818abb4baa26649baf8d3bf6709aefcda7195f.zip swift-contrib-75818abb4baa26649baf8d3bf6709aefcda7195f.tar.bz2 | |
Fixed some Windows issues with FT.
Diffstat (limited to 'Swift/QtUI/QtChatView.cpp')
| -rw-r--r-- | Swift/QtUI/QtChatView.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp index cb7f901..7bb5818 100644 --- a/Swift/QtUI/QtChatView.cpp +++ b/Swift/QtUI/QtChatView.cpp @@ -16,18 +16,19 @@ #include <QStackedWidget> #include <QTimer> #include <QMessageBox> #include <QApplication> #include <Swiften/Base/Log.h> #include "QtWebView.h" #include "QtChatTheme.h" +#include "QtSwiftUtil.h" namespace Swift { QtChatView::QtChatView(QtChatTheme* theme, QWidget* parent) : QWidget(parent), fontSizeSteps_(0) { theme_ = theme; QVBoxLayout* mainLayout = new QVBoxLayout(this); mainLayout->setSpacing(0); @@ -296,19 +297,19 @@ void QtChatView::setFileTransferProgress(QString id, const int percentageDone) { progressBar.setStyleProperty("width", QString::number(percentageDone) + "%"); QWebElement progressBarValue = ftElement.findFirst("div.progressbar-value"); progressBarValue.setInnerXml(QString::number(percentageDone) + " %"); } void QtChatView::setFileTransferStatus(QString id, const ChatWindow::FileTransferState state, const QString& /* msg */) { QWebElement ftElement = findDivElementWithID(document_, id); if (ftElement.isNull()) { - SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << id.toStdString() << std::endl; + SWIFT_LOG(debug) << "Tried to access FT UI via invalid id! id = " << Q2PSTRING(id) << std::endl; return; } QString newInnerHTML = ""; if (state == ChatWindow::WaitingForAccept) { newInnerHTML = "Waiting for other side to accept the transfer.<br/>" "<input id=\"discard\" type=\"submit\" value=\"Cancel\" onclick=\"filetransfer.cancel(\'" + id + "\');\">"; } if (state == ChatWindow::Negotiating) { |