Compare commits
870 Commits
Author | SHA1 | Date | |
---|---|---|---|
314f00669f | |||
de9d90df4a | |||
883659272d | |||
0c443e9278 | |||
7363e083e5 | |||
6ec30b71d1 | |||
fc663f92dc | |||
4ed19a38d9 | |||
e592de9555 | |||
1e0316c4de | |||
91abbdcd96 | |||
e81d765098 | |||
8eaf444a25 | |||
183e7d8a20 | |||
a4a1ae064f | |||
3e81cd16bb | |||
55319521b2 | |||
e525cb4742 | |||
0f19bce80d | |||
e0df575aa9 | |||
276248a748 | |||
c05a87a540 | |||
9f46a17b98 | |||
c2a18f8845 | |||
308b721c87 | |||
c4c37406a5 | |||
ffb66586d3 | |||
935fa04757 | |||
fee70b7385 | |||
ed21e3fb18 | |||
5807d4d75e | |||
5bd95fe41a | |||
13edbc5eb1 | |||
3b41239672 | |||
b30bd35add | |||
4bba061d66 | |||
ce30d90a23 | |||
423eabd857 | |||
e5a9e99438 | |||
eb911551eb | |||
5886dcc50b | |||
2d7d4c55a2 | |||
ea5d73d8fd | |||
c7cfdd66d3 | |||
081f7a3c88 | |||
707fa727c5 | |||
c2cee4943e | |||
5d0c05e856 | |||
4625afa0b9 | |||
5c56f813d2 | |||
5e08434835 | |||
d2e6f2fe38 | |||
e90e1da096 | |||
9d0a1bd70c | |||
7ce3e8b1cf | |||
7a00dce7c5 | |||
760d9f91c7 | |||
1a7530a847 | |||
1702045550 | |||
fe88c72498 | |||
737759d03f | |||
1a5caee4bc | |||
934e30819c | |||
a4d3a09f26 | |||
acc4df92bc | |||
b4658d61b2 | |||
0a723aef82 | |||
1a50484deb | |||
271b8d55cf | |||
1afc33abef | |||
6b8244f3c4 | |||
ff2032cca1 | |||
05aafc43e7 | |||
d0c96ce829 | |||
6e62ceaac7 | |||
4109f21bf6 | |||
6e99e262d4 | |||
1b4d1d6944 | |||
8be4cc6e82 | |||
99c750fd0b | |||
fca8019972 | |||
8d3dd0ed96 | |||
4974948151 | |||
9e50ade6a5 | |||
801eea9a8b | |||
1841fb5ed2 | |||
9c8dbdcb41 | |||
53afc07457 | |||
1caecb427b | |||
ea10d526d5 | |||
b818586a23 | |||
a30e6ba21b | |||
fe38d9133b | |||
38c5589c10 | |||
ce09ab753b | |||
10f556e41b | |||
d097e154ff | |||
8979ddf52b | |||
d3dd9b3390 | |||
5615fd3ff9 | |||
cbb8415a95 | |||
8dcdae9611 | |||
bfdaadfc8b | |||
9543122816 | |||
6a24fc3f63 | |||
73d1b0a69f | |||
06f4882a2d | |||
7565ea2e82 | |||
004a97800c | |||
8dfb6b609f | |||
f893b34e19 | |||
a189e1af38 | |||
0332c59daf | |||
26b375254a | |||
89cb4b74fd | |||
ea1d5fca86 | |||
c3c46ff1b1 | |||
87406f70c4 | |||
d520f55afc | |||
77a94aa0c1 | |||
c103986f37 | |||
7568ae2a3b | |||
2ea5824fd7 | |||
47439ef151 | |||
63d19f038c | |||
9d5864aa62 | |||
d74cd645fd | |||
80767c9dbf | |||
57ad8a0a2b | |||
eea636c6f1 | |||
65141ff528 | |||
f882756fad | |||
335fbb137e | |||
fcb698e7fc | |||
f1b5208bb2 | |||
c9f5be6a60 | |||
f7094ca187 | |||
a326ebdabf | |||
3ee1d4c30e | |||
31c129163b | |||
80c994bce0 | |||
8aa6d0c626 | |||
33623fe75e | |||
ecf4be8d9c | |||
7f6a2d8100 | |||
086870e9c2 | |||
1c52cf72be | |||
8e598bbd13 | |||
877f58784b | |||
8cc2e5ad02 | |||
ee6cf60aa4 | |||
6449465be2 | |||
3403d1de50 | |||
f9ddf690c7 | |||
87652eb774 | |||
a9924a1432 | |||
c5cb5cb359 | |||
65c8f552de | |||
486267256c | |||
94e87ee570 | |||
b17aeb88e3 | |||
7d8036b0e1 | |||
4d1c05d737 | |||
95ede170d9 | |||
80d926290c | |||
5b9984d950 | |||
e5b1102abf | |||
f3f9239984 | |||
18c993c0d5 | |||
a9e3e3f087 | |||
a7b2d16342 | |||
8f6d9e7ab5 | |||
22dcebe647 | |||
6e087f418f | |||
b76cbb8ce3 | |||
24ad32b6ca | |||
51b7d3aa09 | |||
3674fba669 | |||
f1116d1f83 | |||
bcf757477b | |||
1864dc71d5 | |||
90c33ab24d | |||
052d8a034c | |||
064cd7e44f | |||
9e59b22c32 | |||
89f6661fa5 | |||
7836fbf77f | |||
d90d9e2c6f | |||
53918f4528 | |||
927e93b7fc | |||
fbf89f61b4 | |||
77675a8e2f | |||
4adf457ada | |||
0d4211b2c4 | |||
085eec7a3d | |||
baf5085506 | |||
17a0c61b4a | |||
3497922928 | |||
2f88c7ae60 | |||
8e8ac2f3c7 | |||
5cd5272f10 | |||
bee8e2f180 | |||
bf16e72e1e | |||
faf259e339 | |||
f6a6704fd2 | |||
4a0da3f978 | |||
e4e8f299c0 | |||
71ae832bcd | |||
1465657648 | |||
0f1763cb81 | |||
b20a96d32f | |||
75d101cc8b | |||
5d9d551afe | |||
78b7a87c29 | |||
bc2071a493 | |||
5a0541d06d | |||
18789f78b3 | |||
ab01c9fa08 | |||
620c4bd1e3 | |||
4337379177 | |||
69c09d9ff8 | |||
cae9e0d2e3 | |||
7b154af1b3 | |||
fd3ed61191 | |||
2a257de1e6 | |||
6f09737f0f | |||
b73fb19409 | |||
c57a92b687 | |||
72f0d4587b | |||
ea7c15d865 | |||
2dccc92933 | |||
e71da9bdfb | |||
f717c984b7 | |||
906ad56c46 | |||
301a908aed | |||
6bd7788aa9 | |||
51c7299ad0 | |||
326c65528d | |||
14aab3b758 | |||
7c37134aab | |||
734cbe2f4c | |||
082efcc127 | |||
4bcdb3a7ff | |||
5ad0c533f0 | |||
d57e54b714 | |||
13f2d560d0 | |||
2220ad6bfe | |||
97f2e78308 | |||
3771ce6ec2 | |||
46db3fee4c | |||
a339f9a743 | |||
24d45c6d48 | |||
4e52d16f1a | |||
097b63415e | |||
77388deab6 | |||
d01d8f95e5 | |||
22586811de | |||
7eb82c8c8d | |||
82dda14260 | |||
f8e9945bc4 | |||
139554578c | |||
1827f641f9 | |||
aef1a736c8 | |||
27a80274ac | |||
0e3f83f361 | |||
d30df9dafc | |||
f7a6b86cae | |||
a3e7a84b92 | |||
48e98239d9 | |||
354fd3cd0c | |||
15abe54290 | |||
60cbc40e9f | |||
bfa4f9e98e | |||
2514dcc74d | |||
e9146b3b6c | |||
4a499a6157 | |||
d216ee1f79 | |||
81ceaa8160 | |||
d4c7095d61 | |||
d9409c25f4 | |||
7d1e035240 | |||
fa795121aa | |||
b9fda3e1cd | |||
1187c43e57 | |||
4a6aaa95b0 | |||
7e42c8cb49 | |||
88f0ebfe96 | |||
86458b8238 | |||
bd65e44002 | |||
fe7f82373b | |||
3a6033e676 | |||
453d4d5149 | |||
07c753b703 | |||
52b1255d3f | |||
7f665fef77 | |||
7ff1515c94 | |||
162708295d | |||
4a59acae09 | |||
be9203e816 | |||
5af4b0c40c | |||
071d7fdb78 | |||
6916c8f992 | |||
89d573450a | |||
50f3ef5bba | |||
8cae273ffb | |||
15d4d7667d | |||
95a5eec108 | |||
2c7b072829 | |||
362f1fd87e | |||
5c474e822b | |||
d856fa8e97 | |||
54e1545bb1 | |||
636978b442 | |||
384097625c | |||
5ddf720a57 | |||
1610c190b4 | |||
beb2682b04 | |||
c1cf8185a3 | |||
fb7fc4a104 | |||
210415cdff | |||
bfac30c304 | |||
966c6059a0 | |||
1c78e0d779 | |||
fba58c27e8 | |||
4b679ff570 | |||
d8d2311621 | |||
809936a563 | |||
2c1aa1a4c9 | |||
02305b93d9 | |||
aece0e2eff | |||
c24e41d557 | |||
5be3f9246b | |||
81d99e66b9 | |||
940ef13ffa | |||
5ee1cec909 | |||
83ec82debd | |||
ac089dee9c | |||
2d9ca281a9 | |||
99e38118a4 | |||
68dd2432cd | |||
919a10fff6 | |||
d0ba320e1b | |||
8545192ef8 | |||
f77cf7c1aa | |||
dd262c3d84 | |||
df87850f65 | |||
c2db8740b8 | |||
75ab84e993 | |||
c161004640 | |||
c1a8c17ecb | |||
17a8a1734b | |||
8645260f99 | |||
0e1b101703 | |||
2db2de4c27 | |||
af0dd25b86 | |||
3be733a775 | |||
d3ab0a7228 | |||
440d180c20 | |||
827275da3f | |||
6f86e8ec5e | |||
f1e6f74c7d | |||
f7e24f680a | |||
69c1f0ed5a | |||
c4612d84ed | |||
228d6500d3 | |||
befdf0519f | |||
79d2b07d57 | |||
84f6f1a820 | |||
92ce241742 | |||
ab2a444c84 | |||
0fa274ad75 | |||
82e2bc23a1 | |||
4cc44c1d59 | |||
d20db1b888 | |||
120e201c5b | |||
24eb548bb3 | |||
646e897058 | |||
95b6b2d9e9 | |||
dddc3962a5 | |||
f08600db61 | |||
0ba74b3130 | |||
0298a8c088 | |||
bf5c500938 | |||
9e45b02c8e | |||
ab0ab0d40f | |||
f5e40d084d | |||
d00ab81fe9 | |||
09275731aa | |||
be26033ff7 | |||
70020d0aef | |||
7218defe19 | |||
200ecc7196 | |||
6689bea9a7 | |||
5940ec4531 | |||
2716f77eb2 | |||
cfdcaae036 | |||
82c1839634 | |||
08dae3b02b | |||
cc2b1b7b8a | |||
4c27382467 | |||
aacb50c946 | |||
466faf53fa | |||
8228d1d06b | |||
37726370ee | |||
07305d7578 | |||
b97c821c8f | |||
b50c1d2363 | |||
713aa611d9 | |||
319755179f | |||
9509d87962 | |||
6d58a3f05c | |||
2cca290630 | |||
29b75e2b12 | |||
835eb00f0d | |||
a5e9b32b28 | |||
fbdc9112aa | |||
b3fc0501ba | |||
a74c65a2a3 | |||
4858c9dbcd | |||
3601b4246d | |||
241e13ffd8 | |||
7a5d2d5dd4 | |||
24b143f43a | |||
df473c53b5 | |||
3122c2fa8c | |||
08cb7d9abe | |||
e38863ebc2 | |||
1cddf6f14d | |||
7405b2ba1d | |||
6fbe897b27 | |||
5f7c35a37c | |||
6173b60806 | |||
4c9e39ec9b | |||
429393998c | |||
c9acb0bdcd | |||
16305a91c4 | |||
bbb9aa0747 | |||
983b808247 | |||
c61a5ac092 | |||
3b6df44489 | |||
4742617e3e | |||
880a986782 | |||
b699095f38 | |||
a065e96bc3 | |||
1110929b14 | |||
c7d998eb12 | |||
eb63ef5e96 | |||
327d5a7ff9 | |||
2b9505207c | |||
cd36c4ed68 | |||
903a1a454d | |||
cf5d713d2e | |||
467a3bf508 | |||
4e78e0e1dd | |||
d01fb91e36 | |||
61ed3a444f | |||
494590475a | |||
27ab7d9cd7 | |||
1869a68122 | |||
aa0a4b417d | |||
41deb8ef72 | |||
aa15e13713 | |||
ad63f78929 | |||
224e558a98 | |||
a391df2804 | |||
755d0b39f8 | |||
fcd612880f | |||
5aff2d2e4e | |||
5a52c056a7 | |||
42615a6fdc | |||
b431d2c6cf | |||
f96b3fcb07 | |||
f534a6854a | |||
b51c97abbb | |||
8dc3510a30 | |||
fce098cb5c | |||
5f4bf9ec29 | |||
8c73b2560b | |||
78931b3ae0 | |||
a53c5ec38c | |||
3bac9ac09f | |||
b82d78bcbe | |||
396fa95ec3 | |||
c6cadba4b6 | |||
daa362fc16 | |||
26c51007e0 | |||
7919e6d250 | |||
88c3e780cf | |||
7f4dfe1060 | |||
15d88ee3ba | |||
104bb52557 | |||
9a6b883905 | |||
fd8f2127d9 | |||
7ae90bf82d | |||
bcf26156d1 | |||
4cee2535ee | |||
e1ebd87871 | |||
4cef889fd4 | |||
d785839d1d | |||
cf6ccc293b | |||
e9ee6150c1 | |||
30577e91ec | |||
e5006ed2d6 | |||
3bd73d0458 | |||
4dbf5150fc | |||
061244b1d0 | |||
8055647f34 | |||
d74c7cb030 | |||
f5006af977 | |||
16d7d2bc20 | |||
6e27717dc8 | |||
d1f1d79752 | |||
862d14dc0e | |||
685c0390b4 | |||
35a5aa6a6c | |||
681fec4cac | |||
bb88892125 | |||
f01fd96cf6 | |||
eac1319889 | |||
86d4bd76ea | |||
27fd4e8f1e | |||
9611677254 | |||
a61cff7caa | |||
4966a0a5bf | |||
b1abf74e89 | |||
16170c72b0 | |||
c5a0ba3796 | |||
cce37d66e5 | |||
c850aaf2a3 | |||
43efbbba72 | |||
3a0cbee39f | |||
213595b3c1 | |||
f5fbb80d91 | |||
0288e6e1eb | |||
6667b45919 | |||
9ff07241b1 | |||
cc7b7b5659 | |||
3e709f549d | |||
adcf6c942f | |||
7415a6830f | |||
c23846f7b4 | |||
e957a2723b | |||
5369bbda65 | |||
6a8842163e | |||
56e7ee3d11 | |||
ce72c46cd9 | |||
78ab09c1da | |||
498a965488 | |||
d1d4a97fa4 | |||
8f1e8606d4 | |||
b682c6dbd6 | |||
c8bf047e76 | |||
a336d9aa04 | |||
2272b0c2c0 | |||
0533ee8cd5 | |||
be792a4c5a | |||
997e13706b | |||
6bcb6798a2 | |||
4e3593a2a9 | |||
4b471593c7 | |||
695a85be29 | |||
bae34ba898 | |||
93db63b16c | |||
0cd2ff6813 | |||
222db43dc1 | |||
e4be3b2e02 | |||
543e39a7ac | |||
ca60a85241 | |||
2c3c575493 | |||
5f37a9d8c7 | |||
c3420a8393 | |||
5ce3a5c213 | |||
179a97b01b | |||
f0c79a4dab | |||
f56f319075 | |||
f7b7d5b6b4 | |||
3193de1a85 | |||
8cdfdd4e81 | |||
16d7ca2005 | |||
e54ab7e1a5 | |||
a335979830 | |||
8460d07875 | |||
5ec26c7747 | |||
8aafdb6fc4 | |||
9eedaf246f | |||
e7714042bb | |||
0f4bbbfba1 | |||
7069758b73 | |||
bbc9d72606 | |||
b53b1111f9 | |||
64fdc4bebe | |||
583046e195 | |||
71b3a4e6ab | |||
4b90fac0c4 | |||
2fa0acf13d | |||
0f9d2e52ab | |||
373bab14db | |||
7e095c4349 | |||
a4af7ffc07 | |||
0ab4878b22 | |||
1748829901 | |||
6a41fa2b8a | |||
2cd04e1f7f | |||
0a61d926f8 | |||
45c248b101 | |||
6a784d2e28 | |||
13023a4985 | |||
6463ed3bf7 | |||
5bf3847bc9 | |||
4fc2e238bd | |||
c18bb61521 | |||
9e82210463 | |||
171d545562 | |||
c6fa1f2a79 | |||
14cee9dbc7 | |||
5759273e4c | |||
4387bb1e76 | |||
03af5f0e49 | |||
7f6afbcb4d | |||
4a320bc5d6 | |||
29d34525a3 | |||
0ab74b493c | |||
952fa97fcc | |||
677ed1ab5e | |||
deb0b3bdbb | |||
20c85f0d42 | |||
f9a37f0cb2 | |||
0c8013c26b | |||
6b9e19ed58 | |||
432ab694fd | |||
c506183247 | |||
fe822518d5 | |||
1f9e8221f0 | |||
d7e93e83a3 | |||
17c3383616 | |||
830bab7cb6 | |||
0b3832cc32 | |||
e64ca5ec08 | |||
84b93098f2 | |||
17bef06c98 | |||
db7573de80 | |||
4907496a2e | |||
43daae5529 | |||
1d1fe469f8 | |||
99049164be | |||
f61948d9b3 | |||
ea54c54d42 | |||
c843c5260d | |||
a8912074dd | |||
2be0edcb40 | |||
fcf7ca233f | |||
aa127574c4 | |||
d72f827984 | |||
b7d607bfcc | |||
c727947557 | |||
6864e5bda0 | |||
4babb3ba04 | |||
e0aadc48c4 | |||
18b6fc6eef | |||
5406f6f66f | |||
ab966504cc | |||
ce761db924 | |||
f91c80b5b1 | |||
97fbb4acc1 | |||
554354ce36 | |||
c007fabe12 | |||
3b11e39e99 | |||
653cc4fd84 | |||
eae742c559 | |||
e339f5aa1a | |||
21a1d8cd1b | |||
0ea17555b1 | |||
eec87be7a2 | |||
0cd293c4c3 | |||
e5c70b9535 | |||
3ef68f7a43 | |||
1fbc9e315e | |||
28dafcb721 | |||
4164c7fe04 | |||
bc8aadc17b | |||
cd48ac8245 | |||
0751d080eb | |||
6c6cfe9a04 | |||
b61d514cb2 | |||
a5c352bc06 | |||
54174974b1 | |||
fd81fda9a1 | |||
c69957e905 | |||
a65f4cb02f | |||
3b89b30a98 | |||
5921bd4c1d | |||
5b26d835df | |||
38c4d3bfaf | |||
eac50a8799 | |||
6e5a068ad2 | |||
7f639805e6 | |||
8a6650f833 | |||
96cfeb520d | |||
7cd80e14a7 | |||
b55d453aeb | |||
7eb5197318 | |||
e603ad9977 | |||
068a976499 | |||
5b44fa5c75 | |||
87614084ab | |||
8ccad0b86c | |||
0240dee6ea | |||
81105fb12d | |||
93abb86340 | |||
5584ba0e9f | |||
2c35031549 | |||
d28d7156ce | |||
123cfcb475 | |||
7fa541bc06 | |||
03574461a9 | |||
f588c9af8d | |||
ee39ac9203 | |||
5ea8c97094 | |||
edf3a72564 | |||
b9c9aac686 | |||
7dd7251a45 | |||
1ccbc264ed | |||
334189b8a1 | |||
6c7d6a5443 | |||
e37f2a7190 | |||
baf21549d5 | |||
07c2abd5bc | |||
2ea73b2261 | |||
7c3b47693e | |||
0fe67ce323 | |||
bfb7d72faf | |||
662b952961 | |||
a81cbe3d9c | |||
0462bb186e | |||
9985fe6260 | |||
11a6f01ae3 | |||
43ee40a65d | |||
f9eb27964f | |||
bab9f58b35 | |||
608908fd02 | |||
178bbd0bc0 | |||
f8a02a48ac | |||
cf39fba9c2 | |||
6643852822 | |||
7145a1d33e | |||
a3c1f4ea66 | |||
a6ddd53308 | |||
744f3bc04b | |||
afdf86f03a | |||
8f2784d2a2 | |||
926da88c10 | |||
ea287c21b1 | |||
c0561a95e0 | |||
b7d1802ca8 | |||
c659f16d7e | |||
79cbfc4b32 | |||
61e2a380b9 | |||
64bc89ba75 | |||
926d112d22 | |||
e205664fec | |||
5d13c8289f | |||
7ac5d68b02 | |||
69b5bdec66 | |||
5ce7aac9dd | |||
80eb7983fc | |||
7e2b1384ae | |||
d573cc7491 | |||
b380000d2f | |||
50d96574f5 | |||
d6819e3771 | |||
a54b3064fe | |||
a0288bcf96 | |||
f1e22f122e | |||
52f85836a2 | |||
2ad638c158 | |||
cebf3b9aea | |||
e32a37043a | |||
246430dc28 | |||
dd4471a0d2 | |||
31c612cfd2 | |||
2201f4d4a2 | |||
886e24d4af | |||
fbf5f649ee | |||
7fc7b68358 | |||
9904e5d6c6 | |||
e10f3396b9 | |||
25ff5a9189 | |||
41b1282488 | |||
5d46988745 | |||
71823471cc | |||
fe580ef806 | |||
b1f8340774 | |||
e868b03454 | |||
632adfa54c | |||
4476ec8e45 | |||
b4f7b6e65a | |||
77349e797f | |||
e7b6e4a3bf | |||
3d8f88d935 | |||
1eed0f458c | |||
9b581a882f | |||
6ba1288c50 | |||
926c283338 | |||
8519eb51bd | |||
f05b256306 | |||
6fd7bad8f9 | |||
6f4ecbd107 | |||
9f392c3a19 | |||
e04430e36c | |||
68759513a9 | |||
62164f8229 | |||
7c5e02217b | |||
23cd74132a | |||
5dfb02bf9d | |||
2d0a92eec1 | |||
359e81ff93 | |||
1bd80ba786 | |||
2a04414600 | |||
fe51e67ba4 | |||
e208be7894 | |||
26bf118d50 | |||
86da48bbca | |||
d081a64889 | |||
3d2c09647a | |||
c7a99a6d0d | |||
c0a273f9f7 | |||
5d724ac688 | |||
8e318a99d0 | |||
5c861b3814 | |||
5cf068875c | |||
80366e59bb | |||
a6a94f0e49 | |||
6a74802261 | |||
c44e98d8a1 | |||
b872a66088 | |||
74d54d6268 | |||
2ad6d76d4e | |||
878dac158e | |||
2de09cec32 | |||
90ca8c89f5 | |||
757d7b703f | |||
5d3e377ffb | |||
9b5a6908d7 | |||
f54ba7a6cf | |||
7427183981 | |||
109328e33b | |||
ec62e93e4e | |||
1a6d97800c | |||
b09e90a0e5 | |||
c1f18a31bf | |||
962478a27a | |||
4857c6658f | |||
4416298e88 | |||
a3576275cc | |||
9c8be61855 | |||
3fece265f4 | |||
cc26873200 | |||
2ee6949a59 | |||
1a99c0cb3d | |||
a0e8f373c0 | |||
f53179330b | |||
d1a0597b5f | |||
1c58b23fa2 | |||
4c442a7e73 | |||
3bfeabe537 | |||
cd99f059ff | |||
45de9145fb | |||
21418cdd18 | |||
cc1d062fd9 | |||
c9fd746cd0 |
12
.docker/Dockerfile-arch
Normal file
@ -0,0 +1,12 @@
|
||||
FROM archlinux
|
||||
|
||||
RUN pacman -Sy
|
||||
|
||||
# toolchain
|
||||
RUN echo -e 'y\ny' | pacman -S util-linux-libs
|
||||
RUN pacman -S --noconfirm base-devel cmake extra-cmake-modules python util-linux-libs
|
||||
# kf5 and qt5 libraries
|
||||
RUN pacman -S --noconfirm plasma-framework
|
||||
|
||||
# required by tests
|
||||
RUN pacman -S --noconfirm xorg-server-xvfb
|
14
.docker/Dockerfile-ubuntu-amd64
Normal file
@ -0,0 +1,14 @@
|
||||
FROM ubuntu:focal
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update
|
||||
# toolchain
|
||||
RUN apt-get install -yq cmake extra-cmake-modules g++ git gettext
|
||||
# kf5 and qt5 libraries
|
||||
RUN apt-get install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
|
||||
libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \
|
||||
plasma-framework
|
||||
|
||||
# required by tests
|
||||
RUN apt-get install -yq xvfb
|
14
.docker/build-arch.sh
Executable file
@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
rm -rf build-arch
|
||||
mkdir build-arch
|
||||
|
||||
# build
|
||||
cd build-arch
|
||||
cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_TESTING=ON ../sources
|
||||
make
|
||||
|
||||
# tests
|
||||
xvfb-run -a make test
|
15
.docker/build-ubuntu-package.sh
Executable file
@ -0,0 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
rm -rf build-ubuntu
|
||||
mkdir build-ubuntu
|
||||
|
||||
# patches
|
||||
git apply patches/qt5.14-splitbehavior-and-qset.patch
|
||||
|
||||
# build
|
||||
cd build-ubuntu
|
||||
cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_DEB_PACKAGE=ON ../sources
|
||||
make package
|
||||
|
17
.docker/build-ubuntu.sh
Executable file
@ -0,0 +1,17 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
rm -rf build-ubuntu
|
||||
mkdir build-ubuntu
|
||||
|
||||
# patches
|
||||
git apply patches/qt5.14-splitbehavior-and-qset.patch
|
||||
|
||||
# build
|
||||
cd build-ubuntu
|
||||
cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_TESTING=ON ../sources
|
||||
make
|
||||
|
||||
# tests
|
||||
xvfb-run -a make test
|
53
.gitignore
vendored
@ -1,3 +1,50 @@
|
||||
sources/build
|
||||
sources/usr
|
||||
*-src.tar.xz
|
||||
# Compiled Object files
|
||||
*.slo
|
||||
*.lo
|
||||
*.o
|
||||
*.obj
|
||||
|
||||
# Precompiled Headers
|
||||
*.gch
|
||||
*.pch
|
||||
|
||||
# Compiled Dynamic libraries
|
||||
*.so
|
||||
*.dylib
|
||||
*.dll
|
||||
|
||||
# Fortran module files
|
||||
*.mod
|
||||
|
||||
# Compiled Static libraries
|
||||
*.lai
|
||||
*.la
|
||||
*.a
|
||||
*.lib
|
||||
|
||||
# Executables
|
||||
*.exe
|
||||
*.out
|
||||
*.app
|
||||
|
||||
# cmake
|
||||
CMakeCache.txt
|
||||
CMakeFiles
|
||||
CMakeScripts
|
||||
Makefile
|
||||
cmake_install.cmake
|
||||
install_manifest.txt
|
||||
|
||||
# build directory
|
||||
build
|
||||
|
||||
# archives
|
||||
*src.tar.[gx]z
|
||||
*pkg.tar.[gx]z
|
||||
src
|
||||
pkg
|
||||
*.deb
|
||||
|
||||
# clion settings
|
||||
.idea
|
||||
cmake-build*
|
||||
|
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
[submodule "sources/3rdparty/fontdialog"]
|
||||
path = sources/3rdparty/fontdialog
|
||||
url = https://github.com/arcan1s/qtadds-fontdialog.git
|
14
.travis.yml
Normal file
@ -0,0 +1,14 @@
|
||||
sudo: required
|
||||
language: generic
|
||||
|
||||
env:
|
||||
- DOCKER_TAG_ARCH="arcan1s/awesome-widgets-arch"
|
||||
|
||||
services:
|
||||
- docker
|
||||
|
||||
before_install:
|
||||
- docker build --tag="${DOCKER_TAG_ARCH}" -f ".docker/Dockerfile-arch" ".docker"
|
||||
|
||||
script:
|
||||
- docker run --rm -v "$(pwd):/opt/build" -w /opt/build "${DOCKER_TAG_ARCH}" sh -c ".docker/build-arch.sh"
|
8
.tx/config
Normal file
@ -0,0 +1,8 @@
|
||||
[main]
|
||||
host = https://www.transifex.com
|
||||
|
||||
[awesome-widgets.awesome-widgetspot]
|
||||
source_file = sources/translations/awesome-widgets.pot
|
||||
source_lang = en
|
||||
type = PO
|
||||
file_filter = sources/translations/<lang>.po
|
12
AUTHORS
@ -1,5 +1,15 @@
|
||||
Current developers:
|
||||
Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
|
||||
|
||||
Packagers:
|
||||
Konstantin Voinov (openSuSe)
|
||||
|
||||
Translators:
|
||||
@Mermouy (french translations)
|
||||
@Mermouy (French)
|
||||
Ernesto Avilés Vzqz (Spanish)
|
||||
@underr (Brazillian Portuguese)
|
||||
Виктор Слободян (Ukrainian)
|
||||
Steve Lemuel (Chinese)
|
||||
Mariusz Kocoń (Polish)
|
||||
Ibnu Daru Aji (Indonesian)
|
||||
Antonio Vivace (Italian)
|
||||
|
465
CHANGELOG
@ -1,12 +1,383 @@
|
||||
Ver.3.4.2:
|
||||
+ Italian translation (#136, thanks to @avivace)
|
||||
+ stooq quotes support (default) (#131)
|
||||
+ Indonesian translation (#132, thanks to @ibnuda)
|
||||
+ new keys - $batleftN, $batnowN, $batrateN, $battotalN, $brightness, $volume
|
||||
* fix compiler warnings
|
||||
* update to new qt api
|
||||
- fix non printable spaces (#142, #143)
|
||||
|
||||
|
||||
Ver.3.3.3:
|
||||
+ add custom keys support (#101)
|
||||
* DBus interface improvements
|
||||
* rename tags (up|down|ps)total.* to (up|down|ps)tot.*
|
||||
- fix issue with invalid (up|down)total($|kb) calculation (#127)
|
||||
- fix issue with wrong applet identation (#125)
|
||||
|
||||
Ver.3.3.2:
|
||||
- fix bug with invalid DP colour configuration
|
||||
- fix bug with invalid HTML tags operation
|
||||
* update to newest Qt and plasma
|
||||
|
||||
Ver.3.3.1:
|
||||
+ add ability to direct issue report (#104)
|
||||
+ add key completion (#105)
|
||||
+ add ability to load historical configuration (#106)
|
||||
+ add ability to upload configuration to remote server (#106)
|
||||
+ add stylish (#112)
|
||||
+ add DBus intergration (#115)
|
||||
+ add cron-like extenstion triggers (`X-AW-Socket` option) (#117)
|
||||
+ add ability to trigger extensions by calling socket (`X-AW-Schedule` option) (#118)
|
||||
+ add source for network requests
|
||||
+ add Json formatter
|
||||
- drop patches provided support for Qt 5.4
|
||||
* use custom signal slot connection for dataengine (`BUILD_FUTURE` flag required)
|
||||
* update UI
|
||||
* refactoring
|
||||
|
||||
Ver.3.2.1:
|
||||
+ add X-AW-Translate option to DateTime formatter
|
||||
+ add formatters to configuration export and import
|
||||
+ add macro fuction to selector
|
||||
+ add default formatters
|
||||
- add translation reinit (fix #102)
|
||||
- fix invalid float formatter saving
|
||||
- fix missing ApiVersion for formatters
|
||||
* use sockets for MPD data
|
||||
* translation update
|
||||
|
||||
Ver.3.2.0:
|
||||
+ custom formatters (#91)
|
||||
+ add backend tests (#95)
|
||||
+ add OWM weather provider for ExtWeather. It can be switched by using X-AW-Provider (ApiVer 3)
|
||||
+ add DBus timeout for calls (#96)
|
||||
+ add macros support (`$aw_macro` and `$aw_macro_*` for calls)
|
||||
- fix vertical alignment (#94)
|
||||
- fix bug with invalid updates on `X-AW-Interval=1` for ExtScript and ExtUpgrade
|
||||
- fix bug with missing derivate vaules in ExtQuotes
|
||||
- fix possible plasma crash (#96)
|
||||
- fix possible undefined behaviour if no extensions was found by name
|
||||
* split dataengine sources to own library
|
||||
* allow to use screened double brakets inside functions
|
||||
|
||||
Ver.3.1.2:
|
||||
+ add standalone widget configuration example
|
||||
+ new tag tstime
|
||||
+ new tags uptotal* and downtotal*
|
||||
+ add background configuration button
|
||||
+ allow X-AW-Direction property works with graphs and bars (graphical items)
|
||||
+ add bars support to Graphical Items
|
||||
+ add integration with transifex
|
||||
+ add integration with coverity
|
||||
- drop update source (breaking changes if you are using it as developer)
|
||||
- fix pen generation from file image (graphical items)
|
||||
- fix bug with which font html parameters will be pasted even if there cancel clicked
|
||||
- fix bug with invalid total memory formating
|
||||
- fix bug in configuration UI with which there is no selected text pasted
|
||||
- fixes in graphical item configuration UI and behaviour
|
||||
- fix changelog building
|
||||
- fix invalid cast (found by coverity)
|
||||
* change text update mechanism
|
||||
* grahical item improvements
|
||||
* code improvements
|
||||
* translation update
|
||||
|
||||
Ver.3.1.1:
|
||||
- fix broken gcc build (#87)
|
||||
* translation update
|
||||
|
||||
Ver.3.1.0:
|
||||
+ implement templates support (#71)
|
||||
+ implement special functions (#71)
|
||||
+ special directory for configs (#72)
|
||||
+ custom bar images (#80)
|
||||
+ custom bar values (#80)
|
||||
+ show changelog after updates
|
||||
+ add Polish translation (thanks to Mariusz Kocoń)
|
||||
+ use Qt-5.6 features
|
||||
- fix invalid tooltip resize in desktop panel (#74)
|
||||
- fix graphical items blinking (#81)
|
||||
- drop tasks and move to native QProcess to avoid crash (#83)
|
||||
- the newest Qt (5.6) fixes
|
||||
- the newest Plasma fixes
|
||||
* move from OWM to Yahoo! Weather (#73)
|
||||
* improve performance by using optimized subscriptions (#75)
|
||||
* improve performance by storing QVariant instead of frequent casting (#75)
|
||||
* change bar names semantic to the simplest one (#80, breaking changes)
|
||||
* high memory usage notifications have been changed from 90 to 80 perc
|
||||
* a large part of refactoring
|
||||
|
||||
Ver.3.0.1:
|
||||
+ add patches for old Qt versions
|
||||
- drop `nullptr` checking
|
||||
* move dialogs to QML part
|
||||
|
||||
Ver.3.0.0:
|
||||
+ add tags upunits, downunits, upkb, downkb
|
||||
+ add tags dalbum, dartist, dtitle, salbum, sartist, stitle
|
||||
+ add support of lambda functions
|
||||
+ add Dutch translation (thanks to Heimen Stoffels)
|
||||
+ add check for update function on startup (optional)
|
||||
+ add ability to disable string tags translations
|
||||
+ add filtering to ExtUpgrade (ApiVer == 3)
|
||||
+ add ability to change weather icons (ApiVer == 2)
|
||||
+ show message if no updates found on direct request
|
||||
+ add swap redirect type to ExtScript (ApiVer == 4)
|
||||
+ add ability to wrap words
|
||||
+ add support of graphs to GraphicalItems (ApiVer == 3)
|
||||
+ add ability to show preview from configuration
|
||||
+ add configuration export and import functions
|
||||
- fix warning for empty tooltip image
|
||||
- fix bug with widget auto resizing
|
||||
- fix bug with no settings saving in DE
|
||||
- fix bug with large start size
|
||||
- fix bug with no possibility use more than 10 ext tags
|
||||
- drop HDD free space notifications
|
||||
- drop X-AW-Output key for ExtScript (ApiVer == 4)
|
||||
- fix possible crash on web sources destruction
|
||||
* more pretty configuration ui
|
||||
* improve logging, change format to Qt5 style
|
||||
* switch to concurrent data update
|
||||
* some more optimization
|
||||
* better network device definition
|
||||
* quotes values now have double type (ApiVer == 3)
|
||||
* better quotes output
|
||||
* more comments inside code
|
||||
* more Qt code style
|
||||
* move update interval to another group
|
||||
* move DataEnignes operations to plugin
|
||||
* change DataEngine data format (breaking changes)
|
||||
|
||||
Ver.2.4.0:
|
||||
+ add support of weather items
|
||||
+ add support of load average (la1, la5, la15 tags)
|
||||
+ add "drop key cache" button
|
||||
+ add support of clang building
|
||||
+ create ExtItems aggregator
|
||||
+ add time to debug information
|
||||
+ add ability to disable player monitor
|
||||
- fix bug with invalid network data calculation
|
||||
- fix warning with fond dialog init
|
||||
- fix bug with no object deletions (#60)
|
||||
* rewrite ExtItems to use own abstract class
|
||||
* improve work with data updating (#57)
|
||||
* move to signal-slot interface painting
|
||||
* move plugin part back to private
|
||||
* cast plugin as type, not signleton (#57)
|
||||
* change logic in data building inside DataEngine
|
||||
* edit build and drop different DataEngine packaging
|
||||
* rewrite QMap to QHash if possible
|
||||
* rewrite to use iterators if possible
|
||||
* list of desktops is now represented as QStringList
|
||||
* refactoring
|
||||
|
||||
Ver.2.3.3:
|
||||
* change text rendering from Qt to native
|
||||
|
||||
Ver.2.3.2:
|
||||
+ change network speed units from KB/s to MB/s if value is more than 1000 KB/s (metrics are the same)
|
||||
- fix bug with no actions on link activation (thanks to infans)
|
||||
* improve quotes support, e.g. fix plasma crash
|
||||
* rewrite main widget to signal-slot update model
|
||||
* improve battery calculation for system which has several batteries
|
||||
|
||||
Ver.2.3.1:
|
||||
- fix bug with no updates from configuration UI
|
||||
- fix invalid vertical tab parsing
|
||||
* translation update
|
||||
* merge fan tags to temp ones, improve lmsensors tags handling
|
||||
|
||||
Ver.2.3.0:
|
||||
+ implement fitlers support to ExtScripts (ApiVer = 3) (#53)
|
||||
+ implement ability to wrap `\n` as new lines (#53)
|
||||
+ implement key sorting in comboboxes
|
||||
+ implement (perc)(bid|ask|price)chg tag support (ApiVer = 2)
|
||||
+ implement timeouts to quotes (#54)
|
||||
- fix bug with invalid html parsing
|
||||
* move from XML to JSON in ExtQuotes (ApiVer = 2)
|
||||
* more pretty configuration UI
|
||||
* some part of refactoring
|
||||
|
||||
Ver.2.2.2:
|
||||
+ add quotes support (#46)
|
||||
+ add support of properties height and width (#47)
|
||||
+ add transtaltion support to the plugins (#50)
|
||||
+ add support of key caching
|
||||
+ add support of X-AW-Number to ExtScript and ExtUpgrade (ApiVer = 2)
|
||||
+ add reconnection to DataEngine (in some cases some values are not updated)
|
||||
+ add widgets width and height update
|
||||
- fix bug with Ext* items update (#49)
|
||||
- fix bug with GPUDEV, HDDDEV settings saving from UI
|
||||
- fix Desktop Panel settings
|
||||
- fix bug with adding paragraph settings
|
||||
* drop support of KDE4 support, created a separated branch
|
||||
* increase intervals limits (#48)
|
||||
* hddtemp was replaced to smartctl by default
|
||||
* plugins were moved from private
|
||||
* more correct interface painting
|
||||
|
||||
Ver.2.2.1:
|
||||
+ add key X-AW-Interval to ExtUpgrade (ApiVer = 1, default = 3600)
|
||||
+ add values cache to ExtScript and ExtUpgrade
|
||||
+ add support isActive to ExtUpgrade
|
||||
* change cmake version check
|
||||
* improve logic of ExtScript and ExtUpgrade
|
||||
|
||||
Ver.2.2.0:
|
||||
* port to Plasma 5
|
||||
+ add support of windows list in tooltip
|
||||
+ add notifications on system events
|
||||
+ add ability to show selected tag
|
||||
+ add tags $downN, $upN
|
||||
+ add new engine netdev
|
||||
+ add support of smartctl
|
||||
- remove ability to hide panel on hotkey
|
||||
* small changes in widget logic
|
||||
* edit window preview painting
|
||||
* KDE4 code upgrade to new ABI
|
||||
* DataEngine optimization
|
||||
* PKGCMD was replaced by ExtUpgrade
|
||||
|
||||
Ver.2.1.0:
|
||||
+ add support of custom scripts
|
||||
+ add support of desktop preview to DP
|
||||
+ add bar support
|
||||
+ add autoupdate function
|
||||
- remove custom command
|
||||
- fix #34
|
||||
* fix notifications
|
||||
* rewrite UI to KDE standards
|
||||
* fix margins on graphical objects
|
||||
* rewrite DP abd DE to use library calls
|
||||
* edit GPU properties definition
|
||||
* edit regexp matching
|
||||
|
||||
Ver.2.0.5:
|
||||
+ add tooltip bottom (#30)
|
||||
* fix network interface update
|
||||
* fix battery tooltip bug
|
||||
* edit DP layout (#31)
|
||||
|
||||
Ver.2.0.4:
|
||||
* more correct work with batteries
|
||||
|
||||
Ver.2.0.3:
|
||||
+ add support of several $bat tags
|
||||
* edit layout
|
||||
|
||||
Ver.2.0.2:
|
||||
+ add $fan* tags
|
||||
+ add Chinese translation (thanks to @Lemueler)
|
||||
+ add net devices checking is it p2p device
|
||||
- remove ps stats from notification
|
||||
* yet another fix cpu* and cpucl*
|
||||
* rewrite DP configuration interface
|
||||
* fix non-standard temp units
|
||||
|
||||
Ver.2.0.1:
|
||||
+ add support of custom interfaces
|
||||
* fix label edge's shading
|
||||
* fix cpu*, cpucl*, gpu*, ps* tags
|
||||
|
||||
Ver.2.0.0:
|
||||
+ add new widget - awesome widget
|
||||
+ add new tags $hddfreemb, $hddfreegb, $memusedmb, $memusedgb, $memfreemb $memfreegb, $swapfreemb, $swapfreegb
|
||||
+ add new DataEngine - battery
|
||||
+ add new tooltip - battery
|
||||
+ add new temperature units cm^-1, kcal/mol, kJ/mol, Reamur
|
||||
+ add ability to hide panels by hotkey pressing
|
||||
- remove widget pytextmonitor
|
||||
- remove separate fields
|
||||
- remove README
|
||||
* project has been renamed to Awesome Widgets
|
||||
* rename tag $custom (time) to $ctime
|
||||
* rename tag $custom (uptime) to $cuptime
|
||||
* rename tag $time (player) to $duration
|
||||
* rename tag $number to $ndesktop
|
||||
* rename tag $name to $desktop
|
||||
* rename tag $total to $tdesktops
|
||||
* debug flag is DEBUG now
|
||||
* rewrite project to C++
|
||||
* tooltip doesn't depend on widget now
|
||||
* text align now can be configured only by using HTML tags
|
||||
* move battery and AC settings to DataEngine
|
||||
* changes in configuration interface
|
||||
|
||||
Ver.1.11.0:
|
||||
+ add ability to disable background image
|
||||
+ add desktop DataEngine
|
||||
+ add PTM desktop panel
|
||||
+ add desktop label (tags $name, $number, $total)
|
||||
+ add ability to interact with players using mpris
|
||||
* rewrite to use submodules
|
||||
* rewrite DataEngine to use tasks
|
||||
* fix nvidia temperature definition
|
||||
|
||||
Ver.1.10.2:
|
||||
- fix error with tempUnits in hddtemp label
|
||||
|
||||
Ver.1.10.1:
|
||||
- fix error with number formats in ps label
|
||||
- fix first initialization of DataEngine
|
||||
- fix checking of qmmp
|
||||
|
||||
Ver.1.10.0:
|
||||
+ add tags $hddtotmb, $hddtotgb
|
||||
+ add tags $memtotmb, $memtotgb, $swaptotmb, $swaptotgb
|
||||
+ add ability for force update text
|
||||
+ add support of clementine
|
||||
+ add support of hddtemp cmd
|
||||
+ add support of disable option for HDDDEV and GPUDEV
|
||||
+ add error checking of DataEngine variables
|
||||
+ add multithreading to DataEngine
|
||||
+ add ability to disable popup messages
|
||||
+ add ability to use vertical layout
|
||||
+ add ability to add stretch
|
||||
+ add ability to show debug information (set environment variable 'PTM_DEBUG' to 'yes')
|
||||
+ add Brazillian Portuguese translation (@underr)
|
||||
+ add Ukrainian translation (Виктор Слободян)
|
||||
- remove util.py
|
||||
- remove createNotifyrc since it isn't needed
|
||||
* refactoring of configuration interface
|
||||
* player settings was moved from plasmoid to DataEngine
|
||||
* edit readme call
|
||||
* change readme from md to html
|
||||
|
||||
Ver.1.9.0:
|
||||
+ add support of several custom commands ($customN)
|
||||
+ add hdd speed label ($hddrN, $hddwN)
|
||||
+ add actions to context menu (open readme and run ksysguard)
|
||||
- remove doubleclick event
|
||||
* fix parsing pkg label
|
||||
|
||||
Ver.1.8.3:
|
||||
+ add Spanish translation (thanks to Ernesto Avilés Vzqz)
|
||||
+ add readme to the package
|
||||
|
||||
Ver.1.8.2:
|
||||
+ add different temperature units (Farenheit and Kelvin)
|
||||
|
||||
Ver.1.8.1:
|
||||
* change pkg update time to hour
|
||||
|
||||
Ver.1.8.0:
|
||||
+ add scrollbar to configuration interface
|
||||
+ add AC lines configuration
|
||||
+ add $hddmbN, $hddgbN tags
|
||||
+ add support of ps ($ps, $pscount, $pstotal tags)
|
||||
+ add support of package managers ($pkgcountN tags)
|
||||
* refactoring of DataEngine
|
||||
|
||||
Ver.1.7.4:
|
||||
+ added support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels
|
||||
+ add support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels
|
||||
- format bug fixes
|
||||
* changes in custom uptime format
|
||||
|
||||
Ver.1.7.3:
|
||||
+ added tags $memgb, $swapgb
|
||||
+ added readme directory
|
||||
+ added french translation (@Mermouy)
|
||||
+ add tags $memgb, $swapgb
|
||||
+ add readme directory
|
||||
+ add french translation (@Mermouy)
|
||||
- fix tooltip for custom uptime format
|
||||
- fix #12
|
||||
* more refactoring to the god of refactoring
|
||||
@ -15,108 +386,108 @@ Ver.1.7.3:
|
||||
* player_name now has str type
|
||||
|
||||
Ver.1.7.2:
|
||||
+ added tags $dd, $d, $hh, $h, $mm, $m to custom uptime format
|
||||
+ added scalling to tooltips
|
||||
+ added dataengine configuration from ptm
|
||||
+ added custom command to dataengine
|
||||
- removed custom command from ptm
|
||||
- removed tags $ds, $hs, $ms
|
||||
+ add tags $dd, $d, $hh, $h, $mm, $m to custom uptime format
|
||||
+ add scalling to tooltips
|
||||
+ add DataEngine configuration from ptm
|
||||
+ add custom command to DataEngine
|
||||
- remove custom command from ptm
|
||||
- remove tags $ds, $hs, $ms
|
||||
|
||||
Ver.1.7.1:
|
||||
- removed error label
|
||||
- remove error label
|
||||
* fix bug with zero values in tooltip
|
||||
|
||||
Ver.1.7.0:
|
||||
+ added support of several tags in temperature label
|
||||
+ added tags $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
|
||||
+ added label with custom command
|
||||
+ added tooltips for CPU, CPU clock, memory, swap and network labels
|
||||
- removed tags @@...@@, $temp, $ccpu, $ccpucl, $net
|
||||
+ add support of several tags in temperature label
|
||||
+ add tags $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
|
||||
+ add label with custom command
|
||||
+ add tooltips for CPU, CPU clock, memory, swap and network labels
|
||||
- remove tags @@...@@, $temp, $ccpu, $ccpucl, $net
|
||||
* changes in settings
|
||||
* ptm now does not require net-tools
|
||||
* refactoring
|
||||
|
||||
Ver.1.6.1:
|
||||
+ added support of several devices in hddtemp label
|
||||
+ add support of several devices in hddtemp label
|
||||
- fixed #6
|
||||
|
||||
Ver.1.6.0:
|
||||
+ added $custom tag to time and uptime labels (#8)
|
||||
+ add $custom tag to time and uptime labels (#8)
|
||||
+ russian translation
|
||||
- fixed #6, #10
|
||||
* changed license to GPLv3
|
||||
* changed project build
|
||||
- fix #6, #10
|
||||
* change license to GPLv3
|
||||
* change project build
|
||||
|
||||
Ver.1.5.3:
|
||||
+ added $album, $progress and $time tags to player label (#7)
|
||||
- fixed zero swap
|
||||
+ add $album, $progress and $time tags to player label (#7)
|
||||
- fix zero swap
|
||||
|
||||
Ver.1.5.2:
|
||||
+ added $isotime, $shorttime and $longtime tags to time label
|
||||
+ add $isotime, $shorttime and $longtime tags to time label
|
||||
|
||||
Ver.1.5.1:
|
||||
+ added time label
|
||||
+ add time label
|
||||
|
||||
Ver.1.5.0:
|
||||
+ added player label
|
||||
+ add player label
|
||||
|
||||
Ver.1.4.0:
|
||||
+ added notifications
|
||||
+ add notifications
|
||||
|
||||
Ver.1.3.6:
|
||||
- fixed #1, #2
|
||||
- fix #1, #2
|
||||
|
||||
Ver.1.3.5:
|
||||
- fix bug with definition network device
|
||||
|
||||
Ver.1.3.4:
|
||||
+ added double click event
|
||||
+ added auto selection of network device
|
||||
- fixed yet another plasma crash
|
||||
+ add double click event
|
||||
+ add auto selection of network device
|
||||
- fix yet another plasma crash
|
||||
|
||||
Ver.1.3.3:
|
||||
* edited reading temperature device
|
||||
* edit reading temperature device
|
||||
|
||||
Ver.1.3.2b:
|
||||
- fixed plasma crash
|
||||
- fix plasma crash
|
||||
|
||||
Ver.1.3.2:
|
||||
+ added GPU, GPU temperature, HDD and HDD temperature labels
|
||||
+ added $ccpu and $ccpucl tags
|
||||
+ add GPU, GPU temperature, HDD and HDD temperature labels
|
||||
+ add $ccpu and $ccpucl tags
|
||||
- bug fixes
|
||||
* optimization and refactoring
|
||||
|
||||
Ver.1.2.2:
|
||||
+ added tooltip to lineEdit
|
||||
+ add tooltip to lineEdit
|
||||
|
||||
Ver.1.2.1:
|
||||
* if battery doesn't exist return 'off'
|
||||
* if AC doesn't exist return '(?)'
|
||||
|
||||
Ver.1.2.0:
|
||||
+ added $ac tag to battery label
|
||||
+ added battery and ac device configurations
|
||||
+ added error cheking
|
||||
+ add $ac tag to battery label
|
||||
+ add battery and ac device configurations
|
||||
+ add error cheking
|
||||
* $bat tag now reading from /sys/*
|
||||
|
||||
Ver.1.1.4:
|
||||
* changed parsing acpi output (battery label)
|
||||
* change parsing acpi output (battery label)
|
||||
|
||||
Ver.1.1.3:
|
||||
+ added font weight
|
||||
* edited font setup line. Now setup for font family works normaly
|
||||
+ add font weight
|
||||
* edit font setup line. Now setup for font family works normaly
|
||||
* small bug fix
|
||||
|
||||
Ver.1.1.2:
|
||||
+ added CPU clock lable
|
||||
+ added function to update network device (100*time_interval)
|
||||
+ changed update sliders
|
||||
+ add CPU clock lable
|
||||
+ add function to update network device (100*time_interval)
|
||||
+ change update sliders
|
||||
|
||||
Ver.1.1.1:
|
||||
+ added $swapmb, $memmb, $netdev, @@netdev=...@@ tags
|
||||
+ add $swapmb, $memmb, $netdev, @@netdev=...@@ tags
|
||||
- some bug fixes
|
||||
* widget consists of several labels
|
||||
* edited configuration interface
|
||||
* edit configuration interface
|
||||
|
||||
Ver.1.0:
|
||||
First release
|
||||
|
122
CHANGELOG-RU
@ -1,122 +0,0 @@
|
||||
Вер.1.7.4:
|
||||
+ добавлена поддержка более чем 10 тэгов в полях cpu, cpuclock, hdd, hddtemp, temp
|
||||
- фиксы в форматах
|
||||
* изменения в кастомном формате аптайма
|
||||
|
||||
Вер.1.7.3:
|
||||
+ добавлены тэги $memgb, $swapgb
|
||||
+ добавлена директория readme
|
||||
+ добавлен французский перевод (@Mermouy)
|
||||
- фикс подсказки для кастомного формата аптайма
|
||||
- фикс #12
|
||||
* больше рефакторинга богу рефакторинга
|
||||
* интервал обновления сетевого интерфейса теперь 30*interval
|
||||
* тэги $swap, $swapmb и $swapgb теперь работают одновременно (тэги $mem* тоже)
|
||||
* player_name теперь имеет тип str
|
||||
|
||||
Вер.1.7.2:
|
||||
+ добавлены тэги $dd, $d, $hh, $h, $mm, $m в кастомный формат аптайма
|
||||
+ добавлено масштабирование в тултипы
|
||||
+ добавлена конфигурация DE из виджета
|
||||
+ добавлена кастомная команда в DE
|
||||
- удалена кастомная команда из виджета
|
||||
- удалены тэги $ds, $hs, $ms
|
||||
|
||||
Вер.1.7.1:
|
||||
- удалено поле с ошибкой
|
||||
* пофикшен баг с нулевым значением в тултипе
|
||||
|
||||
Вер.1.7.0:
|
||||
+ добавлена поддержка нескольких тэгов в поле температуры
|
||||
+ добавлены тэги $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
|
||||
+ добавлено поле с кастомной командой
|
||||
+ добавлены тултипы для полей CPU, частоты CPU, памяти, swap и сеть
|
||||
- удалены тэги @@...@@, $temp, $ccpu, $ccpucl, $net
|
||||
* изменения в настройках
|
||||
* виджет не требует больше net-tools
|
||||
* рефакторинг
|
||||
|
||||
Вер.1.6.1:
|
||||
+ добавлена поддержка нескольких девайсов в поле hddtemp
|
||||
- фикс #6
|
||||
|
||||
Вер.1.6.0:
|
||||
+ добавлен тэг $custom в поля time и uptime (#8)
|
||||
+ русский перевод
|
||||
- фикс #6, #10
|
||||
* лицензия изменена на GPLv3
|
||||
* изменения в сборке проекта
|
||||
|
||||
Вер.1.5.3:
|
||||
+ добавлены тэги $album, $progress и $time tags в поле плеера (#7)
|
||||
- фикс бага с нулевым свопом
|
||||
|
||||
Вер.1.5.2:
|
||||
+ добавлены тэги $isotime, $shorttime и $longtime в поле time
|
||||
|
||||
Вер.1.5.1:
|
||||
+ добавлено поле time
|
||||
|
||||
Вер.1.5.0:
|
||||
+ добавлено поле player
|
||||
|
||||
Вер.1.4.0:
|
||||
+ добавлены уведомления
|
||||
|
||||
Вер.1.3.6:
|
||||
- фикс #1, #2
|
||||
|
||||
Вер.1.3.5:
|
||||
- фикс бага с определением сетевого устройства
|
||||
|
||||
Вер.1.3.4:
|
||||
+ добавлено событие по двойному щелчку
|
||||
+ добавлен автовыбор сетевого устройства
|
||||
- фикс еще одного падения Плазмы
|
||||
|
||||
Вер.1.3.3:
|
||||
* редактирование чтения температурного устройства
|
||||
|
||||
Вер.1.3.2b:
|
||||
- фикс падения Плазмы
|
||||
|
||||
Вер.1.3.2:
|
||||
+ добавлены поля GPU, GPU temp, HDD и HDD temp
|
||||
+ добавлены тэги $ccpu и $ccpucl
|
||||
- фикс некоторых багов
|
||||
* оптимизация и рефакторинг
|
||||
|
||||
Вер.1.2.2:
|
||||
+ добавлен тултип в строки
|
||||
|
||||
Вер.1.2.1:
|
||||
* если батарея не существует, возвращает off
|
||||
* если AC не существует, возвращает '(?)'
|
||||
|
||||
Вер.1.2.0:
|
||||
+ добавлен тэг $ac в поле battery
|
||||
+ добавлена настройка устройств батареи и AC
|
||||
+ добавлена проверка ошибок
|
||||
* тэг $bat теперь читается из /sys/*
|
||||
|
||||
Вер.1.1.4:
|
||||
* изменения в парсинге acpi (поле battery)
|
||||
|
||||
Вер.1.1.3:
|
||||
+ добавлена настройка ширины шрифта
|
||||
- небольшие фиксы
|
||||
* отредактирована настройка шрифта. Теперь настройки для шрифта работают нормально
|
||||
|
||||
Вер.1.1.2:
|
||||
+ добавлено поле CPU clock
|
||||
+ добавлена функция для обновления сетевого интерфейса (100*time_interval)
|
||||
* изменено обновление слайдеров
|
||||
|
||||
Вер.1.1.1:
|
||||
+ добавлены тэги $swapmb, $memmb, $netdev, @@netdev=...@@
|
||||
- небольшие фиксы
|
||||
* виджет теперь состоит из нескольких полей
|
||||
* отредактирован конфигурационный интерфейс
|
||||
|
||||
Вер.1.0:
|
||||
Первый релиз
|
228
CONTRIBUTING.md
Normal file
@ -0,0 +1,228 @@
|
||||
Code style
|
||||
----------
|
||||
|
||||
The recommended code style is Qt one. See [this document](https://wiki.qt.io/Qt_Coding_Style)
|
||||
for more details. To avoid manual labor there is automatic cmake target named
|
||||
`clangformat` (see below). Some additional detail see below.
|
||||
|
||||
* Indent is only spaces. 4 spaces.
|
||||
* Any private variable should start with `m_` prefix (`m_foo`). The only one
|
||||
exception is `Ui` object which should be named as `ui`.
|
||||
* Avoid to create a large methods. Exception: if method contains lambda functions.
|
||||
* If some method is called only once, it is recommended to use lambda functions.
|
||||
Exception is `Q_INVOKABLE` methods.
|
||||
* STL containers are not recommended, use Qt ones instead.
|
||||
* In other hand Qt specific variables types (`qint`, `qfloat`, etc) are not
|
||||
recommended.
|
||||
* Do not repeat yourself ([DRY](https://en.wikipedia.org/wiki/Don't_repeat_yourself)).
|
||||
* Headers declaration:
|
||||
* Include only those headers which are strictly necessary inside headers. Use
|
||||
forward class declaration instead. Exception is base class header declaration.
|
||||
* In a`*.cpp` file header declaration should have the following order separated
|
||||
by a new line in the alphabet order:
|
||||
1. Class header.
|
||||
2. KDE specific headers.
|
||||
3. Qt specific headers.
|
||||
4. Third party headers.
|
||||
5. Project headers.
|
||||
* Any header should have [include guard](https://en.wikipedia.org/wiki/Include_guard)
|
||||
named as `CLASSNAMECAPS_H`
|
||||
* If any `#if` directive is used condition should be mentioned in `#endif`:
|
||||
|
||||
```
|
||||
#if (FOO)
|
||||
someCodeInside();
|
||||
#endif /* FOO */
|
||||
```
|
||||
|
||||
* `Q_PROPERTY` macro is allowed and recommended for QObject based classes.
|
||||
* Qt macros (e.g. `signals`, `slots`, `Q_OBJECT`, etc) are allowed. In other hand
|
||||
`Q_FOREACH` (`foreach`) is not allowed use `for (auto &foo : bar)` instead.
|
||||
* Current project standard is **C++17**.
|
||||
* Do not use C-like code:
|
||||
* C-like style iteration if possible. Use `for (auto &foo : bar)` and
|
||||
`std::for_each` instead if possible. It is also recommended to use iterators.
|
||||
* C-like casts, use `const_cast`, `static_cast`, `dymanic_Cast` instead. Using
|
||||
of `reinterpret_cast` is not recommended. It is highly recommended to use
|
||||
`dynamic_cast` with the exception catching. It is also possible to use
|
||||
`qvariant_cast` if required.
|
||||
* C-like `NULL`, use `nullptr` instead.
|
||||
* C-like constant definition, use `const vartype foo = bar` definition instead.
|
||||
* Abstract classes (which have at least one pure virtual method) are allowed.
|
||||
* Templates are allowed and recommended. Templates usually should be described
|
||||
inside header not source code file.
|
||||
* Hardcode is not recommended. But it is possible to use cmake variables to
|
||||
configure some items during build time.
|
||||
* Build should not require any additional system variable declaration/changing.
|
||||
* Any line should not end with space.
|
||||
* Do not hesitate move public methods to private one if possible.
|
||||
* Do not hesitate use `const` modifier. In other hand `volatile` modifier is not
|
||||
recommended.
|
||||
* New lines rules:
|
||||
* One line after license header.
|
||||
* One line between header group declaration (see above).
|
||||
* Two lines after header declaration and before declaration at the end of a
|
||||
file.
|
||||
* One line after class and types forward declarations in headers.
|
||||
* One line before each method modifiers (`public`, `public slots`, etc).
|
||||
* Two lines between methods inside source code (`*.cpp`).
|
||||
* One line after `qCDebug()` information (see below).
|
||||
* One line inside a method to improve code reading.
|
||||
* Each destructor should be virtual.
|
||||
* Class constructor should have default arguments. Use `QObject *parent` property
|
||||
for QObject based classes.
|
||||
* QObject based classes constructors should have explicit modifier.
|
||||
* Create one file (source and header) per class.
|
||||
* `else if` construction is allowed and recommended.
|
||||
* 'true ? foo : bar' construction is allowed and recommended for one-line assignment.
|
||||
* Any global pointer should be assign to `nullptr` after deletion and before
|
||||
initialization. Exception: if object is deleted into class destructor.
|
||||
* Do not use semicolon in qml files unless it is required.
|
||||
* Any method argument including class constructors should start with `_`.
|
||||
|
||||
Comments
|
||||
--------
|
||||
|
||||
Please do not hesitate to use comments inside source code (especially in non-obvious
|
||||
blocks). Comments also may use the following keywords:
|
||||
|
||||
* **TODO** - indicates that some new code should be implemented here later. Please
|
||||
note that usually these methods should be implemented before the next release.
|
||||
* **FIXME** - some dirty hacks and/or methods which should be done better.
|
||||
* **HACK** - hacks inside code which requires to avoid some restrictions and/or
|
||||
which adds additional non-obvious optimizations.
|
||||
|
||||
Do not use dots at the end of the comment line.
|
||||
|
||||
Development
|
||||
-----------
|
||||
|
||||
* Officially the latest libraries versions should be used. In addition it is
|
||||
possible to add workarounds for all versions (usually by using preprocessor
|
||||
directives); in this case patches should be placed to `packages` directory.
|
||||
* Build should not contain any warning.
|
||||
* Try to minimize message in Release build with logging disabled. It is highly
|
||||
recommended to fix KDE/Qt specific warning if possible
|
||||
* Do not use dependency to KDE libraries if there are no any strictly necessary.
|
||||
Exceptions are KNotification and KI18n libraries.
|
||||
* It is highly recommended to use submodules for third party libraries if possible.
|
||||
* The main branch is **development**. Changes in this branch may be merged to the
|
||||
master one only if it is a 'stable' build.
|
||||
* For experimental features development new branch `feature-foo` creation is allowed
|
||||
and recommended.
|
||||
* Experimental features should be added inside `BUILD_FUTURE` definition:
|
||||
|
||||
```
|
||||
#ifdef BUILD_FUTURE
|
||||
someTestFunctionInside();
|
||||
#endif /* BUILD_FUTURE */
|
||||
```
|
||||
|
||||
* Any project specific build variable should be mentioned inside `version.h` as
|
||||
well.
|
||||
* Recommended compiler is `clang`.
|
||||
|
||||
HIG
|
||||
---
|
||||
|
||||
The recommended HIG is [KDE one](https://techbase.kde.org/Projects/Usability/HIG).
|
||||
Avoid to paint interfaces inside plugin because QML and C++ parts may have different
|
||||
theming.
|
||||
|
||||
Licensing
|
||||
---------
|
||||
|
||||
All files should be licensed under GPLv3, the owner of the license should be the
|
||||
project (i.e. **awesome-widgets**). See **Tools** section for more details.
|
||||
|
||||
Logging
|
||||
-------
|
||||
|
||||
For logging please use [QLoggingCategory](http://doc.qt.io/qt-5/qloggingcategory.html).
|
||||
Available categories should be declared in `awdebug.*` files. The following log
|
||||
levels should be used:
|
||||
|
||||
* **debug** (`qCDebug()`) - method arguments information. Please note that it
|
||||
is recommended to logging all arguments in the one line.
|
||||
* **info** (`qCInfo()`) - additional information inside methods.
|
||||
* **warning** (`qCWarning()`) - not critical information, which may be caused by
|
||||
mistakes in configuration for example.
|
||||
* **critical** (`qCCritical()`) - a critical error. After this error program may
|
||||
be terminated.
|
||||
|
||||
The empty log string (e.g. `qCDebug();`) is not allowed because the method names
|
||||
will be stripped by compiler with `Release` build type. To log class constructor
|
||||
and destructor use `__PRETTY_FUNCTION__` macro.
|
||||
|
||||
Testing
|
||||
-------
|
||||
|
||||
* Any changes should be tested by using `plasmawindowed` and `plasmashell` applications.
|
||||
(It is also possible to use `plasmaengineexplorer` and `plasmoidviewer` in addition.)
|
||||
* Any test should be performed on real (not Virtual Machine) system.
|
||||
* Test builds should be:
|
||||
1. `-DCMAKE_BUILD_TYPE=Debug`.
|
||||
2. `-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON`.
|
||||
3. `-DCMAKE_BUILD_TYPE=Release`.
|
||||
* Additional test functions should be declated and used only inside `BUILD_TESTING`
|
||||
definition.
|
||||
|
||||
Tools
|
||||
-----
|
||||
|
||||
* For QString concatenation use `QString::arg` method.
|
||||
* Any source file should have license header:
|
||||
|
||||
```
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
```
|
||||
|
||||
* Recommended class constructor for QObject based classes:
|
||||
|
||||
```
|
||||
FooClass::FooClass(QObject *_parent, const QVariant _var)
|
||||
: QObject(_parent)
|
||||
, m_var(_var)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
// some code below if any
|
||||
}
|
||||
```
|
||||
|
||||
* Property usage:
|
||||
|
||||
```
|
||||
Q_PROPERTY(bool prop READ prop WRITE setProp);
|
||||
public:
|
||||
bool prop() const
|
||||
{
|
||||
return m_prop;
|
||||
};
|
||||
void setProp(const bool _prop)
|
||||
{
|
||||
// error checking if required
|
||||
m_prop = _prop
|
||||
}
|
||||
private:
|
||||
// declare with default value
|
||||
bool m_prop = false;
|
||||
```
|
||||
* Use `cppcheck` to avoid common errors in the code. To start application just
|
||||
run `make cppcheck`.
|
||||
* Use `clang-format` to apply valid code format. To start application just run
|
||||
`make clangformat`.
|
8
COPYING
@ -1,4 +1,4 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
pytextmonitor
|
||||
Copyright (C) 2013-2014 Evgeniy Alekseev
|
||||
{one line to give the program's name and a brief idea of what it does.}
|
||||
Copyright (C) {year} {name of author}
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
pytextmonitor Copyright (C) 2013 Evgeniy Alekseev
|
||||
{project} Copyright (C) {year} {fullname}
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
42
PKGBUILD
@ -1,42 +0,0 @@
|
||||
# Maintainer: Evgeniy "arcanis" Alexeev <arcanis.arch at gmail dot com>
|
||||
|
||||
pkgname=kdeplasma-applets-pytextmonitor
|
||||
_pkgname=pytextmonitor
|
||||
pkgver=1.7.4
|
||||
pkgrel=1
|
||||
pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in Awesome WM"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://arcanis.name/projects/pytextmonitor"
|
||||
license=('GPLv3')
|
||||
depends=('kdebase-workspace' 'kdebindings-python2' 'lm_sensors')
|
||||
optdepends=("amarok: for music player monitor"
|
||||
"catalyst: for GPU monitor"
|
||||
"hddtemp: for HDD temperature monitor"
|
||||
"mpd: for music player monitor"
|
||||
"net-tools: for popup messages"
|
||||
"nvidia-utils: for GPU monitor"
|
||||
"qmmp: for music player monitor"
|
||||
"sysstat: for popup messages")
|
||||
makedepends=('automoc4' 'cmake')
|
||||
source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
|
||||
install=${pkgname}.install
|
||||
md5sums=('a820a3f9d676e1b05c13839d36df4a9d')
|
||||
backup=('usr/share/config/extsysmon.conf')
|
||||
|
||||
prepare() {
|
||||
[[ -d ${srcdir}/build ]] && rm -rf "${srcdir}/build"
|
||||
mkdir "${srcdir}/build"
|
||||
}
|
||||
|
||||
build () {
|
||||
cd "${srcdir}/build"
|
||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) \
|
||||
"../${_pkgname}"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/build"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
199
README.md
@ -1,190 +1,85 @@
|
||||
pytextmonitor
|
||||
=============
|
||||
awesome-widgets (ex-pytextmonitor)
|
||||
==================================
|
||||
|
||||
[](https://travis-ci.org/arcan1s/awesome-widgets)
|
||||
[](https://scan.coverity.com/projects/awesome-widgets)
|
||||
|
||||
Information
|
||||
-----------
|
||||
PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm.
|
||||
|
||||
**NOTE** LOOKING FOR TRANSLATORS!
|
||||
A collection of minimalistic widgets which looks like Awesome Window Manager widgets.
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
For edited output you must open Settings window and setup output format in lines:
|
||||
* tag `$time` - time in default format. For example, *fri Nov 6 04:48:01 2013*
|
||||
* tag `$isotime` - time in iso format
|
||||
* tag `$shorttime` - time in short locale format
|
||||
* tag `$longtime` - time in long locale format
|
||||
* tag `$custom` - custom time format
|
||||
* tag `$uptime` - uptime, *---d--h--m*
|
||||
* tag `$custom` - custom uptime format
|
||||
* tag `$cpu` - total load cpu, *%*
|
||||
* tag `$cpuN` - load CPU for core N, *%*
|
||||
* tag `$cpucl` - average cpu clock, *MHz*
|
||||
* tag `$cpuclN` - cpu clock for core N, *MHz*
|
||||
* tag `$tempN` - temperature for device N. For example, `$temp0`
|
||||
* tag `$gpu` - GPU usage, *%*. `aticonfig` or `nvidia-smi` must be installed
|
||||
* tag `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
|
||||
* tag `$mem` - usage memory, *%*
|
||||
* tag `$memmb` - usage memory, *MB*
|
||||
* tag `$memgb` - usage memory, *GB*
|
||||
* tag `$swap` - swap, *%*
|
||||
* tag `$swapmb` - swap, *MB*
|
||||
* tag `$swapgb` - swap, *GB*
|
||||
* tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0`
|
||||
* tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
|
||||
* tag `$down` - download speed, *KB/s*
|
||||
* tag `$up` - upload speed, *KB/s*
|
||||
* tag `$netdev` - current network device
|
||||
* tag `$bat` - battery charge, *%*
|
||||
* tag `$ac` - status AC device. Return (\*) if AC device is online or *( )* if offline
|
||||
* tag `$album` - current song album. One of supported music players must be installed
|
||||
* tag `$artist` - current song artist. One of supported music players must be installed
|
||||
* tag `$progress` - current song progress. One of supported music players must be installed
|
||||
* tag `$time` - current song duration. One of supported music players must be installed
|
||||
* tag `$title` - current song title. One of supported music players must be installed
|
||||
* tag `$custom` - returns output for custom command
|
||||
**NOTE** [LOOKING FOR TRANSLATORS!](https://github.com/arcan1s/awesome-widgets/issues/14)
|
||||
|
||||
Label order will changed if you change slider position. HTML tags in label work normally.
|
||||
Features
|
||||
========
|
||||
|
||||
**NOTE** you don't may set to show `$cpu` tag in swap label for example. **`$cpu` will work only in cpu label**.
|
||||
* easy and fully configurable native Plasma widget which may be used as Conky widget or as Awesome-like information panel
|
||||
* panel which shows active desktop status
|
||||
* clear Conky-like configuration with html tags support
|
||||
* custom command support (it may be simple action as well as special custom tag)
|
||||
* graphical item support - tooltips, bars
|
||||
|
||||
Advanced settings
|
||||
-----------------
|
||||
**Custom time**
|
||||
See [links](#Links) for more details.
|
||||
|
||||
* tag `$dddd` - weekday in long format
|
||||
* tag `$ddd` - weekday in short format
|
||||
* tag `$dd` - day
|
||||
* tag `$d` - day without zero
|
||||
* tag `$MMMM` - month in long format
|
||||
* tag `$MMM` - month in short format
|
||||
* tag `$MM` - month
|
||||
* tag `$M` - month without zero
|
||||
* tag `$yyyy` - year
|
||||
* tag `$yy` - year in short format
|
||||
* tag `$hh` - hours
|
||||
* tag `$h` - hours without zero
|
||||
* tag `$mm` - minutes
|
||||
* tag `$m` - minutes without zero
|
||||
* tag `$ss` - seconds
|
||||
* tag `$s` - seconds without zero
|
||||
|
||||
**Custom uptime**
|
||||
|
||||
* tag `$dd` - uptime days
|
||||
* tag `$d` - uptime days without zero
|
||||
* tag `$hh` - uptime hours
|
||||
* tag `$h` - uptime hours without zero
|
||||
* tag `$mm` - uptime minutes
|
||||
* tag `$m` - uptime minutes without zero
|
||||
|
||||
**Temperature devices**
|
||||
|
||||
List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
|
||||
|
||||
**Mount points**
|
||||
|
||||
List of mount points, which will be observed in hdd label (combo box items come from `mount`). List widget is editable, delete key will remove current item.
|
||||
|
||||
**HDD**
|
||||
|
||||
List of hard disk devices, which will be observed in hddtem label (combo box items come from `find`). List widget is editable, delete key will remove current item.
|
||||
|
||||
**Network directory**
|
||||
|
||||
Path to directory, which contains network devices information. Default is `/sys/class/net`. Required for auto select network device.
|
||||
|
||||
**Network device**
|
||||
|
||||
Use specified device as active. Combo box items come from **network directory**. Will disable auto select network device.
|
||||
|
||||
**Battery device**
|
||||
|
||||
File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
|
||||
|
||||
**AC device**
|
||||
|
||||
File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
|
||||
|
||||
**Music player**
|
||||
|
||||
Select one of supported music playes for player label.
|
||||
|
||||
Tooltip settings
|
||||
----------------
|
||||
Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
|
||||
|
||||
DataEngine settings
|
||||
-------------------
|
||||
**GPU device**
|
||||
|
||||
Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
|
||||
|
||||
**HDD**
|
||||
|
||||
Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`.
|
||||
|
||||
**MPD address**
|
||||
|
||||
Address of MPD server. Default is `localhost`.
|
||||
|
||||
**MPD port**
|
||||
|
||||
Port of MPD server. Default is `6600`.
|
||||
|
||||
**Custom command**
|
||||
|
||||
*NOTE* This can cause the computer freeze.
|
||||
|
||||
A command, which will be run for custom label.
|
||||
|
||||
DataEngine configuration
|
||||
------------------------
|
||||
You may edit DataEngine configuration. It is `/usr/share/config/extsysmon.conf` or `$HOME/share/config/extsysmon.conf` depending on the type of installation. Uncomment needed line and edit it.
|
||||
**Didn't find required feature?** [Just ask for it!](https://github.com/arcan1s/awesome-widgets/issues)
|
||||
|
||||
Instruction
|
||||
===========
|
||||
|
||||
Dependencies
|
||||
------------
|
||||
* kdebase-workspace
|
||||
* kdebindings-python2
|
||||
* lm_sensors (*for definition temperature device*)
|
||||
* sysstat (*for notification*)
|
||||
|
||||
* plasma-framework
|
||||
|
||||
Optional dependencies
|
||||
---------------------
|
||||
|
||||
* proprietary video driver
|
||||
* hddtemp (make sure that it may be run with `sudo` without password. Just add following line to `/etc/sudoers`: `$USERNAME ALL=NOPASSWD: /usr/bin/hddtemp`)
|
||||
* music player (amarok, mpd or qmmp)
|
||||
* hddtemp
|
||||
* smartmontools
|
||||
* music player (mpd or MPRIS supported)
|
||||
* wireless_tools
|
||||
|
||||
Make dependencies
|
||||
-----------------
|
||||
* automoc4
|
||||
|
||||
* cmake
|
||||
* kdebase-runtime
|
||||
* extra-cmake-modules
|
||||
|
||||
In addition some distros might require to install some -dev packages, e.g. the list of required packages for deb-based distros can be found [here](https://github.com/arcan1s/awesome-widgets/blob/development/.docker/Dockerfile-ubuntu-amd64#L7).
|
||||
|
||||
Installation
|
||||
------------
|
||||
|
||||
* download sources
|
||||
* install
|
||||
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` ../
|
||||
make && make install
|
||||
|
||||
Also you may install it to `/`:
|
||||
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ../
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../sources
|
||||
make && sudo make install
|
||||
|
||||
**NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
|
||||
|
||||
**NOTE** if you are going to build from git, you need to init submodules first, e.g.:
|
||||
|
||||
git submodule update --init --recursive
|
||||
|
||||
Additional information
|
||||
======================
|
||||
|
||||
TODO (wish list)
|
||||
----------------
|
||||
|
||||
See [milestones](https://github.com/arcan1s/awesome-widgets/milestones) for more details.
|
||||
|
||||
Links
|
||||
-----
|
||||
* [Homepage](http://arcanis.name/projects/pytextmonitor/)
|
||||
* Plasmoid on [kde-look](http://kde-look.org/content/show.php/Py+Text+Monitor?content=157124)
|
||||
|
||||
* [Homepage](https://arcanis.me/projects/awesome-widgets/)
|
||||
* [Migration to 2.*](https://arcanis.me/en/2014/09/04/migration-to-v2/)
|
||||
* [Scripts and bars](https://arcanis.me/en/2014/12/19/aw-v21-bells-and-whistles/)
|
||||
* Plasmoid on [kde-look](http://kde-look.org/content/show.php/Awesome+Widgets?content=157124)
|
||||
* DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
|
||||
* Archlinux [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-pytextmonitor/) package
|
||||
* Archlinux [AUR](https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/) package
|
||||
* [OpenSuse](http://software.opensuse.org/search?q=awesome-widgets) packages, [KF5 OpenSuse](http://software.opensuse.org/package/plasma5-awesome-widgets) package
|
||||
|
@ -1,36 +1,32 @@
|
||||
#!/bin/bash
|
||||
|
||||
# update english readme
|
||||
cp readme/en.md README.md
|
||||
|
||||
SRCDIR="sources"
|
||||
VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
|
||||
$(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
|
||||
$(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut -c 1)
|
||||
MAJOR=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
|
||||
MINOR=$(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
|
||||
PATCH=$(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
|
||||
VERSION="${MAJOR}.${MINOR}.${PATCH}"
|
||||
|
||||
# build dataengine
|
||||
ARCHIVE="ext-sysmon"
|
||||
# create archive
|
||||
[[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f ${ARCHIVE}-${VERSION}-src.tar.xz
|
||||
[[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
|
||||
cp -r "${SRCDIR}/${ARCHIVE}" "${ARCHIVE}"
|
||||
tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
|
||||
rm -rf "${ARCHIVE}"
|
||||
# update submodules
|
||||
git submodule update --init --recursive
|
||||
|
||||
# build widget
|
||||
ARCHIVE="pytextmonitor"
|
||||
FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING readme"
|
||||
IGNORELIST="build usr"
|
||||
ARCHIVE="awesome-widgets"
|
||||
FILES="AUTHORS CHANGELOG COPYING packages patches"
|
||||
IGNORELIST="build usr .kdev4 *.kdev4 .idea packages/*src.tar.xz"
|
||||
# create archive
|
||||
[[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
|
||||
[[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
|
||||
cp -r "${SRCDIR}" "${ARCHIVE}"
|
||||
for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done
|
||||
for FILE in ${IGNORELIST[*]}; do rm -rf "${ARCHIVE}/${FILE}"; done
|
||||
tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
|
||||
tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
|
||||
ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" packages
|
||||
rm -rf "${ARCHIVE}"
|
||||
|
||||
# update md5sum
|
||||
MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
|
||||
sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD
|
||||
sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD
|
||||
sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" packages/PKGBUILD
|
||||
sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" packages/PKGBUILD
|
||||
# clear
|
||||
find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \;
|
||||
find packages -type l -xtype l -exec rm -rf {} \;
|
||||
|
@ -1,24 +0,0 @@
|
||||
func_update() {
|
||||
cat << EOF
|
||||
Update plasmoids...
|
||||
EOF
|
||||
kbuildsycoca4 > /dev/null 2>&1
|
||||
}
|
||||
|
||||
post_install() {
|
||||
func_update
|
||||
cat << EOF
|
||||
Make sure that \`hddtemp\` can be run with sudo without password
|
||||
EOF
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
func_update
|
||||
cat << EOF
|
||||
Make sure that \`hddtemp\` can be run with sudo without password
|
||||
EOF
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
func_update
|
||||
}
|
41
packages/PKGBUILD
Normal file
@ -0,0 +1,41 @@
|
||||
# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
|
||||
|
||||
pkgname=plasma5-applet-awesome-widgets
|
||||
_pkgname=awesome-widgets
|
||||
pkgver=3.4.3
|
||||
pkgrel=1
|
||||
pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://arcanis.me/projects/awesome-widgets"
|
||||
license=('GPL3')
|
||||
depends=('plasma-framework')
|
||||
optdepends=("catalyst: for GPU monitor"
|
||||
"hddtemp: for HDD temperature monitor"
|
||||
"smartmontools: for HDD temperature monitor"
|
||||
"mpd: for music player monitor"
|
||||
"nvidia-utils: for GPU monitor")
|
||||
makedepends=('cmake' 'extra-cmake-modules' 'python')
|
||||
source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
|
||||
install=${pkgname}.install
|
||||
md5sums=('5953ba518191bb6fff83cdb8633c735c')
|
||||
backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
|
||||
|
||||
prepare() {
|
||||
rm -rf "${srcdir}/build"
|
||||
mkdir "${srcdir}/build"
|
||||
}
|
||||
|
||||
build () {
|
||||
cd "${srcdir}/build"
|
||||
cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
|
||||
-DCMAKE_BUILD_TYPE=Optimization \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DBUILD_FUTURE=ON \
|
||||
"../${_pkgname}"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/build"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
54
packages/PKGBUILD-git
Normal file
@ -0,0 +1,54 @@
|
||||
# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
|
||||
|
||||
pkgname=plasma5-applet-awesome-widgets
|
||||
_pkgname=awesome-widgets
|
||||
pkgver=2.2.1.r15.g78931b3
|
||||
pkgrel=1
|
||||
pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor). Git version"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://arcanis.me/projects/awesome-widgets"
|
||||
license=('GPL3')
|
||||
depends=('plasma-framework')
|
||||
optdepends=("amarok: for music player monitor"
|
||||
"clementine: for music player monitor"
|
||||
"catalyst: for GPU monitor"
|
||||
"hddtemp: for HDD temperature monitor"
|
||||
"smartmontools: for HDD temperature monitor"
|
||||
"mpd: for music player monitor"
|
||||
"nvidia-utils: for GPU monitor"
|
||||
"qmmp: for music player monitor")
|
||||
makedepends=('cmake' 'extra-cmake-modules' 'git')
|
||||
source=(${_pkgname}::git+https://github.com/arcan1s/awesome-widgets/)
|
||||
install=${pkgname}.install
|
||||
md5sums=('SKIP')
|
||||
backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
|
||||
|
||||
pkgver() {
|
||||
cd "${srcdir}/${_pkgname}"
|
||||
git describe --tags --long | sed 's/V\.//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
rm -rf "${srcdir}/${_pkgname}/build"
|
||||
mkdir "${srcdir}/${_pkgname}/build"
|
||||
|
||||
# update submobules
|
||||
cd "${srcdir}/${_pkgname}"
|
||||
git submodule init
|
||||
git submodule update --recursive
|
||||
echo "$pkgver"
|
||||
}
|
||||
|
||||
build () {
|
||||
cd "${srcdir}/${_pkgname}/build"
|
||||
cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
"../sources"
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${_pkgname}/build"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
11
packages/build-requirements.deb.txt
Normal file
@ -0,0 +1,11 @@
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
g++
|
||||
git
|
||||
libkf5i18n-dev
|
||||
libkf5notifications-dev
|
||||
libkf5service-dev
|
||||
libkf5windowsystem-dev
|
||||
plasma-framework-dev
|
||||
qtbase5-dev
|
||||
qtdeclarative5-dev
|
0
packages/build-requirements.rpm.txt
Normal file
11
packages/plasma5-applet-awesome-widgets.install
Normal file
@ -0,0 +1,11 @@
|
||||
post_install() {
|
||||
kbuildsycoca5 > /dev/null 2>&1
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install "$1"
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
post_install "$1"
|
||||
}
|
7
patches/PATCHING.md
Normal file
@ -0,0 +1,7 @@
|
||||
* Using git tree from root git directory:
|
||||
|
||||
git apply path/to/patch
|
||||
|
||||
* Using release tarball from root directory:
|
||||
|
||||
patch -p2 -i path/to/patch
|
255
patches/qt5.14-splitbehavior-and-qset.patch
Normal file
@ -0,0 +1,255 @@
|
||||
diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
|
||||
index 7135db6..a2870ec 100644
|
||||
--- a/sources/awdebug.cpp
|
||||
+++ b/sources/awdebug.cpp
|
||||
@@ -67,7 +67,7 @@ QString AWDebug::getAboutText(const QString &_type)
|
||||
translator = QString("<li>%1</li>").arg(translator);
|
||||
text = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
|
||||
} else if (_type == "3rdparty") {
|
||||
- QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(';', Qt::SkipEmptyParts);
|
||||
+ QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(';', QString::SkipEmptyParts);
|
||||
for (int i = 0; i < trdPartyList.count(); i++)
|
||||
trdPartyList[i] = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
|
||||
.arg(trdPartyList.at(i).split(',')[0])
|
||||
@@ -75,7 +75,7 @@ QString AWDebug::getAboutText(const QString &_type)
|
||||
.arg(trdPartyList.at(i).split(',')[2]);
|
||||
text = i18n("This software uses:") + "<ul>" + trdPartyList.join("") + "</ul>";
|
||||
} else if (_type == "thanks") {
|
||||
- QStringList thanks = QString(SPECIAL_THANKS).split(';', Qt::SkipEmptyParts);
|
||||
+ QStringList thanks = QString(SPECIAL_THANKS).split(';', QString::SkipEmptyParts);
|
||||
for (int i = 0; i < thanks.count(); i++)
|
||||
thanks[i] = QString("<li><a href=\"%2\">%1</a></li>")
|
||||
.arg(thanks.at(i).split(',')[0])
|
||||
diff --git a/sources/awesome-widget/plugin/awabstractpairhelper.cpp b/sources/awesome-widget/plugin/awabstractpairhelper.cpp
|
||||
index 55a4e91..f7c2969 100644
|
||||
--- a/sources/awesome-widget/plugin/awabstractpairhelper.cpp
|
||||
+++ b/sources/awesome-widget/plugin/awabstractpairhelper.cpp
|
||||
@@ -61,7 +61,7 @@ QStringList AWAbstractPairHelper::values() const
|
||||
QSet<QString> AWAbstractPairHelper::valuesSet() const
|
||||
{
|
||||
auto values = m_pairs.values();
|
||||
- return QSet(values.cbegin(), values.cend());
|
||||
+ return QSet<QString>::fromList(values);
|
||||
}
|
||||
|
||||
|
||||
@@ -138,4 +138,4 @@ bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
|
||||
settings.sync();
|
||||
|
||||
return (settings.status() == QSettings::NoError);
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp
|
||||
index 15aab94..54b47b3 100644
|
||||
--- a/sources/awesome-widget/plugin/awkeycache.cpp
|
||||
+++ b/sources/awesome-widget/plugin/awkeycache.cpp
|
||||
@@ -83,9 +83,9 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
|
||||
<< _tooltip;
|
||||
|
||||
// initial copy
|
||||
- QSet<QString> used(_keys.cbegin(), _keys.cend());
|
||||
- used.unite(QSet(_bars.cbegin(), _bars.cend()));
|
||||
- used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
|
||||
+ auto used = QSet<QString>::fromList(_keys);
|
||||
+ used.unite(QSet<QString>::fromList(_bars));
|
||||
+ used.unite(QSet<QString>::fromList(_userKeys));
|
||||
// insert keys from tooltip
|
||||
for (auto &key : _tooltip.keys()) {
|
||||
if ((key.endsWith("Tooltip")) && (_tooltip[key].toBool())) {
|
||||
diff --git a/sources/awesomewidgets/awjsonformatter.cpp b/sources/awesomewidgets/awjsonformatter.cpp
|
||||
index bbdd7ce..8a1c5e0 100644
|
||||
--- a/sources/awesomewidgets/awjsonformatter.cpp
|
||||
+++ b/sources/awesomewidgets/awjsonformatter.cpp
|
||||
@@ -178,7 +178,7 @@ QVariant AWJsonFormatter::getFromMap(const QVariant &_value, const QString &_key
|
||||
void AWJsonFormatter::initPath()
|
||||
{
|
||||
m_splittedPath.clear();
|
||||
- QStringList splittedByDot = m_path.split('.', Qt::SkipEmptyParts);
|
||||
+ QStringList splittedByDot = m_path.split('.', QString::SkipEmptyParts);
|
||||
|
||||
for (auto &element : splittedByDot) {
|
||||
bool ok;
|
||||
diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp
|
||||
index 3017dac..da009f9 100644
|
||||
--- a/sources/awesomewidgets/extscript.cpp
|
||||
+++ b/sources/awesomewidgets/extscript.cpp
|
||||
@@ -218,7 +218,7 @@ void ExtScript::readConfiguration()
|
||||
setExecutable(settings.value("Exec", executable()).toString());
|
||||
setStrRedirect(settings.value("X-AW-Redirect", strRedirect()).toString());
|
||||
// api == 3
|
||||
- setFilters(settings.value("X-AW-Filters", filters()).toString().split(',', Qt::SkipEmptyParts));
|
||||
+ setFilters(settings.value("X-AW-Filters", filters()).toString().split(',', QString::SkipEmptyParts));
|
||||
settings.endGroup();
|
||||
|
||||
bumpApi(AW_EXTSCRIPT_API);
|
||||
diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp
|
||||
index 0195779..0081cc9 100644
|
||||
--- a/sources/awesomewidgets/extupgrade.cpp
|
||||
+++ b/sources/awesomewidgets/extupgrade.cpp
|
||||
@@ -219,8 +219,8 @@ void ExtUpgrade::updateValue()
|
||||
= QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
|
||||
m_values[tag("pkgcount")] = [this](const QString &output) {
|
||||
return filter().isEmpty()
|
||||
- ? output.split('\n', Qt::SkipEmptyParts).count() - null()
|
||||
- : output.split('\n', Qt::SkipEmptyParts).filter(QRegExp(filter())).count();
|
||||
+ ? output.split('\n', QString::SkipEmptyParts).count() - null()
|
||||
+ : output.split('\n', QString::SkipEmptyParts).filter(QRegExp(filter())).count();
|
||||
}(qoutput);
|
||||
|
||||
emit(dataReceived(m_values));
|
||||
diff --git a/sources/awesomewidgets/qcronscheduler.cpp b/sources/awesomewidgets/qcronscheduler.cpp
|
||||
index 6f67590..c72abc9 100644
|
||||
--- a/sources/awesomewidgets/qcronscheduler.cpp
|
||||
+++ b/sources/awesomewidgets/qcronscheduler.cpp
|
||||
@@ -87,7 +87,7 @@ QList<int> QCronScheduler::parseField(const QString &_value, const int _min, con
|
||||
parsedField.fromRange(field.split('/').first(), _min, _max);
|
||||
if (field.contains('/')) {
|
||||
bool status;
|
||||
- parsedField.div = field.split('/', Qt::SkipEmptyParts).at(1).toInt(&status);
|
||||
+ parsedField.div = field.split('/', QString::SkipEmptyParts).at(1).toInt(&status);
|
||||
if (!status)
|
||||
parsedField.div = 1;
|
||||
}
|
||||
@@ -107,7 +107,7 @@ void QCronScheduler::QCronField::fromRange(const QString &_range, const int _min
|
||||
minValue = _min;
|
||||
maxValue = _max;
|
||||
} else if (_range.contains("-")) {
|
||||
- auto interval = _range.split('-', Qt::SkipEmptyParts);
|
||||
+ auto interval = _range.split('-', QString::SkipEmptyParts);
|
||||
if (interval.count() != 2)
|
||||
return;
|
||||
bool status;
|
||||
diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp
|
||||
index 88b6e39..5bdc7f3 100644
|
||||
--- a/sources/extsysmon/extsysmon.cpp
|
||||
+++ b/sources/extsysmon/extsysmon.cpp
|
||||
@@ -126,7 +126,7 @@ QHash<QString, QString> ExtendedSysMon::updateConfiguration(QHash<QString, QStri
|
||||
} else if (_rawConfig["HDDDEV"] == "disable") {
|
||||
_rawConfig["HDDDEV"] = "";
|
||||
} else {
|
||||
- QStringList deviceList = _rawConfig["HDDDEV"].split(',', Qt::SkipEmptyParts);
|
||||
+ QStringList deviceList = _rawConfig["HDDDEV"].split(',', QString::SkipEmptyParts);
|
||||
QStringList devices;
|
||||
QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$");
|
||||
for (auto &device : deviceList)
|
||||
diff --git a/sources/extsysmonsources/gpuloadsource.cpp b/sources/extsysmonsources/gpuloadsource.cpp
|
||||
index 6281637..e81be26 100644
|
||||
--- a/sources/extsysmonsources/gpuloadsource.cpp
|
||||
+++ b/sources/extsysmonsources/gpuloadsource.cpp
|
||||
@@ -132,7 +132,7 @@ void GPULoadSource::updateValue()
|
||||
qCInfo(LOG_ESS) << "Output" << qoutput;
|
||||
|
||||
if (m_device == "nvidia") {
|
||||
- for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
|
||||
+ for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
|
||||
if (!str.contains("<gpu_util>"))
|
||||
continue;
|
||||
auto load = str.remove("<gpu_util>").remove("</gpu_util>").remove('%');
|
||||
@@ -140,10 +140,10 @@ void GPULoadSource::updateValue()
|
||||
break;
|
||||
}
|
||||
} else if (m_device == "ati") {
|
||||
- for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
|
||||
+ for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
|
||||
if (!str.contains("load"))
|
||||
continue;
|
||||
- QString load = str.split(' ', Qt::SkipEmptyParts)[3].remove('%');
|
||||
+ QString load = str.split(' ', QString::SkipEmptyParts)[3].remove('%');
|
||||
m_values["gpu/load"] = load.toFloat();
|
||||
break;
|
||||
}
|
||||
diff --git a/sources/extsysmonsources/gputempsource.cpp b/sources/extsysmonsources/gputempsource.cpp
|
||||
index 55fbadc..dce0c6e 100644
|
||||
--- a/sources/extsysmonsources/gputempsource.cpp
|
||||
+++ b/sources/extsysmonsources/gputempsource.cpp
|
||||
@@ -112,7 +112,7 @@ void GPUTemperatureSource::updateValue()
|
||||
qCInfo(LOG_ESS) << "Output" << qoutput;
|
||||
|
||||
if (m_device == "nvidia") {
|
||||
- for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
|
||||
+ for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
|
||||
if (!str.contains("<gpu_temp>"))
|
||||
continue;
|
||||
QString temp = str.remove("<gpu_temp>").remove("C</gpu_temp>");
|
||||
@@ -120,10 +120,10 @@ void GPUTemperatureSource::updateValue()
|
||||
break;
|
||||
}
|
||||
} else if (m_device == "ati") {
|
||||
- for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
|
||||
+ for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
|
||||
if (!str.contains("Temperature"))
|
||||
continue;
|
||||
- QString temp = str.split(' ', Qt::SkipEmptyParts).at(4);
|
||||
+ QString temp = str.split(' ', QString::SkipEmptyParts).at(4);
|
||||
m_values["gpu/temperature"] = temp.toFloat();
|
||||
break;
|
||||
}
|
||||
diff --git a/sources/extsysmonsources/hddtempsource.cpp b/sources/extsysmonsources/hddtempsource.cpp
|
||||
index efaae08..dad47a3 100644
|
||||
--- a/sources/extsysmonsources/hddtempsource.cpp
|
||||
+++ b/sources/extsysmonsources/hddtempsource.cpp
|
||||
@@ -31,7 +31,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *_parent, const QStringList &
|
||||
Q_ASSERT(_args.count() == 2);
|
||||
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
|
||||
|
||||
- m_devices = _args.at(0).split(',', Qt::SkipEmptyParts);
|
||||
+ m_devices = _args.at(0).split(',', QString::SkipEmptyParts);
|
||||
m_cmd = _args.at(1).split(' '); // lets hope no one put cmd with spaces here lol
|
||||
|
||||
m_smartctl = m_cmd.contains("smartctl");
|
||||
@@ -131,17 +131,17 @@ void HDDTemperatureSource::updateValue(const QString &_device)
|
||||
|
||||
// parse
|
||||
if (m_smartctl) {
|
||||
- QStringList lines = qoutput.split('\n', Qt::SkipEmptyParts);
|
||||
+ QStringList lines = qoutput.split('\n', QString::SkipEmptyParts);
|
||||
for (auto &str : lines) {
|
||||
if (!str.startsWith("194"))
|
||||
continue;
|
||||
- if (str.split(' ', Qt::SkipEmptyParts).count() < 9)
|
||||
+ if (str.split(' ', QString::SkipEmptyParts).count() < 9)
|
||||
continue;
|
||||
- m_values[_device] = str.split(' ', Qt::SkipEmptyParts).at(9).toFloat();
|
||||
+ m_values[_device] = str.split(' ', QString::SkipEmptyParts).at(9).toFloat();
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
- QStringList lines = qoutput.split(':', Qt::SkipEmptyParts);
|
||||
+ QStringList lines = qoutput.split(':', QString::SkipEmptyParts);
|
||||
if (lines.count() >= 3) {
|
||||
QString temp = lines.at(2);
|
||||
temp.remove(QChar(0260)).remove('C');
|
||||
diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp
|
||||
index aaca22f..e127a05 100644
|
||||
--- a/sources/extsysmonsources/playersource.cpp
|
||||
+++ b/sources/extsysmonsources/playersource.cpp
|
||||
@@ -256,11 +256,11 @@ void PlayerSource::mpdSocketReadyRead()
|
||||
qCInfo(LOG_ESS) << "Output" << qoutput;
|
||||
|
||||
// parse
|
||||
- for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
|
||||
- if (str.split(": ", Qt::SkipEmptyParts).count() == 2) {
|
||||
+ for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
|
||||
+ if (str.split(": ", QString::SkipEmptyParts).count() == 2) {
|
||||
// "Metadata: data"
|
||||
- QString metadata = str.split(": ", Qt::SkipEmptyParts).first().toLower();
|
||||
- QString data = str.split(": ", Qt::SkipEmptyParts).last().trimmed();
|
||||
+ QString metadata = str.split(": ", QString::SkipEmptyParts).first().toLower();
|
||||
+ QString data = str.split(": ", QString::SkipEmptyParts).last().trimmed();
|
||||
// there are one more time...
|
||||
if ((metadata == "time") && (data.contains(':'))) {
|
||||
QStringList times = data.split(':');
|
||||
diff --git a/sources/test/testawtelemetryhandler.cpp b/sources/test/testawtelemetryhandler.cpp
|
||||
index ffb0e79..b4181e0 100644
|
||||
--- a/sources/test/testawtelemetryhandler.cpp
|
||||
+++ b/sources/test/testawtelemetryhandler.cpp
|
||||
@@ -51,7 +51,7 @@ void TestAWTelemetryHandler::test_get()
|
||||
QStringList output = plugin->get(telemetryGroup);
|
||||
|
||||
QVERIFY(!output.isEmpty());
|
||||
- QCOMPARE(QSet<QString>(output.cbegin(), output.cend()).count(), output.count());
|
||||
+ QCOMPARE(QSet<QString>::fromList(output).count(), output.count());
|
||||
QVERIFY(output.contains(telemetryData));
|
||||
}
|
||||
|
190
readme/en.md
@ -1,190 +0,0 @@
|
||||
pytextmonitor
|
||||
=============
|
||||
|
||||
Information
|
||||
-----------
|
||||
PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm.
|
||||
|
||||
**NOTE** LOOKING FOR TRANSLATORS!
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
For edited output you must open Settings window and setup output format in lines:
|
||||
* tag `$time` - time in default format. For example, *fri Nov 6 04:48:01 2013*
|
||||
* tag `$isotime` - time in iso format
|
||||
* tag `$shorttime` - time in short locale format
|
||||
* tag `$longtime` - time in long locale format
|
||||
* tag `$custom` - custom time format
|
||||
* tag `$uptime` - uptime, *---d--h--m*
|
||||
* tag `$custom` - custom uptime format
|
||||
* tag `$cpu` - total load cpu, *%*
|
||||
* tag `$cpuN` - load CPU for core N, *%*
|
||||
* tag `$cpucl` - average cpu clock, *MHz*
|
||||
* tag `$cpuclN` - cpu clock for core N, *MHz*
|
||||
* tag `$tempN` - temperature for device N. For example, `$temp0`
|
||||
* tag `$gpu` - GPU usage, *%*. `aticonfig` or `nvidia-smi` must be installed
|
||||
* tag `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
|
||||
* tag `$mem` - usage memory, *%*
|
||||
* tag `$memmb` - usage memory, *MB*
|
||||
* tag `$memgb` - usage memory, *GB*
|
||||
* tag `$swap` - swap, *%*
|
||||
* tag `$swapmb` - swap, *MB*
|
||||
* tag `$swapgb` - swap, *GB*
|
||||
* tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0`
|
||||
* tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
|
||||
* tag `$down` - download speed, *KB/s*
|
||||
* tag `$up` - upload speed, *KB/s*
|
||||
* tag `$netdev` - current network device
|
||||
* tag `$bat` - battery charge, *%*
|
||||
* tag `$ac` - status AC device. Return (\*) if AC device is online or *( )* if offline
|
||||
* tag `$album` - current song album. One of supported music players must be installed
|
||||
* tag `$artist` - current song artist. One of supported music players must be installed
|
||||
* tag `$progress` - current song progress. One of supported music players must be installed
|
||||
* tag `$time` - current song duration. One of supported music players must be installed
|
||||
* tag `$title` - current song title. One of supported music players must be installed
|
||||
* tag `$custom` - returns output for custom command
|
||||
|
||||
Label order will changed if you change slider position. HTML tags in label work normally.
|
||||
|
||||
**NOTE** you don't may set to show `$cpu` tag in swap label for example. **`$cpu` will work only in cpu label**.
|
||||
|
||||
Advanced settings
|
||||
-----------------
|
||||
**Custom time**
|
||||
|
||||
* tag `$dddd` - weekday in long format
|
||||
* tag `$ddd` - weekday in short format
|
||||
* tag `$dd` - day
|
||||
* tag `$d` - day without zero
|
||||
* tag `$MMMM` - month in long format
|
||||
* tag `$MMM` - month in short format
|
||||
* tag `$MM` - month
|
||||
* tag `$M` - month without zero
|
||||
* tag `$yyyy` - year
|
||||
* tag `$yy` - year in short format
|
||||
* tag `$hh` - hours
|
||||
* tag `$h` - hours without zero
|
||||
* tag `$mm` - minutes
|
||||
* tag `$m` - minutes without zero
|
||||
* tag `$ss` - seconds
|
||||
* tag `$s` - seconds without zero
|
||||
|
||||
**Custom uptime**
|
||||
|
||||
* tag `$dd` - uptime days
|
||||
* tag `$d` - uptime days without zero
|
||||
* tag `$hh` - uptime hours
|
||||
* tag `$h` - uptime hours without zero
|
||||
* tag `$mm` - uptime minutes
|
||||
* tag `$m` - uptime minutes without zero
|
||||
|
||||
**Temperature devices**
|
||||
|
||||
List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
|
||||
|
||||
**Mount points**
|
||||
|
||||
List of mount points, which will be observed in hdd label (combo box items come from `mount`). List widget is editable, delete key will remove current item.
|
||||
|
||||
**HDD**
|
||||
|
||||
List of hard disk devices, which will be observed in hddtem label (combo box items come from `find`). List widget is editable, delete key will remove current item.
|
||||
|
||||
**Network directory**
|
||||
|
||||
Path to directory, which contains network devices information. Default is `/sys/class/net`. Required for auto select network device.
|
||||
|
||||
**Network device**
|
||||
|
||||
Use specified device as active. Combo box items come from **network directory**. Will disable auto select network device.
|
||||
|
||||
**Battery device**
|
||||
|
||||
File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
|
||||
|
||||
**AC device**
|
||||
|
||||
File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
|
||||
|
||||
**Music player**
|
||||
|
||||
Select one of supported music playes for player label.
|
||||
|
||||
Tooltip settings
|
||||
----------------
|
||||
Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
|
||||
|
||||
DataEngine settings
|
||||
-------------------
|
||||
**GPU device**
|
||||
|
||||
Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
|
||||
|
||||
**HDD**
|
||||
|
||||
Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`.
|
||||
|
||||
**MPD address**
|
||||
|
||||
Address of MPD server. Default is `localhost`.
|
||||
|
||||
**MPD port**
|
||||
|
||||
Port of MPD server. Default is `6600`.
|
||||
|
||||
**Custom command**
|
||||
|
||||
*NOTE* This can cause the computer freeze.
|
||||
|
||||
A command, which will be run for custom label.
|
||||
|
||||
DataEngine configuration
|
||||
------------------------
|
||||
You may edit DataEngine configuration. It is `/usr/share/config/extsysmon.conf` or `$HOME/share/config/extsysmon.conf` depending on the type of installation. Uncomment needed line and edit it.
|
||||
|
||||
Instruction
|
||||
===========
|
||||
|
||||
Dependencies
|
||||
------------
|
||||
* kdebase-workspace
|
||||
* kdebindings-python2
|
||||
* lm_sensors (*for definition temperature device*)
|
||||
* sysstat (*for notification*)
|
||||
|
||||
Optional dependencies
|
||||
---------------------
|
||||
* proprietary video driver
|
||||
* hddtemp (make sure that it may be run with `sudo` without password. Just add following line to `/etc/sudoers`: `$USERNAME ALL=NOPASSWD: /usr/bin/hddtemp`)
|
||||
* music player (amarok, mpd or qmmp)
|
||||
|
||||
Make dependencies
|
||||
-----------------
|
||||
* automoc4
|
||||
* cmake
|
||||
* kdebase-runtime
|
||||
|
||||
Installation
|
||||
------------
|
||||
* download sources
|
||||
* install
|
||||
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` ../
|
||||
make && make install
|
||||
|
||||
Also you may install it to `/`:
|
||||
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ../
|
||||
make && sudo make install
|
||||
|
||||
Additional information
|
||||
======================
|
||||
|
||||
Links
|
||||
-----
|
||||
* [Homepage](http://arcanis.name/projects/pytextmonitor/)
|
||||
* Plasmoid on [kde-look](http://kde-look.org/content/show.php/Py+Text+Monitor?content=157124)
|
||||
* DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
|
||||
* Archlinux [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-pytextmonitor/) package
|
188
readme/ru.md
@ -1,188 +0,0 @@
|
||||
pytextmonitor
|
||||
=============
|
||||
|
||||
Информация
|
||||
----------
|
||||
PyTextMonitor - минималистичный плазмоид, написанный на Python2. Он выглядит, как виджеты в Awesome WM.
|
||||
|
||||
Настройка
|
||||
---------
|
||||
Для редактирования внешнего виде, откройте окно настроек и установите требуемый формат в поля:
|
||||
* тэг `$time` - время в стандартном формате. Например, *fri Nov 6 04:48:01 2013*
|
||||
* тэг `$isotime` - время в ISO формате
|
||||
* тэг `$shorttime` - время в коротком формате
|
||||
* тэг `$longtime` - время в длинном формате
|
||||
* тэг `$custom` - свой формат времени
|
||||
* тэг `$uptime` - время работы, *---d--h--m*
|
||||
* тэг `$custom` - свой формат аптайма
|
||||
* тэг `$cpu` - общая загрузка CPU, *%*
|
||||
* тэг `$cpuN` - загрузка CPU для ядра N, *%*
|
||||
* тэг `$cpucl` - средняя частота CPU, *MHz*
|
||||
* тэг `$cpuclN` - частота CPU для ядра N, *MHz
|
||||
* тэг `$tempN` - температура для устройства N. Например, `$temp0`
|
||||
* тэг `$gpu` - использование GPU, *%*. `aticonfig` или `nvidia-smi` должны быть установлены
|
||||
* тэг `$gputemp` - температура GPU. `aticonfig` или `nvidia-smi` должны быть установлены
|
||||
* тэг `$mem` - использование RAM, *%*
|
||||
* тэг `$memmb` - использование RAM, *MB*
|
||||
* тэг `$memgb` - использование RAM, *GB*
|
||||
* тэг `$swap` - swap, *%*
|
||||
* тэг `$swapmb` - swap, *MB*
|
||||
* тэг `$swapgb` - swap, *GB*
|
||||
* тэг `$hddN` - использование точки монтирования N, *%*. Например, `$hdd0`
|
||||
* тэг `$hddtempN` - температура HDD N. Например, `$hddtemp0`
|
||||
* тэг `$down` - скорость загрузки, *KB/s*
|
||||
* тэг `$up` - скорость отдачи, *KB/s*
|
||||
* тэг `$netdev` - текущий сетевой интерфейс
|
||||
* тэг `$bat` - заряд батареи, *%*
|
||||
* тэг `$ac` - статус адаптора питания. Возвращает (\*), если AC подключен или *( )*, если нет
|
||||
* тэг `$album` - альбом. Один из поддерживаемых плееров должен быть установлен
|
||||
* тэг `$artist` - исполнитель. Один из поддерживаемых плееров должен быть установлен
|
||||
* тэг `$progress` - прогресс. Один из поддерживаемых плееров должен быть установлен
|
||||
* тэг `$time` - длительность. Один из поддерживаемых плееров должен быть установлен
|
||||
* тэг `$title` - название. Один из поддерживаемых плееров должен быть установлен
|
||||
* тэг `$custom` - возвращает результат своей команды
|
||||
|
||||
Порядок полей изменится, если вы измените позицию слайдеров. HTML тэги в полях работают корректно.
|
||||
|
||||
**ЗАМЕЧАНИЕ** вы не можете установить тэг `$cpu`, например, в поле swap. **`$cpu` будет работать только в поле CPU**.
|
||||
|
||||
Расширенные настройки
|
||||
---------------------
|
||||
**Свой формат времени**
|
||||
|
||||
* тэг `$dddd` - день недели в длинном формате
|
||||
* тэг `$ddd` - день недели в коротком формате
|
||||
* тэг `$dd` - день
|
||||
* тэг `$d` - день без нуля
|
||||
* тэг `$MMMM` - месяц в длинном формате
|
||||
* тэг `$MMM` - месяц в коротком формате
|
||||
* тэг `$MM` - месяц
|
||||
* тэг `$M` - месяц без нуля
|
||||
* тэг `$yyyy` - год
|
||||
* тэг `$yy` - год в коротком формате
|
||||
* тэг `$hh` - часы
|
||||
* тэг `$h` - часы без нуля
|
||||
* тэг `$mm` - минуты
|
||||
* тэг `$m` - минуты без нуля
|
||||
* тэг `$ss` - секунды
|
||||
* тэг `$s` - секунды без нуля
|
||||
|
||||
**Свой формат аптайма**
|
||||
|
||||
* тэг `$dd` - дни аптайма
|
||||
* тэг `$d` - дни аптайма без нуля
|
||||
* тэг `$hh` - часы аптайма
|
||||
* тэг `$h` - часы аптайма без нуля
|
||||
* тэг `$mm` - минуты аптайма
|
||||
* тэг `$m` - минуты аптайма без нуля
|
||||
|
||||
**Датчики температуры**
|
||||
|
||||
Список датчиков, которые будут наблюдаться в поле temo (содержимое комбо бокса берется из `sensors`). Виджет редактируем, клавиша delete удалит текущую строку.
|
||||
|
||||
**Точки монтирования**
|
||||
|
||||
Список точек монтирования, которые будут наблюдаться в поле hdd (содержимое комбо бокса берется из `mount`). Виджет редактируем, клавиша delete удалит текущую строку.
|
||||
|
||||
**HDD**
|
||||
|
||||
Список HDD, которые будут наблюдаться в поле hddtemp (содержимое комбо бокса берется из `find`). Виджет редактируем, клавиша delete удалит текущую строку.
|
||||
|
||||
**Директория с сетевыми интерфейсами**
|
||||
|
||||
Путь к директории, которая содержит информацию о сетевых интерфейсах. По умолчанию `/sys/class/net`. Требуется для определения сетевого устройства.
|
||||
|
||||
**Сетевое устройство**
|
||||
|
||||
Использовать указанный интерфейс, как активный. Содержимое комбо бокса берется из **директории с сетевыми интерфейсами**. Эта опция отключит авто определение интерфейса.
|
||||
|
||||
**Устройство батареи**
|
||||
|
||||
Файл с информацией о батарее. Данный файл (`/sys/class/power_supply/BAT0/capacity` по умолчанию) должен содержать только заряд батареи в процентах.
|
||||
|
||||
**Устройство AC**
|
||||
|
||||
Файл с информацией об адапторе питания. Данный файл (`/sys/class/power_supply/AC/online` по умолчанию) должен содержать `1`, если адаптор подключен.
|
||||
|
||||
**Музыкальные плеер**
|
||||
|
||||
Выберете один из поддерживаемых музыкальных плееров.
|
||||
|
||||
Настройки тултипа
|
||||
-----------------
|
||||
Начиная с версии 1.7.0 поля CPU, частота CPU, память, swap и сеть поддерживают графический тултип. Чтобы включить их, просто сделайте требуемые чекбоксы полностью чекнутыми. Число хранимых значений может быть выставленно в данной вкладке. Цвета графиков также настраиваются.
|
||||
|
||||
Настройки DataEngine
|
||||
--------------------
|
||||
**Устройство GPU**
|
||||
|
||||
Выберете одно из поддерживаемых устройств GPU. `auto` включит автоматическое определение. По умолчанию `auto`.
|
||||
|
||||
**HDD**
|
||||
|
||||
Выберете один из HDD для монитора его температуры. `all` включит монитор для всех доступных устройств. По умолчанию `all`.
|
||||
|
||||
**Адрес MPD**
|
||||
|
||||
Адрес MPD сервера. По умолчанию `localhost`.
|
||||
|
||||
**Порт MPD**
|
||||
|
||||
Порт MPD сервера. По умолчанию `6600`.
|
||||
|
||||
**Своя команда**
|
||||
|
||||
*ЗАМЕЧАНИЕ* Может вызвать зависание компьютера.
|
||||
|
||||
Команда, которая будет запущена для соответствующего поля.
|
||||
|
||||
Настройка DataEngine
|
||||
--------------------
|
||||
Вы можете отредактировать настройки DataEngine вручную. Откройте файл `/usr/share/config/extsysmon.conf` или `$HOME/.kde4/share/config/extsysmon.conf`, в зависимости от типа установки. Раскомментируйте требуемые строки и отредактируйте их.
|
||||
|
||||
Инструкция
|
||||
==========
|
||||
|
||||
Зависимости
|
||||
-----------
|
||||
* kdebase-workspace
|
||||
* kdebindings-python2
|
||||
* lm_sensors (*для определения датчиков температуры*)
|
||||
* sysstat (*для уведомлений*)
|
||||
|
||||
Опциональные зависимости
|
||||
------------------------
|
||||
* проприетарный видеодрайвер
|
||||
* hddtemp (убедитесь, что может быть запущен с `sudo` без пароля. Просто добавьте следующую строку в `/etc/sudoers`: `$USERNAME ALL=NOPASSWD: /usr/bin/hddtemp`)
|
||||
* музыкальный плеер (amarok, mpd или qmmp)
|
||||
|
||||
Зависимости сборки
|
||||
------------------
|
||||
* automoc4
|
||||
* cmake
|
||||
* kdebase-runtime
|
||||
|
||||
Установка
|
||||
---------
|
||||
* скачать исходный архив
|
||||
* установить
|
||||
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` ../
|
||||
make && make install
|
||||
|
||||
Для установки в `/`:
|
||||
|
||||
mkdir build && cd build
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ../
|
||||
make && sudo make install
|
||||
|
||||
Дополнительная информация
|
||||
=========================
|
||||
|
||||
Ссылки
|
||||
------
|
||||
* [Домашняя страница](http://arcanis.name/projects/pytextmonitor/)
|
||||
* Виджет на [kde-look](http://kde-look.org/content/show.php/Py+Text+Monitor?content=157124)
|
||||
* DataEngine на [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
|
||||
* Пакет для Archlinux в [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-pytextmonitor/)
|
BIN
screenshots/config_01.png
Normal file
After Width: | Height: | Size: 54 KiB |
BIN
screenshots/config_02.png
Normal file
After Width: | Height: | Size: 68 KiB |
BIN
screenshots/config_03.png
Normal file
After Width: | Height: | Size: 67 KiB |
BIN
screenshots/config_04.png
Normal file
After Width: | Height: | Size: 40 KiB |
BIN
screenshots/config_05.png
Normal file
After Width: | Height: | Size: 65 KiB |
BIN
screenshots/config_06.png
Normal file
After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 65 KiB |
BIN
screenshots/dp_config_01.png
Normal file
After Width: | Height: | Size: 42 KiB |
BIN
screenshots/dp_config_02.png
Normal file
After Width: | Height: | Size: 46 KiB |
BIN
screenshots/dp_config_03.png
Normal file
After Width: | Height: | Size: 38 KiB |
BIN
screenshots/dp_config_04.png
Normal file
After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 89 KiB |
Before Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 3.0 KiB |
65
sources/.clang-format
Normal file
@ -0,0 +1,65 @@
|
||||
---
|
||||
Language: Cpp
|
||||
AccessModifierOffset: -4
|
||||
AlignAfterOpenBracket: Align
|
||||
AlignConsecutiveAssignments: false
|
||||
AlignOperands: true
|
||||
AlignTrailingComments: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: true
|
||||
AllowShortBlocksOnASingleLine: false
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: Inline
|
||||
AllowShortIfStatementsOnASingleLine: Never
|
||||
AllowShortLoopsOnASingleLine: false
|
||||
AlwaysBreakAfterDefinitionReturnType: None
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
AlwaysBreakTemplateDeclarations: No
|
||||
BinPackArguments: true
|
||||
BinPackParameters: true
|
||||
BreakBeforeBinaryOperators: All
|
||||
BreakBeforeBraces: Linux
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializersBeforeComma: true
|
||||
ColumnLimit: 100
|
||||
CommentPragmas: '^ IWYU pragma:'
|
||||
ConstructorInitializerAllOnOneLineOrOnePerLine: false
|
||||
ConstructorInitializerIndentWidth: 4
|
||||
ContinuationIndentWidth: 4
|
||||
Cpp11BracedListStyle: true
|
||||
DerivePointerAlignment: false
|
||||
DisableFormat: false
|
||||
ExperimentalAutoDetectBinPacking: false
|
||||
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
|
||||
IndentCaseLabels: false
|
||||
IndentWidth: 4
|
||||
IndentWrappedFunctionNames: false
|
||||
KeepEmptyLinesAtTheStartOfBlocks: true
|
||||
MacroBlockBegin: ''
|
||||
MacroBlockEnd: ''
|
||||
MaxEmptyLinesToKeep: 2
|
||||
NamespaceIndentation: None
|
||||
ObjCBlockIndentWidth: 2
|
||||
ObjCSpaceAfterProperty: false
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
PenaltyBreakBeforeFirstCallParameter: 19
|
||||
PenaltyBreakComment: 300
|
||||
PenaltyBreakFirstLessLess: 120
|
||||
PenaltyBreakString: 1000
|
||||
PenaltyExcessCharacter: 1000000
|
||||
PenaltyReturnTypeOnItsOwnLine: 60
|
||||
PointerAlignment: Right
|
||||
SpaceAfterCStyleCast: false
|
||||
SpaceBeforeAssignmentOperators: true
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceInEmptyParentheses: false
|
||||
SpacesBeforeTrailingComments: 1
|
||||
SpacesInAngles: false
|
||||
SpacesInContainerLiterals: true
|
||||
SpacesInCStyleCastParentheses: false
|
||||
SpacesInParentheses: false
|
||||
SpacesInSquareBrackets: false
|
||||
Standard: Cpp11
|
||||
TabWidth: 8
|
||||
UseTab: Never
|
||||
...
|
||||
|
1
sources/3rdparty/fontdialog
vendored
Submodule
18
sources/3rdparty/qreplytimeout/qreplytimeout.cpp
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
#include "qreplytimeout.h"
|
||||
|
||||
#include <QTimer>
|
||||
|
||||
|
||||
QReplyTimeout::QReplyTimeout(QNetworkReply *reply, const int timeout)
|
||||
: QObject(reply)
|
||||
{
|
||||
QTimer::singleShot(timeout, this, SLOT(timeout()));
|
||||
}
|
||||
|
||||
|
||||
void QReplyTimeout::timeout()
|
||||
{
|
||||
auto *reply = dynamic_cast<QNetworkReply *>(parent());
|
||||
if (reply->isRunning())
|
||||
reply->close();
|
||||
}
|
17
sources/3rdparty/qreplytimeout/qreplytimeout.h
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
// from here http://codereview.stackexchange.com/questions/30031/qnetworkreply-network-reply-timeout-helper
|
||||
// no license provided
|
||||
|
||||
#include <QNetworkReply>
|
||||
#include <QObject>
|
||||
|
||||
|
||||
class QReplyTimeout : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit QReplyTimeout(QNetworkReply *reply, const int timeout);
|
||||
|
||||
public slots:
|
||||
void timeout();
|
||||
};
|
@ -1,27 +1,76 @@
|
||||
cmake_minimum_required (VERSION 2.8)
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
cmake_policy (SET CMP0003 OLD)
|
||||
cmake_policy (SET CMP0002 OLD)
|
||||
cmake_policy (SET CMP0011 NEW)
|
||||
cmake_policy (SET CMP0015 NEW)
|
||||
|
||||
project (pytextmonitor)
|
||||
set (PROJECT_VERSION_MAJOR 1)
|
||||
set (PROJECT_VERSION_MINOR 7)
|
||||
set (PROJECT_VERSION_PATCH 4)
|
||||
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
|
||||
|
||||
message (STATUS "Version: ${PROJECT_VERSION}")
|
||||
|
||||
# flags
|
||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
set (ADD_CXX_FLAGS "-Wall")
|
||||
set (CMAKE_CXX_FLAGS "-O0 ${ADD_CXX_FLAGS}")
|
||||
set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
|
||||
set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
|
||||
else ()
|
||||
message (STATUS "Unknown compiler")
|
||||
# some fucking magic
|
||||
cmake_policy(SET CMP0011 NEW)
|
||||
cmake_policy(SET CMP0015 NEW)
|
||||
if (POLICY CMP0063)
|
||||
cmake_policy(SET CMP0063 NEW)
|
||||
endif ()
|
||||
if (POLICY CMP0071)
|
||||
cmake_policy(SET CMP0071 NEW)
|
||||
endif ()
|
||||
|
||||
add_subdirectory (ext-sysmon)
|
||||
add_subdirectory (ptm)
|
||||
project(awesomewidgets)
|
||||
set(PROJECT_AUTHOR "Evgeniy Alekseev")
|
||||
set(PROJECT_CONTACT "esalexeev@gmail.com")
|
||||
set(PROJECT_LICENSE "GPL3")
|
||||
set(PROJECT_VERSION_MAJOR "3")
|
||||
set(PROJECT_VERSION_MINOR "4")
|
||||
set(PROJECT_VERSION_PATCH "3")
|
||||
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
|
||||
# append git version if any
|
||||
set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
|
||||
include(checkgit.cmake)
|
||||
|
||||
string(TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
|
||||
string(TIMESTAMP CURRENT_YEAR "%Y")
|
||||
|
||||
message(STATUS "Project: ${PROJECT_NAME}")
|
||||
message(STATUS "Version: ${PROJECT_VERSION}")
|
||||
message(STATUS "Build date: ${CURRENT_DATE}")
|
||||
|
||||
# components
|
||||
option(BUILD_PLASMOIDS "Build plasmoids" ON)
|
||||
option(BUILD_DEB_PACKAGE "Build deb package" OFF)
|
||||
option(BUILD_RPM_PACKAGE "Build rpm package" OFF)
|
||||
# build details
|
||||
option(BUILD_FUTURE "Build with the features which will be marked as stable later" OFF)
|
||||
option(BUILD_LOAD "Build with additional load" OFF)
|
||||
option(BUILD_TESTING "Build with additional test abilities" OFF)
|
||||
|
||||
# generate changelog
|
||||
set(PROJECT_CHANGELOG "Changelog" CACHE INTERNAL "")
|
||||
include(changelog.cmake)
|
||||
|
||||
# directories
|
||||
set(PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
|
||||
set(PROJECT_LIBRARY awesomewidgets)
|
||||
set(PROJECT_MONITORSOURCES extsysmonsources)
|
||||
|
||||
# modules
|
||||
include(compiler.cmake)
|
||||
include(libraries.cmake)
|
||||
include(clang-format.cmake)
|
||||
include(cppcheck.cmake)
|
||||
include(coverity.cmake)
|
||||
|
||||
# pre-configure
|
||||
get_directory_property(CMAKE_DEFINITIONS COMPILE_DEFINITIONS)
|
||||
configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
|
||||
|
||||
# build components
|
||||
add_subdirectory(awesomewidgets)
|
||||
add_subdirectory(extsysmonsources)
|
||||
add_subdirectory(extsysmon)
|
||||
if (BUILD_PLASMOIDS)
|
||||
add_subdirectory(qml)
|
||||
add_subdirectory(awesome-widget)
|
||||
add_subdirectory(desktop-panel)
|
||||
add_subdirectory(translations)
|
||||
endif ()
|
||||
if (BUILD_TESTING)
|
||||
enable_testing()
|
||||
add_subdirectory(test)
|
||||
endif ()
|
||||
|
||||
include(packages-recipe.cmake)
|
||||
|
141
sources/awdebug.cpp
Normal file
@ -0,0 +1,141 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#include <KI18n/KLocalizedString>
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget", QtMsgType::QtWarningMsg)
|
||||
Q_LOGGING_CATEGORY(LOG_DBUS, "org.kde.plasma.awdbus", QtMsgType::QtWarningMsg)
|
||||
Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel", QtMsgType::QtWarningMsg)
|
||||
Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
|
||||
Q_LOGGING_CATEGORY(LOG_ESS, "org.kde.plasma.extsysmonsources", QtMsgType::QtWarningMsg)
|
||||
Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets", QtMsgType::QtWarningMsg)
|
||||
|
||||
|
||||
QString AWDebug::getAboutText(const QString &_type)
|
||||
{
|
||||
QString text;
|
||||
if (_type == "header") {
|
||||
text = NAME;
|
||||
} else if (_type == "version") {
|
||||
text = i18n("Version %1 (build date %2)", VERSION, BUILD_DATE);
|
||||
if (!QString(COMMIT_SHA).isEmpty())
|
||||
text += QString(" (%1)").arg(COMMIT_SHA);
|
||||
} else if (_type == "description") {
|
||||
text = i18n("A set of minimalistic plasmoid widgets");
|
||||
} else if (_type == "links") {
|
||||
text = i18n("Links:") + "<ul>"
|
||||
+ QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE).arg(i18n("Homepage"))
|
||||
+ QString("<li><a href=\"%1\">%2</a></li>").arg(REPOSITORY).arg(i18n("Repository"))
|
||||
+ QString("<li><a href=\"%1\">%2</a></li>").arg(BUGTRACKER).arg(i18n("Bugtracker"))
|
||||
+ QString("<li><a href=\"%1\">%2</a></li>")
|
||||
.arg(TRANSLATION)
|
||||
.arg(i18n("Translation issue"))
|
||||
+ QString("<li><a href=\"%1\">%2</a></li>")
|
||||
.arg(AUR_PACKAGES)
|
||||
.arg(i18n("AUR packages"))
|
||||
+ QString("<li><a href=\"%1\">%2</a></li>")
|
||||
.arg(OPENSUSE_PACKAGES)
|
||||
.arg(i18n("openSUSE packages"))
|
||||
+ "</ul>";
|
||||
} else if (_type == "copy") {
|
||||
text = QString("<small>© %1 <a href=\"mailto:%2\">%3</a><br>")
|
||||
.arg(DATE)
|
||||
.arg(EMAIL)
|
||||
.arg(AUTHOR)
|
||||
+ i18nc("This software is licensed under %1", LICENSE) + "</small>";
|
||||
} else if (_type == "translators") {
|
||||
QStringList translatorList = QString(TRANSLATORS).split(',');
|
||||
for (auto &translator : translatorList)
|
||||
translator = QString("<li>%1</li>").arg(translator);
|
||||
text = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
|
||||
} else if (_type == "3rdparty") {
|
||||
QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(';', Qt::SkipEmptyParts);
|
||||
for (int i = 0; i < trdPartyList.count(); i++)
|
||||
trdPartyList[i] = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
|
||||
.arg(trdPartyList.at(i).split(',')[0])
|
||||
.arg(trdPartyList.at(i).split(',')[1])
|
||||
.arg(trdPartyList.at(i).split(',')[2]);
|
||||
text = i18n("This software uses:") + "<ul>" + trdPartyList.join("") + "</ul>";
|
||||
} else if (_type == "thanks") {
|
||||
QStringList thanks = QString(SPECIAL_THANKS).split(';', Qt::SkipEmptyParts);
|
||||
for (int i = 0; i < thanks.count(); i++)
|
||||
thanks[i] = QString("<li><a href=\"%2\">%1</a></li>")
|
||||
.arg(thanks.at(i).split(',')[0])
|
||||
.arg(thanks.at(i).split(',')[1]);
|
||||
text = i18n("Special thanks to:") + "<ul>" + thanks.join("") + "</ul>";
|
||||
}
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
|
||||
QStringList AWDebug::getBuildData()
|
||||
{
|
||||
QStringList metadata;
|
||||
metadata.append("=== Awesome Widgets configuration details ===");
|
||||
// build information
|
||||
metadata.append("Build details:");
|
||||
metadata.append(QString(" VERSION: %1").arg(VERSION));
|
||||
metadata.append(QString(" COMMIT_SHA: %1").arg(COMMIT_SHA));
|
||||
metadata.append(QString(" BUILD_DATE: %1").arg(BUILD_DATE));
|
||||
// configuration
|
||||
metadata.append("API details:");
|
||||
metadata.append(QString(" AW_GRAPHITEM_API: %1").arg(AW_GRAPHITEM_API));
|
||||
metadata.append(QString(" AW_EXTQUOTES_API: %1").arg(AW_EXTQUOTES_API));
|
||||
metadata.append(QString(" AW_EXTSCRIPT_API: %1").arg(AW_EXTSCRIPT_API));
|
||||
metadata.append(QString(" AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_API));
|
||||
metadata.append(QString(" AW_EXTWEATHER_API: %1").arg(AW_EXTWEATHER_API));
|
||||
metadata.append(QString(" AW_FORMATTER_API: %1").arg(AW_FORMATTER_API));
|
||||
metadata.append(QString(" REQUEST_TIMEOUT: %1").arg(REQUEST_TIMEOUT));
|
||||
metadata.append(QString(" TIME_KEYS: %1").arg(TIME_KEYS));
|
||||
metadata.append(QString(" STATIC_KEYS: %1").arg(STATIC_KEYS));
|
||||
// cmake properties
|
||||
metadata.append("cmake properties:");
|
||||
metadata.append(QString(" CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
|
||||
metadata.append(QString(" CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
|
||||
metadata.append(QString(" CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
|
||||
metadata.append(QString(" CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
|
||||
metadata.append(QString(" CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
|
||||
metadata.append(
|
||||
QString(" CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
|
||||
metadata.append(QString(" CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
|
||||
metadata.append(QString(" CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
|
||||
metadata.append(QString(" CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));
|
||||
metadata.append(QString(" CMAKE_SHARED_LINKER_FLAGS: %1").arg(CMAKE_SHARED_LINKER_FLAGS));
|
||||
// components
|
||||
metadata.append("Components data:");
|
||||
metadata.append(QString(" BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
|
||||
metadata.append(QString(" BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
|
||||
metadata.append(QString(" BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
|
||||
metadata.append(QString(" CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
|
||||
metadata.append(QString(" COVERITY_COMMENT: %1").arg(COVERITY_COMMENT));
|
||||
metadata.append(QString(" COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
|
||||
metadata.append(QString(" COVERITY_EMAIL: %1").arg(COVERITY_EMAIL));
|
||||
metadata.append(QString(" COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
|
||||
metadata.append(QString(" COVERITY_URL: %1").arg(COVERITY_URL));
|
||||
metadata.append(QString(" CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
|
||||
// additional functions
|
||||
metadata.append(QString(" PROP_FUTURE: %1").arg(PROP_FUTURE));
|
||||
metadata.append(QString(" PROP_LOAD: %1").arg(PROP_LOAD));
|
||||
metadata.append(QString(" PROP_TEST: %1").arg(PROP_TEST));
|
||||
|
||||
return metadata;
|
||||
}
|
47
sources/awdebug.h
Normal file
@ -0,0 +1,47 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWDEBUG_H
|
||||
#define AWDEBUG_H
|
||||
|
||||
#include <QLoggingCategory>
|
||||
|
||||
#include "version.h"
|
||||
|
||||
namespace AWDebug
|
||||
{
|
||||
const char LOG_FORMAT[] = "[%{time "
|
||||
"process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
|
||||
"{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
|
||||
"fatal}FF%{endif}][%{category}][%{function}] "
|
||||
"%{message}";
|
||||
|
||||
QString getAboutText(const QString &_type);
|
||||
QStringList getBuildData();
|
||||
} // namespace AWDebug
|
||||
|
||||
|
||||
Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
|
||||
Q_DECLARE_LOGGING_CATEGORY(LOG_DBUS)
|
||||
Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
|
||||
Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
|
||||
Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
|
||||
Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
|
||||
|
||||
|
||||
#endif /* AWDEBUG_H */
|
7
sources/awesome-widget/CMakeLists.txt
Normal file
@ -0,0 +1,7 @@
|
||||
set(SUBPROJECT plasma_applet_awesome-widget)
|
||||
message(STATUS "Subproject ${SUBPROJECT}")
|
||||
|
||||
configure_file(metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
|
||||
|
||||
add_subdirectory(plugin)
|
||||
plasma_install_package(package org.kde.plasma.awesomewidget)
|
27
sources/awesome-widget/metadata.desktop
Normal file
@ -0,0 +1,27 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Awesome Widget
|
||||
Comment=A minimalistic Plasmoid
|
||||
Comment[en]=A minimalistic Plasmoid
|
||||
Comment[es]=Un plasmoide minimalista
|
||||
Comment[es]=Un script Plasmoïde minimaliste
|
||||
Comment[pt_BR]=Um script Plasmoid
|
||||
Comment[ru]=Минималистичный плазмоид
|
||||
Comment[uk]=Мінімалістичний плазмоїд
|
||||
X-KDE-ServiceTypes=Plasma/Applet
|
||||
Type=Service
|
||||
Icon=utilities-system-monitor
|
||||
|
||||
X-KDE-ServiceTypes=Plasma/Applet
|
||||
X-Plasma-API=declarativeappletscript
|
||||
X-Plasma-MainScript=ui/main.qml
|
||||
|
||||
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
|
||||
X-KDE-PluginInfo-Email=esalexeev@gmail.com
|
||||
X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
|
||||
X-KDE-PluginInfo-Version=@PROJECT_VERSION@
|
||||
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
|
||||
X-KDE-PluginInfo-Category=System Information
|
||||
X-KDE-PluginInfo-Depends=
|
||||
X-KDE-PluginInfo-License=GPLv3
|
||||
X-KDE-PluginInfo-EnabledByDefault=true
|
59
sources/awesome-widget/package/contents/config/config.qml
Normal file
@ -0,0 +1,59 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
|
||||
import org.kde.plasma.configuration 2.0
|
||||
|
||||
|
||||
ConfigModel {
|
||||
ConfigCategory {
|
||||
name: i18n("Widget")
|
||||
icon: "utilities-system-monitor"
|
||||
source: "widget.qml"
|
||||
}
|
||||
|
||||
ConfigCategory {
|
||||
name: i18n("Advanced")
|
||||
icon: "system-run"
|
||||
source: "advanced.qml"
|
||||
}
|
||||
|
||||
ConfigCategory {
|
||||
name: i18n("Tooltip")
|
||||
icon: "preferences-desktop-color"
|
||||
source: "tooltip.qml"
|
||||
}
|
||||
|
||||
ConfigCategory {
|
||||
name: i18n("Appearance")
|
||||
icon: "preferences-desktop-theme"
|
||||
source: "appearance.qml"
|
||||
}
|
||||
|
||||
ConfigCategory {
|
||||
name: i18n("DataEngine")
|
||||
icon: "utilities-system-monitor"
|
||||
source: "dataengine.qml"
|
||||
}
|
||||
|
||||
ConfigCategory {
|
||||
name: i18n("About")
|
||||
icon: "help-about"
|
||||
source: "about.qml"
|
||||
}
|
||||
}
|
158
sources/awesome-widget/package/contents/config/main.xml
Normal file
@ -0,0 +1,158 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
|
||||
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
|
||||
<kcfgfile name=""/>
|
||||
|
||||
<group name="Widget">
|
||||
<!-- widget -->
|
||||
<entry name="text" type="string">
|
||||
<default>[cpu: $cpu%] [mem: $mem%] [swap: $swap%] [$netdev: $down/$upKB/s]</default>
|
||||
</entry>
|
||||
</group>
|
||||
|
||||
<group name="Advanced">
|
||||
<!-- advanced -->
|
||||
<entry name="background" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="translateStrings" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="wrapNewLines" type="bool">
|
||||
<default>false</default>
|
||||
</entry>
|
||||
<entry name="wrapText" type="bool">
|
||||
<default>false</default>
|
||||
</entry>
|
||||
<entry name="notify" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="checkUpdates" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="optimize" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="height" type="int">
|
||||
<default>0</default>
|
||||
</entry>
|
||||
<entry name="width" type="int">
|
||||
<default>0</default>
|
||||
</entry>
|
||||
<entry name="interval" type="int">
|
||||
<default>1000</default>
|
||||
</entry>
|
||||
<entry name="queueLimit" type="int">
|
||||
<default>0</default>
|
||||
</entry>
|
||||
<entry name="tempUnits" type="string">
|
||||
<default>Celsius</default>
|
||||
</entry>
|
||||
<entry name="customTime" type="string">
|
||||
<default>$hh:$mm</default>
|
||||
</entry>
|
||||
<entry name="customUptime" type="string">
|
||||
<default>$dd,$hh,$mm</default>
|
||||
</entry>
|
||||
<entry name="acOnline" type="string">
|
||||
<default>(*)</default>
|
||||
</entry>
|
||||
<entry name="acOffline" type="string">
|
||||
<default>( )</default>
|
||||
</entry>
|
||||
<entry name="telemetryCount" type="int">
|
||||
<default>100</default>
|
||||
</entry>
|
||||
<entry name="telemetryRemote" type="bool">
|
||||
<default>false</default>
|
||||
</entry>
|
||||
<entry name="telemetryId" type="string">
|
||||
<default></default>
|
||||
</entry>
|
||||
</group>
|
||||
|
||||
<group name="Tooltip">
|
||||
<entry name="tooltipNumber" type="int">
|
||||
<default>100</default>
|
||||
</entry>
|
||||
<entry name="useTooltipBackground" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="tooltipBackground" type="string">
|
||||
<default>#ffffff</default>
|
||||
</entry>
|
||||
<entry name="cpuTooltip" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="cpuTooltipColor" type="string">
|
||||
<default>#ff0000</default>
|
||||
</entry>
|
||||
<entry name="cpuclTooltip" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="cpuclTooltipColor" type="string">
|
||||
<default>#00ff00</default>
|
||||
</entry>
|
||||
<entry name="memTooltip" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="memTooltipColor" type="string">
|
||||
<default>#0000ff</default>
|
||||
</entry>
|
||||
<entry name="swapTooltip" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="swapTooltipColor" type="string">
|
||||
<default>#ffff00</default>
|
||||
</entry>
|
||||
<entry name="downkbTooltip" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="downkbTooltipColor" type="string">
|
||||
<default>#00ffff</default>
|
||||
</entry>
|
||||
<entry name="upkbTooltipColor" type="string">
|
||||
<default>#ff00ff</default>
|
||||
</entry>
|
||||
<entry name="batTooltip" type="bool">
|
||||
<default>true</default>
|
||||
</entry>
|
||||
<entry name="batTooltipColor" type="string">
|
||||
<default>#008800</default>
|
||||
</entry>
|
||||
<entry name="batInTooltipColor" type="string">
|
||||
<default>#880000</default>
|
||||
</entry>
|
||||
</group>
|
||||
|
||||
<group name="Appearance">
|
||||
<!-- appearance -->
|
||||
<entry name="textAlign" type="string">
|
||||
<default>center</default>
|
||||
</entry>
|
||||
<entry name="fontFamily" type="string">
|
||||
<default>Terminus</default>
|
||||
</entry>
|
||||
<entry name="fontSize" type="int">
|
||||
<default>12</default>
|
||||
</entry>
|
||||
<entry name="fontColor" type="string">
|
||||
<default>#000000</default>
|
||||
</entry>
|
||||
<entry name="fontWeight" type="string">
|
||||
<default>normal</default>
|
||||
</entry>
|
||||
<entry name="fontStyle" type="string">
|
||||
<default>normal</default>
|
||||
</entry>
|
||||
<entry name="textStyle" type="string">
|
||||
<default>normal</default>
|
||||
</entry>
|
||||
<entry name="textStyleColor" type="string">
|
||||
<default>#000000</default>
|
||||
</entry>
|
||||
</group>
|
||||
|
||||
</kcfg>
|
42
sources/awesome-widget/package/contents/ui/about.qml
Normal file
@ -0,0 +1,42 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
|
||||
import org.kde.plasma.private.awesomewidget 1.0
|
||||
|
||||
|
||||
Item {
|
||||
id: aboutPage
|
||||
// backend
|
||||
AWActions {
|
||||
id: awActions
|
||||
}
|
||||
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
|
||||
property bool debug: awActions.isDebugEnabled()
|
||||
|
||||
AboutTab {
|
||||
textProvider: awActions
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
if (debug) console.debug()
|
||||
}
|
||||
}
|
262
sources/awesome-widget/package/contents/ui/advanced.qml
Normal file
@ -0,0 +1,262 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
import QtQuick.Controls 1.3 as QtControls
|
||||
|
||||
import org.kde.plasma.private.awesomewidget 1.0
|
||||
|
||||
|
||||
Item {
|
||||
id: advancedPage
|
||||
// backend
|
||||
AWActions {
|
||||
id: awActions
|
||||
}
|
||||
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
implicitWidth: pageColumn.implicitWidth
|
||||
implicitHeight: pageColumn.implicitHeight
|
||||
|
||||
property bool debug: awActions.isDebugEnabled()
|
||||
|
||||
property alias cfg_background: background.checked
|
||||
property alias cfg_translateStrings: translate.checked
|
||||
property alias cfg_wrapNewLines: wrapNewLines.checked
|
||||
property alias cfg_wrapText: wordWrap.checked
|
||||
property alias cfg_notify: notify.checked
|
||||
property alias cfg_checkUpdates: updates.checked
|
||||
property alias cfg_optimize: optimize.checked
|
||||
property alias cfg_height: widgetHeight.value
|
||||
property alias cfg_width: widgetWidth.value
|
||||
property alias cfg_interval: update.value
|
||||
property alias cfg_queueLimit: queueLimit.value
|
||||
property string cfg_tempUnits: tempUnits.value
|
||||
property alias cfg_customTime: customTime.value
|
||||
property alias cfg_customUptime: customUptime.value
|
||||
property alias cfg_acOnline: acOnline.value
|
||||
property alias cfg_acOffline: acOffline.value
|
||||
property alias cfg_telemetryCount: telemetryCount.value
|
||||
property alias cfg_telemetryRemote: telemetryRemote.checked
|
||||
property alias cfg_telemetryId: telemetryId.value
|
||||
|
||||
|
||||
Column {
|
||||
id: pageColumn
|
||||
anchors.fill: parent
|
||||
|
||||
CheckBoxSelector {
|
||||
id: background
|
||||
text: i18n("Enable background")
|
||||
}
|
||||
|
||||
CheckBoxSelector {
|
||||
id: translate
|
||||
text: i18n("Translate strings")
|
||||
}
|
||||
|
||||
CheckBoxSelector {
|
||||
id: wrapNewLines
|
||||
text: i18n("Wrap new lines")
|
||||
}
|
||||
|
||||
CheckBoxSelector {
|
||||
id: wordWrap
|
||||
text: i18n("Enable word wrap")
|
||||
}
|
||||
|
||||
CheckBoxSelector {
|
||||
id: notify
|
||||
text: i18n("Enable notifications")
|
||||
}
|
||||
|
||||
CheckBoxSelector {
|
||||
id: updates
|
||||
text: i18n("Check updates on startup")
|
||||
}
|
||||
|
||||
CheckBoxSelector {
|
||||
id: optimize
|
||||
text: i18n("Optimize subscription")
|
||||
}
|
||||
|
||||
IntegerSelector {
|
||||
id: widgetHeight
|
||||
maximumValue: 4096
|
||||
minimumValue: 0
|
||||
stepSize: 50
|
||||
text: i18n("Widget height, px")
|
||||
value: plasmoid.configuration.height
|
||||
}
|
||||
|
||||
IntegerSelector {
|
||||
id: widgetWidth
|
||||
maximumValue: 4096
|
||||
minimumValue: 0
|
||||
stepSize: 50
|
||||
text: i18n("Widget width, px")
|
||||
value: plasmoid.configuration.width
|
||||
}
|
||||
|
||||
IntegerSelector {
|
||||
id: update
|
||||
maximumValue: 10000
|
||||
minimumValue: 1000
|
||||
stepSize: 500
|
||||
text: i18n("Time interval")
|
||||
value: plasmoid.configuration.interval
|
||||
}
|
||||
|
||||
IntegerSelector {
|
||||
id: queueLimit
|
||||
maximumValue: 99
|
||||
minimumValue: 0
|
||||
stepSize: 1
|
||||
text: i18n("Messages queue limit")
|
||||
value: plasmoid.configuration.queueLimit
|
||||
}
|
||||
|
||||
ComboBoxSelector {
|
||||
id: tempUnits
|
||||
model: [
|
||||
{
|
||||
'label': i18n("Celsius"),
|
||||
'name': "Celsius"
|
||||
},
|
||||
{
|
||||
'label': i18n("Fahrenheit"),
|
||||
'name': "Fahrenheit"
|
||||
},
|
||||
{
|
||||
'label': i18n("Kelvin"),
|
||||
'name': "Kelvin"
|
||||
},
|
||||
{
|
||||
'label': i18n("Reaumur"),
|
||||
'name': "Reaumur"
|
||||
},
|
||||
{
|
||||
'label': i18n("cm^-1"),
|
||||
'name': "cm^-1"
|
||||
},
|
||||
{
|
||||
'label': i18n("kJ/mol"),
|
||||
'name': "kJ/mol"
|
||||
},
|
||||
{
|
||||
'label': i18n("kcal/mol"),
|
||||
'name': "kcal/mol"
|
||||
}
|
||||
]
|
||||
text: i18n("Temperature units")
|
||||
value: plasmoid.configuration.tempUnits
|
||||
onValueEdited: cfg_tempUnits = newValue
|
||||
}
|
||||
|
||||
LineSelector {
|
||||
id: customTime
|
||||
text: i18n("Custom time format")
|
||||
value: plasmoid.configuration.customTime
|
||||
}
|
||||
|
||||
LineSelector {
|
||||
id: customUptime
|
||||
text: i18n("Custom uptime format")
|
||||
value: plasmoid.configuration.customUptime
|
||||
}
|
||||
|
||||
LineSelector {
|
||||
id: acOnline
|
||||
text: i18n("AC online tag")
|
||||
value: plasmoid.configuration.acOnline
|
||||
}
|
||||
|
||||
LineSelector {
|
||||
id: acOffline
|
||||
text: i18n("AC offline tag")
|
||||
value: plasmoid.configuration.acOffline
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
title: i18n("Actions")
|
||||
|
||||
Column {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
ButtonSelector {
|
||||
value: i18n("Drop key cache")
|
||||
onButtonActivated: awActions.dropCache()
|
||||
}
|
||||
ButtonSelector {
|
||||
ExportDialog {
|
||||
id: saveConfigAs
|
||||
configuration: plasmoid.configuration
|
||||
}
|
||||
value: i18n("Export configuration")
|
||||
onButtonActivated: saveConfigAs.open()
|
||||
}
|
||||
ButtonSelector {
|
||||
ImportDialog {
|
||||
id: loadConfigFrom
|
||||
onConfigurationReceived: {
|
||||
for (var key in configuration)
|
||||
plasmoid.configuration[key] = configuration[key]
|
||||
}
|
||||
}
|
||||
value: i18n("Import configuration")
|
||||
onButtonActivated: loadConfigFrom.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
title: i18n("Telemetry")
|
||||
|
||||
Column {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
CheckBoxSelector {
|
||||
id: telemetryRemote
|
||||
text: i18n("Enable remote telemetry")
|
||||
}
|
||||
IntegerSelector {
|
||||
id: telemetryCount
|
||||
maximumValue: 10000
|
||||
minimumValue: 0
|
||||
stepSize: 50
|
||||
text: i18n("History count")
|
||||
value: plasmoid.configuration.telemetryCount
|
||||
}
|
||||
LineSelector {
|
||||
id: telemetryId
|
||||
text: i18n("Telemetry ID")
|
||||
value: plasmoid.configuration.telemetryId
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Component.onCompleted: {
|
||||
if (debug) console.debug()
|
||||
}
|
||||
}
|
114
sources/awesome-widget/package/contents/ui/appearance.qml
Normal file
@ -0,0 +1,114 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
|
||||
import org.kde.plasma.private.awesomewidget 1.0
|
||||
import "."
|
||||
|
||||
|
||||
Item {
|
||||
id: appearancePage
|
||||
// backend
|
||||
AWActions {
|
||||
id: awActions
|
||||
}
|
||||
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
implicitWidth: pageColumn.implicitWidth
|
||||
implicitHeight: pageColumn.implicitHeight
|
||||
|
||||
property bool debug: awActions.isDebugEnabled()
|
||||
property variant weight: {
|
||||
25: 0,
|
||||
50: 1,
|
||||
63: 3,
|
||||
75: 4,
|
||||
87: 5
|
||||
}
|
||||
|
||||
property alias cfg_fontFamily: font.value
|
||||
property alias cfg_fontSize: fontSize.value
|
||||
property string cfg_fontWeight: fontWeight.value
|
||||
property string cfg_fontStyle: fontStyle.value
|
||||
property alias cfg_fontColor: selectColor.value
|
||||
property alias cfg_textStyleColor: selectStyleColor.value
|
||||
property string cfg_textStyle: textStyle.value
|
||||
|
||||
|
||||
Column {
|
||||
id: pageColumn
|
||||
anchors.fill: parent
|
||||
|
||||
FontSelector {
|
||||
id: font
|
||||
text: i18n("Font")
|
||||
value: plasmoid.configuration.fontFamily
|
||||
}
|
||||
|
||||
IntegerSelector {
|
||||
id: fontSize
|
||||
maximumValue: 32
|
||||
minimumValue: 8
|
||||
stepSize: 1
|
||||
text: i18n("Font size")
|
||||
value: plasmoid.configuration.fontSize
|
||||
}
|
||||
|
||||
ComboBoxSelector {
|
||||
id: fontWeight
|
||||
model: General.fontWeightModel
|
||||
text: i18n("Font weight")
|
||||
value: plasmoid.configuration.fontWeight
|
||||
onValueEdited: cfg_fontWeight = newValue
|
||||
}
|
||||
|
||||
ComboBoxSelector {
|
||||
id: fontStyle
|
||||
model: General.fontStyleModel
|
||||
text: i18n("Font style")
|
||||
value: plasmoid.configuration.fontStyle
|
||||
onValueEdited: cfg_fontStyle = newValue
|
||||
}
|
||||
|
||||
ColorSelector {
|
||||
id: selectColor
|
||||
text: i18n("Font color")
|
||||
value: plasmoid.configuration.fontColor
|
||||
}
|
||||
|
||||
ComboBoxSelector {
|
||||
id: textStyle
|
||||
model: General.textStyleModel
|
||||
text: i18n("Style")
|
||||
value: plasmoid.configuration.textStyle
|
||||
onValueEdited: cfg_textStyle = newValue
|
||||
}
|
||||
|
||||
ColorSelector {
|
||||
id: selectStyleColor
|
||||
text: i18n("Style color")
|
||||
value: plasmoid.configuration.textStyleColor
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Component.onCompleted: {
|
||||
if (debug) console.debug()
|
||||
}
|
||||
}
|
264
sources/awesome-widget/package/contents/ui/dataengine.qml
Normal file
@ -0,0 +1,264 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
import QtQuick.Controls 1.3 as QtControls
|
||||
import QtQuick.Dialogs 1.1 as QtDialogs
|
||||
|
||||
import org.kde.plasma.private.awesomewidget 1.0
|
||||
|
||||
|
||||
Item {
|
||||
id: dataenginePage
|
||||
// backend
|
||||
AWKeys {
|
||||
id: awKeys
|
||||
}
|
||||
AWActions {
|
||||
id: awActions
|
||||
}
|
||||
AWConfigHelper {
|
||||
id: awConfig
|
||||
}
|
||||
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
implicitWidth: pageColumn.implicitWidth
|
||||
implicitHeight: pageColumn.implicitHeight
|
||||
|
||||
property bool debug: awActions.isDebugEnabled()
|
||||
|
||||
property variant cfg_dataengine: awConfig.readDataEngineConfiguration()
|
||||
|
||||
|
||||
Column {
|
||||
id: pageColumn
|
||||
anchors.fill: parent
|
||||
QtControls.GroupBox {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
title: i18n("ACPI")
|
||||
LineSelector {
|
||||
text: i18n("ACPI path")
|
||||
value: cfg_dataengine["ACPIPATH"]
|
||||
onValueEdited: cfg_dataengine["ACPIPATH"] = newValue
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
title: i18n("GPU")
|
||||
ComboBoxSelector {
|
||||
model: [
|
||||
{
|
||||
'label': "auto",
|
||||
'name': "auto"
|
||||
},
|
||||
{
|
||||
'label': "disable",
|
||||
'name': "disable"
|
||||
},
|
||||
{
|
||||
'label': "ati",
|
||||
'name': "ati"
|
||||
},
|
||||
{
|
||||
'label': "nvidia",
|
||||
'name': "nvidia"
|
||||
}
|
||||
]
|
||||
text: i18n("GPU device")
|
||||
value: cfg_dataengine["GPUDEV"]
|
||||
onValueEdited: cfg_dataengine["GPUDEV"] = newValue
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
title: i18n("HDD temperature")
|
||||
Column {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
ComboBoxSelector {
|
||||
id: hdd
|
||||
text: i18n("HDD")
|
||||
value: cfg_dataengine["HDDDEV"]
|
||||
onValueEdited: cfg_dataengine["HDDDEV"] = newValue
|
||||
}
|
||||
|
||||
LineSelector {
|
||||
text: i18n("hddtemp cmd")
|
||||
value: cfg_dataengine["HDDTEMPCMD"]
|
||||
onValueEdited: cfg_dataengine["HDDTEMPCMD"] = newValue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
title: i18n("Player")
|
||||
Column {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
IntegerSelector {
|
||||
maximumValue: 100
|
||||
minimumValue: 1
|
||||
stepSize: 1
|
||||
text: i18n("Player data symbols")
|
||||
value: cfg_dataengine["PLAYERSYMBOLS"]
|
||||
onValueEdited: cfg_dataengine["PLAYERSYMBOLS"] = newValue
|
||||
}
|
||||
|
||||
ComboBoxSelector {
|
||||
model: [
|
||||
{
|
||||
'label': "disable",
|
||||
'name': "disable"
|
||||
},
|
||||
{
|
||||
'label': "mpris",
|
||||
'name': "mpris"
|
||||
},
|
||||
{
|
||||
'label': "mpd",
|
||||
'name': "mpd"
|
||||
}
|
||||
]
|
||||
text: i18n("Music player")
|
||||
value: cfg_dataengine["PLAYER"]
|
||||
onValueEdited: cfg_dataengine["PLAYER"] = newValue
|
||||
}
|
||||
|
||||
ComboBoxSelector {
|
||||
id: mpris
|
||||
editable: true
|
||||
model: [
|
||||
{
|
||||
'label': 'auto',
|
||||
'name': 'auto'
|
||||
},
|
||||
{
|
||||
'label': 'amarok',
|
||||
'name': 'amarok'
|
||||
},
|
||||
{
|
||||
'label': 'audacious',
|
||||
'name': 'audacious'
|
||||
},
|
||||
{
|
||||
'label': 'clementine',
|
||||
'name': 'clementine'
|
||||
},
|
||||
{
|
||||
'label': 'DeaDBeeF',
|
||||
'name': 'DeaDBeeF'
|
||||
},
|
||||
{
|
||||
'label': 'vlc',
|
||||
'name': 'vlc'
|
||||
},
|
||||
{
|
||||
'label': 'qmmp',
|
||||
'name': 'qmmp'
|
||||
},
|
||||
{
|
||||
'label': 'xmms2',
|
||||
'name': 'xmms2'
|
||||
},
|
||||
{
|
||||
'label': cfg_dataengine["MPRIS"],
|
||||
'name': cfg_dataengine["MPRIS"]
|
||||
}
|
||||
]
|
||||
text: i18n("MPRIS player name")
|
||||
currentIndex: model.length - 1
|
||||
}
|
||||
|
||||
LineSelector {
|
||||
text: i18n("MPD address")
|
||||
value: cfg_dataengine["MPDADDRESS"]
|
||||
onValueEdited: cfg_dataengine["MPDADDRESS"] = newValue
|
||||
}
|
||||
|
||||
IntegerSelector {
|
||||
maximumValue: 65535
|
||||
minimumValue: 1000
|
||||
stepSize: 1
|
||||
text: i18n("MPD port")
|
||||
value: cfg_dataengine["MPDPORT"]
|
||||
onValueEdited: cfg_dataengine["MPDPORT"] = newValue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
title: i18n("Extensions")
|
||||
Column {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
ButtonSelector {
|
||||
value: i18n("Custom scripts")
|
||||
onButtonActivated: awKeys.editItem("extscript")
|
||||
}
|
||||
|
||||
ButtonSelector {
|
||||
value: i18n("Network requests")
|
||||
onButtonActivated: awKeys.editItem("extnetworkrequest")
|
||||
}
|
||||
|
||||
ButtonSelector {
|
||||
value: i18n("Package manager")
|
||||
onButtonActivated: awKeys.editItem("extupgrade")
|
||||
}
|
||||
|
||||
ButtonSelector {
|
||||
value: i18n("Quotes monitor")
|
||||
onButtonActivated: awKeys.editItem("extquotes")
|
||||
}
|
||||
|
||||
ButtonSelector {
|
||||
value: i18n("Weather")
|
||||
onButtonActivated: awKeys.editItem("extweather")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Component.onCompleted: {
|
||||
if (debug) console.debug()
|
||||
|
||||
// init submodule
|
||||
awKeys.updateCache()
|
||||
|
||||
// update hdd model
|
||||
hdd.model = awKeys.getHddDevices()
|
||||
hdd.onCompleted
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
if (debug) console.debug()
|
||||
|
||||
cfg_dataengine["MPRIS"] = mpris.editText
|
||||
awConfig.writeDataEngineConfiguration(cfg_dataengine)
|
||||
}
|
||||
}
|
258
sources/awesome-widget/package/contents/ui/main.qml
Normal file
@ -0,0 +1,258 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.4
|
||||
import QtQuick.Controls 1.3 as QtControls
|
||||
import QtQuick.Dialogs 1.2 as QtDialogs
|
||||
import QtQuick.Layouts 1.1
|
||||
import org.kde.plasma.plasmoid 2.0
|
||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||
import org.kde.plasma.components 2.0 as PlasmaComponents
|
||||
|
||||
import org.kde.plasma.private.awesomewidget 1.0
|
||||
import "."
|
||||
|
||||
|
||||
Item {
|
||||
id: main
|
||||
// backend
|
||||
AWKeys {
|
||||
id: awKeys
|
||||
}
|
||||
AWActions {
|
||||
id: awActions
|
||||
}
|
||||
AWTelemetryHandler {
|
||||
id: awTelemetryHandler
|
||||
}
|
||||
BugReport {
|
||||
id: bugReport
|
||||
}
|
||||
|
||||
property bool debug: awActions.isDebugEnabled()
|
||||
property variant tooltipSettings: {
|
||||
"tooltipNumber": plasmoid.configuration.tooltipNumber,
|
||||
"useTooltipBackground": plasmoid.configuration.useTooltipBackground,
|
||||
"tooltipBackground": plasmoid.configuration.tooltipBackground,
|
||||
"cpuTooltip": plasmoid.configuration.cpuTooltip,
|
||||
"cpuclTooltip": plasmoid.configuration.cpuclTooltip,
|
||||
"memTooltip": plasmoid.configuration.memTooltip,
|
||||
"swapTooltip": plasmoid.configuration.swapTooltip,
|
||||
"downkbTooltip": plasmoid.configuration.downkbTooltip,
|
||||
"upkbTooltip": plasmoid.configuration.downkbTooltip,
|
||||
"batTooltip": plasmoid.configuration.batTooltip,
|
||||
"cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
|
||||
"cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
|
||||
"memTooltipColor": plasmoid.configuration.memTooltipColor,
|
||||
"swapTooltipColor": plasmoid.configuration.swapTooltipColor,
|
||||
"downkbTooltipColor": plasmoid.configuration.downkbTooltipColor,
|
||||
"upkbTooltipColor": plasmoid.configuration.upkbTooltipColor,
|
||||
"batTooltipColor": plasmoid.configuration.batTooltipColor,
|
||||
"batInTooltipColor": plasmoid.configuration.batInTooltipColor,
|
||||
// additional field to parse AC status
|
||||
"acOnline": plasmoid.configuration.acOnline,
|
||||
// additional field to send notifications
|
||||
"notify": plasmoid.configuration.notify
|
||||
}
|
||||
|
||||
signal needTextUpdate(string newText)
|
||||
signal needToolTipUpdate(string newText)
|
||||
signal sizeUpdate
|
||||
|
||||
|
||||
// init
|
||||
Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
|
||||
Plasmoid.compactRepresentation: Plasmoid.fullRepresentation
|
||||
|
||||
Layout.fillWidth: plasmoid.formFactor != PlasmaCore.Planar
|
||||
Layout.fillHeight: plasmoid.formFactor != PlasmaCore.Planar
|
||||
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
|
||||
|
||||
Plasmoid.icon: "utilities-system-monitor"
|
||||
Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
|
||||
Plasmoid.associatedApplication: "ksysguard"
|
||||
|
||||
|
||||
// ui
|
||||
Text {
|
||||
id: text
|
||||
anchors.fill: parent
|
||||
renderType: Text.NativeRendering
|
||||
textFormat: Text.RichText
|
||||
wrapMode: plasmoid.configuration.wrapText ? Text.WordWrap : Text.NoWrap
|
||||
|
||||
horizontalAlignment: General.align[plasmoid.configuration.textAlign]
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
|
||||
color: plasmoid.configuration.fontColor
|
||||
font.family: plasmoid.configuration.fontFamily
|
||||
font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
|
||||
font.pointSize: plasmoid.configuration.fontSize
|
||||
font.weight: General.fontWeight[plasmoid.configuration.fontWeight]
|
||||
|
||||
style: General.textStyle[plasmoid.configuration.textStyle]
|
||||
styleColor: plasmoid.configuration.textStyleColor
|
||||
|
||||
PlasmaCore.ToolTipArea {
|
||||
height: tooltip.height
|
||||
width: tooltip.width
|
||||
mainItem: Text {
|
||||
id: tooltip
|
||||
height: contentHeight
|
||||
width: contentWidth
|
||||
textFormat: Text.RichText
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QtDialogs.Dialog {
|
||||
id: tagSelector
|
||||
title: i18n("Select tag")
|
||||
|
||||
QtControls.ComboBox {
|
||||
id: tagSelectorBox
|
||||
width: parent.width
|
||||
editable: true
|
||||
}
|
||||
|
||||
onAccepted: {
|
||||
var tag = tagSelectorBox.editText
|
||||
var message = i18n("Tag: %1", tag)
|
||||
message += "<br>"
|
||||
message += i18n("Value: %1", awKeys.valueByKey(tag))
|
||||
message += "<br>"
|
||||
message += i18n("Info: %1", awKeys.infoByKey(tag))
|
||||
awActions.sendNotification("tag", message)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Component.onCompleted: {
|
||||
if (debug) console.debug()
|
||||
|
||||
// actions
|
||||
// it makes no sense to use this field with optimization enable
|
||||
if (!plasmoid.configuration.optimize)
|
||||
plasmoid.setAction("requestKey", i18n("Request key"), "utilities-system-monitor")
|
||||
plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
|
||||
plasmoid.setAction("checkUpdates", i18n("Check updates"), "system-software-update")
|
||||
plasmoid.setAction("reportBug", i18n("Report bug"), "tools-report-bug")
|
||||
// init submodule
|
||||
Plasmoid.userConfiguringChanged(false)
|
||||
// connect data
|
||||
awKeys.needTextToBeUpdated.connect(needTextUpdate)
|
||||
awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
|
||||
// check updates if required
|
||||
if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
|
||||
}
|
||||
|
||||
onNeedTextUpdate: {
|
||||
if (debug) console.debug()
|
||||
|
||||
text.text = newText
|
||||
sizeUpdate()
|
||||
}
|
||||
|
||||
onNeedToolTipUpdate: {
|
||||
if (debug) console.debug()
|
||||
|
||||
tooltip.text = newText
|
||||
}
|
||||
|
||||
onSizeUpdate: {
|
||||
if (debug) console.debug()
|
||||
// 16 is a magic number
|
||||
// in other case plasmoid will increase own size on each update
|
||||
|
||||
if (plasmoid.configuration.height == 0) {
|
||||
Layout.minimumHeight = text.contentHeight - 16
|
||||
Layout.maximumHeight = -1
|
||||
} else {
|
||||
Layout.minimumHeight = plasmoid.configuration.height
|
||||
Layout.maximumHeight = plasmoid.configuration.height
|
||||
}
|
||||
if (plasmoid.configuration.width == 0) {
|
||||
Layout.minimumWidth = text.contentWidth - 16
|
||||
Layout.maximumWidth = -1
|
||||
} else {
|
||||
Layout.minimumWidth = plasmoid.configuration.width
|
||||
Layout.maximumWidth = plasmoid.configuration.width
|
||||
}
|
||||
}
|
||||
|
||||
Plasmoid.onUserConfiguringChanged: {
|
||||
if (plasmoid.userConfiguring) return
|
||||
if (debug) console.debug()
|
||||
|
||||
// init submodule
|
||||
awKeys.initDataAggregator(tooltipSettings)
|
||||
awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
|
||||
plasmoid.configuration.queueLimit, plasmoid.configuration.optimize)
|
||||
awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
|
||||
// configure aggregator
|
||||
awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
|
||||
awKeys.setAggregatorProperty("acOnline", plasmoid.configuration.acOnline)
|
||||
awKeys.setAggregatorProperty("customTime", plasmoid.configuration.customTime)
|
||||
awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
|
||||
awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
|
||||
awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
|
||||
// update telemetry ID
|
||||
if (plasmoid.configuration.telemetryId.length == 0)
|
||||
plasmoid.configuration.telemetryId = generateUuid()
|
||||
// save telemetry
|
||||
awTelemetryHandler.init(plasmoid.configuration.telemetryCount,
|
||||
plasmoid.configuration.telemetryRemote,
|
||||
plasmoid.configuration.telemetryId)
|
||||
if (awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text))
|
||||
awTelemetryHandler.uploadTelemetry("awwidgetconfig", plasmoid.configuration.text)
|
||||
}
|
||||
|
||||
|
||||
function action_checkUpdates() {
|
||||
if (debug) console.debug()
|
||||
|
||||
return awActions.checkUpdates(true)
|
||||
}
|
||||
|
||||
function action_showReadme() {
|
||||
if (debug) console.debug()
|
||||
|
||||
return awActions.showReadme()
|
||||
}
|
||||
|
||||
function action_reportBug() {
|
||||
if (debug) console.debug()
|
||||
|
||||
bugReport.reset()
|
||||
bugReport.open()
|
||||
}
|
||||
|
||||
function action_requestKey() {
|
||||
if (debug) console.debug()
|
||||
|
||||
tagSelectorBox.model = awKeys.dictKeys(true)
|
||||
return tagSelector.open()
|
||||
}
|
||||
|
||||
// code from http://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
|
||||
function generateUuid() {
|
||||
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
|
||||
var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
|
||||
return v.toString(16);
|
||||
});
|
||||
}
|
||||
}
|
27
sources/awesome-widget/package/contents/ui/qmldir
Normal file
@ -0,0 +1,27 @@
|
||||
# Do not edit qmldir directly it will be overrided during compilation,
|
||||
# edit qml/qmldir.in file instead.
|
||||
|
||||
|
||||
# common QML constants
|
||||
singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml
|
||||
|
||||
# custom QML UI classes
|
||||
AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml
|
||||
AWExtensions file:///usr/share/awesomewidgets/qml/AWExtensions.qml
|
||||
AWInfoLabel file:///usr/share/awesomewidgets/qml/AWInfoLabel.qml
|
||||
AWTagSelector file:///usr/share/awesomewidgets/qml/AWTagSelector.qml
|
||||
AWTextEditor file:///usr/share/awesomewidgets/qml/AWTextEditor.qml
|
||||
BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml
|
||||
ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml
|
||||
CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml
|
||||
ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml
|
||||
ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml
|
||||
ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml
|
||||
FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml
|
||||
HtmlDefaultFunctionsBar file:///usr/share/awesomewidgets/qml/HtmlDefaultFunctionsBar.qml
|
||||
HtmlEditorButton file:///usr/share/awesomewidgets/qml/HtmlEditorButton.qml
|
||||
HtmlEditorColor file:///usr/share/awesomewidgets/qml/HtmlEditorColor.qml
|
||||
HtmlEditorFont file:///usr/share/awesomewidgets/qml/HtmlEditorFont.qml
|
||||
ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml
|
||||
IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml
|
||||
LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml
|
191
sources/awesome-widget/package/contents/ui/tooltip.qml
Normal file
@ -0,0 +1,191 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.0
|
||||
import QtQuick.Controls 1.3 as QtControls
|
||||
|
||||
import org.kde.plasma.private.awesomewidget 1.0
|
||||
|
||||
|
||||
Item {
|
||||
id: tooltipPage
|
||||
// backend
|
||||
AWActions {
|
||||
id: awActions
|
||||
}
|
||||
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
implicitWidth: pageColumn.implicitWidth
|
||||
implicitHeight: pageColumn.implicitHeight
|
||||
|
||||
property bool debug: awActions.isDebugEnabled()
|
||||
|
||||
property alias cfg_tooltipNumber: tooltipNumber.value
|
||||
property alias cfg_useTooltipBackground: useTooltipBackground.checked
|
||||
property alias cfg_tooltipBackground: tooltipBackground.value
|
||||
property alias cfg_cpuTooltip: cpuTooltip.checked
|
||||
property alias cfg_cpuTooltipColor: cpuTooltipColor.value
|
||||
property alias cfg_cpuclTooltip: cpuclTooltip.checked
|
||||
property alias cfg_cpuclTooltipColor: cpuclTooltipColor.value
|
||||
property alias cfg_memTooltip: memTooltip.checked
|
||||
property alias cfg_memTooltipColor: memTooltipColor.value
|
||||
property alias cfg_swapTooltip: swapTooltip.checked
|
||||
property alias cfg_swapTooltipColor: swapTooltipColor.value
|
||||
property alias cfg_downkbTooltip: downkbTooltip.checked
|
||||
property alias cfg_downkbTooltipColor: downkbTooltipColor.value
|
||||
property alias cfg_upkbTooltipColor: upkbTooltipColor.value
|
||||
property alias cfg_batTooltip: batTooltip.checked
|
||||
property alias cfg_batTooltipColor: batTooltipColor.value
|
||||
property alias cfg_batInTooltipColor: batInTooltipColor.value
|
||||
|
||||
|
||||
Column {
|
||||
id: pageColumn
|
||||
anchors.fill: parent
|
||||
QtControls.Label {
|
||||
width: parent.width
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
wrapMode: Text.WordWrap
|
||||
text: i18n("CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make needed checkbox checked.")
|
||||
}
|
||||
|
||||
IntegerSelector {
|
||||
id: tooltipNumber
|
||||
maximumValue: 1000
|
||||
minimumValue: 50
|
||||
stepSize: 25
|
||||
text: i18n("Number of values for tooltips")
|
||||
value: plasmoid.configuration.tooltipNumber
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
id: useTooltipBackground
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
checkable: true
|
||||
title: i18n("Background")
|
||||
ColorSelector {
|
||||
id: tooltipBackground
|
||||
text: i18n("Background color")
|
||||
value: plasmoid.configuration.tooltipBackground
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
id: cpuTooltip
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
checkable: true
|
||||
title: i18n("CPU")
|
||||
ColorSelector {
|
||||
id: cpuTooltipColor
|
||||
text: i18n("CPU color")
|
||||
value: plasmoid.configuration.cpuTooltipColor
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
id: cpuclTooltip
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
checkable: true
|
||||
title: i18n("CPU clock")
|
||||
ColorSelector {
|
||||
id: cpuclTooltipColor
|
||||
text: i18n("CPU clock color")
|
||||
value: plasmoid.configuration.cpuclTooltipColor
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
id: memTooltip
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
checkable: true
|
||||
title: i18n("Memory")
|
||||
ColorSelector {
|
||||
id: memTooltipColor
|
||||
text: i18n("Memory color")
|
||||
value: plasmoid.configuration.memTooltipColor
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
id: swapTooltip
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
checkable: true
|
||||
title: i18n("Swap")
|
||||
ColorSelector {
|
||||
id: swapTooltipColor
|
||||
text: i18n("Swap color")
|
||||
value: plasmoid.configuration.swapTooltipColor
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
id: downkbTooltip
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
checkable: true
|
||||
title: i18n("Network")
|
||||
Column {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
ColorSelector {
|
||||
id: downkbTooltipColor
|
||||
text: i18n("Download speed color")
|
||||
value: plasmoid.configuration.downkbTooltipColor
|
||||
}
|
||||
ColorSelector {
|
||||
id: upkbTooltipColor
|
||||
text: i18n("Upload speed color")
|
||||
value: plasmoid.configuration.upkbTooltipColor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QtControls.GroupBox {
|
||||
id: batTooltip
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
checkable: true
|
||||
title: i18n("Battery")
|
||||
Column {
|
||||
height: implicitHeight
|
||||
width: parent.width
|
||||
ColorSelector {
|
||||
id: batTooltipColor
|
||||
text: i18n("Battery active color")
|
||||
value: plasmoid.configuration.batTooltipColor
|
||||
}
|
||||
ColorSelector {
|
||||
id: batInTooltipColor
|
||||
text: i18n("Battery inactive color")
|
||||
value: plasmoid.configuration.batInTooltipColor
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Component.onCompleted: {
|
||||
if (debug) console.debug()
|
||||
}
|
||||
}
|
100
sources/awesome-widget/package/contents/ui/widget.qml
Normal file
@ -0,0 +1,100 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
import QtQuick 2.2
|
||||
|
||||
import org.kde.plasma.private.awesomewidget 1.0
|
||||
import "."
|
||||
|
||||
|
||||
Item {
|
||||
id: widgetPage
|
||||
// backend
|
||||
AWKeys {
|
||||
id: awKeys
|
||||
}
|
||||
AWActions {
|
||||
id: awActions
|
||||
}
|
||||
|
||||
width: childrenRect.width
|
||||
height: childrenRect.height
|
||||
implicitWidth: pageColumn.implicitWidth
|
||||
implicitHeight: pageColumn.implicitHeight
|
||||
|
||||
property bool debug: awActions.isDebugEnabled()
|
||||
|
||||
property alias cfg_text: textPattern.text
|
||||
property bool lock: true
|
||||
|
||||
signal needTextUpdate(string newText)
|
||||
|
||||
|
||||
Column {
|
||||
id: pageColumn
|
||||
anchors.fill: parent
|
||||
|
||||
AWInfoLabel {}
|
||||
|
||||
HtmlDefaultFunctionsBar {
|
||||
textArea: textPattern
|
||||
}
|
||||
|
||||
AWTagSelector {
|
||||
backend: awKeys
|
||||
notifyBackend: awActions
|
||||
textArea: textPattern
|
||||
groups: General.awTagRegexp
|
||||
}
|
||||
|
||||
AWExtensions {
|
||||
id: extensions
|
||||
backend: awKeys
|
||||
textArea: textPattern
|
||||
onUnlock: lock = false
|
||||
}
|
||||
|
||||
AWTextEditor {
|
||||
id: textPattern
|
||||
backend: awKeys
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Component.onCompleted: {
|
||||
if (debug) console.debug()
|
||||
|
||||
awKeys.needTextToBeUpdated.connect(needTextUpdate)
|
||||
// init submodule
|
||||
awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
|
||||
plasmoid.configuration.queueLimit, false)
|
||||
awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
|
||||
awKeys.setAggregatorProperty("acOnline", plasmoid.configuration.acOnline)
|
||||
awKeys.setAggregatorProperty("customTime", plasmoid.configuration.customTime)
|
||||
awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
|
||||
awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
|
||||
awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
|
||||
}
|
||||
|
||||
onNeedTextUpdate: {
|
||||
if (lock) return
|
||||
if (debug) console.debug()
|
||||
|
||||
extensions.showMessage(newText)
|
||||
lock = true
|
||||
}
|
||||
}
|
27
sources/awesome-widget/package/metadata.desktop
Normal file
@ -0,0 +1,27 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Awesome Widget
|
||||
Comment=A minimalistic Plasmoid
|
||||
Comment[en]=A minimalistic Plasmoid
|
||||
Comment[es]=Un plasmoide minimalista
|
||||
Comment[es]=Un script Plasmoïde minimaliste
|
||||
Comment[pt_BR]=Um script Plasmoid
|
||||
Comment[ru]=Минималистичный плазмоид
|
||||
Comment[uk]=Мінімалістичний плазмоїд
|
||||
X-KDE-ServiceTypes=Plasma/Applet
|
||||
Type=Service
|
||||
Icon=utilities-system-monitor
|
||||
|
||||
X-KDE-ServiceTypes=Plasma/Applet
|
||||
X-Plasma-API=declarativeappletscript
|
||||
X-Plasma-MainScript=ui/main.qml
|
||||
|
||||
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
|
||||
X-KDE-PluginInfo-Email=esalexeev@gmail.com
|
||||
X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
|
||||
X-KDE-PluginInfo-Version=3.4.3
|
||||
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
|
||||
X-KDE-PluginInfo-Category=System Information
|
||||
X-KDE-PluginInfo-Depends=
|
||||
X-KDE-PluginInfo-License=GPLv3
|
||||
X-KDE-PluginInfo-EnabledByDefault=true
|
23
sources/awesome-widget/plugin/CMakeLists.txt
Normal file
@ -0,0 +1,23 @@
|
||||
set(PLUGIN_NAME awplugin)
|
||||
add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
|
||||
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
|
||||
${PROJECT_TRDPARTY_DIR}
|
||||
${Qt_INCLUDE}
|
||||
${Kf5_INCLUDE}
|
||||
)
|
||||
|
||||
file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
|
||||
file(GLOB SUBPROJECT_UI *.ui)
|
||||
file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
|
||||
|
||||
qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
|
||||
add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
|
||||
target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
|
||||
|
||||
install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
|
||||
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
|
||||
install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
|
182
sources/awesome-widget/plugin/awabstractpairconfig.cpp
Normal file
@ -0,0 +1,182 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awabstractpairconfig.h"
|
||||
#include "ui_awabstractpairconfig.h"
|
||||
|
||||
#include <KI18n/KLocalizedString>
|
||||
|
||||
#include <QPushButton>
|
||||
#include <utility>
|
||||
|
||||
#include "awabstractselector.h"
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent, const bool _hasEdit, QStringList _keys)
|
||||
: QDialog(_parent)
|
||||
, ui(new Ui::AWAbstractPairConfig)
|
||||
, m_hasEdit(_hasEdit)
|
||||
, m_keys(std::move(_keys))
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
ui->setupUi(this);
|
||||
|
||||
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
|
||||
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
|
||||
|
||||
// edit feature
|
||||
if (m_hasEdit) {
|
||||
m_editButton = ui->buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
|
||||
connect(m_editButton, SIGNAL(clicked(bool)), this, SLOT(edit()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
AWAbstractPairConfig::~AWAbstractPairConfig()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
clearSelectors();
|
||||
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::showDialog()
|
||||
{
|
||||
// update dialog
|
||||
updateDialog();
|
||||
// exec dialog
|
||||
return execDialog();
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::setEditable(const bool _first, const bool _second)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Set editable" << _first << _second;
|
||||
|
||||
m_editable = {_first, _second};
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::edit()
|
||||
{
|
||||
m_helper->editPairs();
|
||||
updateDialog();
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::updateUi()
|
||||
{
|
||||
QPair<QString, QString> current = dynamic_cast<AWAbstractSelector *>(sender())->current();
|
||||
int index = m_selectors.indexOf(dynamic_cast<AWAbstractSelector *>(sender()));
|
||||
|
||||
if ((current.first.isEmpty()) && (current.second.isEmpty())) {
|
||||
// remove current selector if it is empty and does not last
|
||||
if (sender() == m_selectors.last())
|
||||
return;
|
||||
AWAbstractSelector *selector = m_selectors.takeAt(index);
|
||||
ui->verticalLayout->removeWidget(selector);
|
||||
selector->deleteLater();
|
||||
} else {
|
||||
// add new selector if something changed
|
||||
if (sender() != m_selectors.last())
|
||||
return;
|
||||
auto keys = initKeys();
|
||||
addSelector(keys.first, keys.second, QPair<QString, QString>());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::addSelector(const QStringList &_keys, const QStringList &_values,
|
||||
const QPair<QString, QString> &_current)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values
|
||||
<< "and current ones" << _current;
|
||||
|
||||
auto *selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
|
||||
selector->init(_keys, _values, _current);
|
||||
ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
|
||||
connect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
|
||||
m_selectors.append(selector);
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::clearSelectors()
|
||||
{
|
||||
for (auto &selector : m_selectors) {
|
||||
disconnect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
|
||||
ui->verticalLayout->removeWidget(selector);
|
||||
selector->deleteLater();
|
||||
}
|
||||
m_selectors.clear();
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::execDialog()
|
||||
{
|
||||
int ret = exec();
|
||||
QHash<QString, QString> data;
|
||||
for (auto &selector : m_selectors) {
|
||||
QPair<QString, QString> select = selector->current();
|
||||
if (select.first.isEmpty())
|
||||
continue;
|
||||
data[select.first] = select.second;
|
||||
}
|
||||
|
||||
// save configuration if required
|
||||
auto status = true;
|
||||
switch (ret) {
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
default:
|
||||
status &= m_helper->writeItems(data);
|
||||
status &= m_helper->removeUnusedKeys(data.keys());
|
||||
break;
|
||||
}
|
||||
qCDebug(LOG_AW) << "Configuration save status" << status;
|
||||
}
|
||||
|
||||
|
||||
QPair<QStringList, QStringList> AWAbstractPairConfig::initKeys() const
|
||||
{
|
||||
// we are adding empty string at the start
|
||||
QStringList left = {""};
|
||||
left.append(m_helper->leftKeys().isEmpty() ? m_keys : m_helper->leftKeys());
|
||||
left.sort();
|
||||
QStringList right = {""};
|
||||
right.append(m_helper->rightKeys().isEmpty() ? m_keys : m_helper->rightKeys());
|
||||
right.sort();
|
||||
|
||||
return QPair<QStringList, QStringList>(left, right);
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairConfig::updateDialog()
|
||||
{
|
||||
clearSelectors();
|
||||
auto pairs = m_helper->pairs();
|
||||
auto keys = initKeys();
|
||||
|
||||
for (auto &key : m_helper->keys())
|
||||
addSelector(keys.first, keys.second, QPair<QString, QString>(key, m_helper->pairs()[key]));
|
||||
// empty one
|
||||
addSelector(keys.first, keys.second, QPair<QString, QString>());
|
||||
}
|
74
sources/awesome-widget/plugin/awabstractpairconfig.h
Normal file
@ -0,0 +1,74 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWABSTRACTPAIRCONFIG_H
|
||||
#define AWABSTRACTPAIRCONFIG_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
#include "awabstractpairhelper.h"
|
||||
|
||||
|
||||
class AWAbstractSelector;
|
||||
namespace Ui
|
||||
{
|
||||
class AWAbstractPairConfig;
|
||||
}
|
||||
|
||||
class AWAbstractPairConfig : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false,
|
||||
QStringList _keys = QStringList());
|
||||
~AWAbstractPairConfig() override;
|
||||
template <class T> void initHelper()
|
||||
{
|
||||
|
||||
delete m_helper;
|
||||
m_helper = new T(this);
|
||||
}
|
||||
void showDialog();
|
||||
// properties
|
||||
void setEditable(bool _first, bool _second);
|
||||
|
||||
private slots:
|
||||
void edit();
|
||||
void updateUi();
|
||||
|
||||
private:
|
||||
QPushButton *m_editButton = nullptr;
|
||||
Ui::AWAbstractPairConfig *ui = nullptr;
|
||||
AWAbstractPairHelper *m_helper = nullptr;
|
||||
QList<AWAbstractSelector *> m_selectors;
|
||||
// properties
|
||||
QPair<bool, bool> m_editable = {false, false};
|
||||
bool m_hasEdit = false;
|
||||
QStringList m_keys;
|
||||
// methods
|
||||
void addSelector(const QStringList &_keys, const QStringList &_values,
|
||||
const QPair<QString, QString> &_current);
|
||||
void clearSelectors();
|
||||
void execDialog();
|
||||
[[nodiscard]] QPair<QStringList, QStringList> initKeys() const;
|
||||
void updateDialog();
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWABSTRACTPAIRCONFIG_H */
|
93
sources/awesome-widget/plugin/awabstractpairconfig.ui
Normal file
@ -0,0 +1,93 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>AWAbstractPairConfig</class>
|
||||
<widget class="QDialog" name="AWAbstractPairConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea">
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>384</width>
|
||||
<height>249</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>AWAbstractPairConfig</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>AWAbstractPairConfig</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
141
sources/awesome-widget/plugin/awabstractpairhelper.cpp
Normal file
@ -0,0 +1,141 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awabstractpairhelper.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QStandardPaths>
|
||||
#include <utility>
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWAbstractPairHelper::AWAbstractPairHelper(QString _filePath, QString _section)
|
||||
: m_filePath(std::move(_filePath))
|
||||
, m_section(std::move(_section))
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
AWAbstractPairHelper::initItems();
|
||||
}
|
||||
|
||||
|
||||
AWAbstractPairHelper::~AWAbstractPairHelper()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
QStringList AWAbstractPairHelper::keys() const
|
||||
{
|
||||
return m_pairs.keys();
|
||||
}
|
||||
|
||||
|
||||
QHash<QString, QString> AWAbstractPairHelper::pairs() const
|
||||
{
|
||||
return m_pairs;
|
||||
}
|
||||
|
||||
|
||||
QStringList AWAbstractPairHelper::values() const
|
||||
{
|
||||
return m_pairs.values();
|
||||
}
|
||||
|
||||
|
||||
QSet<QString> AWAbstractPairHelper::valuesSet() const
|
||||
{
|
||||
auto values = m_pairs.values();
|
||||
return QSet(values.cbegin(), values.cend());
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractPairHelper::initItems()
|
||||
{
|
||||
m_pairs.clear();
|
||||
|
||||
QStringList configs
|
||||
= QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
|
||||
|
||||
for (auto &fileName : configs) {
|
||||
QSettings settings(fileName, QSettings::IniFormat);
|
||||
qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
|
||||
|
||||
settings.beginGroup(m_section);
|
||||
QStringList keys = settings.childKeys();
|
||||
for (auto &key : keys) {
|
||||
QString value = settings.value(key).toString();
|
||||
qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in"
|
||||
<< settings.fileName();
|
||||
if (value.isEmpty()) {
|
||||
qCInfo(LOG_AW) << "Skip empty value for" << key;
|
||||
continue;
|
||||
}
|
||||
m_pairs[key] = value;
|
||||
}
|
||||
settings.endGroup();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool AWAbstractPairHelper::writeItems(const QHash<QString, QString> &_configuration) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Write configuration" << _configuration;
|
||||
|
||||
QString fileName
|
||||
= QString("%1/%2")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
|
||||
.arg(m_filePath);
|
||||
QSettings settings(fileName, QSettings::IniFormat);
|
||||
qCInfo(LOG_AW) << "Configuration file" << fileName;
|
||||
|
||||
settings.beginGroup(m_section);
|
||||
for (auto &key : _configuration.keys())
|
||||
settings.setValue(key, _configuration[key]);
|
||||
settings.endGroup();
|
||||
|
||||
settings.sync();
|
||||
|
||||
return (settings.status() == QSettings::NoError);
|
||||
}
|
||||
|
||||
|
||||
bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Remove keys" << _keys;
|
||||
|
||||
QString fileName
|
||||
= QString("%1/%2")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
|
||||
.arg(m_filePath);
|
||||
QSettings settings(fileName, QSettings::IniFormat);
|
||||
qCInfo(LOG_AW) << "Configuration file" << fileName;
|
||||
|
||||
settings.beginGroup(m_section);
|
||||
QStringList foundKeys = settings.childKeys();
|
||||
for (auto &key : foundKeys) {
|
||||
if (_keys.contains(key))
|
||||
continue;
|
||||
settings.remove(key);
|
||||
}
|
||||
settings.endGroup();
|
||||
|
||||
settings.sync();
|
||||
|
||||
return (settings.status() == QSettings::NoError);
|
||||
}
|
51
sources/awesome-widget/plugin/awabstractpairhelper.h
Normal file
@ -0,0 +1,51 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWABSTRACTPAIRHELPER_H
|
||||
#define AWABSTRACTPAIRHELPER_H
|
||||
|
||||
#include <QHash>
|
||||
|
||||
|
||||
class AWAbstractPairHelper
|
||||
{
|
||||
public:
|
||||
explicit AWAbstractPairHelper(QString _filePath = "", QString _section = "");
|
||||
virtual ~AWAbstractPairHelper();
|
||||
[[nodiscard]] QStringList keys() const;
|
||||
[[nodiscard]] QHash<QString, QString> pairs() const;
|
||||
[[nodiscard]] QStringList values() const;
|
||||
[[nodiscard]] QSet<QString> valuesSet() const;
|
||||
// read-write methods
|
||||
virtual void initItems();
|
||||
[[nodiscard]] virtual bool writeItems(const QHash<QString, QString> &_configuration) const;
|
||||
[[nodiscard]] virtual bool removeUnusedKeys(const QStringList &_keys) const;
|
||||
// configuration related
|
||||
virtual void editPairs() = 0;
|
||||
virtual QStringList leftKeys() = 0;
|
||||
virtual QStringList rightKeys() = 0;
|
||||
|
||||
private:
|
||||
// properties
|
||||
QHash<QString, QString> m_pairs;
|
||||
QString m_filePath;
|
||||
QString m_section;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWABSTRACTPAIRHELPER_H */
|
75
sources/awesome-widget/plugin/awabstractselector.cpp
Normal file
@ -0,0 +1,75 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awabstractselector.h"
|
||||
#include "ui_awabstractselector.h"
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWAbstractSelector::AWAbstractSelector(QWidget *_parent, const QPair<bool, bool> &_editable)
|
||||
: QWidget(_parent)
|
||||
, ui(new Ui::AWAbstractSelector)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
ui->setupUi(this);
|
||||
ui->comboBox_key->setEditable(_editable.first);
|
||||
ui->comboBox_value->setEditable(_editable.second);
|
||||
|
||||
connect(ui->comboBox_key, SIGNAL(currentIndexChanged(int)), this, SIGNAL(selectionChanged()));
|
||||
connect(ui->comboBox_value, SIGNAL(currentIndexChanged(int)), this, SIGNAL(selectionChanged()));
|
||||
}
|
||||
|
||||
|
||||
AWAbstractSelector::~AWAbstractSelector()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
||||
QPair<QString, QString> AWAbstractSelector::current() const
|
||||
{
|
||||
QString key = ui->comboBox_key->currentText();
|
||||
QString value = ui->comboBox_value->currentText();
|
||||
|
||||
return QPair<QString, QString>(key, value);
|
||||
}
|
||||
|
||||
|
||||
void AWAbstractSelector::init(const QStringList &_keys, const QStringList &_values,
|
||||
const QPair<QString, QString> &_current)
|
||||
{
|
||||
if ((!_keys.contains(_current.first)) || (!_values.contains(_current.second))) {
|
||||
qCWarning(LOG_AW) << "Invalid current value" << _current << "not found in default ones";
|
||||
return;
|
||||
}
|
||||
qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values
|
||||
<< "and current ones are" << _current;
|
||||
|
||||
// set data
|
||||
ui->comboBox_key->clear();
|
||||
ui->comboBox_key->addItems(_keys);
|
||||
ui->comboBox_value->clear();
|
||||
ui->comboBox_value->addItems(_values);
|
||||
|
||||
// set current values
|
||||
ui->comboBox_key->setCurrentText(_current.first);
|
||||
ui->comboBox_value->setCurrentText(_current.second);
|
||||
}
|
50
sources/awesome-widget/plugin/awabstractselector.h
Normal file
@ -0,0 +1,50 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWABSTRACTSELECTOR_H
|
||||
#define AWABSTRACTSELECTOR_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class AWAbstractSelector;
|
||||
}
|
||||
|
||||
class AWAbstractSelector : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWAbstractSelector(QWidget *_parent = nullptr,
|
||||
const QPair<bool, bool> &_editable = {false, false});
|
||||
~AWAbstractSelector() override;
|
||||
[[nodiscard]] QPair<QString, QString> current() const;
|
||||
void init(const QStringList &_keys, const QStringList &_values,
|
||||
const QPair<QString, QString> &_current);
|
||||
|
||||
signals:
|
||||
void selectionChanged();
|
||||
|
||||
private:
|
||||
Ui::AWAbstractSelector *ui = nullptr;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWABSTRACTSELECTOR_H */
|
36
sources/awesome-widget/plugin/awabstractselector.ui
Normal file
@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>AWAbstractSelector</class>
|
||||
<widget class="QWidget" name="AWAbstractSelector">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>25</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QComboBox" name="comboBox_key"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="comboBox_value"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
148
sources/awesome-widget/plugin/awactions.cpp
Normal file
@ -0,0 +1,148 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awactions.h"
|
||||
|
||||
#include <KI18n/KLocalizedString>
|
||||
#include <KNotifications/KNotification>
|
||||
|
||||
#include <QDesktopServices>
|
||||
#include <QFile>
|
||||
#include <QProcess>
|
||||
#include <QUrl>
|
||||
|
||||
#include <fontdialog/fontdialog.h>
|
||||
|
||||
#include "awdebug.h"
|
||||
#include "awupdatehelper.h"
|
||||
|
||||
|
||||
AWActions::AWActions(QObject *_parent)
|
||||
: QObject(_parent)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
m_updateHelper = new AWUpdateHelper(this);
|
||||
}
|
||||
|
||||
|
||||
AWActions::~AWActions()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
void AWActions::checkUpdates(const bool _showAnyway)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
|
||||
|
||||
if (!m_updateHelper->checkVersion())
|
||||
m_updateHelper->checkUpdates(_showAnyway);
|
||||
}
|
||||
|
||||
|
||||
QString AWActions::getFileContent(const QString &_path)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Get content from file" << _path;
|
||||
|
||||
QFile inputFile(_path);
|
||||
if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
qCWarning(LOG_AW) << "Could not open file as text" << inputFile.fileName();
|
||||
return "";
|
||||
}
|
||||
|
||||
QString output = inputFile.readAll();
|
||||
inputFile.close();
|
||||
return output;
|
||||
}
|
||||
|
||||
|
||||
// HACK: since QML could not use QLoggingCategory I need this hack
|
||||
bool AWActions::isDebugEnabled()
|
||||
{
|
||||
return LOG_AW().isDebugEnabled();
|
||||
}
|
||||
|
||||
|
||||
bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;
|
||||
|
||||
sendNotification(QString("Info"), i18n("Run %1", _cmd));
|
||||
|
||||
return QProcess::startDetached(_cmd, _args);
|
||||
}
|
||||
|
||||
|
||||
// HACK: this method uses variable from version.h
|
||||
void AWActions::showReadme()
|
||||
{
|
||||
QDesktopServices::openUrl(QUrl(HOMEPAGE));
|
||||
}
|
||||
|
||||
|
||||
void AWActions::showLegacyInfo()
|
||||
{
|
||||
auto *msgBox = new QMessageBox(nullptr);
|
||||
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||
msgBox->setModal(false);
|
||||
msgBox->setWindowTitle(i18n("Not supported"));
|
||||
msgBox->setText(i18n("You are using mammoth's Qt version, try to update it first"));
|
||||
msgBox->setStandardButtons(QMessageBox::Ok);
|
||||
msgBox->setIcon(QMessageBox::Information);
|
||||
|
||||
msgBox->open();
|
||||
}
|
||||
|
||||
|
||||
// HACK: this method uses variables from version.h
|
||||
QString AWActions::getAboutText(const QString &_type)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Type" << _type;
|
||||
|
||||
return AWDebug::getAboutText(_type);
|
||||
}
|
||||
|
||||
|
||||
QVariantMap AWActions::getFont(const QVariantMap &_defaultFont)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Default font is" << _defaultFont;
|
||||
|
||||
QVariantMap fontMap;
|
||||
int ret = 0;
|
||||
CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400,
|
||||
false, _defaultFont["color"].toString());
|
||||
CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
|
||||
|
||||
fontMap["applied"] = ret;
|
||||
fontMap["color"] = font.color().name();
|
||||
fontMap["family"] = font.family();
|
||||
fontMap["size"] = font.pointSize();
|
||||
|
||||
return fontMap;
|
||||
}
|
||||
|
||||
|
||||
// to avoid additional object definition this method is static
|
||||
void AWActions::sendNotification(const QString &_eventId, const QString &_message)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
|
||||
|
||||
KNotification *notification
|
||||
= KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
|
||||
notification->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
|
||||
}
|
53
sources/awesome-widget/plugin/awactions.h
Normal file
@ -0,0 +1,53 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWACTIONS_H
|
||||
#define AWACTIONS_H
|
||||
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
|
||||
|
||||
class AWUpdateHelper;
|
||||
|
||||
class AWActions : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWActions(QObject *_parent = nullptr);
|
||||
~AWActions() override;
|
||||
Q_INVOKABLE void checkUpdates(bool _showAnyway = false);
|
||||
Q_INVOKABLE static QString getFileContent(const QString &_path);
|
||||
Q_INVOKABLE static bool isDebugEnabled();
|
||||
Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args);
|
||||
Q_INVOKABLE static void showLegacyInfo();
|
||||
Q_INVOKABLE static void showReadme();
|
||||
// configuration slots
|
||||
Q_INVOKABLE static QString getAboutText(const QString &_type);
|
||||
Q_INVOKABLE static QVariantMap getFont(const QVariantMap &_defaultFont);
|
||||
|
||||
public slots:
|
||||
Q_INVOKABLE static void sendNotification(const QString &_eventId, const QString &_message);
|
||||
|
||||
private:
|
||||
AWUpdateHelper *m_updateHelper = nullptr;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWACTIONS_H */
|
152
sources/awesome-widget/plugin/awbugreporter.cpp
Normal file
@ -0,0 +1,152 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awbugreporter.h"
|
||||
|
||||
#include <KI18n/KLocalizedString>
|
||||
|
||||
#include <QDesktopServices>
|
||||
#include <QJsonDocument>
|
||||
#include <QMessageBox>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWBugReporter::AWBugReporter(QObject *_parent)
|
||||
: QObject(_parent)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
AWBugReporter::~AWBugReporter()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
void AWBugReporter::doConnect()
|
||||
{
|
||||
// additional method for testing needs
|
||||
connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
|
||||
SLOT(showInformation(int, const QString &)));
|
||||
}
|
||||
|
||||
|
||||
QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce,
|
||||
const QString &_expected, const QString &_logs)
|
||||
{
|
||||
// do not log _logs here, it may have quite large size
|
||||
qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
|
||||
<< "and expected result" << _expected;
|
||||
|
||||
QString output;
|
||||
output += QString("**Description**\n\n%1\n\n").arg(_description);
|
||||
output += QString("**Step to _reproduce**\n\n%1\n\n").arg(_reproduce);
|
||||
output += QString("**Expected result**\n\n%1\n\n").arg(_expected);
|
||||
output += QString("**Version**\n\n%1\n\n").arg(AWDebug::getBuildData().join(QString("\n")));
|
||||
// append _logs
|
||||
output += QString("**Logs**\n\n%1").arg(_logs);
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
|
||||
void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
|
||||
|
||||
auto *manager = new QNetworkAccessManager(nullptr);
|
||||
connect(manager, SIGNAL(finished(QNetworkReply *)), this,
|
||||
SLOT(issueReplyRecieved(QNetworkReply *)));
|
||||
|
||||
QNetworkRequest request = QNetworkRequest(QUrl(BUGTRACKER_API));
|
||||
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
|
||||
|
||||
// generate payload
|
||||
QVariantMap payload;
|
||||
payload["title"] = _title;
|
||||
payload["body"] = _body;
|
||||
payload["labels"] = QStringList() << "from application";
|
||||
// convert to QByteArray to send request
|
||||
QByteArray data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
|
||||
qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size" << data.size();
|
||||
|
||||
manager->post(request, data);
|
||||
}
|
||||
|
||||
|
||||
void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
|
||||
{
|
||||
if (_reply->error() != QNetworkReply::NoError) {
|
||||
qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
|
||||
<< _reply->errorString();
|
||||
return emit(replyReceived(0, ""));
|
||||
}
|
||||
|
||||
QJsonParseError error{};
|
||||
QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
|
||||
if (error.error != QJsonParseError::NoError) {
|
||||
qCWarning(LOG_AW) << "Parse error" << error.errorString();
|
||||
return emit(replyReceived(0, ""));
|
||||
}
|
||||
_reply->deleteLater();
|
||||
|
||||
// convert to map
|
||||
QVariantMap response = jsonDoc.toVariant().toMap();
|
||||
QString url = response["html_url"].toString();
|
||||
int number = response["number"].toInt();
|
||||
|
||||
return emit(replyReceived(number, url));
|
||||
}
|
||||
|
||||
|
||||
void AWBugReporter::showInformation(const int _number, const QString &_url)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Created issue with number" << _number << "and url" << _url;
|
||||
|
||||
// cache url first
|
||||
m_lastBugUrl = _url;
|
||||
|
||||
auto *msgBox = new QMessageBox(nullptr);
|
||||
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||
msgBox->setModal(false);
|
||||
msgBox->setWindowTitle(i18n("Issue created"));
|
||||
msgBox->setText(i18n("Issue %1 has been created", _number));
|
||||
msgBox->setStandardButtons(QMessageBox::Open | QMessageBox::Close);
|
||||
msgBox->setIcon(QMessageBox::Information);
|
||||
|
||||
msgBox->open(this, SLOT(userReplyOnBugReport(QAbstractButton *)));
|
||||
}
|
||||
|
||||
|
||||
void AWBugReporter::userReplyOnBugReport(QAbstractButton *_button)
|
||||
{
|
||||
QMessageBox::ButtonRole ret = dynamic_cast<QMessageBox *>(sender())->buttonRole(_button);
|
||||
qCInfo(LOG_AW) << "User select" << ret;
|
||||
|
||||
switch (ret) {
|
||||
case QMessageBox::AcceptRole:
|
||||
QDesktopServices::openUrl(m_lastBugUrl);
|
||||
break;
|
||||
case QMessageBox::RejectRole:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
53
sources/awesome-widget/plugin/awbugreporter.h
Normal file
@ -0,0 +1,53 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWBUGREPORTER_H
|
||||
#define AWBUGREPORTER_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
|
||||
class QAbstractButton;
|
||||
class QNetworkReply;
|
||||
|
||||
class AWBugReporter : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWBugReporter(QObject *_parent = nullptr);
|
||||
~AWBugReporter() override;
|
||||
Q_INVOKABLE void doConnect();
|
||||
Q_INVOKABLE static QString generateText(const QString &_description, const QString &_reproduce,
|
||||
const QString &_expected, const QString &_logs);
|
||||
Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
|
||||
|
||||
signals:
|
||||
void replyReceived(const int _number, const QString &_url);
|
||||
|
||||
private slots:
|
||||
void issueReplyRecieved(QNetworkReply *_reply);
|
||||
void showInformation(int _number, const QString &_url);
|
||||
void userReplyOnBugReport(QAbstractButton *_button);
|
||||
|
||||
private:
|
||||
QString m_lastBugUrl;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWBUGREPORTER_H */
|
308
sources/awesome-widget/plugin/awconfighelper.cpp
Normal file
@ -0,0 +1,308 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awconfighelper.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QQmlPropertyMap>
|
||||
#include <QSettings>
|
||||
#include <QStandardPaths>
|
||||
#include <QTextCodec>
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWConfigHelper::AWConfigHelper(QObject *_parent)
|
||||
: QObject(_parent)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
m_baseDir = QString("%1/awesomewidgets")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
|
||||
}
|
||||
|
||||
|
||||
AWConfigHelper::~AWConfigHelper()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
QString AWConfigHelper::configurationDirectory()
|
||||
{
|
||||
// get readable directory
|
||||
QString localDir
|
||||
= QString("%1/awesomewidgets/configs")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
|
||||
|
||||
// create directory and copy files from default settings
|
||||
QDir localDirectory;
|
||||
if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) {
|
||||
qCInfo(LOG_AW) << "Created directory" << localDir;
|
||||
copyConfigs(localDir);
|
||||
}
|
||||
|
||||
return localDir;
|
||||
}
|
||||
|
||||
|
||||
bool AWConfigHelper::dropCache()
|
||||
{
|
||||
QString fileName
|
||||
= QString("%1/awesomewidgets.ndx")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
|
||||
|
||||
return QFile(fileName).remove();
|
||||
}
|
||||
|
||||
|
||||
bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Selected filename" << _fileName;
|
||||
|
||||
QSettings settings(_fileName, QSettings::IniFormat);
|
||||
// plasmoid configuration
|
||||
const auto *configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
|
||||
settings.beginGroup("plasmoid");
|
||||
for (auto &key : configuration->keys()) {
|
||||
QVariant value = configuration->value(key);
|
||||
if (!value.isValid())
|
||||
continue;
|
||||
settings.setValue(key, value);
|
||||
}
|
||||
settings.endGroup();
|
||||
|
||||
// extensions
|
||||
for (auto &item : m_dirs) {
|
||||
QStringList items = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
|
||||
.entryList(QStringList() << "*.desktop", QDir::Files);
|
||||
settings.beginGroup(item);
|
||||
for (auto &it : items)
|
||||
copyExtensions(it, item, settings, false);
|
||||
settings.endGroup();
|
||||
}
|
||||
|
||||
// additional files
|
||||
settings.beginGroup("json");
|
||||
// script filters
|
||||
readFile(settings, "filters",
|
||||
QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
|
||||
// weather icon settings
|
||||
readFile(settings, "weathers",
|
||||
QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
|
||||
settings.endGroup();
|
||||
|
||||
settings.beginGroup("ini");
|
||||
// formatter settings
|
||||
readFile(settings, "formatters", QString("%1/formatters/formatters.ini").arg(m_baseDir));
|
||||
// custom keys settings
|
||||
readFile(settings, "custom", QString("%1/custom.ini").arg(m_baseDir));
|
||||
settings.endGroup();
|
||||
|
||||
// sync settings
|
||||
settings.sync();
|
||||
// show additional message
|
||||
return settings.status() == QSettings::NoError;
|
||||
}
|
||||
|
||||
|
||||
QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
|
||||
const bool _importPlasmoid,
|
||||
const bool _importExtensions,
|
||||
const bool _importAdds) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Selected filename" << _fileName;
|
||||
|
||||
QVariantMap configuration;
|
||||
QSettings settings(_fileName, QSettings::IniFormat);
|
||||
|
||||
// extensions
|
||||
if (_importExtensions) {
|
||||
for (auto &item : m_dirs) {
|
||||
settings.beginGroup(item);
|
||||
for (auto &it : settings.childGroups())
|
||||
copyExtensions(it, item, settings, true);
|
||||
settings.endGroup();
|
||||
}
|
||||
}
|
||||
|
||||
// additional files
|
||||
if (_importAdds) {
|
||||
settings.beginGroup("json");
|
||||
// script filters
|
||||
writeFile(settings, "filters",
|
||||
QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
|
||||
// weather icon settings
|
||||
writeFile(settings, "weathers",
|
||||
QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
|
||||
settings.endGroup();
|
||||
|
||||
settings.beginGroup("ini");
|
||||
// formatter settings
|
||||
writeFile(settings, "formatters", QString("%1/formatters/formatters.ini").arg(m_baseDir));
|
||||
// custom keys settings
|
||||
writeFile(settings, "custom", QString("%1/custom.ini").arg(m_baseDir));
|
||||
settings.endGroup();
|
||||
}
|
||||
|
||||
// plasmoid configuration
|
||||
if (_importPlasmoid) {
|
||||
settings.beginGroup("plasmoid");
|
||||
for (auto &key : settings.childKeys())
|
||||
configuration[key] = settings.value(key);
|
||||
settings.endGroup();
|
||||
}
|
||||
|
||||
return configuration;
|
||||
}
|
||||
|
||||
|
||||
QVariantMap AWConfigHelper::readDataEngineConfiguration()
|
||||
{
|
||||
QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
|
||||
"plasma-dataengine-extsysmon.conf");
|
||||
qCInfo(LOG_AW) << "Configuration file" << fileName;
|
||||
QSettings settings(fileName, QSettings::IniFormat);
|
||||
QVariantMap configuration;
|
||||
|
||||
settings.beginGroup("Configuration");
|
||||
configuration["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/");
|
||||
configuration["GPUDEV"] = settings.value("GPUDEV", "auto");
|
||||
configuration["HDDDEV"] = settings.value("HDDDEV", "all");
|
||||
configuration["HDDTEMPCMD"] = settings.value("HDDTEMPCMD", "sudo smartctl -a");
|
||||
configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
|
||||
configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
|
||||
configuration["MPRIS"] = settings.value("MPRIS", "auto");
|
||||
configuration["PLAYER"] = settings.value("PLAYER", "mpris");
|
||||
configuration["PLAYERSYMBOLS"] = settings.value("PLAYERSYMBOLS", "10");
|
||||
settings.endGroup();
|
||||
|
||||
qCInfo(LOG_AW) << "Configuration" << configuration;
|
||||
|
||||
return configuration;
|
||||
}
|
||||
|
||||
|
||||
bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configuration)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Configuration" << _configuration;
|
||||
|
||||
QString fileName = QString("%1/plasma-dataengine-extsysmon.conf")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
|
||||
QSettings settings(fileName, QSettings::IniFormat);
|
||||
qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
|
||||
|
||||
settings.beginGroup("Configuration");
|
||||
settings.setValue("ACPIPATH", _configuration["ACPIPATH"]);
|
||||
settings.setValue("GPUDEV", _configuration["GPUDEV"]);
|
||||
settings.setValue("HDDDEV", _configuration["HDDDEV"]);
|
||||
settings.setValue("HDDTEMPCMD", _configuration["HDDTEMPCMD"]);
|
||||
settings.setValue("MPDADDRESS", _configuration["MPDADDRESS"]);
|
||||
settings.setValue("MPDPORT", _configuration["MPDPORT"]);
|
||||
settings.setValue("MPRIS", _configuration["MPRIS"]);
|
||||
settings.setValue("PLAYER", _configuration["PLAYER"]);
|
||||
settings.setValue("PLAYERSYMBOLS", _configuration["PLAYERSYMBOLS"]);
|
||||
settings.endGroup();
|
||||
|
||||
settings.sync();
|
||||
|
||||
return (settings.status() == QSettings::NoError);
|
||||
}
|
||||
|
||||
|
||||
void AWConfigHelper::copyConfigs(const QString &_localDir)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Local directory" << _localDir;
|
||||
|
||||
QStringList dirs
|
||||
= QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
|
||||
QStandardPaths::LocateDirectory);
|
||||
for (auto &dir : dirs) {
|
||||
if (dir == _localDir)
|
||||
continue;
|
||||
QStringList files = QDir(dir).entryList(QDir::Files);
|
||||
for (auto &source : files) {
|
||||
QString destination = QString("%1/%2").arg(_localDir).arg(source);
|
||||
bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source), destination);
|
||||
qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination
|
||||
<< "with status" << status;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type,
|
||||
QSettings &_settings, const bool _inverse) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type << "inverse copying" << _inverse;
|
||||
|
||||
_settings.beginGroup(_item);
|
||||
QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
|
||||
QSettings::IniFormat);
|
||||
itemSettings.beginGroup("Desktop Entry");
|
||||
if (_inverse)
|
||||
copySettings(_settings, itemSettings);
|
||||
else
|
||||
copySettings(itemSettings, _settings);
|
||||
itemSettings.endGroup();
|
||||
_settings.endGroup();
|
||||
|
||||
if (_inverse)
|
||||
itemSettings.sync();
|
||||
}
|
||||
|
||||
|
||||
void AWConfigHelper::copySettings(QSettings &_from, QSettings &_to)
|
||||
{
|
||||
for (auto &key : _from.childKeys())
|
||||
_to.setValue(key, _from.value(key));
|
||||
}
|
||||
|
||||
|
||||
void AWConfigHelper::readFile(QSettings &_settings, const QString &_key, const QString &_fileName)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Key" << _key << "from file" << _fileName;
|
||||
|
||||
QFile file(_fileName);
|
||||
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
QString text = QString::fromUtf8(file.readAll());
|
||||
file.close();
|
||||
_settings.setValue(_key, text);
|
||||
} else {
|
||||
qCWarning(LOG_AW) << "Could not open to read" << file.fileName();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key, const QString &_fileName)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Key" << _key << "to file" << _fileName;
|
||||
|
||||
if (!_settings.contains(_key))
|
||||
return;
|
||||
|
||||
QFile file(_fileName);
|
||||
if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
|
||||
QTextStream out(&file);
|
||||
out.setCodec("UTF-8");
|
||||
out << _settings.value(_key).toString().toUtf8();
|
||||
out.flush();
|
||||
file.close();
|
||||
} else {
|
||||
qCWarning(LOG_AW) << "Could not open to write" << file.fileName();
|
||||
}
|
||||
}
|
60
sources/awesome-widget/plugin/awconfighelper.h
Normal file
@ -0,0 +1,60 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWCONFIGHELPER_H
|
||||
#define AWCONFIGHELPER_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QVariant>
|
||||
|
||||
|
||||
class QSettings;
|
||||
|
||||
class AWConfigHelper : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWConfigHelper(QObject *_parent = nullptr);
|
||||
~AWConfigHelper() override;
|
||||
Q_INVOKABLE [[nodiscard]] static QString configurationDirectory();
|
||||
Q_INVOKABLE static bool dropCache();
|
||||
Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
|
||||
Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName,
|
||||
bool _importPlasmoid,
|
||||
bool _importExtensions,
|
||||
bool _importAdds) const;
|
||||
// dataengine
|
||||
Q_INVOKABLE static QVariantMap readDataEngineConfiguration();
|
||||
Q_INVOKABLE static bool writeDataEngineConfiguration(const QVariantMap &_configuration);
|
||||
|
||||
private:
|
||||
// methods
|
||||
static void copyConfigs(const QString &_localDir);
|
||||
void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
|
||||
bool _inverse) const;
|
||||
static void copySettings(QSettings &_from, QSettings &_to);
|
||||
static void readFile(QSettings &_settings, const QString &_key, const QString &_fileName);
|
||||
static void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName);
|
||||
// properties
|
||||
QString m_baseDir;
|
||||
QStringList m_dirs = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"};
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWCONFIGHELPER_H */
|
37
sources/awesome-widget/plugin/awcustomkeysconfig.cpp
Normal file
@ -0,0 +1,37 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awcustomkeysconfig.h"
|
||||
|
||||
#include "awcustomkeyshelper.h"
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWCustomKeysConfig::AWCustomKeysConfig(QWidget *_parent, const QStringList &_keys)
|
||||
: AWAbstractPairConfig(_parent, false, _keys)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
setEditable(true, false);
|
||||
initHelper<AWCustomKeysHelper>();
|
||||
}
|
||||
|
||||
|
||||
AWCustomKeysConfig::~AWCustomKeysConfig()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
36
sources/awesome-widget/plugin/awcustomkeysconfig.h
Normal file
@ -0,0 +1,36 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWCUSTOMKEYSCONFIG_H
|
||||
#define AWCUSTOMKEYSCONFIG_H
|
||||
|
||||
#include "awabstractpairconfig.h"
|
||||
|
||||
|
||||
class AWCustomKeysConfig : public AWAbstractPairConfig
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWCustomKeysConfig(QWidget *_parent = nullptr,
|
||||
const QStringList &_keys = QStringList());
|
||||
~AWCustomKeysConfig() override;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWCUSTOMKEYSCONFIG_H */
|
78
sources/awesome-widget/plugin/awcustomkeyshelper.cpp
Normal file
@ -0,0 +1,78 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awcustomkeyshelper.h"
|
||||
|
||||
#include <QSet>
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWCustomKeysHelper::AWCustomKeysHelper(QObject *_parent)
|
||||
: QObject(_parent)
|
||||
, AWAbstractPairHelper("awesomewidgets/custom.ini", "Custom")
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
AWCustomKeysHelper::~AWCustomKeysHelper()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
QString AWCustomKeysHelper::source(const QString &_key) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Get source by key" << _key;
|
||||
|
||||
return pairs()[_key];
|
||||
}
|
||||
|
||||
|
||||
QStringList AWCustomKeysHelper::sources() const
|
||||
{
|
||||
return valuesSet().values();
|
||||
}
|
||||
|
||||
|
||||
QStringList AWCustomKeysHelper::refinedSources() const
|
||||
{
|
||||
auto allSources = valuesSet();
|
||||
QSet<QString> output;
|
||||
|
||||
while (output != allSources) {
|
||||
output.clear();
|
||||
for (auto &src : allSources)
|
||||
output.insert(pairs().contains(src) ? source(src) : src);
|
||||
allSources = output;
|
||||
}
|
||||
|
||||
return output.values();
|
||||
}
|
||||
|
||||
|
||||
QStringList AWCustomKeysHelper::leftKeys()
|
||||
{
|
||||
return keys();
|
||||
}
|
||||
|
||||
|
||||
QStringList AWCustomKeysHelper::rightKeys()
|
||||
{
|
||||
return QStringList();
|
||||
}
|
47
sources/awesome-widget/plugin/awcustomkeyshelper.h
Normal file
@ -0,0 +1,47 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWCUSTOMKEYSHELPER_H
|
||||
#define AWCUSTOMKEYSHELPER_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "awabstractpairhelper.h"
|
||||
|
||||
|
||||
class AWCustomKeysHelper : public QObject, public AWAbstractPairHelper
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWCustomKeysHelper(QObject *_parent = nullptr);
|
||||
~AWCustomKeysHelper() override;
|
||||
// get
|
||||
[[nodiscard]] QString source(const QString &_key) const;
|
||||
[[nodiscard]] QStringList sources() const;
|
||||
[[nodiscard]] QStringList refinedSources() const;
|
||||
// configuration related
|
||||
void editPairs() override{};
|
||||
QStringList leftKeys() override;
|
||||
QStringList rightKeys() override;
|
||||
|
||||
private:
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWCUSTOMKEYSHELPER_H */
|
287
sources/awesome-widget/plugin/awdataaggregator.cpp
Normal file
@ -0,0 +1,287 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awdataaggregator.h"
|
||||
|
||||
#include <KI18n/KLocalizedString>
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QGraphicsScene>
|
||||
#include <QGraphicsView>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
#include "awactions.h"
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
AWDataAggregator::AWDataAggregator(QObject *_parent)
|
||||
: QObject(_parent)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
m_boundaries["cpuTooltip"] = 100.0;
|
||||
m_boundaries["cpuclTooltip"] = 4000.0;
|
||||
m_boundaries["memTooltip"] = 100.0;
|
||||
m_boundaries["swapTooltip"] = 100.0;
|
||||
m_boundaries["downkbTooltip"] = 1.0;
|
||||
m_boundaries["upkbTooltip"] = 1.0;
|
||||
m_boundaries["batTooltip"] = 100.0;
|
||||
|
||||
initScene();
|
||||
}
|
||||
|
||||
|
||||
AWDataAggregator::~AWDataAggregator()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
delete m_toolTipScene;
|
||||
}
|
||||
|
||||
|
||||
QString AWDataAggregator::htmlImage(const QPixmap &_source)
|
||||
{
|
||||
QByteArray byteArray;
|
||||
QBuffer buffer(&byteArray);
|
||||
_source.save(&buffer, "PNG");
|
||||
|
||||
return byteArray.isEmpty() ? ""
|
||||
: QString("<img src=\"data:image/png;base64,%1\"/>")
|
||||
.arg(QString(byteArray.toBase64()));
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::setParameters(const QVariantMap &_settings)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Settings" << _settings;
|
||||
|
||||
// cast from QVariantMap to QVariantHash without data lost
|
||||
m_configuration = qvariant_cast<QVariantHash>(_settings);
|
||||
|
||||
m_enablePopup = m_configuration["notify"].toBool();
|
||||
|
||||
m_counts = 0;
|
||||
m_counts += m_configuration["cpuTooltip"].toInt();
|
||||
m_counts += m_configuration["cpuclTooltip"].toInt();
|
||||
m_counts += m_configuration["memTooltip"].toInt();
|
||||
m_counts += m_configuration["swapTooltip"].toInt();
|
||||
m_counts += m_configuration["downkbTooltip"].toInt();
|
||||
m_counts += m_configuration["batTooltip"].toInt();
|
||||
// resize tooltip image
|
||||
m_toolTipView->resize(100 * m_counts, 105);
|
||||
|
||||
requiredKeys.clear();
|
||||
if (m_configuration["cpuTooltip"].toBool())
|
||||
requiredKeys.append("cpuTooltip");
|
||||
if (m_configuration["cpuclTooltip"].toBool())
|
||||
requiredKeys.append("cpuclTooltip");
|
||||
if (m_configuration["memTooltip"].toBool())
|
||||
requiredKeys.append("memTooltip");
|
||||
if (m_configuration["swapTooltip"].toBool())
|
||||
requiredKeys.append("swapTooltip");
|
||||
if (m_configuration["downkbTooltip"].toBool())
|
||||
requiredKeys.append("downkbTooltip");
|
||||
if (m_configuration["upkbTooltip"].toBool())
|
||||
requiredKeys.append("upkbTooltip");
|
||||
if (m_configuration["batTooltip"].toBool())
|
||||
requiredKeys.append("batTooltip");
|
||||
|
||||
// background
|
||||
m_toolTipScene->setBackgroundBrush(
|
||||
m_configuration["useTooltipBackground"].toBool()
|
||||
? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
|
||||
: QBrush(Qt::NoBrush));
|
||||
}
|
||||
|
||||
|
||||
QPixmap AWDataAggregator::tooltipImage()
|
||||
{
|
||||
// create image
|
||||
m_toolTipScene->clear();
|
||||
QPen pen;
|
||||
bool down = false;
|
||||
for (auto &key : requiredKeys) {
|
||||
// create frame
|
||||
float normX = 100.0f / static_cast<float>(m_values[key].count());
|
||||
float normY = 100.0f / (1.5f * m_boundaries[key]);
|
||||
float shift = static_cast<float>(requiredKeys.indexOf(key)) * 100.0f;
|
||||
if (down)
|
||||
shift -= 100.0;
|
||||
// apply pen color
|
||||
if (key != "batTooltip")
|
||||
pen.setColor(QColor(m_configuration[QString("%1Color").arg(key)].toString()));
|
||||
// paint data inside frame
|
||||
for (int j = 0; j < m_values[key].count() - 1; j++) {
|
||||
// some magic here
|
||||
float x1 = j * normX + shift;
|
||||
float y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0f;
|
||||
float x2 = (j + 1) * normX + shift;
|
||||
float y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0f;
|
||||
if (key == "batTooltip") {
|
||||
if (m_values[key].at(j + 1) > 0)
|
||||
pen.setColor(QColor(m_configuration["batTooltipColor"].toString()));
|
||||
else
|
||||
pen.setColor(QColor(m_configuration["batInTooltipColor"].toString()));
|
||||
}
|
||||
m_toolTipScene->addLine(x1, y1, x2, y2, pen);
|
||||
}
|
||||
if (key == "downkbTooltip")
|
||||
down = true;
|
||||
}
|
||||
|
||||
return m_toolTipView->grab();
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::dataUpdate(const QVariantHash &_values)
|
||||
{
|
||||
// do not log these arguments
|
||||
setData(_values);
|
||||
emit(toolTipPainted(htmlImage(tooltipImage())));
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::checkValue(const QString &_source, const float _value,
|
||||
const float _extremum) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value
|
||||
<< "called with extremum" << _extremum;
|
||||
|
||||
if (_value >= 0.0) {
|
||||
if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
|
||||
return AWActions::sendNotification("event", notificationText(_source, _value));
|
||||
} else {
|
||||
if ((m_enablePopup) && (_value < _extremum) && (m_values[_source].last() > _extremum))
|
||||
return AWActions::sendNotification("event", notificationText(_source, _value));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::checkValue(const QString &_source, const QString &_current,
|
||||
const QString &_received) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current
|
||||
<< "and received one" << _received;
|
||||
|
||||
if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
|
||||
return AWActions::sendNotification("event", notificationText(_source, _received));
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::initScene()
|
||||
{
|
||||
m_toolTipScene = new QGraphicsScene(nullptr);
|
||||
m_toolTipView = new QGraphicsView(m_toolTipScene);
|
||||
m_toolTipView->setStyleSheet("background: transparent");
|
||||
m_toolTipView->setContentsMargins(0, 0, 0, 0);
|
||||
m_toolTipView->setFrameShape(QFrame::NoFrame);
|
||||
m_toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
m_toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||
}
|
||||
|
||||
|
||||
QString AWDataAggregator::notificationText(const QString &_source, const float _value)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
|
||||
|
||||
QString output;
|
||||
if (_source == "batTooltip")
|
||||
output = _value > 0.0 ? i18n("AC online") : i18n("AC offline");
|
||||
else if (_source == "cpuTooltip")
|
||||
output = i18n("High CPU load");
|
||||
else if (_source == "memTooltip")
|
||||
output = i18n("High memory usage");
|
||||
else if (_source == "swapTooltip")
|
||||
output = i18n("Swap is used");
|
||||
else if (_source == "gpu")
|
||||
output = i18n("High GPU load");
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
|
||||
QString AWDataAggregator::notificationText(const QString &_source, const QString &_value)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
|
||||
|
||||
QString output;
|
||||
if (_source == "netdev")
|
||||
output = i18n("Network device has been changed to %1", _value);
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::setData(const QVariantHash &_values)
|
||||
{
|
||||
// do not log these arguments
|
||||
// battery update requires info is AC online or not
|
||||
setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip",
|
||||
_values["bat"].toFloat());
|
||||
// usual case
|
||||
setData("cpuTooltip", _values["cpu"].toFloat(), 90.0);
|
||||
setData("cpuclTooltip", _values["cpucl"].toFloat());
|
||||
setData("memTooltip", _values["mem"].toFloat(), 80.0);
|
||||
setData("swapTooltip", _values["swap"].toFloat(), 0.0);
|
||||
setData("downkbTooltip", _values["downkb"].toFloat());
|
||||
setData("upkbTooltip", _values["upkb"].toFloat());
|
||||
// additional check for network device
|
||||
[this](const QString &value) {
|
||||
checkValue("netdev", m_currentNetworkDevice, value);
|
||||
m_currentNetworkDevice = value;
|
||||
}(_values["netdev"].toString());
|
||||
// additional check for GPU load
|
||||
[this](const float value) { checkValue("gpu", value, 90.0); }(_values["gpu"].toFloat());
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::setData(const QString &_source, float _value, const float _extremum)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Source" << _source << "to value" << _value << "with extremum" << _extremum;
|
||||
|
||||
if (m_values[_source].count() == 0)
|
||||
m_values[_source].append(0.0);
|
||||
else if (m_values[_source].count() > m_configuration["tooltipNumber"].toInt())
|
||||
m_values[_source].removeFirst();
|
||||
if (std::isnan(_value))
|
||||
_value = 0.0;
|
||||
|
||||
// notifications
|
||||
checkValue(_source, _value, _extremum);
|
||||
|
||||
m_values[_source].append(_value);
|
||||
if (_source == "downkbTooltip") {
|
||||
QList<float> netValues = m_values["downkbTooltip"] + m_values["upkbTooltip"];
|
||||
// to avoid inf value of normY
|
||||
netValues << 1.0;
|
||||
m_boundaries["downkbTooltip"]
|
||||
= 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
|
||||
m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, float _value)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source"
|
||||
<< _source;
|
||||
|
||||
// invert values for different battery colours
|
||||
_value = _dontInvert ? _value : -_value;
|
||||
return setData(_source, _value, 0.0);
|
||||
}
|
74
sources/awesome-widget/plugin/awdataaggregator.h
Normal file
@ -0,0 +1,74 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWTOOLTIP_H
|
||||
#define AWTOOLTIP_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QVariant>
|
||||
|
||||
|
||||
class QGraphicsScene;
|
||||
class QGraphicsView;
|
||||
class QPixmap;
|
||||
class QThreadPool;
|
||||
|
||||
class AWDataAggregator : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWDataAggregator(QObject *_parent = nullptr);
|
||||
~AWDataAggregator() override;
|
||||
static QString htmlImage(const QPixmap &_source);
|
||||
void setParameters(const QVariantMap &_settings);
|
||||
QPixmap tooltipImage();
|
||||
|
||||
public slots:
|
||||
void dataUpdate(const QVariantHash &_values);
|
||||
|
||||
signals:
|
||||
void toolTipPainted(const QString &_image) const;
|
||||
|
||||
private:
|
||||
// ui
|
||||
QGraphicsScene *m_toolTipScene = nullptr;
|
||||
QGraphicsView *m_toolTipView = nullptr;
|
||||
void checkValue(const QString &_source, float _value, float _extremum) const;
|
||||
void checkValue(const QString &_source, const QString &_current,
|
||||
const QString &_received) const;
|
||||
void initScene();
|
||||
static QString notificationText(const QString &_source, float _value);
|
||||
static QString notificationText(const QString &_source, const QString &_value);
|
||||
// main method
|
||||
void setData(const QVariantHash &_values);
|
||||
void setData(const QString &_source, float _value, float _extremum = -1.0f);
|
||||
// different signature for battery device
|
||||
void setData(bool _dontInvert, const QString &_source, float _value);
|
||||
// variables
|
||||
int m_counts = 0;
|
||||
QVariantHash m_configuration;
|
||||
QString m_currentNetworkDevice = "lo";
|
||||
QHash<QString, float> m_boundaries;
|
||||
QHash<QString, QList<float>> m_values;
|
||||
bool m_enablePopup = false;
|
||||
QStringList requiredKeys;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWTOOLTIP_H */
|
120
sources/awesome-widget/plugin/awdataengineaggregator.cpp
Normal file
@ -0,0 +1,120 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awdataengineaggregator.h"
|
||||
|
||||
#include <Plasma/DataContainer>
|
||||
|
||||
#include "awdebug.h"
|
||||
#include "awkeys.h"
|
||||
|
||||
|
||||
AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
|
||||
: QObject(_parent)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
m_consumer = new Plasma::DataEngineConsumer();
|
||||
m_dataEngines["systemmonitor"] = m_consumer->dataEngine("systemmonitor");
|
||||
m_dataEngines["extsysmon"] = m_consumer->dataEngine("extsysmon");
|
||||
m_dataEngines["time"] = m_consumer->dataEngine("time");
|
||||
|
||||
// additional method required by systemmonitor structure
|
||||
m_newSourceConnection
|
||||
= connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
|
||||
[this](const QString &source) {
|
||||
emit(deviceAdded(source));
|
||||
m_dataEngines["systemmonitor"]->connectSource(source, parent(), 1000);
|
||||
});
|
||||
|
||||
// required to define Qt::QueuedConnection for signal-slot connection
|
||||
qRegisterMetaType<Plasma::DataEngine::Data>("Plasma::DataEngine::Data");
|
||||
}
|
||||
|
||||
|
||||
AWDataEngineAggregator::~AWDataEngineAggregator()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
disconnectSources();
|
||||
}
|
||||
|
||||
|
||||
void AWDataEngineAggregator::disconnectSources()
|
||||
{
|
||||
for (auto dataEngine : m_dataEngines.values())
|
||||
for (auto &source : dataEngine->sources())
|
||||
dataEngine->disconnectSource(source, parent());
|
||||
disconnect(m_newSourceConnection);
|
||||
}
|
||||
|
||||
|
||||
void AWDataEngineAggregator::reconnectSources(const int _interval)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval;
|
||||
|
||||
disconnectSources();
|
||||
|
||||
m_dataEngines["systemmonitor"]->connectAllSources(parent(), (uint)_interval);
|
||||
m_dataEngines["extsysmon"]->connectAllSources(parent(), (uint)_interval);
|
||||
m_dataEngines["time"]->connectSource("Local", parent(), 1000);
|
||||
|
||||
m_newSourceConnection = connect(
|
||||
m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
|
||||
[this, _interval](const QString &source) {
|
||||
emit(deviceAdded(source));
|
||||
m_dataEngines["systemmonitor"]->connectSource(source, parent(), (uint)_interval);
|
||||
});
|
||||
|
||||
#ifdef BUILD_FUTURE
|
||||
createQueuedConnection();
|
||||
#endif /* BUILD_FUTURE */
|
||||
}
|
||||
|
||||
|
||||
void AWDataEngineAggregator::dropSource(const QString &_source)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Source" << _source;
|
||||
|
||||
// HACK there is no possibility to check to which dataengine source
|
||||
// connected we will try to disconnect it from all engines
|
||||
for (auto dataEngine : m_dataEngines.values())
|
||||
dataEngine->disconnectSource(_source, parent());
|
||||
}
|
||||
|
||||
|
||||
void AWDataEngineAggregator::createQueuedConnection()
|
||||
{
|
||||
// HACK additional method which forces QueuedConnection instead of Auto one
|
||||
// for more details refer to plasma-framework source code
|
||||
for (auto &dataEngine : m_dataEngines.keys()) {
|
||||
// different source set for different engines
|
||||
QStringList sources = dataEngine == "time" ? QStringList() << "Local"
|
||||
: m_dataEngines[dataEngine]->sources();
|
||||
// reconnect sources
|
||||
for (auto &source : sources) {
|
||||
Plasma::DataContainer *container
|
||||
= m_dataEngines[dataEngine]->containerForSource(source);
|
||||
// disconnect old connections first
|
||||
disconnect(container, SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)), parent(),
|
||||
SLOT(dataUpdated(QString, Plasma::DataEngine::Data)));
|
||||
// and now reconnect with Qt::QueuedConnection type
|
||||
connect(container, SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)), parent(),
|
||||
SLOT(dataUpdated(QString, Plasma::DataEngine::Data)), Qt::QueuedConnection);
|
||||
}
|
||||
}
|
||||
}
|
52
sources/awesome-widget/plugin/awdataengineaggregator.h
Normal file
@ -0,0 +1,52 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWDATAENGINEAGGREGATOR_H
|
||||
#define AWDATAENGINEAGGREGATOR_H
|
||||
|
||||
#include <Plasma/DataEngine>
|
||||
#include <Plasma/DataEngineConsumer>
|
||||
|
||||
#include <QObject>
|
||||
|
||||
|
||||
class AWDataEngineAggregator : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWDataEngineAggregator(QObject *_parent = nullptr);
|
||||
~AWDataEngineAggregator() override;
|
||||
void disconnectSources();
|
||||
void reconnectSources(int _interval);
|
||||
|
||||
signals:
|
||||
void deviceAdded(const QString &_source);
|
||||
|
||||
public slots:
|
||||
void dropSource(const QString &_source);
|
||||
|
||||
private:
|
||||
void createQueuedConnection();
|
||||
Plasma::DataEngineConsumer *m_consumer = nullptr;
|
||||
QHash<QString, Plasma::DataEngine *> m_dataEngines;
|
||||
QMetaObject::Connection m_newSourceConnection;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWDATAENGINEAGGREGATOR_H */
|
448
sources/awesome-widget/plugin/awdataenginemapper.cpp
Normal file
@ -0,0 +1,448 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awdataenginemapper.h"
|
||||
|
||||
#include <QRegExp>
|
||||
|
||||
#include "awdebug.h"
|
||||
#include "awformatterhelper.h"
|
||||
|
||||
|
||||
AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_custom)
|
||||
: QObject(_parent)
|
||||
, m_customFormatters(_custom)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
// default formatters
|
||||
// memory
|
||||
m_formatter["mem"] = AWKeysAggregator::FormatterType::Float;
|
||||
m_formatter["memtotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
m_formatter["memtotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
// network
|
||||
m_formatter["down"] = AWKeysAggregator::FormatterType::NetSmartFormat;
|
||||
m_formatter["downkb"] = AWKeysAggregator::FormatterType::Integer;
|
||||
m_formatter["downtot"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
m_formatter["downtotkb"] = AWKeysAggregator::FormatterType::Integer;
|
||||
m_formatter["downunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
|
||||
m_formatter["up"] = AWKeysAggregator::FormatterType::NetSmartFormat;
|
||||
m_formatter["upkb"] = AWKeysAggregator::FormatterType::Integer;
|
||||
m_formatter["uptot"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
m_formatter["uptotkb"] = AWKeysAggregator::FormatterType::Integer;
|
||||
m_formatter["upunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
|
||||
// swap
|
||||
m_formatter["swap"] = AWKeysAggregator::FormatterType::Float;
|
||||
m_formatter["swaptotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
m_formatter["swaptotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
}
|
||||
|
||||
|
||||
AWDataEngineMapper::~AWDataEngineMapper()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
AWKeysAggregator::FormatterType AWDataEngineMapper::formatter(const QString &_key) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Get formatter for key" << _key;
|
||||
|
||||
return m_formatter.value(_key, AWKeysAggregator::FormatterType::NoFormat);
|
||||
}
|
||||
|
||||
|
||||
QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Search for source" << _source;
|
||||
|
||||
return m_map.values(_source);
|
||||
}
|
||||
|
||||
|
||||
// HACK units required to define should the value be calculated as temperature
|
||||
// or fan data
|
||||
QStringList AWDataEngineMapper::registerSource(const QString &_source, const QString &_units,
|
||||
const QStringList &_keys)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
|
||||
|
||||
// regular expressions
|
||||
QRegExp cpuRegExp = QRegExp("cpu/cpu.*/TotalLoad");
|
||||
QRegExp cpuclRegExp = QRegExp("cpu/cpu.*/clock");
|
||||
QRegExp hddrRegExp = QRegExp("disk/.*/Rate/rblk");
|
||||
QRegExp hddwRegExp = QRegExp("disk/.*/Rate/wblk");
|
||||
QRegExp mountFillRegExp = QRegExp("partitions/.*/filllevel");
|
||||
QRegExp mountFreeRegExp = QRegExp("partitions/.*/freespace");
|
||||
QRegExp mountUsedRegExp = QRegExp("partitions/.*/usedspace");
|
||||
QRegExp netRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
|
||||
QRegExp netTotalRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
|
||||
|
||||
if (_source == "battery/ac") {
|
||||
// AC
|
||||
m_map.insert(_source, "ac");
|
||||
m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
|
||||
} else if (_source.startsWith("battery/")) {
|
||||
// battery stats
|
||||
QString key = _source;
|
||||
key.remove("battery/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
|
||||
: AWKeysAggregator::FormatterType::IntegerThree;
|
||||
} else if (_source == "cpu/system/TotalLoad") {
|
||||
// cpu
|
||||
m_map.insert(_source, "cpu");
|
||||
m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
|
||||
} else if (_source.contains(cpuRegExp)) {
|
||||
// cpus
|
||||
QString key = _source;
|
||||
key.remove("cpu/").remove("/TotalLoad");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Float;
|
||||
} else if (_source == "cpu/system/AverageClock") {
|
||||
// cpucl
|
||||
m_map.insert(_source, "cpucl");
|
||||
m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
|
||||
} else if (_source.contains(cpuclRegExp)) {
|
||||
// cpucls
|
||||
QString key = _source;
|
||||
key.remove("cpu/cpu").remove("/clock");
|
||||
key = QString("cpucl%1").arg(key);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
|
||||
} else if (_source.startsWith("custom")) {
|
||||
// custom
|
||||
QString key = _source;
|
||||
key.remove("custom/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source == "desktop/current/name") {
|
||||
// current desktop name
|
||||
m_map.insert(_source, "desktop");
|
||||
m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source == "desktop/current/number") {
|
||||
// current desktop number
|
||||
m_map.insert(_source, "ndesktop");
|
||||
m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source == "desktop/total/number") {
|
||||
// desktop count
|
||||
m_map.insert(_source, "tdesktops");
|
||||
m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source.contains(hddrRegExp)) {
|
||||
// read speed
|
||||
QString device = _source;
|
||||
device.remove("/Rate/rblk");
|
||||
int index = m_devices["disk"].indexOf(device);
|
||||
if (index > -1) {
|
||||
QString key = QString("hddr%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
|
||||
}
|
||||
} else if (_source.contains(hddwRegExp)) {
|
||||
// write speed
|
||||
QString device = _source;
|
||||
device.remove("/Rate/wblk");
|
||||
int index = m_devices["disk"].indexOf(device);
|
||||
if (index > -1) {
|
||||
QString key = QString("hddw%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
|
||||
}
|
||||
} else if (_source == "gpu/load") {
|
||||
// gpu load
|
||||
m_map.insert(_source, "gpu");
|
||||
m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
|
||||
} else if (_source == "gpu/temperature") {
|
||||
// gpu temperature
|
||||
m_map.insert(_source, "gputemp");
|
||||
m_formatter["gputemp"] = AWKeysAggregator::FormatterType::Temperature;
|
||||
} else if (_source.contains(mountFillRegExp)) {
|
||||
// fill level
|
||||
QString device = _source;
|
||||
device.remove("partitions").remove("/filllevel");
|
||||
int index = m_devices["mount"].indexOf(device);
|
||||
if (index > -1) {
|
||||
QString key = QString("hdd%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Float;
|
||||
// additional keys
|
||||
m_formatter[QString("hddtotmb%1").arg(index)]
|
||||
= AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
m_formatter[QString("hddtotgb%1").arg(index)]
|
||||
= AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
}
|
||||
} else if (_source.contains(mountFreeRegExp)) {
|
||||
// free space
|
||||
QString device = _source;
|
||||
device.remove("partitions").remove("/freespace");
|
||||
int index = m_devices["mount"].indexOf(device);
|
||||
if (index > -1) {
|
||||
// mb
|
||||
QString key = QString("hddfreemb%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
// gb
|
||||
key = QString("hddfreegb%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
}
|
||||
} else if (_source.contains(mountUsedRegExp)) {
|
||||
// used
|
||||
QString device = _source;
|
||||
device.remove("partitions").remove("/usedspace");
|
||||
int index = m_devices["mount"].indexOf(device);
|
||||
if (index > -1) {
|
||||
// mb
|
||||
QString key = QString("hddmb%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
// gb
|
||||
key = QString("hddgb%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
}
|
||||
} else if (_source.startsWith("hdd/temperature")) {
|
||||
// hdd temperature
|
||||
QString device = _source;
|
||||
device.remove("hdd/temperature");
|
||||
int index = m_devices["hdd"].indexOf(device);
|
||||
if (index > -1) {
|
||||
QString key = QString("hddtemp%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
|
||||
}
|
||||
} else if (_source.startsWith("cpu/system/loadavg")) {
|
||||
// load average
|
||||
QString time = _source;
|
||||
time.remove("cpu/system/loadavg");
|
||||
QString key = QString("la%1").arg(time);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
|
||||
} else if (_source == "mem/physical/application") {
|
||||
// app memory
|
||||
// mb
|
||||
m_map.insert(_source, "memmb");
|
||||
m_formatter["memmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
// gb
|
||||
m_map.insert(_source, "memgb");
|
||||
m_formatter["memgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
} else if (_source == "mem/physical/free") {
|
||||
// free memory
|
||||
// mb
|
||||
m_map.insert(_source, "memfreemb");
|
||||
m_formatter["memfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
// gb
|
||||
m_map.insert(_source, "memfreegb");
|
||||
m_formatter["memfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
} else if (_source == "mem/physical/used") {
|
||||
// used memory
|
||||
// mb
|
||||
m_map.insert(_source, "memusedmb");
|
||||
m_formatter["memusedmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
// gb
|
||||
m_map.insert(_source, "memusedgb");
|
||||
m_formatter["memusedgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
} else if (_source == "network/current/name") {
|
||||
// network device
|
||||
m_map.insert(_source, "netdev");
|
||||
m_formatter["netdev"] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source == "network/current/ssid") {
|
||||
// current ssid
|
||||
m_map.insert(_source, "ssid");
|
||||
m_formatter["ssid"] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source.startsWith("network/response")) {
|
||||
// network response
|
||||
QString key = _source;
|
||||
key.remove("network/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source.contains(netRegExp)) {
|
||||
// network speed
|
||||
QString type = _source.contains("receiver") ? "down" : "up";
|
||||
int index = m_devices["net"].indexOf(_source.split('/')[2]);
|
||||
if (index > -1) {
|
||||
// kb
|
||||
QString key = QString("%1kb%2").arg(type).arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
|
||||
// smart
|
||||
key = QString("%1%2").arg(type).arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartFormat;
|
||||
// units
|
||||
key = QString("%1units%2").arg(type).arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartUnits;
|
||||
}
|
||||
} else if (_source.contains(netTotalRegExp)) {
|
||||
// network data total
|
||||
QString type = _source.contains("receiver") ? "down" : "up";
|
||||
int index = m_devices["net"].indexOf(_source.split('/')[2]);
|
||||
if (index > -1) {
|
||||
// kb
|
||||
QString key = QString("%1totkb%2").arg(type).arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
|
||||
// mb
|
||||
key = QString("%1tot%2").arg(type).arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
}
|
||||
} else if (_source.startsWith("upgrade")) {
|
||||
// package manager
|
||||
QString key = _source;
|
||||
key.remove("upgrade/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
|
||||
} else if (_source.startsWith("player")) {
|
||||
// player
|
||||
QString key = _source;
|
||||
key.remove("player/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source == "ps/running/count") {
|
||||
// running processes count
|
||||
m_map.insert(_source, "pscount");
|
||||
m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source == "ps/running/list") {
|
||||
// list of running processes
|
||||
m_map.insert(_source, "ps");
|
||||
m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
|
||||
} else if (_source == "ps/total/count") {
|
||||
// total processes count
|
||||
m_map.insert(_source, "pstot");
|
||||
m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source.startsWith("quotes")) {
|
||||
// quotes
|
||||
QString key = _source;
|
||||
key.remove("quotes/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
|
||||
} else if (_source == "mem/swap/free") {
|
||||
// free swap
|
||||
// mb
|
||||
m_map.insert(_source, "swapfreemb");
|
||||
m_formatter["swapfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
// gb
|
||||
m_map.insert(_source, "swapfreegb");
|
||||
m_formatter["swapfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
} else if (_source == "mem/swap/used") {
|
||||
// used swap
|
||||
// mb
|
||||
m_map.insert(_source, "swapmb");
|
||||
m_formatter["swapmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
|
||||
// gb
|
||||
m_map.insert(_source, "swapgb");
|
||||
m_formatter["swapgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
|
||||
} else if (_source.startsWith("lmsensors/")) {
|
||||
// temperature
|
||||
int index = m_devices["temp"].indexOf(_source);
|
||||
// HACK on DE initialization there are no units key
|
||||
if (_units.isEmpty())
|
||||
return QStringList({QString("temp%1").arg(index)});
|
||||
if (index > -1) {
|
||||
QString key = QString("temp%1").arg(index);
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
|
||||
: AWKeysAggregator::FormatterType::Integer;
|
||||
}
|
||||
} else if (_source == "Local") {
|
||||
// time
|
||||
m_map.insert(_source, "time");
|
||||
m_formatter["time"] = AWKeysAggregator::FormatterType::Time;
|
||||
// custom time
|
||||
m_map.insert(_source, "ctime");
|
||||
m_formatter["ctime"] = AWKeysAggregator::FormatterType::TimeCustom;
|
||||
// ISO time
|
||||
m_map.insert(_source, "isotime");
|
||||
m_formatter["isotime"] = AWKeysAggregator::FormatterType::TimeISO;
|
||||
// long time
|
||||
m_map.insert(_source, "longtime");
|
||||
m_formatter["longtime"] = AWKeysAggregator::FormatterType::TimeLong;
|
||||
// short time
|
||||
m_map.insert(_source, "shorttime");
|
||||
m_formatter["shorttime"] = AWKeysAggregator::FormatterType::TimeShort;
|
||||
// timestamp
|
||||
m_map.insert(_source, "tstime");
|
||||
m_formatter["tstime"] = AWKeysAggregator::FormatterType::Timestamp;
|
||||
} else if (_source == "system/brightness") {
|
||||
m_map.insert(_source, "brightness");
|
||||
m_formatter["brightness"] = AWKeysAggregator::FormatterType::IntegerThree;
|
||||
} else if (_source == "system/volume") {
|
||||
m_map.insert(_source, "volume");
|
||||
m_formatter["volume"] = AWKeysAggregator::FormatterType::IntegerThree;
|
||||
} else if (_source == "system/uptime") {
|
||||
// uptime
|
||||
m_map.insert(_source, "uptime");
|
||||
m_formatter["uptime"] = AWKeysAggregator::FormatterType::Uptime;
|
||||
// custom uptime
|
||||
m_map.insert(_source, "cuptime");
|
||||
m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
|
||||
} else if (_source.startsWith("weather/temperature")) {
|
||||
// temperature
|
||||
QString key = _source;
|
||||
key.remove("weather/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
|
||||
} else if (_source.startsWith("weather/")) {
|
||||
// other weather
|
||||
QString key = _source;
|
||||
key.remove("weather/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
|
||||
} else if (_source.startsWith("load/load")) {
|
||||
// load source
|
||||
QString key = _source;
|
||||
key.remove("load/");
|
||||
m_map.insert(_source, key);
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
|
||||
}
|
||||
|
||||
QStringList foundKeys = keysFromSource(_source);
|
||||
|
||||
// rewrite formatters for custom ones
|
||||
QStringList customFormattersKeys;
|
||||
if (m_customFormatters)
|
||||
customFormattersKeys = m_customFormatters->definedFormatters();
|
||||
qCInfo(LOG_AW) << "Looking for formatters" << foundKeys << "in" << customFormattersKeys;
|
||||
for (auto &key : foundKeys) {
|
||||
if (!customFormattersKeys.contains(key))
|
||||
continue;
|
||||
m_formatter[key] = AWKeysAggregator::FormatterType::Custom;
|
||||
}
|
||||
|
||||
// drop key from dictionary if no one user requested key required it
|
||||
qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
|
||||
bool required = _keys.isEmpty()
|
||||
|| std::any_of(foundKeys.cbegin(), foundKeys.cend(),
|
||||
[&_keys](const QString &key) { return _keys.contains(key); });
|
||||
if (!required) {
|
||||
m_map.remove(_source);
|
||||
for (auto &key : foundKeys)
|
||||
m_formatter.remove(key);
|
||||
}
|
||||
|
||||
return keysFromSource(_source);
|
||||
}
|
||||
|
||||
|
||||
void AWDataEngineMapper::setDevices(const QHash<QString, QStringList> &_devices)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Devices" << _devices;
|
||||
|
||||
m_devices = _devices;
|
||||
}
|
54
sources/awesome-widget/plugin/awdataenginemapper.h
Normal file
@ -0,0 +1,54 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWDATAENGINEMAPPER_H
|
||||
#define AWDATAENGINEMAPPER_H
|
||||
|
||||
#include <QMultiHash>
|
||||
#include <QObject>
|
||||
|
||||
#include "awkeysaggregator.h"
|
||||
|
||||
|
||||
class AWFormatterHelper;
|
||||
|
||||
class AWDataEngineMapper : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
|
||||
~AWDataEngineMapper() override;
|
||||
// get methods
|
||||
[[nodiscard]] AWKeysAggregator::FormatterType formatter(const QString &_key) const;
|
||||
[[nodiscard]] QStringList keysFromSource(const QString &_source) const;
|
||||
// set methods
|
||||
QStringList registerSource(const QString &_source, const QString &_units,
|
||||
const QStringList &_keys);
|
||||
void setDevices(const QHash<QString, QStringList> &_devices);
|
||||
|
||||
private:
|
||||
AWFormatterHelper *m_customFormatters = nullptr;
|
||||
// variables
|
||||
QHash<QString, QStringList> m_devices;
|
||||
QHash<QString, AWKeysAggregator::FormatterType> m_formatter;
|
||||
QMultiHash<QString, QString> m_map;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWDATAENGINEMAPPER_H */
|
110
sources/awesome-widget/plugin/awdbusadaptor.cpp
Normal file
@ -0,0 +1,110 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awdbusadaptor.h"
|
||||
|
||||
#include <QDBusConnection>
|
||||
#include <QDBusConnectionInterface>
|
||||
|
||||
#include "awdebug.h"
|
||||
#include "awkeys.h"
|
||||
|
||||
|
||||
AWDBusAdaptor::AWDBusAdaptor(AWKeys *_parent)
|
||||
: QDBusAbstractAdaptor(_parent)
|
||||
, m_plugin(_parent)
|
||||
{
|
||||
qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
AWDBusAdaptor::~AWDBusAdaptor()
|
||||
{
|
||||
qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
QStringList AWDBusAdaptor::ActiveServices() const
|
||||
{
|
||||
QDBusMessage listServices
|
||||
= QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
|
||||
if (listServices.arguments().isEmpty()) {
|
||||
qCWarning(LOG_DBUS) << "Could not find any DBus service";
|
||||
return {};
|
||||
}
|
||||
QStringList arguments = listServices.arguments().first().toStringList();
|
||||
|
||||
return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(),
|
||||
[](QStringList &source, const QString &service) {
|
||||
if (service.startsWith(AWDBUS_SERVICE))
|
||||
source.append(service);
|
||||
return source;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
QString AWDBusAdaptor::Info(const QString &key) const
|
||||
{
|
||||
return m_plugin->infoByKey(key);
|
||||
}
|
||||
|
||||
|
||||
QStringList AWDBusAdaptor::Keys(const QString ®exp) const
|
||||
{
|
||||
return m_plugin->dictKeys(true, regexp);
|
||||
}
|
||||
|
||||
|
||||
QString AWDBusAdaptor::Value(const QString &key) const
|
||||
{
|
||||
return m_plugin->valueByKey(key);
|
||||
}
|
||||
|
||||
|
||||
qlonglong AWDBusAdaptor::WhoAmI() const
|
||||
{
|
||||
return reinterpret_cast<qlonglong>(m_plugin);
|
||||
}
|
||||
|
||||
|
||||
void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
|
||||
{
|
||||
qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
|
||||
|
||||
if (level >= m_logLevels.count()) {
|
||||
qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than"
|
||||
<< m_logLevels.count();
|
||||
return;
|
||||
}
|
||||
|
||||
for (auto &lev : m_logLevels)
|
||||
SetLogLevel(what, lev, m_logLevels.indexOf(lev) >= level);
|
||||
}
|
||||
|
||||
|
||||
void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level, const bool enabled)
|
||||
{
|
||||
qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled << "for" << what;
|
||||
|
||||
if (!m_logLevels.contains(level)) {
|
||||
qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in" << m_logLevels;
|
||||
return;
|
||||
}
|
||||
|
||||
QString state = enabled ? "true" : "false";
|
||||
QLoggingCategory::setFilterRules(QString("%1.%2=%3").arg(what).arg(level).arg(state));
|
||||
}
|
55
sources/awesome-widget/plugin/awdbusadaptor.h
Normal file
@ -0,0 +1,55 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWDBUSADAPTOR_H
|
||||
#define AWDBUSADAPTOR_H
|
||||
|
||||
#include <QDBusAbstractAdaptor>
|
||||
|
||||
#include "version.h"
|
||||
|
||||
|
||||
class AWKeys;
|
||||
|
||||
class AWDBusAdaptor : public QDBusAbstractAdaptor
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_CLASSINFO("D-Bus Interface", AWDBUS_SERVICE_NAME)
|
||||
|
||||
public:
|
||||
explicit AWDBusAdaptor(AWKeys *_parent = nullptr);
|
||||
~AWDBusAdaptor() override;
|
||||
|
||||
public slots:
|
||||
// get methods
|
||||
QStringList ActiveServices() const;
|
||||
QString Info(const QString &key) const;
|
||||
QStringList Keys(const QString ®exp) const;
|
||||
QString Value(const QString &key) const;
|
||||
qlonglong WhoAmI() const;
|
||||
// set methods
|
||||
void SetLogLevel(const QString &what, int level);
|
||||
void SetLogLevel(const QString &what, const QString &level, bool enabled);
|
||||
|
||||
private:
|
||||
AWKeys *m_plugin = nullptr;
|
||||
QStringList m_logLevels = {"debug", "info", "warning", "critical"};
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWDBUSADAPTOR_H */
|
40
sources/awesome-widget/plugin/awesomewidget.cpp
Normal file
@ -0,0 +1,40 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awesomewidget.h"
|
||||
|
||||
#include <QtQml>
|
||||
|
||||
#include "awactions.h"
|
||||
#include "awbugreporter.h"
|
||||
#include "awconfighelper.h"
|
||||
#include "awkeys.h"
|
||||
#include "awpairconfigfactory.h"
|
||||
#include "awtelemetryhandler.h"
|
||||
|
||||
|
||||
void AWPlugin::registerTypes(const char *uri)
|
||||
{
|
||||
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
|
||||
|
||||
qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
|
||||
qmlRegisterType<AWBugReporter>(uri, 1, 0, "AWBugReporter");
|
||||
qmlRegisterType<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
|
||||
qmlRegisterType<AWPairConfigFactory>(uri, 1, 0, "AWPairConfigFactory");
|
||||
qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
|
||||
qmlRegisterType<AWTelemetryHandler>(uri, 1, 0, "AWTelemetryHandler");
|
||||
}
|
35
sources/awesome-widget/plugin/awesomewidget.h
Normal file
@ -0,0 +1,35 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWPLUGIN_H
|
||||
#define AWPLUGIN_H
|
||||
|
||||
#include <QQmlExtensionPlugin>
|
||||
|
||||
|
||||
class AWPlugin : public QQmlExtensionPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
|
||||
|
||||
public:
|
||||
void registerTypes(const char *uri) override;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWPLUGIN_H */
|
37
sources/awesome-widget/plugin/awformatterconfig.cpp
Normal file
@ -0,0 +1,37 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awformatterconfig.h"
|
||||
|
||||
#include "awdebug.h"
|
||||
#include "awformatterhelper.h"
|
||||
|
||||
|
||||
AWFormatterConfig::AWFormatterConfig(QWidget *_parent, const QStringList &_keys)
|
||||
: AWAbstractPairConfig(_parent, true, _keys)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
setEditable(false, false);
|
||||
initHelper<AWFormatterHelper>();
|
||||
}
|
||||
|
||||
|
||||
AWFormatterConfig::~AWFormatterConfig()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
36
sources/awesome-widget/plugin/awformatterconfig.h
Normal file
@ -0,0 +1,36 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWFORMATTERCONFIG_H
|
||||
#define AWFORMATTERCONFIG_H
|
||||
|
||||
#include "awabstractpairconfig.h"
|
||||
|
||||
|
||||
class AWFormatterConfig : public AWAbstractPairConfig
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWFormatterConfig(QWidget *_parent = nullptr,
|
||||
const QStringList &_keys = QStringList());
|
||||
~AWFormatterConfig() override;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWFORMATTERCONFIG_H */
|
245
sources/awesome-widget/plugin/awformatterhelper.cpp
Normal file
@ -0,0 +1,245 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awformatterhelper.h"
|
||||
|
||||
#include <KI18n/KLocalizedString>
|
||||
|
||||
#include <QDir>
|
||||
#include <QInputDialog>
|
||||
#include <QSettings>
|
||||
|
||||
#include "awdatetimeformatter.h"
|
||||
#include "awdebug.h"
|
||||
#include "awfloatformatter.h"
|
||||
#include "awjsonformatter.h"
|
||||
#include "awlistformatter.h"
|
||||
#include "awnoformatter.h"
|
||||
#include "awscriptformatter.h"
|
||||
#include "awstringformatter.h"
|
||||
|
||||
|
||||
AWFormatterHelper::AWFormatterHelper(QWidget *_parent)
|
||||
: AbstractExtItemAggregator(_parent, "formatters")
|
||||
, AWAbstractPairHelper("awesomewidgets/formatters/formatters.ini", "Formatters")
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
AWFormatterHelper::initItems();
|
||||
}
|
||||
|
||||
|
||||
AWFormatterHelper::~AWFormatterHelper()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
m_formatters.clear();
|
||||
m_formattersClasses.clear();
|
||||
}
|
||||
|
||||
|
||||
void AWFormatterHelper::initItems()
|
||||
{
|
||||
initFormatters();
|
||||
|
||||
// assign internal storage
|
||||
m_formatters.clear();
|
||||
for (auto &key : pairs().keys()) {
|
||||
auto name = pairs()[key];
|
||||
if (!m_formattersClasses.contains(name)) {
|
||||
qCWarning(LOG_AW) << "Invalid formatter" << name << "found in" << key;
|
||||
continue;
|
||||
}
|
||||
|
||||
m_formatters[key] = m_formattersClasses[name];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
QString AWFormatterHelper::convert(const QVariant &_value, const QString &_name) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Convert value" << _value << "for" << _name;
|
||||
|
||||
return m_formatters.contains(_name) ? m_formatters[_name]->convert(_value) : _value.toString();
|
||||
}
|
||||
|
||||
|
||||
QStringList AWFormatterHelper::definedFormatters() const
|
||||
{
|
||||
return m_formatters.keys();
|
||||
}
|
||||
|
||||
|
||||
QList<AbstractExtItem *> AWFormatterHelper::items() const
|
||||
{
|
||||
QList<AbstractExtItem *> converted;
|
||||
for (auto &item : m_formattersClasses.values())
|
||||
converted.append(item);
|
||||
|
||||
return converted;
|
||||
}
|
||||
|
||||
|
||||
void AWFormatterHelper::editPairs()
|
||||
{
|
||||
return editItems();
|
||||
}
|
||||
|
||||
|
||||
QStringList AWFormatterHelper::leftKeys()
|
||||
{
|
||||
return QStringList();
|
||||
}
|
||||
|
||||
|
||||
QStringList AWFormatterHelper::rightKeys()
|
||||
{
|
||||
return m_formattersClasses.keys();
|
||||
}
|
||||
|
||||
|
||||
void AWFormatterHelper::editItems()
|
||||
{
|
||||
repaintList();
|
||||
int ret = exec();
|
||||
qCInfo(LOG_AW) << "Dialog returns" << ret;
|
||||
}
|
||||
|
||||
|
||||
AWAbstractFormatter::FormatterClass
|
||||
AWFormatterHelper::defineFormatterClass(const QString &_stringType)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
|
||||
|
||||
AWAbstractFormatter::FormatterClass formatter = AWAbstractFormatter::FormatterClass::NoFormat;
|
||||
if (_stringType == "DateTime")
|
||||
formatter = AWAbstractFormatter::FormatterClass::DateTime;
|
||||
else if (_stringType == "Float")
|
||||
formatter = AWAbstractFormatter::FormatterClass::Float;
|
||||
else if (_stringType == "List")
|
||||
formatter = AWAbstractFormatter::FormatterClass::List;
|
||||
else if (_stringType == "NoFormat")
|
||||
;
|
||||
else if (_stringType == "Script")
|
||||
formatter = AWAbstractFormatter::FormatterClass::Script;
|
||||
else if (_stringType == "String")
|
||||
formatter = AWAbstractFormatter::FormatterClass::String;
|
||||
else if (_stringType == "Json")
|
||||
formatter = AWAbstractFormatter::FormatterClass::Json;
|
||||
else
|
||||
qCWarning(LOG_AW) << "Unknown formatter" << _stringType;
|
||||
|
||||
return formatter;
|
||||
}
|
||||
|
||||
|
||||
void AWFormatterHelper::initFormatters()
|
||||
{
|
||||
m_formattersClasses.clear();
|
||||
|
||||
auto dirs = directories();
|
||||
for (auto &dir : dirs) {
|
||||
QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name);
|
||||
for (auto &file : files) {
|
||||
// check filename
|
||||
if (!file.endsWith(".desktop"))
|
||||
continue;
|
||||
qCInfo(LOG_AW) << "Found file" << file << "in" << dir;
|
||||
QString filePath = QString("%1/%2").arg(dir).arg(file);
|
||||
// check if already exists
|
||||
auto values = m_formattersClasses.values();
|
||||
if (std::any_of(values.cbegin(), values.cend(),
|
||||
[&filePath](const AWAbstractFormatter *item) {
|
||||
return (item->fileName() == filePath);
|
||||
}))
|
||||
continue;
|
||||
|
||||
auto metadata = readMetadata(filePath);
|
||||
switch (metadata.second) {
|
||||
case AWAbstractFormatter::FormatterClass::DateTime:
|
||||
m_formattersClasses[metadata.first] = new AWDateTimeFormatter(this, filePath);
|
||||
break;
|
||||
case AWAbstractFormatter::FormatterClass::Float:
|
||||
m_formattersClasses[metadata.first] = new AWFloatFormatter(this, filePath);
|
||||
break;
|
||||
case AWAbstractFormatter::FormatterClass::List:
|
||||
m_formattersClasses[metadata.first] = new AWListFormatter(this, filePath);
|
||||
break;
|
||||
case AWAbstractFormatter::FormatterClass::Script:
|
||||
m_formattersClasses[metadata.first] = new AWScriptFormatter(this, filePath);
|
||||
break;
|
||||
case AWAbstractFormatter::FormatterClass::String:
|
||||
m_formattersClasses[metadata.first] = new AWStringFormatter(this, filePath);
|
||||
break;
|
||||
case AWAbstractFormatter::FormatterClass::Json:
|
||||
m_formattersClasses[metadata.first] = new AWJsonFormatter(this, filePath);
|
||||
break;
|
||||
case AWAbstractFormatter::FormatterClass::NoFormat:
|
||||
m_formattersClasses[metadata.first] = new AWNoFormatter(this, filePath);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
QPair<QString, AWAbstractFormatter::FormatterClass>
|
||||
AWFormatterHelper::readMetadata(const QString &_filePath)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
|
||||
|
||||
QSettings settings(_filePath, QSettings::IniFormat);
|
||||
settings.beginGroup("Desktop Entry");
|
||||
QString name = settings.value("Name", _filePath).toString();
|
||||
QString type = settings.value("X-AW-Type", "NoFormat").toString();
|
||||
AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
|
||||
settings.endGroup();
|
||||
|
||||
return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
|
||||
}
|
||||
|
||||
|
||||
void AWFormatterHelper::doCreateItem()
|
||||
{
|
||||
QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
|
||||
bool ok;
|
||||
QString select
|
||||
= QInputDialog::getItem(this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
|
||||
if (!ok) {
|
||||
qCWarning(LOG_AW) << "No type selected";
|
||||
return;
|
||||
}
|
||||
|
||||
qCInfo(LOG_AW) << "Selected type" << select;
|
||||
AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(select);
|
||||
switch (formatter) {
|
||||
case AWAbstractFormatter::FormatterClass::DateTime:
|
||||
return createItem<AWDateTimeFormatter>();
|
||||
case AWAbstractFormatter::FormatterClass::Float:
|
||||
return createItem<AWFloatFormatter>();
|
||||
case AWAbstractFormatter::FormatterClass::List:
|
||||
return createItem<AWListFormatter>();
|
||||
case AWAbstractFormatter::FormatterClass::Script:
|
||||
return createItem<AWScriptFormatter>();
|
||||
case AWAbstractFormatter::FormatterClass::String:
|
||||
return createItem<AWStringFormatter>();
|
||||
case AWAbstractFormatter::FormatterClass::Json:
|
||||
return createItem<AWJsonFormatter>();
|
||||
case AWAbstractFormatter::FormatterClass::NoFormat:
|
||||
return createItem<AWNoFormatter>();
|
||||
}
|
||||
}
|
62
sources/awesome-widget/plugin/awformatterhelper.h
Normal file
@ -0,0 +1,62 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWFORMATTERHELPER_H
|
||||
#define AWFORMATTERHELPER_H
|
||||
|
||||
#include "abstractextitemaggregator.h"
|
||||
#include "awabstractformatter.h"
|
||||
#include "awabstractpairhelper.h"
|
||||
|
||||
|
||||
class AWFormatterHelper : public AbstractExtItemAggregator, public AWAbstractPairHelper
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit AWFormatterHelper(QWidget *_parent = nullptr);
|
||||
~AWFormatterHelper() override;
|
||||
// read-write methods
|
||||
void initItems() override;
|
||||
// methods
|
||||
[[nodiscard]] QString convert(const QVariant &_value, const QString &_name) const;
|
||||
[[nodiscard]] QStringList definedFormatters() const;
|
||||
[[nodiscard]] QList<AbstractExtItem *> items() const override;
|
||||
// configuration related
|
||||
void editPairs() override;
|
||||
QStringList leftKeys() override;
|
||||
QStringList rightKeys() override;
|
||||
|
||||
public slots:
|
||||
void editItems();
|
||||
|
||||
private:
|
||||
// methods
|
||||
static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
|
||||
void initFormatters();
|
||||
[[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass>
|
||||
readMetadata(const QString &_filePath);
|
||||
// parent methods
|
||||
void doCreateItem() override;
|
||||
// properties
|
||||
QHash<QString, AWAbstractFormatter *> m_formatters;
|
||||
QHash<QString, AWAbstractFormatter *> m_formattersClasses;
|
||||
};
|
||||
|
||||
|
||||
#endif /* AWFORMATTERHELPER_H */
|
179
sources/awesome-widget/plugin/awkeycache.cpp
Normal file
@ -0,0 +1,179 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#include "awkeycache.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QNetworkInterface>
|
||||
#include <QSettings>
|
||||
#include <QStandardPaths>
|
||||
|
||||
#include "awdebug.h"
|
||||
|
||||
|
||||
bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
|
||||
|
||||
QString fileName
|
||||
= QString("%1/awesomewidgets.ndx")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
|
||||
qCInfo(LOG_AW) << "Cache file" << fileName;
|
||||
QSettings cache(fileName, QSettings::IniFormat);
|
||||
|
||||
cache.beginGroup(_type);
|
||||
QStringList cachedValues;
|
||||
for (auto &number : cache.allKeys())
|
||||
cachedValues.append(cache.value(number).toString());
|
||||
|
||||
if (_type == "hdd") {
|
||||
QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
|
||||
QStringList devices = allDevices.filter(QRegExp("^[hms]d[a-z]$"));
|
||||
for (auto &dev : devices) {
|
||||
QString device = QString("/dev/%1").arg(dev);
|
||||
if (cachedValues.contains(device))
|
||||
continue;
|
||||
qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
|
||||
cachedValues.append(device);
|
||||
cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
|
||||
}
|
||||
} else if (_type == "net") {
|
||||
QList<QNetworkInterface> rawInterfaceList = QNetworkInterface::allInterfaces();
|
||||
for (auto &interface : rawInterfaceList) {
|
||||
QString device = interface.name();
|
||||
if (cachedValues.contains(device))
|
||||
continue;
|
||||
qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
|
||||
cachedValues.append(device);
|
||||
cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
|
||||
}
|
||||
} else {
|
||||
if (cachedValues.contains(_key))
|
||||
return false;
|
||||
qCInfo(LOG_AW) << "Found new key" << _key << "for type" << _type;
|
||||
cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), _key);
|
||||
}
|
||||
cache.endGroup();
|
||||
|
||||
cache.sync();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
|
||||
const QVariantMap &_tooltip, const QStringList &_userKeys,
|
||||
const QStringList &_allKeys)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings"
|
||||
<< _tooltip;
|
||||
|
||||
// initial copy
|
||||
QSet<QString> used(_keys.cbegin(), _keys.cend());
|
||||
used.unite(QSet(_bars.cbegin(), _bars.cend()));
|
||||
used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
|
||||
// insert keys from tooltip
|
||||
for (auto &key : _tooltip.keys()) {
|
||||
if ((key.endsWith("Tooltip")) && (_tooltip[key].toBool())) {
|
||||
key.remove("Tooltip");
|
||||
used << key;
|
||||
}
|
||||
}
|
||||
|
||||
// insert depending keys, refer to AWKeys::calculateValues()
|
||||
// hddtotmb*
|
||||
for (auto &key : _allKeys.filter(QRegExp("^hddtotmb"))) {
|
||||
if (!used.contains(key))
|
||||
continue;
|
||||
key.remove("hddtotmb");
|
||||
int index = key.toInt();
|
||||
used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
|
||||
}
|
||||
// hddtotgb*
|
||||
for (auto &key : _allKeys.filter(QRegExp("^hddtotgb"))) {
|
||||
if (!used.contains(key))
|
||||
continue;
|
||||
key.remove("hddtotgb");
|
||||
int index = key.toInt();
|
||||
used << QString("hddfreegb%1").arg(index) << QString("hddgb%1").arg(index);
|
||||
}
|
||||
// mem
|
||||
if (used.contains("mem"))
|
||||
used << "memmb"
|
||||
<< "memtotmb";
|
||||
// memtotmb
|
||||
if (used.contains("memtotmb"))
|
||||
used << "memusedmb"
|
||||
<< "memfreemb";
|
||||
// memtotgb
|
||||
if (used.contains("memtotgb"))
|
||||
used << "memusedgb"
|
||||
<< "memfreegb";
|
||||
// swap
|
||||
if (used.contains("swap"))
|
||||
used << "swapmb"
|
||||
<< "swaptotmb";
|
||||
// swaptotmb
|
||||
if (used.contains("swaptotmb"))
|
||||
used << "swapmb"
|
||||
<< "swapfreemb";
|
||||
// memtotgb
|
||||
if (used.contains("swaptotgb"))
|
||||
used << "swapgb"
|
||||
<< "swapfreegb";
|
||||
// network keys
|
||||
QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot",
|
||||
"downtotkb", "downunits"});
|
||||
for (auto &key : netKeys) {
|
||||
if (!used.contains(key))
|
||||
continue;
|
||||
QStringList filt = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
|
||||
for (auto &filtered : filt)
|
||||
used << filtered;
|
||||
}
|
||||
// netdev key
|
||||
if (std::any_of(netKeys.cbegin(), netKeys.cend(),
|
||||
[&used](const QString &key) { return used.contains(key); }))
|
||||
used << "netdev";
|
||||
|
||||
// HACK append dummy if there are no other keys. This hack is required
|
||||
// because empty list leads to the same behaviour as skip checking
|
||||
if (used.isEmpty())
|
||||
used << "dummy";
|
||||
|
||||
return used.values();
|
||||
}
|
||||
|
||||
|
||||
QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
|
||||
{
|
||||
QString fileName
|
||||
= QString("%1/awesomewidgets.ndx")
|
||||
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
|
||||
qCInfo(LOG_AW) << "Cache file" << fileName;
|
||||
QSettings cache(fileName, QSettings::IniFormat);
|
||||
|
||||
QHash<QString, QStringList> devices;
|
||||
for (auto &group : cache.childGroups()) {
|
||||
cache.beginGroup(group);
|
||||
for (auto &key : cache.allKeys())
|
||||
devices[group].append(cache.value(key).toString());
|
||||
cache.endGroup();
|
||||
}
|
||||
|
||||
return devices;
|
||||
}
|
37
sources/awesome-widget/plugin/awkeycache.h
Normal file
@ -0,0 +1,37 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef AWKEYCACHE_H
|
||||
#define AWKEYCACHE_H
|
||||
|
||||
#include <QHash>
|
||||
#include <QString>
|
||||
#include <QVariant>
|
||||
|
||||
|
||||
namespace AWKeyCache
|
||||
{
|
||||
bool addKeyToCache(const QString &_type, const QString &_key = "");
|
||||
QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
|
||||
const QVariantMap &_tooltip, const QStringList &_userKeys,
|
||||
const QStringList &_allKeys);
|
||||
QHash<QString, QStringList> loadKeysFromCache();
|
||||
} // namespace AWKeyCache
|
||||
|
||||
|
||||
#endif /* AWKEYCACHE_H */
|
358
sources/awesome-widget/plugin/awkeyoperations.cpp
Normal file
@ -0,0 +1,358 @@
|
||||
/***************************************************************************
|
||||
* This file is part of awesome-widgets *
|
||||
* *
|
||||
* awesome-widgets is free software: you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU General Public License as *
|
||||
* published by the Free Software Foundation, either version 3 of the *
|
||||
* License, or (at your option) any later version. *
|
||||
* *
|
||||
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||
***************************************************************************/
|
||||
|
||||
#include "awkeyoperations.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QJSEngine>
|
||||
#include <QRegExp>
|
||||
#include <QThread>
|
||||
|
||||
#include "awcustomkeyshelper.h"
|
||||
#include "awdebug.h"
|
||||
#include "awkeycache.h"
|
||||
#include "awpatternfunctions.h"
|
||||
// extensions
|
||||
#include "extnetworkrequest.h"
|
||||
#include "extquotes.h"
|
||||
#include "extscript.h"
|
||||
#include "extupgrade.h"
|
||||
#include "extweather.h"
|
||||
#include "graphicalitem.h"
|
||||
|
||||
|
||||
AWKeyOperations::AWKeyOperations(QObject *_parent)
|
||||
: QObject(_parent)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
m_customKeys = new AWCustomKeysHelper(this);
|
||||
m_graphicalItems = new ExtItemAggregator<GraphicalItem>(nullptr, "desktops");
|
||||
m_extNetRequest = new ExtItemAggregator<ExtNetworkRequest>(nullptr, "requests");
|
||||
m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, "quotes");
|
||||
m_extScripts = new ExtItemAggregator<ExtScript>(nullptr, "scripts");
|
||||
m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, "upgrade");
|
||||
m_extWeather = new ExtItemAggregator<ExtWeather>(nullptr, "weather");
|
||||
}
|
||||
|
||||
|
||||
AWKeyOperations::~AWKeyOperations()
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
}
|
||||
|
||||
|
||||
QStringList AWKeyOperations::devices(const QString &_type) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Looking for type" << _type;
|
||||
|
||||
return m_devices[_type];
|
||||
}
|
||||
|
||||
|
||||
QHash<QString, QStringList> AWKeyOperations::devices() const
|
||||
{
|
||||
return m_devices;
|
||||
}
|
||||
|
||||
|
||||
void AWKeyOperations::updateCache()
|
||||
{
|
||||
// update network and hdd list
|
||||
addKeyToCache("hdd");
|
||||
addKeyToCache("net");
|
||||
}
|
||||
|
||||
|
||||
QStringList AWKeyOperations::dictKeys() const
|
||||
{
|
||||
QStringList allKeys;
|
||||
// weather
|
||||
for (auto &item : m_extWeather->activeItems()) {
|
||||
allKeys.append(item->tag("weatherId"));
|
||||
allKeys.append(item->tag("weather"));
|
||||
allKeys.append(item->tag("humidity"));
|
||||
allKeys.append(item->tag("pressure"));
|
||||
allKeys.append(item->tag("temperature"));
|
||||
allKeys.append(item->tag("timestamp"));
|
||||
}
|
||||
// cpuclock & cpu
|
||||
for (int i = 0; i < QThread::idealThreadCount(); i++) {
|
||||
allKeys.append(QString("cpucl%1").arg(i));
|
||||
allKeys.append(QString("cpu%1").arg(i));
|
||||
}
|
||||
// temperature
|
||||
for (int i = 0; i < m_devices["temp"].count(); i++)
|
||||
allKeys.append(QString("temp%1").arg(i));
|
||||
// hdd
|
||||
for (int i = 0; i < m_devices["mount"].count(); i++) {
|
||||
allKeys.append(QString("hddmb%1").arg(i));
|
||||
allKeys.append(QString("hddgb%1").arg(i));
|
||||
allKeys.append(QString("hddfreemb%1").arg(i));
|
||||
allKeys.append(QString("hddfreegb%1").arg(i));
|
||||
allKeys.append(QString("hddtotmb%1").arg(i));
|
||||
allKeys.append(QString("hddtotgb%1").arg(i));
|
||||
allKeys.append(QString("hdd%1").arg(i));
|
||||
}
|
||||
// hdd speed
|
||||
for (int i = 0; i < m_devices["disk"].count(); i++) {
|
||||
allKeys.append(QString("hddr%1").arg(i));
|
||||
allKeys.append(QString("hddw%1").arg(i));
|
||||
}
|
||||
// hdd temp
|
||||
for (int i = 0; i < m_devices["hdd"].count(); i++)
|
||||
allKeys.append(QString("hddtemp%1").arg(i));
|
||||
// network
|
||||
for (int i = 0; i < m_devices["net"].count(); i++) {
|
||||
allKeys.append(QString("downunits%1").arg(i));
|
||||
allKeys.append(QString("upunits%1").arg(i));
|
||||
allKeys.append(QString("downtotkb%1").arg(i));
|
||||
allKeys.append(QString("downtot%1").arg(i));
|
||||
allKeys.append(QString("downkb%1").arg(i));
|
||||
allKeys.append(QString("down%1").arg(i));
|
||||
allKeys.append(QString("uptotkb%1").arg(i));
|
||||
allKeys.append(QString("uptot%1").arg(i));
|
||||
allKeys.append(QString("upkb%1").arg(i));
|
||||
allKeys.append(QString("up%1").arg(i));
|
||||
}
|
||||
// battery
|
||||
QStringList allBatteryDevices
|
||||
= QDir("/sys/class/power_supply")
|
||||
.entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
|
||||
for (int i = 0; i < allBatteryDevices.count(); i++) {
|
||||
allKeys.append(QString("bat%1").arg(i));
|
||||
allKeys.append(QString("batleft%1").arg(i));
|
||||
allKeys.append(QString("batnow%1").arg(i));
|
||||
allKeys.append(QString("batrate%1").arg(i));
|
||||
allKeys.append(QString("battotal%1").arg(i));
|
||||
}
|
||||
// package manager
|
||||
for (auto &item : m_extUpgrade->activeItems())
|
||||
allKeys.append(item->tag("pkgcount"));
|
||||
// quotes
|
||||
for (auto &item : m_extQuotes->activeItems()) {
|
||||
allKeys.append(item->tag("price"));
|
||||
allKeys.append(item->tag("pricechg"));
|
||||
allKeys.append(item->tag("percpricechg"));
|
||||
allKeys.append(item->tag("volume"));
|
||||
allKeys.append(item->tag("volumechg"));
|
||||
allKeys.append(item->tag("percvolumechg"));
|
||||
}
|
||||
// custom
|
||||
for (auto &item : m_extScripts->activeItems())
|
||||
allKeys.append(item->tag("custom"));
|
||||
// network requests
|
||||
for (auto &item : m_extNetRequest->activeItems())
|
||||
allKeys.append(item->tag("response"));
|
||||
// bars
|
||||
for (auto &item : m_graphicalItems->activeItems())
|
||||
allKeys.append(item->tag("bar"));
|
||||
// user defined keys
|
||||
allKeys.append(m_customKeys->keys());
|
||||
// static keys
|
||||
allKeys.append(QString(STATIC_KEYS).split(','));
|
||||
|
||||
// sort in valid order
|
||||
allKeys.sort();
|
||||
std::reverse(allKeys.begin(), allKeys.end());
|
||||
|
||||
return allKeys;
|
||||
}
|
||||
|
||||
|
||||
// this method is required to provide GraphicalItem functions (e.g. paint()) to
|
||||
// parent classes
|
||||
GraphicalItem *AWKeyOperations::giByKey(const QString &_key) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Looking for item" << _key;
|
||||
|
||||
return m_graphicalItems->itemByTag(_key, "bar");
|
||||
}
|
||||
|
||||
|
||||
QStringList AWKeyOperations::requiredUserKeys() const
|
||||
{
|
||||
return m_customKeys->refinedSources();
|
||||
}
|
||||
|
||||
|
||||
QStringList AWKeyOperations::userKeys() const
|
||||
{
|
||||
return m_customKeys->keys();
|
||||
}
|
||||
|
||||
|
||||
QString AWKeyOperations::userKeySource(const QString &_key) const
|
||||
{
|
||||
return m_customKeys->source(_key);
|
||||
}
|
||||
|
||||
|
||||
QString AWKeyOperations::infoByKey(const QString &_key) const
|
||||
{
|
||||
qCDebug(LOG_AW) << "Requested key" << _key;
|
||||
|
||||
QString stripped = _key;
|
||||
stripped.remove(QRegExp("\\d+"));
|
||||
QString output;
|
||||
|
||||
if (_key.startsWith("bar")) {
|
||||
AbstractExtItem *item = m_graphicalItems->itemByTag(_key, stripped);
|
||||
if (item)
|
||||
output = item->uniq();
|
||||
} else if (_key.startsWith("custom")) {
|
||||
AbstractExtItem *item = m_extScripts->itemByTag(_key, stripped);
|
||||
if (item)
|
||||
output = item->uniq();
|
||||
} else if (_key.contains(QRegExp("^hdd[rw]"))) {
|
||||
QString index = _key;
|
||||
index.remove(QRegExp("hdd[rw]"));
|
||||
output = m_devices["disk"][index.toInt()];
|
||||
} else if (_key.contains(QRegExp("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
|
||||
QString index = _key;
|
||||
index.remove(QRegExp("^hdd(|mb|gb|freemb|freegb|totmb|totgb)"));
|
||||
output = m_devices["mount"][index.toInt()];
|
||||
} else if (_key.startsWith("hddtemp")) {
|
||||
QString index = _key;
|
||||
index.remove("hddtemp");
|
||||
output = m_devices["hdd"][index.toInt()];
|
||||
} else if (_key.contains(QRegExp("^(down|up)[0-9]"))) {
|
||||
QString index = _key;
|
||||
index.remove(QRegExp("^(down|up)"));
|
||||
output = m_devices["net"][index.toInt()];
|
||||
} else if (_key.startsWith("pkgcount")) {
|
||||
AbstractExtItem *item = m_extUpgrade->itemByTag(_key, stripped);
|
||||
if (item)
|
||||
output = item->uniq();
|
||||
} else if (_key.contains(QRegExp("(^|perc)(ask|bid|price)(chg|)"))) {
|
||||
AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
|
||||
if (item)
|
||||
output = item->uniq();
|
||||
} else if (_key.contains(QRegExp("(weather|weatherId|humidity|pressure|temperature)"))) {
|
||||
AbstractExtItem *item = m_extWeather->itemByTag(_key, stripped);
|
||||
if (item)
|
||||
output = item->uniq();
|
||||
} else if (_key.startsWith("temp")) {
|
||||
QString index = _key;
|
||||
index.remove("temp");
|
||||
output = m_devices["temp"][index.toInt()];
|
||||
} else if (_key.startsWith("response")) {
|
||||
AbstractExtItem *item = m_extNetRequest->itemByTag(_key, stripped);
|
||||
if (item)
|
||||
output = item->uniq();
|
||||
} else {
|
||||
output = "(none)";
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
|
||||
QString AWKeyOperations::pattern() const
|
||||
{
|
||||
return m_pattern;
|
||||
}
|
||||
|
||||
|
||||
void AWKeyOperations::setPattern(const QString &_currentPattern)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Set pattern" << _currentPattern;
|
||||
|
||||
m_pattern = _currentPattern;
|
||||
}
|
||||
|
||||
|
||||
void AWKeyOperations::editItem(const QString &_type)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Item type" << _type;
|
||||
|
||||
if (_type == "graphicalitem") {
|
||||
QStringList keys
|
||||
= dictKeys().filter(QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
|
||||
keys.sort();
|
||||
m_graphicalItems->setConfigArgs(keys);
|
||||
return m_graphicalItems->editItems();
|
||||
} else if (_type == "extnetworkrequest") {
|
||||
return m_extNetRequest->editItems();
|
||||
} else if (_type == "extquotes") {
|
||||
return m_extQuotes->editItems();
|
||||
} else if (_type == "extscript") {
|
||||
return m_extScripts->editItems();
|
||||
} else if (_type == "extupgrade") {
|
||||
return m_extUpgrade->editItems();
|
||||
} else if (_type == "extweather") {
|
||||
return m_extWeather->editItems();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWKeyOperations::addDevice(const QString &_source)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Source" << _source;
|
||||
|
||||
QRegExp diskRegexp = QRegExp("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
|
||||
QRegExp mountRegexp = QRegExp("partitions/.*/filllevel");
|
||||
|
||||
if (_source.contains(diskRegexp)) {
|
||||
QString device = _source;
|
||||
device.remove("/Rate/rblk");
|
||||
addKeyToCache("disk", device);
|
||||
} else if (_source.contains(mountRegexp)) {
|
||||
QString device = _source;
|
||||
device.remove("partitions").remove("/filllevel");
|
||||
addKeyToCache("mount", device);
|
||||
} else if (_source.startsWith("lmsensors")) {
|
||||
addKeyToCache("temp", _source);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWKeyOperations::addKeyToCache(const QString &_type, const QString &_key)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
|
||||
|
||||
if (AWKeyCache::addKeyToCache(_type, _key)) {
|
||||
m_devices = AWKeyCache::loadKeysFromCache();
|
||||
reinitKeys();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void AWKeyOperations::reinitKeys()
|
||||
{
|
||||
m_customKeys->initItems();
|
||||
m_graphicalItems->initItems();
|
||||
m_extNetRequest->initItems();
|
||||
m_extQuotes->initItems();
|
||||
m_extScripts->initItems();
|
||||
m_extUpgrade->initItems();
|
||||
m_extWeather->initItems();
|
||||
|
||||
// init
|
||||
QStringList allKeys = dictKeys();
|
||||
|
||||
// apply aw_* functions
|
||||
m_pattern = AWPatternFunctions::insertAllKeys(m_pattern, allKeys);
|
||||
m_pattern = AWPatternFunctions::insertKeyCount(m_pattern, allKeys);
|
||||
m_pattern = AWPatternFunctions::insertKeyNames(m_pattern, allKeys);
|
||||
m_pattern = AWPatternFunctions::insertKeys(m_pattern, allKeys);
|
||||
m_pattern = AWPatternFunctions::insertMacros(m_pattern);
|
||||
// wrap templates
|
||||
m_pattern = AWPatternFunctions::expandTemplates(m_pattern);
|
||||
|
||||
emit(updateKeys(allKeys));
|
||||
}
|