Merge remote-tracking branch 'falconne/develop' into develop

NEWS

@@ -27,6 +27,13 @@ DFHack future
     - digfort: improved csv parsing, add start() comment handling
     - exterminate: allow specifying a caste (exterminate gob:male)
     - createitem: in adventure mode it now defaults to the controlled unit as maker.
+    - autotrade: adds "(Un)mark All" options to both panes of trade screen.
+    - mousequery: several usability improvements.
+    - mousequery: show live overlay (in menu area) of what's on the tile under the mouse cursor.
+    - search: workshop profile search added.
+    - dwarfmonitor: add screen to summarise preferences of fortress dwarfs.
+    - getplants: add autochop function to automate woodcutting.
+    - stocks: added more filtering and display options.
 
   Siege engine plugin:
     - engine quality and distance to target now affect accuracy

Readme.rst

@@ -1938,6 +1938,29 @@ another savegame you can use the command list_export:
      autobutcher.bat
 
 
+autochop
+---------
+Automatically manage tree cutting designation to keep available logs withing given
+quotas.
+
+Open the dashboard by running:
+::  
+
+     getplants autochop
+
+The plugin must be activated (with 'a') before it can be used. You can then set logging quotas
+and restrict designations to specific burrows (with 'Enter') if desired. The plugin's activity
+cycle runs once every in game day.
+
+If you add
+::
+
+      enable getplants
+      
+to your dfhack.init there will be a hotkey to open the dashboard from the chop designation
+menu.
+
+
 autolabor
 ---------
 Automatically manage dwarf labors.

plugins/automaterial.cpp

@@ -735,7 +735,7 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
             MaterialDescriptor material = get_material_in_list(ui_build_selector->sel_index);
             if (material.valid)
             {
-                if (input->count(interface_key::SELECT) || input->count(interface_key::SEC_SELECT))
+                if (input->count(interface_key::SELECT) || input->count(interface_key::SELECT_ALL))
                 {
                     if (get_last_moved_material().matches(material))
                         last_used_moved = false; //Keep selected material on top
@@ -749,7 +749,7 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
                         gen_material.push_back(get_material_in_list(curr_index));
                         box_select_materials.clear();
                         // Populate material list with selected material
-                        populate_box_materials(gen_material, ((input->count(interface_key::SEC_SELECT) && ui_build_selector->is_grouped) ? -1 : 1));
+                        populate_box_materials(gen_material, ((input->count(interface_key::SELECT_ALL) && ui_build_selector->is_grouped) ? -1 : 1));
 
                         input->clear(); // Let the apply_box_selection routine allocate the construction
                         input->insert(interface_key::LEAVESCREEN);
@@ -1162,6 +1162,15 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
 
                 case SELECT_SECOND:
                     OutputString(COLOR_GREEN, x, y, "Choose second corner", true, left_margin);
+
+                    int32_t curr_x, curr_y, curr_z;
+                    Gui::getCursorCoords(curr_x, curr_y, curr_z);
+                    int dX = abs(box_first.x - curr_x) + 1;
+                    int dY = abs(box_first.y - curr_y) + 1;
+                    stringstream label;
+                    label << "Selection: " << dX << "x" << dY;
+                    OutputString(COLOR_WHITE, x, ++y, label.str(), true, left_margin);
+
                     int cx = box_first.x;
                     int cy = box_first.y;
                     OutputString(COLOR_BROWN, cx, cy, "X");