[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-dropdowns into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix-dropdowns into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-dropdowns. ___ 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/fix-dropdowns into lp:widelands
Tracked down the line for the crash, it is caused by the new WIP constructionsite options. So, definitely not related to this branch. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-dropdowns. ___ 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/fix-dropdowns into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fix-dropdowns into lp:widelands has been updated. Commit message changed to: Dropdown fixes and improvements - Fix positioning of dropdown lists on fullscreen switches - Define dropdown list height by number of items - Add dropdowns to Lua interface - Panel::free_children() now frees all its children - Create styles for hotkeys and reduce number of render calls in listselect - Get rid of map width/height code duplication in the editor - Add support for using dropdowns as toolbar menus with hotkeys - Fix toggling of minimized UniqueWindows For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-dropdowns. ___ 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/fix-dropdowns into lp:widelands
Can you please create a bug report when finding errors caused by trunk, rather than putting them in a code review? You now have marked this branch as "needs fixing"; but it's trunk that needs fixing ;) I have created a new bug report for this: https://bugs.launchpad.net/widelands/+bug/1834151 Since you have found no further error in this branch, I'll go ahead and merge. @bunnybot merge > Compiling again, got: > > src/wui/constructionsitewindow.cc:33:19: warning: unused variable > 'pic_max_fill_indicator' > static const char pic_max_fill_indicator[] = > "images/wui/buildings/max_fill_indicator.png"; > ^ These are already in trunk. It's time for another "fix compiler warnings" branch. > After merging with trunk I dont see the network Issue any longer, well. Excellent > Did we just break savegame ccompatibility (yes with the elk_moose) No, that branch has compatibility code. You won't be able to load new maps on older WIdelands versions though. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-dropdowns. ___ 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/fix-dropdowns into lp:widelands
Review: Needs Fixing testplay No I got a crash :( kaputtnik is right, we must play some network games on trunk, RSN. FATAL ERROR - game crashed. Attempting emergency save. ... InternetGaming: logout(SERVER_CRASHED) [NetClient] Closing network socket connected to 2a03:4000:32:524:48cb:feff:feae:b0c6:7395. Warning: Economy still has requests left on destruction Warning: Economy still has flags left on destruction Warning: Economy still has warehouses left on destruction WareList: 125 items of 30 left. WareList: 2 items of 33 left. ... WareList: 1 items of 102 left. Warning: Economy still has requests left on destruction Warning: Economy still has flags left on destruction Warning: Economy still has warehouses left on destruction WareList: 127 items of 0 left. ... WareList: 12 items of 102 left. ObjectManager: ouch! remaining objects lastserial: 2499 [NetRelayConnection] Closing network socket connected to 2a03:4000:32:524:48cb:feff:feae:b0c6:7397. InternetGaming: logout(SERVER_CRASHED) libc++abi.dylib: terminating with uncaught exception of type WException: [../src/logic/playercommand.cc:1070] Unreachable code was reached. Abort trap: 6 ObjectManager: ouch! remaining objects lastserial: 2499 [NetRelayConnection] Closing network socket connected to 2a03:4000:32:524:48cb:feff:feae:b0c6:7397. InternetGaming: logout(SERVER_CRASHED) I dont think this is related to tis particular branch, though. Will try this on trunk again, later -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix-dropdowns. ___ 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/fix-dropdowns into lp:widelands
Compiling again, got: src/wui/constructionsitewindow.cc:33:19: warning: unused variable 'pic_max_fill_indicator' static const char pic_max_fill_indicator[] = "images/wui/buildings/max_fill_indicator.png"; ^ src/wui/constructionsitewindow.cc:34:19: warning: unused variable 'pic_priority_low' static const char pic_priority_low[] = "images/wui/buildings/low_priority_button.png"; ^ src/wui/constructionsitewindow.cc:35:19: warning: unused variable 'pic_priority_normal' static const char pic_priority_normal[] = "images/wui/buildings/normal_priority_button.png"; ^ src/wui/constructionsitewindow.cc:36:19: warning: unused variable 'pic_priority_high' static const char pic_priority_high[] = "images/wui/buildings/high_priority_button.png"; Not sure where got that from? After merging with trunk I dont see the network Issue any longer, well. Did we just break savegame ccompatibility (yes with the elk_moose) OK, will start a new game for testing -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Continuous integration builds have changed state: Travis build 5237. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/549847068. Appveyor build 5016. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_dropdowns-5016. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Continuous integration builds have changed state: Travis build 5233. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/549672031. Appveyor build 5012. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_dropdowns-5012. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Can you test the networking issue with trunk? I don't think that it's related to this branch. We also just merged an improvement for the work areas, so they will hopefully be a bit faster now. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Played a bit and tested the MapEditor. So far all fine. The new WorkAreaIndicator (when selecting a building) is a pain, at least on my OSX-Computer. It is so slow, that selecting the correct building becomes quit difficult. Do we have an optin to disable this? Do we have a bug for this? This branch per se is fine, except for the Networking Issue. Will wait for other opinions for now. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
> * How can I find the hotkeys and test them? Best use https://code.launchpad.net/~widelands-dev/widelands/toolbar-dropdown-menus/+merge/368230 for that where you can see them in action. > * Improved SyntaxErrorImpl - no idea how to test this :-) > Can I break som RichText in an easy way? You could edit one of the basic layouting functions in data/scripting/richtext.lua (for example, add an additional "" to the p() function without closing the tag) and then access the encyclopedia. > * Sure we want to log every (Lua Button) keypress? It makes debugging scenarios easier. > Nice refactoring of boring code :-) And that bug in UI::Panel is really nasty, it cost me many hours of pulling my hair when I originally implemented the dropdowns. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
> Found a unrealted, minor Bug: when leaving the "Set Player Positions" Window, > the Map still shows only Big buidling Plots. Not sure if we _must_ fix this. > Will go away with the next map commands. That's independent from this branch, so I have created a new bug report: https://bugs.launchpad.net/widelands/+bug/1834001 > When trying to open an Online Game I get: This is probably related to the server move this weekend. I don't think that this branch broke it, but I'll merge trunk to make sure that the networking code is up to date. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Found a unrealted, minor Bug: when leaving the "Set Player Positions" Window, the Map still shows only Big buidling Plots. Not sure if we _must_ fix this. Will go away with the next map commands. When trying to open an Online Game I get: InternetGaming: Connecting to the metaserver. [NetClient]: Trying to connect to 2a03:4000:32:524:48cb:feff:feae:b0c6:7395 ... failed. Could not resolve network name: resolve: Host not found (authoritative) > dig widelands.org widelands.org. 2431IN 2a03:4000:32:524:48cb:feff:feae:b0c6 > dig widelands.org A widelands.org. 3312IN A 85.235.66.69 ./widelands --metaserver=2a03:4000:32:524:48cb:feff:feae:b0c6 > OK ./widelands --metaserver=85.235.66.69 > OK How did this branch break the Internet (IPv6) connectivitiy? Can anybody confirm. I will continue testing with the hardcoded IPv6 Adress -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Most travis builds green, two fail as of test_inputqueues.lua Compiled. To test: * in MapEditor ** Widht/Height dropdowns (new Map) ** Widht/Height dropdowns (resize Map) ** Number of Players dropdown * Filter in news overview * Which examples of minimzed UniqueWindows can you give me? * How can I find the hotkeys and test them? * Improved SyntaxErrorImpl - no idea how to test this :-) Can I break som RichText in an easy way? * Sure we want to log every (Lua Button) keypress? Nice refactoring of boring code :-) Will no test the Lua part -> next Branch. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Continuous integration builds have changed state: Travis build 5163. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/542120713. Appveyor build 4945. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_dropdowns-4945. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Continuous integration builds have changed state: Travis build 5121. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/540143701. Appveyor build 4903. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_dropdowns-4903. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
Continuous integration builds have changed state: Travis build 5113. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/540070598. Appveyor build 4895. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_dropdowns-4895. -- https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-dropdowns 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/fix-dropdowns into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix-dropdowns into
lp:widelands.
Commit message:
Dropdown fixes and improvements
- Fix positioning of dropdown lists on fullscreen switches
- Define dropdpwn list height by number of items
- Add dropdowns to Lua interface
- Panel::free_children() now frees all its children
- Create styles for hotkeys and reduce number of render calls in listselect
- Get rid of map width/height code duplication in the editor
- Add support for using dropdowns as toolbar menus with hotkeys
- Fix toggling of minimized UniqueWIndows
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1643563 in widelands: "Toolbar redesign"
https://bugs.launchpad.net/widelands/+bug/1643563
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix-dropdowns/+merge/368223
I pulled out some code from
https://code.launchpad.net/~widelands-dev/widelands/toolbar-dropdown-menus
to make it more reviewable, because that branch has become too big.
The new dropdown functionality in the Lua interface and for toolbar menus is
not being used in this branch, but it can be tested with the other branch.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fix-dropdowns into lp:widelands.
=== modified file 'data/templates/default/init.lua'
--- data/templates/default/init.lua 2019-05-25 09:40:09 +
+++ data/templates/default/init.lua 2019-06-01 10:27:23 +
@@ -422,6 +422,13 @@
size = fs_font_size,
bold = true,
shadow = true
+ },
+ hotkey = {
+color = {180, 180, 180},
+face = fs_font_face,
+size = fs_font_size,
+bold = true,
+shadow = true
}
},
wui = {
@@ -438,6 +445,13 @@
size = fs_font_size,
bold = true,
shadow = true
+ },
+ hotkey = {
+color = {180, 180, 180},
+face = fs_font_face,
+size = fs_font_size,
+bold = true,
+shadow = true
}
},
},
@@ -615,6 +629,12 @@
size = 14,
bold = false,
},
+ tooltip_hotkey = {
+ color = {180, 180, 180},
+ face = fs_font_face,
+ size = 14,
+ bold = false,
+ },
tooltip_header = {
color = fs_font_color,
face = fs_font_face,
=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt 2019-05-12 07:45:59 +
+++ src/editor/CMakeLists.txt 2019-06-01 10:27:23 +
@@ -65,6 +65,8 @@
ui_menus/main_menu_save_map.h
ui_menus/main_menu_save_map_make_directory.cc
ui_menus/main_menu_save_map_make_directory.h
+ui_menus/map_size_box.cc
+ui_menus/map_size_box.h
ui_menus/player_menu.cc
ui_menus/player_menu.h
ui_menus/tool_change_height_options_menu.cc
=== modified file 'src/editor/ui_menus/main_menu_new_map.cc'
--- src/editor/ui_menus/main_menu_new_map.cc 2019-04-26 05:52:49 +
+++ src/editor/ui_menus/main_menu_new_map.cc 2019-06-01 10:27:23 +
@@ -46,24 +46,7 @@
margin_(4),
box_width_(get_inner_w() - 2 * margin_),
box_(this, margin_, margin_, UI::Box::Vertical, 0, 0, margin_),
- width_(&box_,
-0,
-0,
-box_width_,
-box_width_ / 3,
-24,
-_("Width"),
-UI::DropdownType::kTextual,
-UI::PanelStyle::kWui),
- height_(&box_,
- 0,
- 0,
- box_width_,
- box_width_ / 3,
- 24,
- _("Height"),
- UI::DropdownType::kTextual,
- UI::PanelStyle::kWui),
+ map_size_box_(box_, "new_map_menu", 4, parent.egbase().map().get_width(), parent.egbase().map().get_height()),
list_(&box_, 0, 0, box_width_, 330, UI::PanelStyle::kWui),
// Buttons
button_box_(&box_, 0, 0, UI::Box::Horizontal, 0, 0, margin_),
@@ -84,18 +67,8 @@
UI::ButtonStyle::kWuiSecondary,
_("Cancel")) {
- for (const int32_t& i : Widelands::kMapDimensions) {
- width_.add(std::to_string(i), i);
- height_.add(std::to_string(i), i);
- }
- width_.select(parent.egbase().map().get_width());
- height_.select(parent.egbase().map().get_height());
- width_.set_max_items(12);
- height_.set_max_items(12);
-
box_.set_size(100, 20); // Prevent assert failures
- box_.add(&width_);
- box_.add(&height_);
+ box_.add(&map_size_box_, UI::Box::Resizing::kExpandBoth);
box_.add_space(margin_);
UI::Textarea* terrain_label = new UI::Textarea(&box_, _("Terrain:"));
box_.add(terrain_label);
@@ -113,9 +86,7 @@
}
box_.add(&button_box_);
- box_.set_size(box_width_, width_.get_h() + height_.get_h() + terrain_label->get_h() +
- list_.get_h() + button_box_.get_h() + 9 * margin_);
- set_size(get_w(), box_.get_h() + 2 * mar
