diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 02:03:38 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 02:03:38 +0000 |
| commit | 0d5bb885dee83f041830dc950d3be6f21a37f08b (patch) | |
| tree | 88a0ae7a15ed496ddad1f83f43547783b88843ac /src/widgets/tweak-toolbar.cpp | |
| parent | Bug fixes (diff) | |
| parent | Add Mac CI build config (diff) | |
| download | inkscape-0d5bb885dee83f041830dc950d3be6f21a37f08b.tar.gz inkscape-0d5bb885dee83f041830dc950d3be6f21a37f08b.zip | |
update to trunk
Diffstat (limited to 'src/widgets/tweak-toolbar.cpp')
| -rw-r--r-- | src/widgets/tweak-toolbar.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp index a6b8ba436..6a2847c68 100644 --- a/src/widgets/tweak-toolbar.cpp +++ b/src/widgets/tweak-toolbar.cpp @@ -117,7 +117,7 @@ static void tweak_toggle_doo(GtkToggleAction *act, gpointer /*data*/) { void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { - Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1); + GtkIconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); { @@ -286,7 +286,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj _("Hue"), _("In color mode, act on objects' hue"), NULL, - Inkscape::ICON_SIZE_DECORATION ); + GTK_ICON_SIZE_MENU ); //TRANSLATORS: "H" here stands for hue g_object_set( act, "short_label", C_("Hue", "H"), NULL ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); @@ -302,7 +302,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj _("Saturation"), _("In color mode, act on objects' saturation"), NULL, - Inkscape::ICON_SIZE_DECORATION ); + GTK_ICON_SIZE_MENU ); //TRANSLATORS: "S" here stands for Saturation g_object_set( act, "short_label", C_("Saturation", "S"), NULL ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); @@ -318,7 +318,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj _("Lightness"), _("In color mode, act on objects' lightness"), NULL, - Inkscape::ICON_SIZE_DECORATION ); + GTK_ICON_SIZE_MENU ); //TRANSLATORS: "L" here stands for Lightness g_object_set( act, "short_label", C_("Lightness", "L"), NULL ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); @@ -334,7 +334,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj _("Opacity"), _("In color mode, act on objects' opacity"), NULL, - Inkscape::ICON_SIZE_DECORATION ); + GTK_ICON_SIZE_MENU ); //TRANSLATORS: "O" here stands for Opacity g_object_set( act, "short_label", C_("Opacity", "O"), NULL ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); @@ -372,7 +372,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj _("Pressure"), _("Use the pressure of the input device to alter the force of tweak action"), INKSCAPE_ICON("draw-use-pressure"), - Inkscape::ICON_SIZE_DECORATION ); + GTK_ICON_SIZE_MENU ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_tweak_pressure_state_changed), NULL); gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/tweak/usepressure", true) ); |