mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

moviebrowser/mb.cpp: avoid possible empty menue entries in showMenu()

Browse Source 
Empty entries don't look good if no movie infos are available but it
seems to be better to show movie name beside entry name. If movie title
not available show menu entry with an "edit" hint.
So the menu should be more intuitive.


Origin commit data
------------------
Commit: 82efff9ad8
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-05-09 (Thu, 09 May 2019)

Origin message was:
------------------
moviebrowser/mb.cpp: avoid possible empty menue entries in showMenu()

Empty entries don't look good if no movie infos are available but it
seems to be better to show movie name beside entry name. If movie title
not available show menu entry with an "edit" hint.
So the menu should be more intuitive.
This commit is contained in:
Thilo Graf
2019-05-09 00:05:58 +02:00
committed by vanhofen
parent 3287d9c382
commit 2e1a38719c
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -2021,6 +2021,7 @@ moviebrowser.menu_cut Film schneiden
moviebrowser.menu_cut_head Kopieren, Schneiden und Kürzen
moviebrowser.menu_data_request Online-Datenbank abfragen
moviebrowser.menu_directories_head Verzeichnisse de/aktivieren
moviebrowser.menu_edit bearbeiten
moviebrowser.menu_main_bookmarks Markierungen
moviebrowser.menu_main_head Film-Info und Einstellungen
moviebrowser.menu_nfs_head NFS Einstellung

1
data/locale/english.locale
View File

@@ -2021,6 +2021,7 @@ moviebrowser.menu_cut Cut movie
moviebrowser.menu_cut_head Copy, cut and truncate
moviebrowser.menu_data_request Online database request
moviebrowser.menu_directories_head Directories de/activate
moviebrowser.menu_edit edit
moviebrowser.menu_main_bookmarks Bookmarks
moviebrowser.menu_main_head Movie info and settings
moviebrowser.menu_nfs_head NFS settings

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

@@ -3628,20 +3628,21 @@ bool CMovieBrowser::showMenu(bool calledExternally)
if (!calledExternally) {
CMenuWidget mainMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
mainMenu.addIntroItems(LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD);
std::string title = g_Locale->getText(LOCALE_MOVIEBROWSER_MENU_EDIT);
if (m_movieSelectionHandler)
{
mainMenu.addItem(new CMenuForwarder(m_movieSelectionHandler->epgTitle, false));
mainMenu.addItem(GenericMenuSeparator);
if (!m_movieSelectionHandler->epgTitle.empty())
title = m_movieSelectionHandler->epgTitle;
}
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_info_menu", CRCInput::RC_red));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_CUT_HEAD, (m_movieSelectionHandler != NULL), NULL, this, "show_movie_cut_menu", CRCInput::RC_green));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DELETE_MOVIE, (m_movieSelectionHandler != NULL), NULL, this, "delete_movie", CRCInput::RC_yellow));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, true, NULL, this, "reload_movie_info", CRCInput::RC_blue));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_INFO_HEAD, (m_movieSelectionHandler != NULL), title, this, "show_movie_info_menu", CRCInput::RC_red));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_CUT_HEAD, (m_movieSelectionHandler != NULL), NULL , this, "show_movie_cut_menu", CRCInput::RC_green));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DELETE_MOVIE, (m_movieSelectionHandler != NULL), NULL , this, "delete_movie", CRCInput::RC_yellow));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, true, NULL , this, "reload_movie_info", CRCInput::RC_blue));
mainMenu.addItem(GenericMenuSeparatorLine);
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_SETTINGS, true, NULL, &optionsMenu,NULL, CRCInput::RC_1));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &dirMenu, NULL, CRCInput::RC_2));
// mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, true, NULL, this, "reload_movie_info",CRCInput::RC_3));
// mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, true, NULL, nfs, NULL, CRCInput::RC_setup));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_SETTINGS, true, NULL , &optionsMenu,NULL, CRCInput::RC_1));
mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL , &dirMenu, NULL, CRCInput::RC_2));
// mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_SCAN_FOR_MOVIES, true, NULL , this, "reload_movie_info",CRCInput::RC_3));
// mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_NFS_HEAD, true, NULL , nfs, NULL, CRCInput::RC_setup));
mainMenu.exec(NULL, " ");
} else

1
src/system/locals.h
View File

@@ -2048,6 +2048,7 @@ typedef enum
LOCALE_MOVIEBROWSER_MENU_CUT_HEAD,
LOCALE_MOVIEBROWSER_MENU_DATA_REQUEST,
LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD,
LOCALE_MOVIEBROWSER_MENU_EDIT,
LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS,
LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD,
LOCALE_MOVIEBROWSER_MENU_NFS_HEAD,

1
src/system/locals_intern.h
View File

@@ -2048,6 +2048,7 @@ const char * locale_real_names[] =
"moviebrowser.menu_cut_head",
"moviebrowser.menu_data_request",
"moviebrowser.menu_directories_head",
"moviebrowser.menu_edit",
"moviebrowser.menu_main_bookmarks",
"moviebrowser.menu_main_head",
"moviebrowser.menu_nfs_head",