Ticket #4069: diplomacy_screen_chatPanel_fix.patch

File diplomacy_screen_chatPanel_fix.patch, 5.3 KB (added by elexis, 8 years ago)

Note to oneself: commit after #3934 is merged.

  • binaries/data/mods/public/gui/session/diplomacy_window.xml

     
    99    <object type="text" style="TitleText" size="50%-96 -16 50%+96 16">
    1010        <translatableAttribute id="caption">Diplomacy</translatableAttribute>
    1111    </object>
    1212
    1313    <object name="diplomacyHeader" size="32 32 100%-32 64">
    14         <object name="diplomacyHeaderName" size="0 0 150 100%" type="text" style="chatPanel" ghost="true">
     14        <object name="diplomacyHeaderName" size="0 0 150 100%" type="text" style="ModernLeftLabelText" ghost="true">
    1515            <translatableAttribute id="caption">Name</translatableAttribute>
    1616        </object>
    17         <object name="diplomacyHeaderCiv" size="150 0 250 100%" type="text" style="chatPanel" ghost="true">
     17        <object name="diplomacyHeaderCiv" size="150 0 250 100%" type="text" style="ModernLeftLabelText" ghost="true">
    1818            <translatableAttribute id="caption">Civilization</translatableAttribute>
    1919        </object>
    20         <object name="diplomacyHeaderTeam" size="250 0 300 100%" type="text" style="chatPanel" ghost="true">
     20        <object name="diplomacyHeaderTeam" size="250 0 300 100%" type="text" style="ModernLeftLabelText" ghost="true">
    2121            <translatableAttribute id="caption">Team</translatableAttribute>
    2222        </object>
    23         <object name="diplomacyHeaderTheirs" size="300 0 360 100%" type="text" style="chatPanel" ghost="true">
     23        <object name="diplomacyHeaderTheirs" size="300 0 360 100%" type="text" style="ModernLeftLabelText" ghost="true">
    2424            <translatableAttribute id="caption">Theirs</translatableAttribute>
    2525        </object>
    26         <object name="diplomacyHeaderAlly" size="100%-180 0 100%-160 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
     26        <object name="diplomacyHeaderAlly" size="100%-180 0 100%-160 100%" type="text" style="ModernLeftLabelText" tooltip_style="sessionToolTipBold">
    2727            <translatableAttribute id="caption">A</translatableAttribute>
    2828            <translatableAttribute id="tooltip">Ally</translatableAttribute>
    2929        </object>
    30         <object name="diplomacyHeaderNeutral" size="100%-160 0 100%-140 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
     30        <object name="diplomacyHeaderNeutral" size="100%-160 0 100%-140 100%" type="text" style="ModernLeftLabelText" tooltip_style="sessionToolTipBold">
    3131            <translatableAttribute id="caption">N</translatableAttribute>
    3232            <translatableAttribute id="tooltip">Neutral</translatableAttribute>
    3333        </object>
    34         <object name="diplomacyHeaderEnemy" size="100%-140 0 100%-120 100%" type="text" style="chatPanel" tooltip_style="sessionToolTipBold">
     34        <object name="diplomacyHeaderEnemy" size="100%-140 0 100%-120 100%" type="text" style="ModernLeftLabelText" tooltip_style="sessionToolTipBold">
    3535            <translatableAttribute id="caption">E</translatableAttribute>
    3636            <translatableAttribute id="tooltip">Enemy</translatableAttribute>
    3737        </object>
    38         <object name="diplomacyHeaderTribute" size="100%-110 0 100% 100%" type="text" style="chatPanel">
     38        <object name="diplomacyHeaderTribute" size="100%-110 0 100% 100%" type="text" style="ModernLeftLabelText">
    3939            <translatableAttribute id="caption">Tribute</translatableAttribute>
    4040        </object>
    4141    </object>
     42
    4243    <object size="32 64 100%-32 384">
    4344        <repeat count="16">
    4445            <object name="diplomacyPlayer[n]" size="0 0 100% 20" type="image" hidden="false">
    45                 <object name="diplomacyPlayerName[n]" size="0 0 150 100%" type="text" style="chatPanel" ghost="true"/>
    46                 <object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="chatPanel" ghost="true"/>
    47                 <object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="chatPanel" ghost="true"/>
    48                 <object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="chatPanel" ghost="true"/>
     46                <object name="diplomacyPlayerName[n]" size="0 0 150 100%" type="text" style="ModernLeftLabelText" ghost="true"/>
     47                <object name="diplomacyPlayerCiv[n]" size="150 0 250 100%" type="text" style="ModernLeftLabelText" ghost="true"/>
     48                <object name="diplomacyPlayerTeam[n]" size="250 0 300 100%" type="text" style="ModernLeftLabelText" ghost="true"/>
     49                <object name="diplomacyPlayerTheirs[n]" size="300 0 360 100%" type="text" style="ModernLeftLabelText" ghost="true"/>
    4950
    5051                <!-- Diplomatic stance - selection -->
    5152                <object name="diplomacyPlayerAlly[n]" size="100%-180 0 100%-160 100%" type="button" style="StoneButton" hidden="true"/>
    5253                <object name="diplomacyPlayerNeutral[n]" size="100%-160 0 100%-140 100%" type="button" style="StoneButton" hidden="true"/>
    5354                <object name="diplomacyPlayerEnemy[n]" size="100%-140 0 100%-120 100%" type="button" style="StoneButton" hidden="true"/>
     
    7172                </object>
    7273            </object>
    7374        </repeat>
    7475    </object>
    7576
    76     <object name="diplomacyCeasefireCounter" size="32 100%-90 100%-32 100%-62" type="text" style="chatPanel" ghost="true"></object>
     77    <object name="diplomacyCeasefireCounter" size="32 100%-90 100%-32 100%-62" type="text" style="ModernLeftLabelText" ghost="true"></object>
    7778
    7879    <object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
    7980        <translatableAttribute id="caption">Close</translatableAttribute>
    8081        <action on="Press">closeDiplomacy();</action>
    8182    </object>