Skip to content

Commit 00227b9

Browse files
committed
apps: Adds desktop files and iconsfor wlm[cpu|mem|net]graph DockApps.
1 parent 6adc836 commit 00227b9

File tree

8 files changed

+85
-0
lines changed

8 files changed

+85
-0
lines changed

doc/ROADMAP.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ See the [Detailed Feature List](FEATURES.md) for details.
3636
* Initial placement algorithm.
3737

3838
* Infrastructure
39+
* [done] Dockapps for monitoring CPU, memory and network ([#431](https://github.com/phkaeser/wlmaker/pull/431)).
3940
* [done] Build with wlroots-0.20 (tested with -rc1).
4041
* [done] Read keymap from `/etc/default/keyboard` or similar.
4142
* [done] Support copy-paste and middle-click paste ([#399](https://github.com/phkaeser/wlmaker/issues/399)).

share/CMakeLists.txt

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,30 @@ INSTALL(
3535
FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmclock.desktop
3636
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
3737

38+
CONFIGURE_FILE(
39+
${CMAKE_CURRENT_SOURCE_DIR}/wlmaker.wlmcpugraph.desktop.in
40+
${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmcpugraph.desktop
41+
@ONLY)
42+
INSTALL(
43+
FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmcpugraph.desktop
44+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
45+
46+
CONFIGURE_FILE(
47+
${CMAKE_CURRENT_SOURCE_DIR}/wlmaker.wlmnetgraph.desktop.in
48+
${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmnetgraph.desktop
49+
@ONLY)
50+
INSTALL(
51+
FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmnetgraph.desktop
52+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
53+
54+
CONFIGURE_FILE(
55+
${CMAKE_CURRENT_SOURCE_DIR}/wlmaker.wlmmemgraph.desktop.in
56+
${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmmemgraph.desktop
57+
@ONLY)
58+
INSTALL(
59+
FILES ${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmmemgraph.desktop
60+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
61+
3862
CONFIGURE_FILE(
3963
${CMAKE_CURRENT_SOURCE_DIR}/wlmaker.wlmeyes.desktop.in
4064
${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmeyes.desktop
@@ -59,6 +83,27 @@ IF(DESKTOP_FILE_VALIDATOR)
5983
SET_PROPERTY(
6084
TEST wlmclock_desktop_test
6185
PROPERTY FAIL_REGULAR_EXPRESSION " error: ")
86+
ADD_TEST(
87+
NAME wlmcpugraph_desktop_test
88+
COMMAND ${DESKTOP_FILE_VALIDATOR} "${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmcpugraph.desktop")
89+
# We also want to report errors that are not "fatal" yet.
90+
SET_PROPERTY(
91+
TEST wlmcpugraph_desktop_test
92+
PROPERTY FAIL_REGULAR_EXPRESSION " error: ")
93+
ADD_TEST(
94+
NAME wlmnetgraph_desktop_test
95+
COMMAND ${DESKTOP_FILE_VALIDATOR} "${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmnetgraph.desktop")
96+
# We also want to report errors that are not "fatal" yet.
97+
SET_PROPERTY(
98+
TEST wlmnetgraph_desktop_test
99+
PROPERTY FAIL_REGULAR_EXPRESSION " error: ")
100+
ADD_TEST(
101+
NAME wlmmemgraph_desktop_test
102+
COMMAND ${DESKTOP_FILE_VALIDATOR} "${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmmemgraph.desktop")
103+
# We also want to report errors that are not "fatal" yet.
104+
SET_PROPERTY(
105+
TEST wlmmemgraph_desktop_test
106+
PROPERTY FAIL_REGULAR_EXPRESSION " error: ")
62107
ADD_TEST(
63108
NAME wlmeyes_desktop_test
64109
COMMAND ${DESKTOP_FILE_VALIDATOR} "${CMAKE_CURRENT_BINARY_DIR}/wlmaker.wlmeyes.desktop")
@@ -86,6 +131,18 @@ INSTALL(FILES
86131
wlmclock-64x64.png
87132
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps
88133
RENAME wlmclock.png)
134+
INSTALL(FILES
135+
wlmcpugraph-64x64.png
136+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps
137+
RENAME wlmcpugraph.png)
138+
INSTALL(FILES
139+
wlmmemgraph-64x64.png
140+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps
141+
RENAME wlmmemgraph.png)
142+
INSTALL(FILES
143+
wlmnetgraph-64x64.png
144+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps
145+
RENAME wlmnetgraph.png)
89146

90147
INSTALL(FILES
91148
wlmeyes-64x64.png
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[Desktop Entry]
2+
Name=WLMCPUGraph
3+
GenericName="Wayland Maker CPU usage graph dockapp"
4+
Comment="Display CPU usage"
5+
Exec=@CMAKE_INSTALL_PREFIX@/bin/wlmcpugraph
6+
Type=Application
7+
Categories=Utility;Monitor;
8+
Keywords=cpu;monitoring;dockapp;wlmaker
9+
Icon=wlmcpugraph
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[Desktop Entry]
2+
Name=WLMMemGraph
3+
GenericName="Wayland Maker memory usage graph dockapp"
4+
Comment="Display memory usage"
5+
Exec=@CMAKE_INSTALL_PREFIX@/bin/wlmmemgraph
6+
Type=Application
7+
Categories=Utility;Monitor;
8+
Keywords=memory;monitoring;dockapp;wlmaker
9+
Icon=wlmmemgraph
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[Desktop Entry]
2+
Name=WLMNetGraph
3+
GenericName="Wayland Maker network usage graph dockapp"
4+
Comment="Display network usage"
5+
Exec=@CMAKE_INSTALL_PREFIX@/bin/wlmnetgraph
6+
Type=Application
7+
Categories=Utility;Monitor;
8+
Keywords=network;monitoring;dockapp;wlmaker
9+
Icon=wlmnetgraph

share/wlmcpugraph-64x64.png

1.51 KB
Loading

share/wlmmemgraph-64x64.png

1.68 KB
Loading

share/wlmnetgraph-64x64.png

1.44 KB
Loading

0 commit comments

Comments
 (0)