mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

moviebrowser: add switch for cut of text inside rows, default enabled

Browse Source
This commit is contained in:
Thilo Graf
2019-05-05 14:14:34 +02:00
parent 826986d088
commit 0a93d97daa
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/moviebrowser/mb.cpp
View File

@@ -464,6 +464,7 @@ void CMovieBrowser::initGlobalSettings(void)
/***** Browser List **************/ /***** Browser List **************/
m_settings.browserFrameHeight = 65; /* percent */ m_settings.browserFrameHeight = 65; /* percent */
m_settings.browserCutLongRowText = 1;
m_settings.browserRowNr = 7; m_settings.browserRowNr = 7;
m_settings.browserRowItem[0] = MB_INFO_TITLE; m_settings.browserRowItem[0] = MB_INFO_TITLE;
@@ -650,6 +651,7 @@ bool CMovieBrowser::loadSettings(MB_SETTINGS* settings)
} }
/* these variables are used for the listframes */ /* these variables are used for the listframes */
settings->browserFrameHeight = configfile.getInt32("mb_browserFrameHeight", 50); settings->browserFrameHeight = configfile.getInt32("mb_browserFrameHeight", 50);
settings->browserCutLongRowText = configfile.getInt32("mb_browserCutLongRowText", 1);
settings->browserRowNr = configfile.getInt32("mb_browserRowNr", 0); settings->browserRowNr = configfile.getInt32("mb_browserRowNr", 0);
for (int i = 0; i < MB_MAX_ROWS && i < settings->browserRowNr; i++) for (int i = 0; i < MB_MAX_ROWS && i < settings->browserRowNr; i++)
{ {
@@ -717,6 +719,8 @@ bool CMovieBrowser::saveSettings(MB_SETTINGS* settings)
} }
/* these variables are used for the listframes */ /* these variables are used for the listframes */
configfile.setInt32("mb_browserFrameHeight", settings->browserFrameHeight); configfile.setInt32("mb_browserFrameHeight", settings->browserFrameHeight);
configfile.setInt32("mb_browserCutLongRowText", settings->browserCutLongRowText);
configfile.setInt32("mb_browserRowNr",settings->browserRowNr); configfile.setInt32("mb_browserRowNr",settings->browserRowNr);
for (int i = 0; i < MB_MAX_ROWS && i < settings->browserRowNr; i++) for (int i = 0; i < MB_MAX_ROWS && i < settings->browserRowNr; i++)
{ {
@@ -1799,6 +1803,7 @@ void CMovieBrowser::refreshLastPlayList(void) //P2
m_playListLines.marked.push_back(m_vHandlePlayList[handle]->marked); m_playListLines.marked.push_back(m_vHandlePlayList[handle]->marked);
} }
m_pcLastPlay->setLines(&m_playListLines); m_pcLastPlay->setLines(&m_playListLines);
m_pcLastPlay->cutRowText(&m_settings.browserCutLongRowText);
m_currentPlaySelection = m_pcLastPlay->getSelectedLine(); m_currentPlaySelection = m_pcLastPlay->getSelectedLine();
// update selected movie if browser is in the focus // update selected movie if browser is in the focus
@@ -1857,6 +1862,7 @@ void CMovieBrowser::refreshLastRecordList(void) //P2
} }
m_pcLastRecord->setLines(&m_recordListLines); m_pcLastRecord->setLines(&m_recordListLines);
m_pcLastRecord->cutRowText(&m_settings.browserCutLongRowText);
m_currentRecordSelection = m_pcLastRecord->getSelectedLine(); m_currentRecordSelection = m_pcLastRecord->getSelectedLine();
// update selected movie if browser is in the focus // update selected movie if browser is in the focus
@@ -1952,6 +1958,7 @@ void CMovieBrowser::refreshBrowserList(void) //P1
m_browserListLines.marked.push_back(m_vHandleBrowserList[handle]->marked); m_browserListLines.marked.push_back(m_vHandleBrowserList[handle]->marked);
} }
m_pcBrowser->setLines(&m_browserListLines); m_pcBrowser->setLines(&m_browserListLines);
m_pcBrowser->cutRowText(&m_settings.browserCutLongRowText);
m_currentBrowserSelection = m_pcBrowser->getSelectedLine(); m_currentBrowserSelection = m_pcBrowser->getSelectedLine();
// update selected movie if browser is in the focus // update selected movie if browser is in the focus
@@ -3558,6 +3565,7 @@ bool CMovieBrowser::showMenu(bool calledExternally)
optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LAST_RECORD_MAX_ITEMS, true, recMaxUserIntInput.getValue(), &recMaxUserIntInput)); optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LAST_RECORD_MAX_ITEMS, true, recMaxUserIntInput.getValue(), &recMaxUserIntInput));
optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH, true, browserFrameUserIntInput.getValue(), &browserFrameUserIntInput)); optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH, true, browserFrameUserIntInput.getValue(), &browserFrameUserIntInput));
optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL, (int*)(&m_settings.browserAdditional), MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true)); optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL, (int*)(&m_settings.browserAdditional), MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true));
optionsMenuBrowser.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_BROWSER_CUT_LONG_ROWTEXT, (int*)(&m_settings.browserCutLongRowText), MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true));
optionsMenuBrowser.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD)); optionsMenuBrowser.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD));
optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_NR, true, browserRowNrIntInput.getValue(), &browserRowNrIntInput)); optionsMenuBrowser.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BROWSER_ROW_NR, true, browserRowNrIntInput.getValue(), &browserRowNrIntInput));
optionsMenuBrowser.addItem(GenericMenuSeparator); optionsMenuBrowser.addItem(GenericMenuSeparator);

1
src/gui/moviebrowser/mb.h
View File

@@ -97,6 +97,7 @@ typedef struct
MB_INFO_ITEM browserRowItem[MB_MAX_ROWS]; MB_INFO_ITEM browserRowItem[MB_MAX_ROWS];
int browserRowWidth[MB_MAX_ROWS]; int browserRowWidth[MB_MAX_ROWS];
int browserAdditional; int browserAdditional;
int browserCutLongRowText;
// to be added to config later // to be added to config later
int lastPlayMaxItems; int lastPlayMaxItems;

1
src/system/locals.h
View File

@@ -1786,6 +1786,7 @@ typedef enum
LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD, LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD,
LOCALE_MOVIEBROWSER_BOOK_TYPE_FORWARD, LOCALE_MOVIEBROWSER_BOOK_TYPE_FORWARD,
LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL, LOCALE_MOVIEBROWSER_BROWSER_ADDITIONAL,
LOCALE_MOVIEBROWSER_BROWSER_CUT_LONG_ROWTEXT,
LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH, LOCALE_MOVIEBROWSER_BROWSER_FRAME_HIGH,
LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD, LOCALE_MOVIEBROWSER_BROWSER_ROW_HEAD,
LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM, LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM,

1
src/system/locals_intern.h
View File

@@ -1786,6 +1786,7 @@ const char * locale_real_names[] =
"moviebrowser.book_type_backward", "moviebrowser.book_type_backward",
"moviebrowser.book_type_forward", "moviebrowser.book_type_forward",
"moviebrowser.browser_additional", "moviebrowser.browser_additional",
"moviebrowser.browser_cut_long_rowtext",
"moviebrowser.browser_frame_high", "moviebrowser.browser_frame_high",
"moviebrowser.browser_row_head", "moviebrowser.browser_row_head",
"moviebrowser.browser_row_item", "moviebrowser.browser_row_item",