Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1395322-tool3 into lp:widelands

[Miroslav Remák]

If we're going to be so specific, we should also mention that Shift or Ctrl + 
Click removes map elements for Immovables, Animals and Port Space tools. Except 
Ctrl + Click with the Port Space tool does placement instead of removal for 
some reason. Perhaps we could fix this inconsistency? That would be an easy 
one-line change in EditorSetPortSpaceTool's constructor.

Also, see diff comments.

Diff comments:

> === modified file 'data/scripting/editor/editor_controls.lua'
> --- data/scripting/editor/editor_controls.lua 2016-04-02 08:09:19 +
> +++ data/scripting/editor/editor_controls.lua 2016-04-05 19:21:40 +
> @@ -35,6 +30,28 @@
>  -- TRANSLATORS: This is an access key combination. Localize, but 
> do not change the key.
>  dl(help_format_hotkey(pgettext("hotkey", "Ctrl + S")), _"Save 
> map") ..
>  help_toggle_fullscreen_hotkey()
> - )
> + ) ..
> +
> + h2(_"Tools") ..
> + p(
> +-- TRANSLATORS: This is an access key combination. Localize, but 
> do not change the key.
> +dl(help_format_hotkey(pgettext("hotkey", "Click")), _"Place new 
> elements on the map, or increase map elements by the selected value") ..
> +-- TRANSLATORS: This is an access key combination. Localize, but 
> do not change the key.
> +dl(help_format_hotkey(pgettext("hotkey", "1-0")), _"Change tool 
> size")
> + ) ..
> +
> + h3(_"Height and Ressources Tools") ..

Ressources -> Resources

> + p(
> +-- TRANSLATORS: This is an access key combination. Localize, but 
> do not change the key.
> +dl(help_format_hotkey(pgettext("hotkey", "Shift + Click")), 
> _"Decrease map elements by the value selected by ‘Increase/Decrease value’") 
> ..

Inconsistent capitalization: ‘Increase/Decrease value’ and ‘Set Value’.

> +-- TRANSLATORS: This is an access key combination. Localize, but 
> do not change the key.
> +dl(help_format_hotkey(pgettext("hotkey", "Ctrl + Click")), _"Set 
> map elements to the value selected by ‘Set Value’")
> +  ) ..
> +
> +  h3(_"Noise Height Tool") ..
> +  p(
> +-- TRANSLATORS: This is an access key combination. Localize, but 
> do not change the key.
> +dl(help_format_hotkey(pgettext("hotkey", "Shift or Ctrl + 
> Click")), _"Set height to the value selected by ‘Set Value’")
> +  )
>)
>  }


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1395322-tool3.

___
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-1526911-cursor-positioning into lp:widelands

[Miroslav Remák]

Review: Approve code

Looks good code-wise.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning.

___
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-1395322-tool3 into lp:widelands

[bunnybot]

Continuous integration builds have changed state:

Travis build 969. State: errored. Details: 
https://travis-ci.org/widelands/widelands/builds/120978837.
Appveyor build 802. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_tool3-802.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1395322-tool3.

___
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-1395322-tool3 into lp:widelands

[kaputtnik]

Review: Approve testing

Great :-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1395322-tool3.

___
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-1526911-cursor-positioning into lp:widelands

[kaputtnik]

Review: Approve testing

I think this is much better :-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning.

___
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-1395322-tool3 into lp:widelands

[bunnybot]

Continuous integration builds have changed state:

Travis build 968. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/120930924.
Appveyor build 801. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395322_tool3-801.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395322-tool3 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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-clang-warnings into lp:widelands

[SirVer]

Lgtm!! Thanks :)

> Am 05.04.2016 um 11:03 schrieb Klaus Halfmann :
> 
> Ready for merge, any objections?
> 
> SirVer, can you appove?
> -- 
> https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
> You are subscribed to branch lp:widelands.

-- 
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/travis-clang-warnings.

___
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-1526911-cursor-positioning into lp:widelands

[bunnybot]

Continuous integration builds have changed state:

Travis build 967. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/120912395.
Appveyor build 800. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1526911_cursor_positioning-800.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning 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-1526911-cursor-positioning into lp:widelands

[bunnybot]

Continuous integration builds have changed state:

Travis build 962. State: failed. Details: 
https://travis-ci.org/widelands/widelands/builds/120833342.
Appveyor build 795. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1526911_cursor_positioning-795.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning 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/travis-clang-warnings into lp:widelands

[noreply]

The proposal to merge lp:~widelands-dev/widelands/travis-clang-warnings into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/travis-clang-warnings.

___
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/travis-clang-warnings into lp:widelands

[GunChleoc]

Thanks for cleaning up after me and for adding the documentation. I don't think 
we need SirVer to look at this personally now.

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/travis-clang-warnings.

___
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/travis-clang-warnings into lp:widelands

[Klaus Halfmann]

Ready for merge, any objections?

SirVer, can you appove?
-- 
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/travis-clang-warnings.

___
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-1538549-dismantle-enemy-buildings into lp:widelands

[noreply]

The proposal to merge 
lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings.

___
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-1526911-cursor-positioning into lp:widelands

[GunChleoc]

GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning into lp:widelands.

Commit message:
Some cursor fixes for edit boxes:
- Fixed cursor y position for empty Editboxes.
- Moved test for empty player names from editor player tool to map saving.
- In a new MultilineEditbox, position cursor at end of text.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1526911 in widelands: "Textboxes: inconsistent cursor positioning"
  https://bugs.launchpad.net/widelands/+bug/1526911

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954

Cursor position for BiDi languages is still broken, but that's a separate issue.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1526911-cursor-positioning into lp:widelands.
=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2016-03-14 18:10:09 +
+++ src/editor/ui_menus/editor_player_menu.cc	2016-04-05 07:39:22 +
@@ -334,10 +334,6 @@
 	std::string text = plr_names_[m]->text();
 	EditorInteractive& menu = eia();
 	Widelands::Map & map = menu.egbase().map();
-	if (text == "") {
-		text = map.get_scenario_player_name(m + 1);
-		plr_names_[m]->set_text(text);
-	}
 	map.set_scenario_player_name(m + 1, text);
 	plr_names_[m]->set_text(map.get_scenario_player_name(m + 1));
 	menu.set_need_save(true);

=== modified file 'src/map_io/map_player_names_and_tribes_packet.cc'
--- src/map_io/map_player_names_and_tribes_packet.cc	2015-11-28 22:29:26 +
+++ src/map_io/map_player_names_and_tribes_packet.cc	2016-04-05 07:39:22 +
@@ -20,6 +20,7 @@
 #include "map_io/map_player_names_and_tribes_packet.h"
 
 #include 
+#include 
 
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
@@ -96,8 +97,16 @@
 	iterate_player_numbers(p, nr_players) {
 		const std::string section_key = (boost::format("player_%u")
 	% static_cast(p)).str();
+
+		// Make sure that no player name is empty, and trim leading/trailing whitespaces.
+		std::string player_name = map.get_scenario_player_name(p);
+		boost::trim(player_name);
+		if (player_name.empty()) {
+			player_name =  (boost::format(_("Player %u")) % static_cast(p)).str();
+		}
+
 		Section & s = prof.create_section(section_key.c_str());
-		s.set_string("name",  map.get_scenario_player_name (p));
+		s.set_string("name",  player_name);
 		s.set_string("tribe", map.get_scenario_player_tribe(p));
 		s.set_string("ai",map.get_scenario_player_ai   (p));
 		s.set_bool  ("closeable", map.get_scenario_player_closeable(p));

=== modified file 'src/ui_basic/editbox.cc'
--- src/ui_basic/editbox.cc	2016-03-10 15:00:32 +
+++ src/ui_basic/editbox.cc	2016-04-05 07:39:22 +
@@ -396,8 +396,11 @@
 
 	const Image* entry_text_im = UI::g_fh1->render(as_editorfont(m_->text, m_->fontsize));
 
-	int linewidth = entry_text_im->width();
-	int lineheight = entry_text_im->height();
+	const int linewidth = entry_text_im->width();
+	const int lineheight = m_->text.empty() ?
+			  UI::g_fh1->render(as_editorfont(UI::g_fh1->fontset()->representative_character(),
+		 m_->fontsize))->height() :
+			  entry_text_im->height();
 
 	Point point(kMargin, get_h() / 2);
 

=== modified file 'src/ui_basic/multilineeditbox.cc'
--- src/ui_basic/multilineeditbox.cc	2016-03-25 17:01:05 +
+++ src/ui_basic/multilineeditbox.cc	2016-04-05 07:39:22 +
@@ -138,11 +138,11 @@
 		return;
 
 	d_->text = text;
-	while (d_->text.size() > d_->maxbytes)
+	while (d_->text.size() > d_->maxbytes) {
 		d_->erase_bytes(d_->prev_char(d_->text.size()), d_->text.size());
+	}
 
-	if (d_->cursor_pos > d_->text.size())
-		d_->cursor_pos = d_->text.size();
+	d_->set_cursor_pos(d_->text.size());
 
 	d_->update();
 	d_->scroll_cursor_into_view();

___
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-1538549-dismantle-enemy-buildings into lp:widelands

[GunChleoc]

No, no there shouldn't be a conflict.

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings.

___
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-1538549-dismantle-enemy-buildings into lp:widelands

[bunnybot]

Continuous integration builds have changed state:

Travis build 961. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/120671195.
Appveyor build 794. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1538549_dismantle_enemy_buildings-794.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings.

___
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/travis-clang-warnings into lp:widelands

[Klaus Halfmann]

Uhm, the fix for bug-1562332 was somehow reverted, I will add it in this branch 
again
-- 
https://code.launchpad.net/~widelands-dev/widelands/travis-clang-warnings/+merge/290697
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/travis-clang-warnings.

___
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