From 3450fa0bd2609f60fd244725fc02aee7aef771b3 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Wed, 18 Jul 2018 15:05:54 +0200 Subject: [PATCH 1/7] Refactor to unify all render icon code --- .../hicolor/scalable/actions/swatches.svg | 38 +- src/helper/CMakeLists.txt | 2 + src/helper/action.cpp | 6 +- src/helper/icon-loader.cpp | 129 ++++ src/helper/icon-loader.h | 25 + src/live_effects/parameter/item.cpp | 9 +- src/live_effects/parameter/originalitem.cpp | 7 +- .../parameter/originalitemarray.cpp | 19 +- .../parameter/originalpatharray.cpp | 14 +- src/live_effects/parameter/path.cpp | 22 +- src/live_effects/parameter/togglebutton.cpp | 23 +- src/svg-view-slideshow.cpp | 15 +- src/ui/dialog/align-and-distribute.cpp | 3 +- src/ui/dialog/clonetiler.cpp | 25 +- src/ui/dialog/cssdialog.cpp | 3 +- src/ui/dialog/document-properties.cpp | 6 +- src/ui/dialog/fill-and-stroke.cpp | 4 +- src/ui/dialog/layers.cpp | 12 +- src/ui/dialog/livepatheffect-editor.cpp | 3 +- src/ui/dialog/objects.cpp | 9 +- src/ui/dialog/ocaldialogs.cpp | 12 +- src/ui/dialog/styledialog.cpp | 4 +- src/ui/dialog/symbols.cpp | 40 +- src/ui/dialog/tags.cpp | 16 +- src/ui/dialog/transformation.cpp | 7 +- src/ui/dialog/undo-history.cpp | 11 +- src/ui/dialog/xml-tree.cpp | 29 +- src/ui/interface.cpp | 1 + src/ui/widget/addtoicon.cpp | 16 +- src/ui/widget/addtoicon.h | 1 - src/ui/widget/alignment-selector.cpp | 4 +- src/ui/widget/anchor-selector.cpp | 7 +- src/ui/widget/clipmaskicon.cpp | 18 +- src/ui/widget/color-notebook.cpp | 10 +- src/ui/widget/dock-item.cpp | 17 +- src/ui/widget/imagetoggler.cpp | 19 +- src/ui/widget/insertordericon.cpp | 16 +- src/ui/widget/labelled.cpp | 5 +- src/ui/widget/layer-selector.cpp | 9 +- src/ui/widget/layertypeicon.cpp | 17 +- src/ui/widget/preferences-widget.cpp | 5 +- src/ui/widget/random.cpp | 5 +- src/verbs.cpp | 634 +++++++++--------- src/widgets/button.cpp | 7 +- src/widgets/ege-adjustment-action.cpp | 6 +- src/widgets/gradient-selector.cpp | 3 +- src/widgets/ink-action.cpp | 5 +- src/widgets/ink-radio-action.cpp | 8 +- src/widgets/ink-toggle-action.cpp | 21 +- src/widgets/paint-selector.cpp | 8 +- src/widgets/stroke-marker-selector.cpp | 4 +- src/widgets/stroke-style.cpp | 4 +- 52 files changed, 740 insertions(+), 603 deletions(-) create mode 100644 src/helper/icon-loader.cpp create mode 100644 src/helper/icon-loader.h diff --git a/share/icons/hicolor/scalable/actions/swatches.svg b/share/icons/hicolor/scalable/actions/swatches.svg index da80b32d7e2..30e426bdcf2 100644 --- a/share/icons/hicolor/scalable/actions/swatches.svg +++ b/share/icons/hicolor/scalable/actions/swatches.svg @@ -28,25 +28,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index bcd9f7c58a8..7b6b548b9f2 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -17,6 +17,7 @@ set(helper_SRC geom-pathvectorsatellites.cpp geom-satellite.cpp gettext.cpp + icon-loader.cpp pixbuf-ops.cpp png-write.cpp stock-items.cpp @@ -38,6 +39,7 @@ set(helper_SRC geom-satellite.h geom.h gettext.h + icon-loader.h mathfns.h pixbuf-ops.h png-write.h diff --git a/src/helper/action.cpp b/src/helper/action.cpp index 6e44487f96e..6d14037f08f 100644 --- a/src/helper/action.cpp +++ b/src/helper/action.cpp @@ -10,6 +10,7 @@ */ #include "helper/action.h" +#include "helper/icon-loader.h" #include @@ -236,8 +237,9 @@ SPAction::create_toolbutton_for_verb(unsigned int verb_code, auto icon_name = verb->get_image(); // Create a button with the required display properties - auto button = Gtk::manage(new Gtk::ToolButton(verb->get_name())); - button->set_icon_name(icon_name); + auto button = Gtk::manage(new Gtk::ToolButton(verb->get_tip())); + auto icon_widget = sp_get_icon_image(icon_name, "/toolbox/small"); + button->set_icon_widget(*icon_widget); button->set_tooltip_text(verb->get_tip()); // Hook up signal handler diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp new file mode 100644 index 00000000000..f7133ecef23 --- /dev/null +++ b/src/helper/icon-loader.cpp @@ -0,0 +1,129 @@ +/* + * Icon Loader + * + * Icon Loader management code + * + * Authors: + * Jabiertxo Arraiza + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "icon-loader.h" +#include "inkscape.h" +#include "io/resource.h" +#include "preferences.h" +#include "svg/svg-color.h" +#include "widgets/toolbox.h" +#include +#include + +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) +{ + using namespace Inkscape::IO::Resource; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if (prefs->getString("/theme/themeName") == "") { + prefs->setString("/theme/themeName", "hicolor"); + } + auto iconTheme = Gtk::IconTheme::create(); + iconTheme->set_custom_theme(prefs->getString("/theme/themeName")); + iconTheme->append_search_path(get_path_ustring(SYSTEM, ICONS)); + iconTheme->append_search_path(get_path_ustring(USER, ICONS)); +#ifdef INKSCAPE_THEMEDIR + iconTheme->append_search_path(get_path_ustring(SYSTEM, THEMES)); + iconTheme->append_search_path(get_path_ustring(USER, THEMES)); +#endif + Glib::RefPtr _icon_pixbuf; + try { + if (prefs->getBool("/theme/symbolicIcons", false)) { + gchar colornamed[64]; + sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); + Gdk::RGBA color; + color.set(colornamed); + Gtk::IconInfo iconinfo = + iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE); + if (bool(iconinfo)) { + // TODO: view if we need parametrice other colors + bool was_symbolic = false; + _icon_pixbuf = iconinfo.load_symbolic(color, color, color, color, was_symbolic); + } + else { + _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + } + } + else { + _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + } + } + catch (const Gtk::IconThemeError &e) { + std::cout << "Icon Loader: " << e.what() << std::endl; + } + return _icon_pixbuf; +} + +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size) +{ + int width, height; + Gtk::IconSize::lookup(Gtk::IconSize(icon_size), width, height); + return sp_get_icon_pixbuf(icon_name, width); +} + +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, GtkIconSize icon_size) +{ + gint width, height; + gtk_icon_size_lookup(icon_size, &width, &height); + return sp_get_icon_pixbuf(icon_name, width); +} + +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gchar const *prefs_size) +{ + // Load icon based in preference size defined allowed values are: + //"/toolbox/tools/small" Toolbox icon size + //"/toolbox/small" Control bar icon size + //"/toolbox/secondary" Secondary toolbar icon size + GtkIconSize icon_size = Inkscape::UI::ToolboxFactory::prefToSize(prefs_size); + return sp_get_icon_pixbuf(icon_name, icon_size); +} + +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gint size) +{ + auto icon = sp_get_icon_pixbuf(icon_name, size); + Gtk::Image *image = new Gtk::Image(icon); + return image; +} + +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size) +{ + auto icon = sp_get_icon_pixbuf(icon_name, icon_size); + Gtk::Image *image = new Gtk::Image(icon); + return image; +} + +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_size) +{ + auto icon = sp_get_icon_pixbuf(icon_name, icon_size); + Gtk::Image *image = new Gtk::Image(icon); + return image; +} + +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_size) +{ + auto icon = sp_get_icon_pixbuf(icon_name, prefs_size); + Gtk::Image *image = new Gtk::Image(icon); + return image; +} + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/helper/icon-loader.h b/src/helper/icon-loader.h new file mode 100644 index 00000000000..5b6af546f16 --- /dev/null +++ b/src/helper/icon-loader.h @@ -0,0 +1,25 @@ +#ifndef SEEN_INK_ICON_LOADER_H +#define SEEN_INK_ICON_LOADER_H + +/* + * Icon Loader + * + * + * Authors: + * Jabiertxo Arraiza + * + * + */ +#include +#include + +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size); +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size); +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, GtkIconSize icon_size); +Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gchar const *prefs_sice); +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gint size); +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_sice); +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_sice); +Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_sice); + +#endif // SEEN_INK_STOCK_ITEMS_H diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp index 8a8b1230737..5da934da62c 100644 --- a/src/live_effects/parameter/item.cpp +++ b/src/live_effects/parameter/item.cpp @@ -18,12 +18,12 @@ #include "live_effects/effect.h" #include "svg/svg.h" -#include "selection-chemistry.h" -#include "xml/repr.h" #include "desktop.h" +#include "helper/icon-loader.h" #include "inkscape.h" #include "message-stack.h" - +#include "selection-chemistry.h" +#include "xml/repr.h" // clipboard support #include "ui/clipboard.h" // required for linking to other paths @@ -118,8 +118,7 @@ Gtk::Widget * ItemParam::param_newWidget() { Gtk::HBox * _widget = Gtk::manage(new Gtk::HBox()); - Gtk::Image* pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name("edit-clone", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("edit-clone", Gtk::ICON_SIZE_BUTTON)); Gtk::Button * pButton = Gtk::manage(new Gtk::Button()); Gtk::Label* pLabel = Gtk::manage(new Gtk::Label(param_label)); static_cast(_widget)->pack_start(*pLabel, true, true); diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp index b415dd52a6b..c42db4ce904 100644 --- a/src/live_effects/parameter/originalitem.cpp +++ b/src/live_effects/parameter/originalitem.cpp @@ -24,6 +24,7 @@ #include "object/uri.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" namespace Inkscape { @@ -52,8 +53,7 @@ OriginalItemParam::param_newWidget() } { // Paste item to link button - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name("edit-paste", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("edit-paste", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -65,8 +65,7 @@ OriginalItemParam::param_newWidget() } { // Select original button - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name("edit-select-original", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("edit-select-original", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp index 23d9f96cd22..22193b2151c 100644 --- a/src/live_effects/parameter/originalitemarray.cpp +++ b/src/live_effects/parameter/originalitemarray.cpp @@ -18,11 +18,12 @@ #include +#include "helper/icon-loader.h" #include "inkscape.h" -#include "ui/clipboard.h" -#include "svg/svg.h" -#include "svg/stringstream.h" #include "originalitem.h" +#include "svg/stringstream.h" +#include "svg/svg.h" +#include "ui/clipboard.h" #include "object/uri.h" @@ -137,8 +138,7 @@ Gtk::Widget* OriginalItemArrayParam::param_newWidget() { // Paste item to link button - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name("edit-clone", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("edit-clone", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -150,8 +150,7 @@ Gtk::Widget* OriginalItemArrayParam::param_newWidget() } { // Remove linked item - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name("gtk-remove", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("gtk-remove", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -163,8 +162,7 @@ Gtk::Widget* OriginalItemArrayParam::param_newWidget() } { // Move Down - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( "gtk-go-down", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("gtk-go-down", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -176,8 +174,7 @@ Gtk::Widget* OriginalItemArrayParam::param_newWidget() } { // Move Down - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( "gtk-go-up", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("gtk-go-up", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index cc4408218c8..474f6c1bf56 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -32,6 +32,8 @@ #include <2geom/coord.h> #include <2geom/point.h> +#include "helper/icon-loader.h" + #include "object/sp-shape.h" #include "object/sp-text.h" #include "object/uri.h" @@ -177,8 +179,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() { // Paste path to link button - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name("edit-clone", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("edit-clone", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -190,8 +191,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() } { // Remove linked path - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name("gtk-remove", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("gtk-remove", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -203,8 +203,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() } { // Move Down - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( "gtk-go-down", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("gtk-go-down", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -216,8 +215,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() } { // Move Down - Gtk::Image *pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( "gtk-go-up", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("gtk-go-up", Gtk::ICON_SIZE_BUTTON)); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index 52e1b62a671..af553a02935 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -22,15 +22,15 @@ #include <2geom/pathvector.h> #include <2geom/d2.h> -#include "selection-chemistry.h" -#include "xml/repr.h" #include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "helper/icon-loader.h" #include "inkscape.h" #include "message-stack.h" +#include "selection-chemistry.h" #include "verbs.h" -#include "document.h" -#include "document-undo.h" - +#include "xml/repr.h" // needed for on-canvas editing: #include "ui/tools-switch.h" #include "ui/shape-editor.h" @@ -201,8 +201,7 @@ PathParam::param_newWidget() Gtk::Image * pIcon = nullptr; Gtk::Button * pButton = nullptr; if (_edit_button) { - pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( INKSCAPE_ICON("tool-node-editor"), Gtk::ICON_SIZE_BUTTON); + pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("tool-node-editor"), Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -214,8 +213,7 @@ PathParam::param_newWidget() } if (_copy_button) { - pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( INKSCAPE_ICON("edit-copy"), Gtk::ICON_SIZE_BUTTON); + pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-copy"), Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -227,8 +225,7 @@ PathParam::param_newWidget() } if (_paste_button) { - pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( INKSCAPE_ICON("edit-paste"), Gtk::ICON_SIZE_BUTTON); + pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-paste"), Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -239,8 +236,7 @@ PathParam::param_newWidget() pButton->set_tooltip_text(_("Paste path")); } if (_link_button) { - pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( INKSCAPE_ICON("edit-clone"), Gtk::ICON_SIZE_BUTTON); + pIcon = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("edit-clone"), Gtk::ICON_SIZE_BUTTON)); pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp index 535e43dcf97..be75555db41 100644 --- a/src/live_effects/parameter/togglebutton.cpp +++ b/src/live_effects/parameter/togglebutton.cpp @@ -10,14 +10,15 @@ #include -#include "live_effects/parameter/togglebutton.h" +#include "helper-fns.h" +#include "helper/icon-loader.h" +#include "inkscape.h" #include "live_effects/effect.h" -#include "svg/svg.h" -#include "svg/stringstream.h" +#include "live_effects/parameter/togglebutton.h" #include "selection.h" -#include "inkscape.h" +#include "svg/stringstream.h" +#include "svg/svg.h" #include "verbs.h" -#include "helper-fns.h" namespace Inkscape { @@ -110,10 +111,10 @@ ToggleButtonParam::param_newWidget() } gtk_widget_show(box_button); GtkWidget *icon_button = nullptr; - if(!value){ - icon_button = gtk_image_new_from_icon_name(_icon_inactive, _icon_size); + if(!value){ + icon_button = GTK_WIDGET(sp_get_icon_image(_icon_inactive, _icon_size)); } else { - icon_button = gtk_image_new_from_icon_name(_icon_active, _icon_size); + icon_button = GTK_WIDGET(sp_get_icon_image(_icon_active, _icon_size)); } gtk_widget_show(icon_button); gtk_box_pack_start (GTK_BOX(box_button), icon_button, false, false, 1); @@ -162,10 +163,10 @@ ToggleButtonParam::refresh_button() Gtk::Image *im = dynamic_cast(children[0]); Gtk::IconSize is(_icon_size); if (!im) return; - if(!value){ - im->set_from_icon_name(_icon_inactive, is); + if(!value){ + im = sp_get_icon_image(_icon_inactive, is); } else { - im->set_from_icon_name(_icon_active, is); + im = sp_get_icon_image(_icon_active, is); } } } diff --git a/src/svg-view-slideshow.cpp b/src/svg-view-slideshow.cpp index 3bb80029215..f5f8c41cac6 100644 --- a/src/svg-view-slideshow.cpp +++ b/src/svg-view-slideshow.cpp @@ -38,6 +38,7 @@ #include #include "document.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" #include "ui/monitor.h" #include "util/units.h" @@ -100,29 +101,27 @@ void SPSlideShow::control_show() _ctrlwin->add(*t); auto btn_go_first = Gtk::manage(new Gtk::Button()); - auto img_go_first = Gtk::manage(new Gtk::Image()); - img_go_first->set_from_icon_name(INKSCAPE_ICON("go-first"), Gtk::ICON_SIZE_BUTTON); + auto img_go_first = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("go-first"), Gtk::ICON_SIZE_BUTTON)); btn_go_first->set_image(*img_go_first); t->add(*btn_go_first); btn_go_first->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_first)); auto btn_go_prev = Gtk::manage(new Gtk::Button()); - auto img_go_prev = Gtk::manage(new Gtk::Image()); - img_go_prev->set_from_icon_name(INKSCAPE_ICON("go-previous"), Gtk::ICON_SIZE_BUTTON); + auto img_go_prev = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("go-previous"), Gtk::ICON_SIZE_BUTTON)); + btn_go_prev->set_image(*img_go_prev); t->add(*btn_go_prev); btn_go_prev->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_prev)); auto btn_go_next = Gtk::manage(new Gtk::Button()); - auto img_go_next = Gtk::manage(new Gtk::Image()); - img_go_next->set_from_icon_name(INKSCAPE_ICON("go-next"), Gtk::ICON_SIZE_BUTTON); + auto img_go_next = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("go-next"), Gtk::ICON_SIZE_BUTTON)); + btn_go_next->set_image(*img_go_next); t->add(*btn_go_next); btn_go_next->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::show_next)); auto btn_go_last = Gtk::manage(new Gtk::Button()); - auto img_go_last = Gtk::manage(new Gtk::Image()); - img_go_last->set_from_icon_name(INKSCAPE_ICON("go-last"), Gtk::ICON_SIZE_BUTTON); + auto img_go_last = Gtk::manage(sp_get_icon_image(INKSCAPE_ICON("go-last"), Gtk::ICON_SIZE_BUTTON)); btn_go_last->set_image(*img_go_last); t->add(*btn_go_last); btn_go_last->signal_clicked().connect(sigc::mem_fun(*this, &SPSlideShow::goto_last)); diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 3d9a53951b6..7ad8a5e185d 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -45,6 +45,7 @@ #include "object/sp-root.h" #include "object/sp-text.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" #include "ui/tool/control-point-selection.h" #include "ui/tool/multi-path-manipulator.h" @@ -68,7 +69,7 @@ Action::Action(Glib::ustring id, _parent(parent) { Gtk::Image* pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( _id, Gtk::ICON_SIZE_LARGE_TOOLBAR); + pIcon = sp_get_icon_image(_id, Gtk::ICON_SIZE_LARGE_TOOLBAR); Gtk::Button * pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index 9a4cd92ab09..3cec3802271 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -43,6 +43,7 @@ #include "display/drawing-context.h" #include "display/drawing.h" +#include "helper/icon-loader.h" #include "helper/window.h" #include "object/sp-item.h" @@ -2683,28 +2684,28 @@ GtkWidget * CloneTiler::table_x_y_rand(int values) auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous(GTK_BOX(hb), FALSE); - GtkWidget *i = gtk_image_new_from_icon_name (INKSCAPE_ICON("object-rows"), GTK_ICON_SIZE_MENU); - gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2); + GtkWidget *i = GTK_WIDGET(sp_get_icon_image(INKSCAPE_ICON("object-rows"), GTK_ICON_SIZE_MENU)->gobj()); + gtk_box_pack_start(GTK_BOX(hb), i, FALSE, FALSE, 2); - GtkWidget *l = gtk_label_new (""); - gtk_label_set_markup (GTK_LABEL(l), _("Per row:")); - gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 2); + GtkWidget *l = gtk_label_new(""); + gtk_label_set_markup(GTK_LABEL(l), _("Per row:")); + gtk_box_pack_start(GTK_BOX(hb), l, FALSE, FALSE, 2); - table_attach (table, hb, 0, 1, 2); + table_attach(table, hb, 0, 1, 2); } { auto hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous(GTK_BOX(hb), FALSE); - GtkWidget *i = gtk_image_new_from_icon_name (INKSCAPE_ICON("object-columns"), GTK_ICON_SIZE_MENU); - gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2); + GtkWidget *i = GTK_WIDGET(sp_get_icon_image(INKSCAPE_ICON("object-columns"), GTK_ICON_SIZE_MENU)->gobj()); + gtk_box_pack_start(GTK_BOX(hb), i, FALSE, FALSE, 2); - GtkWidget *l = gtk_label_new (""); - gtk_label_set_markup (GTK_LABEL(l), _("Per column:")); - gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 2); + GtkWidget *l = gtk_label_new(""); + gtk_label_set_markup(GTK_LABEL(l), _("Per column:")); + gtk_box_pack_start(GTK_BOX(hb), l, FALSE, FALSE, 2); - table_attach (table, hb, 0, 1, 3); + table_attach(table, hb, 0, 1, 3); } { diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp index aa0198f2721..901bcf36cc6 100644 --- a/src/ui/dialog/cssdialog.cpp +++ b/src/ui/dialog/cssdialog.cpp @@ -16,6 +16,7 @@ #include "verbs.h" #include "selection.h" +#include "helper/icon-loader.h" #include "ui/widget/addtoicon.h" #include "xml/attribute-record.h" @@ -123,7 +124,7 @@ void CssDialog::setDesktop(SPDesktop* desktop) void CssDialog::_styleButton(Gtk::Button& btn, char const* iconName, char const* tooltip) { - GtkWidget *child = gtk_image_new_from_icon_name(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show(child); btn.add(*manage(Glib::wrap(child))); btn.set_relief(Gtk::RELIEF_NONE); diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 0b47f9bac74..39993bc0981 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -34,6 +34,7 @@ #include "object/sp-script.h" #include "style.h" +#include "helper/icon-loader.h" #include "ui/dialog/filedialog.h" #include "ui/icon-names.h" #include "ui/shape-editor.h" @@ -75,7 +76,7 @@ static Inkscape::XML::NodeEventVector const _repr_events = { static void docprops_style_button(Gtk::Button& btn, char const* iconName) { - GtkWidget *child = gtk_image_new_from_icon_name(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show( child ); btn.add(*Gtk::manage(Glib::wrap(child))); btn.set_relief(Gtk::RELIEF_NONE); @@ -1511,8 +1512,7 @@ DocumentProperties::_createPageTabLabel(const Glib::ustring& label, const char * Gtk::HBox *_tab_label_box = Gtk::manage(new Gtk::HBox(false, 0)); _tab_label_box->set_spacing(4); - auto img = Gtk::manage(new Gtk::Image()); - img->set_from_icon_name(label_image, Gtk::ICON_SIZE_MENU); + auto img = Gtk::manage(sp_get_icon_image(label_image, Gtk::ICON_SIZE_MENU)); _tab_label_box->pack_start(*img); Gtk::Label *_tab_label = Gtk::manage(new Gtk::Label(label, true)); diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp index dd387c37e77..067749fa062 100644 --- a/src/ui/dialog/fill-and-stroke.cpp +++ b/src/ui/dialog/fill-and-stroke.cpp @@ -26,6 +26,7 @@ #include "svg/css-ostringstream.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" #include "ui/view/view-widget.h" #include "ui/widget/notebook-page.h" @@ -177,8 +178,7 @@ FillAndStroke::_createPageTabLabel(const Glib::ustring& label, const char *label { Gtk::HBox *_tab_label_box = Gtk::manage(new Gtk::HBox(false, 4)); - auto img = Gtk::manage(new Gtk::Image()); - img->set_from_icon_name(label_image, Gtk::ICON_SIZE_MENU); + auto img = Gtk::manage(sp_get_icon_image(label_image, Gtk::ICON_SIZE_MENU)); _tab_label_box->pack_start(*img); Gtk::Label *_tab_label = Gtk::manage(new Gtk::Label(label, true)); diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index fe528d34d7f..bfd0e05e31d 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -30,11 +30,13 @@ #include "verbs.h" #include "helper/action.h" +#include "helper/icon-loader.h" #include "object/sp-root.h" #include "svg/css-ostringstream.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" #include "ui/tools/tool-base.h" #include "ui/widget/imagetoggler.h" @@ -85,7 +87,7 @@ void LayersPanel::_styleButton( Gtk::Button& btn, SPDesktop *desktop, unsigned i bool set = false; if ( iconName ) { - GtkWidget *child = gtk_image_new_from_icon_name( iconName, GTK_ICON_SIZE_SMALL_TOOLBAR ); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show( child ); btn.add( *Gtk::manage(Glib::wrap(child)) ); btn.set_relief(Gtk::RELIEF_NONE); @@ -97,7 +99,7 @@ void LayersPanel::_styleButton( Gtk::Button& btn, SPDesktop *desktop, unsigned i if ( verb ) { SPAction *action = verb->get_action(Inkscape::ActionContext(desktop)); if ( !set && action && action->image ) { - GtkWidget *child = gtk_image_new_from_icon_name( action->image, GTK_ICON_SIZE_SMALL_TOOLBAR ); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(action->image, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show( child ); btn.add( *Gtk::manage(Glib::wrap(child)) ); set = true; @@ -121,8 +123,7 @@ Gtk::MenuItem& LayersPanel::_addPopupItem( SPDesktop *desktop, unsigned int code const char* label = nullptr; if ( iconName ) { - iconWidget = Gtk::manage(new Gtk::Image()); - iconWidget->set_from_icon_name( iconName, Gtk::ICON_SIZE_MENU ); + iconWidget = Gtk::manage(sp_get_icon_image(iconName, Gtk::ICON_SIZE_MENU)); } if ( desktop ) { @@ -130,8 +131,7 @@ Gtk::MenuItem& LayersPanel::_addPopupItem( SPDesktop *desktop, unsigned int code if ( verb ) { SPAction *action = verb->get_action(Inkscape::ActionContext(desktop)); if ( !iconWidget && action && action->image ) { - iconWidget = Gtk::manage(new Gtk::Image()); - iconWidget->set_from_icon_name( action->image, Gtk::ICON_SIZE_MENU ); + iconWidget = Gtk::manage(sp_get_icon_image(action->image, Gtk::ICON_SIZE_MENU)); } if ( action ) { diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp index dd019cfbad2..ccd71a171fb 100644 --- a/src/ui/dialog/livepatheffect-editor.cpp +++ b/src/ui/dialog/livepatheffect-editor.cpp @@ -30,6 +30,7 @@ #include "verbs.h" #include "helper/action.h" +#include "helper/icon-loader.h" #include "live_effects/effect.h" #include "live_effects/lpeobject-reference.h" @@ -73,7 +74,7 @@ void lpeeditor_selection_modified (Inkscape::Selection * selection, guint /*flag static void lpe_style_button(Gtk::Button& btn, char const* iconName) { - GtkWidget *child = gtk_image_new_from_icon_name(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show( child ); btn.add(*Gtk::manage(Glib::wrap(child))); btn.set_relief(Gtk::RELIEF_NONE); diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index 397f5690e48..2bcde597ffa 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -33,6 +33,7 @@ #include "verbs.h" #include "helper/action.h" +#include "helper/icon-loader.h" #include "object/filters/blend.h" #include "object/filters/gaussian-blur.h" @@ -230,7 +231,7 @@ public: */ void ObjectsPanel::_styleButton(Gtk::Button& btn, char const* iconName, char const* tooltip) { - GtkWidget *child = gtk_image_new_from_icon_name( iconName, GTK_ICON_SIZE_SMALL_TOOLBAR ); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show( child ); btn.add( *Gtk::manage(Glib::wrap(child)) ); btn.set_relief(Gtk::RELIEF_NONE); @@ -252,8 +253,7 @@ Gtk::MenuItem& ObjectsPanel::_addPopupItem( SPDesktop *desktop, unsigned int cod const char* label = nullptr; if ( iconName ) { - iconWidget = Gtk::manage(new Gtk::Image()); - iconWidget->set_from_icon_name( iconName, Gtk::ICON_SIZE_MENU ); + iconWidget = Gtk::manage(sp_get_icon_image(iconName, Gtk::ICON_SIZE_MENU)); } if ( desktop ) { @@ -261,8 +261,7 @@ Gtk::MenuItem& ObjectsPanel::_addPopupItem( SPDesktop *desktop, unsigned int cod if ( verb ) { SPAction *action = verb->get_action(Inkscape::ActionContext(desktop)); if ( !iconWidget && action && action->image ) { - iconWidget = Gtk::manage(new Gtk::Image()); - iconWidget->set_from_icon_name( action->image, Gtk::ICON_SIZE_MENU ); + iconWidget = Gtk::manage(sp_get_icon_image(action->image, Gtk::ICON_SIZE_MENU)); } if ( action ) { diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index 2c457b6d05b..ffa535b78e0 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -18,12 +18,13 @@ #include "ocaldialogs.h" -#include "path-prefix.h" #include "filedialogimpl-gtkmm.h" -#include "ui/interface.h" +#include "helper/icon-loader.h" #include "inkgc/gc-core.h" #include "io/sys.h" +#include "path-prefix.h" #include "preferences.h" +#include "ui/interface.h" #include #include @@ -462,8 +463,7 @@ bool PreviewWidget::_on_draw(const Cairo::RefPtr& cr) StatusWidget::StatusWidget() : Gtk::HBox(false, 6) { - image = new Gtk::Image(); - image->set_from_icon_name("dialog-error", Gtk::ICON_SIZE_MENU); + image = sp_get_icon_image("dialog-error", Gtk::ICON_SIZE_MENU); spinner = new Gtk::Spinner(); label = new Gtk::Label(); @@ -488,7 +488,7 @@ void StatusWidget::set_info(Glib::ustring text) spinner->hide(); image->show(); label->show(); - image->set_from_icon_name("dialog-information", Gtk::ICON_SIZE_MENU); + image = sp_get_icon_image("dialog-information", Gtk::ICON_SIZE_MENU); label->set_text(text); } @@ -497,7 +497,7 @@ void StatusWidget::set_error(Glib::ustring text) spinner->hide(); image->show(); label->show(); - image->set_from_icon_name("dialog-error", Gtk::ICON_SIZE_MENU); + image = sp_get_icon_image("dialog-error", Gtk::ICON_SIZE_MENU); label->set_text(text); } diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 9171dd9cec9..e978667efcf 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -18,7 +18,7 @@ #include "inkscape.h" #include "document-undo.h" - +#include "helper/icon-loader.h" #include "ui/widget/addtoicon.h" #include "xml/attribute-record.h" @@ -1518,7 +1518,7 @@ bool StyleDialog::_delProperty(GdkEventButton *event) void StyleDialog::_styleButton(Gtk::Button& btn, char const* iconName, char const* tooltip) { - GtkWidget *child = gtk_image_new_from_icon_name(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show(child); btn.add(*manage(Glib::wrap(child))); btn.set_relief(Gtk::RELIEF_NONE); diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 578562a79b9..cc5434318f3 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -28,6 +28,7 @@ #include "io/resource.h" #include "display/cairo-utils.h" +#include "helper/icon-loader.h" #include "ui/cache/svg_preview_cache.h" #include "ui/clipboard.h" #include "ui/icon-names.h" @@ -272,8 +273,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : scroller->set_hexpand(); table->attach(*Gtk::manage(tools),0,row,2,1); - auto add_symbol_image = Gtk::manage(new Gtk::Image()); - add_symbol_image->set_from_icon_name("symbol-add", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto add_symbol_image = Gtk::manage(sp_get_icon_image("symbol-add", Gtk::ICON_SIZE_SMALL_TOOLBAR)); add_symbol = Gtk::manage(new Gtk::Button()); add_symbol->add(*add_symbol_image); @@ -283,8 +283,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : add_symbol->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::insertSymbol)); tools->pack_start(* add_symbol, Gtk::PACK_SHRINK); - auto remove_symbolImage = Gtk::manage(new Gtk::Image()); - remove_symbolImage->set_from_icon_name("symbol-remove", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto remove_symbolImage = Gtk::manage(sp_get_icon_image("symbol-remove", Gtk::ICON_SIZE_SMALL_TOOLBAR)); remove_symbol = Gtk::manage(new Gtk::Button()); remove_symbol->add(*remove_symbolImage); @@ -300,8 +299,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : // Pack size (controls display area) pack_size = 2; // Default 32px - auto packMoreImage = Gtk::manage(new Gtk::Image()); - packMoreImage->set_from_icon_name("pack-more", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto packMoreImage = Gtk::manage(sp_get_icon_image("pack-more", Gtk::ICON_SIZE_SMALL_TOOLBAR)); more = Gtk::manage(new Gtk::Button()); more->add(*packMoreImage); @@ -311,8 +309,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : more->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::packmore)); tools->pack_start(* more, Gtk::PACK_SHRINK); - auto packLessImage = Gtk::manage(new Gtk::Image()); - packLessImage->set_from_icon_name("pack-less", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto packLessImage = Gtk::manage(sp_get_icon_image("pack-less", Gtk::ICON_SIZE_SMALL_TOOLBAR)); fewer = Gtk::manage(new Gtk::Button()); fewer->add(*packLessImage); @@ -323,8 +320,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : tools->pack_start(* fewer, Gtk::PACK_SHRINK); // Toggle scale to fit on/off - auto fit_symbolImage = Gtk::manage(new Gtk::Image()); - fit_symbolImage->set_from_icon_name("symbol-fit", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto fit_symbolImage = Gtk::manage(sp_get_icon_image("symbol-fit", Gtk::ICON_SIZE_SMALL_TOOLBAR)); fit_symbol = Gtk::manage(new Gtk::ToggleButton()); fit_symbol->add(*fit_symbolImage); @@ -337,8 +333,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : // Render size (scales symbols within display area) scale_factor = 0; // Default 1:1 * pack_size/pack_size default - auto zoom_outImage = Gtk::manage(new Gtk::Image()); - zoom_outImage->set_from_icon_name("symbol-smaller", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto zoom_outImage = Gtk::manage(sp_get_icon_image("symbol-smaller", Gtk::ICON_SIZE_SMALL_TOOLBAR)); zoom_out = Gtk::manage(new Gtk::Button()); zoom_out->add(*zoom_outImage); @@ -349,8 +344,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : zoom_out->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::zoomout)); tools->pack_start(* zoom_out, Gtk::PACK_SHRINK); - auto zoom_inImage = Gtk::manage(new Gtk::Image()); - zoom_inImage->set_from_icon_name("symbol-bigger", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto zoom_inImage = Gtk::manage(sp_get_icon_image("symbol-bigger", Gtk::ICON_SIZE_SMALL_TOOLBAR)); zoom_in = Gtk::manage(new Gtk::Button()); zoom_in->add(*zoom_inImage); @@ -471,20 +465,24 @@ void SymbolsDialog::rebuild() { void SymbolsDialog::showOverlay() { #if GTKMM_CHECK_VERSION(3,14,0) Glib::ustring current = Glib::Markup::escape_text(symbol_set->get_active_text()); - overlay_icon->set_from_icon_name("none", iconsize); + overlay_icon = sp_get_icon_image("none", iconsize); if (current == ALLDOCS && !l.size()) { if (!all_docs_processed ) { - overlay_icon->set_from_icon_name("searching", iconsize); - overlay_title->set_markup(Glib::ustring("") + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("")); - overlay_desc->set_markup(Glib::ustring("") + Glib::ustring(_("First search can be slow.")) + Glib::ustring("")); + overlay_icon = sp_get_icon_image("searching", iconsize); + overlay_title->set_markup(Glib::ustring("") + + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("")); + overlay_desc->set_markup(Glib::ustring("") + + Glib::ustring(_("First search can be slow.")) + Glib::ustring("")); } else if (!icons_found && !search_str.empty()) { overlay_title->set_markup(Glib::ustring("") + Glib::ustring(_("No results found")) + Glib::ustring("")); overlay_desc->set_markup(Glib::ustring("") + Glib::ustring(_("Try a different search term.")) + Glib::ustring("")); } else { - overlay_icon->set_from_icon_name("searching", iconsize); - overlay_title->set_markup(Glib::ustring("") + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("")); - overlay_desc->set_markup(Glib::ustring("") + Glib::ustring("")); + overlay_icon = sp_get_icon_image("searching", iconsize); + overlay_title->set_markup(Glib::ustring("") + + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("")); + overlay_desc->set_markup(Glib::ustring("") + + Glib::ustring("")); } } else if (!number_symbols && (current != CURRENTDOC || !search_str.empty())) { overlay_title->set_markup(Glib::ustring("") + Glib::ustring(_("No results found")) + Glib::ustring("")); diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index ed8c00c611f..d27a320a775 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -18,21 +18,23 @@ #include #include -#include "desktop.h" #include "desktop-style.h" -#include "document.h" +#include "desktop.h" #include "document-undo.h" +#include "document.h" #include "helper/action.h" +#include "helper/icon-loader.h" #include "inkscape.h" #include "layer-fns.h" #include "layer-manager.h" +#include "helper/icon-loader.h" #include "svg/css-ostringstream.h" -#include "ui/widget/layertypeicon.h" +#include "ui/tools/tool-base.h" //"event-context.h" #include "ui/widget/addtoicon.h" +#include "ui/widget/layertypeicon.h" #include "verbs.h" #include "xml/node-observer.h" -#include "ui/tools/tool-base.h" //"event-context.h" //#include "dialogs/dialog-events.h" #include "ui/widget/color-notebook.h" #include "filter-chemistry.h" @@ -125,7 +127,7 @@ public: void TagsPanel::_styleButton(Gtk::Button& btn, char const* iconName, char const* tooltip) { - GtkWidget *child = gtk_image_new_from_icon_name(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show(child); btn.add(*manage(Glib::wrap(child))); btn.set_relief(Gtk::RELIEF_NONE); @@ -139,7 +141,7 @@ Gtk::MenuItem& TagsPanel::_addPopupItem( SPDesktop *desktop, unsigned int code, const char* label = nullptr; if ( iconName ) { - iconWidget = gtk_image_new_from_icon_name( iconName, GTK_ICON_SIZE_MENU ); + iconWidget = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_MENU)->gobj()); } if ( desktop ) { @@ -147,7 +149,7 @@ Gtk::MenuItem& TagsPanel::_addPopupItem( SPDesktop *desktop, unsigned int code, if ( verb ) { SPAction *action = verb->get_action(desktop); if ( !iconWidget && action && action->image ) { - iconWidget = gtk_image_new_from_icon_name( action->image, GTK_ICON_SIZE_MENU ); + iconWidget = GTK_WIDGET(sp_get_icon_image(action->image, GTK_ICON_SIZE_MENU)->gobj()); } if ( action ) { diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp index 9a0e4ddf407..14ddc90440e 100644 --- a/src/ui/dialog/transformation.cpp +++ b/src/ui/dialog/transformation.cpp @@ -29,6 +29,7 @@ #include "transformation.h" #include "verbs.h" +#include "helper/icon-loader.h" #include "object/sp-item-transform.h" #include "object/sp-namedview.h" @@ -280,16 +281,14 @@ void Transformation::layoutPageRotate() _scalar_rotate.setDigits(3); _scalar_rotate.setIncrements(0.1, 1.0); - auto object_rotate_left_icon = Gtk::manage(new Gtk::Image()); - object_rotate_left_icon->set_from_icon_name("object-rotate-left", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto object_rotate_left_icon = Gtk::manage(sp_get_icon_image("object-rotate-left", Gtk::ICON_SIZE_SMALL_TOOLBAR)); _counterclockwise_rotate.add(*object_rotate_left_icon); _counterclockwise_rotate.set_mode(false); _counterclockwise_rotate.set_relief(Gtk::RELIEF_NONE); _counterclockwise_rotate.set_tooltip_text(_("Rotate in a counterclockwise direction")); - auto object_rotate_right_icon = Gtk::manage(new Gtk::Image()); - object_rotate_right_icon->set_from_icon_name("object-rotate-right", Gtk::ICON_SIZE_SMALL_TOOLBAR); + auto object_rotate_right_icon = Gtk::manage(sp_get_icon_image("object-rotate-right", Gtk::ICON_SIZE_SMALL_TOOLBAR)); _clockwise_rotate.add(*object_rotate_right_icon); _clockwise_rotate.set_mode(false); diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp index e9572443523..c480624fd63 100644 --- a/src/ui/dialog/undo-history.cpp +++ b/src/ui/dialog/undo-history.cpp @@ -17,14 +17,14 @@ #include "undo-history.h" -#include "document.h" #include "document-undo.h" +#include "document.h" +#include "helper/icon-loader.h" #include "inkscape.h" - #include "util/signal-blocker.h" #include "desktop.h" -#include + namespace Inkscape { namespace UI { @@ -45,14 +45,13 @@ void CellRendererSPIcon::render_vfunc(const Cairo::RefPtr& cr, Glib::ustring image_name = Inkscape::Verb::get(_property_event_type)->get_image(); Gtk::Image* icon = Gtk::manage(new Gtk::Image()); - icon->set_from_icon_name(image_name, Gtk::ICON_SIZE_MENU); + icon = sp_get_icon_image(image_name, Gtk::ICON_SIZE_MENU); if (icon) { // check icon type (inkscape, gtk, none) if ( GTK_IS_IMAGE(icon->gobj()) ) { - auto icon_theme = Gtk::IconTheme::get_default(); - _property_icon = icon_theme->load_icon(image_name, 16); + _property_icon = sp_get_icon_pixbuf(image_name, 16); } else { delete icon; return; diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index c7c5424ebcb..647e0beedb2 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -35,6 +35,7 @@ #include "object/sp-root.h" #include "object/sp-string.h" +#include "helper/icon-loader.h" #include "ui/dialog-events.h" #include "ui/icon-names.h" #include "ui/interface.h" @@ -113,24 +114,21 @@ XmlTree::XmlTree() : tree_toolbar.set_toolbar_style(Gtk::TOOLBAR_ICONS); - auto xml_element_new_icon = Gtk::manage(new Gtk::Image()); - xml_element_new_icon->set_from_icon_name("xml-element-new", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto xml_element_new_icon = Gtk::manage(sp_get_icon_image("xml-element-new", Gtk::ICON_SIZE_LARGE_TOOLBAR)); xml_element_new_button.set_icon_widget(*xml_element_new_icon); xml_element_new_button.set_tooltip_text(_("New element node")); xml_element_new_button.set_sensitive(false); tree_toolbar.add(xml_element_new_button); - auto xml_text_new_icon = Gtk::manage(new Gtk::Image()); - xml_text_new_icon->set_from_icon_name("xml-text-new", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto xml_text_new_icon = Gtk::manage(sp_get_icon_image("xml-text-new", Gtk::ICON_SIZE_LARGE_TOOLBAR)); xml_text_new_button.set_icon_widget(*xml_text_new_icon); xml_text_new_button.set_tooltip_text(_("New text node")); xml_text_new_button.set_sensitive(false); tree_toolbar.add(xml_text_new_button); - auto xml_node_duplicate_icon = Gtk::manage(new Gtk::Image()); - xml_node_duplicate_icon->set_from_icon_name("xml-node-duplicate", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto xml_node_duplicate_icon = Gtk::manage(sp_get_icon_image("xml-node-duplicate", Gtk::ICON_SIZE_LARGE_TOOLBAR)); xml_node_duplicate_button.set_icon_widget(*xml_node_duplicate_icon); xml_node_duplicate_button.set_tooltip_text(_("Duplicate node")); @@ -139,8 +137,7 @@ XmlTree::XmlTree() : tree_toolbar.add(separator); - auto xml_node_delete_icon = Gtk::manage(new Gtk::Image()); - xml_node_delete_icon->set_from_icon_name("xml-node-delete", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto xml_node_delete_icon = Gtk::manage(sp_get_icon_image("xml-node-delete", Gtk::ICON_SIZE_LARGE_TOOLBAR)); xml_node_delete_button.set_icon_widget(*xml_node_delete_icon); xml_node_delete_button.set_tooltip_text(Q_("nodeAsInXMLdialogTooltip|Delete node")); @@ -149,8 +146,7 @@ XmlTree::XmlTree() : tree_toolbar.add(separator2); - auto format_indent_less_icon = Gtk::manage(new Gtk::Image()); - format_indent_less_icon->set_from_icon_name("format-indent-less", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto format_indent_less_icon = Gtk::manage(sp_get_icon_image("format-indent-less", Gtk::ICON_SIZE_LARGE_TOOLBAR)); unindent_node_button.set_icon_widget(*format_indent_less_icon); unindent_node_button.set_label(_("Unindent node")); @@ -158,8 +154,7 @@ XmlTree::XmlTree() : unindent_node_button.set_sensitive(false); tree_toolbar.add(unindent_node_button); - auto format_indent_more_icon = Gtk::manage(new Gtk::Image()); - format_indent_more_icon->set_from_icon_name("format-indent-more", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto format_indent_more_icon = Gtk::manage(sp_get_icon_image("format-indent-more", Gtk::ICON_SIZE_LARGE_TOOLBAR)); indent_node_button.set_icon_widget(*format_indent_more_icon); indent_node_button.set_label(_("Indent node")); @@ -167,8 +162,7 @@ XmlTree::XmlTree() : indent_node_button.set_sensitive(false); tree_toolbar.add(indent_node_button); - auto go_up_icon = Gtk::manage(new Gtk::Image()); - go_up_icon->set_from_icon_name("go-up", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto go_up_icon = Gtk::manage(sp_get_icon_image("go-up", Gtk::ICON_SIZE_LARGE_TOOLBAR)); raise_node_button.set_icon_widget(*go_up_icon); raise_node_button.set_label(_("Raise node")); @@ -176,8 +170,7 @@ XmlTree::XmlTree() : raise_node_button.set_sensitive(false); tree_toolbar.add(raise_node_button); - auto go_down_icon = Gtk::manage(new Gtk::Image()); - go_down_icon->set_from_icon_name("go-down", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto go_down_icon = Gtk::manage(sp_get_icon_image("go-down", Gtk::ICON_SIZE_LARGE_TOOLBAR)); lower_node_button.set_icon_widget(*go_down_icon); lower_node_button.set_label(_("Lower node")); @@ -204,8 +197,8 @@ XmlTree::XmlTree() : attr_toolbar.set_toolbar_style(Gtk::TOOLBAR_ICONS); - auto xml_attribute_delete_icon = Gtk::manage(new Gtk::Image()); - xml_attribute_delete_icon->set_from_icon_name("xml-attribute-delete", Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto xml_attribute_delete_icon = + Gtk::manage(sp_get_icon_image("xml-attribute-delete", Gtk::ICON_SIZE_LARGE_TOOLBAR)); xml_attribute_delete_button.set_icon_widget(*xml_attribute_delete_icon); xml_attribute_delete_button.set_tooltip_text(_("Delete attribute")); xml_attribute_delete_button.set_sensitive(false); diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 7e64e876bcf..edfc02823dc 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -51,6 +51,7 @@ #include "extension/input.h" #include "helper/action.h" +#include "helper/icon-loader.h" #include "helper/window.h" #include "io/sys.h" diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp index e5119fc609a..4542333b59e 100644 --- a/src/ui/widget/addtoicon.cpp +++ b/src/ui/widget/addtoicon.cpp @@ -14,11 +14,10 @@ #include "ui/widget/addtoicon.h" -#include - -#include "widgets/toolbox.h" -#include "ui/icon-names.h" +#include "helper/icon-loader.h" #include "layertypeicon.h" +#include "ui/icon-names.h" +#include "widgets/toolbox.h" namespace Inkscape { namespace UI { @@ -33,9 +32,6 @@ AddToIcon::AddToIcon() : { property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE; - gint width, height; - gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &width, &height); - phys = width; // Assumes that we have a square icon? // Glib::RefPtr icon_theme = Gtk::IconTheme::get_default(); // @@ -103,11 +99,7 @@ bool AddToIcon::activate_vfunc(GdkEvent* /*event*/, void AddToIcon::set_pixbuf() { bool active = property_active().get_value(); - - auto icon_theme = Gtk::IconTheme::get_default(); - - property_pixbuf() = icon_theme->load_icon(active ? "list-add" : "edit-delete", - phys); + property_pixbuf() = sp_get_icon_pixbuf((active ? "list-add" : "edit-delete"), GTK_ICON_SIZE_BUTTON); } diff --git a/src/ui/widget/addtoicon.h b/src/ui/widget/addtoicon.h index 60c773e8481..c17ae907a15 100644 --- a/src/ui/widget/addtoicon.h +++ b/src/ui/widget/addtoicon.h @@ -54,7 +54,6 @@ protected: private: - int phys; ///< Physical size of the icon (px) // Glib::ustring _pixAddName; diff --git a/src/ui/widget/alignment-selector.cpp b/src/ui/widget/alignment-selector.cpp index c6c95f097b2..9256a08bd02 100644 --- a/src/ui/widget/alignment-selector.cpp +++ b/src/ui/widget/alignment-selector.cpp @@ -5,6 +5,7 @@ */ #include "ui/widget/alignment-selector.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" #include @@ -14,8 +15,7 @@ namespace UI { namespace Widget { void AlignmentSelector::setupButton(const Glib::ustring& icon, Gtk::Button& button) { - Gtk::Image* buttonIcon = Gtk::manage(new Gtk::Image()); - buttonIcon->set_from_icon_name(icon, Gtk::ICON_SIZE_SMALL_TOOLBAR); + Gtk::Image *buttonIcon = Gtk::manage(sp_get_icon_image(icon, Gtk::ICON_SIZE_SMALL_TOOLBAR)); buttonIcon->show(); button.set_relief(Gtk::RELIEF_NONE); diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp index 52768b7f150..fc7c15f21b2 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -6,8 +6,8 @@ * * Released under GNU GPL. Read the file 'COPYING' for more information. */ - #include "ui/widget/anchor-selector.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" #include @@ -17,9 +17,8 @@ namespace UI { namespace Widget { void AnchorSelector::setupButton(const Glib::ustring& icon, Gtk::ToggleButton& button) { - Gtk::Image* buttonIcon = Gtk::manage(new Gtk::Image()); - buttonIcon->set_from_icon_name(icon, Gtk::ICON_SIZE_SMALL_TOOLBAR); - buttonIcon->show(); + Gtk::Image *buttonIcon = Gtk::manage(sp_get_icon_image(icon, Gtk::ICON_SIZE_SMALL_TOOLBAR)); + buttonIcon->show(); button.set_relief(Gtk::RELIEF_NONE); button.show(); diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp index 509e218a99c..704b5c653c1 100644 --- a/src/ui/widget/clipmaskicon.cpp +++ b/src/ui/widget/clipmaskicon.cpp @@ -13,11 +13,10 @@ #include "ui/widget/clipmaskicon.h" -#include - -#include "widgets/toolbox.h" -#include "ui/icon-names.h" +#include "helper/icon-loader.h" #include "layertypeicon.h" +#include "ui/icon-names.h" +#include "widgets/toolbox.h" namespace Inkscape { namespace UI { @@ -37,14 +36,9 @@ ClipMaskIcon::ClipMaskIcon() : property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE; - gint width, height; - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - phys = width; - - Glib::RefPtr icon_theme = Gtk::IconTheme::get_default(); - _property_pixbuf_clip = icon_theme->load_icon(_pixClipName, phys, (Gtk::IconLookupFlags)0); - _property_pixbuf_mask = icon_theme->load_icon(_pixMaskName, phys, (Gtk::IconLookupFlags)0); - _property_pixbuf_both = icon_theme->load_icon(_pixBothName, phys, (Gtk::IconLookupFlags)0); + _property_pixbuf_clip = sp_get_icon_pixbuf(_pixClipName, GTK_ICON_SIZE_MENU); + _property_pixbuf_mask = sp_get_icon_pixbuf(_pixMaskName, GTK_ICON_SIZE_MENU); + _property_pixbuf_both = sp_get_icon_pixbuf(_pixBothName, GTK_ICON_SIZE_MENU); property_pixbuf() = Glib::RefPtr(nullptr); } diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index 5b0f12e51a1..2d8dcc31057 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -30,6 +30,7 @@ #include "preferences.h" #include "profile-manager.h" +#include "helper/icon-loader.h" #include "object/color-profile.h" #include "svg/svg-icc-color.h" @@ -159,21 +160,22 @@ void ColorNotebook::_initUI() #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) /* Create color management icons */ _box_colormanaged = gtk_event_box_new(); - GtkWidget *colormanaged = gtk_image_new_from_icon_name("color-management-icon", GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *colormanaged = + GTK_WIDGET(sp_get_icon_image("color-management-icon", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_container_add(GTK_CONTAINER(_box_colormanaged), colormanaged); gtk_widget_set_tooltip_text(_box_colormanaged, _("Color Managed")); gtk_widget_set_sensitive(_box_colormanaged, false); gtk_box_pack_start(GTK_BOX(rgbabox), _box_colormanaged, FALSE, FALSE, 2); _box_outofgamut = gtk_event_box_new(); - GtkWidget *outofgamut = gtk_image_new_from_icon_name("out-of-gamut-icon", GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *outofgamut = GTK_WIDGET(sp_get_icon_image("out-of-gamut-icon", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_container_add(GTK_CONTAINER(_box_outofgamut), outofgamut); gtk_widget_set_tooltip_text(_box_outofgamut, _("Out of gamut!")); gtk_widget_set_sensitive(_box_outofgamut, false); gtk_box_pack_start(GTK_BOX(rgbabox), _box_outofgamut, FALSE, FALSE, 2); _box_toomuchink = gtk_event_box_new(); - GtkWidget *toomuchink = gtk_image_new_from_icon_name("too-much-ink-icon", GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *toomuchink = GTK_WIDGET(sp_get_icon_image("too-much-ink-icon", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_container_add(GTK_CONTAINER(_box_toomuchink), toomuchink); gtk_widget_set_tooltip_text(_box_toomuchink, _("Too much ink!")); gtk_widget_set_sensitive(_box_toomuchink, false); @@ -182,7 +184,7 @@ void ColorNotebook::_initUI() /* Color picker */ - GtkWidget *picker = gtk_image_new_from_icon_name("color-picker", GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *picker = GTK_WIDGET(sp_get_icon_image("color-picker", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); _btn_picker = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(_btn_picker), GTK_RELIEF_NONE); gtk_container_add(GTK_CONTAINER(_btn_picker), picker); diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp index 7cd841d882c..c85abd6de8b 100644 --- a/src/ui/widget/dock-item.cpp +++ b/src/ui/widget/dock-item.cpp @@ -10,11 +10,11 @@ #include "ui/widget/dock.h" #include "desktop.h" +#include "helper/icon-loader.h" #include "inkscape.h" #include "ui/icon-names.h" - -#include #include +#include namespace Inkscape { namespace UI { @@ -31,6 +31,7 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l _grab_focus_on_realize(false), _gdl_dock_item(nullptr) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); GdlDockItemBehavior gdl_dock_behavior = (prefs->getBool("/options/dock/cancenterdock", true) ? @@ -39,17 +40,7 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l if (!icon_name.empty()) { - Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); - - int width = 0; - int height = 0; - Gtk::IconSize::lookup(Gtk::ICON_SIZE_MENU, width, height); - try { - _icon_pixbuf = iconTheme->load_icon(icon_name, width); - } - catch (const Gtk::IconThemeError& e) { - std::cerr << "DocItem::DocItem(): " << e.what() << std::endl; - } + _icon_pixbuf = sp_get_icon_pixbuf(icon_name, "/toolbox/secondary"); } if ( _icon_pixbuf ) { diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp index 1200144f120..76b48fbbe15 100644 --- a/src/ui/widget/imagetoggler.cpp +++ b/src/ui/widget/imagetoggler.cpp @@ -11,10 +11,9 @@ #include "ui/widget/imagetoggler.h" -#include - -#include "widgets/toolbox.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" +#include "widgets/toolbox.h" #include @@ -34,18 +33,8 @@ ImageToggler::ImageToggler( char const* on, char const* off) : { property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE; - gint width, height; - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - int phys = width; - - Glib::RefPtr icon_theme = Gtk::IconTheme::get_default(); - try { - _property_pixbuf_on = icon_theme->load_icon(_pixOnName, phys, (Gtk::IconLookupFlags)0); - _property_pixbuf_off = icon_theme->load_icon(_pixOffName, phys, (Gtk::IconLookupFlags)0); - } - catch (const Gtk::IconThemeError& e) { - std::cerr << "ImageToggler::ImageToggler(): " << e.what() << std::endl; - } + _property_pixbuf_on = sp_get_icon_pixbuf(_pixOnName, GTK_ICON_SIZE_MENU); + _property_pixbuf_off = sp_get_icon_pixbuf(_pixOffName, GTK_ICON_SIZE_MENU); property_pixbuf() = _property_pixbuf_off.get_value(); } diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp index d402aca37fc..1343786a128 100644 --- a/src/ui/widget/insertordericon.cpp +++ b/src/ui/widget/insertordericon.cpp @@ -8,12 +8,11 @@ */ #include "ui/widget/insertordericon.h" - -#include -#include "widgets/toolbox.h" -#include "ui/icon-names.h" +#include "helper/icon-loader.h" #include "layertypeicon.h" +#include "ui/icon-names.h" +#include "widgets/toolbox.h" namespace Inkscape { namespace UI { @@ -31,13 +30,8 @@ InsertOrderIcon::InsertOrderIcon() : property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE; - gint width, height; - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - phys=width; - - Glib::RefPtr icon_theme = Gtk::IconTheme::get_default(); - _property_pixbuf_top = icon_theme->load_icon(_pixTopName, phys, (Gtk::IconLookupFlags)0); - _property_pixbuf_bottom = icon_theme->load_icon(_pixBottomName, phys, (Gtk::IconLookupFlags)0); + _property_pixbuf_top = sp_get_icon_pixbuf(_pixTopName, GTK_ICON_SIZE_MENU); + _property_pixbuf_bottom = sp_get_icon_pixbuf(_pixBottomName, GTK_ICON_SIZE_MENU); property_pixbuf() = Glib::RefPtr(nullptr); } diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp index 2e98400358e..6ee2b752f75 100644 --- a/src/ui/widget/labelled.cpp +++ b/src/ui/widget/labelled.cpp @@ -12,8 +12,8 @@ # include #endif +#include "helper/icon-loader.h" #include "labelled.h" - #include #include @@ -32,8 +32,7 @@ Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip, { g_assert(g_utf8_validate(icon.c_str(), -1, nullptr)); if (icon != "") { - _icon = Gtk::manage(new Gtk::Image()); - _icon->set_from_icon_name(icon, Gtk::ICON_SIZE_LARGE_TOOLBAR); + _icon = Gtk::manage(sp_get_icon_image(icon, Gtk::ICON_SIZE_LARGE_TOOLBAR)); pack_start(*_icon, Gtk::PACK_SHRINK); } pack_start(*Gtk::manage(_label), Gtk::PACK_EXPAND_WIDGET, 6); diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index b862224043e..c8aefa65665 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -17,10 +17,11 @@ #include #include +#include "helper/icon-loader.h" #include "ui/dialog/layer-properties.h" -#include #include #include +#include #include "desktop.h" @@ -46,14 +47,12 @@ public: { set_name("AlternateIcons"); if (!a.empty()) { - _a = Gtk::manage(new Gtk::Image()); - _a->set_from_icon_name(a, size); + _a = Gtk::manage(sp_get_icon_image(a, size)); _a->set_no_show_all(true); add(*_a); } if (!b.empty()) { - _b = Gtk::manage(new Gtk::Image()); - _b->set_from_icon_name(b, size); + _b = Gtk::manage(sp_get_icon_image(b, size)); _b->set_no_show_all(true); add(*_b); } diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp index 278bd317b1c..356531620b5 100644 --- a/src/ui/widget/layertypeicon.cpp +++ b/src/ui/widget/layertypeicon.cpp @@ -13,10 +13,9 @@ #include "ui/widget/layertypeicon.h" -#include - -#include "widgets/toolbox.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" +#include "widgets/toolbox.h" namespace Inkscape { namespace UI { @@ -36,14 +35,10 @@ LayerTypeIcon::LayerTypeIcon() : { property_mode() = Gtk::CELL_RENDERER_MODE_ACTIVATABLE; - gint width, height; - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - int phys = width; - - Glib::RefPtr icon_theme = Gtk::IconTheme::get_default(); - _property_pixbuf_layer = icon_theme->load_icon(_pixLayerName, phys, (Gtk::IconLookupFlags)0); - _property_pixbuf_group = icon_theme->load_icon(_pixGroupName, phys, (Gtk::IconLookupFlags)0); - _property_pixbuf_path = icon_theme->load_icon(_pixPathName, phys, (Gtk::IconLookupFlags)0); + + _property_pixbuf_layer = sp_get_icon_pixbuf(_pixLayerName, GTK_ICON_SIZE_MENU); + _property_pixbuf_group = sp_get_icon_pixbuf(_pixGroupName, GTK_ICON_SIZE_MENU); + _property_pixbuf_path = sp_get_icon_pixbuf(_pixPathName, GTK_ICON_SIZE_MENU); property_pixbuf() = _property_pixbuf_path.get_value(); } diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index fee39263231..3127434985d 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -34,6 +34,7 @@ #include "io/sys.h" +#include "helper/icon-loader.h" #include "ui/dialog/filedialog.h" #include "ui/widget/preferences-widget.h" @@ -705,9 +706,7 @@ void PrefEntryFileButtonHBox::init(Glib::ustring const &prefs_path, relatedButton = new Gtk::Button(); Gtk::HBox* pixlabel = new Gtk::HBox(false, 3); - Gtk::Image *im = new Gtk::Image(); - im->set_from_icon_name("applications-graphics", - Gtk::ICON_SIZE_BUTTON); + Gtk::Image *im = sp_get_icon_image("applications-graphics", Gtk::ICON_SIZE_BUTTON); pixlabel->pack_start(*im); Gtk::Label *l = new Gtk::Label(); l->set_markup_with_mnemonic(_("_Browse...")); diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp index 237144c7ce8..3bda641d7ae 100644 --- a/src/ui/widget/random.cpp +++ b/src/ui/widget/random.cpp @@ -14,8 +14,8 @@ #endif +#include "helper/icon-loader.h" #include "random.h" - #include #include @@ -70,8 +70,7 @@ void Random::setStartSeed(long newseed) void Random::addReseedButton() { - Gtk::Image* pIcon = Gtk::manage(new Gtk::Image()); - pIcon->set_from_icon_name( "randomize", Gtk::ICON_SIZE_BUTTON); + Gtk::Image *pIcon = Gtk::manage(sp_get_icon_image("randomize", Gtk::ICON_SIZE_BUTTON)); Gtk::Button * pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/verbs.cpp b/src/verbs.cpp index f859f672ba6..0bbfeb1fbe9 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -2603,48 +2603,50 @@ Verb *Verb::_base_verbs[] = { // File new FileVerb(SP_VERB_FILE_NEW, "FileNew", N_("_New"), N_("Create new document from the default template"), INKSCAPE_ICON("document-new")), - new FileVerb(SP_VERB_FILE_OPEN, "FileOpen", N_("_Open..."), - N_("Open an existing document"), INKSCAPE_ICON("document-open")), + new FileVerb(SP_VERB_FILE_OPEN, "FileOpen", N_("_Open..."), N_("Open an existing document"), + INKSCAPE_ICON("document-open")), new FileVerb(SP_VERB_FILE_REVERT, "FileRevert", N_("Re_vert"), - N_("Revert to the last saved version of document (changes will be lost)"), INKSCAPE_ICON("document-revert")), - new FileVerb(SP_VERB_FILE_SAVE, "FileSave", N_("_Save"), N_("Save document"), - INKSCAPE_ICON("document-save")), - new FileVerb(SP_VERB_FILE_SAVE_AS, "FileSaveAs", N_("Save _As..."), - N_("Save document under a new name"), INKSCAPE_ICON("document-save-as")), + N_("Revert to the last saved version of document (changes will be lost)"), + INKSCAPE_ICON("document-revert")), + new FileVerb(SP_VERB_FILE_SAVE, "FileSave", N_("_Save"), N_("Save document"), INKSCAPE_ICON("document-save")), + new FileVerb(SP_VERB_FILE_SAVE_AS, "FileSaveAs", N_("Save _As..."), N_("Save document under a new name"), + INKSCAPE_ICON("document-save-as")), new FileVerb(SP_VERB_FILE_SAVE_A_COPY, "FileSaveACopy", N_("Save a Cop_y..."), - N_("Save a copy of the document under a new name"), nullptr ), + N_("Save a copy of the document under a new name"), nullptr), new FileVerb(SP_VERB_FILE_SAVE_TEMPLATE, "FileSaveTemplate", N_("Save template ..."), - N_("Save a copy of the document as template"), nullptr ), + N_("Save a copy of the document as template"), nullptr), new FileVerb(SP_VERB_FILE_PRINT, "FilePrint", N_("_Print..."), N_("Print document"), INKSCAPE_ICON("document-print")), // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) - new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Clean _up document"), N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"), - INKSCAPE_ICON("document-cleanup") ), + new FileVerb( + SP_VERB_FILE_VACUUM, "FileVacuum", N_("Clean _up document"), + N_("Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document"), + INKSCAPE_ICON("document-cleanup")), new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."), N_("Import a bitmap or SVG image into this document"), INKSCAPE_ICON("document-import")), -// new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), + // new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a + // selection as a bitmap image"), INKSCAPE_ICON("document-export")), new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import Clip Art..."), - N_("Import clipart from Open Clip Art Library"), INKSCAPE_ICON("document-import-ocal")), -// new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), - new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"), - N_("Switch to the next document window"), INKSCAPE_ICON("window-next")), + N_("Import clipart from Open Clip Art Library"), INKSCAPE_ICON("document-import-ocal")), + // new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), + // N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), + new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"), N_("Switch to the next document window"), + INKSCAPE_ICON("window-next")), new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"), N_("Switch to the previous document window"), INKSCAPE_ICON("window-previous")), - new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileClose", N_("_Close"), - N_("Close this document window"), INKSCAPE_ICON("window-close")), + new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileClose", N_("_Close"), N_("Close this document window"), + INKSCAPE_ICON("window-close")), new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), INKSCAPE_ICON("application-exit")), new FileVerb(SP_VERB_FILE_TEMPLATES, "FileTemplates", N_("New from _Template..."), - N_("Create new project from template"), INKSCAPE_ICON("dialog-templates")), + N_("Create new project from template"), INKSCAPE_ICON("dialog-templates")), // Edit - new EditVerb(SP_VERB_EDIT_UNDO, "EditUndo", N_("_Undo"), N_("Undo last action"), - INKSCAPE_ICON("edit-undo")), - new EditVerb(SP_VERB_EDIT_REDO, "EditRedo", N_("_Redo"), - N_("Do again the last undone action"), INKSCAPE_ICON("edit-redo")), - new EditVerb(SP_VERB_EDIT_CUT, "EditCut", N_("Cu_t"), - N_("Cut selection to clipboard"), INKSCAPE_ICON("edit-cut")), - new EditVerb(SP_VERB_EDIT_COPY, "EditCopy", N_("_Copy"), - N_("Copy selection to clipboard"), INKSCAPE_ICON("edit-copy")), + new EditVerb(SP_VERB_EDIT_UNDO, "EditUndo", N_("_Undo"), N_("Undo last action"), INKSCAPE_ICON("edit-undo")), + new EditVerb(SP_VERB_EDIT_REDO, "EditRedo", N_("_Redo"), N_("Do again the last undone action"), + INKSCAPE_ICON("edit-redo")), + new EditVerb(SP_VERB_EDIT_CUT, "EditCut", N_("Cu_t"), N_("Cut selection to clipboard"), INKSCAPE_ICON("edit-cut")), + new EditVerb(SP_VERB_EDIT_COPY, "EditCopy", N_("_Copy"), N_("Copy selection to clipboard"), + INKSCAPE_ICON("edit-copy")), new EditVerb(SP_VERB_EDIT_PASTE, "EditPaste", N_("_Paste"), N_("Paste objects from clipboard to mouse point, or paste text"), INKSCAPE_ICON("edit-paste")), new EditVerb(SP_VERB_EDIT_PASTE_STYLE, "EditPasteStyle", N_("Paste _Style"), @@ -2669,16 +2671,18 @@ Verb *Verb::_base_verbs[] = { N_("Remove any path effects from selected objects"), nullptr), new EditVerb(SP_VERB_EDIT_REMOVE_FILTER, "RemoveFilter", N_("_Remove Filters"), N_("Remove any filters from selected objects"), nullptr), - new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"), - N_("Delete selection"), INKSCAPE_ICON("edit-delete")), - new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"), - N_("Duplicate selected objects"), INKSCAPE_ICON("edit-duplicate")), + new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"), N_("Delete selection"), + INKSCAPE_ICON("edit-delete")), + new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"), N_("Duplicate selected objects"), + INKSCAPE_ICON("edit-duplicate")), new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Create Clo_ne"), N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON("edit-clone")), new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"), - N_("Cut the selected clones' links to the originals, turning them into standalone objects"), INKSCAPE_ICON("edit-clone-unlink")), + N_("Cut the selected clones' links to the originals, turning them into standalone objects"), + INKSCAPE_ICON("edit-clone-unlink")), new EditVerb(SP_VERB_EDIT_UNLINK_CLONE_RECURSIVE, "EditUnlinkCloneRecursive", N_("Unlink Clones _recursively"), - N_("Unlink all clones in the selection, even if they are in groups."), INKSCAPE_ICON("edit-clone-unlink")), + N_("Unlink all clones in the selection, even if they are in groups."), + INKSCAPE_ICON("edit-clone-unlink")), new EditVerb(SP_VERB_EDIT_RELINK_CLONE, "EditRelinkClone", N_("Relink to Copied"), N_("Relink the selected clones to the object currently on the clipboard"), nullptr), new EditVerb(SP_VERB_EDIT_CLONE_SELECT_ORIGINAL, "EditCloneSelectOriginal", N_("Select _Original"), @@ -2693,55 +2697,63 @@ Verb *Verb::_base_verbs[] = { N_("Convert selection to a rectangle with tiled pattern fill"), nullptr), new EditVerb(SP_VERB_EDIT_UNTILE, "ObjectsFromPattern", N_("Pattern to _Objects"), N_("Extract objects from a tiled pattern fill"), nullptr), - new EditVerb(SP_VERB_EDIT_SYMBOL, "ObjectsToSymbol", N_("Group to Symbol"), - N_("Convert group to a symbol"), nullptr), - new EditVerb(SP_VERB_EDIT_UNSYMBOL, "ObjectsFromSymbol", N_("Symbol to Group"), - N_("Extract group from a symbol"), nullptr), - new EditVerb(SP_VERB_EDIT_CLEAR_ALL, "EditClearAll", N_("Clea_r All"), - N_("Delete all objects from document"), nullptr), - new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"), - N_("Select all objects or all nodes"), INKSCAPE_ICON("edit-select-all")), + new EditVerb(SP_VERB_EDIT_SYMBOL, "ObjectsToSymbol", N_("Group to Symbol"), N_("Convert group to a symbol"), + nullptr), + new EditVerb(SP_VERB_EDIT_UNSYMBOL, "ObjectsFromSymbol", N_("Symbol to Group"), N_("Extract group from a symbol"), + nullptr), + new EditVerb(SP_VERB_EDIT_CLEAR_ALL, "EditClearAll", N_("Clea_r All"), N_("Delete all objects from document"), + nullptr), + new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"), N_("Select all objects or all nodes"), + INKSCAPE_ICON("edit-select-all")), new EditVerb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS, "EditSelectAllInAllLayers", N_("Select All in All La_yers"), N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON("edit-select-all-layers")), new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_STROKE, "EditSelectSameFillStroke", N_("Fill _and Stroke"), - N_("Select all objects with the same fill and stroke as the selected objects"), INKSCAPE_ICON("edit-select-all")), + N_("Select all objects with the same fill and stroke as the selected objects"), + INKSCAPE_ICON("edit-select-all")), new EditVerb(SP_VERB_EDIT_SELECT_SAME_FILL_COLOR, "EditSelectSameFillColor", N_("_Fill Color"), - N_("Select all objects with the same fill as the selected objects"), INKSCAPE_ICON("edit-select-all")), + N_("Select all objects with the same fill as the selected objects"), INKSCAPE_ICON("edit-select-all")), new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE_COLOR, "EditSelectSameStrokeColor", N_("_Stroke Color"), - N_("Select all objects with the same stroke as the selected objects"), INKSCAPE_ICON("edit-select-all")), + N_("Select all objects with the same stroke as the selected objects"), + INKSCAPE_ICON("edit-select-all")), new EditVerb(SP_VERB_EDIT_SELECT_SAME_STROKE_STYLE, "EditSelectSameStrokeStyle", N_("Stroke St_yle"), - N_("Select all objects with the same stroke style (width, dash, markers) as the selected objects"), INKSCAPE_ICON("edit-select-all")), - new EditVerb(SP_VERB_EDIT_SELECT_SAME_OBJECT_TYPE, "EditSelectSameObjectType", N_("_Object Type"), - N_("Select all objects with the same object type (rect, arc, text, path, bitmap etc) as the selected objects"), INKSCAPE_ICON("edit-select-all")), + N_("Select all objects with the same stroke style (width, dash, markers) as the selected objects"), + INKSCAPE_ICON("edit-select-all")), + new EditVerb( + SP_VERB_EDIT_SELECT_SAME_OBJECT_TYPE, "EditSelectSameObjectType", N_("_Object Type"), + N_("Select all objects with the same object type (rect, arc, text, path, bitmap etc) as the selected objects"), + INKSCAPE_ICON("edit-select-all")), new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"), - N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON("edit-select-invert")), + N_("Invert selection (unselect what is selected and select everything else)"), + INKSCAPE_ICON("edit-select-invert")), new EditVerb(SP_VERB_EDIT_INVERT_IN_ALL_LAYERS, "EditInvertInAllLayers", N_("Invert in All Layers"), N_("Invert selection in all visible and unlocked layers"), nullptr), - new EditVerb(SP_VERB_EDIT_SELECT_NEXT, "EditSelectNext", N_("Select Next"), - N_("Select next object or node"), nullptr), + new EditVerb(SP_VERB_EDIT_SELECT_NEXT, "EditSelectNext", N_("Select Next"), N_("Select next object or node"), + nullptr), new EditVerb(SP_VERB_EDIT_SELECT_PREV, "EditSelectPrev", N_("Select Previous"), N_("Select previous object or node"), nullptr), - new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"), - N_("Deselect any selected objects or nodes"), INKSCAPE_ICON("edit-select-none")), + new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"), N_("Deselect any selected objects or nodes"), + INKSCAPE_ICON("edit-select-none")), new EditVerb(SP_VERB_EDIT_DELETE_ALL_GUIDES, "EditRemoveAllGuides", N_("Delete All Guides"), N_("Delete all the guides in the document"), nullptr), - new EditVerb(SP_VERB_EDIT_GUIDES_TOGGLE_LOCK, "EditGuidesToggleLock", N_("Lock All Guides"), N_("Toggle lock of all guides in the document"), nullptr), + new EditVerb(SP_VERB_EDIT_GUIDES_TOGGLE_LOCK, "EditGuidesToggleLock", N_("Lock All Guides"), + N_("Toggle lock of all guides in the document"), nullptr), new EditVerb(SP_VERB_EDIT_GUIDES_AROUND_PAGE, "EditGuidesAroundPage", N_("Create _Guides Around the Page"), N_("Create four guides aligned with the page borders"), nullptr), - new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next path effect parameter"), - N_("Show next editable path effect parameter"), INKSCAPE_ICON("path-effect-parameter-next")), + new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", + N_("Next path effect parameter"), N_("Show next editable path effect parameter"), + INKSCAPE_ICON("path-effect-parameter-next")), new EditVerb(SP_VERB_EDIT_SWAP_FILL_STROKE, "EditSwapFillStroke", N_("Swap fill and stroke"), N_("Swap fill and stroke of an object"), nullptr), // Selection - new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"), - N_("Raise selection to top"), INKSCAPE_ICON("selection-top")), + new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"), N_("Raise selection to top"), + INKSCAPE_ICON("selection-top")), new SelectionVerb(SP_VERB_SELECTION_TO_BACK, "SelectionToBack", N_("Lower to _Bottom"), N_("Lower selection to bottom"), INKSCAPE_ICON("selection-bottom")), - new SelectionVerb(SP_VERB_SELECTION_RAISE, "SelectionRaise", N_("_Raise"), - N_("Raise selection one step"), INKSCAPE_ICON("selection-raise")), - new SelectionVerb(SP_VERB_SELECTION_LOWER, "SelectionLower", N_("_Lower"), - N_("Lower selection one step"), INKSCAPE_ICON("selection-lower")), + new SelectionVerb(SP_VERB_SELECTION_RAISE, "SelectionRaise", N_("_Raise"), N_("Raise selection one step"), + INKSCAPE_ICON("selection-raise")), + new SelectionVerb(SP_VERB_SELECTION_LOWER, "SelectionLower", N_("_Lower"), N_("Lower selection one step"), + INKSCAPE_ICON("selection-lower")), new SelectionVerb(SP_VERB_SELECTION_STACK_UP, "SelectionStackUp", N_("_Stack up"), @@ -2750,44 +2762,47 @@ Verb *Verb::_base_verbs[] = { N_("Stack selection one step down"), INKSCAPE_ICON("layer-lower")), - new SelectionVerb(SP_VERB_SELECTION_GROUP, "SelectionGroup", N_("_Group"), - N_("Group selected objects"), INKSCAPE_ICON("object-group")), - new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"), - N_("Ungroup selected groups"), INKSCAPE_ICON("object-ungroup")), - new SelectionVerb(SP_VERB_SELECTION_UNGROUP_POP_SELECTION, "SelectionUnGroupPopSelection", N_("_Pop selected objects out of group"), - N_("Pop selected objects out of group"), INKSCAPE_ICON("object-ungroup-pop-selection")), + new SelectionVerb(SP_VERB_SELECTION_GROUP, "SelectionGroup", N_("_Group"), N_("Group selected objects"), + INKSCAPE_ICON("object-group")), + new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"), N_("Ungroup selected groups"), + INKSCAPE_ICON("object-ungroup")), + new SelectionVerb(SP_VERB_SELECTION_UNGROUP_POP_SELECTION, "SelectionUnGroupPopSelection", + N_("_Pop selected objects out of group"), N_("Pop selected objects out of group"), + INKSCAPE_ICON("object-ungroup-pop-selection")), - new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"), - N_("Put text on path"), INKSCAPE_ICON("text-put-on-path")), + new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"), N_("Put text on path"), + INKSCAPE_ICON("text-put-on-path")), new SelectionVerb(SP_VERB_SELECTION_TEXTFROMPATH, "SelectionTextFromPath", N_("_Remove from Path"), N_("Remove text from path"), INKSCAPE_ICON("text-remove-from-path")), new SelectionVerb(SP_VERB_SELECTION_REMOVE_KERNS, "SelectionTextRemoveKerns", N_("Remove Manual _Kerns"), // TRANSLATORS: "glyph": An image used in the visual representation of characters; // roughly speaking, how a character looks. A font is a set of glyphs. - N_("Remove all manual kerns and glyph rotations from a text object"), INKSCAPE_ICON("text-unkern")), + N_("Remove all manual kerns and glyph rotations from a text object"), + INKSCAPE_ICON("text-unkern")), - new SelectionVerb(SP_VERB_SELECTION_UNION, "SelectionUnion", N_("_Union"), - N_("Create union of selected paths"), INKSCAPE_ICON("path-union")), + new SelectionVerb(SP_VERB_SELECTION_UNION, "SelectionUnion", N_("_Union"), N_("Create union of selected paths"), + INKSCAPE_ICON("path-union")), new SelectionVerb(SP_VERB_SELECTION_INTERSECT, "SelectionIntersect", N_("_Intersection"), N_("Create intersection of selected paths"), INKSCAPE_ICON("path-intersection")), new SelectionVerb(SP_VERB_SELECTION_DIFF, "SelectionDiff", N_("_Difference"), N_("Create difference of selected paths (bottom minus top)"), INKSCAPE_ICON("path-difference")), new SelectionVerb(SP_VERB_SELECTION_SYMDIFF, "SelectionSymDiff", N_("E_xclusion"), - N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), INKSCAPE_ICON("path-exclusion")), - new SelectionVerb(SP_VERB_SELECTION_CUT, "SelectionDivide", N_("Di_vision"), - N_("Cut the bottom path into pieces"), INKSCAPE_ICON("path-division")), + N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), + INKSCAPE_ICON("path-exclusion")), + new SelectionVerb(SP_VERB_SELECTION_CUT, "SelectionDivide", N_("Di_vision"), N_("Cut the bottom path into pieces"), + INKSCAPE_ICON("path-division")), // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the // Advanced tutorial for more info new SelectionVerb(SP_VERB_SELECTION_SLICE, "SelectionCutPath", N_("Cut _Path"), N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON("path-cut")), - new SelectionVerb(SP_VERB_SELECTION_GROW, "SelectionGrow", N_("_Grow"), - N_("Make selected objects bigger"), INKSCAPE_ICON("selection-grow")), + new SelectionVerb(SP_VERB_SELECTION_GROW, "SelectionGrow", N_("_Grow"), N_("Make selected objects bigger"), + INKSCAPE_ICON("selection-grow")), new SelectionVerb(SP_VERB_SELECTION_GROW_SCREEN, "SelectionGrowScreen", N_("_Grow on screen"), N_("Make selected objects bigger relative to screen"), INKSCAPE_ICON("selection-grow-screen")), new SelectionVerb(SP_VERB_SELECTION_GROW_DOUBLE, "SelectionGrowDouble", N_("_Double size"), N_("Double the size of selected objects"), INKSCAPE_ICON("selection-grow-double")), - new SelectionVerb(SP_VERB_SELECTION_SHRINK, "SelectionShrink", N_("_Shrink"), - N_("Make selected objects smaller"), INKSCAPE_ICON("selection-shrink")), + new SelectionVerb(SP_VERB_SELECTION_SHRINK, "SelectionShrink", N_("_Shrink"), N_("Make selected objects smaller"), + INKSCAPE_ICON("selection-shrink")), new SelectionVerb(SP_VERB_SELECTION_SHRINK_SCREEN, "SelectionShrinkScreen", N_("_Shrink on screen"), N_("Make selected objects smaller relative to screen"), INKSCAPE_ICON("selection-shrink-screen")), new SelectionVerb(SP_VERB_SELECTION_SHRINK_HALVE, "SelectionShrinkHalve", N_("_Halve size"), @@ -2795,29 +2810,24 @@ Verb *Verb::_base_verbs[] = { // TRANSLATORS: "outset": expand a shape by offsetting the object's path, // i.e. by displacing it perpendicular to the path in each point. // See also the Advanced Tutorial for explanation. - new SelectionVerb(SP_VERB_SELECTION_OFFSET, "SelectionOffset", N_("Outs_et"), - N_("Outset selected paths"), INKSCAPE_ICON("path-outset")), - new SelectionVerb(SP_VERB_SELECTION_OFFSET_SCREEN, "SelectionOffsetScreen", - N_("O_utset Path by 1 px"), + new SelectionVerb(SP_VERB_SELECTION_OFFSET, "SelectionOffset", N_("Outs_et"), N_("Outset selected paths"), + INKSCAPE_ICON("path-outset")), + new SelectionVerb(SP_VERB_SELECTION_OFFSET_SCREEN, "SelectionOffsetScreen", N_("O_utset Path by 1 px"), N_("Outset selected paths by 1 px"), nullptr), - new SelectionVerb(SP_VERB_SELECTION_OFFSET_SCREEN_10, "SelectionOffsetScreen10", - N_("O_utset Path by 10 px"), + new SelectionVerb(SP_VERB_SELECTION_OFFSET_SCREEN_10, "SelectionOffsetScreen10", N_("O_utset Path by 10 px"), N_("Outset selected paths by 10 px"), nullptr), // TRANSLATORS: "inset": contract a shape by offsetting the object's path, // i.e. by displacing it perpendicular to the path in each point. // See also the Advanced Tutorial for explanation. - new SelectionVerb(SP_VERB_SELECTION_INSET, "SelectionInset", N_("I_nset"), - N_("Inset selected paths"), INKSCAPE_ICON("path-inset")), - new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN, "SelectionInsetScreen", - N_("I_nset Path by 1 px"), + new SelectionVerb(SP_VERB_SELECTION_INSET, "SelectionInset", N_("I_nset"), N_("Inset selected paths"), + INKSCAPE_ICON("path-inset")), + new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN, "SelectionInsetScreen", N_("I_nset Path by 1 px"), N_("Inset selected paths by 1 px"), nullptr), - new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN_10, "SelectionInsetScreen10", - N_("I_nset Path by 10 px"), + new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN_10, "SelectionInsetScreen10", N_("I_nset Path by 10 px"), N_("Inset selected paths by 10 px"), nullptr), - new SelectionVerb(SP_VERB_SELECTION_DYNAMIC_OFFSET, "SelectionDynOffset", - N_("D_ynamic Offset"), N_("Create a dynamic offset object"), INKSCAPE_ICON("path-offset-dynamic")), - new SelectionVerb(SP_VERB_SELECTION_LINKED_OFFSET, "SelectionLinkedOffset", - N_("_Linked Offset"), + new SelectionVerb(SP_VERB_SELECTION_DYNAMIC_OFFSET, "SelectionDynOffset", N_("D_ynamic Offset"), + N_("Create a dynamic offset object"), INKSCAPE_ICON("path-offset-dynamic")), + new SelectionVerb(SP_VERB_SELECTION_LINKED_OFFSET, "SelectionLinkedOffset", N_("_Linked Offset"), N_("Create a dynamic offset object linked to the original path"), INKSCAPE_ICON("path-offset-linked")), new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "StrokeToPath", N_("_Stroke to Path"), @@ -2827,7 +2837,8 @@ Verb *Verb::_base_verbs[] = { new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"), N_("Simplify selected paths (remove extra nodes)"), INKSCAPE_ICON("path-simplify")), new SelectionVerb(SP_VERB_SELECTION_REVERSE, "SelectionReverse", N_("_Reverse"), - N_("Reverse the direction of selected paths (useful for flipping markers)"), INKSCAPE_ICON("path-reverse")), + N_("Reverse the direction of selected paths (useful for flipping markers)"), + INKSCAPE_ICON("path-reverse")), #if HAVE_POTRACE // TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) @@ -2836,9 +2847,11 @@ Verb *Verb::_base_verbs[] = { #endif new SelectionVerb(SP_VERB_SELECTION_PIXEL_ART, "SelectionPixelArt", N_("Trace Pixel Art..."), - N_("Create paths using Kopf-Lischinski algorithm to vectorize pixel art"), INKSCAPE_ICON("pixelart-trace")), + N_("Create paths using Kopf-Lischinski algorithm to vectorize pixel art"), + INKSCAPE_ICON("pixelart-trace")), new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("Make a _Bitmap Copy"), - N_("Export selection to a bitmap and insert it into document"), INKSCAPE_ICON("selection-make-bitmap-copy") ), + N_("Export selection to a bitmap and insert it into document"), + INKSCAPE_ICON("selection-make-bitmap-copy")), new SelectionVerb(SP_VERB_SELECTION_COMBINE, "SelectionCombine", N_("_Combine"), N_("Combine several paths into one"), INKSCAPE_ICON("path-combine")), // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the @@ -2848,10 +2861,10 @@ Verb *Verb::_base_verbs[] = { new SelectionVerb(SP_VERB_SELECTION_ARRANGE, "DialogArrange", N_("_Arrange..."), N_("Arrange selected objects in a table or circle"), INKSCAPE_ICON("dialog-rows-and-columns")), // Layer - new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."), - N_("Create a new layer"), INKSCAPE_ICON("layer-new")), - new LayerVerb(SP_VERB_LAYER_RENAME, "LayerRename", N_("Re_name Layer..."), - N_("Rename the current layer"), INKSCAPE_ICON("layer-rename")), + new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."), N_("Create a new layer"), + INKSCAPE_ICON("layer-new")), + new LayerVerb(SP_VERB_LAYER_RENAME, "LayerRename", N_("Re_name Layer..."), N_("Rename the current layer"), + INKSCAPE_ICON("layer-rename")), new LayerVerb(SP_VERB_LAYER_NEXT, "LayerNext", N_("Switch to Layer Abov_e"), N_("Switch to the layer above the current"), INKSCAPE_ICON("layer-previous")), new LayerVerb(SP_VERB_LAYER_PREV, "LayerPrev", N_("Switch to Layer Belo_w"), @@ -2860,32 +2873,29 @@ Verb *Verb::_base_verbs[] = { N_("Move selection to the layer above the current"), INKSCAPE_ICON("selection-move-to-layer-above")), new LayerVerb(SP_VERB_LAYER_MOVE_TO_PREV, "LayerMoveToPrev", N_("Move Selection to Layer Bel_ow"), N_("Move selection to the layer below the current"), INKSCAPE_ICON("selection-move-to-layer-below")), - new LayerVerb(SP_VERB_LAYER_MOVE_TO, "LayerMoveTo", N_("Move Selection to Layer..."), - N_("Move selection to layer"), INKSCAPE_ICON("layer-rename")), - new LayerVerb(SP_VERB_LAYER_TO_TOP, "LayerToTop", N_("Layer to _Top"), - N_("Raise the current layer to the top"), INKSCAPE_ICON("layer-top")), + new LayerVerb(SP_VERB_LAYER_MOVE_TO, "LayerMoveTo", N_("Move Selection to Layer..."), N_("Move selection to layer"), + INKSCAPE_ICON("layer-rename")), + new LayerVerb(SP_VERB_LAYER_TO_TOP, "LayerToTop", N_("Layer to _Top"), N_("Raise the current layer to the top"), + INKSCAPE_ICON("layer-top")), new LayerVerb(SP_VERB_LAYER_TO_BOTTOM, "LayerToBottom", N_("Layer to _Bottom"), N_("Lower the current layer to the bottom"), INKSCAPE_ICON("layer-bottom")), - new LayerVerb(SP_VERB_LAYER_RAISE, "LayerRaise", N_("_Raise Layer"), - N_("Raise the current layer"), INKSCAPE_ICON("layer-raise")), - new LayerVerb(SP_VERB_LAYER_LOWER, "LayerLower", N_("_Lower Layer"), - N_("Lower the current layer"), INKSCAPE_ICON("layer-lower")), + new LayerVerb(SP_VERB_LAYER_RAISE, "LayerRaise", N_("_Raise Layer"), N_("Raise the current layer"), + INKSCAPE_ICON("layer-raise")), + new LayerVerb(SP_VERB_LAYER_LOWER, "LayerLower", N_("_Lower Layer"), N_("Lower the current layer"), + INKSCAPE_ICON("layer-lower")), new LayerVerb(SP_VERB_LAYER_DUPLICATE, "LayerDuplicate", N_("D_uplicate Current Layer"), N_("Duplicate an existing layer"), INKSCAPE_ICON("layer-duplicate")), - new LayerVerb(SP_VERB_LAYER_DELETE, "LayerDelete", N_("_Delete Current Layer"), - N_("Delete the current layer"), INKSCAPE_ICON("layer-delete")), - new LayerVerb(SP_VERB_LAYER_SOLO, "LayerSolo", N_("_Show/hide other layers"), - N_("Solo the current layer"), nullptr), - new LayerVerb(SP_VERB_LAYER_SHOW_ALL, "LayerShowAll", N_("_Show all layers"), - N_("Show all the layers"), nullptr), - new LayerVerb(SP_VERB_LAYER_HIDE_ALL, "LayerHideAll", N_("_Hide all layers"), - N_("Hide all the layers"), nullptr), - new LayerVerb(SP_VERB_LAYER_LOCK_ALL, "LayerLockAll", N_("_Lock all layers"), - N_("Lock all the layers"), nullptr), + new LayerVerb(SP_VERB_LAYER_DELETE, "LayerDelete", N_("_Delete Current Layer"), N_("Delete the current layer"), + INKSCAPE_ICON("layer-delete")), + new LayerVerb(SP_VERB_LAYER_SOLO, "LayerSolo", N_("_Show/hide other layers"), N_("Solo the current layer"), + nullptr), + new LayerVerb(SP_VERB_LAYER_SHOW_ALL, "LayerShowAll", N_("_Show all layers"), N_("Show all the layers"), nullptr), + new LayerVerb(SP_VERB_LAYER_HIDE_ALL, "LayerHideAll", N_("_Hide all layers"), N_("Hide all the layers"), nullptr), + new LayerVerb(SP_VERB_LAYER_LOCK_ALL, "LayerLockAll", N_("_Lock all layers"), N_("Lock all the layers"), nullptr), new LayerVerb(SP_VERB_LAYER_LOCK_OTHERS, "LayerLockOthers", N_("Lock/Unlock _other layers"), - N_("Lock all the other layers"), nullptr), - new LayerVerb(SP_VERB_LAYER_UNLOCK_ALL, "LayerUnlockAll", N_("_Unlock all layers"), - N_("Unlock all the layers"), nullptr), + N_("Lock all the other layers"), nullptr), + new LayerVerb(SP_VERB_LAYER_UNLOCK_ALL, "LayerUnlockAll", N_("_Unlock all layers"), N_("Unlock all the layers"), + nullptr), new LayerVerb(SP_VERB_LAYER_TOGGLE_LOCK, "LayerToggleLock", N_("_Lock/Unlock Current Layer"), N_("Toggle lock on current layer"), nullptr), new LayerVerb(SP_VERB_LAYER_TOGGLE_HIDE, "LayerToggleHide", N_("_Show/hide Current Layer"), @@ -2905,75 +2915,74 @@ Verb *Verb::_base_verbs[] = { new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToPath", N_("_Object to Path"), N_("Convert selected object to path"), INKSCAPE_ICON("object-to-path")), new ObjectVerb(SP_VERB_OBJECT_FLOW_TEXT, "ObjectFlowText", N_("_Flow into Frame"), - N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), "text-flow-into-frame"), + N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), + "text-flow-into-frame"), new ObjectVerb(SP_VERB_OBJECT_UNFLOW_TEXT, "ObjectUnFlowText", N_("_Unflow"), N_("Remove text from frame (creates a single-line text object)"), INKSCAPE_ICON("text-unflow")), new ObjectVerb(SP_VERB_OBJECT_FLOWTEXT_TO_TEXT, "ObjectFlowtextToText", N_("_Convert to Text"), - N_("Convert flowed text to regular text object (preserves appearance)"), INKSCAPE_ICON("text-convert-to-regular")), - new ObjectVerb(SP_VERB_OBJECT_FLIP_HORIZONTAL, "ObjectFlipHorizontally", - N_("Flip _Horizontal"), N_("Flip selected objects horizontally"), - INKSCAPE_ICON("object-flip-horizontal")), - new ObjectVerb(SP_VERB_OBJECT_FLIP_VERTICAL, "ObjectFlipVertically", - N_("Flip _Vertical"), N_("Flip selected objects vertically"), - INKSCAPE_ICON("object-flip-vertical")), + N_("Convert flowed text to regular text object (preserves appearance)"), + INKSCAPE_ICON("text-convert-to-regular")), + new ObjectVerb(SP_VERB_OBJECT_FLIP_HORIZONTAL, "ObjectFlipHorizontally", N_("Flip _Horizontal"), + N_("Flip selected objects horizontally"), INKSCAPE_ICON("object-flip-horizontal")), + new ObjectVerb(SP_VERB_OBJECT_FLIP_VERTICAL, "ObjectFlipVertically", N_("Flip _Vertical"), + N_("Flip selected objects vertically"), INKSCAPE_ICON("object-flip-vertical")), new ObjectVerb(SP_VERB_OBJECT_SET_MASK, "ObjectSetMask", N_("_Set"), - N_("Apply mask to selection (using the topmost object as mask)"), nullptr), + N_("Apply mask to selection (using the topmost object as mask)"), nullptr), new ObjectVerb(SP_VERB_OBJECT_SET_INVERSE_MASK, "ObjectSetInverseMask", N_("_Set Inverse (LPE)"), - N_("Apply inverse mask to selection (using the topmost object as mask)"), nullptr), - new ObjectVerb(SP_VERB_OBJECT_EDIT_MASK, "ObjectEditMask", N_("_Edit"), - N_("Edit mask"), INKSCAPE_ICON("path-mask-edit")), - new ObjectVerb(SP_VERB_OBJECT_UNSET_MASK, "ObjectUnSetMask", N_("_Release"), - N_("Remove mask from selection"), nullptr), + N_("Apply inverse mask to selection (using the topmost object as mask)"), nullptr), + new ObjectVerb(SP_VERB_OBJECT_EDIT_MASK, "ObjectEditMask", N_("_Edit"), N_("Edit mask"), + INKSCAPE_ICON("path-mask-edit")), + new ObjectVerb(SP_VERB_OBJECT_UNSET_MASK, "ObjectUnSetMask", N_("_Release"), N_("Remove mask from selection"), + nullptr), new ObjectVerb(SP_VERB_OBJECT_SET_CLIPPATH, "ObjectSetClipPath", N_("_Set"), - N_("Apply clipping path to selection (using the topmost object as clipping path)"), nullptr), + N_("Apply clipping path to selection (using the topmost object as clipping path)"), nullptr), new ObjectVerb(SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, "ObjectSetInverseClipPath", N_("_Set Inverse (LPE)"), - N_("Apply inverse clipping path to selection (using the topmost object as clipping path)"), nullptr), + N_("Apply inverse clipping path to selection (using the topmost object as clipping path)"), nullptr), new ObjectVerb(SP_VERB_OBJECT_CREATE_CLIP_GROUP, "ObjectCreateClipGroup", N_("Create Cl_ip Group"), - N_("Creates a clip group using the selected objects as a base"), nullptr), - new ObjectVerb(SP_VERB_OBJECT_EDIT_CLIPPATH, "ObjectEditClipPath", N_("_Edit"), - N_("Edit clipping path"), INKSCAPE_ICON("path-clip-edit")), + N_("Creates a clip group using the selected objects as a base"), nullptr), + new ObjectVerb(SP_VERB_OBJECT_EDIT_CLIPPATH, "ObjectEditClipPath", N_("_Edit"), N_("Edit clipping path"), + INKSCAPE_ICON("path-clip-edit")), new ObjectVerb(SP_VERB_OBJECT_UNSET_CLIPPATH, "ObjectUnSetClipPath", N_("_Release"), - N_("Remove clipping path from selection"), nullptr), + N_("Remove clipping path from selection"), nullptr), // Tag - new TagVerb(SP_VERB_TAG_NEW, "TagNew", N_("_New"), - N_("Create new selection set"), nullptr), + new TagVerb(SP_VERB_TAG_NEW, "TagNew", N_("_New"), N_("Create new selection set"), nullptr), // Tools new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", NC_("ContextVerb", "Select"), N_("Select and transform objects"), INKSCAPE_ICON("tool-pointer")), - new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", NC_("ContextVerb", "Node Edit"), - N_("Edit paths by nodes"), INKSCAPE_ICON("tool-node-editor")), + new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", NC_("ContextVerb", "Node Edit"), N_("Edit paths by nodes"), + INKSCAPE_ICON("tool-node-editor")), new ContextVerb(SP_VERB_CONTEXT_TWEAK, "ToolTweak", NC_("ContextVerb", "Tweak"), N_("Tweak objects by sculpting or painting"), INKSCAPE_ICON("tool-tweak")), new ContextVerb(SP_VERB_CONTEXT_SPRAY, "ToolSpray", NC_("ContextVerb", "Spray"), N_("Spray objects by sculpting or painting"), INKSCAPE_ICON("tool-spray")), new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", NC_("ContextVerb", "Rectangle"), N_("Create rectangles and squares"), INKSCAPE_ICON("draw-rectangle")), - new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", NC_("ContextVerb", "3D Box"), - N_("Create 3D boxes"), INKSCAPE_ICON("draw-cuboid")), + new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", NC_("ContextVerb", "3D Box"), N_("Create 3D boxes"), + INKSCAPE_ICON("draw-cuboid")), new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", NC_("ContextVerb", "Ellipse"), N_("Create circles, ellipses, and arcs"), INKSCAPE_ICON("draw-ellipse")), - new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", NC_("ContextVerb", "Star"), - N_("Create stars and polygons"), INKSCAPE_ICON("draw-polygon-star")), - new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", NC_("ContextVerb", "Spiral"), - N_("Create spirals"), INKSCAPE_ICON("draw-spiral")), - new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", NC_("ContextVerb", "Pencil"), - N_("Draw freehand lines"), INKSCAPE_ICON("draw-freehand")), + new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", NC_("ContextVerb", "Star"), N_("Create stars and polygons"), + INKSCAPE_ICON("draw-polygon-star")), + new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", NC_("ContextVerb", "Spiral"), N_("Create spirals"), + INKSCAPE_ICON("draw-spiral")), + new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", NC_("ContextVerb", "Pencil"), N_("Draw freehand lines"), + INKSCAPE_ICON("draw-freehand")), new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", NC_("ContextVerb", "Pen"), N_("Draw Bezier curves and straight lines"), INKSCAPE_ICON("draw-path")), new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligraphic", NC_("ContextVerb", "Calligraphy"), N_("Draw calligraphic or brush strokes"), INKSCAPE_ICON("draw-calligraphic")), - new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", NC_("ContextVerb", "Text"), - N_("Create and edit text objects"), INKSCAPE_ICON("draw-text")), - new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", NC_("ContextVerb", "Gradient"), + new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", NC_("ContextVerb", "Text"), N_("Create and edit text objects"), + INKSCAPE_ICON("draw-text")), + new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", NC_("ContextVerb", "Gradient"), N_("Create and edit gradients"), INKSCAPE_ICON("color-gradient")), - new ContextVerb(SP_VERB_CONTEXT_MESH, "ToolMesh", NC_("ContextVerb", "Mesh"), - N_("Create and edit meshes"), INKSCAPE_ICON("mesh-gradient")), - new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", NC_("ContextVerb", "Zoom"), - N_("Zoom in or out"), INKSCAPE_ICON("zoom")), - new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", NC_("ContextVerb", "Measure"), - N_("Measurement tool"), INKSCAPE_ICON("tool-measure")), - new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", NC_("ContextVerb", "Dropper"), - N_("Pick colors from image"), INKSCAPE_ICON("color-picker")), + new ContextVerb(SP_VERB_CONTEXT_MESH, "ToolMesh", NC_("ContextVerb", "Mesh"), N_("Create and edit meshes"), + INKSCAPE_ICON("mesh-gradient")), + new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", NC_("ContextVerb", "Zoom"), N_("Zoom in or out"), + INKSCAPE_ICON("zoom")), + new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", NC_("ContextVerb", "Measure"), N_("Measurement tool"), + INKSCAPE_ICON("tool-measure")), + new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", NC_("ContextVerb", "Dropper"), N_("Pick colors from image"), + INKSCAPE_ICON("color-picker")), new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", NC_("ContextVerb", "Connector"), N_("Create diagram connectors"), INKSCAPE_ICON("draw-connector")), @@ -2982,10 +2991,10 @@ Verb *Verb::_base_verbs[] = { N_("Fill bounded areas"), INKSCAPE_ICON("color-fill")), #endif - new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", NC_("ContextVerb", "LPE Edit"), - N_("Edit Path Effect parameters"), nullptr), - new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", NC_("ContextVerb", "Eraser"), - N_("Erase existing paths"), INKSCAPE_ICON("draw-eraser")), + new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", NC_("ContextVerb", "LPE Edit"), N_("Edit Path Effect parameters"), + nullptr), + new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", NC_("ContextVerb", "Eraser"), N_("Erase existing paths"), + INKSCAPE_ICON("draw-eraser")), new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", NC_("ContextVerb", "LPE Tool"), N_("Do geometric constructions"), "draw-geometry"), // Tool prefs @@ -3045,58 +3054,67 @@ Verb *Verb::_base_verbs[] = { INKSCAPE_ICON("zoom-next")), new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"), INKSCAPE_ICON("zoom-previous")), - new ZoomVerb(SP_VERB_ZOOM_1_1, "Zoom1:0", N_("Zoom 1:_1"), N_("Zoom to 1:1"), - INKSCAPE_ICON("zoom-original")), - new ZoomVerb(SP_VERB_ZOOM_1_2, "Zoom1:2", N_("Zoom 1:_2"), N_("Zoom to 1:2"), - INKSCAPE_ICON("zoom-half-size")), - new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"), - INKSCAPE_ICON("zoom-double-size")), - new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"), - N_("Zoom to fit page in window"), INKSCAPE_ICON("zoom-fit-page")), - new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"), - N_("Zoom to fit page width in window"), INKSCAPE_ICON("zoom-fit-width")), - new ZoomVerb(SP_VERB_ZOOM_DRAWING, "ZoomDrawing", N_("_Drawing"), - N_("Zoom to fit drawing in window"), INKSCAPE_ICON("zoom-fit-drawing")), - new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"), - N_("Zoom to fit selection in window"), INKSCAPE_ICON("zoom-fit-selection")), - - new ZoomVerb(SP_VERB_ROTATE_CW, "RotateClockwise", N_("Rotate Clockwise"), N_("Rotate canvas clockwise"), nullptr), - new ZoomVerb(SP_VERB_ROTATE_CCW, "RotateCounterClockwise", N_("Rotate Counter-Clockwise"), N_("Rotate canvas counter-clockwise"), nullptr), - new ZoomVerb(SP_VERB_ROTATE_ZERO, "RotateZero", N_("Reset Rotation"), N_("Reset canvas rotation to zero"), nullptr), - - new ZoomVerb(SP_VERB_FLIP_HORIZONTAL, "FlipHorizontal", N_("Flip Horizontally"), N_("Flip canvas horizontally"), INKSCAPE_ICON("object-flip-horizontal")), - new ZoomVerb(SP_VERB_FLIP_VERTICAL, "FlipVertical", N_("Flip Vertically"), N_("Flip canvas vertically"), INKSCAPE_ICON("object-flip-vertical")), - new ZoomVerb(SP_VERB_FLIP_NONE, "FlipNone", N_("Reset Flip"), N_("Undo any flip"), nullptr), - - -// WHY ARE THE FOLLOWING ZoomVerbs??? + new ZoomVerb(SP_VERB_ZOOM_1_1, "Zoom1:0", N_("Zoom 1:_1"), N_("Zoom to 1:1"), INKSCAPE_ICON("zoom-original")), + new ZoomVerb(SP_VERB_ZOOM_1_2, "Zoom1:2", N_("Zoom 1:_2"), N_("Zoom to 1:2"), INKSCAPE_ICON("zoom-half-size")), + new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"), INKSCAPE_ICON("zoom-double-size")), + new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"), N_("Zoom to fit page in window"), + INKSCAPE_ICON("zoom-fit-page")), + new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"), N_("Zoom to fit page width in window"), + INKSCAPE_ICON("zoom-fit-width")), + new ZoomVerb(SP_VERB_ZOOM_DRAWING, "ZoomDrawing", N_("_Drawing"), N_("Zoom to fit drawing in window"), + INKSCAPE_ICON("zoom-fit-drawing")), + new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"), N_("Zoom to fit selection in window"), + INKSCAPE_ICON("zoom-fit-selection")), + + new ZoomVerb(SP_VERB_ROTATE_CW, "RotateClockwise", N_("Rotate Clockwise"), N_("Rotate canvas clockwise"), nullptr), + new ZoomVerb(SP_VERB_ROTATE_CCW, "RotateCounterClockwise", N_("Rotate Counter-Clockwise"), + N_("Rotate canvas counter-clockwise"), nullptr), + new ZoomVerb(SP_VERB_ROTATE_ZERO, "RotateZero", N_("Reset Rotation"), N_("Reset canvas rotation to zero"), nullptr), + + new ZoomVerb(SP_VERB_FLIP_HORIZONTAL, "FlipHorizontal", N_("Flip Horizontally"), N_("Flip canvas horizontally"), + INKSCAPE_ICON("object-flip-horizontal")), + new ZoomVerb(SP_VERB_FLIP_VERTICAL, "FlipVertical", N_("Flip Vertically"), N_("Flip canvas vertically"), + INKSCAPE_ICON("object-flip-vertical")), + new ZoomVerb(SP_VERB_FLIP_NONE, "FlipNone", N_("Reset Flip"), N_("Undo any flip"), nullptr), + + + // WHY ARE THE FOLLOWING ZoomVerbs??? // View new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), nullptr), - new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), nullptr), - new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("Page _Grid"), N_("Show or hide the page grid"), INKSCAPE_ICON("show-grid")), - new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON("show-guides")), + new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), + N_("Show or hide the canvas scrollbars"), nullptr), + new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("Page _Grid"), N_("Show or hide the page grid"), + INKSCAPE_ICON("show-grid")), + new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), + N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON("show-guides")), new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Enable snapping"), INKSCAPE_ICON("snap")), - new ZoomVerb(SP_VERB_TOGGLE_COMMANDS_TOOLBAR, "ToggleCommandsToolbar", N_("_Commands Bar"), N_("Show or hide the Commands bar (under the menu)"), nullptr), - new ZoomVerb(SP_VERB_TOGGLE_SNAP_TOOLBAR, "ToggleSnapToolbar", N_("Sn_ap Controls Bar"), N_("Show or hide the snapping controls"), nullptr), - new ZoomVerb(SP_VERB_TOGGLE_TOOL_TOOLBAR, "ToggleToolToolbar", N_("T_ool Controls Bar"), N_("Show or hide the Tool Controls bar"), nullptr), - new ZoomVerb(SP_VERB_TOGGLE_TOOLBOX, "ToggleToolbox", N_("_Toolbox"), N_("Show or hide the main toolbox (on the left)"), nullptr), - new ZoomVerb(SP_VERB_TOGGLE_PALETTE, "TogglePalette", N_("_Palette"), N_("Show or hide the color palette"), nullptr), - new ZoomVerb(SP_VERB_TOGGLE_STATUSBAR, "ToggleStatusbar", N_("_Statusbar"), N_("Show or hide the statusbar (at the bottom of the window)"), nullptr), + new ZoomVerb(SP_VERB_TOGGLE_COMMANDS_TOOLBAR, "ToggleCommandsToolbar", N_("_Commands Bar"), + N_("Show or hide the Commands bar (under the menu)"), nullptr), + new ZoomVerb(SP_VERB_TOGGLE_SNAP_TOOLBAR, "ToggleSnapToolbar", N_("Sn_ap Controls Bar"), + N_("Show or hide the snapping controls"), nullptr), + new ZoomVerb(SP_VERB_TOGGLE_TOOL_TOOLBAR, "ToggleToolToolbar", N_("T_ool Controls Bar"), + N_("Show or hide the Tool Controls bar"), nullptr), + new ZoomVerb(SP_VERB_TOGGLE_TOOLBOX, "ToggleToolbox", N_("_Toolbox"), + N_("Show or hide the main toolbox (on the left)"), nullptr), + new ZoomVerb(SP_VERB_TOGGLE_PALETTE, "TogglePalette", N_("_Palette"), N_("Show or hide the color palette"), + nullptr), + new ZoomVerb(SP_VERB_TOGGLE_STATUSBAR, "ToggleStatusbar", N_("_Statusbar"), + N_("Show or hide the statusbar (at the bottom of the window)"), nullptr), new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"), INKSCAPE_ICON("view-fullscreen")), - new ZoomVerb(SP_VERB_FULLSCREENFOCUS, "FullScreenFocus", N_("Fullscreen & Focus Mode"), N_("Stretch this document window to full screen"), - INKSCAPE_ICON("view-fullscreen")), - new ZoomVerb(SP_VERB_FOCUSTOGGLE, "FocusToggle", N_("Toggle _Focus Mode"), N_("Remove excess toolbars to focus on drawing"), - nullptr), + new ZoomVerb(SP_VERB_FULLSCREENFOCUS, "FullScreenFocus", N_("Fullscreen & Focus Mode"), + N_("Stretch this document window to full screen"), INKSCAPE_ICON("view-fullscreen")), + new ZoomVerb(SP_VERB_FOCUSTOGGLE, "FocusToggle", N_("Toggle _Focus Mode"), + N_("Remove excess toolbars to focus on drawing"), nullptr), new ZoomVerb(SP_VERB_VIEW_NEW, "ViewNew", N_("Duplic_ate Window"), N_("Open a new window with the same document"), INKSCAPE_ICON("window-new")), - new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"), - N_("New View Preview"), nullptr/*"view_new_preview"*/), + new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"), N_("New View Preview"), + nullptr /*"view_new_preview"*/), - new ZoomVerb(SP_VERB_VIEW_MODE_NORMAL, "ViewModeNormal", N_("_Normal"), - N_("Switch to normal display mode"), nullptr), + new ZoomVerb(SP_VERB_VIEW_MODE_NORMAL, "ViewModeNormal", N_("_Normal"), N_("Switch to normal display mode"), + nullptr), new ZoomVerb(SP_VERB_VIEW_MODE_NO_FILTERS, "ViewModeNoFilters", N_("No _Filters"), N_("Switch to normal display without filters"), nullptr), new ZoomVerb(SP_VERB_VIEW_MODE_OUTLINE, "ViewModeOutline", N_("_Outline"), @@ -3105,38 +3123,43 @@ Verb *Verb::_base_verbs[] = { N_("Toggle between normal and outline display modes"), nullptr), new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_NORMAL, "ViewColorModeNormal", N_("_Normal"), N_("Switch to normal color display mode"), nullptr), - new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_GRAYSCALE, "ViewColorModeGrayscale", N_("_Grayscale"), + new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_GRAYSCALE, "ViewColorModeGrayscale", N_("_Grayscale"), N_("Switch to grayscale display mode"), nullptr), -// new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), -// N_("Switch to print colors preview mode"), NULL), - new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_TOGGLE, "ViewColorModeToggle", N_("_Toggle"), + // new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print + // Colors Preview"), + // N_("Switch to print colors preview mode"), NULL), + new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_TOGGLE, "ViewColorModeToggle", N_("_Toggle"), N_("Toggle between normal and grayscale color display modes"), nullptr), new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-managed view"), N_("Toggle color-managed display for this document window"), INKSCAPE_ICON("color-management")), new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."), - N_("Open a window to preview objects at different icon resolutions"), INKSCAPE_ICON("dialog-icon-preview")), + N_("Open a window to preview objects at different icon resolutions"), + INKSCAPE_ICON("dialog-icon-preview")), // Dialogs - new DialogVerb(SP_VERB_DIALOG_PROTOTYPE, "DialogPrototype", N_("Prototype..."), - N_("Prototype Dialog"), INKSCAPE_ICON("gtk-preferences")), + new DialogVerb(SP_VERB_DIALOG_PROTOTYPE, "DialogPrototype", N_("Prototype..."), N_("Prototype Dialog"), + INKSCAPE_ICON("gtk-preferences")), new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("P_references..."), N_("Edit global Inkscape preferences"), INKSCAPE_ICON("gtk-preferences")), new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogDocumentProperties", N_("_Document Properties..."), - N_("Edit properties of this document (to be saved with the document)"), INKSCAPE_ICON("document-properties")), + N_("Edit properties of this document (to be saved with the document)"), + INKSCAPE_ICON("document-properties")), new DialogVerb(SP_VERB_DIALOG_METADATA, "DialogMetadata", N_("Document _Metadata..."), - N_("Edit document metadata (to be saved with the document)"), INKSCAPE_ICON("document-metadata") ), + N_("Edit document metadata (to be saved with the document)"), INKSCAPE_ICON("document-metadata")), new DialogVerb(SP_VERB_DIALOG_FILL_STROKE, "DialogFillStroke", N_("_Fill and Stroke..."), - N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), INKSCAPE_ICON("dialog-fill-and-stroke")), + N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), + INKSCAPE_ICON("dialog-fill-and-stroke")), // FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon - // Technically what we show are unicode code points and not glyphs. The actual glyphs shown are determined by the shaping engines. + // Technically what we show are unicode code points and not glyphs. The actual glyphs shown are determined by the + // shaping engines. new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("_Unicode Characters..."), N_("Select Unicode characters from a palette"), INKSCAPE_ICON("gtk-select-font")), // FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon // TRANSLATORS: "Swatches" means: color samples new DialogVerb(SP_VERB_DIALOG_SWATCHES, "DialogSwatches", N_("S_watches..."), - N_("Select colors from a swatches palette"), INKSCAPE_ICON("gtk-select-color")), + N_("Select colors from a swatches palette"), INKSCAPE_ICON("swatches")), new DialogVerb(SP_VERB_DIALOG_SYMBOLS, "DialogSymbols", N_("S_ymbols..."), N_("Select symbol from a symbols palette"), INKSCAPE_ICON("symbols")), new DialogVerb(SP_VERB_DIALOG_TRANSFORM, "DialogTransform", N_("Transfor_m..."), @@ -3145,74 +3168,75 @@ Verb *Verb::_base_verbs[] = { N_("Align and distribute objects"), INKSCAPE_ICON("dialog-align-and-distribute")), new DialogVerb(SP_VERB_DIALOG_SPRAY_OPTION, "DialogSprayOption", N_("_Spray options..."), N_("Some options for the spray"), INKSCAPE_ICON("dialog-spray-options")), - new DialogVerb(SP_VERB_DIALOG_UNDO_HISTORY, "DialogUndoHistory", N_("Undo _History..."), - N_("Undo History"), INKSCAPE_ICON("edit-undo-history")), + new DialogVerb(SP_VERB_DIALOG_UNDO_HISTORY, "DialogUndoHistory", N_("Undo _History..."), N_("Undo History"), + INKSCAPE_ICON("edit-undo-history")), new DialogVerb(SP_VERB_DIALOG_TEXT, "DialogText", N_("_Text and Font..."), - N_("View and select font family, font size and other text properties"), INKSCAPE_ICON("dialog-text-and-font")), + N_("View and select font family, font size and other text properties"), + INKSCAPE_ICON("dialog-text-and-font")), new DialogVerb(SP_VERB_DIALOG_XML_EDITOR, "DialogXMLEditor", N_("_XML Editor..."), N_("View and edit the XML tree of the document"), INKSCAPE_ICON("dialog-xml-editor")), - new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find/Replace..."), - N_("Find objects in document"), INKSCAPE_ICON("edit-find")), + new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find/Replace..."), N_("Find objects in document"), + INKSCAPE_ICON("edit-find")), new DialogVerb(SP_VERB_DIALOG_FINDREPLACE, "DialogFindReplace", N_("Find and _Replace Text..."), N_("Find and replace text in document"), INKSCAPE_ICON("edit-find-replace")), new DialogVerb(SP_VERB_DIALOG_SPELLCHECK, "DialogSpellcheck", N_("Check Spellin_g..."), N_("Check spelling of text in document"), INKSCAPE_ICON("tools-check-spelling")), - new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."), - N_("View debug messages"), INKSCAPE_ICON("dialog-messages")), + new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."), N_("View debug messages"), + INKSCAPE_ICON("dialog-messages")), new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"), N_("Show or hide all open dialogs"), INKSCAPE_ICON("show-dialogs")), new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogClonetiler", N_("Create Tiled Clones..."), - N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), INKSCAPE_ICON("dialog-tile-clones")), + N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), + INKSCAPE_ICON("dialog-tile-clones")), new DialogVerb(SP_VERB_DIALOG_ATTR, "DialogObjectAttributes", N_("_Object attributes..."), N_("Edit the object attributes..."), INKSCAPE_ICON("dialog-object-properties")), new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogObjectProperties", N_("_Object Properties..."), - N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON("dialog-object-properties")), + N_("Edit the ID, locked and visible status, and other object properties"), + INKSCAPE_ICON("dialog-object-properties")), new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."), - N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON("dialog-input-devices")), + N_("Configure extended input devices, such as a graphics tablet"), + INKSCAPE_ICON("dialog-input-devices")), new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."), N_("Query information about extensions"), nullptr), - new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."), - N_("View Layers"), INKSCAPE_ICON("dialog-layers")), - new DialogVerb(SP_VERB_DIALOG_OBJECTS, "DialogObjects", N_("Object_s..."), - N_("View Objects"), INKSCAPE_ICON("dialog-layers")), - new DialogVerb(SP_VERB_DIALOG_TAGS, "DialogTags", N_("Selection se_ts..."), - N_("View Tags"), INKSCAPE_ICON("edit-select-all-layers")), - new DialogVerb(SP_VERB_DIALOG_STYLE, "DialogStyle", N_("Style Dialog..."), - N_("View Style Dialog"), nullptr), - new DialogVerb(SP_VERB_DIALOG_CSS, "DialogCss", N_("Css Dialog..."), - N_("View Css Dialog"), nullptr), + new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."), N_("View Layers"), + INKSCAPE_ICON("dialog-layers")), + new DialogVerb(SP_VERB_DIALOG_OBJECTS, "DialogObjects", N_("Object_s..."), N_("View Objects"), + INKSCAPE_ICON("dialog-layers")), + new DialogVerb(SP_VERB_DIALOG_TAGS, "DialogTags", N_("Selection se_ts..."), N_("View Tags"), + INKSCAPE_ICON("edit-select-all-layers")), + new DialogVerb(SP_VERB_DIALOG_STYLE, "DialogStyle", N_("Style Dialog..."), N_("View Style Dialog"), nullptr), + new DialogVerb(SP_VERB_DIALOG_CSS, "DialogCss", N_("Css Dialog..."), N_("View Css Dialog"), nullptr), new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path E_ffects ..."), N_("Manage, edit, and apply path effects"), INKSCAPE_ICON("dialog-path-effects")), new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter _Editor..."), N_("Manage, edit, and apply SVG filters"), INKSCAPE_ICON("dialog-filters")), - new DialogVerb(SP_VERB_DIALOG_SVG_FONTS, "DialogSVGFonts", N_("SVG Font Editor..."), - N_("Edit SVG fonts"), nullptr), + new DialogVerb(SP_VERB_DIALOG_SVG_FONTS, "DialogSVGFonts", N_("SVG Font Editor..."), N_("Edit SVG fonts"), nullptr), new DialogVerb(SP_VERB_DIALOG_PRINT_COLORS_PREVIEW, "DialogPrintColorsPreview", N_("Print Colors..."), N_("Select which color separations to render in Print Colors Preview rendermode"), nullptr), new DialogVerb(SP_VERB_DIALOG_EXPORT, "DialogExport", N_("_Export PNG Image..."), - N_("Export this document or a selection as a PNG image"), INKSCAPE_ICON("document-export")), + N_("Export this document or a selection as a PNG image"), INKSCAPE_ICON("document-export")), // Help new HelpVerb(SP_VERB_HELP_ABOUT_EXTENSIONS, "HelpAboutExtensions", N_("About E_xtensions"), N_("Information on Inkscape extensions"), nullptr), - new HelpVerb(SP_VERB_HELP_MEMORY, "HelpAboutMemory", N_("About _Memory"), - N_("Memory usage information"), INKSCAPE_ICON("dialog-memory")), - new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"), - N_("Inkscape version, authors, license"), INKSCAPE_ICON("inkscape-logo")), - //new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), + new HelpVerb(SP_VERB_HELP_MEMORY, "HelpAboutMemory", N_("About _Memory"), N_("Memory usage information"), + INKSCAPE_ICON("dialog-memory")), + new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"), N_("Inkscape version, authors, license"), + INKSCAPE_ICON("inkscape-logo")), + // new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), // N_("Distribution terms"), /*"show_license"*/"inkscape_options"), // Tutorials new TutorialVerb(SP_VERB_TUTORIAL_BASIC, "TutorialsBasic", N_("Inkscape: _Basic"), - N_("Getting started with Inkscape"), nullptr/*"tutorial_basic"*/), + N_("Getting started with Inkscape"), nullptr /*"tutorial_basic"*/), new TutorialVerb(SP_VERB_TUTORIAL_SHAPES, "TutorialsShapes", N_("Inkscape: _Shapes"), N_("Using shape tools to create and edit shapes"), nullptr), new TutorialVerb(SP_VERB_TUTORIAL_ADVANCED, "TutorialsAdvanced", N_("Inkscape: _Advanced"), - N_("Advanced Inkscape topics"), nullptr/*"tutorial_advanced"*/), + N_("Advanced Inkscape topics"), nullptr /*"tutorial_advanced"*/), #if HAVE_POTRACE // TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) - new TutorialVerb(SP_VERB_TUTORIAL_TRACING, "TutorialsTracing", N_("Inkscape: T_racing"), - N_("Using bitmap tracing"), nullptr/*"tutorial_tracing"*/), + new TutorialVerb(SP_VERB_TUTORIAL_TRACING, "TutorialsTracing", N_("Inkscape: T_racing"), N_("Using bitmap tracing"), + nullptr /*"tutorial_tracing"*/), #endif new TutorialVerb(SP_VERB_TUTORIAL_TRACING_PIXELART, "TutorialsTracingPixelArt", N_("Inkscape: Tracing Pixel Art"), @@ -3220,11 +3244,11 @@ Verb *Verb::_base_verbs[] = { new TutorialVerb(SP_VERB_TUTORIAL_CALLIGRAPHY, "TutorialsCalligraphy", N_("Inkscape: _Calligraphy"), N_("Using the Calligraphy pen tool"), nullptr), new TutorialVerb(SP_VERB_TUTORIAL_INTERPOLATE, "TutorialsInterpolate", N_("Inkscape: _Interpolate"), - N_("Using the interpolate extension"), nullptr/*"tutorial_interpolate"*/), + N_("Using the interpolate extension"), nullptr /*"tutorial_interpolate"*/), new TutorialVerb(SP_VERB_TUTORIAL_DESIGN, "TutorialsDesign", N_("_Elements of Design"), - N_("Principles of design in the tutorial form"), nullptr/*"tutorial_design"*/), + N_("Principles of design in the tutorial form"), nullptr /*"tutorial_design"*/), new TutorialVerb(SP_VERB_TUTORIAL_TIPS, "TutorialsTips", N_("_Tips and Tricks"), - N_("Miscellaneous tips and tricks"), nullptr/*"tutorial_tips"*/), + N_("Miscellaneous tips and tricks"), nullptr /*"tutorial_tips"*/), // Effect -- renamed Extension new EffectLastVerb(SP_VERB_EFFECT_LAST, "EffectLast", N_("Previous Exte_nsion"), @@ -3234,59 +3258,69 @@ Verb *Verb::_base_verbs[] = { // Fit Page new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION, "FitCanvasToSelection", N_("Fit Page to Selection"), - N_("Fit the page to the current selection"), nullptr), + N_("Fit the page to the current selection"), nullptr), new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_DRAWING, "FitCanvasToDrawing", N_("Fit Page to Drawing"), - N_("Fit the page to the drawing"), nullptr), - new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING, "FitCanvasToSelectionOrDrawing", N_("_Resize Page to Selection"), - N_("Fit the page to the current selection or the drawing if there is no selection"), nullptr), + N_("Fit the page to the drawing"), nullptr), + new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING, "FitCanvasToSelectionOrDrawing", + N_("_Resize Page to Selection"), + N_("Fit the page to the current selection or the drawing if there is no selection"), nullptr), // LockAndHide new LockAndHideVerb(SP_VERB_UNLOCK_ALL, "UnlockAll", N_("Unlock All"), - N_("Unlock all objects in the current layer"), nullptr), + N_("Unlock all objects in the current layer"), nullptr), new LockAndHideVerb(SP_VERB_UNLOCK_ALL_IN_ALL_LAYERS, "UnlockAllInAllLayers", N_("Unlock All in All Layers"), - N_("Unlock all objects in all layers"), nullptr), + N_("Unlock all objects in all layers"), nullptr), new LockAndHideVerb(SP_VERB_UNHIDE_ALL, "UnhideAll", N_("Unhide All"), - N_("Unhide all objects in the current layer"), nullptr), + N_("Unhide all objects in the current layer"), nullptr), new LockAndHideVerb(SP_VERB_UNHIDE_ALL_IN_ALL_LAYERS, "UnhideAllInAllLayers", N_("Unhide All in All Layers"), - N_("Unhide all objects in all layers"), nullptr), + N_("Unhide all objects in all layers"), nullptr), // Color Management new EditVerb(SP_VERB_EDIT_LINK_COLOR_PROFILE, "LinkColorProfile", N_("Link Color Profile"), N_("Link an ICC color profile"), nullptr), new EditVerb(SP_VERB_EDIT_REMOVE_COLOR_PROFILE, "RemoveColorProfile", N_("Remove Color Profile"), N_("Remove a linked ICC color profile"), nullptr), // Scripting - new ContextVerb(SP_VERB_EDIT_ADD_EXTERNAL_SCRIPT, "AddExternalScript", - N_("Add External Script"), N_("Add an external script"), nullptr), - new ContextVerb(SP_VERB_EDIT_ADD_EMBEDDED_SCRIPT, "AddEmbeddedScript", - N_("Add Embedded Script"), N_("Add an embedded script"), nullptr), - new ContextVerb(SP_VERB_EDIT_EMBEDDED_SCRIPT, "EditEmbeddedScript", - N_("Edit Embedded Script"), N_("Edit an embedded script"), nullptr), - new ContextVerb(SP_VERB_EDIT_REMOVE_EXTERNAL_SCRIPT, "RemoveExternalScript", - N_("Remove External Script"), N_("Remove an external script"), nullptr), - new ContextVerb(SP_VERB_EDIT_REMOVE_EMBEDDED_SCRIPT, "RemoveEmbeddedScript", - N_("Remove Embedded Script"), N_("Remove an embedded script"), nullptr), - // Align - new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_RIGHT_TO_ANCHOR, "AlignHorizontalRightToAnchor", N_("Align right edges of objects to the left edge of the anchor"), - N_("Align right edges of objects to the left edge of the anchor"), INKSCAPE_ICON("align-horizontal-right-to-anchor")), - new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_LEFT, "AlignHorizontalLeft", N_("Align left edges"), - N_("Align left edges"), INKSCAPE_ICON("align-horizontal-left")), - new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_CENTER, "AlignHorizontalCenter", N_("Center on vertical axis"), - N_("Center on vertical axis"), INKSCAPE_ICON("align-horizontal-center")), - new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_RIGHT, "AlignHorizontalRight", N_("Align right sides"), - N_("Align right sides"), INKSCAPE_ICON("align-horizontal-right")), - new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_LEFT_TO_ANCHOR, "AlignHorizontalLeftToAnchor", N_("Align left edges of objects to the right edge of the anchor"), - N_("Align left edges of objects to the right edge of the anchor"), INKSCAPE_ICON("align-horizontal-left-to-anchor")), - new ContextVerb(SP_VERB_ALIGN_VERTICAL_BOTTOM_TO_ANCHOR, "AlignVerticalBottomToAnchor", N_("Align bottom edges of objects to the top edge of the anchor"), - N_("Align bottom edges of objects to the top edge of the anchor"), INKSCAPE_ICON("align-vertical-bottom-to-anchor")), - new ContextVerb(SP_VERB_ALIGN_VERTICAL_TOP, "AlignVerticalTop", N_("Align top edges"), - N_("Align top edges"), INKSCAPE_ICON("align-vertical-top")), - new ContextVerb(SP_VERB_ALIGN_VERTICAL_CENTER, "AlignVerticalCenter", N_("Center on horizontal axis"), - N_("Center on horizontal axis"), INKSCAPE_ICON("align-vertical-center")), - new ContextVerb(SP_VERB_ALIGN_VERTICAL_BOTTOM, "AlignVerticalBottom", N_("Align bottom edges"), - N_("Align bottom edges"), INKSCAPE_ICON("align-vertical-bottom")), - new ContextVerb(SP_VERB_ALIGN_VERTICAL_TOP_TO_ANCHOR, "AlignVerticalTopToAnchor", N_("Align top edges of objects to the bottom edge of the anchor"), - N_("Align top edges of objects to the bottom edge of the anchor"), INKSCAPE_ICON("align-vertical-top-to-anchor")), - new ContextVerb(SP_VERB_ALIGN_VERTICAL_HORIZONTAL_CENTER, "AlignVerticalHorizontalCenter", N_("Center on horizontal and vertical axis"), - N_("Center on horizontal and vertical axis"), INKSCAPE_ICON("align-vertical-center")), + new ContextVerb(SP_VERB_EDIT_ADD_EXTERNAL_SCRIPT, "AddExternalScript", N_("Add External Script"), + N_("Add an external script"), nullptr), + new ContextVerb(SP_VERB_EDIT_ADD_EMBEDDED_SCRIPT, "AddEmbeddedScript", N_("Add Embedded Script"), + N_("Add an embedded script"), nullptr), + new ContextVerb(SP_VERB_EDIT_EMBEDDED_SCRIPT, "EditEmbeddedScript", N_("Edit Embedded Script"), + N_("Edit an embedded script"), nullptr), + new ContextVerb(SP_VERB_EDIT_REMOVE_EXTERNAL_SCRIPT, "RemoveExternalScript", N_("Remove External Script"), + N_("Remove an external script"), nullptr), + new ContextVerb(SP_VERB_EDIT_REMOVE_EMBEDDED_SCRIPT, "RemoveEmbeddedScript", N_("Remove Embedded Script"), + N_("Remove an embedded script"), nullptr), + // Align + new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_RIGHT_TO_ANCHOR, "AlignHorizontalRightToAnchor", + N_("Align right edges of objects to the left edge of the anchor"), + N_("Align right edges of objects to the left edge of the anchor"), + INKSCAPE_ICON("align-horizontal-right-to-anchor")), + new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_LEFT, "AlignHorizontalLeft", N_("Align left edges"), + N_("Align left edges"), INKSCAPE_ICON("align-horizontal-left")), + new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_CENTER, "AlignHorizontalCenter", N_("Center on vertical axis"), + N_("Center on vertical axis"), INKSCAPE_ICON("align-horizontal-center")), + new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_RIGHT, "AlignHorizontalRight", N_("Align right sides"), + N_("Align right sides"), INKSCAPE_ICON("align-horizontal-right")), + new ContextVerb(SP_VERB_ALIGN_HORIZONTAL_LEFT_TO_ANCHOR, "AlignHorizontalLeftToAnchor", + N_("Align left edges of objects to the right edge of the anchor"), + N_("Align left edges of objects to the right edge of the anchor"), + INKSCAPE_ICON("align-horizontal-left-to-anchor")), + new ContextVerb(SP_VERB_ALIGN_VERTICAL_BOTTOM_TO_ANCHOR, "AlignVerticalBottomToAnchor", + N_("Align bottom edges of objects to the top edge of the anchor"), + N_("Align bottom edges of objects to the top edge of the anchor"), + INKSCAPE_ICON("align-vertical-bottom-to-anchor")), + new ContextVerb(SP_VERB_ALIGN_VERTICAL_TOP, "AlignVerticalTop", N_("Align top edges"), N_("Align top edges"), + INKSCAPE_ICON("align-vertical-top")), + new ContextVerb(SP_VERB_ALIGN_VERTICAL_CENTER, "AlignVerticalCenter", N_("Center on horizontal axis"), + N_("Center on horizontal axis"), INKSCAPE_ICON("align-vertical-center")), + new ContextVerb(SP_VERB_ALIGN_VERTICAL_BOTTOM, "AlignVerticalBottom", N_("Align bottom edges"), + N_("Align bottom edges"), INKSCAPE_ICON("align-vertical-bottom")), + new ContextVerb(SP_VERB_ALIGN_VERTICAL_TOP_TO_ANCHOR, "AlignVerticalTopToAnchor", + N_("Align top edges of objects to the bottom edge of the anchor"), + N_("Align top edges of objects to the bottom edge of the anchor"), + INKSCAPE_ICON("align-vertical-top-to-anchor")), + new ContextVerb(SP_VERB_ALIGN_VERTICAL_HORIZONTAL_CENTER, "AlignVerticalHorizontalCenter", + N_("Center on horizontal and vertical axis"), N_("Center on horizontal and vertical axis"), + INKSCAPE_ICON("align-vertical-center")), // Footer diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 19443716cec..83094c1566a 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -15,9 +15,10 @@ #include "button.h" #include "helper/action-context.h" -#include "ui/interface.h" -#include "shortcuts.h" #include "helper/action.h" +#include "helper/icon-loader.h" +#include "shortcuts.h" +#include "ui/interface.h" static void sp_button_dispose(GObject *object); static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -211,7 +212,7 @@ static void sp_button_set_action(SPButton *button, SPAction *action) button->c_set_sensitive = action->signal_set_sensitive.connect( sigc::bind<0>(sigc::ptr_fun(>k_widget_set_sensitive), GTK_WIDGET(button))); if (action->image) { - child = gtk_image_new_from_icon_name(action->image, button->lsize); + child = GTK_WIDGET(sp_get_icon_image(action->image, "/toolbox/tools/small")->gobj()); gtk_widget_show(child); gtk_container_add(GTK_CONTAINER(button), child); } diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp index 5b71110b221..927b6aec0fd 100644 --- a/src/widgets/ege-adjustment-action.cpp +++ b/src/widgets/ege-adjustment-action.cpp @@ -50,9 +50,10 @@ #include #include -#include "widgets/ege-adjustment-action.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" #include "ui/widget/ink-spinscale.h" +#include "widgets/ege-adjustment-action.h" static void ege_adjustment_action_finalize( GObject* object ); static void ege_adjustment_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec ); @@ -864,7 +865,8 @@ static GtkWidget* create_tool_item( GtkAction* action ) /* Use an icon if available or use short-label */ if ( act->private_data->iconId && strcmp( act->private_data->iconId, "" ) != 0 ) { - GtkWidget* icon = gtk_image_new_from_icon_name( act->private_data->iconId, act->private_data->iconSize ); + GtkWidget *icon = + GTK_WIDGET(sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize)->gobj()); gtk_box_pack_start( GTK_BOX(hb), icon, FALSE, FALSE, 0 ); } else { GtkWidget* lbl = gtk_label_new( g_value_get_string( &value ) ? g_value_get_string( &value ) : "wwww" ); diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp index 230282e6d42..10b1ecf04e3 100644 --- a/src/widgets/gradient-selector.cpp +++ b/src/widgets/gradient-selector.cpp @@ -35,6 +35,7 @@ #include "style.h" #include "helper/action.h" +#include "helper/icon-loader.h" #include "ui/icon-names.h" @@ -98,7 +99,7 @@ static void sp_gradient_selector_class_init(SPGradientSelectorClass *klass) static void gradsel_style_button(GtkWidget *gtkbtn, char const *iconName) { Gtk::Button *btn = Glib::wrap(GTK_BUTTON(gtkbtn)); - GtkWidget *child = gtk_image_new_from_icon_name(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *child = GTK_WIDGET(sp_get_icon_image(iconName, GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_widget_show(child); btn->add(*manage(Glib::wrap(child))); btn->set_relief(Gtk::RELIEF_NONE); diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp index 5adb69ac67c..ee647840348 100644 --- a/src/widgets/ink-action.cpp +++ b/src/widgets/ink-action.cpp @@ -1,5 +1,5 @@ #include "ink-action.h" - +#include "helper/icon-loader.h" #include static void ink_action_finalize( GObject* obj ); @@ -161,7 +161,8 @@ static GtkWidget* ink_action_create_tool_item( GtkAction* action ) if ( GTK_IS_TOOL_BUTTON(item) ) { GtkToolButton* button = GTK_TOOL_BUTTON(item); - GtkWidget* child = gtk_image_new_from_icon_name( act->private_data->iconId, act->private_data->iconSize ); + GtkWidget *child = + GTK_WIDGET(sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize)->gobj()); gtk_tool_button_set_icon_widget( button, child ); } else { // For now trigger a warning but don't do anything else diff --git a/src/widgets/ink-radio-action.cpp b/src/widgets/ink-radio-action.cpp index 611e0c6248a..d0bff127188 100644 --- a/src/widgets/ink-radio-action.cpp +++ b/src/widgets/ink-radio-action.cpp @@ -1,4 +1,5 @@ #include "ink-radio-action.h" +#include "helper/icon-loader.h" static void ink_radio_action_finalize( GObject* obj ); static void ink_radio_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec ); @@ -157,9 +158,10 @@ static GtkWidget* ink_radio_action_create_tool_item( GtkAction* action ) if ( GTK_IS_TOOL_BUTTON(item) ) { GtkToolButton* button = GTK_TOOL_BUTTON(item); - GtkWidget* child = gtk_image_new_from_icon_name( act->private_data->iconId, act->private_data->iconSize ); - gtk_widget_set_hexpand(child, FALSE); - gtk_widget_set_vexpand(child, FALSE); + GtkWidget *child = + GTK_WIDGET(sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize)->gobj()); + gtk_widget_set_hexpand(child, FALSE); + gtk_widget_set_vexpand(child, FALSE); gtk_tool_button_set_icon_widget(button, child); } else { // For now trigger a warning but don't do anything else diff --git a/src/widgets/ink-toggle-action.cpp b/src/widgets/ink-toggle-action.cpp index 467f0f24c5b..77dc39c3d66 100644 --- a/src/widgets/ink-toggle-action.cpp +++ b/src/widgets/ink-toggle-action.cpp @@ -1,4 +1,5 @@ #include "ink-toggle-action.h" +#include "helper/icon-loader.h" static void ink_toggle_action_finalize( GObject* obj ); static void ink_toggle_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec ); @@ -163,11 +164,12 @@ static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action ) if ( GTK_IS_TOOL_BUTTON(item) ) { GtkToolButton* button = GTK_TOOL_BUTTON(item); if ( act->private_data->iconId ) { - GtkWidget* child = gtk_image_new_from_icon_name( act->private_data->iconId, act->private_data->iconSize ); + GtkWidget *child = + GTK_WIDGET(sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize)->gobj()); - gtk_widget_set_hexpand(child, FALSE); - gtk_widget_set_vexpand(child, FALSE); - gtk_tool_button_set_icon_widget(button, child); + gtk_widget_set_hexpand(child, FALSE); + gtk_widget_set_vexpand(child, FALSE); + gtk_tool_button_set_icon_widget(button, child); } else { gchar *label = nullptr; g_object_get( G_OBJECT(action), "short_label", &label, NULL ); @@ -195,11 +197,12 @@ static void ink_toggle_action_update_icon( InkToggleAction* action ) if ( GTK_IS_TOOL_BUTTON(proxies->data) ) { GtkToolButton* button = GTK_TOOL_BUTTON(proxies->data); - GtkWidget* child = gtk_image_new_from_icon_name( action->private_data->iconId, action->private_data->iconSize ); - gtk_widget_set_hexpand(child, FALSE); - gtk_widget_set_vexpand(child, FALSE); - gtk_widget_show_all(child); - gtk_tool_button_set_icon_widget(button, child); + GtkWidget *child = GTK_WIDGET( + sp_get_icon_image(action->private_data->iconId, action->private_data->iconSize)->gobj()); + gtk_widget_set_hexpand(child, FALSE); + gtk_widget_set_vexpand(child, FALSE); + gtk_widget_show_all(child); + gtk_tool_button_set_icon_widget(button, child); } } diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 3fcd40bdf92..3b93f20f5b9 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -34,6 +34,7 @@ #include "paint-selector.h" #include "path-prefix.h" +#include "helper/icon-loader.h" #include "helper/stock-items.h" #include "style.h" @@ -243,7 +244,7 @@ sp_paint_selector_init(SPPaintSelector *psel) // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty gtk_widget_set_tooltip_text(psel->evenodd, _("Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)")); g_object_set_data(G_OBJECT(psel->evenodd), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_EVENODD)); - w = gtk_image_new_from_icon_name("fill-rule-even-odd", GTK_ICON_SIZE_MENU); + w = GTK_WIDGET(sp_get_icon_image("fill-rule-even-odd", GTK_ICON_SIZE_MENU)->gobj()); gtk_container_add(GTK_CONTAINER(psel->evenodd), w); gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->evenodd, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(psel->evenodd), "toggled", G_CALLBACK(sp_paint_selector_fillrule_toggled), psel); @@ -254,7 +255,7 @@ sp_paint_selector_init(SPPaintSelector *psel) // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty gtk_widget_set_tooltip_text(psel->nonzero, _("Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)")); g_object_set_data(G_OBJECT(psel->nonzero), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_NONZERO)); - w = gtk_image_new_from_icon_name("fill-rule-nonzero", GTK_ICON_SIZE_MENU); + w = GTK_WIDGET(sp_get_icon_image("fill-rule-nonzero", GTK_ICON_SIZE_MENU)->gobj()); gtk_container_add(GTK_CONTAINER(psel->nonzero), w); gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->nonzero, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(psel->nonzero), "toggled", G_CALLBACK(sp_paint_selector_fillrule_toggled), psel); @@ -323,8 +324,7 @@ static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel, gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(b), FALSE); g_object_set_data(G_OBJECT(b), "mode", GUINT_TO_POINTER(mode)); - w = gtk_image_new_from_icon_name(pixmap, GTK_ICON_SIZE_BUTTON); - gtk_widget_show(w); + w = GTK_WIDGET(sp_get_icon_image(pixmap, GTK_ICON_SIZE_BUTTON)->gobj()); gtk_container_add(GTK_CONTAINER(b), w); gtk_box_pack_start(GTK_BOX(psel->style), b, FALSE, FALSE, 0); diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 191d215f30d..dfa8614a1dc 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -25,6 +25,7 @@ #include "path-prefix.h" #include "stroke-style.h" +#include "helper/icon-loader.h" #include "helper/stock-items.h" #include "io/sys.h" @@ -55,8 +56,7 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) : set_cell_data_func(image_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareImageRenderer)); gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(gobj()), MarkerComboBox::separator_cb, nullptr, nullptr); - empty_image = new Gtk::Image(); - empty_image->set_from_icon_name("no-marker", Gtk::ICON_SIZE_SMALL_TOOLBAR); + empty_image = sp_get_icon_image("no-marker", Gtk::ICON_SIZE_SMALL_TOOLBAR); sandbox = ink_markers_preview_doc (); desktop = SP_ACTIVE_DESKTOP; diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 9f702a3c4c5..3a5abbca43f 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -28,6 +28,7 @@ #include "svg/svg-color.h" +#include "helper/icon-loader.h" #include "ui/widget/unit-menu.h" #include "widgets/style-utils.h" @@ -120,8 +121,7 @@ StrokeStyle::StrokeStyleButton::StrokeStyleButton(Gtk::RadioButtonGroup &grp, show(); set_mode(false); - auto px = Gtk::manage(new Gtk::Image()); - px->set_from_icon_name(icon, Gtk::ICON_SIZE_LARGE_TOOLBAR); + auto px = Gtk::manage(sp_get_icon_image(icon, Gtk::ICON_SIZE_LARGE_TOOLBAR)); g_assert(px != nullptr); px->show(); add(*px); -- GitLab From f67117fb92a029282412e02634b280ef5607273f Mon Sep 17 00:00:00 2001 From: Jabiertxo Arraiza Cenoz Date: Wed, 18 Jul 2018 18:35:12 +0200 Subject: [PATCH 2/7] Code cleanup and harkoded values temporaly to show as symbolic --- po/inkscape.pot | 1510 +++++++++---------- src/helper/icon-loader.cpp | 3 + src/live_effects/parameter/togglebutton.cpp | 4 +- src/ui/widget/anchor-selector.cpp | 2 +- 4 files changed, 761 insertions(+), 758 deletions(-) diff --git a/po/inkscape.pot b/po/inkscape.pot index 2272d15a117..e40a1f8b825 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -4477,7 +4477,7 @@ msgstr "" #: ../src/display/canvas-axonomgrid.cpp:336 #: ../src/ui/dialog/inkscape-preferences.cpp:869 -#: ../src/ui/toolbar/box3d-toolbar.cpp:306 +#: ../src/widgets/box3d-toolbar.cpp:306 msgid "Angle X:" msgstr "" @@ -4488,7 +4488,7 @@ msgstr "" #: ../src/display/canvas-axonomgrid.cpp:338 #: ../src/ui/dialog/inkscape-preferences.cpp:870 -#: ../src/ui/toolbar/box3d-toolbar.cpp:385 +#: ../src/widgets/box3d-toolbar.cpp:385 msgid "Angle Z:" msgstr "" @@ -4983,9 +4983,9 @@ msgstr "" #: ../src/ui/dialog/object-attributes.cpp:68 #: ../src/ui/dialog/object-attributes.cpp:77 #: ../src/ui/widget/page-sizer.cpp:231 -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:401 -#: ../src/ui/toolbar/eraser-toolbar.cpp:191 ../src/ui/toolbar/spray-toolbar.cpp:297 -#: ../src/ui/toolbar/tweak-toolbar.cpp:132 ../share/extensions/foldablebox.inx.h:2 +#: ../src/widgets/calligraphy-toolbar.cpp:401 +#: ../src/widgets/eraser-toolbar.cpp:191 ../src/widgets/spray-toolbar.cpp:297 +#: ../src/widgets/tweak-toolbar.cpp:132 ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "" @@ -4999,7 +4999,7 @@ msgid "Height:" msgstr "" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 -#: ../src/ui/toolbar/measure-toolbar.cpp:349 +#: ../src/widgets/measure-toolbar.cpp:349 #: ../share/extensions/printing_marks.inx.h:12 msgid "Offset:" msgstr "" @@ -5248,7 +5248,7 @@ msgstr "" #: ../src/extension/internal/bitmap/cycleColormap.cpp:39 #: ../src/extension/internal/bitmap/spread.cpp:39 #: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/ui/toolbar/spray-toolbar.cpp:409 +#: ../src/widgets/spray-toolbar.cpp:409 msgid "Amount:" msgstr "" @@ -5423,14 +5423,14 @@ msgstr "" #: ../src/extension/internal/filter/blurs.h:333 #: ../src/extension/internal/filter/transparency.h:279 #: ../src/ui/dialog/clonetiler.cpp:799 ../src/ui/dialog/clonetiler.cpp:930 -#: ../src/ui/toolbar/tweak-toolbar.cpp:328 +#: ../src/widgets/tweak-toolbar.cpp:328 #: ../share/extensions/interp_att_g.inx.h:20 msgid "Opacity" msgstr "" #: ../src/extension/internal/bitmap/opacity.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:2808 -#: ../src/ui/toolbar/dropper-toolbar.cpp:83 +#: ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "" @@ -5538,7 +5538,7 @@ msgstr "" #: ../src/extension/internal/bitmap/threshold.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:46 -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:163 +#: ../src/widgets/paintbucket-toolbar.cpp:163 msgid "Threshold:" msgstr "" @@ -6299,7 +6299,7 @@ msgstr "" #: ../src/extension/internal/filter/bumps.h:98 #: ../src/extension/internal/filter/bumps.h:329 #: ../src/ui/tools/measure-tool.cpp:1236 ../src/ui/widget/page-sizer.cpp:232 -#: ../src/ui/toolbar/rect-toolbar.cpp:341 +#: ../src/widgets/rect-toolbar.cpp:341 #: ../share/extensions/interp_att_g.inx.h:15 msgid "Height" msgstr "" @@ -6315,14 +6315,14 @@ msgstr "" #: ../src/ui/tools/flood-tool.cpp:97 #: ../src/ui/widget/color-icc-selector.cpp:167 #: ../src/ui/widget/color-scales.cpp:412 ../src/ui/widget/color-scales.cpp:413 -#: ../src/ui/toolbar/tweak-toolbar.cpp:312 +#: ../src/widgets/tweak-toolbar.cpp:312 msgid "Lightness" msgstr "" #: ../src/extension/internal/filter/bumps.h:100 #: ../src/extension/internal/filter/bumps.h:331 #: ../src/live_effects/lpe-measure-segments.cpp:67 -#: ../src/ui/toolbar/measure-toolbar.cpp:323 +#: ../src/widgets/measure-toolbar.cpp:323 msgid "Precision" msgstr "" @@ -6517,7 +6517,7 @@ msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:168 #: ../src/ui/widget/color-scales.cpp:408 ../src/ui/widget/color-scales.cpp:409 #: ../src/ui/widget/color-scales.cpp:444 ../src/ui/widget/color-scales.cpp:445 -#: ../src/ui/toolbar/tweak-toolbar.cpp:296 +#: ../src/widgets/tweak-toolbar.cpp:296 msgid "Saturation" msgstr "" @@ -6820,8 +6820,8 @@ msgstr "" #: ../src/live_effects/effect.cpp:145 #: ../src/live_effects/lpe-transform_2pts.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:1032 -#: ../src/ui/toolbar/gradient-toolbar.cpp:1053 -#: ../src/ui/toolbar/measure-toolbar.cpp:349 +#: ../src/widgets/gradient-toolbar.cpp:1053 +#: ../src/widgets/measure-toolbar.cpp:349 msgid "Offset" msgstr "" @@ -6966,7 +6966,7 @@ msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:166 #: ../src/ui/widget/color-scales.cpp:403 ../src/ui/widget/color-scales.cpp:404 #: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 -#: ../src/ui/toolbar/tweak-toolbar.cpp:280 +#: ../src/widgets/tweak-toolbar.cpp:280 msgid "Hue" msgstr "" @@ -7201,8 +7201,8 @@ msgstr "" #: ../src/extension/internal/filter/morphology.h:65 #: ../src/ui/tools/measure-tool.cpp:1242 ../src/ui/widget/page-sizer.cpp:231 -#: ../src/ui/toolbar/rect-toolbar.cpp:325 ../src/ui/toolbar/spray-toolbar.cpp:297 -#: ../src/ui/toolbar/tweak-toolbar.cpp:132 +#: ../src/widgets/rect-toolbar.cpp:325 ../src/widgets/spray-toolbar.cpp:297 +#: ../src/widgets/tweak-toolbar.cpp:132 #: ../share/extensions/interp_att_g.inx.h:14 msgid "Width" msgstr "" @@ -9014,11 +9014,11 @@ msgstr "" #: ../src/live_effects/effect.cpp:124 #: ../src/live_effects/lpe-show_handles.cpp:30 -#: ../src/ui/toolbar/mesh-toolbar.cpp:513 +#: ../src/widgets/mesh-toolbar.cpp:513 msgid "Show handles" msgstr "" -#: ../src/live_effects/effect.cpp:126 ../src/ui/toolbar/pencil-toolbar.cpp:149 +#: ../src/live_effects/effect.cpp:126 ../src/widgets/pencil-toolbar.cpp:149 msgid "BSpline" msgstr "" @@ -10009,7 +10009,7 @@ msgid "Reverses the second path order" msgstr "" #: ../src/live_effects/lpe-fillet-chamfer.cpp:31 -#: ../src/ui/toolbar/text-toolbar.cpp:2211 +#: ../src/widgets/text-toolbar.cpp:2211 #: ../share/extensions/render_barcode_qrcode.inx.h:5 msgid "Auto" msgstr "" @@ -10200,7 +10200,7 @@ msgstr "" #: ../src/live_effects/lpe-jointype.cpp:47 #: ../src/live_effects/lpe-powerstroke.cpp:161 #: ../src/live_effects/lpe-taperstroke.cpp:63 -#: ../src/ui/toolbar/star-toolbar.cpp:564 +#: ../src/widgets/star-toolbar.cpp:564 msgid "Rounded" msgstr "" @@ -10593,7 +10593,7 @@ msgid "Hide Points" msgstr "" #: ../src/live_effects/lpe-measure-segments.cpp:55 -#: ../src/ui/toolbar/text-toolbar.cpp:2168 +#: ../src/widgets/text-toolbar.cpp:2168 msgid "Horizontal" msgstr "" @@ -10762,8 +10762,8 @@ msgstr "" #. Name #: ../src/live_effects/lpe-mirror_symmetry.cpp:55 -#: ../src/ui/toolbar/eraser-toolbar.cpp:170 ../src/ui/toolbar/pencil-toolbar.cpp:172 -#: ../src/ui/toolbar/spray-toolbar.cpp:389 ../src/ui/toolbar/tweak-toolbar.cpp:248 +#: ../src/widgets/eraser-toolbar.cpp:170 ../src/widgets/pencil-toolbar.cpp:172 +#: ../src/widgets/spray-toolbar.cpp:389 ../src/widgets/tweak-toolbar.cpp:248 msgid "Mode" msgstr "" @@ -11036,7 +11036,7 @@ msgid "Zero width" msgstr "" #: ../src/live_effects/lpe-powerstroke.cpp:165 -#: ../src/ui/toolbar/pencil-toolbar.cpp:143 +#: ../src/widgets/pencil-toolbar.cpp:143 msgid "Spiro" msgstr "" @@ -11456,13 +11456,13 @@ msgstr "" #: ../src/live_effects/lpe-ruler.cpp:30 #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#: ../src/ui/tools/measure-tool.cpp:765 ../src/ui/toolbar/arc-toolbar.cpp:499 +#: ../src/ui/tools/measure-tool.cpp:765 ../src/widgets/arc-toolbar.cpp:499 msgid "Start" msgstr "" #: ../src/live_effects/lpe-ruler.cpp:31 #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#: ../src/ui/tools/measure-tool.cpp:766 ../src/ui/toolbar/arc-toolbar.cpp:512 +#: ../src/ui/tools/measure-tool.cpp:766 ../src/widgets/arc-toolbar.cpp:512 msgid "End" msgstr "" @@ -12007,7 +12007,7 @@ msgid "Link to path" msgstr "" #: ../src/live_effects/parameter/originalpatharray.cpp:90 -#: ../src/ui/toolbar/gradient-toolbar.cpp:1099 +#: ../src/widgets/gradient-toolbar.cpp:1099 msgid "Reverse" msgstr "" @@ -12490,11 +12490,11 @@ msgstr "" msgid "without URI" msgstr "" -#: ../src/object/sp-ellipse.cpp:389 ../src/ui/toolbar/arc-toolbar.cpp:531 +#: ../src/object/sp-ellipse.cpp:389 ../src/widgets/arc-toolbar.cpp:531 msgid "Slice" msgstr "" -#: ../src/object/sp-ellipse.cpp:392 ../src/ui/toolbar/arc-toolbar.cpp:543 +#: ../src/object/sp-ellipse.cpp:392 ../src/widgets/arc-toolbar.cpp:543 msgid "Chord" msgstr "" @@ -12505,7 +12505,7 @@ msgstr "" #. Ellipse #: ../src/object/sp-ellipse.cpp:399 ../src/object/sp-ellipse.cpp:406 #: ../src/ui/dialog/inkscape-preferences.cpp:452 -#: ../src/ui/toolbar/pencil-toolbar.cpp:229 +#: ../src/widgets/pencil-toolbar.cpp:229 msgid "Ellipse" msgstr "" @@ -12715,11 +12715,11 @@ msgstr "" #. Star #: ../src/object/sp-star.cpp:229 ../src/ui/dialog/inkscape-preferences.cpp:456 -#: ../src/ui/toolbar/star-toolbar.cpp:497 +#: ../src/widgets/star-toolbar.cpp:497 msgid "Star" msgstr "" -#: ../src/object/sp-star.cpp:230 ../src/ui/toolbar/star-toolbar.cpp:491 +#: ../src/object/sp-star.cpp:230 ../src/widgets/star-toolbar.cpp:491 msgid "Polygon" msgstr "" @@ -13137,10 +13137,10 @@ msgid "Nothing was deleted." msgstr "" #: ../src/selection-chemistry.cpp:420 ../src/ui/dialog/swatches.cpp:285 -#: ../src/ui/tools/text-tool.cpp:959 ../src/ui/toolbar/eraser-toolbar.cpp:151 -#: ../src/ui/toolbar/gradient-toolbar.cpp:1075 -#: ../src/ui/toolbar/gradient-toolbar.cpp:1089 -#: ../src/ui/toolbar/gradient-toolbar.cpp:1103 ../src/ui/toolbar/node-toolbar.cpp:404 +#: ../src/ui/tools/text-tool.cpp:959 ../src/widgets/eraser-toolbar.cpp:151 +#: ../src/widgets/gradient-toolbar.cpp:1075 +#: ../src/widgets/gradient-toolbar.cpp:1089 +#: ../src/widgets/gradient-toolbar.cpp:1103 ../src/widgets/node-toolbar.cpp:404 msgid "Delete" msgstr "" @@ -14282,12 +14282,12 @@ msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:500 #: ../src/ui/dialog/align-and-distribute.cpp:930 -#: ../src/ui/toolbar/connector-toolbar.cpp:412 +#: ../src/widgets/connector-toolbar.cpp:412 msgid "Remove overlaps" msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:532 -#: ../src/ui/toolbar/connector-toolbar.cpp:238 +#: ../src/widgets/connector-toolbar.cpp:238 msgid "Arrange connector network" msgstr "" @@ -14429,7 +14429,7 @@ msgid "Distribute baselines of texts vertically" msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:1023 -#: ../src/ui/toolbar/connector-toolbar.cpp:374 +#: ../src/widgets/connector-toolbar.cpp:374 msgid "Nicely arrange selected connector network" msgstr "" @@ -15666,7 +15666,7 @@ msgstr "" #. Name #: ../src/ui/dialog/document-properties.cpp:852 -#: ../src/ui/dialog/objects.cpp:1887 ../src/ui/toolbar/gradient-toolbar.cpp:879 +#: ../src/ui/dialog/objects.cpp:1887 ../src/widgets/gradient-toolbar.cpp:879 msgid "New" msgstr "" @@ -15756,8 +15756,8 @@ msgstr "" msgid "_Custom" msgstr "" -#: ../src/ui/dialog/export.cpp:139 ../src/ui/toolbar/measure-toolbar.cpp:307 -#: ../src/ui/toolbar/measure-toolbar.cpp:315 +#: ../src/ui/dialog/export.cpp:139 ../src/widgets/measure-toolbar.cpp:307 +#: ../src/widgets/measure-toolbar.cpp:315 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" msgstr "" @@ -17885,7 +17885,7 @@ msgstr "" #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 #: ../src/ui/widget/page-sizer.cpp:229 ../src/widgets/desktop-widget.cpp:655 -#: ../src/ui/toolbar/node-toolbar.cpp:584 +#: ../src/widgets/node-toolbar.cpp:584 msgid "X:" msgstr "" @@ -17897,7 +17897,7 @@ msgstr "" #: ../src/ui/dialog/object-attributes.cpp:67 #: ../src/ui/dialog/object-attributes.cpp:76 #: ../src/ui/widget/page-sizer.cpp:230 ../src/widgets/desktop-widget.cpp:656 -#: ../src/ui/toolbar/node-toolbar.cpp:601 +#: ../src/widgets/node-toolbar.cpp:601 msgid "Y:" msgstr "" @@ -20003,7 +20003,7 @@ msgstr "" #. Transforms options #: ../src/ui/dialog/inkscape-preferences.cpp:1258 -#: ../src/ui/toolbar/select-toolbar.cpp:563 +#: ../src/widgets/select-toolbar.cpp:563 msgid "Scale stroke width" msgstr "" @@ -20024,22 +20024,22 @@ msgid "Preserved" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1266 -#: ../src/ui/toolbar/select-toolbar.cpp:564 +#: ../src/widgets/select-toolbar.cpp:564 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1268 -#: ../src/ui/toolbar/select-toolbar.cpp:575 +#: ../src/widgets/select-toolbar.cpp:575 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1270 -#: ../src/ui/toolbar/select-toolbar.cpp:586 +#: ../src/widgets/select-toolbar.cpp:586 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1272 -#: ../src/ui/toolbar/select-toolbar.cpp:597 +#: ../src/widgets/select-toolbar.cpp:597 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "" @@ -20594,7 +20594,7 @@ msgstr "" #. Note: /options/bitmapoversample removed with Cairo renderer #: ../src/ui/dialog/inkscape-preferences.cpp:1535 ../src/verbs.cpp:161 -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:606 +#: ../src/widgets/calligraphy-toolbar.cpp:606 msgid "Edit" msgstr "" @@ -20968,9 +20968,9 @@ msgid "" "or to a single (usually focused) 'Window'" msgstr "" -#: ../src/ui/dialog/input.cpp:1443 ../src/ui/toolbar/calligraphy-toolbar.cpp:549 -#: ../src/ui/toolbar/spray-toolbar.cpp:311 ../src/ui/toolbar/spray-toolbar.cpp:425 -#: ../src/ui/toolbar/spray-toolbar.cpp:474 ../src/ui/toolbar/tweak-toolbar.cpp:366 +#: ../src/ui/dialog/input.cpp:1443 ../src/widgets/calligraphy-toolbar.cpp:549 +#: ../src/widgets/spray-toolbar.cpp:311 ../src/widgets/spray-toolbar.cpp:425 +#: ../src/widgets/spray-toolbar.cpp:474 ../src/widgets/tweak-toolbar.cpp:366 msgid "Pressure" msgstr "" @@ -23270,12 +23270,12 @@ msgid "Duplicate nodes" msgstr "" #: ../src/ui/tool/multi-path-manipulator.cpp:417 -#: ../src/ui/toolbar/node-toolbar.cpp:411 +#: ../src/widgets/node-toolbar.cpp:411 msgid "Join nodes" msgstr "" #: ../src/ui/tool/multi-path-manipulator.cpp:424 -#: ../src/ui/toolbar/node-toolbar.cpp:422 +#: ../src/widgets/node-toolbar.cpp:422 msgid "Break nodes" msgstr "" @@ -23528,7 +23528,7 @@ msgid "Rotate handle" msgstr "" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1563 ../src/ui/toolbar/node-toolbar.cpp:400 +#: ../src/ui/tool/path-manipulator.cpp:1563 ../src/widgets/node-toolbar.cpp:400 msgid "Delete node" msgstr "" @@ -23875,12 +23875,12 @@ msgid "Select at least one non-connector object." msgstr "" #: ../src/ui/tools/connector-tool.cpp:1320 -#: ../src/ui/toolbar/connector-toolbar.cpp:315 +#: ../src/widgets/connector-toolbar.cpp:315 msgid "Make connectors avoid selected objects" msgstr "" #: ../src/ui/tools/connector-tool.cpp:1321 -#: ../src/ui/toolbar/connector-toolbar.cpp:325 +#: ../src/widgets/connector-toolbar.cpp:325 msgid "Make connectors ignore selected objects" msgstr "" @@ -24509,11 +24509,11 @@ msgstr "" msgid "Nothing selected! Select objects to spray." msgstr "" -#: ../src/ui/tools/spray-tool.cpp:1355 ../src/ui/toolbar/spray-toolbar.cpp:362 +#: ../src/ui/tools/spray-tool.cpp:1355 ../src/widgets/spray-toolbar.cpp:362 msgid "Spray with copies" msgstr "" -#: ../src/ui/tools/spray-tool.cpp:1359 ../src/ui/toolbar/spray-toolbar.cpp:368 +#: ../src/ui/tools/spray-tool.cpp:1359 ../src/widgets/spray-toolbar.cpp:368 msgid "Spray with clones" msgstr "" @@ -24979,7 +24979,7 @@ msgid "Style" msgstr "" #: ../src/ui/widget/font-selector.cpp:34 ../src/ui/widget/font-selector.cpp:134 -#: ../src/ui/toolbar/text-toolbar.cpp:1587 ../src/ui/toolbar/text-toolbar.cpp:2044 +#: ../src/widgets/text-toolbar.cpp:1587 ../src/widgets/text-toolbar.cpp:2044 msgid "Font size" msgstr "" @@ -28372,554 +28372,554 @@ msgstr "" msgid "Center on horizontal and vertical axis" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:144 +#: ../src/widgets/arc-toolbar.cpp:144 msgid "Change arc" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:210 +#: ../src/widgets/arc-toolbar.cpp:210 msgid "Arc: Change start/end" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:278 +#: ../src/widgets/arc-toolbar.cpp:278 msgid "Arc: Changed arc type" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:413 ../src/ui/toolbar/arc-toolbar.cpp:452 -#: ../src/ui/toolbar/rect-toolbar.cpp:268 ../src/ui/toolbar/rect-toolbar.cpp:307 -#: ../src/ui/toolbar/spiral-toolbar.cpp:218 ../src/ui/toolbar/spiral-toolbar.cpp:242 -#: ../src/ui/toolbar/star-toolbar.cpp:396 ../src/ui/toolbar/star-toolbar.cpp:476 +#: ../src/widgets/arc-toolbar.cpp:413 ../src/widgets/arc-toolbar.cpp:452 +#: ../src/widgets/rect-toolbar.cpp:268 ../src/widgets/rect-toolbar.cpp:307 +#: ../src/widgets/spiral-toolbar.cpp:218 ../src/widgets/spiral-toolbar.cpp:242 +#: ../src/widgets/star-toolbar.cpp:396 ../src/widgets/star-toolbar.cpp:476 msgid "New:" msgstr "" #. FIXME: implement averaging of all parameters for multiple selected #. gtk_label_set_markup(GTK_LABEL(l), _("Average:")); -#: ../src/ui/toolbar/arc-toolbar.cpp:416 ../src/ui/toolbar/arc-toolbar.cpp:433 -#: ../src/ui/toolbar/rect-toolbar.cpp:276 ../src/ui/toolbar/rect-toolbar.cpp:294 -#: ../src/ui/toolbar/spiral-toolbar.cpp:220 ../src/ui/toolbar/spiral-toolbar.cpp:231 -#: ../src/ui/toolbar/star-toolbar.cpp:398 +#: ../src/widgets/arc-toolbar.cpp:416 ../src/widgets/arc-toolbar.cpp:433 +#: ../src/widgets/rect-toolbar.cpp:276 ../src/widgets/rect-toolbar.cpp:294 +#: ../src/widgets/spiral-toolbar.cpp:220 ../src/widgets/spiral-toolbar.cpp:231 +#: ../src/widgets/star-toolbar.cpp:398 msgid "Change:" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:463 ../src/ui/toolbar/rect-toolbar.cpp:357 +#: ../src/widgets/arc-toolbar.cpp:463 ../src/widgets/rect-toolbar.cpp:357 msgid "Horizontal radius" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:463 ../src/ui/toolbar/rect-toolbar.cpp:357 +#: ../src/widgets/arc-toolbar.cpp:463 ../src/widgets/rect-toolbar.cpp:357 msgid "Rx:" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:463 +#: ../src/widgets/arc-toolbar.cpp:463 msgid "Horizontal radius of the circle, ellipse, or arc" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:479 ../src/ui/toolbar/rect-toolbar.cpp:371 +#: ../src/widgets/arc-toolbar.cpp:479 ../src/widgets/rect-toolbar.cpp:371 msgid "Vertical radius" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:479 ../src/ui/toolbar/rect-toolbar.cpp:371 +#: ../src/widgets/arc-toolbar.cpp:479 ../src/widgets/rect-toolbar.cpp:371 msgid "Ry:" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:479 +#: ../src/widgets/arc-toolbar.cpp:479 msgid "Vertical radius of the circle, ellipse, or arc" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:492 ../src/ui/toolbar/lpe-toolbar.cpp:404 -#: ../src/ui/toolbar/node-toolbar.cpp:614 -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:184 -#: ../src/ui/toolbar/rect-toolbar.cpp:382 ../src/ui/toolbar/select-toolbar.cpp:528 -#: ../src/ui/toolbar/text-toolbar.cpp:2326 +#: ../src/widgets/arc-toolbar.cpp:492 ../src/widgets/lpe-toolbar.cpp:404 +#: ../src/widgets/node-toolbar.cpp:614 +#: ../src/widgets/paintbucket-toolbar.cpp:184 +#: ../src/widgets/rect-toolbar.cpp:382 ../src/widgets/select-toolbar.cpp:528 +#: ../src/widgets/text-toolbar.cpp:2326 msgid "Units" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:499 +#: ../src/widgets/arc-toolbar.cpp:499 msgid "Start:" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:500 +#: ../src/widgets/arc-toolbar.cpp:500 msgid "The angle (in degrees) from the horizontal to the arc's start point" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:512 +#: ../src/widgets/arc-toolbar.cpp:512 msgid "End:" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:513 +#: ../src/widgets/arc-toolbar.cpp:513 msgid "The angle (in degrees) from the horizontal to the arc's end point" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:532 +#: ../src/widgets/arc-toolbar.cpp:532 msgid "Switch to slice (closed shape with two radii)" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:537 +#: ../src/widgets/arc-toolbar.cpp:537 msgid "Arc (Open)" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:538 +#: ../src/widgets/arc-toolbar.cpp:538 msgid "Switch to arc (unclosed shape)" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:544 +#: ../src/widgets/arc-toolbar.cpp:544 msgid "Switch to chord (closed shape)" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:569 +#: ../src/widgets/arc-toolbar.cpp:569 msgid "Make whole" msgstr "" -#: ../src/ui/toolbar/arc-toolbar.cpp:570 +#: ../src/widgets/arc-toolbar.cpp:570 msgid "Make the shape a whole ellipse, not arc or segment" msgstr "" #. TODO: use the correct axis here, too -#: ../src/ui/toolbar/box3d-toolbar.cpp:237 +#: ../src/widgets/box3d-toolbar.cpp:237 msgid "3D Box: Change perspective (angle of infinite axis)" msgstr "" -#: ../src/ui/toolbar/box3d-toolbar.cpp:306 +#: ../src/widgets/box3d-toolbar.cpp:306 msgid "Angle in X direction" msgstr "" #. Translators: PL is short for 'perspective line' -#: ../src/ui/toolbar/box3d-toolbar.cpp:308 +#: ../src/widgets/box3d-toolbar.cpp:308 msgid "Angle of PLs in X direction" msgstr "" #. Translators: VP is short for 'vanishing point' -#: ../src/ui/toolbar/box3d-toolbar.cpp:330 +#: ../src/widgets/box3d-toolbar.cpp:330 msgid "State of VP in X direction" msgstr "" -#: ../src/ui/toolbar/box3d-toolbar.cpp:331 +#: ../src/widgets/box3d-toolbar.cpp:331 msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" msgstr "" -#: ../src/ui/toolbar/box3d-toolbar.cpp:346 +#: ../src/widgets/box3d-toolbar.cpp:346 msgid "Angle in Y direction" msgstr "" -#: ../src/ui/toolbar/box3d-toolbar.cpp:346 +#: ../src/widgets/box3d-toolbar.cpp:346 msgid "Angle Y:" msgstr "" #. Translators: PL is short for 'perspective line' -#: ../src/ui/toolbar/box3d-toolbar.cpp:348 +#: ../src/widgets/box3d-toolbar.cpp:348 msgid "Angle of PLs in Y direction" msgstr "" #. Translators: VP is short for 'vanishing point' -#: ../src/ui/toolbar/box3d-toolbar.cpp:369 +#: ../src/widgets/box3d-toolbar.cpp:369 msgid "State of VP in Y direction" msgstr "" -#: ../src/ui/toolbar/box3d-toolbar.cpp:370 +#: ../src/widgets/box3d-toolbar.cpp:370 msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" msgstr "" -#: ../src/ui/toolbar/box3d-toolbar.cpp:385 +#: ../src/widgets/box3d-toolbar.cpp:385 msgid "Angle in Z direction" msgstr "" #. Translators: PL is short for 'perspective line' -#: ../src/ui/toolbar/box3d-toolbar.cpp:387 +#: ../src/widgets/box3d-toolbar.cpp:387 msgid "Angle of PLs in Z direction" msgstr "" #. Translators: VP is short for 'vanishing point' -#: ../src/ui/toolbar/box3d-toolbar.cpp:408 +#: ../src/widgets/box3d-toolbar.cpp:408 msgid "State of VP in Z direction" msgstr "" -#: ../src/ui/toolbar/box3d-toolbar.cpp:409 +#: ../src/widgets/box3d-toolbar.cpp:409 msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:216 -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:257 +#: ../src/widgets/calligraphy-toolbar.cpp:216 +#: ../src/widgets/calligraphy-toolbar.cpp:257 msgid "No preset" msgstr "" #. Width -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:398 -#: ../src/ui/toolbar/eraser-toolbar.cpp:188 +#: ../src/widgets/calligraphy-toolbar.cpp:398 +#: ../src/widgets/eraser-toolbar.cpp:188 msgid "(hairline)" msgstr "" #. Mean #. Rotation #. Scale -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:398 -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 -#: ../src/ui/toolbar/eraser-toolbar.cpp:188 ../src/ui/toolbar/pencil-toolbar.cpp:560 -#: ../src/ui/toolbar/spray-toolbar.cpp:294 ../src/ui/toolbar/spray-toolbar.cpp:323 -#: ../src/ui/toolbar/spray-toolbar.cpp:339 ../src/ui/toolbar/spray-toolbar.cpp:406 -#: ../src/ui/toolbar/spray-toolbar.cpp:436 ../src/ui/toolbar/spray-toolbar.cpp:454 -#: ../src/ui/toolbar/spray-toolbar.cpp:603 ../src/ui/toolbar/tweak-toolbar.cpp:129 -#: ../src/ui/toolbar/tweak-toolbar.cpp:146 ../src/ui/toolbar/tweak-toolbar.cpp:344 +#: ../src/widgets/calligraphy-toolbar.cpp:398 +#: ../src/widgets/calligraphy-toolbar.cpp:431 +#: ../src/widgets/eraser-toolbar.cpp:188 ../src/widgets/pencil-toolbar.cpp:560 +#: ../src/widgets/spray-toolbar.cpp:294 ../src/widgets/spray-toolbar.cpp:323 +#: ../src/widgets/spray-toolbar.cpp:339 ../src/widgets/spray-toolbar.cpp:406 +#: ../src/widgets/spray-toolbar.cpp:436 ../src/widgets/spray-toolbar.cpp:454 +#: ../src/widgets/spray-toolbar.cpp:603 ../src/widgets/tweak-toolbar.cpp:129 +#: ../src/widgets/tweak-toolbar.cpp:146 ../src/widgets/tweak-toolbar.cpp:344 msgid "(default)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:398 -#: ../src/ui/toolbar/eraser-toolbar.cpp:188 +#: ../src/widgets/calligraphy-toolbar.cpp:398 +#: ../src/widgets/eraser-toolbar.cpp:188 msgid "(broad stroke)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:401 -#: ../src/ui/toolbar/eraser-toolbar.cpp:191 +#: ../src/widgets/calligraphy-toolbar.cpp:401 +#: ../src/widgets/eraser-toolbar.cpp:191 msgid "Pen Width" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:402 +#: ../src/widgets/calligraphy-toolbar.cpp:402 msgid "The width of the calligraphic pen (relative to the visible canvas area)" msgstr "" #. Thinning -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 -#: ../src/ui/toolbar/eraser-toolbar.cpp:221 +#: ../src/widgets/calligraphy-toolbar.cpp:415 +#: ../src/widgets/eraser-toolbar.cpp:221 msgid "(speed blows up stroke)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 -#: ../src/ui/toolbar/eraser-toolbar.cpp:221 +#: ../src/widgets/calligraphy-toolbar.cpp:415 +#: ../src/widgets/eraser-toolbar.cpp:221 msgid "(slight widening)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 -#: ../src/ui/toolbar/eraser-toolbar.cpp:221 +#: ../src/widgets/calligraphy-toolbar.cpp:415 +#: ../src/widgets/eraser-toolbar.cpp:221 msgid "(constant width)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 -#: ../src/ui/toolbar/eraser-toolbar.cpp:221 +#: ../src/widgets/calligraphy-toolbar.cpp:415 +#: ../src/widgets/eraser-toolbar.cpp:221 msgid "(slight thinning, default)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 -#: ../src/ui/toolbar/eraser-toolbar.cpp:221 +#: ../src/widgets/calligraphy-toolbar.cpp:415 +#: ../src/widgets/eraser-toolbar.cpp:221 msgid "(speed deflates stroke)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:418 +#: ../src/widgets/calligraphy-toolbar.cpp:418 msgid "Stroke Thinning" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:418 -#: ../src/ui/toolbar/eraser-toolbar.cpp:224 +#: ../src/widgets/calligraphy-toolbar.cpp:418 +#: ../src/widgets/eraser-toolbar.cpp:224 msgid "Thinning:" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:419 -#: ../src/ui/toolbar/eraser-toolbar.cpp:225 +#: ../src/widgets/calligraphy-toolbar.cpp:419 +#: ../src/widgets/eraser-toolbar.cpp:225 msgid "" "How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 " "makes them broader, 0 makes width independent of velocity)" msgstr "" #. Angle -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 +#: ../src/widgets/calligraphy-toolbar.cpp:431 msgid "(left edge up)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 +#: ../src/widgets/calligraphy-toolbar.cpp:431 msgid "(horizontal)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 +#: ../src/widgets/calligraphy-toolbar.cpp:431 msgid "(right edge up)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:434 +#: ../src/widgets/calligraphy-toolbar.cpp:434 msgid "Pen Angle" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:434 +#: ../src/widgets/calligraphy-toolbar.cpp:434 #: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:5 msgid "Angle:" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:435 +#: ../src/widgets/calligraphy-toolbar.cpp:435 msgid "" "The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " "fixation = 0)" msgstr "" #. Fixation -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:449 +#: ../src/widgets/calligraphy-toolbar.cpp:449 msgid "(perpendicular to stroke, \"brush\")" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:449 +#: ../src/widgets/calligraphy-toolbar.cpp:449 msgid "(almost fixed, default)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:449 +#: ../src/widgets/calligraphy-toolbar.cpp:449 msgid "(fixed by Angle, \"pen\")" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:452 +#: ../src/widgets/calligraphy-toolbar.cpp:452 msgid "Fixation" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:452 +#: ../src/widgets/calligraphy-toolbar.cpp:452 msgid "Fixation:" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:453 +#: ../src/widgets/calligraphy-toolbar.cpp:453 msgid "" "Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " "fixed angle)" msgstr "" #. Cap Rounding -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 -#: ../src/ui/toolbar/eraser-toolbar.cpp:239 +#: ../src/widgets/calligraphy-toolbar.cpp:465 +#: ../src/widgets/eraser-toolbar.cpp:239 msgid "(blunt caps, default)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 -#: ../src/ui/toolbar/eraser-toolbar.cpp:239 +#: ../src/widgets/calligraphy-toolbar.cpp:465 +#: ../src/widgets/eraser-toolbar.cpp:239 msgid "(slightly bulging)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 -#: ../src/ui/toolbar/eraser-toolbar.cpp:239 +#: ../src/widgets/calligraphy-toolbar.cpp:465 +#: ../src/widgets/eraser-toolbar.cpp:239 msgid "(approximately round)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 -#: ../src/ui/toolbar/eraser-toolbar.cpp:239 +#: ../src/widgets/calligraphy-toolbar.cpp:465 +#: ../src/widgets/eraser-toolbar.cpp:239 msgid "(long protruding caps)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:469 +#: ../src/widgets/calligraphy-toolbar.cpp:469 msgid "Cap rounding" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:469 -#: ../src/ui/toolbar/eraser-toolbar.cpp:243 +#: ../src/widgets/calligraphy-toolbar.cpp:469 +#: ../src/widgets/eraser-toolbar.cpp:243 msgid "Caps:" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:470 -#: ../src/ui/toolbar/eraser-toolbar.cpp:244 +#: ../src/widgets/calligraphy-toolbar.cpp:470 +#: ../src/widgets/eraser-toolbar.cpp:244 msgid "" "Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = " "round caps)" msgstr "" #. Tremor -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 -#: ../src/ui/toolbar/eraser-toolbar.cpp:258 +#: ../src/widgets/calligraphy-toolbar.cpp:482 +#: ../src/widgets/eraser-toolbar.cpp:258 msgid "(smooth line)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 -#: ../src/ui/toolbar/eraser-toolbar.cpp:258 +#: ../src/widgets/calligraphy-toolbar.cpp:482 +#: ../src/widgets/eraser-toolbar.cpp:258 msgid "(slight tremor)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 -#: ../src/ui/toolbar/eraser-toolbar.cpp:258 +#: ../src/widgets/calligraphy-toolbar.cpp:482 +#: ../src/widgets/eraser-toolbar.cpp:258 msgid "(noticeable tremor)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 -#: ../src/ui/toolbar/eraser-toolbar.cpp:258 +#: ../src/widgets/calligraphy-toolbar.cpp:482 +#: ../src/widgets/eraser-toolbar.cpp:258 msgid "(maximum tremor)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:485 +#: ../src/widgets/calligraphy-toolbar.cpp:485 msgid "Stroke Tremor" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:485 -#: ../src/ui/toolbar/eraser-toolbar.cpp:261 +#: ../src/widgets/calligraphy-toolbar.cpp:485 +#: ../src/widgets/eraser-toolbar.cpp:261 msgid "Tremor:" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:486 -#: ../src/ui/toolbar/eraser-toolbar.cpp:262 +#: ../src/widgets/calligraphy-toolbar.cpp:486 +#: ../src/widgets/eraser-toolbar.cpp:262 msgid "Increase to make strokes rugged and trembling" msgstr "" #. Wiggle -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:500 +#: ../src/widgets/calligraphy-toolbar.cpp:500 msgid "(no wiggle)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:500 +#: ../src/widgets/calligraphy-toolbar.cpp:500 msgid "(slight deviation)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:500 +#: ../src/widgets/calligraphy-toolbar.cpp:500 msgid "(wild waves and curls)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:503 +#: ../src/widgets/calligraphy-toolbar.cpp:503 msgid "Pen Wiggle" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:503 +#: ../src/widgets/calligraphy-toolbar.cpp:503 msgid "Wiggle:" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:504 +#: ../src/widgets/calligraphy-toolbar.cpp:504 msgid "Increase to make the pen waver and wiggle" msgstr "" #. Mass -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 -#: ../src/ui/toolbar/eraser-toolbar.cpp:278 +#: ../src/widgets/calligraphy-toolbar.cpp:517 +#: ../src/widgets/eraser-toolbar.cpp:278 msgid "(no inertia)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 -#: ../src/ui/toolbar/eraser-toolbar.cpp:278 +#: ../src/widgets/calligraphy-toolbar.cpp:517 +#: ../src/widgets/eraser-toolbar.cpp:278 msgid "(slight smoothing, default)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 -#: ../src/ui/toolbar/eraser-toolbar.cpp:278 +#: ../src/widgets/calligraphy-toolbar.cpp:517 +#: ../src/widgets/eraser-toolbar.cpp:278 msgid "(noticeable lagging)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 -#: ../src/ui/toolbar/eraser-toolbar.cpp:278 +#: ../src/widgets/calligraphy-toolbar.cpp:517 +#: ../src/widgets/eraser-toolbar.cpp:278 msgid "(maximum inertia)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:520 +#: ../src/widgets/calligraphy-toolbar.cpp:520 msgid "Pen Mass" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:520 -#: ../src/ui/toolbar/eraser-toolbar.cpp:281 +#: ../src/widgets/calligraphy-toolbar.cpp:520 +#: ../src/widgets/eraser-toolbar.cpp:281 msgid "Mass:" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:521 +#: ../src/widgets/calligraphy-toolbar.cpp:521 msgid "Increase to make the pen drag behind, as if slowed by inertia" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:536 +#: ../src/widgets/calligraphy-toolbar.cpp:536 msgid "Trace Background" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:537 +#: ../src/widgets/calligraphy-toolbar.cpp:537 msgid "" "Trace the lightness of the background by the width of the pen (white - " "minimum width, black - maximum width)" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:550 -#: ../src/ui/toolbar/eraser-toolbar.cpp:209 +#: ../src/widgets/calligraphy-toolbar.cpp:550 +#: ../src/widgets/eraser-toolbar.cpp:209 msgid "Use the pressure of the input device to alter the width of the pen" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:562 +#: ../src/widgets/calligraphy-toolbar.cpp:562 msgid "Tilt" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:563 +#: ../src/widgets/calligraphy-toolbar.cpp:563 msgid "Use the tilt of the input device to alter the angle of the pen's nib" msgstr "" #. Name #. Label -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:584 +#: ../src/widgets/calligraphy-toolbar.cpp:584 msgid "Choose a preset" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:602 +#: ../src/widgets/calligraphy-toolbar.cpp:602 msgid "Add/Edit Profile" msgstr "" -#: ../src/ui/toolbar/calligraphy-toolbar.cpp:603 +#: ../src/widgets/calligraphy-toolbar.cpp:603 msgid "Add or edit calligraphic profile" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:120 +#: ../src/widgets/connector-toolbar.cpp:120 msgid "Set connector type: orthogonal" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:120 +#: ../src/widgets/connector-toolbar.cpp:120 msgid "Set connector type: polyline" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:167 +#: ../src/widgets/connector-toolbar.cpp:167 msgid "Change connector curvature" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:216 +#: ../src/widgets/connector-toolbar.cpp:216 msgid "Change connector spacing" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:314 +#: ../src/widgets/connector-toolbar.cpp:314 msgid "Avoid" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:324 +#: ../src/widgets/connector-toolbar.cpp:324 msgid "Ignore" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:335 +#: ../src/widgets/connector-toolbar.cpp:335 msgid "Orthogonal" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:336 +#: ../src/widgets/connector-toolbar.cpp:336 msgid "Make connector orthogonal or polyline" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:350 +#: ../src/widgets/connector-toolbar.cpp:350 msgid "Connector Curvature" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:350 +#: ../src/widgets/connector-toolbar.cpp:350 msgid "Curvature:" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:351 +#: ../src/widgets/connector-toolbar.cpp:351 msgid "The amount of connectors curvature" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:361 +#: ../src/widgets/connector-toolbar.cpp:361 msgid "Connector Spacing" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:361 +#: ../src/widgets/connector-toolbar.cpp:361 msgid "Spacing:" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:362 +#: ../src/widgets/connector-toolbar.cpp:362 msgid "The amount of space left around objects by auto-routing connectors" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:373 +#: ../src/widgets/connector-toolbar.cpp:373 msgid "Graph" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:383 +#: ../src/widgets/connector-toolbar.cpp:383 msgid "Connector Length" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:383 +#: ../src/widgets/connector-toolbar.cpp:383 msgid "Length:" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:384 +#: ../src/widgets/connector-toolbar.cpp:384 msgid "Ideal length for connectors when layout is applied" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:396 +#: ../src/widgets/connector-toolbar.cpp:396 msgid "Downwards" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:397 +#: ../src/widgets/connector-toolbar.cpp:397 msgid "Make connectors with end-markers (arrows) point downwards" msgstr "" -#: ../src/ui/toolbar/connector-toolbar.cpp:413 +#: ../src/widgets/connector-toolbar.cpp:413 msgid "Do not allow overlapping shapes" msgstr "" @@ -29017,30 +29017,30 @@ msgstr "" msgid "Note:" msgstr "" -#: ../src/ui/toolbar/dropper-toolbar.cpp:90 +#: ../src/widgets/dropper-toolbar.cpp:90 msgid "Pick opacity" msgstr "" -#: ../src/ui/toolbar/dropper-toolbar.cpp:91 +#: ../src/widgets/dropper-toolbar.cpp:91 msgid "" "Pick both the color and the alpha (transparency) under cursor; otherwise, " "pick only the visible color premultiplied by alpha" msgstr "" -#: ../src/ui/toolbar/dropper-toolbar.cpp:94 +#: ../src/widgets/dropper-toolbar.cpp:94 msgid "Pick" msgstr "" -#: ../src/ui/toolbar/dropper-toolbar.cpp:103 +#: ../src/widgets/dropper-toolbar.cpp:103 msgid "Assign opacity" msgstr "" -#: ../src/ui/toolbar/dropper-toolbar.cpp:104 +#: ../src/widgets/dropper-toolbar.cpp:104 msgid "" "If alpha was picked, assign it to selection as fill or stroke transparency" msgstr "" -#: ../src/ui/toolbar/dropper-toolbar.cpp:107 +#: ../src/widgets/dropper-toolbar.cpp:107 msgid "Assign" msgstr "" @@ -29048,59 +29048,59 @@ msgstr "" msgid "remove" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:152 +#: ../src/widgets/eraser-toolbar.cpp:152 msgid "Delete objects touched by eraser" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:157 +#: ../src/widgets/eraser-toolbar.cpp:157 msgid "Cut" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:158 +#: ../src/widgets/eraser-toolbar.cpp:158 msgid "Cut out from paths and shapes" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:163 +#: ../src/widgets/eraser-toolbar.cpp:163 msgid "Clip" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:164 +#: ../src/widgets/eraser-toolbar.cpp:164 msgid "Clip from objects" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:188 +#: ../src/widgets/eraser-toolbar.cpp:188 msgid "(no width)" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:192 +#: ../src/widgets/eraser-toolbar.cpp:192 msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:208 +#: ../src/widgets/eraser-toolbar.cpp:208 msgid "Eraser Pressure" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:224 +#: ../src/widgets/eraser-toolbar.cpp:224 msgid "Eraser Stroke Thinning" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:243 +#: ../src/widgets/eraser-toolbar.cpp:243 msgid "Eraser Cap rounding" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:261 +#: ../src/widgets/eraser-toolbar.cpp:261 msgid "EraserStroke Tremor" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:281 +#: ../src/widgets/eraser-toolbar.cpp:281 msgid "Eraser Mass" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:282 +#: ../src/widgets/eraser-toolbar.cpp:282 msgid "Increase to make the eraser drag behind, as if slowed by inertia" msgstr "" -#: ../src/ui/toolbar/eraser-toolbar.cpp:298 ../src/ui/toolbar/eraser-toolbar.cpp:299 +#: ../src/widgets/eraser-toolbar.cpp:298 ../src/widgets/eraser-toolbar.cpp:299 msgid "Break apart cut items" msgstr "" @@ -29193,101 +29193,101 @@ msgstr "" msgid "Rename gradient" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:143 -#: ../src/ui/toolbar/gradient-toolbar.cpp:163 -#: ../src/ui/toolbar/gradient-toolbar.cpp:539 -#: ../src/ui/toolbar/gradient-toolbar.cpp:942 +#: ../src/widgets/gradient-toolbar.cpp:143 +#: ../src/widgets/gradient-toolbar.cpp:163 +#: ../src/widgets/gradient-toolbar.cpp:539 +#: ../src/widgets/gradient-toolbar.cpp:942 msgid "No gradient" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:153 +#: ../src/widgets/gradient-toolbar.cpp:153 msgid "Nothing Selected" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:172 +#: ../src/widgets/gradient-toolbar.cpp:172 msgid "Multiple gradients" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:549 +#: ../src/widgets/gradient-toolbar.cpp:549 #: ../src/widgets/gradient-vector.cpp:572 msgid "No stops in gradient" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:663 +#: ../src/widgets/gradient-toolbar.cpp:663 msgid "Multiple stops" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:746 +#: ../src/widgets/gradient-toolbar.cpp:746 msgid "Assign gradient to object" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:774 +#: ../src/widgets/gradient-toolbar.cpp:774 msgid "Set gradient repeat" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:837 +#: ../src/widgets/gradient-toolbar.cpp:837 #: ../src/widgets/gradient-vector.cpp:680 msgid "Change gradient stop offset" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:866 +#: ../src/widgets/gradient-toolbar.cpp:866 msgid "linear" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:867 +#: ../src/widgets/gradient-toolbar.cpp:867 msgid "Create linear gradient" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:872 +#: ../src/widgets/gradient-toolbar.cpp:872 msgid "radial" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:873 +#: ../src/widgets/gradient-toolbar.cpp:873 msgid "Create radial (elliptic or circular) gradient" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:904 ../src/ui/toolbar/mesh-toolbar.cpp:422 +#: ../src/widgets/gradient-toolbar.cpp:904 ../src/widgets/mesh-toolbar.cpp:422 msgid "fill" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:905 ../src/ui/toolbar/mesh-toolbar.cpp:423 +#: ../src/widgets/gradient-toolbar.cpp:905 ../src/widgets/mesh-toolbar.cpp:423 msgid "Create gradient in the fill" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:910 ../src/ui/toolbar/mesh-toolbar.cpp:428 +#: ../src/widgets/gradient-toolbar.cpp:910 ../src/widgets/mesh-toolbar.cpp:428 msgid "stroke" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:911 ../src/ui/toolbar/mesh-toolbar.cpp:429 +#: ../src/widgets/gradient-toolbar.cpp:911 ../src/widgets/mesh-toolbar.cpp:429 msgid "Create gradient in the stroke" msgstr "" #. Name -#: ../src/ui/toolbar/gradient-toolbar.cpp:949 +#: ../src/widgets/gradient-toolbar.cpp:949 msgid "Select" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:976 +#: ../src/widgets/gradient-toolbar.cpp:976 msgctxt "Gradient repeat type" msgid "None" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:982 +#: ../src/widgets/gradient-toolbar.cpp:982 msgid "Reflected" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:988 +#: ../src/widgets/gradient-toolbar.cpp:988 msgid "Direct" msgstr "" #. Name -#: ../src/ui/toolbar/gradient-toolbar.cpp:995 +#: ../src/widgets/gradient-toolbar.cpp:995 msgid "Repeat" msgstr "" #. Label #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute -#: ../src/ui/toolbar/gradient-toolbar.cpp:997 +#: ../src/widgets/gradient-toolbar.cpp:997 msgid "" "Whether to fill with flat color beyond the ends of the gradient vector " "(spreadMethod=\"pad\"), or repeat the gradient in the same direction " @@ -29295,46 +29295,46 @@ msgid "" "directions (spreadMethod=\"reflect\")" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:1024 +#: ../src/widgets/gradient-toolbar.cpp:1024 msgid "No stops" msgstr "" #. Name -#: ../src/ui/toolbar/gradient-toolbar.cpp:1031 +#: ../src/widgets/gradient-toolbar.cpp:1031 msgid "Stops" msgstr "" #. Label -#: ../src/ui/toolbar/gradient-toolbar.cpp:1053 +#: ../src/widgets/gradient-toolbar.cpp:1053 #: ../src/widgets/gradient-vector.cpp:857 msgctxt "Gradient" msgid "Offset:" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:1053 +#: ../src/widgets/gradient-toolbar.cpp:1053 msgid "Offset of selected stop" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:1071 -#: ../src/ui/toolbar/gradient-toolbar.cpp:1072 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/gradient-toolbar.cpp:1072 msgid "Insert new stop" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:1085 -#: ../src/ui/toolbar/gradient-toolbar.cpp:1086 +#: ../src/widgets/gradient-toolbar.cpp:1085 +#: ../src/widgets/gradient-toolbar.cpp:1086 #: ../src/widgets/gradient-vector.cpp:843 msgid "Delete stop" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:1100 +#: ../src/widgets/gradient-toolbar.cpp:1100 msgid "Reverse the direction of the gradient" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:1114 +#: ../src/widgets/gradient-toolbar.cpp:1114 msgid "Link gradients" msgstr "" -#: ../src/ui/toolbar/gradient-toolbar.cpp:1115 +#: ../src/widgets/gradient-toolbar.cpp:1115 msgid "Link gradients to change all related gradients" msgstr "" @@ -29378,206 +29378,206 @@ msgstr "" msgid "Change gradient stop color" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:279 +#: ../src/widgets/lpe-toolbar.cpp:279 msgid "All inactive" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:280 +#: ../src/widgets/lpe-toolbar.cpp:280 msgid "No geometric tool is active" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:318 +#: ../src/widgets/lpe-toolbar.cpp:318 msgid "Show limiting bounding box" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:319 +#: ../src/widgets/lpe-toolbar.cpp:319 msgid "Show bounding box (used to cut infinite lines)" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:330 +#: ../src/widgets/lpe-toolbar.cpp:330 msgid "Get limiting bounding box from selection" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:331 +#: ../src/widgets/lpe-toolbar.cpp:331 msgid "" "Set limiting bounding box (used to cut infinite lines) to the bounding box " "of current selection" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:349 +#: ../src/widgets/lpe-toolbar.cpp:349 msgid "Closed" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:355 +#: ../src/widgets/lpe-toolbar.cpp:355 msgid "Open start" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:361 +#: ../src/widgets/lpe-toolbar.cpp:361 msgid "Open end" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:367 +#: ../src/widgets/lpe-toolbar.cpp:367 msgid "Open both" msgstr "" #. Name #. Label -#: ../src/ui/toolbar/lpe-toolbar.cpp:375 +#: ../src/widgets/lpe-toolbar.cpp:375 msgid "Choose a line segement type" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:393 +#: ../src/widgets/lpe-toolbar.cpp:393 msgid "Display measuring info" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:394 +#: ../src/widgets/lpe-toolbar.cpp:394 msgid "Display measuring info for selected items" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:414 +#: ../src/widgets/lpe-toolbar.cpp:414 msgid "Open LPE dialog" msgstr "" -#: ../src/ui/toolbar/lpe-toolbar.cpp:415 +#: ../src/widgets/lpe-toolbar.cpp:415 msgid "Open LPE dialog (to adapt parameters numerically)" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:160 +#: ../src/widgets/measure-toolbar.cpp:160 msgid "Start and end measures inactive." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:162 +#: ../src/widgets/measure-toolbar.cpp:162 msgid "Start and end measures active." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:178 +#: ../src/widgets/measure-toolbar.cpp:178 msgid "Measures only selected." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:180 +#: ../src/widgets/measure-toolbar.cpp:180 msgid "Measure all." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:196 +#: ../src/widgets/measure-toolbar.cpp:196 msgid "Show all crossings." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:198 +#: ../src/widgets/measure-toolbar.cpp:198 msgid "Show visible crossings." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:214 +#: ../src/widgets/measure-toolbar.cpp:214 msgid "Use all layers in the measure." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:216 +#: ../src/widgets/measure-toolbar.cpp:216 msgid "Use current layer in the measure." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:232 +#: ../src/widgets/measure-toolbar.cpp:232 msgid "Compute all elements." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:234 +#: ../src/widgets/measure-toolbar.cpp:234 msgid "Compute max length." msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:295 ../src/ui/toolbar/text-toolbar.cpp:2047 +#: ../src/widgets/measure-toolbar.cpp:295 ../src/widgets/text-toolbar.cpp:2047 msgid "Font Size" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:295 +#: ../src/widgets/measure-toolbar.cpp:295 msgid "Font Size:" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:296 +#: ../src/widgets/measure-toolbar.cpp:296 msgid "The font size to be used in the measurement labels" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:307 -#: ../src/ui/toolbar/measure-toolbar.cpp:315 +#: ../src/widgets/measure-toolbar.cpp:307 +#: ../src/widgets/measure-toolbar.cpp:315 msgid "The units to be used for the measurements" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:323 ../share/extensions/measure.inx.h:14 +#: ../src/widgets/measure-toolbar.cpp:323 ../share/extensions/measure.inx.h:14 msgid "Precision:" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:324 +#: ../src/widgets/measure-toolbar.cpp:324 msgid "Decimal precision of measure" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:336 +#: ../src/widgets/measure-toolbar.cpp:336 msgid "Scale %" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:336 +#: ../src/widgets/measure-toolbar.cpp:336 msgid "Scale %:" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:337 +#: ../src/widgets/measure-toolbar.cpp:337 msgid "Scale the results" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:350 +#: ../src/widgets/measure-toolbar.cpp:350 msgid "Mark dimension offset" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:362 -#: ../src/ui/toolbar/measure-toolbar.cpp:363 +#: ../src/widgets/measure-toolbar.cpp:362 +#: ../src/widgets/measure-toolbar.cpp:363 msgid "Measure only selected" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:374 -#: ../src/ui/toolbar/measure-toolbar.cpp:375 +#: ../src/widgets/measure-toolbar.cpp:374 +#: ../src/widgets/measure-toolbar.cpp:375 msgid "Ignore first and last" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:385 -#: ../src/ui/toolbar/measure-toolbar.cpp:386 +#: ../src/widgets/measure-toolbar.cpp:385 +#: ../src/widgets/measure-toolbar.cpp:386 msgid "Show hidden intersections" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:396 -#: ../src/ui/toolbar/measure-toolbar.cpp:397 +#: ../src/widgets/measure-toolbar.cpp:396 +#: ../src/widgets/measure-toolbar.cpp:397 msgid "Show measures between items" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:407 -#: ../src/ui/toolbar/measure-toolbar.cpp:408 +#: ../src/widgets/measure-toolbar.cpp:407 +#: ../src/widgets/measure-toolbar.cpp:408 msgid "Measure all layers" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:418 -#: ../src/ui/toolbar/measure-toolbar.cpp:419 +#: ../src/widgets/measure-toolbar.cpp:418 +#: ../src/widgets/measure-toolbar.cpp:419 msgid "Reverse measure" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:428 -#: ../src/ui/toolbar/measure-toolbar.cpp:429 +#: ../src/widgets/measure-toolbar.cpp:428 +#: ../src/widgets/measure-toolbar.cpp:429 msgid "Phantom measure" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:438 -#: ../src/ui/toolbar/measure-toolbar.cpp:439 +#: ../src/widgets/measure-toolbar.cpp:438 +#: ../src/widgets/measure-toolbar.cpp:439 msgid "To guides" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:448 -#: ../src/ui/toolbar/measure-toolbar.cpp:449 +#: ../src/widgets/measure-toolbar.cpp:448 +#: ../src/widgets/measure-toolbar.cpp:449 msgid "Mark Dimension" msgstr "" -#: ../src/ui/toolbar/measure-toolbar.cpp:458 -#: ../src/ui/toolbar/measure-toolbar.cpp:459 +#: ../src/widgets/measure-toolbar.cpp:458 +#: ../src/widgets/measure-toolbar.cpp:459 msgid "Convert to item" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:275 +#: ../src/widgets/mesh-toolbar.cpp:275 msgid "Set mesh type" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:348 +#: ../src/widgets/mesh-toolbar.cpp:348 msgid "" "Mesh gradients are part of SVG 2:\n" "* Syntax may change.\n" @@ -29587,336 +29587,336 @@ msgid "" "For print: export to PDF." msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:384 +#: ../src/widgets/mesh-toolbar.cpp:384 msgid "normal" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:385 +#: ../src/widgets/mesh-toolbar.cpp:385 msgid "Create mesh gradient" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:390 +#: ../src/widgets/mesh-toolbar.cpp:390 msgid "conical" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:391 +#: ../src/widgets/mesh-toolbar.cpp:391 msgid "Create conical gradient" msgstr "" #. Name -#: ../src/ui/toolbar/mesh-toolbar.cpp:397 +#: ../src/widgets/mesh-toolbar.cpp:397 msgid "New:" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:456 +#: ../src/widgets/mesh-toolbar.cpp:456 msgid "Rows" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:456 +#: ../src/widgets/mesh-toolbar.cpp:456 #: ../share/extensions/guides_creator.inx.h:5 #: ../share/extensions/layout_nup.inx.h:12 msgid "Rows:" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:456 +#: ../src/widgets/mesh-toolbar.cpp:456 msgid "Number of rows in new mesh" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:472 +#: ../src/widgets/mesh-toolbar.cpp:472 msgid "Columns" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:472 +#: ../src/widgets/mesh-toolbar.cpp:472 #: ../share/extensions/guides_creator.inx.h:4 msgid "Columns:" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:472 +#: ../src/widgets/mesh-toolbar.cpp:472 msgid "Number of columns in new mesh" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:486 +#: ../src/widgets/mesh-toolbar.cpp:486 msgid "Edit Fill" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:487 +#: ../src/widgets/mesh-toolbar.cpp:487 msgid "Edit fill mesh" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:499 +#: ../src/widgets/mesh-toolbar.cpp:499 msgid "Edit Stroke" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:500 +#: ../src/widgets/mesh-toolbar.cpp:500 msgid "Edit stroke mesh" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:512 ../src/ui/toolbar/node-toolbar.cpp:524 +#: ../src/widgets/mesh-toolbar.cpp:512 ../src/widgets/node-toolbar.cpp:524 msgid "Show Handles" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:529 ../src/ui/toolbar/mesh-toolbar.cpp:530 +#: ../src/widgets/mesh-toolbar.cpp:529 ../src/widgets/mesh-toolbar.cpp:530 msgid "WARNING: Mesh SVG Syntax Subject to Change" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:547 +#: ../src/widgets/mesh-toolbar.cpp:547 msgctxt "Type" msgid "Coons" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:553 +#: ../src/widgets/mesh-toolbar.cpp:553 msgid "Bicubic" msgstr "" #. Name -#: ../src/ui/toolbar/mesh-toolbar.cpp:561 +#: ../src/widgets/mesh-toolbar.cpp:561 msgid "Smoothing" msgstr "" #. Label -#: ../src/ui/toolbar/mesh-toolbar.cpp:562 +#: ../src/widgets/mesh-toolbar.cpp:562 msgid "Coons: no smothing. Bicubic: smothing across patch boundaries." msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:581 +#: ../src/widgets/mesh-toolbar.cpp:581 msgid "Toggle Sides" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:582 +#: ../src/widgets/mesh-toolbar.cpp:582 msgid "Toggle selected sides between Beziers and lines." msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:585 +#: ../src/widgets/mesh-toolbar.cpp:585 msgid "Toggle side:" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:592 +#: ../src/widgets/mesh-toolbar.cpp:592 msgid "Make elliptical" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:593 +#: ../src/widgets/mesh-toolbar.cpp:593 msgid "" "Make selected sides elliptical by changing length of handles. Works best if " "handles already approximate ellipse." msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:596 +#: ../src/widgets/mesh-toolbar.cpp:596 msgid "Make elliptical:" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:603 +#: ../src/widgets/mesh-toolbar.cpp:603 msgid "Pick colors:" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:604 +#: ../src/widgets/mesh-toolbar.cpp:604 msgid "Pick colors for selected corner nodes from underneath mesh." msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:607 +#: ../src/widgets/mesh-toolbar.cpp:607 msgid "Pick Color" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:615 +#: ../src/widgets/mesh-toolbar.cpp:615 msgid "Scale mesh to bounding box:" msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:616 +#: ../src/widgets/mesh-toolbar.cpp:616 msgid "Scale mesh to fit inside bounding box." msgstr "" -#: ../src/ui/toolbar/mesh-toolbar.cpp:619 +#: ../src/widgets/mesh-toolbar.cpp:619 msgid "Fit mesh" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:344 +#: ../src/widgets/node-toolbar.cpp:344 msgid "Insert node" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:345 +#: ../src/widgets/node-toolbar.cpp:345 msgid "Insert new nodes into selected segments" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:348 +#: ../src/widgets/node-toolbar.cpp:348 msgid "Insert" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:359 +#: ../src/widgets/node-toolbar.cpp:359 msgid "Insert node at min X" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:360 +#: ../src/widgets/node-toolbar.cpp:360 msgid "Insert new nodes at min X into selected segments" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:363 +#: ../src/widgets/node-toolbar.cpp:363 msgid "Insert min X" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:369 +#: ../src/widgets/node-toolbar.cpp:369 msgid "Insert node at max X" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:370 +#: ../src/widgets/node-toolbar.cpp:370 msgid "Insert new nodes at max X into selected segments" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:373 +#: ../src/widgets/node-toolbar.cpp:373 msgid "Insert max X" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:379 +#: ../src/widgets/node-toolbar.cpp:379 msgid "Insert node at min Y" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:380 +#: ../src/widgets/node-toolbar.cpp:380 msgid "Insert new nodes at min Y into selected segments" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:383 +#: ../src/widgets/node-toolbar.cpp:383 msgid "Insert min Y" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:389 +#: ../src/widgets/node-toolbar.cpp:389 msgid "Insert node at max Y" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:390 +#: ../src/widgets/node-toolbar.cpp:390 msgid "Insert new nodes at max Y into selected segments" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:393 +#: ../src/widgets/node-toolbar.cpp:393 msgid "Insert max Y" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:401 +#: ../src/widgets/node-toolbar.cpp:401 msgid "Delete selected nodes" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:412 +#: ../src/widgets/node-toolbar.cpp:412 msgid "Join selected nodes" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:415 +#: ../src/widgets/node-toolbar.cpp:415 msgid "Join" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:423 +#: ../src/widgets/node-toolbar.cpp:423 msgid "Break path at selected nodes" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:433 +#: ../src/widgets/node-toolbar.cpp:433 msgid "Join with segment" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:434 +#: ../src/widgets/node-toolbar.cpp:434 msgid "Join selected endnodes with a new segment" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:443 +#: ../src/widgets/node-toolbar.cpp:443 msgid "Delete segment" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:444 +#: ../src/widgets/node-toolbar.cpp:444 msgid "Delete segment between two non-endpoint nodes" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:453 +#: ../src/widgets/node-toolbar.cpp:453 msgid "Node Cusp" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:454 +#: ../src/widgets/node-toolbar.cpp:454 msgid "Make selected nodes corner" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:463 +#: ../src/widgets/node-toolbar.cpp:463 msgid "Node Smooth" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:464 +#: ../src/widgets/node-toolbar.cpp:464 msgid "Make selected nodes smooth" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:473 +#: ../src/widgets/node-toolbar.cpp:473 msgid "Node Symmetric" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:474 +#: ../src/widgets/node-toolbar.cpp:474 msgid "Make selected nodes symmetric" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:483 +#: ../src/widgets/node-toolbar.cpp:483 msgid "Node Auto" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:484 +#: ../src/widgets/node-toolbar.cpp:484 msgid "Make selected nodes auto-smooth" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:493 +#: ../src/widgets/node-toolbar.cpp:493 msgid "Node Line" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:494 +#: ../src/widgets/node-toolbar.cpp:494 msgid "Make selected segments lines" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:503 +#: ../src/widgets/node-toolbar.cpp:503 msgid "Node Curve" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:504 +#: ../src/widgets/node-toolbar.cpp:504 msgid "Make selected segments curves" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:513 +#: ../src/widgets/node-toolbar.cpp:513 msgid "Show Transform Handles" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:514 +#: ../src/widgets/node-toolbar.cpp:514 msgid "Show transformation handles for selected nodes" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:525 +#: ../src/widgets/node-toolbar.cpp:525 msgid "Show Bezier handles of selected nodes" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:535 +#: ../src/widgets/node-toolbar.cpp:535 msgid "Show Outline" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:536 +#: ../src/widgets/node-toolbar.cpp:536 msgid "Show path outline (without path effects)" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:558 +#: ../src/widgets/node-toolbar.cpp:558 msgid "Edit clipping paths" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:559 +#: ../src/widgets/node-toolbar.cpp:559 msgid "Show clipping path(s) of selected object(s)" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:569 +#: ../src/widgets/node-toolbar.cpp:569 msgid "Edit masks" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:570 +#: ../src/widgets/node-toolbar.cpp:570 msgid "Show mask(s) of selected object(s)" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:584 +#: ../src/widgets/node-toolbar.cpp:584 msgid "X coordinate:" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:584 +#: ../src/widgets/node-toolbar.cpp:584 msgid "X coordinate of selected node(s)" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:601 +#: ../src/widgets/node-toolbar.cpp:601 msgid "Y coordinate:" msgstr "" -#: ../src/ui/toolbar/node-toolbar.cpp:601 +#: ../src/widgets/node-toolbar.cpp:601 msgid "Y coordinate of selected node(s)" msgstr "" @@ -30010,365 +30010,365 @@ msgid "Swatch fill" msgstr "" #. Name -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:141 +#: ../src/widgets/paintbucket-toolbar.cpp:141 msgid "Fill by" msgstr "" -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:163 +#: ../src/widgets/paintbucket-toolbar.cpp:163 msgid "Fill Threshold" msgstr "" -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:164 +#: ../src/widgets/paintbucket-toolbar.cpp:164 msgid "" "The maximum allowed difference between the clicked pixel and the neighboring " "pixels to be counted in the fill" msgstr "" -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:192 +#: ../src/widgets/paintbucket-toolbar.cpp:192 msgid "Grow/shrink by" msgstr "" -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:192 +#: ../src/widgets/paintbucket-toolbar.cpp:192 msgid "Grow/shrink by:" msgstr "" -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:193 +#: ../src/widgets/paintbucket-toolbar.cpp:193 msgid "" "The amount to grow (positive) or shrink (negative) the created fill path" msgstr "" #. Name -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:219 +#: ../src/widgets/paintbucket-toolbar.cpp:219 msgid "Close gaps" msgstr "" -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:240 -#: ../src/ui/toolbar/pencil-toolbar.cpp:584 ../src/ui/toolbar/spiral-toolbar.cpp:293 -#: ../src/ui/toolbar/star-toolbar.cpp:592 +#: ../src/widgets/paintbucket-toolbar.cpp:240 +#: ../src/widgets/pencil-toolbar.cpp:584 ../src/widgets/spiral-toolbar.cpp:293 +#: ../src/widgets/star-toolbar.cpp:592 msgid "Defaults" msgstr "" -#: ../src/ui/toolbar/paintbucket-toolbar.cpp:241 +#: ../src/widgets/paintbucket-toolbar.cpp:241 msgid "" "Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " "to change defaults)" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:137 +#: ../src/widgets/pencil-toolbar.cpp:137 msgid "Bezier" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:138 +#: ../src/widgets/pencil-toolbar.cpp:138 msgid "Create regular Bezier path" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:144 +#: ../src/widgets/pencil-toolbar.cpp:144 msgid "Create Spiro path" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:150 +#: ../src/widgets/pencil-toolbar.cpp:150 msgid "Create BSpline path" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:156 +#: ../src/widgets/pencil-toolbar.cpp:156 msgid "Zigzag" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:157 +#: ../src/widgets/pencil-toolbar.cpp:157 msgid "Create a sequence of straight line segments" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:162 +#: ../src/widgets/pencil-toolbar.cpp:162 msgid "Paraxial" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:163 +#: ../src/widgets/pencil-toolbar.cpp:163 msgid "Create a sequence of paraxial line segments" msgstr "" #. Label -#: ../src/ui/toolbar/pencil-toolbar.cpp:173 +#: ../src/widgets/pencil-toolbar.cpp:173 msgid "Mode of new lines drawn by this tool" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:188 ../src/ui/toolbar/pencil-toolbar.cpp:189 +#: ../src/widgets/pencil-toolbar.cpp:188 ../src/widgets/pencil-toolbar.cpp:189 msgid "LPE spiro or bspline flatten" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:226 +#: ../src/widgets/pencil-toolbar.cpp:226 msgctxt "Freehand shape" msgid "None" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:227 +#: ../src/widgets/pencil-toolbar.cpp:227 msgid "Triangle in" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:228 +#: ../src/widgets/pencil-toolbar.cpp:228 msgid "Triangle out" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:230 +#: ../src/widgets/pencil-toolbar.cpp:230 msgid "From clipboard" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:231 +#: ../src/widgets/pencil-toolbar.cpp:231 msgid "Bend from clipboard" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:232 +#: ../src/widgets/pencil-toolbar.cpp:232 msgid "Last applied" msgstr "" #. Name -#: ../src/ui/toolbar/pencil-toolbar.cpp:254 +#: ../src/widgets/pencil-toolbar.cpp:254 msgid "Shape" msgstr "" #. Label -#: ../src/ui/toolbar/pencil-toolbar.cpp:255 +#: ../src/widgets/pencil-toolbar.cpp:255 msgid "Shape of new paths drawn by this tool" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:507 +#: ../src/widgets/pencil-toolbar.cpp:507 msgid "Min pressure" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:507 +#: ../src/widgets/pencil-toolbar.cpp:507 msgid "Min:" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:507 +#: ../src/widgets/pencil-toolbar.cpp:507 msgid "Min percent of pressure" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:525 +#: ../src/widgets/pencil-toolbar.cpp:525 msgid "Max pressure" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:525 +#: ../src/widgets/pencil-toolbar.cpp:525 msgid "Max:" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:525 +#: ../src/widgets/pencil-toolbar.cpp:525 msgid "Max percent of pressure" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:542 ../src/ui/toolbar/pencil-toolbar.cpp:543 +#: ../src/widgets/pencil-toolbar.cpp:542 ../src/widgets/pencil-toolbar.cpp:543 msgid "Use pressure input" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:560 +#: ../src/widgets/pencil-toolbar.cpp:560 msgid "(many nodes, rough)" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:560 +#: ../src/widgets/pencil-toolbar.cpp:560 msgid "(few nodes, smooth)" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:563 +#: ../src/widgets/pencil-toolbar.cpp:563 msgid "Smoothing:" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:563 +#: ../src/widgets/pencil-toolbar.cpp:563 msgid "Smoothing: " msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:564 +#: ../src/widgets/pencil-toolbar.cpp:564 msgid "How much smoothing (simplifying) is applied to the line" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:585 +#: ../src/widgets/pencil-toolbar.cpp:585 msgid "" "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:594 ../src/ui/toolbar/pencil-toolbar.cpp:595 +#: ../src/widgets/pencil-toolbar.cpp:594 ../src/widgets/pencil-toolbar.cpp:595 msgid "LPE based interactive simplify" msgstr "" -#: ../src/ui/toolbar/pencil-toolbar.cpp:612 ../src/ui/toolbar/pencil-toolbar.cpp:613 +#: ../src/widgets/pencil-toolbar.cpp:612 ../src/widgets/pencil-toolbar.cpp:613 msgid "LPE simplify flatten" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:127 +#: ../src/widgets/rect-toolbar.cpp:127 msgid "Change rectangle" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:325 +#: ../src/widgets/rect-toolbar.cpp:325 msgid "W:" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:325 +#: ../src/widgets/rect-toolbar.cpp:325 msgid "Width of rectangle" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:341 +#: ../src/widgets/rect-toolbar.cpp:341 msgid "H:" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:341 +#: ../src/widgets/rect-toolbar.cpp:341 msgid "Height of rectangle" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:354 ../src/ui/toolbar/rect-toolbar.cpp:368 +#: ../src/widgets/rect-toolbar.cpp:354 ../src/widgets/rect-toolbar.cpp:368 msgid "not rounded" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:357 +#: ../src/widgets/rect-toolbar.cpp:357 msgid "Horizontal radius of rounded corners" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:371 +#: ../src/widgets/rect-toolbar.cpp:371 msgid "Vertical radius of rounded corners" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:389 +#: ../src/widgets/rect-toolbar.cpp:389 msgid "Not rounded" msgstr "" -#: ../src/ui/toolbar/rect-toolbar.cpp:390 +#: ../src/widgets/rect-toolbar.cpp:390 msgid "Make corners sharp" msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:265 +#: ../src/widgets/select-toolbar.cpp:265 msgid "Transform by toolbar" msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:283 +#: ../src/widgets/select-toolbar.cpp:283 msgid "Now stroke width is scaled when objects are scaled." msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:285 +#: ../src/widgets/select-toolbar.cpp:285 msgid "Now stroke width is not scaled when objects are scaled." msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:296 +#: ../src/widgets/select-toolbar.cpp:296 msgid "" "Now rounded rectangle corners are scaled when rectangles are " "scaled." msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:298 +#: ../src/widgets/select-toolbar.cpp:298 msgid "" "Now rounded rectangle corners are not scaled when rectangles " "are scaled." msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:309 +#: ../src/widgets/select-toolbar.cpp:309 msgid "" "Now gradients are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:311 +#: ../src/widgets/select-toolbar.cpp:311 msgid "" "Now gradients remain fixed when objects are transformed " "(moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:322 +#: ../src/widgets/select-toolbar.cpp:322 msgid "" "Now patterns are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:324 +#: ../src/widgets/select-toolbar.cpp:324 msgid "" "Now patterns remain fixed when objects are transformed (moved, " "scaled, rotated, or skewed)." msgstr "" #. name -#: ../src/ui/toolbar/select-toolbar.cpp:438 +#: ../src/widgets/select-toolbar.cpp:438 msgctxt "Select toolbar" msgid "X position" msgstr "" #. label -#: ../src/ui/toolbar/select-toolbar.cpp:439 +#: ../src/widgets/select-toolbar.cpp:439 msgctxt "Select toolbar" msgid "X:" msgstr "" #. shortLabel -#: ../src/ui/toolbar/select-toolbar.cpp:440 +#: ../src/widgets/select-toolbar.cpp:440 msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" msgstr "" #. name -#: ../src/ui/toolbar/select-toolbar.cpp:457 +#: ../src/widgets/select-toolbar.cpp:457 msgctxt "Select toolbar" msgid "Y position" msgstr "" #. label -#: ../src/ui/toolbar/select-toolbar.cpp:458 +#: ../src/widgets/select-toolbar.cpp:458 msgctxt "Select toolbar" msgid "Y:" msgstr "" #. shortLabel -#: ../src/ui/toolbar/select-toolbar.cpp:459 +#: ../src/widgets/select-toolbar.cpp:459 msgctxt "Select toolbar" msgid "Vertical coordinate of selection" msgstr "" #. name -#: ../src/ui/toolbar/select-toolbar.cpp:476 +#: ../src/widgets/select-toolbar.cpp:476 msgctxt "Select toolbar" msgid "Width" msgstr "" #. label -#: ../src/ui/toolbar/select-toolbar.cpp:477 +#: ../src/widgets/select-toolbar.cpp:477 msgctxt "Select toolbar" msgid "W:" msgstr "" #. shortLabel -#: ../src/ui/toolbar/select-toolbar.cpp:478 +#: ../src/widgets/select-toolbar.cpp:478 msgctxt "Select toolbar" msgid "Width of selection" msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:496 +#: ../src/widgets/select-toolbar.cpp:496 msgid "Lock width and height" msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:497 +#: ../src/widgets/select-toolbar.cpp:497 msgid "When locked, change both width and height by the same proportion" msgstr "" #. name -#: ../src/ui/toolbar/select-toolbar.cpp:508 +#: ../src/widgets/select-toolbar.cpp:508 msgctxt "Select toolbar" msgid "Height" msgstr "" #. label -#: ../src/ui/toolbar/select-toolbar.cpp:509 +#: ../src/widgets/select-toolbar.cpp:509 msgctxt "Select toolbar" msgid "H:" msgstr "" #. shortLabel -#: ../src/ui/toolbar/select-toolbar.cpp:510 +#: ../src/widgets/select-toolbar.cpp:510 msgctxt "Select toolbar" msgid "Height of selection" msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:574 +#: ../src/widgets/select-toolbar.cpp:574 msgid "Scale rounded corners" msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:585 +#: ../src/widgets/select-toolbar.cpp:585 msgid "Move gradients" msgstr "" -#: ../src/ui/toolbar/select-toolbar.cpp:596 +#: ../src/widgets/select-toolbar.cpp:596 msgid "Move patterns" msgstr "" @@ -30384,467 +30384,467 @@ msgstr "" msgid "Type text in a text node" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:100 +#: ../src/widgets/spiral-toolbar.cpp:100 msgid "Change spiral" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:250 +#: ../src/widgets/spiral-toolbar.cpp:250 msgid "just a curve" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:250 +#: ../src/widgets/spiral-toolbar.cpp:250 msgid "one full revolution" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:253 +#: ../src/widgets/spiral-toolbar.cpp:253 msgid "Number of turns" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:253 +#: ../src/widgets/spiral-toolbar.cpp:253 msgid "Turns:" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:253 +#: ../src/widgets/spiral-toolbar.cpp:253 msgid "Number of revolutions" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:264 +#: ../src/widgets/spiral-toolbar.cpp:264 msgid "circle" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:264 +#: ../src/widgets/spiral-toolbar.cpp:264 msgid "edge is much denser" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:264 +#: ../src/widgets/spiral-toolbar.cpp:264 msgid "edge is denser" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:264 +#: ../src/widgets/spiral-toolbar.cpp:264 msgid "even" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:264 +#: ../src/widgets/spiral-toolbar.cpp:264 msgid "center is denser" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:264 +#: ../src/widgets/spiral-toolbar.cpp:264 msgid "center is much denser" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:267 +#: ../src/widgets/spiral-toolbar.cpp:267 msgid "Divergence" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:267 +#: ../src/widgets/spiral-toolbar.cpp:267 msgid "Divergence:" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:267 +#: ../src/widgets/spiral-toolbar.cpp:267 msgid "How much denser/sparser are outer revolutions; 1 = uniform" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:278 +#: ../src/widgets/spiral-toolbar.cpp:278 msgid "starts from center" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:278 +#: ../src/widgets/spiral-toolbar.cpp:278 msgid "starts mid-way" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:278 +#: ../src/widgets/spiral-toolbar.cpp:278 msgid "starts near edge" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:281 +#: ../src/widgets/spiral-toolbar.cpp:281 msgid "Inner radius" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:281 +#: ../src/widgets/spiral-toolbar.cpp:281 msgid "Inner radius:" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:281 +#: ../src/widgets/spiral-toolbar.cpp:281 msgid "Radius of the innermost revolution (relative to the spiral size)" msgstr "" -#: ../src/ui/toolbar/spiral-toolbar.cpp:294 ../src/ui/toolbar/star-toolbar.cpp:593 +#: ../src/widgets/spiral-toolbar.cpp:294 ../src/widgets/star-toolbar.cpp:593 msgid "" "Reset shape parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" msgstr "" #. Width -#: ../src/ui/toolbar/spray-toolbar.cpp:294 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(narrow spray)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:294 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(broad spray)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:297 +#: ../src/widgets/spray-toolbar.cpp:297 msgid "The width of the spray area (relative to the visible canvas area)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:312 +#: ../src/widgets/spray-toolbar.cpp:312 msgid "Use the pressure of the input device to alter the width of spray area" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:323 +#: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:326 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:326 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus:" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:326 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "" #. Standard_deviation -#: ../src/ui/toolbar/spray-toolbar.cpp:339 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(minimum scatter)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:339 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(maximum scatter)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:342 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:342 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter:" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:342 +#: ../src/widgets/spray-toolbar.cpp:342 msgid "Increase to scatter sprayed objects" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:363 +#: ../src/widgets/spray-toolbar.cpp:363 msgid "Spray copies of the initial selection" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:369 +#: ../src/widgets/spray-toolbar.cpp:369 msgid "Spray clones of the initial selection" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:375 +#: ../src/widgets/spray-toolbar.cpp:375 msgid "Spray single path" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:376 +#: ../src/widgets/spray-toolbar.cpp:376 msgid "Spray objects in a single path" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:382 +#: ../src/widgets/spray-toolbar.cpp:382 msgid "Delete sprayed items" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:383 +#: ../src/widgets/spray-toolbar.cpp:383 msgid "Delete sprayed items from selection" msgstr "" #. Population -#: ../src/ui/toolbar/spray-toolbar.cpp:406 +#: ../src/widgets/spray-toolbar.cpp:406 msgid "(low population)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:406 +#: ../src/widgets/spray-toolbar.cpp:406 msgid "(high population)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:409 +#: ../src/widgets/spray-toolbar.cpp:409 msgid "Amount" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:410 +#: ../src/widgets/spray-toolbar.cpp:410 msgid "Adjusts the number of items sprayed per click" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:426 +#: ../src/widgets/spray-toolbar.cpp:426 msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:436 +#: ../src/widgets/spray-toolbar.cpp:436 msgid "(high rotation variation)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:439 +#: ../src/widgets/spray-toolbar.cpp:439 msgid "Rotation" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:439 +#: ../src/widgets/spray-toolbar.cpp:439 msgid "Rotation:" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:441 +#: ../src/widgets/spray-toolbar.cpp:441 #, no-c-format msgid "" "Variation of the rotation of the sprayed objects; 0% for the same rotation " "than the original object" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:454 +#: ../src/widgets/spray-toolbar.cpp:454 msgid "(high scale variation)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:457 +#: ../src/widgets/spray-toolbar.cpp:457 msgctxt "Spray tool" msgid "Scale" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:457 +#: ../src/widgets/spray-toolbar.cpp:457 msgctxt "Spray tool" msgid "Scale:" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:459 +#: ../src/widgets/spray-toolbar.cpp:459 #, no-c-format msgid "" "Variation in the scale of the sprayed objects; 0% for the same scale than " "the original object" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:475 +#: ../src/widgets/spray-toolbar.cpp:475 msgid "Use the pressure of the input device to alter the scale of new items" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:487 ../src/ui/toolbar/spray-toolbar.cpp:488 +#: ../src/widgets/spray-toolbar.cpp:487 ../src/widgets/spray-toolbar.cpp:488 msgid "" "Pick color from the drawing. You can use clonetiler trace dialog for " "advanced effects. In clone mode original fill or stroke colors must be unset." msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:500 ../src/ui/toolbar/spray-toolbar.cpp:501 +#: ../src/widgets/spray-toolbar.cpp:500 ../src/widgets/spray-toolbar.cpp:501 msgid "Pick from center instead average area." msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:513 ../src/ui/toolbar/spray-toolbar.cpp:514 +#: ../src/widgets/spray-toolbar.cpp:513 ../src/widgets/spray-toolbar.cpp:514 msgid "Inverted pick value, retaining color in advanced trace mode" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:526 ../src/ui/toolbar/spray-toolbar.cpp:527 +#: ../src/widgets/spray-toolbar.cpp:526 ../src/widgets/spray-toolbar.cpp:527 msgid "Apply picked color to fill" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:539 ../src/ui/toolbar/spray-toolbar.cpp:540 +#: ../src/widgets/spray-toolbar.cpp:539 ../src/widgets/spray-toolbar.cpp:540 msgid "Apply picked color to stroke" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:552 ../src/ui/toolbar/spray-toolbar.cpp:553 +#: ../src/widgets/spray-toolbar.cpp:552 ../src/widgets/spray-toolbar.cpp:553 msgid "No overlap between colors" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:565 ../src/ui/toolbar/spray-toolbar.cpp:566 +#: ../src/widgets/spray-toolbar.cpp:565 ../src/widgets/spray-toolbar.cpp:566 msgid "Apply over transparent areas" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:578 ../src/ui/toolbar/spray-toolbar.cpp:579 +#: ../src/widgets/spray-toolbar.cpp:578 ../src/widgets/spray-toolbar.cpp:579 msgid "Apply over no transparent areas" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:591 ../src/ui/toolbar/spray-toolbar.cpp:592 +#: ../src/widgets/spray-toolbar.cpp:591 ../src/widgets/spray-toolbar.cpp:592 msgid "Prevent overlapping objects" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:603 +#: ../src/widgets/spray-toolbar.cpp:603 msgid "(minimum offset)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:603 +#: ../src/widgets/spray-toolbar.cpp:603 msgid "(maximum offset)" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:606 +#: ../src/widgets/spray-toolbar.cpp:606 msgid "Offset %" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:606 +#: ../src/widgets/spray-toolbar.cpp:606 msgid "Offset %:" msgstr "" -#: ../src/ui/toolbar/spray-toolbar.cpp:607 +#: ../src/widgets/spray-toolbar.cpp:607 msgid "Increase to segregate objects more (value in percent)" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:105 +#: ../src/widgets/star-toolbar.cpp:105 msgid "Star: Change number of corners" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:158 +#: ../src/widgets/star-toolbar.cpp:158 msgid "Star: Change spoke ratio" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:204 +#: ../src/widgets/star-toolbar.cpp:204 msgid "Make polygon" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:204 +#: ../src/widgets/star-toolbar.cpp:204 msgid "Make star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:243 +#: ../src/widgets/star-toolbar.cpp:243 msgid "Star: Change rounding" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:283 +#: ../src/widgets/star-toolbar.cpp:283 msgid "Star: Change randomization" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:492 +#: ../src/widgets/star-toolbar.cpp:492 msgid "Regular polygon (with one handle) instead of a star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:498 +#: ../src/widgets/star-toolbar.cpp:498 msgid "Star instead of a regular polygon (with one handle)" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:520 +#: ../src/widgets/star-toolbar.cpp:520 msgid "triangle/tri-star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:520 +#: ../src/widgets/star-toolbar.cpp:520 msgid "square/quad-star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:520 +#: ../src/widgets/star-toolbar.cpp:520 msgid "pentagon/five-pointed star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:520 +#: ../src/widgets/star-toolbar.cpp:520 msgid "hexagon/six-pointed star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:523 +#: ../src/widgets/star-toolbar.cpp:523 msgid "Corners" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:523 +#: ../src/widgets/star-toolbar.cpp:523 msgid "Corners:" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:523 +#: ../src/widgets/star-toolbar.cpp:523 msgid "Number of corners of a polygon or star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:536 +#: ../src/widgets/star-toolbar.cpp:536 msgid "thin-ray star" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:536 +#: ../src/widgets/star-toolbar.cpp:536 msgid "pentagram" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:536 +#: ../src/widgets/star-toolbar.cpp:536 msgid "hexagram" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:536 +#: ../src/widgets/star-toolbar.cpp:536 msgid "heptagram" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:536 +#: ../src/widgets/star-toolbar.cpp:536 msgid "octagram" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:536 +#: ../src/widgets/star-toolbar.cpp:536 msgid "regular polygon" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:539 +#: ../src/widgets/star-toolbar.cpp:539 msgid "Spoke ratio" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:539 +#: ../src/widgets/star-toolbar.cpp:539 msgid "Spoke ratio:" msgstr "" #. TRANSLATORS: Tip radius of a star is the distance from the center to the farthest handle. #. Base radius is the same for the closest handle. -#: ../src/ui/toolbar/star-toolbar.cpp:542 +#: ../src/widgets/star-toolbar.cpp:542 msgid "Base radius to tip radius ratio" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:560 ../src/ui/toolbar/star-toolbar.cpp:561 +#: ../src/widgets/star-toolbar.cpp:560 ../src/widgets/star-toolbar.cpp:561 msgid "stretched" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:560 +#: ../src/widgets/star-toolbar.cpp:560 msgid "twisted" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:560 +#: ../src/widgets/star-toolbar.cpp:560 msgid "slightly pinched" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:560 +#: ../src/widgets/star-toolbar.cpp:560 msgid "NOT rounded" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:560 +#: ../src/widgets/star-toolbar.cpp:560 msgid "slightly rounded" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:561 +#: ../src/widgets/star-toolbar.cpp:561 msgid "visibly rounded" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:561 +#: ../src/widgets/star-toolbar.cpp:561 msgid "well rounded" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:561 +#: ../src/widgets/star-toolbar.cpp:561 msgid "amply rounded" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:561 ../src/ui/toolbar/star-toolbar.cpp:576 +#: ../src/widgets/star-toolbar.cpp:561 ../src/widgets/star-toolbar.cpp:576 msgid "blown up" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:564 +#: ../src/widgets/star-toolbar.cpp:564 msgid "Rounded:" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:564 +#: ../src/widgets/star-toolbar.cpp:564 msgid "How much rounded are the corners (0 for sharp)" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:576 +#: ../src/widgets/star-toolbar.cpp:576 msgid "NOT randomized" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:576 +#: ../src/widgets/star-toolbar.cpp:576 msgid "slightly irregular" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:576 +#: ../src/widgets/star-toolbar.cpp:576 msgid "visibly randomized" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:576 +#: ../src/widgets/star-toolbar.cpp:576 msgid "strongly randomized" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:579 +#: ../src/widgets/star-toolbar.cpp:579 msgid "Randomized" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:579 +#: ../src/widgets/star-toolbar.cpp:579 msgid "Randomized:" msgstr "" -#: ../src/ui/toolbar/star-toolbar.cpp:579 +#: ../src/widgets/star-toolbar.cpp:579 msgid "Scatter randomly the corners and angles" msgstr "" @@ -30974,306 +30974,306 @@ msgstr "" msgid "Change swatch color" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:188 +#: ../src/widgets/text-toolbar.cpp:188 msgid "Text: Change font family" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:282 +#: ../src/widgets/text-toolbar.cpp:282 msgid "Text: Change font size" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:327 +#: ../src/widgets/text-toolbar.cpp:327 msgid "Text: Change font style" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:366 +#: ../src/widgets/text-toolbar.cpp:366 msgid "Text: Unset line height." msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:443 +#: ../src/widgets/text-toolbar.cpp:443 msgid "Text: Change superscript or subscript" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:584 +#: ../src/widgets/text-toolbar.cpp:584 msgid "Text: Change alignment" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:717 +#: ../src/widgets/text-toolbar.cpp:717 msgid "Text: Change line-height" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:881 +#: ../src/widgets/text-toolbar.cpp:881 msgid "Text: Change line-height unit" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1061 +#: ../src/widgets/text-toolbar.cpp:1061 msgid "Text: Change line spacing mode" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1098 +#: ../src/widgets/text-toolbar.cpp:1098 msgid "Text: Change word-spacing" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1138 +#: ../src/widgets/text-toolbar.cpp:1138 msgid "Text: Change letter-spacing" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1176 +#: ../src/widgets/text-toolbar.cpp:1176 msgid "Text: Change dx (kern)" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1210 +#: ../src/widgets/text-toolbar.cpp:1210 msgid "Text: Change dy" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1245 +#: ../src/widgets/text-toolbar.cpp:1245 msgid "Text: Change rotate" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1296 +#: ../src/widgets/text-toolbar.cpp:1296 msgid "Text: Change writing mode" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1350 +#: ../src/widgets/text-toolbar.cpp:1350 msgid "Text: Change orientation" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1398 +#: ../src/widgets/text-toolbar.cpp:1398 msgid "Text: Change direction" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1996 +#: ../src/widgets/text-toolbar.cpp:1996 msgid "Font Family" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:1997 +#: ../src/widgets/text-toolbar.cpp:1997 msgid "Select Font Family (Alt-X to access)" msgstr "" #. Focus widget #. Enable entry completion -#: ../src/ui/toolbar/text-toolbar.cpp:2007 +#: ../src/widgets/text-toolbar.cpp:2007 msgid "Select all text with this font-family" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2011 +#: ../src/widgets/text-toolbar.cpp:2011 msgid "Font not found on system" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2069 +#: ../src/widgets/text-toolbar.cpp:2069 msgid "Font Style" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2070 +#: ../src/widgets/text-toolbar.cpp:2070 msgid "Font style" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2087 +#: ../src/widgets/text-toolbar.cpp:2087 msgid "Toggle Superscript" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2088 +#: ../src/widgets/text-toolbar.cpp:2088 msgid "Toggle superscript" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2100 +#: ../src/widgets/text-toolbar.cpp:2100 msgid "Toggle Subscript" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2101 +#: ../src/widgets/text-toolbar.cpp:2101 msgid "Toggle subscript" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2119 ../src/ui/toolbar/text-toolbar.cpp:2120 +#: ../src/widgets/text-toolbar.cpp:2119 ../src/widgets/text-toolbar.cpp:2120 msgid "Align left" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2125 ../src/ui/toolbar/text-toolbar.cpp:2126 +#: ../src/widgets/text-toolbar.cpp:2125 ../src/widgets/text-toolbar.cpp:2126 msgid "Align center" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2131 ../src/ui/toolbar/text-toolbar.cpp:2132 +#: ../src/widgets/text-toolbar.cpp:2131 ../src/widgets/text-toolbar.cpp:2132 msgid "Align right" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2137 +#: ../src/widgets/text-toolbar.cpp:2137 msgid "Justify" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2138 +#: ../src/widgets/text-toolbar.cpp:2138 msgid "Justify (only flowed text)" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2144 +#: ../src/widgets/text-toolbar.cpp:2144 msgid "Alignment" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2145 +#: ../src/widgets/text-toolbar.cpp:2145 msgid "Text alignment" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2169 +#: ../src/widgets/text-toolbar.cpp:2169 msgid "Horizontal text" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2174 +#: ../src/widgets/text-toolbar.cpp:2174 msgid "Vertical — RL" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2175 +#: ../src/widgets/text-toolbar.cpp:2175 msgid "Vertical text — lines: right to left" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2180 +#: ../src/widgets/text-toolbar.cpp:2180 msgid "Vertical — LR" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2181 +#: ../src/widgets/text-toolbar.cpp:2181 msgid "Vertical text — lines: left to right" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2187 +#: ../src/widgets/text-toolbar.cpp:2187 msgid "Writing mode" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2188 +#: ../src/widgets/text-toolbar.cpp:2188 msgid "Block progression" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2212 +#: ../src/widgets/text-toolbar.cpp:2212 msgid "Auto glyph orientation" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2217 +#: ../src/widgets/text-toolbar.cpp:2217 msgid "Upright" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2218 +#: ../src/widgets/text-toolbar.cpp:2218 msgid "Upright glyph orientation" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2223 +#: ../src/widgets/text-toolbar.cpp:2223 msgid "Sideways" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2224 +#: ../src/widgets/text-toolbar.cpp:2224 msgid "Sideways glyph orientation" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2230 +#: ../src/widgets/text-toolbar.cpp:2230 msgid "Text orientation" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2231 +#: ../src/widgets/text-toolbar.cpp:2231 msgid "Text (glyph) orientation in vertical text." msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2255 +#: ../src/widgets/text-toolbar.cpp:2255 msgid "LTR" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2256 +#: ../src/widgets/text-toolbar.cpp:2256 msgid "Left to right text" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2261 +#: ../src/widgets/text-toolbar.cpp:2261 msgid "RTL" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2262 +#: ../src/widgets/text-toolbar.cpp:2262 msgid "Right to left text" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2268 +#: ../src/widgets/text-toolbar.cpp:2268 msgid "Text direction" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2269 +#: ../src/widgets/text-toolbar.cpp:2269 msgid "Text direction for normally horizontal text." msgstr "" #. Drop down menu -#: ../src/ui/toolbar/text-toolbar.cpp:2295 +#: ../src/widgets/text-toolbar.cpp:2295 msgid "Smaller spacing" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2295 ../src/ui/toolbar/text-toolbar.cpp:2383 -#: ../src/ui/toolbar/text-toolbar.cpp:2414 +#: ../src/widgets/text-toolbar.cpp:2295 ../src/widgets/text-toolbar.cpp:2383 +#: ../src/widgets/text-toolbar.cpp:2414 msgctxt "Text tool" msgid "Normal" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2295 +#: ../src/widgets/text-toolbar.cpp:2295 msgid "Larger spacing" msgstr "" #. name -#: ../src/ui/toolbar/text-toolbar.cpp:2300 +#: ../src/widgets/text-toolbar.cpp:2300 msgid "Line Height" msgstr "" #. label -#: ../src/ui/toolbar/text-toolbar.cpp:2301 +#: ../src/widgets/text-toolbar.cpp:2301 msgid "Line:" msgstr "" #. short label -#: ../src/ui/toolbar/text-toolbar.cpp:2302 +#: ../src/widgets/text-toolbar.cpp:2302 msgid "Spacing between baselines" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2341 +#: ../src/widgets/text-toolbar.cpp:2341 msgid "Adaptive" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2342 +#: ../src/widgets/text-toolbar.cpp:2342 msgid "Line spacing adapts to font size." msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2347 +#: ../src/widgets/text-toolbar.cpp:2347 #: ../share/extensions/polyhedron_3d.inx.h:54 msgid "Minimum" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2348 +#: ../src/widgets/text-toolbar.cpp:2348 msgid "Line spacing adapts to fonts size with set minimum spacing." msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2352 +#: ../src/widgets/text-toolbar.cpp:2352 msgid "Even" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2353 +#: ../src/widgets/text-toolbar.cpp:2353 msgid "Lines evenly spaced." msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2358 +#: ../src/widgets/text-toolbar.cpp:2358 msgid "Adjustable ☠" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2359 +#: ../src/widgets/text-toolbar.cpp:2359 msgid "Line spacing fully adjustable" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2365 +#: ../src/widgets/text-toolbar.cpp:2365 msgid "Line Spacing Mode" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2366 +#: ../src/widgets/text-toolbar.cpp:2366 msgid "" "How should multiple baselines be spaced?\n" " Adaptive: Line spacing adapts to font size.\n" @@ -31283,106 +31283,106 @@ msgid "" msgstr "" #. Drop down menu -#: ../src/ui/toolbar/text-toolbar.cpp:2383 ../src/ui/toolbar/text-toolbar.cpp:2414 +#: ../src/widgets/text-toolbar.cpp:2383 ../src/widgets/text-toolbar.cpp:2414 msgid "Negative spacing" msgstr "" -#: ../src/ui/toolbar/text-toolbar.cpp:2383 ../src/ui/toolbar/text-toolbar.cpp:2414 +#: ../src/widgets/text-toolbar.cpp:2383 ../src/widgets/text-toolbar.cpp:2414 msgid "Positive spacing" msgstr "" #. name -#: ../src/ui/toolbar/text-toolbar.cpp:2388 +#: ../src/widgets/text-toolbar.cpp:2388 msgid "Word spacing" msgstr "" #. label -#: ../src/ui/toolbar/text-toolbar.cpp:2389 +#: ../src/widgets/text-toolbar.cpp:2389 msgid "Word:" msgstr "" #. short label -#: ../src/ui/toolbar/text-toolbar.cpp:2390 +#: ../src/widgets/text-toolbar.cpp:2390 msgid "Spacing between words (px)" msgstr "" #. name -#: ../src/ui/toolbar/text-toolbar.cpp:2419 +#: ../src/widgets/text-toolbar.cpp:2419 msgid "Letter spacing" msgstr "" #. label -#: ../src/ui/toolbar/text-toolbar.cpp:2420 +#: ../src/widgets/text-toolbar.cpp:2420 msgid "Letter:" msgstr "" #. short label -#: ../src/ui/toolbar/text-toolbar.cpp:2421 +#: ../src/widgets/text-toolbar.cpp:2421 msgid "Spacing between letters (px)" msgstr "" #. name -#: ../src/ui/toolbar/text-toolbar.cpp:2450 +#: ../src/widgets/text-toolbar.cpp:2450 msgid "Kerning" msgstr "" #. label -#: ../src/ui/toolbar/text-toolbar.cpp:2451 +#: ../src/widgets/text-toolbar.cpp:2451 msgid "Kern:" msgstr "" #. short label -#: ../src/ui/toolbar/text-toolbar.cpp:2452 +#: ../src/widgets/text-toolbar.cpp:2452 msgid "Horizontal kerning (px)" msgstr "" #. name -#: ../src/ui/toolbar/text-toolbar.cpp:2481 +#: ../src/widgets/text-toolbar.cpp:2481 msgid "Vertical Shift" msgstr "" #. label -#: ../src/ui/toolbar/text-toolbar.cpp:2482 +#: ../src/widgets/text-toolbar.cpp:2482 msgid "Vert:" msgstr "" #. short label -#: ../src/ui/toolbar/text-toolbar.cpp:2483 +#: ../src/widgets/text-toolbar.cpp:2483 msgid "Vertical shift (px)" msgstr "" #. name -#: ../src/ui/toolbar/text-toolbar.cpp:2512 +#: ../src/widgets/text-toolbar.cpp:2512 msgid "Letter rotation" msgstr "" #. label -#: ../src/ui/toolbar/text-toolbar.cpp:2513 +#: ../src/widgets/text-toolbar.cpp:2513 msgid "Rot:" msgstr "" #. short label -#: ../src/ui/toolbar/text-toolbar.cpp:2514 +#: ../src/widgets/text-toolbar.cpp:2514 msgid "Character rotation (degrees)" msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2538 +#: ../src/widgets/text-toolbar.cpp:2538 msgid "Unset line height" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2539 +#: ../src/widgets/text-toolbar.cpp:2539 msgid "If enabled, line height is set on part of selection. Click to unset." msgstr "" #. Name -#: ../src/ui/toolbar/text-toolbar.cpp:2551 +#: ../src/widgets/text-toolbar.cpp:2551 msgid "Show outer style" msgstr "" #. Label -#: ../src/ui/toolbar/text-toolbar.cpp:2552 +#: ../src/widgets/text-toolbar.cpp:2552 msgid "" "Show style of outermost text element. The 'font-size' and 'line-height' " "values of the outermost text element determine the minimum line spacing in " @@ -31562,211 +31562,211 @@ msgid "Snap guides" msgstr "" #. Width -#: ../src/ui/toolbar/tweak-toolbar.cpp:129 +#: ../src/widgets/tweak-toolbar.cpp:129 msgid "(pinch tweak)" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:129 +#: ../src/widgets/tweak-toolbar.cpp:129 msgid "(broad tweak)" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:132 +#: ../src/widgets/tweak-toolbar.cpp:132 msgid "The width of the tweak area (relative to the visible canvas area)" msgstr "" #. Force -#: ../src/ui/toolbar/tweak-toolbar.cpp:146 +#: ../src/widgets/tweak-toolbar.cpp:146 msgid "(minimum force)" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:146 +#: ../src/widgets/tweak-toolbar.cpp:146 msgid "(maximum force)" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:149 +#: ../src/widgets/tweak-toolbar.cpp:149 msgid "Force" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:149 +#: ../src/widgets/tweak-toolbar.cpp:149 msgid "Force:" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:149 +#: ../src/widgets/tweak-toolbar.cpp:149 msgid "The force of the tweak action" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:169 +#: ../src/widgets/tweak-toolbar.cpp:169 msgid "Move mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:170 +#: ../src/widgets/tweak-toolbar.cpp:170 msgid "Move objects in any direction" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:175 +#: ../src/widgets/tweak-toolbar.cpp:175 msgid "Move in/out mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:176 +#: ../src/widgets/tweak-toolbar.cpp:176 msgid "Move objects towards cursor; with Shift from cursor" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:181 +#: ../src/widgets/tweak-toolbar.cpp:181 msgid "Move jitter mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:182 +#: ../src/widgets/tweak-toolbar.cpp:182 msgid "Move objects in random directions" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:187 +#: ../src/widgets/tweak-toolbar.cpp:187 msgid "Scale mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:188 +#: ../src/widgets/tweak-toolbar.cpp:188 msgid "Shrink objects, with Shift enlarge" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:193 +#: ../src/widgets/tweak-toolbar.cpp:193 msgid "Rotate mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:194 +#: ../src/widgets/tweak-toolbar.cpp:194 msgid "Rotate objects, with Shift counterclockwise" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:199 +#: ../src/widgets/tweak-toolbar.cpp:199 msgid "Duplicate/delete mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:200 +#: ../src/widgets/tweak-toolbar.cpp:200 msgid "Duplicate objects, with Shift delete" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:205 +#: ../src/widgets/tweak-toolbar.cpp:205 msgid "Push mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:206 +#: ../src/widgets/tweak-toolbar.cpp:206 msgid "Push parts of paths in any direction" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:211 +#: ../src/widgets/tweak-toolbar.cpp:211 msgid "Shrink/grow mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:212 +#: ../src/widgets/tweak-toolbar.cpp:212 msgid "Shrink (inset) parts of paths; with Shift grow (outset)" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:217 +#: ../src/widgets/tweak-toolbar.cpp:217 msgid "Attract/repel mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:218 +#: ../src/widgets/tweak-toolbar.cpp:218 msgid "Attract parts of paths towards cursor; with Shift from cursor" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:223 +#: ../src/widgets/tweak-toolbar.cpp:223 msgid "Roughen mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:224 +#: ../src/widgets/tweak-toolbar.cpp:224 msgid "Roughen parts of paths" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:229 +#: ../src/widgets/tweak-toolbar.cpp:229 msgid "Color paint mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:230 +#: ../src/widgets/tweak-toolbar.cpp:230 msgid "Paint the tool's color upon selected objects" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:235 +#: ../src/widgets/tweak-toolbar.cpp:235 msgid "Color jitter mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:236 +#: ../src/widgets/tweak-toolbar.cpp:236 msgid "Jitter the colors of selected objects" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:241 +#: ../src/widgets/tweak-toolbar.cpp:241 msgid "Blur mode" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:242 +#: ../src/widgets/tweak-toolbar.cpp:242 msgid "Blur selected objects more; with Shift, blur less" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:269 +#: ../src/widgets/tweak-toolbar.cpp:269 msgid "Channels:" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:281 +#: ../src/widgets/tweak-toolbar.cpp:281 msgid "In color mode, act on objects' hue" msgstr "" #. TRANSLATORS: "H" here stands for hue -#: ../src/ui/toolbar/tweak-toolbar.cpp:285 +#: ../src/widgets/tweak-toolbar.cpp:285 msgctxt "Hue" msgid "H" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:297 +#: ../src/widgets/tweak-toolbar.cpp:297 msgid "In color mode, act on objects' saturation" msgstr "" #. TRANSLATORS: "S" here stands for Saturation -#: ../src/ui/toolbar/tweak-toolbar.cpp:301 +#: ../src/widgets/tweak-toolbar.cpp:301 msgctxt "Saturation" msgid "S" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:313 +#: ../src/widgets/tweak-toolbar.cpp:313 msgid "In color mode, act on objects' lightness" msgstr "" #. TRANSLATORS: "L" here stands for Lightness -#: ../src/ui/toolbar/tweak-toolbar.cpp:317 +#: ../src/widgets/tweak-toolbar.cpp:317 msgctxt "Lightness" msgid "L" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:329 +#: ../src/widgets/tweak-toolbar.cpp:329 msgid "In color mode, act on objects' opacity" msgstr "" #. TRANSLATORS: "O" here stands for Opacity -#: ../src/ui/toolbar/tweak-toolbar.cpp:333 +#: ../src/widgets/tweak-toolbar.cpp:333 msgctxt "Opacity" msgid "O" msgstr "" #. Fidelity -#: ../src/ui/toolbar/tweak-toolbar.cpp:344 +#: ../src/widgets/tweak-toolbar.cpp:344 msgid "(rough, simplified)" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:344 +#: ../src/widgets/tweak-toolbar.cpp:344 msgid "(fine, but many nodes)" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:347 +#: ../src/widgets/tweak-toolbar.cpp:347 msgid "Fidelity" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:347 +#: ../src/widgets/tweak-toolbar.cpp:347 msgid "Fidelity:" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:348 +#: ../src/widgets/tweak-toolbar.cpp:348 msgid "" "Low fidelity simplifies paths; high fidelity preserves path features but may " "generate a lot of new nodes" msgstr "" -#: ../src/ui/toolbar/tweak-toolbar.cpp:367 +#: ../src/widgets/tweak-toolbar.cpp:367 msgid "Use the pressure of the input device to alter the force of tweak action" msgstr "" diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp index f7133ecef23..7be86a1a8b8 100644 --- a/src/helper/icon-loader.cpp +++ b/src/helper/icon-loader.cpp @@ -29,6 +29,9 @@ Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) if (prefs->getString("/theme/themeName") == "") { prefs->setString("/theme/themeName", "hicolor"); } + //TODO: remove this fixed value by a theme setting in prefs or wereeber might to be + prefs->setBool("/theme/symbolicIcons", true); + prefs->setString("/theme/symbolicIcons", "hicolor"); auto iconTheme = Gtk::IconTheme::create(); iconTheme->set_custom_theme(prefs->getString("/theme/themeName")); iconTheme->append_search_path(get_path_ustring(SYSTEM, ICONS)); diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp index be75555db41..c92e1c437ba 100644 --- a/src/live_effects/parameter/togglebutton.cpp +++ b/src/live_effects/parameter/togglebutton.cpp @@ -111,7 +111,7 @@ ToggleButtonParam::param_newWidget() } gtk_widget_show(box_button); GtkWidget *icon_button = nullptr; - if(!value){ + if (!value) { icon_button = GTK_WIDGET(sp_get_icon_image(_icon_inactive, _icon_size)); } else { icon_button = GTK_WIDGET(sp_get_icon_image(_icon_active, _icon_size)); @@ -163,7 +163,7 @@ ToggleButtonParam::refresh_button() Gtk::Image *im = dynamic_cast(children[0]); Gtk::IconSize is(_icon_size); if (!im) return; - if(!value){ + if (!value) { im = sp_get_icon_image(_icon_inactive, is); } else { im = sp_get_icon_image(_icon_active, is); diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp index fc7c15f21b2..0873f9a84a9 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -20,7 +20,7 @@ void AnchorSelector::setupButton(const Glib::ustring& icon, Gtk::ToggleButton& b Gtk::Image *buttonIcon = Gtk::manage(sp_get_icon_image(icon, Gtk::ICON_SIZE_SMALL_TOOLBAR)); buttonIcon->show(); - button.set_relief(Gtk::RELIEF_NONE); + button.set_relief(Gtk::RELIEF_NONE); button.show(); button.add(*buttonIcon); button.set_can_focus(false); -- GitLab From b9854e602a6c699e1154a2b922e4a03253372df9 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Thu, 19 Jul 2018 00:22:06 +0200 Subject: [PATCH 3/7] Cleanup for merge and start working with themes --- src/helper/icon-loader.cpp | 40 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp index 7be86a1a8b8..3eaeb72f5f1 100644 --- a/src/helper/icon-loader.cpp +++ b/src/helper/icon-loader.cpp @@ -30,8 +30,10 @@ Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) prefs->setString("/theme/themeName", "hicolor"); } //TODO: remove this fixed value by a theme setting in prefs or wereeber might to be - prefs->setBool("/theme/symbolicIcons", true); + prefs->setBool("/theme/symbolicIcons", false); prefs->setString("/theme/symbolicIcons", "hicolor"); + prefs->setInt("/theme/symbolicColor", 0x000000ff); + //end of remove auto iconTheme = Gtk::IconTheme::create(); iconTheme->set_custom_theme(prefs->getString("/theme/themeName")); iconTheme->append_search_path(get_path_ustring(SYSTEM, ICONS)); @@ -42,25 +44,25 @@ Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) #endif Glib::RefPtr _icon_pixbuf; try { - if (prefs->getBool("/theme/symbolicIcons", false)) { - gchar colornamed[64]; - sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); - Gdk::RGBA color; - color.set(colornamed); - Gtk::IconInfo iconinfo = - iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE); - if (bool(iconinfo)) { - // TODO: view if we need parametrice other colors - bool was_symbolic = false; - _icon_pixbuf = iconinfo.load_symbolic(color, color, color, color, was_symbolic); - } - else { - _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); - } - } - else { +// if (prefs->getBool("/theme/symbolicIcons", false)) { +// gchar colornamed[64]; +// sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); +// Gdk::RGBA color; +// color.set(colornamed); +// Gtk::IconInfo iconinfo = +// iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE); +// if (bool(iconinfo)) { +// // TODO: view if we need parametrice other colors +// bool was_symbolic = false; +// _icon_pixbuf = iconinfo.load_symbolic(color, color, color, color, was_symbolic); +// } +// else { +// _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); +// } +// } +// else { _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); - } +// } } catch (const Gtk::IconThemeError &e) { std::cout << "Icon Loader: " << e.what() << std::endl; -- GitLab From 8312e0ca447378b2cfb11572226877e85036f132 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Thu, 19 Jul 2018 00:33:46 +0200 Subject: [PATCH 4/7] Fix coding style --- src/helper/icon-loader.cpp | 41 +++++++++++++++---------------- src/ui/widget/anchor-selector.cpp | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/helper/icon-loader.cpp b/src/helper/icon-loader.cpp index 3eaeb72f5f1..a8aa663c0ae 100644 --- a/src/helper/icon-loader.cpp +++ b/src/helper/icon-loader.cpp @@ -29,11 +29,11 @@ Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) if (prefs->getString("/theme/themeName") == "") { prefs->setString("/theme/themeName", "hicolor"); } - //TODO: remove this fixed value by a theme setting in prefs or wereeber might to be + // TODO: remove this fixed value by a theme setting in prefs or wereeber might to be prefs->setBool("/theme/symbolicIcons", false); prefs->setString("/theme/symbolicIcons", "hicolor"); prefs->setInt("/theme/symbolicColor", 0x000000ff); - //end of remove + // end of remove auto iconTheme = Gtk::IconTheme::create(); iconTheme->set_custom_theme(prefs->getString("/theme/themeName")); iconTheme->append_search_path(get_path_ustring(SYSTEM, ICONS)); @@ -44,25 +44,24 @@ Glib::RefPtr sp_get_icon_pixbuf(Glib::ustring icon_name, gint size) #endif Glib::RefPtr _icon_pixbuf; try { -// if (prefs->getBool("/theme/symbolicIcons", false)) { -// gchar colornamed[64]; -// sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", 0x000000ff)); -// Gdk::RGBA color; -// color.set(colornamed); -// Gtk::IconInfo iconinfo = -// iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, Gtk::ICON_LOOKUP_FORCE_SIZE); -// if (bool(iconinfo)) { -// // TODO: view if we need parametrice other colors -// bool was_symbolic = false; -// _icon_pixbuf = iconinfo.load_symbolic(color, color, color, color, was_symbolic); -// } -// else { -// _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); -// } -// } -// else { - _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); -// } + // if (prefs->getBool("/theme/symbolicIcons", false)) { + // gchar colornamed[64]; + // sp_svg_write_color(colornamed, sizeof(colornamed), prefs->getInt("/theme/symbolicColor", + // 0x000000ff)); Gdk::RGBA color; color.set(colornamed); Gtk::IconInfo iconinfo = + // iconTheme->lookup_icon(icon_name + Glib::ustring("-symbolic"), size, + // Gtk::ICON_LOOKUP_FORCE_SIZE); + // if (bool(iconinfo)) { + // // TODO: view if we need parametrice other colors + // bool was_symbolic = false; + // _icon_pixbuf = iconinfo.load_symbolic(color, color, color, color, was_symbolic); + // } + // else { + // _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + // } + // } + // else { + _icon_pixbuf = iconTheme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE); + // } } catch (const Gtk::IconThemeError &e) { std::cout << "Icon Loader: " << e.what() << std::endl; diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp index 0873f9a84a9..60935d8d56f 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -21,7 +21,7 @@ void AnchorSelector::setupButton(const Glib::ustring& icon, Gtk::ToggleButton& b buttonIcon->show(); button.set_relief(Gtk::RELIEF_NONE); - button.show(); + button.show(); button.add(*buttonIcon); button.set_can_focus(false); } -- GitLab From 4f92e3c9aad6584affa7d46cf8bbb48537357525 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Thu, 19 Jul 2018 00:40:34 +0200 Subject: [PATCH 5/7] Fixing coding style --- src/ui/widget/anchor-selector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp index 60935d8d56f..e15f82aeebb 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -22,7 +22,7 @@ void AnchorSelector::setupButton(const Glib::ustring& icon, Gtk::ToggleButton& b button.set_relief(Gtk::RELIEF_NONE); button.show(); - button.add(*buttonIcon); + button.add(*buttonIcon); button.set_can_focus(false); } -- GitLab From a394adcbfaab159001064b8c8d5d1f3353eb80a5 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Thu, 19 Jul 2018 00:44:05 +0200 Subject: [PATCH 6/7] Fixing coding style --- src/ui/widget/anchor-selector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp index e15f82aeebb..cecc571ab14 100644 --- a/src/ui/widget/anchor-selector.cpp +++ b/src/ui/widget/anchor-selector.cpp @@ -23,7 +23,7 @@ void AnchorSelector::setupButton(const Glib::ustring& icon, Gtk::ToggleButton& b button.set_relief(Gtk::RELIEF_NONE); button.show(); button.add(*buttonIcon); - button.set_can_focus(false); + button.set_can_focus(false); } AnchorSelector::AnchorSelector() -- GitLab From 0a53b9994d8daf9f1d004baaf34cb8969fe07b59 Mon Sep 17 00:00:00 2001 From: Jabiertxo Arraiza Cenoz Date: Thu, 19 Jul 2018 11:20:15 +0200 Subject: [PATCH 7/7] Update inkscape.pot --- po/inkscape.pot | 1510 +++++++++++++++++++++++------------------------ 1 file changed, 755 insertions(+), 755 deletions(-) diff --git a/po/inkscape.pot b/po/inkscape.pot index e40a1f8b825..2272d15a117 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -4477,7 +4477,7 @@ msgstr "" #: ../src/display/canvas-axonomgrid.cpp:336 #: ../src/ui/dialog/inkscape-preferences.cpp:869 -#: ../src/widgets/box3d-toolbar.cpp:306 +#: ../src/ui/toolbar/box3d-toolbar.cpp:306 msgid "Angle X:" msgstr "" @@ -4488,7 +4488,7 @@ msgstr "" #: ../src/display/canvas-axonomgrid.cpp:338 #: ../src/ui/dialog/inkscape-preferences.cpp:870 -#: ../src/widgets/box3d-toolbar.cpp:385 +#: ../src/ui/toolbar/box3d-toolbar.cpp:385 msgid "Angle Z:" msgstr "" @@ -4983,9 +4983,9 @@ msgstr "" #: ../src/ui/dialog/object-attributes.cpp:68 #: ../src/ui/dialog/object-attributes.cpp:77 #: ../src/ui/widget/page-sizer.cpp:231 -#: ../src/widgets/calligraphy-toolbar.cpp:401 -#: ../src/widgets/eraser-toolbar.cpp:191 ../src/widgets/spray-toolbar.cpp:297 -#: ../src/widgets/tweak-toolbar.cpp:132 ../share/extensions/foldablebox.inx.h:2 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:401 +#: ../src/ui/toolbar/eraser-toolbar.cpp:191 ../src/ui/toolbar/spray-toolbar.cpp:297 +#: ../src/ui/toolbar/tweak-toolbar.cpp:132 ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "" @@ -4999,7 +4999,7 @@ msgid "Height:" msgstr "" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 -#: ../src/widgets/measure-toolbar.cpp:349 +#: ../src/ui/toolbar/measure-toolbar.cpp:349 #: ../share/extensions/printing_marks.inx.h:12 msgid "Offset:" msgstr "" @@ -5248,7 +5248,7 @@ msgstr "" #: ../src/extension/internal/bitmap/cycleColormap.cpp:39 #: ../src/extension/internal/bitmap/spread.cpp:39 #: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/widgets/spray-toolbar.cpp:409 +#: ../src/ui/toolbar/spray-toolbar.cpp:409 msgid "Amount:" msgstr "" @@ -5423,14 +5423,14 @@ msgstr "" #: ../src/extension/internal/filter/blurs.h:333 #: ../src/extension/internal/filter/transparency.h:279 #: ../src/ui/dialog/clonetiler.cpp:799 ../src/ui/dialog/clonetiler.cpp:930 -#: ../src/widgets/tweak-toolbar.cpp:328 +#: ../src/ui/toolbar/tweak-toolbar.cpp:328 #: ../share/extensions/interp_att_g.inx.h:20 msgid "Opacity" msgstr "" #: ../src/extension/internal/bitmap/opacity.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:2808 -#: ../src/widgets/dropper-toolbar.cpp:83 +#: ../src/ui/toolbar/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "" @@ -5538,7 +5538,7 @@ msgstr "" #: ../src/extension/internal/bitmap/threshold.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:46 -#: ../src/widgets/paintbucket-toolbar.cpp:163 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:163 msgid "Threshold:" msgstr "" @@ -6299,7 +6299,7 @@ msgstr "" #: ../src/extension/internal/filter/bumps.h:98 #: ../src/extension/internal/filter/bumps.h:329 #: ../src/ui/tools/measure-tool.cpp:1236 ../src/ui/widget/page-sizer.cpp:232 -#: ../src/widgets/rect-toolbar.cpp:341 +#: ../src/ui/toolbar/rect-toolbar.cpp:341 #: ../share/extensions/interp_att_g.inx.h:15 msgid "Height" msgstr "" @@ -6315,14 +6315,14 @@ msgstr "" #: ../src/ui/tools/flood-tool.cpp:97 #: ../src/ui/widget/color-icc-selector.cpp:167 #: ../src/ui/widget/color-scales.cpp:412 ../src/ui/widget/color-scales.cpp:413 -#: ../src/widgets/tweak-toolbar.cpp:312 +#: ../src/ui/toolbar/tweak-toolbar.cpp:312 msgid "Lightness" msgstr "" #: ../src/extension/internal/filter/bumps.h:100 #: ../src/extension/internal/filter/bumps.h:331 #: ../src/live_effects/lpe-measure-segments.cpp:67 -#: ../src/widgets/measure-toolbar.cpp:323 +#: ../src/ui/toolbar/measure-toolbar.cpp:323 msgid "Precision" msgstr "" @@ -6517,7 +6517,7 @@ msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:168 #: ../src/ui/widget/color-scales.cpp:408 ../src/ui/widget/color-scales.cpp:409 #: ../src/ui/widget/color-scales.cpp:444 ../src/ui/widget/color-scales.cpp:445 -#: ../src/widgets/tweak-toolbar.cpp:296 +#: ../src/ui/toolbar/tweak-toolbar.cpp:296 msgid "Saturation" msgstr "" @@ -6820,8 +6820,8 @@ msgstr "" #: ../src/live_effects/effect.cpp:145 #: ../src/live_effects/lpe-transform_2pts.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:1032 -#: ../src/widgets/gradient-toolbar.cpp:1053 -#: ../src/widgets/measure-toolbar.cpp:349 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1053 +#: ../src/ui/toolbar/measure-toolbar.cpp:349 msgid "Offset" msgstr "" @@ -6966,7 +6966,7 @@ msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:166 #: ../src/ui/widget/color-scales.cpp:403 ../src/ui/widget/color-scales.cpp:404 #: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 -#: ../src/widgets/tweak-toolbar.cpp:280 +#: ../src/ui/toolbar/tweak-toolbar.cpp:280 msgid "Hue" msgstr "" @@ -7201,8 +7201,8 @@ msgstr "" #: ../src/extension/internal/filter/morphology.h:65 #: ../src/ui/tools/measure-tool.cpp:1242 ../src/ui/widget/page-sizer.cpp:231 -#: ../src/widgets/rect-toolbar.cpp:325 ../src/widgets/spray-toolbar.cpp:297 -#: ../src/widgets/tweak-toolbar.cpp:132 +#: ../src/ui/toolbar/rect-toolbar.cpp:325 ../src/ui/toolbar/spray-toolbar.cpp:297 +#: ../src/ui/toolbar/tweak-toolbar.cpp:132 #: ../share/extensions/interp_att_g.inx.h:14 msgid "Width" msgstr "" @@ -9014,11 +9014,11 @@ msgstr "" #: ../src/live_effects/effect.cpp:124 #: ../src/live_effects/lpe-show_handles.cpp:30 -#: ../src/widgets/mesh-toolbar.cpp:513 +#: ../src/ui/toolbar/mesh-toolbar.cpp:513 msgid "Show handles" msgstr "" -#: ../src/live_effects/effect.cpp:126 ../src/widgets/pencil-toolbar.cpp:149 +#: ../src/live_effects/effect.cpp:126 ../src/ui/toolbar/pencil-toolbar.cpp:149 msgid "BSpline" msgstr "" @@ -10009,7 +10009,7 @@ msgid "Reverses the second path order" msgstr "" #: ../src/live_effects/lpe-fillet-chamfer.cpp:31 -#: ../src/widgets/text-toolbar.cpp:2211 +#: ../src/ui/toolbar/text-toolbar.cpp:2211 #: ../share/extensions/render_barcode_qrcode.inx.h:5 msgid "Auto" msgstr "" @@ -10200,7 +10200,7 @@ msgstr "" #: ../src/live_effects/lpe-jointype.cpp:47 #: ../src/live_effects/lpe-powerstroke.cpp:161 #: ../src/live_effects/lpe-taperstroke.cpp:63 -#: ../src/widgets/star-toolbar.cpp:564 +#: ../src/ui/toolbar/star-toolbar.cpp:564 msgid "Rounded" msgstr "" @@ -10593,7 +10593,7 @@ msgid "Hide Points" msgstr "" #: ../src/live_effects/lpe-measure-segments.cpp:55 -#: ../src/widgets/text-toolbar.cpp:2168 +#: ../src/ui/toolbar/text-toolbar.cpp:2168 msgid "Horizontal" msgstr "" @@ -10762,8 +10762,8 @@ msgstr "" #. Name #: ../src/live_effects/lpe-mirror_symmetry.cpp:55 -#: ../src/widgets/eraser-toolbar.cpp:170 ../src/widgets/pencil-toolbar.cpp:172 -#: ../src/widgets/spray-toolbar.cpp:389 ../src/widgets/tweak-toolbar.cpp:248 +#: ../src/ui/toolbar/eraser-toolbar.cpp:170 ../src/ui/toolbar/pencil-toolbar.cpp:172 +#: ../src/ui/toolbar/spray-toolbar.cpp:389 ../src/ui/toolbar/tweak-toolbar.cpp:248 msgid "Mode" msgstr "" @@ -11036,7 +11036,7 @@ msgid "Zero width" msgstr "" #: ../src/live_effects/lpe-powerstroke.cpp:165 -#: ../src/widgets/pencil-toolbar.cpp:143 +#: ../src/ui/toolbar/pencil-toolbar.cpp:143 msgid "Spiro" msgstr "" @@ -11456,13 +11456,13 @@ msgstr "" #: ../src/live_effects/lpe-ruler.cpp:30 #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#: ../src/ui/tools/measure-tool.cpp:765 ../src/widgets/arc-toolbar.cpp:499 +#: ../src/ui/tools/measure-tool.cpp:765 ../src/ui/toolbar/arc-toolbar.cpp:499 msgid "Start" msgstr "" #: ../src/live_effects/lpe-ruler.cpp:31 #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#: ../src/ui/tools/measure-tool.cpp:766 ../src/widgets/arc-toolbar.cpp:512 +#: ../src/ui/tools/measure-tool.cpp:766 ../src/ui/toolbar/arc-toolbar.cpp:512 msgid "End" msgstr "" @@ -12007,7 +12007,7 @@ msgid "Link to path" msgstr "" #: ../src/live_effects/parameter/originalpatharray.cpp:90 -#: ../src/widgets/gradient-toolbar.cpp:1099 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1099 msgid "Reverse" msgstr "" @@ -12490,11 +12490,11 @@ msgstr "" msgid "without URI" msgstr "" -#: ../src/object/sp-ellipse.cpp:389 ../src/widgets/arc-toolbar.cpp:531 +#: ../src/object/sp-ellipse.cpp:389 ../src/ui/toolbar/arc-toolbar.cpp:531 msgid "Slice" msgstr "" -#: ../src/object/sp-ellipse.cpp:392 ../src/widgets/arc-toolbar.cpp:543 +#: ../src/object/sp-ellipse.cpp:392 ../src/ui/toolbar/arc-toolbar.cpp:543 msgid "Chord" msgstr "" @@ -12505,7 +12505,7 @@ msgstr "" #. Ellipse #: ../src/object/sp-ellipse.cpp:399 ../src/object/sp-ellipse.cpp:406 #: ../src/ui/dialog/inkscape-preferences.cpp:452 -#: ../src/widgets/pencil-toolbar.cpp:229 +#: ../src/ui/toolbar/pencil-toolbar.cpp:229 msgid "Ellipse" msgstr "" @@ -12715,11 +12715,11 @@ msgstr "" #. Star #: ../src/object/sp-star.cpp:229 ../src/ui/dialog/inkscape-preferences.cpp:456 -#: ../src/widgets/star-toolbar.cpp:497 +#: ../src/ui/toolbar/star-toolbar.cpp:497 msgid "Star" msgstr "" -#: ../src/object/sp-star.cpp:230 ../src/widgets/star-toolbar.cpp:491 +#: ../src/object/sp-star.cpp:230 ../src/ui/toolbar/star-toolbar.cpp:491 msgid "Polygon" msgstr "" @@ -13137,10 +13137,10 @@ msgid "Nothing was deleted." msgstr "" #: ../src/selection-chemistry.cpp:420 ../src/ui/dialog/swatches.cpp:285 -#: ../src/ui/tools/text-tool.cpp:959 ../src/widgets/eraser-toolbar.cpp:151 -#: ../src/widgets/gradient-toolbar.cpp:1075 -#: ../src/widgets/gradient-toolbar.cpp:1089 -#: ../src/widgets/gradient-toolbar.cpp:1103 ../src/widgets/node-toolbar.cpp:404 +#: ../src/ui/tools/text-tool.cpp:959 ../src/ui/toolbar/eraser-toolbar.cpp:151 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1075 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1089 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1103 ../src/ui/toolbar/node-toolbar.cpp:404 msgid "Delete" msgstr "" @@ -14282,12 +14282,12 @@ msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:500 #: ../src/ui/dialog/align-and-distribute.cpp:930 -#: ../src/widgets/connector-toolbar.cpp:412 +#: ../src/ui/toolbar/connector-toolbar.cpp:412 msgid "Remove overlaps" msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:532 -#: ../src/widgets/connector-toolbar.cpp:238 +#: ../src/ui/toolbar/connector-toolbar.cpp:238 msgid "Arrange connector network" msgstr "" @@ -14429,7 +14429,7 @@ msgid "Distribute baselines of texts vertically" msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:1023 -#: ../src/widgets/connector-toolbar.cpp:374 +#: ../src/ui/toolbar/connector-toolbar.cpp:374 msgid "Nicely arrange selected connector network" msgstr "" @@ -15666,7 +15666,7 @@ msgstr "" #. Name #: ../src/ui/dialog/document-properties.cpp:852 -#: ../src/ui/dialog/objects.cpp:1887 ../src/widgets/gradient-toolbar.cpp:879 +#: ../src/ui/dialog/objects.cpp:1887 ../src/ui/toolbar/gradient-toolbar.cpp:879 msgid "New" msgstr "" @@ -15756,8 +15756,8 @@ msgstr "" msgid "_Custom" msgstr "" -#: ../src/ui/dialog/export.cpp:139 ../src/widgets/measure-toolbar.cpp:307 -#: ../src/widgets/measure-toolbar.cpp:315 +#: ../src/ui/dialog/export.cpp:139 ../src/ui/toolbar/measure-toolbar.cpp:307 +#: ../src/ui/toolbar/measure-toolbar.cpp:315 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" msgstr "" @@ -17885,7 +17885,7 @@ msgstr "" #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 #: ../src/ui/widget/page-sizer.cpp:229 ../src/widgets/desktop-widget.cpp:655 -#: ../src/widgets/node-toolbar.cpp:584 +#: ../src/ui/toolbar/node-toolbar.cpp:584 msgid "X:" msgstr "" @@ -17897,7 +17897,7 @@ msgstr "" #: ../src/ui/dialog/object-attributes.cpp:67 #: ../src/ui/dialog/object-attributes.cpp:76 #: ../src/ui/widget/page-sizer.cpp:230 ../src/widgets/desktop-widget.cpp:656 -#: ../src/widgets/node-toolbar.cpp:601 +#: ../src/ui/toolbar/node-toolbar.cpp:601 msgid "Y:" msgstr "" @@ -20003,7 +20003,7 @@ msgstr "" #. Transforms options #: ../src/ui/dialog/inkscape-preferences.cpp:1258 -#: ../src/widgets/select-toolbar.cpp:563 +#: ../src/ui/toolbar/select-toolbar.cpp:563 msgid "Scale stroke width" msgstr "" @@ -20024,22 +20024,22 @@ msgid "Preserved" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1266 -#: ../src/widgets/select-toolbar.cpp:564 +#: ../src/ui/toolbar/select-toolbar.cpp:564 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1268 -#: ../src/widgets/select-toolbar.cpp:575 +#: ../src/ui/toolbar/select-toolbar.cpp:575 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1270 -#: ../src/widgets/select-toolbar.cpp:586 +#: ../src/ui/toolbar/select-toolbar.cpp:586 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1272 -#: ../src/widgets/select-toolbar.cpp:597 +#: ../src/ui/toolbar/select-toolbar.cpp:597 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "" @@ -20594,7 +20594,7 @@ msgstr "" #. Note: /options/bitmapoversample removed with Cairo renderer #: ../src/ui/dialog/inkscape-preferences.cpp:1535 ../src/verbs.cpp:161 -#: ../src/widgets/calligraphy-toolbar.cpp:606 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:606 msgid "Edit" msgstr "" @@ -20968,9 +20968,9 @@ msgid "" "or to a single (usually focused) 'Window'" msgstr "" -#: ../src/ui/dialog/input.cpp:1443 ../src/widgets/calligraphy-toolbar.cpp:549 -#: ../src/widgets/spray-toolbar.cpp:311 ../src/widgets/spray-toolbar.cpp:425 -#: ../src/widgets/spray-toolbar.cpp:474 ../src/widgets/tweak-toolbar.cpp:366 +#: ../src/ui/dialog/input.cpp:1443 ../src/ui/toolbar/calligraphy-toolbar.cpp:549 +#: ../src/ui/toolbar/spray-toolbar.cpp:311 ../src/ui/toolbar/spray-toolbar.cpp:425 +#: ../src/ui/toolbar/spray-toolbar.cpp:474 ../src/ui/toolbar/tweak-toolbar.cpp:366 msgid "Pressure" msgstr "" @@ -23270,12 +23270,12 @@ msgid "Duplicate nodes" msgstr "" #: ../src/ui/tool/multi-path-manipulator.cpp:417 -#: ../src/widgets/node-toolbar.cpp:411 +#: ../src/ui/toolbar/node-toolbar.cpp:411 msgid "Join nodes" msgstr "" #: ../src/ui/tool/multi-path-manipulator.cpp:424 -#: ../src/widgets/node-toolbar.cpp:422 +#: ../src/ui/toolbar/node-toolbar.cpp:422 msgid "Break nodes" msgstr "" @@ -23528,7 +23528,7 @@ msgid "Rotate handle" msgstr "" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1563 ../src/widgets/node-toolbar.cpp:400 +#: ../src/ui/tool/path-manipulator.cpp:1563 ../src/ui/toolbar/node-toolbar.cpp:400 msgid "Delete node" msgstr "" @@ -23875,12 +23875,12 @@ msgid "Select at least one non-connector object." msgstr "" #: ../src/ui/tools/connector-tool.cpp:1320 -#: ../src/widgets/connector-toolbar.cpp:315 +#: ../src/ui/toolbar/connector-toolbar.cpp:315 msgid "Make connectors avoid selected objects" msgstr "" #: ../src/ui/tools/connector-tool.cpp:1321 -#: ../src/widgets/connector-toolbar.cpp:325 +#: ../src/ui/toolbar/connector-toolbar.cpp:325 msgid "Make connectors ignore selected objects" msgstr "" @@ -24509,11 +24509,11 @@ msgstr "" msgid "Nothing selected! Select objects to spray." msgstr "" -#: ../src/ui/tools/spray-tool.cpp:1355 ../src/widgets/spray-toolbar.cpp:362 +#: ../src/ui/tools/spray-tool.cpp:1355 ../src/ui/toolbar/spray-toolbar.cpp:362 msgid "Spray with copies" msgstr "" -#: ../src/ui/tools/spray-tool.cpp:1359 ../src/widgets/spray-toolbar.cpp:368 +#: ../src/ui/tools/spray-tool.cpp:1359 ../src/ui/toolbar/spray-toolbar.cpp:368 msgid "Spray with clones" msgstr "" @@ -24979,7 +24979,7 @@ msgid "Style" msgstr "" #: ../src/ui/widget/font-selector.cpp:34 ../src/ui/widget/font-selector.cpp:134 -#: ../src/widgets/text-toolbar.cpp:1587 ../src/widgets/text-toolbar.cpp:2044 +#: ../src/ui/toolbar/text-toolbar.cpp:1587 ../src/ui/toolbar/text-toolbar.cpp:2044 msgid "Font size" msgstr "" @@ -28372,554 +28372,554 @@ msgstr "" msgid "Center on horizontal and vertical axis" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:144 +#: ../src/ui/toolbar/arc-toolbar.cpp:144 msgid "Change arc" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:210 +#: ../src/ui/toolbar/arc-toolbar.cpp:210 msgid "Arc: Change start/end" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:278 +#: ../src/ui/toolbar/arc-toolbar.cpp:278 msgid "Arc: Changed arc type" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:413 ../src/widgets/arc-toolbar.cpp:452 -#: ../src/widgets/rect-toolbar.cpp:268 ../src/widgets/rect-toolbar.cpp:307 -#: ../src/widgets/spiral-toolbar.cpp:218 ../src/widgets/spiral-toolbar.cpp:242 -#: ../src/widgets/star-toolbar.cpp:396 ../src/widgets/star-toolbar.cpp:476 +#: ../src/ui/toolbar/arc-toolbar.cpp:413 ../src/ui/toolbar/arc-toolbar.cpp:452 +#: ../src/ui/toolbar/rect-toolbar.cpp:268 ../src/ui/toolbar/rect-toolbar.cpp:307 +#: ../src/ui/toolbar/spiral-toolbar.cpp:218 ../src/ui/toolbar/spiral-toolbar.cpp:242 +#: ../src/ui/toolbar/star-toolbar.cpp:396 ../src/ui/toolbar/star-toolbar.cpp:476 msgid "New:" msgstr "" #. FIXME: implement averaging of all parameters for multiple selected #. gtk_label_set_markup(GTK_LABEL(l), _("Average:")); -#: ../src/widgets/arc-toolbar.cpp:416 ../src/widgets/arc-toolbar.cpp:433 -#: ../src/widgets/rect-toolbar.cpp:276 ../src/widgets/rect-toolbar.cpp:294 -#: ../src/widgets/spiral-toolbar.cpp:220 ../src/widgets/spiral-toolbar.cpp:231 -#: ../src/widgets/star-toolbar.cpp:398 +#: ../src/ui/toolbar/arc-toolbar.cpp:416 ../src/ui/toolbar/arc-toolbar.cpp:433 +#: ../src/ui/toolbar/rect-toolbar.cpp:276 ../src/ui/toolbar/rect-toolbar.cpp:294 +#: ../src/ui/toolbar/spiral-toolbar.cpp:220 ../src/ui/toolbar/spiral-toolbar.cpp:231 +#: ../src/ui/toolbar/star-toolbar.cpp:398 msgid "Change:" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:463 ../src/widgets/rect-toolbar.cpp:357 +#: ../src/ui/toolbar/arc-toolbar.cpp:463 ../src/ui/toolbar/rect-toolbar.cpp:357 msgid "Horizontal radius" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:463 ../src/widgets/rect-toolbar.cpp:357 +#: ../src/ui/toolbar/arc-toolbar.cpp:463 ../src/ui/toolbar/rect-toolbar.cpp:357 msgid "Rx:" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:463 +#: ../src/ui/toolbar/arc-toolbar.cpp:463 msgid "Horizontal radius of the circle, ellipse, or arc" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:479 ../src/widgets/rect-toolbar.cpp:371 +#: ../src/ui/toolbar/arc-toolbar.cpp:479 ../src/ui/toolbar/rect-toolbar.cpp:371 msgid "Vertical radius" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:479 ../src/widgets/rect-toolbar.cpp:371 +#: ../src/ui/toolbar/arc-toolbar.cpp:479 ../src/ui/toolbar/rect-toolbar.cpp:371 msgid "Ry:" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:479 +#: ../src/ui/toolbar/arc-toolbar.cpp:479 msgid "Vertical radius of the circle, ellipse, or arc" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:492 ../src/widgets/lpe-toolbar.cpp:404 -#: ../src/widgets/node-toolbar.cpp:614 -#: ../src/widgets/paintbucket-toolbar.cpp:184 -#: ../src/widgets/rect-toolbar.cpp:382 ../src/widgets/select-toolbar.cpp:528 -#: ../src/widgets/text-toolbar.cpp:2326 +#: ../src/ui/toolbar/arc-toolbar.cpp:492 ../src/ui/toolbar/lpe-toolbar.cpp:404 +#: ../src/ui/toolbar/node-toolbar.cpp:614 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:184 +#: ../src/ui/toolbar/rect-toolbar.cpp:382 ../src/ui/toolbar/select-toolbar.cpp:528 +#: ../src/ui/toolbar/text-toolbar.cpp:2326 msgid "Units" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:499 +#: ../src/ui/toolbar/arc-toolbar.cpp:499 msgid "Start:" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:500 +#: ../src/ui/toolbar/arc-toolbar.cpp:500 msgid "The angle (in degrees) from the horizontal to the arc's start point" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:512 +#: ../src/ui/toolbar/arc-toolbar.cpp:512 msgid "End:" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:513 +#: ../src/ui/toolbar/arc-toolbar.cpp:513 msgid "The angle (in degrees) from the horizontal to the arc's end point" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:532 +#: ../src/ui/toolbar/arc-toolbar.cpp:532 msgid "Switch to slice (closed shape with two radii)" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:537 +#: ../src/ui/toolbar/arc-toolbar.cpp:537 msgid "Arc (Open)" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:538 +#: ../src/ui/toolbar/arc-toolbar.cpp:538 msgid "Switch to arc (unclosed shape)" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:544 +#: ../src/ui/toolbar/arc-toolbar.cpp:544 msgid "Switch to chord (closed shape)" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:569 +#: ../src/ui/toolbar/arc-toolbar.cpp:569 msgid "Make whole" msgstr "" -#: ../src/widgets/arc-toolbar.cpp:570 +#: ../src/ui/toolbar/arc-toolbar.cpp:570 msgid "Make the shape a whole ellipse, not arc or segment" msgstr "" #. TODO: use the correct axis here, too -#: ../src/widgets/box3d-toolbar.cpp:237 +#: ../src/ui/toolbar/box3d-toolbar.cpp:237 msgid "3D Box: Change perspective (angle of infinite axis)" msgstr "" -#: ../src/widgets/box3d-toolbar.cpp:306 +#: ../src/ui/toolbar/box3d-toolbar.cpp:306 msgid "Angle in X direction" msgstr "" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:308 +#: ../src/ui/toolbar/box3d-toolbar.cpp:308 msgid "Angle of PLs in X direction" msgstr "" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:330 +#: ../src/ui/toolbar/box3d-toolbar.cpp:330 msgid "State of VP in X direction" msgstr "" -#: ../src/widgets/box3d-toolbar.cpp:331 +#: ../src/ui/toolbar/box3d-toolbar.cpp:331 msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" msgstr "" -#: ../src/widgets/box3d-toolbar.cpp:346 +#: ../src/ui/toolbar/box3d-toolbar.cpp:346 msgid "Angle in Y direction" msgstr "" -#: ../src/widgets/box3d-toolbar.cpp:346 +#: ../src/ui/toolbar/box3d-toolbar.cpp:346 msgid "Angle Y:" msgstr "" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:348 +#: ../src/ui/toolbar/box3d-toolbar.cpp:348 msgid "Angle of PLs in Y direction" msgstr "" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:369 +#: ../src/ui/toolbar/box3d-toolbar.cpp:369 msgid "State of VP in Y direction" msgstr "" -#: ../src/widgets/box3d-toolbar.cpp:370 +#: ../src/ui/toolbar/box3d-toolbar.cpp:370 msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" msgstr "" -#: ../src/widgets/box3d-toolbar.cpp:385 +#: ../src/ui/toolbar/box3d-toolbar.cpp:385 msgid "Angle in Z direction" msgstr "" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:387 +#: ../src/ui/toolbar/box3d-toolbar.cpp:387 msgid "Angle of PLs in Z direction" msgstr "" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:408 +#: ../src/ui/toolbar/box3d-toolbar.cpp:408 msgid "State of VP in Z direction" msgstr "" -#: ../src/widgets/box3d-toolbar.cpp:409 +#: ../src/ui/toolbar/box3d-toolbar.cpp:409 msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:216 -#: ../src/widgets/calligraphy-toolbar.cpp:257 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:216 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:257 msgid "No preset" msgstr "" #. Width -#: ../src/widgets/calligraphy-toolbar.cpp:398 -#: ../src/widgets/eraser-toolbar.cpp:188 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:398 +#: ../src/ui/toolbar/eraser-toolbar.cpp:188 msgid "(hairline)" msgstr "" #. Mean #. Rotation #. Scale -#: ../src/widgets/calligraphy-toolbar.cpp:398 -#: ../src/widgets/calligraphy-toolbar.cpp:431 -#: ../src/widgets/eraser-toolbar.cpp:188 ../src/widgets/pencil-toolbar.cpp:560 -#: ../src/widgets/spray-toolbar.cpp:294 ../src/widgets/spray-toolbar.cpp:323 -#: ../src/widgets/spray-toolbar.cpp:339 ../src/widgets/spray-toolbar.cpp:406 -#: ../src/widgets/spray-toolbar.cpp:436 ../src/widgets/spray-toolbar.cpp:454 -#: ../src/widgets/spray-toolbar.cpp:603 ../src/widgets/tweak-toolbar.cpp:129 -#: ../src/widgets/tweak-toolbar.cpp:146 ../src/widgets/tweak-toolbar.cpp:344 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:398 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 +#: ../src/ui/toolbar/eraser-toolbar.cpp:188 ../src/ui/toolbar/pencil-toolbar.cpp:560 +#: ../src/ui/toolbar/spray-toolbar.cpp:294 ../src/ui/toolbar/spray-toolbar.cpp:323 +#: ../src/ui/toolbar/spray-toolbar.cpp:339 ../src/ui/toolbar/spray-toolbar.cpp:406 +#: ../src/ui/toolbar/spray-toolbar.cpp:436 ../src/ui/toolbar/spray-toolbar.cpp:454 +#: ../src/ui/toolbar/spray-toolbar.cpp:603 ../src/ui/toolbar/tweak-toolbar.cpp:129 +#: ../src/ui/toolbar/tweak-toolbar.cpp:146 ../src/ui/toolbar/tweak-toolbar.cpp:344 msgid "(default)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:398 -#: ../src/widgets/eraser-toolbar.cpp:188 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:398 +#: ../src/ui/toolbar/eraser-toolbar.cpp:188 msgid "(broad stroke)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:401 -#: ../src/widgets/eraser-toolbar.cpp:191 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:401 +#: ../src/ui/toolbar/eraser-toolbar.cpp:191 msgid "Pen Width" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:402 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:402 msgid "The width of the calligraphic pen (relative to the visible canvas area)" msgstr "" #. Thinning -#: ../src/widgets/calligraphy-toolbar.cpp:415 -#: ../src/widgets/eraser-toolbar.cpp:221 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 +#: ../src/ui/toolbar/eraser-toolbar.cpp:221 msgid "(speed blows up stroke)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:415 -#: ../src/widgets/eraser-toolbar.cpp:221 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 +#: ../src/ui/toolbar/eraser-toolbar.cpp:221 msgid "(slight widening)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:415 -#: ../src/widgets/eraser-toolbar.cpp:221 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 +#: ../src/ui/toolbar/eraser-toolbar.cpp:221 msgid "(constant width)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:415 -#: ../src/widgets/eraser-toolbar.cpp:221 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 +#: ../src/ui/toolbar/eraser-toolbar.cpp:221 msgid "(slight thinning, default)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:415 -#: ../src/widgets/eraser-toolbar.cpp:221 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:415 +#: ../src/ui/toolbar/eraser-toolbar.cpp:221 msgid "(speed deflates stroke)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:418 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:418 msgid "Stroke Thinning" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:418 -#: ../src/widgets/eraser-toolbar.cpp:224 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:418 +#: ../src/ui/toolbar/eraser-toolbar.cpp:224 msgid "Thinning:" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:419 -#: ../src/widgets/eraser-toolbar.cpp:225 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:419 +#: ../src/ui/toolbar/eraser-toolbar.cpp:225 msgid "" "How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 " "makes them broader, 0 makes width independent of velocity)" msgstr "" #. Angle -#: ../src/widgets/calligraphy-toolbar.cpp:431 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 msgid "(left edge up)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:431 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 msgid "(horizontal)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:431 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:431 msgid "(right edge up)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:434 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:434 msgid "Pen Angle" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:434 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:434 #: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:5 msgid "Angle:" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:435 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:435 msgid "" "The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " "fixation = 0)" msgstr "" #. Fixation -#: ../src/widgets/calligraphy-toolbar.cpp:449 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:449 msgid "(perpendicular to stroke, \"brush\")" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:449 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:449 msgid "(almost fixed, default)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:449 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:449 msgid "(fixed by Angle, \"pen\")" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:452 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:452 msgid "Fixation" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:452 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:452 msgid "Fixation:" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:453 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:453 msgid "" "Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " "fixed angle)" msgstr "" #. Cap Rounding -#: ../src/widgets/calligraphy-toolbar.cpp:465 -#: ../src/widgets/eraser-toolbar.cpp:239 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 +#: ../src/ui/toolbar/eraser-toolbar.cpp:239 msgid "(blunt caps, default)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:465 -#: ../src/widgets/eraser-toolbar.cpp:239 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 +#: ../src/ui/toolbar/eraser-toolbar.cpp:239 msgid "(slightly bulging)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:465 -#: ../src/widgets/eraser-toolbar.cpp:239 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 +#: ../src/ui/toolbar/eraser-toolbar.cpp:239 msgid "(approximately round)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:465 -#: ../src/widgets/eraser-toolbar.cpp:239 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:465 +#: ../src/ui/toolbar/eraser-toolbar.cpp:239 msgid "(long protruding caps)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:469 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:469 msgid "Cap rounding" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:469 -#: ../src/widgets/eraser-toolbar.cpp:243 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:469 +#: ../src/ui/toolbar/eraser-toolbar.cpp:243 msgid "Caps:" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:470 -#: ../src/widgets/eraser-toolbar.cpp:244 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:470 +#: ../src/ui/toolbar/eraser-toolbar.cpp:244 msgid "" "Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = " "round caps)" msgstr "" #. Tremor -#: ../src/widgets/calligraphy-toolbar.cpp:482 -#: ../src/widgets/eraser-toolbar.cpp:258 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 +#: ../src/ui/toolbar/eraser-toolbar.cpp:258 msgid "(smooth line)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:482 -#: ../src/widgets/eraser-toolbar.cpp:258 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 +#: ../src/ui/toolbar/eraser-toolbar.cpp:258 msgid "(slight tremor)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:482 -#: ../src/widgets/eraser-toolbar.cpp:258 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 +#: ../src/ui/toolbar/eraser-toolbar.cpp:258 msgid "(noticeable tremor)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:482 -#: ../src/widgets/eraser-toolbar.cpp:258 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:482 +#: ../src/ui/toolbar/eraser-toolbar.cpp:258 msgid "(maximum tremor)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:485 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:485 msgid "Stroke Tremor" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:485 -#: ../src/widgets/eraser-toolbar.cpp:261 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:485 +#: ../src/ui/toolbar/eraser-toolbar.cpp:261 msgid "Tremor:" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:486 -#: ../src/widgets/eraser-toolbar.cpp:262 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:486 +#: ../src/ui/toolbar/eraser-toolbar.cpp:262 msgid "Increase to make strokes rugged and trembling" msgstr "" #. Wiggle -#: ../src/widgets/calligraphy-toolbar.cpp:500 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:500 msgid "(no wiggle)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:500 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:500 msgid "(slight deviation)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:500 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:500 msgid "(wild waves and curls)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:503 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:503 msgid "Pen Wiggle" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:503 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:503 msgid "Wiggle:" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:504 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:504 msgid "Increase to make the pen waver and wiggle" msgstr "" #. Mass -#: ../src/widgets/calligraphy-toolbar.cpp:517 -#: ../src/widgets/eraser-toolbar.cpp:278 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 +#: ../src/ui/toolbar/eraser-toolbar.cpp:278 msgid "(no inertia)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:517 -#: ../src/widgets/eraser-toolbar.cpp:278 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 +#: ../src/ui/toolbar/eraser-toolbar.cpp:278 msgid "(slight smoothing, default)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:517 -#: ../src/widgets/eraser-toolbar.cpp:278 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 +#: ../src/ui/toolbar/eraser-toolbar.cpp:278 msgid "(noticeable lagging)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:517 -#: ../src/widgets/eraser-toolbar.cpp:278 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:517 +#: ../src/ui/toolbar/eraser-toolbar.cpp:278 msgid "(maximum inertia)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:520 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:520 msgid "Pen Mass" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:520 -#: ../src/widgets/eraser-toolbar.cpp:281 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:520 +#: ../src/ui/toolbar/eraser-toolbar.cpp:281 msgid "Mass:" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:521 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:521 msgid "Increase to make the pen drag behind, as if slowed by inertia" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:536 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:536 msgid "Trace Background" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:537 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:537 msgid "" "Trace the lightness of the background by the width of the pen (white - " "minimum width, black - maximum width)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:550 -#: ../src/widgets/eraser-toolbar.cpp:209 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:550 +#: ../src/ui/toolbar/eraser-toolbar.cpp:209 msgid "Use the pressure of the input device to alter the width of the pen" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:562 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:562 msgid "Tilt" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:563 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:563 msgid "Use the tilt of the input device to alter the angle of the pen's nib" msgstr "" #. Name #. Label -#: ../src/widgets/calligraphy-toolbar.cpp:584 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:584 msgid "Choose a preset" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:602 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:602 msgid "Add/Edit Profile" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:603 +#: ../src/ui/toolbar/calligraphy-toolbar.cpp:603 msgid "Add or edit calligraphic profile" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:120 +#: ../src/ui/toolbar/connector-toolbar.cpp:120 msgid "Set connector type: orthogonal" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:120 +#: ../src/ui/toolbar/connector-toolbar.cpp:120 msgid "Set connector type: polyline" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:167 +#: ../src/ui/toolbar/connector-toolbar.cpp:167 msgid "Change connector curvature" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:216 +#: ../src/ui/toolbar/connector-toolbar.cpp:216 msgid "Change connector spacing" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:314 +#: ../src/ui/toolbar/connector-toolbar.cpp:314 msgid "Avoid" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:324 +#: ../src/ui/toolbar/connector-toolbar.cpp:324 msgid "Ignore" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:335 +#: ../src/ui/toolbar/connector-toolbar.cpp:335 msgid "Orthogonal" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:336 +#: ../src/ui/toolbar/connector-toolbar.cpp:336 msgid "Make connector orthogonal or polyline" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:350 +#: ../src/ui/toolbar/connector-toolbar.cpp:350 msgid "Connector Curvature" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:350 +#: ../src/ui/toolbar/connector-toolbar.cpp:350 msgid "Curvature:" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:351 +#: ../src/ui/toolbar/connector-toolbar.cpp:351 msgid "The amount of connectors curvature" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:361 +#: ../src/ui/toolbar/connector-toolbar.cpp:361 msgid "Connector Spacing" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:361 +#: ../src/ui/toolbar/connector-toolbar.cpp:361 msgid "Spacing:" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:362 +#: ../src/ui/toolbar/connector-toolbar.cpp:362 msgid "The amount of space left around objects by auto-routing connectors" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:373 +#: ../src/ui/toolbar/connector-toolbar.cpp:373 msgid "Graph" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:383 +#: ../src/ui/toolbar/connector-toolbar.cpp:383 msgid "Connector Length" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:383 +#: ../src/ui/toolbar/connector-toolbar.cpp:383 msgid "Length:" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:384 +#: ../src/ui/toolbar/connector-toolbar.cpp:384 msgid "Ideal length for connectors when layout is applied" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:396 +#: ../src/ui/toolbar/connector-toolbar.cpp:396 msgid "Downwards" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:397 +#: ../src/ui/toolbar/connector-toolbar.cpp:397 msgid "Make connectors with end-markers (arrows) point downwards" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:413 +#: ../src/ui/toolbar/connector-toolbar.cpp:413 msgid "Do not allow overlapping shapes" msgstr "" @@ -29017,30 +29017,30 @@ msgstr "" msgid "Note:" msgstr "" -#: ../src/widgets/dropper-toolbar.cpp:90 +#: ../src/ui/toolbar/dropper-toolbar.cpp:90 msgid "Pick opacity" msgstr "" -#: ../src/widgets/dropper-toolbar.cpp:91 +#: ../src/ui/toolbar/dropper-toolbar.cpp:91 msgid "" "Pick both the color and the alpha (transparency) under cursor; otherwise, " "pick only the visible color premultiplied by alpha" msgstr "" -#: ../src/widgets/dropper-toolbar.cpp:94 +#: ../src/ui/toolbar/dropper-toolbar.cpp:94 msgid "Pick" msgstr "" -#: ../src/widgets/dropper-toolbar.cpp:103 +#: ../src/ui/toolbar/dropper-toolbar.cpp:103 msgid "Assign opacity" msgstr "" -#: ../src/widgets/dropper-toolbar.cpp:104 +#: ../src/ui/toolbar/dropper-toolbar.cpp:104 msgid "" "If alpha was picked, assign it to selection as fill or stroke transparency" msgstr "" -#: ../src/widgets/dropper-toolbar.cpp:107 +#: ../src/ui/toolbar/dropper-toolbar.cpp:107 msgid "Assign" msgstr "" @@ -29048,59 +29048,59 @@ msgstr "" msgid "remove" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:152 +#: ../src/ui/toolbar/eraser-toolbar.cpp:152 msgid "Delete objects touched by eraser" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:157 +#: ../src/ui/toolbar/eraser-toolbar.cpp:157 msgid "Cut" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:158 +#: ../src/ui/toolbar/eraser-toolbar.cpp:158 msgid "Cut out from paths and shapes" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:163 +#: ../src/ui/toolbar/eraser-toolbar.cpp:163 msgid "Clip" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:164 +#: ../src/ui/toolbar/eraser-toolbar.cpp:164 msgid "Clip from objects" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:188 +#: ../src/ui/toolbar/eraser-toolbar.cpp:188 msgid "(no width)" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:192 +#: ../src/ui/toolbar/eraser-toolbar.cpp:192 msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:208 +#: ../src/ui/toolbar/eraser-toolbar.cpp:208 msgid "Eraser Pressure" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:224 +#: ../src/ui/toolbar/eraser-toolbar.cpp:224 msgid "Eraser Stroke Thinning" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:243 +#: ../src/ui/toolbar/eraser-toolbar.cpp:243 msgid "Eraser Cap rounding" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:261 +#: ../src/ui/toolbar/eraser-toolbar.cpp:261 msgid "EraserStroke Tremor" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:281 +#: ../src/ui/toolbar/eraser-toolbar.cpp:281 msgid "Eraser Mass" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:282 +#: ../src/ui/toolbar/eraser-toolbar.cpp:282 msgid "Increase to make the eraser drag behind, as if slowed by inertia" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:298 ../src/widgets/eraser-toolbar.cpp:299 +#: ../src/ui/toolbar/eraser-toolbar.cpp:298 ../src/ui/toolbar/eraser-toolbar.cpp:299 msgid "Break apart cut items" msgstr "" @@ -29193,101 +29193,101 @@ msgstr "" msgid "Rename gradient" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:143 -#: ../src/widgets/gradient-toolbar.cpp:163 -#: ../src/widgets/gradient-toolbar.cpp:539 -#: ../src/widgets/gradient-toolbar.cpp:942 +#: ../src/ui/toolbar/gradient-toolbar.cpp:143 +#: ../src/ui/toolbar/gradient-toolbar.cpp:163 +#: ../src/ui/toolbar/gradient-toolbar.cpp:539 +#: ../src/ui/toolbar/gradient-toolbar.cpp:942 msgid "No gradient" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:153 +#: ../src/ui/toolbar/gradient-toolbar.cpp:153 msgid "Nothing Selected" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:172 +#: ../src/ui/toolbar/gradient-toolbar.cpp:172 msgid "Multiple gradients" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:549 +#: ../src/ui/toolbar/gradient-toolbar.cpp:549 #: ../src/widgets/gradient-vector.cpp:572 msgid "No stops in gradient" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:663 +#: ../src/ui/toolbar/gradient-toolbar.cpp:663 msgid "Multiple stops" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:746 +#: ../src/ui/toolbar/gradient-toolbar.cpp:746 msgid "Assign gradient to object" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:774 +#: ../src/ui/toolbar/gradient-toolbar.cpp:774 msgid "Set gradient repeat" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:837 +#: ../src/ui/toolbar/gradient-toolbar.cpp:837 #: ../src/widgets/gradient-vector.cpp:680 msgid "Change gradient stop offset" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:866 +#: ../src/ui/toolbar/gradient-toolbar.cpp:866 msgid "linear" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:867 +#: ../src/ui/toolbar/gradient-toolbar.cpp:867 msgid "Create linear gradient" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:872 +#: ../src/ui/toolbar/gradient-toolbar.cpp:872 msgid "radial" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:873 +#: ../src/ui/toolbar/gradient-toolbar.cpp:873 msgid "Create radial (elliptic or circular) gradient" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:904 ../src/widgets/mesh-toolbar.cpp:422 +#: ../src/ui/toolbar/gradient-toolbar.cpp:904 ../src/ui/toolbar/mesh-toolbar.cpp:422 msgid "fill" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:905 ../src/widgets/mesh-toolbar.cpp:423 +#: ../src/ui/toolbar/gradient-toolbar.cpp:905 ../src/ui/toolbar/mesh-toolbar.cpp:423 msgid "Create gradient in the fill" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:910 ../src/widgets/mesh-toolbar.cpp:428 +#: ../src/ui/toolbar/gradient-toolbar.cpp:910 ../src/ui/toolbar/mesh-toolbar.cpp:428 msgid "stroke" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:911 ../src/widgets/mesh-toolbar.cpp:429 +#: ../src/ui/toolbar/gradient-toolbar.cpp:911 ../src/ui/toolbar/mesh-toolbar.cpp:429 msgid "Create gradient in the stroke" msgstr "" #. Name -#: ../src/widgets/gradient-toolbar.cpp:949 +#: ../src/ui/toolbar/gradient-toolbar.cpp:949 msgid "Select" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:976 +#: ../src/ui/toolbar/gradient-toolbar.cpp:976 msgctxt "Gradient repeat type" msgid "None" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:982 +#: ../src/ui/toolbar/gradient-toolbar.cpp:982 msgid "Reflected" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:988 +#: ../src/ui/toolbar/gradient-toolbar.cpp:988 msgid "Direct" msgstr "" #. Name -#: ../src/widgets/gradient-toolbar.cpp:995 +#: ../src/ui/toolbar/gradient-toolbar.cpp:995 msgid "Repeat" msgstr "" #. Label #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute -#: ../src/widgets/gradient-toolbar.cpp:997 +#: ../src/ui/toolbar/gradient-toolbar.cpp:997 msgid "" "Whether to fill with flat color beyond the ends of the gradient vector " "(spreadMethod=\"pad\"), or repeat the gradient in the same direction " @@ -29295,46 +29295,46 @@ msgid "" "directions (spreadMethod=\"reflect\")" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1024 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1024 msgid "No stops" msgstr "" #. Name -#: ../src/widgets/gradient-toolbar.cpp:1031 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1031 msgid "Stops" msgstr "" #. Label -#: ../src/widgets/gradient-toolbar.cpp:1053 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1053 #: ../src/widgets/gradient-vector.cpp:857 msgctxt "Gradient" msgid "Offset:" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1053 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1053 msgid "Offset of selected stop" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1071 -#: ../src/widgets/gradient-toolbar.cpp:1072 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1071 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1072 msgid "Insert new stop" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1085 -#: ../src/widgets/gradient-toolbar.cpp:1086 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1085 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1086 #: ../src/widgets/gradient-vector.cpp:843 msgid "Delete stop" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1100 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1100 msgid "Reverse the direction of the gradient" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1114 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1114 msgid "Link gradients" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1115 +#: ../src/ui/toolbar/gradient-toolbar.cpp:1115 msgid "Link gradients to change all related gradients" msgstr "" @@ -29378,206 +29378,206 @@ msgstr "" msgid "Change gradient stop color" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:279 +#: ../src/ui/toolbar/lpe-toolbar.cpp:279 msgid "All inactive" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:280 +#: ../src/ui/toolbar/lpe-toolbar.cpp:280 msgid "No geometric tool is active" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:318 +#: ../src/ui/toolbar/lpe-toolbar.cpp:318 msgid "Show limiting bounding box" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:319 +#: ../src/ui/toolbar/lpe-toolbar.cpp:319 msgid "Show bounding box (used to cut infinite lines)" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:330 +#: ../src/ui/toolbar/lpe-toolbar.cpp:330 msgid "Get limiting bounding box from selection" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:331 +#: ../src/ui/toolbar/lpe-toolbar.cpp:331 msgid "" "Set limiting bounding box (used to cut infinite lines) to the bounding box " "of current selection" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:349 +#: ../src/ui/toolbar/lpe-toolbar.cpp:349 msgid "Closed" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:355 +#: ../src/ui/toolbar/lpe-toolbar.cpp:355 msgid "Open start" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:361 +#: ../src/ui/toolbar/lpe-toolbar.cpp:361 msgid "Open end" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:367 +#: ../src/ui/toolbar/lpe-toolbar.cpp:367 msgid "Open both" msgstr "" #. Name #. Label -#: ../src/widgets/lpe-toolbar.cpp:375 +#: ../src/ui/toolbar/lpe-toolbar.cpp:375 msgid "Choose a line segement type" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:393 +#: ../src/ui/toolbar/lpe-toolbar.cpp:393 msgid "Display measuring info" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:394 +#: ../src/ui/toolbar/lpe-toolbar.cpp:394 msgid "Display measuring info for selected items" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:414 +#: ../src/ui/toolbar/lpe-toolbar.cpp:414 msgid "Open LPE dialog" msgstr "" -#: ../src/widgets/lpe-toolbar.cpp:415 +#: ../src/ui/toolbar/lpe-toolbar.cpp:415 msgid "Open LPE dialog (to adapt parameters numerically)" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:160 +#: ../src/ui/toolbar/measure-toolbar.cpp:160 msgid "Start and end measures inactive." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:162 +#: ../src/ui/toolbar/measure-toolbar.cpp:162 msgid "Start and end measures active." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:178 +#: ../src/ui/toolbar/measure-toolbar.cpp:178 msgid "Measures only selected." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:180 +#: ../src/ui/toolbar/measure-toolbar.cpp:180 msgid "Measure all." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:196 +#: ../src/ui/toolbar/measure-toolbar.cpp:196 msgid "Show all crossings." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:198 +#: ../src/ui/toolbar/measure-toolbar.cpp:198 msgid "Show visible crossings." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:214 +#: ../src/ui/toolbar/measure-toolbar.cpp:214 msgid "Use all layers in the measure." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:216 +#: ../src/ui/toolbar/measure-toolbar.cpp:216 msgid "Use current layer in the measure." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:232 +#: ../src/ui/toolbar/measure-toolbar.cpp:232 msgid "Compute all elements." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:234 +#: ../src/ui/toolbar/measure-toolbar.cpp:234 msgid "Compute max length." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:295 ../src/widgets/text-toolbar.cpp:2047 +#: ../src/ui/toolbar/measure-toolbar.cpp:295 ../src/ui/toolbar/text-toolbar.cpp:2047 msgid "Font Size" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:295 +#: ../src/ui/toolbar/measure-toolbar.cpp:295 msgid "Font Size:" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:296 +#: ../src/ui/toolbar/measure-toolbar.cpp:296 msgid "The font size to be used in the measurement labels" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:307 -#: ../src/widgets/measure-toolbar.cpp:315 +#: ../src/ui/toolbar/measure-toolbar.cpp:307 +#: ../src/ui/toolbar/measure-toolbar.cpp:315 msgid "The units to be used for the measurements" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:323 ../share/extensions/measure.inx.h:14 +#: ../src/ui/toolbar/measure-toolbar.cpp:323 ../share/extensions/measure.inx.h:14 msgid "Precision:" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:324 +#: ../src/ui/toolbar/measure-toolbar.cpp:324 msgid "Decimal precision of measure" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:336 +#: ../src/ui/toolbar/measure-toolbar.cpp:336 msgid "Scale %" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:336 +#: ../src/ui/toolbar/measure-toolbar.cpp:336 msgid "Scale %:" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:337 +#: ../src/ui/toolbar/measure-toolbar.cpp:337 msgid "Scale the results" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:350 +#: ../src/ui/toolbar/measure-toolbar.cpp:350 msgid "Mark dimension offset" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:362 -#: ../src/widgets/measure-toolbar.cpp:363 +#: ../src/ui/toolbar/measure-toolbar.cpp:362 +#: ../src/ui/toolbar/measure-toolbar.cpp:363 msgid "Measure only selected" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:374 -#: ../src/widgets/measure-toolbar.cpp:375 +#: ../src/ui/toolbar/measure-toolbar.cpp:374 +#: ../src/ui/toolbar/measure-toolbar.cpp:375 msgid "Ignore first and last" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:385 -#: ../src/widgets/measure-toolbar.cpp:386 +#: ../src/ui/toolbar/measure-toolbar.cpp:385 +#: ../src/ui/toolbar/measure-toolbar.cpp:386 msgid "Show hidden intersections" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:396 -#: ../src/widgets/measure-toolbar.cpp:397 +#: ../src/ui/toolbar/measure-toolbar.cpp:396 +#: ../src/ui/toolbar/measure-toolbar.cpp:397 msgid "Show measures between items" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:407 -#: ../src/widgets/measure-toolbar.cpp:408 +#: ../src/ui/toolbar/measure-toolbar.cpp:407 +#: ../src/ui/toolbar/measure-toolbar.cpp:408 msgid "Measure all layers" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:418 -#: ../src/widgets/measure-toolbar.cpp:419 +#: ../src/ui/toolbar/measure-toolbar.cpp:418 +#: ../src/ui/toolbar/measure-toolbar.cpp:419 msgid "Reverse measure" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:428 -#: ../src/widgets/measure-toolbar.cpp:429 +#: ../src/ui/toolbar/measure-toolbar.cpp:428 +#: ../src/ui/toolbar/measure-toolbar.cpp:429 msgid "Phantom measure" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:438 -#: ../src/widgets/measure-toolbar.cpp:439 +#: ../src/ui/toolbar/measure-toolbar.cpp:438 +#: ../src/ui/toolbar/measure-toolbar.cpp:439 msgid "To guides" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:448 -#: ../src/widgets/measure-toolbar.cpp:449 +#: ../src/ui/toolbar/measure-toolbar.cpp:448 +#: ../src/ui/toolbar/measure-toolbar.cpp:449 msgid "Mark Dimension" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:458 -#: ../src/widgets/measure-toolbar.cpp:459 +#: ../src/ui/toolbar/measure-toolbar.cpp:458 +#: ../src/ui/toolbar/measure-toolbar.cpp:459 msgid "Convert to item" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:275 +#: ../src/ui/toolbar/mesh-toolbar.cpp:275 msgid "Set mesh type" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:348 +#: ../src/ui/toolbar/mesh-toolbar.cpp:348 msgid "" "Mesh gradients are part of SVG 2:\n" "* Syntax may change.\n" @@ -29587,336 +29587,336 @@ msgid "" "For print: export to PDF." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:384 +#: ../src/ui/toolbar/mesh-toolbar.cpp:384 msgid "normal" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:385 +#: ../src/ui/toolbar/mesh-toolbar.cpp:385 msgid "Create mesh gradient" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:390 +#: ../src/ui/toolbar/mesh-toolbar.cpp:390 msgid "conical" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:391 +#: ../src/ui/toolbar/mesh-toolbar.cpp:391 msgid "Create conical gradient" msgstr "" #. Name -#: ../src/widgets/mesh-toolbar.cpp:397 +#: ../src/ui/toolbar/mesh-toolbar.cpp:397 msgid "New:" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:456 +#: ../src/ui/toolbar/mesh-toolbar.cpp:456 msgid "Rows" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:456 +#: ../src/ui/toolbar/mesh-toolbar.cpp:456 #: ../share/extensions/guides_creator.inx.h:5 #: ../share/extensions/layout_nup.inx.h:12 msgid "Rows:" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:456 +#: ../src/ui/toolbar/mesh-toolbar.cpp:456 msgid "Number of rows in new mesh" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:472 +#: ../src/ui/toolbar/mesh-toolbar.cpp:472 msgid "Columns" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:472 +#: ../src/ui/toolbar/mesh-toolbar.cpp:472 #: ../share/extensions/guides_creator.inx.h:4 msgid "Columns:" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:472 +#: ../src/ui/toolbar/mesh-toolbar.cpp:472 msgid "Number of columns in new mesh" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:486 +#: ../src/ui/toolbar/mesh-toolbar.cpp:486 msgid "Edit Fill" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:487 +#: ../src/ui/toolbar/mesh-toolbar.cpp:487 msgid "Edit fill mesh" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:499 +#: ../src/ui/toolbar/mesh-toolbar.cpp:499 msgid "Edit Stroke" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:500 +#: ../src/ui/toolbar/mesh-toolbar.cpp:500 msgid "Edit stroke mesh" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:512 ../src/widgets/node-toolbar.cpp:524 +#: ../src/ui/toolbar/mesh-toolbar.cpp:512 ../src/ui/toolbar/node-toolbar.cpp:524 msgid "Show Handles" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:529 ../src/widgets/mesh-toolbar.cpp:530 +#: ../src/ui/toolbar/mesh-toolbar.cpp:529 ../src/ui/toolbar/mesh-toolbar.cpp:530 msgid "WARNING: Mesh SVG Syntax Subject to Change" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:547 +#: ../src/ui/toolbar/mesh-toolbar.cpp:547 msgctxt "Type" msgid "Coons" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:553 +#: ../src/ui/toolbar/mesh-toolbar.cpp:553 msgid "Bicubic" msgstr "" #. Name -#: ../src/widgets/mesh-toolbar.cpp:561 +#: ../src/ui/toolbar/mesh-toolbar.cpp:561 msgid "Smoothing" msgstr "" #. Label -#: ../src/widgets/mesh-toolbar.cpp:562 +#: ../src/ui/toolbar/mesh-toolbar.cpp:562 msgid "Coons: no smothing. Bicubic: smothing across patch boundaries." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:581 +#: ../src/ui/toolbar/mesh-toolbar.cpp:581 msgid "Toggle Sides" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:582 +#: ../src/ui/toolbar/mesh-toolbar.cpp:582 msgid "Toggle selected sides between Beziers and lines." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:585 +#: ../src/ui/toolbar/mesh-toolbar.cpp:585 msgid "Toggle side:" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:592 +#: ../src/ui/toolbar/mesh-toolbar.cpp:592 msgid "Make elliptical" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:593 +#: ../src/ui/toolbar/mesh-toolbar.cpp:593 msgid "" "Make selected sides elliptical by changing length of handles. Works best if " "handles already approximate ellipse." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:596 +#: ../src/ui/toolbar/mesh-toolbar.cpp:596 msgid "Make elliptical:" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:603 +#: ../src/ui/toolbar/mesh-toolbar.cpp:603 msgid "Pick colors:" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:604 +#: ../src/ui/toolbar/mesh-toolbar.cpp:604 msgid "Pick colors for selected corner nodes from underneath mesh." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:607 +#: ../src/ui/toolbar/mesh-toolbar.cpp:607 msgid "Pick Color" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:615 +#: ../src/ui/toolbar/mesh-toolbar.cpp:615 msgid "Scale mesh to bounding box:" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:616 +#: ../src/ui/toolbar/mesh-toolbar.cpp:616 msgid "Scale mesh to fit inside bounding box." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:619 +#: ../src/ui/toolbar/mesh-toolbar.cpp:619 msgid "Fit mesh" msgstr "" -#: ../src/widgets/node-toolbar.cpp:344 +#: ../src/ui/toolbar/node-toolbar.cpp:344 msgid "Insert node" msgstr "" -#: ../src/widgets/node-toolbar.cpp:345 +#: ../src/ui/toolbar/node-toolbar.cpp:345 msgid "Insert new nodes into selected segments" msgstr "" -#: ../src/widgets/node-toolbar.cpp:348 +#: ../src/ui/toolbar/node-toolbar.cpp:348 msgid "Insert" msgstr "" -#: ../src/widgets/node-toolbar.cpp:359 +#: ../src/ui/toolbar/node-toolbar.cpp:359 msgid "Insert node at min X" msgstr "" -#: ../src/widgets/node-toolbar.cpp:360 +#: ../src/ui/toolbar/node-toolbar.cpp:360 msgid "Insert new nodes at min X into selected segments" msgstr "" -#: ../src/widgets/node-toolbar.cpp:363 +#: ../src/ui/toolbar/node-toolbar.cpp:363 msgid "Insert min X" msgstr "" -#: ../src/widgets/node-toolbar.cpp:369 +#: ../src/ui/toolbar/node-toolbar.cpp:369 msgid "Insert node at max X" msgstr "" -#: ../src/widgets/node-toolbar.cpp:370 +#: ../src/ui/toolbar/node-toolbar.cpp:370 msgid "Insert new nodes at max X into selected segments" msgstr "" -#: ../src/widgets/node-toolbar.cpp:373 +#: ../src/ui/toolbar/node-toolbar.cpp:373 msgid "Insert max X" msgstr "" -#: ../src/widgets/node-toolbar.cpp:379 +#: ../src/ui/toolbar/node-toolbar.cpp:379 msgid "Insert node at min Y" msgstr "" -#: ../src/widgets/node-toolbar.cpp:380 +#: ../src/ui/toolbar/node-toolbar.cpp:380 msgid "Insert new nodes at min Y into selected segments" msgstr "" -#: ../src/widgets/node-toolbar.cpp:383 +#: ../src/ui/toolbar/node-toolbar.cpp:383 msgid "Insert min Y" msgstr "" -#: ../src/widgets/node-toolbar.cpp:389 +#: ../src/ui/toolbar/node-toolbar.cpp:389 msgid "Insert node at max Y" msgstr "" -#: ../src/widgets/node-toolbar.cpp:390 +#: ../src/ui/toolbar/node-toolbar.cpp:390 msgid "Insert new nodes at max Y into selected segments" msgstr "" -#: ../src/widgets/node-toolbar.cpp:393 +#: ../src/ui/toolbar/node-toolbar.cpp:393 msgid "Insert max Y" msgstr "" -#: ../src/widgets/node-toolbar.cpp:401 +#: ../src/ui/toolbar/node-toolbar.cpp:401 msgid "Delete selected nodes" msgstr "" -#: ../src/widgets/node-toolbar.cpp:412 +#: ../src/ui/toolbar/node-toolbar.cpp:412 msgid "Join selected nodes" msgstr "" -#: ../src/widgets/node-toolbar.cpp:415 +#: ../src/ui/toolbar/node-toolbar.cpp:415 msgid "Join" msgstr "" -#: ../src/widgets/node-toolbar.cpp:423 +#: ../src/ui/toolbar/node-toolbar.cpp:423 msgid "Break path at selected nodes" msgstr "" -#: ../src/widgets/node-toolbar.cpp:433 +#: ../src/ui/toolbar/node-toolbar.cpp:433 msgid "Join with segment" msgstr "" -#: ../src/widgets/node-toolbar.cpp:434 +#: ../src/ui/toolbar/node-toolbar.cpp:434 msgid "Join selected endnodes with a new segment" msgstr "" -#: ../src/widgets/node-toolbar.cpp:443 +#: ../src/ui/toolbar/node-toolbar.cpp:443 msgid "Delete segment" msgstr "" -#: ../src/widgets/node-toolbar.cpp:444 +#: ../src/ui/toolbar/node-toolbar.cpp:444 msgid "Delete segment between two non-endpoint nodes" msgstr "" -#: ../src/widgets/node-toolbar.cpp:453 +#: ../src/ui/toolbar/node-toolbar.cpp:453 msgid "Node Cusp" msgstr "" -#: ../src/widgets/node-toolbar.cpp:454 +#: ../src/ui/toolbar/node-toolbar.cpp:454 msgid "Make selected nodes corner" msgstr "" -#: ../src/widgets/node-toolbar.cpp:463 +#: ../src/ui/toolbar/node-toolbar.cpp:463 msgid "Node Smooth" msgstr "" -#: ../src/widgets/node-toolbar.cpp:464 +#: ../src/ui/toolbar/node-toolbar.cpp:464 msgid "Make selected nodes smooth" msgstr "" -#: ../src/widgets/node-toolbar.cpp:473 +#: ../src/ui/toolbar/node-toolbar.cpp:473 msgid "Node Symmetric" msgstr "" -#: ../src/widgets/node-toolbar.cpp:474 +#: ../src/ui/toolbar/node-toolbar.cpp:474 msgid "Make selected nodes symmetric" msgstr "" -#: ../src/widgets/node-toolbar.cpp:483 +#: ../src/ui/toolbar/node-toolbar.cpp:483 msgid "Node Auto" msgstr "" -#: ../src/widgets/node-toolbar.cpp:484 +#: ../src/ui/toolbar/node-toolbar.cpp:484 msgid "Make selected nodes auto-smooth" msgstr "" -#: ../src/widgets/node-toolbar.cpp:493 +#: ../src/ui/toolbar/node-toolbar.cpp:493 msgid "Node Line" msgstr "" -#: ../src/widgets/node-toolbar.cpp:494 +#: ../src/ui/toolbar/node-toolbar.cpp:494 msgid "Make selected segments lines" msgstr "" -#: ../src/widgets/node-toolbar.cpp:503 +#: ../src/ui/toolbar/node-toolbar.cpp:503 msgid "Node Curve" msgstr "" -#: ../src/widgets/node-toolbar.cpp:504 +#: ../src/ui/toolbar/node-toolbar.cpp:504 msgid "Make selected segments curves" msgstr "" -#: ../src/widgets/node-toolbar.cpp:513 +#: ../src/ui/toolbar/node-toolbar.cpp:513 msgid "Show Transform Handles" msgstr "" -#: ../src/widgets/node-toolbar.cpp:514 +#: ../src/ui/toolbar/node-toolbar.cpp:514 msgid "Show transformation handles for selected nodes" msgstr "" -#: ../src/widgets/node-toolbar.cpp:525 +#: ../src/ui/toolbar/node-toolbar.cpp:525 msgid "Show Bezier handles of selected nodes" msgstr "" -#: ../src/widgets/node-toolbar.cpp:535 +#: ../src/ui/toolbar/node-toolbar.cpp:535 msgid "Show Outline" msgstr "" -#: ../src/widgets/node-toolbar.cpp:536 +#: ../src/ui/toolbar/node-toolbar.cpp:536 msgid "Show path outline (without path effects)" msgstr "" -#: ../src/widgets/node-toolbar.cpp:558 +#: ../src/ui/toolbar/node-toolbar.cpp:558 msgid "Edit clipping paths" msgstr "" -#: ../src/widgets/node-toolbar.cpp:559 +#: ../src/ui/toolbar/node-toolbar.cpp:559 msgid "Show clipping path(s) of selected object(s)" msgstr "" -#: ../src/widgets/node-toolbar.cpp:569 +#: ../src/ui/toolbar/node-toolbar.cpp:569 msgid "Edit masks" msgstr "" -#: ../src/widgets/node-toolbar.cpp:570 +#: ../src/ui/toolbar/node-toolbar.cpp:570 msgid "Show mask(s) of selected object(s)" msgstr "" -#: ../src/widgets/node-toolbar.cpp:584 +#: ../src/ui/toolbar/node-toolbar.cpp:584 msgid "X coordinate:" msgstr "" -#: ../src/widgets/node-toolbar.cpp:584 +#: ../src/ui/toolbar/node-toolbar.cpp:584 msgid "X coordinate of selected node(s)" msgstr "" -#: ../src/widgets/node-toolbar.cpp:601 +#: ../src/ui/toolbar/node-toolbar.cpp:601 msgid "Y coordinate:" msgstr "" -#: ../src/widgets/node-toolbar.cpp:601 +#: ../src/ui/toolbar/node-toolbar.cpp:601 msgid "Y coordinate of selected node(s)" msgstr "" @@ -30010,365 +30010,365 @@ msgid "Swatch fill" msgstr "" #. Name -#: ../src/widgets/paintbucket-toolbar.cpp:141 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:141 msgid "Fill by" msgstr "" -#: ../src/widgets/paintbucket-toolbar.cpp:163 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:163 msgid "Fill Threshold" msgstr "" -#: ../src/widgets/paintbucket-toolbar.cpp:164 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:164 msgid "" "The maximum allowed difference between the clicked pixel and the neighboring " "pixels to be counted in the fill" msgstr "" -#: ../src/widgets/paintbucket-toolbar.cpp:192 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:192 msgid "Grow/shrink by" msgstr "" -#: ../src/widgets/paintbucket-toolbar.cpp:192 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:192 msgid "Grow/shrink by:" msgstr "" -#: ../src/widgets/paintbucket-toolbar.cpp:193 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:193 msgid "" "The amount to grow (positive) or shrink (negative) the created fill path" msgstr "" #. Name -#: ../src/widgets/paintbucket-toolbar.cpp:219 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:219 msgid "Close gaps" msgstr "" -#: ../src/widgets/paintbucket-toolbar.cpp:240 -#: ../src/widgets/pencil-toolbar.cpp:584 ../src/widgets/spiral-toolbar.cpp:293 -#: ../src/widgets/star-toolbar.cpp:592 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:240 +#: ../src/ui/toolbar/pencil-toolbar.cpp:584 ../src/ui/toolbar/spiral-toolbar.cpp:293 +#: ../src/ui/toolbar/star-toolbar.cpp:592 msgid "Defaults" msgstr "" -#: ../src/widgets/paintbucket-toolbar.cpp:241 +#: ../src/ui/toolbar/paintbucket-toolbar.cpp:241 msgid "" "Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " "to change defaults)" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:137 +#: ../src/ui/toolbar/pencil-toolbar.cpp:137 msgid "Bezier" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:138 +#: ../src/ui/toolbar/pencil-toolbar.cpp:138 msgid "Create regular Bezier path" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:144 +#: ../src/ui/toolbar/pencil-toolbar.cpp:144 msgid "Create Spiro path" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:150 +#: ../src/ui/toolbar/pencil-toolbar.cpp:150 msgid "Create BSpline path" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:156 +#: ../src/ui/toolbar/pencil-toolbar.cpp:156 msgid "Zigzag" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:157 +#: ../src/ui/toolbar/pencil-toolbar.cpp:157 msgid "Create a sequence of straight line segments" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:162 +#: ../src/ui/toolbar/pencil-toolbar.cpp:162 msgid "Paraxial" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:163 +#: ../src/ui/toolbar/pencil-toolbar.cpp:163 msgid "Create a sequence of paraxial line segments" msgstr "" #. Label -#: ../src/widgets/pencil-toolbar.cpp:173 +#: ../src/ui/toolbar/pencil-toolbar.cpp:173 msgid "Mode of new lines drawn by this tool" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:188 ../src/widgets/pencil-toolbar.cpp:189 +#: ../src/ui/toolbar/pencil-toolbar.cpp:188 ../src/ui/toolbar/pencil-toolbar.cpp:189 msgid "LPE spiro or bspline flatten" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:226 +#: ../src/ui/toolbar/pencil-toolbar.cpp:226 msgctxt "Freehand shape" msgid "None" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:227 +#: ../src/ui/toolbar/pencil-toolbar.cpp:227 msgid "Triangle in" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:228 +#: ../src/ui/toolbar/pencil-toolbar.cpp:228 msgid "Triangle out" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:230 +#: ../src/ui/toolbar/pencil-toolbar.cpp:230 msgid "From clipboard" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:231 +#: ../src/ui/toolbar/pencil-toolbar.cpp:231 msgid "Bend from clipboard" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:232 +#: ../src/ui/toolbar/pencil-toolbar.cpp:232 msgid "Last applied" msgstr "" #. Name -#: ../src/widgets/pencil-toolbar.cpp:254 +#: ../src/ui/toolbar/pencil-toolbar.cpp:254 msgid "Shape" msgstr "" #. Label -#: ../src/widgets/pencil-toolbar.cpp:255 +#: ../src/ui/toolbar/pencil-toolbar.cpp:255 msgid "Shape of new paths drawn by this tool" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:507 +#: ../src/ui/toolbar/pencil-toolbar.cpp:507 msgid "Min pressure" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:507 +#: ../src/ui/toolbar/pencil-toolbar.cpp:507 msgid "Min:" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:507 +#: ../src/ui/toolbar/pencil-toolbar.cpp:507 msgid "Min percent of pressure" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:525 +#: ../src/ui/toolbar/pencil-toolbar.cpp:525 msgid "Max pressure" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:525 +#: ../src/ui/toolbar/pencil-toolbar.cpp:525 msgid "Max:" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:525 +#: ../src/ui/toolbar/pencil-toolbar.cpp:525 msgid "Max percent of pressure" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:542 ../src/widgets/pencil-toolbar.cpp:543 +#: ../src/ui/toolbar/pencil-toolbar.cpp:542 ../src/ui/toolbar/pencil-toolbar.cpp:543 msgid "Use pressure input" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:560 +#: ../src/ui/toolbar/pencil-toolbar.cpp:560 msgid "(many nodes, rough)" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:560 +#: ../src/ui/toolbar/pencil-toolbar.cpp:560 msgid "(few nodes, smooth)" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:563 +#: ../src/ui/toolbar/pencil-toolbar.cpp:563 msgid "Smoothing:" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:563 +#: ../src/ui/toolbar/pencil-toolbar.cpp:563 msgid "Smoothing: " msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:564 +#: ../src/ui/toolbar/pencil-toolbar.cpp:564 msgid "How much smoothing (simplifying) is applied to the line" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:585 +#: ../src/ui/toolbar/pencil-toolbar.cpp:585 msgid "" "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:594 ../src/widgets/pencil-toolbar.cpp:595 +#: ../src/ui/toolbar/pencil-toolbar.cpp:594 ../src/ui/toolbar/pencil-toolbar.cpp:595 msgid "LPE based interactive simplify" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:612 ../src/widgets/pencil-toolbar.cpp:613 +#: ../src/ui/toolbar/pencil-toolbar.cpp:612 ../src/ui/toolbar/pencil-toolbar.cpp:613 msgid "LPE simplify flatten" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:127 +#: ../src/ui/toolbar/rect-toolbar.cpp:127 msgid "Change rectangle" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:325 +#: ../src/ui/toolbar/rect-toolbar.cpp:325 msgid "W:" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:325 +#: ../src/ui/toolbar/rect-toolbar.cpp:325 msgid "Width of rectangle" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:341 +#: ../src/ui/toolbar/rect-toolbar.cpp:341 msgid "H:" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:341 +#: ../src/ui/toolbar/rect-toolbar.cpp:341 msgid "Height of rectangle" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:354 ../src/widgets/rect-toolbar.cpp:368 +#: ../src/ui/toolbar/rect-toolbar.cpp:354 ../src/ui/toolbar/rect-toolbar.cpp:368 msgid "not rounded" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:357 +#: ../src/ui/toolbar/rect-toolbar.cpp:357 msgid "Horizontal radius of rounded corners" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:371 +#: ../src/ui/toolbar/rect-toolbar.cpp:371 msgid "Vertical radius of rounded corners" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:389 +#: ../src/ui/toolbar/rect-toolbar.cpp:389 msgid "Not rounded" msgstr "" -#: ../src/widgets/rect-toolbar.cpp:390 +#: ../src/ui/toolbar/rect-toolbar.cpp:390 msgid "Make corners sharp" msgstr "" -#: ../src/widgets/select-toolbar.cpp:265 +#: ../src/ui/toolbar/select-toolbar.cpp:265 msgid "Transform by toolbar" msgstr "" -#: ../src/widgets/select-toolbar.cpp:283 +#: ../src/ui/toolbar/select-toolbar.cpp:283 msgid "Now stroke width is scaled when objects are scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:285 +#: ../src/ui/toolbar/select-toolbar.cpp:285 msgid "Now stroke width is not scaled when objects are scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:296 +#: ../src/ui/toolbar/select-toolbar.cpp:296 msgid "" "Now rounded rectangle corners are scaled when rectangles are " "scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:298 +#: ../src/ui/toolbar/select-toolbar.cpp:298 msgid "" "Now rounded rectangle corners are not scaled when rectangles " "are scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:309 +#: ../src/ui/toolbar/select-toolbar.cpp:309 msgid "" "Now gradients are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/widgets/select-toolbar.cpp:311 +#: ../src/ui/toolbar/select-toolbar.cpp:311 msgid "" "Now gradients remain fixed when objects are transformed " "(moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/widgets/select-toolbar.cpp:322 +#: ../src/ui/toolbar/select-toolbar.cpp:322 msgid "" "Now patterns are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/widgets/select-toolbar.cpp:324 +#: ../src/ui/toolbar/select-toolbar.cpp:324 msgid "" "Now patterns remain fixed when objects are transformed (moved, " "scaled, rotated, or skewed)." msgstr "" #. name -#: ../src/widgets/select-toolbar.cpp:438 +#: ../src/ui/toolbar/select-toolbar.cpp:438 msgctxt "Select toolbar" msgid "X position" msgstr "" #. label -#: ../src/widgets/select-toolbar.cpp:439 +#: ../src/ui/toolbar/select-toolbar.cpp:439 msgctxt "Select toolbar" msgid "X:" msgstr "" #. shortLabel -#: ../src/widgets/select-toolbar.cpp:440 +#: ../src/ui/toolbar/select-toolbar.cpp:440 msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" msgstr "" #. name -#: ../src/widgets/select-toolbar.cpp:457 +#: ../src/ui/toolbar/select-toolbar.cpp:457 msgctxt "Select toolbar" msgid "Y position" msgstr "" #. label -#: ../src/widgets/select-toolbar.cpp:458 +#: ../src/ui/toolbar/select-toolbar.cpp:458 msgctxt "Select toolbar" msgid "Y:" msgstr "" #. shortLabel -#: ../src/widgets/select-toolbar.cpp:459 +#: ../src/ui/toolbar/select-toolbar.cpp:459 msgctxt "Select toolbar" msgid "Vertical coordinate of selection" msgstr "" #. name -#: ../src/widgets/select-toolbar.cpp:476 +#: ../src/ui/toolbar/select-toolbar.cpp:476 msgctxt "Select toolbar" msgid "Width" msgstr "" #. label -#: ../src/widgets/select-toolbar.cpp:477 +#: ../src/ui/toolbar/select-toolbar.cpp:477 msgctxt "Select toolbar" msgid "W:" msgstr "" #. shortLabel -#: ../src/widgets/select-toolbar.cpp:478 +#: ../src/ui/toolbar/select-toolbar.cpp:478 msgctxt "Select toolbar" msgid "Width of selection" msgstr "" -#: ../src/widgets/select-toolbar.cpp:496 +#: ../src/ui/toolbar/select-toolbar.cpp:496 msgid "Lock width and height" msgstr "" -#: ../src/widgets/select-toolbar.cpp:497 +#: ../src/ui/toolbar/select-toolbar.cpp:497 msgid "When locked, change both width and height by the same proportion" msgstr "" #. name -#: ../src/widgets/select-toolbar.cpp:508 +#: ../src/ui/toolbar/select-toolbar.cpp:508 msgctxt "Select toolbar" msgid "Height" msgstr "" #. label -#: ../src/widgets/select-toolbar.cpp:509 +#: ../src/ui/toolbar/select-toolbar.cpp:509 msgctxt "Select toolbar" msgid "H:" msgstr "" #. shortLabel -#: ../src/widgets/select-toolbar.cpp:510 +#: ../src/ui/toolbar/select-toolbar.cpp:510 msgctxt "Select toolbar" msgid "Height of selection" msgstr "" -#: ../src/widgets/select-toolbar.cpp:574 +#: ../src/ui/toolbar/select-toolbar.cpp:574 msgid "Scale rounded corners" msgstr "" -#: ../src/widgets/select-toolbar.cpp:585 +#: ../src/ui/toolbar/select-toolbar.cpp:585 msgid "Move gradients" msgstr "" -#: ../src/widgets/select-toolbar.cpp:596 +#: ../src/ui/toolbar/select-toolbar.cpp:596 msgid "Move patterns" msgstr "" @@ -30384,467 +30384,467 @@ msgstr "" msgid "Type text in a text node" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:100 +#: ../src/ui/toolbar/spiral-toolbar.cpp:100 msgid "Change spiral" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:250 +#: ../src/ui/toolbar/spiral-toolbar.cpp:250 msgid "just a curve" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:250 +#: ../src/ui/toolbar/spiral-toolbar.cpp:250 msgid "one full revolution" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:253 +#: ../src/ui/toolbar/spiral-toolbar.cpp:253 msgid "Number of turns" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:253 +#: ../src/ui/toolbar/spiral-toolbar.cpp:253 msgid "Turns:" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:253 +#: ../src/ui/toolbar/spiral-toolbar.cpp:253 msgid "Number of revolutions" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:264 +#: ../src/ui/toolbar/spiral-toolbar.cpp:264 msgid "circle" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:264 +#: ../src/ui/toolbar/spiral-toolbar.cpp:264 msgid "edge is much denser" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:264 +#: ../src/ui/toolbar/spiral-toolbar.cpp:264 msgid "edge is denser" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:264 +#: ../src/ui/toolbar/spiral-toolbar.cpp:264 msgid "even" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:264 +#: ../src/ui/toolbar/spiral-toolbar.cpp:264 msgid "center is denser" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:264 +#: ../src/ui/toolbar/spiral-toolbar.cpp:264 msgid "center is much denser" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:267 +#: ../src/ui/toolbar/spiral-toolbar.cpp:267 msgid "Divergence" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:267 +#: ../src/ui/toolbar/spiral-toolbar.cpp:267 msgid "Divergence:" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:267 +#: ../src/ui/toolbar/spiral-toolbar.cpp:267 msgid "How much denser/sparser are outer revolutions; 1 = uniform" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:278 +#: ../src/ui/toolbar/spiral-toolbar.cpp:278 msgid "starts from center" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:278 +#: ../src/ui/toolbar/spiral-toolbar.cpp:278 msgid "starts mid-way" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:278 +#: ../src/ui/toolbar/spiral-toolbar.cpp:278 msgid "starts near edge" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:281 +#: ../src/ui/toolbar/spiral-toolbar.cpp:281 msgid "Inner radius" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:281 +#: ../src/ui/toolbar/spiral-toolbar.cpp:281 msgid "Inner radius:" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:281 +#: ../src/ui/toolbar/spiral-toolbar.cpp:281 msgid "Radius of the innermost revolution (relative to the spiral size)" msgstr "" -#: ../src/widgets/spiral-toolbar.cpp:294 ../src/widgets/star-toolbar.cpp:593 +#: ../src/ui/toolbar/spiral-toolbar.cpp:294 ../src/ui/toolbar/star-toolbar.cpp:593 msgid "" "Reset shape parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" msgstr "" #. Width -#: ../src/widgets/spray-toolbar.cpp:294 +#: ../src/ui/toolbar/spray-toolbar.cpp:294 msgid "(narrow spray)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:294 +#: ../src/ui/toolbar/spray-toolbar.cpp:294 msgid "(broad spray)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:297 +#: ../src/ui/toolbar/spray-toolbar.cpp:297 msgid "The width of the spray area (relative to the visible canvas area)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:312 +#: ../src/ui/toolbar/spray-toolbar.cpp:312 msgid "Use the pressure of the input device to alter the width of spray area" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:323 +#: ../src/ui/toolbar/spray-toolbar.cpp:323 msgid "(maximum mean)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:326 +#: ../src/ui/toolbar/spray-toolbar.cpp:326 msgid "Focus" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:326 +#: ../src/ui/toolbar/spray-toolbar.cpp:326 msgid "Focus:" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:326 +#: ../src/ui/toolbar/spray-toolbar.cpp:326 msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "" #. Standard_deviation -#: ../src/widgets/spray-toolbar.cpp:339 +#: ../src/ui/toolbar/spray-toolbar.cpp:339 msgid "(minimum scatter)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:339 +#: ../src/ui/toolbar/spray-toolbar.cpp:339 msgid "(maximum scatter)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:342 +#: ../src/ui/toolbar/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:342 +#: ../src/ui/toolbar/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter:" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:342 +#: ../src/ui/toolbar/spray-toolbar.cpp:342 msgid "Increase to scatter sprayed objects" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:363 +#: ../src/ui/toolbar/spray-toolbar.cpp:363 msgid "Spray copies of the initial selection" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:369 +#: ../src/ui/toolbar/spray-toolbar.cpp:369 msgid "Spray clones of the initial selection" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:375 +#: ../src/ui/toolbar/spray-toolbar.cpp:375 msgid "Spray single path" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:376 +#: ../src/ui/toolbar/spray-toolbar.cpp:376 msgid "Spray objects in a single path" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:382 +#: ../src/ui/toolbar/spray-toolbar.cpp:382 msgid "Delete sprayed items" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:383 +#: ../src/ui/toolbar/spray-toolbar.cpp:383 msgid "Delete sprayed items from selection" msgstr "" #. Population -#: ../src/widgets/spray-toolbar.cpp:406 +#: ../src/ui/toolbar/spray-toolbar.cpp:406 msgid "(low population)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:406 +#: ../src/ui/toolbar/spray-toolbar.cpp:406 msgid "(high population)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:409 +#: ../src/ui/toolbar/spray-toolbar.cpp:409 msgid "Amount" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:410 +#: ../src/ui/toolbar/spray-toolbar.cpp:410 msgid "Adjusts the number of items sprayed per click" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:426 +#: ../src/ui/toolbar/spray-toolbar.cpp:426 msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:436 +#: ../src/ui/toolbar/spray-toolbar.cpp:436 msgid "(high rotation variation)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:439 +#: ../src/ui/toolbar/spray-toolbar.cpp:439 msgid "Rotation" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:439 +#: ../src/ui/toolbar/spray-toolbar.cpp:439 msgid "Rotation:" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:441 +#: ../src/ui/toolbar/spray-toolbar.cpp:441 #, no-c-format msgid "" "Variation of the rotation of the sprayed objects; 0% for the same rotation " "than the original object" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:454 +#: ../src/ui/toolbar/spray-toolbar.cpp:454 msgid "(high scale variation)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:457 +#: ../src/ui/toolbar/spray-toolbar.cpp:457 msgctxt "Spray tool" msgid "Scale" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:457 +#: ../src/ui/toolbar/spray-toolbar.cpp:457 msgctxt "Spray tool" msgid "Scale:" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:459 +#: ../src/ui/toolbar/spray-toolbar.cpp:459 #, no-c-format msgid "" "Variation in the scale of the sprayed objects; 0% for the same scale than " "the original object" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:475 +#: ../src/ui/toolbar/spray-toolbar.cpp:475 msgid "Use the pressure of the input device to alter the scale of new items" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:487 ../src/widgets/spray-toolbar.cpp:488 +#: ../src/ui/toolbar/spray-toolbar.cpp:487 ../src/ui/toolbar/spray-toolbar.cpp:488 msgid "" "Pick color from the drawing. You can use clonetiler trace dialog for " "advanced effects. In clone mode original fill or stroke colors must be unset." msgstr "" -#: ../src/widgets/spray-toolbar.cpp:500 ../src/widgets/spray-toolbar.cpp:501 +#: ../src/ui/toolbar/spray-toolbar.cpp:500 ../src/ui/toolbar/spray-toolbar.cpp:501 msgid "Pick from center instead average area." msgstr "" -#: ../src/widgets/spray-toolbar.cpp:513 ../src/widgets/spray-toolbar.cpp:514 +#: ../src/ui/toolbar/spray-toolbar.cpp:513 ../src/ui/toolbar/spray-toolbar.cpp:514 msgid "Inverted pick value, retaining color in advanced trace mode" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:526 ../src/widgets/spray-toolbar.cpp:527 +#: ../src/ui/toolbar/spray-toolbar.cpp:526 ../src/ui/toolbar/spray-toolbar.cpp:527 msgid "Apply picked color to fill" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:539 ../src/widgets/spray-toolbar.cpp:540 +#: ../src/ui/toolbar/spray-toolbar.cpp:539 ../src/ui/toolbar/spray-toolbar.cpp:540 msgid "Apply picked color to stroke" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:552 ../src/widgets/spray-toolbar.cpp:553 +#: ../src/ui/toolbar/spray-toolbar.cpp:552 ../src/ui/toolbar/spray-toolbar.cpp:553 msgid "No overlap between colors" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:565 ../src/widgets/spray-toolbar.cpp:566 +#: ../src/ui/toolbar/spray-toolbar.cpp:565 ../src/ui/toolbar/spray-toolbar.cpp:566 msgid "Apply over transparent areas" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:578 ../src/widgets/spray-toolbar.cpp:579 +#: ../src/ui/toolbar/spray-toolbar.cpp:578 ../src/ui/toolbar/spray-toolbar.cpp:579 msgid "Apply over no transparent areas" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:591 ../src/widgets/spray-toolbar.cpp:592 +#: ../src/ui/toolbar/spray-toolbar.cpp:591 ../src/ui/toolbar/spray-toolbar.cpp:592 msgid "Prevent overlapping objects" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:603 +#: ../src/ui/toolbar/spray-toolbar.cpp:603 msgid "(minimum offset)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:603 +#: ../src/ui/toolbar/spray-toolbar.cpp:603 msgid "(maximum offset)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:606 +#: ../src/ui/toolbar/spray-toolbar.cpp:606 msgid "Offset %" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:606 +#: ../src/ui/toolbar/spray-toolbar.cpp:606 msgid "Offset %:" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:607 +#: ../src/ui/toolbar/spray-toolbar.cpp:607 msgid "Increase to segregate objects more (value in percent)" msgstr "" -#: ../src/widgets/star-toolbar.cpp:105 +#: ../src/ui/toolbar/star-toolbar.cpp:105 msgid "Star: Change number of corners" msgstr "" -#: ../src/widgets/star-toolbar.cpp:158 +#: ../src/ui/toolbar/star-toolbar.cpp:158 msgid "Star: Change spoke ratio" msgstr "" -#: ../src/widgets/star-toolbar.cpp:204 +#: ../src/ui/toolbar/star-toolbar.cpp:204 msgid "Make polygon" msgstr "" -#: ../src/widgets/star-toolbar.cpp:204 +#: ../src/ui/toolbar/star-toolbar.cpp:204 msgid "Make star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:243 +#: ../src/ui/toolbar/star-toolbar.cpp:243 msgid "Star: Change rounding" msgstr "" -#: ../src/widgets/star-toolbar.cpp:283 +#: ../src/ui/toolbar/star-toolbar.cpp:283 msgid "Star: Change randomization" msgstr "" -#: ../src/widgets/star-toolbar.cpp:492 +#: ../src/ui/toolbar/star-toolbar.cpp:492 msgid "Regular polygon (with one handle) instead of a star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:498 +#: ../src/ui/toolbar/star-toolbar.cpp:498 msgid "Star instead of a regular polygon (with one handle)" msgstr "" -#: ../src/widgets/star-toolbar.cpp:520 +#: ../src/ui/toolbar/star-toolbar.cpp:520 msgid "triangle/tri-star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:520 +#: ../src/ui/toolbar/star-toolbar.cpp:520 msgid "square/quad-star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:520 +#: ../src/ui/toolbar/star-toolbar.cpp:520 msgid "pentagon/five-pointed star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:520 +#: ../src/ui/toolbar/star-toolbar.cpp:520 msgid "hexagon/six-pointed star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:523 +#: ../src/ui/toolbar/star-toolbar.cpp:523 msgid "Corners" msgstr "" -#: ../src/widgets/star-toolbar.cpp:523 +#: ../src/ui/toolbar/star-toolbar.cpp:523 msgid "Corners:" msgstr "" -#: ../src/widgets/star-toolbar.cpp:523 +#: ../src/ui/toolbar/star-toolbar.cpp:523 msgid "Number of corners of a polygon or star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:536 +#: ../src/ui/toolbar/star-toolbar.cpp:536 msgid "thin-ray star" msgstr "" -#: ../src/widgets/star-toolbar.cpp:536 +#: ../src/ui/toolbar/star-toolbar.cpp:536 msgid "pentagram" msgstr "" -#: ../src/widgets/star-toolbar.cpp:536 +#: ../src/ui/toolbar/star-toolbar.cpp:536 msgid "hexagram" msgstr "" -#: ../src/widgets/star-toolbar.cpp:536 +#: ../src/ui/toolbar/star-toolbar.cpp:536 msgid "heptagram" msgstr "" -#: ../src/widgets/star-toolbar.cpp:536 +#: ../src/ui/toolbar/star-toolbar.cpp:536 msgid "octagram" msgstr "" -#: ../src/widgets/star-toolbar.cpp:536 +#: ../src/ui/toolbar/star-toolbar.cpp:536 msgid "regular polygon" msgstr "" -#: ../src/widgets/star-toolbar.cpp:539 +#: ../src/ui/toolbar/star-toolbar.cpp:539 msgid "Spoke ratio" msgstr "" -#: ../src/widgets/star-toolbar.cpp:539 +#: ../src/ui/toolbar/star-toolbar.cpp:539 msgid "Spoke ratio:" msgstr "" #. TRANSLATORS: Tip radius of a star is the distance from the center to the farthest handle. #. Base radius is the same for the closest handle. -#: ../src/widgets/star-toolbar.cpp:542 +#: ../src/ui/toolbar/star-toolbar.cpp:542 msgid "Base radius to tip radius ratio" msgstr "" -#: ../src/widgets/star-toolbar.cpp:560 ../src/widgets/star-toolbar.cpp:561 +#: ../src/ui/toolbar/star-toolbar.cpp:560 ../src/ui/toolbar/star-toolbar.cpp:561 msgid "stretched" msgstr "" -#: ../src/widgets/star-toolbar.cpp:560 +#: ../src/ui/toolbar/star-toolbar.cpp:560 msgid "twisted" msgstr "" -#: ../src/widgets/star-toolbar.cpp:560 +#: ../src/ui/toolbar/star-toolbar.cpp:560 msgid "slightly pinched" msgstr "" -#: ../src/widgets/star-toolbar.cpp:560 +#: ../src/ui/toolbar/star-toolbar.cpp:560 msgid "NOT rounded" msgstr "" -#: ../src/widgets/star-toolbar.cpp:560 +#: ../src/ui/toolbar/star-toolbar.cpp:560 msgid "slightly rounded" msgstr "" -#: ../src/widgets/star-toolbar.cpp:561 +#: ../src/ui/toolbar/star-toolbar.cpp:561 msgid "visibly rounded" msgstr "" -#: ../src/widgets/star-toolbar.cpp:561 +#: ../src/ui/toolbar/star-toolbar.cpp:561 msgid "well rounded" msgstr "" -#: ../src/widgets/star-toolbar.cpp:561 +#: ../src/ui/toolbar/star-toolbar.cpp:561 msgid "amply rounded" msgstr "" -#: ../src/widgets/star-toolbar.cpp:561 ../src/widgets/star-toolbar.cpp:576 +#: ../src/ui/toolbar/star-toolbar.cpp:561 ../src/ui/toolbar/star-toolbar.cpp:576 msgid "blown up" msgstr "" -#: ../src/widgets/star-toolbar.cpp:564 +#: ../src/ui/toolbar/star-toolbar.cpp:564 msgid "Rounded:" msgstr "" -#: ../src/widgets/star-toolbar.cpp:564 +#: ../src/ui/toolbar/star-toolbar.cpp:564 msgid "How much rounded are the corners (0 for sharp)" msgstr "" -#: ../src/widgets/star-toolbar.cpp:576 +#: ../src/ui/toolbar/star-toolbar.cpp:576 msgid "NOT randomized" msgstr "" -#: ../src/widgets/star-toolbar.cpp:576 +#: ../src/ui/toolbar/star-toolbar.cpp:576 msgid "slightly irregular" msgstr "" -#: ../src/widgets/star-toolbar.cpp:576 +#: ../src/ui/toolbar/star-toolbar.cpp:576 msgid "visibly randomized" msgstr "" -#: ../src/widgets/star-toolbar.cpp:576 +#: ../src/ui/toolbar/star-toolbar.cpp:576 msgid "strongly randomized" msgstr "" -#: ../src/widgets/star-toolbar.cpp:579 +#: ../src/ui/toolbar/star-toolbar.cpp:579 msgid "Randomized" msgstr "" -#: ../src/widgets/star-toolbar.cpp:579 +#: ../src/ui/toolbar/star-toolbar.cpp:579 msgid "Randomized:" msgstr "" -#: ../src/widgets/star-toolbar.cpp:579 +#: ../src/ui/toolbar/star-toolbar.cpp:579 msgid "Scatter randomly the corners and angles" msgstr "" @@ -30974,306 +30974,306 @@ msgstr "" msgid "Change swatch color" msgstr "" -#: ../src/widgets/text-toolbar.cpp:188 +#: ../src/ui/toolbar/text-toolbar.cpp:188 msgid "Text: Change font family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:282 +#: ../src/ui/toolbar/text-toolbar.cpp:282 msgid "Text: Change font size" msgstr "" -#: ../src/widgets/text-toolbar.cpp:327 +#: ../src/ui/toolbar/text-toolbar.cpp:327 msgid "Text: Change font style" msgstr "" -#: ../src/widgets/text-toolbar.cpp:366 +#: ../src/ui/toolbar/text-toolbar.cpp:366 msgid "Text: Unset line height." msgstr "" -#: ../src/widgets/text-toolbar.cpp:443 +#: ../src/ui/toolbar/text-toolbar.cpp:443 msgid "Text: Change superscript or subscript" msgstr "" -#: ../src/widgets/text-toolbar.cpp:584 +#: ../src/ui/toolbar/text-toolbar.cpp:584 msgid "Text: Change alignment" msgstr "" -#: ../src/widgets/text-toolbar.cpp:717 +#: ../src/ui/toolbar/text-toolbar.cpp:717 msgid "Text: Change line-height" msgstr "" -#: ../src/widgets/text-toolbar.cpp:881 +#: ../src/ui/toolbar/text-toolbar.cpp:881 msgid "Text: Change line-height unit" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1061 +#: ../src/ui/toolbar/text-toolbar.cpp:1061 msgid "Text: Change line spacing mode" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1098 +#: ../src/ui/toolbar/text-toolbar.cpp:1098 msgid "Text: Change word-spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1138 +#: ../src/ui/toolbar/text-toolbar.cpp:1138 msgid "Text: Change letter-spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1176 +#: ../src/ui/toolbar/text-toolbar.cpp:1176 msgid "Text: Change dx (kern)" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1210 +#: ../src/ui/toolbar/text-toolbar.cpp:1210 msgid "Text: Change dy" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1245 +#: ../src/ui/toolbar/text-toolbar.cpp:1245 msgid "Text: Change rotate" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1296 +#: ../src/ui/toolbar/text-toolbar.cpp:1296 msgid "Text: Change writing mode" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1350 +#: ../src/ui/toolbar/text-toolbar.cpp:1350 msgid "Text: Change orientation" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1398 +#: ../src/ui/toolbar/text-toolbar.cpp:1398 msgid "Text: Change direction" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1996 +#: ../src/ui/toolbar/text-toolbar.cpp:1996 msgid "Font Family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1997 +#: ../src/ui/toolbar/text-toolbar.cpp:1997 msgid "Select Font Family (Alt-X to access)" msgstr "" #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:2007 +#: ../src/ui/toolbar/text-toolbar.cpp:2007 msgid "Select all text with this font-family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2011 +#: ../src/ui/toolbar/text-toolbar.cpp:2011 msgid "Font not found on system" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2069 +#: ../src/ui/toolbar/text-toolbar.cpp:2069 msgid "Font Style" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2070 +#: ../src/ui/toolbar/text-toolbar.cpp:2070 msgid "Font style" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2087 +#: ../src/ui/toolbar/text-toolbar.cpp:2087 msgid "Toggle Superscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2088 +#: ../src/ui/toolbar/text-toolbar.cpp:2088 msgid "Toggle superscript" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2100 +#: ../src/ui/toolbar/text-toolbar.cpp:2100 msgid "Toggle Subscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2101 +#: ../src/ui/toolbar/text-toolbar.cpp:2101 msgid "Toggle subscript" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2119 ../src/widgets/text-toolbar.cpp:2120 +#: ../src/ui/toolbar/text-toolbar.cpp:2119 ../src/ui/toolbar/text-toolbar.cpp:2120 msgid "Align left" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2125 ../src/widgets/text-toolbar.cpp:2126 +#: ../src/ui/toolbar/text-toolbar.cpp:2125 ../src/ui/toolbar/text-toolbar.cpp:2126 msgid "Align center" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2131 ../src/widgets/text-toolbar.cpp:2132 +#: ../src/ui/toolbar/text-toolbar.cpp:2131 ../src/ui/toolbar/text-toolbar.cpp:2132 msgid "Align right" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2137 +#: ../src/ui/toolbar/text-toolbar.cpp:2137 msgid "Justify" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2138 +#: ../src/ui/toolbar/text-toolbar.cpp:2138 msgid "Justify (only flowed text)" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2144 +#: ../src/ui/toolbar/text-toolbar.cpp:2144 msgid "Alignment" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2145 +#: ../src/ui/toolbar/text-toolbar.cpp:2145 msgid "Text alignment" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2169 +#: ../src/ui/toolbar/text-toolbar.cpp:2169 msgid "Horizontal text" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2174 +#: ../src/ui/toolbar/text-toolbar.cpp:2174 msgid "Vertical — RL" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2175 +#: ../src/ui/toolbar/text-toolbar.cpp:2175 msgid "Vertical text — lines: right to left" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2180 +#: ../src/ui/toolbar/text-toolbar.cpp:2180 msgid "Vertical — LR" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2181 +#: ../src/ui/toolbar/text-toolbar.cpp:2181 msgid "Vertical text — lines: left to right" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2187 +#: ../src/ui/toolbar/text-toolbar.cpp:2187 msgid "Writing mode" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2188 +#: ../src/ui/toolbar/text-toolbar.cpp:2188 msgid "Block progression" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2212 +#: ../src/ui/toolbar/text-toolbar.cpp:2212 msgid "Auto glyph orientation" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2217 +#: ../src/ui/toolbar/text-toolbar.cpp:2217 msgid "Upright" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2218 +#: ../src/ui/toolbar/text-toolbar.cpp:2218 msgid "Upright glyph orientation" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2223 +#: ../src/ui/toolbar/text-toolbar.cpp:2223 msgid "Sideways" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2224 +#: ../src/ui/toolbar/text-toolbar.cpp:2224 msgid "Sideways glyph orientation" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2230 +#: ../src/ui/toolbar/text-toolbar.cpp:2230 msgid "Text orientation" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2231 +#: ../src/ui/toolbar/text-toolbar.cpp:2231 msgid "Text (glyph) orientation in vertical text." msgstr "" -#: ../src/widgets/text-toolbar.cpp:2255 +#: ../src/ui/toolbar/text-toolbar.cpp:2255 msgid "LTR" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2256 +#: ../src/ui/toolbar/text-toolbar.cpp:2256 msgid "Left to right text" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2261 +#: ../src/ui/toolbar/text-toolbar.cpp:2261 msgid "RTL" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2262 +#: ../src/ui/toolbar/text-toolbar.cpp:2262 msgid "Right to left text" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2268 +#: ../src/ui/toolbar/text-toolbar.cpp:2268 msgid "Text direction" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2269 +#: ../src/ui/toolbar/text-toolbar.cpp:2269 msgid "Text direction for normally horizontal text." msgstr "" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:2295 +#: ../src/ui/toolbar/text-toolbar.cpp:2295 msgid "Smaller spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2295 ../src/widgets/text-toolbar.cpp:2383 -#: ../src/widgets/text-toolbar.cpp:2414 +#: ../src/ui/toolbar/text-toolbar.cpp:2295 ../src/ui/toolbar/text-toolbar.cpp:2383 +#: ../src/ui/toolbar/text-toolbar.cpp:2414 msgctxt "Text tool" msgid "Normal" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2295 +#: ../src/ui/toolbar/text-toolbar.cpp:2295 msgid "Larger spacing" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:2300 +#: ../src/ui/toolbar/text-toolbar.cpp:2300 msgid "Line Height" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:2301 +#: ../src/ui/toolbar/text-toolbar.cpp:2301 msgid "Line:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:2302 +#: ../src/ui/toolbar/text-toolbar.cpp:2302 msgid "Spacing between baselines" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2341 +#: ../src/ui/toolbar/text-toolbar.cpp:2341 msgid "Adaptive" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2342 +#: ../src/ui/toolbar/text-toolbar.cpp:2342 msgid "Line spacing adapts to font size." msgstr "" -#: ../src/widgets/text-toolbar.cpp:2347 +#: ../src/ui/toolbar/text-toolbar.cpp:2347 #: ../share/extensions/polyhedron_3d.inx.h:54 msgid "Minimum" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2348 +#: ../src/ui/toolbar/text-toolbar.cpp:2348 msgid "Line spacing adapts to fonts size with set minimum spacing." msgstr "" -#: ../src/widgets/text-toolbar.cpp:2352 +#: ../src/ui/toolbar/text-toolbar.cpp:2352 msgid "Even" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2353 +#: ../src/ui/toolbar/text-toolbar.cpp:2353 msgid "Lines evenly spaced." msgstr "" -#: ../src/widgets/text-toolbar.cpp:2358 +#: ../src/ui/toolbar/text-toolbar.cpp:2358 msgid "Adjustable ☠" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2359 +#: ../src/ui/toolbar/text-toolbar.cpp:2359 msgid "Line spacing fully adjustable" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2365 +#: ../src/ui/toolbar/text-toolbar.cpp:2365 msgid "Line Spacing Mode" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2366 +#: ../src/ui/toolbar/text-toolbar.cpp:2366 msgid "" "How should multiple baselines be spaced?\n" " Adaptive: Line spacing adapts to font size.\n" @@ -31283,106 +31283,106 @@ msgid "" msgstr "" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:2383 ../src/widgets/text-toolbar.cpp:2414 +#: ../src/ui/toolbar/text-toolbar.cpp:2383 ../src/ui/toolbar/text-toolbar.cpp:2414 msgid "Negative spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:2383 ../src/widgets/text-toolbar.cpp:2414 +#: ../src/ui/toolbar/text-toolbar.cpp:2383 ../src/ui/toolbar/text-toolbar.cpp:2414 msgid "Positive spacing" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:2388 +#: ../src/ui/toolbar/text-toolbar.cpp:2388 msgid "Word spacing" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:2389 +#: ../src/ui/toolbar/text-toolbar.cpp:2389 msgid "Word:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:2390 +#: ../src/ui/toolbar/text-toolbar.cpp:2390 msgid "Spacing between words (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:2419 +#: ../src/ui/toolbar/text-toolbar.cpp:2419 msgid "Letter spacing" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:2420 +#: ../src/ui/toolbar/text-toolbar.cpp:2420 msgid "Letter:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:2421 +#: ../src/ui/toolbar/text-toolbar.cpp:2421 msgid "Spacing between letters (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:2450 +#: ../src/ui/toolbar/text-toolbar.cpp:2450 msgid "Kerning" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:2451 +#: ../src/ui/toolbar/text-toolbar.cpp:2451 msgid "Kern:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:2452 +#: ../src/ui/toolbar/text-toolbar.cpp:2452 msgid "Horizontal kerning (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:2481 +#: ../src/ui/toolbar/text-toolbar.cpp:2481 msgid "Vertical Shift" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:2482 +#: ../src/ui/toolbar/text-toolbar.cpp:2482 msgid "Vert:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:2483 +#: ../src/ui/toolbar/text-toolbar.cpp:2483 msgid "Vertical shift (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:2512 +#: ../src/ui/toolbar/text-toolbar.cpp:2512 msgid "Letter rotation" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:2513 +#: ../src/ui/toolbar/text-toolbar.cpp:2513 msgid "Rot:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:2514 +#: ../src/ui/toolbar/text-toolbar.cpp:2514 msgid "Character rotation (degrees)" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2538 +#: ../src/ui/toolbar/text-toolbar.cpp:2538 msgid "Unset line height" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2539 +#: ../src/ui/toolbar/text-toolbar.cpp:2539 msgid "If enabled, line height is set on part of selection. Click to unset." msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:2551 +#: ../src/ui/toolbar/text-toolbar.cpp:2551 msgid "Show outer style" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:2552 +#: ../src/ui/toolbar/text-toolbar.cpp:2552 msgid "" "Show style of outermost text element. The 'font-size' and 'line-height' " "values of the outermost text element determine the minimum line spacing in " @@ -31562,211 +31562,211 @@ msgid "Snap guides" msgstr "" #. Width -#: ../src/widgets/tweak-toolbar.cpp:129 +#: ../src/ui/toolbar/tweak-toolbar.cpp:129 msgid "(pinch tweak)" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:129 +#: ../src/ui/toolbar/tweak-toolbar.cpp:129 msgid "(broad tweak)" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:132 +#: ../src/ui/toolbar/tweak-toolbar.cpp:132 msgid "The width of the tweak area (relative to the visible canvas area)" msgstr "" #. Force -#: ../src/widgets/tweak-toolbar.cpp:146 +#: ../src/ui/toolbar/tweak-toolbar.cpp:146 msgid "(minimum force)" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:146 +#: ../src/ui/toolbar/tweak-toolbar.cpp:146 msgid "(maximum force)" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:149 +#: ../src/ui/toolbar/tweak-toolbar.cpp:149 msgid "Force" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:149 +#: ../src/ui/toolbar/tweak-toolbar.cpp:149 msgid "Force:" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:149 +#: ../src/ui/toolbar/tweak-toolbar.cpp:149 msgid "The force of the tweak action" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:169 +#: ../src/ui/toolbar/tweak-toolbar.cpp:169 msgid "Move mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:170 +#: ../src/ui/toolbar/tweak-toolbar.cpp:170 msgid "Move objects in any direction" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:175 +#: ../src/ui/toolbar/tweak-toolbar.cpp:175 msgid "Move in/out mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:176 +#: ../src/ui/toolbar/tweak-toolbar.cpp:176 msgid "Move objects towards cursor; with Shift from cursor" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:181 +#: ../src/ui/toolbar/tweak-toolbar.cpp:181 msgid "Move jitter mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:182 +#: ../src/ui/toolbar/tweak-toolbar.cpp:182 msgid "Move objects in random directions" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:187 +#: ../src/ui/toolbar/tweak-toolbar.cpp:187 msgid "Scale mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:188 +#: ../src/ui/toolbar/tweak-toolbar.cpp:188 msgid "Shrink objects, with Shift enlarge" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:193 +#: ../src/ui/toolbar/tweak-toolbar.cpp:193 msgid "Rotate mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:194 +#: ../src/ui/toolbar/tweak-toolbar.cpp:194 msgid "Rotate objects, with Shift counterclockwise" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:199 +#: ../src/ui/toolbar/tweak-toolbar.cpp:199 msgid "Duplicate/delete mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:200 +#: ../src/ui/toolbar/tweak-toolbar.cpp:200 msgid "Duplicate objects, with Shift delete" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:205 +#: ../src/ui/toolbar/tweak-toolbar.cpp:205 msgid "Push mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:206 +#: ../src/ui/toolbar/tweak-toolbar.cpp:206 msgid "Push parts of paths in any direction" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:211 +#: ../src/ui/toolbar/tweak-toolbar.cpp:211 msgid "Shrink/grow mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:212 +#: ../src/ui/toolbar/tweak-toolbar.cpp:212 msgid "Shrink (inset) parts of paths; with Shift grow (outset)" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:217 +#: ../src/ui/toolbar/tweak-toolbar.cpp:217 msgid "Attract/repel mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:218 +#: ../src/ui/toolbar/tweak-toolbar.cpp:218 msgid "Attract parts of paths towards cursor; with Shift from cursor" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:223 +#: ../src/ui/toolbar/tweak-toolbar.cpp:223 msgid "Roughen mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:224 +#: ../src/ui/toolbar/tweak-toolbar.cpp:224 msgid "Roughen parts of paths" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:229 +#: ../src/ui/toolbar/tweak-toolbar.cpp:229 msgid "Color paint mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:230 +#: ../src/ui/toolbar/tweak-toolbar.cpp:230 msgid "Paint the tool's color upon selected objects" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:235 +#: ../src/ui/toolbar/tweak-toolbar.cpp:235 msgid "Color jitter mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:236 +#: ../src/ui/toolbar/tweak-toolbar.cpp:236 msgid "Jitter the colors of selected objects" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:241 +#: ../src/ui/toolbar/tweak-toolbar.cpp:241 msgid "Blur mode" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:242 +#: ../src/ui/toolbar/tweak-toolbar.cpp:242 msgid "Blur selected objects more; with Shift, blur less" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:269 +#: ../src/ui/toolbar/tweak-toolbar.cpp:269 msgid "Channels:" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:281 +#: ../src/ui/toolbar/tweak-toolbar.cpp:281 msgid "In color mode, act on objects' hue" msgstr "" #. TRANSLATORS: "H" here stands for hue -#: ../src/widgets/tweak-toolbar.cpp:285 +#: ../src/ui/toolbar/tweak-toolbar.cpp:285 msgctxt "Hue" msgid "H" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:297 +#: ../src/ui/toolbar/tweak-toolbar.cpp:297 msgid "In color mode, act on objects' saturation" msgstr "" #. TRANSLATORS: "S" here stands for Saturation -#: ../src/widgets/tweak-toolbar.cpp:301 +#: ../src/ui/toolbar/tweak-toolbar.cpp:301 msgctxt "Saturation" msgid "S" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:313 +#: ../src/ui/toolbar/tweak-toolbar.cpp:313 msgid "In color mode, act on objects' lightness" msgstr "" #. TRANSLATORS: "L" here stands for Lightness -#: ../src/widgets/tweak-toolbar.cpp:317 +#: ../src/ui/toolbar/tweak-toolbar.cpp:317 msgctxt "Lightness" msgid "L" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:329 +#: ../src/ui/toolbar/tweak-toolbar.cpp:329 msgid "In color mode, act on objects' opacity" msgstr "" #. TRANSLATORS: "O" here stands for Opacity -#: ../src/widgets/tweak-toolbar.cpp:333 +#: ../src/ui/toolbar/tweak-toolbar.cpp:333 msgctxt "Opacity" msgid "O" msgstr "" #. Fidelity -#: ../src/widgets/tweak-toolbar.cpp:344 +#: ../src/ui/toolbar/tweak-toolbar.cpp:344 msgid "(rough, simplified)" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:344 +#: ../src/ui/toolbar/tweak-toolbar.cpp:344 msgid "(fine, but many nodes)" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:347 +#: ../src/ui/toolbar/tweak-toolbar.cpp:347 msgid "Fidelity" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:347 +#: ../src/ui/toolbar/tweak-toolbar.cpp:347 msgid "Fidelity:" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:348 +#: ../src/ui/toolbar/tweak-toolbar.cpp:348 msgid "" "Low fidelity simplifies paths; high fidelity preserves path features but may " "generate a lot of new nodes" msgstr "" -#: ../src/widgets/tweak-toolbar.cpp:367 +#: ../src/ui/toolbar/tweak-toolbar.cpp:367 msgid "Use the pressure of the input device to alter the force of tweak action" msgstr "" -- GitLab