Skip to content

Commit

Permalink
Merge branch 'wip/descriptive-icons'
Browse files Browse the repository at this point in the history
- use icon foreach device type, which is smartphone-symbolic, tablet-symbolic, computer-symbolic, laptop-symbolic.
- install icons to hicolor folder, icons is taken from Gnome icon theme
  • Loading branch information
vikoadi committed Nov 8, 2014
2 parents c6d41b7 + fce3b01 commit 4c5fe6d
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 1 deletion.
13 changes: 13 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,16 @@ add_executable(${CONTRACTOR_EXEC} ${VALA_C})
install (TARGETS ${CONTRACTOR_EXEC} RUNTIME DESTINATION bin)
# install .contract file
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/kdeconnect.contract DESTINATION ${DATADIR}/contractor/)

#install icons
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/smartphone-symbolic.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/devices/)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/tablet-symbolic.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/devices/)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/computer-symbolic.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/devices/)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/laptop-symbolic.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/devices/)

install(
CODE
"execute_process (COMMAND gtk-update-icon-cache -t -f ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)"
CODE
"message (STATUS \"Updated icon cache in ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor\")"
)
2 changes: 2 additions & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ICON:
Gnome Icon Theme
18 changes: 18 additions & 0 deletions data/computer-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions data/laptop-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions data/smartphone-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions data/tablet-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/DeviceIndicator.vala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace KDEConnectIndicator {

indicator = new AppIndicator.Indicator (
path,
ICON_NAME,
device.icon_name + "-symbolic",
AppIndicator.IndicatorCategory.HARDWARE);
indicator.set_status (AppIndicator.IndicatorStatus.ACTIVE);

Expand Down

0 comments on commit 4c5fe6d

Please sign in to comment.