Commit graph

246 commits

Author SHA1 Message Date
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
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
jostephd
40fbb6dc43
Merge pull request #3731 from jostephd/sidebar-changes
Several sidebar changes
2019-01-07 21:05:39 +00: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 461cd2c4bd)
2018-10-28 02:53:10 +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
kallaballa
78dff47bd3 Implemented dropout to observer on surrender 2018-02-05 00:35:35 +01: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
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
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
a4c4f18a7c Don't show any images for buttons in menu bar 2016-03-16 05:01:26 +11:00
Andreas Löf
ae1d364318 Merge branch 'master' into sdl2 2015-10-15 09:57:15 +13:00
Charles Dang
b037fc7074 Cleaned up and reorganized the Actions and Context menus a bit 2015-10-04 05:41:17 +11:00
Andreas Löf
9ae3b29f4a Merge with master 2015-09-21 23:07:49 +12:00
Randypk
5a584381f3 Bug Fix#23060: unit status tooltips do not show.
The rectangle for the unit_stats was overlapping other rectangles, making
it not function properly.  Just resized it to fit. Tested with single
poison effect, both poison and slow, and no effects, all worked.
2015-09-21 09:20:08 +11:00
Celtic Minstrel
40ea98568a Add "Quit to Desktop" to the themes.
It's still omitted from Pandora theme. Should it be?
2015-09-08 10:46:02 -04:00
Celtic Minstrel
819eab2f96 Add dialog to allow user to customize which label groups are displayed 2015-08-07 16:44:50 -04:00
Ignacio R. Morelle
ab5d76fa96 Default theme uses 'classic' dir, Classic uses 'legacy'
Reverts a decision from commit 10b7cd63f5
in order to both make the Classic theme backportable to 1.12 and
eliminate an unnecessary complication for UMC.

At some point in the future, the Default theme will replace Classic when
the rumored UnitBox theme becomes the default, so I'd say naming its
directories "classic" makes sense, while the current Classic theme is
the "legacy" classic.

If we hadn't gotten stuck with Default using "classic" dirs in 1.12
there would be no need for any of this irritating nonsense.
2015-01-15 04:41:40 -03:00
Ignacio R. Morelle
61a7527a71 Rename data/themes/macros.cfg and include it only once instead of 7 times 2015-01-10 13:15:57 -03:00
Zappaman
1e0ae693b2 This patch adds a feature mentioned in http://wiki.wesnoth.org/EasyCoding,
namely the first one in "Engine related features". To implement this feature, I added the command field in the configuration for the context menu.

This comes as an alternative to https://github.com/wesnoth/wesnoth/pull/246
2014-07-12 07:42:33 -07:00
Ignacio R. Morelle
e55458f2c6 wmlindent pass on data/themes/ 2014-07-02 21:40:59 -04:00
Espreon
c8848813fd Improved theme descriptions 2014-06-16 13:19:54 -04:00
fendrin
10b7cd63f5 Class Theme restoring the 1.12 UI. 2014-05-08 02:14:14 +02:00
fendrin
d4494d7e79 Fix bug #21542: Observers icon on the top bar overlaps the Menu button 2014-03-01 09:21:28 +01:00
fendrin
4e03757bbe Adjust space for the unit side flag and colors for attributes. 2014-03-01 08:13:51 +01:00
fendrin
257908cd01 Add a font color for the traits. Some cleanups. 2014-03-01 02:41:45 +01:00
fendrin
ca2eec45b9 Update to the default and editor themes.
Reintroduced the alignment and side.
2014-02-27 23:54:51 +01:00
Ignacio R. Morelle
b7848663bd Revert most of c1374ba032
Commit c1374ba032 for some reason reverted
commits 4a44369d8a and
91cbc9aff1.
2014-02-19 23:12:15 -03:00
ln-zookeeper
c1374ba032 Clarified 'Evacuation' now taking place at Lake Vrug. 2014-02-20 00:56:39 +02:00
Ignacio R. Morelle
91cbc9aff1 theme ui: Convert mainline themes to use id= and translatable name= values
The 'null' theme is a hidden theme, so it doesn't get a UI name of its
own.
2014-02-19 08:56:51 -03:00
Ignacio R. Morelle
1ce9448b1e theme ui: Add descriptions to the user-visible mainline themes 2014-02-19 06:39:51 -03:00
Ignacio R. Morelle
00442b4624 gui: Move Describe Terrain context menu item below Kill Unit
Only applies to the Pandora and Default themes since no other themes
have the Describe Terrain action.
2014-01-13 04:00:50 -03:00