Skip to content

Feature/command row shortcuts default enable #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lee-b wants to merge 2 commits into
base: develop
Choose a base branch
from
+67 −9
Open

Feature/command row shortcuts default enable #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ea42b
Add shortcuts to the action buttons (prioritizing function keys)
lee-b Dec 23, 2025
9697b49
Default to enabling the shortcuts in command row buttons
lee-b Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 62 additions & 9 deletions sunflower/gui/main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,18 +425,20 @@ def __init__(self, application, dont_load_plugins):
self.command_bar.set_border_width(2)

buttons = (
(_('Refresh'), _('Reload active item list'), self._command_reload),
(_('Rename'), _('Rename selected file'), self._command_rename),
(_('Preview'), _('Preview selected file'), self._command_view),
(_('Edit'), _('Edit selected file'), self._command_edit),
(_('Copy'), _('Copy selected items from active to opposite list'), self._command_copy),
(_('Move'), _('Move selected items from active to opposite list'), self._command_move),
(_('Create'), _('Create new directory'), self._command_create),
(_('Delete'), _('Delete selected items'), self._command_delete)
(_('Refresh'), _('Reload active item list'), self._command_reload, 'item_list', 'refresh_list'),
(_('Rename'), _('Rename selected file'), self._command_rename, 'item_list', 'rename_file'),
(_('Preview'), _('Preview selected file'), self._command_view, 'item_list', 'view_selected'),
(_('Edit'), _('Edit selected file'), self._command_edit, 'item_list', 'edit_selected'),
(_('Copy'), _('Copy selected items from active to opposite list'), self._command_copy, 'item_list', 'copy_files'),
(_('Move'), _('Move selected items from active to opposite list'), self._command_move, 'item_list', 'move_files'),
(_('Create'), _('Create new directory'), self._command_create, 'main_menu', 'create_directory'),
(_('Delete'), _('Delete selected items'), self._command_delete, 'item_list', 'delete_files')
)

self._command_bar_buttons = []

# create buttons and pack them
for text, tooltip, callback in buttons:
for text, tooltip, callback, accel_group, accel_name in buttons:
button = Gtk.Button(label=text)

if callback is not None:
Expand All @@ -449,8 +451,19 @@ def __init__(self, application, dont_load_plugins):
button.show() # we need to explicitly show in cases where toolbar is not visible
self.command_bar.pack_start(button, True, True, 0)

# store button info for label updates
self._command_bar_buttons.append({
'button': button,
'label': text,
'accel_group': accel_group,
'accel_name': accel_name
})

self.command_bar.set_property('no-show-all', not self.options.get('show_command_bar'))

# update button labels based on initial settings
self._update_command_bar_labels()

# pack user interface
vbox = Gtk.VBox(False, 0)
vbox.pack_start(self.toolbar_manager.get_toolbar(), False, False, 0)
Expand Down Expand Up @@ -508,6 +521,42 @@ def __init__(self, application, dont_load_plugins):
# show widgets
self.show_all()

def _update_command_bar_labels(self):
"""Update command bar button labels to optionally include shortcuts."""
show_shortcuts = self.options.get('show_command_bar_shortcuts')

for button_info in self._command_bar_buttons:
button = button_info['button']
base_label = button_info['label']

if show_shortcuts:
group = button_info['accel_group']
name = button_info['accel_name']

# Get both primary and secondary accelerators
primary_accel = self.accelerator_manager.get_accelerator(group, name, primary=True)
secondary_accel = self.accelerator_manager.get_accelerator(group, name, primary=False)

# Prefer function key (F1-F12) if available, matching Norton Commander tradition
accel = None
if primary_accel and primary_accel[0] > 0:
if Gdk.KEY_F1 <= primary_accel[0] <= Gdk.KEY_F12:
accel = primary_accel
elif secondary_accel and secondary_accel[0] > 0 and Gdk.KEY_F1 <= secondary_accel[0] <= Gdk.KEY_F12:
accel = secondary_accel
else:
accel = primary_accel # fallback to primary
elif secondary_accel and secondary_accel[0] > 0:
accel = secondary_accel

if accel:
shortcut = Gtk.accelerator_get_label(accel[0], accel[1])
button.set_label('{} ({})'.format(base_label, shortcut))
else:
button.set_label(base_label)
else:
button.set_label(base_label)

def _destroy(self, widget=None, data=None):
"""Application destructor"""
# save tabs
Expand Down Expand Up @@ -1952,6 +2001,7 @@ def load_config(self):
'show_toolbar': False,
'show_titlebar': True,
'show_command_bar': False,
'show_command_bar_shortcuts': True,
'history_file': '.bash_history',
'last_version': 0,
'focus_new_tab': True,
Expand Down Expand Up @@ -2190,6 +2240,9 @@ def apply_settings(self):
if hasattr(page, 'apply_settings'):
page.apply_settings()

# update command bar button labels
self._update_command_bar_labels()

def register_class(self, name, title, PluginClass):
"""Register plugin class

Expand Down
5 changes: 5 additions & 0 deletions sunflower/gui/preferences/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ def __init__(self, parent, application):
self._checkbox_show_toolbar.connect('toggled', self._parent.enable_save)
self._checkbox_show_titlebar.connect('toggled', self._parent.enable_save)
self._checkbox_show_command_bar.connect('toggled', self._parent.enable_save)
self._checkbox_show_command_bar_shortcuts = Gtk.CheckButton(_('Show keyboard shortcuts on command bar buttons'))
self._checkbox_show_command_bar_shortcuts.connect('toggled', self._parent.enable_save)
self._checkbox_horizontal_split.connect('toggled', self._parent.enable_save)
self._checkbox_dark_theme.connect('toggled', self._parent.enable_save)

Expand Down Expand Up @@ -136,6 +138,7 @@ def __init__(self, parent, application):
vbox_main_window.pack_start(self._checkbox_show_toolbar, False, False, 0)
vbox_main_window.pack_start(self._checkbox_show_titlebar, False, False, 0)
vbox_main_window.pack_start(self._checkbox_show_command_bar, False, False, 0)
vbox_main_window.pack_start(self._checkbox_show_command_bar_shortcuts, False, False, 0)
vbox_main_window.pack_start(self._checkbox_horizontal_split, False, False, 0)
vbox_main_window.pack_start(self._checkbox_dark_theme, False, False, 0)

Expand All @@ -161,6 +164,7 @@ def _load_options(self):
self._checkbox_show_toolbar.set_active(options.get('show_toolbar'))
self._checkbox_show_titlebar.set_active(options.get('show_titlebar'))
self._checkbox_show_command_bar.set_active(options.get('show_command_bar'))
self._checkbox_show_command_bar_shortcuts.set_active(options.get('show_command_bar_shortcuts'))
self._checkbox_tab_close_button.set_active(options.get('tab_close_button'))
self._checkbox_always_show_tabs.set_active(options.get('always_show_tabs'))
self._checkbox_superuser_notification.set_active(options.get('superuser_notification'))
Expand All @@ -184,6 +188,7 @@ def _save_options(self):
options.set('show_toolbar', self._checkbox_show_toolbar.get_active())
options.set('show_titlebar', self._checkbox_show_titlebar.get_active())
options.set('show_command_bar', self._checkbox_show_command_bar.get_active())
options.set('show_command_bar_shortcuts', self._checkbox_show_command_bar_shortcuts.get_active())
options.set('tab_close_button', self._checkbox_tab_close_button.get_active())
options.set('always_show_tabs', self._checkbox_always_show_tabs.get_active())
options.set('superuser_notification', self._checkbox_superuser_notification.get_active())
Expand Down