Commit e21a5ff2 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/display/gimpscalecombobox.[ch] pass an action label to

2005-02-09  Sven Neumann  <sven@gimp.org>

	* app/display/gimpscalecombobox.[ch]
	* app/display/gimpstatusbar.c: pass an action label to
	gimp_scale_combo_box_add_action().
parent 4fac6a1f
2005-02-09 Sven Neumann <sven@gimp.org>
* app/display/gimpscalecombobox.[ch]
* app/display/gimpstatusbar.c: pass an action label to
gimp_scale_combo_box_add_action().
2005-02-09 Sven Neumann <sven@gimp.org>
* app/display/gimpscalecombobox.c: fixed brokeness introduced by
......
......@@ -315,13 +315,12 @@ gimp_scale_combo_box_new (void)
void
gimp_scale_combo_box_add_action (GimpScaleComboBox *combo_box,
GtkAction *action)
GtkAction *action,
const gchar *label)
{
GtkTreeModel *model;
GtkListStore *store;
GtkTreeIter iter;
gchar *label;
gchar *stripped_label;
g_return_if_fail (GIMP_IS_SCALE_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_ACTION (action));
......@@ -340,19 +339,13 @@ gimp_scale_combo_box_add_action (GimpScaleComboBox *combo_box,
combo_box->actions_added = TRUE;
}
g_object_get (action, "label", &label, NULL);
stripped_label = gimp_strip_uline (label);
g_free (label);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
LABEL, stripped_label,
LABEL, label,
LABEL_ALIGN, 0.0,
PERSISTENT, TRUE,
ACTION, action,
-1);
g_free (stripped_label);
}
void
......
......@@ -54,7 +54,8 @@ GType gimp_scale_combo_box_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_scale_combo_box_new (void);
void gimp_scale_combo_box_add_action (GimpScaleComboBox *combo_box,
GtkAction *action);
GtkAction *action,
const gchar *label);
void gimp_scale_combo_box_set_scale (GimpScaleComboBox *combo_box,
gdouble scale);
gdouble gimp_scale_combo_box_get_scale (GimpScaleComboBox *combo_box);
......
......@@ -422,7 +422,7 @@ gimp_statusbar_new (GimpDisplayShell *shell)
{
GimpScaleComboBox *combo = GIMP_SCALE_COMBO_BOX (statusbar->scale_combo);
gimp_scale_combo_box_add_action (combo, action);
gimp_scale_combo_box_add_action (combo, action, _("Other..."));
}
g_signal_connect_object (shell, "scaled",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment