[PATCH] Barter Button Removal, Bartering UI Tweak

[michael]

Remove the 'Barter' button from the bartering panel in the Market UI. Just select the 'Sell' resource in the top row, then begin clicking the desired 'Buy' resource in the bottom row. No need for the 'Barter' button. This space can be used for the 'trade tax'. I know we went back and forth about this prior to adding bartering, but after some playtesting I feel the button is completely unnecessary. Tooltips completely suffice. Later we can add an option to turn on/off tooltips.

[fcxSanya]

Currently there is two sets of buttons: 'inactive' (greyed) and 'selected' (coloured and with yellow corners). In the current svn version all barter buttons displayed as inactive except one selected in the first row (resource to sell) and one selected in the second row (resource to buy), in this patch there is obviously no selected icon in the second row and all they displayed as 'inactive' which as a bit misleading. Given r11364 we can replace the 'inactive' set of icons with the 'active' (coloured) and use:

• inactive icons ('active' with grayscale filter) + 'seleted' in the first row;
• 'active' icons in the second row.

Ideally there should be only one set of 'active' icons, and 'selected' should be implemented via adding yellow corners overlay to it, but I don't know how to do this without ugly image-inside-image workaround.

[fcxSanya]

Replying to fcxSanya:

Ideally there should be only one set of 'active' icons, and 'selected' should be implemented via adding yellow corners overlay to it, but I don't know how to do this without ugly image-inside-image workaround.

After discussion on IRC it seems like 'image-inside-image' is not so bad and already used in other places, so I will do 'selected' icons this way.

[leper]

Seems like Michael commited your patch in [11450]. I suppose this was unintended.

[Kieran P]

Ok, leper, if the patch was nearly there, please just commit the changes needed to clean it up.

If the patch needed a lot of work, please pull the mistakenly committed code until it is ready.

[leper]

In 11459:

Make use of the grayscale opion.
Move some icon files to a more adequate location.
Closes #1214 as that was already commited and this commit fixes some minor issues.

[leper]

Replying to fcxSanya:

After discussion on IRC it seems like 'image-inside-image' is not so bad and already used in other places, so I will do 'selected' icons this way.

As Michael had already commited your patch and I made it use the nice grayscale option I closed this ticket. I added some comments to the formation and stances gui code as those should also use the "image-inside-image" way to mark them as selected. I will probably try to make those cases work with the "image-inside-image" way, but if you want to do that just say so.

[fcxSanya]

Replying to leper:

I will probably try to make those cases work with the "image-inside-image" way, but if you want to do that just say so.

Most likely you will do this much faster than me, so go ahead :)

[leper]

Done.

[fcxSanya]

Replying to leper:

Done.

Nice, thanks :)

As I understand it is r11464 , good to have the link here for reference. You can use SpecialCommands in such cases, e.g. add 'Refs #1214' to the commit message.

[leper]

Replying to fcxSanya:

As I understand it is r11464 , good to have the link here for reference.

Thanks for adding it here. I forgot adding it to the commit message.