From 11ca2327935cd20d7a902e69f6fd997b5c1b6eb7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 5 Jul 2018 23:36:17 +0200 Subject: [PATCH] moviebrowser: add subheader to main window to avoid gui-jumps; add left/right icons to header Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/caa8b68b170a395e446f3898f91ba09d9d8bfb80 Author: vanhofen Date: 2018-07-05 (Thu, 05 Jul 2018) Origin message was: ------------------ - moviebrowser: add subheader to main window to avoid gui-jumps; add left/right icons to header --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/moviebrowser/mb.cpp | 6 +++--- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 00b34d888..17adfe14b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1913,6 +1913,7 @@ moviebrowser.foot_play Wiedergabe moviebrowser.foot_refresh Neu laden moviebrowser.foot_sort Sortieren: moviebrowser.head Meine Aufnahmen +moviebrowser.head_all_movies Alle Aufnahmen: moviebrowser.head_filter Filme nach Kategorie filtern: moviebrowser.head_playlist Zuletzt gesehen: moviebrowser.head_recordlist Zuletzt aufgenommen: diff --git a/data/locale/english.locale b/data/locale/english.locale index b9e8f36c7..60aa17091 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1913,6 +1913,7 @@ moviebrowser.foot_play Playback moviebrowser.foot_refresh Refresh list moviebrowser.foot_sort Sort: moviebrowser.head My recordings +moviebrowser.head_all_movies All movies: moviebrowser.head_filter Filter movies by category: moviebrowser.head_playlist Last played: moviebrowser.head_recordlist Last recorded: diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 2a69f3116..6e96aff37 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1229,8 +1229,8 @@ int CMovieBrowser::paint(void) Font* font = g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_LIST]; m_movieSelectionHandler = NULL; - m_pcBrowser = new CListFrame(&m_browserListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE, - &m_cBoxFrameBrowserList, NULL, + m_pcBrowser = new CListFrame(&m_browserListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE | CListFrame::TITLE, + &m_cBoxFrameBrowserList, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_ALL_MOVIES), g_Font[SNeutrinoSettings::FONT_TYPE_MOVIEBROWSER_HEAD]); m_pcLastPlay = new CListFrame(&m_playListLines, font, CListFrame::SCROLL | CListFrame::HEADER_LINE | CListFrame::TITLE, &m_cBoxFrameLastPlayList, g_Locale->getText(LOCALE_MOVIEBROWSER_HEAD_PLAYLIST), @@ -1962,7 +1962,7 @@ void CMovieBrowser::refreshTitle(void) int h = m_cBoxFrameTitleRel.iHeight; if (!m_header){ - m_header = new CComponentsHeader(x, y, w, h, title.c_str(), icon, CComponentsHeader::CC_BTN_HELP); + m_header = new CComponentsHeader(x, y, w, h, title.c_str(), icon, CComponentsHeader::CC_BTN_LEFT | CComponentsHeader::CC_BTN_RIGHT | CComponentsHeader::CC_BTN_HELP); } m_header->paint(CC_SAVE_SCREEN_NO); newHeader = m_header->isPainted(); diff --git a/src/system/locals.h b/src/system/locals.h index 4ff15fb29..09be1ba94 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1940,6 +1940,7 @@ typedef enum LOCALE_MOVIEBROWSER_FOOT_REFRESH, LOCALE_MOVIEBROWSER_FOOT_SORT, LOCALE_MOVIEBROWSER_HEAD, + LOCALE_MOVIEBROWSER_HEAD_ALL_MOVIES, LOCALE_MOVIEBROWSER_HEAD_FILTER, LOCALE_MOVIEBROWSER_HEAD_PLAYLIST, LOCALE_MOVIEBROWSER_HEAD_RECORDLIST, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index d07bfd852..5829e8112 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1940,6 +1940,7 @@ const char * locale_real_names[] = "moviebrowser.foot_refresh", "moviebrowser.foot_sort", "moviebrowser.head", + "moviebrowser.head_all_movies", "moviebrowser.head_filter", "moviebrowser.head_playlist", "moviebrowser.head_recordlist",