[prev in list] [next in list] [prev in thread] [next in thread]
List: atlantik-devel
Subject: [atlantik-devel] CVS: kdegames/atlantik/client monopigator.cpp,1.8,1.9 monopigator.h,1.7,1.8 selectc
From: kde () office ! kde ! org
Date: 2002-06-29 12:51:35
[Download RAW message or body]
Update of /home/kde/kdegames/atlantik/client
In directory office:/tmp/cvs-serv22914/client
Modified Files:
monopigator.cpp monopigator.h selectconfiguration_widget.cpp
selectserver_widget.cpp selectserver_widget.h
Log Message:
fix roll signal/slot, add user count to monopigator, remove config widget that won't \
be used for 1.0
Index: monopigator.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/monopigator.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- monopigator.cpp 2002/04/30 21:36:00 1.8
+++ monopigator.cpp 2002/06/29 12:51:33 1.9
@@ -70,7 +70,7 @@
if(!e.isNull())
{
if (e.tagName() == "server")
- emit monopigatorAdd(e.attributeNode(QString("host")).value(), \
e.attributeNode(QString("port")).value(), \
e.attributeNode(QString("version")).value()); + emit \
monopigatorAdd(e.attributeNode(QString("host")).value(), \
e.attributeNode(QString("port")).value(), \
e.attributeNode(QString("version")).value(), \
e.attributeNode(QString("users")).value().toInt()); }
n = n.nextSibling();
}
Index: monopigator.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/monopigator.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- monopigator.h 2002/04/23 16:56:30 1.7
+++ monopigator.h 2002/06/29 12:51:33 1.8
@@ -33,7 +33,7 @@
signals:
void monopigatorClear();
- void monopigatorAdd(QString host, QString port, QString version);
+ void monopigatorAdd(QString host, QString port, QString version, int users);
void finished();
private slots:
Index: selectconfiguration_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectconfiguration_widget.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- selectconfiguration_widget.cpp 2002/04/25 11:01:59 1.11
+++ selectconfiguration_widget.cpp 2002/06/29 12:51:33 1.12
@@ -34,9 +34,6 @@
m_playerGroupBox = new QVGroupBox(i18n("Player List"), this, "groupBox");
m_mainLayout->addWidget(m_playerGroupBox);
- // Game configuration.
- m_groupBox = new QVGroupBox(i18n("Game Configuration"), this, "groupBox");
- m_mainLayout->addWidget(m_groupBox);
// List of players
m_playerList = new KListView(m_playerGroupBox, "m_playerList");
@@ -47,9 +44,11 @@
connect(m_playerList, SIGNAL(doubleClicked(QListViewItem *)), this, \
SLOT(connectPressed()));
- // Add new configuration option to list view
-// QListViewItem *item = new QListViewItem(m_configurationList, i18n("Start a new \
configuration"), "");
-// item->setPixmap(0, SmallIcon("filenew"));
+#if 0
+ // Game configuration.
+ m_groupBox = new QVGroupBox(i18n("Game Configuration"), this, "groupBox");
+ m_mainLayout->addWidget(m_groupBox);
+#endif
QHBoxLayout *buttonBox = new QHBoxLayout(this, 0, KDialog::spacingHint());
m_mainLayout->addItem(buttonBox);
Index: selectserver_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectserver_widget.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- selectserver_widget.cpp 2002/04/25 11:01:59 1.13
+++ selectserver_widget.cpp 2002/06/29 12:51:33 1.14
@@ -48,6 +48,7 @@
m_serverList->addColumn(QString(i18n("Host")));
m_serverList->addColumn(QString(i18n("Port")));
m_serverList->addColumn(QString(i18n("Version")));
+ m_serverList->addColumn(QString(i18n("Users")));
// m_mainLayout->addWidget(m_serverList);
connect(m_serverList, SIGNAL(clicked(QListViewItem *)), this, \
SLOT(validateConnectButton())); @@ -80,7 +81,7 @@
monopigator = new Monopigator();
connect(monopigator, SIGNAL(monopigatorClear()), this, \
SLOT(slotMonopigatorClear()));
- connect(monopigator, SIGNAL(monopigatorAdd(QString, QString, QString)), this, \
SLOT(slotMonopigatorAdd(QString, QString, QString))); + connect(monopigator, \
SIGNAL(monopigatorAdd(QString, QString, QString, int)), this, \
SLOT(slotMonopigatorAdd(QString, QString, QString, int))); connect(monopigator, \
SIGNAL(finished()), SLOT(monopigatorFinished()));
// Until we have a good way to use start a local monopd server, disable this button
@@ -103,9 +104,9 @@
// emit statusChanged();
}
-void SelectServer::slotMonopigatorAdd(QString host, QString port, QString version)
+void SelectServer::slotMonopigatorAdd(QString host, QString port, QString version, \
int users) {
- QListViewItem *item = new QListViewItem(m_serverList, host, port, version);
+ QListViewItem *item = new QListViewItem(m_serverList, host, port, version, (users \
== -1) ? i18n("unknown") : QString::number(users)); item->setPixmap(0, \
BarIcon("atlantik", KIcon::SizeSmall)); validateConnectButton();
}
Index: selectserver_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectserver_widget.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- selectserver_widget.h 2002/04/23 16:56:30 1.7
+++ selectserver_widget.h 2002/06/29 12:51:33 1.8
@@ -46,7 +46,7 @@
void validateConnectButton();
void slotMonopigatorClear();
- void slotMonopigatorAdd(QString host, QString port, QString version);
+ void slotMonopigatorAdd(QString host, QString port, QString version, int users);
void slotListClicked(QListViewItem *);
private slots:
_______________________________________________
atlantik-devel mailing list
atlantik-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic