- implemented image loading through ImageMagick (fixes crashes when runningv0.0.1-rc4

  together with GraphTFT)
- implemented Theme support (see file demo.colors in the demo skin)
- implemented translations for texts used in skins (see file demo.trans in the
  demo skin)

1 files changed, 8 insertions, 13 deletions

diff --git a/display.h b/display.h
index 85e2a7f..e7d7926 100644
--- a/display.h
+++ b/display.h
@@ -1,26 +1,25 @@
 /*
- * $Id: display.h,v 1.2 2004/05/31 19:54:12 lordjaxom Exp $
+ * $Id: display.h,v 1.3 2004/06/02 20:43:05 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_SKIN_H
 #define VDR_TEXT2SKIN_SKIN_H
 
-#define __STL_CONFIG_H
+#include "common.h"
 #include <vdr/skins.h>
-#undef __STL_CONFIG_H
 
 class cText2SkinData;
+class cText2SkinI18n;
 class cText2SkinRender;
 
 class cText2SkinDisplayChannel: public cSkinDisplayChannel {
 private:
-	cText2SkinData   *mData;
 	bool              mWithInfo;
 	cText2SkinRender *mRender;
 	bool              mDirty;
 
 public:
-	cText2SkinDisplayChannel(cText2SkinData *Data, bool WithInfo);
+	cText2SkinDisplayChannel(cText2SkinData *Data, cText2SkinI18n *I18n, cText2SkinTheme *Theme, bool WithInfo);
 	virtual ~cText2SkinDisplayChannel();
 
 	virtual void SetChannel(const cChannel *Channel, int Number);
@@ -31,12 +30,11 @@ public:
 
 class cText2SkinDisplayVolume: public cSkinDisplayVolume {
 private:
-	cText2SkinData   *mData;
 	cText2SkinRender *mRender;
 	bool              mDirty;
 
 public:
-	cText2SkinDisplayVolume(cText2SkinData *Data);
+	cText2SkinDisplayVolume(cText2SkinData *Data, cText2SkinI18n *I18n, cText2SkinTheme *Theme);
 	virtual ~cText2SkinDisplayVolume();
 	virtual void SetVolume(int Current, int Total, bool Mute);
 	virtual void Flush(void);
@@ -44,11 +42,10 @@ public:
 
 class cText2SkinDisplayReplay: public cSkinDisplayReplay {
 private:
-	cText2SkinData   *mData;
 	cText2SkinRender *mRender;
 	bool              mDirty;
 public:
-	cText2SkinDisplayReplay(cText2SkinData *Data, bool ModeOnly);
+	cText2SkinDisplayReplay(cText2SkinData *Data, cText2SkinI18n *I18n, cText2SkinTheme *Theme, bool ModeOnly);
 	virtual ~cText2SkinDisplayReplay();
 	virtual void SetTitle(const char *Title);
 	virtual void SetMode(bool Play, bool Forward, int Speed);
@@ -63,12 +60,11 @@ public:
 
 class cText2SkinDisplayMessage: public cSkinDisplayMessage {
 private:
-	cText2SkinData   *mData;
 	cText2SkinRender *mRender;
 	bool              mDirty;
 
 public:
-	cText2SkinDisplayMessage(cText2SkinData *Data);
+	cText2SkinDisplayMessage(cText2SkinData *Data, cText2SkinI18n *I18n, cText2SkinTheme *Theme);
 	virtual ~cText2SkinDisplayMessage();
 	virtual void SetMessage(eMessageType Type, const char *Text);
 	virtual void Flush(void);
@@ -76,13 +72,12 @@ public:
 
 class cText2SkinDisplayMenu: public cSkinDisplayMenu {
 private:
-	cText2SkinData   *mData;
 	cText2SkinRender *mRender;
 	bool              mDirty;
 	int               mMaxItems;
 
 public:
-	cText2SkinDisplayMenu(cText2SkinData *Data);
+	cText2SkinDisplayMenu(cText2SkinData *Data, cText2SkinI18n *I18n, cText2SkinTheme *Theme);
 	virtual ~cText2SkinDisplayMenu();
 
   virtual int MaxItems(void) { return mMaxItems; }