From 9df34be6cbf5ed791aa78f3f1761c719208aea09 Mon Sep 17 00:00:00 2001
From: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
Date: Sat, 8 May 2021 12:15:58 -0700
Subject: [PATCH] Hide inspector accelerator in film strip

Only show the accelerator key in the context menu when opening the menu
from the full file browser but not the film strip.
---
 rtgui/filebrowser.cc | 15 ++++++++++++++-
 rtgui/filebrowser.h  |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index 304e75a5c..37ff6da62 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -411,7 +411,7 @@ FileBrowser::FileBrowser () :
     untrash->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_Delete, Gdk::SHIFT_MASK, Gtk::ACCEL_VISIBLE);
     open->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_Return, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
     if (options.inspectorWindow)
-        inspect->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_F, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
+        inspect->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_f, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
     develop->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_B, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
     developfast->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_B, Gdk::CONTROL_MASK | Gdk::SHIFT_MASK, Gtk::ACCEL_VISIBLE);
     copyprof->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_C, Gdk::CONTROL_MASK, Gtk::ACCEL_VISIBLE);
@@ -1374,6 +1374,19 @@ int FileBrowser::getThumbnailHeight ()
     }
 }
 
+void FileBrowser::enableTabMode(bool enable)
+{
+    ThumbBrowserBase::enableTabMode(enable);
+    if (options.inspectorWindow) {
+        if (enable) {
+            inspect->remove_accelerator(pmenu->get_accel_group(), GDK_KEY_f, (Gdk::ModifierType)0);
+        }
+        else {
+            inspect->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_f, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
+        }
+    }
+}
+
 void FileBrowser::applyMenuItemActivated (ProfileStoreLabel *label)
 {
     MYREADERLOCK(l, entryRW);
diff --git a/rtgui/filebrowser.h b/rtgui/filebrowser.h
index 03a8636e5..4602ba9bb 100644
--- a/rtgui/filebrowser.h
+++ b/rtgui/filebrowser.h
@@ -182,6 +182,8 @@ public:
     void saveThumbnailHeight (int height) override;
     int  getThumbnailHeight () override;
 
+
+    void enableTabMode(bool enable);
     bool isInTabMode() override
     {
         return tbl ? tbl->isInTabMode() : false;