Commit 1d2976f9 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/widgets/gimppropwidgets.[ch] replaced

2004-04-19  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimppropwidgets.[ch]
	* app/gui/preferences-dialog.c: replaced
	gimp_prop_boolean_option_menu_new() with
	gimp_prop_boolean_combo_box_new().
parent e2709b97
2004-04-19 Sven Neumann <sven@gimp.org>
* app/widgets/gimppropwidgets.[ch]
* app/gui/preferences-dialog.c: replaced
gimp_prop_boolean_option_menu_new() with
gimp_prop_boolean_combo_box_new().
2004-04-19 Sven Neumann <sven@gimp.org>
* app/widgets/gimpenumstore.[ch]: avoid unnecessary casts.
......
......@@ -805,18 +805,18 @@ prefs_enum_combo_box_add (GObject *config,
}
static GtkWidget *
prefs_boolean_option_menu_add (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text,
const gchar *label,
GtkTable *table,
gint table_row)
prefs_boolean_combo_box_add (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text,
const gchar *label,
GtkTable *table,
gint table_row)
{
GtkWidget *menu;
menu = gimp_prop_boolean_option_menu_new (config, property_name,
true_text, false_text);
menu = gimp_prop_boolean_combo_box_new (config, property_name,
true_text, false_text);
if (menu)
gimp_table_attach_aligned (table, 0, table_row,
......@@ -1506,11 +1506,11 @@ prefs_dialog_new (Gimp *gimp,
table = prefs_table_new (1, GTK_CONTAINER (vbox2), FALSE);
prefs_boolean_option_menu_add (object, "initial-zoom-to-fit",
_("Fit to Window"),
"1:1",
_("Inital Zoom Ratio:"),
GTK_TABLE (table), 0);
prefs_boolean_combo_box_add (object, "initial-zoom-to-fit",
_("Fit to Window"),
"1:1",
_("Inital Zoom Ratio:"),
GTK_TABLE (table), 0);
/* Pointer Movement Feedback */
vbox2 = prefs_frame_new (_("Pointer Movement Feedback"),
......@@ -1931,11 +1931,11 @@ prefs_dialog_new (Gimp *gimp,
table = prefs_table_new (2, GTK_CONTAINER (vbox2), TRUE);
prefs_boolean_option_menu_add (object, "trust-dirty-flag",
_("Only when Modified"),
_("Always"),
_("\"File -> Save\" Saves the Image:"),
GTK_TABLE (table), 0);
prefs_boolean_combo_box_add (object, "trust-dirty-flag",
_("Only when Modified"),
_("Always"),
_("\"File -> Save\" Saves the Image:"),
GTK_TABLE (table), 0);
prefs_enum_combo_box_add (object, "thumbnail-size", 0, 0,
_("Size of Thumbnail Files:"),
GTK_TABLE (table), 1);
......
......@@ -805,18 +805,18 @@ prefs_enum_combo_box_add (GObject *config,
}
static GtkWidget *
prefs_boolean_option_menu_add (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text,
const gchar *label,
GtkTable *table,
gint table_row)
prefs_boolean_combo_box_add (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text,
const gchar *label,
GtkTable *table,
gint table_row)
{
GtkWidget *menu;
menu = gimp_prop_boolean_option_menu_new (config, property_name,
true_text, false_text);
menu = gimp_prop_boolean_combo_box_new (config, property_name,
true_text, false_text);
if (menu)
gimp_table_attach_aligned (table, 0, table_row,
......@@ -1506,11 +1506,11 @@ prefs_dialog_new (Gimp *gimp,
table = prefs_table_new (1, GTK_CONTAINER (vbox2), FALSE);
prefs_boolean_option_menu_add (object, "initial-zoom-to-fit",
_("Fit to Window"),
"1:1",
_("Inital Zoom Ratio:"),
GTK_TABLE (table), 0);
prefs_boolean_combo_box_add (object, "initial-zoom-to-fit",
_("Fit to Window"),
"1:1",
_("Inital Zoom Ratio:"),
GTK_TABLE (table), 0);
/* Pointer Movement Feedback */
vbox2 = prefs_frame_new (_("Pointer Movement Feedback"),
......@@ -1931,11 +1931,11 @@ prefs_dialog_new (Gimp *gimp,
table = prefs_table_new (2, GTK_CONTAINER (vbox2), TRUE);
prefs_boolean_option_menu_add (object, "trust-dirty-flag",
_("Only when Modified"),
_("Always"),
_("\"File -> Save\" Saves the Image:"),
GTK_TABLE (table), 0);
prefs_boolean_combo_box_add (object, "trust-dirty-flag",
_("Only when Modified"),
_("Always"),
_("\"File -> Save\" Saves the Image:"),
GTK_TABLE (table), 0);
prefs_enum_combo_box_add (object, "thumbnail-size", 0, 0,
_("Size of Thumbnail Files:"),
GTK_TABLE (table), 1);
......
......@@ -380,27 +380,29 @@ gimp_prop_enum_combo_box_notify (GObject *config,
}
/******************/
/* option menus */
/******************/
/************************/
/* boolean combo box */
/************************/
static void gimp_prop_boolean_combo_box_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_boolean_combo_box_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *widget);
static void gimp_prop_option_menu_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_option_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu);
GtkWidget *
gimp_prop_paint_mode_menu_new (GObject *config,
const gchar *property_name,
gboolean with_behind_mode)
gimp_prop_boolean_combo_box_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text)
{
GParamSpec *param_spec;
GtkWidget *menu;
gint value;
GtkWidget *combo_box;
gboolean value;
param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC);
G_TYPE_PARAM_BOOLEAN, G_STRLOC);
if (! param_spec)
return NULL;
......@@ -408,33 +410,80 @@ gimp_prop_paint_mode_menu_new (GObject *config,
property_name, &value,
NULL);
menu = gimp_paint_mode_menu_new (G_CALLBACK (gimp_prop_option_menu_callback),
config,
with_behind_mode,
value);
combo_box = gtk_combo_box_new_text ();
set_param_spec (G_OBJECT (menu), menu, param_spec);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), true_text);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), false_text);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), value ? 0 : 1);
g_signal_connect (combo_box, "changed",
G_CALLBACK (gimp_prop_boolean_combo_box_callback),
config);
set_param_spec (G_OBJECT (combo_box), combo_box, param_spec);
connect_notify (config, property_name,
G_CALLBACK (gimp_prop_option_menu_notify),
menu);
G_CALLBACK (gimp_prop_boolean_combo_box_notify),
combo_box);
return menu;
return combo_box;
}
static void
gimp_prop_boolean_combo_box_callback (GtkWidget *widget,
GObject *config)
{
GParamSpec *param_spec;
gint value;
param_spec = get_param_spec (G_OBJECT (widget));
if (! param_spec)
return;
value = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
g_object_set (config,
param_spec->name, value ? FALSE : TRUE,
NULL);
}
static void
gimp_prop_boolean_combo_box_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *combo_box)
{
gint value;
g_object_get (config,
param_spec->name, &value,
NULL);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), value ? 0 : 1);
}
/****************/
/* paint menu */
/****************/
static void gimp_prop_paint_menu_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_paint_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu);
GtkWidget *
gimp_prop_boolean_option_menu_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text)
gimp_prop_paint_mode_menu_new (GObject *config,
const gchar *property_name,
gboolean with_behind_mode)
{
GParamSpec *param_spec;
GtkWidget *menu;
gboolean value;
gint value;
param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC);
G_TYPE_PARAM_ENUM, G_STRLOC);
if (! param_spec)
return NULL;
......@@ -442,28 +491,23 @@ gimp_prop_boolean_option_menu_new (GObject *config,
property_name, &value,
NULL);
menu =
gimp_int_option_menu_new (FALSE,
G_CALLBACK (gimp_prop_option_menu_callback),
config, value,
true_text, TRUE, NULL,
false_text, FALSE, NULL,
NULL);
menu = gimp_paint_mode_menu_new (G_CALLBACK (gimp_prop_paint_menu_callback),
config,
with_behind_mode,
value);
set_param_spec (G_OBJECT (menu), menu, param_spec);
connect_notify (config, property_name,
G_CALLBACK (gimp_prop_option_menu_notify),
G_CALLBACK (gimp_prop_paint_menu_notify),
menu);
return menu;
}
static void
gimp_prop_option_menu_callback (GtkWidget *widget,
GObject *config)
gimp_prop_paint_menu_callback (GtkWidget *widget,
GObject *config)
{
if (GTK_IS_MENU (widget->parent))
{
......@@ -491,9 +535,9 @@ gimp_prop_option_menu_callback (GtkWidget *widget,
}
static void
gimp_prop_option_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu)
gimp_prop_paint_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu)
{
gint value;
......
......@@ -28,7 +28,7 @@
GtkWidget * gimp_prop_check_button_new (GObject *config,
const gchar *property_name,
const gchar *label);
GtkWidget * gimp_prop_boolean_option_menu_new (GObject *config,
GtkWidget * gimp_prop_boolean_combo_box_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text);
......
......@@ -380,27 +380,29 @@ gimp_prop_enum_combo_box_notify (GObject *config,
}
/******************/
/* option menus */
/******************/
/************************/
/* boolean combo box */
/************************/
static void gimp_prop_boolean_combo_box_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_boolean_combo_box_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *widget);
static void gimp_prop_option_menu_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_option_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu);
GtkWidget *
gimp_prop_paint_mode_menu_new (GObject *config,
const gchar *property_name,
gboolean with_behind_mode)
gimp_prop_boolean_combo_box_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text)
{
GParamSpec *param_spec;
GtkWidget *menu;
gint value;
GtkWidget *combo_box;
gboolean value;
param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_ENUM, G_STRLOC);
G_TYPE_PARAM_BOOLEAN, G_STRLOC);
if (! param_spec)
return NULL;
......@@ -408,33 +410,80 @@ gimp_prop_paint_mode_menu_new (GObject *config,
property_name, &value,
NULL);
menu = gimp_paint_mode_menu_new (G_CALLBACK (gimp_prop_option_menu_callback),
config,
with_behind_mode,
value);
combo_box = gtk_combo_box_new_text ();
set_param_spec (G_OBJECT (menu), menu, param_spec);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), true_text);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), false_text);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), value ? 0 : 1);
g_signal_connect (combo_box, "changed",
G_CALLBACK (gimp_prop_boolean_combo_box_callback),
config);
set_param_spec (G_OBJECT (combo_box), combo_box, param_spec);
connect_notify (config, property_name,
G_CALLBACK (gimp_prop_option_menu_notify),
menu);
G_CALLBACK (gimp_prop_boolean_combo_box_notify),
combo_box);
return menu;
return combo_box;
}
static void
gimp_prop_boolean_combo_box_callback (GtkWidget *widget,
GObject *config)
{
GParamSpec *param_spec;
gint value;
param_spec = get_param_spec (G_OBJECT (widget));
if (! param_spec)
return;
value = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
g_object_set (config,
param_spec->name, value ? FALSE : TRUE,
NULL);
}
static void
gimp_prop_boolean_combo_box_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *combo_box)
{
gint value;
g_object_get (config,
param_spec->name, &value,
NULL);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), value ? 0 : 1);
}
/****************/
/* paint menu */
/****************/
static void gimp_prop_paint_menu_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_paint_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu);
GtkWidget *
gimp_prop_boolean_option_menu_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text)
gimp_prop_paint_mode_menu_new (GObject *config,
const gchar *property_name,
gboolean with_behind_mode)
{
GParamSpec *param_spec;
GtkWidget *menu;
gboolean value;
gint value;
param_spec = check_param_spec (config, property_name,
G_TYPE_PARAM_BOOLEAN, G_STRLOC);
G_TYPE_PARAM_ENUM, G_STRLOC);
if (! param_spec)
return NULL;
......@@ -442,28 +491,23 @@ gimp_prop_boolean_option_menu_new (GObject *config,
property_name, &value,
NULL);
menu =
gimp_int_option_menu_new (FALSE,
G_CALLBACK (gimp_prop_option_menu_callback),
config, value,
true_text, TRUE, NULL,
false_text, FALSE, NULL,
NULL);
menu = gimp_paint_mode_menu_new (G_CALLBACK (gimp_prop_paint_menu_callback),
config,
with_behind_mode,
value);
set_param_spec (G_OBJECT (menu), menu, param_spec);
connect_notify (config, property_name,
G_CALLBACK (gimp_prop_option_menu_notify),
G_CALLBACK (gimp_prop_paint_menu_notify),
menu);
return menu;
}
static void
gimp_prop_option_menu_callback (GtkWidget *widget,
GObject *config)
gimp_prop_paint_menu_callback (GtkWidget *widget,
GObject *config)
{
if (GTK_IS_MENU (widget->parent))
{
......@@ -491,9 +535,9 @@ gimp_prop_option_menu_callback (GtkWidget *widget,
}
static void
gimp_prop_option_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu)
gimp_prop_paint_menu_notify (GObject *config,
GParamSpec *param_spec,
GtkWidget *menu)
{
gint value;
......
......@@ -28,7 +28,7 @@
GtkWidget * gimp_prop_check_button_new (GObject *config,
const gchar *property_name,
const gchar *label);
GtkWidget * gimp_prop_boolean_option_menu_new (GObject *config,
GtkWidget * gimp_prop_boolean_combo_box_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text);
......
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