Diffusion 0 A.D. Public Repository rP23072

Refactor trade dialog and barter panel buttons to use object orientation, refs…
AuditedrP23072
Actions

Tags

None

Subscribers

Description

Refactor trade dialog and barter panel buttons to use object orientation, refs #23, #2311, #4366, #5387, rP10588, rP14417, rP17553, rP19354.

Differential Revision: https://code.wildfiregames.com/D2369

Details

Auditors

Committed

Oct 13 2019, 5:43 AM

Differential Revision

D2369: Refactor trade dialog to use object orientation

Parents

rP23071: Fix atlas complaining about the diplomacy dialog following rP23065/D2365, refs…

Branches

Unknown

Tags

Unknown

Build Status

Buildable 9805
Build 16501: Post-Commit Build	Jenkins

Event Timeline

elexis committed rP23072: Refactor trade dialog and barter panel buttons to use object orientation, refs….Oct 13 2019, 5:43 AM

elexis added an edge: D2369: Refactor trade dialog to use object orientation.

Harbormaster failed to build B9805: rP23072: Refactor trade dialog and barter panel buttons to use object orientation, refs…!Oct 13 2019, 5:52 AM

elexis mentioned this in D2306: remove "Goods" from trade window stings.Oct 20 2019, 1:12 PM

bb raised a concern with this commit.Sep 23 2020, 8:13 PM

bb added a subscriber: bb.

bb added inline comments.

/ps/trunk/binaries/data/mods/public/gui/session/trade/TradeButtonManager.js
11	We can't assume that, since the values should be visible for observers too and they don't change the simstate. Therefore observers never saw changes here (they inherited the initial gaia settings) and since D2810 they show undefined (since initially there is no player interface, which is fine since the trade dialog can't be opened). We probably should update the values on update then...

This commit now has outstanding concerns.Sep 23 2020, 8:13 PM

bb mentioned this in D3014: Show correct trade info for observers.Sep 23 2020, 8:22 PM

Fixed by rP24071

All concerns with this commit have now been addressed.Sep 26 2020, 12:07 AM

Changes (25)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

gui/

session/

hotkeys/

selection_panels.js

selection_panels_left/

barter_panel.xml

top_panel/

TradeDialogButton.js

button_trade.xml

BarterButton.js

BarterButton.xml

BarterButtonManager.js

TradeButtonManager.js

TradeDialogBarterPanel.js

TradeDialogTradePanel.js

TraderStatusText.js

TraderStatusTextLand.js

TraderStatusTextShip.js

	trade/

	BarterPanel.xml
	trade_window.xml

	TradeDialog.xml
	trade_window.xml

	TradePanel.xml
	trade_window.xml

trade_window.xml

unit_actions.js

rP23072

ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/menu.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/session.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/session.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/top_panel/TradeDialogButton.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/BarterButton.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/BarterButton.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/BarterButtonManager.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/BarterPanel.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TradeButton.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TradeButtonManager.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TradeDialog.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TradeDialog.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TradeDialogBarterPanel.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TradeDialogTradePanel.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TradePanel.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TraderStatusText.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TraderStatusTextLand.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade/TraderStatusTextShip.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade_window.xml

Loading...

ps/trunk/binaries/data/mods/public/gui/session/unit_actions.js

Loading...