diff options
| author | Jabiertxof <jtx@jtx> | 2017-01-21 23:03:48 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-01-21 23:03:48 +0000 |
| commit | 29a2125fbad631e51c4286adf831279a7779e693 (patch) | |
| tree | cc2749bd7eaa82b6cc23aede773ba7cf9a5f7a3c /src/widgets | |
| parent | Relay LPE on widgets and optionaly write on text inputs (diff) | |
| parent | Fix "swap fill and stroke" for multiple objects in selection (diff) | |
| download | inkscape-29a2125fbad631e51c4286adf831279a7779e693.tar.gz inkscape-29a2125fbad631e51c4286adf831279a7779e693.zip | |
Update to trunk
(bzr r15356.1.14)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/eraser-toolbar.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/measure-toolbar.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index 64aace4e7..7377cdc00 100644 --- a/src/widgets/eraser-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -33,6 +33,8 @@ #include "eraser-toolbar.h" #include "calligraphy-toolbar.h" // TODO: needed for update_presets_list +#include <array> + #include "desktop.h" #include "document-undo.h" #include "widgets/ege-adjustment-action.h" diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp index a8c974bbc..066c3fbfa 100644 --- a/src/widgets/measure-toolbar.cpp +++ b/src/widgets/measure-toolbar.cpp @@ -326,7 +326,7 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G { eact = create_adjustment_action( "MeasureOffsetAction", _("Offset"), _("Offset:"), - _("The offset size"), + _("Mark dimension offset"), "/tools/measure/offset", 5.0, GTK_WIDGET(desktop->canvas), holder, FALSE, NULL, 0.0, 90000.0, 1.0, 4.0, diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 784c467f1..ba79517d2 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -337,7 +337,7 @@ static void sp_text_lineheight_unset_changed( InkToggleAction*act, GObject *tbl sp_desktop_set_style (desktop, css); sp_repr_css_attr_unref(css); - + DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_TEXT, _("Text: Unset line height.")); @@ -571,7 +571,7 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl ) static bool is_relative( Unit const *unit ) { return (unit->abbr == "" || unit->abbr == "em" || unit->abbr == "ex" || unit->abbr == "%"); } - + static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) { // quit if run by the _changed callbacks @@ -1706,7 +1706,7 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje _(tooltip.c_str()), NULL, GTK_TREE_MODEL(model_size), - 4, // Width in characters + 8, // Width in characters 0, // Extra list width NULL, // Cell layout NULL, // Separator diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 758a3125b..126eac9cd 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -362,8 +362,6 @@ static gchar const * ui_descr = " <separator />" " <toolitem action='MeasureScaleAction' />" " <separator />" - " <toolitem action='MeasureOffsetAction' />" - " <separator />" " <toolitem action='measure_units_label' />" " <toolitem action='MeasureUnitsAction' />" " <toolitem action='MeasureIgnore1stAndLast' />" @@ -373,8 +371,9 @@ static gchar const * ui_descr = " <toolitem action='MeasureReverse' />" " <toolitem action='MeasureToPhantom' />" " <toolitem action='MeasureToGuides' />" - " <toolitem action='MeasureMarkDimension' />" " <toolitem action='MeasureToItem' />" + " <toolitem action='MeasureMarkDimension' />" + " <toolitem action='MeasureOffsetAction' />" " </toolbar>" " <toolbar name='StarToolbar'>" |