Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small display changes 

Added registration number to ship info screen
Added new icon for systems management, not used yet
Changed color param so orbits are visible in system view

 Changes to be committed:
	modified:   data/icons/icons.svg
	modified:   data/pigui/themes/default.lua
	modified:   data/ui/InfoView/ShipInfo.lua
	modified:   src/SystemView.cpp
master
Jon Jenkins 2018-01-10 10:58:08 -06:00 committed by Kate Jenkins
parent 0b3fee7599
commit c5d14360f2
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/icons/icons.svg
View File

@ -7815,5 +7815,19 @@
id="rect5790"
style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1, 2;stroke-dashoffset:0;stroke-opacity:1" />
</g>
<path
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.58464569;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 2990.3484,-953.61135 c -9.815,0 -17.7155,7.90237 -17.7155,17.71734 v 120.70678 c 0,9.81497 7.9005,17.71725 17.7155,17.71725 h 142.0001 c 9.815,0 17.7173,-7.90228 17.7173,-17.71725 v -120.70678 c 0,-9.81497 -7.9023,-17.71734 -17.7173,-17.71734 z m 7.7893,17.95537 h 1.0712 c 3.9259,0 7.0862,3.16022 7.0862,7.08619 v 106.05834 c 0,3.92597 -3.1603,7.08619 -7.0862,7.08619 h -1.0712 c -3.926,0 -7.0862,-3.16022 -7.0862,-7.08619 v -106.05834 c 0,-3.92597 3.1602,-7.08619 7.0862,-7.08619 z m 25.7336,0 h 1.0712 c 3.9261,0 7.0881,3.16022 7.0881,7.08619 v 106.05834 c 0,3.92597 -3.162,7.08619 -7.0881,7.08619 h -1.0712 c -3.9259,0 -7.0862,-3.16022 -7.0862,-7.08619 v -106.05834 c 0,-3.92597 3.1603,-7.08619 7.0862,-7.08619 z m 24.8987,0 h 1.0712 c 3.9259,0 7.0862,3.16022 7.0862,7.08619 v 106.05834 c 0,3.92597 -3.1603,7.08619 -7.0862,7.08619 h -1.0712 c -3.926,0 -7.088,-3.16022 -7.088,-7.08619 v -106.05834 c 0,-3.92597 3.162,-7.08619 7.088,-7.08619 z m 36.5021,13.71825 a 10.940943,10.940943 0 0 1 10.9405,10.94053 10.940943,10.940943 0 0 1 -10.9405,10.94053 10.940943,10.940943 0 0 1 -10.9424,-10.94053 10.940943,10.940943 0 0 1 10.9424,-10.94053 z m 28.894,0 a 10.940943,10.940943 0 0 1 10.9406,10.94053 10.940943,10.940943 0 0 1 -10.9406,10.94053 10.940943,10.940943 0 0 1 -10.9405,-10.94053 10.940943,10.940943 0 0 1 10.9405,-10.94053 z m -28.894,35.45653 a 10.940943,10.940943 0 0 1 10.9405,10.94053 10.940943,10.940943 0 0 1 -10.9405,10.94063 10.940943,10.940943 0 0 1 -10.9424,-10.94063 10.940943,10.940943 0 0 1 10.9424,-10.94053 z m 28.894,0 a 10.940943,10.940943 0 0 1 10.9406,10.94053 10.940943,10.940943 0 0 1 -10.9406,10.94063 10.940943,10.940943 0 0 1 -10.9405,-10.94063 10.940943,10.940943 0 0 1 10.9405,-10.94053 z m -28.894,35.45653 a 10.940943,10.940943 0 0 1 10.9405,10.94063 10.940943,10.940943 0 0 1 -10.9405,10.94053 10.940943,10.940943 0 0 1 -10.9424,-10.94053 10.940943,10.940943 0 0 1 10.9424,-10.94063 z m 28.894,0 a 10.940943,10.940943 0 0 1 10.9406,10.94063 10.940943,10.940943 0 0 1 -10.9406,10.94053 10.940943,10.940943 0 0 1 -10.9405,-10.94053 10.940943,10.940943 0 0 1 10.9405,-10.94063 z"
id="rect5788"
inkscape:connector-curvature="0" />
<rect
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.58464569;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect5791"
width="7.0973153"
height="2.3657718"
x="3199.7061"
y="-1303.9465"
rx="17.716499"
ry="2.3657718" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 KiB

After

Width:  |  Height:  |  Size: 641 KiB

1
data/pigui/themes/default.lua
View File

@ -187,6 +187,7 @@ theme.icons = {
alert1 = 122,
alert2 = 123,
ecm_advanced = 124,
systems_management = 125,
-- ninth row
view_internal = 128,
view_external = 129,

11
data/ui/InfoView/ShipInfo.lua
View File

@ -22,11 +22,11 @@ local yes_no = function (binary)
end
local shipInfo = function (args)
local shipDef = ShipDef[Game.player.shipId]
local hyperdrive = table.unpack(Game.player:GetEquip("engine"))
local frontWeapon = table.unpack(Game.player:GetEquip("laser_front"))
local rearWeapon = table.unpack(Game.player:GetEquip("laser_rear"))
local shipDef = ShipDef[Game.player.shipId]
local shipLabel = Game.player:GetLabel()
local hyperdrive = table.unpack(Game.player:GetEquip("engine"))
local frontWeapon = table.unpack(Game.player:GetEquip("laser_front"))
local rearWeapon = table.unpack(Game.player:GetEquip("laser_rear"))
hyperdrive = hyperdrive or nil
frontWeapon = frontWeapon or nil
@ -84,6 +84,7 @@ local shipInfo = function (args)
:SetColumn(0, {
ui:Table():AddRows({
ui:Table():SetColumnSpacing(10):AddRows({
{ l.REGISTRATION_NUMBER..":", shipLabel},
{ l.HYPERDRIVE..":", hyperdrive and hyperdrive:GetName() or l.NONE },
{
l.HYPERSPACE_RANGE..":",

2
src/SystemView.cpp
View File

@ -473,7 +473,7 @@ void SystemView::PutOrbit(const Orbit *orbit, const vector3d &offset, const Colo
}
static const float startTrailPercent = 0.85;
static const float fadedColorParameter = 0.1;
static const float fadedColorParameter = 0.8;
Uint16 fadingColors = 0;
const double tMinust0 = m_time - m_game->GetTime();