[atlantik-cvs] CVS: kdegames/atlantik/libatlantikui estateview.cpp, 1.73, 1.73.2.1
[email protected] Tue, 2 Dec 2003 21:59:22 +0100 (CET)
| Newsgroups | gmane.comp.kde.devel.atlantik |
|---|---|
| Message-ID | <[email protected]> |
Update of /home/kde/kdegames/atlantik/libatlantikui
In directory office:/tmp/cvs-serv16877/libatlantikui
Modified Files:
Tag: atlantik_3_3_branch
estateview.cpp
Log Message:
fix wish #61858: show estate names on board
Index: estateview.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantikui/estateview.cpp,v
retrieving revision 1.73
retrieving revision 1.73.2.1
diff -u -d -r1.73 -r1.73.2.1
--- estateview.cpp 23 Jun 2003 03:05:25 -0000 1.73
+++ estateview.cpp 2 Dec 2003 20:59:19 -0000 1.73.2.1
@@ -21,11 +21,13 @@
#include <qcursor.h>
#include <kdebug.h>
-
+#include <kdialogbase.h>
+#include <kglobalsettings.h>
+#include <klocale.h>
#include <kpixmapeffect.h>
-#include <kstandarddirs.h>
#include <kpopupmenu.h>
-#include <klocale.h>
+#include <kstandarddirs.h>
+#include <kstringhandler.h>
#include <player.h>
#include <estate.h>
@@ -375,9 +377,23 @@
}
break;
}
+
+
quartzPainter.end();
delete quartzBuffer;
}
+
+ painter.setFont(QFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), QFont::Bold));
+// painter.drawText(0, height()/2-15, m_estate->name().section(" ", 0, 0));
+ if (m_estate->color().isValid() && m_orientation == West)
+ painter.drawText( width()/4 + 2, height()/2, KStringHandler::rPixelSqueeze( m_estate->name(), QFontMetrics( QFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), QFont::Bold ) ), 3*width()/4 ) );
+ else if (m_estate->color().isValid() && m_orientation == East)
+ painter.drawText(2, height()/2, KStringHandler::rPixelSqueeze( m_estate->name(), QFontMetrics( QFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), QFont::Bold ) ), 3*width()/4 ) );
+ else
+ painter.drawText(2, height()/2, KStringHandler::rPixelSqueeze( m_estate->name(), QFontMetrics( QFont( KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), QFont::Bold ) ), width() ) );
+
+// painter.drawText(0, height()/2+15, m_estate->name().section(" ", 2, 2));
+
b_recreate = false;
}
bitBlt(this, 0, 0, qpixmap);