From b43eaf9a9521a55c6cbbedb62147c2daaaf6e32d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 6 Jan 2008 02:23:58 +0000 Subject: Install icon to standard (themeable) location. git-svn-id: http://svn.drobilla.net/lad/patchage@1013 a436a847-0d15-0410-975c-d299462d15a1 --- Makefile.am | 2 +- configure.ac | 9 +- icons/16x16/Makefile.am | 4 + icons/22x22/Makefile.am | 4 + icons/24x24/Makefile.am | 4 + icons/32x32/Makefile.am | 4 + icons/48x48/Makefile.am | 4 + icons/48x48/patchage.png | Bin 0 -> 2687 bytes icons/Makefile.am | 14 ++ icons/scalable/Makefile.am | 3 + icons/scalable/patchage.svg | 595 ++++++++++++++++++++++++++++++++++++++++++++ patchage.desktop.in | 2 +- src/Patchage.cpp | 2 + src/patchage.svg | 2 +- 14 files changed, 645 insertions(+), 4 deletions(-) create mode 100644 icons/16x16/Makefile.am create mode 100644 icons/22x22/Makefile.am create mode 100644 icons/24x24/Makefile.am create mode 100644 icons/32x32/Makefile.am create mode 100644 icons/48x48/Makefile.am create mode 100644 icons/48x48/patchage.png create mode 100644 icons/Makefile.am create mode 100644 icons/scalable/Makefile.am create mode 100644 icons/scalable/patchage.svg diff --git a/Makefile.am b/Makefile.am index 42e35a3..bc869ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src +SUBDIRS = src icons desktopfilesdir = $(datadir)/applications dist_desktopfiles_DATA = patchage.desktop diff --git a/configure.ac b/configure.ac index 3476f1d..d0c73c2 100644 --- a/configure.ac +++ b/configure.ac @@ -167,8 +167,15 @@ PKG_CHECK_MODULES(FLOWCANVAS, flowcanvas) # Patchage AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([patchage.desktop]) +AC_CONFIG_FILES([src/Makefile]) +AC_CONFIG_FILES([icons/Makefile]) +AC_CONFIG_FILES([icons/16x16/Makefile]) +AC_CONFIG_FILES([icons/22x22/Makefile]) +AC_CONFIG_FILES([icons/24x24/Makefile]) +AC_CONFIG_FILES([icons/32x32/Makefile]) +AC_CONFIG_FILES([icons/48x48/Makefile]) +AC_CONFIG_FILES([icons/scalable/Makefile]) AC_OUTPUT diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am new file mode 100644 index 0000000..f27a98a --- /dev/null +++ b/icons/16x16/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/16x16/apps +icon_DATA = patchage.png + +EXTRA_DIST = $(icon_DATA) diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am new file mode 100644 index 0000000..b71f687 --- /dev/null +++ b/icons/22x22/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/22x22/apps +icon_DATA = patchage.png + +EXTRA_DIST = $(icon_DATA) diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am new file mode 100644 index 0000000..e4b6d06 --- /dev/null +++ b/icons/24x24/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/24x24/apps +icon_DATA = patchage.png + +EXTRA_DIST = $(icon_DATA) diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am new file mode 100644 index 0000000..9b03b6e --- /dev/null +++ b/icons/32x32/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/32x32/apps +icon_DATA = patchage.png + +EXTRA_DIST = $(icon_DATA) diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am new file mode 100644 index 0000000..56f9453 --- /dev/null +++ b/icons/48x48/Makefile.am @@ -0,0 +1,4 @@ +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = patchage.png + +EXTRA_DIST = $(icon_DATA) diff --git a/icons/48x48/patchage.png b/icons/48x48/patchage.png new file mode 100644 index 0000000..43d863d Binary files /dev/null and b/icons/48x48/patchage.png differ diff --git a/icons/Makefile.am b/icons/Makefile.am new file mode 100644 index 0000000..79835fc --- /dev/null +++ b/icons/Makefile.am @@ -0,0 +1,14 @@ +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am new file mode 100644 index 0000000..4dd0154 --- /dev/null +++ b/icons/scalable/Makefile.am @@ -0,0 +1,3 @@ +icondir = $(datadir)/icons/hicolor/scalable/apps +icon_DATA = patchage.svg +EXTRA_DIST = $(icon_DATA) diff --git a/icons/scalable/patchage.svg b/icons/scalable/patchage.svg new file mode 100644 index 0000000..cf2c26c --- /dev/null +++ b/icons/scalable/patchage.svg @@ -0,0 +1,595 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Patchage + + + patches + audio + cables + jacks + jack + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/patchage.desktop.in b/patchage.desktop.in index efe341c..29a7866 100644 --- a/patchage.desktop.in +++ b/patchage.desktop.in @@ -5,6 +5,6 @@ Version=@PACKAGE_VERSION@ Comment=Connect audio and MIDI applications together and manage audio sessions Exec=patchage Terminal=false -Icon=patchage-icon.svg +Icon=patchage Type=Application Categories=Application;AudioVideo;Sound;Audio diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 20c7cbf..59b8cfa 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -143,6 +143,8 @@ Patchage::Patchage(int argc, char** argv) #endif xml->get_widget_derived("jack_settings_win", _jack_settings_dialog); + + Glib::set_application_name("Patchage"); _about_win->property_program_name() = "Patchage"; gtkmm_set_width_for_given_text(*_buffer_size_combo, "4096 frames", 40); diff --git a/src/patchage.svg b/src/patchage.svg index 88500da..ce73588 120000 --- a/src/patchage.svg +++ b/src/patchage.svg @@ -1 +1 @@ -../icons/48x48/patchage.svg \ No newline at end of file +../icons/scalable/patchage.svg \ No newline at end of file -- cgit v1.2.1