From 347006e0d8c36374060abc1d69e22c238ec1eda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Crozat?= Date: Fri, 20 Aug 2004 16:50:57 +0000 Subject: [PATCH] Use themed icons for WM hint. --- capplets/accessibility/at-properties/ChangeLog | 5 +++++ capplets/accessibility/at-properties/main.c | 2 +- capplets/accessibility/keyboard/ChangeLog | 5 +++++ .../keyboard/gnome-accessibility-keyboard-properties.c | 2 +- capplets/background/ChangeLog | 6 ++++++ capplets/background/gnome-wp-capplet.c | 4 ++-- capplets/default-applications/ChangeLog | 5 +++++ .../gnome-default-applications-properties.c | 2 +- capplets/font/ChangeLog | 5 +++++ capplets/font/main.c | 2 +- capplets/keybindings/ChangeLog | 5 +++++ capplets/keybindings/gnome-keybinding-properties.c | 2 +- capplets/keyboard/ChangeLog | 5 +++++ capplets/keyboard/gnome-keyboard-properties.c | 2 +- capplets/mouse/ChangeLog | 5 +++++ capplets/mouse/gnome-mouse-properties.c | 2 +- capplets/sound/.cvsignore | 1 + capplets/sound/ChangeLog | 8 ++++++++ capplets/sound/sound-properties-capplet.c | 2 +- capplets/theme-switcher/ChangeLog | 7 +++++++ capplets/theme-switcher/gnome-theme-details.c | 2 +- capplets/theme-switcher/gnome-theme-manager.c | 2 +- capplets/theme-switcher/theme-switcher.c | 2 +- capplets/ui-properties/ChangeLog | 5 +++++ capplets/ui-properties/gnome-ui-properties.c | 2 +- capplets/windows/ChangeLog | 5 +++++ capplets/windows/gnome-window-properties.c | 2 +- 27 files changed, 82 insertions(+), 15 deletions(-) diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog index 3c01edacd..c5e168108 100644 --- a/capplets/accessibility/at-properties/ChangeLog +++ b/capplets/accessibility/at-properties/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * main.c: (setup_dialog): + Use themed icon for window hint. + 2004-04-15 Jody Goldberg * Release 2.6.1 diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c index 570339ede..98cd8ac17 100644 --- a/capplets/accessibility/at-properties/main.c +++ b/capplets/accessibility/at-properties/main.c @@ -257,7 +257,7 @@ setup_dialog (GladeXML *dialog) dialog); widget = WID ("at_properties_dialog"); - capplet_set_icon (widget, "at-enable-capplet.png"); + capplet_set_icon (widget, "gnome-settings-accessibility-technologies"); g_signal_connect (G_OBJECT (widget), "response", diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog index 77f0e1573..6544f8a16 100644 --- a/capplets/accessibility/keyboard/ChangeLog +++ b/capplets/accessibility/keyboard/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * gnome-accessibility-keyboard-properties.c: (main): + Use themed icon for window hint. + 2004-07-06 Padraig O'Briain * gnome-accessibility-keyboard-properties.glade: Add label-for/ diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c index afe621066..8646e3d69 100644 --- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c +++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c @@ -108,7 +108,7 @@ main (int argc, char **argv) g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (dialog_response), changeset); - capplet_set_icon (dialog, "accessibility-keyboard-capplet.png"); + capplet_set_icon (dialog, "gnome-settings-accessibility-keyboard"); gtk_widget_show_all (dialog); gtk_main (); diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index fad75181c..709b3a91e 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,9 @@ +2004-08-20 Frederic Crozat + + * gnome-wp-capplet.c: (gnome_wp_icon_theme_changed), + (wallpaper_properties_init): + Use themed icon for window hint. + 2004-08-16 Rodney Dawes * gnome-wp-capplet.c (wallpaper_properties_clicked): diff --git a/capplets/background/gnome-wp-capplet.c b/capplets/background/gnome-wp-capplet.c index f1a556333..787b4e00f 100644 --- a/capplets/background/gnome-wp-capplet.c +++ b/capplets/background/gnome-wp-capplet.c @@ -821,7 +821,7 @@ static void gnome_wp_icon_theme_changed (GnomeIconTheme * theme, gchar * icofile; icofile = gnome_icon_theme_lookup_icon (capplet->theme, - "background-capplet", + "gnome-settings-background", 48, NULL, NULL); if (icofile != NULL) { pixbuf = gdk_pixbuf_new_from_file (icofile, NULL); @@ -988,7 +988,7 @@ static void wallpaper_properties_init (void) { capplet->window = glade_xml_get_widget (dialog,"gnome_wp_properties"); icofile = gnome_icon_theme_lookup_icon (capplet->theme, - "background-capplet", + "gnome-settings-background", 48, NULL, NULL); if (icofile != NULL) { pixbuf = gdk_pixbuf_new_from_file (icofile, NULL); diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog index f62a429b3..9b23a5b51 100644 --- a/capplets/default-applications/ChangeLog +++ b/capplets/default-applications/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * gnome-default-applications-properties.c: (create_dialog): + Use themed icon for WM hint. + 2004-07-13 David Sedeņo http://bugzilla.gnome.org/show_bug.cgi?id=147244 diff --git a/capplets/default-applications/gnome-default-applications-properties.c b/capplets/default-applications/gnome-default-applications-properties.c index 56f6bf79f..0018fabff 100644 --- a/capplets/default-applications/gnome-default-applications-properties.c +++ b/capplets/default-applications/gnome-default-applications-properties.c @@ -577,7 +577,7 @@ create_dialog (GConfClient *client) GList *strings = NULL, *li; gint i; dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-default-applications-properties.glade", NULL, NULL); - capplet_set_icon (WID ("default_applications_dialog"), "default-applications-capplet.png"); + capplet_set_icon (WID ("default_applications_dialog"), "gnome-settings-default-applications"); setup_peditors (client, dialog); diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog index 330e54d64..9e2c85645 100644 --- a/capplets/font/ChangeLog +++ b/capplets/font/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * main.c: (setup_dialog): + Use themed iconf for WM hint. + 2004-05-17 Jody Goldberg http://bugzilla.gnome.org/show_bug.cgi?id=142190 diff --git a/capplets/font/main.c b/capplets/font/main.c index b13ffcc3c..ec8ad9b72 100644 --- a/capplets/font/main.c +++ b/capplets/font/main.c @@ -584,7 +584,7 @@ setup_dialog (GladeXML *dialog) metacity_titlebar_load_sensitivity (client, dialog); widget = WID ("font_dialog"); - capplet_set_icon (widget, "font-capplet.png"); + capplet_set_icon (widget, "gnome-settings-font"); #ifdef HAVE_XFT2 setup_font_pair (WID ("monochrome_radio"), WID ("monochrome_sample"), ANTIALIAS_NONE, HINT_FULL); diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog index bd9503e47..913568ef9 100644 --- a/capplets/keybindings/ChangeLog +++ b/capplets/keybindings/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * gnome-keybinding-properties.c: (setup_dialog): + Use themed icon for WM hint. + 2004-07-23 David Sedeņo http://bugzilla.gnome.org/show_bug.cgi?id=148208 diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c index 337980d97..6abc46734 100644 --- a/capplets/keybindings/gnome-keybinding-properties.c +++ b/capplets/keybindings/gnome-keybinding-properties.c @@ -870,7 +870,7 @@ setup_dialog (GladeXML *dialog) reload_key_entries (wm_common_get_current_window_manager(), dialog); widget = WID ("gnome-keybinding-dialog"); - capplet_set_icon (widget, "keyboard-shortcut.png"); + capplet_set_icon (widget, "gnome-settings-keybindings"); gtk_widget_show (widget); g_signal_connect (G_OBJECT (widget), "response", G_CALLBACK(cb_dialog_response), NULL); diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 2590aeca4..98e75ff12 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * gnome-keyboard-properties.c: (main): + Use themed icon for WM hint. + 2004-07-28 Richard Hult * gnome-keyboard-properties.c (main): Switch to the right page for diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c index c6d923676..4d744d6dc 100644 --- a/capplets/keyboard/gnome-keyboard-properties.c +++ b/capplets/keyboard/gnome-keyboard-properties.c @@ -252,7 +252,7 @@ main (int argc, char **argv) gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 3); } capplet_set_icon (WID ("keyboard_dialog"), - "keyboard-capplet.png"); + "gnome-dev-keyboard"); gtk_widget_show (WID ("keyboard_dialog")); gtk_main (); } diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog index d8bafa4f4..dfca76e2a 100644 --- a/capplets/mouse/ChangeLog +++ b/capplets/mouse/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * gnome-mouse-properties.c: (main): + Use themed icon for WM hint. + 2004-06-15 Bastien Nocera * .cvsignore: upd diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c index 703f3f05f..24d102cac 100644 --- a/capplets/mouse/gnome-mouse-properties.c +++ b/capplets/mouse/gnome-mouse-properties.c @@ -841,7 +841,7 @@ main (int argc, char **argv) g_signal_connect (dialog_win, "response", G_CALLBACK (dialog_response_cb), changeset); - capplet_set_icon (dialog_win, "mouse-capplet.png"); + capplet_set_icon (dialog_win, "gnome-dev-mouse-optical"); gtk_widget_show (dialog_win); gtk_main (); diff --git a/capplets/sound/.cvsignore b/capplets/sound/.cvsignore index f1494e164..167034d70 100644 --- a/capplets/sound/.cvsignore +++ b/capplets/sound/.cvsignore @@ -7,3 +7,4 @@ Makefile.in *.o gnome-sound-properties sound.desktop +gnome-settings-sound.desktop diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index d527a0151..4123d6b1e 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,11 @@ +2004-08-20 Frederic Crozat + + * .cvsignore: + Quiet CVS. + + * sound-properties-capplet.c: (main): + Use themed icon for WM hint. + 2004-06-22 Leena Gunda * sound-properties-capplet.c: diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c index ca2fe82d3..c6a2b383e 100644 --- a/capplets/sound/sound-properties-capplet.c +++ b/capplets/sound/sound-properties-capplet.c @@ -278,7 +278,7 @@ main (int argc, char **argv) gtk_dialog_set_default_response (GTK_DIALOG (dialog_win), GTK_RESPONSE_CLOSE); g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, 0); - capplet_set_icon (dialog_win, "sound-capplet.png"); + capplet_set_icon (dialog_win, "gnome-settings-sound"); gtk_widget_show_all (dialog_win); gtk_main (); diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 3e7aa3556..aca13e8f6 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,10 @@ +2004-08-20 Frederic Crozat + + * gnome-theme-details.c: (gnome_theme_details_init): + * gnome-theme-manager.c: (setup_dialog): + * theme-switcher.c: (setup_dialog): + Use themed icon for WM hint. + 2004-07-31 Kjartan Maraas * gnome-theme-save.c: (setup_directory_structure): Remove diff --git a/capplets/theme-switcher/gnome-theme-details.c b/capplets/theme-switcher/gnome-theme-details.c index 288c0ec7a..4c7ce04f0 100644 --- a/capplets/theme-switcher/gnome-theme-details.c +++ b/capplets/theme-switcher/gnome-theme-details.c @@ -339,7 +339,7 @@ gnome_theme_details_init (void) g_signal_connect (G_OBJECT (parent), "drag-leave", G_CALLBACK (gnome_theme_manager_drag_leave_cb), NULL); g_signal_connect (G_OBJECT (parent), "drag-data-received", G_CALLBACK (gnome_theme_manager_drag_data_received_cb), NULL); - capplet_set_icon (parent, "gnome-ccthemes.png"); + capplet_set_icon (parent, "gnome-settings-theme"); gnome_theme_details_reread_themes_from_disk (); } diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c index e5f8a4174..1d2a6aa7a 100644 --- a/capplets/theme-switcher/gnome-theme-manager.c +++ b/capplets/theme-switcher/gnome-theme-manager.c @@ -1215,7 +1215,7 @@ setup_dialog (GladeXML *dialog) g_signal_connect (G_OBJECT (parent), "drag-leave", G_CALLBACK (gnome_theme_manager_drag_leave_cb), NULL); g_signal_connect (G_OBJECT (parent), "drag-data-received",G_CALLBACK (gnome_theme_manager_drag_data_received_cb), NULL); - capplet_set_icon (parent, "gnome-ccthemes.png"); + capplet_set_icon (parent, "gnome-settings-theme"); update_font_button_state (dialog); gtk_widget_show (parent); diff --git a/capplets/theme-switcher/theme-switcher.c b/capplets/theme-switcher/theme-switcher.c index 593032fdc..5ad78b00b 100644 --- a/capplets/theme-switcher/theme-switcher.c +++ b/capplets/theme-switcher/theme-switcher.c @@ -806,7 +806,7 @@ setup_dialog (GladeXML *dialog) G_CALLBACK (drag_data_received_cb), dialog); - capplet_set_icon (parent, "gnome-ccthemes.png"); + capplet_set_icon (parent, "gnome-settings-theme"); gtk_widget_show (parent); } diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog index b06b20576..62453916c 100644 --- a/capplets/ui-properties/ChangeLog +++ b/capplets/ui-properties/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * gnome-ui-properties.c: (setup_dialog): + Use themed icon for window hint. + 2004-04-15 Jody Goldberg * Release 2.6.1 diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c index b2128eab2..c84cebc23 100644 --- a/capplets/ui-properties/gnome-ui-properties.c +++ b/capplets/ui-properties/gnome-ui-properties.c @@ -274,7 +274,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset) g_free (toolbar_style); gtk_window_set_resizable (GTK_WINDOW (widget), FALSE); - capplet_set_icon (widget, "behavior-capplet.png"); + capplet_set_icon (widget, "gnome-settings-ui-behavior"); gtk_widget_show_all (widget); } diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog index 58edd845d..e2450ef0e 100644 --- a/capplets/windows/ChangeLog +++ b/capplets/windows/ChangeLog @@ -1,3 +1,8 @@ +2004-08-20 Frederic Crozat + + * gnome-window-properties.c: (main): + Use themed icon for window hint. + 2004-07-06 Padraig O'Briain * gnome-window-properties.glade: Add mnemnoic widget for diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c index fdbcd1e6a..259363340 100644 --- a/capplets/windows/gnome-window-properties.c +++ b/capplets/windows/gnome-window-properties.c @@ -518,7 +518,7 @@ main (int argc, char **argv) ++i; } - capplet_set_icon (dialog_win, "window-capplet.png"); + capplet_set_icon (dialog_win, "gnome-window-manager"); gtk_widget_show (dialog_win); gtk_main ();