Skip to content

Add DB button to faction k/v for Science scan target #2836

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 1 commit into
base: master
Choose a base branch
from
Open

Add DB button to faction k/v for Science scan target #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 26 additions & 2 deletions src/screens/crew6/scienceScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,30 @@ ScienceScreen::ScienceScreen(GuiContainer* owner, CrewPosition crew_position)
info_heading->setSize(GuiElement::GuiSizeMax, 30);
info_relspeed = new GuiKeyValueDisplay(info_sidebar, "SCIENCE_REL_SPEED", 0.4, tr("science", "Rel. Speed"), "");
info_relspeed->setSize(GuiElement::GuiSizeMax, 30);
info_faction = new GuiKeyValueDisplay(info_sidebar, "SCIENCE_FACTION", 0.4, tr("science", "Faction"), "");
info_faction->setSize(GuiElement::GuiSizeMax, 30);
info_faction = new GuiKeyValueDisplay(info_sidebar, "SCIENCE_FACTION", 0.4f, tr("science", "Faction"), "");
info_faction->setSize(GuiElement::GuiSizeMax, 30.0f);
info_faction_button = new GuiButton(info_faction, "SCIENCE_FACTION_BUTTON", tr("scienceButton", "DB"),
[this]()
{
auto ship = targets.get();
auto faction = Faction::getInfo(ship);

if (!faction.locale_name.empty())
{
if (database_view->findAndDisplayEntry(faction.locale_name))
{
view_mode_selection->setSelectionIndex(1);
radar_view->hide();
background_gradient->hide();
database_view->show();
}
}
}
);
info_faction_button
->setTextSize(20.0f)
->setPosition(0.0f, 1.0f, sp::Alignment::TopLeft)
->setSize(50.0f, 28.0f);
info_type = new GuiKeyValueDisplay(info_sidebar, "SCIENCE_TYPE", 0.4, tr("science", "Type"), "");
info_type->setSize(GuiElement::GuiSizeMax, 30);
info_type_button = new GuiButton(info_type, "SCIENCE_TYPE_BUTTON", tr("scienceButton", "DB"), [this]() {
Expand Down Expand Up @@ -323,6 +345,7 @@ void ScienceScreen::onDraw(sp::RenderTarget& renderer)
info_shield_frequency->setFrequency(-1)->hide();
info_beam_frequency->setFrequency(-1)->hide();
info_description->hide();
info_faction_button->hide();
info_type_button->hide();
sidebar_pager->hide();

Expand Down Expand Up @@ -412,6 +435,7 @@ void ScienceScreen::onDraw(sp::RenderTarget& renderer)
{
auto faction = Faction::getInfo(target);
info_faction->setValue(faction.locale_name);
info_faction_button->show();
if (auto tn = target.getComponent<TypeName>())
info_type->setValue(tn->localized);
info_type_button->show();
Expand Down
1 change: 1 addition & 0 deletions src/screens/crew6/scienceScreen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class ScienceScreen : public GuiOverlay
GuiKeyValueDisplay* info_relspeed;

GuiKeyValueDisplay* info_faction;
GuiButton* info_faction_button;
GuiKeyValueDisplay* info_type;
GuiButton* info_type_button;
GuiKeyValueDisplay* info_shields;
Expand Down
Loading