fixed epgpics in detailedepgview

This commit is contained in:
louis 2016-02-06 10:33:18 +01:00
parent 7c6167a79e
commit 86d3df4223
4 changed files with 1109 additions and 1095 deletions

View File

@ -92,7 +92,7 @@ void cDesignerConfig::ReadSkinFolder(cString &skinFolder, vector<string> *contai
while (dirEntry = readdir(folder)) { while (dirEntry = readdir(folder)) {
string dirEntryName = dirEntry->d_name; string dirEntryName = dirEntry->d_name;
int dirEntryType = dirEntry->d_type; int dirEntryType = dirEntry->d_type;
if (!dirEntryName.compare(".") || !dirEntryName.compare("..") || !dirEntryName.compare("skinrepositories") || dirEntryType != DT_DIR) if (!dirEntryName.compare(".") || !dirEntryName.compare("..") || !dirEntryName.compare("skinrepositories") || (dirEntryType != DT_DIR && dirEntryType != DT_LNK))
continue; continue;
container->push_back(dirEntryName); container->push_back(dirEntryName);
} }

View File

@ -1234,9 +1234,9 @@ enum class eDmDetailedEpgIT {
channelnumber, channelnumber,
channellogoexists, channellogoexists,
hasreruns, hasreruns,
epgpic1avaialble, epgpic1available,
epgpic2avaialble, epgpic2available,
epgpic3avaialble, epgpic3available,
count count
}; };

File diff suppressed because it is too large Load Diff

View File

@ -1,114 +1,115 @@
#ifndef __VIEWDETAIL_H #ifndef __VIEWDETAIL_H
#define __VIEWDETAIL_H #define __VIEWDETAIL_H
#include "../services/epgsearch.h" #include "../services/epgsearch.h"
#include "../extensions/scrapmanager.h" #include "../extensions/scrapmanager.h"
#include "viewelement.h" #include "viewelement.h"
/****************************************************************** /******************************************************************
* cViewDetail * cViewDetail
******************************************************************/ ******************************************************************/
class cViewDetail : public cViewElement, public cScrapManager { class cViewDetail : public cViewElement, public cScrapManager {
protected: protected:
int plugId; int plugId;
int plugMenuId; int plugMenuId;
cArea *activeTab; cArea *activeTab;
int activeTabIndex; int activeTabIndex;
int numTabs; int numTabs;
void SetActiveTab(void); void SetActiveTab(void);
public: public:
cViewDetail(void); cViewDetail(void);
virtual ~cViewDetail(void); virtual ~cViewDetail(void);
void SetPlugId(int id) { plugId = id; }; void SetPlugId(int id) { plugId = id; };
void SetPlugMenuId(int id) { plugMenuId = id; }; void SetPlugMenuId(int id) { plugMenuId = id; };
int GetWidth(void); int GetWidth(void);
void ResetTabs(void); void ResetTabs(void);
void Clear(void); void Clear(void);
void Close(void); void Close(void);
void Render(void); void Render(void);
void Scrollbar(int &barheight, int &offset, bool &end); void Scrollbar(int &barheight, int &offset, bool &end);
bool ScrollUp(bool page = false); bool ScrollUp(bool page = false);
bool ScrollDown(bool page = false); bool ScrollDown(bool page = false);
int GetTabs(vector<const char*> &tabs); int GetTabs(vector<const char*> &tabs);
int NumTabs(void) { return numTabs; }; int NumTabs(void) { return numTabs; };
int ActiveTab(void) { return activeTabIndex; }; int ActiveTab(void) { return activeTabIndex; };
void NextTab(void); void NextTab(void);
void PrevTab(void); void PrevTab(void);
void SetTransparency(int transparency, bool forceDetached = false); void SetTransparency(int transparency, bool forceDetached = false);
}; };
/****************************************************************** /******************************************************************
* cViewDetailEpg * cViewDetailEpg
******************************************************************/ ******************************************************************/
class cViewDetailEpg : public cViewDetail { class cViewDetailEpg : public cViewDetail {
protected: protected:
const cEvent *event; const cEvent *event;
int rerunsIndex; int rerunsIndex;
int actorsIndex; int actorsIndex;
cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *LoadReruns(void); cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *LoadReruns(void);
int NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns); int NumReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);
void SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns); void SetReruns(cList<Epgsearch_searchresults_v1_0::cServiceSearchResult> *reruns);
public: void SetEpgPictures(int eventId);
cViewDetailEpg(void); public:
virtual ~cViewDetailEpg(void); cViewDetailEpg(void);
void SetTokenContainer(void); virtual ~cViewDetailEpg(void);
void SetEvent(const cEvent *event) { this->event = event; }; void SetTokenContainer(void);
bool Parse(bool forced = false); void SetEvent(const cEvent *event) { this->event = event; };
}; bool Parse(bool forced = false);
/****************************************************************** };
* cViewDetailRec /******************************************************************
******************************************************************/ * cViewDetailRec
class cViewDetailRec : public cViewDetail { ******************************************************************/
protected: class cViewDetailRec : public cViewDetail {
const cRecording *recording; protected:
int actorsIndex; const cRecording *recording;
void SetRecInfos(void); int actorsIndex;
int ReadSizeVdr(const char *strPath); void SetRecInfos(void);
string StripXmlTag(string &Line, const char *Tag); int ReadSizeVdr(const char *strPath);
void SetRecordingImages(const char *recPath); string StripXmlTag(string &Line, const char *Tag);
public: void SetRecordingImages(const char *recPath);
cViewDetailRec(void); public:
virtual ~cViewDetailRec(void); cViewDetailRec(void);
void SetTokenContainer(void); virtual ~cViewDetailRec(void);
void SetRecording(const cRecording *recording) { this->recording = recording; }; void SetTokenContainer(void);
bool Parse(bool forced = false); void SetRecording(const cRecording *recording) { this->recording = recording; };
}; bool Parse(bool forced = false);
/****************************************************************** };
* cViewDetailText /******************************************************************
******************************************************************/ * cViewDetailText
class cViewDetailText : public cViewDetail { ******************************************************************/
protected: class cViewDetailText : public cViewDetail {
const char *text; protected:
public: const char *text;
cViewDetailText(void); public:
virtual ~cViewDetailText(void); cViewDetailText(void);
void SetTokenContainer(void); virtual ~cViewDetailText(void);
void SetText(const char *text) { this->text = text; }; void SetTokenContainer(void);
bool Parse(bool forced = false); void SetText(const char *text) { this->text = text; };
}; bool Parse(bool forced = false);
};
/******************************************************************
* cViewDetailPlugin /******************************************************************
******************************************************************/ * cViewDetailPlugin
class cViewDetailPlugin : public cViewDetail { ******************************************************************/
protected: class cViewDetailPlugin : public cViewDetail {
public: protected:
cViewDetailPlugin(void); public:
virtual ~cViewDetailPlugin(void); cViewDetailPlugin(void);
void SetTokenContainer(void); virtual ~cViewDetailPlugin(void);
void Set(skindesignerapi::cTokenContainer *tk); void SetTokenContainer(void);
bool Parse(bool forced = false); void Set(skindesignerapi::cTokenContainer *tk);
}; bool Parse(bool forced = false);
};
/******************************************************************
* cViewDetailAdvancedPlugin /******************************************************************
******************************************************************/ * cViewDetailAdvancedPlugin
class cViewDetailAdvancedPlugin : public cViewDetail { ******************************************************************/
protected: class cViewDetailAdvancedPlugin : public cViewDetail {
int plugViewId; protected:
public: int plugViewId;
cViewDetailAdvancedPlugin(int viewId, int plugId); public:
virtual ~cViewDetailAdvancedPlugin(void); cViewDetailAdvancedPlugin(int viewId, int plugId);
void SetTokenContainer(void); virtual ~cViewDetailAdvancedPlugin(void);
void Set(skindesignerapi::cTokenContainer *tk); void SetTokenContainer(void);
bool Parse(bool forced = false); void Set(skindesignerapi::cTokenContainer *tk);
}; bool Parse(bool forced = false);
};
#endif //__VIEWDETAIL_H #endif //__VIEWDETAIL_H