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

move some strings to glade file, don't leak the file selector, plus a few

Browse source 
2007-05-12  Jens Granseuer  <jensgr@gmx.net>

	* appearance-desktop.c: (get_selected_item),
	(wp_tree_delete_event), (wp_update_preview), (desktop_init):
	* appearance.glade: move some strings to glade file, don't leak the
	file selector, plus a few minor beautifications

svn path=/trunk/; revision=7595
This commit is contained in:
Jens Granseuer 2007-05-11 22:04:03 +00:00 • committed by Jens Granseuer
parent 8e26b48607
commit 6670dd1029
3 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/appearance/ChangeLog
View file

@ -1,3 +1,10 @@
2007-05-12 Jens Granseuer <jensgr@gmx.net>
* appearance-desktop.c: (get_selected_item),
(wp_tree_delete_event), (wp_update_preview), (desktop_init):
* appearance.glade: move some strings to glade file, don't leak the
file selector, plus a few minor beautifications
2007-05-11 Denis Washington <denisw@svn.nome.org> 2007-05-11 Denis Washington <denisw@svn.nome.org>
* appearance-desktop.c: (desktop_init): * appearance-desktop.c: (desktop_init):

25
capplets/appearance/appearance-desktop.c
View file

@ -58,9 +58,7 @@ static GtkTargetEntry drop_types[] = {
{ "property/bgimage", 0, TARGET_BGIMAGE }, { "property/bgimage", 0, TARGET_BGIMAGE },
/* { "x-special/gnome-reset-background", 0, TARGET_BACKGROUND_RESET }*/ /* { "x-special/gnome-reset-background", 0, TARGET_BACKGROUND_RESET }*/
}; };
static GnomeWPItem *
get_selected_item (AppearanceData *data,
GtkTreeIter *iter);
static void static void
scroll_to_item (AppearanceData *data, scroll_to_item (AppearanceData *data,
GnomeWPItem * item) GnomeWPItem * item)
@ -96,6 +94,9 @@ get_selected_item (AppearanceData *data,
gtk_tree_model_get_iter (data->wp_model, &sel_iter, gtk_tree_model_get_iter (data->wp_model, &sel_iter,
selected->data); selected->data);
g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
g_list_free (selected);
if (iter) if (iter)
*iter = sel_iter; *iter = sel_iter;
@ -105,9 +106,6 @@ get_selected_item (AppearanceData *data,
g_free (wpfile); g_free (wpfile);
} }
g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
g_list_free (selected);
return item; return item;
} }
@ -688,6 +686,8 @@ wp_tree_delete_event (GtkWidget *widget,
{ {
gnome_wp_xml_save_list (data); gnome_wp_xml_save_list (data);
g_object_unref (data->wp_thumbs); g_object_unref (data->wp_thumbs);
g_object_ref_sink (data->wp_filesel);
g_object_unref (data->wp_filesel);
} }
static void static void
@ -784,6 +784,7 @@ wp_update_preview (GtkFileChooser *chooser,
pixbuf = gnome_thumbnail_factory_generate_thumbnail (data->wp_thumbs, pixbuf = gnome_thumbnail_factory_generate_thumbnail (data->wp_thumbs,
uri, uri,
mime_type); mime_type);
g_free (mime_type);
} }
if (pixbuf != NULL) if (pixbuf != NULL)
@ -797,8 +798,6 @@ wp_update_preview (GtkFileChooser *chooser,
"gtk-dialog-question", "gtk-dialog-question",
GTK_ICON_SIZE_DIALOG); GTK_ICON_SIZE_DIALOG);
} }
g_free (mime_type);
} }
gtk_file_chooser_set_preview_widget_active (chooser, TRUE); gtk_file_chooser_set_preview_widget_active (chooser, TRUE);
@ -971,21 +970,11 @@ desktop_init (AppearanceData *data)
data->wp_style_menu = glade_xml_get_widget (data->xml, "wp_style_menu"); data->wp_style_menu = glade_xml_get_widget (data->xml, "wp_style_menu");
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Centered"));
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Fill screen"));
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Scaled"));
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Zoom"));
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_style_menu), _("Tiled"));
g_signal_connect (G_OBJECT (data->wp_style_menu), "changed", g_signal_connect (G_OBJECT (data->wp_style_menu), "changed",
G_CALLBACK (wp_scale_type_changed), data); G_CALLBACK (wp_scale_type_changed), data);
data->wp_color_menu = glade_xml_get_widget (data->xml, "wp_color_menu"); data->wp_color_menu = glade_xml_get_widget (data->xml, "wp_color_menu");
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Solid color"));
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Horizontal gradient"));
gtk_combo_box_append_text (GTK_COMBO_BOX (data->wp_color_menu), _("Vertical gradient"));
g_signal_connect (G_OBJECT (data->wp_color_menu), "changed", g_signal_connect (G_OBJECT (data->wp_color_menu), "changed",
G_CALLBACK (wp_shade_type_changed), data); G_CALLBACK (wp_shade_type_changed), data);

10
capplets/appearance/appearance.glade
View file

@ -1133,7 +1133,11 @@
<child> <child>
<widget class="GtkComboBox" id="wp_style_menu"> <widget class="GtkComboBox" id="wp_style_menu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="items" translatable="yes"></property> <property name="items" translatable="yes">Centered
Fill screen
Scaled
Zoom
Tiled</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1237,7 +1241,9 @@
<child> <child>
<widget class="GtkComboBox" id="wp_color_menu"> <widget class="GtkComboBox" id="wp_color_menu">
<property name="visible">True</property> <property name="visible">True</property>
<property name="items" translatable="yes"></property> <property name="items" translatable="yes">Solid color
Horizontal gradient
Vertical gradient</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>