X-Git-Url: http://git.maemo.org/git/?p=jspeed;a=blobdiff_plain;f=src%2Ftextelement.h;h=2a3f519b1f749a178de4f77f8cc48eb787899e29;hp=ddd289cd9aa8e3cfebd85a6924a876e22e0d2642;hb=fa66fb373153edc684f4d575c56107b74a615a3b;hpb=b958396e9dcff299ef5b36bf4deb5f7074be788a

diff --git a/src/textelement.h b/src/textelement.h
index ddd289c..2a3f519 100644
--- a/src/textelement.h
+++ b/src/textelement.h
@@ -30,8 +30,8 @@ class GraphicsScene;
 class TextElement : public GraphicsElement
 {
 public:
-    enum Attribute {XPOS, YPOS, DATA, FORMAT, WIDTH, ALIGN, COLOR, SIZE, FONT, BOLD, ITALIC, ATTRIBUTE_COUNT};
-    enum Field {TRIP, TOTAL, SPEED, MAXSPEED, AVGSPEED, UNIT, SPEEDUNIT, TIME, FIELD_COUNT};
+    enum Attribute {XPOS, YPOS, ZPOS, VISIBLEWHEN, DATA, FORMAT, WIDTH, ALIGN, COLOR, SIZE, FONT, BOLD, ITALIC, UPPERCASE, LETTERSPACING, TIMEFORMAT, DATEFORMAT, ATTRIBUTE_COUNT};
+    enum Field {TRIP, TOTAL, SPEED, MAXSPEED, AVGSPEED, UNIT, SPEEDUNIT, TIME, DATE, POIDISTANCE, ANGLE, LATITUDE, LONGITUDE, FIELD_COUNT};
     TextElement(Reader* reader);
     virtual bool setAttribute(QString const& name, QString const& value);
     virtual void addToScene(GraphicsScene* scene);
@@ -39,17 +39,23 @@ public:
     virtual QGraphicsItem* getElement() const;
 
 private:
-    void updateHtml(QString const& data);
+    QString handleEmpty(double value);
+    void updateHtml(QString data);
     void replaceSpecialFields(QString& value);
     void replaceValue(QString& value, Field field, QString const& replace);
+    bool applyFont();
     QString formatString(double val);
     QGraphicsTextItem* element_;
     QString data_;
     QString format_;
     QString align_;
+    QString timeFormat_;
+    QString dateFormat_;
     int fontSize_;
     bool bold_;
     bool italic_;
+    bool uppercase_;
+    int letterSpacing_;
     QString fontFile_;
     QList<Field> specialFields_;
 };