Compare commits
932 Commits
Author | SHA1 | Date | |
---|---|---|---|
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 | |||
1555b22a3b | |||
1c772f288a | |||
16f4f4a8ff | |||
c09da99e06 | |||
14fab265cd | |||
9ba7a2b0d5 | |||
2c4515eb66 | |||
2e7fa3689b | |||
831b98f836 | |||
2295e80b67 | |||
f21fea1393 | |||
2675beb106 | |||
329457955d | |||
614e15d336 | |||
2e93325601 | |||
6f6af548ef | |||
5dc3d4e212 | |||
d8ae9a4c2a | |||
ce74cdb2d5 | |||
0fdb7317cc | |||
c1d55962a7 | |||
7353fdfe0f | |||
032953eac2 | |||
4766ef5675 | |||
1b6c8faf49 | |||
fc104b4549 | |||
975b575db5 | |||
4547815549 | |||
73e921a8f5 | |||
7ee4a5dc9d | |||
89efe6c846 | |||
4218a4da08 | |||
0db909d914 | |||
d7cc354432 | |||
aab456924f | |||
20c2a4eb6b | |||
d63b33903a | |||
fe77fcb2fd | |||
d226629b45 | |||
413dbb2134 | |||
b11b4d2462 | |||
62dd94a294 | |||
12d506a16d | |||
363c4327ee | |||
a716269e79 | |||
c66b255e8b | |||
decf714e74 | |||
405dda5144 | |||
0f8b9dc627 | |||
6cf7792f9a | |||
1df3cf0def | |||
59ffe456de | |||
9b981cb3f0 | |||
f640eb58d7 | |||
e5648babfc | |||
c34e569603 | |||
f42fc1e97d | |||
b8fd9cd51f | |||
05b65679d9 | |||
284243f810 | |||
c0e1f9c094 | |||
3545b9c1f1 | |||
d66bafa816 | |||
e6bbea9c07 | |||
2ddf9082f2 | |||
65a60de9a5 |
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
|
12
.docker/Dockerfile-ubuntu-amd64
Normal file
@ -0,0 +1,12 @@
|
||||
FROM ubuntu:bionic
|
||||
|
||||
RUN apt-get update
|
||||
# toolchain
|
||||
RUN apt-get install -y cmake extra-cmake-modules g++ git gettext
|
||||
# kf5 and qt5 libraries
|
||||
RUN apt-get install -y libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
|
||||
libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev \
|
||||
plasma-framework
|
||||
|
||||
# required by tests
|
||||
RUN apt-get install -y xvfb
|
12
.docker/Dockerfile-ubuntu-i386
Normal file
@ -0,0 +1,12 @@
|
||||
FROM multiarch/ubuntu-core:i386-bionic
|
||||
|
||||
RUN apt-get update
|
||||
# toolchain
|
||||
RUN apt-get install -y cmake extra-cmake-modules g++ git gettext
|
||||
# kf5 and qt5 libraries
|
||||
RUN apt-get install -y libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
|
||||
libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev \
|
||||
plasma-framework
|
||||
|
||||
# required by tests
|
||||
RUN apt-get install -y 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
|
16
.docker/build-ubuntu-package.sh
Executable file
@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
rm -rf build-ubuntu
|
||||
mkdir build-ubuntu
|
||||
|
||||
# patches
|
||||
#git apply patches/qt5.6-qversionnumber.patch
|
||||
#git apply patches/qt5.5-qstringlist-and-qinfo.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
|
||||
|
18
.docker/build-ubuntu.sh
Executable file
@ -0,0 +1,18 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
rm -rf build-ubuntu
|
||||
mkdir build-ubuntu
|
||||
|
||||
# patches
|
||||
git apply patches/qt5.6-qversionnumber.patch
|
||||
git apply patches/qt5.5-qstringlist-and-qinfo.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
|
50
.gitignore
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
# 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
|
15
AUTHORS
Normal file
@ -0,0 +1,15 @@
|
||||
Current developers:
|
||||
Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
|
||||
|
||||
Packagers:
|
||||
Konstantin Voinov (openSuSe)
|
||||
|
||||
Translators:
|
||||
@Mermouy (French)
|
||||
Ernesto Avilés Vzqz (Spanish)
|
||||
@underr (Brazillian Portuguese)
|
||||
Виктор Слободян (Ukrainian)
|
||||
Steve Lemuel (Chinese)
|
||||
Mariusz Kocoń (Polish)
|
||||
Ibnu Daru Aji (Indonesian)
|
||||
Antonio Vivace (Italian)
|
493
CHANGELOG
Normal file
@ -0,0 +1,493 @@
|
||||
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:
|
||||
+ 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:
|
||||
+ 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
|
||||
* network device update interval now is 30*interval
|
||||
* $swap, $swapmb and $swapgb tags now work simultaneously ($mem* tags too)
|
||||
* player_name now has str type
|
||||
|
||||
Ver.1.7.2:
|
||||
+ 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:
|
||||
- remove error label
|
||||
* fix bug with zero values in tooltip
|
||||
|
||||
Ver.1.7.0:
|
||||
+ 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:
|
||||
+ add support of several devices in hddtemp label
|
||||
- fixed #6
|
||||
|
||||
Ver.1.6.0:
|
||||
+ add $custom tag to time and uptime labels (#8)
|
||||
+ russian translation
|
||||
- fix #6, #10
|
||||
* change license to GPLv3
|
||||
* change project build
|
||||
|
||||
Ver.1.5.3:
|
||||
+ add $album, $progress and $time tags to player label (#7)
|
||||
- fix zero swap
|
||||
|
||||
Ver.1.5.2:
|
||||
+ add $isotime, $shorttime and $longtime tags to time label
|
||||
|
||||
Ver.1.5.1:
|
||||
+ add time label
|
||||
|
||||
Ver.1.5.0:
|
||||
+ add player label
|
||||
|
||||
Ver.1.4.0:
|
||||
+ add notifications
|
||||
|
||||
Ver.1.3.6:
|
||||
- fix #1, #2
|
||||
|
||||
Ver.1.3.5:
|
||||
- fix bug with definition network device
|
||||
|
||||
Ver.1.3.4:
|
||||
+ add double click event
|
||||
+ add auto selection of network device
|
||||
- fix yet another plasma crash
|
||||
|
||||
Ver.1.3.3:
|
||||
* edit reading temperature device
|
||||
|
||||
Ver.1.3.2b:
|
||||
- fix plasma crash
|
||||
|
||||
Ver.1.3.2:
|
||||
+ add GPU, GPU temperature, HDD and HDD temperature labels
|
||||
+ add $ccpu and $ccpucl tags
|
||||
- bug fixes
|
||||
* optimization and refactoring
|
||||
|
||||
Ver.1.2.2:
|
||||
+ 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:
|
||||
+ 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:
|
||||
* change parsing acpi output (battery label)
|
||||
|
||||
Ver.1.1.3:
|
||||
+ add font weight
|
||||
* edit font setup line. Now setup for font family works normaly
|
||||
* small bug fix
|
||||
|
||||
Ver.1.1.2:
|
||||
+ add CPU clock lable
|
||||
+ add function to update network device (100*time_interval)
|
||||
+ change update sliders
|
||||
|
||||
Ver.1.1.1:
|
||||
+ add $swapmb, $memmb, $netdev, @@netdev=...@@ tags
|
||||
- some bug fixes
|
||||
* widget consists of several labels
|
||||
* edit configuration interface
|
||||
|
||||
Ver.1.0:
|
||||
First release
|
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`.
|
674
COPYING
Normal file
@ -0,0 +1,674 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
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.
|
||||
|
||||
{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
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
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:
|
||||
|
||||
{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.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
59
PKGBUILD
@ -1,59 +0,0 @@
|
||||
# Author: Evgeniy "arcanis" Alexeev <esalexeev@gmail.com>
|
||||
# Maintainer: Evgeniy "arcanis" Alexeev <esalexeev@gmail.com>
|
||||
|
||||
pkgname=kdeplasma-applets-pytextmonitor
|
||||
_pkgname=py-text-monitor
|
||||
pkgver=1.5.3
|
||||
pkgrel=1
|
||||
_dtengine=ext-sysmon
|
||||
_dtver=1.6
|
||||
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=('GPL')
|
||||
depends=('kdebase-workspace' 'kdebindings-python2' 'lm_sensors' 'net-tools' 'sysstat')
|
||||
optdepends=("hddtemp: for HDD temperature monitor"
|
||||
"catalyst: for GPU monitor"
|
||||
"nvidia-utils: for GPU monitor"
|
||||
"amarok: for music player monitor"
|
||||
"mpd: for music player monitor"
|
||||
"qmmp: for music player monitor")
|
||||
makedepends=('automoc4' 'cmake')
|
||||
source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid
|
||||
https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip)
|
||||
install=${pkgname}.install
|
||||
md5sums=('7fef048a8e000ccf9a1e5f0924f59cc2'
|
||||
'74f42444a2bddce898d462045c3dbd44')
|
||||
backup=('usr/share/config/extsysmon.conf')
|
||||
|
||||
build () {
|
||||
# build dataengine
|
||||
if [[ -d ${srcdir}/${_dtengine}/build ]]; then
|
||||
rm -rf "${srcdir}/${_dtengine}/build"
|
||||
fi
|
||||
mkdir "${srcdir}/${_dtengine}/build"
|
||||
cd "${srcdir}/${_dtengine}/build"
|
||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \
|
||||
../
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
# install dataengine
|
||||
cd "${srcdir}/${_dtengine}/build"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
# install plasmoid
|
||||
install -D -m644 "${srcdir}/contents/code/plasma_applet_pytextmonitor.notifyrc" \
|
||||
"${pkgdir}/`kde4-config --prefix`/share/apps/plasma_applet_pytextmonitor/plasma_applet_pytextmonitor.notifyrc"
|
||||
install -D -m644 "${srcdir}/metadata.desktop" \
|
||||
"${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop"
|
||||
install -D -m644 "${srcdir}/metadata.desktop" \
|
||||
"${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop"
|
||||
mkdir -p "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/"{code,ui}
|
||||
install -m644 "${srcdir}/contents/code/"* \
|
||||
-t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/code"
|
||||
install -m644 "${srcdir}/contents/ui/"* \
|
||||
-t "${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/ui"
|
||||
}
|
113
README.md
@ -1,108 +1,85 @@
|
||||
py-text-monitor
|
||||
=============
|
||||
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.
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
For edited output you must open Settings window and setup output format in lines:
|
||||
* label `$time` - time in default format. For example, `fri Nov 6 04:48:01 2013`
|
||||
* label `$isotime` - time in iso format
|
||||
* label `$shorttime` - time in short locale format
|
||||
* label `$longtime` - time in long locale format
|
||||
* label `$uptime` - uptime, <i>---d--h--m</i>
|
||||
* label `$cpu` - total load cpu, <i>%</i>
|
||||
* label `$ccpu` - load CPU for each core, <i>%</i>
|
||||
* label `$cpucl` - average cpu clock, <i>MHz</i>
|
||||
* label `$ccpucl` - cpu clock for each core, <i>MHz</i>
|
||||
* label `$temp` - average temperature in system
|
||||
* label `$gpu` - GPU usage, <i>%</i>. `aticonfig` or `nvidia-smi` must be installed
|
||||
* label `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
|
||||
* label `$mem` - usage memory, <i>%</i>
|
||||
* label `$memmb` - usage memory, <i>MB</i>
|
||||
* label `$swap` - swap, <i>%</i>
|
||||
* label `$swapmb` - swap, <i>MB</i>
|
||||
* label `@@/@@` (in hdd label) - mount point (`/` in example) usage, <i>%</i>. Separator for mount points list is `;`, for example `@@/;/home;/mnt/global@@`
|
||||
* label `@@/dev/sda@@` (in hddtemp label) - HDD (`/dev/sda` in example) temperature. `hddtemp` must be installed
|
||||
* label `$net` - download and upload speed, <i>KB/s</i>. You may specify network device: something like `@@eth0@@`
|
||||
* label `$netdev` - current network device
|
||||
* label `$bat` - battery charge, <i>%</i>. Battery device may be set below. File (`/sys/class/power_supply/BAT0/capacity` by default) must contain only battery charge in percent
|
||||
* label `$ac` - status AC device. Return <i>(*)</i> if AC device is online or <i>( )</i> if offline. AC device may be set below. FIle (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online
|
||||
* label `$artist` - current song artist. One of supported music players must be installed
|
||||
* label `$album` - current song album. One of supported music players must be installed
|
||||
* label `$progress` - current song progress. One of supported music players must be installed (mpd does not support yet)
|
||||
* label `$time` - current song duration. One of supported music players must be installed
|
||||
* label `$title` - current song title. One of supported music players must be installed
|
||||
A collection of minimalistic widgets which looks like Awesome Window Manager widgets.
|
||||
|
||||
Label order will changed if you change slider position. HTML tags in label work normally.
|
||||
**NOTE** [LOOKING FOR TRANSLATORS!](https://github.com/arcan1s/awesome-widgets/issues/14)
|
||||
|
||||
**NOTE** you don't may set to show $cpu in swap label for example. <b>$cpu will work only in cpu label</b>.
|
||||
Features
|
||||
========
|
||||
|
||||
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.
|
||||
* 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
|
||||
|
||||
TODO (wish) list
|
||||
----------------
|
||||
Tooltip (graphical information):
|
||||
* cpu, %
|
||||
* cpuclock, mhz
|
||||
* memory, %
|
||||
* swap, %
|
||||
* network, %
|
||||
See [links](#Links) for more details.
|
||||
|
||||
**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)
|
||||
* net-tools (for definition network device)
|
||||
* sysstat (for notification)
|
||||
|
||||
* plasma-framework
|
||||
|
||||
Optional dependencies
|
||||
---------------------
|
||||
ext-sysmon (for GPU, GPU temp, HDD temp and player labels):
|
||||
|
||||
* proprietary video driver
|
||||
* hddtemp
|
||||
* music player (amarok, mpd or qmmp)
|
||||
* smartmontools
|
||||
* music player (mpd or MPRIS supported)
|
||||
* wireless_tools
|
||||
|
||||
Make dependencies
|
||||
-----------------
|
||||
* automoc4
|
||||
|
||||
* cmake
|
||||
* 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 dataengine
|
||||
* 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 "/":
|
||||
|
||||
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
|
||||
|
||||
* install plasmoid
|
||||
**NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
|
||||
|
||||
plasmapkg -i py-text-monitor-1.5.0.plasmoid
|
||||
**NOTE** if you are going to build from git, you need to init submodules first, e.g.:
|
||||
|
||||
Also you may install it to "/" too:
|
||||
|
||||
plasmapkg -g -i py-text-monitor-1.5.0.plasmoid
|
||||
git submodule update --init --recursive
|
||||
|
||||
Additional information
|
||||
======================
|
||||
|
||||
TODO (wish list)
|
||||
----------------
|
||||
|
||||
See [milestones](https://github.com/arcan1s/awesome-widgets/milestones) for more details.
|
||||
|
||||
Links
|
||||
-----
|
||||
* 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,30 +1,32 @@
|
||||
#!/bin/bash
|
||||
|
||||
# build dataengine
|
||||
ARCHIVE="ext-sysmon"
|
||||
VERSION=`grep Version ext-sysmon/plasma-engine-extsysmon.desktop | awk -F "=" '{print $2}'`
|
||||
# create archive
|
||||
if [ -e ${ARCHIVE}-${VERSION}.zip ]; then
|
||||
rm -f ${ARCHIVE}-${VERSION}.zip
|
||||
fi
|
||||
zip -9 -y -r -q ${ARCHIVE}-${VERSION}.zip ${ARCHIVE}
|
||||
# update md5sum
|
||||
MD5SUMS=`md5sum ${ARCHIVE}-${VERSION}.zip | awk '{print $1}'`
|
||||
sed -i "/ '[0-9A-Fa-f]*/s/[^'][^)]*/ '${MD5SUMS}'/" PKGBUILD
|
||||
sed -i "s/_dtver=[0-9.]*/_dtver=${VERSION}/" PKGBUILD
|
||||
SRCDIR="sources"
|
||||
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}"
|
||||
|
||||
# update submodules
|
||||
git submodule update --init --recursive
|
||||
|
||||
# build widget
|
||||
cd sources
|
||||
FILES="contents metadata.desktop plasma_applet_pytextmonitor"
|
||||
ARCHIVE="py-text-monitor"
|
||||
VERSION=`grep Version metadata.desktop | awk -F "=" '{print $2}'`
|
||||
ARCHIVE="awesome-widgets"
|
||||
FILES="AUTHORS CHANGELOG COPYING packages patches"
|
||||
IGNORELIST="build usr .kdev4 *.kdev4 .idea packages/*src.tar.xz"
|
||||
# create archive
|
||||
if [ -e ${ARCHIVE}-${VERSION}.plasmoid ]; then
|
||||
rm -f ${ARCHIVE}-${VERSION}.plasmoid
|
||||
fi
|
||||
zip -9 -y -r -q ../${ARCHIVE}-${VERSION}.plasmoid ${FILES}
|
||||
cd ..
|
||||
[[ -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}"
|
||||
ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" packages
|
||||
rm -rf "${ARCHIVE}"
|
||||
|
||||
# update md5sum
|
||||
MD5SUMS=`md5sum ${ARCHIVE}-${VERSION}.plasmoid | awk '{print $1}'`
|
||||
sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD
|
||||
sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD
|
||||
MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
|
||||
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,26 +0,0 @@
|
||||
# set project name
|
||||
project (plasma_engine_extsysmon)
|
||||
|
||||
# find required libaries
|
||||
find_package (KDE4 REQUIRED)
|
||||
include (KDE4Defaults)
|
||||
|
||||
add_definitions (${QT_DEFINITIONS}
|
||||
${KDE4_DEFINITIONS})
|
||||
include_directories (${CMAKE_SOURCE_DIR}
|
||||
${CMAKE_BINARY_DIR}
|
||||
${KDE4_INCLUDES})
|
||||
|
||||
set (PLUGIN_NAME ${PROJECT_NAME})
|
||||
file (GLOB PROJECT_DESKTOP *.desktop)
|
||||
file (GLOB PROJECT_SRCS *.cpp)
|
||||
file (GLOB PROJECT_CONF *.conf)
|
||||
|
||||
# make
|
||||
kde4_add_plugin (${PLUGIN_NAME} ${PROJECT_SRCS})
|
||||
target_link_libraries (${PLUGIN_NAME} ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS})
|
||||
|
||||
# install
|
||||
install (TARGETS ${PLUGIN_NAME} DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
install (FILES ${PROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
install (FILES ${PROJECT_CONF} DESTINATION ${CONFIG_INSTALL_DIR})
|
@ -1,13 +0,0 @@
|
||||
# Configuration file for Extended Systemmonitor DataEngine (v.1.6)
|
||||
# Uncomment needed lines
|
||||
|
||||
# Set GPU device
|
||||
# May be 'nvidia' (for nvidia), 'ati' (for ATI RADEON), 'ignore' or 'auto'
|
||||
#GPUDEV=auto
|
||||
|
||||
# Set block device for hddtemp comma separated or use 'all'
|
||||
#HDDDEV=all
|
||||
|
||||
# Set MPD settings
|
||||
#MPDADDRESS=localhost
|
||||
#MPDPORT=6600
|
@ -1,351 +0,0 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2013 by Evgeniy Alekseev <esalekseev@gmail.com> *
|
||||
* *
|
||||
* 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 *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program 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 this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
|
||||
***************************************************************************/
|
||||
|
||||
#include "extsysmon.h"
|
||||
|
||||
#include <Plasma/DataContainer>
|
||||
#include <QFile>
|
||||
#include <QProcess>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
|
||||
: Plasma::DataEngine(parent, args)
|
||||
{
|
||||
Q_UNUSED(args)
|
||||
|
||||
setMinimumPollingInterval(333);
|
||||
readConfiguration();
|
||||
}
|
||||
|
||||
QStringList ExtendedSysMon::sources() const
|
||||
{
|
||||
QStringList source;
|
||||
source.append(QString("gpu"));
|
||||
source.append(QString("gputemp"));
|
||||
source.append(QString("hddtemp"));
|
||||
source.append(QString("player"));
|
||||
return source;
|
||||
}
|
||||
|
||||
bool ExtendedSysMon::readConfiguration()
|
||||
{
|
||||
// pre-setup
|
||||
FILE *f_out;
|
||||
f_out = popen("lspci 2> /dev/null", "r");
|
||||
char device[256];
|
||||
QString dev;
|
||||
while (fgets(device, 256, f_out) != NULL) {
|
||||
dev = QString(device);
|
||||
if (dev.toLower().contains("nvidia"))
|
||||
gpuDev = QString("nvidia");
|
||||
else if (dev.toLower().contains("radeon"))
|
||||
gpuDev = QString("ati");
|
||||
}
|
||||
pclose(f_out);
|
||||
|
||||
f_out = popen("ls -1 /dev/sd[a-z] 2> /dev/null ; ls -1 /dev/hd[a-z] 2> /dev/null", "r");
|
||||
while (fgets(device, 256, f_out) != NULL) {
|
||||
dev = QString(device).split("\n")[0];
|
||||
if (dev[0] == '/')
|
||||
hddDev.append(dev);
|
||||
}
|
||||
pclose(f_out);
|
||||
|
||||
mpdAddress = QString("localhost");
|
||||
mpdPort = QString("6600");
|
||||
|
||||
QString fileStr;
|
||||
// FIXME: define configuration file
|
||||
QString confFileName = QString(getenv("HOME")) + QString("/.kde4/share/config/extsysmon.conf");
|
||||
QFile confFile(confFileName);
|
||||
bool exists = confFile.open(QIODevice::ReadOnly);
|
||||
if (!exists) {
|
||||
confFileName = QString("/usr/share/config/extsysmon.conf");
|
||||
confFile.setFileName(confFileName);
|
||||
exists = confFile.open(QIODevice::ReadOnly);
|
||||
if (!exists)
|
||||
return false;
|
||||
}
|
||||
|
||||
while (true) {
|
||||
fileStr = QString(confFile.readLine());
|
||||
if (fileStr[0] != '#') {
|
||||
if (fileStr.split(QString("="), QString::SkipEmptyParts).count() == 2) {
|
||||
if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("GPUDEV")) {
|
||||
if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("ati"))
|
||||
gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] == QString("nvidia"))
|
||||
gpuDev = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("auto"))
|
||||
gpuDev = QString("ignore");
|
||||
}
|
||||
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("HDDDEV")) {
|
||||
if (fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0] != QString("all")) {
|
||||
hddDev.clear();
|
||||
for (int i=0; i<fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
|
||||
QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts).count(); i++)
|
||||
hddDev.append(fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), \
|
||||
QString::SkipEmptyParts)[0].split(QString(","), QString::SkipEmptyParts)[i]);
|
||||
}
|
||||
}
|
||||
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDADDRESS"))
|
||||
mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDPORT"))
|
||||
mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
}
|
||||
}
|
||||
if (confFile.atEnd())
|
||||
break;
|
||||
}
|
||||
|
||||
confFile.close();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ExtendedSysMon::sourceRequestEvent(const QString &name)
|
||||
{
|
||||
return updateSourceEvent(name);
|
||||
}
|
||||
|
||||
bool ExtendedSysMon::updateSourceEvent(const QString &source)
|
||||
{
|
||||
FILE *f_out;
|
||||
QString key, out, tmp_out, value;
|
||||
bool ok = false;
|
||||
char output[256], val[5];
|
||||
if (source == QString("gpu")) {
|
||||
key = QString("GPU");
|
||||
if (gpuDev == QString("nvidia")) {
|
||||
f_out = popen("nvidia-smi -q -d UTILIZATION 2> /dev/null | grep Gpu | tail -n1", "r");
|
||||
fgets (output, 256, f_out);
|
||||
if ((output[0] == '\0') ||
|
||||
(QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 2))
|
||||
value = QString(" N\\A");
|
||||
else {
|
||||
out = QString(output).split(QString(" "), QString::SkipEmptyParts)[2];
|
||||
sprintf (val, "%5.1f", out.left(out.count()-2).toFloat(&ok));
|
||||
value = QString(val);
|
||||
}
|
||||
pclose(f_out);
|
||||
}
|
||||
else if (gpuDev == QString("ati")) {
|
||||
f_out = popen("aticonfig --od-getclocks 2> /dev/null | grep load | tail -n1", "r");
|
||||
fgets (output, 256, f_out);
|
||||
if ((output[0] == '\0') ||
|
||||
(QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 3))
|
||||
value = QString(" N\\A");
|
||||
else {
|
||||
out = QString(output).split(QString(" "), QString::SkipEmptyParts)[3];
|
||||
sprintf (val, "%5.1f", out.left(out.count()-2).toFloat(&ok));
|
||||
value = QString(val);
|
||||
}
|
||||
pclose(f_out);
|
||||
}
|
||||
else {
|
||||
value = QString(" N\\A");
|
||||
}
|
||||
if (ok == false)
|
||||
value = QString(" N\\A");
|
||||
value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
|
||||
setData(source, key, value);
|
||||
}
|
||||
else if (source == QString("gputemp")) {
|
||||
key = QString("GPUTemp");
|
||||
if (gpuDev == QString("nvidia")) {
|
||||
f_out = popen("nvidia-smi -q -d TEMPERATURE 2> /dev/null | grep Gpu | tail -n1", "r");
|
||||
fgets (output, 256, f_out);
|
||||
if ((output[0] == '\0') ||
|
||||
(QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 2))
|
||||
value = QString(" N\\A");
|
||||
else {
|
||||
out = QString(output).split(QString(" "), QString::SkipEmptyParts)[2];
|
||||
sprintf (val, "%4.1f", out.toFloat(&ok));
|
||||
value = QString(val);
|
||||
}
|
||||
pclose(f_out);
|
||||
}
|
||||
else if (gpuDev == QString("ati")) {
|
||||
f_out = popen("aticonfig --od-gettemperature 2> /dev/null | grep Temperature | tail -n1", "r");
|
||||
fgets (output, 256, f_out);
|
||||
if ((output[0] == '\0') ||
|
||||
(QString(output).split(QString(" "), QString::SkipEmptyParts).count() < 4))
|
||||
value = QString(" N\\A");
|
||||
else {
|
||||
out = QString(output).split(QString(" "), QString::SkipEmptyParts)[4];
|
||||
sprintf (val, "%4.1f", out.toFloat(&ok));
|
||||
value = QString(val);
|
||||
}
|
||||
pclose(f_out);
|
||||
}
|
||||
else {
|
||||
value = QString(" N\\A");
|
||||
}
|
||||
if (ok == false)
|
||||
value = QString(" N\\A");
|
||||
value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
|
||||
setData(source, key, value);
|
||||
}
|
||||
else if (source == QString("hddtemp")) {
|
||||
char command[256], *dev;
|
||||
QByteArray qb;
|
||||
for (int i=0; i<hddDev.count(); i++) {
|
||||
qb = hddDev[i].toUtf8();
|
||||
dev = qb.data();
|
||||
sprintf(command, "sudo hddtemp %s 2> /dev/null", dev);
|
||||
f_out = popen(command, "r");
|
||||
fgets(output, 256, f_out);
|
||||
if ((output[0] == '\0') ||
|
||||
(QString(output).split(QString(":"), QString::SkipEmptyParts).count() < 3))
|
||||
value = QString(" N\\A");
|
||||
else {
|
||||
out = QString(output).split(QString(":"), QString::SkipEmptyParts)[2];
|
||||
sprintf (val, "%4.1f", out.left(out.count()-4).toFloat(&ok));
|
||||
value = QString(val);
|
||||
}
|
||||
pclose(f_out);
|
||||
if (ok == false)
|
||||
value = QString(" N\\A");
|
||||
value = value.split(QString(","), QString::SkipEmptyParts).join(QString("."));
|
||||
setData(source, hddDev[i], value);
|
||||
}
|
||||
}
|
||||
else if (source == QString("player")) {
|
||||
QProcess player;
|
||||
QString qoutput;
|
||||
QString value_album, value_artist, value_progress, value_duration, qstr;
|
||||
// qmmp
|
||||
qoutput = QString("");
|
||||
value = QString("N\\A");
|
||||
value_album = QString("N\\A");
|
||||
value_artist = QString("N\\A");
|
||||
value_progress = QString("0");
|
||||
value_duration = QString("0");
|
||||
player.start("qmmp --status");
|
||||
player.waitForFinished(-1);
|
||||
qoutput = player.readAllStandardOutput();
|
||||
for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
|
||||
qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
|
||||
if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ALBUM"))
|
||||
value_album = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("ARTIST"))
|
||||
value_artist = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.at(0) == QChar('[')) {
|
||||
QString time = qstr.split(QString(" "), QString::SkipEmptyParts)[2].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
value_progress = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
|
||||
time.split(QString("/"), QString::SkipEmptyParts)[0].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
|
||||
value_duration = QString::number(time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[0].toInt() * 60 +
|
||||
time.split(QString("/"), QString::SkipEmptyParts)[1].split(QString(":"), QString::SkipEmptyParts)[1].toInt());
|
||||
}
|
||||
else if (qstr.split(QString(" = "), QString::SkipEmptyParts)[0] == QString("TITLE"))
|
||||
value = qstr.split(QString(" = "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
}
|
||||
key = QString("qmmp_album");
|
||||
setData(source, key, value_album);
|
||||
key = QString("qmmp_artist");
|
||||
setData(source, key, value_artist);
|
||||
key = QString("qmmp_progress");
|
||||
setData(source, key, value_progress);
|
||||
key = QString("qmmp_duration");
|
||||
setData(source, key, value_duration);
|
||||
key = QString("qmmp_title");
|
||||
setData(source, key, value);
|
||||
// amarok
|
||||
qoutput = QString("");
|
||||
value = QString("N\\A");
|
||||
value_album = QString("N\\A");
|
||||
value_artist = QString("N\\A");
|
||||
value_progress = QString("0");
|
||||
value_duration = QString("0");
|
||||
player.start("qdbus org.kde.amarok /Player GetMetadata");
|
||||
player.waitForFinished(-1);
|
||||
qoutput = player.readAllStandardOutput();
|
||||
for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
|
||||
qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
|
||||
if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("album"))
|
||||
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("artist"))
|
||||
value_artist = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("time"))
|
||||
value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("title"))
|
||||
value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
}
|
||||
player.start("qdbus org.kde.amarok /Player PositionGet");
|
||||
player.waitForFinished(-1);
|
||||
qoutput = player.readAllStandardOutput();
|
||||
for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
|
||||
qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
|
||||
int time = qstr.toInt() / 1000;
|
||||
value_progress = QString::number(time);
|
||||
}
|
||||
key = QString("amarok_album");
|
||||
setData(source, key, value_album);
|
||||
key = QString("amarok_artist");
|
||||
setData(source, key, value_artist);
|
||||
key = QString("amarok_progress");
|
||||
setData(source, key, value_progress);
|
||||
key = QString("amarok_duration");
|
||||
setData(source, key, value_duration);
|
||||
key = QString("amarok_title");
|
||||
setData(source, key, value);
|
||||
// mpd
|
||||
value = QString("N\\A");
|
||||
value_album = QString("N\\A");
|
||||
value_artist = QString("N\\A");
|
||||
value_progress = QString("0");
|
||||
value_duration = QString("0");
|
||||
char commandStr[512];
|
||||
sprintf (commandStr, "echo 'currentsong\nclose' | curl --connect-timeout 1 -fsm 3 telnet://%s:%s 2> /dev/null", \
|
||||
mpdAddress.toUtf8().data(), mpdPort.toUtf8().data());
|
||||
qoutput = QString("");
|
||||
player.start(QString(commandStr));
|
||||
player.waitForFinished(-1);
|
||||
qoutput = player.readAllStandardOutput();
|
||||
for (int i=0; i<qoutput.split(QString("\n"), QString::SkipEmptyParts).count(); i++) {
|
||||
qstr = qoutput.split(QString("\n"), QString::SkipEmptyParts)[i];
|
||||
if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Album"))
|
||||
value_album = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Artist"))
|
||||
value_artist = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Time"))
|
||||
value_duration = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
else if (qstr.split(QString(": "), QString::SkipEmptyParts)[0] == QString("Title"))
|
||||
value = qstr.split(QString(": "), QString::SkipEmptyParts)[1].split(QString("\n"), QString::SkipEmptyParts)[0];
|
||||
}
|
||||
key = QString("mpd_album");
|
||||
setData(source, key, value_album);
|
||||
key = QString("mpd_artist");
|
||||
setData(source, key, value_artist);
|
||||
key = QString("mpd_progress");
|
||||
setData(source, key, value_progress);
|
||||
key = QString("mpd_duration");
|
||||
setData(source, key, value_duration);
|
||||
key = QString("mpd_title");
|
||||
setData(source, key, value);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
K_EXPORT_PLASMA_DATAENGINE(extsysmon, ExtendedSysMon)
|
||||
|
||||
#include "extsysmon.moc"
|
@ -1,45 +0,0 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2013 by Evgeniy Alekseev <esalekseev@gmail.com> *
|
||||
* *
|
||||
* 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 *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program 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 this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef EXTSYSMON_H
|
||||
#define EXTSYSMON_H
|
||||
|
||||
#include <Plasma/DataEngine>
|
||||
|
||||
class ExtendedSysMon : public Plasma::DataEngine
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ExtendedSysMon(QObject *parent, const QVariantList &args);
|
||||
|
||||
protected:
|
||||
bool sourceRequestEvent(const QString &name);
|
||||
bool updateSourceEvent(const QString &source);
|
||||
bool readConfiguration();
|
||||
QStringList sources() const;
|
||||
// main configuration
|
||||
QStringList hddDev;
|
||||
QString gpuDev;
|
||||
// configuration
|
||||
QString mpdAddress;
|
||||
QString mpdPort;
|
||||
};
|
||||
|
||||
#endif // EXTSYSMON_H
|
@ -1,20 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Extended SystemMonitor DataEngine
|
||||
Comment=Adds gpu, gputemp and hddtemp to DataEngine
|
||||
ServiceTypes=Plasma/DataEngine
|
||||
Type=Service
|
||||
Icon=utilities-system-monitor
|
||||
|
||||
X-KDE-ServiceTypes=Plasma/DataEngine
|
||||
X-KDE-Library=plasma_engine_extsysmon
|
||||
X-Plasma-EngineName=ext-sysmon
|
||||
|
||||
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
|
||||
X-KDE-PluginInfo-Email=esalexeev@gmail.com
|
||||
X-KDE-PluginInfo-Name=ext-sysmon
|
||||
X-KDE-PluginInfo-Version=1.6
|
||||
X-KDE-PluginInfo-Category=System Information
|
||||
X-KDE-PluginInfo-Depends=
|
||||
X-KDE-PluginInfo-License=GPL
|
||||
X-KDE-PluginInfo-EnabledByDefault=true
|
@ -1,28 +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
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
plasmapkg -t dataengine -i ext-sysmon-1.0.zip
|
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.2
|
||||
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=('df3ad1c626fdc1893f0f6e0b0fe636c2')
|
||||
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
|
33
patches/qt5.5-qstringlist-and-qinfo.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff --git a/sources/awdebug.h b/sources/awdebug.h
|
||||
index 8447c65..4eef49a 100644
|
||||
--- a/sources/awdebug.h
|
||||
+++ b/sources/awdebug.h
|
||||
@@ -23,10 +23,15 @@
|
||||
|
||||
#include "version.h"
|
||||
|
||||
+#ifndef qCInfo
|
||||
+#define qCInfo qCDebug
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
namespace AWDebug
|
||||
{
|
||||
const char LOG_FORMAT[] = "[%{time "
|
||||
- "process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
|
||||
+ "process}][%{if-debug}DD%{endif}%"
|
||||
"{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
|
||||
"fatal}FF%{endif}][%{category}][%{function}] "
|
||||
"%{message}";
|
||||
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
|
||||
index d6d5d1a..ee301df 100644
|
||||
--- a/sources/awesome-widget/plugin/awkeysaggregator.h
|
||||
+++ b/sources/awesome-widget/plugin/awkeysaggregator.h
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
+#include <QStringList>
|
||||
|
||||
|
||||
class AWFormatterHelper;
|
139
patches/qt5.6-qversionnumber.patch
Normal file
@ -0,0 +1,139 @@
|
||||
diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
|
||||
index f6b5338..b5a3163 100644
|
||||
--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
|
||||
+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
|
||||
@@ -35,7 +35,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
|
||||
{
|
||||
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||
|
||||
- m_foundVersion = QVersionNumber::fromString(VERSION);
|
||||
+ m_foundVersion = VERSION;
|
||||
m_genericConfig = QString("%1/awesomewidgets/general.ini")
|
||||
.arg(QStandardPaths::writableLocation(
|
||||
QStandardPaths::GenericDataLocation));
|
||||
@@ -67,8 +67,7 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
|
||||
bool AWUpdateHelper::checkVersion()
|
||||
{
|
||||
QSettings settings(m_genericConfig, QSettings::IniFormat);
|
||||
- QVersionNumber version = QVersionNumber::fromString(
|
||||
- settings.value("Version", QString(VERSION)).toString());
|
||||
+ QString version = settings.value("Version", VERSION).toString();
|
||||
// update version
|
||||
settings.setValue("Version", QString(VERSION));
|
||||
settings.sync();
|
||||
@@ -91,12 +90,11 @@ bool AWUpdateHelper::checkVersion()
|
||||
}
|
||||
|
||||
|
||||
-void AWUpdateHelper::showInfo(const QVersionNumber &_version)
|
||||
+void AWUpdateHelper::showInfo(const QString &_version)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Version" << _version;
|
||||
|
||||
- QString text
|
||||
- = i18n("You are using the actual version %1", _version.toString());
|
||||
+ QString text = i18n("You are using the actual version %1", _version);
|
||||
if (!QString(COMMIT_SHA).isEmpty())
|
||||
text += QString(" (%1)").arg(QString(COMMIT_SHA));
|
||||
return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
|
||||
@@ -104,7 +102,7 @@ void AWUpdateHelper::showInfo(const QVersionNumber &_version)
|
||||
}
|
||||
|
||||
|
||||
-void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
|
||||
+void AWUpdateHelper::showUpdates(const QString &_version)
|
||||
{
|
||||
qCDebug(LOG_AW) << "Version" << _version;
|
||||
|
||||
@@ -113,7 +111,7 @@ void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
|
||||
text += QString(COMMIT_SHA).isEmpty()
|
||||
? "\n"
|
||||
: QString(" (%1)\n").arg(QString(COMMIT_SHA));
|
||||
- text += i18n("New version : %1", _version.toString()) + "\n\n";
|
||||
+ text += i18n("New version : %1", _version) + "\n\n";
|
||||
text += i18n("Click \"Ok\" to download");
|
||||
|
||||
genMessageBox(i18n("There are updates"), text,
|
||||
@@ -130,8 +128,7 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
|
||||
|
||||
switch (ret) {
|
||||
case QMessageBox::AcceptRole:
|
||||
- QDesktopServices::openUrl(QString(RELEASES)
|
||||
- + m_foundVersion.toString());
|
||||
+ QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion);
|
||||
break;
|
||||
case QMessageBox::RejectRole:
|
||||
default:
|
||||
@@ -162,14 +159,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
|
||||
QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
|
||||
QString version = firstRelease["tag_name"].toString();
|
||||
version.remove("V.");
|
||||
- m_foundVersion = QVersionNumber::fromString(version);
|
||||
+ m_foundVersion = version;
|
||||
qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
|
||||
|
||||
- QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
|
||||
- if (oldVersion < m_foundVersion)
|
||||
- return showUpdates(m_foundVersion);
|
||||
+ // FIXME: possible there is a better way to check versions
|
||||
+ int old_major = QString(VERSION).split(QChar('.')).at(0).toInt();
|
||||
+ int old_minor = QString(VERSION).split(QChar('.')).at(1).toInt();
|
||||
+ int old_patch = QString(VERSION).split(QChar('.')).at(2).toInt();
|
||||
+ int new_major = version.split(QChar('.')).at(0).toInt();
|
||||
+ int new_minor = version.split(QChar('.')).at(1).toInt();
|
||||
+ int new_patch = version.split(QChar('.')).at(2).toInt();
|
||||
+ if ((old_major < new_major)
|
||||
+ || ((old_major == new_major) && (old_minor < new_minor))
|
||||
+ || ((old_major == new_major) && (old_minor == new_minor)
|
||||
+ && (old_patch < new_patch)))
|
||||
+ return showUpdates(version);
|
||||
else if (_showAnyway)
|
||||
- return showInfo(m_foundVersion);
|
||||
+ return showInfo(version);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h
|
||||
index cfd26e7..b311be2 100644
|
||||
--- a/sources/awesome-widget/plugin/awupdatehelper.h
|
||||
+++ b/sources/awesome-widget/plugin/awupdatehelper.h
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QObject>
|
||||
-#include <QVersionNumber>
|
||||
|
||||
|
||||
class QNetworkReply;
|
||||
@@ -37,15 +36,15 @@ public:
|
||||
bool checkVersion();
|
||||
|
||||
private slots:
|
||||
- void showInfo(const QVersionNumber &_version);
|
||||
- void showUpdates(const QVersionNumber &_version);
|
||||
+ void showInfo(const QString &_version);
|
||||
+ void showUpdates(const QString &_version);
|
||||
void userReplyOnUpdates(QAbstractButton *_button);
|
||||
void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway);
|
||||
|
||||
private:
|
||||
QMessageBox *genMessageBox(const QString &_title, const QString &_body,
|
||||
const QMessageBox::StandardButtons _buttons);
|
||||
- QVersionNumber m_foundVersion;
|
||||
+ QString m_foundVersion;
|
||||
QString m_genericConfig;
|
||||
};
|
||||
|
||||
diff --git a/sources/libraries.cmake b/sources/libraries.cmake
|
||||
index 6f171a6..004b39f 100644
|
||||
--- a/sources/libraries.cmake
|
||||
+++ b/sources/libraries.cmake
|
||||
@@ -2,7 +2,7 @@
|
||||
find_package(Gettext REQUIRED)
|
||||
|
||||
# main qt libraries
|
||||
-find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
|
||||
+find_package(Qt5 5.5.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
|
||||
add_definitions(
|
||||
${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
|
||||
${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
|
Before Width: | Height: | Size: 175 KiB |
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 |
BIN
screenshots/dataengine.png
Normal file
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: 9.4 KiB After Width: | Height: | Size: 3.6 KiB |
BIN
screenshots/panel_01.png
Normal file
After Width: | Height: | Size: 8.5 KiB |
BIN
screenshots/panel_02.png
Normal file
After Width: | Height: | Size: 8.4 KiB |
BIN
screenshots/panel_03.png
Normal file
After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 2.5 KiB |
BIN
screenshots/tooltips.png
Normal file
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();
|
||||
};
|
76
sources/CMakeLists.txt
Normal file
@ -0,0 +1,76 @@
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
# 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 ()
|
||||
|
||||
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 "2")
|
||||
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.2
|
||||
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__;
|
||||
}
|