MapEditor: Add toolbar menu to view menu

Closes #1155.
OpenOrienteering · Oct 31, 2018 · aef7460 · aef7460
1 parent f166bc1
commit aef7460
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/gui/map/map_editor.cpp b/src/gui/map/map_editor.cpp
@@ -1082,6 +1082,7 @@ void MapEditorController::createMenuAndToolbars()
 	view_menu->addSeparator();
 	view_menu->addAction(fullscreen_act);
 	view_menu->addSeparator();
+	toolbars_menu = view_menu->addMenu(tr("Toolbars"));
 	view_menu->addAction(tags_window_act);
 	view_menu->addAction(color_window_act);
 	view_menu->addAction(symbol_window_act);
@@ -1270,6 +1271,13 @@ void MapEditorController::createMenuAndToolbars()
 	toolbar_advanced_editing->addAction(boolean_xor_act);
 	toolbar_advanced_editing->addAction(boolean_merge_holes_act);
 
+	toolbars_menu->addAction(main_toolbar->toggleViewAction());
+	toolbars_menu->addAction(toolbar_view->toggleViewAction());
+	toolbars_menu->addAction(toolbar_mapparts->toggleViewAction());
+	toolbars_menu->addAction(toolbar_drawing->toggleViewAction());
+	toolbars_menu->addAction(toolbar_editing->toggleViewAction());
+	toolbars_menu->addAction(toolbar_advanced_editing->toggleViewAction());
+
 	QWidget* context_menu = map_widget->getContextMenu();
 	context_menu->addAction(edit_tool_act);
 	context_menu->addAction(draw_point_act);

diff --git a/src/gui/map/map_editor.h b/src/gui/map/map_editor.h
@@ -661,6 +661,8 @@ protected slots:
 	QAction* geographic_coordinates_act;
 	QAction* geographic_coordinates_dms_act;
 
+	QMenu* toolbars_menu = nullptr;
+
 	QAction* scale_all_symbols_act;
 	QAction* georeferencing_act;
 	QAction* scale_map_act;