aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYordan Karadzhov <ykaradzhov@vmware.com>2019-06-07 12:50:55 +0300
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-07-19 18:13:47 -0400
commit11d683a8aaabc15a43bd084fb7ddac8d427e2ba4 (patch)
tree24a03c7e8310de2af37276214f111d42b0dbc7d3
parente5a8e0b67d90d7d733098c334585a8c73efcf7ca (diff)
downloadtrace-cmd-11d683a8aaabc15a43bd084fb7ddac8d427e2ba4.tar.gz
kernel-shark: Start using the new logo and icon
The new Logo is shown on the title page of the doxygen documentation. The two new icons are installed ("jumping shark" and "fin only"). The "jumping shark" icon is used by default. Link: http://lore.kernel.org/linux-trace-devel/20190607095056.14666-3-ykaradzhov@vmware.com Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel-shark/CMakeLists.txt6
-rw-r--r--kernel-shark/doc/dox_config3
-rw-r--r--kernel-shark/src/CMakeLists.txt1
3 files changed, 8 insertions, 2 deletions
diff --git a/kernel-shark/CMakeLists.txt b/kernel-shark/CMakeLists.txt
index 23d64499..45c6f233 100644
--- a/kernel-shark/CMakeLists.txt
+++ b/kernel-shark/CMakeLists.txt
@@ -55,7 +55,11 @@ if (NOT _INSTALL_PREFIX)
endif (NOT _INSTALL_PREFIX)
set(KS_PLUGIN_INSTALL_PREFIX ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/plugins/)
-set(KS_ICON ksharkicon.png)
+
+set(KS_ICON KS_icon_shark.svg)
+set(KS_ICON_FIN KS_icon_fin.svg)
+set(KS_LOGO KS_logo_symbol.svg)
+set(KS_LOGO_LABEL KS_logo_horizontal.svg)
set(CMAKE_INSTALL_RPATH "${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/")
diff --git a/kernel-shark/doc/dox_config b/kernel-shark/doc/dox_config
index c6c53dfa..43c7f84e 100644
--- a/kernel-shark/doc/dox_config
+++ b/kernel-shark/doc/dox_config
@@ -2,7 +2,7 @@
# http://www.doxygen.org/manual/config.html
DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "kernel-shark"
+PROJECT_NAME = "KernelShark"
PROJECT_BRIEF = "Kernel Shark is a front-end reader of the Linux kernel tracing data."
INPUT = ../src/ ../src/plugins/
SOURCE_BROWSER = YES
@@ -13,3 +13,4 @@ CASE_SENSE_NAMES = YES
SORT_MEMBER_DOCS = NO
STRICT_PROTO_MATCHING = YES
DOT_MULTI_TARGETS = YES
+PROJECT_LOGO = ../icons/KS_logo_stacked.svg
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index 12289933..d91c3650 100644
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
@@ -89,6 +89,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
DESTINATION ${_INSTALL_PREFIX}/share/applications/)
install(FILES "${KS_DIR}/icons/${KS_ICON}"
+ "${KS_DIR}/icons/${KS_ICON_FIN}"
DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME})
install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy"