summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalló György <[email protected]>2015-07-29 01:53:34 +0200
committerraveit65 <[email protected]>2015-09-02 11:02:29 +0200
commit669179007231d19fbb02423b45b8351ba3d59546 (patch)
treef3a0388c0b3d1f156bff84d2596641b82361dda1
parent0669ff3f15eb392bfb2e31912a010d8d583db68b (diff)
downloadmate-utils-669179007231d19fbb02423b45b8351ba3d59546.tar.bz2
mate-utils-669179007231d19fbb02423b45b8351ba3d59546.tar.xz
logviewer: Provide an application icon
Based on this commit in gnome-system-log: https://git.gnome.org/browse/gnome-system-log/commit/?id=f3f63c20a0b9fd9e791dde542292f9931de6e86f
-rw-r--r--configure.ac1
-rw-r--r--logview/data/Makefile.am2
-rw-r--r--logview/data/icons/Makefile.am58
-rw-r--r--logview/data/icons/hicolor_apps_16x16_mate-system-log.pngbin0 -> 714 bytes
-rw-r--r--logview/data/icons/hicolor_apps_22x22_mate-system-log.pngbin0 -> 1337 bytes
-rw-r--r--logview/data/icons/hicolor_apps_256x256_mate-system-log.pngbin0 -> 59630 bytes
-rw-r--r--logview/data/icons/hicolor_apps_32x32_mate-system-log.pngbin0 -> 1944 bytes
-rw-r--r--logview/data/icons/hicolor_apps_48x48_mate-system-log.pngbin0 -> 3993 bytes
-rw-r--r--logview/data/icons/hicolor_apps_scalable_mate-system-log-symbolic.svg23
-rw-r--r--logview/data/mate-system-log.desktop.in.in2
-rw-r--r--logview/logview-app.c2
-rw-r--r--logview/logview-window.c2
12 files changed, 87 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 0d9f4520..263224fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,6 +395,7 @@ baobab/help/Makefile
logview/Makefile
logview/data/Makefile
logview/data/org.mate.system-log.gschema.xml
+logview/data/icons/Makefile
logview/tests/Makefile
logview/help/Makefile
diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am
index 93a713d6..ea98da7f 100644
--- a/logview/data/Makefile.am
+++ b/logview/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=icons
+
xmldir = $(pkgdatadir)
xml_DATA = logview-toolbar.xml logview-filter.ui
diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am
new file mode 100644
index 00000000..a87353f7
--- /dev/null
+++ b/logview/data/icons/Makefile.am
@@ -0,0 +1,58 @@
+NULL =
+
+public_icons_themes = \
+ hicolor \
+ $(NULL)
+
+public_icons = \
+ hicolor_apps_16x16_mate-system-log.png \
+ hicolor_apps_22x22_mate-system-log.png \
+ hicolor_apps_32x32_mate-system-log.png \
+ hicolor_apps_48x48_mate-system-log.png \
+ hicolor_apps_256x256_mate-system-log.png \
+ hicolor_apps_scalable_mate-system-log-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/logview/data/icons/hicolor_apps_16x16_mate-system-log.png b/logview/data/icons/hicolor_apps_16x16_mate-system-log.png
new file mode 100644
index 00000000..34638e07
--- /dev/null
+++ b/logview/data/icons/hicolor_apps_16x16_mate-system-log.png
Binary files differ
diff --git a/logview/data/icons/hicolor_apps_22x22_mate-system-log.png b/logview/data/icons/hicolor_apps_22x22_mate-system-log.png
new file mode 100644
index 00000000..ff6fad54
--- /dev/null
+++ b/logview/data/icons/hicolor_apps_22x22_mate-system-log.png
Binary files differ
diff --git a/logview/data/icons/hicolor_apps_256x256_mate-system-log.png b/logview/data/icons/hicolor_apps_256x256_mate-system-log.png
new file mode 100644
index 00000000..45334bf8
--- /dev/null
+++ b/logview/data/icons/hicolor_apps_256x256_mate-system-log.png
Binary files differ
diff --git a/logview/data/icons/hicolor_apps_32x32_mate-system-log.png b/logview/data/icons/hicolor_apps_32x32_mate-system-log.png
new file mode 100644
index 00000000..943028d1
--- /dev/null
+++ b/logview/data/icons/hicolor_apps_32x32_mate-system-log.png
Binary files differ
diff --git a/logview/data/icons/hicolor_apps_48x48_mate-system-log.png b/logview/data/icons/hicolor_apps_48x48_mate-system-log.png
new file mode 100644
index 00000000..b00429e9
--- /dev/null
+++ b/logview/data/icons/hicolor_apps_48x48_mate-system-log.png
Binary files differ
diff --git a/logview/data/icons/hicolor_apps_scalable_mate-system-log-symbolic.svg b/logview/data/icons/hicolor_apps_scalable_mate-system-log-symbolic.svg
new file mode 100644
index 00000000..df132b2a
--- /dev/null
+++ b/logview/data/icons/hicolor_apps_scalable_mate-system-log-symbolic.svg
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='logviewer-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.2 r9819' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+ <metadata id='metadata90'>
+ <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>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-70.23294' inkscape:cy='-15.428804' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='false' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1381' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='1600' inkscape:window-y='27' inkscape:zoom='16'>
+ <inkscape:grid empspacing='2' enabled='true' id='grid4866' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+ </sodipodi:namedview>
+ <title id='title9167'>Gnome Symbolic Icon Theme</title>
+ <defs id='defs7386'/>
+ <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-203.0002,-195)'>
+ <path inkscape:connector-curvature='0' d='m 203.0002,195 0,16 0.96875,0 c -0.44927,-0.52508 -0.39088,-0.99184 0.0312,-1.53125 l 2.54465,-2.5209 c -0.3395,-0.58519 -0.54465,-1.25698 -0.54465,-1.9791 0,-2.21358 1.80078,-4.03125 4,-4.03125 2.19923,0 4,1.81767 4,4.03125 0,2.21358 -1.80077,4.03125 -4,4.03125 -0.8092,0 -1.55582,-0.23556 -2.1875,-0.65625 L 205.03145,211 l 12,0 c -0.12596,-0.12596 -0.21875,-0.30779 -0.21875,-0.5 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.19221 -0.0928,0.37404 -0.21875,0.5 l 1,0 0,-16 -1,0 c -0.12596,0.12596 -0.30779,0.21875 -0.5,0.21875 -0.19221,0 -0.34279,-0.0928 -0.46875,-0.21875 l -12.0625,0 c -0.12596,0.12595 -0.27654,0.21875 -0.46875,0.21875 -0.19221,0 -0.37404,-0.0928 -0.5,-0.21875 z m 1.5,0.8125 c 0.38442,0 0.6875,0.30308 0.6875,0.6875 0,0.38442 -0.30308,0.71875 -0.6875,0.71875 -0.38442,0 -0.71875,-0.33433 -0.71875,-0.71875 0,-0.38442 0.33433,-0.6875 0.71875,-0.6875 z m 13,0 c 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.38442 -0.33433,0.71875 -0.71875,0.71875 -0.38442,0 -0.6875,-0.33433 -0.6875,-0.71875 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 z m -13,2 c 0.38442,0 0.6875,0.30308 0.6875,0.6875 0,0.38442 -0.30308,0.71875 -0.6875,0.71875 -0.38442,0 -0.71875,-0.33433 -0.71875,-0.71875 0,-0.38442 0.33433,-0.6875 0.71875,-0.6875 z m 13,0 c 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.38442 -0.33433,0.71875 -0.71875,0.71875 -0.38442,0 -0.6875,-0.33433 -0.6875,-0.71875 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 z m -13,2 c 0.38442,0 0.6875,0.30308 0.6875,0.6875 0,0.38442 -0.30308,0.71875 -0.6875,0.71875 -0.38442,0 -0.71875,-0.33433 -0.71875,-0.71875 0,-0.38442 0.33433,-0.6875 0.71875,-0.6875 z m 13,0 c 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.38442 -0.33433,0.71875 -0.71875,0.71875 -0.38442,0 -0.6875,-0.33433 -0.6875,-0.71875 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 z m -13,2 c 0.38442,0 0.6875,0.30308 0.6875,0.6875 0,0.38442 -0.30308,0.71875 -0.6875,0.71875 -0.38442,0 -0.71875,-0.33433 -0.71875,-0.71875 0,-0.38442 0.33433,-0.6875 0.71875,-0.6875 z m 13,0 c 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.38442 -0.33433,0.71875 -0.71875,0.71875 -0.38442,0 -0.6875,-0.33433 -0.6875,-0.71875 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 z m -7.45979,1.20312 c -1.1122,0 -1.99105,0.89617 -1.99105,2.01563 0,1.11946 0.87885,2.01562 1.99105,2.01562 1.1122,0 1.99104,-0.89616 1.99104,-2.01562 0,-1.11946 -0.87884,-2.01563 -1.99104,-2.01563 z m -5.54021,0.79688 c 0.38442,0 0.6875,0.30308 0.6875,0.6875 0,0.38442 -0.30308,0.71875 -0.6875,0.71875 -0.38442,0 -0.71875,-0.33433 -0.71875,-0.71875 0,-0.38442 0.33433,-0.6875 0.71875,-0.6875 z m 13,0 c 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.38442 -0.33433,0.71875 -0.71875,0.71875 -0.38442,0 -0.6875,-0.33433 -0.6875,-0.71875 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 z m -13,2 c 0.38442,0 0.6875,0.30308 0.6875,0.6875 0,0.38442 -0.30308,0.71875 -0.6875,0.71875 -0.38442,0 -0.71875,-0.33433 -0.71875,-0.71875 0,-0.38442 0.33433,-0.6875 0.71875,-0.6875 z m 13,0 c 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.38442 -0.33433,0.71875 -0.71875,0.71875 -0.38442,0 -0.6875,-0.33433 -0.6875,-0.71875 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 z m 0,2 c 0.38442,0 0.71875,0.30308 0.71875,0.6875 0,0.38442 -0.33433,0.71875 -0.71875,0.71875 -0.38442,0 -0.6875,-0.33433 -0.6875,-0.71875 0,-0.38442 0.30308,-0.6875 0.6875,-0.6875 z' id='path10349' sodipodi:nodetypes='cccccsssscccsssccccsccsccssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
+
+ </g>
+</svg>
diff --git a/logview/data/mate-system-log.desktop.in.in b/logview/data/mate-system-log.desktop.in.in
index 0d2e2cd8..77bb9595 100644
--- a/logview/data/mate-system-log.desktop.in.in
+++ b/logview/data/mate-system-log.desktop.in.in
@@ -2,7 +2,7 @@
_Name=Log File Viewer
_Comment=View or monitor system log files
Exec=mate-system-log
-Icon=logviewer
+Icon=mate-system-log
Terminal=false
Type=Application
StartupNotify=true
diff --git a/logview/logview-app.c b/logview/logview-app.c
index b5ef8b45..ffa37ec7 100644
--- a/logview/logview-app.c
+++ b/logview/logview-app.c
@@ -79,7 +79,7 @@ logview_app_set_window (LogviewApp *app)
retval = TRUE;
}
- gtk_window_set_default_icon_name ("logviewer");
+ gtk_window_set_default_icon_name ("mate-system-log");
return retval;
}
diff --git a/logview/logview-window.c b/logview/logview-window.c
index 31966fd4..dd2e9c6b 100644
--- a/logview/logview-window.c
+++ b/logview/logview-window.c
@@ -770,7 +770,7 @@ logview_about (GtkWidget *widget, GtkWidget *window)
"translator_credits", strcmp (logview_about_translator_credits,
"translator-credits") != 0 ?
logview_about_translator_credits : NULL,
- "logo_icon_name", "logviewer",
+ "logo_icon_name", "mate-system-log",
NULL);
g_free (license_trans);