Feature: Group liveries, and livery window usability enhancements. #7108

PeterN · 2019-01-26T12:59:37Z

This PR add liveries to vehicle groups, and makes some usability changes to the livery selection window, replacing the checkbox enable/disable with a 'default' option in the colour drop down.

nielsmh · 2019-01-26T13:48:44Z

A PR like this ought to have some PR screenshots, I say.

andythenorth · 2019-01-26T16:07:58Z

A PR like this ought to have some PR screenshots, I say.

You probably meant for the new UI features, not just train colours, right? 😛

PeterN · 2019-01-26T18:42:15Z

Thanks Andy. Didn't have time earlier to post screenshots.

andythenorth · 2019-01-26T19:40:12Z

Company Colour defaults are now set like this:

For ungrouped trains, RVs etc, the long established (and weird imo) settings for some types of vehicle are kept. Note however that the checkboxes are now removed, reducing UI friction:

Liveries for groups do not offer settings by types of vehicle, 1CC and 2CC will be applied consistently to all vehicles in the group:

Results:

Group livery UI can also be opened directly from the groups window, with the correct group selected:

andythenorth · 2019-01-26T23:01:22Z

Just 2 more 😛

J0anJosep · 2019-01-27T00:01:31Z

Looks good. I tested it and works as expected. But please run script/api/generate_widget.sh.

Some questions:

(unrelated to this PR) Could be "New Colour Scheme" window renamed to "Name of the company - Colour Scheme"? And could its title widget have the company color as other company-related windows?
Group hierarchy isn't shown in the Colour Scheme Window. Could it be added?
Can the colour of a parent group change the colour of all its descendants? In other words, can group hierarchy be used for colour schemes?
Shouldn't new icons have a similar style to those on openttd.grf or OpenGFX?

PeterN · 2019-01-27T08:55:04Z

Looks good. I tested it and works as expected. But please run script/api/generate_widget.sh.

Ah yes. We really ought to make this part of the build process!

Some questions:

* (unrelated to this PR) Could be "New Colour Scheme" window renamed to "Name of the company - Colour Scheme"? And could its title widget have the company color as other company-related windows?

Hmm, sounds reasonable, although the title widget is already the company colour. EDIT Or not. Confused as I was testing something else and it was. EDIT And it is in master, just broken in this PR, wow.

* Group hierarchy isn't shown in the Colour Scheme Window. Could it be added?

Possibly depending on the next point.

* Can the colour of a parent group change the colour of all its descendants? In other words, can group hierarchy be used for colour schemes?

This will change how setting a colour to 'Default' will work. Currently it means to fall back to the system of picking the colour based on the original liveries system. With hierarchy in place it would mean falling back to the parent scheme.

* Shouldn't new icons have a similar style to those on openttd.grf or OpenGFX?

It's based on the extra OpenTTD GUI sprites that already exist, but there's no icon for 'choose colour'.

andythenorth · 2019-01-27T10:01:28Z

I would ship what we've got, and consider group hierarchy stuff later. Some things need to be used in prod for a while to see what really needs changed / improved :)

Also group hierarchy might be a moving target, e.g. #6053 and #6189

nielsmh

I will admit to not testing this myself, but the code looks sound, and others' testing indicates it works as intended.
Were the new sprites final?

PeterN · 2019-01-27T11:14:52Z

Another update as I had, again, forgotten to run generate_widgets

J0anJosep · 2019-01-27T11:17:13Z

This will change how setting a colour to 'Default' will work. Currently it means to fall back to the system of picking the colour based on the original liveries system. With hierarchy in place it would mean falling back to the parent scheme.

Well, instead of "Default", it should be "Inherited". But it is more consistent to inherit colour from parents, the same way autoreplacements work.

I would ship what we've got, and consider group hierarchy stuff later. Some things need to be used in prod for a while to see what really needs changed / improved :)

I think it is better to deal with this now for keeping commits to master in a better order.

J0anJosep · 2019-01-27T11:35:35Z

About icons, it is my fault. I thought those icons were based on non-free graphics instead of being based on OpenGFX. Probably, some static newGRF must have had replaced the ones in OpenGFX when I checked this.

PeterN · 2019-01-27T13:30:06Z

@nielsmh Unless someone wants to improve them, I think the icons are fine.

Current version now displays the group hierarchy so the list order is the same as the group window, but does not affect how colour is assigned.

There's a small discrepancy anyway that when 'Default' is selected it shows the main company colour, but vehicles may not be that colour if the type-based liveries are used.


        Change: Replace checkbox in livery selection window with Default opti…

…on in drop down selection. This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.


        Feature: Add vehicle group liveries.

PeterN · 2019-01-28T20:34:02Z

Group hierarchy is now followed for liveries.

andythenorth · 2019-01-28T22:12:39Z

Tested, works for me.

I thought I had found an issue where default was sometimes wrong for 2CC, but can't repro. Only saw it in a savegame with groups created in a previous version of patch, assuming it was stale data.

planetmaker · 2019-01-31T13:56:11Z

It compiles and looks good. Let's ship it ;)

planetmaker

As by the comment... let's ship it


        Fix OpenTTD#7108: Group livery command did not check its parameters p…

…roperly.


        Fix #7108: Group livery command did not check its parameters properly.


        Fix OpenTTD#7108: Missed generate_widget script run for livery changes.


        Fix #7108: Missed generate_widget script run for livery changes.


        broke build

Revert "Feature: Group liveries, and livery window usability enhancements. (OpenTTD#7108)" This reverts commit 23960d0.


        Feature: Group liveries, and livery window usability enhancements. (O…

…penTTD#7108) * Change: Replace checkbox in livery selection window with Default option in drop down selection. This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired. * Feature: Add vehicle group liveries.


        Fix OpenTTD#7108: Group livery command did not check its parameters p…

…roperly.


        Fix OpenTTD#7108: Missed generate_widget script run for livery changes.


        Fix: Update OTTD_GUI sprite count.

The number of GUI sprites has increased since the group liveries addition (OpenTTD/OpenTTD#7108).


        Fix: Update OTTD_GUI sprite count.

The number of GUI sprites has increased since the group liveries addition (OpenTTD/OpenTTD#7108).

PeterN force-pushed the PeterN:group-livery branch from 5d1cb6d to 92499e0 Jan 27, 2019

nielsmh reviewed Jan 27, 2019

View changes

PeterN dismissed nielsmh’s stale review via 9383c79 Jan 27, 2019

PeterN force-pushed the PeterN:group-livery branch from 92499e0 to 9383c79 Jan 27, 2019

PeterN force-pushed the PeterN:group-livery branch from 9383c79 to dc8362a Jan 27, 2019

PeterN force-pushed the PeterN:group-livery branch from dc8362a to 73cde85 Jan 28, 2019

PeterN added 2 commits Apr 16, 2018

Change: Replace checkbox in livery selection window with Default opti…

1659a05

…on in drop down selection. This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.

Feature: Add vehicle group liveries.

Loading status checks…

b115c53

PeterN force-pushed the PeterN:group-livery branch from 73cde85 to b115c53 Jan 28, 2019

nielsmh added Interface enhancement savegame upgrade labels Jan 28, 2019

planetmaker approved these changes Jan 31, 2019

View changes

planetmaker merged commit 23960d0 into OpenTTD:master Jan 31, 2019
1 check passed

1 check passed

OpenTTD CI Build #20190128.13 succeeded
Details

PeterN deleted the PeterN:group-livery branch Feb 2, 2019

PeterN added a commit to PeterN/OpenTTD that referenced this pull request Feb 3, 2019

Fix OpenTTD#7108: Group livery command did not check its parameters p…

5acdb0a

…roperly.

PeterN added a commit that referenced this pull request Feb 3, 2019

Fix #7108: Group livery command did not check its parameters properly.

Loading status checks…

cca952d

PeterN added a commit to PeterN/OpenTTD that referenced this pull request Feb 6, 2019

Fix OpenTTD#7108: Missed generate_widget script run for livery changes.

3f6fe9e

michicc added a commit that referenced this pull request Feb 6, 2019

Fix #7108: Missed generate_widget script run for livery changes.

Loading status checks…

bfdad9a

smearle added a commit to smearle/pyOpenTTD that referenced this pull request Feb 12, 2019

broke build

b9762e0

Revert "Feature: Group liveries, and livery window usability enhancements. (OpenTTD#7108)" This reverts commit 23960d0.

nielsmh added a commit to nielsmh/OpenTTD that referenced this pull request Mar 11, 2019

Fix OpenTTD#7108: Group livery command did not check its parameters p…

4de848c

…roperly.

nielsmh added a commit to nielsmh/OpenTTD that referenced this pull request Mar 11, 2019

Fix OpenTTD#7108: Missed generate_widget script run for livery changes.

83c6f81

stormcone mentioned this pull request Apr 20, 2019

Fix: Update OTTD_GUI sprite count. #32

Merged

michicc added a commit to OpenTTD/nml that referenced this pull request Apr 20, 2019

Fix: Update OTTD_GUI sprite count.

3f2ed3c

The number of GUI sprites has increased since the group liveries addition (OpenTTD/OpenTTD#7108).

OpenTTD/OpenTTD

Feature: Group liveries, and livery window usability enhancements. #7108

Feature: Group liveries, and livery window usability enhancements. #7108

PeterN commented Jan 26, 2019 •

edited

This comment has been minimized.

nielsmh commented Jan 26, 2019

This comment has been minimized.

andythenorth commented Jan 26, 2019 •

edited

This comment has been minimized.

PeterN commented Jan 26, 2019

This comment has been minimized.

andythenorth commented Jan 26, 2019 •

edited

This comment has been minimized.

andythenorth commented Jan 26, 2019

This comment has been minimized.

J0anJosep commented Jan 27, 2019 •

edited

This comment has been minimized.

PeterN commented Jan 27, 2019 •

edited

This comment has been minimized.

andythenorth commented Jan 27, 2019

nielsmh left a comment

This comment has been minimized.

PeterN commented Jan 27, 2019

This comment has been minimized.

J0anJosep commented Jan 27, 2019 •

edited

This comment has been minimized.

J0anJosep commented Jan 27, 2019

This comment has been minimized.

PeterN commented Jan 27, 2019

This comment has been minimized.

PeterN commented Jan 28, 2019

This comment has been minimized.

andythenorth commented Jan 28, 2019

This comment has been minimized.

planetmaker commented Jan 31, 2019

planetmaker left a comment

Sponsor OpenTTD/OpenTTD

OpenTTD/OpenTTD

Join GitHub today

Feature: Group liveries, and livery window usability enhancements. #7108

Feature: Group liveries, and livery window usability enhancements. #7108

Conversation

PeterN commented Jan 26, 2019 • edited

This comment has been minimized.

nielsmh commented Jan 26, 2019

This comment has been minimized.

andythenorth commented Jan 26, 2019 • edited

This comment has been minimized.

PeterN commented Jan 26, 2019

This comment has been minimized.

andythenorth commented Jan 26, 2019 • edited

This comment has been minimized.

andythenorth commented Jan 26, 2019

This comment has been minimized.

J0anJosep commented Jan 27, 2019 • edited

This comment has been minimized.

PeterN commented Jan 27, 2019 • edited

This comment has been minimized.

andythenorth commented Jan 27, 2019

nielsmh left a comment

This comment has been minimized.

PeterN commented Jan 27, 2019

This comment has been minimized.

J0anJosep commented Jan 27, 2019 • edited

This comment has been minimized.

J0anJosep commented Jan 27, 2019

This comment has been minimized.

PeterN commented Jan 27, 2019

This comment has been minimized.

PeterN commented Jan 28, 2019

This comment has been minimized.

andythenorth commented Jan 28, 2019

This comment has been minimized.

planetmaker commented Jan 31, 2019

planetmaker left a comment

PeterN commented Jan 26, 2019 •

edited

andythenorth commented Jan 26, 2019 •

edited

andythenorth commented Jan 26, 2019 •

edited

J0anJosep commented Jan 27, 2019 •

edited

PeterN commented Jan 27, 2019 •

edited

J0anJosep commented Jan 27, 2019 •

edited