diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-02-01 20:03:54 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2017-02-01 20:03:54 +0000 |
| commit | f1ddd1e70dbd780b0620bb86682ac0b55db0afce (patch) | |
| tree | 2341a6791dac54782952195cf7b67e00de0fbe19 /src/widgets/toolbox.cpp | |
| parent | Avoid crash when opening files containing hrefs with invalid "file:" URIs (diff) | |
| download | inkscape-f1ddd1e70dbd780b0620bb86682ac0b55db0afce.tar.gz inkscape-f1ddd1e70dbd780b0620bb86682ac0b55db0afce.zip | |
Prevent display units from effecting 'line-height' unit.
Allow relative units to be saved in preferences for 'line-height'.
Fixed bugs:
- https://launchpad.net/bugs/1562217
(bzr r15462)
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 126eac9cd..f34b4625d 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -204,6 +204,7 @@ static struct { SP_VERB_CONTEXT_ERASER_PREFS, "/tools/eraser", _("TBD")}, { "/tools/lpetool", "lpetool_toolbox", 0, sp_lpetool_toolbox_prep, "LPEToolToolbar", SP_VERB_CONTEXT_LPETOOL_PREFS, "/tools/lpetool", _("TBD")}, + // If you change TextToolbar here, change it also in desktop-widget.cpp { "/tools/text", "text_toolbox", 0, sp_text_toolbox_prep, "TextToolbar", SP_VERB_INVALID, 0, 0}, { "/tools/dropper", "dropper_toolbox", 0, sp_dropper_toolbox_prep, "DropperToolbar", @@ -1428,7 +1429,7 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) auto kludge = dataHolders[aux_toolboxes[i].type_name]; auto holder = gtk_grid_new(); - gtk_widget_set_name( holder, "ToolbarHolder" ); + gtk_widget_set_name( holder, aux_toolboxes[i].ui_name ); gtk_grid_attach( GTK_GRID(holder), kludge, 2, 0, 1, 1); gchar* tmp = g_strdup_printf( "/ui/%s", aux_toolboxes[i].ui_name ); GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, tmp ); |