diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | icons/Makefile.am | 59 | ||||
| -rw-r--r-- | icons/hicolor_apps_16x16_mate.png | bin | 0 -> 774 bytes | |||
| -rw-r--r-- | icons/hicolor_apps_22x22_mate.png | bin | 0 -> 1323 bytes | |||
| -rw-r--r-- | icons/hicolor_apps_24x24_mate.png | bin | 0 -> 1511 bytes | |||
| -rw-r--r-- | icons/hicolor_apps_256x256_mate.png | bin | 0 -> 31357 bytes | |||
| -rw-r--r-- | icons/hicolor_apps_32x32_mate.png | bin | 0 -> 2180 bytes | |||
| -rw-r--r-- | icons/hicolor_apps_48x48_mate.png | bin | 0 -> 4164 bytes | |||
| -rw-r--r-- | icons/hicolor_apps_scalable_mate-symbolic.svg | 24 | ||||
| -rw-r--r-- | mate-about/mate-about.c | 14 | ||||
| -rw-r--r-- | mate-about/mate-about.h | 1 | ||||
| -rw-r--r-- | tools/mate-color-select.c | 1 | ||||
| -rw-r--r-- | tools/mate-color-select.desktop.in.in | 2 | ||||
| -rw-r--r-- | user-guide/mate-user-guide.desktop.in.in | 2 |
15 files changed, 90 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 2be4449..5e76c52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = libmate-desktop man docs po schemas tools +SUBDIRS = libmate-desktop man docs po schemas tools icons if MATE_ABOUT_ENABLED SUBDIRS += mate-about diff --git a/configure.ac b/configure.ac index aaeea77..05ad090 100644 --- a/configure.ac +++ b/configure.ac @@ -333,6 +333,7 @@ tools/mate-conf-import.desktop.in tools/Makefile user-guide/Makefile user-guide/mate-user-guide.desktop.in +icons/Makefile ]) AC_OUTPUT diff --git a/icons/Makefile.am b/icons/Makefile.am new file mode 100644 index 0000000..786bb26 --- /dev/null +++ b/icons/Makefile.am @@ -0,0 +1,59 @@ +NULL = + +public_icons_themes = \ + hicolor \ + $(NULL) + +public_icons = \ + hicolor_apps_16x16_mate.png \ + hicolor_apps_22x22_mate.png \ + hicolor_apps_24x24_mate.png \ + hicolor_apps_32x32_mate.png \ + hicolor_apps_48x48_mate.png \ + hicolor_apps_256x256_mate.png \ + hicolor_apps_scalable_mate-symbolic.svg \ + $(NULL) + +EXTRA_DIST = \ + $(public_icons) \ + $(NULL) + +############################################################################### + +gtk_update_icon_cache = gtk-update-icon-cache -f -t + +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + for theme in $(public_icons_themes); do \ + $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ + done; \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + for theme in $(public_icons_themes); do \ + echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ + done; \ + fi + +install-icons: + for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +uninstall-icons: + -for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +install-data-local: install-icons update-icon-cache + +uninstall-local: uninstall-icons update-icon-cache diff --git a/icons/hicolor_apps_16x16_mate.png b/icons/hicolor_apps_16x16_mate.png Binary files differnew file mode 100644 index 0000000..0a34149 --- /dev/null +++ b/icons/hicolor_apps_16x16_mate.png diff --git a/icons/hicolor_apps_22x22_mate.png b/icons/hicolor_apps_22x22_mate.png Binary files differnew file mode 100644 index 0000000..1fd92a8 --- /dev/null +++ b/icons/hicolor_apps_22x22_mate.png diff --git a/icons/hicolor_apps_24x24_mate.png b/icons/hicolor_apps_24x24_mate.png Binary files differnew file mode 100644 index 0000000..2065bea --- /dev/null +++ b/icons/hicolor_apps_24x24_mate.png diff --git a/icons/hicolor_apps_256x256_mate.png b/icons/hicolor_apps_256x256_mate.png Binary files differnew file mode 100644 index 0000000..9708cdd --- /dev/null +++ b/icons/hicolor_apps_256x256_mate.png diff --git a/icons/hicolor_apps_32x32_mate.png b/icons/hicolor_apps_32x32_mate.png Binary files differnew file mode 100644 index 0000000..2a6a192 --- /dev/null +++ b/icons/hicolor_apps_32x32_mate.png diff --git a/icons/hicolor_apps_48x48_mate.png b/icons/hicolor_apps_48x48_mate.png Binary files differnew file mode 100644 index 0000000..d00c802 --- /dev/null +++ b/icons/hicolor_apps_48x48_mate.png diff --git a/icons/hicolor_apps_scalable_mate-symbolic.svg b/icons/hicolor_apps_scalable_mate-symbolic.svg new file mode 100644 index 0000000..776a8dd --- /dev/null +++ b/icons/hicolor_apps_scalable_mate-symbolic.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata id="metadata7"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g id="layer2" display="none" transform="translate(0,-6)"> + <rect id="rect4898" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#333"/> + </g> + <g id="layer3" display="none" transform="translate(0,-6)"> + <rect id="rect4126" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#efebe7"/> + </g> + <g id="layer1" transform="matrix(1.0319689,0,0,1.0563566,-0.69397664,-6.778957)" stroke-miterlimit="4" stroke-width="0" fill="#bebebe"> + <path id="path5070" fill-rule="evenodd" d="m1.6415,10.204,6.7832,3.7866-6.7832,3.7866z"/> + <path id="path5067" d="m15.208,13.991c0-3.658-3.131-6.6271-6.7834-6.6271-2.109,0-4.1361,1.0094-5.348,2.5503l0.85177,0.47616c1.034-1.2658,2.7359-2.0798,4.4963-2.0798,3.1115-1E-7,5.8141,2.5683,5.8141,5.6799,0,3.1115-2.7025,5.6799-5.8141,5.6799-1.7553,0-3.5475-0.92376-4.5815-2.183l-0.84886,0.47427c1.2122,1.5345,3.3264,2.6554,5.4304,2.6554,3.6524,0,6.7832-2.9686,6.7832-6.6266z"/> + <path id="path5648" d="m12.301,13.99c0-2.2361-1.64-3.7866-3.8761-3.7866-1.1905,0-2.0368,0.32699-2.7782,1.1454l0.8789,0.49036c0.55229-0.54547,1.065-0.68916,1.8993-0.68916,1.6896,0,2.9071,1.1392,2.9071,2.84s-1.2175,2.84-2.9071,2.84c-0.84982,0-1.4491-0.21841-2.0039-0.78193l-0.86824,0.48468c0.74137,0.81851,1.6817,1.2439,2.8722,1.2439,2.2361,0,3.8761-1.5505,3.8761-3.7866z"/> + </g> +</svg> diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c index 2167769..50506e5 100644 --- a/mate-about/mate-about.c +++ b/mate-about/mate-about.c @@ -69,18 +69,8 @@ void mate_about_run(void) { mate_about_dialog = (MateAboutDialog*) mate_about_dialog_new(); - GtkIconTheme* icon_theme = gtk_icon_theme_get_default(); - - if (gtk_icon_theme_has_icon(icon_theme, icon)) - { - gtk_window_set_default_icon_name(icon); - mate_about_dialog_set_logo_icon_name(mate_about_dialog, icon); - } - else - { - gtk_window_set_default_icon_name(desktop_icon); - mate_about_dialog_set_logo_icon_name(mate_about_dialog, desktop_icon); - } + gtk_window_set_default_icon_name(icon); + mate_about_dialog_set_logo_icon_name(mate_about_dialog, icon); // name mate_about_dialog_set_program_name(mate_about_dialog, gettext(program_name)); diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h index f4ecba0..9bf285a 100644 --- a/mate-about/mate-about.h +++ b/mate-about/mate-about.h @@ -31,7 +31,6 @@ const char* program_name = "MATE Desktop Environment"; const char* version = PACKAGE_VERSION; const char* icon = "mate"; -const char* desktop_icon = "desktop"; const char* website = "http://www.mate-desktop.org/"; const char* copyright = "" diff --git a/tools/mate-color-select.c b/tools/mate-color-select.c index 5870ab3..73af718 100644 --- a/tools/mate-color-select.c +++ b/tools/mate-color-select.c @@ -58,6 +58,7 @@ main (int argc, char **argv) /* initialize GTK+ */ gtk_init (&argc, &argv); + gtk_window_set_default_icon_name ("gtk-select-color"); color_dialog = mate_color_selection_dialog_new (_("MATE Color Selection")); mate_color_selection_set_has_palette (MATE_COLOR_SELECTION_DIALOG (color_dialog)->colorsel, TRUE); diff --git a/tools/mate-color-select.desktop.in.in b/tools/mate-color-select.desktop.in.in index 99020b6..458ab6e 100644 --- a/tools/mate-color-select.desktop.in.in +++ b/tools/mate-color-select.desktop.in.in @@ -3,7 +3,7 @@ _Name=MATE Color Selection _GenericName=Color selection dialog _Comment=Choose colors from the palette or the screen Exec=mate-color-select -Icon=gcolor2 +Icon=gtk-select-color Terminal=false Type=Application Categories=GTK;Graphics; diff --git a/user-guide/mate-user-guide.desktop.in.in b/user-guide/mate-user-guide.desktop.in.in index 99d8d82..34ea7b0 100644 --- a/user-guide/mate-user-guide.desktop.in.in +++ b/user-guide/mate-user-guide.desktop.in.in @@ -3,7 +3,7 @@ Type=Application _Name=Help _Comment=Get help with MATE Keywords=documentation;information;manual; -Icon=help +Icon=help-browser Exec=yelp help:mate-user-guide StartupNotify=true Terminal=false |
