liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide inspector accelerator in film strip

Browse Source 
Only show the accelerator key in the context menu when opening the menu
from the full file browser but not the film strip.
This commit is contained in:
Lawrence Lee
2021-05-08 12:15:58 -07:00
parent 36cb32b31b
commit 9df34be6cb
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/filebrowser.cc
View File

@@ -411,7 +411,7 @@ FileBrowser::FileBrowser () :
untrash->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_Delete, Gdk::SHIFT_MASK, Gtk::ACCEL_VISIBLE); 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); open->add_accelerator ("activate", pmenu->get_accel_group(), GDK_KEY_Return, (Gdk::ModifierType)0, Gtk::ACCEL_VISIBLE);
if (options.inspectorWindow) 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); 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); 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); 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) void FileBrowser::applyMenuItemActivated (ProfileStoreLabel *label)
{ {
MYREADERLOCK(l, entryRW); MYREADERLOCK(l, entryRW);

2
rtgui/filebrowser.h
View File

@@ -182,6 +182,8 @@ public:
void saveThumbnailHeight (int height) override; void saveThumbnailHeight (int height) override;
int getThumbnailHeight () override; int getThumbnailHeight () override;
void enableTabMode(bool enable);
bool isInTabMode() override bool isInTabMode() override
{ {
return tbl ? tbl->isInTabMode() : false; return tbl ? tbl->isInTabMode() : false;