diff --git a/recmenuitem.c b/recmenuitem.c index eb931e9..082ec4c 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -46,13 +46,14 @@ void cRecMenuItem::setBackground(void) { // --- cRecMenuItemButton ------------------------------------------------------- -cRecMenuItemButton::cRecMenuItemButton(const char *text, eRecMenuState action, bool active, bool halfWidth) { +cRecMenuItemButton::cRecMenuItemButton(const char *text, eRecMenuState action, bool active, bool halfWidth, bool alignLeft) { selectable = true; this->text = text; this->action = action; this->active = active; height = 3 * font->Height() / 2; this->halfWidth = halfWidth; + this->alignLeft = alignLeft; } cRecMenuItemButton::~cRecMenuItemButton(void) { @@ -75,7 +76,11 @@ void cRecMenuItemButton::SetPixmaps(void) { void cRecMenuItemButton::Draw(void) { int y = (height - font->Height()) / 2; - int x = (width - font->Width(*text)) / 2;; + int x; + if (!alignLeft) + x = (width - font->Width(*text)) / 2; + else + x = 10; pixmap->DrawText(cPoint(x, y), *text, colorText, colorTextBack, font); } diff --git a/recmenuitem.h b/recmenuitem.h index 7162f70..09fbbec 100644 --- a/recmenuitem.h +++ b/recmenuitem.h @@ -97,8 +97,9 @@ class cRecMenuItemButton : public cRecMenuItem { private: cString text; bool halfWidth; + bool alignLeft; public: - cRecMenuItemButton(const char *text, eRecMenuState action, bool active, bool halfWidth = false); + cRecMenuItemButton(const char *text, eRecMenuState action, bool active, bool halfWidth = false, bool alignLeft = false); virtual ~cRecMenuItemButton(void); int GetWidth(void); void SetPixmaps(void); diff --git a/recmenus.c b/recmenus.c index 62cf238..0327a10 100644 --- a/recmenus.c +++ b/recmenus.c @@ -76,12 +76,12 @@ public: infoItem->CalculateHeight(width - 2 * border); SetHeader(infoItem); - AddMenuItemScroll(new cRecMenuItemButton(tr("root video folder"), nextAction, true, false)); + AddMenuItemScroll(new cRecMenuItemButton(tr("root video folder"), nextAction, true, false, true)); readFolders(NULL, ""); int numFolders = folders.size(); for (int i=0; i < numFolders; i++) { - AddMenuItemScroll(new cRecMenuItemButton(*folders[i], nextAction, false, false)); + AddMenuItemScroll(new cRecMenuItemButton(*folders[i], nextAction, false, false, true)); if (!CheckHeight()) break; } @@ -92,10 +92,10 @@ public: }; cRecMenuItem *GetMenuItem(int number) { if (number == 0) { - cRecMenuItem *result = new cRecMenuItemButton(tr("root video folder"), rmsInstantRecord, false, false); + cRecMenuItem *result = new cRecMenuItemButton(tr("root video folder"), rmsInstantRecord, false, false, true); return result; } else if ((number > 0) && (number < folders.size()+1)) { - cRecMenuItem *result = new cRecMenuItemButton(*folders[number-1], rmsInstantRecord, false, false); + cRecMenuItem *result = new cRecMenuItemButton(*folders[number-1], rmsInstantRecord, false, false, true); return result; } return NULL;