[atlantik-cvs] CVS: kdegames/atlantik/client atlantik.cpp,1.121,1.122 main.h,1.24,1.25

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

Modified Files:
	atlantik.cpp main.h 
Log Message:
qmap->qptrlist changes, improved estatedetails widget

Index: atlantik.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/atlantik.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- atlantik.cpp	2002/09/11 03:46:37	1.121
+++ atlantik.cpp	2002/11/27 21:08:55	1.122
@@ -102,6 +102,8 @@
 	m_portfolioWidget->show();
 	m_portfolioLayout = new QVBoxLayout(m_portfolioWidget);
 
+	m_portfolioViews.setAutoDelete(true);
+
 	// Nice label
 //	m_portfolioLabel = new QLabel(i18n("Players"), m_portfolioWidget, "pfLabel");
 //	m_portfolioLayout->addWidget(m_portfolioLabel);
@@ -235,6 +237,11 @@
 	m_selectGame = new SelectGame(m_mainWidget, "selectGame");
 	m_mainLayout->addMultiCellWidget(m_selectGame, 0, 2, 1, 1);
 	m_selectGame->show();
+
+	// Reset core and GUI
+	m_atlanticCore->reset();
+	m_portfolioViews.clear();
+
 	if (m_selectServer)
 	{
 		delete m_selectServer;
@@ -293,8 +300,7 @@
 	m_board = new AtlantikBoard(m_atlanticCore, 40, AtlantikBoard::Play, m_mainWidget, "board");
 	m_board->setViewProperties(m_config.indicateUnowned, m_config.highliteUnowned, m_config.darkenMortgaged, m_config.quartzEffects, m_config.animateTokens);
 
-	connect(m_atlantikNetwork, SIGNAL(displayText(QString, QString)), m_board, SLOT(displayText(QString, QString)));
-	connect(m_atlantikNetwork, SIGNAL(displayEstate(Estate *)), m_board, SLOT(insertEstateDetails(Estate *)));
+	connect(m_atlantikNetwork, SIGNAL(displayDetails(QString, Estate *)), m_board, SLOT(insertDetails(QString, Estate *)));
 	connect(m_atlantikNetwork, SIGNAL(displayDefault()), m_board, SLOT(displayDefault()));
 	connect(m_atlantikNetwork, SIGNAL(addCommandButton(QString, QString, bool)), m_board, SLOT(displayButton(QString, QString, bool)));
 	connect(m_atlantikNetwork, SIGNAL(addCloseButton()), m_board, SLOT(addCloseButton()));

Index: main.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/client/main.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- main.h	2002/10/23 15:56:41	1.24
+++ main.h	2002/11/27 21:08:55	1.25
@@ -17,10 +17,10 @@
 #ifndef ATLANTIK_MAIN_H
 #define ATLANTIK_MAIN_H
 
-#define	ATLANTIK_VERSION 050
-#define	ATLANTIK_VERSION_STRING "0.5.0"
+#define	ATLANTIK_VERSION 060
+#define	ATLANTIK_VERSION_STRING "0.6.0 (CVS >= 20021127)"
 #define ATLANTIK_VERSION_MAJOR 0
-#define ATLANTIK_VERSION_MINOR 5
+#define ATLANTIK_VERSION_MINOR 6
 #define ATLANTIK_VERSION_RELEASE 0
 
 int main(int, char *[]);