diff --git a/core/core.cpp b/core/core.cpp index 4a243f1e0..2f82b70b6 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -323,16 +323,6 @@ namespace horizon { } return ToolResponse(); } - - const std::string Core::get_tool_name() { - if(tool) { - return tool->name; - } - return "None"; - } - - - Junction *Core::insert_junction(const UUID &uu, bool work) { auto map = get_junction_map(work); diff --git a/core/core.hpp b/core/core.hpp index aaf3d1e56..01c5105d0 100644 --- a/core/core.hpp +++ b/core/core.hpp @@ -111,7 +111,6 @@ namespace horizon { virtual bool is_specific() {return false;} virtual ~ToolBase() {} - std::string name; protected : Cores core; @@ -140,7 +139,6 @@ namespace horizon { */ class Core :public sigc::trackable { public : - const std::string get_tool_name(); virtual bool has_object_type(ObjectType ty) {return false;} virtual class Junction *insert_junction(const UUID &uu, bool work = true); diff --git a/core/tool_add_part.cpp b/core/tool_add_part.cpp index 9dcc221b0..99e737689 100644 --- a/core/tool_add_part.cpp +++ b/core/tool_add_part.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolAddPart::ToolAddPart(Core *c, ToolID tid): ToolBase(c, tid), ToolHelperMapSymbol(c, tid), ToolHelperMove(c, tid) { - name = "Add Part"; } bool ToolAddPart::can_begin() { diff --git a/core/tool_add_vertex.cpp b/core/tool_add_vertex.cpp index 298af332a..13b67a14c 100644 --- a/core/tool_add_vertex.cpp +++ b/core/tool_add_vertex.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolAddVertex::ToolAddVertex(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Add vertex"; } bool ToolAddVertex::can_begin() { diff --git a/core/tool_assign_part.cpp b/core/tool_assign_part.cpp index 290e67c6a..b540bc7fe 100644 --- a/core/tool_assign_part.cpp +++ b/core/tool_assign_part.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolAssignPart::ToolAssignPart(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Assign part"; } bool ToolAssignPart::can_begin() { diff --git a/core/tool_bend_line_net.cpp b/core/tool_bend_line_net.cpp index 4c817bc7c..f364d526e 100644 --- a/core/tool_bend_line_net.cpp +++ b/core/tool_bend_line_net.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolBendLineNet::ToolBendLineNet(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Bend net line"; } bool ToolBendLineNet::can_begin() { diff --git a/core/tool_drag_keep_slope.cpp b/core/tool_drag_keep_slope.cpp index 2e695c4b3..44c987d65 100644 --- a/core/tool_drag_keep_slope.cpp +++ b/core/tool_drag_keep_slope.cpp @@ -5,7 +5,6 @@ namespace horizon { ToolDragKeepSlope::ToolDragKeepSlope(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Drag keeping slope"; } bool ToolDragKeepSlope::can_begin() { diff --git a/core/tool_draw_arc.cpp b/core/tool_draw_arc.cpp index 728b98ffc..3099121b0 100644 --- a/core/tool_draw_arc.cpp +++ b/core/tool_draw_arc.cpp @@ -5,7 +5,6 @@ namespace horizon { ToolDrawArc::ToolDrawArc(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Draw Arc"; } bool ToolDrawArc::can_begin() { diff --git a/core/tool_draw_dimension.cpp b/core/tool_draw_dimension.cpp index d94bec351..74029c320 100644 --- a/core/tool_draw_dimension.cpp +++ b/core/tool_draw_dimension.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolDrawDimension::ToolDrawDimension(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Draw Dim"; } bool ToolDrawDimension::can_begin() { diff --git a/core/tool_draw_line.cpp b/core/tool_draw_line.cpp index 35fb0dd3e..3efb43c2e 100644 --- a/core/tool_draw_line.cpp +++ b/core/tool_draw_line.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolDrawLine::ToolDrawLine(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Draw Line"; } bool ToolDrawLine::can_begin() { diff --git a/core/tool_draw_line_net.cpp b/core/tool_draw_line_net.cpp index 1b1dd0538..3c90b092a 100644 --- a/core/tool_draw_line_net.cpp +++ b/core/tool_draw_line_net.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolDrawLineNet::ToolDrawLineNet(Core *c, ToolID tid):ToolBase(c, tid), ToolHelperMerge(c, tid) { - name = "Draw Net Line"; } bool ToolDrawLineNet::can_begin() { diff --git a/core/tool_draw_line_rectangle.cpp b/core/tool_draw_line_rectangle.cpp index e0daf41e6..cd4186041 100644 --- a/core/tool_draw_line_rectangle.cpp +++ b/core/tool_draw_line_rectangle.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolDrawLineRectangle::ToolDrawLineRectangle(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Draw Line rect"; } bool ToolDrawLineRectangle::can_begin() { diff --git a/core/tool_draw_polygon.cpp b/core/tool_draw_polygon.cpp index 9cd000473..b63fec62f 100644 --- a/core/tool_draw_polygon.cpp +++ b/core/tool_draw_polygon.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolDrawPolygon::ToolDrawPolygon(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Draw Polygon"; } bool ToolDrawPolygon::can_begin() { diff --git a/core/tool_draw_polygon_rectangle.cpp b/core/tool_draw_polygon_rectangle.cpp index 6f7f97bd0..888353064 100644 --- a/core/tool_draw_polygon_rectangle.cpp +++ b/core/tool_draw_polygon_rectangle.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolDrawPolygonRectangle::ToolDrawPolygonRectangle(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Draw Polygon rect"; } bool ToolDrawPolygonRectangle::can_begin() { diff --git a/core/tool_draw_track.cpp b/core/tool_draw_track.cpp index 16356f11d..7ab802612 100644 --- a/core/tool_draw_track.cpp +++ b/core/tool_draw_track.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolDrawTrack::ToolDrawTrack(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Draw Track"; } bool ToolDrawTrack::can_begin() { diff --git a/core/tool_edit_board_hole.cpp b/core/tool_edit_board_hole.cpp index e355fe0ce..bd5f60282 100644 --- a/core/tool_edit_board_hole.cpp +++ b/core/tool_edit_board_hole.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolEditBoardHole::ToolEditBoardHole(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Edit pad brd hole"; } bool ToolEditBoardHole::can_begin() { diff --git a/core/tool_edit_line_rectangle.cpp b/core/tool_edit_line_rectangle.cpp index d80f6a960..494dba2c8 100644 --- a/core/tool_edit_line_rectangle.cpp +++ b/core/tool_edit_line_rectangle.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolEditLineRectangle::ToolEditLineRectangle(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Edit Line rect"; } bool ToolEditLineRectangle::can_begin() { diff --git a/core/tool_edit_pad_parameter_set.cpp b/core/tool_edit_pad_parameter_set.cpp index 9ce4cc435..a9c7caeb2 100644 --- a/core/tool_edit_pad_parameter_set.cpp +++ b/core/tool_edit_pad_parameter_set.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolEditPadParameterSet::ToolEditPadParameterSet(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Edit pad parameter set"; } bool ToolEditPadParameterSet::can_begin() { diff --git a/core/tool_edit_parameter_program.cpp b/core/tool_edit_parameter_program.cpp index c40c6b18a..19e1996b2 100644 --- a/core/tool_edit_parameter_program.cpp +++ b/core/tool_edit_parameter_program.cpp @@ -5,7 +5,6 @@ namespace horizon { ToolEditParameterProgram::ToolEditParameterProgram(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Edit param program"; } bool ToolEditParameterProgram::can_begin() { diff --git a/core/tool_edit_plane.cpp b/core/tool_edit_plane.cpp index 0366bd111..b81860552 100644 --- a/core/tool_edit_plane.cpp +++ b/core/tool_edit_plane.cpp @@ -8,7 +8,6 @@ namespace horizon { ToolEditPlane::ToolEditPlane(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Edit plane"; } Polygon *ToolEditPlane::get_poly() { diff --git a/core/tool_edit_shape.cpp b/core/tool_edit_shape.cpp index e28b455da..98bc81c1e 100644 --- a/core/tool_edit_shape.cpp +++ b/core/tool_edit_shape.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolEditShape::ToolEditShape(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Edit shape"; } bool ToolEditShape::can_begin() { diff --git a/core/tool_edit_symbol_pin_names.cpp b/core/tool_edit_symbol_pin_names.cpp index ccdbf4dfa..3003e0ee2 100644 --- a/core/tool_edit_symbol_pin_names.cpp +++ b/core/tool_edit_symbol_pin_names.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolEditSymbolPinNames::ToolEditSymbolPinNames(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Edit symbol pin names"; } SchematicSymbol *ToolEditSymbolPinNames::get_symbol() { diff --git a/core/tool_edit_via.cpp b/core/tool_edit_via.cpp index 358acad93..9d800635c 100644 --- a/core/tool_edit_via.cpp +++ b/core/tool_edit_via.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolEditVia::ToolEditVia(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Edit via"; } bool ToolEditVia::can_begin() { diff --git a/core/tool_enter_datum.cpp b/core/tool_enter_datum.cpp index cc2a434a4..f15f38baf 100644 --- a/core/tool_enter_datum.cpp +++ b/core/tool_enter_datum.cpp @@ -11,7 +11,6 @@ namespace horizon { ToolEnterDatum::ToolEnterDatum(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Enter Datum"; } diff --git a/core/tool_lock.cpp b/core/tool_lock.cpp index 4f5a179a4..c9a8f953a 100644 --- a/core/tool_lock.cpp +++ b/core/tool_lock.cpp @@ -5,7 +5,6 @@ namespace horizon { ToolLock::ToolLock(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Lock"; } std::set ToolLock::get_vias(bool locked) { diff --git a/core/tool_manage_buses.cpp b/core/tool_manage_buses.cpp index b7b7e19b4..ea2243bf6 100644 --- a/core/tool_manage_buses.cpp +++ b/core/tool_manage_buses.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolManageBuses::ToolManageBuses(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Bus Manager"; } bool ToolManageBuses::can_begin() { diff --git a/core/tool_map_package.cpp b/core/tool_map_package.cpp index bf8f561b9..3fce54ee7 100644 --- a/core/tool_map_package.cpp +++ b/core/tool_map_package.cpp @@ -5,7 +5,6 @@ namespace horizon { ToolMapPackage::ToolMapPackage(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Map Pkg"; } bool ToolMapPackage::can_begin() { diff --git a/core/tool_map_pin.cpp b/core/tool_map_pin.cpp index 15372a97d..356069dee 100644 --- a/core/tool_map_pin.cpp +++ b/core/tool_map_pin.cpp @@ -9,7 +9,6 @@ namespace horizon { ToolMapPin::ToolMapPin(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Map Pin"; } bool ToolMapPin::can_begin() { diff --git a/core/tool_map_symbol.cpp b/core/tool_map_symbol.cpp index 0165c3551..94cd9be26 100644 --- a/core/tool_map_symbol.cpp +++ b/core/tool_map_symbol.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolMapSymbol::ToolMapSymbol(Core *c, ToolID tid): ToolBase(c, tid), ToolHelperMapSymbol(c, tid), ToolHelperMove(c, tid) { - name = "Map Symbol"; } bool ToolMapSymbol::can_begin() { diff --git a/core/tool_move.cpp b/core/tool_move.cpp index 1570a73c7..8bcb8c6a1 100644 --- a/core/tool_move.cpp +++ b/core/tool_move.cpp @@ -12,7 +12,6 @@ namespace horizon { ToolMove::ToolMove(Core *c, ToolID tid): ToolBase(c, tid), ToolHelperMove(c, tid), ToolHelperMerge(c, tid) { - name = "Move"; } void ToolMove::expand_selection() { diff --git a/core/tool_move_net_segment.cpp b/core/tool_move_net_segment.cpp index faa65abf5..68ff9217d 100644 --- a/core/tool_move_net_segment.cpp +++ b/core/tool_move_net_segment.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolMoveNetSegment::ToolMoveNetSegment(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Move net segment"; } bool ToolMoveNetSegment::can_begin() { diff --git a/core/tool_paste.cpp b/core/tool_paste.cpp index 447679516..48f7a7ef9 100644 --- a/core/tool_paste.cpp +++ b/core/tool_paste.cpp @@ -9,7 +9,6 @@ namespace horizon { ToolPaste::ToolPaste(Core *c, ToolID tid): ToolBase(c, tid), ToolHelperMove(c, tid), ToolHelperMerge(c, tid) { - name = "Paste"; } class JunctionProvider: public ObjectProvider { diff --git a/core/tool_place_board_hole.cpp b/core/tool_place_board_hole.cpp index 87439e8b5..f36194f6c 100644 --- a/core/tool_place_board_hole.cpp +++ b/core/tool_place_board_hole.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolPlaceBoardHole::ToolPlaceBoardHole(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Place board hole"; } bool ToolPlaceBoardHole::can_begin() { diff --git a/core/tool_place_bus_label.cpp b/core/tool_place_bus_label.cpp index 93fbc8e8d..fd72000c3 100644 --- a/core/tool_place_bus_label.cpp +++ b/core/tool_place_bus_label.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolPlaceBusLabel::ToolPlaceBusLabel(Core *c, ToolID tid):ToolPlaceJunction(c, tid) { - name = "Place bus label"; } bool ToolPlaceBusLabel::can_begin() { diff --git a/core/tool_place_bus_ripper.cpp b/core/tool_place_bus_ripper.cpp index 16fc40943..4efb82390 100644 --- a/core/tool_place_bus_ripper.cpp +++ b/core/tool_place_bus_ripper.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolPlaceBusRipper::ToolPlaceBusRipper(Core *c, ToolID tid): ToolPlaceJunction(c, tid) { - name = "Place Bus Ripper"; } bool ToolPlaceBusRipper::can_begin() { diff --git a/core/tool_place_hole.cpp b/core/tool_place_hole.cpp index d046060a6..ed1b5f178 100644 --- a/core/tool_place_hole.cpp +++ b/core/tool_place_hole.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolPlaceHole::ToolPlaceHole(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Place Hole"; } bool ToolPlaceHole::can_begin() { diff --git a/core/tool_place_junction.cpp b/core/tool_place_junction.cpp index 3b23cf0c7..ebbeea48e 100644 --- a/core/tool_place_junction.cpp +++ b/core/tool_place_junction.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolPlaceJunction::ToolPlaceJunction(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Place Junction"; } bool ToolPlaceJunction::can_begin() { diff --git a/core/tool_place_net_label.cpp b/core/tool_place_net_label.cpp index 7b6550243..c88b9eb47 100644 --- a/core/tool_place_net_label.cpp +++ b/core/tool_place_net_label.cpp @@ -7,7 +7,6 @@ namespace horizon { ToolPlaceNetLabel::ToolPlaceNetLabel(Core *c, ToolID tid):ToolPlaceJunction(c, tid) { - name = "Place Net label"; } bool ToolPlaceNetLabel::can_begin() { diff --git a/core/tool_place_pad.cpp b/core/tool_place_pad.cpp index eda9eedb9..c5b44d48d 100644 --- a/core/tool_place_pad.cpp +++ b/core/tool_place_pad.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolPlacePad::ToolPlacePad(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Place pad"; } bool ToolPlacePad::can_begin() { diff --git a/core/tool_place_power_symbol.cpp b/core/tool_place_power_symbol.cpp index 69e4a2e48..bfbef9c48 100644 --- a/core/tool_place_power_symbol.cpp +++ b/core/tool_place_power_symbol.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolPlacePowerSymbol::ToolPlacePowerSymbol(Core *c, ToolID tid): ToolPlaceJunction(c, tid) { - name = "Place Power Symbol"; } bool ToolPlacePowerSymbol::can_begin() { diff --git a/core/tool_place_shape.cpp b/core/tool_place_shape.cpp index 263b3d341..4ea021d9f 100644 --- a/core/tool_place_shape.cpp +++ b/core/tool_place_shape.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolPlaceShape::ToolPlaceShape(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Place Shape"; } bool ToolPlaceShape::can_begin() { diff --git a/core/tool_place_text.cpp b/core/tool_place_text.cpp index a660b8d54..6014c4bf4 100644 --- a/core/tool_place_text.cpp +++ b/core/tool_place_text.cpp @@ -5,7 +5,6 @@ namespace horizon { ToolPlaceText::ToolPlaceText(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Place Text"; } bool ToolPlaceText::can_begin() { diff --git a/core/tool_place_via.cpp b/core/tool_place_via.cpp index f79155c47..a5c7ac795 100644 --- a/core/tool_place_via.cpp +++ b/core/tool_place_via.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolPlaceVia::ToolPlaceVia(Core *c, ToolID tid): ToolPlaceJunction(c, tid) { - name = "Place Via"; } bool ToolPlaceVia::can_begin() { diff --git a/core/tool_rotate_arbitrary.cpp b/core/tool_rotate_arbitrary.cpp index d35aea0ed..51db4ee9c 100644 --- a/core/tool_rotate_arbitrary.cpp +++ b/core/tool_rotate_arbitrary.cpp @@ -13,7 +13,6 @@ namespace horizon { ToolRotateArbitrary::ToolRotateArbitrary(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Move"; } void ToolRotateArbitrary::expand_selection() { diff --git a/core/tool_route_track.cpp b/core/tool_route_track.cpp index b7cf55298..3ef69db68 100644 --- a/core/tool_route_track.cpp +++ b/core/tool_route_track.cpp @@ -8,7 +8,6 @@ namespace horizon { ToolRouteTrack::ToolRouteTrack(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Route Track"; } bool ToolRouteTrack::can_begin() { diff --git a/core/tool_route_track_interactive.cpp b/core/tool_route_track_interactive.cpp index c06a088df..11b173423 100644 --- a/core/tool_route_track_interactive.cpp +++ b/core/tool_route_track_interactive.cpp @@ -33,7 +33,6 @@ namespace horizon { }; ToolRouteTrackInteractive::ToolRouteTrackInteractive(Core *c, ToolID tid):ToolBase(c, tid) { - name = "Route Track interactive"; } bool ToolRouteTrackInteractive::can_begin() { diff --git a/core/tool_select_more.cpp b/core/tool_select_more.cpp index ed471e10e..c4ba7255b 100644 --- a/core/tool_select_more.cpp +++ b/core/tool_select_more.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolSelectMore::ToolSelectMore(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Select more"; } bool ToolSelectMore::can_begin() { diff --git a/core/tool_set_diffpair.cpp b/core/tool_set_diffpair.cpp index 7bde6bc66..c24ba50af 100644 --- a/core/tool_set_diffpair.cpp +++ b/core/tool_set_diffpair.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolSetDiffpair::ToolSetDiffpair(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Set diffpair"; } std::pair ToolSetDiffpair::get_net() { diff --git a/core/tool_set_via_net.cpp b/core/tool_set_via_net.cpp index aa40cbf71..878c8a161 100644 --- a/core/tool_set_via_net.cpp +++ b/core/tool_set_via_net.cpp @@ -6,7 +6,6 @@ namespace horizon { ToolSetViaNet::ToolSetViaNet(Core *c, ToolID tid): ToolBase(c, tid) { - name = "Set via net"; } std::set ToolSetViaNet::get_vias() { diff --git a/imp/imp.cpp b/imp/imp.cpp index 12646fbf9..e58dcb9a3 100644 --- a/imp/imp.cpp +++ b/imp/imp.cpp @@ -287,7 +287,6 @@ namespace horizon { args.selection = canvas->get_selection(); args.work_layer = canvas->property_work_layer(); ToolResponse r= core.r->tool_begin(tool_id, args, imp_interface.get()); - main_window->active_tool_label->set_text("Active tool: "+core.r->get_tool_name()); tool_process(r); }); @@ -377,7 +376,6 @@ namespace horizon { args.selection = canvas->get_selection(); args.work_layer = canvas->property_work_layer(); ToolResponse r= core.r->tool_begin(id, args, imp_interface.get()); - main_window->active_tool_label->set_text("Active tool: "+core.r->get_tool_name()); tool_process(r); } @@ -769,7 +767,6 @@ namespace horizon { args.coords = canvas->get_cursor_pos(); args.keep_selection = true; ToolResponse r = core.r->tool_begin(resp.next_tool, args, imp_interface.get()); - main_window->active_tool_label->set_text("Active tool: "+core.r->get_tool_name()); tool_process(r); } } diff --git a/imp/imp_board.cpp b/imp/imp_board.cpp index 63c97054f..d6e2d7b1b 100644 --- a/imp/imp_board.cpp +++ b/imp/imp_board.cpp @@ -127,7 +127,6 @@ namespace horizon { args.selection = components; args.work_layer = canvas->property_work_layer(); ToolResponse r= core.r->tool_begin(ToolID::MAP_PACKAGE, args, imp_interface.get()); - main_window->active_tool_label->set_text("Active tool: "+core.r->get_tool_name()); tool_process(r); } }