# HG changeset patch
# User unc0rr
# Date 1301844468 -14400
# Node ID 53e9d9451328f01ab878772aa1718d4cf3dcc1f8
# Parent  9c3553254100d7cea86f0ed4fefc62bf756effb1# Parent  7d588baaff8298d398b3ab12acd842004f857c0f
dammit, merge

diff -r 7d588baaff82 -r 53e9d9451328 QTfrontend/chatwidget.cpp
--- a/QTfrontend/chatwidget.cpp	Sun Apr 03 16:46:20 2011 +0200
+++ b/QTfrontend/chatwidget.cpp	Sun Apr 03 19:27:48 2011 +0400
@@ -31,6 +31,7 @@
 #include <QCursor>
 #include <QScrollBar>
 #include <QItemSelectionModel>
+#include <QLabel>
 
 #include "hwconsts.h"
 #include "SDLs.h"
@@ -142,7 +143,7 @@
     chatEditLine->setMaxLength(300);
     connect(chatEditLine, SIGNAL(returnPressed()), this, SLOT(returnPressed()));
 
-    mainLayout.addWidget(chatEditLine, 1, 0);
+    mainLayout.addWidget(chatEditLine, 2, 0);
 
     chatText = new QTextBrowser(this);
     chatText->document()->setDefaultStyleSheet(STYLE);
@@ -152,7 +153,7 @@
     chatText->setOpenLinks(false);
     connect(chatText, SIGNAL(anchorClicked(const QUrl&)),
         this, SLOT(linkClicked(const QUrl&)));
-    mainLayout.addWidget(chatText, 0, 0);
+    mainLayout.addWidget(chatText, 0, 0, 2, 1);
 
     chatNicks = new QListWidget(this);
     chatNicks->setMinimumHeight(10);
@@ -165,7 +166,12 @@
     connect(chatNicks, SIGNAL(currentRowChanged(int)),
         this, SLOT(chatNickSelected(int)));
 
-    mainLayout.addWidget(chatNicks, 0, 1, -1, 1);
+    mainLayout.addWidget(chatNicks, 1, 1, 2, 1);
+
+    lblCount = new QLabel(this);
+    mainLayout.addWidget(lblCount, 0, 1);
+    lblCount->setText("0");
+    lblCount->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
 
     acInfo = new QAction(QAction::tr("Info"), chatNicks);
     acInfo->setIcon(QIcon(":/res/info.png"));
@@ -393,6 +399,8 @@
     updateNickItem(item);
     chatNicks->addItem(item);
 
+    lblCount->setText(QString::number(chatNicks->count()));
+
     if(notifyNick && notify && gameSettings->value("frontend/sound", true).toBool()) {
        Mix_PlayChannel(-1, sound[rand()%4], 0);
     }
@@ -405,6 +413,8 @@
         chatNicks->takeItem(chatNicks->row(*it));
         ++it;
     }
+
+    lblCount->setText(QString::number(chatNicks->count()));
 }
 
 void HWChatWidget::clear()
diff -r 7d588baaff82 -r 53e9d9451328 QTfrontend/chatwidget.h
--- a/QTfrontend/chatwidget.h	Sun Apr 03 16:46:20 2011 +0200
+++ b/QTfrontend/chatwidget.h	Sun Apr 03 19:27:48 2011 +0400
@@ -34,6 +34,7 @@
 class QListWidget;
 class QSettings;
 class SDLInteraction;
+class QLabel;
 
 // this class is for custom nick sorting
 class ListWidgetNickItem : public QListWidgetItem
@@ -101,6 +102,7 @@
   QAction * acIgnore;
   QAction * acFriend;
   QSettings * gameSettings;
+  QLabel * lblCount;
   SDLInteraction * sdli;
   Mix_Chunk *sound[4];
   bool notify;
diff -r 7d588baaff82 -r 53e9d9451328 project_files/hedgewars.pro
--- a/project_files/hedgewars.pro	Sun Apr 03 16:46:20 2011 +0200
+++ b/project_files/hedgewars.pro	Sun Apr 03 19:27:48 2011 +0400
@@ -54,7 +54,7 @@
 	../QTfrontend/namegen.cpp ../QTfrontend/netregister.cpp \
 	../QTfrontend/netserver.cpp ../QTfrontend/netserverslist.cpp \
 	../QTfrontend/netudpserver.cpp ../QTfrontend/netudpwidget.cpp \
-	../QTfrontend/newnetclient.cpp ../QTfrontend/pages.cpp \
+        ../QTfrontend/newnetclient.cpp \
 	../QTfrontend/playrecordpage.cpp ../QTfrontend/proto.cpp \
 	../QTfrontend/selectWeapon.cpp ../QTfrontend/statsPage.cpp \
 	../QTfrontend/tcpBase.cpp ../QTfrontend/team.cpp \
@@ -65,7 +65,26 @@
     ../QTfrontend/hwconsts.cpp \
     ../QTfrontend/drawmapwidget.cpp \
     ../QTfrontend/drawmapscene.cpp \
-    ../QTfrontend/qaspectratiolayout.cpp
+    ../QTfrontend/qaspectratiolayout.cpp \
+    ../QTfrontend/pagetraining.cpp \
+    ../QTfrontend/pagesingleplayer.cpp \
+    ../QTfrontend/pageselectweapon.cpp \
+    ../QTfrontend/pagescheme.cpp \
+    ../QTfrontend/pageroomslist.cpp \
+    ../QTfrontend/pageoptions.cpp \
+    ../QTfrontend/pagenettype.cpp \
+    ../QTfrontend/pagenetserver.cpp \
+    ../QTfrontend/pagenetgame.cpp \
+    ../QTfrontend/pagenet.cpp \
+    ../QTfrontend/pagemultiplayer.cpp \
+    ../QTfrontend/pagemain.cpp \
+    ../QTfrontend/pageingame.cpp \
+    ../QTfrontend/pageinfo.cpp \
+    ../QTfrontend/pageeditteam.cpp \
+    ../QTfrontend/pagedrawmap.cpp \
+    ../QTfrontend/pageconnecting.cpp \
+    ../QTfrontend/pagecampaign.cpp \
+    ../QTfrontend/pageadmin.cpp
 
 win32 {
 	SOURCES += ../QTfrontend/xfire.cpp