[Widelands-dev] [Merge] lp:~widelands-dev/widelands/beautiful_correct_lines into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/beautiful_correct_lines into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ 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/listselect into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/listselect into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect. ___ 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/map_object_info into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/map_object_info into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/map_object_info/+merge/287409 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_object_info. ___ 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_object_info into lp:widelands
Putting this on hold to give bunnybot a break - will make a new merge request when this is ready again. -- https://code.launchpad.net/~widelands-dev/widelands/map_object_info/+merge/287409 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_object_info. ___ 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/listselect into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect. ___ 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/beautiful_correct_lines into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ 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/beautiful_correct_lines into lp:widelands
Continuous integration builds have changed state: Travis build 816. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/114585398. Appveyor build 655. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_beautiful_correct_lines-655. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ 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/listselect into lp:widelands
Continuous integration builds have changed state: Travis build 815. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/114585099. Appveyor build 657. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_listselect-657. -- https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect. ___ 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/listselect into lp:widelands
Continuous integration builds have changed state: Travis build 815. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/114585099. Appveyor build 657. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_listselect-657. -- https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect. ___ 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-1545647-upgraded-workers into lp:widelands
Continuous integration builds have changed state: Travis build 813. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/114584643. Appveyor build 653. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1545647_upgraded_workers-653. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1545647-upgraded-workers/+merge/287890 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1545647-upgraded-workers 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-1191556-cancel-expedition into lp:widelands
Continuous integration builds have changed state: Travis build 811. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/114584036. Appveyor build 656. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1191556_cancel_expedition-656. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1191556-cancel-expedition/+merge/288375 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1191556-cancel-expedition 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/new_starting_conditions into lp:widelands
Continuous integration builds have changed state: Travis build 812. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/114584397. Appveyor build 652. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_new_starting_conditions-652. -- https://code.launchpad.net/~widelands-dev/widelands/new_starting_conditions/+merge/288059 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/new_starting_conditions 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/listselect into lp:widelands
Bunnybot encountered an error while working on this merge proposal: Running 'bzr merge ../_widelands_dev_widelands_listselect' failed. Output: M data/i18n/fonts.lua M src/editor/ui_menus/editor_main_menu_load_or_save_map.cc M src/editor/ui_menus/editor_main_menu_map_options.cc M src/editor/ui_menus/editor_main_menu_map_options.h M src/editor/ui_menus/editor_main_menu_new_map.cc M src/editor/ui_menus/editor_main_menu_random_map.cc M src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc M src/graphic/align.cc M src/graphic/font.cc M src/graphic/font_handler1.cc M src/graphic/font_handler1.h M src/graphic/richtext.cc M src/graphic/text/bidi.cc M src/graphic/text/bidi.h M src/graphic/text/font_set.cc M src/graphic/text/font_set.h M src/graphic/text/rt_render.cc M src/graphic/text/rt_render.h M src/graphic/text/sdl_ttf_font.cc M src/graphic/text/sdl_ttf_font.h M src/graphic/text/test/CMakeLists.txt M src/graphic/text/test/render.cc M src/graphic/text_layout.cc M src/graphic/text_parser.cc M src/graphic/wordwrap.cc M src/ui_basic/button.cc M src/ui_basic/checkbox.cc M src/ui_basic/editbox.cc M src/ui_basic/listselect.cc M src/ui_basic/listselect.h M src/ui_basic/messagebox.cc M src/ui_basic/multilinetextarea.cc M src/ui_basic/panel.cc M src/ui_basic/progresswindow.cc M src/ui_basic/slider.cc M src/ui_basic/spinbox.cc M src/ui_basic/table.cc M src/ui_basic/textarea.cc M src/ui_fsmenu/campaign_select.h M src/ui_fsmenu/internet_lobby.cc M src/ui_fsmenu/launch_mpg.h M src/ui_fsmenu/launch_spg.h M src/ui_fsmenu/load_map_or_game.cc M src/ui_fsmenu/load_map_or_game.h M src/ui_fsmenu/options.cc M src/wui/actionconfirm.cc M src/wui/building_statistics_menu.cc M src/wui/game_objectives_menu.cc M src/wui/login_box.cc M src/wui/productionsitewindow.cc Text conflict in src/ui_basic/table.cc 1 conflicts encountered. -- https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect. ___ 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/listselect into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/listselect/+merge/286033 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/listselect. ___ 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/beautiful_correct_lines into lp:widelands
Continuous integration builds have changed state: Travis build 810. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/114323509. Appveyor build 655. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_beautiful_correct_lines-655. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ 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-1545647-upgraded-workers into lp:widelands
Continuous integration builds have changed state: Travis build 808. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/114238928. Appveyor build 653. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1545647_upgraded_workers-653. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1545647-upgraded-workers/+merge/287890 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1545647-upgraded-workers 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/deprecated_error into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/deprecated_error into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/deprecated_error/+merge/288337 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/deprecated_error. ___ 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/text-overlays into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/text-overlays into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/text-overlays/+merge/287754 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/text-overlays. ___ 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-1395278-game_io into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1395278-game_io into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1395278-game_io 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/beautiful_correct_lines into lp:widelands
No problem - I will take care of it :) -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ 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/beautiful_correct_lines into lp:widelands
That Should be removed. Sorry for that. > Am 08.03.2016 um 10:25 schrieb GunChleoc : > > Beautiful :) > > Just 1 question before I merge: what is this line for? > >draw_rect(Rect(5, 7, 3, 4), RGBColor(0, 255, 0), screen_.get()); > > in void Graphic::refresh(), src/graphic/graphic.cc, line 217. > -- > https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 > You proposed lp:~widelands-dev/widelands/beautiful_correct_lines for merging. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ 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/beautiful_correct_lines into lp:widelands
Beautiful :) Just 1 question before I merge: what is this line for? draw_rect(Rect(5, 7, 3, 4), RGBColor(0, 255, 0), screen_.get()); in void Graphic::refresh(), src/graphic/graphic.cc, line 217. -- https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/beautiful_correct_lines. ___ 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-1191556-cancel-expedition into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1191556-cancel-expedition into lp:widelands.
Commit message:
The "Cancel Expedition" button in Port windows will now toggle and remove the
tab.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1191556 in widelands: "Port window not updated ("Cancel the expedition"
starts a new one)"
https://bugs.launchpad.net/widelands/+bug/1191556
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1191556-cancel-expedition/+merge/288375
Using a new note and a new "remove_last_tab" function to fix the cancel
expedition button in port windows.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1191556-cancel-expedition into lp:widelands.
=== modified file 'src/economy/expedition_bootstrap.cc'
--- src/economy/expedition_bootstrap.cc 2016-01-18 19:35:25 +
+++ src/economy/expedition_bootstrap.cc 2016-03-08 08:44:38 +
@@ -160,8 +160,10 @@
workers_.clear();
// Update the user interface
- if (upcast(InteractiveGameBase, igb, warehouse->owner().egbase().get_ibase()))
+ if (upcast(InteractiveGameBase, igb, warehouse->owner().egbase().get_ibase())) {
warehouse->refresh_options(*igb);
+ }
+ Notifications::publish(NoteExpeditionCanceled(this));
}
void ExpeditionBootstrap::cleanup(EditorGameBase& /* egbase */) {
=== modified file 'src/economy/expedition_bootstrap.h'
--- src/economy/expedition_bootstrap.h 2015-11-28 22:29:26 +
+++ src/economy/expedition_bootstrap.h 2016-03-08 08:44:38 +
@@ -99,6 +99,17 @@
DISALLOW_COPY_AND_ASSIGN(ExpeditionBootstrap);
};
+
+struct NoteExpeditionCanceled {
+ CAN_BE_SENT_AS_NOTE(NoteId::NoteExpeditionCanceled)
+
+ ExpeditionBootstrap* bootstrap;
+
+ NoteExpeditionCanceled(ExpeditionBootstrap* const init_bootstrap)
+ : bootstrap(init_bootstrap) {
+ }
+};
+
} // namespace Widelands
#endif // end of include guard: WL_ECONOMY_EXPEDITION_BOOTSTRAP_H
=== modified file 'src/notifications/note_ids.h'
--- src/notifications/note_ids.h 2016-01-14 22:09:24 +
+++ src/notifications/note_ids.h 2016-03-08 08:44:38 +
@@ -36,7 +36,7 @@
TrainingSiteSoldierTrained,
ShipMessage,
GraphicResolutionChanged,
-
+ NoteExpeditionCanceled
};
#endif // end of include guard: WL_NOTIFICATIONS_NOTE_IDS_H
=== modified file 'src/ui_basic/tabpanel.cc'
--- src/ui_basic/tabpanel.cc 2016-02-14 14:09:29 +
+++ src/ui_basic/tabpanel.cc 2016-03-08 08:44:38 +
@@ -254,12 +254,24 @@
}
/**
- * Return the tab names in order
+ * Return the tabs in order
*/
const TabPanel::TabList & TabPanel::tabs() {
return tabs_;
}
+bool TabPanel::remove_last_tab(const std::string& tabname) {
+ if (tabs_.back()->get_name() == tabname) {
+ tabs_.pop_back();
+ if (active_ > tabs_.size() - 1) {
+ active_ = 0ul;
+ }
+ update_desired_size();
+ return true;
+ }
+ return false;
+}
+
/**
* Draw the buttons and the tab
*/
=== modified file 'src/ui_basic/tabpanel.h'
--- src/ui_basic/tabpanel.h 2016-02-08 12:38:48 +
+++ src/ui_basic/tabpanel.h 2016-03-08 08:44:38 +
@@ -115,6 +115,9 @@
void activate(uint32_t idx);
void activate(const std::string &);
uint32_t active() {return active_;}
+ // Removes the last tab if the 'tabname' matches. Returns whether a tab was removed.
+ // We use the tabname as a safety precaution to prevent acidentally removing the wrong tab.
+ bool remove_last_tab(const std::string& tabname);
boost::signals2::signal sigclicked;
=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc 2016-02-13 12:15:29 +
+++ src/wui/buildingwindow.cc 2016-03-08 08:44:38 +
@@ -58,7 +58,8 @@
registry_(registry),
building_ (b),
workarea_overlay_id_(0),
- avoid_fastclick_(false)
+ avoid_fastclick_(false),
+ expeditionbtn_(nullptr)
{
delete registry_;
registry_ = this;
@@ -178,27 +179,20 @@
// Check if this is a port building and if yes show expedition button
if (upcast(Widelands::Warehouse const, warehouse, &building_)) {
if (Widelands::PortDock * pd = warehouse->get_portdock()) {
-if (pd->expedition_started()) {
- UI::Button * expeditionbtn =
- new UI::Button
- (capsbuttons, "cancel_expedition", 0, 0, 34, 34,
- g_gr->images().get("images/ui_basic/but4.png"),
- g_gr->images().get("images/wui/buildings/cancel_expedition.png"),
- _("Cancel the expedition"));
- expeditionbtn->sigclicked.connect
- (boost::bind(&BuildingWindow::act_start_or_cancel_expedition, boost::ref(*this)));
- capsbuttons->add(expeditionbtn, UI::Align::kHCenter);
-} else {
- UI::Button * expeditionbtn =
- new UI::Button
- (capsbuttons, "start_expedition", 0, 0, 34, 34,
- g_gr->images().get("images/ui_basic/but4.png"),
- g_gr->images().get("images/wui/buildings/start_expedition.png"),
- _("Start an expedition"));
- expeditionbtn->sigclicked.connect
- (boost::bind(
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/deprecated_error into lp:widelands
Review: Approve Thanks for cleaning up after me :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/deprecated_error/+merge/288337 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/deprecated_error. ___ 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
