- fixed VPSTime which was displayed on channels that didn't even have VPSv0.0.3

- fixed Symbols in channel display when viewing a group
- fixed text translation if no translation is present
- fixed compile error with gcc 3.4 (thanks to Gregoire Favre for reporting this)
- restructured Skin (now the official Skin version is 0.0.2)
  it is now possible to control visibility of all items
- added a script to convert 0.0.1 themes to 0.0.2
- added support for animated logos (mng or gif files) ONLY IMAGEMAGICK!!!
- added finnish language translations (thanks to Rolf Ahrenberg)

1 files changed, 3 insertions, 100 deletions

diff --git a/data.h b/data.h
index 78ac8da..ae66568 100644
--- a/data.h
+++ b/data.h
@@ -1,5 +1,5 @@
 /*
- * $Id: data.h,v 1.14 2004/06/07 19:08:42 lordjaxom Exp $
+ * $Id: data.h,v 1.15 2004/06/11 15:01:58 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_DATA_H
@@ -11,107 +11,12 @@
 #include <vdr/osd.h>
 #include <vdr/config.h>
 
-// sections and items known by skin files
-
-enum eSkinSection {
-	sectionSkin,
-	sectionChannelSmall,
-	sectionChannel,
-	sectionVolume,
-	sectionReplayMode,
-	sectionReplay,
-	sectionMessage,
-	sectionMenu,
-	__SECTION_COUNT__
-};
-
-enum eSkinItem {
-	itemUnknown,
-	itemSkin, // item identifying the Skin itself
-	itemBackground,
-	itemText,
-	itemImage,
-	itemRectangle,
-	itemEllipse,
-	itemSlope,
-	itemDateTime,
-	itemDate,
-	itemTime,
-	itemChannelLogo,
-	itemChannelNumberName,
-	itemChannelNumber,
-	itemChannelName,
-	itemLanguage,
-	itemTimebar,
-	itemPresentTime,
-	itemPresentTitle,
-	itemPresentShortText,
-	itemFollowingTime,
-	itemFollowingTitle,
-	itemFollowingShortText,
-	itemSymbolTeletext,
-	itemSymbolAudio,
-	itemSymbolDolby,
-	itemSymbolEncrypted,
-	itemSymbolRecording,
-	itemSymbolRadio,
-	itemVolumebar,
-	itemMute,
-	itemReplaybar,
-	itemReplayTitle,
-	itemReplayCurrent,
-	itemReplayTotal,
-	itemReplayJump,
-	itemSymbolPlay,
-	itemSymbolPause,
-	itemSymbolFastFwd,
-	itemSymbolFastRew,
-	itemSymbolSlowFwd,
-	itemSymbolSlowRew,
-	itemMessageStatus,
-	itemMessageInfo,
-	itemMessageWarning,
-	itemMessageError,
-	itemMenuArea,
-	itemMenuItem,
-	itemMenuCurrent,
-	itemMenuTitle,
-	itemMenuRed,
-	itemMenuGreen,
-	itemMenuYellow,
-	itemMenuBlue,
-	itemMenuText,
-	itemSymbolScrollUp,
-	itemSymbolScrollDown,
-	itemMenuEventTitle,
-	itemMenuEventShortText,
-	itemMenuEventDescription,
-	itemMenuEventTime,
-	itemSymbolEventRunning,
-	itemSymbolEventTimer,
-	itemSymbolEventVPS,
-	itemMenuRecording,
-	itemMenuEventEndTime,
-	itemMenuEventVPSTime,
-	itemMenuEventDate,
-	itemMenuEventDateTimeF,
-	itemDateTimeF,
-	__ITEM_COUNT__
-};
-
-struct POINT {
-	int x, y;
-};
-
-struct SIZE {
-	int w, h;
-};
-
 class cText2SkinItem {
 	friend class cText2SkinRender;
 
 private:
 	eSkinItem       mItem;
+	eSkinDisplay    mDisplay;
 	POINT           mPos;
 	SIZE            mSize;
 	int             mBpp;
@@ -138,6 +43,7 @@ public:
 	bool Parse(const char *Text);
 
 	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; }
 	int             Bpp(void)     const { return mBpp; }
@@ -160,9 +66,6 @@ public:
 	typedef vector<cText2SkinItem*> tSection;
 	typedef tSection::iterator      tIterator;
 
-	static const string SectionNames[__SECTION_COUNT__];
-	static const string ItemNames[__ITEM_COUNT__];
-
 private:
 	eSkinSection mCurrentSection;
 	tSection mSections[__SECTION_COUNT__];