Merge pull request #6222 from Beep6581/inspector-window-fixes
Inspector window fixes
This commit is contained in:
@@ -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);
|
||||
@@ -2100,5 +2113,5 @@ void FileBrowser::openRequested( std::vector<FileBrowserEntry*> mselected)
|
||||
|
||||
void FileBrowser::inspectRequested(std::vector<FileBrowserEntry*> mselected)
|
||||
{
|
||||
getInspector()->showWindow(false, false);
|
||||
getInspector()->showWindow(true);
|
||||
}
|
||||
|
Reference in New Issue
Block a user