mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
fixed some bugs
This commit is contained in:
parent
97cbc1080d
commit
8ef68f8ab8
@ -479,6 +479,7 @@ cLeMenuSchedules::cLeMenuSchedules(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cLeMenuSchedules::cLeMenuSchedules(const cLeMenuSchedules &other) : cListElement(other) {
|
cLeMenuSchedules::cLeMenuSchedules(const cLeMenuSchedules &other) : cListElement(other) {
|
||||||
|
currentSchedules = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
cLeMenuSchedules::~cLeMenuSchedules(void) {
|
cLeMenuSchedules::~cLeMenuSchedules(void) {
|
||||||
@ -789,6 +790,7 @@ cLeMenuChannels::cLeMenuChannels(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cLeMenuChannels::cLeMenuChannels(const cLeMenuChannels &other) : cListElement(other) {
|
cLeMenuChannels::cLeMenuChannels(const cLeMenuChannels &other) : cListElement(other) {
|
||||||
|
currentChannel = NULL;
|
||||||
channel = NULL;
|
channel = NULL;
|
||||||
withProvider = false;
|
withProvider = false;
|
||||||
}
|
}
|
||||||
@ -1061,6 +1063,11 @@ cLeMenuTimers::cLeMenuTimers(void) {
|
|||||||
timer = NULL;
|
timer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cLeMenuTimers::cLeMenuTimers(const cLeMenuTimers &other) : cListElement(other) {
|
||||||
|
currentTimer = NULL;
|
||||||
|
timer = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
cLeMenuTimers::~cLeMenuTimers(void) {
|
cLeMenuTimers::~cLeMenuTimers(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1326,6 +1333,14 @@ cLeMenuRecordings::cLeMenuRecordings(void) {
|
|||||||
New = 0;
|
New = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cLeMenuRecordings::cLeMenuRecordings(const cLeMenuRecordings &other) : cListElement(other) {
|
||||||
|
currentRecording = NULL;
|
||||||
|
recording = NULL;
|
||||||
|
level = 0;
|
||||||
|
total = 0;
|
||||||
|
New = 0;
|
||||||
|
}
|
||||||
|
|
||||||
cLeMenuRecordings::~cLeMenuRecordings(void) {
|
cLeMenuRecordings::~cLeMenuRecordings(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1722,6 +1737,12 @@ cLeMenuPlugin::cLeMenuPlugin(void) {
|
|||||||
plugMenuId = -1;
|
plugMenuId = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cLeMenuPlugin::cLeMenuPlugin(const cLeMenuPlugin &other) : cListElement(other) {
|
||||||
|
currentPlugin = NULL;
|
||||||
|
plugId = -1;
|
||||||
|
plugMenuId = -1;
|
||||||
|
}
|
||||||
|
|
||||||
cLeMenuPlugin::~cLeMenuPlugin(void) {
|
cLeMenuPlugin::~cLeMenuPlugin(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,6 +217,7 @@ private:
|
|||||||
const cTimer *timer;
|
const cTimer *timer;
|
||||||
public:
|
public:
|
||||||
cLeMenuTimers(void);
|
cLeMenuTimers(void);
|
||||||
|
cLeMenuTimers(const cLeMenuTimers &other);
|
||||||
virtual ~cLeMenuTimers(void);
|
virtual ~cLeMenuTimers(void);
|
||||||
void SetTokenContainer(void);
|
void SetTokenContainer(void);
|
||||||
void SetCurrentElement(cCeMenuTimers *cur) { currentTimer = cur; currentElement = (cViewElement*)cur; };
|
void SetCurrentElement(cCeMenuTimers *cur) { currentTimer = cur; currentElement = (cViewElement*)cur; };
|
||||||
@ -255,6 +256,7 @@ private:
|
|||||||
char *FolderName(const char *path, int level);
|
char *FolderName(const char *path, int level);
|
||||||
public:
|
public:
|
||||||
cLeMenuRecordings(void);
|
cLeMenuRecordings(void);
|
||||||
|
cLeMenuRecordings(const cLeMenuRecordings &other);
|
||||||
virtual ~cLeMenuRecordings(void);
|
virtual ~cLeMenuRecordings(void);
|
||||||
void SetTokenContainer(void);
|
void SetTokenContainer(void);
|
||||||
void SetCurrentElement(cCeMenuRecordings *cur) { currentRecording = cur; currentElement = (cViewElement*)cur; };
|
void SetCurrentElement(cCeMenuRecordings *cur) { currentRecording = cur; currentElement = (cViewElement*)cur; };
|
||||||
@ -292,6 +294,7 @@ private:
|
|||||||
cCeMenuPlugin *currentPlugin;
|
cCeMenuPlugin *currentPlugin;
|
||||||
public:
|
public:
|
||||||
cLeMenuPlugin(void);
|
cLeMenuPlugin(void);
|
||||||
|
cLeMenuPlugin(const cLeMenuPlugin &other);
|
||||||
virtual ~cLeMenuPlugin(void);
|
virtual ~cLeMenuPlugin(void);
|
||||||
void SetTokenContainer(void);
|
void SetTokenContainer(void);
|
||||||
void SetPlugId(int id) { plugId = id; };
|
void SetPlugId(int id) { plugId = id; };
|
||||||
|
@ -143,25 +143,29 @@ bool cView::ValidViewList(const char *viewList) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cView::PreCache(void) {
|
void cView::PreCache(void) {
|
||||||
if (container.Width() == 0) {
|
bool rootView = (container.Width() == 0) ? true : false;
|
||||||
|
if (rootView) {
|
||||||
SetContainer(0, 0, cOsd::OsdWidth(), cOsd::OsdHeight());
|
SetContainer(0, 0, cOsd::OsdWidth(), cOsd::OsdHeight());
|
||||||
attribs->SetContainer(0, 0, cOsd::OsdWidth(), cOsd::OsdHeight());
|
attribs->SetContainer(0, 0, cOsd::OsdWidth(), cOsd::OsdHeight());
|
||||||
attribs->Cache();
|
attribs->Cache();
|
||||||
|
rootView = true;
|
||||||
}
|
}
|
||||||
//set frame for scaling tv picture
|
//set frame for scaling tv picture
|
||||||
tvFrame = attribs->TvFrame();
|
tvFrame = attribs->TvFrame();
|
||||||
//cache viewelements
|
//cache viewelements
|
||||||
|
int contX = rootView ? 0 : ((attribs->X() > -1) ? attribs->X() : 0);
|
||||||
|
int contY = rootView ? 0 : ((attribs->Y() > -1) ? attribs->Y() : 0);
|
||||||
for (int i=0; i < numViewElements; i++) {
|
for (int i=0; i < numViewElements; i++) {
|
||||||
if (!viewElements[i])
|
if (!viewElements[i])
|
||||||
continue;
|
continue;
|
||||||
viewElements[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());
|
viewElements[i]->SetContainer(contX, contY, attribs->Width(), attribs->Height());
|
||||||
viewElements[i]->Cache();
|
viewElements[i]->Cache();
|
||||||
}
|
}
|
||||||
if (viewElementsHorizontal) {
|
if (viewElementsHorizontal) {
|
||||||
for (int i=0; i < numViewElements; i++) {
|
for (int i=0; i < numViewElements; i++) {
|
||||||
if (!viewElementsHorizontal[i])
|
if (!viewElementsHorizontal[i])
|
||||||
continue;
|
continue;
|
||||||
viewElementsHorizontal[i]->SetContainer(0, 0, attribs->Width(), attribs->Height());
|
viewElementsHorizontal[i]->SetContainer(contX, contY, attribs->Width(), attribs->Height());
|
||||||
viewElementsHorizontal[i]->Cache();
|
viewElementsHorizontal[i]->Cache();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -287,6 +291,7 @@ void cView::Flush(void) {
|
|||||||
|
|
||||||
void cView::Debug(void) {
|
void cView::Debug(void) {
|
||||||
esyslog("skindesigner: ---> view %s", viewName);
|
esyslog("skindesigner: ---> view %s", viewName);
|
||||||
|
attribs->Debug();
|
||||||
for (int i=0; i < numViewElements; i++) {
|
for (int i=0; i < numViewElements; i++) {
|
||||||
if (!viewElements[i])
|
if (!viewElements[i])
|
||||||
continue;
|
continue;
|
||||||
|
@ -1552,6 +1552,7 @@ void cViewMenuDetail::SetPluginText(skindesignerapi::cTokenContainer *tk) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cViewMenuDetail::Clear(void) {
|
void cViewMenuDetail::Clear(void) {
|
||||||
|
cSubView::Clear();
|
||||||
cSubView::Close();
|
cSubView::Close();
|
||||||
if (detailedheaderEpg) {
|
if (detailedheaderEpg) {
|
||||||
detailedheaderEpg->Close();
|
detailedheaderEpg->Close();
|
||||||
@ -1569,6 +1570,7 @@ void cViewMenuDetail::Clear(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cViewMenuDetail::Close(void) {
|
void cViewMenuDetail::Close(void) {
|
||||||
|
cSubView::Clear();
|
||||||
cSubView::Close();
|
cSubView::Close();
|
||||||
if (detailView) {
|
if (detailView) {
|
||||||
detailView->Close();
|
detailView->Close();
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user