[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Jim Raykowski (via logerrit)]

 include/sfx2/sidebar/TabBar.hxx |    2 +-
 sfx2/source/sidebar/TabBar.cxx  |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit bb1d48498c9fdedf8e78344765f6c6eda6f4707c
Author:     Jim Raykowski <rayk...@gmail.com>
AuthorDate: Wed May 18 22:22:06 2022 -0800
Commit:     Jim Raykowski <rayk...@gmail.com>
CommitDate: Sun May 22 03:13:20 2022 +0200

    tdf#84502 related: Show keyboard shortcut in sidebar tab bar tab button
    
    tooltip
    
    Change-Id: Ia0d48ac437c6a18c4e1624dd9b154ee7a8514f1c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134594
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>

diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index d788f9f01c1b..5cc092c239de 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -119,7 +119,7 @@ private:
     const ::std::function<void (const OUString& rsDeckId)> 
maDeckActivationFunctor;
     PopupMenuProvider maPopupMenuProvider;
 
-    static void CreateTabItem(weld::Toolbar& rButton, const DeckDescriptor& 
rDeckDescriptor);
+    void CreateTabItem(weld::Toolbar& rButton, const DeckDescriptor& 
rDeckDescriptor);
     css::uno::Reference<css::graphic::XGraphic> GetItemImage(const 
DeckDescriptor& rDeskDescriptor) const;
     void UpdateButtonIcons();
 
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index d874a3191300..59649ec152d3 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -28,6 +28,7 @@
 #include <comphelper/processfactory.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/acceleratorexecute.hxx>
@@ -226,7 +227,11 @@ void TabBar::CreateTabItem(weld::Toolbar& rItem, const 
DeckDescriptor& rDeckDesc
     rItem.set_accessible_name(rDeckDescriptor.msTitle);
     rItem.set_accessible_description(rDeckDescriptor.msHelpText);
     rItem.set_tooltip_text(rDeckDescriptor.msHelpText);
-    rItem.set_item_tooltip_text("toggle", rDeckDescriptor.msHelpText);
+    const OUString sCommand = ".uno:SidebarDeck." + rDeckDescriptor.msId;
+    OUString sShortcut = 
vcl::CommandInfoProvider::GetCommandShortcut(sCommand, mxFrame);
+    if (!sShortcut.isEmpty())
+        sShortcut = u" (" + sShortcut + u")";
+    rItem.set_item_tooltip_text("toggle", rDeckDescriptor.msHelpText + 
sShortcut);
 }
 
 css::uno::Reference<css::graphic::XGraphic> TabBar::GetItemImage(const 
DeckDescriptor& rDeckDescriptor) const