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.

diff --git a/src/ui/gui/app-icons/16x16/pspp.png b/src/ui/gui/app-icons/16x16/pspp.png
new file mode 100644 (file)
index 0000000..f8ed8bb
Binary files /dev/null and b/src/ui/gui/app-icons/16x16/pspp.png differ

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index da8f2d9352fb6c5ecdea4958fb960b41ded31e0b..0ff301b89411811c195877f6feb85d7cb2a7b4b4 100644 (file)
--- 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 1015fda89811d0e826101da7765b1c26eb23c7fd..58a19bb7f2584233c8a28c7227211504cddac886 100644 (file)
--- 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 eaee1b4f98c64805f0472f331fc0c7207000cb30..e825bf9cdef258bfeae2b4b0ee33b7a3a30ad90d 100644 (file)
--- 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/psppicon.png b/src/ui/gui/psppicon.png
deleted file mode 100644 (file)
index f8ed8bb..0000000
Binary files a/src/ui/gui/psppicon.png and /dev/null differ

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 49438d6cff14f5af7a68150455de8a741aa13410..e51f827cf3f30fb10c88cedd4c838ccc798450a0 100644 (file)
--- 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 6f27aa54d13e41883c1adb0037acd7c8e6224383..99d32197ec28551e6e20f1d2ce6acaa543640f21 100644 (file)
--- 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 5ccbca5cb5660635a982b09ae4965a925ca59ae0..9f9e90a908303ba2181cad5f7a380c5326e45021 100644 (file)
--- 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 2b521970ceec0226bf4af930794679bf65a8abc4..f2bd2d120ffe469b8f6a17c91e1f7af9bac40f21 100644 (file)
--- 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 09daa0e6b39a7ea8a033dd5d1b66bdd2e444585f..a6aba1e8571f459149cb10acc23b4f5770eb968e 100644 (file)
--- 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);