diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index bde34580b..4913fb2cf 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1317,6 +1317,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 4b7b499f0..ad1b7f3af 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1316,6 +1316,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 ff682ff3c..43fac6d9d 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 fb74155af..fb6044999 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -2202,6 +2202,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) @@ -2209,20 +2223,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 8bbfca541..3b00523e1 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -5891,6 +5891,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); @@ -5987,6 +5989,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 6db701227..0b7888059 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1344,6 +1344,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 fc56e6206..e51fab26c 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1344,6 +1344,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 dc5710a51..d04aa2434 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -1273,6 +1273,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;