[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_string_fixes_2 into lp:widelands
kaputtnik has proposed merging
lp:~widelands-dev/widelands/bug-1807701_string_fixes_2 into lp:widelands.
Commit message:
fixed some strings
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_string_fixes_2/+merge/361115
Just a few string fixes
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1807701_string_fixes_2 into lp:widelands.
=== modified file 'data/txts/README.lua'
--- data/txts/README.lua 2018-02-28 09:53:42 +
+++ data/txts/README.lua 2018-12-19 07:09:08 +
@@ -22,7 +22,7 @@
h2(_"Reporting Bugs") ..
p(_"If you encounter a bug, please report it to our bugtracker:") ..
- p(a("widelands.org/wiki/ReportingBugs]")) ..
+ p(a("widelands.org/wiki/ReportingBugs")) ..
p(_"Please provide enough background information. Tell us:") ..
p(
li(_"Detailed steps on how to trigger the bug, if possible.") ..
=== modified file 'data/world/terrains/init.lua'
--- data/world/terrains/init.lua 2018-11-03 11:14:46 +
+++ data/world/terrains/init.lua 2018-12-19 07:09:08 +
@@ -79,7 +79,6 @@
--*Optional*. Additional custom tooltip entries, e.g.::
--
--tooltips = {
--- -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-- _"likes trees",
--},
--
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands
Continuous integration builds have changed state: Travis build 4347. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/469721440. Appveyor build 4141. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1808169_disable_focus-4141. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1808169-disable-focus/+merge/361097 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands
Continuous integration builds have changed state: Travis build 4346. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/469689821. Appveyor build 4140. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_boost_168-4140. -- https://code.launchpad.net/~widelands-dev/widelands/appveyor-boost-168/+merge/361094 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands.
Commit message:
Allowing hotkey usage while windows are open.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1808169 in widelands: "scrolling not possible with arrow keys"
https://bugs.launchpad.net/widelands/+bug/1808169
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1808169-disable-focus/+merge/361097
Allowing to use arrow keys while windows (e.g., ware statistics) are open.
Changed two points:
- The UI::Panel no longer grabs the keyboard focus when it is clicked but
shouldn't grab it
- Some components (buttons, slider, checkbox) no longer accept the keyboard
focus. I don't know why they ever did so, though. It possibly was connected to
the Panel being able to switch between components with the Tab key. But since
nearly no component handles any keys, I guess it is no (big) loss. But still my
main problem with this merge request is: Does someone knows about or finds a
functionality that breaks due to the no longer applied keyboard focus?
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands.
=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc 2018-12-13 07:24:01 +
+++ src/ui_basic/button.cc 2018-12-18 20:42:33 +
@@ -60,7 +60,8 @@
title_image_(title_image),
background_style_(g_gr->styles().button_style(init_style)) {
set_thinks(false);
- set_can_focus(true);
+ // Don't allow focus
+ assert(!get_can_focus());
}
Button::Button // for textual buttons. If h = 0, h will resize according to the font's height.
@@ -143,8 +144,6 @@
if (enabled_ == on)
return;
- set_can_focus(on);
-
// disabled buttons should look different...
if (on)
enabled_ = true;
@@ -316,7 +315,6 @@
return false;
if (enabled_) {
- focus();
grab_mouse(true);
pressed_ = true;
if (repeating_) {
=== modified file 'src/ui_basic/checkbox.cc'
--- src/ui_basic/checkbox.cc 2018-12-13 07:24:01 +
+++ src/ui_basic/checkbox.cc 2018-12-18 20:42:33 +
@@ -50,7 +50,6 @@
uint16_t h = pic->height();
set_desired_size(w, h);
set_size(w, h);
- set_can_focus(true);
set_flags(Has_Custom_Picture, true);
}
@@ -98,7 +97,6 @@
* Args: enabled true if the checkbox should be enabled, false otherwise
*/
void Statebox::set_enabled(bool const enabled) {
- set_can_focus(enabled);
if (((flags_ & Is_Enabled) > 1) && enabled)
return;
@@ -177,7 +175,6 @@
*/
bool Statebox::handle_mousepress(const uint8_t btn, int32_t, int32_t) {
if (btn == SDL_BUTTON_LEFT && (flags_ & Is_Enabled)) {
- focus();
clicked();
return true;
}
=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc 2018-12-13 07:24:01 +
+++ src/ui_basic/panel.cc 2018-12-18 20:42:33 +
@@ -528,7 +528,7 @@
* \return true if the mouseclick was processed, false otherwise
*/
bool Panel::handle_mousepress(const uint8_t btn, int32_t, int32_t) {
- if (btn == SDL_BUTTON_LEFT) {
+ if (btn == SDL_BUTTON_LEFT && get_can_focus()) {
focus();
}
return false;
=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc 2018-12-13 07:24:01 +
+++ src/ui_basic/slider.cc 2018-12-18 20:42:33 +
@@ -78,7 +78,7 @@
bar_size_(bar_size),
cursor_size_(cursor_size) {
set_thinks(false);
- set_can_focus(true);
+ assert(!get_can_focus());
calculate_cursor_position();
}
@@ -205,7 +205,6 @@
if (enabled_ == enabled)
return;
- set_can_focus(enabled);
enabled_ = enabled;
if (!enabled) {
pressed_ = false;
@@ -402,7 +401,6 @@
if (btn != SDL_BUTTON_LEFT)
return false;
- focus();
if (x >= cursor_pos_ && x <= cursor_pos_ + cursor_size_) {
// click on cursor
cursor_pressed(x);
@@ -469,7 +467,6 @@
if (btn != SDL_BUTTON_LEFT)
return false;
- focus();
if (y >= cursor_pos_ && y <= cursor_pos_ + cursor_size_) {
// click on cursor
cursor_pressed(y);
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands
Should be alright, now. If nobody objects I would merge this branch into trunk. -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands. Commit message: since boost 1.69 breaks compiling use 1.68 to unbreak compiling on appveyor. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1808481 in widelands: "Boost 1.69 breaks compiling" https://bugs.launchpad.net/widelands/+bug/1808481 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appveyor-boost-168/+merge/361094 This is just a temporary fix until the underlying issue is resolved. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands. === modified file 'appveyor.yml' --- appveyor.yml 2018-12-04 12:13:49 + +++ appveyor.yml 2018-12-18 19:48:14 + @@ -21,8 +21,10 @@ - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\"" - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\"" # Installed required libs - - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\"" - + - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-wget mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\"" + # Download and install Boost 1.68 --since 1.69 breaks compiling + # https://bugs.launchpad.net/widelands/+bug/1808481 + - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz\"" shallow_clone: true branches: ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_string_fixes into lp:widelands
The file data/txts/translators_data.lua is automatically created through utils/update_authors.py: https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/utils/update_authors.py It will be overwritten when the translations are updated. I guess this file will not change a lot, until a new translator, or language get added. The reason why it is shown up in the diffs is likely a modified file timestamp. Regarding the aligning: No idea. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_string_fixes/+merge/360968 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1807701_string_fixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
