[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-cvs] CVS: kdegames/atlantik/libatlantikui board.cpp,
From:       kde () office ! kde ! org
Date:       2003-12-08 23:50:24
[Download RAW message or body]

Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv3608/libatlantikui

Modified Files:
      Tag: atlantik_3_3_branch
	board.cpp estatedetails.cpp estatedetails.h 
Log Message:
only add estatedetails when it's a user request

Index: board.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/board.cpp,v
retrieving revision 1.119.2.1
retrieving revision 1.119.2.2
diff -u -d -r1.119.2.1 -r1.119.2.2
--- board.cpp	17 Nov 2003 02:50:42 -0000	1.119.2.1
+++ board.cpp	8 Dec 2003 23:50:22 -0000	1.119.2.2
@@ -555,6 +555,7 @@
 		return;
 
 	EstateDetails *eDetails = new EstateDetails(estate, QString::null, this);
+	eDetails->addDetails();
 	eDetails->addCloseButton();
 
 	if (m_displayQueue.getFirst() != m_lastServerDisplay)

Index: estatedetails.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estatedetails.cpp,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- estatedetails.cpp	25 Nov 2003 01:25:31 -0000	1.25.2.1
+++ estatedetails.cpp	8 Dec 2003 23:50:22 -0000	1.25.2.2
@@ -208,6 +208,37 @@
 	b_recreate = true;
 }
 
+void EstateDetails::addDetails()
+{
+	if (m_estate)
+	{
+		QListViewItem *infoText = 0;
+
+		// Price
+		if (m_estate->price())
+		{
+			infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
i18n("Price: %1").arg(m_estate->price())); +			infoText->setPixmap(0, \
QPixmap(SmallIcon("info"))); +		}
+
+		// Owner, houses, isMortgaged
+		if (m_estate && m_estate->canBeOwned())
+		{
+			infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
i18n("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : \
i18n("unowned"))); +			infoText->setPixmap(0, QPixmap(SmallIcon("info")));
+
+			if (m_estate->isOwned())
+			{
+				infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
i18n("Houses: %1").arg(m_estate->houses())); +				infoText->setPixmap(0, \
QPixmap(SmallIcon("info"))); +
+				infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No"))); \
+				infoText->setPixmap(0, QPixmap(SmallIcon("info"))); +			}
+		}
+	}
+}
+
 void EstateDetails::addButton(QString command, QString caption, bool enabled)
 {
 	KPushButton *button = new KPushButton(caption, this);
@@ -247,36 +278,7 @@
 	{
 		m_estate = estate;
 
-		QString columnText = m_estate ? m_estate->name() : QString::null;
-		m_infoListView->setColumnText(0, columnText);
-
-		// Price
-		if (m_estate)
-		{
-			QListViewItem *infoText = 0;
-
-			if (m_estate->price())
-			{
-				infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
                i18n("Price: %1").arg(m_estate->price()));
-				infoText->setPixmap(0, QPixmap(SmallIcon("info")));
-			}
-
-			// Owner, houses, isMortgaged
-			if (m_estate && m_estate->canBeOwned())
-			{
-				infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
i18n("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : \
                i18n("unowned")));
-				infoText->setPixmap(0, QPixmap(SmallIcon("info")));
-
-				if (m_estate->isOwned())
-				{
-					infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
                i18n("Houses: %1").arg(m_estate->houses()));
-					infoText->setPixmap(0, QPixmap(SmallIcon("info")));
-
-					infoText = new QListViewItem(m_infoListView, m_infoListView->lastItem(), \
                i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : \
                i18n("No")));
-					infoText->setPixmap(0, QPixmap(SmallIcon("info")));
-				}
-			}
-		}
+		m_infoListView->setColumnText( 0, m_estate ? m_estate->name() : QString::null );
 
 		b_recreate = true;
 		update();

Index: estatedetails.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estatedetails.h,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- estatedetails.h	27 Dec 2002 01:38:08 -0000	1.10
+++ estatedetails.h	8 Dec 2003 23:50:22 -0000	1.10.2.1
@@ -41,6 +41,7 @@
 	~EstateDetails();
 	Estate *estate() { return m_estate; }
 
+	void addDetails();
 	void addButton(const QString command, const QString caption, bool enabled);
 	void addCloseButton();
 	void setEstate(Estate *estate);

_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@kde.org
https://mail.kde.org/mailman/listinfo/atlantik-cvs


[prev in list] [next in list] [prev in thread] [next in thread]