[atlantik-cvs] CVS: kdegames/atlantik/client selectserver_widget.cpp,1.27,1.28 selectserver_widget.h,1.14,1.15

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

Modified Files:
	selectserver_widget.cpp selectserver_widget.h 
Log Message:
allow users to use custom servers only

Index: selectserver_widget.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectserver_widget.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- selectserver_widget.cpp	3 Jun 2003 07:54:09 -0000	1.27
+++ selectserver_widget.cpp	23 Jun 2003 03:07:54 -0000	1.28
@@ -102,12 +102,12 @@
 	m_monopigator->loadData("http://gator.monopd.net/");
 }
 
-void SelectServer::checkLocalServer()
+void SelectServer::checkCustomServer(const QString &host, int port)
 {
 	m_localSocket = new KExtendedSocket(0, 0, KExtendedSocket::inputBufferedSocket);
-	connect(m_localSocket, SIGNAL(connectionSuccess()), this, SLOT(slotLocalConnected()));
-	connect(m_localSocket, SIGNAL(connectionFailed(int)), this, SLOT(slotLocalError()));
-	m_localSocket->setAddress("localhost", 1234);
+	connect(m_localSocket, SIGNAL(connectionSuccess()), this, SLOT(slotCustomConnected()));
+	connect(m_localSocket, SIGNAL(connectionFailed(int)), this, SLOT(slotCustomError()));
+	m_localSocket->setAddress(host, port);
 	m_localSocket->enableRead(true);
 	m_localSocket->startAsyncConnect();
 }
@@ -119,17 +119,17 @@
 	validateConnectButton();
 }
 
-void SelectServer::slotLocalConnected()
+void SelectServer::slotCustomConnected()
 {
 	m_localServerAvailable = true;
 
-	QListViewItem *item = new QListViewItem(m_serverList, "localhost", i18n("unknown"), i18n("unknown"), QString::number(1234));
+	QListViewItem *item = new QListViewItem(m_serverList, m_localSocket->host(), i18n("unknown"), i18n("unknown"), m_localSocket->port());
 	item->setPixmap(0, BarIcon("atlantik", KIcon::SizeSmall));
 
 	validateConnectButton();
 }
 
-void SelectServer::slotLocalError()
+void SelectServer::slotCustomError()
 {
 	m_localServerAvailable = false;
 
@@ -168,7 +168,6 @@
 {
 	validateRadioButtons();
 
-//	if ( (m_localGameButton->isEnabled() && m_localGameButton->isChecked()) || (m_onlineGameButton->isEnabled() && m_onlineGameButton->isChecked() && m_serverList->selectedItem()) )
 	if (m_serverList->selectedItem())
 		m_connectButton->setEnabled(true);
 	else
@@ -189,7 +188,7 @@
 	m_serverList->clear();
 	validateConnectButton();
 
-	checkLocalServer();
+	checkCustomServer("localhost", 1234);
 	if (useMonopigator)
 	{
 		m_refreshButton->setEnabled(false);
@@ -205,7 +204,7 @@
 	if (!dlg.exec())
 		return;
 
-	// TODO: add a server entry for dlg.text()
+	checkCustomServer(dlg.text(), 1234);
 }
 
 void SelectServer::slotConnect()

Index: selectserver_widget.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/selectserver_widget.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- selectserver_widget.h	2 Jun 2003 18:38:26 -0000	1.14
+++ selectserver_widget.h	23 Jun 2003 03:07:54 -0000	1.15
@@ -53,8 +53,8 @@
 		void slotConnect();
 		void slotRefresh(bool useMonopigator = true);
 		void slotAddServer();
-		void slotLocalConnected();
-		void slotLocalError();
+		void slotCustomConnected();
+		void slotCustomError();
 		void monopigatorFinished();
 		void monopigatorTimeout();
 
@@ -63,17 +63,17 @@
 //		void statusChanged();
 
 private:
-	void checkLocalServer();
+	void checkCustomServer(const QString &host, int port);
 	void initMonopigator();
 
-		QVBoxLayout *m_mainLayout;
-		QLabel *status_label;
-		QRadioButton *m_localGameButton, *m_onlineGameButton;
-		KListView *m_serverList;
-		KPushButton *m_addServerButton, *m_refreshButton, *m_connectButton;
-		Monopigator *m_monopigator;
-		KExtendedSocket *m_localSocket;
-		bool m_localServerAvailable;
+	QVBoxLayout *m_mainLayout;
+	QLabel *status_label;
+	QRadioButton *m_localGameButton, *m_onlineGameButton;
+	KListView *m_serverList;
+	KPushButton *m_addServerButton, *m_refreshButton, *m_connectButton;
+	Monopigator *m_monopigator;
+	KExtendedSocket *m_localSocket;
+	bool m_localServerAvailable;
 };
 
 #endif