537 Commits

Author SHA1 Message Date
Iris Morelle
fd37a05ffe ui: Claim back unused space from the 800 px minimap theme
This allows the minimap widget to be 2 pixels wider, and frees up 7
pixels of vertical space for the rest of the sidebar
2021-03-24 04:23:25 -03:00
Iris Morelle
5f462c6064 ui: Remove orphaned references to the zoom slider 2021-03-24 04:05:18 -03:00
Iris Morelle
73e5bff25c ui: Remove unused zoom slider portion of the minimap panel
This allows us to claim back 10px for the rest of the sidebar.
2021-03-24 04:05:18 -03:00
Iris Morelle
e7d1a5dc8a ui: Handle the battery/countdown report switcheroo differently
This fixes the countdown report (a.k.a. clock) using the wrong font size
at small resolutions, as well as taking over the battery report's box
without resizing it and thus running out of horizontal room most of the
time.

This also removes two broken references to "timeout-panel" and
"report_timeout", neither of which being names that actually exist in
this version of the theme.
2021-03-18 20:27:57 -03:00
Iris Morelle
2c540ccfce ui: Anchor the Observers icon to the sidebar, going right to left
Supersedes 9e0593d7143fa76c51239b5cb874284d1800e1fc, which attempted to
fix the issue with the icon displaying at unexpected places by anchoring
it to the battery display from the left instead of staying true to the
intended design.

CC #5575
2021-03-18 20:27:57 -03:00
Iris Morelle
0d3517e7aa ui: Fix bad x position for the theme UI battery status on low resolutions 2021-03-17 23:40:29 -03:00
Iris Morelle
7713437085 ui: Reduce font size for the ToD counter
*Should* generally fix counters like 14/15 getting ellipsized. There was
no real reason for it to be so large to begin with.
2021-03-17 20:20:56 -03:00
Iris Morelle
ffbc7ebc57 ui: Rearrange and resize the unit vision and XP labels slightly
This makes it so the unit vision label uses a smaller font on smaller
resolutions. It also makes it so it doesn't take space away from the XP
report for all resolutions. Meanwhile, the XP report has more space.

CC #5575
2021-03-17 19:43:47 -03:00
Iris Morelle
579610498a ui: Reduce unit HP/XP/MP/Def font sizes and line heights on 1024x600
Fixes the unit name overlapping the MP and defense reports.

CC #5575
2021-03-17 04:34:24 -03:00
Iris Morelle
97ece89aeb ui: Fix font and box sizes for unit defense labels on the sidebar
This fixes the "def" label (previously unknown to everybody before the
sdl_ttf_compat API transition!) having the wrong box size and alignment.
This also extends to its accompanying unit defense report, which had the
wrong font size entirely.
2021-03-17 04:21:43 -03:00
Iris Morelle
c611128112 ui: Rearrange Menu menu items more logically
This changes the position of Statistics, Status Table and Unit List
according to their respective likelihood of being used and relabels the
Back to submenu to Load Turn and brings it right under Load Game.
2021-03-14 20:16:13 -03:00
Pentarctagon
c8666a8a41 Remove the editor option to assign a recruit list to a unit.
The UI implementation of this is bad enough that I consider its presence to actively a detriment to anyone trying to use the editor.
2020-12-15 23:41:55 -06:00
Pentarctagon
f39bd33899 Remove a few bits of never implemented editor features.
The sound source tool in particular, since showing a button to players whose only function is to tell them it's not implemented makes no sense.
2020-11-03 15:30:57 -06:00
Celtic Minstrel
fab490cf60 Add ThemeWML and HelpWML to the schema
The change in theme.cpp is just to make the "title_literal" key be consistently applied as documented. Since the key isn't used in mainline, it should have no effect on actual uses.
2020-10-24 15:04:46 -04:00
Glen Whitney
6d935302a7 Update editor cfg file to reflect earlier changes in scaling
Commit 43de778 made all themes scale from their base dimensions rather
  than from an arbitrary hard-coded 1024x768 pixel size. As a result, the
  800x600 layout for the editor needs its main map explicitly sized --
  the 843-pixel width no longer fits in 800x600, and it isn't being scaled
  down from 1024. (But once it is explicitly set for the 800x600 layout,
  it will scale up for pixel widths between 800 and 1024). This commit
  adds such an explicit sizing, analogous to the one found in default.cfg.

  Resolves #5193.
2020-10-10 20:53:19 -07:00
Glen Whitney
2e6a043c1a Fix issue #4909. 2020-05-22 13:33:18 -05:00
Iris Morelle
f4ca974cd1 Disambiguate uses of the Play button label
This extends to a few other button labels used for replay control. While
checking if commit 46dbbc06c967bfc8ee5acb6525e1f1bd96b53005 was fit for
backporting to 1.14 I found out that "Play" was already in use
exclusively for one of the replay control buttons (which means, no, it
can't be backported). This makes the disambiguation markers absolutely
necessary.

To give a more practical example of why this is a big deal, in Spanish,
"Play" would be translated as "Jugar" in the context of the Campaigns
menu, and "Reproducir" in the context of a replay (or movie). The
Spanish translation in fact already uses the latter in both 1.14 and
master.

[ci skip]
2019-11-10 23:43:05 -03:00
Charles Dang
e718d1e472 Removed Classic theme
[ci skip]
2019-11-04 17:07:36 +11:00
Charles Dang
baec45fc53 Fixed turn display at ridiculously tiny res
[ci skip]
2019-10-18 15:30:21 +11:00
Charles Dang
cb35e6885f Ensure enough space to display turn numbers in the hundreds
[ci skip]
2019-10-18 15:30:18 +11:00
josteph
416c0f2734 Editor: Fix palette size
Issue #2618.
2019-10-16 05:11:13 +00:00
Wedge009
798bae668c Add zoom options to context menu.
Resolves #1213

(Alternatively could go in main menu (from the top-bar) but I feel it's crowded enough already (unless we have nested menus available).)
2019-10-16 15:27:49 +11:00
josteph
b4e977555b themes: Remove the brief top bar tooltips
These are the tooltips of the images. Mousing over the figures next to
the images shows a more verbose tooltip.

For #1068/#1060
2019-09-14 12:44:24 +00:00
Wedge009
e2c20e5563 Restore defence modifier display in side-bar
Fixes #3693, based on 47bd5ade.

[ci skip]
2019-09-07 22:50:02 +10:00
josteph
08352d2ab4 theme: Add optional argument to REPLAY_THEME for the benefit of user-defined themes
See #4184
2019-08-10 20:09:36 +00:00
Steve Cotton
862e482895 Add a hint about not save-loading, and link to it from the "Back to ..." menu 2019-08-03 20:05:27 +02:00
josteph
e4cb8efc03 Theme: Remove the empty replay-label from the replay theme. 2019-02-24 17:11:57 +00:00
jostephd
40fbb6dc43
Merge pull request #3731 from jostephd/sidebar-changes
Several sidebar changes
2019-01-07 21:05:39 +00:00
Jyrki Vesterinen
2753b6617b Fix issues with classic theme 2018-11-26 20:10:07 +02:00
Jyrki Vesterinen
e9a6b95fd8 Better implementation of placing the clock (resolves #3582) 2018-11-18 19:52:24 +02:00
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 461cd2c4bdeb2eb0e84ede6e57cd0b315dee2cee)
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 bf3ece140e5ffc22ca5d1ffd8316ecac93ad5d93)
2018-10-28 02:53:02 +00:00
Martin Hrubý (hrubymar10)
c79ba9ac03 Fix MP label for #2855
(cherry picked from commit 4ba1811f03bfd6b9706a281e05c316be86cbe97c)
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 d51ccbe5386e5325c6ecfe6c46472f7a8113bfa7)
2018-10-28 02:52:54 +00:00
Martin Hrubý (hrubymar10)
674fda85b7 Migrate links to https if available - Fwd c18537edc0678f40a209797d72dfaba3e5e88545
(cherry-picked from commit bc4d22dc72e79c3d6a3364ac896e473afd298246)
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 f50b644c30e126d53db54d5a342f3be4dc0461c8)
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