diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-24 23:04:01 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-24 23:04:01 +0000 |
| commit | d2aa9ac6d7039622809050e1cc43c67ec30f7775 (patch) | |
| tree | 586ef83378d19950edd38f9d6d624742fb65e11a | |
| parent | Modal should not be active for live-preview (reverse modal) (diff) | |
| download | inkscape-d2aa9ac6d7039622809050e1cc43c67ec30f7775.tar.gz inkscape-d2aa9ac6d7039622809050e1cc43c67ec30f7775.zip | |
SelectToolbar: cleanup unused
| -rw-r--r-- | share/ui/select-toolbar.ui | 29 | ||||
| -rw-r--r-- | src/ui/toolbar/select-toolbar.cpp | 20 | ||||
| -rw-r--r-- | src/ui/toolbar/select-toolbar.h | 3 |
3 files changed, 3 insertions, 49 deletions
diff --git a/share/ui/select-toolbar.ui b/share/ui/select-toolbar.ui index f62cd705e..1c8c1efc3 100644 --- a/share/ui/select-toolbar.ui +++ b/share/ui/select-toolbar.ui @@ -1,33 +1,4 @@ <ui> -<!-- - <toolbar name='SelectToolbar'> - <toolitem action='EditSelectAll' /> - <toolitem action='EditSelectAllInAllLayers' /> - <toolitem action='EditDeselect' /> - <separator /> - <toolitem action='ObjectRotate90CCW' /> - <toolitem action='ObjectRotate90' /> - <toolitem action='ObjectFlipHorizontally' /> - <toolitem action='ObjectFlipVertically' /> - <separator /> - <toolitem action='SelectionToBack' /> - <toolitem action='SelectionLower' /> - <toolitem action='SelectionRaise' /> - <toolitem action='SelectionToFront' /> - <separator /> - <toolitem action='XAction' /> - <toolitem action='YAction' /> - <toolitem action='WidthAction' /> - <toolitem action='LockAction' /> - <toolitem action='HeightAction' /> - <toolitem action='UnitsAction' /> - <separator /> - <toolitem action='transform_stroke' /> - <toolitem action='transform_corners' /> - <toolitem action='transform_gradient' /> - <toolitem action='transform_pattern' /> - </toolbar> ---> <toolbar name='NodeToolbar'> <separator /> <toolitem action='NodeInsertAction'> diff --git a/src/ui/toolbar/select-toolbar.cpp b/src/ui/toolbar/select-toolbar.cpp index 764280b18..8d6805487 100644 --- a/src/ui/toolbar/select-toolbar.cpp +++ b/src/ui/toolbar/select-toolbar.cpp @@ -13,14 +13,15 @@ * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ +#include "select-toolbar.h" + #include <glibmm/i18n.h> +#include <gtkmm/adjustment.h> #include <gtkmm/separatortoolitem.h> #include <2geom/rect.h> -#include "select-toolbar.h" - #include "desktop.h" #include "document-undo.h" #include "document.h" @@ -31,19 +32,14 @@ #include "display/sp-canvas.h" -#include "helper/action-context.h" -#include "helper/action.h" - #include "object/sp-item-transform.h" #include "object/sp-namedview.h" #include "ui/icon-names.h" #include "ui/widget/ink-select-one-action.h" -#include "ui/widget/spinbutton.h" #include "ui/widget/spin-button-tool-item.h" #include "ui/widget/unit-tracker.h" -#include "widgets/ege-adjustment-action.h" #include "widgets/widget-sizes.h" using Inkscape::UI::Widget::UnitTracker; @@ -52,16 +48,6 @@ using Inkscape::Util::Quantity; using Inkscape::DocumentUndo; using Inkscape::Util::unit_table; - - -static void trigger_sp_action( GtkAction* /*act*/, gpointer user_data ) -{ - SPAction* targetAction = SP_ACTION(user_data); - if ( targetAction ) { - sp_action_perform( targetAction, nullptr ); - } -} - namespace Inkscape { namespace UI { namespace Toolbar { diff --git a/src/ui/toolbar/select-toolbar.h b/src/ui/toolbar/select-toolbar.h index f233b62c8..79c3310b8 100644 --- a/src/ui/toolbar/select-toolbar.h +++ b/src/ui/toolbar/select-toolbar.h @@ -19,8 +19,6 @@ class SPDesktop; -typedef struct _GtkActionGroup GtkActionGroup; - namespace Inkscape { class Selection; @@ -46,7 +44,6 @@ private: Gtk::ToggleToolButton *_transform_gradient_btn; Gtk::ToggleToolButton *_transform_pattern_btn; - GtkActionGroup *_selection_actions; std::vector<Gtk::ToolItem *> _context_items; bool _update; |
