Changeset View
Changeset View
Standalone View
Standalone View
binaries/data/mods/public/gui/session/diplomacy_window.xml
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||
| <object name="diplomacyDialogPanel" | <object name="diplomacyDialogPanel" | ||||
| size="50%-260 50%-200 50%+260 50%+150" | size="50%-280 50%-200 50%+280 50%+150" | ||||
elexis: (Merge conflict incoming with D88 but won't be hard to solve for him, just adding 10px or… | |||||
| type="image" | type="image" | ||||
| hidden="true" | hidden="true" | ||||
| sprite="ModernDialog" | sprite="ModernDialog" | ||||
| > | > | ||||
| <object type="text" style="TitleText" size="50%-96 -16 50%+96 16"> | <object type="text" style="TitleText" size="50%-96 -16 50%+96 16"> | ||||
| <translatableAttribute id="caption">Diplomacy</translatableAttribute> | <translatableAttribute id="caption">Diplomacy</translatableAttribute> | ||||
| </object> | </object> | ||||
| Show All 17 Lines | <object name="diplomacyHeader" size="32 32 100%-32 64"> | ||||
| <object name="diplomacyHeaderNeutral" size="380 0 400 100%" type="text" style="DiplomacyText" tooltip_style="sessionToolTipBold"> | <object name="diplomacyHeaderNeutral" size="380 0 400 100%" type="text" style="DiplomacyText" tooltip_style="sessionToolTipBold"> | ||||
| <translatableAttribute id="caption">N</translatableAttribute> | <translatableAttribute id="caption">N</translatableAttribute> | ||||
| <translatableAttribute id="tooltip">Neutral</translatableAttribute> | <translatableAttribute id="tooltip">Neutral</translatableAttribute> | ||||
| </object> | </object> | ||||
| <object name="diplomacyHeaderEnemy" size="400 0 420 100%" type="text" style="DiplomacyText" tooltip_style="sessionToolTipBold"> | <object name="diplomacyHeaderEnemy" size="400 0 420 100%" type="text" style="DiplomacyText" tooltip_style="sessionToolTipBold"> | ||||
| <translatableAttribute id="caption">E</translatableAttribute> | <translatableAttribute id="caption">E</translatableAttribute> | ||||
| <translatableAttribute id="tooltip">Enemy</translatableAttribute> | <translatableAttribute id="tooltip">Enemy</translatableAttribute> | ||||
| </object> | </object> | ||||
| <object name="diplomacyHeaderTribute" size="430 0 100%-30 100%" type="text" style="DiplomacyText" text_align="center"> | <object name="diplomacyHeaderTribute" size="430 0 100%-70 100%" type="text" style="DiplomacyText" text_align="center"> | ||||
| <translatableAttribute id="caption">Tribute</translatableAttribute> | <translatableAttribute id="caption">Tribute</translatableAttribute> | ||||
| </object> | </object> | ||||
| </object> | </object> | ||||
| <object size="32 64 100%-32 384"> | <object size="32 64 100%-32 384"> | ||||
| <repeat count="8" var="n"> | <repeat count="8" var="n"> | ||||
| <object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="true"> | <object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="true"> | ||||
| <object name="diplomacyPlayerOutcome[n]" size="0 0 25 100%" type="image" tooltip_style="sessionToolTipBold"/> | <object name="diplomacyPlayerOutcome[n]" size="0 0 25 100%" type="image" tooltip_style="sessionToolTipBold"/> | ||||
| <object name="diplomacyPlayerName[n]" size="25 0 150 100%" type="text" style="DiplomacyText"/> | <object name="diplomacyPlayerName[n]" size="25 0 150 100%" type="text" style="DiplomacyText"/> | ||||
| <object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="DiplomacyText"/> | <object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="DiplomacyText"/> | ||||
| <object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="DiplomacyText"/> | <object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="DiplomacyText"/> | ||||
| <object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="DiplomacyText"/> | <object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="DiplomacyText"/> | ||||
| <!-- Diplomatic stance - selection --> | <!-- Diplomatic stance - selection --> | ||||
| <object name="diplomacyPlayerAlly[n]" size="360 0 380 100%" type="button" style="StoneButton" hidden="true"/> | <object name="diplomacyPlayerAlly[n]" size="360 0 380 100%" type="button" style="StoneButton" hidden="true"/> | ||||
| <object name="diplomacyPlayerNeutral[n]" size="380 0 400 100%" type="button" style="StoneButton" hidden="true"/> | <object name="diplomacyPlayerNeutral[n]" size="380 0 400 100%" type="button" style="StoneButton" hidden="true"/> | ||||
| <object name="diplomacyPlayerEnemy[n]" size="400 0 420 100%" type="button" style="StoneButton" hidden="true"/> | <object name="diplomacyPlayerEnemy[n]" size="400 0 420 100%" type="button" style="StoneButton" hidden="true"/> | ||||
| <!-- Tribute --> | <!-- Tribute --> | ||||
| <object size="430 0 100%-40 100%"> | <object size="430 0 100%-80 100%"> | ||||
| <repeat count="8" var="r"> | <repeat count="8" var="r"> | ||||
| <object name="diplomacyPlayer[n]_tribute[r]" size="0 0 20 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true"> | <object name="diplomacyPlayer[n]_tribute[r]" size="0 0 20 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true"> | ||||
| <object name="diplomacyPlayer[n]_tribute[r]_image" type="image" size="0 0 100% 100%" ghost="true"/> | <object name="diplomacyPlayer[n]_tribute[r]_image" type="image" size="0 0 100% 100%" ghost="true"/> | ||||
| </object> | </object> | ||||
| </repeat> | </repeat> | ||||
| </object> | </object> | ||||
| <object name="diplomacyAttackRequest[n]" size="100%-20 0 100% 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true"> | <object name="diplomacyAttackRequest[n]" size="100%-60 0 100%-40 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true"> | ||||
| <object name="diplomacyAttackRequestImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/attack-request.png" ghost="true"/> | <object name="diplomacyAttackRequestImage[n]" type="image" size="0 0 100% 100%" sprite="stretched:session/icons/attack-request.png" ghost="true"/> | ||||
| </object> | </object> | ||||
| <object name="diplomacySpyRequest[n]" size="100%-20 0 100% 100%" type="button" style="iconButton" tooltip_style="sessionToolTipBold" hidden="true"> | |||||
elexis: Ack on the new size | |||||
| <object name="diplomacySpyRequestImage[n]" type="image" size="2 2 100%-2 100%-2" ghost="true"/> | |||||
elexisUnsubmitted TODO: There is space between the attack request button and the spy-request button. Is that intentional?  (In rP19199 we removed those "ghost" properties because they were a workaround, but in this case they are still needed). (Just for reference and future / non-staff readers: it's subideal to add buttons that receive a playerID argument to the diplomacy panel, as most of them are not really related to diplomacy, but good enough for now.) elexis: **TODO:** There is space between the attack request button and the spy-request button. Is that… | |||||
mimoAuthorUnsubmitted I guess it would be nicer to increase a little bit the gap between tribute and attack-request (so that it is the same as between the A-N-E and tributes, and have the same one between attack and spy. mimo: I guess it would be nicer to increase a little bit the gap between tribute and attack-request… | |||||
elexisUnsubmitted ack elexis: ack | |||||
| </object> | |||||
| </object> | </object> | ||||
| </repeat> | </repeat> | ||||
| </object> | </object> | ||||
| <object name="diplomacyCeasefireCounter" size="32 100%-90 100%-32 100%-62" type="text" style="DiplomacyText" ghost="true"></object> | <object name="diplomacyCeasefireCounter" size="32 100%-90 100%-32 100%-62" type="text" style="DiplomacyText" ghost="true"></object> | ||||
| <object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton"> | <object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton"> | ||||
| <translatableAttribute id="caption">Close</translatableAttribute> | <translatableAttribute id="caption">Close</translatableAttribute> | ||||
| <action on="Press">closeDiplomacy();</action> | <action on="Press">closeDiplomacy();</action> | ||||
| </object> | </object> | ||||
| </object> | </object> | ||||
(Merge conflict incoming with D88 but won't be hard to solve for him, just adding 10px or something)