summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-01-26 17:18:58 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-02-18 21:18:27 +0000
commit106cd424af0fec559422a6443944ed09e537d930 (patch)
tree182275be6ce6f9860aa4fb4c341574311796cc0a /src/widgets/toolbox.cpp
parentAdding styling refactoring, moving after to other branch the CSS part (diff)
downloadinkscape-106cd424af0fec559422a6443944ed09e537d930.tar.gz
inkscape-106cd424af0fec559422a6443944ed09e537d930.zip
fixing coding style and translation and merge from master
Diffstat (limited to 'src/widgets/toolbox.cpp')
-rw-r--r--src/widgets/toolbox.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 12b5c58d3..bf2736fe6 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -694,10 +694,7 @@ void ToolboxFactory::setOrientation(GtkWidget* toolbox, GtkOrientation orientati
void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
{
- setupToolboxCommon( toolbox, desktop,
- "toolbar-tool.ui",
- "/ui/ToolToolbar",
- "/toolbox/tools/small");
+ setupToolboxCommon(toolbox, desktop, "toolbar-tool.ui", "/ui/ToolToolbar", "/toolbox/tools/small");
}
void update_tool_toolbox( SPDesktop *desktop, ToolBase *eventcontext, GtkWidget * /*toolbox*/ )
@@ -931,10 +928,7 @@ void update_aux_toolbox(SPDesktop * /*desktop*/, ToolBase *eventcontext, GtkWidg
void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
{
- setupToolboxCommon( toolbox, desktop,
- "toolbar-commands.ui",
- "/ui/CommandsToolbar",
- "/toolbox/small" );
+ setupToolboxCommon(toolbox, desktop, "toolbar-commands.ui", "/ui/CommandsToolbar", "/toolbox/small");
}
void update_commands_toolbox(SPDesktop * /*desktop*/, ToolBase * /*eventcontext*/, GtkWidget * /*toolbox*/)
@@ -1245,10 +1239,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
}
- setupToolboxCommon( toolbox, desktop,
- "toolbar-snap.ui",
- "/ui/SnapToolbar",
- "/toolbox/secondary" );
+ setupToolboxCommon(toolbox, desktop, "toolbar-snap.ui", "/ui/SnapToolbar", "/toolbox/secondary");
}
Glib::ustring ToolboxFactory::getToolboxName(GtkWidget* toolbox)