[atlantik-cvs] CVS: kdegames/atlantik/client main.cpp,1.32,1.33 main.h,1.36,1.37 monopigator.cpp,1.14,1.15 monopigator.h,1.13,1.14 selectserver_widget.cpp,1.31,1.32

Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv649/client

Modified Files:
	main.cpp main.h monopigator.cpp monopigator.h 
	selectserver_widget.cpp 
Log Message:
support for server ping times using thiago's klatencytimer

Index: main.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/main.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- main.cpp	2 Jun 2003 18:42:39 -0000	1.32
+++ main.cpp	24 Jul 2003 19:20:29 -0000	1.33
@@ -49,7 +49,7 @@
 	aboutData.addAuthor("Rob Kaper", I18N_NOOP("main author"), "[email protected]", "http://capsi.com/");
 
 	// Patches and artists
-	aboutData.addCredit("Thiago Macieira", I18N_NOOP("KExtendedSocket support"), "[email protected]");
+	aboutData.addCredit("Thiago Macieira", I18N_NOOP("KExtendedSocket support, KLatencyTimer"), "[email protected]");
 	aboutData.addCredit("Albert Astals Cid", I18N_NOOP("various patches"), "[email protected]");
 
 	aboutData.addCredit("Bart Szyszka", I18N_NOOP("application icon"), "[email protected]", "http://www.gigabee.com/");

Index: main.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/main.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- main.h	20 Jul 2003 11:38:30 -0000	1.36
+++ main.h	24 Jul 2003 19:20:29 -0000	1.37
@@ -18,7 +18,7 @@
 #define ATLANTIK_MAIN_H
 
 #define	ATLANTIK_VERSION 060
-#define	ATLANTIK_VERSION_STRING "0.6.0 (CVS >= 20030720)"
+#define	ATLANTIK_VERSION_STRING "0.6.0 (CVS >= 20030724)"
 #define ATLANTIK_VERSION_MAJOR 0
 #define ATLANTIK_VERSION_MINOR 6
 #define ATLANTIK_VERSION_RELEASE 0

Index: monopigator.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/monopigator.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- monopigator.cpp	12 Jul 2003 22:58:46 -0000	1.14
+++ monopigator.cpp	24 Jul 2003 19:20:29 -0000	1.15
@@ -16,6 +16,8 @@
 
 #include <qdom.h>
 
+#include <klatencytimer.h>
+
 #include "monopigator.moc"
 #include "main.h"
 
@@ -103,13 +105,25 @@
 	}
 }
 
-MonopigatorEntry::MonopigatorEntry(QListView *parent, QString host, QString version, QString users, QString port) : QListViewItem(parent, host, version, users, port)
+MonopigatorEntry::MonopigatorEntry(QListView *parent, QString host, QString latency, QString version, QString users, QString port) : QObject(), QListViewItem(parent, host, latency, version, users, port)
+{
+	m_latencyTimer = new KLatencyTimer(port.toInt(), this, "latencyTimer");
+	m_latencyTimer->setHost(host);
+
+	connect(m_latencyTimer, SIGNAL(answer(int)), this, SLOT(updateLatency(int)));
+
+	m_latencyTimer->start();
+}
+
+void MonopigatorEntry::updateLatency(int msec)
 {
+	setText(1, QString::number(msec));
 }
 
 int MonopigatorEntry::compare(QListViewItem *i, int col, bool ascending) const
 {
-	if (col == 2)
+	// Colums 1 and 3 are integers (latency and users)
+	if (col == 1 || col == 3)
 	{
 		int myVal = text(col).toInt(), iVal = i->text(col).toInt();
 		if (myVal == iVal)

Index: monopigator.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/monopigator.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- monopigator.h	12 Jul 2003 22:58:46 -0000	1.13
+++ monopigator.h	24 Jul 2003 19:20:29 -0000	1.14
@@ -25,6 +25,8 @@
 #include <kio/job.h>
 #include <kurl.h>
 
+class KLatencyTimer;
+
 class Monopigator : public QObject
 {
 Q_OBJECT
@@ -52,11 +54,19 @@
 	KIO::Job *m_job;
 };
 
-class MonopigatorEntry : public QListViewItem
+class MonopigatorEntry : public QObject, public QListViewItem
 {
+Q_OBJECT
+
 public:
-	MonopigatorEntry(QListView *parent, QString host, QString version, QString users, QString port);
+	MonopigatorEntry(QListView *parent, QString host, QString latency, QString version, QString users, QString port);
 	int compare(QListViewItem *i, int col, bool ascending) const;
+
+private slots:
+	void updateLatency(int msec);
+
+private:
+	KLatencyTimer *m_latencyTimer;
 };
 
 #endif

Index: selectserver_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectserver_widget.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- selectserver_widget.cpp	20 Jul 2003 11:38:30 -0000	1.31
+++ selectserver_widget.cpp	24 Jul 2003 19:20:29 -0000	1.32
@@ -59,6 +59,7 @@
 	// List of servers
 	m_serverList = new KListView(bgroup, "m_serverList");
 	m_serverList->addColumn(i18n("Host"));
+	m_serverList->addColumn(i18n("Latency"));
 	m_serverList->addColumn(i18n("Version"));
 	m_serverList->addColumn(i18n("Users"));
 	m_serverList->setAllColumnsShowFocus(true);
@@ -137,7 +138,7 @@
 	if (m_hideDevelopmentServers && version.contains("CVS"))
 		return;
 
-	MonopigatorEntry *item = new MonopigatorEntry(m_serverList, host, version, (users == -1) ? i18n("unknown") : QString::number(users), port);
+	MonopigatorEntry *item = new MonopigatorEntry(m_serverList, host, i18n("Unknown"), version, (users == -1) ? i18n("unknown") : QString::number(users), port);
 	item->setPixmap(0, BarIcon("atlantik", KIcon::SizeSmall));
 	validateConnectButton();
 }
@@ -146,7 +147,7 @@
 {
 	m_localServerAvailable = true;
 
-	MonopigatorEntry *item = new MonopigatorEntry(m_serverList, m_localSocket->host(), i18n("unknown"), i18n("unknown"), m_localSocket->port());
+	MonopigatorEntry *item = new MonopigatorEntry(m_serverList, m_localSocket->host(), i18n("Unknown"), i18n("unknown"), i18n("unknown"), m_localSocket->port());
 	item->setPixmap(0, BarIcon("atlantik", KIcon::SizeSmall));
 	validateConnectButton();
 }