From 0bbfe98c035d25c52b802c56fc169dde9390a619 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 9 Jan 2007 19:13:39 +0000 Subject: [PATCH] set default window icon and application name install icons use 2007-01-09 Vincent Untz * main.c: (main): set default window icon and application name * Makefile.am: install icons * drwright.c: (popup_about_cb): use gtk_about_dialog_show() * typing-monitor.png: * typing-monitor.svn: new Fix bug #348641, icon by Andreas Nilsson , patch by Luca Cavalli svn path=/trunk/; revision=7124 --- typing-break/ChangeLog | 10 + typing-break/Makefile.am | 19 +- typing-break/drwright.c | 43 +--- typing-break/main.c | 3 + typing-break/typing-monitor.png | Bin 0 -> 3292 bytes typing-break/typing-monitor.svg | 336 ++++++++++++++++++++++++++++++++ 6 files changed, 376 insertions(+), 35 deletions(-) create mode 100644 typing-break/typing-monitor.png create mode 100644 typing-break/typing-monitor.svg diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog index 34c4abde4..25b2b3222 100644 --- a/typing-break/ChangeLog +++ b/typing-break/ChangeLog @@ -1,3 +1,13 @@ +2007-01-09 Vincent Untz + + * main.c: (main): set default window icon and application name + * Makefile.am: install icons + * drwright.c: (popup_about_cb): use gtk_about_dialog_show() + * typing-monitor.png: + * typing-monitor.svn: new + Fix bug #348641, icon by Andreas Nilsson , patch + by Luca Cavalli + 2006-11-15 Kjartan Maraas * Makefile.am: Don't redefine GNOMELOCALEDIR. diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am index 83ce8a547..f4fead043 100644 --- a/typing-break/Makefile.am +++ b/typing-break/Makefile.am @@ -23,4 +23,21 @@ gnome_typing_monitor_LDFLAGS = -export-dynamic imagedir = $(GNOMECC_PIXMAPS_DIR) image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png -EXTRA_DIST = $(image_DATA) +# Themeable application icon +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = typing-monitor.png +svgicondir = $(datadir)/icons/hicolor/scalable/apps +svgicon_DATA = typing-monitor.svg +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor +install-data-hook: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + +EXTRA_DIST = $(image_DATA) \ + $(icon_DATA) \ + $(svgicon_DATA) diff --git a/typing-break/drwright.c b/typing-break/drwright.c index a0e0f0e63..fdbd087b6 100644 --- a/typing-break/drwright.c +++ b/typing-break/drwright.c @@ -593,48 +593,23 @@ popup_about_cb (gpointer callback_data, guint action, GtkWidget *widget) { - static GtkWidget *about_window; - GdkPixbuf *icon; - char *authors [] = { + gint i; + gchar *authors[] = { N_("Written by Richard Hult "), N_("Eye candy added by Anders Carlsson"), NULL }; - int i; - if (about_window) { - gtk_window_present (GTK_WINDOW (about_window)); - return; - } - for (i = 0; authors [i]; i++) authors [i] = _(authors [i]); - about_window = gtk_about_dialog_new (); - - g_signal_connect (about_window, - "destroy", - G_CALLBACK (gtk_widget_destroyed), - &about_window); - - icon = NULL; /*gdk_pixbuf_new_from_file (IMAGEDIR "/bar.png", NULL);*/ - - g_object_set (about_window, - "name", _("Typing Monitor"), - "version", VERSION, - "comments", _("A computer break reminder."), - "authors", authors, - "logo", icon, - NULL); - - if (icon != NULL) - g_object_unref (icon); - - g_signal_connect (about_window, - "response", G_CALLBACK (gtk_widget_destroy), - NULL); - - gtk_widget_show (about_window); + gtk_show_about_dialog (NULL, + "authors", authors, + "comments", _("A computer break reminder."), + "logo-icon-name", "typing-monitor", + "translator-credits", _("translator-credits"), + "version", VERSION, + NULL); } static void diff --git a/typing-break/main.c b/typing-break/main.c index 2c98c4be8..83a6a2e1f 100644 --- a/typing-break/main.c +++ b/typing-break/main.c @@ -81,6 +81,9 @@ main (int argc, char *argv[]) ++i; } + g_set_application_name (_("Typing Monitor")); + gtk_window_set_default_icon_name ("typing-monitor"); + gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, NULL); diff --git a/typing-break/typing-monitor.png b/typing-break/typing-monitor.png new file mode 100644 index 0000000000000000000000000000000000000000..41ee09cff23523b5fc1f9c5359be0684a186748b GIT binary patch literal 3292 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 al>QHC0a~vPH~JU=0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + +