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

Modified Files:
	estatedetails.cpp 
Log Message:
added more info to estatedetails and added conditions to showing details

Index: estatedetails.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estatedetails.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- estatedetails.cpp	2002/04/23 17:02:56	1.4
+++ estatedetails.cpp	2002/06/30 23:32:29	1.5
@@ -17,11 +17,13 @@
 #include <qpainter.h>
 #include <qpixmap.h>
 
+#include <kdialog.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kpixmap.h>
 
 #include <estate.h>
+#include <estategroup.h>
 #include <player.h>
 
 #include "estatedetails.h"
@@ -130,18 +132,47 @@
 
 		// TODO: steal blur code from kicker/taskbar/taskcontainer.cpp
 
-		int xText = (KGlobalSettings::generalFont().pointSize() * 2) + 5;
+		// Estate name
 		painter.setPen(Qt::white);
 		painter.setFont(QFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize() * 2, QFont::Bold));
-		painter.drawText(5, xText, width()-10, titleHeight, Qt::AlignJustify, m_estate->name());
+		painter.drawText(KDialog::marginHint(), KDialog::marginHint(), width()-KDialog::marginHint(), titleHeight, Qt::AlignJustify, m_estate->name());
 
-		xText = titleHeight + KGlobalSettings::generalFont().pointSize() + 5;
 		painter.setPen(Qt::black);
+
+		int xText = 0;
+		// Estate group
+		if (m_estate->estateGroup())
+		{
+			xText = titleHeight - KGlobalSettings::generalFont().pointSize() - KDialog::marginHint();
+			painter.setFont(QFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), QFont::Bold));
+			painter.drawText(5, xText, width()-10, titleHeight, Qt::AlignRight, m_estate->estateGroup()->name().upper());
+		}
+
+		xText = titleHeight + KGlobalSettings::generalFont().pointSize() + 5;
 		painter.setFont(QFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), QFont::Normal));
-		painter.drawText(5, xText, QString("Houses: %1").arg(m_estate->houses()));
 
-		xText += (KGlobalSettings::generalFont().pointSize() + 5);
-		painter.drawText(5, xText, QString("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
+		// Price
+		if (m_estate->price())
+		{
+			painter.drawText(5, xText, i18n("Price: %1").arg(m_estate->price()));
+			xText += (KGlobalSettings::generalFont().pointSize() + 5);
+		}
+
+		// Owner, houses, isMortgaged
+		if (m_estate->canBeOwned())
+		{
+			painter.drawText(5, xText, i18n("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
+			xText += (KGlobalSettings::generalFont().pointSize() + 5);
+
+			if (m_estate->isOwned())
+			{
+				painter.drawText(5, xText, i18n("Houses: %1").arg(m_estate->houses()));
+				xText += (KGlobalSettings::generalFont().pointSize() + 5);
+
+				painter.drawText(5, xText, i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
+				xText += (KGlobalSettings::generalFont().pointSize() + 5);
+			}
+		}
 
 		b_recreate = false;
 	}

_______________________________________________
atlantik-devel mailing list
atlantik-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-devel