[atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp,1.121.6.6,1.121.6.7 selectgame_widget.cpp,1.23,1.23.6.1 selectgame_widget.h,1.15,1.15.6.1

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

Modified Files:
      Tag: KDE_3_1_BRANCH
	atlantik.cpp selectgame_widget.cpp selectgame_widget.h 
Log Message:
backport: disable games that can't be joined

Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.121.6.6
retrieving revision 1.121.6.7
diff -u -d -r1.121.6.6 -r1.121.6.7
--- atlantik.cpp	20 Jan 2003 23:47:36 -0000	1.121.6.6
+++ atlantik.cpp	21 Jan 2003 00:31:13 -0000	1.121.6.7
@@ -269,8 +269,8 @@
 	}
 
 	connect(m_atlantikNetwork, SIGNAL(gameListClear()), m_selectGame, SLOT(slotGameListClear()));
-	connect(m_atlantikNetwork, SIGNAL(gameListAdd(QString, QString, QString, QString, QString)), m_selectGame, SLOT(slotGameListAdd(QString, QString, QString, QString, QString)));
-	connect(m_atlantikNetwork, SIGNAL(gameListEdit(QString, QString, QString, QString, QString)), m_selectGame, SLOT(slotGameListEdit(QString, QString, QString, QString, QString)));
+	connect(m_atlantikNetwork, SIGNAL(gameListAdd(QString, QString, QString, QString, QString, bool)), m_selectGame, SLOT(slotGameListAdd(QString, QString, QString, QString, QString, bool)));
+	connect(m_atlantikNetwork, SIGNAL(gameListEdit(QString, QString, QString, QString, QString, bool)), m_selectGame, SLOT(slotGameListEdit(QString, QString, QString, QString, QString, bool)));
 	connect(m_atlantikNetwork, SIGNAL(gameListDel(QString)), m_selectGame, SLOT(slotGameListDel(QString)));
 	connect(m_atlantikNetwork, SIGNAL(gameListEndUpdate()), m_selectGame, SLOT(slotGameListEndUpdate()));
 

Index: selectgame_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectgame_widget.cpp,v
retrieving revision 1.23
retrieving revision 1.23.6.1
diff -u -d -r1.23 -r1.23.6.1
--- selectgame_widget.cpp	11 Sep 2002 03:46:37 -0000	1.23
+++ selectgame_widget.cpp	21 Jan 2003 00:31:13 -0000	1.23.6.1
@@ -81,23 +81,24 @@
 	m_statusLabel->setText(i18n("Retrieved game list."));
 }
 
-void SelectGame::slotGameListAdd(QString gameId, QString name, QString description, QString players, QString gameType)
+void SelectGame::slotGameListAdd(QString gameId, QString name, QString description, QString players, QString gameType, bool canBeJoined)
 {
 	if (gameId == "-1")
 	{
-		QListViewItem *item = new QListViewItem(m_gameList, i18n("Create new %1 Game").arg(name), description, "", "", gameType);
+		QListViewItem *item = new QListViewItem(m_gameList, i18n("Create new %1 Game").arg(name), description, QString::null, QString::null, gameType);
 		item->setPixmap(0, QPixmap(SmallIcon("filenew")));
 	}
 	else
 	{
 		QListViewItem *item = new QListViewItem(m_gameList, i18n("Join %1 Game #%2").arg(name).arg(gameId), description, gameId, players, gameType);
 		item->setPixmap(0, QPixmap(SmallIcon("atlantik")));
+		item->setEnabled(canBeJoined);
 	}
 
 	validateConnectButton();
 }
 
-void SelectGame::slotGameListEdit(QString gameId, QString name, QString description, QString players, QString gameType)
+void SelectGame::slotGameListEdit(QString gameId, QString name, QString description, QString players, QString gameType, bool canBeJoined)
 {
 	QListViewItem *item = m_gameList->firstChild();
 	while (item)
@@ -111,6 +112,7 @@
 			item->setText(3, players);
 			if (!gameType.isEmpty())
 				item->setText(4, gameType);
+			item->setEnabled(canBeJoined);
 			m_gameList->triggerUpdate();
 			return;
 		}

Index: selectgame_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectgame_widget.h,v
retrieving revision 1.15
retrieving revision 1.15.6.1
diff -u -d -r1.15 -r1.15.6.1
--- selectgame_widget.h	11 Sep 2002 03:46:37 -0000	1.15
+++ selectgame_widget.h	21 Jan 2003 00:31:13 -0000	1.15.6.1
@@ -40,8 +40,8 @@
 		void validateConnectButton();
 
 		void slotGameListClear();
-		void slotGameListAdd(QString gameId, QString name, QString description, QString players, QString gameType);
-		void slotGameListEdit(QString gameId, QString name, QString description, QString players, QString gameType);
+		void slotGameListAdd(QString gameId, QString name, QString description, QString players, QString gameType, bool canBeJoined);
+		void slotGameListEdit(QString gameId, QString name, QString description, QString players, QString gameType, bool canBeJoined);
 		void slotGameListDel(QString gameId);
 
 private slots: