diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 20a3ff6fd..c9abdc12c 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -272,7 +272,7 @@ void CMovieBrowser::clearListLines() m_browserListLines.Icon.clear(); m_browserListLines.marked.clear(); - for (int i = 0; i < 2; i++) + for (int i = 0; i < 3; i++) { m_recordListLines.lineArray[i].clear(); m_playListLines.lineArray[i].clear(); @@ -536,21 +536,29 @@ void CMovieBrowser::initRows(void) { //TRACE("[mb]->%s\n", __func__); + /* + The "last played" / "last recorded" windows have only half the width, so + multiply the relative width with 2 and add 1 percent for safety to date row. + This addition is just usefull for l a r g e font settings. + */ + /***** Last Play List **************/ - m_settings.lastPlayRowNr = 2; + m_settings.lastPlayRowNr = 3; m_settings.lastPlayRow[0] = MB_INFO_TITLE; - m_settings.lastPlayRow[1] = MB_INFO_PREVPLAYDATE; - /* the "last played" / "last recorded" windows have only half the width, so - multiply the relative width with 2 */ - m_settings.lastPlayRowWidth[1] = m_defaultRowWidth[m_settings.lastPlayRow[1]] * 2 + 1; - m_settings.lastPlayRowWidth[0] = 100 - m_settings.lastPlayRowWidth[1]; + m_settings.lastPlayRow[1] = MB_INFO_SPACER; + m_settings.lastPlayRow[2] = MB_INFO_PREVPLAYDATE; + m_settings.lastPlayRowWidth[2] = m_defaultRowWidth[m_settings.lastPlayRow[2]] * 2 + 1; + m_settings.lastPlayRowWidth[1] = m_defaultRowWidth[m_settings.lastPlayRow[1]] * 2; + m_settings.lastPlayRowWidth[0] = 100 - m_settings.lastPlayRowWidth[1] - m_settings.lastPlayRowWidth[2]; /***** Last Record List **************/ - m_settings.lastRecordRowNr = 2; + m_settings.lastRecordRowNr = 3; m_settings.lastRecordRow[0] = MB_INFO_TITLE; - m_settings.lastRecordRow[1] = MB_INFO_RECORDDATE; - m_settings.lastRecordRowWidth[1] = m_defaultRowWidth[m_settings.lastRecordRow[1]] * 2 + 1; - m_settings.lastRecordRowWidth[0] = 100 - m_settings.lastRecordRowWidth[1]; + m_settings.lastRecordRow[1] = MB_INFO_SPACER; + m_settings.lastRecordRow[2] = MB_INFO_RECORDDATE; + m_settings.lastRecordRowWidth[2] = m_defaultRowWidth[m_settings.lastRecordRow[2]] * 2 + 1; + m_settings.lastRecordRowWidth[1] = m_defaultRowWidth[m_settings.lastRecordRow[1]] * 2; + m_settings.lastRecordRowWidth[0] = 100 - m_settings.lastRecordRowWidth[1] - m_settings.lastRecordRowWidth[2]; } void CMovieBrowser::defaultSettings(MB_SETTINGS* /*settings*/) diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h index 41dfc1d7d..aefffc146 100644 --- a/src/gui/moviebrowser/mb.h +++ b/src/gui/moviebrowser/mb.h @@ -67,10 +67,6 @@ #define MAX_BROWSER_FRAME_HEIGHT 80 // void strReplace(std::string& orig, const char* fstr, const std::string &rstr); - - - - #define MB_MAX_ROWS LF_MAX_ROWS #define MB_MAX_DIRS NETWORK_NFS_NR_OF_ENTRIES /* MB_SETTINGS to be stored in g_settings anytime ....*/ @@ -94,22 +90,24 @@ typedef struct int browser_serie_mode; int serie_auto_create; + /* these variables are used for the listframes */ int browserFrameHeight; int browserRowNr; - MB_INFO_ITEM browserRowItem[MB_MAX_ROWS];//MB_INFO_ITEM + MB_INFO_ITEM browserRowItem[MB_MAX_ROWS]; int browserRowWidth[MB_MAX_ROWS]; // to be added to config later int lastPlayMaxItems; int lastPlayRowNr; - MB_INFO_ITEM lastPlayRow[2]; - int lastPlayRowWidth[2]; + MB_INFO_ITEM lastPlayRow[3]; + int lastPlayRowWidth[3]; int lastRecordMaxItems; int lastRecordRowNr; - MB_INFO_ITEM lastRecordRow[2]; - int lastRecordRowWidth[2]; + MB_INFO_ITEM lastRecordRow[3]; + int lastRecordRowWidth[3]; + int ytmode; int ytorderby; int ytresults;