dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: coding style and tooltip fixes

This commit is contained in:
Michael Natterer 2014-11-15 22:23:14 +01:00
parent 78120dcb87
commit 0aaee2a0e0
1 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
app/tools/gimppaintoptions-gui.c
View File

@ -67,17 +67,18 @@ static GtkWidget * jitter_options_gui (GimpPaintOptions *paint_options,
GType tool_type); GType tool_type);
static GtkWidget * smoothing_options_gui (GimpPaintOptions *paint_options, static GtkWidget * smoothing_options_gui (GimpPaintOptions *paint_options,
GType tool_type); GType tool_type);
static GtkWidget * gimp_paint_options_gui_scale_with_reset_button static GtkWidget * gimp_paint_options_gui_scale_with_reset_button
(GObject *config, (GObject *config,
gchar *prop_name, gchar *prop_name,
gchar *prop_descr, gchar *prop_descr,
gchar *reset_tooltip, gchar *reset_tooltip,
gdouble minor_step, gdouble step_increment,
gdouble major_step, gdouble page_increment,
gdouble min, gdouble scale_min,
gdouble max, gdouble scale_max,
gdouble gamma, gdouble gamma,
GCallback callback); GCallback reset_callback);
/* public functions */ /* public functions */
@ -143,39 +144,35 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button); gtk_widget_show (button);
/*Size spinner*/
hbox = gimp_paint_options_gui_scale_with_reset_button hbox = gimp_paint_options_gui_scale_with_reset_button
(config, "brush-size", _("Size"), (config, "brush-size", _("Size"),
_("Reset size to brush's native size"), _("Reset size to brush's native size"),
1.0, 10.0, 1.0, 1000.0, 1.7, 1.0, 10.0, 1.0, 1000.0, 1.7,
G_CALLBACK (gimp_paint_options_gui_reset_size)); G_CALLBACK (gimp_paint_options_gui_reset_size));
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
/*Aspect ratio spinner*/
hbox = gimp_paint_options_gui_scale_with_reset_button hbox = gimp_paint_options_gui_scale_with_reset_button
(config, "brush-aspect-ratio", _("Aspect Ratio"), (config, "brush-aspect-ratio", _("Aspect Ratio"),
_("Reset size to brush's native size"), _("Reset aspect ratio to brush's native"),
0.1, 1.0, -20.0, 20.0, 1.0, 0.1, 1.0, -20.0, 20.0, 1.0,
G_CALLBACK (gimp_paint_options_gui_reset_aspect_ratio)); G_CALLBACK (gimp_paint_options_gui_reset_aspect_ratio));
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
/*Brush angle spinner*/
hbox = gimp_paint_options_gui_scale_with_reset_button hbox = gimp_paint_options_gui_scale_with_reset_button
(config, "brush-angle", _("Angle"), (config, "brush-angle", _("Angle"),
_("Reset angle to zero"), _("Reset angle to zero"),
0.1, 1.0, -180.0, 180.0, 1.0, 0.1, 1.0, -180.0, 180.0, 1.0,
G_CALLBACK (gimp_paint_options_gui_reset_angle)); G_CALLBACK (gimp_paint_options_gui_reset_angle));
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
/*Brush spacing spinner*/
hbox = gimp_paint_options_gui_scale_with_reset_button hbox = gimp_paint_options_gui_scale_with_reset_button
(config, "brush-spacing", _("Spacing"), (config, "brush-spacing", _("Spacing"),
_("Reset spacing to zero"), _("Reset spacing to brush's native spacing"),
0.1, 1.0, 1.0, 200.0, 1.7, 0.1, 1.0, 1.0, 200.0, 1.7,
G_CALLBACK (gimp_paint_options_gui_reset_spacing)); G_CALLBACK (gimp_paint_options_gui_reset_spacing));
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
@ -420,40 +417,41 @@ gimp_paint_options_gui_scale_with_reset_button (GObject *config,
gchar *prop_name, gchar *prop_name,
gchar *prop_descr, gchar *prop_descr,
gchar *reset_tooltip, gchar *reset_tooltip,
gdouble minor_step, gdouble step_increment,
gdouble major_step, gdouble page_increment,
gdouble min, gdouble scale_min,
gdouble max, gdouble scale_max,
gdouble gamma, gdouble gamma,
GCallback callback) GCallback reset_callback)
{ {
GtkWidget *scale; GtkWidget *scale;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *button; GtkWidget *button;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
scale = gimp_prop_spin_scale_new (config, prop_name, scale = gimp_prop_spin_scale_new (config, prop_name,
prop_descr, prop_descr,
minor_step, major_step, 2); step_increment, page_increment, 2);
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), min, max); gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale),
gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), gamma); scale_min, scale_max);
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gimp_spin_scale_set_gamma (GIMP_SPIN_SCALE (scale), gamma);
gtk_widget_show (scale); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_widget_show (scale);
button = gimp_icon_button_new (GIMP_STOCK_RESET, NULL); button = gimp_icon_button_new (GIMP_STOCK_RESET, NULL);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
gtk_image_set_from_icon_name (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (button))), gtk_image_set_from_icon_name (GTK_IMAGE (gtk_bin_get_child (GTK_BIN (button))),
GIMP_STOCK_RESET, GTK_ICON_SIZE_MENU); GIMP_STOCK_RESET, GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button); gtk_widget_show (button);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
callback, reset_callback,
config); config);
gimp_help_set_help_data (button, gimp_help_set_help_data (button,
reset_tooltip, NULL); reset_tooltip, NULL);
return hbox; return hbox;
} }