add application icon

Change-Id: Ibb7da31e6ae598c91987e9c191047f451c003fe5
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9245e39..e6c18cf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,12 @@ ENDIF(NOT DEFINED IMAGEDIR)
 IF(NOT DEFINED PACKAGEDIR)
        SET(PACKAGEDIR "/usr/share/packages")
 ENDIF(NOT DEFINED PACKAGEDIR)
+IF(NOT DEFINED DESKTOP_ICONDIR)
+       SET(DESKTOP_ICONDIR "/usr/share/icons")
+ENDIF(NOT DEFINED DESKTOP_ICONDIR)
+IF(NOT DEFINED DESKTOP_ICON)
+       SET(DESKTOP_ICON ${PACKAGE_NAME}.png)
+ENDIF(NOT DEFINED DESKTOP_ICON)
 
 SET(SRCS
 src/main.c
@@ -90,4 +96,6 @@ CONFIGURE_FILE(${PACKAGE_NAME}.xml.in ${PACKAGE_NAME}.xml)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION ${PACKAGEDIR})
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images DESTINATION ${RESDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${DESKTOP_ICON} DESTINATION ${DESKTOP_ICONDIR})
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images DESTINATION ${RESDIR})
 ADD_SUBDIRECTORY(res/edc)

diff --git a/org.tizen.mediahub.png b/org.tizen.mediahub.png
new file mode 100644 (file)
index 0000000..39f839d
Binary files /dev/null and b/org.tizen.mediahub.png differ

diff --git a/org.tizen.mediahub.xml.in b/org.tizen.mediahub.xml.in
index 1c659b4..eb61bd4 100644 (file)
--- a/org.tizen.mediahub.xml.in
+++ b/org.tizen.mediahub.xml.in
@@ -3,7 +3,8 @@
        <label>Media Hub</label>
        <author email="jehun.lim@samsung.com" href="www.samsung.com">Jehun Lim</author>
        <description>Media Hub</description>
-       <ui-application appid="@PACKAGE_NAME@" exec="@BINDIR@/@PROJECT_NAME@" nodisplay="true" multiple="false" type="capp" taskmanage="true">
+       <ui-application appid="@PACKAGE_NAME@" exec="@BINDIR@/@PROJECT_NAME@" nodisplay="false" multiple="false" type="capp" taskmanage="true">
+               <icon>org.tizen.mediahub.png</icon>
                <label>Media Hub </label>
        </ui-application>
 </manifest>

diff --git a/packaging/org.tizen.mediahub.spec b/packaging/org.tizen.mediahub.spec
index 969283d..ddeabd9 100644 (file)
--- a/packaging/org.tizen.mediahub.spec
+++ b/packaging/org.tizen.mediahub.spec
@@ -18,6 +18,7 @@ BuildRequires: pkgconfig(app-utils)
 %define _resdir %{_appdir}/res
 %define _localedir %{_resdir}/locale
 %define _pkgdir %{_datadir}/packages
+%define _desktop_icondir /usr/share/icons
 
 %description
 Media Hub Application
@@ -33,6 +34,8 @@ cmake \
        -DBINDIR=%{_bindir} \
        -DLOCALEDIR=%{_localedir} \
        -DPACKAGEDIR=%{_pkgdir} \
+       -DDESKTOP_ICONDIR=%{_desktop_icondir} \
+       -DDESKTOP_ICON=%{name}.png \
        -DVERSION=%{version}
 
 make %{?jobs:-j%jobs}
@@ -49,4 +52,5 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %{_resdir}/*
 %{_pkgdir}/%{name}.xml
+%{_desktop_icondir}/%{name}.png
 %defattr(-,app,app,-)