applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Patch by: Priit Laes <amd@store20.com>

Browse source 
2007-04-16  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Priit Laes <amd@store20.com>

	* gnome-background-properties.glade:
	* gnome-wp-capplet.c: (gnome_wp_option_menu_set),
	(gnome_wp_scale_type_changed), (gnome_wp_shade_type_changed),
	(wallpaper_properties_init): replace deprecated GtkOptionMenu with
	GtkComboBox (closes bug #421199)

svn path=/trunk/; revision=7472
This commit is contained in:
Jens Granseuer 2007-04-16 18:20:06 +00:00 • committed by Jens Granseuer
parent 25fe0c1319
commit ef714f2d83
3 changed files with 38 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
capplets/background/ChangeLog
View file

@ -1,3 +1,13 @@
2007-04-16 Jens Granseuer <jensgr@gmx.net>
Patch by: Priit Laes <amd@store20.com>
* gnome-background-properties.glade:
* gnome-wp-capplet.c: (gnome_wp_option_menu_set),
(gnome_wp_scale_type_changed), (gnome_wp_shade_type_changed),
(wallpaper_properties_init): replace deprecated GtkOptionMenu with
GtkComboBox (closes bug #421199)
2007-04-16 Jens Granseuer <jensgr@gmx.net> 2007-04-16 Jens Granseuer <jensgr@gmx.net>
* gnome-wp-capplet.c: (gnome_wp_load_stuffs): don't crash if the * gnome-wp-capplet.c: (gnome_wp_load_stuffs): don't crash if the

15
capplets/background/gnome-background-properties.glade
View file

@ -286,7 +286,6 @@
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
<property name="mnemonic_widget">style_menu</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property> <property name="width_chars">-1</property>
<property name="single_line_mode">False</property> <property name="single_line_mode">False</property>
@ -300,10 +299,11 @@
</child> </child>
<child> <child>
<widget class="GtkOptionMenu" id="style_menu"> <widget class="GtkComboBox" id="style_menu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="items"></property>
<property name="history">-1</property> <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
@ -475,10 +475,11 @@
</child> </child>
<child> <child>
<widget class="GtkOptionMenu" id="color_menu"> <widget class="GtkComboBox" id="color_menu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="items"></property>
<property name="history">-1</property> <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>

85
capplets/background/gnome-wp-capplet.c
View file

@ -227,52 +227,38 @@ static void wp_props_load_wallpaper (gchar * key,
gtk_tree_path_free (path); gtk_tree_path_free (path);
} }
static gint gnome_wp_option_menu_get (GtkOptionMenu * menu) {
GtkWidget * widget;
g_return_val_if_fail (GTK_IS_OPTION_MENU (menu), -1);
widget = gtk_menu_get_active (GTK_MENU (menu->menu));
if (widget != NULL) {
return g_list_index (GTK_MENU_SHELL (menu->menu)->children, widget);
}
return -1;
}
static void gnome_wp_option_menu_set (GnomeWPCapplet * capplet, static void gnome_wp_option_menu_set (GnomeWPCapplet * capplet,
const gchar * value, const gchar * value,
gboolean shade_type) { gboolean shade_type) {
if (shade_type) { if (shade_type) {
if (!strcmp (value, "horizontal-gradient")) { if (!strcmp (value, "horizontal-gradient")) {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->color_opt), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->color_opt),
GNOME_WP_SHADE_TYPE_HORIZ); GNOME_WP_SHADE_TYPE_HORIZ);
gtk_widget_show (capplet->sc_picker); gtk_widget_show (capplet->sc_picker);
} else if (!strcmp (value, "vertical-gradient")) { } else if (!strcmp (value, "vertical-gradient")) {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->color_opt), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->color_opt),
GNOME_WP_SHADE_TYPE_VERT); GNOME_WP_SHADE_TYPE_VERT);
gtk_widget_show (capplet->sc_picker); gtk_widget_show (capplet->sc_picker);
} else { } else {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->color_opt), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->color_opt),
GNOME_WP_SHADE_TYPE_SOLID); GNOME_WP_SHADE_TYPE_SOLID);
gtk_widget_hide (capplet->sc_picker); gtk_widget_hide (capplet->sc_picker);
} }
} else { } else {
if (!strcmp (value, "centered")) { if (!strcmp (value, "centered")) {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->wp_opts), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->wp_opts),
GNOME_WP_SCALE_TYPE_CENTERED); GNOME_WP_SCALE_TYPE_CENTERED);
} else if (!strcmp (value, "stretched")) { } else if (!strcmp (value, "stretched")) {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->wp_opts), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->wp_opts),
GNOME_WP_SCALE_TYPE_STRETCHED); GNOME_WP_SCALE_TYPE_STRETCHED);
} else if (!strcmp (value, "scaled")) { } else if (!strcmp (value, "scaled")) {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->wp_opts), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->wp_opts),
GNOME_WP_SCALE_TYPE_SCALED); GNOME_WP_SCALE_TYPE_SCALED);
} else if (!strcmp (value, "zoom")) { } else if (!strcmp (value, "zoom")) {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->wp_opts), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->wp_opts),
GNOME_WP_SCALE_TYPE_ZOOM); GNOME_WP_SCALE_TYPE_ZOOM);
} else if (strcmp (value, "none") != 0) { } else if (strcmp (value, "none") != 0) {
gtk_option_menu_set_history (GTK_OPTION_MENU (capplet->wp_opts), gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->wp_opts),
GNOME_WP_SCALE_TYPE_TILED); GNOME_WP_SCALE_TYPE_TILED);
} }
} }
@ -403,7 +389,7 @@ static void wallpaper_properties_clicked (GtkWidget * dialog,
} }
} }
static void gnome_wp_scale_type_changed (GtkOptionMenu * option_menu, static void gnome_wp_scale_type_changed (GtkComboBox* combobox,
GnomeWPCapplet * capplet) { GnomeWPCapplet * capplet) {
GnomeWPItem * item = NULL; GnomeWPItem * item = NULL;
GdkPixbuf * pixbuf; GdkPixbuf * pixbuf;
@ -427,7 +413,7 @@ static void gnome_wp_scale_type_changed (GtkOptionMenu * option_menu,
g_free (item->options); g_free (item->options);
switch (gnome_wp_option_menu_get (GTK_OPTION_MENU (capplet->wp_opts))) { switch (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->wp_opts))) {
case GNOME_WP_SCALE_TYPE_CENTERED: case GNOME_WP_SCALE_TYPE_CENTERED:
item->options = g_strdup ("centered"); item->options = g_strdup ("centered");
break; break;
@ -454,7 +440,7 @@ static void gnome_wp_scale_type_changed (GtkOptionMenu * option_menu,
item->options, NULL); item->options, NULL);
} }
static void gnome_wp_shade_type_changed (GtkOptionMenu * option_menu, static void gnome_wp_shade_type_changed (GtkWidget* combobox,
GnomeWPCapplet * capplet) { GnomeWPCapplet * capplet) {
GnomeWPItem * item = NULL; GnomeWPItem * item = NULL;
GtkTreeIter iter; GtkTreeIter iter;
@ -478,7 +464,7 @@ static void gnome_wp_shade_type_changed (GtkOptionMenu * option_menu,
g_free (item->shade_type); g_free (item->shade_type);
switch (gnome_wp_option_menu_get (GTK_OPTION_MENU (capplet->color_opt))) { switch (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->color_opt))) {
case GNOME_WP_SHADE_TYPE_HORIZ: case GNOME_WP_SHADE_TYPE_HORIZ:
item->shade_type = g_strdup ("horizontal-gradient"); item->shade_type = g_strdup ("horizontal-gradient");
gtk_widget_show (capplet->sc_picker); gtk_widget_show (capplet->sc_picker);
@ -854,8 +840,6 @@ static void gnome_wp_update_preview (GtkFileChooser *chooser,
static void wallpaper_properties_init (void) { static void wallpaper_properties_init (void) {
GnomeWPCapplet * capplet; GnomeWPCapplet * capplet;
GladeXML * dialog; GladeXML * dialog;
GtkWidget * menu;
GtkWidget * mitem;
GtkWidget * add_button; GtkWidget * add_button;
GtkCellRenderer * renderer; GtkCellRenderer * renderer;
GtkTreeViewColumn * column; GtkTreeViewColumn * column;
@ -954,29 +938,11 @@ static void wallpaper_properties_init (void) {
capplet->wp_opts = glade_xml_get_widget (dialog, "style_menu"); capplet->wp_opts = glade_xml_get_widget (dialog, "style_menu");
menu = gtk_menu_new (); gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->wp_opts), _("Centered"));
gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->wp_opts), _("Fill Screen"));
mitem = gtk_menu_item_new_with_label (_("Centered")); gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->wp_opts), _("Scaled"));
gtk_menu_append (GTK_MENU (menu), mitem); gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->wp_opts), _("Zoom"));
gtk_widget_show (mitem); gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->wp_opts), _("Tiled"));
mitem = gtk_menu_item_new_with_label (_("Fill Screen"));
gtk_menu_append (GTK_MENU (menu), mitem);
gtk_widget_show (mitem);
mitem = gtk_menu_item_new_with_label (_("Scaled"));
gtk_menu_append (GTK_MENU (menu), mitem);
gtk_widget_show (mitem);
mitem = gtk_menu_item_new_with_label (_("Zoom"));
gtk_menu_append (GTK_MENU (menu), mitem);
gtk_widget_show (mitem);
mitem = gtk_menu_item_new_with_label (_("Tiled"));
gtk_menu_append (GTK_MENU (menu), mitem);
gtk_widget_show (mitem);
gtk_option_menu_set_menu (GTK_OPTION_MENU (capplet->wp_opts), menu);
g_signal_connect (G_OBJECT (capplet->wp_opts), "changed", g_signal_connect (G_OBJECT (capplet->wp_opts), "changed",
G_CALLBACK (gnome_wp_scale_type_changed), capplet); G_CALLBACK (gnome_wp_scale_type_changed), capplet);
@ -991,21 +957,10 @@ static void wallpaper_properties_init (void) {
capplet->color_opt = glade_xml_get_widget (dialog, "color_menu"); capplet->color_opt = glade_xml_get_widget (dialog, "color_menu");
menu = gtk_menu_new (); gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->color_opt), _("Solid Color"));
gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->color_opt), _("Horizontal Gradient"));
gtk_combo_box_append_text (GTK_COMBO_BOX (capplet->color_opt), _("Vertical Gradient"));
mitem = gtk_menu_item_new_with_label (_("Solid Color"));
gtk_menu_append (GTK_MENU (menu), mitem);
gtk_widget_show (mitem);
mitem = gtk_menu_item_new_with_label (_("Horizontal Gradient"));
gtk_menu_append (GTK_MENU (menu), mitem);
gtk_widget_show (mitem);
mitem = gtk_menu_item_new_with_label (_("Vertical Gradient"));
gtk_menu_append (GTK_MENU (menu), mitem);
gtk_widget_show (mitem);
gtk_option_menu_set_menu (GTK_OPTION_MENU (capplet->color_opt), menu);
g_signal_connect (G_OBJECT (capplet->color_opt), "changed", g_signal_connect (G_OBJECT (capplet->color_opt), "changed",
G_CALLBACK (gnome_wp_shade_type_changed), capplet); G_CALLBACK (gnome_wp_shade_type_changed), capplet);