From ebaf83c502c251031cb54db8cb371733b7048cc1 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Wed, 20 Jan 2021 16:22:04 -0800 Subject: [PATCH] Minor tidying on tourney entry popup and more language updates --- .efrocachemap | 4 +- CHANGELOG.md | 1 + .../python/bastd/ui/tournamententry.py | 44 ++++++++++--------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 151ce879..0ac35110 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -420,7 +420,7 @@ "assets/build/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/a9/71/9286d55c45c37877f3267850f90b", "assets/build/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/2f/09/36e691de67eb8f155449a7170861", "assets/build/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/fd/a8/ad50785ce206e8dc3dcc7358b173", - "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/4f/b2/9208b315c0f27099a80167eab90b", + "assets/build/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/34/93/4989950b5dd035da056a0291dbb2", "assets/build/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/0d/25/26de912f111de8189f40aeeddee6", "assets/build/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/44/ed/5b972fa848cffb73723533c2ccb7", "assets/build/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/6a/20/57d91c24e0aeb1fe6b7d6dbbcac9", @@ -440,7 +440,7 @@ "assets/build/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/a4/01/1fcc28b303858b3d028d26516907", "assets/build/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/20/ca/d675783cd094030a625e7ce023cf", "assets/build/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/0a/84/bbb6ed2abf66509406f534cbbb52", - "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/e4/81/d3fdd1931b4a1e8b17affc95729c", + "assets/build/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/f8/e6/773d3da1cbdb2215956f9d99c348", "assets/build/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/29/72/bcf75316f71373a47739a72ad6da", "assets/build/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/3d/ba/7f4c8846babc5ef59187e87efa3d", "assets/build/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/44/3c/7cc06ca8d5475e1687d0ed05bdbf", diff --git a/CHANGELOG.md b/CHANGELOG.md index a58e42bb..859bc4dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### 1.5.30 (20263) - The meta subsystem now enables new plugins by default in headless builds. - Added option to save party in Manual tab +- Slight tidying on the tourney entry popup ### 1.5.29 (20246) - Exposed ba method/class initing in public C++ layer. diff --git a/assets/src/ba_data/python/bastd/ui/tournamententry.py b/assets/src/ba_data/python/bastd/ui/tournamententry.py index 2299ec21..12ed8b3a 100644 --- a/assets/src/ba_data/python/bastd/ui/tournamententry.py +++ b/assets/src/ba_data/python/bastd/ui/tournamententry.py @@ -27,7 +27,6 @@ class TournamentEntryWindow(popup.PopupWindow): on_close_call: Callable[[], Any] = None): # Needs some tidying. # pylint: disable=too-many-branches - # pylint: disable=too-many-locals # pylint: disable=too-many-statements ba.set_analytics_screen('Tournament Entry Window') @@ -70,7 +69,7 @@ class TournamentEntryWindow(popup.PopupWindow): self._tournament_activity = tournament_activity self._width = 340 - self._height = 220 + self._height = 225 bg_color = (0.5, 0.4, 0.6) @@ -94,8 +93,8 @@ class TournamentEntryWindow(popup.PopupWindow): x_offs = 0 if self._do_ad_btn else 85 self._cancel_button = ba.buttonwidget(parent=self.root_widget, - position=(20, self._height - 30), - size=(50, 50), + position=(20, self._height - 34), + size=(60, 60), scale=0.5, label='', color=bg_color, @@ -112,7 +111,7 @@ class TournamentEntryWindow(popup.PopupWindow): v_align='center', scale=0.6, text=ba.Lstr(resource='tournamentEntryText'), - maxwidth=200, + maxwidth=180, color=(1, 1, 1, 0.4)) btn = self._pay_with_tickets_button = ba.buttonwidget( @@ -221,18 +220,19 @@ class TournamentEntryWindow(popup.PopupWindow): if ba.app.allow_ticket_purchases: self._get_tickets_button = ba.buttonwidget( parent=self.root_widget, - position=(self._width - 190 + 110, 15), + position=(self._width - 190 + 125, self._height - 34), autoselect=True, - scale=0.6, + scale=0.5, size=(120, 60), textcolor=(0.2, 1, 0.2), label=ba.charstr(ba.SpecialChar.TICKET), - color=(0.6, 0.4, 0.7), + color=(0.65, 0.5, 0.8), on_activate_call=self._on_get_tickets_press) else: self._ticket_count_text = ba.textwidget( parent=self.root_widget, - position=(self._width - 190 + 110, 15), + scale=0.5, + position=(self._width - 190 + 125, self._height - 34), color=(0.2, 1, 0.2), h_align='center', v_align='center') @@ -245,20 +245,22 @@ class TournamentEntryWindow(popup.PopupWindow): # Let's also ask the server for info about this tournament # (time remaining, etc) so we can show the user time remaining, # disallow entry if time has run out, etc. - xoffs = 104 if ba.app.ui.use_toolbars else 0 - self._time_remaining_text = ba.textwidget(parent=self.root_widget, - position=(70 + xoffs, 23), - size=(0, 0), - h_align='center', - v_align='center', - text='-', - scale=0.65, - maxwidth=100, - flatness=1.0, - color=(0.7, 0.7, 0.7)) + # xoffs = 104 if ba.app.ui.use_toolbars else 0 + self._time_remaining_text = ba.textwidget( + parent=self.root_widget, + position=(self._width / 2, 28), + size=(0, 0), + h_align='center', + v_align='center', + text='-', + scale=0.65, + maxwidth=100, + flatness=1.0, + color=(0.7, 0.7, 0.7), + ) self._time_remaining_label_text = ba.textwidget( parent=self.root_widget, - position=(70 + xoffs, 40), + position=(self._width / 2, 45), size=(0, 0), h_align='center', v_align='center',