Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1397500 into lp:widelands
The wrong building of the path appears also on linux. See diff comment.
With this change all works fine, imho. Haven't tested all use cases yet.
Diff comments:
>
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt2016-01-23 12:42:00 +
> +++ CMakeLists.txt2016-01-28 17:26:34 +
> @@ -15,7 +17,13 @@
> # (through config.h). If not specified, we are going to use the directory
> where
> # the executable is in. Also on Linux.
> # Packagers (or people using make install) have to set this variable to an
> absolute path.
> -wl_set_if_unset(WL_INSTALL_DATADIR ".")
> +wl_set_if_unset(WL_INSTALL_BASEDIR ".")
> +
> +# Define the directory structure for installation of the data files - will
> be hardcoded
> +# in WL bin (through config.h). If not specified, we are going to use the
> "data" directory
> +# below the directory where the executable is in. Also on Linux.
> +# Packagers (or people using make install) have to set this variable to an
> absolute path.
> +wl_set_if_unset(WL_INSTALL_DATADIR "./data/")
>
Shouldn't this be "data/" instead of "./data/"?
> if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
>if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1397500.
___
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/map_compatibility into lp:widelands
We have updated Together We're Strong because of the artifacts, so you will need to grab the map from Build 18. I actually want to take a different approach to this: Rather than putting the compatibility code back in, only load needed packages in the editor. So, this branch is now only sitting here as a reminder. -- https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_compatibility. ___ 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/ui_align into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ui_align into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ui_align/+merge/284353 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ui_align. ___ 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/ui_align into lp:widelands
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/ui_align/+merge/284353 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ui_align. ___ 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/map_compatibility into lp:widelands
Review: Needs Information Is there a way I can trigger the bug this is trying to fix in trunk? Together we're strong loaded just fine in the editor for me and so did every other shipped map I tried. -- https://code.launchpad.net/~widelands-dev/widelands/map_compatibility/+merge/276088 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_compatibility. ___ 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:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands
nevermind, the codecheck warning was already in trunk. I wonder if I should change bunnybot to not merge until travis is green. @bunnybot merge -- https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-ui_fsmenu/+merge/284339 Your team Widelands Developers is requested to review the proposed merge of lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu 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/ui_align into lp:widelands
lgtm. I fixed the trunk codecheck warning. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/ui_align/+merge/284353 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ui_align 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:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands
travis is reporting codecheck warnings, otherwise lgtm. Please fix them before merging. Klaus, as a aside: would you help out with reviewing other merge requests reviews? I also added you to widelands-dev now, so you can also push to ~widelands-dev instead of your username which allows other devs to fix nits in your branches. -- https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-ui_fsmenu/+merge/284339 Your team Widelands Developers is requested to review the proposed merge of lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu 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:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands
Continuous integration builds have changed state: Travis build 435. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/105514919. Appveyor build 333. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_klaus_halfmann_widelands_bug_1395278_ui_fsmenu-333. -- https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-ui_fsmenu/+merge/284339 Your team Widelands Developers is requested to review the proposed merge of lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu 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-1397500 into lp:widelands
Continuous integration builds have changed state: Travis build 434. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/105474727. Appveyor build 332. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-332. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ 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-1530124 into lp:widelands
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/bug-1530124 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1530124 You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530124/+merge/284356 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1530124 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-1530124 into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1530124 into
lp:widelands.
Commit message:
- Fixed crash with richtext font renderer for filenames that contain
in Table, MultilineTextarea and EditBox.
- EditBox now uses the new font renderer.
- Fixed a crash in SpinBox.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1530124 in widelands: "No escaping of special characters when reading
files (maps, save games) leads to crash"
https://bugs.launchpad.net/widelands/+bug/1530124
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1530124/+merge/284356
There was a crash with savegame/map filenames that contained ,
because the font renderers interpreted them as illegal tags. This crash
happened in Table, MultilineTextarea and EditBox.
I also shifted EditBox to the new font renderer in order to fix this. Note that
caret rendering / text scrolling is broken for RTL languages, but it was broken
before, so this is not a regression. I don't want to deal with that in this
branch.
Also fixed a crash in Spinbox for Arabic in the Options window.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1530124 into lp:widelands.
=== modified file 'src/editor/ui_menus/editor_main_menu_map_options.cc'
--- src/editor/ui_menus/editor_main_menu_map_options.cc 2015-11-01 10:11:56 +
+++ src/editor/ui_menus/editor_main_menu_map_options.cc 2016-01-28 22:15:18 +
@@ -74,8 +74,8 @@
tags_box_(&tabs_, padding_, padding_, UI::Box::Vertical, max_w_, get_inner_h(), 0),
teams_box_(&tabs_, padding_, padding_, UI::Box::Vertical, max_w_, get_inner_h(), 0),
- name_(&main_box_, 0, 0, max_w_, labelh_, g_gr->images().get("pics/but1.png")),
- author_(&main_box_, 0, 0, max_w_, labelh_, g_gr->images().get("pics/but1.png")),
+ name_(&main_box_, 0, 0, max_w_, g_gr->images().get("pics/but1.png")),
+ author_(&main_box_, 0, 0, max_w_, g_gr->images().get("pics/but1.png")),
size_(&main_box_, 0, 0, max_w_ - indent_, labelh_, ""),
teams_list_(&teams_box_, 0, 0, max_w_, 60, UI::Align_Left, true),
=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc 2016-01-18 19:35:25 +
+++ src/editor/ui_menus/editor_main_menu_random_map.cc 2016-01-28 22:15:18 +
@@ -120,12 +120,12 @@
map_number_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
map_number_label_(&map_number_box_, 0, 0, _("Random Number:")),
map_number_edit_(&map_number_box_, 0, 0,
- box_width_ - 2 * margin_ - map_number_label_.get_w(), label_height_,
+ box_width_ - 2 * margin_ - map_number_label_.get_w(),
g_gr->images().get("pics/but1.png")),
map_id_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
map_id_label_(&map_id_box_, 0, 0, _("Map ID:")),
map_id_edit_(&map_id_box_, 0, 0,
- box_width_ - 2 * margin_ - map_id_label_.get_w(), label_height_,
+ box_width_ - 2 * margin_ - map_id_label_.get_w(),
g_gr->images().get("pics/but1.png")),
// Buttons
button_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc 2015-11-18 08:35:44 +
+++ src/editor/ui_menus/editor_main_menu_save_map.cc 2016-01-28 22:15:18 +
@@ -86,9 +86,7 @@
editbox_label_.get_x() + editbox_label_.get_w() + padding_,
editbox_label_.get_y(),
tablew_ - editbox_label_.get_w() - padding_ + 1,
- buth_,
- g_gr->images().get("pics/but1.png"),
- UI::Align::Align_Left);
+ g_gr->images().get("pics/but1.png"));
editbox_->set_text(parent.egbase().map().get_name());
editbox_->changed.connect(boost::bind(&MainMenuSaveMap::edit_box_changed, this));
=== modified file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc'
--- src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc 2015-10-02 07:02:00 +
+++ src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc 2016-01-28 22:15:18 +
@@ -32,7 +32,7 @@
vbox_(this, padding_, padding_, UI::Box::Vertical,
get_inner_w() - 2 * padding_, get_inner_h() - 3 * padding_ - buth_, padding_ / 2),
label_(&vbox_, 0, 0, get_inner_w() - 2 * padding_, buth_, _("Enter Directory Name: "), UI::Align_Left),
- edit_(&vbox_, 0, 0, get_inner_w() - 2 * padding_, buth_, g_gr->images().get("pics/but1.png")),
+ edit_(&vbox_, 0, 0, get_inner_w() - 2 * padding_, g_gr->images().get("pics/but1.png")),
ok_button_(
this, "ok",
padding_, get_inner_h() - padding_ - buth_,
=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc 2016-01-16 12:55:14 +
+++ src/editor/ui_menus/editor_player_menu.cc 2016-01-28 22:15:18 +
@@ -142,7 +14
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ui_align into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/ui_align into
lp:widelands.
Commit message:
UI::Align is now an enum class. Got rid of align aliases in UI::Box.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1367725 in widelands: "Consistent naming of enum members"
https://bugs.launchpad.net/widelands/+bug/1367725
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ui_align/+merge/284353
Just scratching a code style itch.
UI::Align is now an enum class. Got rid of align aliases in UI::Box.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/ui_align into lp:widelands.
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc 2016-01-16 15:57:31 +
+++ src/editor/editorinteractive.cc 2016-01-28 21:30:20 +
@@ -135,14 +135,14 @@
redo_.sigclicked.connect([this] {history_->redo_action(egbase().world());});
toolbar_.set_layout_toplevel(true);
- toolbar_.add(&toggle_main_menu_, UI::Box::AlignLeft);
- toolbar_.add(&toggle_tool_menu_, UI::Box::AlignLeft);
- toolbar_.add(&toggle_toolsize_menu_, UI::Box::AlignLeft);
- toolbar_.add(&toggle_minimap_, UI::Box::AlignLeft);
- toolbar_.add(&toggle_buildhelp_, UI::Box::AlignLeft);
- toolbar_.add(&toggle_player_menu_, UI::Box::AlignLeft);
- toolbar_.add(&undo_, UI::Box::AlignLeft);
- toolbar_.add(&redo_, UI::Box::AlignLeft);
+ toolbar_.add(&toggle_main_menu_, UI::Align::kLeft);
+ toolbar_.add(&toggle_tool_menu_, UI::Align::kLeft);
+ toolbar_.add(&toggle_toolsize_menu_, UI::Align::kLeft);
+ toolbar_.add(&toggle_minimap_, UI::Align::kLeft);
+ toolbar_.add(&toggle_buildhelp_, UI::Align::kLeft);
+ toolbar_.add(&toggle_player_menu_, UI::Align::kLeft);
+ toolbar_.add(&undo_, UI::Align::kLeft);
+ toolbar_.add(&redo_, UI::Align::kLeft);
adjust_toolbar_position();
#ifndef NDEBUG
=== modified file 'src/editor/ui_menus/categorized_item_selection_menu.h'
--- src/editor/ui_menus/categorized_item_selection_menu.h 2015-11-28 22:29:26 +
+++ src/editor/ui_menus/categorized_item_selection_menu.h 2016-01-28 21:30:20 +
@@ -78,11 +78,11 @@
descriptions_(descriptions),
select_correct_tool_(select_correct_tool),
protect_against_recursive_select_(false),
- current_selection_names_(this, 0, 0, 0, 20, UI::Align_Center),
+ current_selection_names_(this, 0, 0, 0, 20, UI::Align::kCenter),
tool_(tool)
{
UI::TabPanel* tab_panel = new UI::TabPanel(this, 0, 0, nullptr);
- add(tab_panel, UI::Align_Center);
+ add(tab_panel, UI::Align::kCenter);
for (uint32_t category_index = 0; category_index < categories.size(); ++category_index) {
const Widelands::EditorCategory& category = categories.get(category_index);
@@ -108,7 +108,7 @@
horizontal = new UI::Box(vertical, 0, 0, UI::Box::Horizontal);
horizontal->add_space(kSpacing);
-vertical->add(horizontal, UI::Align_Left);
+vertical->add(horizontal, UI::Align::kLeft);
vertical->add_space(kSpacing);
}
assert(horizontal != nullptr);
@@ -117,13 +117,13 @@
cb->set_state(tool_->is_enabled(i));
cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, _1));
checkboxes_[i] = cb;
- horizontal->add(cb, UI::Align_Left);
+ horizontal->add(cb, UI::Align::kLeft);
horizontal->add_space(kSpacing);
++nitems_handled;
}
tab_panel->add(category.name(), category.picture(), vertical, category.descname());
}
- add(¤t_selection_names_, UI::Align_Center, true);
+ add(¤t_selection_names_, UI::Align::kCenter, true);
}
template
=== modified file 'src/editor/ui_menus/editor_main_menu.cc'
--- src/editor/ui_menus/editor_main_menu.cc 2015-10-05 06:53:34 +
+++ src/editor/ui_menus/editor_main_menu.cc 2016-01-28 21:30:20 +
@@ -82,13 +82,13 @@
g_gr->images().get("pics/but5.png"),
_("Exit Editor"))
{
- box_.add(&button_new_map_, UI::Box::AlignCenter);
- box_.add(&button_new_random_map_, UI::Box::AlignCenter);
- box_.add(&button_load_map_, UI::Box::AlignCenter);
- box_.add(&button_save_map_, UI::Box::AlignCenter);
- box_.add(&button_map_options_, UI::Box::AlignCenter);
- box_.add(&button_view_readme_, UI::Box::AlignCenter);
- box_.add(&button_exit_editor_, UI::Box::AlignCenter);
+ box_.add(&button_new_map_, UI::Align::kHCenter);
+ box_.add(&button_new_random_map_, UI::Align::kHCenter);
+ box_.add(&button_load_map_, UI::Align::kHCenter);
+ box_.add(&button_save_map_, UI::Align::kHCenter);
+ box_.add(&button_map_options_, UI::Align::kHCenter);
+ box_.add(&button_view_readme_, UI::Align::kHCenter);
+ box_.add(&button_exit_editor_, UI::Align::kHCenter);
box_.set_size(width, 7 * button_new_map_.get_h()+ 6 * vspacing);
set_inner_size(get_inner_w(), box_.get_h() + 2 * margin);
=== modified file 'src/editor/ui_menus/editor_main_menu_load_or_save_map.cc'
---
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ui_align into lp:widelands
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~widelands-dev/widelands/ui_align mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_ui_align You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~widelands-dev/widelands/ui_align/+merge/284353 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ui_align 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:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands
Code LGTM - just 1 nit: get_y_fropreceding_ => get_y_from_preceding. I have
marked 2 instances with diff comments.
Diff comments:
>
> === modified file 'src/ui_fsmenu/campaign_select.cc'
> --- src/ui_fsmenu/campaign_select.cc 2015-10-23 18:03:33 +
> +++ src/ui_fsmenu/campaign_select.cc 2016-01-28 20:02:32 +
> @@ -42,71 +42,71 @@
> */
> FullscreenMenuCampaignSelect::FullscreenMenuCampaignSelect() :
> FullscreenMenuLoadMapOrGame(),
> - m_table(this, tablex_, tabley_, tablew_, tableh_, false),
> + table_(this, tablex_, tabley_, tablew_, tableh_, false),
>
> // Main Title
> - m_title
> + title_
> (this, get_w() / 2, tabley_ / 3,
>_("Choose a campaign"),
>UI::Align_HCenter),
>
> // Campaign description
> - m_label_campname
> + label_campname_
> (this, right_column_x_, tabley_,
>"",
>UI::Align_Left),
> - m_ta_campname(this,
> - right_column_x_ + indent_,
> get_y_from_preceding(m_label_campname) + padding_,
> - get_right_column_w(right_column_x_) -
> indent_, m_label_height),
> -
> - m_label_tribename
> - (this, right_column_x_, get_y_from_preceding(m_ta_campname) + 2
> * padding_,
> - "",
> - UI::Align_Left),
> - m_ta_tribename(this,
> - right_column_x_ + indent_,
> get_y_from_preceding(m_label_tribename) + padding_,
> -
> get_right_column_w(right_column_x_ + indent_), m_label_height),
> -
> - m_label_difficulty
> - (this, right_column_x_, get_y_from_preceding(m_ta_tribename) +
> 2 * padding_,
> - "",
> - UI::Align_Left),
> - m_ta_difficulty(this,
> - right_column_x_ + indent_,
> get_y_from_preceding(m_label_difficulty) + padding_,
> -
> get_right_column_w(right_column_x_ + indent_), 2 * m_label_height - padding_),
> -
> - m_label_description
> - (this, right_column_x_, get_y_from_preceding(m_ta_difficulty) +
> 2 * padding_,
> + ta_campname_(this,
> + right_column_x_ + indent_,
> get_y_fropreceding_(label_campname_) + padding_,
> + get_right_column_w(right_column_x_) -
> indent_, label_height_),
> +
> + label_tribename_
> + (this, right_column_x_, get_y_fropreceding_(ta_campname_) + 2 *
> padding_,
> + "",
> + UI::Align_Left),
> + ta_tribename_(this,
> + right_column_x_ + indent_,
> get_y_fropreceding_(label_tribename_) + padding_,
> +
> get_right_column_w(right_column_x_ + indent_), label_height_),
> +
> + label_difficulty_
> + (this, right_column_x_, get_y_fropreceding_(ta_tribename_) + 2
> * padding_,
> + "",
> + UI::Align_Left),
> + ta_difficulty_(this,
> + right_column_x_ + indent_,
> get_y_fropreceding_(label_difficulty_) + padding_,
> +
> get_right_column_w(right_column_x_ + indent_), 2 * label_height_ - padding_),
> +
> + label_description_
> + (this, right_column_x_, get_y_fropreceding_(ta_difficulty_) + 2
> * padding_,
>_("Description:"),
>UI::Align_Left),
> - m_ta_description
> + ta_description_
> (this,
>right_column_x_ + indent_,
> - get_y_from_preceding(m_label_description) + padding_,
> + get_y_fropreceding_(label_description_) + padding_,
get_y_fropreceding_ => get_y_from_preceding
>get_right_column_w(right_column_x_ + indent_),
> - m_buty - get_y_from_preceding(m_label_description) - 4 *
> padding_)
> + buty_ - get_y_fropreceding_(label_description_) - 4 * padding_)
> {
> - m_title.set_textstyle(UI::TextStyle::ui_big());
> + title_.set_textstyle(UI::TextStyle::ui_big());
> back_.set_tooltip(_("Return to the main menu"));
> ok_.set_tooltip(_("Play this campaign"));
> - m_ta_campname.set_tooltip(_("The name of this campaign"));
> - m_ta_tribename.set_tooltip(_("The tribe you will be playing"));
> - m_ta_difficulty.set_tooltip(_("The difficulty of this campaign"));
> + ta_campname_.set_tooltip(_("The name of this campaign"));
> + ta_tribename_.set_tooltip(_("The tribe you will be playing"));
> + ta_difficulty_.set_tooltip(_("The difficulty of this campaign"));
>
>
> ok_.sigclicked.connect(boost::bind(&FullscreenMenuCampaignSelect::clicked_ok,
> boost::ref(*this)));
>
> back_.sigclicked.connect(boost::bind(&F
[Widelands-dev] [Merge] lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands
Hi, I am bunnybot (https://github.com/widelands/bunnybot). I am keeping the source branch lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu mirrored to https://github.com/widelands/widelands/tree/_klaus_halfmann_widelands_bug_1395278_ui_fsmenu You can give me commands by starting a line with @bunnybot . I understand: merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set. -- https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-ui_fsmenu/+merge/284339 Your team Widelands Developers is requested to review the proposed merge of lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu 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:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands
Klaus Halfmann has proposed merging
lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~klaus-halfmann/widelands/bug-1395278-ui_fsmenu/+merge/284339
Migration from m_... to ..._ mostly in ui_fsmenu
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~klaus-halfmann/widelands/bug-1395278-ui_fsmenu into lp:widelands.
=== modified file 'src/ui_fsmenu/base.h'
--- src/ui_fsmenu/base.h 2015-12-05 12:51:16 +
+++ src/ui_fsmenu/base.h 2016-01-28 20:02:32 +
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002, 2006, 2008-2009 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
=== modified file 'src/ui_fsmenu/campaign_select.cc'
--- src/ui_fsmenu/campaign_select.cc 2015-10-23 18:03:33 +
+++ src/ui_fsmenu/campaign_select.cc 2016-01-28 20:02:32 +
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2002-2012 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -42,71 +42,71 @@
*/
FullscreenMenuCampaignSelect::FullscreenMenuCampaignSelect() :
FullscreenMenuLoadMapOrGame(),
- m_table(this, tablex_, tabley_, tablew_, tableh_, false),
+ table_(this, tablex_, tabley_, tablew_, tableh_, false),
// Main Title
- m_title
+ title_
(this, get_w() / 2, tabley_ / 3,
_("Choose a campaign"),
UI::Align_HCenter),
// Campaign description
- m_label_campname
+ label_campname_
(this, right_column_x_, tabley_,
"",
UI::Align_Left),
- m_ta_campname(this,
- right_column_x_ + indent_, get_y_from_preceding(m_label_campname) + padding_,
- get_right_column_w(right_column_x_) - indent_, m_label_height),
-
- m_label_tribename
- (this, right_column_x_, get_y_from_preceding(m_ta_campname) + 2 * padding_,
- "",
- UI::Align_Left),
- m_ta_tribename(this,
- right_column_x_ + indent_, get_y_from_preceding(m_label_tribename) + padding_,
- get_right_column_w(right_column_x_ + indent_), m_label_height),
-
- m_label_difficulty
- (this, right_column_x_, get_y_from_preceding(m_ta_tribename) + 2 * padding_,
- "",
- UI::Align_Left),
- m_ta_difficulty(this,
- right_column_x_ + indent_, get_y_from_preceding(m_label_difficulty) + padding_,
- get_right_column_w(right_column_x_ + indent_), 2 * m_label_height - padding_),
-
- m_label_description
- (this, right_column_x_, get_y_from_preceding(m_ta_difficulty) + 2 * padding_,
+ ta_campname_(this,
+ right_column_x_ + indent_, get_y_fropreceding_(label_campname_) + padding_,
+ get_right_column_w(right_column_x_) - indent_, label_height_),
+
+ label_tribename_
+ (this, right_column_x_, get_y_fropreceding_(ta_campname_) + 2 * padding_,
+ "",
+ UI::Align_Left),
+ ta_tribename_(this,
+ right_column_x_ + indent_, get_y_fropreceding_(label_tribename_) + padding_,
+ get_right_column_w(right_column_x_ + indent_), label_height_),
+
+ label_difficulty_
+ (this, right_column_x_, get_y_fropreceding_(ta_tribename_) + 2 * padding_,
+ "",
+ UI::Align_Left),
+ ta_difficulty_(this,
+ right_column_x_ + indent_, get_y_fropreceding_(label_difficulty_) + padding_,
+ get_right_column_w(right_column_x_ + indent_), 2 * label_height_ - padding_),
+
+ label_description_
+ (this, right_column_x_, get_y_fropreceding_(ta_difficulty_) + 2 * padding_,
_("Description:"),
UI::Align_Left),
- m_ta_description
+ ta_description_
(this,
right_column_x_ + indent_,
- get_y_from_preceding(m_label_description) + padding_,
+ get_y_fropreceding_(label_description_) + padding_,
get_right_column_w(right_column_x_ + indent_),
- m_buty - get_y_from_preceding(m_label_description) - 4 * padding_)
+ buty_ - get_y_fropreceding_(label_description_) - 4 * padding_)
{
- m_title.set_textstyle(UI::TextStyle::ui_big());
+ title_.set_textstyle(UI::TextStyle::ui_big());
back_.set_tooltip(_("Return to the main menu"));
ok_.set_tooltip(_("Play this campaign"));
- m_ta_campname.set_tooltip(_("The name of this campaign"));
- m_ta_tribename.set_tooltip(_("The tribe you will be playing"));
- m_ta_difficulty.set_tooltip(_("The difficulty of this campaign"));
+ ta_campname_.set_tooltip(_("The name of this campaign"));
+ ta_tribename_.set_tooltip(_("The tribe you will be playing"));
+ ta_difficulty_.set_tooltip(_("The difficulty of this campaign"));
ok_.sigclicked.connect(boost::bind(&FullscreenMenuCampaignSelect::clicked_ok, boost::ref(*this)));
back_.sigclicked.connect(boost::bind(&FullscreenMenuCampaignSelect::clicked_back, boost::ref(*this)));
- m_table.selected.connect(boost::bind(&FullscreenMenuCampaignSelect::entry_s
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1397500 into lp:widelands
Continuous integration builds have changed state: Travis build 434. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/105474727. Appveyor build 332. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-332. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ 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-1397500 into lp:widelands
I had a look at http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1397500/view/head:/utils/win32/mingw/config.h and I don't know if the . in the datadir needs removing or something. SInce I can't test on Windows, it's hard for me to play with stuff. The variable that needs setting is datadir_ in wlapplication.h/cc. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ 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/load_library into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/load_library into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/load_library/+merge/284218 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/load_library. ___ 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/load_library into lp:widelands
Review: Approve LGTM @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/load_library/+merge/284218 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/load_library. ___ 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/load_library into lp:widelands
Continuous integration builds have changed state: Travis build 424. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/105353758. Appveyor build 324. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_load_library-324. -- https://code.launchpad.net/~widelands-dev/widelands/load_library/+merge/284218 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/load_library 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-1397500 into lp:widelands
Continuous integration builds have changed state: Travis build 426. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/105358644. Appveyor build 326. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1397500-326. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ 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/padding_in_atlas into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/padding_in_atlas into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/padding_in_atlas. ___ 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/padding_in_atlas into lp:widelands
Review: Approve Works well :-) This is a really good change. Thanks a lot for this. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/padding_in_atlas. ___ 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/padding_in_atlas into lp:widelands
Whatever is easier for you. -- https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/padding_in_atlas. ___ 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/padding_in_atlas into lp:widelands
I am just compiling... If this fixes the problem i want to change the road pics to have them all a width of 10 pixel. Could i change them in this branch or should i make another branch for this? -- https://code.launchpad.net/~widelands-dev/widelands/padding_in_atlas/+merge/284216 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/padding_in_atlas. ___ 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
