Mercurial > octave

diff libgui/graphics/Figure.h @ 26869:992f55ef87f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 278ae90567a7
children cb5c1ea2062c
line wrap: on
line diff
--- a/libgui/graphics/Figure.h	Thu Mar 07 15:11:17 2019 -0800
+++ b/libgui/graphics/Figure.h	Thu Mar 07 22:53:33 2019 +0100
@@ -39,15 +39,13 @@
 
   enum MouseMode
   {
-    // NOTE: These values must match the order of the buttons in the
-    // MouseModeActionGroup object.
-
-    NoMode      = 0,
-    RotateMode  = 1,
-    ZoomInMode  = 2,
-    ZoomOutMode = 3,
-    PanMode     = 4,
-    TextMode    = 5
+    NoMode,
+    RotateMode,
+    ZoomInMode,
+    ZoomOutMode,
+    PanMode,
+    SelectMode,
+    TextMode
   };
 
   class Container;
@@ -55,8 +53,6 @@
   class MenuBar;
   class ToolBar;
 
-  class MouseModeActionGroup;
-
   class Figure :
   public Object,
   public MenuContainer,
@@ -101,22 +97,16 @@
     void beingDeleted (void);
 
   private:
-    void createFigureToolBarAndMenuBar (void);
     void showFigureToolBar (bool visible);
-    void addCustomToolBar (QToolBar *bar, bool visible);
+    void addCustomToolBar (QToolBar *bar, bool visible, bool isdefault);
     void showCustomToolBar (QToolBar *bar, bool visible);
-    void updateFigureToolBarAndMenuBar (void);
     void set_geometry (QRect r);
 
     void enableMouseTracking (void);
 
   private slots:
-    void setMouseMode (MouseMode mode);
     void updateFigureHeight (int delta_h);
     void updateContainer (void);
-    void toggleAxes (void);
-    void toggleGrid (void);
-    void autoAxes (void);
     void figureWindowShown ();
     void screenChanged (QScreen*);
 
@@ -134,7 +124,6 @@
     QStatusBar *m_statusBar;
     QRect m_innerRect;
     QRect m_outerRect;
-    MouseModeActionGroup *m_mouseModeGroup;
     int m_previousHeight;
     bool m_resizable;
   };