From d0511c6be07e9a3975824d45e9fbd22addbd48d5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 20 Nov 2022 01:53:52 +0100 Subject: [PATCH] - moviebrowser: allow configurable keys to toggle view --- data/locale/deutsch.locale | 2 ++ data/locale/english.locale | 2 ++ src/gui/keybind_setup.cpp | 2 ++ src/gui/keybind_setup.h | 2 ++ src/gui/moviebrowser/mb.cpp | 28 ++++++++++++++-------------- src/neutrino.cpp | 4 ++++ src/system/locals.h | 2 ++ src/system/locals_intern.h | 2 ++ src/system/settings.h | 2 ++ 9 files changed, 32 insertions(+), 14 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 2e201620b..11251ab24 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1239,6 +1239,8 @@ mbkey.copy_onefile Film kopieren mbkey.copy_several Film kopieren und teilen mbkey.cover Filmcover erzeugen/löschen mbkey.cut Film schneiden +mbkey.toggle_view_cw Ansicht umschalten im Uhrzeigersinn +mbkey.toggle_view_ccw Ansicht umschalten entgegen dem Uhrzeigersinn mbkey.truncate Film kürzen mdb.head Movie Database mdb.choose Movie Database wählen diff --git a/data/locale/english.locale b/data/locale/english.locale index e3473a452..01b9da8a0 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1238,6 +1238,8 @@ mbkey.copy_onefile Copy movie mbkey.copy_several Copy and split movie mbkey.cover Create/remove movie cover mbkey.cut Cut movie +mbkey.toggle_view_cw Toggle view clockwise +mbkey.toggle_view_ccw Toggle view counter clockwise mbkey.truncate Truncate movie mdb.head Movie database mdb.choose Choose movie database diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 12824bd73..0d7078ffb 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -238,6 +238,8 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = {LOCALE_MBKEY_COPY_SEVERAL, &g_settings.mbkey_copy_several, NONEXISTANT_LOCALE }, {LOCALE_MBKEY_CUT, &g_settings.mbkey_cut, NONEXISTANT_LOCALE }, {LOCALE_MBKEY_TRUNCATE, &g_settings.mbkey_truncate, NONEXISTANT_LOCALE }, + {LOCALE_MBKEY_TOGGLE_VIEW_CW, &g_settings.mbkey_toggle_view_cw, NONEXISTANT_LOCALE }, + {LOCALE_MBKEY_TOGGLE_VIEW_CCW, &g_settings.mbkey_toggle_view_ccw, NONEXISTANT_LOCALE }, {LOCALE_MBKEY_COVER, &g_settings.mbkey_cover, LOCALE_MENU_HINT_MBKEY_COVER }, }; diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h index f84adb17c..631fa66e4 100644 --- a/src/gui/keybind_setup.h +++ b/src/gui/keybind_setup.h @@ -102,6 +102,8 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver MBKEY_COPY_SEVERAL, MBKEY_CUT, MBKEY_TRUNCATE, + MBKEY_TOGGLE_VIEW_CW, + MBKEY_TOGGLE_VIEW_CCW, MBKEY_COVER, KEYBINDS_COUNT diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 3c1ddf259..360c19dd5 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -2199,6 +2199,20 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) } } } + else if (msg == (neutrino_msg_t) g_settings.mbkey_toggle_view_cw) + { + if (m_settings.browserAdditional && m_windowFocus == MB_FOCUS_BROWSER) + onSetFocusNext(); + else if (show_mode != MB_SHOW_YT) + onSetGUIWindowNext(); + } + else if (msg == (neutrino_msg_t) g_settings.mbkey_toggle_view_ccw) + { + if (m_settings.browserAdditional && m_windowFocus == MB_FOCUS_MOVIE_INFO2) + onSetFocusNext(); + else if (show_mode != MB_SHOW_YT) + onSetGUIWindowPrev(); + } else if (CNeutrinoApp::getInstance()->backKey(msg)) { if (m_settings.gui == MB_GUI_FILTER) @@ -2206,20 +2220,6 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) else result = false; } - else if (msg == CRCInput::RC_left) - { - if (m_windowFocus == MB_FOCUS_MOVIE_INFO2 && m_settings.browserAdditional) - onSetFocusNext(); - else if (show_mode != MB_SHOW_YT) - onSetGUIWindowPrev(); - } - else if (msg == CRCInput::RC_right) - { - if (m_windowFocus == MB_FOCUS_BROWSER && m_settings.browserAdditional) - onSetFocusNext(); - else if (show_mode != MB_SHOW_YT) - onSetGUIWindowNext(); - } else if (msg == CRCInput::RC_green) { if (m_settings.gui == MB_GUI_MOVIE_INFO) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 5900cf3a8..f4f20b6ad 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -5775,6 +5775,8 @@ void CNeutrinoApp::loadKeys(const char *fname) g_settings.mbkey_cover = tconfig->getInt32("mbkey.cover", CRCInput::RC_favorites); g_settings.mbkey_cut = tconfig->getInt32("mbkey.cut", CRCInput::RC_nokey); g_settings.mbkey_truncate = tconfig->getInt32("mbkey.truncate", CRCInput::RC_nokey); + g_settings.mbkey_toggle_view_cw = tconfig->getInt32("mbkey.toggle_view_cw", CRCInput::RC_right); + g_settings.mbkey_toggle_view_ccw = tconfig->getInt32("mbkey.toggle_view_ccw", CRCInput::RC_left); g_settings.mpkey_audio = tconfig->getInt32("mpkey.audio", CRCInput::RC_green); g_settings.mpkey_bookmark = tconfig->getInt32("mpkey.bookmark", CRCInput::RC_yellow); @@ -5874,6 +5876,8 @@ void CNeutrinoApp::saveKeys(const char *fname) tconfig->setInt32("mbkey.cover", g_settings.mbkey_cover); tconfig->setInt32("mbkey.cut", g_settings.mbkey_cut); tconfig->setInt32("mbkey.truncate", g_settings.mbkey_truncate); + tconfig->setInt32("mbkey.toggle_view_cw", g_settings.mbkey_toggle_view_cw); + tconfig->setInt32("mbkey.toggle_view_ccw", g_settings.mbkey_toggle_view_ccw); tconfig->setInt32("mpkey.audio", g_settings.mpkey_audio); tconfig->setInt32("mpkey.bookmark", g_settings.mpkey_bookmark); diff --git a/src/system/locals.h b/src/system/locals.h index b3a65b780..1c983ef8b 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1266,6 +1266,8 @@ typedef enum LOCALE_MBKEY_COPY_SEVERAL, LOCALE_MBKEY_COVER, LOCALE_MBKEY_CUT, + LOCALE_MBKEY_TOGGLE_VIEW_CW, + LOCALE_MBKEY_TOGGLE_VIEW_CCW, LOCALE_MBKEY_TRUNCATE, LOCALE_MDB_HEAD, LOCALE_MDB_CHOOSE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 4cf3104ee..9e25e9481 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1266,6 +1266,8 @@ const char * locale_real_names[] = "mbkey.copy_several", "mbkey.cover", "mbkey.cut", + "mbkey.toggle_view_cw", + "mbkey.toggle_view_ccw", "mbkey.truncate", "mdb.head", "mdb.choose", diff --git a/src/system/settings.h b/src/system/settings.h index fa9ee1f8a..e94229a4a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -1264,6 +1264,8 @@ struct SNeutrinoSettings int mbkey_cover; int mbkey_cut; int mbkey_truncate; + int mbkey_toggle_view_cw; + int mbkey_toggle_view_ccw; int mpkey_audio; int mpkey_bookmark;