[atlantik-cvs] CVS: kdegames/atlantik/libatlantikui estatedetails.cpp,1.11,1.12

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

Modified Files:
	estatedetails.cpp 
Log Message:
bugfix: completed != accepted in API

Index: estatedetails.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estatedetails.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- estatedetails.cpp	2002/08/15 10:56:25	1.11
+++ estatedetails.cpp	2002/10/23 19:18:20	1.12
@@ -151,7 +151,11 @@
 
 		// Estate name
 		painter.setPen(Qt::white);
-		painter.setFont(QFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize() * 2, QFont::Bold));
+		int fontSize = KGlobalSettings::generalFont().pointSize();
+		if (fontSize == -1)
+			fontSize = KGlobalSettings::generalFont().pixelSize();
+
+		painter.setFont(QFont(KGlobalSettings::generalFont().family(), fontSize * 2, QFont::Bold));
 		painter.drawText(KDialog::marginHint(), KDialog::marginHint(), width()-KDialog::marginHint(), titleHeight, Qt::AlignJustify, m_estate->name());
 
 		painter.setPen(Qt::black);
@@ -160,34 +164,34 @@
 		// Estate group
 		if (m_estate->estateGroup())
 		{
-			xText = titleHeight - KGlobalSettings::generalFont().pointSize() - KDialog::marginHint();
-			painter.setFont(QFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), QFont::Bold));
+			xText = titleHeight - fontSize - KDialog::marginHint();
+			painter.setFont(QFont(KGlobalSettings::generalFont().family(), fontSize, 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));
+		xText = titleHeight + fontSize + 5;
+		painter.setFont(QFont(KGlobalSettings::generalFont().family(), fontSize, QFont::Normal));
 
 		// Price
 		if (m_estate->price())
 		{
 			painter.drawText(5, xText, i18n("Price: %1").arg(m_estate->price()));
-			xText += (KGlobalSettings::generalFont().pointSize() + 5);
+			xText += (fontSize + 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);
+			xText += (fontSize + 5);
 
 			if (m_estate->isOwned())
 			{
 				painter.drawText(5, xText, i18n("Houses: %1").arg(m_estate->houses()));
-				xText += (KGlobalSettings::generalFont().pointSize() + 5);
+				xText += (fontSize + 5);
 
 				painter.drawText(5, xText, i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
-				xText += (KGlobalSettings::generalFont().pointSize() + 5);
+				xText += (fontSize + 5);
 			}
 		}