From 6d55edea6ccfe661f6899ff4707627befd8adaeb Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:30:18 -0500 Subject: [PATCH] Update to Hotkeys (#5929) --- src/ui/zcl_abapgit_gui_chunk_lib.clas.abap | 4 ++-- src/ui/zcl_abapgit_gui_hotkey_ctl.clas.abap | 18 +++++++++--------- src/ui/zcl_abapgit_gui_page_diff.clas.abap | 2 +- .../zcl_abapgit_gui_page_repo_over.clas.abap | 6 +++--- .../zcl_abapgit_gui_page_repo_view.clas.abap | 7 ++++++- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap index d043e78d9..a98b1621c 100644 --- a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap +++ b/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap @@ -244,7 +244,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. +CLASS zcl_abapgit_gui_chunk_lib IMPLEMENTATION. METHOD advanced_submenu. @@ -984,7 +984,7 @@ CLASS ZCL_ABAPGIT_GUI_CHUNK_LIB IMPLEMENTATION. ri_html->add( |var gGoRepoPalette = new CommandPalette(createRepoCatalogEnumerator(repoCatalog, "{ iv_action }"), \{| ). ri_html->add( ' toggleKey: "F2",' ). - ri_html->add( ' hotkeyDescription: "Go to repo ..."' ). + ri_html->add( ' hotkeyDescription: "Go to Repository ..."' ). ri_html->add( '});' ). ENDMETHOD. diff --git a/src/ui/zcl_abapgit_gui_hotkey_ctl.clas.abap b/src/ui/zcl_abapgit_gui_hotkey_ctl.clas.abap index 9e49158b2..80d45151b 100644 --- a/src/ui/zcl_abapgit_gui_hotkey_ctl.clas.abap +++ b/src/ui/zcl_abapgit_gui_hotkey_ctl.clas.abap @@ -38,6 +38,7 @@ ENDCLASS. CLASS zcl_abapgit_gui_hotkey_ctl IMPLEMENTATION. + METHOD constructor. super->constructor( ). @@ -88,7 +89,7 @@ CLASS zcl_abapgit_gui_hotkey_ctl IMPLEMENTATION. ls_hotkey-ui_component = 'Hotkeys'. ls_hotkey-action = c_showhotkeys_action. - ls_hotkey-description = 'Show hotkeys help'. + ls_hotkey-description = 'Show Hotkeys Help'. ls_hotkey-hotkey = '?'. INSERT ls_hotkey INTO TABLE rt_hotkey_actions. @@ -128,6 +129,13 @@ CLASS zcl_abapgit_gui_hotkey_ctl IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_gui_hotkey_ctl~set_visible. + + mv_visible = iv_visible. + + ENDMETHOD. + + METHOD zif_abapgit_gui_renderable~render. DATA: @@ -203,12 +211,4 @@ CLASS zcl_abapgit_gui_hotkey_ctl IMPLEMENTATION. mv_visible = abap_false. ENDMETHOD. - - - METHOD zif_abapgit_gui_hotkey_ctl~set_visible. - - mv_visible = iv_visible. - - ENDMETHOD. - ENDCLASS. diff --git a/src/ui/zcl_abapgit_gui_page_diff.clas.abap b/src/ui/zcl_abapgit_gui_page_diff.clas.abap index 34f162ceb..e68a49308 100644 --- a/src/ui/zcl_abapgit_gui_page_diff.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_diff.clas.abap @@ -1225,7 +1225,7 @@ CLASS zcl_abapgit_gui_page_diff IMPLEMENTATION. ri_html->add( 'var gGoJumpPalette = new CommandPalette(enumerateJumpAllFiles, {' ). ri_html->add( ' toggleKey: "F2",' ). - ri_html->add( ' hotkeyDescription: "Jump to file ..."' ). + ri_html->add( ' hotkeyDescription: "Jump to File ..."' ). ri_html->add( '});' ). " Feature for selecting ABAP code by column and copy to clipboard diff --git a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap index 00167ded9..e459b8db0 100644 --- a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap @@ -158,7 +158,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_OVER IMPLEMENTATION. +CLASS zcl_abapgit_gui_page_repo_over IMPLEMENTATION. METHOD apply_filter. @@ -909,7 +909,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_OVER IMPLEMENTATION. ls_hotkey_action-description = |Patch|. ls_hotkey_action-action = zif_abapgit_definitions=>c_action-go_patch. - ls_hotkey_action-hotkey = |p|. + ls_hotkey_action-hotkey = |a|. INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions. " registered/handled in js @@ -928,7 +928,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_OVER IMPLEMENTATION. ls_hotkey_action-hotkey = |Enter|. INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions. - ls_hotkey_action-description = |Focus filter|. + ls_hotkey_action-description = |Focus Filter|. ls_hotkey_action-action = `####`. ls_hotkey_action-hotkey = |f|. INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions. diff --git a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap index 77d0468d0..ccad31a50 100644 --- a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap @@ -1356,7 +1356,7 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION. DATA: ls_hotkey_action LIKE LINE OF rt_hotkey_actions. ls_hotkey_action-ui_component = 'Repo'. - ls_hotkey_action-description = |Stage Changes|. + ls_hotkey_action-description = |Stage|. ls_hotkey_action-action = zif_abapgit_definitions=>c_action-go_stage. ls_hotkey_action-hotkey = |s|. INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions. @@ -1381,6 +1381,11 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION. ls_hotkey_action-hotkey = |p|. INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions. + ls_hotkey_action-description = |Patch|. + ls_hotkey_action-action = zif_abapgit_definitions=>c_action-go_patch. + ls_hotkey_action-hotkey = |a|. + INSERT ls_hotkey_action INTO TABLE rt_hotkey_actions. + ls_hotkey_action-description = |Diff|. ls_hotkey_action-action = zif_abapgit_definitions=>c_action-go_repo_diff. ls_hotkey_action-hotkey = |d|.