diff libgui/graphics/ToolBar.cc @ 26869:992f55ef87f5

Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795) * Figure.[cc,h] (mouse_mode_to_string, mouse_mode_from_string): Remove functions. (createFigureToolBarAndMenuBar, updateFigureToolBarAndMenuBar): Remove methods. (Figure::Figure): Instantiate the menubar here. Simplify size handling now that the toolbar is created in addCustomToolBar. (Figure::addCustomToolBar): Add optional argument to signal if the toolbar is the default one. (Figure::autoAxes, Figrue::toggleGrid, Figure::toggleAxes): Remove methods. * GLCanvas.[cc,h] (GLCanvas::autoAxes, GLCanvas::toggleGrid, GLCanvas::toggleAxes): Ditto. * Canvas.[cc,h] (Canvas::canvasAutoAxes, Canvas::canvasToggleGrid, Canvas::canvasToggleAxes): Ditto. (Canvas::setCursor): Use resourse_manager to retrieve icons. * MouseModeActionGroup.[cc, h]: Remove unnecessary class file. * __add_default_menu__.m: Add default toobar and associated buttons. * libgui/graphics/qthandles.qrc: Remove file * libgui/graphics/images: Remove directory. * libgui/graphics/module.mk: Update to eliminate the Crystal icons resources. * libgui/src/resources.qrc: Include new figure-* png icons * libgui/src/module.mk: Include new figure-* png icons * libgui/src/icons/icons_license: Document the origin of figure-* icons
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Thu, 07 Mar 2019 22:53:33 +0100
parents 00f796120a6d
children 02500c701539
line wrap: on
line diff
--- a/libgui/graphics/ToolBar.cc	Thu Mar 07 15:11:17 2019 -0800
+++ b/libgui/graphics/ToolBar.cc	Thu Mar 07 22:53:33 2019 +0100
@@ -94,7 +94,8 @@
       dynamic_cast<Figure *> (Object::fromQObject (bar->parentWidget ()));
 
     if (m_figure)
-      m_figure->addCustomToolBar (bar, tp.is_visible ());
+      m_figure->addCustomToolBar (bar, tp.is_visible (),
+                                  tp.get_tag () == "__default_toolbar__");
 
     bar->installEventFilter (this);
   }