From 434c1487ed3183eb953ddcc3400eda93adec716b Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Wed, 14 Jun 2017 14:33:41 +0100 Subject: [PATCH] fix up .desktop file and add an icon --- ChangeLog | 3 +++ Makefile.am | 2 ++ configure.ac | 4 ++-- nip2.desktop.in | 2 +- share/nip2/data/Makefile.am | 2 +- share/nip2/data/{vips-128.png => nip2.png} | Bin src/boxes.c | 3 +-- src/main.c | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) rename share/nip2/data/{vips-128.png => nip2.png} (100%) diff --git a/ChangeLog b/ChangeLog index 756d4cfc..93c3f0d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +started 8.5.2 14/6/17 +- install icon, fix icon in desktop file + started 8.5.1 22/1/17 - fix a crash bug - make separate Image / Alpha menu, add Add, Extract, Drop diff --git a/Makefile.am b/Makefile.am index 5b5b4bbc..b68108eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,6 +37,8 @@ if UPDATE_DESKTOP install-data-hook: -$(UPDATE_MIME_DATABASE) ${DESTDIR}$(datadir)/mime -$(UPDATE_DESKTOP_DATABASE) ${DESTDIR}$(datadir)/applications + $(mkinstalldirs) ${DESTDIR}$(datadir)/icons/hicolor/128x128/apps + -cp share/nip2/data/nip2.png ${DESTDIR}$(datadir)/icons/hicolor/128x128/apps endif dist-hook: diff --git a/configure.ac b/configure.ac index 2ee7a406..4cf740c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([nip2], [8.5.1], [vipsip@jiscmail.ac.uk]) +AC_INIT([nip2], [8.5.2], [vipsip@jiscmail.ac.uk]) # foreign stops complaints about a missing README (we use README.md instead) # and missing INSTALL (the standard Gnu INSTALL is not very useful) @@ -17,7 +17,7 @@ dnl m4_define([nip_major_version], [8]) m4_define([nip_minor_version], [5]) -m4_define([nip_micro_version], [1]) +m4_define([nip_micro_version], [2]) m4_define([nip_version], [nip_major_version.nip_minor_version.nip_micro_version]) diff --git a/nip2.desktop.in b/nip2.desktop.in index 318cf39c..d66b8a75 100644 --- a/nip2.desktop.in +++ b/nip2.desktop.in @@ -3,7 +3,7 @@ Name=@PACKAGE@ Comment=Image manipulation program based on VIPS Comment[it]=Programma per la manipolazione di immagini basato su VIPS Exec=nip2 %F -Icon=nip2 +Icon=nip2.png Terminal=false Type=Application Categories=Graphics;RasterGraphics; diff --git a/share/nip2/data/Makefile.am b/share/nip2/data/Makefile.am index 0f562824..8ec9a5d1 100644 --- a/share/nip2/data/Makefile.am +++ b/share/nip2/data/Makefile.am @@ -6,7 +6,7 @@ nipdata_DATA = \ sRGB.icm \ macbeth_lab_d65.mat \ macbeth_lab_d50.mat \ - vips-128.png \ + nip2.png \ nip2-icon.ico \ cmyk.icm \ stock-tool-ink-22.png \ diff --git a/share/nip2/data/vips-128.png b/share/nip2/data/nip2.png similarity index 100% rename from share/nip2/data/vips-128.png rename to share/nip2/data/nip2.png diff --git a/src/boxes.c b/src/boxes.c index cd6bbe57..af0dbe4a 100644 --- a/src/boxes.c +++ b/src/boxes.c @@ -367,8 +367,7 @@ about_build( iDialog *idlg, GtkWidget *work ) gtk_container_add( GTK_CONTAINER( work ), hb ); gtk_widget_show( hb ); - image = image_new_from_file( - "$VIPSHOME/share/$PACKAGE/data/vips-128.png" ); + image = image_new_from_file( "$VIPSHOME/share/$PACKAGE/data/nip2.png" ); gtk_box_pack_start( GTK_BOX( hb ), image, FALSE, FALSE, 2 ); gtk_widget_show( image ); diff --git a/src/main.c b/src/main.c index 411148fd..327fc3e6 100644 --- a/src/main.c +++ b/src/main.c @@ -794,7 +794,7 @@ main_x_init( int *argc, char ***argv ) /* Set the default icon. */ im_strncpy( buf, - "$VIPSHOME/share/$PACKAGE/data/vips-128.png", FILENAME_MAX ); + "$VIPSHOME/share/$PACKAGE/data/nip2.png", FILENAME_MAX ); path_expand( buf ); gtk_window_set_default_icon_from_file( buf, NULL ); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy