From: Nickolay V. Shmyrev Date: Tue, 2 May 2006 18:55:10 +0000 (+0000) Subject: Evince use it's own icon. Fix for the bug #313392. X-Git-Tag: EVINCE_0_5_3~28 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=c9c1e2212e37fb03d5e4ce4192cfe3f8a7515c5c;p=evince.git Evince use it's own icon. Fix for the bug #313392. * data/Makefile.am: * data/evince.png: * data/evince-16.png: * data/evince-22.png: * data/evince.svg: * shell/main.c: (main): Evince use it's own icon. Fix for the bug #313392. * shell/ev-window.c: (fullscreen_timeout_cb), (fullscreen_set_timeout), (fullscreen_clear_timeout), (ev_window_cmd_help_about), (ev_window_dispose): Simplify fullscreen timeout code. --- diff --git a/ChangeLog b/ChangeLog index be35cf75..a9e97913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-05-02 Nickolay V. Shmyrev + + * data/Makefile.am: + * data/evince.png: + * data/evince-16.png: + * data/evince-22.png: + * data/evince.svg: + * shell/main.c: (main): + + Evince use it's own icon. Fix for the bug #313392. + + * shell/ev-window.c: (fullscreen_timeout_cb), + (fullscreen_set_timeout), (fullscreen_clear_timeout), + (ev_window_cmd_help_about), (ev_window_dispose): + + Simplify fullscreen timeout code. + 2006-04-29 Carlos Garcia Campos * backend/ev-attachment.c: diff --git a/data/Makefile.am b/data/Makefile.am index d7d6dafe..39835b31 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -26,6 +26,16 @@ schema_in_files = evince.schemas.in schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_DATA = $(schema_in_files:.schemas.in=.schemas) +icon_16dir = $(datadir)/icons/hicolor/16x16/apps +icon_16_DATA = evince-16.png +icon_22dir = $(datadir)/icons/hicolor/22x22/apps +icon_22_DATA = evince-22.png +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = evince.png +svgicondir = $(datadir)/icons/hicolor/scalable/apps +svgicon_DATA = evince.svg +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + install-data-local: if GCONF_SCHEMAS_INSTALL if test -z "$(DESTDIR)" ; then \ @@ -34,14 +44,27 @@ if GCONF_SCHEMAS_INSTALL done \ fi endif + 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 = \ $(glade_DATA) \ $(ui_DATA) \ $(DESKTOP_IN_FILES) \ $(schema_in_files) \ - $(NULL) + $(icon_16_DATA) \ + $(icon_22_DATA) \ + $(icon_DATA) \ + $(svgicon_DATA) \ + $(NULL) DISTCLEANFILES = \ $(DESKTOP_FILES) \ $(schema_DATA) + + diff --git a/data/evince-16.png b/data/evince-16.png new file mode 100644 index 00000000..e2e7fae1 Binary files /dev/null and b/data/evince-16.png differ diff --git a/data/evince-22.png b/data/evince-22.png new file mode 100644 index 00000000..e8b8c12e Binary files /dev/null and b/data/evince-22.png differ diff --git a/data/evince.png b/data/evince.png new file mode 100644 index 00000000..f0b382fd Binary files /dev/null and b/data/evince.png differ diff --git a/data/evince.svg b/data/evince.svg new file mode 100644 index 00000000..9b0332fb --- /dev/null +++ b/data/evince.svg @@ -0,0 +1,500 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Evince + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shell/ev-window.c b/shell/ev-window.c index 71cf0ec4..6ca0de64 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -127,7 +127,7 @@ struct _EvWindowPrivate { /* Fullscreen mode */ GtkWidget *fullscreen_toolbar; GtkWidget *fullscreen_popup; - GSource *fullscreen_timeout_source; + guint fullscreen_timeout_id; /* Popup link */ GtkWidget *view_popup; @@ -1563,8 +1563,8 @@ fullscreen_timeout_cb (gpointer data) g_object_set (window->priv->fullscreen_popup, "visible", FALSE, NULL); ev_view_hide_cursor (EV_VIEW (window->priv->view)); - g_source_unref (window->priv->fullscreen_timeout_source); - window->priv->fullscreen_timeout_source = NULL; + + window->priv->fullscreen_timeout_id = 0; return FALSE; } @@ -1572,28 +1572,22 @@ fullscreen_timeout_cb (gpointer data) static void fullscreen_set_timeout (EvWindow *window) { - GSource *source; - - if (window->priv->fullscreen_timeout_source != NULL) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); + if (window->priv->fullscreen_timeout_id != 0) { + g_source_remove (window->priv->fullscreen_timeout_id); } - - source = g_timeout_source_new (FULLSCREEN_TIMEOUT); - g_source_set_callback (source, fullscreen_timeout_cb, window, NULL); - g_source_attach (source, NULL); - window->priv->fullscreen_timeout_source = source; + + window->priv->fullscreen_timeout_id = + g_timeout_add (FULLSCREEN_TIMEOUT, fullscreen_timeout_cb, window); } static void fullscreen_clear_timeout (EvWindow *window) { - if (window->priv->fullscreen_timeout_source != NULL) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); + if (window->priv->fullscreen_timeout_id != 0) { + g_source_remove (window->priv->fullscreen_timeout_id); } - window->priv->fullscreen_timeout_source = NULL; + window->priv->fullscreen_timeout_id = 0; ev_view_show_cursor (EV_VIEW (window->priv->view)); } @@ -2428,6 +2422,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window) "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), + "logo-icon-name", "evince", NULL); g_free (comments); @@ -2809,10 +2804,9 @@ ev_window_dispose (GObject *object) priv->uri = NULL; } - if (window->priv->fullscreen_timeout_source) { - g_source_unref (window->priv->fullscreen_timeout_source); - g_source_destroy (window->priv->fullscreen_timeout_source); - window->priv->fullscreen_timeout_source = NULL; + if (priv->fullscreen_timeout_id) { + g_source_remove (priv->fullscreen_timeout_id); + priv->fullscreen_timeout_id = 0; } destroy_fullscreen_popup (window); diff --git a/shell/main.c b/shell/main.c index 3a24e058..b874b28b 100644 --- a/shell/main.c +++ b/shell/main.c @@ -288,7 +288,7 @@ main (int argc, char *argv[]) ev_file_helpers_init (); ev_debug_init (); ev_stock_icons_init (); - gtk_window_set_default_icon_name ("postscript-viewer"); + gtk_window_set_default_icon_name ("evince"); load_files (poptGetArgs (context));