From 713ebece78fdc55316eb91da374eca193e43200e Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Tue, 15 Feb 2011 23:01:24 +0100 Subject: [PATCH] server version bump, minor chat view fix --- cockatrice/src/chatview.cpp | 7 ++++--- cockatrice/src/chatview.h | 2 +- servatrice/src/servatrice.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp index 47724d9d..92696cf0 100644 --- a/cockatrice/src/chatview.cpp +++ b/cockatrice/src/chatview.cpp @@ -10,7 +10,7 @@ ChatView::ChatView(const QString &_ownName, QWidget *parent) setTextInteractionFlags(Qt::TextSelectableByMouse); } -void ChatView::appendMessage(const QString &sender, const QString &message) +void ChatView::appendMessage(QString sender, const QString &message) { QTextCursor cursor(document()->lastBlock()); cursor.movePosition(QTextCursor::End); @@ -31,7 +31,9 @@ void ChatView::appendMessage(const QString &sender, const QString &message) } else senderFormat.setForeground(Qt::blue); cursor.setCharFormat(senderFormat); - cursor.insertText(sender + " "); + if (!sender.isEmpty()) + sender.append(" "); + cursor.insertText(sender); QTextCharFormat messageFormat; if (sender.isEmpty()) @@ -39,6 +41,5 @@ void ChatView::appendMessage(const QString &sender, const QString &message) cursor.setCharFormat(messageFormat); cursor.insertText(message); - verticalScrollBar()->setValue(verticalScrollBar()->maximum()); } diff --git a/cockatrice/src/chatview.h b/cockatrice/src/chatview.h index fc9a2626..bd7e763a 100644 --- a/cockatrice/src/chatview.h +++ b/cockatrice/src/chatview.h @@ -12,7 +12,7 @@ private: QString ownName; public: ChatView(const QString &_ownName, QWidget *parent = 0); - void appendMessage(const QString &sender, const QString &message); + void appendMessage(QString sender, const QString &message); }; #endif \ No newline at end of file diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index 89b89f0e..a9ff3b36 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -235,4 +235,4 @@ void Servatrice::statusUpdate() execSqlQuery(query); } -const QString Servatrice::versionString = "Servatrice 0.20110127"; +const QString Servatrice::versionString = "Servatrice 0.20110215";