From fea925912b94d356a579598031abe54a191903fc Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 2 Sep 2011 20:59:54 +0200 Subject: [PATCH] Fix make makedistcheck and re-organize icon paths. This change does several things: * renamed psppicon.png to pspp.png - The word "icon" is redundant (it's also a misuse of English). * Changed the install target of the existing 16x16 pictograms out of the apps directory. Instead, they now go in a directory of their own called "pspp". This is more in line with what other applications seem to do. It also makes it a lot easier to deal uninstall them, since we can be reasonably sure that everything in the "pspp" directory was put there by us. * Ensures that make distcheck passes. --- .../gui/{psppicon.png => app-icons/16x16/pspp.png} | Bin src/ui/gui/automake.mk | 11 +++++++---- src/ui/gui/help-menu.c | 2 +- src/ui/gui/pspp.desktop | 2 +- src/ui/gui/psppire-data-window.c | 2 +- src/ui/gui/psppire-dialog.c | 2 +- src/ui/gui/psppire-syntax-window.c | 2 +- src/ui/gui/psppire-window.c | 4 ++-- src/ui/gui/text-data-import-dialog.c | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) rename src/ui/gui/{psppicon.png => app-icons/16x16/pspp.png} (100%) diff --git a/src/ui/gui/psppicon.png b/src/ui/gui/app-icons/16x16/pspp.png similarity index 100% rename from src/ui/gui/psppicon.png rename to src/ui/gui/app-icons/16x16/pspp.png diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index da8f2d93..0ff301b8 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -43,7 +43,6 @@ UI_FILES = \ EXTRA_DIST += \ src/ui/gui/OChangeLog \ - src/ui/gui/psppicon.png \ src/ui/gui/marshaller-list \ src/ui/gui/pspp.desktop @@ -80,7 +79,7 @@ src_ui_gui_psppiredir = $(pkgdatadir) themedir = $(DESTDIR)$(datadir)/icons/hicolor -context = apps +context = pspp install-lang: @@ -90,6 +89,8 @@ install-icons: for size in 16x16 ; do \ $(MKDIR_P) $(themedir)/$$size/$(context) ; \ $(INSTALL) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \ + $(MKDIR_P) $(themedir)/$$size/apps ; \ + $(INSTALL) $(top_srcdir)/src/ui/gui/app-icons/$$size/pspp.png $(themedir)/$$size/apps ; \ done gtk-update-icon-cache --ignore-theme-index $(themedir) @@ -97,7 +98,8 @@ INSTALL_DATA_HOOKS += install-icons install-lang uninstall-icons: for size in 16x16 ; do \ - rm -f $(themedir)/$$size/$(context)/psppicon.png ; \ + rm -r -f $(themedir)/$$size/$(context); \ + rm -f $(themedir)/$$size/apps/pspp.png; \ done gtk-update-icon-cache --ignore-theme-index $(themedir) @@ -105,6 +107,7 @@ UNINSTALL_DATA_HOOKS += uninstall-icons dist_src_ui_gui_psppire_DATA = \ $(UI_FILES) \ + $(top_srcdir)/src/ui/gui/app-icons/16x16/pspp.png \ $(top_srcdir)/src/ui/gui/pspp.lang \ $(top_srcdir)/src/ui/gui/pspplogo.png \ $(top_srcdir)/src/ui/gui/icons/value-labels.png \ @@ -120,7 +123,7 @@ dist_src_ui_gui_psppire_DATA = \ $(top_srcdir)/src/ui/gui/icons/16x16/scale.png \ $(top_srcdir)/src/ui/gui/icons/16x16/string.png \ $(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \ - $(top_srcdir)/src/ui/gui/icons/splash.png + $(top_srcdir)/src/ui/gui/icons/splash.png src_ui_gui_psppire_SOURCES = \ diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c index 1015fda8..58a19bb7 100644 --- a/src/ui/gui/help-menu.c +++ b/src/ui/gui/help-menu.c @@ -46,7 +46,7 @@ about_new (GtkMenuItem *m, GtkWindow *parent) gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), pb); - gtk_window_set_icon_name (GTK_WINDOW (about), "psppicon"); + gtk_window_set_icon_name (GTK_WINDOW (about), "pspp"); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about), PACKAGE_URL); diff --git a/src/ui/gui/pspp.desktop b/src/ui/gui/pspp.desktop index eaee1b4f..e825bf9c 100644 --- a/src/ui/gui/pspp.desktop +++ b/src/ui/gui/pspp.desktop @@ -9,7 +9,7 @@ Comment[de]= Statistische Daten mit einer freien Alternative zu SPSS analysieren Comment[lt]= Statistinių duomenų analizavimas su nemokama SPSS alternatyva Comment[cs]= Analyzuj statistická data se svobodnou variantou SPSS Exec=psppire %F -Icon=psppicon +Icon=pspp Terminal=false Type=Application Categories=GTK;Education;Science;Math; diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 49438d6c..e51f827c 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -600,7 +600,7 @@ confirm_delete_dataset (PsppireDataWindow *de, GTK_STOCK_DELETE, GTK_RESPONSE_OK, NULL); - g_object_set (dialog, "icon-name", "psppicon", NULL); + g_object_set (dialog, "icon-name", "pspp", NULL); result = gtk_dialog_run (GTK_DIALOG (dialog)); diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c index 6f27aa54..99d32197 100644 --- a/src/ui/gui/psppire-dialog.c +++ b/src/ui/gui/psppire-dialog.c @@ -355,7 +355,7 @@ psppire_dialog_init (PsppireDialog *dialog) gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - g_object_set (dialog, "icon-name", "psppicon", NULL); + g_object_set (dialog, "icon-name", "pspp", NULL); } diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 5ccbca5c..9f9e90a9 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -937,7 +937,7 @@ error_dialog (GtkWindow *w, const gchar *filename, GError *err) g_free (fn); - g_object_set (dialog, "icon-name", "psppicon", NULL); + g_object_set (dialog, "icon-name", "pspp", NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", err->message); diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c index 2b521970..f2bd2d12 100644 --- a/src/ui/gui/psppire-window.c +++ b/src/ui/gui/psppire-window.c @@ -488,7 +488,7 @@ psppire_window_init (PsppireWindow *window) g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window); - g_object_set (window, "icon-name", "psppicon", NULL); + g_object_set (window, "icon-name", "pspp", NULL); g_signal_connect (window, "realize", G_CALLBACK (on_realize), window); @@ -526,7 +526,7 @@ psppire_window_query_save (PsppireWindow *se) description); g_free (description); - g_object_set (dialog, "icon-name", "psppicon", NULL); + g_object_set (dialog, "icon-name", "pspp", NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("If you don't save, changes from the last %ld seconds will be permanently lost."), diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c index 09daa0e6..a6aba1e8 100644 --- a/src/ui/gui/text-data-import-dialog.c +++ b/src/ui/gui/text-data-import-dialog.c @@ -582,7 +582,7 @@ init_assistant (struct import_assistant *ia, GtkWindow *parent_window) gtk_window_set_title (GTK_WINDOW (a->assistant), _("Importing Delimited Text Data")); gtk_window_set_transient_for (GTK_WINDOW (a->assistant), parent_window); - gtk_window_set_icon_name (GTK_WINDOW (a->assistant), "psppicon"); + gtk_window_set_icon_name (GTK_WINDOW (a->assistant), "pspp"); a->prop_renderer = gtk_cell_renderer_text_new (); g_object_ref_sink (a->prop_renderer); -- 2.30.2