The Stone theme is still widely in use and that's not going to change, because those buttons are actually more appealing (than what was offered otherwise, see those red buttons in the lobby).
Alternatively, the modern theme could adopt these styles. But then the question remains why we have separate directories for themes to begin with.
Details
Details
- Reviewers
- None
Search for "Stone in XML files to test for completeness.
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Branch
- /ps/trunk
- Lint
Lint OK - Unit
No Unit Test Coverage - Build Status
Buildable 2234 Build 3685: Vulcan Build (Windows) Jenkins Build 3684: Vulcan Build Jenkins Build 3683: arc lint + arc unit
Event Timeline
Comment Actions
Build is green
Updating workspaces. Build (release)... Build (debug)... Running release tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
http://jw:8080/job/phabricator/1524/ for more details.
Comment Actions
Executing section Default... Executing section Source... Executing section JS... Executing section XML GUI... | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 1| 1| <?xml version="1.0" encoding="utf-8"?> | 2| |- | 3| 2| <sprites> | 4| 3| | 5| 4| <!-- | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 9| 9| --> | 10| 10| | 11| 11| <sprite name="productLogo"> | 12| |- <image texture="pregame/shell/logo/0ad_logo.png" | 13| |- real_texture_placement="0 0 256 128" | 14| |- size="0 -5% 100% 105%" | 15| |- /> | | 12|+ <image texture="pregame/shell/logo/0ad_logo.png" real_texture_placement="0 0 256 128" size="0 -5% 100% 105%"/> | 16| 13| </sprite> | 17| 14| | 18| 15| <sprite name="companyLogo"> | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 16| 16| </sprite> | 17| 17| | 18| 18| <sprite name="companyLogo"> | 19| |- <image texture="pregame/shell/logo/wfg_logo_white.png" | 20| |- real_texture_placement="0 0 32 32" | 21| |- /> | | 19|+ <image texture="pregame/shell/logo/wfg_logo_white.png" real_texture_placement="0 0 32 32"/> | 22| 20| </sprite> | 23| 21| | 24| 22| <!-- | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 28| 28| --> | 29| 29| | 30| 30| <sprite name="BackgroundTranslucent"> | 31| |- <image backcolor="0 0 0 85" | 32| |- size="0 0 100% 100%" | 33| |- /> | | 31|+ <image backcolor="0 0 0 85" size="0 0 100% 100%"/> | 34| 32| </sprite> | 35| 33| | 36| 34| <sprite name="BackgroundBlack"> | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 38| 38| </sprite> | 39| 39| | 40| 40| <sprite name="BackgroundWhiteBorderBlack"> | 41| |- <image | 42| |- backcolor="white" | 43| |- size="0 0 100% 100%" | 44| |- border="true" | 45| |- bordercolor="black" | 46| |- /> | | 41|+ <image backcolor="white" size="0 0 100% 100%" border="true" bordercolor="black"/> | 47| 42| </sprite> | 48| 43| | 49| 44| <!-- | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 53| 53| --> | 54| 54| | 55| 55| <sprite name="TranslucentPanelThinBorder"> | 56| |- <image backcolor="0 0 0 85" | 57| |- size="0 0 100% 100%" | 58| |- /> | | 56|+ <image backcolor="0 0 0 85" size="0 0 100% 100%"/> | 59| 57| | 60| 58| <!-- sides --> | 61| 59| <image texture="global/border/line_horiz.png" | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 58| 58| /> | 59| 59| | 60| 60| <!-- sides --> | 61| |- <image texture="global/border/line_horiz.png" | 62| |- texture_size="0 0 64 4" | 63| |- size="4 0 100%-4 4" | 64| |- /> | 65| |- <image texture="global/border/line_vert.png" | 66| |- texture_size="0 0 4 64" | 67| |- size="100%-4 4 100% 100%-4" | 68| |- /> | 69| |- <image texture="global/border/line_horiz.png" | 70| |- texture_size="0 0 64 4" | 71| |- size="4 100%-4 100%-4 100%" | 72| |- /> | 73| |- <image texture="global/border/line_vert.png" | 74| |- texture_size="0 0 4 64" | 75| |- size="0 4 4 100%-4" | 76| |- /> | | 61|+ <image texture="global/border/line_horiz.png" texture_size="0 0 64 4" size="4 0 100%-4 4"/> | | 62|+ <image texture="global/border/line_vert.png" texture_size="0 0 4 64" size="100%-4 4 100% 100%-4"/> | | 63|+ <image texture="global/border/line_horiz.png" texture_size="0 0 64 4" size="4 100%-4 100%-4 100%"/> | | 64|+ <image texture="global/border/line_vert.png" texture_size="0 0 4 64" size="0 4 4 100%-4"/> | 77| 65| | 78| 66| <!-- corners --> | 79| 67| <image | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 76| 76| /> | 77| 77| | 78| 78| <!-- corners --> | 79| |- <image | 80| |- texture="global/border/line_corner_top_right.png" | 81| |- texture_size="0 0 4 4" | 82| |- size="100%-4 0 100% 4" | 83| |- /> | 84| |- <image texture="global/border/line_corner_bottom_right.png" | 85| |- texture_size="0 0 4 4" | 86| |- size="100%-4 100%-4 100% 100%" | 87| |- /> | 88| |- <image texture="global/border/line_corner_bottom_left.png" | 89| |- texture_size="0 0 4 4" | 90| |- size="0 100%-4 4 100%" | 91| |- /> | 92| |- <image texture="global/border/line_corner_top_left.png" | 93| |- texture_size="0 0 4 4" | 94| |- size="0 0 4 4" | 95| |- /> | | 79|+ <image texture="global/border/line_corner_top_right.png" texture_size="0 0 4 4" size="100%-4 0 100% 4"/> | | 80|+ <image texture="global/border/line_corner_bottom_right.png" texture_size="0 0 4 4" size="100%-4 100%-4 100% 100%"/> | | 81|+ <image texture="global/border/line_corner_bottom_left.png" texture_size="0 0 4 4" size="0 100%-4 4 100%"/> | | 82|+ <image texture="global/border/line_corner_top_left.png" texture_size="0 0 4 4" size="0 0 4 4"/> | 96| 83| </sprite> | 97| 84| | 98| 85| | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 104| 104| | 105| 105| <sprite name="iconInfoGold"> | 106| 106| <effect add_color="237 227 167"/> | 107| |- <image | 108| |- texture="global/icon/info.png" | 109| |- size="0 3 100% 100%+3" | 110| |- /> | | 107|+ <image texture="global/icon/info.png" size="0 3 100% 100%+3"/> | 111| 108| </sprite> | 112| 109| | 113| 110| <sprite name="iconInfoWhite"> | | [INFO] XMLBear: | | XML can be formatted better. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/common/sprites.xml | 112| 112| | 113| 113| <sprite name="iconInfoWhite"> | 114| 114| <effect add_color="255 255 255"/> | 115| |- <image | 116| |- texture="global/icon/info.png" | 117| |- size="0 3 100% 100%+3" | 118| |- /> | | 115|+ <image texture="global/icon/info.png" size="0 3 10
http://jw:8080/job/phabricator_lint/167/ for more details.
Comment Actions
As discussed with Imarok recently, the Stone theme can stay where it is for now. Adding a new directory with onyl the button and lots of inclusion files doesn't have any advantage (themes won't be interchangeable anytime soon anyhow).
The mod mod doesn't use this theme and is probably better off staying minimal. Otherwise the Modern theme could just adopt the widely used Stone button.
The idea was to minimize gui/common/ and delete everything as far as possible in there if not really needed there to keep inclusions transparent.
Maybe gui/common/styles.xml can become deleted, but gui/common/sprites.xml probably can't be deleted either, so the theme shouldn't be moved, so that the number of includes doesn't increase.