[atlantik-cvs] CVS: kdegames/atlantik/libatlantikclient atlantik_network.cpp,1.65.4.8,1.65.4.9 atlantik_network.h,1.34.4.4,1.34.4.5

Update of /home/kde/kdegames/atlantik/libatlantikclient
In directory office:/tmp/cvs-serv22220/libatlantikclient

Modified Files:
      Tag: KDE_3_1_BRANCH
	atlantik_network.cpp atlantik_network.h 
Log Message:
backport display, fix 52208

Index: atlantik_network.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.cpp,v
retrieving revision 1.65.4.8
retrieving revision 1.65.4.9
diff -u -d -r1.65.4.8 -r1.65.4.9
--- atlantik_network.cpp	21 Jan 2003 00:31:14 -0000	1.65.4.8
+++ atlantik_network.cpp	21 Jan 2003 02:36:42 -0000	1.65.4.9
@@ -280,32 +280,23 @@
 				if (!a.isNull())
 				{
 					estateId = a.value().toInt();
-					Estate *estate;
-					if ((estate = m_atlanticCore->findEstate(a.value().toInt())))
-					{
-						emit displayEstate(estate);
-						// TODO: merge into displayEstate, or statusbar
-						emit msgInfo(e.attributeNode(QString("text")).value());
+					Estate *estate = m_atlanticCore->findEstate(a.value().toInt());
 
-						bool hasButtons = false;
-						for( QDomNode nButtons = n.firstChild() ; !nButtons.isNull() ; nButtons = nButtons.nextSibling() )
+					emit displayDetails(e.attributeNode(QString("text")).value(), e.attributeNode(QString("cleartext")).value().toInt(), e.attributeNode(QString("clearbuttons")).value().toInt(), estate);
+
+					bool hasButtons = false;
+					for( QDomNode nButtons = n.firstChild() ; !nButtons.isNull() ; nButtons = nButtons.nextSibling() )
+					{
+						QDomElement eButton = nButtons.toElement();
+						if (!eButton.isNull() && eButton.tagName() == "button")
 						{
-							QDomElement eButton = nButtons.toElement();
-							if (!eButton.isNull() && eButton.tagName() == "button")
-							{
-								QDomElement eButton = nButtons.toElement();
-								if (!eButton.isNull() && eButton.tagName() == "button")
-								{
-									emit addCommandButton(eButton.attributeNode(QString("command")).value(), eButton.attributeNode(QString("caption")).value(), eButton.attributeNode(QString("enabled")).value().toInt());
-									hasButtons = true;
-								}
-							}
+							emit addCommandButton(eButton.attributeNode(QString("command")).value(), eButton.attributeNode(QString("caption")).value(), eButton.attributeNode(QString("enabled")).value().toInt());
+							hasButtons = true;
 						}
-						if (!hasButtons)
-							emit addCloseButton();
 					}
-					else
-						displayDefault();
+
+					if (!hasButtons)
+						emit addCloseButton();
 				}
 			}
 			else if (e.tagName() == "updategamelist")

Index: atlantik_network.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikclient/atlantik_network.h,v
retrieving revision 1.34.4.4
retrieving revision 1.34.4.5
diff -u -d -r1.34.4.4 -r1.34.4.5
--- atlantik_network.h	21 Jan 2003 00:31:14 -0000	1.34.4.4
+++ atlantik_network.h	21 Jan 2003 02:36:42 -0000	1.34.4.5
@@ -118,9 +118,7 @@
 	void msgError(QString);
 	void msgChat(QString, QString);
 
-	void displayText(QString title, QString description);
-	void displayEstate(Estate *);
-	void displayDefault();
+	void displayDetails(QString text, bool clearText, bool clearButtons, Estate *estate = 0);
 	void addCommandButton(QString command, QString caption, bool enabled);
 	void addCloseButton();