Commit graph

557 commits

Author SHA1 Message Date
josteph
78523be7f7 Default theme: Make alignment and abilities wider. 2018-11-18 12:19:50 +00:00
josteph
815ded47dd Themes: Fix unit status icons not showing
When [unit_status] shows two or more images, only the first showed and
there was no indication that there were further statuses. Now an
ellipsis is shown and the tooltip contains the information about the
second and further statuses.

Fixes #3197
2018-11-13 22:16:07 +00:00
Jyrki Vesterinen
34d93d44ca Hide battery status if the device doesn't have a battery
The strategy is two-fold. We move the rendering of the icon into the
battery status report where it can be disabled at runtime, and allow the
countdown/clock to move to the position of the battery status if the device
doesn't have a battery. I also moved rendering of the clock icon to the
time report to allow the icon to move together with the text.

I needed to change theme::status_ to store pointers to status items because
otherwise the countdown object loses its type when inserted to the map. And
to be able to use std::unique_ptr inside the theme class, I had to make the
class non-copyable and movable.
2018-10-30 07:46:50 +02:00
Martin Hrubý (hrubymar10)
de183eeb2d Include battery percentage into GUI and add 2 versions of battery icon 2018-10-30 07:14:42 +02:00
josteph
9e0593d714 Themes: Fix the observers icon being hidden under the minimap
Closes #3543. Fixups #3441.

The observers icon is declared immediately after `report_timeout`,
therefore the timeout widget was the ref rect for the observers widget:
83ba09a5a9/src/theme.cpp (L120)

PR #3441 added a battery icon to the left of the timeout widget. That
shifted the timeout widget to the right and the observers widget shifted
along with it due to its relative positioning. The observers widget
moved even on devices that didn't have a battery.

Fix this by using the battery box as the ref of the observers widget,
because it currently occupies the absolute location the observers widget
was positioned relatively to.

(cherry picked from commit 461cd2c4bd)
2018-10-28 02:53:10 +00:00
Celtic Minstrel
1489f5fbd0 Minor tweaks to classic theme (thanks enclave for doing this)
No forward-port to master, as the classic theme will be removed in 1.15.0

(cherry picked from commit bf3ece140e)
2018-10-28 02:53:02 +00:00
Martin Hrubý (hrubymar10)
c79ba9ac03 Fix MP label for #2855
(cherry picked from commit 4ba1811f03)
2018-10-28 02:52:59 +00:00
Sofartin
0bc9f4ef23 Fix HP label in longer languages
English uses 2 letter abbrev but some languages like Czech don't have this abbrev so we need wider space for our 6 letter label "Životů"

(cherry picked from commit d51ccbe538)
2018-10-28 02:52:54 +00:00
Martin Hrubý (hrubymar10)
674fda85b7 Migrate links to https if available - Fwd c18537edc0
(cherry-picked from commit bc4d22dc72)
2018-10-07 03:23:36 +00:00
Choicerer
12c7a950d2 Fixes broken tooltips for the unit_side flag and the unit name. (#3315)
Fixes #3306

(cherry-picked from commit f50b644c30)
2018-10-07 03:23:11 +00:00
Charles Dang
ff341cc8ee Theme: draw plain black bg if no [main_map_border] background_image= is given 2018-02-09 21:45:02 +11:00
Charles Dang
9f22a56370 Theme: added [main_map_border] show_border= key to control whether map borders draw
Fixes #2272.
2018-02-09 21:35:14 +11:00
Matthias Krüger
b11d3fdcbe fix a bunch of typos found by codespell in data directory.
https://github.com/lucasdemarchi/codespell
2018-02-06 23:03:06 +11:00
kallaballa
78dff47bd3 Implemented dropout to observer on surrender 2018-02-05 00:35:35 +01:00
Charles Dang
5c7f58c9a6 Remove Unit Box and Widescreen themes
[ci skip]

These were half-baked and mostly badly-designed. The Unit Box theme was never finished, is completely broken,
and if we were to do a major theme refresh we'd probably go in another direction. The Widescreen theme was a
legacy experiment that was never adopted and as of now is basically alsp completely broken.
2017-10-23 17:32:27 +11:00
Charles Dang
193baf2c22 Themes/Editor: removed golden border from top and right of map
[ci skip]

Not really necessary, just took up space. Partly addressed #1844. As for the new [main_map] rect numbers, I
just played around with them until they filled the available space.
2017-08-09 23:24:21 +11:00
Celtic Minstrel
2d5cb4c9ed Widescreen Theme: Use new minimap style 2017-07-24 00:14:37 -04:00
Celtic Minstrel
e85b429b0b Update font sizes of widescreen theme to match default theme 2017-07-23 16:38:50 -04:00
Celtic Minstrel
7df0da5659 Fix missing images in the widescreen theme.
The theme still has numerous other issues, such as misplaced elements.
2017-07-23 16:38:47 -04:00
Charles Dang
ee31ff7cc9 Removed now-unnecessary border keys from the Classic theme
These were rendered unnecessary by 781276709d.
2017-05-05 14:26:16 +11:00
Charles Dang
01e3aaf97d Added Cutscene and Minimal Cutscene themes from After the Storm
These were added with permission from shadowm, and were copied verbatim save for a small tweak to
the position of the menu button in the cutscene theme to get rid of the 3 pixel offset on the left
which had been corrected a few releases back in the default theme.
2017-05-05 14:24:36 +11:00
Celtic Minstrel
db92e95e45 Editor: Remove "draw # of bitmaps" from toolbar
This makes all the buttons fit nicely in 800x600 resolution. This option is probably rarely used and is still available from the menu in any case.
2017-05-04 14:24:34 -04:00
Charles Dang
d4529dfc1e Removed ThemeWML border image keys
These were rendered unnecessary by 781276709d, which changed border rendering to use the terrain engine.
This also removes display::draw_border, which used the keys.
2017-04-25 19:49:08 +11:00
Celtic Minstrel
062046760d Fix most of the missing image errors in the UnitBox theme 2017-04-24 11:01:14 -04:00
Celtic Minstrel
a1c22e5098 Rearrange default theme context menu to put most important commands at the top 2017-04-21 19:18:01 -04:00
gfgtdf
fcf71a249a fix replay button description
https://gna.org/bugs/?24490
2017-03-14 19:52:34 +01:00
Charles Dang
d5a3878e8e Fixed slight button overlap in replay controls 2017-03-12 17:07:36 +11:00
Charles Dang
c912f7e7e7 Removed zoom slider code
This slider hasn't worked in ages, and we're planning to remove it anyway.

The slider "groove" image remains since it's hard drawn in the background image file.
2017-03-07 21:05:25 +11:00
Celtic Minstrel
86675c28de Remove 800x480 support from the themes
[ci skip]
2016-12-02 16:05:32 -05:00
Charles Dang
6d704071b9 Removed Pandora theme
We no longer support the Pandora.
2016-12-03 07:52:54 +11:00
ln-zookeeper
5d347bb61b Added a "Draw Number of Bitmaps" option to the editor
This is similar to "Draw Hex Coordinates" and "Draw Terrain Codes", and displays the number of terrain graphics surfaces draw for each hex. It is useful for spotting mistakes such as overlay images having non-transparent pixels in adjacent hexes where they shouldn't, or for comparing the efficiency of different kinds of terrain graphics rules.
2016-10-05 18:20:19 +03:00
Charles Dang
1dafd22365 Further text clipping fixes (bug #24707) 2016-07-29 05:21:38 +11:00
Charles Dang
772f78b5a0 Fixed some ext clipping with Lato in sidebar (bug #24707) 2016-07-29 00:22:50 +11:00
Charles Dang
7a859a2ece Fixup a5130a4c36 (forgot to include small resolution buttons) 2016-07-24 10:00:01 +11:00
Charles Dang
a5130a4c36 Made sure menu button are flush with window border 2016-07-24 09:56:12 +11:00
Charles Dang
a3e535300b Revert "Don't show any images for buttons in menu bar"
This reverts commit a4c4f18a7c.
2016-07-23 15:27:15 +11:00
Charles Dang
b882a82ca4 Fixed placement of Observer icon 2016-05-28 00:41:33 +11:00
Charles Dang
52cba5fc63 Enabled Lato for GUI1 and adjusted assigned sizes accordingly
Since GUI1 widgets seem to rely on the given font size values in font.hpp
for their dimensions, those are unchanged. ThemeWML-provided sizes were adjusted,
and larger sizes assigned to elements that were too small with the new font.

Theme element rects were also adjusted as necessary.
2016-05-18 08:05:02 +11:00
Ignacio R. Morelle
00975dcf6f Fix ToD schedule progress label overlapping other items on low resolutions
Specifically, on vertical resolutions < 600 px.
2016-05-17 06:01:38 -04:00
Ignacio R. Morelle
ca664acc4a Fix Observers icon overlapping other elements on low resolutions (bug #24455)
More specifically, horizontal resolutions less than 1024 px.

Okay, I lied. This doesn't fully fix that on master because recent font
and theme changes cause it to be misaligned even on >= 1024 px. But
hopefully someone will figure something out later.

This is a backport of a 1.12 commit.
2016-05-17 05:09:13 -04:00
Charles Dang
edc2fb7e9d Default theme: restore backgrounds to sidebar panels 2016-03-20 03:58:50 +11:00
Charles Dang
a8e5036c24 editor: No panel background for top bar status areas 2016-03-16 05:14:05 +11:00
Charles Dang
a4c4f18a7c Don't show any images for buttons in menu bar 2016-03-16 05:01:26 +11:00
Charles Dang
33a68d33fd Remove background from theme status boxes and tweak position slightly 2016-03-16 00:13:53 +11:00
gfgtdf
ab8bf2d97e fix replay pause button description
https://gna.org/bugs/?24490
2016-03-03 12:03:07 +01:00
Andreas Löf
ae1d364318 Merge branch 'master' into sdl2 2015-10-15 09:57:15 +13:00
Ignacio R. Morelle
25a5facce3 editor: Add Recent Files menu with recently loaded/saved files
File paths are recorded into the game preferences up to a (currently
hardcoded) limit of 6 and opening or saving maps adds or bumps existing
entries to the top. We may allow users to change the MRU limit in
Advanced Preferences in a later commit.

Adds two translatable strings.

In order to fit file paths in the menu without filling up the whole
screen sideways, we use only the file names for now. Because identical
file names could prove to be an actual issue later, I intend to look
into ellipsizing paths correctly in a later step.

(Note that I'm piggybacking on the crummy submenu support we already had
in the themable UI so that this can be safely backported to 1.12. It's
decidedly not optimal usability-wise, but it'll have to do for now.)
2015-10-09 19:47:38 -03:00
Charles Dang
b037fc7074 Cleaned up and reorganized the Actions and Context menus a bit 2015-10-04 05:41:17 +11:00
gfgtdf
7f24dd1907 add 'continue game' button to replaytheme
previously this was only accesible via hotkeys
2015-09-30 02:58:41 +02:00
Andreas Löf
9ae3b29f4a Merge with master 2015-09-21 23:07:49 +12:00