Skip to content

Refactor Science sidebar #2852

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
oznogon wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Refactor Science sidebar #2852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f8567a
Add Science UI navigation keybinds
oznogon Apr 8, 2026
4cfca38
Refactor Science sidebar
oznogon Apr 10, 2026
517ae39
Merge branch 'master' into 2761-science-binds
oznogon Apr 14, 2026
381b0f8
Merge branch 'master' into 2761-science-binds
oznogon Apr 17, 2026
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
14 changes: 14 additions & 0 deletions src/gui/hotkeyConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,13 @@ Keys::Keys() :
{"SCIENCE_SCAN_PARAM_SET_3"},
{"SCIENCE_SCAN_PARAM_SET_4"},
}},
science_open_radar("SCIENCE_OPEN_RADAR"),
science_open_database("SCIENCE_OPEN_DATABASE"),
science_open_database_target("SCIENCE_OPEN_DATABASE_TARGET"),
science_sidebar_prev("SCIENCE_SIDEBAR_PREV"),
science_sidebar_next("SCIENCE_SIDEBAR_NEXT"),
science_sidebar_pager_prev("SCIENCE_SIDEBAR_PAGER_PREV"),
science_sidebar_pager_next("SCIENCE_SIDEBAR_PAGER_NEXT"),

// Engineering crew screen
engineering_select_system{
Expand Down Expand Up @@ -436,6 +443,13 @@ void Keys::init()
science_scan_object.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scan object"));
science_scan_abort.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Abort scan"));
science_select_next_scannable.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Select next scannable object"));
science_open_radar.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Open radar view"));
science_open_database.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Open database view"));
science_open_database_target.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Open database entry for target"));
science_sidebar_prev.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Sidebar previous tab"));
science_sidebar_next.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Sidebar next tab"));
science_sidebar_pager_prev.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Sidebar page previous"));
science_sidebar_pager_next.setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Sidebar page next"));
for (auto n = 0u; n < science_scan_param_increase.size(); n++)
{
science_scan_param_increase[n].setLabel(tr("hotkey_menu", "Science"), tr("hotkey_Science", "Scanning parameter {number} increase").format({{"number", string(n + 1)}}));
Expand Down
7 changes: 7 additions & 0 deletions src/gui/hotkeyConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ class Keys
sp::io::Keybinding science_scan_object;
sp::io::Keybinding science_scan_abort;
sp::io::Keybinding science_select_next_scannable;
sp::io::Keybinding science_open_radar;
sp::io::Keybinding science_open_database;
sp::io::Keybinding science_open_database_target;
sp::io::Keybinding science_sidebar_prev;
sp::io::Keybinding science_sidebar_next;
sp::io::Keybinding science_sidebar_pager_prev;
sp::io::Keybinding science_sidebar_pager_next;
std::array<sp::io::Keybinding, 4> science_scan_param_increase;
std::array<sp::io::Keybinding, 4> science_scan_param_decrease;
std::array<sp::io::Keybinding, 4> science_scan_param_set;
Expand Down
Loading
Loading