Merge lp:~widelands-dev/widelands/bug-1806230-enable-ok-button into lp:widelands

Proposed by Notabilis
Status: Merged
Merged at revision: 8951
Proposed branch: lp:~widelands-dev/widelands/bug-1806230-enable-ok-button
Merge into: lp:widelands
Diff against target: 21 lines (+4/-0)
1 file modified
src/editor/ui_menus/main_menu_map_options.cc (+4/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1806230-enable-ok-button
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+361163@code.launchpad.net

Commit message

Enabling OK button in map options of editor when tags are changed.

Description of the change

Adding the missing linkage between changes to the tabs and enabling the OK button in the map option menu of the editor.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4350. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/470244109.
Appveyor build 4144. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806230_enable_ok_button-4144.

Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4350. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/470244109.

8945. By Toni Förster

merged trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4363. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/472186116.
Appveyor build 4156. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806230_enable_ok_button-4156.

Revision history for this message
Toni Förster (stonerl) wrote :

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
2--- src/editor/ui_menus/main_menu_map_options.cc 2018-12-13 07:24:01 +0000
3+++ src/editor/ui_menus/main_menu_map_options.cc 2018-12-25 21:20:35 +0000
4@@ -129,6 +129,7 @@
5 // TODO(GunChleoc): We need team images in the listselect here,
6 // so map editors will be able to delete entries.
7 // This is waiting for the new RT renderer.
8+ // TODO(Notabilis): Add onChanged-code below after this is added
9 teams_list_.add("Not implemented yet.", "", nullptr, false);
10
11 unsigned int nr_players = static_cast<unsigned int>(eia().egbase().map().get_nrplayers());
12@@ -148,6 +149,9 @@
13 author_.changed.connect(boost::bind(&MainMenuMapOptions::changed, this));
14 descr_->changed.connect(boost::bind(&MainMenuMapOptions::changed, this));
15 hint_->changed.connect(boost::bind(&MainMenuMapOptions::changed, this));
16+ for (const auto& tag : tags_checkboxes_) {
17+ tag.second->changed.connect(boost::bind(&MainMenuMapOptions::changed, this));
18+ }
19
20 ok_.sigclicked.connect(boost::bind(&MainMenuMapOptions::clicked_ok, boost::ref(*this)));
21 cancel_.sigclicked.connect(boost::bind(&MainMenuMapOptions::clicked_cancel, boost::ref(*this)));

Subscribers

People subscribed via source and target branches

to status/vote changes: