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

List:       kde-commits
Subject:    playground/games/kamala/src
From:       Stanislas Marquis <roundphi () gmail ! com>
Date:       2009-04-05 22:56:49
Message-ID: 1238972209.941433.1710.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 949800 by smarquis:

Fixed zodiac signs tool tips.


 M  +22 -0     core/objects/names.cpp  
 M  +15 -0     core/objects/names.h  
 M  +2 -1      gui/items/chartitem.cpp  
 M  +2 -2      gui/items/zodiacitem.cpp  


--- trunk/playground/games/kamala/src/core/objects/names.cpp #949799:949800
@@ -66,4 +66,26 @@
     }
 }
 
+QString translatedZodiacSign(int i)
+{
+    switch (i)
+    {
+        case 0: return TR_ARIES;
+        case 1: return TR_TAURUS;
+        case 2: return TR_GEMINI;
+        case 3: return TR_CANCER;
+        case 4: return TR_LEO;
+        case 5: return TR_VIRGO;
+        case 6: return TR_LIBRA;
+        case 7: return TR_SCORPIO;
+        case 8: return TR_SAGITTARIUS;
+        case 9: return TR_CAPRICORN;
+        case 10: return TR_AQUARIUS;
+        case 11: return TR_PISCES;
+        default:
+            kWarning() << "Invalid zodiac index" << i;
+            return QString();
+    }
+}
+
 } // namespace Kamala
--- trunk/playground/games/kamala/src/core/objects/names.h #949799:949800
@@ -23,6 +23,19 @@
 #ifndef KAMALA_NAMES_H
 #define KAMALA_NAMES_H
 
+#define TR_ARIES            i18nc("Zodiac sign", "Aries")
+#define TR_TAURUS           i18nc("Zodiac sign", "Taurus")
+#define TR_GEMINI           i18nc("Zodiac sign", "Gemini")
+#define TR_CANCER           i18nc("Zodiac sign", "Cancer")
+#define TR_LEO              i18nc("Zodiac sign", "Leo")
+#define TR_VIRGO            i18nc("Zodiac sign", "Virgo")
+#define TR_LIBRA            i18nc("Zodiac sign", "Libra")
+#define TR_SCORPIO          i18nc("Zodiac sign", "Scorpio")
+#define TR_SAGITTARIUS      i18nc("Zodiac sign", "Sagittarius")
+#define TR_CAPRICORN        i18nc("Zodiac sign", "Capricorn")
+#define TR_AQUARIUS         i18nc("Zodiac sign", "Aquarius")
+#define TR_PISCES           i18nc("Zodiac sign", "Pisces")
+
 #define TR_SUN              i18nc("Planet name", "Sun")
 #define TR_MOON             i18nc("Planet name", "Moon")
 #define TR_MERCURY          i18nc("Planet name", "Mercury")
@@ -43,6 +56,8 @@
 
 KAMALA_EXPORT QString translate(const QString &name);
 
+KAMALA_EXPORT QString translatedZodiacSign(int i);
+
 } // namespace Kamala
 
 #endif // KAMALA_NAMES_H
--- trunk/playground/games/kamala/src/gui/items/chartitem.cpp #949799:949800
@@ -32,6 +32,7 @@
 #include <KDebug>
 #include "../../core/objects/chart.h"
 #include "../../core/objects/data.h"
+#include "../../core/objects/names.h"
 #include "../../core/collections/svgcollection.h"
 #include "zodiacitem.h"
 #include <swephexp.h>
@@ -85,7 +86,7 @@
         QPointF p3 = toPoint(z - 15, y, -25.6, -25.6);
         ZodiacItem *zodItem;
         QString ico = QString("sign_%1.svg").arg(i + 1, 2, 10, QChar('0'));
-        zodItem = new ZodiacItem("Aries", svgColl->renderer(ico), this);
+        zodItem = new ZodiacItem(translatedZodiacSign(i), svgColl->renderer(ico), this);
         zodItem->scale(0.8, 0.8);
         zodItem->setPos(p3);
     }
--- trunk/playground/games/kamala/src/gui/items/zodiacitem.cpp #949799:949800
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
-#include <KLocalizedString>
+#include <QSvgRenderer>
 
 namespace Kamala
 {
@@ -33,7 +33,7 @@
     QGraphicsItem *parent): QGraphicsSvgItem(parent)
 {
     setSharedRenderer(renderer);
-    setToolTip(i18nc("Tool tip", "Zodiac sign %1", name));
+    setToolTip(name);
 }
 
 } // namespace Kamala
[prev in list] [next in list] [prev in thread] [next in thread]