Commit graph

1878 commits

Author SHA1 Message Date
Charles Dang
075d793539 Campaign Difficulty: consolidated both lines into a single label
(cherry-picked from commit f72f89f4d5)
2018-10-07 03:21:57 +00:00
Charles Dang
886156b0fe Campaign Difficulty: rearranged entry layout
(cherry-picked from commit 67530c4375)
2018-10-07 03:21:45 +00:00
Charles Dang
2873ad1c7e MP Lobby: removed manual player list sorting
It didn't make much sense to have these since there's really no situation you'd want
the "default" sorting order, which is however the server decided to send the list.

(cherry-picked from commit e754e64987)
2018-10-07 03:21:44 +00:00
Charles Dang
b67fd6d96d Fixup 9bf7a4c (WFL comment syntax)
[ci skip]

(cherry-picked from commit c48a8e7edd)
2018-10-07 03:21:41 +00:00
Iris Morelle
34c9a2aedc gui2/preferences: Add margin around the version info button
[ci skip]

(cherry-picked from commit f30634842e)
2018-10-07 03:21:40 +00:00
Iris Morelle
bcf56aac3a gui2/preferences: Add version info button
Also simplifies the layout of the bottom-most row of the dialog a bit.

(cherry-picked from commit e8c803d426)
2018-10-07 03:21:40 +00:00
Charles Dang
ef09c1d10a GUI2/Message: tweaked Magic Numbers to fix layout failure with large portraits
[ci skip]

Fixes #2912

(cherry-picked from commit 9bf7a4c8fb)
2018-10-07 03:21:39 +00:00
Charles Dang
e0653e7d54 Preferences Dialog: fixed inconsistent label sizes in hotkeys list
(cherry-picked from commit 26c8860b6c)
2018-10-07 03:20:36 +00:00
Charles Dang
7b4b14eb32 MP Lobby: bunch of small UI and text formatting tweaks
(cherry-picked from commit 58ebc064e9)
2018-10-07 03:20:36 +00:00
Charles Dang
650121a8de MP Lobby: removed Refresh button
I'm not 100% sure about this change, but I think its presence was rather confusing and
it (hopefully) shouldn't ever be needed.

(cherry-picked from commit fe10bc0315)
2018-10-07 03:20:32 +00:00
Charles Dang
d90c6d9d34 * MP Method Selection: clarified the account requirement for the official server
Also sets the tooltip type for this dialog back to bottom-of-the-screen ones instead
of floating ones. And some formatting cleanup to the C++.

(cherry-picked from commit 851b28e24b)
2018-10-07 03:20:28 +00:00
Charles Dang
9e2918d68e MP Lobby: base resolution selection on window width not height
[ci skip]

Height isn't the problem. The default lobby can display fine even at 600 px h. Width is
the problem the default layout faces at low resolutions, and it was quite odd to have a
really wide window use the low resolution layout, despite there obviously being enough
horizontal space to fit the sidebar.

(cherry-picked from commit 2f565b8e90)
2018-10-07 03:20:21 +00:00
Charles Dang
5c66a97f3c MP Lobby: decreased size of scenario/era name label
[ci skip]

Will slightly mitigate the issue of it potentially getting too long...

(cherry-picked from commit 08d0f6983f)
2018-10-07 03:20:21 +00:00
Charles Dang
f464cd20c7 MP Lobby: shifted game info icon to the left
[ci skip]

(cherry-picked from commit 0db17bbcf1)
2018-10-07 03:20:20 +00:00
Charles Dang
e9bc7c9586 MP Lobby: restored Era info to main game display
Includes some slight spacing tweaks.

(cherry-picked from commit b17e9fa9b1)
2018-10-07 03:20:20 +00:00
Charles Dang
74d5891ad0 MP Create Game: cap custom game names at 50 characters
[ci skip]

(cherry-picked from commit d9e3983e97)
2018-10-07 03:20:19 +00:00
Charles Dang
b0b150cb5a MP Lobby: improved low-resolution layout
[ci skip]

* Removed unnecessary spacer line.
* Increased chat area height by 10% .

(cherry-picked from commit 195eb0ce73)
2018-10-07 03:20:17 +00:00
Charles Dang
577fa7c0dd MP Lobby: removed individual Join/Observe buttons for each game
(cherry-picked from commit ffe71c5157)
2018-10-07 03:20:15 +00:00
Charles Dang
015b1891cf Ditch the "titlescreen" nomenclature for player-visible strings
(cherry-picked from commit eacc1e0f6b)
2018-10-07 03:20:08 +00:00
Charles Dang
324588e484 MP Method Selection: removed text saying registered nicknames are optional
[ci skip]

This is currently only the case on the 1.14 server, but it's easiest just to
remove the line completely rather than constantly adding or re-adding it based
on whether you're using a or dev series.

(cherry-picked from commit 6f057d8b02)
2018-10-07 03:20:06 +00:00
Charles Dang
e2592c9d6a GUI2: removed unnecessary spaces and newlines from color macros
[ci skip]

Since these are usually used inline or as key values, we don't need the extra padding.

(cherry-picked from commit 7db83e3a0e)
2018-10-07 03:20:03 +00:00
Charles Dang
2924495299 MP Create Game: keep background image width proportional to its height
[ci skip]

(cherry-picked from commit 604dcd8008)
2018-10-07 03:20:03 +00:00
Iris Morelle
450092033a gui2/log_settings: Permit disabling logdomains (log level -1)
(cherry-picked from commit ae5ab22b1a)
2018-10-07 03:19:55 +00:00
Celtic Minstrel
b3b3a3c53d Remove redundant unused column in stats
(cherry-picked from commit ceea173eb4)
2018-10-07 03:19:20 +00:00
Celtic Minstrel
558b9809e9 Swap count and name columns in statistics (fixes #2893)
(cherry-picked from commit ddd3222b3d)
2018-10-07 03:19:20 +00:00
Charles Dang
1dd00c3441 Game Load: added a convenient button in Load Game to open your saves folder
(cherry-picked from commit 802bbe8cdc)
2018-10-07 03:19:09 +00:00
Charles Dang
b6991ced4d MP Staging: made the faction select button about as prominent as you can get
[ci skip]

Thanks to grzywacz for pointing out the possible use of the unit icon.

(cherry-picked from commit dba3d409fc)
2018-10-07 03:18:57 +00:00
Charles Dang
72d3f15dc6 MP Staging: make Faction Select button's purpose more clear
[ci skip]

(cherry-picked from commit 1f0588883c)
2018-10-07 03:18:56 +00:00
Iris Morelle
99d2919f5d gui2/log_settings: Make log options tooltips translatable
Fixes #2837.

(cherry-picked from commit 3967fd190e)
2018-10-07 03:18:52 +00:00
Charles Dang
d52737b5d0 Swapped the position and formatting of game names and titles in the MP lobby
Addresses point 2 of #2815.

(cherry-picked from commit 6615aa7efe)
2018-10-07 03:18:47 +00:00
Charles Dang
3f5d554f8c GUI2/Label: tweaked link color
[ci skip]

(cherry-picked from commit 1903b05ab1)
2018-10-07 03:18:47 +00:00
Charles Dang
e0b35791e2 GUI2/Text Box: refactored hint text interface
Previously, I had implemented the hint text ("Search)" and image (the magnifying glass)
as a custom text box definition. This caused some problems, though. Since the string was
hard-coded as part of a WFL formula, it couldn't be translated (see #2709 and #2732). It
also wasn't expandable to any other usecase.

Instead, I've added two new hint_text= and hint_image= keys to [text_box], wrapped the
"Search" text and magnifying image path in a helper macro, and refactored the default
definition to display the hint text and image when appropriate.

This also fixes a minor issue where selected text wouldn't remain highlighted when the
box wasn't focused when using the filter definition (it did with the default one).

This should fix the untranslatable "Search" text issue mentioned in both issues above.
The new string is in the wesnoth-lib textdomain.

(cherry-picked from commit db5abb7e63)
2018-10-07 03:18:19 +00:00
Charles Dang
31320923bf GUI2/Canvas: allow formula values for [text] font_size=
(cherry-picked from commit 2b9c7b1abd)
2018-10-07 03:18:19 +00:00
Charles Dang
717511a428 MP Login: removed Password Reminder functionality
Resolves #2748.

Essentially, all this did was tell users to go use the forum, so it wasn't worth
it to keep it and solve the infinite loading screen issues it was causing.

The server backend still needs to be cleaned up.

Also removed a dead reference to some "Change Username" button in the Login dialog's
code.

(cherry-picked from commit ebec4d6ce8)
2018-10-07 03:18:17 +00:00
Charles Dang
d5227d8fab Added two missing textdomain headers
[ci skip]

Should fix two of the issues mentioned in 2709.

(cherry-picked from commit 8d1ec6216b)
2018-10-07 03:18:03 +00:00
Charles Dang
a43623ff2d Screenshot Notification: cleaned up and tweaked a few things
* Added textdomain closure missing from 267510ea07
* Avoid use of invalidate_layout by having an em dash in the size field prior to
  saving. That's needed since GUI2 doesn't expand the label's canvas if its text
  is initially empty.
* Use a better button definition for the View button.
* Grouped Save and Close buttons together
2018-03-18 17:01:26 +11:00
Charles Dang
a18522acb8 File Dialog: removed label keys with empty values
[ci skip]

This doesn't do anything.
2018-03-18 17:01:24 +11:00
Jyrki Vesterinen
267510ea07 Show screenshot window before saving the screenshot
In particular, this allows the player to choose the filename before saving,
including the extension. If support for target format is present, Wesnoth
honors the extension and saves the screenshot in that format.

I also changed the default screenshot format back to PNG due to quality
issues JPEG has with pixel art. See discussion in pull request #2655.

This commit doesn't introduce any string changes. I used existing strings
for everything (sometimes having to take them from another textdomain).
2018-03-16 23:45:36 +02:00
Charles Dang
95d9eb7f1b Unit Attack: removed the Choose Weapon text
[ci skip]

Legacy from the GUI1 dialog, not really in line with our current UI.
Replaced it with a spacer.
2018-03-17 00:41:33 +11:00
Charles Dang
3a90f86674 Addressed more whitespace issues from #2613
[ci skip]
2018-03-12 03:48:59 +11:00
Charles Dang
5fc4dcf5fa Revert "Message Dialog: make all option rows have the same height"
[ci skip]

This reverts commit 0089357edb. It wasn't suitable for
all usecases, and it's impossible to make it a dialog option.

Fixes #2628
2018-03-11 14:02:16 +11:00
Charles Dang
471c9e876a Addressed a large chunk of the whitespace issues from #2613
[ci skip]
2018-03-09 11:37:00 +11:00
Charles Dang
0089357edb Message Dialog: make all option rows have the same height
[ci skip]
2018-03-05 13:55:43 +11:00
Charles Dang
9c83099613 MP Lobby: increased chatbox height on standard resolution
[ci skip]

* Increase chatbox height from 25% of the screen height to 28%
* Removed remaining horizontal spacer line
* Disabled horizontal scrollbar for the game list. I had set the mode to 'auto' in order to
  reserve space for the bar should it be needed. However, I've since decreased the amount of
  content in the game listbox, rendering the chance it will be needed much less likely.
2018-02-24 22:52:35 +11:00
Charles Dang
cc3d73621a Preferences Dialog: avoid offset-by-one handling for accl speeds
Since the slider values started at 1, they needed to be adjusted for speed
index access. Less confusing to start at 0.
2018-02-24 18:57:06 +11:00
Charles Dang
894cc6a3cc GUI2/Toggle Panel: switched to procedural border drawing for semi-transparent message variant
[ci skip]

This matches the regular toggle panel now.
2018-02-23 15:45:02 +11:00
Charles Dang
ca4b7dccff GUI2: removed excess spaces and newlines from font size macros
[ci skip]
2018-02-23 15:37:47 +11:00
Charles Dang
5f1005d5ce GUI2/Chatbox: removed room listbox header
[ci skip]

Headers don't do anything with horizontal listboxes.
2018-02-22 16:19:49 +11:00
Charles Dang
b35663e1bf GUI2/Chatbox: handle main border in including windows
[ci skip]

This is consistent with other widgets.
2018-02-22 15:13:48 +11:00
Charles Dang
38477ee23b MP Lobby: ensure turn/slots text always has enough space
[ci skip]
2018-02-20 15:13:22 +11:00