- on devices capable of full-color OSD, bpp's have no meaning anymorev0.0.7

  (but will still work like usual). On such devices, a full-screen 8-bit
  OSD will be used
- new display-item "PresentTextDescription" displays combined
  ShortText/Description
- displaying replay symbols only if information is actually available
- exchanged x, y, width, height with x1, y1, x2, y2 coordinates
  (skin version is now 0.0.3)
- coordinates may be negative to respect dynamic OSD settings
  (negative coordinates give pixels from the right or bottom edge)
- added base parameter to Skin item to be able to use full screen in absolute
  mode
- added a script to convert 0.0.2 skins to 0.0.3
- added parsing quoted texts (path="Bla.jpg" etc. will work correctly now)
- fixed translator to escape the dollar sign
- fixed display of scrollbar (REALLY!)
- fixed linkage of libMagick++

1 files changed, 16 insertions, 7 deletions

diff --git a/data.h b/data.h
index 17ab6bf..3e60e05 100644
--- a/data.h
+++ b/data.h
@@ -1,5 +1,5 @@
 /*
- * $Id: data.h,v 1.16 2004/06/12 18:00:05 lordjaxom Exp $
+ * $Id: data.h,v 1.17 2004/06/22 16:48:03 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_DATA_H
@@ -12,13 +12,11 @@
 #include <vdr/config.h>
 
 class cText2SkinItem {
-	friend class cText2SkinRender;
-
 private:
 	eSkinItem       mItem;
 	eSkinDisplay    mDisplay;
-	POINT           mPos;
-	SIZE            mSize;
+	POINT           mPos1;
+	POINT           mPos2;
 	int             mBpp;
 	int             mArc;
 	int             mAlpha;
@@ -33,6 +31,7 @@ private:
 	string          mType;
 	string          mFormat;
 	eTextAlignment  mAlign;
+	eBaseCoordinate mBase;
 
 protected:
 	bool ParseItem(const char *Text);
@@ -43,10 +42,16 @@ public:
 
 	bool Parse(const char *Text);
 
+	// writeables
+	POINT          &Pos1(void)          { return mPos1; }
+	POINT          &Pos2(void)          { return mPos2; }
+
+	// readables
 	eSkinItem       Item(void)    const { return mItem; }
 	eSkinDisplay    Display(void) const { return mDisplay; }
-	const POINT    &Pos(void)     const { return mPos; }
-	const SIZE     &Size(void)    const { return mSize; }
+	eBaseCoordinate Base(void)    const { return mBase; }
+	const POINT    &Pos1(void)    const { return mPos1; }
+	const POINT    &Pos2(void)    const { return mPos2; }
 	int             Bpp(void)     const { return mBpp; }
 	int             Arc(void)     const { return mArc; }
 	int             Alpha(void)   const { return mAlpha; }
@@ -61,6 +66,10 @@ public:
 	const string   &Type(void)    const { return mType; }
 	const string   &Format(void)  const { return mFormat; }
 	eTextAlignment  Align(void)   const { return mAlign; }
+
+	// auto-conversion
+	const POINT     Pos(void)     const;
+	const SIZE      Size(void)    const;
 };
 
 class cText2SkinData: public cText2SkinFile {