From 75071a777c467fb3af7b3e3e6d0e190cbaf8e66b Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Thu, 1 Nov 2007 16:51:59 +0000
Subject: [PATCH] gui+log fixes

---
 src/gui/qt/gamelobbydialog.ui                 |  2 +-
 .../gamelobbydialog/gamelobbydialogimpl.cpp   | 21 ++++++++++++-------
 src/gui/qt/mainwindow/log/log.cpp             |  4 ++--
 src/gui/qt/mainwindow/mainwindowimpl.cpp      |  3 +--
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui
index 3b43406d..77860e4c 100644
--- a/src/gui/qt/gamelobbydialog.ui
+++ b/src/gui/qt/gamelobbydialog.ui
@@ -129,7 +129,7 @@
         <property name="iconSize" >
          <size>
           <width>25</width>
-          <height>25</height>
+          <height>26</height>
          </size>
         </property>
         <property name="indentation" >
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index d56c14d5..f78758c7 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -515,14 +515,21 @@ void gameLobbyDialogImpl::refreshConnectedPlayerAvatars() {
 	while (*it) {
 
 		std::string myAvatarFileName;
-		PlayerInfo playerInfo(mySession->getClientPlayerInfo((*it)->data(0, Qt::UserRole).toInt()));
-		mySession->getAvatarFile(playerInfo.avatar, myAvatarFileName);
-		QString myAvatarString(QString::fromUtf8(myAvatarFileName.c_str()));
-		
-		if(QFile::QFile(myAvatarString).exists()) {
-			(*it)->setIcon(0, QIcon(myAvatarString));
-		}
+		PlayerInfo playerInfo(mySession->getClientPlayerInfo((*it)->data(0, Qt::UserRole).toUInt()));
 		
+		if(mySession->getAvatarFile(playerInfo.avatar, myAvatarFileName)) {
+
+			QString myAvatarString(QString::fromUtf8(myAvatarFileName.c_str()));
+			if(QFile::QFile(myAvatarString).exists()) {
+	
+				QPixmap myAvatarPixmap(25,26);
+				myAvatarPixmap.fill(Qt::transparent);
+				QPixmap tempPixmap(myAvatarString);
+				QPainter p(&myAvatarPixmap);
+				p.drawPixmap (0,0,25,25,tempPixmap);
+				(*it)->setIcon(0, QIcon(myAvatarPixmap));
+			}
+		}		
 		++it;
 	}
 }
diff --git a/src/gui/qt/mainwindow/log/log.cpp b/src/gui/qt/mainwindow/log/log.cpp
index 1ccc0322..0b03e7a3 100644
--- a/src/gui/qt/mainwindow/log/log.cpp
+++ b/src/gui/qt/mainwindow/log/log.cpp
@@ -353,11 +353,11 @@ void Log::logNewGameAdminMsg(QString playerName) {
 
 void Log::logPlayerWinGame(QString playerName, int gameID) {
 
-	myW->textBrowser_Log->append( "<i><b>"+playerName+" wins game " + QString::number(gameID,10)  +"!</i></b>");
+	myW->textBrowser_Log->append( "<br><i><b>"+playerName+" wins game " + QString::number(gameID,10)  +"!</i></b><br>");
 	
 	if(myConfig->readConfigInt("LogOnOff")) {
 	
-		logFileStreamString += "<i><b>"+playerName+" wins game " + QString::number(gameID,10)  +"!</i></b><br>\n";
+		logFileStreamString += "</br></br><i><b>"+playerName+" wins game " + QString::number(gameID,10)  +"!</i></b><br>\n";
 
 		if(myConfig->readConfigInt("LogInterval") == 0) {	
 			writeLogFileStream(logFileStreamString);
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 20e9756a..d5e8cdfe 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -544,6 +544,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalRefreshButton()), this, SLOT(refreshButton()));
 	connect(this, SIGNAL(signalRefreshGameLabels(int)), this, SLOT(refreshGameLabels(int)));
 	connect(this, SIGNAL(signalSetPlayerAvatar(int, QString)), this, SLOT(setPlayerAvatar(int, QString))); 
+	connect(this, SIGNAL(signalSetPlayerAvatar(int, QString)), myGameLobbyDialog, SLOT(refreshConnectedPlayerAvatars())); 
 
 	connect(this, SIGNAL(signalGuiUpdateDone()), this, SLOT(guiUpdateDone()));
 
@@ -2623,8 +2624,6 @@ void mainWindowImpl::postRiverRunAnimation3() {
 		}
 	}
 
-	textBrowser_Log->append("");
-	
 	postRiverRunAnimation3Timer->start(postRiverRunAnimationSpeed/2);
 }