[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 2038. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207741512. Appveyor build 1873. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-1873. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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-1664052-expedition-shipwindow-crash into lp:widelands
Continuous integration builds have changed state: Travis build 2037. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207741358. Appveyor build 1872. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1664052_expedition_shipwindow_crash-1872. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash/+merge/318986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash 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-website/get_rid_of_wikiwords into lp:widelands-website
Thanks for review :-) I've run the converting script and merged this branch on alpha. Alpha is still running. If you have some articles on alpha observed, you should have an e mail about the change in your inbox. I think all looks good over there (except some wrong syntax in some tables). There where some difficulties executing the script, but i found solutions. Tomorrow i want to run this against widelands.org and merge the changes. -- https://code.launchpad.net/~widelands-dev/widelands-website/get_rid_of_wikiwords/+merge/318283 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands-website/convert_wikiwords. ___ 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-1664052-expedition-shipwindow-crash into lp:widelands
Started and canceled an expedition about 10 times and no crash anymore. What i noticed: 1. The Black 'Cargo-space' does not fill the entire window anymore... intended? 2. If an expedition is canceled the button 'Cancel expedition is removed from the ship window. But if you close the ship window and reopen it, the button is there again. An Idea to 1.: Is it possible to have an image there where the black area is? I am thinking of a wooden ship hold with some book shelf, enlightened with a candle or so... :-D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash/+merge/318986 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash 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/string-fixes into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
Since we don't have a consensus, I reverted it to the way it was. I don't have strong feelings about this string. Ans even as master of strings I appreciate any feedback and improvement from others ;) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
For me "Jundlina Writes a Letter" is the heading of this chapter. The header gives a hint on whats going on in the following text, but isn't a concrete part of the text. Since i am not registered on transifex and you are the master of translation, feel free to change it as you like. I am not good in explaining such things :D -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/hasimusic into lp:widelands
I have sent you a PM on the forum - it's easier for me to explain in German. I really like Silkweaver Song, the other 2 songs still need some work. -- https://code.launchpad.net/~widelands-dev/widelands/hasimusic/+merge/317892 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/hasimusic. ___ 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/glossary_checks into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/glossary_checks into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/glossary_checks/+merge/312430 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/glossary_checks. ___ 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/glossary_checks into lp:widelands
Continuous integration builds have changed state: Travis build 2031. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207665942. Appveyor build 1700. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_glossary_checks-1700. -- https://code.launchpad.net/~widelands-dev/widelands/glossary_checks/+merge/312430 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/glossary_checks. ___ 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-1669971-libnote_sound into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1669971-libnote_sound into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669971-libnote_sound/+merge/318984 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669971-libnote_sound. ___ 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-1669971-libnote_sound into lp:widelands
Continuous integration builds have changed state: Travis build 2030. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207664659. Appveyor build 1866. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1669971_libnote_sound-1866. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669971-libnote_sound/+merge/318984 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669971-libnote_sound. ___ 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/string-fixes into lp:widelands
Regarding your comment, I changed it due to the following feedback on Transifex: Wait, so Jundlina writes a letter in which she writes that she will write a letter to Sidolus? Perhaps we should just go with one of the older titles? It would fit perfectly well if she received a letter instead of writing one, for example. Change it to "Jundlina Received a Message"? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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-1664052-expedition-shipwindow-crash into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into
lp:widelands.
Commit message:
Do not delete/recreate buttons in the ship window. This fixes a segfault with
the button signals. This also makes NoteShipWindow::Action::kRefresh obsolete.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1664052 in widelands: "Memory corruption in the gui"
https://bugs.launchpad.net/widelands/+bug/1664052
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash/+merge/318986
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into
lp:widelands.
=== modified file 'src/economy/portdock.cc'
--- src/economy/portdock.cc 2017-02-22 20:23:49 +
+++ src/economy/portdock.cc 2017-03-04 15:08:32 +
@@ -336,7 +336,6 @@
// The expedition goods are now on the ship, so from now on it is independent from the port
// and thus we switch the port to normal, so we could even start a new expedition,
cancel_expedition(game);
- Notifications::publish(NoteShipWindow(ship.serial(), NoteShipWindow::Action::kRefresh));
return fleet_->update(game);
}
}
=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc 2017-02-22 20:23:49 +
+++ src/logic/map_objects/tribes/ship.cc 2017-03-04 15:08:32 +
@@ -680,8 +680,6 @@
}
expedition_.reset(nullptr);
-
- Notifications::publish(NoteShipWindow(serial(), NoteShipWindow::Action::kRefresh));
return start_task_idle(game, descr().main_animation(), 1500);
}
}
@@ -924,9 +922,6 @@
// Delete the expedition and the economy it created.
expedition_.reset(nullptr);
-
- // And finally update our ship window
- Notifications::publish(NoteShipWindow(serial(), NoteShipWindow::Action::kRefresh));
}
/// Sinks the ship
=== modified file 'src/logic/map_objects/tribes/ship.h'
--- src/logic/map_objects/tribes/ship.h 2017-02-22 20:23:49 +
+++ src/logic/map_objects/tribes/ship.h 2017-03-04 15:08:32 +
@@ -59,7 +59,8 @@
Serial serial;
- enum class Action { kRefresh, kClose };
+ // TODO(GunChleoc): We leave the 1 action for now, because notes will be merged in the shiplist branch.
+ enum class Action { kClose };
const Action action;
NoteShipWindow(Serial init_serial, const Action& init_action)
=== modified file 'src/wui/shipwindow.cc'
--- src/wui/shipwindow.cc 2017-02-25 13:27:40 +
+++ src/wui/shipwindow.cc 2017-03-04 15:08:32 +
@@ -51,132 +51,127 @@
using namespace Widelands;
ShipWindow::ShipWindow(InteractiveGameBase& igb, UniqueWindow::Registry& reg, Ship& ship)
- : UniqueWindow(&igb, "shipwindow", ®, 0, 0, ship.get_shipname()), igbase_(igb), ship_(ship) {
- init(false);
- shipnotes_subscriber_ = Notifications::subscribe(
- [this](const Widelands::NoteShipWindow& note) {
- if (note.serial == ship_.serial()) {
- switch (note.action) {
- // The ship state has changed, e.g. expedition canceled
- case Widelands::NoteShipWindow::Action::kRefresh:
- init(true);
- break;
- // The ship is no more
- case Widelands::NoteShipWindow::Action::kClose:
- // Stop this from thinking to avoid segfaults
- set_thinks(false);
- die();
- break;
- default:
- break;
- }
- }
- });
-}
-
-void ShipWindow::init(bool avoid_fastclick) {
+ : UniqueWindow(&igb, "shipwindow", ®, 0, 0, ship.get_shipname()), igbase_(igb), ship_(ship),
+ vbox_(this, 0, 0, UI::Box::Vertical),
+ navigation_box_(&vbox_, 0, 0, UI::Box::Vertical),
+ navigation_box_height_(0)
+{
+ vbox_.set_inner_spacing(5);
assert(ship_.get_owner());
- vbox_.reset(new UI::Box(this, 0, 0, UI::Box::Vertical));
-
- display_ = new ItemWaresDisplay(vbox_.get(), *ship_.get_owner());
+ display_ = new ItemWaresDisplay(&vbox_, *ship_.get_owner());
display_->set_capacity(ship_.descr().get_capacity());
- vbox_->add(display_, UI::Box::Resizing::kAlign, UI::Align::kCenter);
+ vbox_.add(display_, UI::Box::Resizing::kAlign, UI::Align::kCenter);
// Expedition buttons
- if (ship_.state_is_expedition()) {
- UI::Box* exp_top = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
- vbox_->add(exp_top, UI::Box::Resizing::kAlign, UI::Align::kCenter);
- UI::Box* exp_mid = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
- vbox_->add(exp_mid, UI::Box::Resizing::kAlign, UI::Align::kCenter);
- UI::Box* exp_bot = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
- vbox_->add(exp_bot, UI::Box::Resizing::kAlign, UI::Align::kCenter);
-
- btn_scout_[WALK_NW - 1] =
- make_button(exp_top, "scnw", _("Scout towards the north west"), pic_scout_nw,
- boost::bind(&ShipWindow::act_scout_towards, this, WALK_NW));
- exp_top->add(btn_scout_[WALK_NW - 1]);
-
- btn_explore_island_cw_ = make_button(
- exp_top, "expcw", _("Explore
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Review: Approve
One nit, otherwise looks good to me.
Diff comments:
> === modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
> --- data/campaigns/atl01.wmf/scripting/texts.lua 2017-02-15 19:32:31
> +
> +++ data/campaigns/atl01.wmf/scripting/texts.lua 2017-03-04 13:46:04
> +
> @@ -314,7 +314,7 @@
>
> barracks_story = {
> {
> - title = _"Jundlina Writes a Letter",
> + title = _"Jundlina Received a Letter",
As i understand the text Jundlina writes a letter to Sidolus and she received
word.
>body = jundlina(_"Jundlina",
> -- TRANSLATORS: Jundlina
> _([[I have received word that our mining industry started working.
> Now that we are forging weapons, I will send a letter to Sidolus informing
> him that it’s time to build a barracks and start recruiting soldiers.]]))
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
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/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Small string fixes for issues reported on Transifex.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
--- data/campaigns/atl01.wmf/scripting/texts.lua 2017-02-15 19:32:31 +
+++ data/campaigns/atl01.wmf/scripting/texts.lua 2017-03-04 13:46:04 +
@@ -314,7 +314,7 @@
barracks_story = {
{
- title = _"Jundlina Writes a Letter",
+ title = _"Jundlina Received a Letter",
body = jundlina(_"Jundlina",
-- TRANSLATORS: Jundlina
_([[I have received word that our mining industry started working. Now that we are forging weapons, I will send a letter to Sidolus informing him that it’s time to build a barracks and start recruiting soldiers.]]))
=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2016-12-06 18:41:32 +
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2017-03-04 13:46:04 +
@@ -166,7 +166,7 @@
}
lumberjack_message_07 = {
- title = _"Lumberjack is Done",
+ title = _"The Lumberjack’s Hut is Done",
position = "topright",
body = rt(
p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the granite.]])
=== modified file 'data/txts/tips/barbarians.lua'
--- data/txts/tips/barbarians.lua 2017-03-02 11:09:27 +
+++ data/txts/tips/barbarians.lua 2017-03-04 13:46:04 +
@@ -9,7 +9,7 @@
seconds = 5
},
{
- text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
+ text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
seconds = 7
},
}
=== modified file 'data/txts/tips/editor.lua'
--- data/txts/tips/editor.lua 2017-03-02 11:09:27 +
+++ data/txts/tips/editor.lua 2017-03-04 13:46:04 +
@@ -41,7 +41,7 @@
seconds = 7
},
{
- text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or unbuildable terrain towards the west, northwest and northeast.",
+ text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or non-arable terrain towards the west, northwest and northeast.",
seconds = 7
},
}
=== modified file 'data/txts/tips/empire.lua'
--- data/txts/tips/empire.lua 2017-03-02 11:09:27 +
+++ data/txts/tips/empire.lua 2017-03-04 13:46:04 +
@@ -9,7 +9,7 @@
seconds = 5
},
{
- text = _"Most upgraded buildings also need an upgraded worker. Do not upgrade a building unless you have the upgraded workers available.",
+ text = _"Most enhanced buildings need experienced workers. Do not enhance a building unless you have the necessary workers available.",
seconds = 7
},
{
___
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-1653460-panel-init-width into lp:widelands
Replied to your question. Thanks for the review!
Diff comments:
>
> === modified file 'src/ui_fsmenu/loadgame.cc'
> --- src/ui_fsmenu/loadgame.cc 2017-02-26 11:57:15 +
> +++ src/ui_fsmenu/loadgame.cc 2017-03-02 08:46:01 +
> @@ -188,6 +188,7 @@
> ta_mapname_.set_tooltip(_("The map that this game is based
> on"));
> delete_.set_tooltip(_("Delete this game"));
> }
> + set_thinks(false);
There are no background actions for this panel to watch for, so we can save
some computing power here.
> minimap_icon_.set_visible(false);
>
>
> back_.sigclicked.connect(boost::bind(&FullscreenMenuLoadGame::clicked_back,
> boost::ref(*this)));
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1653460-panel-init-width/+merge/318358
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1653460-panel-init-width.
___
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/fh1_width_and_mapobject_messages into lp:widelands
Review: Approve testing Played a game a while with this branch: LGTM -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages. ___ 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/glossary_checks into lp:widelands
It's getting a bit annoying to run these from a separate branch. Since none of this affects the Widelands code or translations directly, I'm gonna merge this now. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/glossary_checks/+merge/312430 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/glossary_checks. ___ 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-1669971-libnote_sound into lp:widelands
Klaus Halfmann has proposed merging lp:~widelands-dev/widelands/bug-1669971-libnote_sound into lp:widelands. Requested reviews: GunChleoc (gunchleoc) Related bugs: Bug #1669971 in widelands: "Linking libnote_sound.a fails on OSX / ports" https://bugs.launchpad.net/widelands/+bug/1669971 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669971-libnote_sound/+merge/318984 This fixed Bug 1669971 for me. -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669971-libnote_sound. === modified file 'src/sound/CMakeLists.txt' --- src/sound/CMakeLists.txt 2017-02-28 12:59:39 + +++ src/sound/CMakeLists.txt 2017-03-04 11:53:07 + @@ -1,6 +1,7 @@ wl_library(note_sound SRCS note_sound.h +note_sound.cc DEPENDS logic_widelands_geometry notifications === added file 'src/sound/note_sound.cc' --- src/sound/note_sound.cc 1970-01-01 00:00:00 + +++ src/sound/note_sound.cc 2017-03-04 11:53:07 + @@ -0,0 +1,1 @@ +// CMake cannot deal with header only libraries, therefore we need an empty cc file :(. ___ 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-1669971-libnote_sound into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669971-libnote_sound/+merge/318984 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669971-libnote_sound. ___ 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-1669971-libnote_sound into lp:widelands
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669971-libnote_sound/+merge/318984 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669971-libnote_sound. ___ 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/graphic_dependencies into lp:widelands
Continuous integration builds have changed state: Travis build 2028. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207625982. Appveyor build 1864. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_graphic_dependencies-1864. -- https://code.launchpad.net/~widelands-dev/widelands/graphic_dependencies/+merge/318982 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/graphic_dependencies 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-1653460-panel-init-width into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1653460-panel-init-width into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1653460-panel-init-width/+merge/318358 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1653460-panel-init-width. ___ 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-1653460-panel-init-width into lp:widelands
Review: Approve code review
OK found no obvious code flaws,
I played this in several config for some time withou any harm.
@bunnybot merge
Diff comments:
>
> === modified file 'src/ui_basic/panel.h'
> --- src/ui_basic/panel.h 2017-01-25 18:55:59 +
> +++ src/ui_basic/panel.h 2017-03-02 08:46:01 +
> @@ -180,14 +180,8 @@
> return bborder_;
> }
>
> - int get_inner_w() const {
> - assert(lborder_ + rborder_ <= w_);
> - return w_ - (lborder_ + rborder_);
> - }
> - int get_inner_h() const {
> - assert(tborder_ + bborder_ <= h_);
> - return h_ - (tborder_ + bborder_);
> - }
> + int get_inner_w() const;
> + int get_inner_h() const;
Yes, better do not make this inline.
>
> const Panel* get_next_sibling() const {
> return next_;
>
> === modified file 'src/ui_fsmenu/loadgame.cc'
> --- src/ui_fsmenu/loadgame.cc 2017-02-26 11:57:15 +
> +++ src/ui_fsmenu/loadgame.cc 2017-03-02 08:46:01 +
> @@ -188,6 +188,7 @@
> ta_mapname_.set_tooltip(_("The map that this game is based
> on"));
> delete_.set_tooltip(_("Delete this game"));
> }
> + set_thinks(false);
Waht is improved here? No need fo the loadgame to think?
> minimap_icon_.set_visible(false);
>
>
> back_.sigclicked.connect(boost::bind(&FullscreenMenuLoadGame::clicked_back,
> boost::ref(*this)));
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1653460-panel-init-width/+merge/318358
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1653460-panel-init-width.
___
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/graphic_dependencies into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/graphic_dependencies
into lp:widelands.
Commit message:
Split graphics into multiple libraries. This includes some changes to wordwrap
(used by the old font renderer and the edit boxes). Shifted some functions from
align to text_layout. Moved TextStyle from text_layout to font.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/graphic_dependencies/+merge/318982
Untangling dependencies, the never-ending story...
Codecheck will pick up on missing/superfluous "DEPENDS" entries, but can't
double-check "USES_...".
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/graphic_dependencies into lp:widelands.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2016-05-17 15:57:06 +
+++ src/CMakeLists.txt 2017-03-04 08:03:56 +
@@ -97,6 +97,7 @@
wlapplication_messages.h
USES_SDL2
USES_SDL2_IMAGE
+ USES_SDL2_TTF
DEPENDS
base_exceptions
base_geometry
@@ -106,8 +107,10 @@
build_info
editor
graphic
+graphic_fonthandler
+graphic_fonthandler_legacy
graphic_text
-graphic_text_layout
+graphic_text_constants
helper
io_filesystem
logic
=== modified file 'src/base/CMakeLists.txt'
--- src/base/CMakeLists.txt 2016-10-22 11:22:34 +
+++ src/base/CMakeLists.txt 2017-03-04 08:03:56 +
@@ -27,7 +27,6 @@
SRCS
i18n.h
i18n.cc
-utf8.h
USES_INTL
DEPENDS
base_log
@@ -35,6 +34,11 @@
third_party_gettext
)
+wl_library(base_utf8
+ SRCS
+utf8.h
+)
+
wl_library(base_geometry
SRCS
rect.h
=== modified file 'src/base/utf8.h'
--- src/base/utf8.h 2017-01-25 18:55:59 +
+++ src/base/utf8.h 2017-03-04 08:03:56 +
@@ -33,28 +33,6 @@
return (ch & 0xc0) == 0x80;
}
- /**
- * Convert a unicode character into a multi-byte utf8 string.
- */
- static std::string unicode_to_utf8(uint16_t unicode) {
- unsigned char buf[4];
-
- if (unicode < 0x80) {
- buf[0] = unicode;
- buf[1] = 0;
- } else if (unicode < 0x800) {
- buf[0] = ((unicode & 0x7c0) >> 6) | 0xc0;
- buf[1] = (unicode & 0x3f) | 0x80;
- buf[2] = 0;
- } else {
- buf[0] = ((unicode & 0xf000) >> 12) | 0xe0;
- buf[1] = ((unicode & 0xfc0) >> 6) | 0x80;
- buf[2] = (unicode & 0x3f) | 0x80;
- buf[3] = 0;
- }
-
- return reinterpret_cast(buf);
- }
/**
* Decode the unicode character starting at \p pos and return it. Upon returning,
=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt 2017-02-28 12:59:39 +
+++ src/editor/CMakeLists.txt 2017-03-04 08:03:56 +
@@ -93,6 +93,7 @@
base_macros
base_scoped_timer
graphic
+graphic_fonthandler
graphic_playercolor
graphic_surface
io_filesystem
=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt 2017-02-28 12:59:39 +
+++ src/graphic/CMakeLists.txt 2017-03-04 08:03:56 +
@@ -3,16 +3,12 @@
# TODO(sirver): Separate this directory into a base directory and one
# that is Widelands aware (can include logic stuff).
-wl_library(graphic_build_texture_atlas
+# Align and color
+
+wl_library(graphic_align
SRCS
-build_texture_atlas.h
-build_texture_atlas.cc
- DEPENDS
-graphic
-graphic_image_io
-graphic_surface
-graphic_texture_atlas
-io_filesystem
+align.h
+align.cc
)
wl_library(graphic_color
@@ -31,31 +27,19 @@
graphic_surface
)
-wl_library(graphic_render_queue
- SRCS
-render_queue.cc
-render_queue.h
- DEPENDS
-base_exceptions
-base_geometry
-base_macros
-graphic_color
-graphic_terrain_programs
-graphic_draw_programs
-logic
-)
-
-wl_library(graphic_text_layout
- SRCS
-text_layout.cc
-text_layout.h
-text_constants.h
- DEPENDS
-base_i18n
+
+# Rendering utils
+
+wl_library(graphic_build_texture_atlas
+ SRCS
+build_texture_atlas.h
+build_texture_atlas.cc
+ DEPENDS
graphic
-graphic_color
+graphic_image_io
graphic_surface
-graphic_text
+graphic_texture_atlas
+io_filesystem
)
wl_library(graphic_image_io
@@ -113,49 +97,6 @@
io_filesystem
)
-wl_library(graphic_terrain_programs
- SRCS
-gl/fields_to_draw.h
-gl/road_program.cc
-gl/road_program.h
-gl/terrain_program.cc
-gl/terrain_program.h
-gl/dither_program.cc
-gl/dither_program.h
- DEPENDS
-base_exceptions
-base_geometry
-base_log
-base_macros
-graphic
-graphic_gl_utils
-graphic_image_io
-graphic_surface
-io_filesystem
-logic
-logic_constants
-logic_widelands_geometry
-)
-
-wl_library(graphic_draw_programs
- SRCS
-blend_mode.h
-blit_mode.h
-gl/blit_program.cc
-gl/blit_program.h
-gl/draw_line_program.cc
-gl/draw_line_program.h
-gl/fill_rect_program.cc
-gl/fill_rect_program.h
- DEPENDS
-
