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

app: ellipsize most tool options combo boxes 

which means that now check/radio button labels are our biggest
width-wasters.
This commit is contained in:
Michael Natterer 2013-06-03 17:35:36 +02:00
parent 34ee988a93
commit fc0765ce16
7 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/tools/gimpalignoptions.c
View File

@ -280,6 +280,7 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
combo = gimp_prop_enum_combo_box_new (config, "align-reference", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "align-reference", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Relative to")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Relative to"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (align_vbox), combo, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (align_vbox), combo, FALSE, FALSE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);

2
app/tools/gimpcloneoptions-gui.c
View File

@ -68,6 +68,7 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
/* the source type menu */ /* the source type menu */
combo = gimp_prop_enum_combo_box_new (config, "clone-type", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "clone-type", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Source")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Source"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_frame_set_label_widget (GTK_FRAME (frame), combo); gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
gtk_widget_show (combo); gtk_widget_show (combo);
@ -100,6 +101,7 @@ gimp_clone_options_gui (GimpToolOptions *tool_options)
combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);

1
app/tools/gimphealtool.c
View File

@ -103,6 +103,7 @@ gimp_heal_options_gui (GimpToolOptions *tool_options)
/* the alignment combo */ /* the alignment combo */
combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "align-mode", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Alignment"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);

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

@ -85,6 +85,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
/* the paint mode menu */ /* the paint mode menu */
menu = gimp_prop_paint_mode_menu_new (config, "paint-mode", TRUE, FALSE); menu = gimp_prop_paint_mode_menu_new (config, "paint-mode", TRUE, FALSE);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (menu), _("Mode")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (menu), _("Mode"));
g_object_set (menu, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (vbox), menu, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu); gtk_widget_show (menu);
@ -321,6 +322,7 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
/* the repeat type */ /* the repeat type */
combo = gimp_prop_enum_combo_box_new (config, "fade-repeat", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "fade-repeat", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Repeat")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Repeat"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (inner_vbox), combo, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (inner_vbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);

1
app/tools/gimprectangleoptions.c
View File

@ -869,6 +869,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
combo = gimp_prop_enum_combo_box_new (config, "fixed-rule", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "fixed-rule", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fixed")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Fixed"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);

3
app/tools/gimptransformoptions.c
View File

@ -400,12 +400,14 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
/* the interpolation menu */ /* the interpolation menu */
combo = gimp_prop_enum_combo_box_new (config, "interpolation", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "interpolation", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Interpolation")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Interpolation"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);
/* the clipping menu */ /* the clipping menu */
combo = gimp_prop_enum_combo_box_new (config, "clip", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "clip", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Clipping")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Clipping"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
gtk_widget_show (combo); gtk_widget_show (combo);
@ -426,6 +428,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
/* the guides type menu */ /* the guides type menu */
combo = gimp_prop_enum_combo_box_new (config, "grid-type", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "grid-type", 0, 0);
gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Guides")); gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Guides"));
g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_frame_set_label_widget (GTK_FRAME (frame), combo); gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
gtk_widget_show (combo); gtk_widget_show (combo);

49
app/tools/gimpwarpoptions.c
View File

@ -161,35 +161,34 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
{ {
GObject *config = G_OBJECT (tool_options); GObject *config = G_OBJECT (tool_options);
GtkWidget *vbox = gimp_tool_options_gui (tool_options); GtkWidget *vbox = gimp_tool_options_gui (tool_options);
GtkWidget *behavior; GtkWidget *combo;
GtkWidget *strength; GtkWidget *scale;
GtkWidget *size;
GtkWidget *hardness;
behavior = gimp_prop_enum_combo_box_new (config, "behavior", 0, 0); combo = gimp_prop_enum_combo_box_new (config, "behavior", 0, 0);
gtk_box_pack_start (GTK_BOX (vbox), behavior, FALSE, FALSE, 0); g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
gtk_widget_show (behavior); gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
gtk_widget_show (combo);
strength = gimp_prop_spin_scale_new (config, "effect-strength", scale = gimp_prop_spin_scale_new (config, "effect-strength",
_("Strength"), _("Strength"),
1, 10, 1); 1, 10, 1);
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (strength), 1.0, 100.0); gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
gtk_box_pack_start (GTK_BOX (vbox), strength, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
gtk_widget_show (strength); gtk_widget_show (scale);
size = gimp_prop_spin_scale_new (config, "effect-size", scale = gimp_prop_spin_scale_new (config, "effect-size",
_("Size"), _("Size"),
0.01, 1.0, 2); 0.01, 1.0, 2);
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (size), 1.0, 1000.0); gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
gtk_box_pack_start (GTK_BOX (vbox), size, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
gtk_widget_show (size); gtk_widget_show (scale);
hardness = gimp_prop_spin_scale_new (config, "effect-hardness", scale = gimp_prop_spin_scale_new (config, "effect-hardness",
_("Hardness"), _("Hardness"),
0.01, 1.0, 2); 0.01, 1.0, 2);
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (hardness), 0.0, 1.0); gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 1.0);
gtk_box_pack_start (GTK_BOX (vbox), hardness, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
gtk_widget_show (hardness); gtk_widget_show (scale);
return vbox; return vbox;
} }