Compare commits
670 Commits
Author | SHA1 | Date | |
---|---|---|---|
8f6d9e7ab5 | |||
22dcebe647 | |||
6e087f418f | |||
b76cbb8ce3 | |||
24ad32b6ca | |||
51b7d3aa09 | |||
3674fba669 | |||
f1116d1f83 | |||
bcf757477b | |||
1864dc71d5 | |||
90c33ab24d | |||
052d8a034c | |||
064cd7e44f | |||
9e59b22c32 | |||
89f6661fa5 | |||
7836fbf77f | |||
d90d9e2c6f | |||
927e93b7fc | |||
fbf89f61b4 | |||
4adf457ada | |||
0d4211b2c4 | |||
085eec7a3d | |||
baf5085506 | |||
17a0c61b4a | |||
3497922928 | |||
2f88c7ae60 | |||
8e8ac2f3c7 | |||
5cd5272f10 | |||
bee8e2f180 | |||
bf16e72e1e | |||
faf259e339 | |||
f6a6704fd2 | |||
4a0da3f978 | |||
71ae832bcd | |||
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 | |||
4bcdb3a7ff | |||
5ad0c533f0 | |||
d57e54b714 | |||
13f2d560d0 | |||
2220ad6bfe | |||
97f2e78308 | |||
3771ce6ec2 | |||
46db3fee4c | |||
a339f9a743 | |||
4e52d16f1a | |||
097b63415e | |||
77388deab6 | |||
d01d8f95e5 | |||
22586811de | |||
82dda14260 | |||
f8e9945bc4 | |||
139554578c | |||
1827f641f9 | |||
aef1a736c8 | |||
27a80274ac | |||
0e3f83f361 | |||
d30df9dafc | |||
f7a6b86cae | |||
a3e7a84b92 | |||
354fd3cd0c | |||
15abe54290 | |||
60cbc40e9f | |||
bfa4f9e98e | |||
e9146b3b6c | |||
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 | |||
89d573450a | |||
50f3ef5bba | |||
8cae273ffb | |||
15d4d7667d | |||
95a5eec108 | |||
362f1fd87e | |||
5c474e822b | |||
d856fa8e97 | |||
54e1545bb1 | |||
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 |
53
.gitignore
vendored
@ -1,4 +1,49 @@
|
|||||||
sources/build
|
# Compiled Object files
|
||||||
sources/usr
|
*.slo
|
||||||
*src.tar.xz
|
*.lo
|
||||||
*src.tar.gz
|
*.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
|
||||||
|
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
|
20
.travis.yml.bckp
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
sudo: required
|
||||||
|
dist: trusty
|
||||||
|
|
||||||
|
language: cpp
|
||||||
|
os:
|
||||||
|
- linux
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- sudo apt-add-repository -y ppa:kubuntu-ppa/backports
|
||||||
|
- sudo sed -i 's/trusty/wily/g' /etc/apt/sources.list
|
||||||
|
- sudo sed -i 's/trusty/wily/g' /etc/apt/sources.list.d/kubuntu-ppa-backports-trusty.list
|
||||||
|
- sudo apt-get -qq update
|
||||||
|
- sudo apt-get -y -qq -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew install libkf5i18n-dev libkf5notifications-dev libkf5service-dev libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev extra-cmake-modules cmake g++
|
||||||
|
- rm -rf build
|
||||||
|
- mkdir build
|
||||||
|
|
||||||
|
script:
|
||||||
|
- cd build
|
||||||
|
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../sources
|
||||||
|
- make
|
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
|
10
AUTHORS
@ -1,5 +1,13 @@
|
|||||||
Current developers:
|
Current developers:
|
||||||
Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
|
Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
|
||||||
|
|
||||||
|
Packagers:
|
||||||
|
Konstantin Voinov (openSuSe)
|
||||||
|
|
||||||
Translators:
|
Translators:
|
||||||
@Mermouy (french translations)
|
@Mermouy (French)
|
||||||
|
Ernesto Avilés Vzqz (Spanish)
|
||||||
|
@underr (Brazillian Portuguese)
|
||||||
|
Виктор Слободян (Ukrainian)
|
||||||
|
Steve Lemuel (Chinese)
|
||||||
|
Mariusz Kocoń (Polish)
|
||||||
|
429
CHANGELOG
@ -1,20 +1,345 @@
|
|||||||
|
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:
|
Ver.1.8.0:
|
||||||
+ added scrollbar to configuration interface
|
+ add scrollbar to configuration interface
|
||||||
+ added AC lines configuration
|
+ add AC lines configuration
|
||||||
+ added $hddmbN, %hddgbN tags
|
+ add $hddmbN, $hddgbN tags
|
||||||
+ added support of ps ($ps, $pscount, $pstotal tags)
|
+ add support of ps ($ps, $pscount, $pstotal tags)
|
||||||
+ added support of package managers ($pkgcountN tags)
|
+ add support of package managers ($pkgcountN tags)
|
||||||
* refactoring of DataEngine
|
* refactoring of DataEngine
|
||||||
|
|
||||||
Ver.1.7.4:
|
Ver.1.7.4:
|
||||||
+ added support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels
|
+ add support more than 10 tags in cpu, cpuclock, hdd, hddtemp, temp labels
|
||||||
- format bug fixes
|
- format bug fixes
|
||||||
* changes in custom uptime format
|
* changes in custom uptime format
|
||||||
|
|
||||||
Ver.1.7.3:
|
Ver.1.7.3:
|
||||||
+ added tags $memgb, $swapgb
|
+ add tags $memgb, $swapgb
|
||||||
+ added readme directory
|
+ add readme directory
|
||||||
+ added french translation (@Mermouy)
|
+ add french translation (@Mermouy)
|
||||||
- fix tooltip for custom uptime format
|
- fix tooltip for custom uptime format
|
||||||
- fix #12
|
- fix #12
|
||||||
* more refactoring to the god of refactoring
|
* more refactoring to the god of refactoring
|
||||||
@ -23,108 +348,108 @@ Ver.1.7.3:
|
|||||||
* player_name now has str type
|
* player_name now has str type
|
||||||
|
|
||||||
Ver.1.7.2:
|
Ver.1.7.2:
|
||||||
+ added tags $dd, $d, $hh, $h, $mm, $m to custom uptime format
|
+ add tags $dd, $d, $hh, $h, $mm, $m to custom uptime format
|
||||||
+ added scalling to tooltips
|
+ add scalling to tooltips
|
||||||
+ added dataengine configuration from ptm
|
+ add DataEngine configuration from ptm
|
||||||
+ added custom command to dataengine
|
+ add custom command to DataEngine
|
||||||
- removed custom command from ptm
|
- remove custom command from ptm
|
||||||
- removed tags $ds, $hs, $ms
|
- remove tags $ds, $hs, $ms
|
||||||
|
|
||||||
Ver.1.7.1:
|
Ver.1.7.1:
|
||||||
- removed error label
|
- remove error label
|
||||||
* fix bug with zero values in tooltip
|
* fix bug with zero values in tooltip
|
||||||
|
|
||||||
Ver.1.7.0:
|
Ver.1.7.0:
|
||||||
+ added support of several tags in temperature label
|
+ add support of several tags in temperature label
|
||||||
+ added tags $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
|
+ add tags $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
|
||||||
+ added label with custom command
|
+ add label with custom command
|
||||||
+ added tooltips for CPU, CPU clock, memory, swap and network labels
|
+ add tooltips for CPU, CPU clock, memory, swap and network labels
|
||||||
- removed tags @@...@@, $temp, $ccpu, $ccpucl, $net
|
- remove tags @@...@@, $temp, $ccpu, $ccpucl, $net
|
||||||
* changes in settings
|
* changes in settings
|
||||||
* ptm now does not require net-tools
|
* ptm now does not require net-tools
|
||||||
* refactoring
|
* refactoring
|
||||||
|
|
||||||
Ver.1.6.1:
|
Ver.1.6.1:
|
||||||
+ added support of several devices in hddtemp label
|
+ add support of several devices in hddtemp label
|
||||||
- fixed #6
|
- fixed #6
|
||||||
|
|
||||||
Ver.1.6.0:
|
Ver.1.6.0:
|
||||||
+ added $custom tag to time and uptime labels (#8)
|
+ add $custom tag to time and uptime labels (#8)
|
||||||
+ russian translation
|
+ russian translation
|
||||||
- fixed #6, #10
|
- fix #6, #10
|
||||||
* changed license to GPLv3
|
* change license to GPLv3
|
||||||
* changed project build
|
* change project build
|
||||||
|
|
||||||
Ver.1.5.3:
|
Ver.1.5.3:
|
||||||
+ added $album, $progress and $time tags to player label (#7)
|
+ add $album, $progress and $time tags to player label (#7)
|
||||||
- fixed zero swap
|
- fix zero swap
|
||||||
|
|
||||||
Ver.1.5.2:
|
Ver.1.5.2:
|
||||||
+ added $isotime, $shorttime and $longtime tags to time label
|
+ add $isotime, $shorttime and $longtime tags to time label
|
||||||
|
|
||||||
Ver.1.5.1:
|
Ver.1.5.1:
|
||||||
+ added time label
|
+ add time label
|
||||||
|
|
||||||
Ver.1.5.0:
|
Ver.1.5.0:
|
||||||
+ added player label
|
+ add player label
|
||||||
|
|
||||||
Ver.1.4.0:
|
Ver.1.4.0:
|
||||||
+ added notifications
|
+ add notifications
|
||||||
|
|
||||||
Ver.1.3.6:
|
Ver.1.3.6:
|
||||||
- fixed #1, #2
|
- fix #1, #2
|
||||||
|
|
||||||
Ver.1.3.5:
|
Ver.1.3.5:
|
||||||
- fix bug with definition network device
|
- fix bug with definition network device
|
||||||
|
|
||||||
Ver.1.3.4:
|
Ver.1.3.4:
|
||||||
+ added double click event
|
+ add double click event
|
||||||
+ added auto selection of network device
|
+ add auto selection of network device
|
||||||
- fixed yet another plasma crash
|
- fix yet another plasma crash
|
||||||
|
|
||||||
Ver.1.3.3:
|
Ver.1.3.3:
|
||||||
* edited reading temperature device
|
* edit reading temperature device
|
||||||
|
|
||||||
Ver.1.3.2b:
|
Ver.1.3.2b:
|
||||||
- fixed plasma crash
|
- fix plasma crash
|
||||||
|
|
||||||
Ver.1.3.2:
|
Ver.1.3.2:
|
||||||
+ added GPU, GPU temperature, HDD and HDD temperature labels
|
+ add GPU, GPU temperature, HDD and HDD temperature labels
|
||||||
+ added $ccpu and $ccpucl tags
|
+ add $ccpu and $ccpucl tags
|
||||||
- bug fixes
|
- bug fixes
|
||||||
* optimization and refactoring
|
* optimization and refactoring
|
||||||
|
|
||||||
Ver.1.2.2:
|
Ver.1.2.2:
|
||||||
+ added tooltip to lineEdit
|
+ add tooltip to lineEdit
|
||||||
|
|
||||||
Ver.1.2.1:
|
Ver.1.2.1:
|
||||||
* if battery doesn't exist return 'off'
|
* if battery doesn't exist return 'off'
|
||||||
* if AC doesn't exist return '(?)'
|
* if AC doesn't exist return '(?)'
|
||||||
|
|
||||||
Ver.1.2.0:
|
Ver.1.2.0:
|
||||||
+ added $ac tag to battery label
|
+ add $ac tag to battery label
|
||||||
+ added battery and ac device configurations
|
+ add battery and ac device configurations
|
||||||
+ added error cheking
|
+ add error cheking
|
||||||
* $bat tag now reading from /sys/*
|
* $bat tag now reading from /sys/*
|
||||||
|
|
||||||
Ver.1.1.4:
|
Ver.1.1.4:
|
||||||
* changed parsing acpi output (battery label)
|
* change parsing acpi output (battery label)
|
||||||
|
|
||||||
Ver.1.1.3:
|
Ver.1.1.3:
|
||||||
+ added font weight
|
+ add font weight
|
||||||
* edited font setup line. Now setup for font family works normaly
|
* edit font setup line. Now setup for font family works normaly
|
||||||
* small bug fix
|
* small bug fix
|
||||||
|
|
||||||
Ver.1.1.2:
|
Ver.1.1.2:
|
||||||
+ added CPU clock lable
|
+ add CPU clock lable
|
||||||
+ added function to update network device (100*time_interval)
|
+ add function to update network device (100*time_interval)
|
||||||
+ changed update sliders
|
+ change update sliders
|
||||||
|
|
||||||
Ver.1.1.1:
|
Ver.1.1.1:
|
||||||
+ added $swapmb, $memmb, $netdev, @@netdev=...@@ tags
|
+ add $swapmb, $memmb, $netdev, @@netdev=...@@ tags
|
||||||
- some bug fixes
|
- some bug fixes
|
||||||
* widget consists of several labels
|
* widget consists of several labels
|
||||||
* edited configuration interface
|
* edit configuration interface
|
||||||
|
|
||||||
Ver.1.0:
|
Ver.1.0:
|
||||||
First release
|
First release
|
||||||
|
130
CHANGELOG-RU
@ -1,130 +0,0 @@
|
|||||||
Вер.1.8.0:
|
|
||||||
+ добавлены скроллбары в конфигурационный интерфейс
|
|
||||||
+ добавлена настройка значений AC
|
|
||||||
+ добавлены теги $hddmbN, $hddgbN
|
|
||||||
+ добавлена поддержка ps (теги $ps, $pscount, $pstotal)
|
|
||||||
+ добавлена поддержка пакетных менеджеров (теги $pkgcountN)
|
|
||||||
* рефакторинг DataEngine
|
|
||||||
|
|
||||||
Вер.1.7.4:
|
|
||||||
+ добавлена поддержка более чем 10 тэгов в полях cpu, cpuclock, hdd, hddtemp, temp
|
|
||||||
- фиксы в форматах
|
|
||||||
* изменения в кастомном формате аптайма
|
|
||||||
|
|
||||||
Вер.1.7.3:
|
|
||||||
+ добавлены тэги $memgb, $swapgb
|
|
||||||
+ добавлена директория readme
|
|
||||||
+ добавлен французский перевод (@Mermouy)
|
|
||||||
- фикс подсказки для кастомного формата аптайма
|
|
||||||
- фикс #12
|
|
||||||
* больше рефакторинга богу рефакторинга
|
|
||||||
* интервал обновления сетевого интерфейса теперь 30*interval
|
|
||||||
* тэги $swap, $swapmb и $swapgb теперь работают одновременно (тэги $mem* тоже)
|
|
||||||
* player_name теперь имеет тип str
|
|
||||||
|
|
||||||
Вер.1.7.2:
|
|
||||||
+ добавлены тэги $dd, $d, $hh, $h, $mm, $m в кастомный формат аптайма
|
|
||||||
+ добавлено масштабирование в тултипы
|
|
||||||
+ добавлена конфигурация DE из виджета
|
|
||||||
+ добавлена кастомная команда в DE
|
|
||||||
- удалена кастомная команда из виджета
|
|
||||||
- удалены тэги $ds, $hs, $ms
|
|
||||||
|
|
||||||
Вер.1.7.1:
|
|
||||||
- удалено поле с ошибкой
|
|
||||||
* пофикшен баг с нулевым значением в тултипе
|
|
||||||
|
|
||||||
Вер.1.7.0:
|
|
||||||
+ добавлена поддержка нескольких тэгов в поле температуры
|
|
||||||
+ добавлены тэги $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
|
|
||||||
+ добавлено поле с кастомной командой
|
|
||||||
+ добавлены тултипы для полей CPU, частоты CPU, памяти, swap и сеть
|
|
||||||
- удалены тэги @@...@@, $temp, $ccpu, $ccpucl, $net
|
|
||||||
* изменения в настройках
|
|
||||||
* виджет не требует больше net-tools
|
|
||||||
* рефакторинг
|
|
||||||
|
|
||||||
Вер.1.6.1:
|
|
||||||
+ добавлена поддержка нескольких девайсов в поле hddtemp
|
|
||||||
- фикс #6
|
|
||||||
|
|
||||||
Вер.1.6.0:
|
|
||||||
+ добавлен тэг $custom в поля time и uptime (#8)
|
|
||||||
+ русский перевод
|
|
||||||
- фикс #6, #10
|
|
||||||
* лицензия изменена на GPLv3
|
|
||||||
* изменения в сборке проекта
|
|
||||||
|
|
||||||
Вер.1.5.3:
|
|
||||||
+ добавлены тэги $album, $progress и $time tags в поле плеера (#7)
|
|
||||||
- фикс бага с нулевым свопом
|
|
||||||
|
|
||||||
Вер.1.5.2:
|
|
||||||
+ добавлены тэги $isotime, $shorttime и $longtime в поле time
|
|
||||||
|
|
||||||
Вер.1.5.1:
|
|
||||||
+ добавлено поле time
|
|
||||||
|
|
||||||
Вер.1.5.0:
|
|
||||||
+ добавлено поле player
|
|
||||||
|
|
||||||
Вер.1.4.0:
|
|
||||||
+ добавлены уведомления
|
|
||||||
|
|
||||||
Вер.1.3.6:
|
|
||||||
- фикс #1, #2
|
|
||||||
|
|
||||||
Вер.1.3.5:
|
|
||||||
- фикс бага с определением сетевого устройства
|
|
||||||
|
|
||||||
Вер.1.3.4:
|
|
||||||
+ добавлено событие по двойному щелчку
|
|
||||||
+ добавлен автовыбор сетевого устройства
|
|
||||||
- фикс еще одного падения Плазмы
|
|
||||||
|
|
||||||
Вер.1.3.3:
|
|
||||||
* редактирование чтения температурного устройства
|
|
||||||
|
|
||||||
Вер.1.3.2b:
|
|
||||||
- фикс падения Плазмы
|
|
||||||
|
|
||||||
Вер.1.3.2:
|
|
||||||
+ добавлены поля GPU, GPU temp, HDD и HDD temp
|
|
||||||
+ добавлены тэги $ccpu и $ccpucl
|
|
||||||
- фикс некоторых багов
|
|
||||||
* оптимизация и рефакторинг
|
|
||||||
|
|
||||||
Вер.1.2.2:
|
|
||||||
+ добавлен тултип в строки
|
|
||||||
|
|
||||||
Вер.1.2.1:
|
|
||||||
* если батарея не существует, возвращает off
|
|
||||||
* если AC не существует, возвращает '(?)'
|
|
||||||
|
|
||||||
Вер.1.2.0:
|
|
||||||
+ добавлен тэг $ac в поле battery
|
|
||||||
+ добавлена настройка устройств батареи и AC
|
|
||||||
+ добавлена проверка ошибок
|
|
||||||
* тэг $bat теперь читается из /sys/*
|
|
||||||
|
|
||||||
Вер.1.1.4:
|
|
||||||
* изменения в парсинге acpi (поле battery)
|
|
||||||
|
|
||||||
Вер.1.1.3:
|
|
||||||
+ добавлена настройка ширины шрифта
|
|
||||||
- небольшие фиксы
|
|
||||||
* отредактирована настройка шрифта. Теперь настройки для шрифта работают нормально
|
|
||||||
|
|
||||||
Вер.1.1.2:
|
|
||||||
+ добавлено поле CPU clock
|
|
||||||
+ добавлена функция для обновления сетевого интерфейса (100*time_interval)
|
|
||||||
* изменено обновление слайдеров
|
|
||||||
|
|
||||||
Вер.1.1.1:
|
|
||||||
+ добавлены тэги $swapmb, $memmb, $netdev, @@netdev=...@@
|
|
||||||
- небольшие фиксы
|
|
||||||
* виджет теперь состоит из нескольких полей
|
|
||||||
* отредактирован конфигурационный интерфейс
|
|
||||||
|
|
||||||
Вер.1.0:
|
|
||||||
Первый релиз
|
|
241
CONTRIBUTING.md
Normal file
@ -0,0 +1,241 @@
|
|||||||
|
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++11**.
|
||||||
|
* 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. Exception is class constructors, e.g.:
|
||||||
|
|
||||||
|
```
|
||||||
|
char c = 'c';
|
||||||
|
std::string s = "string";
|
||||||
|
qDebug() << QString("some string") << QChar(c) << QString(s);
|
||||||
|
```
|
||||||
|
|
||||||
|
* C-like `NULL`, use `nullptr` instead.
|
||||||
|
* It is highly recommended to avoid implicit casts. Exception `nullptr` casts to
|
||||||
|
boolean, e.g.:
|
||||||
|
|
||||||
|
```
|
||||||
|
if (nullptr)
|
||||||
|
qDebug() << "nullptr is true, wtf";
|
||||||
|
```
|
||||||
|
|
||||||
|
* 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.
|
||||||
|
|
||||||
|
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`.
|
||||||
|
* It is recommended to create addition test if possible.
|
||||||
|
* Addition test functions should be declated and used only inside `BUILD_TESTING`
|
||||||
|
definition.
|
||||||
|
|
||||||
|
Tools
|
||||||
|
-----
|
||||||
|
|
||||||
|
* For QString concatenation use `QString::arg` method.
|
||||||
|
* Any source file should have license header:
|
||||||
|
|
||||||
|
```
|
||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
```
|
||||||
|
|
||||||
|
* Recommended class constructor for QObject based classes:
|
||||||
|
|
||||||
|
```
|
||||||
|
FooClass::FooClass(QObject *parent, const QVariant var)
|
||||||
|
: QObject(parent)
|
||||||
|
, m_var(var)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
// some code below if any
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
* Property usage:
|
||||||
|
|
||||||
|
```
|
||||||
|
Q_PROPERTY(bool prop READ prop WRITE setProp);
|
||||||
|
public:
|
||||||
|
bool prop() const
|
||||||
|
{
|
||||||
|
return m_prop;
|
||||||
|
};
|
||||||
|
void setProp(const bool _prop)
|
||||||
|
{
|
||||||
|
// error checking if required
|
||||||
|
m_prop = _prop
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
// declare with default value
|
||||||
|
bool m_prop = false;
|
||||||
|
```
|
||||||
|
* Use `cppcheck` to avoid common errors in the code. To start application just
|
||||||
|
run `make cppcheck`.
|
||||||
|
* Use `clang-format` to apply valid code format. To start application just run
|
||||||
|
`make clangformat`.
|
8
COPYING
@ -1,4 +1,4 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
Version 3, 29 June 2007
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
|
|||||||
state the exclusion of warranty; and each file should have at least
|
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.
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
pytextmonitor
|
{one line to give the program's name and a brief idea of what it does.}
|
||||||
Copyright (C) 2013-2014 Evgeniy Alekseev
|
Copyright (C) {year} {name of author}
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
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
|
it under the terms of the GNU General Public License as published by
|
||||||
@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
|
|||||||
If the program does terminal interaction, make it output a short
|
If the program does terminal interaction, make it output a short
|
||||||
notice like this when it starts in an interactive mode:
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
pytextmonitor Copyright (C) 2013 Evgeniy Alekseev
|
{project} Copyright (C) {year} {fullname}
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
This is free software, and you are welcome to redistribute it
|
This is free software, and you are welcome to redistribute it
|
||||||
under certain conditions; type `show c' for details.
|
under certain conditions; type `show c' for details.
|
||||||
|
42
PKGBUILD
@ -1,42 +0,0 @@
|
|||||||
# Maintainer: Evgeniy "arcanis" Alexeev <arcanis.arch at gmail dot com>
|
|
||||||
|
|
||||||
pkgname=kdeplasma-applets-pytextmonitor
|
|
||||||
_pkgname=pytextmonitor
|
|
||||||
pkgver=1.8.0
|
|
||||||
pkgrel=1
|
|
||||||
pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in Awesome WM"
|
|
||||||
arch=('i686' 'x86_64')
|
|
||||||
url="http://arcanis.name/projects/pytextmonitor"
|
|
||||||
license=('GPLv3')
|
|
||||||
depends=('kdebase-workspace' 'kdebindings-python2' 'lm_sensors')
|
|
||||||
optdepends=("amarok: for music player monitor"
|
|
||||||
"catalyst: for GPU monitor"
|
|
||||||
"hddtemp: for HDD temperature monitor"
|
|
||||||
"mpd: for music player monitor"
|
|
||||||
"net-tools: for popup messages"
|
|
||||||
"nvidia-utils: for GPU monitor"
|
|
||||||
"qmmp: for music player monitor"
|
|
||||||
"sysstat: for popup messages")
|
|
||||||
makedepends=('automoc4' 'cmake')
|
|
||||||
source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
|
|
||||||
install=${pkgname}.install
|
|
||||||
md5sums=('9052985dc219e75ffbed88ce3ebf5a32')
|
|
||||||
backup=('usr/share/config/extsysmon.conf')
|
|
||||||
|
|
||||||
prepare() {
|
|
||||||
[[ -d ${srcdir}/build ]] && rm -rf "${srcdir}/build"
|
|
||||||
mkdir "${srcdir}/build"
|
|
||||||
}
|
|
||||||
|
|
||||||
build () {
|
|
||||||
cd "${srcdir}/build"
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) \
|
|
||||||
"../${_pkgname}"
|
|
||||||
make
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
cd "${srcdir}/build"
|
|
||||||
make DESTDIR="${pkgdir}" install
|
|
||||||
}
|
|
212
README.md
@ -1,216 +1,78 @@
|
|||||||
pytextmonitor
|
awesome-widgets (ex-pytextmonitor)
|
||||||
=============
|
==================================
|
||||||
|
|
||||||
|
[](https://travis-ci.org/arcan1s/awesome-widgets)
|
||||||
|
[](https://scan.coverity.com/projects/awesome-widgets)
|
||||||
|
|
||||||
Information
|
Information
|
||||||
-----------
|
-----------
|
||||||
PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm.
|
|
||||||
|
|
||||||
**NOTE** LOOKING FOR TRANSLATORS!
|
A collection of minimalistic widgets which looks like Awesome Window Manager widgets.
|
||||||
|
|
||||||
Configuration
|
**NOTE** [LOOKING FOR TRANSLATORS!](https://github.com/arcan1s/awesome-widgets/issues/14)
|
||||||
-------------
|
|
||||||
For edited output you must open Settings window and setup output format in lines:
|
|
||||||
* tag `$time` - time in default format. For example, *fri Nov 6 04:48:01 2013*
|
|
||||||
* tag `$isotime` - time in iso format
|
|
||||||
* tag `$shorttime` - time in short locale format
|
|
||||||
* tag `$longtime` - time in long locale format
|
|
||||||
* tag `$custom` - custom time format
|
|
||||||
* tag `$uptime` - uptime, *---d--h--m*
|
|
||||||
* tag `$custom` - custom uptime format
|
|
||||||
* tag `$cpu` - total load cpu, *%*
|
|
||||||
* tag `$cpuN` - load CPU for core N, *%*
|
|
||||||
* tag `$cpucl` - average cpu clock, *MHz*
|
|
||||||
* tag `$cpuclN` - cpu clock for core N, *MHz*
|
|
||||||
* tag `$tempN` - temperature for device N. For example, `$temp0`
|
|
||||||
* tag `$gpu` - GPU usage, *%*. `aticonfig` or `nvidia-smi` must be installed
|
|
||||||
* tag `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
|
|
||||||
* tag `$mem` - usage memory, *%*
|
|
||||||
* tag `$memmb` - usage memory, *MB*
|
|
||||||
* tag `$memgb` - usage memory, *GB*
|
|
||||||
* tag `$swap` - swap, *%*
|
|
||||||
* tag `$swapmb` - swap, *MB*
|
|
||||||
* tag `$swapgb` - swap, *GB*
|
|
||||||
* tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0`
|
|
||||||
* tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
|
|
||||||
* tag `$down` - download speed, *KB/s*
|
|
||||||
* tag `$up` - upload speed, *KB/s*
|
|
||||||
* tag `$netdev` - current network device
|
|
||||||
* tag `$bat` - battery charge, *%*
|
|
||||||
* tag `$ac` - status AC device. Return (\*) if AC device is online or *( )* if offline
|
|
||||||
* tag `$album` - current song album. One of supported music players must be installed
|
|
||||||
* tag `$artist` - current song artist. One of supported music players must be installed
|
|
||||||
* tag `$progress` - current song progress. One of supported music players must be installed
|
|
||||||
* tag `$time` - current song duration. One of supported music players must be installed
|
|
||||||
* tag `$title` - current song title. One of supported music players must be installed
|
|
||||||
* tag `$pscount` - number of running processes
|
|
||||||
* tag `$pstotal` - total number of processes
|
|
||||||
* tag `$ps` - list of running processes
|
|
||||||
* tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0`
|
|
||||||
* tag `$custom` - returns output for custom command
|
|
||||||
|
|
||||||
Label order will changed if you change slider position. HTML tags in label work normally.
|
Features
|
||||||
|
========
|
||||||
|
|
||||||
**NOTE** you don't may set to show `$cpu` tag in swap label for example. **`$cpu` will work only in cpu label**.
|
* easy and fully configurable native Plasma widget which may be used as Conky widget or as Awesome-like information panel
|
||||||
|
* panel which shows active desktop status
|
||||||
|
* clear Conky-like configuration with html tags support
|
||||||
|
* custom command support (it may be simple action as well as special custom tag)
|
||||||
|
* graphical item support - tooltips, bars
|
||||||
|
|
||||||
Advanced settings
|
See [links](#Links) for more details.
|
||||||
-----------------
|
|
||||||
**Custom time**
|
|
||||||
|
|
||||||
* tag `$dddd` - weekday in long format
|
**Didn't find required feature?** [Just ask for it!](https://github.com/arcan1s/awesome-widgets/issues)
|
||||||
* tag `$ddd` - weekday in short format
|
|
||||||
* tag `$dd` - day
|
|
||||||
* tag `$d` - day without zero
|
|
||||||
* tag `$MMMM` - month in long format
|
|
||||||
* tag `$MMM` - month in short format
|
|
||||||
* tag `$MM` - month
|
|
||||||
* tag `$M` - month without zero
|
|
||||||
* tag `$yyyy` - year
|
|
||||||
* tag `$yy` - year in short format
|
|
||||||
* tag `$hh` - hours
|
|
||||||
* tag `$h` - hours without zero
|
|
||||||
* tag `$mm` - minutes
|
|
||||||
* tag `$m` - minutes without zero
|
|
||||||
* tag `$ss` - seconds
|
|
||||||
* tag `$s` - seconds without zero
|
|
||||||
|
|
||||||
**Custom uptime**
|
|
||||||
|
|
||||||
* tag `$dd` - uptime days
|
|
||||||
* tag `$d` - uptime days without zero
|
|
||||||
* tag `$hh` - uptime hours
|
|
||||||
* tag `$h` - uptime hours without zero
|
|
||||||
* tag `$mm` - uptime minutes
|
|
||||||
* tag `$m` - uptime minutes without zero
|
|
||||||
|
|
||||||
**Temperature devices**
|
|
||||||
|
|
||||||
List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
|
|
||||||
|
|
||||||
**Mount points**
|
|
||||||
|
|
||||||
List of mount points, which will be observed in hdd label (combo box items come from `mount`). List widget is editable, delete key will remove current item.
|
|
||||||
|
|
||||||
**HDD**
|
|
||||||
|
|
||||||
List of hard disk devices, which will be observed in hddtem label (combo box items come from `find`). List widget is editable, delete key will remove current item.
|
|
||||||
|
|
||||||
**Network directory**
|
|
||||||
|
|
||||||
Path to directory, which contains network devices information. Default is `/sys/class/net`. Required for auto select network device.
|
|
||||||
|
|
||||||
**Network device**
|
|
||||||
|
|
||||||
Use specified device as active. Combo box items come from **network directory**. Will disable auto select network device.
|
|
||||||
|
|
||||||
**Battery device**
|
|
||||||
|
|
||||||
File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
|
|
||||||
|
|
||||||
**AC online tag**
|
|
||||||
|
|
||||||
Line which will be shown when AC is online.
|
|
||||||
|
|
||||||
**AC offline tag**
|
|
||||||
|
|
||||||
Line which will be shown when AC is offline.
|
|
||||||
|
|
||||||
**AC device**
|
|
||||||
|
|
||||||
File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
|
|
||||||
|
|
||||||
**Music player**
|
|
||||||
|
|
||||||
Select one of supported music playes for player label.
|
|
||||||
|
|
||||||
Tooltip settings
|
|
||||||
----------------
|
|
||||||
Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
|
|
||||||
|
|
||||||
DataEngine settings
|
|
||||||
-------------------
|
|
||||||
**Custom command**
|
|
||||||
|
|
||||||
*NOTE* This can cause the computer freeze.
|
|
||||||
|
|
||||||
A command, which will be run for custom label.
|
|
||||||
|
|
||||||
**GPU device**
|
|
||||||
|
|
||||||
Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
|
|
||||||
|
|
||||||
**HDD**
|
|
||||||
|
|
||||||
Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`.
|
|
||||||
|
|
||||||
**MPD address**
|
|
||||||
|
|
||||||
Address of MPD server. Default is `localhost`.
|
|
||||||
|
|
||||||
**MPD port**
|
|
||||||
|
|
||||||
Port of MPD server. Default is `6600`.
|
|
||||||
|
|
||||||
**Package manager**
|
|
||||||
|
|
||||||
List of commands, which will be run. Number of null lines is a number of unneeded lines. Defaults:
|
|
||||||
* *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0`
|
|
||||||
* *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0`
|
|
||||||
* *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0`
|
|
||||||
* *Fedora*: `PKGCMD=yum list updates`, `PKGNULL=3`
|
|
||||||
* *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0`
|
|
||||||
* *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0`
|
|
||||||
|
|
||||||
|
|
||||||
DataEngine configuration
|
|
||||||
------------------------
|
|
||||||
You may edit DataEngine configuration. It is `/usr/share/config/extsysmon.conf` or `$HOME/share/config/extsysmon.conf` depending on the type of installation. Uncomment needed line and edit it.
|
|
||||||
|
|
||||||
Instruction
|
Instruction
|
||||||
===========
|
===========
|
||||||
|
|
||||||
Dependencies
|
Dependencies
|
||||||
------------
|
------------
|
||||||
* kdebase-workspace
|
|
||||||
* kdebindings-python2
|
* plasma-framework
|
||||||
* lm_sensors (*for definition temperature device*)
|
|
||||||
* sysstat (*for notification*)
|
|
||||||
|
|
||||||
Optional dependencies
|
Optional dependencies
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
* proprietary video driver
|
* proprietary video driver
|
||||||
* hddtemp (make sure that it may be run with `sudo` without password. Just add following line to `/etc/sudoers`: `$USERNAME ALL=NOPASSWD: /usr/bin/hddtemp`)
|
* hddtemp
|
||||||
* music player (amarok, mpd or qmmp)
|
* smartmontools
|
||||||
|
* music player (mpd or MPRIS supported)
|
||||||
|
|
||||||
Make dependencies
|
Make dependencies
|
||||||
-----------------
|
-----------------
|
||||||
* automoc4
|
|
||||||
* cmake
|
* cmake
|
||||||
* kdebase-runtime
|
* extra-cmake-modules
|
||||||
|
|
||||||
Installation
|
Installation
|
||||||
------------
|
------------
|
||||||
|
|
||||||
* download sources
|
* download sources
|
||||||
* install
|
* install
|
||||||
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` ../
|
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
|
||||||
make && make install
|
|
||||||
|
|
||||||
Also you may install it to `/`:
|
|
||||||
|
|
||||||
mkdir build && cd build
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ../
|
|
||||||
make && sudo make install
|
make && sudo make install
|
||||||
|
|
||||||
|
**NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
|
||||||
|
|
||||||
Additional information
|
Additional information
|
||||||
======================
|
======================
|
||||||
|
|
||||||
TODO (wish list)
|
TODO (wish list)
|
||||||
----------------
|
----------------
|
||||||
|
|
||||||
|
See [milestones](https://github.com/arcan1s/awesome-widgets/milestones) for more details.
|
||||||
|
|
||||||
Links
|
Links
|
||||||
-----
|
-----
|
||||||
* [Homepage](http://arcanis.name/projects/pytextmonitor/)
|
|
||||||
* Plasmoid on [kde-look](http://kde-look.org/content/show.php/Py+Text+Monitor?content=157124)
|
* [Homepage](https://arcanis.me/projects/awesome-widgets/)
|
||||||
|
* [Migration to 2.*](https://arcanis.me/en/2014/09/04/migration-to-v2/)
|
||||||
|
* [Scripts and bars](https://arcanis.me/en/2014/12/19/aw-v21-bells-and-whistles/)
|
||||||
|
* Plasmoid on [kde-look](http://kde-look.org/content/show.php/Awesome+Widgets?content=157124)
|
||||||
* DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
|
* DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
|
||||||
* Archlinux [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-pytextmonitor/) package
|
* Archlinux [AUR](https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/) package
|
||||||
|
* [OpenSuse](http://software.opensuse.org/search?q=awesome-widgets) packages, [KF5 OpenSuse](http://software.opensuse.org/package/plasma5-awesome-widgets) package
|
||||||
|
@ -1,36 +1,32 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# update english readme
|
|
||||||
cp README.md readme/en.md
|
|
||||||
|
|
||||||
SRCDIR="sources"
|
SRCDIR="sources"
|
||||||
VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
|
MAJOR=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
|
||||||
$(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
|
MINOR=$(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
|
||||||
$(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut -c 1)
|
PATCH=$(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
|
||||||
|
VERSION="${MAJOR}.${MINOR}.${PATCH}"
|
||||||
|
|
||||||
# build dataengine
|
# update submodules
|
||||||
ARCHIVE="ext-sysmon"
|
git submodule update --init --recursive
|
||||||
# create archive
|
|
||||||
[[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f ${ARCHIVE}-${VERSION}-src.tar.xz
|
|
||||||
[[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
|
|
||||||
cp -r "${SRCDIR}/${ARCHIVE}" "${ARCHIVE}"
|
|
||||||
tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
|
|
||||||
rm -rf "${ARCHIVE}"
|
|
||||||
|
|
||||||
# build widget
|
# build widget
|
||||||
ARCHIVE="pytextmonitor"
|
ARCHIVE="awesome-widgets"
|
||||||
FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING readme"
|
FILES="AUTHORS CHANGELOG COPYING packages patches"
|
||||||
IGNORELIST="build usr"
|
IGNORELIST="build usr .kdev4 *.kdev4 .idea packages/*src.tar.xz"
|
||||||
# create archive
|
# create archive
|
||||||
[[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
|
[[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
|
||||||
[[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
|
[[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
|
||||||
cp -r "${SRCDIR}" "${ARCHIVE}"
|
cp -r "${SRCDIR}" "${ARCHIVE}"
|
||||||
for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done
|
for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done
|
||||||
for FILE in ${IGNORELIST[*]}; do rm -rf "${ARCHIVE}/${FILE}"; done
|
for FILE in ${IGNORELIST[*]}; do rm -rf "${ARCHIVE}/${FILE}"; done
|
||||||
tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
|
tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
|
||||||
|
ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" packages
|
||||||
rm -rf "${ARCHIVE}"
|
rm -rf "${ARCHIVE}"
|
||||||
|
|
||||||
# update md5sum
|
# update md5sum
|
||||||
MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
|
MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
|
||||||
sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" PKGBUILD
|
sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" packages/PKGBUILD
|
||||||
sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" PKGBUILD
|
sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" packages/PKGBUILD
|
||||||
|
# clear
|
||||||
|
find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \;
|
||||||
|
find packages -type l -xtype l -exec rm -rf {} \;
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
func_update() {
|
|
||||||
cat << EOF
|
|
||||||
Update plasmoids...
|
|
||||||
EOF
|
|
||||||
kbuildsycoca4 > /dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
post_install() {
|
|
||||||
func_update
|
|
||||||
cat << EOF
|
|
||||||
Make sure that \`hddtemp\` can be run with sudo without password
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
func_update
|
|
||||||
cat << EOF
|
|
||||||
Make sure that \`hddtemp\` can be run with sudo without password
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
post_remove() {
|
|
||||||
func_update
|
|
||||||
}
|
|
41
packages/PKGBUILD
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
|
||||||
|
|
||||||
|
pkgname=plasma5-applet-awesome-widgets
|
||||||
|
_pkgname=awesome-widgets
|
||||||
|
pkgver=3.2.1
|
||||||
|
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=('73da19c31aa95edd428ff5ce7b541ee1')
|
||||||
|
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
|
@ -0,0 +1,402 @@
|
|||||||
|
diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml
|
||||||
|
index 01bcd58..1ec7ba6 100644
|
||||||
|
--- a/sources/awesome-widget/package/contents/ui/advanced.qml
|
||||||
|
+++ b/sources/awesome-widget/package/contents/ui/advanced.qml
|
||||||
|
@@ -17,7 +17,6 @@
|
||||||
|
|
||||||
|
import QtQuick 2.0
|
||||||
|
import QtQuick.Controls 1.3 as QtControls
|
||||||
|
-import QtQuick.Dialogs 1.2 as QtDialogs
|
||||||
|
|
||||||
|
import org.kde.plasma.private.awesomewidget 1.0
|
||||||
|
|
||||||
|
@@ -372,32 +371,7 @@ Item {
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Export configuration")
|
||||||
|
- onClicked: saveConfigAs.open()
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- QtDialogs.FileDialog {
|
||||||
|
- id: saveConfigAs
|
||||||
|
- selectExisting: false
|
||||||
|
- title: i18n("Export")
|
||||||
|
- folder: awConfig.configurationDirectory()
|
||||||
|
- onAccepted: {
|
||||||
|
- var status = awConfig.exportConfiguration(
|
||||||
|
- plasmoid.configuration,
|
||||||
|
- saveConfigAs.fileUrl.toString().replace("file://", ""))
|
||||||
|
- if (status) {
|
||||||
|
- messageDialog.title = i18n("Success")
|
||||||
|
- messageDialog.text = i18n("Please note that binary files were not copied")
|
||||||
|
- } else {
|
||||||
|
- messageDialog.title = i18n("Ooops...")
|
||||||
|
- messageDialog.text = i18n("Could not save configuration file")
|
||||||
|
- }
|
||||||
|
- messageDialog.open()
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- QtDialogs.MessageDialog {
|
||||||
|
- id: messageDialog
|
||||||
|
- standardButtons: QtDialogs.StandardButton.Ok
|
||||||
|
+ onClicked: awConfig.exportConfiguration(plasmoid.configuration)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -410,42 +385,9 @@ Item {
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Import configuration")
|
||||||
|
- onClicked: openConfig.open()
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- QtDialogs.FileDialog {
|
||||||
|
- id: openConfig
|
||||||
|
- title: i18n("Import")
|
||||||
|
- folder: awConfig.configurationDirectory()
|
||||||
|
- onAccepted: importSelection.open()
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- QtDialogs.Dialog {
|
||||||
|
- id: importSelection
|
||||||
|
-
|
||||||
|
- Column {
|
||||||
|
- QtControls.CheckBox {
|
||||||
|
- id: importPlasmoid
|
||||||
|
- text: i18n("Import plasmoid settings")
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- QtControls.CheckBox {
|
||||||
|
- id: importExtensions
|
||||||
|
- text: i18n("Import extensions")
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- QtControls.CheckBox {
|
||||||
|
- id: importAdds
|
||||||
|
- text: i18n("Import additional files")
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- onAccepted: {
|
||||||
|
+ onClicked: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
- var importConfig = awConfig.importConfiguration(
|
||||||
|
- openConfig.fileUrl.toString().replace("file://", ""),
|
||||||
|
- importPlasmoid.checked, importExtensions.checked,
|
||||||
|
- importAdds.checked)
|
||||||
|
+ var importConfig = awConfig.importConfiguration()
|
||||||
|
for (var key in importConfig)
|
||||||
|
plasmoid.configuration[key] = importConfig[key]
|
||||||
|
}
|
||||||
|
diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml
|
||||||
|
index 23e9690..ec83b91 100644
|
||||||
|
--- a/sources/awesome-widget/package/contents/ui/main.qml
|
||||||
|
+++ b/sources/awesome-widget/package/contents/ui/main.qml
|
||||||
|
@@ -17,7 +17,6 @@
|
||||||
|
|
||||||
|
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
|
||||||
|
@@ -110,27 +109,6 @@ Item {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- 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()
|
||||||
|
@@ -216,7 +194,12 @@ Item {
|
||||||
|
function action_requestKey() {
|
||||||
|
if (debug) console.debug()
|
||||||
|
|
||||||
|
- tagSelectorBox.model = awKeys.dictKeys(true)
|
||||||
|
- return tagSelector.open()
|
||||||
|
+ var tag = awKeys.graphicalKey()
|
||||||
|
+ 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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp
|
||||||
|
index 6263b30..5f61d2a 100644
|
||||||
|
--- a/sources/awesome-widget/plugin/awconfighelper.cpp
|
||||||
|
+++ b/sources/awesome-widget/plugin/awconfighelper.cpp
|
||||||
|
@@ -19,10 +19,15 @@
|
||||||
|
|
||||||
|
#include <KI18n/KLocalizedString>
|
||||||
|
|
||||||
|
+#include <QCheckBox>
|
||||||
|
+#include <QDialogButtonBox>
|
||||||
|
#include <QDir>
|
||||||
|
+#include <QFileDialog>
|
||||||
|
+#include <QMessageBox>
|
||||||
|
#include <QQmlPropertyMap>
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QTextCodec>
|
||||||
|
+#include <QVBoxLayout>
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
|
||||||
|
@@ -50,11 +55,13 @@ bool AWConfigHelper::dropCache() const
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-bool AWConfigHelper::exportConfiguration(const QObject *nativeConfig,
|
||||||
|
- const QString fileName) const
|
||||||
|
+void AWConfigHelper::exportConfiguration(const QObject *nativeConfig) const
|
||||||
|
{
|
||||||
|
- qCDebug(LOG_AW) << "Selected filename" << fileName;
|
||||||
|
-
|
||||||
|
+ // get file path and init settings object
|
||||||
|
+ QString fileName = QFileDialog::getSaveFileName(nullptr, i18n("Export"));
|
||||||
|
+ if (fileName.isEmpty())
|
||||||
|
+ return;
|
||||||
|
+ qCInfo(LOG_AW) << "Selected filename" << fileName;
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
|
||||||
|
// plasmoid configuration
|
||||||
|
@@ -96,22 +103,33 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
|
||||||
|
// sync settings
|
||||||
|
settings.sync();
|
||||||
|
// show additional message
|
||||||
|
- return settings.status() == QSettings::NoError;
|
||||||
|
+ switch (settings.status()) {
|
||||||
|
+ case QSettings::NoError:
|
||||||
|
+ QMessageBox::information(
|
||||||
|
+ nullptr, i18n("Success"),
|
||||||
|
+ i18n("Please note that binary files were not copied"));
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ QMessageBox::critical(nullptr, i18n("Ooops..."),
|
||||||
|
+ i18n("Could not save configuration file"));
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
|
||||||
|
- const bool importPlasmoid,
|
||||||
|
- const bool importExtensions,
|
||||||
|
- const bool importAdds) const
|
||||||
|
+QVariantMap AWConfigHelper::importConfiguration() const
|
||||||
|
{
|
||||||
|
- qCDebug(LOG_AW) << "Selected filename" << fileName;
|
||||||
|
-
|
||||||
|
QVariantMap configuration;
|
||||||
|
+ // get file path and init settings object
|
||||||
|
+ QString fileName = QFileDialog::getOpenFileName(nullptr, i18n("Import"));
|
||||||
|
+ if (fileName.isEmpty())
|
||||||
|
+ return configuration;
|
||||||
|
+ qCInfo(LOG_AW) << "Selected filename" << fileName;
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
+ QHash<QString, bool> selection = selectImport();
|
||||||
|
|
||||||
|
// extensions
|
||||||
|
- if (importExtensions) {
|
||||||
|
+ if (selection[QString("extensions")]) {
|
||||||
|
for (auto item : m_dirs) {
|
||||||
|
settings.beginGroup(item);
|
||||||
|
for (auto it : settings.childGroups())
|
||||||
|
@@ -121,7 +139,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
|
||||||
|
}
|
||||||
|
|
||||||
|
// additional files
|
||||||
|
- if (importAdds) {
|
||||||
|
+ if (selection[QString("adds")]) {
|
||||||
|
settings.beginGroup(QString("json"));
|
||||||
|
// script filters
|
||||||
|
writeFile(settings, QString("filters"),
|
||||||
|
@@ -135,7 +153,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
|
||||||
|
}
|
||||||
|
|
||||||
|
// plasmoid configuration
|
||||||
|
- if (importPlasmoid) {
|
||||||
|
+ if (selection[QString("plasmoid")]) {
|
||||||
|
settings.beginGroup(QString("plasmoid"));
|
||||||
|
for (auto key : settings.childKeys())
|
||||||
|
configuration[key] = settings.value(key);
|
||||||
|
@@ -261,6 +279,50 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
+QHash<QString, bool> AWConfigHelper::selectImport() const
|
||||||
|
+{
|
||||||
|
+ QDialog *dialog = new QDialog(nullptr);
|
||||||
|
+ QCheckBox *importPlasmoidSettings
|
||||||
|
+ = new QCheckBox(i18n("Import plasmoid settings"), dialog);
|
||||||
|
+ importPlasmoidSettings->setChecked(true);
|
||||||
|
+ QCheckBox *importExtensionsSettings
|
||||||
|
+ = new QCheckBox(i18n("Import extensions"), dialog);
|
||||||
|
+ importExtensionsSettings->setChecked(true);
|
||||||
|
+ QCheckBox *importAddsSettings
|
||||||
|
+ = new QCheckBox(i18n("Import additional files"), dialog);
|
||||||
|
+ importAddsSettings->setChecked(true);
|
||||||
|
+ QDialogButtonBox *dialogButtons
|
||||||
|
+ = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
|
||||||
|
+ Qt::Horizontal, dialog);
|
||||||
|
+ QVBoxLayout *layout = new QVBoxLayout(dialog);
|
||||||
|
+ layout->addWidget(importPlasmoidSettings);
|
||||||
|
+ layout->addWidget(importExtensionsSettings);
|
||||||
|
+ layout->addWidget(importAddsSettings);
|
||||||
|
+ layout->addWidget(dialogButtons);
|
||||||
|
+ connect(dialogButtons, SIGNAL(accepted()), dialog, SLOT(accept()));
|
||||||
|
+ connect(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject()));
|
||||||
|
+
|
||||||
|
+ // get parameters
|
||||||
|
+ QHash<QString, bool> import;
|
||||||
|
+ import[QString("plasmoid")] = false;
|
||||||
|
+ import[QString("extensions")] = false;
|
||||||
|
+ import[QString("adds")] = false;
|
||||||
|
+ switch (dialog->exec()) {
|
||||||
|
+ case QDialog::Accepted:
|
||||||
|
+ import[QString("plasmoid")] = importPlasmoidSettings->isChecked();
|
||||||
|
+ import[QString("extensions")] = importExtensionsSettings->isChecked();
|
||||||
|
+ import[QString("adds")] = importAddsSettings->isChecked();
|
||||||
|
+ break;
|
||||||
|
+ case QDialog::Rejected:
|
||||||
|
+ default:
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ dialog->deleteLater();
|
||||||
|
+
|
||||||
|
+ return import;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
void AWConfigHelper::writeFile(QSettings &settings, const QString key,
|
||||||
|
const QString fileName) const
|
||||||
|
{
|
||||||
|
diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h
|
||||||
|
index 912ac3d..dc51dfb 100644
|
||||||
|
--- a/sources/awesome-widget/plugin/awconfighelper.h
|
||||||
|
+++ b/sources/awesome-widget/plugin/awconfighelper.h
|
||||||
|
@@ -33,13 +33,9 @@ public:
|
||||||
|
explicit AWConfigHelper(QObject *parent = nullptr);
|
||||||
|
virtual ~AWConfigHelper();
|
||||||
|
Q_INVOKABLE QString configurationDirectory() const;
|
||||||
|
Q_INVOKABLE bool dropCache() const;
|
||||||
|
- Q_INVOKABLE bool exportConfiguration(const QObject *nativeConfig,
|
||||||
|
- const QString fileName) const;
|
||||||
|
- Q_INVOKABLE QVariantMap importConfiguration(const QString fileName,
|
||||||
|
- const bool importPlasmoid,
|
||||||
|
- const bool importExtensions,
|
||||||
|
- const bool importAdds) const;
|
||||||
|
+ Q_INVOKABLE void exportConfiguration(const QObject *nativeConfig) const;
|
||||||
|
+ Q_INVOKABLE QVariantMap importConfiguration() const;
|
||||||
|
// dataengine
|
||||||
|
Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
|
||||||
|
Q_INVOKABLE bool
|
||||||
|
@@ -51,6 +47,7 @@ private:
|
||||||
|
void copySettings(QSettings &from, QSettings &to) const;
|
||||||
|
void readFile(QSettings &settings, const QString key,
|
||||||
|
const QString fileName) const;
|
||||||
|
+ QHash<QString, bool> selectImport() const;
|
||||||
|
void writeFile(QSettings &settings, const QString key,
|
||||||
|
const QString fileName) const;
|
||||||
|
// properties
|
||||||
|
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
|
||||||
|
index e5b9861..039d24e 100644
|
||||||
|
--- a/sources/awesome-widget/plugin/awkeys.cpp
|
||||||
|
+++ b/sources/awesome-widget/plugin/awkeys.cpp
|
||||||
|
@@ -324,6 +324,14 @@ QStringList AWKeys::getHddDevices() const
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
+#include <QInputDialog>
|
||||||
|
+QString AWKeys::graphicalKey() const
|
||||||
|
+{
|
||||||
|
+ return QInputDialog::getItem(nullptr, i18n("Select tag"), QString(),
|
||||||
|
+ dictKeys(true), 0, true);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
QString AWKeys::infoByKey(QString key) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Requested info for key" << key;
|
||||||
|
diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h
|
||||||
|
index a8300f1..8edc3bd 100644
|
||||||
|
--- a/sources/awesome-widget/plugin/awkeys.h
|
||||||
|
+++ b/sources/awesome-widget/plugin/awkeys.h
|
||||||
|
@@ -55,6 +55,7 @@ public:
|
||||||
|
Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
|
||||||
|
const QString regexp = QString()) const;
|
||||||
|
Q_INVOKABLE QStringList getHddDevices() const;
|
||||||
|
+ Q_INVOKABLE QString graphicalKey() const;
|
||||||
|
// values
|
||||||
|
Q_INVOKABLE QString infoByKey(QString key) const;
|
||||||
|
Q_INVOKABLE QString valueByKey(QString key) const;
|
||||||
|
diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
|
||||||
|
index eee61e1..9da8dad 100644
|
||||||
|
--- a/sources/awdebug.cpp
|
||||||
|
+++ b/sources/awdebug.cpp
|
||||||
|
@@ -20,15 +20,11 @@
|
||||||
|
#include "awdebug.h"
|
||||||
|
|
||||||
|
|
||||||
|
-Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
|
||||||
|
- 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)
|
||||||
|
+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget")
|
||||||
|
+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel")
|
||||||
|
+Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon")
|
||||||
|
+Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmonsources")
|
||||||
|
+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets")
|
||||||
|
|
||||||
|
|
||||||
|
const QStringList getBuildData()
|
||||||
|
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
|
||||||
|
index e5b9861..eb73073 100644
|
||||||
|
--- a/sources/awesome-widget/plugin/awkeys.cpp
|
||||||
|
+++ b/sources/awesome-widget/plugin/awkeys.cpp
|
||||||
|
@@ -439,4 +439,4 @@ void AWKeys::dataUpdated(const QString &sourceName,
|
||||||
|
{
|
||||||
|
// run concurrent data update
|
||||||
|
- QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName,
|
||||||
|
+ QtConcurrent::run(this, &AWKeys::setDataBySource, sourceName,
|
||||||
|
data);
|
||||||
|
diff --git a/sources/libraries.cmake b/sources/libraries.cmake
|
||||||
|
index 33192f7..46e2b1e 100644
|
||||||
|
--- a/sources/libraries.cmake
|
||||||
|
+++ b/sources/libraries.cmake
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
find_package(Gettext REQUIRED)
|
||||||
|
|
||||||
|
# main qt libraries
|
||||||
|
-find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
|
||||||
|
+find_package(Qt5 5.3.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
|
||||||
|
add_definitions(
|
||||||
|
${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
|
||||||
|
${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
|
31
patches/qt5.5-qstringlist-and-qinfo.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
|
||||||
|
index f808d03..a056b3f 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>
|
||||||
|
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
|
diff --git a/sources/awdebug.h b/sources/awdebug.h
|
||||||
|
index 43944ce..c679281 100644
|
||||||
|
--- a/sources/awdebug.h
|
||||||
|
+++ b/sources/awdebug.h
|
||||||
|
@@ -21,9 +21,13 @@
|
||||||
|
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
|
+#ifndef qCInfo
|
||||||
|
+#define qCInfo qCDebug
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#ifndef LOG_FORMAT
|
||||||
|
#define LOG_FORMAT \
|
||||||
|
- "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-" \
|
||||||
|
+ "[%{time process}][%{if-debug}DD%{endif}%{if-" \
|
||||||
|
"warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{" \
|
||||||
|
"category}][%{function}] %{message}"
|
||||||
|
#endif /* LOG_FORMAT */
|
148
patches/qt5.6-qversionnumber.patch
Normal file
@ -0,0 +1,148 @@
|
|||||||
|
diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
|
||||||
|
index 3698602..42871c8 100644
|
||||||
|
--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
|
||||||
|
+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
|
||||||
|
@@ -37,7 +37,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
- m_foundVersion = QVersionNumber::fromString(VERSION);
|
||||||
|
+ m_foundVersion = QString(VERSION);
|
||||||
|
m_genericConfig = QString("%1/awesomewidgets/general.ini")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericDataLocation));
|
||||||
|
@@ -69,15 +69,15 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
|
||||||
|
bool AWUpdateHelper::checkVersion()
|
||||||
|
{
|
||||||
|
QSettings settings(m_genericConfig, QSettings::IniFormat);
|
||||||
|
- QVersionNumber version = QVersionNumber::fromString(
|
||||||
|
- settings.value(QString("Version"), QString(VERSION)).toString());
|
||||||
|
+ QString version
|
||||||
|
+ = settings.value(QString("Version"), QString(VERSION)).toString();
|
||||||
|
// update version
|
||||||
|
settings.setValue(QString("Version"), QString(VERSION));
|
||||||
|
settings.sync();
|
||||||
|
qCInfo(LOG_AW) << "Found version" << version << "actual one is"
|
||||||
|
<< m_foundVersion;
|
||||||
|
|
||||||
|
- if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
|
||||||
|
+ if ((version != QString(VERSION)) && (!QString(CHANGELOG).isEmpty())) {
|
||||||
|
genMessageBox(i18n("Changelog of %1", QString(VERSION)),
|
||||||
|
QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
|
||||||
|
QMessageBox::Ok)
|
||||||
|
@@ -90,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)
|
||||||
|
@@ -103,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;
|
||||||
|
|
||||||
|
@@ -112,7 +111,7 @@ void AWUpdateHelper::showUpdates(const QVersionNumber version)
|
||||||
|
text += QString(COMMIT_SHA).isEmpty()
|
||||||
|
? QString("\n")
|
||||||
|
: QString(" (%1)\n").arg(QString(COMMIT_SHA));
|
||||||
|
- text += i18n("New version : %1", version.toString()) + QString("\n\n");
|
||||||
|
+ text += i18n("New version : %1", version) + QString("\n\n");
|
||||||
|
text += i18n("Click \"Ok\" to download");
|
||||||
|
|
||||||
|
genMessageBox(i18n("There are updates"), text,
|
||||||
|
@@ -128,8 +127,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:
|
||||||
|
@@ -157,14 +155,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply,
|
||||||
|
QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
|
||||||
|
QString version = firstRelease[QString("tag_name")].toString();
|
||||||
|
version.remove(QString("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 359cdb2..9c6a42d 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 33192f7..339bb58 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.4.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
|
||||||
|
add_definitions(
|
||||||
|
${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
|
||||||
|
${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
|
216
readme/en.md
@ -1,216 +0,0 @@
|
|||||||
pytextmonitor
|
|
||||||
=============
|
|
||||||
|
|
||||||
Information
|
|
||||||
-----------
|
|
||||||
PyTextMonitor is a minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm.
|
|
||||||
|
|
||||||
**NOTE** LOOKING FOR TRANSLATORS!
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
-------------
|
|
||||||
For edited output you must open Settings window and setup output format in lines:
|
|
||||||
* tag `$time` - time in default format. For example, *fri Nov 6 04:48:01 2013*
|
|
||||||
* tag `$isotime` - time in iso format
|
|
||||||
* tag `$shorttime` - time in short locale format
|
|
||||||
* tag `$longtime` - time in long locale format
|
|
||||||
* tag `$custom` - custom time format
|
|
||||||
* tag `$uptime` - uptime, *---d--h--m*
|
|
||||||
* tag `$custom` - custom uptime format
|
|
||||||
* tag `$cpu` - total load cpu, *%*
|
|
||||||
* tag `$cpuN` - load CPU for core N, *%*
|
|
||||||
* tag `$cpucl` - average cpu clock, *MHz*
|
|
||||||
* tag `$cpuclN` - cpu clock for core N, *MHz*
|
|
||||||
* tag `$tempN` - temperature for device N. For example, `$temp0`
|
|
||||||
* tag `$gpu` - GPU usage, *%*. `aticonfig` or `nvidia-smi` must be installed
|
|
||||||
* tag `$gputemp` - GPU temperature. `aticonfig` or `nvidia-smi` must be installed
|
|
||||||
* tag `$mem` - usage memory, *%*
|
|
||||||
* tag `$memmb` - usage memory, *MB*
|
|
||||||
* tag `$memgb` - usage memory, *GB*
|
|
||||||
* tag `$swap` - swap, *%*
|
|
||||||
* tag `$swapmb` - swap, *MB*
|
|
||||||
* tag `$swapgb` - swap, *GB*
|
|
||||||
* tag `$hddN` - usage for mount point N, *%*. For example, `$hdd0`
|
|
||||||
* tag `$hddtempN` - temperature for HDD N. For example, `$hddtemp0`
|
|
||||||
* tag `$down` - download speed, *KB/s*
|
|
||||||
* tag `$up` - upload speed, *KB/s*
|
|
||||||
* tag `$netdev` - current network device
|
|
||||||
* tag `$bat` - battery charge, *%*
|
|
||||||
* tag `$ac` - status AC device. Return (\*) if AC device is online or *( )* if offline
|
|
||||||
* tag `$album` - current song album. One of supported music players must be installed
|
|
||||||
* tag `$artist` - current song artist. One of supported music players must be installed
|
|
||||||
* tag `$progress` - current song progress. One of supported music players must be installed
|
|
||||||
* tag `$time` - current song duration. One of supported music players must be installed
|
|
||||||
* tag `$title` - current song title. One of supported music players must be installed
|
|
||||||
* tag `$pscount` - number of running processes
|
|
||||||
* tag `$pstotal` - total number of processes
|
|
||||||
* tag `$ps` - list of running processes
|
|
||||||
* tag `$pkgcountN` - number of packages, which available to upgrade for command N. For example, `$pkgcount0`
|
|
||||||
* tag `$custom` - returns output for custom command
|
|
||||||
|
|
||||||
Label order will changed if you change slider position. HTML tags in label work normally.
|
|
||||||
|
|
||||||
**NOTE** you don't may set to show `$cpu` tag in swap label for example. **`$cpu` will work only in cpu label**.
|
|
||||||
|
|
||||||
Advanced settings
|
|
||||||
-----------------
|
|
||||||
**Custom time**
|
|
||||||
|
|
||||||
* tag `$dddd` - weekday in long format
|
|
||||||
* tag `$ddd` - weekday in short format
|
|
||||||
* tag `$dd` - day
|
|
||||||
* tag `$d` - day without zero
|
|
||||||
* tag `$MMMM` - month in long format
|
|
||||||
* tag `$MMM` - month in short format
|
|
||||||
* tag `$MM` - month
|
|
||||||
* tag `$M` - month without zero
|
|
||||||
* tag `$yyyy` - year
|
|
||||||
* tag `$yy` - year in short format
|
|
||||||
* tag `$hh` - hours
|
|
||||||
* tag `$h` - hours without zero
|
|
||||||
* tag `$mm` - minutes
|
|
||||||
* tag `$m` - minutes without zero
|
|
||||||
* tag `$ss` - seconds
|
|
||||||
* tag `$s` - seconds without zero
|
|
||||||
|
|
||||||
**Custom uptime**
|
|
||||||
|
|
||||||
* tag `$dd` - uptime days
|
|
||||||
* tag `$d` - uptime days without zero
|
|
||||||
* tag `$hh` - uptime hours
|
|
||||||
* tag `$h` - uptime hours without zero
|
|
||||||
* tag `$mm` - uptime minutes
|
|
||||||
* tag `$m` - uptime minutes without zero
|
|
||||||
|
|
||||||
**Temperature devices**
|
|
||||||
|
|
||||||
List of devices, which will be observed in temp label (combo box items come from `sensors`). List widget is editable, delete key will remove current item.
|
|
||||||
|
|
||||||
**Mount points**
|
|
||||||
|
|
||||||
List of mount points, which will be observed in hdd label (combo box items come from `mount`). List widget is editable, delete key will remove current item.
|
|
||||||
|
|
||||||
**HDD**
|
|
||||||
|
|
||||||
List of hard disk devices, which will be observed in hddtem label (combo box items come from `find`). List widget is editable, delete key will remove current item.
|
|
||||||
|
|
||||||
**Network directory**
|
|
||||||
|
|
||||||
Path to directory, which contains network devices information. Default is `/sys/class/net`. Required for auto select network device.
|
|
||||||
|
|
||||||
**Network device**
|
|
||||||
|
|
||||||
Use specified device as active. Combo box items come from **network directory**. Will disable auto select network device.
|
|
||||||
|
|
||||||
**Battery device**
|
|
||||||
|
|
||||||
File with battery information. File (`/sys/class/power_supply/BAT0/capacity` by default) should contain only battery charge in percent.
|
|
||||||
|
|
||||||
**AC online tag**
|
|
||||||
|
|
||||||
Line which will be shown when AC is online.
|
|
||||||
|
|
||||||
**AC offline tag**
|
|
||||||
|
|
||||||
Line which will be shown when AC is offline.
|
|
||||||
|
|
||||||
**AC device**
|
|
||||||
|
|
||||||
File with AC information. File (`/sys/class/power_supply/AC/online` by default) must contain `1` if AC is online.
|
|
||||||
|
|
||||||
**Music player**
|
|
||||||
|
|
||||||
Select one of supported music playes for player label.
|
|
||||||
|
|
||||||
Tooltip settings
|
|
||||||
----------------
|
|
||||||
Since version 1.7.0 CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make the needed checkboxes a fully checked. The number of stored values can be set in the tab. Colors of graphs are configurable too.
|
|
||||||
|
|
||||||
DataEngine settings
|
|
||||||
-------------------
|
|
||||||
**Custom command**
|
|
||||||
|
|
||||||
*NOTE* This can cause the computer freeze.
|
|
||||||
|
|
||||||
A command, which will be run for custom label.
|
|
||||||
|
|
||||||
**GPU device**
|
|
||||||
|
|
||||||
Select one of supported GPU devices. `auto` will enable auto selection. Default is `auto`.
|
|
||||||
|
|
||||||
**HDD**
|
|
||||||
|
|
||||||
Select one of HDDs for HDD temperature monitor. `all` will enable monitor for all devices. Default is `all`.
|
|
||||||
|
|
||||||
**MPD address**
|
|
||||||
|
|
||||||
Address of MPD server. Default is `localhost`.
|
|
||||||
|
|
||||||
**MPD port**
|
|
||||||
|
|
||||||
Port of MPD server. Default is `6600`.
|
|
||||||
|
|
||||||
**Package manager**
|
|
||||||
|
|
||||||
List of commands, which will be run. Number of null lines is a number of unneeded lines. Defaults:
|
|
||||||
* *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0`
|
|
||||||
* *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0`
|
|
||||||
* *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0`
|
|
||||||
* *Fedora*: `PKGCMD=yum list updates`, `PKGNULL=3`
|
|
||||||
* *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0`
|
|
||||||
* *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0`
|
|
||||||
|
|
||||||
|
|
||||||
DataEngine configuration
|
|
||||||
------------------------
|
|
||||||
You may edit DataEngine configuration. It is `/usr/share/config/extsysmon.conf` or `$HOME/share/config/extsysmon.conf` depending on the type of installation. Uncomment needed line and edit it.
|
|
||||||
|
|
||||||
Instruction
|
|
||||||
===========
|
|
||||||
|
|
||||||
Dependencies
|
|
||||||
------------
|
|
||||||
* kdebase-workspace
|
|
||||||
* kdebindings-python2
|
|
||||||
* lm_sensors (*for definition temperature device*)
|
|
||||||
* sysstat (*for notification*)
|
|
||||||
|
|
||||||
Optional dependencies
|
|
||||||
---------------------
|
|
||||||
* proprietary video driver
|
|
||||||
* hddtemp (make sure that it may be run with `sudo` without password. Just add following line to `/etc/sudoers`: `$USERNAME ALL=NOPASSWD: /usr/bin/hddtemp`)
|
|
||||||
* music player (amarok, mpd or qmmp)
|
|
||||||
|
|
||||||
Make dependencies
|
|
||||||
-----------------
|
|
||||||
* automoc4
|
|
||||||
* cmake
|
|
||||||
* kdebase-runtime
|
|
||||||
|
|
||||||
Installation
|
|
||||||
------------
|
|
||||||
* download sources
|
|
||||||
* install
|
|
||||||
|
|
||||||
mkdir build && cd build
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` ../
|
|
||||||
make && make install
|
|
||||||
|
|
||||||
Also you may install it to `/`:
|
|
||||||
|
|
||||||
mkdir build && cd build
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ../
|
|
||||||
make && sudo make install
|
|
||||||
|
|
||||||
Additional information
|
|
||||||
======================
|
|
||||||
|
|
||||||
TODO (wish list)
|
|
||||||
----------------
|
|
||||||
|
|
||||||
Links
|
|
||||||
-----
|
|
||||||
* [Homepage](http://arcanis.name/projects/pytextmonitor/)
|
|
||||||
* Plasmoid on [kde-look](http://kde-look.org/content/show.php/Py+Text+Monitor?content=157124)
|
|
||||||
* DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
|
|
||||||
* Archlinux [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-pytextmonitor/) package
|
|
213
readme/ru.md
@ -1,213 +0,0 @@
|
|||||||
pytextmonitor
|
|
||||||
=============
|
|
||||||
|
|
||||||
Информация
|
|
||||||
----------
|
|
||||||
PyTextMonitor - минималистичный плазмоид, написанный на Python2. Он выглядит, как виджеты в Awesome WM.
|
|
||||||
|
|
||||||
Настройка
|
|
||||||
---------
|
|
||||||
Для редактирования внешнего виде, откройте окно настроек и установите требуемый формат в поля:
|
|
||||||
* тег `$time` - время в стандартном формате. Например, *fri Nov 6 04:48:01 2013*
|
|
||||||
* тег `$isotime` - время в ISO формате
|
|
||||||
* тег `$shorttime` - время в коротком формате
|
|
||||||
* тег `$longtime` - время в длинном формате
|
|
||||||
* тег `$custom` - свой формат времени
|
|
||||||
* тег `$uptime` - время работы, *---d--h--m*
|
|
||||||
* тег `$custom` - свой формат аптайма
|
|
||||||
* тег `$cpu` - общая загрузка CPU, *%*
|
|
||||||
* тег `$cpuN` - загрузка CPU для ядра N, *%*
|
|
||||||
* тег `$cpucl` - средняя частота CPU, *MHz*
|
|
||||||
* тег `$cpuclN` - частота CPU для ядра N, *MHz
|
|
||||||
* тег `$tempN` - температура для устройства N. Например, `$temp0`
|
|
||||||
* тег `$gpu` - использование GPU, *%*. `aticonfig` или `nvidia-smi` должны быть установлены
|
|
||||||
* тег `$gputemp` - температура GPU. `aticonfig` или `nvidia-smi` должны быть установлены
|
|
||||||
* тег `$mem` - использование RAM, *%*
|
|
||||||
* тег `$memmb` - использование RAM, *MB*
|
|
||||||
* тег `$memgb` - использование RAM, *GB*
|
|
||||||
* тег `$swap` - swap, *%*
|
|
||||||
* тег `$swapmb` - swap, *MB*
|
|
||||||
* тег `$swapgb` - swap, *GB*
|
|
||||||
* тег `$hddN` - использование точки монтирования N, *%*. Например, `$hdd0`
|
|
||||||
* тег `$hddtempN` - температура HDD N. Например, `$hddtemp0`
|
|
||||||
* тег `$down` - скорость загрузки, *KB/s*
|
|
||||||
* тег `$up` - скорость отдачи, *KB/s*
|
|
||||||
* тег `$netdev` - текущий сетевой интерфейс
|
|
||||||
* тег `$bat` - заряд батареи, *%*
|
|
||||||
* тег `$ac` - статус адаптора питания. Возвращает (\*), если AC подключен или *( )*, если нет
|
|
||||||
* тег `$album` - альбом. Один из поддерживаемых плееров должен быть установлен
|
|
||||||
* тег `$artist` - исполнитель. Один из поддерживаемых плееров должен быть установлен
|
|
||||||
* тег `$progress` - прогресс. Один из поддерживаемых плееров должен быть установлен
|
|
||||||
* тег `$time` - длительность. Один из поддерживаемых плееров должен быть установлен
|
|
||||||
* тег `$title` - название. Один из поддерживаемых плееров должен быть установлен
|
|
||||||
* тег `$pscount` - число запущенных процессов
|
|
||||||
* тег `$pstotal` - общее число процессов
|
|
||||||
* тег `$ps` - список процессов
|
|
||||||
* тег `$pkgcountN` - число пакетов, которые могут быть обновлены, для команды N. Например, `$pkgcount0`
|
|
||||||
* тег `$custom` - возвращает результат своей команды
|
|
||||||
|
|
||||||
Порядок полей изменится, если вы измените позицию слайдеров. HTML теги в полях работают корректно.
|
|
||||||
|
|
||||||
**ЗАМЕЧАНИЕ** вы не можете установить тег `$cpu`, например, в поле swap. **`$cpu` будет работать только в поле CPU**.
|
|
||||||
|
|
||||||
Расширенные настройки
|
|
||||||
---------------------
|
|
||||||
**Свой формат времени**
|
|
||||||
|
|
||||||
* тег `$dddd` - день недели в длинном формате
|
|
||||||
* тег `$ddd` - день недели в коротком формате
|
|
||||||
* тег `$dd` - день
|
|
||||||
* тег `$d` - день без нуля
|
|
||||||
* тег `$MMMM` - месяц в длинном формате
|
|
||||||
* тег `$MMM` - месяц в коротком формате
|
|
||||||
* тег `$MM` - месяц
|
|
||||||
* тег `$M` - месяц без нуля
|
|
||||||
* тег `$yyyy` - год
|
|
||||||
* тег `$yy` - год в коротком формате
|
|
||||||
* тег `$hh` - часы
|
|
||||||
* тег `$h` - часы без нуля
|
|
||||||
* тег `$mm` - минуты
|
|
||||||
* тег `$m` - минуты без нуля
|
|
||||||
* тег `$ss` - секунды
|
|
||||||
* тег `$s` - секунды без нуля
|
|
||||||
|
|
||||||
**Свой формат аптайма**
|
|
||||||
|
|
||||||
* тег `$dd` - дни аптайма
|
|
||||||
* тег `$d` - дни аптайма без нуля
|
|
||||||
* тег `$hh` - часы аптайма
|
|
||||||
* тег `$h` - часы аптайма без нуля
|
|
||||||
* тег `$mm` - минуты аптайма
|
|
||||||
* тег `$m` - минуты аптайма без нуля
|
|
||||||
|
|
||||||
**Датчики температуры**
|
|
||||||
|
|
||||||
Список датчиков, которые будут наблюдаться в поле temo (содержимое комбо бокса берется из `sensors`). Виджет редактируем, клавиша delete удалит текущую строку.
|
|
||||||
|
|
||||||
**Точки монтирования**
|
|
||||||
|
|
||||||
Список точек монтирования, которые будут наблюдаться в поле hdd (содержимое комбо бокса берется из `mount`). Виджет редактируем, клавиша delete удалит текущую строку.
|
|
||||||
|
|
||||||
**HDD**
|
|
||||||
|
|
||||||
Список HDD, которые будут наблюдаться в поле hddtemp (содержимое комбо бокса берется из `find`). Виджет редактируем, клавиша delete удалит текущую строку.
|
|
||||||
|
|
||||||
**Директория с сетевыми интерфейсами**
|
|
||||||
|
|
||||||
Путь к директории, которая содержит информацию о сетевых интерфейсах. По умолчанию `/sys/class/net`. Требуется для определения сетевого устройства.
|
|
||||||
|
|
||||||
**Сетевое устройство**
|
|
||||||
|
|
||||||
Использовать указанный интерфейс, как активный. Содержимое комбо бокса берется из **директории с сетевыми интерфейсами**. Эта опция отключит авто определение интерфейса.
|
|
||||||
|
|
||||||
**Устройство батареи**
|
|
||||||
|
|
||||||
Файл с информацией о батарее. Данный файл (`/sys/class/power_supply/BAT0/capacity` по умолчанию) должен содержать только заряд батареи в процентах.
|
|
||||||
|
|
||||||
**AC online тег**
|
|
||||||
|
|
||||||
Строка, которая будет показана, когда AC онлайн.
|
|
||||||
|
|
||||||
**AC offline тег**
|
|
||||||
|
|
||||||
Строка, которая будет показана, когда AC оффлайн.
|
|
||||||
|
|
||||||
**Устройство AC**
|
|
||||||
|
|
||||||
Файл с информацией об адапторе питания. Данный файл (`/sys/class/power_supply/AC/online` по умолчанию) должен содержать `1`, если адаптор подключен.
|
|
||||||
|
|
||||||
**Музыкальные плеер**
|
|
||||||
|
|
||||||
Выберете один из поддерживаемых музыкальных плееров.
|
|
||||||
|
|
||||||
Настройки тултипа
|
|
||||||
-----------------
|
|
||||||
Начиная с версии 1.7.0 поля CPU, частота CPU, память, swap и сеть поддерживают графический тултип. Чтобы включить их, просто сделайте требуемые чекбоксы полностью чекнутыми. Число хранимых значений может быть выставленно в данной вкладке. Цвета графиков также настраиваются.
|
|
||||||
|
|
||||||
Настройки DataEngine
|
|
||||||
--------------------
|
|
||||||
**Своя команда**
|
|
||||||
|
|
||||||
*ЗАМЕЧАНИЕ* Может вызвать зависание компьютера.
|
|
||||||
|
|
||||||
Команда, которая будет запущена для соответствующего поля.
|
|
||||||
|
|
||||||
**Устройство GPU**
|
|
||||||
|
|
||||||
Выберете одно из поддерживаемых устройств GPU. `auto` включит автоматическое определение. По умолчанию `auto`.
|
|
||||||
|
|
||||||
**HDD**
|
|
||||||
|
|
||||||
Выберете один из HDD для монитора его температуры. `all` включит монитор для всех доступных устройств. По умолчанию `all`.
|
|
||||||
|
|
||||||
**Адрес MPD**
|
|
||||||
|
|
||||||
Адрес MPD сервера. По умолчанию `localhost`.
|
|
||||||
|
|
||||||
**Порт MPD**
|
|
||||||
|
|
||||||
Порт MPD сервера. По умолчанию `6600`.
|
|
||||||
|
|
||||||
**Package manager**
|
|
||||||
|
|
||||||
Список команд, которые будут запущены. Число пустых строк - число ненужных для подсчета строк. Стандартные настройки:
|
|
||||||
* *Arch*: `PKGCMD=pacman -Qu`, `PKGNULL=0`
|
|
||||||
* *Debian*: `PKGCMD=apt-show-versions -u -b`, `PKGNULL=0`
|
|
||||||
* *Ubuntu*: `PKGCMD=aptitude search '~U'`, `PKGNULL=0`
|
|
||||||
* *Fedora*: `PKGCMD=yum list updates`, `PKGNULL=3`
|
|
||||||
* *FreeBSD*: `PKGCMD=pkg_version -I -l '<'`, `PKGNULL=0`
|
|
||||||
* *Mandriva*: `PKGCMD=urpmq --auto-select`, `PKGNULL=0`
|
|
||||||
|
|
||||||
Настройка DataEngine
|
|
||||||
--------------------
|
|
||||||
Вы можете отредактировать настройки DataEngine вручную. Откройте файл `/usr/share/config/extsysmon.conf` или `$HOME/.kde4/share/config/extsysmon.conf`, в зависимости от типа установки. Раскомментируйте требуемые строки и отредактируйте их.
|
|
||||||
|
|
||||||
Инструкция
|
|
||||||
==========
|
|
||||||
|
|
||||||
Зависимости
|
|
||||||
-----------
|
|
||||||
* kdebase-workspace
|
|
||||||
* kdebindings-python2
|
|
||||||
* lm_sensors (*для определения датчиков температуры*)
|
|
||||||
* sysstat (*для уведомлений*)
|
|
||||||
|
|
||||||
Опциональные зависимости
|
|
||||||
------------------------
|
|
||||||
* проприетарный видеодрайвер
|
|
||||||
* hddtemp (убедитесь, что может быть запущен с `sudo` без пароля. Просто добавьте следующую строку в `/etc/sudoers`: `$USERNAME ALL=NOPASSWD: /usr/bin/hddtemp`)
|
|
||||||
* музыкальный плеер (amarok, mpd или qmmp)
|
|
||||||
|
|
||||||
Зависимости сборки
|
|
||||||
------------------
|
|
||||||
* automoc4
|
|
||||||
* cmake
|
|
||||||
* kdebase-runtime
|
|
||||||
|
|
||||||
Установка
|
|
||||||
---------
|
|
||||||
* скачать исходный архив
|
|
||||||
* установить
|
|
||||||
|
|
||||||
mkdir build && cd build
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --localprefix` ../
|
|
||||||
make && make install
|
|
||||||
|
|
||||||
Для установки в `/`:
|
|
||||||
|
|
||||||
mkdir build && cd build
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ../
|
|
||||||
make && sudo make install
|
|
||||||
|
|
||||||
Дополнительная информация
|
|
||||||
=========================
|
|
||||||
|
|
||||||
TODO (wish list)
|
|
||||||
----------------
|
|
||||||
|
|
||||||
Ссылки
|
|
||||||
------
|
|
||||||
* [Домашняя страница](http://arcanis.name/projects/pytextmonitor/)
|
|
||||||
* Виджет на [kde-look](http://kde-look.org/content/show.php/Py+Text+Monitor?content=157124)
|
|
||||||
* DataEngine на [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
|
|
||||||
* Пакет для Archlinux в [AUR](https://aur.archlinux.org/packages/kdeplasma-applets-pytextmonitor/)
|
|
BIN
screenshots/config_01.png
Normal file
After Width: | Height: | Size: 54 KiB |
BIN
screenshots/config_02.png
Normal file
After Width: | Height: | Size: 68 KiB |
BIN
screenshots/config_03.png
Normal file
After Width: | Height: | Size: 67 KiB |
BIN
screenshots/config_04.png
Normal file
After Width: | Height: | Size: 40 KiB |
BIN
screenshots/config_05.png
Normal file
After Width: | Height: | Size: 65 KiB |
BIN
screenshots/config_06.png
Normal file
After Width: | Height: | Size: 57 KiB |
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 65 KiB |
BIN
screenshots/dp_config_01.png
Normal file
After Width: | Height: | Size: 42 KiB |
BIN
screenshots/dp_config_02.png
Normal file
After Width: | Height: | Size: 46 KiB |
BIN
screenshots/dp_config_03.png
Normal file
After Width: | Height: | Size: 38 KiB |
BIN
screenshots/dp_config_04.png
Normal file
After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 89 KiB |
Before Width: | Height: | Size: 78 KiB |
Before Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 3.0 KiB |
66
sources/.clang-format
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
---
|
||||||
|
Language: Cpp
|
||||||
|
AccessModifierOffset: -4
|
||||||
|
AlignAfterOpenBracket: true
|
||||||
|
AlignConsecutiveAssignments: false
|
||||||
|
AlignEscapedNewlinesLeft: false
|
||||||
|
AlignOperands: true
|
||||||
|
AlignTrailingComments: true
|
||||||
|
AllowAllParametersOfDeclarationOnNextLine: true
|
||||||
|
AllowShortBlocksOnASingleLine: false
|
||||||
|
AllowShortCaseLabelsOnASingleLine: false
|
||||||
|
AllowShortFunctionsOnASingleLine: Inline
|
||||||
|
AllowShortIfStatementsOnASingleLine: false
|
||||||
|
AllowShortLoopsOnASingleLine: false
|
||||||
|
AlwaysBreakAfterDefinitionReturnType: None
|
||||||
|
AlwaysBreakBeforeMultilineStrings: false
|
||||||
|
AlwaysBreakTemplateDeclarations: false
|
||||||
|
BinPackArguments: true
|
||||||
|
BinPackParameters: true
|
||||||
|
BreakBeforeBinaryOperators: All
|
||||||
|
BreakBeforeBraces: Linux
|
||||||
|
BreakBeforeTernaryOperators: true
|
||||||
|
BreakConstructorInitializersBeforeComma: true
|
||||||
|
ColumnLimit: 80
|
||||||
|
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
|
||||||
|
...
|
||||||
|
|
26
sources/.kdev4/awesomewidgets.kdev4
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
[Buildset]
|
||||||
|
BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x1e\x00a\x00w\x00e\x00s\x00o\x00m\x00e\x00-\x00w\x00i\x00d\x00g\x00e\x00t\x00s)
|
||||||
|
|
||||||
|
[CMake]
|
||||||
|
Build Directory Count=1
|
||||||
|
Current Build Directory Index=0
|
||||||
|
ProjectRootRelative=./
|
||||||
|
|
||||||
|
[CMake][CMake Build Directory 0]
|
||||||
|
Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
|
||||||
|
Build Type=Optimization
|
||||||
|
CMake Binary=file:///usr/bin/cmake
|
||||||
|
Environment Profile=
|
||||||
|
Extra Arguments=
|
||||||
|
Install Directory=file:///usr
|
||||||
|
|
||||||
|
[Defines And Includes][Compiler]
|
||||||
|
Name=GCC
|
||||||
|
Path=gcc
|
||||||
|
Type=GCC
|
||||||
|
|
||||||
|
[Launch]
|
||||||
|
Launch Configurations=
|
||||||
|
|
||||||
|
[Project]
|
||||||
|
VersionControlSupport=kdevgit
|
23
sources/.kdev4/sources.kdev4
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
[Buildset]
|
||||||
|
BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x1e\x00a\x00w\x00e\x00s\x00o\x00m\x00e\x00-\x00w\x00i\x00d\x00g\x00e\x00t\x00s)
|
||||||
|
|
||||||
|
[CMake]
|
||||||
|
Build Directory Count=1
|
||||||
|
Current Build Directory Index=0
|
||||||
|
ProjectRootRelative=./
|
||||||
|
|
||||||
|
[CMake][CMake Build Directory 0]
|
||||||
|
Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
|
||||||
|
Build Type=Release
|
||||||
|
CMake Binary=file:///usr/bin/cmake
|
||||||
|
Environment Profile=
|
||||||
|
Extra Arguments=
|
||||||
|
Install Directory=file:///usr
|
||||||
|
|
||||||
|
[Defines And Includes][Compiler]
|
||||||
|
Name=GCC
|
||||||
|
Path=gcc
|
||||||
|
Type=GCC
|
||||||
|
|
||||||
|
[Project]
|
||||||
|
VersionControlSupport=kdevgit
|
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()
|
||||||
|
{
|
||||||
|
QNetworkReply *reply = static_cast<QNetworkReply *>(parent());
|
||||||
|
if (reply->isRunning())
|
||||||
|
reply->close();
|
||||||
|
}
|
17
sources/3rdparty/qreplytimeout/qreplytimeout.h
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
// from here http://codereview.stackexchange.com/questions/30031/qnetworkreply-network-reply-timeout-helper
|
||||||
|
// no license provided
|
||||||
|
|
||||||
|
#include <QNetworkReply>
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
|
||||||
|
class QReplyTimeout : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit QReplyTimeout(QNetworkReply *reply, const int timeout);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void timeout();
|
||||||
|
};
|
@ -1,27 +1,91 @@
|
|||||||
cmake_minimum_required (VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8.12)
|
||||||
|
|
||||||
cmake_policy (SET CMP0003 OLD)
|
# some fucking magic
|
||||||
cmake_policy (SET CMP0002 OLD)
|
cmake_policy(SET CMP0003 OLD)
|
||||||
cmake_policy (SET CMP0011 NEW)
|
cmake_policy(SET CMP0002 OLD)
|
||||||
cmake_policy (SET CMP0015 NEW)
|
cmake_policy(SET CMP0011 NEW)
|
||||||
|
cmake_policy(SET CMP0015 NEW)
|
||||||
|
if (POLICY CMP0063)
|
||||||
|
cmake_policy(SET CMP0063 OLD)
|
||||||
|
endif ()
|
||||||
|
|
||||||
project (pytextmonitor)
|
project(awesomewidgets)
|
||||||
set (PROJECT_VERSION_MAJOR 1)
|
set(PROJECT_AUTHOR "Evgeniy Alekseev")
|
||||||
set (PROJECT_VERSION_MINOR 8)
|
set(PROJECT_CONTACT "esalexeev@gmail.com")
|
||||||
set (PROJECT_VERSION_PATCH 0)
|
set(PROJECT_LICENSE "GPL3")
|
||||||
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
|
set(PROJECT_VERSION_MAJOR "3")
|
||||||
|
set(PROJECT_VERSION_MINOR "2")
|
||||||
|
set(PROJECT_VERSION_PATCH "1")
|
||||||
|
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)
|
||||||
|
|
||||||
message (STATUS "Version: ${PROJECT_VERSION}")
|
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)
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||||
set (ADD_CXX_FLAGS "-Wall")
|
set(CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11")
|
||||||
set (CMAKE_CXX_FLAGS "-O0 ${ADD_CXX_FLAGS}")
|
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
|
||||||
set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
|
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
|
||||||
set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
|
set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
|
||||||
|
# avoid newer gcc warnings
|
||||||
|
add_definitions(-D_DEFAULT_SOURCE)
|
||||||
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -stdlib=libc++")
|
||||||
|
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
|
||||||
|
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
|
||||||
|
set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
|
||||||
|
# linker flags
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS "-lc++abi")
|
||||||
|
set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
|
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
|
||||||
else ()
|
else ()
|
||||||
message (STATUS "Unknown compiler")
|
message(FATAL_ERROR "Unknown compiler")
|
||||||
|
endif ()
|
||||||
|
if (CMAKE_BUILD_TYPE MATCHES Debug)
|
||||||
|
set(CMAKE_VERBOSE_MAKEFILE ON)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_subdirectory (ext-sysmon)
|
set(PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
|
||||||
add_subdirectory (ptm)
|
set(PROJECT_LIBRARY awesomewidgets)
|
||||||
|
set(PROJECT_MONITORSOURCES extsysmonsources)
|
||||||
|
include(libraries.cmake)
|
||||||
|
include(clang-format.cmake)
|
||||||
|
include(cppcheck.cmake)
|
||||||
|
include(coverity.cmake)
|
||||||
|
|
||||||
|
get_directory_property(CMAKE_DEFINITIONS COMPILE_DEFINITIONS)
|
||||||
|
configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
|
||||||
|
add_subdirectory(awesomewidgets)
|
||||||
|
add_subdirectory(extsysmonsources)
|
||||||
|
add_subdirectory(extsysmon)
|
||||||
|
if (BUILD_PLASMOIDS)
|
||||||
|
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)
|
||||||
|
97
sources/awdebug.cpp
Normal file
@ -0,0 +1,97 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 "awdebug.h"
|
||||||
|
|
||||||
|
|
||||||
|
Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
|
||||||
|
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)
|
||||||
|
|
||||||
|
|
||||||
|
const QStringList getBuildData()
|
||||||
|
{
|
||||||
|
QStringList metadata;
|
||||||
|
metadata.append(QString("=== Awesome Widgets configuration details ==="));
|
||||||
|
// build information
|
||||||
|
metadata.append(QString("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(QString("API details:"));
|
||||||
|
metadata.append(QString(" AWGIAPI: %1").arg(AWGIAPI));
|
||||||
|
metadata.append(QString(" AWEQAPI: %1").arg(AWEQAPI));
|
||||||
|
metadata.append(QString(" AWESAPI: %1").arg(AWESAPI));
|
||||||
|
metadata.append(QString(" AWEUAPI: %1").arg(AWEUAPI));
|
||||||
|
metadata.append(QString(" AWEWAPI: %1").arg(AWEWAPI));
|
||||||
|
metadata.append(QString(" AWEFAPI: %1").arg(AWEFAPI));
|
||||||
|
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(QString("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(QString("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;
|
||||||
|
}
|
43
sources/awdebug.h
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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"
|
||||||
|
|
||||||
|
#ifndef LOG_FORMAT
|
||||||
|
#define 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}"
|
||||||
|
#endif /* LOG_FORMAT */
|
||||||
|
|
||||||
|
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
|
||||||
|
|
||||||
|
const QStringList getBuildData();
|
||||||
|
|
||||||
|
|
||||||
|
#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)
|
28
sources/awesome-widget/metadata.desktop
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
[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-Plasma-RemoteLocation=
|
||||||
|
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
}
|
143
sources/awesome-widget/package/contents/config/main.xml
Normal file
@ -0,0 +1,143 @@
|
|||||||
|
<?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>
|
||||||
|
</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>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
</kcfg>
|
128
sources/awesome-widget/package/contents/ui/about.qml
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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.Layouts 1.0 as QtLayouts
|
||||||
|
|
||||||
|
import org.kde.plasma.private.awesomewidget 1.0
|
||||||
|
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: aboutPage
|
||||||
|
AWActions {
|
||||||
|
id: awActions
|
||||||
|
}
|
||||||
|
|
||||||
|
width: childrenRect.width
|
||||||
|
height: childrenRect.height
|
||||||
|
implicitWidth: pageColumn.implicitWidth
|
||||||
|
implicitHeight: pageColumn.implicitHeight
|
||||||
|
|
||||||
|
property bool debug: awActions.isDebugEnabled()
|
||||||
|
|
||||||
|
|
||||||
|
Column {
|
||||||
|
id: pageColumn
|
||||||
|
anchors.fill: parent
|
||||||
|
QtControls.TabView {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Tab {
|
||||||
|
anchors.margins: 10.0
|
||||||
|
title: i18n("About")
|
||||||
|
|
||||||
|
QtLayouts.ColumnLayout {
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
text: awActions.getAboutText("header")
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
text: awActions.getAboutText("version")
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
horizontalAlignment: Text.AlignJustify
|
||||||
|
text: awActions.getAboutText("description")
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
horizontalAlignment: Text.AlignLeft
|
||||||
|
textFormat: Text.RichText
|
||||||
|
text: awActions.getAboutText("links")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillHeight: true
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
font.capitalization: Font.SmallCaps
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
verticalAlignment: Text.AlignBottom
|
||||||
|
textFormat: Text.RichText
|
||||||
|
text: awActions.getAboutText("copy")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Tab {
|
||||||
|
anchors.margins: 10.0
|
||||||
|
title: i18n("Acknowledgment")
|
||||||
|
|
||||||
|
QtLayouts.ColumnLayout {
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
horizontalAlignment: Text.AlignJustify
|
||||||
|
text: awActions.getAboutText("translators")
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
horizontalAlignment: Text.AlignJustify
|
||||||
|
textFormat: Text.RichText
|
||||||
|
text: awActions.getAboutText("3rdparty")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Label {
|
||||||
|
QtLayouts.Layout.fillHeight: true
|
||||||
|
QtLayouts.Layout.fillWidth: true
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
horizontalAlignment: Text.AlignJustify
|
||||||
|
verticalAlignment: Text.AlignTop
|
||||||
|
textFormat: Text.RichText
|
||||||
|
text: awActions.getAboutText("thanks")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
}
|
||||||
|
}
|
476
sources/awesome-widget/package/contents/ui/advanced.qml
Normal file
@ -0,0 +1,476 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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.2 as QtDialogs
|
||||||
|
|
||||||
|
import org.kde.plasma.private.awesomewidget 1.0
|
||||||
|
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: advancedPage
|
||||||
|
// backend
|
||||||
|
AWActions {
|
||||||
|
id: awActions
|
||||||
|
}
|
||||||
|
AWConfigHelper {
|
||||||
|
id: awConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
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.currentText
|
||||||
|
property alias cfg_customTime: customTime.text
|
||||||
|
property alias cfg_customUptime: customUptime.text
|
||||||
|
property alias cfg_acOnline: acOnline.text
|
||||||
|
property alias cfg_acOffline: acOffline.text
|
||||||
|
|
||||||
|
|
||||||
|
Column {
|
||||||
|
id: pageColumn
|
||||||
|
anchors.fill: parent
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.heigth
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: background
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Enable background")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.heigth
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: translate
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Translate strings")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.heigth
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: wrapNewLines
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Wrap new lines")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.heigth
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: wordWrap
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Enable word wrap")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.heigth
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: notify
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Enable notifications")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.heigth
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: updates
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Check updates on startup")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.heigth
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: optimize
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Optimize subscription")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Widget height, px")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
id: widgetHeight
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
minimumValue: 0
|
||||||
|
maximumValue: 4096
|
||||||
|
stepSize: 50
|
||||||
|
value: plasmoid.configuration.height
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Widget width, px")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
id: widgetWidth
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
minimumValue: 0
|
||||||
|
maximumValue: 4096
|
||||||
|
stepSize: 50
|
||||||
|
value: plasmoid.configuration.width
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Time interval")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
id: update
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
minimumValue: 1000
|
||||||
|
maximumValue: 10000
|
||||||
|
stepSize: 500
|
||||||
|
value: plasmoid.configuration.interval
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Messages queue limit")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
id: queueLimit
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
minimumValue: 0
|
||||||
|
maximumValue: 99
|
||||||
|
stepSize: 1
|
||||||
|
value: plasmoid.configuration.queueLimit
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Temperature units")
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: tempUnits
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
textRole: "label"
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
onCurrentIndexChanged: cfg_tempUnits = model[currentIndex]["name"]
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
for (var i = 0; i < model.length; i++) {
|
||||||
|
if (model[i]["name"] == plasmoid.configuration.tempUnits) {
|
||||||
|
if (debug) console.info("Found", model[i]["name"], "on", i)
|
||||||
|
tempUnits.currentIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Custom time format")
|
||||||
|
}
|
||||||
|
QtControls.TextField {
|
||||||
|
id: customTime
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: plasmoid.configuration.customTime
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Custom uptime format")
|
||||||
|
}
|
||||||
|
QtControls.TextField {
|
||||||
|
id: customUptime
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: plasmoid.configuration.customUptime
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("AC online tag")
|
||||||
|
}
|
||||||
|
QtControls.TextField {
|
||||||
|
id: acOnline
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: plasmoid.configuration.acOnline
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("AC offline tag")
|
||||||
|
}
|
||||||
|
QtControls.TextField {
|
||||||
|
id: acOffline
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: plasmoid.configuration.acOffline
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Drop key cache")
|
||||||
|
onClicked: awActions.dropCache()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Export configuration")
|
||||||
|
onClicked: saveConfigAs.open()
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.FileDialog {
|
||||||
|
id: saveConfigAs
|
||||||
|
selectExisting: false
|
||||||
|
title: i18n("Export")
|
||||||
|
folder: awConfig.configurationDirectory()
|
||||||
|
onAccepted: {
|
||||||
|
var status = awConfig.exportConfiguration(
|
||||||
|
plasmoid.configuration,
|
||||||
|
saveConfigAs.fileUrl.toString().replace("file://", ""))
|
||||||
|
if (status) {
|
||||||
|
messageDialog.title = i18n("Success")
|
||||||
|
messageDialog.text = i18n("Please note that binary files were not copied")
|
||||||
|
} else {
|
||||||
|
messageDialog.title = i18n("Ooops...")
|
||||||
|
messageDialog.text = i18n("Could not save configuration file")
|
||||||
|
}
|
||||||
|
messageDialog.open()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.MessageDialog {
|
||||||
|
id: messageDialog
|
||||||
|
standardButtons: QtDialogs.StandardButton.Ok
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Import configuration")
|
||||||
|
onClicked: openConfig.open()
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.FileDialog {
|
||||||
|
id: openConfig
|
||||||
|
title: i18n("Import")
|
||||||
|
folder: awConfig.configurationDirectory()
|
||||||
|
onAccepted: importSelection.open()
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.Dialog {
|
||||||
|
id: importSelection
|
||||||
|
|
||||||
|
Column {
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: importPlasmoid
|
||||||
|
text: i18n("Import plasmoid settings")
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: importExtensions
|
||||||
|
text: i18n("Import extensions")
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.CheckBox {
|
||||||
|
id: importAdds
|
||||||
|
text: i18n("Import additional files")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onAccepted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
var importConfig = awConfig.importConfiguration(
|
||||||
|
openConfig.fileUrl.toString().replace("file://", ""),
|
||||||
|
importPlasmoid.checked, importExtensions.checked,
|
||||||
|
importAdds.checked)
|
||||||
|
for (var key in importConfig)
|
||||||
|
plasmoid.configuration[key] = importConfig[key]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
}
|
||||||
|
}
|
243
sources/awesome-widget/package/contents/ui/appearance.qml
Normal file
@ -0,0 +1,243 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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.Controls.Styles 1.3 as QtStyles
|
||||||
|
import QtQuick.Dialogs 1.1 as QtDialogs
|
||||||
|
|
||||||
|
import org.kde.plasma.private.awesomewidget 1.0
|
||||||
|
|
||||||
|
|
||||||
|
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: selectFont.text
|
||||||
|
property alias cfg_fontSize: fontSize.value
|
||||||
|
property string cfg_fontWeight: fontWeight.currentText
|
||||||
|
property string cfg_fontStyle: fontStyle.currentText
|
||||||
|
property alias cfg_fontColor: selectColor.text
|
||||||
|
|
||||||
|
|
||||||
|
Column {
|
||||||
|
id: pageColumn
|
||||||
|
anchors.fill: parent
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width / 3
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Font")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: selectFont
|
||||||
|
width: parent.width * 2 / 3
|
||||||
|
text: plasmoid.configuration.fontFamily
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
fontDialog.setFont()
|
||||||
|
fontDialog.visible = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width / 3
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Font size")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
id: fontSize
|
||||||
|
width: parent.width * 2 / 3
|
||||||
|
minimumValue: 8
|
||||||
|
maximumValue: 32
|
||||||
|
stepSize: 1
|
||||||
|
value: plasmoid.configuration.fontSize
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width / 3
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Font weight")
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: fontWeight
|
||||||
|
width: parent.width * 2 / 3
|
||||||
|
textRole: "label"
|
||||||
|
model: [
|
||||||
|
{
|
||||||
|
'label': i18n("light"),
|
||||||
|
'name': "light"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("normal"),
|
||||||
|
'name': "normal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("demi bold"),
|
||||||
|
'name': "demibold"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("bold"),
|
||||||
|
'name': "bold"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("black"),
|
||||||
|
'name': "black"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
onCurrentIndexChanged: cfg_fontWeight = model[currentIndex]["name"]
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
for (var i = 0; i < model.length; i++) {
|
||||||
|
if (model[i]["name"] == plasmoid.configuration.fontWeight) {
|
||||||
|
if (debug) console.info("Found", model[i]["name"], "on", i)
|
||||||
|
fontWeight.currentIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width / 3
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Font style")
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: fontStyle
|
||||||
|
width: parent.width * 2 / 3
|
||||||
|
textRole: "label"
|
||||||
|
model: [
|
||||||
|
{
|
||||||
|
'label': i18n("normal"),
|
||||||
|
'name': "normal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("italic"),
|
||||||
|
'name': "italic"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
onCurrentIndexChanged: cfg_fontStyle = model[currentIndex]["name"]
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
for (var i = 0; i < model.length; i++) {
|
||||||
|
if (model[i]["name"] == plasmoid.configuration.fontStyle) {
|
||||||
|
if (debug) console.info("Found", model[i]["name"], "on", i)
|
||||||
|
fontStyle.currentIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width / 3
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Font color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: selectColor
|
||||||
|
width: parent.width * 2 / 3
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.fontColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.fontColor
|
||||||
|
onClicked: colorDialog.visible = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: colorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: selectColor.text
|
||||||
|
onAccepted: selectColor.text = colorDialog.color
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.FontDialog {
|
||||||
|
id: fontDialog
|
||||||
|
title: i18n("Select a font")
|
||||||
|
signal setFont
|
||||||
|
|
||||||
|
onAccepted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
selectFont.text = fontDialog.font.family
|
||||||
|
fontSize.value = fontDialog.font.pointSize
|
||||||
|
fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
|
||||||
|
fontWeight.currentIndex = weight[fontDialog.font.weight]
|
||||||
|
}
|
||||||
|
onSetFont: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
fontDialog.font = Qt.font({
|
||||||
|
family: selectFont.text,
|
||||||
|
pointSize: fontSize.value > 0 ? fontSize.value : 12,
|
||||||
|
italic: fontStyle.currentIndex == 1,
|
||||||
|
weight: Font.Normal,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
}
|
||||||
|
}
|
362
sources/awesome-widget/package/contents/ui/dataengine.qml
Normal file
@ -0,0 +1,362 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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")
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("ACPI path")
|
||||||
|
}
|
||||||
|
QtControls.TextField {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: cfg_dataengine["ACPIPATH"]
|
||||||
|
onEditingFinished: cfg_dataengine["ACPIPATH"] = text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
title: i18n("GPU")
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("GPU device")
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: gpuDev
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
model: ["auto", "disable", "ati", "nvidia"]
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
for (var i=0; i<model.length; i++) {
|
||||||
|
if (model[i] == cfg_dataengine["GPUDEV"]) {
|
||||||
|
if (debug) console.info("Found", model[i], "on", i)
|
||||||
|
currentIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
title: i18n("HDD temperature")
|
||||||
|
Column {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("HDD")
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: hdd
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("hddtemp cmd")
|
||||||
|
}
|
||||||
|
QtControls.TextField {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: cfg_dataengine["HDDTEMPCMD"]
|
||||||
|
onEditingFinished: cfg_dataengine["HDDTEMPCMD"] = text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
title: i18n("Player")
|
||||||
|
Column {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Player data symbols")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
minimumValue: 1
|
||||||
|
maximumValue: 100
|
||||||
|
stepSize: 1
|
||||||
|
value: cfg_dataengine["PLAYERSYMBOLS"]
|
||||||
|
onEditingFinished: cfg_dataengine["PLAYERSYMBOLS"] = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Music player")
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: player
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
model: ["disable", "mpris", "mpd"]
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
for (var i=0; i<model.length; i++) {
|
||||||
|
if (model[i] == cfg_dataengine["PLAYER"]) {
|
||||||
|
if (debug) console.info("Found", model[i], "on", i)
|
||||||
|
player.currentIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("MPRIS player name")
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: mpris
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
editable: true
|
||||||
|
model: ["auto", "amarok", "audacious", "clementine", "deadbeef",
|
||||||
|
"vlc", "qmmp", "xmms2", cfg_dataengine["MPRIS"]]
|
||||||
|
currentIndex: model.length - 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("MPD address")
|
||||||
|
}
|
||||||
|
QtControls.TextField {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: cfg_dataengine["MPDADDRESS"]
|
||||||
|
onEditingFinished: cfg_dataengine["MPDADDRESS"] = text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("MPD port")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
minimumValue: 1000
|
||||||
|
maximumValue: 65535
|
||||||
|
stepSize: 1
|
||||||
|
value: cfg_dataengine["MPDPORT"]
|
||||||
|
onEditingFinished: cfg_dataengine["MPDPORT"] = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
title: i18n("Extensions")
|
||||||
|
Column {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Custom scripts")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Edit scripts")
|
||||||
|
onClicked: awKeys.editItem("extscript")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Quotes monitor")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Edit tickers")
|
||||||
|
onClicked: awKeys.editItem("extquotes")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Package manager")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Edit command")
|
||||||
|
onClicked: awKeys.editItem("extupgrade")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Weather")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
text: i18n("Edit weather")
|
||||||
|
onClicked: awKeys.editItem("extweather")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
|
||||||
|
// init submodule
|
||||||
|
awKeys.updateCache()
|
||||||
|
|
||||||
|
// update hdd model
|
||||||
|
hdd.model = awKeys.getHddDevices()
|
||||||
|
for (var i=0; i<hdd.model.length; i++) {
|
||||||
|
if (hdd.model[i] == cfg_dataengine["HDDDEV"]) {
|
||||||
|
if (debug) console.info("Found", hdd.model[i], "on", i)
|
||||||
|
hdd.currentIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Component.onDestruction: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
|
||||||
|
cfg_dataengine["GPUDEV"] = gpuDev.currentText
|
||||||
|
cfg_dataengine["HDDDEV"] = hdd.currentText
|
||||||
|
cfg_dataengine["PLAYER"] = player.currentText
|
||||||
|
cfg_dataengine["MPRIS"] = mpris.currentText
|
||||||
|
awConfig.writeDataEngineConfiguration(cfg_dataengine)
|
||||||
|
}
|
||||||
|
}
|
36
sources/awesome-widget/package/contents/ui/general.qml
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
pragma Singleton
|
||||||
|
import QtQuick 2.0
|
||||||
|
|
||||||
|
|
||||||
|
QtObject {
|
||||||
|
property variant fontWeight: {
|
||||||
|
"light": Font.Light,
|
||||||
|
"normal": Font.Normal,
|
||||||
|
"demibold": Font.DemiBold,
|
||||||
|
"bold": Font.Bold,
|
||||||
|
"black": Font.Black
|
||||||
|
}
|
||||||
|
property variant align: {
|
||||||
|
"left": Text.AlignLeft,
|
||||||
|
"center": Text.AlignHCenter,
|
||||||
|
"right": Text.AlignRight,
|
||||||
|
"justify": Text.AlignJustify
|
||||||
|
}
|
||||||
|
}
|
224
sources/awesome-widget/package/contents/ui/main.qml
Normal file
@ -0,0 +1,224 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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
|
||||||
|
}
|
||||||
|
|
||||||
|
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]
|
||||||
|
|
||||||
|
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")
|
||||||
|
// 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)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function action_checkUpdates() {
|
||||||
|
if (debug) console.debug()
|
||||||
|
|
||||||
|
return awActions.checkUpdates(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
function action_showReadme() {
|
||||||
|
if (debug) console.debug()
|
||||||
|
|
||||||
|
return awActions.showReadme()
|
||||||
|
}
|
||||||
|
|
||||||
|
function action_requestKey() {
|
||||||
|
if (debug) console.debug()
|
||||||
|
|
||||||
|
tagSelectorBox.model = awKeys.dictKeys(true)
|
||||||
|
return tagSelector.open()
|
||||||
|
}
|
||||||
|
}
|
1
sources/awesome-widget/package/contents/ui/qmldir
Normal file
@ -0,0 +1 @@
|
|||||||
|
singleton general 1.0 general.qml
|
420
sources/awesome-widget/package/contents/ui/tooltip.qml
Normal file
@ -0,0 +1,420 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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.Controls.Styles 1.3 as QtStyles
|
||||||
|
import QtQuick.Dialogs 1.1 as QtDialogs
|
||||||
|
|
||||||
|
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.text
|
||||||
|
property alias cfg_cpuTooltip: cpuTooltip.checked
|
||||||
|
property alias cfg_cpuTooltipColor: cpuTooltipColor.text
|
||||||
|
property alias cfg_cpuclTooltip: cpuclTooltip.checked
|
||||||
|
property alias cfg_cpuclTooltipColor: cpuclTooltipColor.text
|
||||||
|
property alias cfg_memTooltip: memTooltip.checked
|
||||||
|
property alias cfg_memTooltipColor: memTooltipColor.text
|
||||||
|
property alias cfg_swapTooltip: swapTooltip.checked
|
||||||
|
property alias cfg_swapTooltipColor: swapTooltipColor.text
|
||||||
|
property alias cfg_downkbTooltip: downkbTooltip.checked
|
||||||
|
property alias cfg_downkbTooltipColor: downkbTooltipColor.text
|
||||||
|
property alias cfg_upkbTooltipColor: upkbTooltipColor.text
|
||||||
|
property alias cfg_batTooltip: batTooltip.checked
|
||||||
|
property alias cfg_batTooltipColor: batTooltipColor.text
|
||||||
|
property alias cfg_batInTooltipColor: batInTooltipColor.text
|
||||||
|
|
||||||
|
|
||||||
|
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.")
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Number of values for tooltips")
|
||||||
|
}
|
||||||
|
QtControls.SpinBox {
|
||||||
|
id: tooltipNumber
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
minimumValue: 50
|
||||||
|
maximumValue: 1000
|
||||||
|
stepSize: 25
|
||||||
|
value: plasmoid.configuration.tooltipNumber
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
id: useTooltipBackground
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
checkable: true
|
||||||
|
title: i18n("Background")
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Background color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: tooltipBackground
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.tooltipBackground
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.tooltipBackground
|
||||||
|
onClicked: tooltipBackgroundDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: tooltipBackgroundDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: tooltipBackground.text
|
||||||
|
onAccepted: tooltipBackground.text = tooltipBackgroundDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
id: cpuTooltip
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
checkable: true
|
||||||
|
title: i18n("CPU")
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("CPU color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: cpuTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.cpuTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.cpuTooltipColor
|
||||||
|
onClicked: cpuTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: cpuTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: cpuTooltipColor.text
|
||||||
|
onAccepted: cpuTooltipColor.text = cpuTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
id: cpuclTooltip
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
checkable: true
|
||||||
|
title: i18n("CPU clock")
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("CPU clock color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: cpuclTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.cpuclTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.cpuclTooltipColor
|
||||||
|
onClicked: cpuclTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: cpuclTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: cpuclTooltipColor.text
|
||||||
|
onAccepted: cpuclTooltipColor.text = cpuclTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
id: memTooltip
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
checkable: true
|
||||||
|
title: i18n("Memory")
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Memory color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: memTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.memTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.memTooltipColor
|
||||||
|
onClicked: memTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: memTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: memTooltipColor.text
|
||||||
|
onAccepted: memTooltipColor.text = memTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
id: swapTooltip
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
checkable: true
|
||||||
|
title: i18n("Swap")
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Swap color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: swapTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.swapTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.swapTooltipColor
|
||||||
|
onClicked: swapTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: swapTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: swapTooltipColor.text
|
||||||
|
onAccepted: swapTooltipColor.text = swapTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
id: downkbTooltip
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
checkable: true
|
||||||
|
title: i18n("Network")
|
||||||
|
Column {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Download speed color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: downkbTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.downkbTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.downkbTooltipColor
|
||||||
|
onClicked: downkbTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: downkbTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: downkbTooltipColor.text
|
||||||
|
onAccepted: downkbTooltipColor.text = downkbTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Upload speed color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: upkbTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.upkbTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.upkbTooltipColor
|
||||||
|
onClicked: upkbTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: upkbTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: upkbTooltipColor.text
|
||||||
|
onAccepted: upkbTooltipColor.text = upkbTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.GroupBox {
|
||||||
|
id: batTooltip
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
checkable: true
|
||||||
|
title: i18n("Battery")
|
||||||
|
Column {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Battery active color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: batTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.batTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.batTooltipColor
|
||||||
|
onClicked: batTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: batTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: batTooltipColor.text
|
||||||
|
onAccepted: batTooltipColor.text = batTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Label {
|
||||||
|
height: parent.height
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: i18n("Battery inactive color")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
id: batInTooltipColor
|
||||||
|
width: parent.width * 3 / 5
|
||||||
|
style: QtStyles.ButtonStyle {
|
||||||
|
background: Rectangle {
|
||||||
|
color: plasmoid.configuration.batInTooltipColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
text: plasmoid.configuration.batInTooltipColor
|
||||||
|
onClicked: batInTooltipColorDialog.visible = true
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: batInTooltipColorDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
color: batInTooltipColor.text
|
||||||
|
onAccepted: batInTooltipColor.text = batInTooltipColorDialog.color
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
}
|
||||||
|
}
|
385
sources/awesome-widget/package/contents/ui/widget.qml
Normal file
@ -0,0 +1,385 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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.2 as QtDialogs
|
||||||
|
|
||||||
|
import org.kde.plasma.private.awesomewidget 1.0
|
||||||
|
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: widgetPage
|
||||||
|
// backend
|
||||||
|
AWKeys {
|
||||||
|
id: awKeys
|
||||||
|
}
|
||||||
|
AWActions {
|
||||||
|
id: awActions
|
||||||
|
}
|
||||||
|
AWFormatterConfigFactory {
|
||||||
|
id: awFormatter
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
QtControls.Label {
|
||||||
|
width: parent.width
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 15
|
||||||
|
text: i18n("Bgcolor")
|
||||||
|
|
||||||
|
onClicked: backgroundDialog.visible = true
|
||||||
|
|
||||||
|
QtDialogs.ColorDialog {
|
||||||
|
id: backgroundDialog
|
||||||
|
title: i18n("Select a color")
|
||||||
|
onAccepted: {
|
||||||
|
var text = textPattern.text
|
||||||
|
textPattern.text = "<body bgcolor=\"" +
|
||||||
|
backgroundDialog.color + "\">" +
|
||||||
|
text + "</body>"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 15
|
||||||
|
text: i18n("Font")
|
||||||
|
iconName: "font"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Font button")
|
||||||
|
var defaultFont = {
|
||||||
|
"color": plasmoid.configuration.fontColor,
|
||||||
|
"family": plasmoid.configuration.fontFamily,
|
||||||
|
"size": plasmoid.configuration.fontSize
|
||||||
|
}
|
||||||
|
var font = awActions.getFont(defaultFont)
|
||||||
|
if (font.applied != 1) {
|
||||||
|
if (debug) console.debug("No font selected")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition,
|
||||||
|
"<span style=\"color:" + font.color +
|
||||||
|
"; font-family:'" + font.family +
|
||||||
|
"'; font-size:" + font.size + "pt;\">" +
|
||||||
|
selected + "</span>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-indent-more"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Indent button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, selected + "<br>\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-text-bold"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Bold button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<b>" + selected + "</b>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-text-italic"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Italic button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<i>" + selected + "</i>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-text-underline"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Underline button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<u>" + selected + "</u>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-text-strikethrough"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Strike button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<s>" + selected + "</s>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-justify-left"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Left button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<p align=\"left\">" + selected + "</p>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-justify-center"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Center button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<p align=\"center\">" + selected + "</p>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-justify-right"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Right button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<p align=\"right\">" + selected + "</p>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width / 15
|
||||||
|
iconName: "format-justify-fill"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (debug) console.debug("Justify button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, "<p align=\"justify\">" + selected + "</p>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.ComboBox {
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
textRole: "label"
|
||||||
|
model: [
|
||||||
|
{
|
||||||
|
'label': i18n("AC"),
|
||||||
|
'regexp': "^(ac|bat).*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Bars"),
|
||||||
|
'regexp': "^bar.*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("CPU"),
|
||||||
|
'regexp': "^(cpu|gpu|la|ps|temp(?!erature)).*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Desktops"),
|
||||||
|
'regexp': "^(n|t)?desktop(s)?"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("HDD"),
|
||||||
|
'regexp': "^hdd.*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Memory"),
|
||||||
|
'regexp': "^(mem|swap).*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Network"),
|
||||||
|
'regexp': "^(netdev|(down|up(?!time)).*)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Music player"),
|
||||||
|
'regexp': "(^|d|s)(album|artist|duration|progress|title)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Scripts"),
|
||||||
|
'regexp': "^custom.*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Time"),
|
||||||
|
'regexp': ".*time$"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Quotes"),
|
||||||
|
'regexp': "^(perc)?(ask|bid|price)(chg)?.*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Upgrades"),
|
||||||
|
'regexp': "^pkgcount.*"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Weathers"),
|
||||||
|
'regexp': "^(weather(Id)?|humidity|pressure|temperature|timestamp)"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'label': i18n("Functions"),
|
||||||
|
'regexp': "functions"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
onCurrentIndexChanged: {
|
||||||
|
if (debug) console.debug()
|
||||||
|
if (model[currentIndex]["regexp"] == "functions")
|
||||||
|
tags.model = ["{{\n\n}}", "template{{\n\n}}",
|
||||||
|
"aw_all<>{{}}", "aw_count<>{{}}", "aw_keys<>{{}}",
|
||||||
|
"aw_macro<>{{}}", "aw_names<>{{}}"]
|
||||||
|
else
|
||||||
|
tags.model = awKeys.dictKeys(true, model[currentIndex]["regexp"])
|
||||||
|
if (debug) console.info("Init model", tags.model, "for", model[currentIndex]["label"])
|
||||||
|
tags.currentIndex = -1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.ComboBox {
|
||||||
|
id: tags
|
||||||
|
width: parent.width * 1 / 5
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 1 / 5
|
||||||
|
text: i18n("Add")
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (!tags.currentText) return
|
||||||
|
if (debug) console.debug("Add tag button")
|
||||||
|
var selected = textPattern.selectedText
|
||||||
|
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
|
||||||
|
textPattern.insert(textPattern.cursorPosition, selected + "$" + tags.currentText)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 1 / 5
|
||||||
|
text: i18n("Show value")
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
if (!tags.currentText) return
|
||||||
|
if (debug) console.debug("Show tag button")
|
||||||
|
var message = i18n("Tag: %1", tags.currentText)
|
||||||
|
message += "<br>"
|
||||||
|
message += i18n("Value: %1", awKeys.valueByKey(tags.currentText))
|
||||||
|
message += "<br>"
|
||||||
|
message += i18n("Info: %1", awKeys.infoByKey(tags.currentText))
|
||||||
|
awActions.sendNotification("tag", message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Row {
|
||||||
|
height: implicitHeight
|
||||||
|
width: parent.width
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 10
|
||||||
|
text: i18n("Edit bars")
|
||||||
|
onClicked: awKeys.editItem("graphicalitem")
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 3 / 10
|
||||||
|
text: i18n("Formatters")
|
||||||
|
onClicked: awFormatter.showDialog(awKeys.dictKeys(true))
|
||||||
|
}
|
||||||
|
QtControls.Button {
|
||||||
|
width: parent.width * 2 / 5
|
||||||
|
text: i18n("Preview")
|
||||||
|
onClicked: {
|
||||||
|
lock = false
|
||||||
|
awKeys.initKeys(textPattern.text, plasmoid.configuration.interval,
|
||||||
|
plasmoid.configuration.queueLimit, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtControls.TextArea {
|
||||||
|
id: textPattern
|
||||||
|
width: parent.width
|
||||||
|
height: parent.height * 4 / 5
|
||||||
|
textFormat: TextEdit.PlainText
|
||||||
|
text: plasmoid.configuration.text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QtDialogs.MessageDialog {
|
||||||
|
id: compiledText
|
||||||
|
modality: Qt.NonModal
|
||||||
|
title: i18n("Preview")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
||||||
|
compiledText.text = newText.replace(/ /g, " ")
|
||||||
|
compiledText.open()
|
||||||
|
lock = true;
|
||||||
|
}
|
||||||
|
}
|
28
sources/awesome-widget/package/metadata.desktop
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
[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-Plasma-RemoteLocation=
|
||||||
|
|
||||||
|
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.2.1
|
||||||
|
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})
|
76
sources/awesome-widget/plugin/awabstractselector.cpp
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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)
|
||||||
|
: QWidget(parent)
|
||||||
|
, ui(new Ui::AWAbstractSelector)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
49
sources/awesome-widget/plugin/awabstractselector.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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);
|
||||||
|
virtual ~AWAbstractSelector();
|
||||||
|
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>
|
181
sources/awesome-widget/plugin/awactions.cpp
Normal file
@ -0,0 +1,181 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 <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__;
|
||||||
|
|
||||||
|
delete m_updateHelper;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWActions::checkUpdates(const bool showAnyway)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Show anyway" << showAnyway;
|
||||||
|
|
||||||
|
if (!m_updateHelper->checkVersion())
|
||||||
|
m_updateHelper->checkUpdates(showAnyway);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// HACK: since QML could not use QLoggingCategory I need this hack
|
||||||
|
bool AWActions::isDebugEnabled() const
|
||||||
|
{
|
||||||
|
return LOG_AW().isDebugEnabled();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool AWActions::runCmd(const QString cmd) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Cmd" << cmd;
|
||||||
|
|
||||||
|
sendNotification(QString("Info"), i18n("Run %1", cmd));
|
||||||
|
|
||||||
|
return QProcess::startDetached(cmd);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// HACK: this method uses variable from version.h
|
||||||
|
void AWActions::showReadme() const
|
||||||
|
{
|
||||||
|
QDesktopServices::openUrl(QUrl(HOMEPAGE));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// HACK: this method uses variables from version.h
|
||||||
|
QString AWActions::getAboutText(const QString type) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Type" << type;
|
||||||
|
|
||||||
|
QString text;
|
||||||
|
if (type == QString("header")) {
|
||||||
|
text = QString(NAME);
|
||||||
|
} else if (type == QString("version")) {
|
||||||
|
text = i18n("Version %1 (build date %2)", QString(VERSION),
|
||||||
|
QString(BUILD_DATE));
|
||||||
|
if (!QString(COMMIT_SHA).isEmpty())
|
||||||
|
text += QString(" (%1)").arg(QString(COMMIT_SHA));
|
||||||
|
} else if (type == QString("description")) {
|
||||||
|
text = i18n("A set of minimalistic plasmoid widgets");
|
||||||
|
} else if (type == QString("links")) {
|
||||||
|
text = i18n("Links:") + QString("<br>")
|
||||||
|
+ QString("<a href=\"%1\">%2</a><br>")
|
||||||
|
.arg(QString(HOMEPAGE))
|
||||||
|
.arg(i18n("Homepage"))
|
||||||
|
+ QString("<a href=\"%1\">%2</a><br>")
|
||||||
|
.arg(QString(REPOSITORY))
|
||||||
|
.arg(i18n("Repository"))
|
||||||
|
+ QString("<a href=\"%1\">%2</a><br>")
|
||||||
|
.arg(QString(BUGTRACKER))
|
||||||
|
.arg(i18n("Bugtracker"))
|
||||||
|
+ QString("<a href=\"%1\">%2</a><br>")
|
||||||
|
.arg(QString(TRANSLATION))
|
||||||
|
.arg(i18n("Translation issue"))
|
||||||
|
+ QString("<a href=\"%1\">%2</a><br>")
|
||||||
|
.arg(QString(AUR_PACKAGES))
|
||||||
|
.arg(i18n("AUR packages"))
|
||||||
|
+ QString("<a href=\"%1\">%2</a>")
|
||||||
|
.arg(QString(OPENSUSE_PACKAGES))
|
||||||
|
.arg(i18n("openSUSE packages"));
|
||||||
|
} else if (type == QString("copy")) {
|
||||||
|
text = QString("<small>© %1 <a href=\"mailto:%2\">%3</a><br>")
|
||||||
|
.arg(QString(DATE))
|
||||||
|
.arg(QString(EMAIL))
|
||||||
|
.arg(QString(AUTHOR))
|
||||||
|
+ i18n("This software is licensed under %1", QString(LICENSE))
|
||||||
|
+ QString("</small>");
|
||||||
|
} else if (type == QString("translators")) {
|
||||||
|
text = i18n("Translators: %1", QString(TRANSLATORS));
|
||||||
|
} else if (type == QString("3rdparty")) {
|
||||||
|
QStringList trdPartyList
|
||||||
|
= QString(TRDPARTY_LICENSE)
|
||||||
|
.split(QChar(';'), QString::SkipEmptyParts);
|
||||||
|
for (int i = 0; i < trdPartyList.count(); i++)
|
||||||
|
trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
|
||||||
|
.arg(trdPartyList.at(i).split(QChar(','))[0])
|
||||||
|
.arg(trdPartyList.at(i).split(QChar(','))[1])
|
||||||
|
.arg(trdPartyList.at(i).split(QChar(','))[2]);
|
||||||
|
text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
|
||||||
|
} else if (type == QString("thanks")) {
|
||||||
|
QStringList thanks = QString(SPECIAL_THANKS)
|
||||||
|
.split(QChar(';'), QString::SkipEmptyParts);
|
||||||
|
for (int i = 0; i < thanks.count(); i++)
|
||||||
|
thanks[i] = QString("<a href=\"%2\">%1</a>")
|
||||||
|
.arg(thanks.at(i).split(QChar(','))[0])
|
||||||
|
.arg(thanks.at(i).split(QChar(','))[1]);
|
||||||
|
text = i18n("Special thanks to %1", thanks.join(QString(", ")));
|
||||||
|
}
|
||||||
|
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QVariantMap AWActions::getFont(const QVariantMap defaultFont) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Default font is" << defaultFont;
|
||||||
|
|
||||||
|
QVariantMap fontMap;
|
||||||
|
int ret = 0;
|
||||||
|
CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
|
||||||
|
defaultFont[QString("size")].toInt(), 400, false,
|
||||||
|
defaultFont[QString("color")].toString());
|
||||||
|
CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
|
||||||
|
false, &ret);
|
||||||
|
|
||||||
|
fontMap[QString("applied")] = ret;
|
||||||
|
fontMap[QString("color")] = font.color().name();
|
||||||
|
fontMap[QString("family")] = font.family();
|
||||||
|
fontMap[QString("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(
|
||||||
|
QString("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);
|
||||||
|
virtual ~AWActions();
|
||||||
|
Q_INVOKABLE void checkUpdates(const bool showAnyway = false);
|
||||||
|
Q_INVOKABLE bool isDebugEnabled() const;
|
||||||
|
Q_INVOKABLE bool runCmd(const QString cmd = QString("/usr/bin/true")) const;
|
||||||
|
Q_INVOKABLE void showReadme() const;
|
||||||
|
// configuration slots
|
||||||
|
Q_INVOKABLE QString getAboutText(const QString type
|
||||||
|
= QString("header")) const;
|
||||||
|
Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const;
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
Q_INVOKABLE static void sendNotification(const QString eventId,
|
||||||
|
const QString message);
|
||||||
|
|
||||||
|
private:
|
||||||
|
AWUpdateHelper *m_updateHelper = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWACTIONS_H */
|
329
sources/awesome-widget/plugin/awconfighelper.cpp
Normal file
@ -0,0 +1,329 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 <KI18n/KLocalizedString>
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QQmlPropertyMap>
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QTextCodec>
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWConfigHelper::AWConfigHelper(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWConfigHelper::~AWConfigHelper()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWConfigHelper::configurationDirectory() const
|
||||||
|
{
|
||||||
|
// 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() const
|
||||||
|
{
|
||||||
|
QString fileName = QString("%1/awesomewidgets.ndx")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericCacheLocation));
|
||||||
|
|
||||||
|
return QFile(fileName).remove();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool AWConfigHelper::exportConfiguration(const QObject *nativeConfig,
|
||||||
|
const QString fileName) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Selected filename" << fileName;
|
||||||
|
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
|
||||||
|
// plasmoid configuration
|
||||||
|
const QQmlPropertyMap *configuration
|
||||||
|
= static_cast<const QQmlPropertyMap *>(nativeConfig);
|
||||||
|
settings.beginGroup(QString("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() << QString("*.desktop"),
|
||||||
|
QDir::Files);
|
||||||
|
settings.beginGroup(item);
|
||||||
|
for (auto it : items)
|
||||||
|
copyExtensions(it, item, settings, false);
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
// additional files
|
||||||
|
settings.beginGroup(QString("json"));
|
||||||
|
// script filters
|
||||||
|
readFile(settings, QString("filters"),
|
||||||
|
QString("%1/scripts/awesomewidgets-extscripts-filters.json")
|
||||||
|
.arg(m_baseDir));
|
||||||
|
// weather icon settings
|
||||||
|
readFile(settings, QString("weathers"),
|
||||||
|
QString("%1/weather/awesomewidgets-extweather-ids.json")
|
||||||
|
.arg(m_baseDir));
|
||||||
|
// formatter settings
|
||||||
|
readFile(settings, QString("formatters"),
|
||||||
|
QString("%1/formatters/formatters.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(QString("json"));
|
||||||
|
// script filters
|
||||||
|
writeFile(settings, QString("filters"),
|
||||||
|
QString("%1/scripts/awesomewidgets-extscripts-filters.json")
|
||||||
|
.arg(m_baseDir));
|
||||||
|
// weather icon settings
|
||||||
|
writeFile(settings, QString("weathers"),
|
||||||
|
QString("%1/weather/awesomewidgets-extweather-ids.json")
|
||||||
|
.arg(m_baseDir));
|
||||||
|
// formatter settings
|
||||||
|
writeFile(settings, QString("formatters"),
|
||||||
|
QString("%1/formatters/formatters.ini").arg(m_baseDir));
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
// plasmoid configuration
|
||||||
|
if (importPlasmoid) {
|
||||||
|
settings.beginGroup(QString("plasmoid"));
|
||||||
|
for (auto key : settings.childKeys())
|
||||||
|
configuration[key] = settings.value(key);
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
return configuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QVariantMap AWConfigHelper::readDataEngineConfiguration() const
|
||||||
|
{
|
||||||
|
QString fileName
|
||||||
|
= QStandardPaths::locate(QStandardPaths::ConfigLocation,
|
||||||
|
QString("plasma-dataengine-extsysmon.conf"));
|
||||||
|
qCInfo(LOG_AW) << "Configuration file" << fileName;
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
QVariantMap configuration;
|
||||||
|
|
||||||
|
settings.beginGroup(QString("Configuration"));
|
||||||
|
configuration[QString("ACPIPATH")] = settings.value(
|
||||||
|
QString("ACPIPATH"), QString("/sys/class/power_supply/"));
|
||||||
|
configuration[QString("GPUDEV")]
|
||||||
|
= settings.value(QString("GPUDEV"), QString("auto"));
|
||||||
|
configuration[QString("HDDDEV")]
|
||||||
|
= settings.value(QString("HDDDEV"), QString("all"));
|
||||||
|
configuration[QString("HDDTEMPCMD")]
|
||||||
|
= settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a"));
|
||||||
|
configuration[QString("MPDADDRESS")]
|
||||||
|
= settings.value(QString("MPDADDRESS"), QString("localhost"));
|
||||||
|
configuration[QString("MPDPORT")]
|
||||||
|
= settings.value(QString("MPDPORT"), QString("6600"));
|
||||||
|
configuration[QString("MPRIS")]
|
||||||
|
= settings.value(QString("MPRIS"), QString("auto"));
|
||||||
|
configuration[QString("PLAYER")]
|
||||||
|
= settings.value(QString("PLAYER"), QString("mpris"));
|
||||||
|
configuration[QString("PLAYERSYMBOLS")]
|
||||||
|
= settings.value(QString("PLAYERSYMBOLS"), QString("10"));
|
||||||
|
settings.endGroup();
|
||||||
|
|
||||||
|
qCInfo(LOG_AW) << "Configuration" << configuration;
|
||||||
|
|
||||||
|
return configuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool AWConfigHelper::writeDataEngineConfiguration(
|
||||||
|
const QVariantMap configuration) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Configuration" << configuration;
|
||||||
|
|
||||||
|
QString fileName
|
||||||
|
= QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)
|
||||||
|
+ QString("/plasma-dataengine-extsysmon.conf");
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
|
||||||
|
|
||||||
|
settings.beginGroup(QString("Configuration"));
|
||||||
|
settings.setValue(QString("ACPIPATH"), configuration[QString("ACPIPATH")]);
|
||||||
|
settings.setValue(QString("GPUDEV"), configuration[QString("GPUDEV")]);
|
||||||
|
settings.setValue(QString("HDDDEV"), configuration[QString("HDDDEV")]);
|
||||||
|
settings.setValue(QString("HDDTEMPCMD"),
|
||||||
|
configuration[QString("HDDTEMPCMD")]);
|
||||||
|
settings.setValue(QString("MPDADDRESS"),
|
||||||
|
configuration[QString("MPDADDRESS")]);
|
||||||
|
settings.setValue(QString("MPDPORT"), configuration[QString("MPDPORT")]);
|
||||||
|
settings.setValue(QString("MPRIS"), configuration[QString("MPRIS")]);
|
||||||
|
settings.setValue(QString("PLAYER"), configuration[QString("PLAYER")]);
|
||||||
|
settings.setValue(QString("PLAYERSYMBOLS"),
|
||||||
|
configuration[QString("PLAYERSYMBOLS")]);
|
||||||
|
settings.endGroup();
|
||||||
|
|
||||||
|
settings.sync();
|
||||||
|
|
||||||
|
return (settings.status() == QSettings::NoError);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWConfigHelper::copyConfigs(const QString localDir) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Local directory" << localDir;
|
||||||
|
|
||||||
|
QStringList dirs = QStandardPaths::locateAll(
|
||||||
|
QStandardPaths::GenericDataLocation, QString("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(QString("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) const
|
||||||
|
{
|
||||||
|
for (auto key : from.childKeys())
|
||||||
|
to.setValue(key, from.value(key));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWConfigHelper::readFile(QSettings &settings, const QString key,
|
||||||
|
const QString fileName) const
|
||||||
|
{
|
||||||
|
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" << file.fileName();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWConfigHelper::writeFile(QSettings &settings, const QString key,
|
||||||
|
const QString fileName) const
|
||||||
|
{
|
||||||
|
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" << file.fileName();
|
||||||
|
}
|
||||||
|
}
|
70
sources/awesome-widget/plugin/awconfighelper.h
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 <QStandardPaths>
|
||||||
|
#include <QVariant>
|
||||||
|
|
||||||
|
|
||||||
|
class QSettings;
|
||||||
|
|
||||||
|
class AWConfigHelper : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWConfigHelper(QObject *parent = nullptr);
|
||||||
|
virtual ~AWConfigHelper();
|
||||||
|
Q_INVOKABLE QString configurationDirectory() const;
|
||||||
|
Q_INVOKABLE bool dropCache() const;
|
||||||
|
Q_INVOKABLE bool exportConfiguration(const QObject *nativeConfig,
|
||||||
|
const QString fileName) const;
|
||||||
|
Q_INVOKABLE QVariantMap importConfiguration(const QString fileName,
|
||||||
|
const bool importPlasmoid,
|
||||||
|
const bool importExtensions,
|
||||||
|
const bool importAdds) const;
|
||||||
|
// dataengine
|
||||||
|
Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
|
||||||
|
Q_INVOKABLE bool
|
||||||
|
writeDataEngineConfiguration(const QVariantMap configuration) const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
// methods
|
||||||
|
void copyConfigs(const QString localDir) const;
|
||||||
|
void copyExtensions(const QString item, const QString type,
|
||||||
|
QSettings &settings, const bool inverse) const;
|
||||||
|
void copySettings(QSettings &from, QSettings &to) const;
|
||||||
|
void readFile(QSettings &settings, const QString key,
|
||||||
|
const QString fileName) const;
|
||||||
|
void writeFile(QSettings &settings, const QString key,
|
||||||
|
const QString fileName) const;
|
||||||
|
// properties
|
||||||
|
QString m_baseDir = QString("%1/awesomewidgets")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericDataLocation));
|
||||||
|
QStringList m_dirs = QStringList()
|
||||||
|
<< QString("desktops") << QString("quotes")
|
||||||
|
<< QString("scripts") << QString("upgrade")
|
||||||
|
<< QString("weather") << QString("formatters");
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWCONFIGHELPER_H */
|
323
sources/awesome-widget/plugin/awdataaggregator.cpp
Normal file
@ -0,0 +1,323 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "awdataaggregator.h"
|
||||||
|
|
||||||
|
#include <KI18n/KLocalizedString>
|
||||||
|
|
||||||
|
#include <QBuffer>
|
||||||
|
#include <QGraphicsScene>
|
||||||
|
#include <QGraphicsView>
|
||||||
|
#include <QPixmap>
|
||||||
|
#include <QtConcurrent/QtConcurrent>
|
||||||
|
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
|
#include "awactions.h"
|
||||||
|
#include "awdebug.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWDataAggregator::AWDataAggregator(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
m_boundaries[QString("cpuTooltip")] = 100.0;
|
||||||
|
m_boundaries[QString("cpuclTooltip")] = 4000.0;
|
||||||
|
m_boundaries[QString("memTooltip")] = 100.0;
|
||||||
|
m_boundaries[QString("swapTooltip")] = 100.0;
|
||||||
|
m_boundaries[QString("downkbTooltip")] = 1.0;
|
||||||
|
m_boundaries[QString("upkbTooltip")] = 1.0;
|
||||||
|
m_boundaries[QString("batTooltip")] = 100.0;
|
||||||
|
|
||||||
|
initScene();
|
||||||
|
connect(this, SIGNAL(updateData(const QVariantHash &)), this,
|
||||||
|
SLOT(dataUpdate(const QVariantHash &)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWDataAggregator::~AWDataAggregator()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
delete m_toolTipScene;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QList<float> AWDataAggregator::getData(const QString key) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Key" << key;
|
||||||
|
|
||||||
|
return m_values[QString("%1Tooltip").arg(key)];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWDataAggregator::htmlImage(const QPixmap &source) const
|
||||||
|
{
|
||||||
|
QByteArray byteArray;
|
||||||
|
QBuffer buffer(&byteArray);
|
||||||
|
source.save(&buffer, "PNG");
|
||||||
|
|
||||||
|
return byteArray.isEmpty()
|
||||||
|
? QString()
|
||||||
|
: QString("<img src=\"data:image/png;base64,%1\"/>")
|
||||||
|
.arg(QString(byteArray.toBase64()));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::setParameters(QVariantMap settings)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Settings" << settings;
|
||||||
|
|
||||||
|
// cast from QVariantMap to QVariantHash without data lost
|
||||||
|
m_configuration = qvariant_cast<QVariantHash>(settings);
|
||||||
|
|
||||||
|
m_enablePopup = m_configuration[QString("notify")].toBool();
|
||||||
|
|
||||||
|
m_counts = 0;
|
||||||
|
m_counts += m_configuration[QString("cpuTooltip")].toInt();
|
||||||
|
m_counts += m_configuration[QString("cpuclTooltip")].toInt();
|
||||||
|
m_counts += m_configuration[QString("memTooltip")].toInt();
|
||||||
|
m_counts += m_configuration[QString("swapTooltip")].toInt();
|
||||||
|
m_counts += m_configuration[QString("downkbTooltip")].toInt();
|
||||||
|
m_counts += m_configuration[QString("batTooltip")].toInt();
|
||||||
|
// resize tooltip image
|
||||||
|
m_toolTipView->resize(100 * m_counts, 105);
|
||||||
|
|
||||||
|
requiredKeys.clear();
|
||||||
|
if (m_configuration[QString("cpuTooltip")].toBool())
|
||||||
|
requiredKeys.append(QString("cpuTooltip"));
|
||||||
|
if (m_configuration[QString("cpuclTooltip")].toBool())
|
||||||
|
requiredKeys.append(QString("cpuclTooltip"));
|
||||||
|
if (m_configuration[QString("memTooltip")].toBool())
|
||||||
|
requiredKeys.append(QString("memTooltip"));
|
||||||
|
if (m_configuration[QString("swapTooltip")].toBool())
|
||||||
|
requiredKeys.append(QString("swapTooltip"));
|
||||||
|
if (m_configuration[QString("downkbTooltip")].toBool())
|
||||||
|
requiredKeys.append(QString("downkbTooltip"));
|
||||||
|
if (m_configuration[QString("upkbTooltip")].toBool())
|
||||||
|
requiredKeys.append(QString("upkbTooltip"));
|
||||||
|
if (m_configuration[QString("batTooltip")].toBool())
|
||||||
|
requiredKeys.append(QString("batTooltip"));
|
||||||
|
|
||||||
|
// background
|
||||||
|
m_toolTipScene->setBackgroundBrush(
|
||||||
|
m_configuration[QString("useTooltipBackground")].toBool()
|
||||||
|
? QBrush(QColor(
|
||||||
|
m_configuration[QString("tooltipBackground")].toString()))
|
||||||
|
: QBrush(Qt::NoBrush));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QPixmap AWDataAggregator::tooltipImage()
|
||||||
|
{
|
||||||
|
// create image
|
||||||
|
m_toolTipScene->clear();
|
||||||
|
QPen pen;
|
||||||
|
bool down = false;
|
||||||
|
for (auto key : requiredKeys) {
|
||||||
|
// create frame
|
||||||
|
float normX = 100.0f / static_cast<float>(m_values[key].count());
|
||||||
|
float normY = 100.0f / (1.5f * m_boundaries[key]);
|
||||||
|
float shift = requiredKeys.indexOf(key) * 100.0f;
|
||||||
|
if (down)
|
||||||
|
shift -= 100.0;
|
||||||
|
// apply pen color
|
||||||
|
if (key != QString("batTooltip"))
|
||||||
|
pen.setColor(QColor(
|
||||||
|
m_configuration[QString("%1Color").arg(key)].toString()));
|
||||||
|
// paint data inside frame
|
||||||
|
for (int j = 0; j < m_values[key].count() - 1; j++) {
|
||||||
|
// some magic here
|
||||||
|
float x1 = j * normX + shift;
|
||||||
|
float y1 = -fabs(m_values[key].at(j)) * normY + 5.0f;
|
||||||
|
float x2 = (j + 1) * normX + shift;
|
||||||
|
float y2 = -fabs(m_values[key].at(j + 1)) * normY + 5.0f;
|
||||||
|
if (key == QString("batTooltip")) {
|
||||||
|
if (m_values[key].at(j + 1) > 0)
|
||||||
|
pen.setColor(
|
||||||
|
QColor(m_configuration[QString("batTooltipColor")]
|
||||||
|
.toString()));
|
||||||
|
else
|
||||||
|
pen.setColor(
|
||||||
|
QColor(m_configuration[QString("batInTooltipColor")]
|
||||||
|
.toString()));
|
||||||
|
}
|
||||||
|
m_toolTipScene->addLine(x1, y1, x2, y2, pen);
|
||||||
|
}
|
||||||
|
if (key == QString("downkbTooltip"))
|
||||||
|
down = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return m_toolTipView->grab();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::dataUpdate(const QVariantHash &values)
|
||||||
|
{
|
||||||
|
// do not log these arguments
|
||||||
|
setData(values);
|
||||||
|
emit(toolTipPainted(htmlImage(tooltipImage())));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::checkValue(const QString source, const float value,
|
||||||
|
const float extremum) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Notification source" << source << "with value" << value
|
||||||
|
<< "called with extremum" << extremum;
|
||||||
|
|
||||||
|
if (value >= 0.0) {
|
||||||
|
if ((m_enablePopup) && (value > extremum)
|
||||||
|
&& (m_values[source].last() < extremum))
|
||||||
|
return AWActions::sendNotification(QString("event"),
|
||||||
|
notificationText(source, value));
|
||||||
|
} else {
|
||||||
|
if ((m_enablePopup) && (value < extremum)
|
||||||
|
&& (m_values[source].last() > extremum))
|
||||||
|
return AWActions::sendNotification(QString("event"),
|
||||||
|
notificationText(source, value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::checkValue(const QString source, const QString current,
|
||||||
|
const QString received) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Notification source" << source << "with current value"
|
||||||
|
<< current << "and received one" << received;
|
||||||
|
|
||||||
|
if ((m_enablePopup) && (current != received) && (!received.isEmpty()))
|
||||||
|
return AWActions::sendNotification(QString("event"),
|
||||||
|
notificationText(source, received));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::initScene()
|
||||||
|
{
|
||||||
|
m_toolTipScene = new QGraphicsScene(nullptr);
|
||||||
|
m_toolTipView = new QGraphicsView(m_toolTipScene);
|
||||||
|
m_toolTipView->setStyleSheet(QString("background: transparent"));
|
||||||
|
m_toolTipView->setContentsMargins(0, 0, 0, 0);
|
||||||
|
m_toolTipView->setFrameShape(QFrame::NoFrame);
|
||||||
|
m_toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||||
|
m_toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWDataAggregator::notificationText(const QString source,
|
||||||
|
const float value) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Notification source" << source << "with value" << value;
|
||||||
|
|
||||||
|
QString output;
|
||||||
|
if (source == QString("batTooltip"))
|
||||||
|
output = value > 0.0 ? i18n("AC online") : i18n("AC offline");
|
||||||
|
else if (source == QString("cpuTooltip"))
|
||||||
|
output = i18n("High CPU load");
|
||||||
|
else if (source == QString("memTooltip"))
|
||||||
|
output = i18n("High memory usage");
|
||||||
|
else if (source == QString("swapTooltip"))
|
||||||
|
output = i18n("Swap is used");
|
||||||
|
else if (source == QString("gpu"))
|
||||||
|
output = i18n("High GPU load");
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWDataAggregator::notificationText(const QString source,
|
||||||
|
const QString value) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Notification source" << source << "with value" << value;
|
||||||
|
|
||||||
|
QString output;
|
||||||
|
if (source == QString("netdev"))
|
||||||
|
output = i18n("Network device has been changed to %1", value);
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::setData(const QVariantHash &values)
|
||||||
|
{
|
||||||
|
// do not log these arguments
|
||||||
|
// battery update requires info is AC online or not
|
||||||
|
setData(values[QString("ac")].toString()
|
||||||
|
== m_configuration[QString("acOnline")],
|
||||||
|
QString("batTooltip"), values[QString("bat")].toFloat());
|
||||||
|
// usual case
|
||||||
|
setData(QString("cpuTooltip"), values[QString("cpu")].toFloat(), 90.0);
|
||||||
|
setData(QString("cpuclTooltip"), values[QString("cpucl")].toFloat());
|
||||||
|
setData(QString("memTooltip"), values[QString("mem")].toFloat(), 80.0);
|
||||||
|
setData(QString("swapTooltip"), values[QString("swap")].toFloat(), 0.0);
|
||||||
|
setData(QString("downkbTooltip"), values[QString("downkb")].toFloat());
|
||||||
|
setData(QString("upkbTooltip"), values[QString("upkb")].toFloat());
|
||||||
|
// additional check for network device
|
||||||
|
[this](const QString value) {
|
||||||
|
checkValue(QString("netdev"), m_currentNetworkDevice, value);
|
||||||
|
m_currentNetworkDevice = value;
|
||||||
|
}(values[QString("netdev")].toString());
|
||||||
|
// additional check for GPU load
|
||||||
|
[this](const float value) {
|
||||||
|
checkValue(QString("gpu"), value, 90.0);
|
||||||
|
m_currentGPULoad = value;
|
||||||
|
}(values[QString("gpu")].toFloat());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::setData(const QString &source, float value,
|
||||||
|
const float extremum)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Source" << source << "to value" << value
|
||||||
|
<< "with extremum" << extremum;
|
||||||
|
|
||||||
|
if (m_values[source].count() == 0)
|
||||||
|
m_values[source].append(0.0);
|
||||||
|
else if (m_values[source].count()
|
||||||
|
> m_configuration[QString("tooltipNumber")].toInt())
|
||||||
|
m_values[source].removeFirst();
|
||||||
|
if (std::isnan(value))
|
||||||
|
value = 0.0;
|
||||||
|
|
||||||
|
// notifications
|
||||||
|
checkValue(source, value, extremum);
|
||||||
|
|
||||||
|
m_values[source].append(value);
|
||||||
|
if (source == QString("downkbTooltip")) {
|
||||||
|
QList<float> netValues = m_values[QString("downkbTooltip")]
|
||||||
|
+ m_values[QString("upkbTooltip")];
|
||||||
|
// to avoid inf value of normY
|
||||||
|
netValues << 1.0;
|
||||||
|
m_boundaries[QString("downkbTooltip")]
|
||||||
|
= 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
|
||||||
|
m_boundaries[QString("upkbTooltip")]
|
||||||
|
= m_boundaries[QString("downkbTooltip")];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataAggregator::setData(const bool dontInvert, const QString &source,
|
||||||
|
float value)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Do not invert" << dontInvert << "value" << value
|
||||||
|
<< "for source" << source;
|
||||||
|
|
||||||
|
// invert values for different battery colours
|
||||||
|
value = dontInvert ? value : -value;
|
||||||
|
return setData(source, value, 0.0);
|
||||||
|
}
|
79
sources/awesome-widget/plugin/awdataaggregator.h
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef AWTOOLTIP_H
|
||||||
|
#define AWTOOLTIP_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QVariant>
|
||||||
|
|
||||||
|
|
||||||
|
class QGraphicsScene;
|
||||||
|
class QGraphicsView;
|
||||||
|
class QPixmap;
|
||||||
|
class QThreadPool;
|
||||||
|
|
||||||
|
class AWDataAggregator : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWDataAggregator(QObject *parent = nullptr);
|
||||||
|
virtual ~AWDataAggregator();
|
||||||
|
QList<float> getData(const QString key) const;
|
||||||
|
QString htmlImage(const QPixmap &source) const;
|
||||||
|
void setParameters(QVariantMap settings);
|
||||||
|
QPixmap tooltipImage();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void updateData(const QVariantHash &values);
|
||||||
|
void toolTipPainted(const QString image) const;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void dataUpdate(const QVariantHash &values);
|
||||||
|
|
||||||
|
private:
|
||||||
|
// ui
|
||||||
|
QGraphicsScene *m_toolTipScene = nullptr;
|
||||||
|
QGraphicsView *m_toolTipView = nullptr;
|
||||||
|
void checkValue(const QString source, const float value,
|
||||||
|
const float extremum) const;
|
||||||
|
void checkValue(const QString source, const QString current,
|
||||||
|
const QString received) const;
|
||||||
|
void initScene();
|
||||||
|
QString notificationText(const QString source, const float value) const;
|
||||||
|
QString notificationText(const QString source, const QString value) const;
|
||||||
|
// main method
|
||||||
|
void setData(const QVariantHash &values);
|
||||||
|
void setData(const QString &source, float value,
|
||||||
|
const float extremum = -1.0f);
|
||||||
|
// different signature for battery device
|
||||||
|
void setData(const bool dontInvert, const QString &source, float value);
|
||||||
|
// variables
|
||||||
|
int m_counts = 0;
|
||||||
|
QVariantHash m_configuration;
|
||||||
|
float m_currentGPULoad = 0.0;
|
||||||
|
QString m_currentNetworkDevice = QString("lo");
|
||||||
|
QHash<QString, float> m_boundaries;
|
||||||
|
QHash<QString, QList<float>> m_values;
|
||||||
|
bool m_enablePopup = false;
|
||||||
|
QStringList requiredKeys;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWTOOLTIP_H */
|
101
sources/awesome-widget/plugin/awdataengineaggregator.cpp
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "awdataengineaggregator.h"
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awkeys.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWDataEngineAggregator::AWDataEngineAggregator(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWDataEngineAggregator::~AWDataEngineAggregator()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataEngineAggregator::clear()
|
||||||
|
{
|
||||||
|
// disconnect sources first
|
||||||
|
disconnectSources();
|
||||||
|
m_dataEngines.clear();
|
||||||
|
delete m_consumer;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataEngineAggregator::disconnectSources()
|
||||||
|
{
|
||||||
|
for (auto dataengine : m_dataEngines.values())
|
||||||
|
for (auto source : dataengine->sources())
|
||||||
|
dataengine->disconnectSource(source, parent());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataEngineAggregator::initDataEngines(const int interval)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Init dataengines with interval" << interval;
|
||||||
|
|
||||||
|
m_consumer = new Plasma::DataEngineConsumer();
|
||||||
|
m_dataEngines[QString("systemmonitor")]
|
||||||
|
= m_consumer->dataEngine(QString("systemmonitor"));
|
||||||
|
m_dataEngines[QString("extsysmon")]
|
||||||
|
= m_consumer->dataEngine(QString("extsysmon"));
|
||||||
|
m_dataEngines[QString("time")] = m_consumer->dataEngine(QString("time"));
|
||||||
|
|
||||||
|
// additional method required by systemmonitor structure
|
||||||
|
connect(m_dataEngines[QString("systemmonitor")],
|
||||||
|
&Plasma::DataEngine::sourceAdded,
|
||||||
|
[this, interval](const QString source) {
|
||||||
|
emit(deviceAdded(source));
|
||||||
|
m_dataEngines[QString("systemmonitor")]->connectSource(
|
||||||
|
source, parent(), interval);
|
||||||
|
});
|
||||||
|
|
||||||
|
return reconnectSources(interval);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataEngineAggregator::dropSource(const QString source)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Source" << source;
|
||||||
|
|
||||||
|
// HACK there is no possibility to check to which dataengine source
|
||||||
|
// connected we will try to disconnect it from systemmonitor and extsysmon
|
||||||
|
m_dataEngines[QString("systemmonitor")]->disconnectSource(source, parent());
|
||||||
|
m_dataEngines[QString("extsysmon")]->disconnectSource(source, parent());
|
||||||
|
m_dataEngines[QString("time")]->disconnectSource(source, parent());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWDataEngineAggregator::reconnectSources(const int interval)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Reconnect sources with interval" << interval;
|
||||||
|
|
||||||
|
m_dataEngines[QString("systemmonitor")]->connectAllSources(parent(),
|
||||||
|
interval);
|
||||||
|
m_dataEngines[QString("extsysmon")]->connectAllSources(parent(), interval);
|
||||||
|
m_dataEngines[QString("time")]->connectSource(QString("Local"), parent(),
|
||||||
|
1000);
|
||||||
|
}
|
52
sources/awesome-widget/plugin/awdataengineaggregator.h
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef AWDATAENGINEAGGREGATOR_H
|
||||||
|
#define AWDATAENGINEAGGREGATOR_H
|
||||||
|
|
||||||
|
#include <Plasma/DataEngine>
|
||||||
|
#include <Plasma/DataEngineConsumer>
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
|
||||||
|
class AWDataEngineAggregator : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWDataEngineAggregator(QObject *parent = nullptr);
|
||||||
|
virtual ~AWDataEngineAggregator();
|
||||||
|
void clear();
|
||||||
|
void disconnectSources();
|
||||||
|
void initDataEngines(const int interval);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void deviceAdded(const QString &source);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void dropSource(const QString source);
|
||||||
|
void reconnectSources(const int interval);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Plasma::DataEngineConsumer *m_consumer = nullptr;
|
||||||
|
QHash<QString, Plasma::DataEngine *> m_dataEngines;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWDATAENGINEAGGREGATOR_H */
|
37
sources/awesome-widget/plugin/awesomewidget.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 "awesomewidget.h"
|
||||||
|
|
||||||
|
#include <QtQml>
|
||||||
|
|
||||||
|
#include "awactions.h"
|
||||||
|
#include "awconfighelper.h"
|
||||||
|
#include "awformatterconfigfactory.h"
|
||||||
|
#include "awkeys.h"
|
||||||
|
|
||||||
|
|
||||||
|
void AWPlugin::registerTypes(const char *uri)
|
||||||
|
{
|
||||||
|
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
|
||||||
|
|
||||||
|
qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
|
||||||
|
qmlRegisterType<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
|
||||||
|
qmlRegisterType<AWFormatterConfigFactory>(uri, 1, 0,
|
||||||
|
"AWFormatterConfigFactory");
|
||||||
|
qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
|
||||||
|
}
|
35
sources/awesome-widget/plugin/awesomewidget.h
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef AWPLUGIN_H
|
||||||
|
#define AWPLUGIN_H
|
||||||
|
|
||||||
|
#include <QQmlExtensionPlugin>
|
||||||
|
|
||||||
|
|
||||||
|
class AWPlugin : public QQmlExtensionPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
|
||||||
|
|
||||||
|
public:
|
||||||
|
void registerTypes(const char *uri);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWPLUGIN_H */
|
181
sources/awesome-widget/plugin/awformatterconfig.cpp
Normal file
@ -0,0 +1,181 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "awformatterconfig.h"
|
||||||
|
#include "ui_awformatterconfig.h"
|
||||||
|
|
||||||
|
#include <KI18n/KLocalizedString>
|
||||||
|
|
||||||
|
#include <QPushButton>
|
||||||
|
|
||||||
|
#include "awabstractselector.h"
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awformatterhelper.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWFormatterConfig::AWFormatterConfig(QWidget *parent, const QStringList keys)
|
||||||
|
: QDialog(parent)
|
||||||
|
, ui(new Ui::AWFormatterConfig)
|
||||||
|
, m_keys(keys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
ui->setupUi(this);
|
||||||
|
m_editButton
|
||||||
|
= ui->buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
|
||||||
|
init();
|
||||||
|
|
||||||
|
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
|
||||||
|
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
|
||||||
|
connect(m_editButton, SIGNAL(clicked(bool)), this, SLOT(editFormatters()));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWFormatterConfig::~AWFormatterConfig()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
clearSelectors();
|
||||||
|
|
||||||
|
delete m_helper;
|
||||||
|
delete ui;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfig::showDialog()
|
||||||
|
{
|
||||||
|
// update dialog
|
||||||
|
updateDialog();
|
||||||
|
// exec dialog
|
||||||
|
return execDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfig::editFormatters()
|
||||||
|
{
|
||||||
|
m_helper->editItems();
|
||||||
|
updateDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfig::updateUi()
|
||||||
|
{
|
||||||
|
QPair<QString, QString> current
|
||||||
|
= static_cast<AWAbstractSelector *>(sender())->current();
|
||||||
|
int index
|
||||||
|
= m_selectors.indexOf(static_cast<AWAbstractSelector *>(sender()));
|
||||||
|
|
||||||
|
if ((current.first.isEmpty()) && (current.second.isEmpty())) {
|
||||||
|
if (sender() == m_selectors.last())
|
||||||
|
return;
|
||||||
|
AWAbstractSelector *selector = m_selectors.takeAt(index);
|
||||||
|
ui->verticalLayout->removeWidget(selector);
|
||||||
|
selector->deleteLater();
|
||||||
|
} else {
|
||||||
|
if (sender() != m_selectors.last())
|
||||||
|
return;
|
||||||
|
auto keys = initKeys();
|
||||||
|
addSelector(keys.first, keys.second, QPair<QString, QString>());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfig::addSelector(const QStringList &keys,
|
||||||
|
const QStringList &values,
|
||||||
|
const QPair<QString, QString> ¤t)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Add selector with keys" << keys << "values" << values
|
||||||
|
<< "and current ones" << current;
|
||||||
|
|
||||||
|
AWAbstractSelector *selector
|
||||||
|
= new AWAbstractSelector(ui->scrollAreaWidgetContents);
|
||||||
|
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 AWFormatterConfig::clearSelectors()
|
||||||
|
{
|
||||||
|
for (auto selector : m_selectors) {
|
||||||
|
disconnect(selector, SIGNAL(selectionChanged()), this,
|
||||||
|
SLOT(updateUi()));
|
||||||
|
ui->verticalLayout->removeWidget(selector);
|
||||||
|
selector->deleteLater();
|
||||||
|
}
|
||||||
|
m_selectors.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfig::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
|
||||||
|
switch (ret) {
|
||||||
|
case 0:
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
default:
|
||||||
|
m_helper->writeFormatters(data);
|
||||||
|
m_helper->writeFormatters(data.keys());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfig::init()
|
||||||
|
{
|
||||||
|
delete m_helper;
|
||||||
|
m_helper = new AWFormatterHelper(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QPair<QStringList, QStringList> AWFormatterConfig::initKeys() const
|
||||||
|
{
|
||||||
|
// we are adding empty string at the start
|
||||||
|
QStringList keys = QStringList() << QString("");
|
||||||
|
keys.append(m_keys);
|
||||||
|
keys.sort();
|
||||||
|
QStringList knownFormatters = QStringList() << QString("");
|
||||||
|
knownFormatters.append(m_helper->knownFormatters());
|
||||||
|
knownFormatters.sort();
|
||||||
|
|
||||||
|
return QPair<QStringList, QStringList>(keys, knownFormatters);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfig::updateDialog()
|
||||||
|
{
|
||||||
|
clearSelectors();
|
||||||
|
QHash<QString, QString> appliedFormatters = m_helper->getFormatters();
|
||||||
|
auto keys = initKeys();
|
||||||
|
|
||||||
|
for (auto key : appliedFormatters.keys())
|
||||||
|
addSelector(keys.first, keys.second,
|
||||||
|
QPair<QString, QString>(key, appliedFormatters[key]));
|
||||||
|
// empty one
|
||||||
|
addSelector(keys.first, keys.second, QPair<QString, QString>());
|
||||||
|
}
|
64
sources/awesome-widget/plugin/awformatterconfig.h
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef AWFORMATTERCONFIG_H
|
||||||
|
#define AWFORMATTERCONFIG_H
|
||||||
|
|
||||||
|
#include <QDialog>
|
||||||
|
|
||||||
|
|
||||||
|
class AWAbstractSelector;
|
||||||
|
class AWFormatterHelper;
|
||||||
|
namespace Ui
|
||||||
|
{
|
||||||
|
class AWFormatterConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
class AWFormatterConfig : public QDialog
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWFormatterConfig(QWidget *parent = nullptr,
|
||||||
|
const QStringList keys = QStringList());
|
||||||
|
virtual ~AWFormatterConfig();
|
||||||
|
Q_INVOKABLE void showDialog();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void editFormatters();
|
||||||
|
void updateUi();
|
||||||
|
|
||||||
|
private:
|
||||||
|
QPushButton *m_editButton = nullptr;
|
||||||
|
Ui::AWFormatterConfig *ui = nullptr;
|
||||||
|
AWFormatterHelper *m_helper = nullptr;
|
||||||
|
QList<AWAbstractSelector *> m_selectors;
|
||||||
|
// properties
|
||||||
|
QStringList m_keys;
|
||||||
|
// methods
|
||||||
|
void addSelector(const QStringList &keys, const QStringList &values,
|
||||||
|
const QPair<QString, QString> ¤t);
|
||||||
|
void clearSelectors();
|
||||||
|
void execDialog();
|
||||||
|
void init();
|
||||||
|
QPair<QStringList, QStringList> initKeys() const;
|
||||||
|
void updateDialog();
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWFORMATTERCONFIG_H */
|
93
sources/awesome-widget/plugin/awformatterconfig.ui
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>AWFormatterConfig</class>
|
||||||
|
<widget class="QDialog" name="AWFormatterConfig">
|
||||||
|
<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>AWFormatterConfig</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>AWFormatterConfig</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>
|
42
sources/awesome-widget/plugin/awformatterconfigfactory.cpp
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/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "awformatterconfigfactory.h"
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awformatterconfig.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWFormatterConfigFactory::AWFormatterConfigFactory(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWFormatterConfigFactory::~AWFormatterConfigFactory()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterConfigFactory::showDialog(const QStringList keys)
|
||||||
|
{
|
||||||
|
AWFormatterConfig *config = new AWFormatterConfig(nullptr, keys);
|
||||||
|
config->showDialog();
|
||||||
|
config->deleteLater();
|
||||||
|
}
|
38
sources/awesome-widget/plugin/awformatterconfigfactory.h
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 AWFORMATTERCONFIGFACTORY_H
|
||||||
|
#define AWFORMATTERCONFIGFACTORY_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
|
||||||
|
class AWFormatterConfigFactory : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWFormatterConfigFactory(QObject *parent = nullptr);
|
||||||
|
virtual ~AWFormatterConfigFactory();
|
||||||
|
Q_INVOKABLE void showDialog(const QStringList keys);
|
||||||
|
|
||||||
|
private:
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWFORMATTERCONFIGFACTORY_H */
|
331
sources/awesome-widget/plugin/awformatterhelper.cpp
Normal file
@ -0,0 +1,331 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "awformatterhelper.h"
|
||||||
|
|
||||||
|
#include <KI18n/KLocalizedString>
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QInputDialog>
|
||||||
|
#include <QSettings>
|
||||||
|
|
||||||
|
#include "awdatetimeformatter.h"
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awfloatformatter.h"
|
||||||
|
#include "awlistformatter.h"
|
||||||
|
#include "awnoformatter.h"
|
||||||
|
#include "awscriptformatter.h"
|
||||||
|
#include "awstringformatter.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWFormatterHelper::AWFormatterHelper(QWidget *parent)
|
||||||
|
: AbstractExtItemAggregator(parent, QString("formatters"))
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
initItems();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWFormatterHelper::~AWFormatterHelper()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
m_formatters.clear();
|
||||||
|
m_formattersClasses.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWFormatterHelper::convert(const QVariant &value,
|
||||||
|
const QString &name) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Convert value" << value << "for" << name;
|
||||||
|
|
||||||
|
return m_formatters.contains(name) ? m_formatters[name]->convert(value)
|
||||||
|
: value.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWFormatterHelper::definedFormatters() const
|
||||||
|
{
|
||||||
|
return m_formatters.keys();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QHash<QString, QString> AWFormatterHelper::getFormatters() const
|
||||||
|
{
|
||||||
|
QHash<QString, QString> map;
|
||||||
|
for (auto tag : m_formatters.keys())
|
||||||
|
map[tag] = m_formatters[tag]->name();
|
||||||
|
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QList<AbstractExtItem *> AWFormatterHelper::items() const
|
||||||
|
{
|
||||||
|
QList<AbstractExtItem *> converted;
|
||||||
|
for (auto item : m_formattersClasses.values())
|
||||||
|
converted.append(item);
|
||||||
|
|
||||||
|
return converted;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWFormatterHelper::knownFormatters() const
|
||||||
|
{
|
||||||
|
return m_formattersClasses.keys();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool AWFormatterHelper::writeFormatters(const QStringList keys) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Remove formatters" << keys;
|
||||||
|
|
||||||
|
QString fileName = QString("%1/awesomewidgets/formatters/formatters.ini")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericDataLocation));
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
qCInfo(LOG_AW) << "Configuration file" << fileName;
|
||||||
|
|
||||||
|
settings.beginGroup(QString("Formatters"));
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool AWFormatterHelper::writeFormatters(
|
||||||
|
const QHash<QString, QString> configuration) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Write configuration" << configuration;
|
||||||
|
|
||||||
|
QString fileName = QString("%1/awesomewidgets/formatters/formatters.ini")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericDataLocation));
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
qCInfo(LOG_AW) << "Configuration file" << fileName;
|
||||||
|
|
||||||
|
settings.beginGroup(QString("Formatters"));
|
||||||
|
for (auto key : configuration.keys())
|
||||||
|
settings.setValue(key, configuration[key]);
|
||||||
|
settings.endGroup();
|
||||||
|
|
||||||
|
settings.sync();
|
||||||
|
|
||||||
|
return (settings.status() == QSettings::NoError);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterHelper::editItems()
|
||||||
|
{
|
||||||
|
repaintList();
|
||||||
|
int ret = exec();
|
||||||
|
qCInfo(LOG_AW) << "Dialog returns" << ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWAbstractFormatter::FormatterClass
|
||||||
|
AWFormatterHelper::defineFormatterClass(const QString stringType) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Define formatter class for" << stringType;
|
||||||
|
|
||||||
|
AWAbstractFormatter::FormatterClass formatter
|
||||||
|
= AWAbstractFormatter::FormatterClass::NoFormat;
|
||||||
|
if (stringType == QString("DateTime"))
|
||||||
|
formatter = AWAbstractFormatter::FormatterClass::DateTime;
|
||||||
|
else if (stringType == QString("Float"))
|
||||||
|
formatter = AWAbstractFormatter::FormatterClass::Float;
|
||||||
|
else if (stringType == QString("List"))
|
||||||
|
formatter = AWAbstractFormatter::FormatterClass::List;
|
||||||
|
else if (stringType == QString("NoFormat"))
|
||||||
|
;
|
||||||
|
else if (stringType == QString("Script"))
|
||||||
|
formatter = AWAbstractFormatter::FormatterClass::Script;
|
||||||
|
else if (stringType == QString("String"))
|
||||||
|
formatter = AWAbstractFormatter::FormatterClass::String;
|
||||||
|
else
|
||||||
|
qCWarning(LOG_AW) << "Unknown formatter" << stringType;
|
||||||
|
|
||||||
|
return formatter;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterHelper::initFormatters()
|
||||||
|
{
|
||||||
|
m_formattersClasses.clear();
|
||||||
|
|
||||||
|
for (int i = m_directories.count() - 1; i >= 0; i--) {
|
||||||
|
QStringList files
|
||||||
|
= QDir(m_directories.at(i)).entryList(QDir::Files, QDir::Name);
|
||||||
|
for (auto file : files) {
|
||||||
|
if (!file.endsWith(QString(".desktop")))
|
||||||
|
continue;
|
||||||
|
qCInfo(LOG_AW) << "Found file" << file << "in"
|
||||||
|
<< m_directories.at(i);
|
||||||
|
QString filePath
|
||||||
|
= QString("%1/%2").arg(m_directories.at(i)).arg(file);
|
||||||
|
auto metadata = readMetadata(filePath);
|
||||||
|
QString name = metadata.first;
|
||||||
|
if (m_formattersClasses.contains(name))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
|
||||||
|
switch (metadata.second) {
|
||||||
|
case AWAbstractFormatter::FormatterClass::DateTime:
|
||||||
|
m_formattersClasses[name]
|
||||||
|
= new AWDateTimeFormatter(this, filePath);
|
||||||
|
break;
|
||||||
|
case AWAbstractFormatter::FormatterClass::Float:
|
||||||
|
m_formattersClasses[name]
|
||||||
|
= new AWFloatFormatter(this, filePath);
|
||||||
|
break;
|
||||||
|
case AWAbstractFormatter::FormatterClass::List:
|
||||||
|
m_formattersClasses[name] = new AWListFormatter(this, filePath);
|
||||||
|
break;
|
||||||
|
case AWAbstractFormatter::FormatterClass::Script:
|
||||||
|
m_formattersClasses[name]
|
||||||
|
= new AWScriptFormatter(this, filePath);
|
||||||
|
break;
|
||||||
|
case AWAbstractFormatter::FormatterClass::String:
|
||||||
|
m_formattersClasses[name]
|
||||||
|
= new AWStringFormatter(this, filePath);
|
||||||
|
break;
|
||||||
|
case AWAbstractFormatter::FormatterClass::NoFormat:
|
||||||
|
m_formattersClasses[name] = new AWNoFormatter(this, filePath);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterHelper::initKeys()
|
||||||
|
{
|
||||||
|
m_formatters.clear();
|
||||||
|
|
||||||
|
QStringList configs = QStandardPaths::locateAll(
|
||||||
|
QStandardPaths::GenericDataLocation,
|
||||||
|
QString("awesomewidgets/formatters/formatters.ini"));
|
||||||
|
|
||||||
|
for (auto fileName : configs) {
|
||||||
|
QSettings settings(fileName, QSettings::IniFormat);
|
||||||
|
qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
|
||||||
|
|
||||||
|
settings.beginGroup(QString("Formatters"));
|
||||||
|
QStringList keys = settings.childKeys();
|
||||||
|
for (auto key : keys) {
|
||||||
|
QString name = settings.value(key).toString();
|
||||||
|
qCInfo(LOG_AW) << "Found formatter" << name << "for key" << key
|
||||||
|
<< "in" << settings.fileName();
|
||||||
|
if (name.isEmpty()) {
|
||||||
|
qCInfo(LOG_AW) << "Skip empty formatter for" << key;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!m_formattersClasses.contains(name)) {
|
||||||
|
qCWarning(LOG_AW) << "Invalid formatter" << name << "found in"
|
||||||
|
<< key;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
m_formatters[key] = m_formattersClasses[name];
|
||||||
|
}
|
||||||
|
settings.endGroup();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterHelper::installDirectories()
|
||||||
|
{
|
||||||
|
// create directory at $HOME
|
||||||
|
QString localDir = QString("%1/awesomewidgets/formatters")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericDataLocation));
|
||||||
|
QDir localDirectory;
|
||||||
|
if (localDirectory.mkpath(localDir))
|
||||||
|
qCInfo(LOG_AW) << "Created directory" << localDir;
|
||||||
|
|
||||||
|
m_directories = QStandardPaths::locateAll(
|
||||||
|
QStandardPaths::GenericDataLocation,
|
||||||
|
QString("awesomewidgets/formatters"), QStandardPaths::LocateDirectory);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QPair<QString, AWAbstractFormatter::FormatterClass>
|
||||||
|
AWFormatterHelper::readMetadata(const QString filePath) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Read initial parameters from" << filePath;
|
||||||
|
|
||||||
|
QSettings settings(filePath, QSettings::IniFormat);
|
||||||
|
settings.beginGroup(QString("Desktop Entry"));
|
||||||
|
QString name = settings.value(QString("Name"), filePath).toString();
|
||||||
|
QString type
|
||||||
|
= settings.value(QString("X-AW-Type"), QString("NoFormat")).toString();
|
||||||
|
AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
|
||||||
|
settings.endGroup();
|
||||||
|
|
||||||
|
return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterHelper::doCreateItem()
|
||||||
|
{
|
||||||
|
QStringList selection = QStringList()
|
||||||
|
<< QString("NoFormat") << QString("DateTime")
|
||||||
|
<< QString("Float") << QString("List")
|
||||||
|
<< QString("Script") << QString("String");
|
||||||
|
bool ok;
|
||||||
|
QString select = QInputDialog::getItem(
|
||||||
|
this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
|
||||||
|
if (!ok) {
|
||||||
|
qCWarning(LOG_AW) << "No type selected";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
qCInfo(LOG_AW) << "Selected type" << select;
|
||||||
|
AWAbstractFormatter::FormatterClass formatter
|
||||||
|
= defineFormatterClass(select);
|
||||||
|
switch (formatter) {
|
||||||
|
case AWAbstractFormatter::FormatterClass::DateTime:
|
||||||
|
return createItem<AWDateTimeFormatter>();
|
||||||
|
case AWAbstractFormatter::FormatterClass::Float:
|
||||||
|
return createItem<AWFloatFormatter>();
|
||||||
|
case AWAbstractFormatter::FormatterClass::List:
|
||||||
|
return createItem<AWListFormatter>();
|
||||||
|
case AWAbstractFormatter::FormatterClass::Script:
|
||||||
|
return createItem<AWScriptFormatter>();
|
||||||
|
case AWAbstractFormatter::FormatterClass::String:
|
||||||
|
return createItem<AWStringFormatter>();
|
||||||
|
case AWAbstractFormatter::FormatterClass::NoFormat:
|
||||||
|
return createItem<AWNoFormatter>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWFormatterHelper::initItems()
|
||||||
|
{
|
||||||
|
installDirectories();
|
||||||
|
initFormatters();
|
||||||
|
initKeys();
|
||||||
|
}
|
66
sources/awesome-widget/plugin/awformatterhelper.h
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef AWFORMATTERHELPER_H
|
||||||
|
#define AWFORMATTERHELPER_H
|
||||||
|
|
||||||
|
#include "abstractextitemaggregator.h"
|
||||||
|
|
||||||
|
#include "awabstractformatter.h"
|
||||||
|
|
||||||
|
|
||||||
|
class AWAbstractFormatter;
|
||||||
|
|
||||||
|
class AWFormatterHelper : public AbstractExtItemAggregator
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWFormatterHelper(QWidget *parent = nullptr);
|
||||||
|
virtual ~AWFormatterHelper();
|
||||||
|
QString convert(const QVariant &value, const QString &name) const;
|
||||||
|
QStringList definedFormatters() const;
|
||||||
|
QHash<QString, QString> getFormatters() const;
|
||||||
|
QList<AbstractExtItem *> items() const;
|
||||||
|
QStringList knownFormatters() const;
|
||||||
|
bool writeFormatters(const QStringList keys) const;
|
||||||
|
bool writeFormatters(const QHash<QString, QString> configuration) const;
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void editItems();
|
||||||
|
|
||||||
|
private:
|
||||||
|
// methods
|
||||||
|
AWAbstractFormatter::FormatterClass
|
||||||
|
defineFormatterClass(const QString stringType) const;
|
||||||
|
void initFormatters();
|
||||||
|
void initKeys();
|
||||||
|
void installDirectories();
|
||||||
|
QPair<QString, AWAbstractFormatter::FormatterClass>
|
||||||
|
readMetadata(const QString filePath) const;
|
||||||
|
// parent methods
|
||||||
|
void doCreateItem();
|
||||||
|
void initItems();
|
||||||
|
// properties
|
||||||
|
QStringList m_directories;
|
||||||
|
QHash<QString, AWAbstractFormatter *> m_formatters;
|
||||||
|
QHash<QString, AWAbstractFormatter *> m_formattersClasses;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWFORMATTERHELPER_H */
|
188
sources/awesome-widget/plugin/awkeycache.cpp
Normal file
@ -0,0 +1,188 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "awkeycache.h"
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QNetworkInterface>
|
||||||
|
#include <QRegExp>
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QStandardPaths>
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
|
||||||
|
|
||||||
|
bool AWKeyCache::addKeyToCache(const QString type, const QString key)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Key" << key << "with type" << type;
|
||||||
|
|
||||||
|
QString fileName = QString("%1/awesomewidgets.ndx")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericCacheLocation));
|
||||||
|
qCInfo(LOG_AW) << "Cache file" << fileName;
|
||||||
|
QSettings cache(fileName, QSettings::IniFormat);
|
||||||
|
|
||||||
|
cache.beginGroup(type);
|
||||||
|
QStringList cachedValues;
|
||||||
|
for (auto number : cache.allKeys())
|
||||||
|
cachedValues.append(cache.value(number).toString());
|
||||||
|
|
||||||
|
if (type == QString("hdd")) {
|
||||||
|
QStringList allDevices
|
||||||
|
= QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
|
||||||
|
QStringList devices
|
||||||
|
= allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
|
||||||
|
for (auto dev : devices) {
|
||||||
|
QString device = QString("/dev/%1").arg(dev);
|
||||||
|
if (cachedValues.contains(device))
|
||||||
|
continue;
|
||||||
|
qCInfo(LOG_AW) << "Found new key" << device << "for type" << type;
|
||||||
|
cachedValues.append(device);
|
||||||
|
cache.setValue(
|
||||||
|
QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
|
||||||
|
device);
|
||||||
|
}
|
||||||
|
} else if (type == QString("net")) {
|
||||||
|
QList<QNetworkInterface> rawInterfaceList
|
||||||
|
= QNetworkInterface::allInterfaces();
|
||||||
|
for (auto interface : rawInterfaceList) {
|
||||||
|
QString device = interface.name();
|
||||||
|
if (cachedValues.contains(device))
|
||||||
|
continue;
|
||||||
|
qCInfo(LOG_AW) << "Found new key" << device << "for type" << type;
|
||||||
|
cachedValues.append(device);
|
||||||
|
cache.setValue(
|
||||||
|
QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
|
||||||
|
device);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (cachedValues.contains(key))
|
||||||
|
return false;
|
||||||
|
qCInfo(LOG_AW) << "Found new key" << key << "for type" << type;
|
||||||
|
cache.setValue(
|
||||||
|
QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), key);
|
||||||
|
}
|
||||||
|
cache.endGroup();
|
||||||
|
|
||||||
|
cache.sync();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWKeyCache::getRequiredKeys(const QStringList &keys,
|
||||||
|
const QStringList &bars,
|
||||||
|
const QVariantMap &tooltip,
|
||||||
|
const QStringList &allKeys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for required keys in" << keys << bars
|
||||||
|
<< "using tooltip settings" << tooltip;
|
||||||
|
|
||||||
|
// initial copy
|
||||||
|
QSet<QString> used = QSet<QString>::fromList(keys);
|
||||||
|
used.unite(QSet<QString>::fromList(bars));
|
||||||
|
// insert keys from tooltip
|
||||||
|
for (auto key : tooltip.keys()) {
|
||||||
|
if ((key.endsWith(QString("Tooltip"))) && (tooltip[key].toBool())) {
|
||||||
|
key.remove(QString("Tooltip"));
|
||||||
|
used << key;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// insert depending keys, refer to AWKeys::calculateValues()
|
||||||
|
// hddtotmb*
|
||||||
|
for (auto key : allKeys.filter(QRegExp(QString("^hddtotmb")))) {
|
||||||
|
if (!used.contains(key))
|
||||||
|
continue;
|
||||||
|
key.remove(QString("hddtotmb"));
|
||||||
|
int index = key.toInt();
|
||||||
|
used << QString("hddfreemb%1").arg(index)
|
||||||
|
<< QString("hddmb%1").arg(index);
|
||||||
|
}
|
||||||
|
// hddtotgb*
|
||||||
|
for (auto key : allKeys.filter(QRegExp(QString("^hddtotgb")))) {
|
||||||
|
if (!used.contains(key))
|
||||||
|
continue;
|
||||||
|
key.remove(QString("hddtotgb"));
|
||||||
|
int index = key.toInt();
|
||||||
|
used << QString("hddfreegb%1").arg(index)
|
||||||
|
<< QString("hddgb%1").arg(index);
|
||||||
|
}
|
||||||
|
// mem
|
||||||
|
if (used.contains(QString("mem")))
|
||||||
|
used << QString("memmb") << QString("memtotmb");
|
||||||
|
// memtotmb
|
||||||
|
if (used.contains(QString("memtotmb")))
|
||||||
|
used << QString("memusedmb") << QString("memfreemb");
|
||||||
|
// memtotgb
|
||||||
|
if (used.contains(QString("memtotgb")))
|
||||||
|
used << QString("memusedgb") << QString("memfreegb");
|
||||||
|
// swap
|
||||||
|
if (used.contains(QString("swap")))
|
||||||
|
used << QString("swapmb") << QString("swaptotmb");
|
||||||
|
// swaptotmb
|
||||||
|
if (used.contains(QString("swaptotmb")))
|
||||||
|
used << QString("swapmb") << QString("swapfreemb");
|
||||||
|
// memtotgb
|
||||||
|
if (used.contains(QString("swaptotgb")))
|
||||||
|
used << QString("swapgb") << QString("swapfreegb");
|
||||||
|
// network keys
|
||||||
|
QStringList netKeys(QStringList()
|
||||||
|
<< QString("up") << QString("upkb")
|
||||||
|
<< QString("uptotal") << QString("uptotalkb")
|
||||||
|
<< QString("upunits") << QString("down")
|
||||||
|
<< QString("downkb") << QString("downtotal")
|
||||||
|
<< QString("downtotalkb") << QString("downunits"));
|
||||||
|
for (auto key : netKeys) {
|
||||||
|
if (!used.contains(key))
|
||||||
|
continue;
|
||||||
|
QStringList filt
|
||||||
|
= allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
|
||||||
|
for (auto filtered : filt)
|
||||||
|
used << filtered;
|
||||||
|
}
|
||||||
|
// netdev key
|
||||||
|
if (std::any_of(netKeys.cbegin(), netKeys.cend(),
|
||||||
|
[&used](const QString &key) { return used.contains(key); }))
|
||||||
|
used << QString("netdev");
|
||||||
|
|
||||||
|
// HACK append dummy if there are no other keys. This hack is required
|
||||||
|
// because empty list leads to the same behaviour as skip checking
|
||||||
|
if (used.isEmpty())
|
||||||
|
used << QString("dummy");
|
||||||
|
|
||||||
|
return used.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
|
||||||
|
{
|
||||||
|
QString fileName = QString("%1/awesomewidgets.ndx")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericCacheLocation));
|
||||||
|
qCInfo(LOG_AW) << "Cache file" << fileName;
|
||||||
|
QSettings cache(fileName, QSettings::IniFormat);
|
||||||
|
|
||||||
|
QHash<QString, QStringList> devices;
|
||||||
|
for (auto group : cache.childGroups()) {
|
||||||
|
cache.beginGroup(group);
|
||||||
|
for (auto key : cache.allKeys())
|
||||||
|
devices[group].append(cache.value(key).toString());
|
||||||
|
cache.endGroup();
|
||||||
|
}
|
||||||
|
|
||||||
|
return devices;
|
||||||
|
}
|
37
sources/awesome-widget/plugin/awkeycache.h
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef AWKEYCACHE_H
|
||||||
|
#define AWKEYCACHE_H
|
||||||
|
|
||||||
|
#include <QHash>
|
||||||
|
#include <QString>
|
||||||
|
#include <QVariant>
|
||||||
|
|
||||||
|
|
||||||
|
namespace AWKeyCache
|
||||||
|
{
|
||||||
|
bool addKeyToCache(const QString type, const QString key = QString(""));
|
||||||
|
QStringList getRequiredKeys(const QStringList &keys, const QStringList &bars,
|
||||||
|
const QVariantMap &tooltip,
|
||||||
|
const QStringList &allKeys);
|
||||||
|
QHash<QString, QStringList> loadKeysFromCache();
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWKEYCACHE_H */
|
356
sources/awesome-widget/plugin/awkeyoperations.cpp
Normal file
@ -0,0 +1,356 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include "awkeyoperations.h"
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QJSEngine>
|
||||||
|
#include <QRegExp>
|
||||||
|
#include <QThread>
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awkeycache.h"
|
||||||
|
#include "awpatternfunctions.h"
|
||||||
|
// extensions
|
||||||
|
#include "extquotes.h"
|
||||||
|
#include "extscript.h"
|
||||||
|
#include "extupgrade.h"
|
||||||
|
#include "extweather.h"
|
||||||
|
#include "graphicalitem.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWKeyOperations::AWKeyOperations(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWKeyOperations::~AWKeyOperations()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
// extensions
|
||||||
|
delete m_graphicalItems;
|
||||||
|
delete m_extQuotes;
|
||||||
|
delete m_extScripts;
|
||||||
|
delete m_extUpgrade;
|
||||||
|
delete m_extWeather;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWKeyOperations::devices(const QString type) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for type" << type;
|
||||||
|
|
||||||
|
return m_devices[type];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QHash<QString, QStringList> AWKeyOperations::devices() const
|
||||||
|
{
|
||||||
|
return m_devices;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeyOperations::updateCache()
|
||||||
|
{
|
||||||
|
// update network and hdd list
|
||||||
|
addKeyToCache(QString("hdd"));
|
||||||
|
addKeyToCache(QString("net"));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWKeyOperations::dictKeys() const
|
||||||
|
{
|
||||||
|
QStringList allKeys;
|
||||||
|
// weather
|
||||||
|
for (int i = m_extWeather->activeItems().count() - 1; i >= 0; i--) {
|
||||||
|
allKeys.append(
|
||||||
|
m_extWeather->activeItems().at(i)->tag(QString("weatherId")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extWeather->activeItems().at(i)->tag(QString("weather")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extWeather->activeItems().at(i)->tag(QString("humidity")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extWeather->activeItems().at(i)->tag(QString("pressure")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extWeather->activeItems().at(i)->tag(QString("temperature")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extWeather->activeItems().at(i)->tag(QString("timestamp")));
|
||||||
|
}
|
||||||
|
// cpuclock & cpu
|
||||||
|
for (int i = QThread::idealThreadCount() - 1; i >= 0; i--) {
|
||||||
|
allKeys.append(QString("cpucl%1").arg(i));
|
||||||
|
allKeys.append(QString("cpu%1").arg(i));
|
||||||
|
}
|
||||||
|
// temperature
|
||||||
|
for (int i = m_devices[QString("temp")].count() - 1; i >= 0; i--)
|
||||||
|
allKeys.append(QString("temp%1").arg(i));
|
||||||
|
// hdd
|
||||||
|
for (int i = m_devices[QString("mount")].count() - 1; i >= 0; i--) {
|
||||||
|
allKeys.append(QString("hddmb%1").arg(i));
|
||||||
|
allKeys.append(QString("hddgb%1").arg(i));
|
||||||
|
allKeys.append(QString("hddfreemb%1").arg(i));
|
||||||
|
allKeys.append(QString("hddfreegb%1").arg(i));
|
||||||
|
allKeys.append(QString("hddtotmb%1").arg(i));
|
||||||
|
allKeys.append(QString("hddtotgb%1").arg(i));
|
||||||
|
allKeys.append(QString("hdd%1").arg(i));
|
||||||
|
}
|
||||||
|
// hdd speed
|
||||||
|
for (int i = m_devices[QString("disk")].count() - 1; i >= 0; i--) {
|
||||||
|
allKeys.append(QString("hddr%1").arg(i));
|
||||||
|
allKeys.append(QString("hddw%1").arg(i));
|
||||||
|
}
|
||||||
|
// hdd temp
|
||||||
|
for (int i = m_devices[QString("hdd")].count() - 1; i >= 0; i--)
|
||||||
|
allKeys.append(QString("hddtemp%1").arg(i));
|
||||||
|
// network
|
||||||
|
for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) {
|
||||||
|
allKeys.append(QString("downunits%1").arg(i));
|
||||||
|
allKeys.append(QString("upunits%1").arg(i));
|
||||||
|
allKeys.append(QString("downtotalkb%1").arg(i));
|
||||||
|
allKeys.append(QString("downtotal%1").arg(i));
|
||||||
|
allKeys.append(QString("downkb%1").arg(i));
|
||||||
|
allKeys.append(QString("down%1").arg(i));
|
||||||
|
allKeys.append(QString("uptotalkb%1").arg(i));
|
||||||
|
allKeys.append(QString("uptotal%1").arg(i));
|
||||||
|
allKeys.append(QString("upkb%1").arg(i));
|
||||||
|
allKeys.append(QString("up%1").arg(i));
|
||||||
|
}
|
||||||
|
// battery
|
||||||
|
QStringList allBatteryDevices
|
||||||
|
= QDir(QString("/sys/class/power_supply"))
|
||||||
|
.entryList(QStringList() << QString("BAT*"),
|
||||||
|
QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
|
||||||
|
for (int i = allBatteryDevices.count() - 1; i >= 0; i--)
|
||||||
|
allKeys.append(QString("bat%1").arg(i));
|
||||||
|
// package manager
|
||||||
|
for (int i = m_extUpgrade->activeItems().count() - 1; i >= 0; i--)
|
||||||
|
allKeys.append(
|
||||||
|
m_extUpgrade->activeItems().at(i)->tag(QString("pkgcount")));
|
||||||
|
// quotes
|
||||||
|
for (int i = m_extQuotes->activeItems().count() - 1; i >= 0; i--) {
|
||||||
|
allKeys.append(m_extQuotes->activeItems().at(i)->tag(QString("ask")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extQuotes->activeItems().at(i)->tag(QString("askchg")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extQuotes->activeItems().at(i)->tag(QString("percaskchg")));
|
||||||
|
allKeys.append(m_extQuotes->activeItems().at(i)->tag(QString("bid")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extQuotes->activeItems().at(i)->tag(QString("bidchg")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extQuotes->activeItems().at(i)->tag(QString("percbidchg")));
|
||||||
|
allKeys.append(m_extQuotes->activeItems().at(i)->tag(QString("price")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extQuotes->activeItems().at(i)->tag(QString("pricechg")));
|
||||||
|
allKeys.append(
|
||||||
|
m_extQuotes->activeItems().at(i)->tag(QString("percpricechg")));
|
||||||
|
}
|
||||||
|
// custom
|
||||||
|
for (int i = m_extScripts->activeItems().count() - 1; i >= 0; i--)
|
||||||
|
allKeys.append(
|
||||||
|
m_extScripts->activeItems().at(i)->tag(QString("custom")));
|
||||||
|
// bars
|
||||||
|
for (int i = m_graphicalItems->activeItems().count() - 1; i >= 0; i--)
|
||||||
|
allKeys.append(
|
||||||
|
m_graphicalItems->activeItems().at(i)->tag(QString("bar")));
|
||||||
|
// static keys
|
||||||
|
QStringList staticKeys = QString(STATIC_KEYS).split(QChar(','));
|
||||||
|
std::for_each(staticKeys.cbegin(), staticKeys.cend(),
|
||||||
|
[&allKeys](const QString &key) { allKeys.append(key); });
|
||||||
|
|
||||||
|
return allKeys;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// this method is required to provide GraphicalItem functions (e.g. paint()) to
|
||||||
|
// parent classes
|
||||||
|
GraphicalItem *AWKeyOperations::giByKey(const QString key) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for item" << key;
|
||||||
|
|
||||||
|
return m_graphicalItems->itemByTag(key, QString("bar"));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWKeyOperations::infoByKey(QString key) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Requested key" << key;
|
||||||
|
|
||||||
|
QString stripped = key;
|
||||||
|
stripped.remove(QRegExp(QString("\\d+")));
|
||||||
|
QString output;
|
||||||
|
|
||||||
|
if (key.startsWith(QString("bar"))) {
|
||||||
|
AbstractExtItem *item = m_graphicalItems->itemByTag(key, stripped);
|
||||||
|
if (item)
|
||||||
|
output = item->uniq();
|
||||||
|
} else if (key.startsWith(QString("custom"))) {
|
||||||
|
AbstractExtItem *item = m_extScripts->itemByTag(key, stripped);
|
||||||
|
if (item)
|
||||||
|
output = item->uniq();
|
||||||
|
} else if (key.contains(QRegExp(QString("^hdd[rw]")))) {
|
||||||
|
output = m_devices[QString("disk")]
|
||||||
|
[key.remove(QRegExp(QString("hdd[rw]"))).toInt()];
|
||||||
|
} else if (key.contains(QRegExp(
|
||||||
|
QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))) {
|
||||||
|
output
|
||||||
|
= m_devices[QString("mount")]
|
||||||
|
[key
|
||||||
|
.remove(QRegExp(QString(
|
||||||
|
"^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))
|
||||||
|
.toInt()];
|
||||||
|
} else if (key.startsWith(QString("hddtemp"))) {
|
||||||
|
output
|
||||||
|
= m_devices[QString("hdd")][key.remove(QString("hddtemp")).toInt()];
|
||||||
|
} else if (key.contains(QRegExp(QString("^(down|up)[0-9]")))) {
|
||||||
|
output = m_devices[QString("net")]
|
||||||
|
[key.remove(QRegExp(QString("^(down|up)"))).toInt()];
|
||||||
|
} else if (key.startsWith(QString("pkgcount"))) {
|
||||||
|
AbstractExtItem *item = m_extUpgrade->itemByTag(key, stripped);
|
||||||
|
if (item)
|
||||||
|
output = item->uniq();
|
||||||
|
} else if (key.contains(
|
||||||
|
QRegExp(QString("(^|perc)(ask|bid|price)(chg|)")))) {
|
||||||
|
AbstractExtItem *item = m_extQuotes->itemByTag(key, stripped);
|
||||||
|
if (item)
|
||||||
|
output = item->uniq();
|
||||||
|
} else if (key.contains(QRegExp(QString(
|
||||||
|
"(weather|weatherId|humidity|pressure|temperature)")))) {
|
||||||
|
AbstractExtItem *item = m_extWeather->itemByTag(key, stripped);
|
||||||
|
if (item)
|
||||||
|
output = item->uniq();
|
||||||
|
} else if (key.startsWith(QString("temp"))) {
|
||||||
|
output
|
||||||
|
= m_devices[QString("temp")][key.remove(QString("temp")).toInt()];
|
||||||
|
} else {
|
||||||
|
output = QString("(none)");
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWKeyOperations::pattern() const
|
||||||
|
{
|
||||||
|
return m_pattern;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeyOperations::setPattern(const QString currentPattern)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Set pattern" << currentPattern;
|
||||||
|
|
||||||
|
m_pattern = currentPattern;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeyOperations::editItem(const QString type)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Item type" << type;
|
||||||
|
|
||||||
|
if (type == QString("graphicalitem")) {
|
||||||
|
QStringList keys = dictKeys().filter(QRegExp(
|
||||||
|
QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)")));
|
||||||
|
keys.sort();
|
||||||
|
m_graphicalItems->setConfigArgs(keys);
|
||||||
|
return m_graphicalItems->editItems();
|
||||||
|
} else if (type == QString("extquotes")) {
|
||||||
|
return m_extQuotes->editItems();
|
||||||
|
} else if (type == QString("extscript")) {
|
||||||
|
return m_extScripts->editItems();
|
||||||
|
} else if (type == QString("extupgrade")) {
|
||||||
|
return m_extUpgrade->editItems();
|
||||||
|
} else if (type == QString("extweather")) {
|
||||||
|
return m_extWeather->editItems();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeyOperations::addDevice(const QString &source)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Source" << source;
|
||||||
|
|
||||||
|
QRegExp diskRegexp
|
||||||
|
= QRegExp(QString("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)"));
|
||||||
|
QRegExp mountRegexp = QRegExp(QString("partitions/.*/filllevel"));
|
||||||
|
|
||||||
|
if (source.contains(diskRegexp)) {
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("/Rate/rblk"));
|
||||||
|
addKeyToCache(QString("disk"), device);
|
||||||
|
} else if (source.contains(mountRegexp)) {
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("partitions")).remove(QString("/filllevel"));
|
||||||
|
addKeyToCache(QString("mount"), device);
|
||||||
|
} else if (source.startsWith(QString("lmsensors"))) {
|
||||||
|
addKeyToCache(QString("temp"), source);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeyOperations::addKeyToCache(const QString type, const QString key)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Key" << key << "with type" << type;
|
||||||
|
|
||||||
|
if (AWKeyCache::addKeyToCache(type, key)) {
|
||||||
|
m_devices = AWKeyCache::loadKeysFromCache();
|
||||||
|
reinitKeys();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeyOperations::reinitKeys()
|
||||||
|
{
|
||||||
|
// renew extensions
|
||||||
|
// delete them if any
|
||||||
|
delete m_graphicalItems;
|
||||||
|
m_graphicalItems = nullptr;
|
||||||
|
delete m_extQuotes;
|
||||||
|
m_extQuotes = nullptr;
|
||||||
|
delete m_extScripts;
|
||||||
|
m_extScripts = nullptr;
|
||||||
|
delete m_extUpgrade;
|
||||||
|
m_extUpgrade = nullptr;
|
||||||
|
delete m_extWeather;
|
||||||
|
m_extWeather = nullptr;
|
||||||
|
// create
|
||||||
|
m_graphicalItems
|
||||||
|
= new ExtItemAggregator<GraphicalItem>(nullptr, QString("desktops"));
|
||||||
|
m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, QString("quotes"));
|
||||||
|
m_extScripts
|
||||||
|
= new ExtItemAggregator<ExtScript>(nullptr, QString("scripts"));
|
||||||
|
m_extUpgrade
|
||||||
|
= new ExtItemAggregator<ExtUpgrade>(nullptr, QString("upgrade"));
|
||||||
|
m_extWeather
|
||||||
|
= new ExtItemAggregator<ExtWeather>(nullptr, QString("weather"));
|
||||||
|
|
||||||
|
// init
|
||||||
|
QStringList allKeys = dictKeys();
|
||||||
|
|
||||||
|
// apply aw_* functions
|
||||||
|
m_pattern = AWPatternFunctions::insertAllKeys(m_pattern, allKeys);
|
||||||
|
m_pattern = AWPatternFunctions::insertKeyCount(m_pattern, allKeys);
|
||||||
|
m_pattern = AWPatternFunctions::insertKeyNames(m_pattern, allKeys);
|
||||||
|
m_pattern = AWPatternFunctions::insertKeys(m_pattern, allKeys);
|
||||||
|
m_pattern = AWPatternFunctions::insertMacros(m_pattern);
|
||||||
|
// wrap templates
|
||||||
|
m_pattern = AWPatternFunctions::expandTemplates(m_pattern);
|
||||||
|
|
||||||
|
emit(updateKeys(allKeys));
|
||||||
|
}
|
83
sources/awesome-widget/plugin/awkeyoperations.h
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 AWKEYOPERATIONS_H
|
||||||
|
#define AWKEYOPERATIONS_H
|
||||||
|
|
||||||
|
#include <Plasma/DataEngine>
|
||||||
|
|
||||||
|
#include <QMutex>
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
#include "extitemaggregator.h"
|
||||||
|
|
||||||
|
|
||||||
|
class AWDataAggregator;
|
||||||
|
class AWDataEngineAggregator;
|
||||||
|
class AWKeysAggregator;
|
||||||
|
class ExtQuotes;
|
||||||
|
class ExtScript;
|
||||||
|
class ExtUpgrade;
|
||||||
|
class ExtWeather;
|
||||||
|
class GraphicalItem;
|
||||||
|
class QThreadPool;
|
||||||
|
|
||||||
|
class AWKeyOperations : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PROPERTY(QString pattern READ pattern WRITE setPattern)
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWKeyOperations(QObject *parent = nullptr);
|
||||||
|
virtual ~AWKeyOperations();
|
||||||
|
QStringList devices(const QString type) const;
|
||||||
|
QHash<QString, QStringList> devices() const;
|
||||||
|
void updateCache();
|
||||||
|
// keys
|
||||||
|
QStringList dictKeys() const;
|
||||||
|
GraphicalItem *giByKey(const QString key) const;
|
||||||
|
// values
|
||||||
|
QString infoByKey(QString key) const;
|
||||||
|
QString pattern() const;
|
||||||
|
void setPattern(const QString currentPattern);
|
||||||
|
// configuration
|
||||||
|
void editItem(const QString type);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void updateKeys(const QStringList currentKeys);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void addDevice(const QString &source);
|
||||||
|
|
||||||
|
private:
|
||||||
|
// methods
|
||||||
|
void addKeyToCache(const QString type, const QString key = QString(""));
|
||||||
|
void reinitKeys();
|
||||||
|
// objects
|
||||||
|
ExtItemAggregator<GraphicalItem> *m_graphicalItems = nullptr;
|
||||||
|
ExtItemAggregator<ExtQuotes> *m_extQuotes = nullptr;
|
||||||
|
ExtItemAggregator<ExtScript> *m_extScripts = nullptr;
|
||||||
|
ExtItemAggregator<ExtUpgrade> *m_extUpgrade = nullptr;
|
||||||
|
ExtItemAggregator<ExtWeather> *m_extWeather = nullptr;
|
||||||
|
// variables
|
||||||
|
QHash<QString, QStringList> m_devices;
|
||||||
|
QString m_pattern;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWKEYOPERATIONS_H */
|
374
sources/awesome-widget/plugin/awkeys.cpp
Normal file
@ -0,0 +1,374 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 "awkeys.h"
|
||||||
|
|
||||||
|
#include <QJSEngine>
|
||||||
|
#include <QRegExp>
|
||||||
|
#include <QThread>
|
||||||
|
#include <QTimer>
|
||||||
|
#include <QtConcurrent/QtConcurrent>
|
||||||
|
|
||||||
|
#include "awdataaggregator.h"
|
||||||
|
#include "awdataengineaggregator.h"
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awkeycache.h"
|
||||||
|
#include "awkeyoperations.h"
|
||||||
|
#include "awkeysaggregator.h"
|
||||||
|
#include "awpatternfunctions.h"
|
||||||
|
#include "graphicalitem.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWKeys::AWKeys(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qSetMessagePattern(LOG_FORMAT);
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
for (auto metadata : getBuildData())
|
||||||
|
qCDebug(LOG_AW) << metadata;
|
||||||
|
|
||||||
|
// thread pool
|
||||||
|
m_threadPool = new QThreadPool(this);
|
||||||
|
|
||||||
|
m_aggregator = new AWKeysAggregator(this);
|
||||||
|
m_dataAggregator = new AWDataAggregator(this);
|
||||||
|
m_dataEngineAggregator = new AWDataEngineAggregator(this);
|
||||||
|
m_keyOperator = new AWKeyOperations(this);
|
||||||
|
|
||||||
|
m_timer = new QTimer(this);
|
||||||
|
m_timer->setSingleShot(false);
|
||||||
|
|
||||||
|
// update key data if required
|
||||||
|
connect(m_keyOperator, SIGNAL(updateKeys(QStringList)), this,
|
||||||
|
SLOT(reinitKeys(QStringList)));
|
||||||
|
connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
|
||||||
|
// transfer signal from AWDataAggregator object to QML ui
|
||||||
|
connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString)), this,
|
||||||
|
SIGNAL(needToolTipToBeUpdated(const QString)));
|
||||||
|
connect(this, SIGNAL(dropSourceFromDataengine(QString)),
|
||||||
|
m_dataEngineAggregator, SLOT(dropSource(QString)));
|
||||||
|
// transfer signal from dataengine to update source list
|
||||||
|
connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)),
|
||||||
|
m_keyOperator, SLOT(addDevice(const QString &)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWKeys::~AWKeys()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
m_timer->stop();
|
||||||
|
delete m_timer;
|
||||||
|
|
||||||
|
// core
|
||||||
|
delete m_dataEngineAggregator;
|
||||||
|
delete m_threadPool;
|
||||||
|
delete m_aggregator;
|
||||||
|
delete m_dataAggregator;
|
||||||
|
delete m_keyOperator;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::initDataAggregator(const QVariantMap tooltipParams)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Tooltip parameters" << tooltipParams;
|
||||||
|
|
||||||
|
// store parameters to generate m_requiredKeys
|
||||||
|
m_tooltipParams = tooltipParams;
|
||||||
|
m_dataAggregator->setParameters(m_tooltipParams);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::initKeys(const QString currentPattern, const int interval,
|
||||||
|
const int limit, const bool optimize)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Pattern" << currentPattern << "with interval"
|
||||||
|
<< interval << "and queue limit" << limit
|
||||||
|
<< "with optimization" << optimize;
|
||||||
|
|
||||||
|
// init
|
||||||
|
m_optimize = optimize;
|
||||||
|
m_threadPool->setMaxThreadCount(limit == 0 ? QThread::idealThreadCount()
|
||||||
|
: limit);
|
||||||
|
// child objects
|
||||||
|
m_aggregator->initFormatters();
|
||||||
|
m_keyOperator->setPattern(currentPattern);
|
||||||
|
m_keyOperator->updateCache();
|
||||||
|
m_dataEngineAggregator->clear();
|
||||||
|
m_dataEngineAggregator->initDataEngines(interval);
|
||||||
|
|
||||||
|
// timer
|
||||||
|
m_timer->setInterval(interval);
|
||||||
|
m_timer->start();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::setAggregatorProperty(const QString key, const QVariant value)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Key" << key << "with value" << value;
|
||||||
|
|
||||||
|
m_aggregator->setProperty(key.toUtf8().constData(), value);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::setWrapNewLines(const bool wrap)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Is wrapping enabled" << wrap;
|
||||||
|
|
||||||
|
m_wrapNewLines = wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::updateCache()
|
||||||
|
{
|
||||||
|
return m_keyOperator->updateCache();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWKeys::dictKeys(const bool sorted, const QString regexp) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Should be sorted" << sorted << "and filter applied"
|
||||||
|
<< regexp;
|
||||||
|
|
||||||
|
QStringList allKeys = m_keyOperator->dictKeys();
|
||||||
|
// sort if required
|
||||||
|
if (sorted)
|
||||||
|
allKeys.sort();
|
||||||
|
|
||||||
|
return allKeys.filter(QRegExp(regexp));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWKeys::getHddDevices() const
|
||||||
|
{
|
||||||
|
QStringList devices = m_keyOperator->devices(QString("hdd"));
|
||||||
|
// required by selector in the UI
|
||||||
|
devices.insert(0, QString("disable"));
|
||||||
|
devices.insert(0, QString("auto"));
|
||||||
|
|
||||||
|
return devices;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWKeys::infoByKey(QString key) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Requested info for key" << key;
|
||||||
|
|
||||||
|
return m_keyOperator->infoByKey(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// HACK this method requires to define tag value from bar from UI interface
|
||||||
|
QString AWKeys::valueByKey(QString key) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Requested value for key" << key;
|
||||||
|
|
||||||
|
QString trueKey
|
||||||
|
= key.startsWith(QString("bar")) ? m_keyOperator->infoByKey(key) : key;
|
||||||
|
|
||||||
|
return m_aggregator->formatter(m_values[trueKey], trueKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::editItem(const QString type)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Item type" << type;
|
||||||
|
|
||||||
|
return m_keyOperator->editItem(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::dataUpdated(const QString &sourceName,
|
||||||
|
const Plasma::DataEngine::Data &data)
|
||||||
|
{
|
||||||
|
// run concurrent data update
|
||||||
|
QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName,
|
||||||
|
data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::reinitKeys(const QStringList currentKeys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Update found keys by using list" << currentKeys;
|
||||||
|
|
||||||
|
// append lists
|
||||||
|
m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
|
||||||
|
currentKeys, true);
|
||||||
|
m_foundKeys = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
|
||||||
|
currentKeys, false);
|
||||||
|
m_foundLambdas = AWPatternFunctions::findLambdas(m_keyOperator->pattern());
|
||||||
|
// generate list of required keys for bars
|
||||||
|
QStringList barKeys;
|
||||||
|
for (auto bar : m_foundBars) {
|
||||||
|
GraphicalItem *item = m_keyOperator->giByKey(bar);
|
||||||
|
if (item->isCustom())
|
||||||
|
item->setUsedKeys(
|
||||||
|
AWPatternFunctions::findKeys(item->bar(), currentKeys, false));
|
||||||
|
else
|
||||||
|
item->setUsedKeys(QStringList() << item->bar());
|
||||||
|
barKeys.append(item->usedKeys());
|
||||||
|
}
|
||||||
|
// get required keys
|
||||||
|
m_requiredKeys
|
||||||
|
= m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys,
|
||||||
|
m_tooltipParams, currentKeys)
|
||||||
|
: QStringList();
|
||||||
|
|
||||||
|
// set key data to m_aggregator
|
||||||
|
m_aggregator->setDevices(m_keyOperator->devices());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::updateTextData()
|
||||||
|
{
|
||||||
|
// do not do it in parallel to avoid race condition
|
||||||
|
m_mutex.lock();
|
||||||
|
calculateValues();
|
||||||
|
QString text = parsePattern(m_keyOperator->pattern());
|
||||||
|
m_mutex.unlock();
|
||||||
|
|
||||||
|
emit(needTextToBeUpdated(text));
|
||||||
|
emit(m_dataAggregator->updateData(m_values));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// HACK this method is required since I could not define some values by using
|
||||||
|
// specified pattern. Usually they are values which depend on several others
|
||||||
|
void AWKeys::calculateValues()
|
||||||
|
{
|
||||||
|
// hddtot*
|
||||||
|
QStringList mountDevices = m_keyOperator->devices(QString("mount"));
|
||||||
|
for (auto device : mountDevices) {
|
||||||
|
int index = mountDevices.indexOf(device);
|
||||||
|
m_values[QString("hddtotmb%1").arg(index)]
|
||||||
|
= m_values[QString("hddfreemb%1").arg(index)].toFloat()
|
||||||
|
+ m_values[QString("hddmb%1").arg(index)].toFloat();
|
||||||
|
m_values[QString("hddtotgb%1").arg(index)]
|
||||||
|
= m_values[QString("hddfreegb%1").arg(index)].toFloat()
|
||||||
|
+ m_values[QString("hddgb%1").arg(index)].toFloat();
|
||||||
|
}
|
||||||
|
|
||||||
|
// memtot*
|
||||||
|
m_values[QString("memtotmb")] = m_values[QString("memusedmb")].toInt()
|
||||||
|
+ m_values[QString("memfreemb")].toInt();
|
||||||
|
m_values[QString("memtotgb")] = m_values[QString("memusedgb")].toFloat()
|
||||||
|
+ m_values[QString("memfreegb")].toFloat();
|
||||||
|
// mem
|
||||||
|
m_values[QString("mem")] = 100.0f * m_values[QString("memmb")].toFloat()
|
||||||
|
/ m_values[QString("memtotmb")].toFloat();
|
||||||
|
|
||||||
|
// up, down, upkb, downkb, upunits, downunits
|
||||||
|
int netIndex = m_keyOperator->devices(QString("net"))
|
||||||
|
.indexOf(m_values[QString("netdev")].toString());
|
||||||
|
m_values[QString("down")] = m_values[QString("down%1").arg(netIndex)];
|
||||||
|
m_values[QString("downkb")] = m_values[QString("downkb%1").arg(netIndex)];
|
||||||
|
m_values[QString("downtotal")]
|
||||||
|
= m_values[QString("downtotal%1").arg(netIndex)];
|
||||||
|
m_values[QString("downtotalkb")]
|
||||||
|
= m_values[QString("downtotalkb%1").arg(netIndex)];
|
||||||
|
m_values[QString("downunits")]
|
||||||
|
= m_values[QString("downunits%1").arg(netIndex)];
|
||||||
|
m_values[QString("up")] = m_values[QString("up%1").arg(netIndex)];
|
||||||
|
m_values[QString("upkb")] = m_values[QString("upkb%1").arg(netIndex)];
|
||||||
|
m_values[QString("uptotal")] = m_values[QString("uptotal%1").arg(netIndex)];
|
||||||
|
m_values[QString("uptotalkb")]
|
||||||
|
= m_values[QString("uptotalkb%1").arg(netIndex)];
|
||||||
|
m_values[QString("upunits")] = m_values[QString("upunits%1").arg(netIndex)];
|
||||||
|
|
||||||
|
// swaptot*
|
||||||
|
m_values[QString("swaptotmb")] = m_values[QString("swapmb")].toInt()
|
||||||
|
+ m_values[QString("swapfreemb")].toInt();
|
||||||
|
m_values[QString("swaptotgb")]
|
||||||
|
= m_values[QString("swapgb")].toFloat()
|
||||||
|
+ m_values[QString("swapfreegb")].toFloat();
|
||||||
|
// swap
|
||||||
|
m_values[QString("swap")] = 100.0f * m_values[QString("swapmb")].toFloat()
|
||||||
|
/ m_values[QString("swaptotmb")].toFloat();
|
||||||
|
|
||||||
|
// lambdas
|
||||||
|
for (auto key : m_foundLambdas)
|
||||||
|
m_values[key] = AWPatternFunctions::expandLambdas(
|
||||||
|
key, m_aggregator, m_values, m_foundKeys);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWKeys::parsePattern(QString pattern) const
|
||||||
|
{
|
||||||
|
// screen sign
|
||||||
|
pattern.replace(QString("$$"), QString(0x1d));
|
||||||
|
|
||||||
|
// lambdas
|
||||||
|
for (auto key : m_foundLambdas)
|
||||||
|
pattern.replace(QString("${{%1}}").arg(key), m_values[key].toString());
|
||||||
|
|
||||||
|
// main keys
|
||||||
|
for (auto key : m_foundKeys)
|
||||||
|
pattern.replace(QString("$%1").arg(key), [this](const QString &tag,
|
||||||
|
const QVariant &value) {
|
||||||
|
QString strValue = m_aggregator->formatter(value, tag);
|
||||||
|
if ((!tag.startsWith(QString("custom")))
|
||||||
|
&& (!tag.startsWith(QString("weather"))))
|
||||||
|
strValue.replace(QString(" "), QString(" "));
|
||||||
|
return strValue;
|
||||||
|
}(key, m_values[key]));
|
||||||
|
|
||||||
|
// bars
|
||||||
|
for (auto bar : m_foundBars) {
|
||||||
|
GraphicalItem *item = m_keyOperator->giByKey(bar);
|
||||||
|
QString image
|
||||||
|
= item->isCustom()
|
||||||
|
? item->image(AWPatternFunctions::expandLambdas(
|
||||||
|
item->bar(), m_aggregator, m_values, item->usedKeys()))
|
||||||
|
: item->image(m_values[item->bar()]);
|
||||||
|
pattern.replace(QString("$%1").arg(bar), image);
|
||||||
|
}
|
||||||
|
|
||||||
|
// prepare strings
|
||||||
|
pattern.replace(QString(0x1d), QString("$"));
|
||||||
|
if (m_wrapNewLines)
|
||||||
|
pattern.replace(QString("\n"), QString("<br>"));
|
||||||
|
|
||||||
|
return pattern;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeys::setDataBySource(const QString &sourceName, const QVariantMap &data)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Source" << sourceName << "with data" << data;
|
||||||
|
|
||||||
|
// first list init
|
||||||
|
QStringList tags = m_aggregator->keysFromSource(sourceName);
|
||||||
|
if (tags.isEmpty())
|
||||||
|
tags = m_aggregator->registerSource(
|
||||||
|
sourceName, data[QString("units")].toString(), m_requiredKeys);
|
||||||
|
|
||||||
|
// update data or drop source if there are no matches and exit
|
||||||
|
if (tags.isEmpty()) {
|
||||||
|
qCInfo(LOG_AW) << "Source" << sourceName << "not found";
|
||||||
|
return emit(dropSourceFromDataengine(sourceName));
|
||||||
|
}
|
||||||
|
|
||||||
|
m_mutex.lock();
|
||||||
|
// HACK workaround for time values which are stored in the different path
|
||||||
|
std::for_each(tags.cbegin(), tags.cend(),
|
||||||
|
[this, &data, &sourceName](const QString &tag) {
|
||||||
|
m_values[tag] = sourceName == QString("Local")
|
||||||
|
? data[QString("DateTime")]
|
||||||
|
: data[QString("value")];
|
||||||
|
});
|
||||||
|
m_mutex.unlock();
|
||||||
|
}
|
99
sources/awesome-widget/plugin/awkeys.h
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 AWKEYS_H
|
||||||
|
#define AWKEYS_H
|
||||||
|
|
||||||
|
#include <Plasma/DataEngine>
|
||||||
|
|
||||||
|
#include <QMutex>
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
|
||||||
|
class AWDataAggregator;
|
||||||
|
class AWDataEngineAggregator;
|
||||||
|
class AWKeyOperations;
|
||||||
|
class AWKeysAggregator;
|
||||||
|
class QThreadPool;
|
||||||
|
class QTimer;
|
||||||
|
|
||||||
|
class AWKeys : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWKeys(QObject *parent = nullptr);
|
||||||
|
virtual ~AWKeys();
|
||||||
|
Q_INVOKABLE void initDataAggregator(const QVariantMap tooltipParams);
|
||||||
|
Q_INVOKABLE void initKeys(const QString currentPattern, const int interval,
|
||||||
|
const int limit, const bool optimize);
|
||||||
|
Q_INVOKABLE void setAggregatorProperty(const QString key,
|
||||||
|
const QVariant value);
|
||||||
|
Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
|
||||||
|
// additional method to force load keys from Qml UI. Used in some
|
||||||
|
// configuration pages
|
||||||
|
Q_INVOKABLE void updateCache();
|
||||||
|
// keys
|
||||||
|
Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
|
||||||
|
const QString regexp = QString()) const;
|
||||||
|
Q_INVOKABLE QStringList getHddDevices() const;
|
||||||
|
// values
|
||||||
|
Q_INVOKABLE QString infoByKey(QString key) const;
|
||||||
|
Q_INVOKABLE QString valueByKey(QString key) const;
|
||||||
|
// configuration
|
||||||
|
Q_INVOKABLE void editItem(const QString type);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void dataUpdated(const QString &sourceName,
|
||||||
|
const Plasma::DataEngine::Data &data);
|
||||||
|
// dummy method required by DataEngine connections
|
||||||
|
void modelChanged(QString, QAbstractItemModel *){};
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void dropSourceFromDataengine(const QString source);
|
||||||
|
void needTextToBeUpdated(const QString newText) const;
|
||||||
|
void needToolTipToBeUpdated(const QString newText) const;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void reinitKeys(const QStringList currentKeys);
|
||||||
|
void updateTextData();
|
||||||
|
|
||||||
|
private:
|
||||||
|
// methods
|
||||||
|
void calculateValues();
|
||||||
|
QString parsePattern(QString pattern) const;
|
||||||
|
void setDataBySource(const QString &sourceName, const QVariantMap &data);
|
||||||
|
// objects
|
||||||
|
AWDataAggregator *m_dataAggregator = nullptr;
|
||||||
|
AWDataEngineAggregator *m_dataEngineAggregator = nullptr;
|
||||||
|
AWKeysAggregator *m_aggregator = nullptr;
|
||||||
|
AWKeyOperations *m_keyOperator = nullptr;
|
||||||
|
QTimer *m_timer = nullptr;
|
||||||
|
// variables
|
||||||
|
QVariantMap m_tooltipParams;
|
||||||
|
QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys;
|
||||||
|
QVariantHash m_values;
|
||||||
|
bool m_optimize = false;
|
||||||
|
bool m_wrapNewLines = false;
|
||||||
|
// multithread features
|
||||||
|
QThreadPool *m_threadPool = nullptr;
|
||||||
|
QMutex m_mutex;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWKEYS_H */
|
635
sources/awesome-widget/plugin/awkeysaggregator.cpp
Normal file
@ -0,0 +1,635 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 "awkeysaggregator.h"
|
||||||
|
|
||||||
|
#include <KI18n/KLocalizedString>
|
||||||
|
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QLocale>
|
||||||
|
#include <QRegExp>
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awformatterhelper.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWKeysAggregator::AWKeysAggregator(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
// default formatters
|
||||||
|
// memory
|
||||||
|
m_formatter[QString("mem")] = FormatterType::Float;
|
||||||
|
m_formatter[QString("memtotmb")] = FormatterType::MemMBFormat;
|
||||||
|
m_formatter[QString("memtotgb")] = FormatterType::MemGBFormat;
|
||||||
|
// network
|
||||||
|
m_formatter[QString("down")] = FormatterType::NetSmartFormat;
|
||||||
|
m_formatter[QString("downkb")] = FormatterType::Integer;
|
||||||
|
m_formatter[QString("downunits")] = FormatterType::NetSmartUnits;
|
||||||
|
m_formatter[QString("up")] = FormatterType::NetSmartFormat;
|
||||||
|
m_formatter[QString("upkb")] = FormatterType::Integer;
|
||||||
|
m_formatter[QString("upunits")] = FormatterType::NetSmartUnits;
|
||||||
|
// swap
|
||||||
|
m_formatter[QString("swap")] = FormatterType::Float;
|
||||||
|
m_formatter[QString("swaptotmb")] = FormatterType::MemMBFormat;
|
||||||
|
m_formatter[QString("swaptotgb")] = FormatterType::MemGBFormat;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWKeysAggregator::~AWKeysAggregator()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
delete m_customFormatters;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::initFormatters()
|
||||||
|
{
|
||||||
|
if (m_customFormatters)
|
||||||
|
delete m_customFormatters;
|
||||||
|
m_customFormatters = new AWFormatterHelper(nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWKeysAggregator::formatter(const QVariant &data,
|
||||||
|
const QString &key) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Data" << data << "for key" << key;
|
||||||
|
|
||||||
|
QString output;
|
||||||
|
QLocale loc = m_translate ? QLocale::system() : QLocale::c();
|
||||||
|
// case block
|
||||||
|
switch (m_formatter[key]) {
|
||||||
|
case FormatterType::Float:
|
||||||
|
output = QString("%1").arg(data.toFloat(), 5, 'f', 1);
|
||||||
|
break;
|
||||||
|
case FormatterType::FloatTwoSymbols:
|
||||||
|
output = QString("%1").arg(data.toFloat(), 5, 'f', 2);
|
||||||
|
break;
|
||||||
|
case FormatterType::Integer:
|
||||||
|
output = QString("%1").arg(data.toFloat(), 4, 'f', 0);
|
||||||
|
break;
|
||||||
|
case FormatterType::IntegerFive:
|
||||||
|
output = QString("%1").arg(data.toFloat(), 5, 'f', 0);
|
||||||
|
break;
|
||||||
|
case FormatterType::IntegerThree:
|
||||||
|
output = QString("%1").arg(data.toFloat(), 3, 'f', 0);
|
||||||
|
break;
|
||||||
|
case FormatterType::List:
|
||||||
|
output = data.toStringList().join(QChar(','));
|
||||||
|
break;
|
||||||
|
case FormatterType::ACFormat:
|
||||||
|
output = data.toBool() ? m_acOnline : m_acOffline;
|
||||||
|
break;
|
||||||
|
case FormatterType::MemGBFormat:
|
||||||
|
output
|
||||||
|
= QString("%1").arg(data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
|
||||||
|
break;
|
||||||
|
case FormatterType::MemMBFormat:
|
||||||
|
output = QString("%1").arg(data.toFloat() / 1024.0, 5, 'f', 0);
|
||||||
|
break;
|
||||||
|
case FormatterType::NetSmartFormat:
|
||||||
|
output = [](const float value) {
|
||||||
|
if (value > 1024.0)
|
||||||
|
return QString("%1").arg(value / 1024.0, 4, 'f', 1);
|
||||||
|
else
|
||||||
|
return QString("%1").arg(value, 4, 'f', 0);
|
||||||
|
}(data.toFloat());
|
||||||
|
break;
|
||||||
|
case FormatterType::NetSmartUnits:
|
||||||
|
if (data.toFloat() > 1024.0)
|
||||||
|
output = m_translate ? i18n("MB/s") : QString("MB/s");
|
||||||
|
else
|
||||||
|
output = m_translate ? i18n("KB/s") : QString("KB/s");
|
||||||
|
break;
|
||||||
|
case FormatterType::Quotes:
|
||||||
|
// first cast
|
||||||
|
output = QString("%1").arg(data.toDouble(), 0, 'f');
|
||||||
|
output = output.rightJustified(8, QLatin1Char(' '), true);
|
||||||
|
break;
|
||||||
|
case FormatterType::Temperature:
|
||||||
|
output = QString("%1").arg(temperature(data.toFloat()), 5, 'f', 1);
|
||||||
|
break;
|
||||||
|
case FormatterType::Time:
|
||||||
|
output = data.toDateTime().toString();
|
||||||
|
break;
|
||||||
|
case FormatterType::TimeCustom:
|
||||||
|
output = m_customTime;
|
||||||
|
[&output, loc, this](const QDateTime dt) {
|
||||||
|
for (auto key : m_timeKeys)
|
||||||
|
output.replace(QString("$%1").arg(key), loc.toString(dt, key));
|
||||||
|
}(data.toDateTime());
|
||||||
|
break;
|
||||||
|
case FormatterType::TimeISO:
|
||||||
|
output = data.toDateTime().toString(Qt::ISODate);
|
||||||
|
break;
|
||||||
|
case FormatterType::TimeLong:
|
||||||
|
output = loc.toString(data.toDateTime(), QLocale::LongFormat);
|
||||||
|
break;
|
||||||
|
case FormatterType::TimeShort:
|
||||||
|
output = loc.toString(data.toDateTime(), QLocale::ShortFormat);
|
||||||
|
break;
|
||||||
|
case FormatterType::Timestamp:
|
||||||
|
output = QString("%1").arg(
|
||||||
|
data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
|
||||||
|
break;
|
||||||
|
case FormatterType::Uptime:
|
||||||
|
case FormatterType::UptimeCustom:
|
||||||
|
output =
|
||||||
|
[](QString source, const int uptime) {
|
||||||
|
int seconds = uptime - uptime % 60;
|
||||||
|
int minutes = seconds / 60 % 60;
|
||||||
|
int hours = ((seconds / 60) - minutes) / 60 % 24;
|
||||||
|
int days = (((seconds / 60) - minutes) / 60 - hours) / 24;
|
||||||
|
source.replace(QString("$dd"),
|
||||||
|
QString("%1").arg(days, 3, 10, QChar('0')));
|
||||||
|
source.replace(QString("$d"), QString("%1").arg(days));
|
||||||
|
source.replace(QString("$hh"),
|
||||||
|
QString("%1").arg(hours, 2, 10, QChar('0')));
|
||||||
|
source.replace(QString("$h"), QString("%1").arg(hours));
|
||||||
|
source.replace(QString("$mm"),
|
||||||
|
QString("%1").arg(minutes, 2, 10, QChar('0')));
|
||||||
|
source.replace(QString("$m"), QString("%1").arg(minutes));
|
||||||
|
return source;
|
||||||
|
}(m_formatter[key] == FormatterType::Uptime
|
||||||
|
? QString("$ddd$hhh$mmm")
|
||||||
|
: m_customUptime,
|
||||||
|
static_cast<int>(data.toFloat()));
|
||||||
|
break;
|
||||||
|
case FormatterType::NoFormat:
|
||||||
|
output = data.toString();
|
||||||
|
break;
|
||||||
|
case FormatterType::Custom:
|
||||||
|
if (m_customFormatters)
|
||||||
|
output = m_customFormatters->convert(data, key);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWKeysAggregator::keysFromSource(const QString &source) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Search for source" << source;
|
||||||
|
|
||||||
|
return m_map.values(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::setAcOffline(const QString inactive)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Inactive AC string" << inactive;
|
||||||
|
|
||||||
|
m_acOffline = inactive;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::setAcOnline(const QString active)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Active AC string" << active;
|
||||||
|
|
||||||
|
m_acOnline = active;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::setCustomTime(const QString customTime)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Format" << customTime;
|
||||||
|
|
||||||
|
m_customTime = customTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::setCustomUptime(const QString customUptime)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Format" << customUptime;
|
||||||
|
|
||||||
|
m_customUptime = customUptime;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::setDevices(const QHash<QString, QStringList> devices)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Devices" << devices;
|
||||||
|
|
||||||
|
m_devices = devices;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::setTempUnits(const QString units)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Units" << units;
|
||||||
|
|
||||||
|
m_tempUnits = units;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWKeysAggregator::setTranslate(const bool translate)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Translate" << translate;
|
||||||
|
|
||||||
|
m_translate = translate;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// HACK units required to define should the value be calculated as temperature
|
||||||
|
// or fan data
|
||||||
|
QStringList AWKeysAggregator::registerSource(const QString &source,
|
||||||
|
const QString &units,
|
||||||
|
const QStringList &keys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Source" << source << "with units" << units;
|
||||||
|
|
||||||
|
// regular expressions
|
||||||
|
QRegExp cpuRegExp = QRegExp(QString("cpu/cpu.*/TotalLoad"));
|
||||||
|
QRegExp cpuclRegExp = QRegExp(QString("cpu/cpu.*/clock"));
|
||||||
|
QRegExp hddrRegExp = QRegExp(QString("disk/.*/Rate/rblk"));
|
||||||
|
QRegExp hddwRegExp = QRegExp(QString("disk/.*/Rate/wblk"));
|
||||||
|
QRegExp mountFillRegExp = QRegExp(QString("partitions/.*/filllevel"));
|
||||||
|
QRegExp mountFreeRegExp = QRegExp(QString("partitions/.*/freespace"));
|
||||||
|
QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace"));
|
||||||
|
QRegExp netRegExp = QRegExp(
|
||||||
|
QString("network/interfaces/.*/(receiver|transmitter)/data$"));
|
||||||
|
QRegExp netTotalRegExp = QRegExp(
|
||||||
|
QString("network/interfaces/.*/(receiver|transmitter)/dataTotal$"));
|
||||||
|
|
||||||
|
if (source == QString("battery/ac")) {
|
||||||
|
// AC
|
||||||
|
m_map[source] = QString("ac");
|
||||||
|
m_formatter[QString("ac")] = FormatterType::ACFormat;
|
||||||
|
} else if (source.startsWith(QString("battery/"))) {
|
||||||
|
// battery stats
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("battery/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::IntegerThree;
|
||||||
|
} else if (source == QString("cpu/system/TotalLoad")) {
|
||||||
|
// cpu
|
||||||
|
m_map[source] = QString("cpu");
|
||||||
|
m_formatter[QString("cpu")] = FormatterType::Float;
|
||||||
|
} else if (source.contains(cpuRegExp)) {
|
||||||
|
// cpus
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("cpu/")).remove(QString("/TotalLoad"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Float;
|
||||||
|
} else if (source == QString("cpu/system/AverageClock")) {
|
||||||
|
// cpucl
|
||||||
|
m_map[source] = QString("cpucl");
|
||||||
|
m_formatter[QString("cpucl")] = FormatterType::Integer;
|
||||||
|
} else if (source.contains(cpuclRegExp)) {
|
||||||
|
// cpucls
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("cpu/cpu")).remove(QString("/clock"));
|
||||||
|
key = QString("cpucl%1").arg(key);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Integer;
|
||||||
|
} else if (source.startsWith(QString("custom"))) {
|
||||||
|
// custom
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("custom/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::NoFormat;
|
||||||
|
} else if (source == QString("desktop/current/name")) {
|
||||||
|
// current desktop name
|
||||||
|
m_map[source] = QString("desktop");
|
||||||
|
m_formatter[QString("desktop")] = FormatterType::NoFormat;
|
||||||
|
} else if (source == QString("desktop/current/number")) {
|
||||||
|
// current desktop number
|
||||||
|
m_map[source] = QString("ndesktop");
|
||||||
|
m_formatter[QString("ndesktop")] = FormatterType::NoFormat;
|
||||||
|
} else if (source == QString("desktop/total/number")) {
|
||||||
|
// desktop count
|
||||||
|
m_map[source] = QString("tdesktops");
|
||||||
|
m_formatter[QString("tdesktops")] = FormatterType::NoFormat;
|
||||||
|
} else if (source.contains(hddrRegExp)) {
|
||||||
|
// read speed
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("/Rate/rblk"));
|
||||||
|
int index = m_devices[QString("disk")].indexOf(device);
|
||||||
|
if (index > -1) {
|
||||||
|
QString key = QString("hddr%1").arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Integer;
|
||||||
|
}
|
||||||
|
} else if (source.contains(hddwRegExp)) {
|
||||||
|
// write speed
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("/Rate/wblk"));
|
||||||
|
int index = m_devices[QString("disk")].indexOf(device);
|
||||||
|
if (index > -1) {
|
||||||
|
QString key = QString("hddw%1").arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Integer;
|
||||||
|
}
|
||||||
|
} else if (source == QString("gpu/load")) {
|
||||||
|
// gpu load
|
||||||
|
m_map[source] = QString("gpu");
|
||||||
|
m_formatter[QString("gpu")] = FormatterType::Float;
|
||||||
|
} else if (source == QString("gpu/temperature")) {
|
||||||
|
// gpu temperature
|
||||||
|
m_map[source] = QString("gputemp");
|
||||||
|
m_formatter[QString("gputemp")] = FormatterType::Temperature;
|
||||||
|
} else if (source.contains(mountFillRegExp)) {
|
||||||
|
// fill level
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("partitions")).remove(QString("/filllevel"));
|
||||||
|
int index = m_devices[QString("mount")].indexOf(device);
|
||||||
|
if (index > -1) {
|
||||||
|
QString key = QString("hdd%1").arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Float;
|
||||||
|
// additional keys
|
||||||
|
m_formatter[QString("hddtotmb%1").arg(index)]
|
||||||
|
= FormatterType::MemMBFormat;
|
||||||
|
m_formatter[QString("hddtotgb%1").arg(index)]
|
||||||
|
= FormatterType::MemGBFormat;
|
||||||
|
}
|
||||||
|
} else if (source.contains(mountFreeRegExp)) {
|
||||||
|
// free space
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("partitions")).remove(QString("/freespace"));
|
||||||
|
int index = m_devices[QString("mount")].indexOf(device);
|
||||||
|
if (index > -1) {
|
||||||
|
// mb
|
||||||
|
QString key = QString("hddfreemb%1").arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::MemMBFormat;
|
||||||
|
// gb
|
||||||
|
key = QString("hddfreegb%1").arg(index);
|
||||||
|
m_map.insertMulti(source, key);
|
||||||
|
m_formatter[key] = FormatterType::MemGBFormat;
|
||||||
|
}
|
||||||
|
} else if (source.contains(mountUsedRegExp)) {
|
||||||
|
// used
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("partitions")).remove(QString("/usedspace"));
|
||||||
|
int index = m_devices[QString("mount")].indexOf(device);
|
||||||
|
if (index > -1) {
|
||||||
|
// mb
|
||||||
|
QString key = QString("hddmb%1").arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::MemMBFormat;
|
||||||
|
// gb
|
||||||
|
key = QString("hddgb%1").arg(index);
|
||||||
|
m_map.insertMulti(source, key);
|
||||||
|
m_formatter[key] = FormatterType::MemGBFormat;
|
||||||
|
}
|
||||||
|
} else if (source.startsWith(QString("hdd/temperature"))) {
|
||||||
|
// hdd temperature
|
||||||
|
QString device = source;
|
||||||
|
device.remove(QString("hdd/temperature"));
|
||||||
|
int index = m_devices[QString("hdd")].indexOf(device);
|
||||||
|
if (index > -1) {
|
||||||
|
QString key = QString("hddtemp%1").arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Temperature;
|
||||||
|
}
|
||||||
|
} else if (source.startsWith(QString("cpu/system/loadavg"))) {
|
||||||
|
// load average
|
||||||
|
QString time = source;
|
||||||
|
time.remove(QString("cpu/system/loadavg"));
|
||||||
|
QString key = QString("la%1").arg(time);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::FloatTwoSymbols;
|
||||||
|
} else if (source == QString("mem/physical/application")) {
|
||||||
|
// app memory
|
||||||
|
// mb
|
||||||
|
m_map[source] = QString("memmb");
|
||||||
|
m_formatter[QString("memmb")] = FormatterType::MemMBFormat;
|
||||||
|
// gb
|
||||||
|
m_map.insertMulti(source, QString("memgb"));
|
||||||
|
m_formatter[QString("memgb")] = FormatterType::MemGBFormat;
|
||||||
|
} else if (source == QString("mem/physical/free")) {
|
||||||
|
// free memory
|
||||||
|
// mb
|
||||||
|
m_map[source] = QString("memfreemb");
|
||||||
|
m_formatter[QString("memfreemb")] = FormatterType::MemMBFormat;
|
||||||
|
// gb
|
||||||
|
m_map.insertMulti(source, QString("memfreegb"));
|
||||||
|
m_formatter[QString("memfreegb")] = FormatterType::MemGBFormat;
|
||||||
|
} else if (source == QString("mem/physical/used")) {
|
||||||
|
// used memory
|
||||||
|
// mb
|
||||||
|
m_map[source] = QString("memusedmb");
|
||||||
|
m_formatter[QString("memusedmb")] = FormatterType::MemMBFormat;
|
||||||
|
// gb
|
||||||
|
m_map.insertMulti(source, QString("memusedgb"));
|
||||||
|
m_formatter[QString("memusedgb")] = FormatterType::MemGBFormat;
|
||||||
|
} else if (source == QString("network/current/name")) {
|
||||||
|
// network device
|
||||||
|
m_map[source] = QString("netdev");
|
||||||
|
m_formatter[QString("netdev")] = FormatterType::NoFormat;
|
||||||
|
} else if (source.contains(netRegExp)) {
|
||||||
|
// network speed
|
||||||
|
QString type = source.contains(QString("receiver")) ? QString("down")
|
||||||
|
: QString("up");
|
||||||
|
int index
|
||||||
|
= m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]);
|
||||||
|
if (index > -1) {
|
||||||
|
// kb
|
||||||
|
QString key = QString("%1kb%2").arg(type).arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Integer;
|
||||||
|
// smart
|
||||||
|
key = QString("%1%2").arg(type).arg(index);
|
||||||
|
m_map.insertMulti(source, key);
|
||||||
|
m_formatter[key] = FormatterType::NetSmartFormat;
|
||||||
|
// units
|
||||||
|
key = QString("%1units%2").arg(type).arg(index);
|
||||||
|
m_map.insertMulti(source, key);
|
||||||
|
m_formatter[key] = FormatterType::NetSmartUnits;
|
||||||
|
}
|
||||||
|
} else if (source.contains(netTotalRegExp)) {
|
||||||
|
// network data total
|
||||||
|
QString type = source.contains(QString("receiver")) ? QString("down")
|
||||||
|
: QString("up");
|
||||||
|
int index
|
||||||
|
= m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]);
|
||||||
|
if (index > -1) {
|
||||||
|
// kb
|
||||||
|
QString key = QString("%1totalkb%2").arg(type).arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Integer;
|
||||||
|
// mb
|
||||||
|
key = QString("%1total%2").arg(type).arg(index);
|
||||||
|
m_map.insertMulti(source, key);
|
||||||
|
m_formatter[key] = FormatterType::MemMBFormat;
|
||||||
|
}
|
||||||
|
} else if (source.startsWith(QString("upgrade"))) {
|
||||||
|
// package manager
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("upgrade/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::IntegerThree;
|
||||||
|
} else if (source.startsWith(QString("player"))) {
|
||||||
|
// player
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("player/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::NoFormat;
|
||||||
|
} else if (source == QString("ps/running/count")) {
|
||||||
|
// running processes count
|
||||||
|
m_map[source] = QString("pscount");
|
||||||
|
m_formatter[QString("pscount")] = FormatterType::NoFormat;
|
||||||
|
} else if (source == QString("ps/running/list")) {
|
||||||
|
// list of running processes
|
||||||
|
m_map[source] = QString("ps");
|
||||||
|
m_formatter[QString("ps")] = FormatterType::List;
|
||||||
|
} else if (source == QString("ps/total/count")) {
|
||||||
|
// total processes count
|
||||||
|
m_map[source] = QString("pstotal");
|
||||||
|
m_formatter[QString("pstotal")] = FormatterType::NoFormat;
|
||||||
|
} else if (source.startsWith(QString("quotes"))) {
|
||||||
|
// quotes
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("quotes/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Quotes;
|
||||||
|
} else if (source == QString("mem/swap/free")) {
|
||||||
|
// free swap
|
||||||
|
// mb
|
||||||
|
m_map[source] = QString("swapfreemb");
|
||||||
|
m_formatter[QString("swapfreemb")] = FormatterType::MemMBFormat;
|
||||||
|
// gb
|
||||||
|
m_map.insertMulti(source, QString("swapfreegb"));
|
||||||
|
m_formatter[QString("swapfreegb")] = FormatterType::MemGBFormat;
|
||||||
|
} else if (source == QString("mem/swap/used")) {
|
||||||
|
// used swap
|
||||||
|
// mb
|
||||||
|
m_map[source] = QString("swapmb");
|
||||||
|
m_formatter[QString("swapmb")] = FormatterType::MemMBFormat;
|
||||||
|
// gb
|
||||||
|
m_map.insertMulti(source, QString("swapgb"));
|
||||||
|
m_formatter[QString("swapgb")] = FormatterType::MemGBFormat;
|
||||||
|
} else if (source.startsWith(QString("lmsensors/"))) {
|
||||||
|
// temperature
|
||||||
|
int index = m_devices[QString("temp")].indexOf(source);
|
||||||
|
// HACK on DE initialization there are no units key
|
||||||
|
if (units.isEmpty())
|
||||||
|
return QStringList() << QString("temp%1").arg(index);
|
||||||
|
if (index > -1) {
|
||||||
|
QString key = QString("temp%1").arg(index);
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = units == QString("°C")
|
||||||
|
? FormatterType::Temperature
|
||||||
|
: FormatterType::Integer;
|
||||||
|
}
|
||||||
|
} else if (source == QString("Local")) {
|
||||||
|
// time
|
||||||
|
m_map[source] = QString("time");
|
||||||
|
m_formatter[QString("time")] = FormatterType::Time;
|
||||||
|
// custom time
|
||||||
|
m_map.insertMulti(source, QString("ctime"));
|
||||||
|
m_formatter[QString("ctime")] = FormatterType::TimeCustom;
|
||||||
|
// ISO time
|
||||||
|
m_map.insertMulti(source, QString("isotime"));
|
||||||
|
m_formatter[QString("isotime")] = FormatterType::TimeISO;
|
||||||
|
// long time
|
||||||
|
m_map.insertMulti(source, QString("longtime"));
|
||||||
|
m_formatter[QString("longtime")] = FormatterType::TimeLong;
|
||||||
|
// short time
|
||||||
|
m_map.insertMulti(source, QString("shorttime"));
|
||||||
|
m_formatter[QString("shorttime")] = FormatterType::TimeShort;
|
||||||
|
// timestamp
|
||||||
|
m_map.insertMulti(source, QString("tstime"));
|
||||||
|
m_formatter[QString("tstime")] = FormatterType::Timestamp;
|
||||||
|
} else if (source == QString("system/uptime")) {
|
||||||
|
// uptime
|
||||||
|
m_map[source] = QString("uptime");
|
||||||
|
m_formatter[QString("uptime")] = FormatterType::Uptime;
|
||||||
|
// custom uptime
|
||||||
|
m_map.insertMulti(source, QString("cuptime"));
|
||||||
|
m_formatter[QString("cuptime")] = FormatterType::UptimeCustom;
|
||||||
|
} else if (source.startsWith(QString("weather/temperature"))) {
|
||||||
|
// temperature
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("weather/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Temperature;
|
||||||
|
} else if (source.startsWith(QString("weather/"))) {
|
||||||
|
// other weather
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("weather/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::NoFormat;
|
||||||
|
} else if (source.startsWith(QString("load/load"))) {
|
||||||
|
// load source
|
||||||
|
QString key = source;
|
||||||
|
key.remove(QString("load/"));
|
||||||
|
m_map[source] = key;
|
||||||
|
m_formatter[key] = FormatterType::Temperature;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList foundKeys = keysFromSource(source);
|
||||||
|
|
||||||
|
// rewrite formatters for custom ones
|
||||||
|
QStringList customFormattersKeys;
|
||||||
|
if (m_customFormatters)
|
||||||
|
customFormattersKeys = m_customFormatters->definedFormatters();
|
||||||
|
qCInfo(LOG_AW) << "Looking for fprmatters" << foundKeys << "in"
|
||||||
|
<< customFormattersKeys;
|
||||||
|
for (auto key : foundKeys) {
|
||||||
|
if (!customFormattersKeys.contains(key))
|
||||||
|
continue;
|
||||||
|
m_formatter[key] = FormatterType::Custom;
|
||||||
|
}
|
||||||
|
|
||||||
|
// drop key from dictionary if no one user requested key required it
|
||||||
|
qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << keys;
|
||||||
|
bool required
|
||||||
|
= keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
|
||||||
|
[&keys](const QString &key) {
|
||||||
|
return keys.contains(key);
|
||||||
|
});
|
||||||
|
if (!required) {
|
||||||
|
m_map.remove(source);
|
||||||
|
for (auto key : foundKeys)
|
||||||
|
m_formatter.remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
return keysFromSource(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
float AWKeysAggregator::temperature(const float temp) const
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Temperature value" << temp;
|
||||||
|
|
||||||
|
float converted = temp;
|
||||||
|
if (m_tempUnits == QString("Celsius")) {
|
||||||
|
} else if (m_tempUnits == QString("Fahrenheit")) {
|
||||||
|
converted = temp * 9.0f / 5.0f + 32.0f;
|
||||||
|
} else if (m_tempUnits == QString("Kelvin")) {
|
||||||
|
converted = temp + 273.15f;
|
||||||
|
} else if (m_tempUnits == QString("Reaumur")) {
|
||||||
|
converted = temp * 0.8f;
|
||||||
|
} else if (m_tempUnits == QString("cm^-1")) {
|
||||||
|
converted = (temp + 273.15f) * 0.695f;
|
||||||
|
} else if (m_tempUnits == QString("kJ/mol")) {
|
||||||
|
converted = (temp + 273.15f) * 8.31f;
|
||||||
|
} else if (m_tempUnits == QString("kcal/mol")) {
|
||||||
|
converted = (temp + 273.15f) * 1.98f;
|
||||||
|
} else {
|
||||||
|
qCWarning(LOG_AW) << "Invalid units" << m_tempUnits;
|
||||||
|
}
|
||||||
|
|
||||||
|
return converted;
|
||||||
|
}
|
106
sources/awesome-widget/plugin/awkeysaggregator.h
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 AWKEYSAGGREGATOR_H
|
||||||
|
#define AWKEYSAGGREGATOR_H
|
||||||
|
|
||||||
|
#include <QHash>
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
#include "version.h"
|
||||||
|
|
||||||
|
|
||||||
|
class AWFormatterHelper;
|
||||||
|
|
||||||
|
class AWKeysAggregator : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PROPERTY(QString acOffline MEMBER m_acOffline WRITE setAcOffline);
|
||||||
|
Q_PROPERTY(QString acOnline MEMBER m_acOnline WRITE setAcOnline);
|
||||||
|
Q_PROPERTY(QString customTime MEMBER m_customTime WRITE setCustomTime);
|
||||||
|
Q_PROPERTY(
|
||||||
|
QString customUptime MEMBER m_customUptime WRITE setCustomUptime);
|
||||||
|
Q_PROPERTY(QString tempUnits MEMBER m_tempUnits WRITE setTempUnits);
|
||||||
|
Q_PROPERTY(bool translate MEMBER m_translate WRITE setTranslate);
|
||||||
|
|
||||||
|
enum class FormatterType {
|
||||||
|
// general formatters
|
||||||
|
Custom,
|
||||||
|
NoFormat,
|
||||||
|
Float,
|
||||||
|
FloatTwoSymbols,
|
||||||
|
Integer,
|
||||||
|
IntegerFive,
|
||||||
|
IntegerThree,
|
||||||
|
List,
|
||||||
|
// unit specific formatters
|
||||||
|
ACFormat,
|
||||||
|
MemGBFormat,
|
||||||
|
MemMBFormat,
|
||||||
|
NetSmartFormat,
|
||||||
|
NetSmartUnits,
|
||||||
|
Quotes,
|
||||||
|
Temperature,
|
||||||
|
Time,
|
||||||
|
TimeCustom,
|
||||||
|
TimeISO,
|
||||||
|
TimeLong,
|
||||||
|
TimeShort,
|
||||||
|
Timestamp,
|
||||||
|
Uptime,
|
||||||
|
UptimeCustom
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWKeysAggregator(QObject *parent = nullptr);
|
||||||
|
virtual ~AWKeysAggregator();
|
||||||
|
void initFormatters();
|
||||||
|
// get methods
|
||||||
|
QString formatter(const QVariant &data, const QString &key) const;
|
||||||
|
QStringList keysFromSource(const QString &source) const;
|
||||||
|
// set methods
|
||||||
|
void setAcOffline(const QString inactive);
|
||||||
|
void setAcOnline(const QString active);
|
||||||
|
void setCustomTime(const QString customTime);
|
||||||
|
void setCustomUptime(const QString customUptime);
|
||||||
|
void setDevices(const QHash<QString, QStringList> devices);
|
||||||
|
void setTempUnits(const QString units);
|
||||||
|
void setTranslate(const bool translate);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
QStringList registerSource(const QString &source, const QString &units,
|
||||||
|
const QStringList &keys);
|
||||||
|
|
||||||
|
private:
|
||||||
|
float temperature(const float temp) const;
|
||||||
|
AWFormatterHelper *m_customFormatters = nullptr;
|
||||||
|
QStringList m_timeKeys = QString(TIME_KEYS).split(QChar(','));
|
||||||
|
// variables
|
||||||
|
QString m_acOffline;
|
||||||
|
QString m_acOnline;
|
||||||
|
QString m_customTime;
|
||||||
|
QString m_customUptime;
|
||||||
|
QHash<QString, QStringList> m_devices;
|
||||||
|
QHash<QString, FormatterType> m_formatter;
|
||||||
|
QHash<QString, QString> m_map;
|
||||||
|
QString m_tempUnits;
|
||||||
|
bool m_translate = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWKEYSAGGREGATOR_H */
|
307
sources/awesome-widget/plugin/awpatternfunctions.cpp
Normal file
@ -0,0 +1,307 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 "awpatternfunctions.h"
|
||||||
|
|
||||||
|
#include <QJSEngine>
|
||||||
|
#include <QRegularExpression>
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
#include "awkeysaggregator.h"
|
||||||
|
|
||||||
|
|
||||||
|
QString AWPatternFunctions::expandLambdas(QString code,
|
||||||
|
AWKeysAggregator *aggregator,
|
||||||
|
const QVariantHash &metadata,
|
||||||
|
const QStringList &usedKeys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Expand lamdas in" << code;
|
||||||
|
|
||||||
|
QJSEngine engine;
|
||||||
|
// apply $this values
|
||||||
|
code.replace(QString("$this"), metadata[code].toString());
|
||||||
|
// parsed values
|
||||||
|
for (auto lambdaKey : usedKeys)
|
||||||
|
code.replace(QString("$%1").arg(lambdaKey),
|
||||||
|
aggregator->formatter(metadata[lambdaKey], lambdaKey));
|
||||||
|
qCInfo(LOG_AW) << "Expression" << code;
|
||||||
|
QJSValue result = engine.evaluate(code);
|
||||||
|
if (result.isError()) {
|
||||||
|
qCWarning(LOG_AW) << "Uncaught exception at line"
|
||||||
|
<< result.property("lineNumber").toInt() << ":"
|
||||||
|
<< result.toString();
|
||||||
|
return QString();
|
||||||
|
} else {
|
||||||
|
return result.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWPatternFunctions::expandTemplates(QString code)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Expand templates in" << code;
|
||||||
|
|
||||||
|
// match the following construction $template{{some code here}}
|
||||||
|
QRegularExpression templatesRegexp(
|
||||||
|
QString("\\$template\\{\\{(?<body>.*?)\\}\\}"));
|
||||||
|
templatesRegexp.setPatternOptions(
|
||||||
|
QRegularExpression::DotMatchesEverythingOption);
|
||||||
|
|
||||||
|
QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(code);
|
||||||
|
while (it.hasNext()) {
|
||||||
|
QRegularExpressionMatch match = it.next();
|
||||||
|
QString body = match.captured(QString("body"));
|
||||||
|
|
||||||
|
QJSEngine engine;
|
||||||
|
qCInfo(LOG_AW) << "Expression" << body;
|
||||||
|
QJSValue result = engine.evaluate(body);
|
||||||
|
QString templateResult = QString("");
|
||||||
|
if (result.isError()) {
|
||||||
|
qCWarning(LOG_AW) << "Uncaught exception at line"
|
||||||
|
<< result.property("lineNumber").toInt() << ":"
|
||||||
|
<< result.toString();
|
||||||
|
} else {
|
||||||
|
templateResult = result.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// replace template
|
||||||
|
code.replace(match.captured(), templateResult);
|
||||||
|
}
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QList<AWPatternFunctions::AWFunction>
|
||||||
|
AWPatternFunctions::findFunctionCalls(const QString function,
|
||||||
|
const QString code)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for function" << function << "in" << code;
|
||||||
|
|
||||||
|
// I suggest the following regex for the internal functions
|
||||||
|
// $aw_function_name<some args here if any>{{function body}}
|
||||||
|
// * args should be always comma separated (e.g. commas are not supported
|
||||||
|
// in this field if they are not screened by $, i.e. '$,'
|
||||||
|
// * body depends on the function name, double brackets should be screened
|
||||||
|
// by using $, e.g. ${
|
||||||
|
QRegularExpression regex(
|
||||||
|
QString("\\$%1\\<(?<args>.*?)\\>\\{\\{(?<body>.*?)\\}\\}")
|
||||||
|
.arg(function));
|
||||||
|
regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
|
||||||
|
|
||||||
|
QList<AWPatternFunctions::AWFunction> foundFunctions;
|
||||||
|
QRegularExpressionMatchIterator it = regex.globalMatch(code);
|
||||||
|
while (it.hasNext()) {
|
||||||
|
QRegularExpressionMatch match = it.next();
|
||||||
|
|
||||||
|
AWPatternFunctions::AWFunction metadata;
|
||||||
|
// work with args
|
||||||
|
QString argsString = match.captured(QString("args"));
|
||||||
|
if (argsString.isEmpty()) {
|
||||||
|
metadata.args = QStringList();
|
||||||
|
} else {
|
||||||
|
// replace '$,' to 0x1d
|
||||||
|
argsString.replace(QString("$,"), QString(0x1d));
|
||||||
|
QStringList args = argsString.split(QChar(','));
|
||||||
|
std::for_each(args.begin(), args.end(), [](QString &arg) {
|
||||||
|
arg.replace(QString(0x1d), QString(","));
|
||||||
|
});
|
||||||
|
metadata.args = args;
|
||||||
|
}
|
||||||
|
// other variables
|
||||||
|
metadata.body = match.captured(QString("body"));
|
||||||
|
metadata.what = match.captured();
|
||||||
|
// replace brackets
|
||||||
|
metadata.body.replace(QString("${"), QString("{"));
|
||||||
|
metadata.body.replace(QString("$}"), QString("}"));
|
||||||
|
foundFunctions.append(metadata);
|
||||||
|
}
|
||||||
|
|
||||||
|
return foundFunctions;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWPatternFunctions::insertAllKeys(QString code, const QStringList keys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list"
|
||||||
|
<< keys;
|
||||||
|
|
||||||
|
QList<AWPatternFunctions::AWFunction> found
|
||||||
|
= AWPatternFunctions::findFunctionCalls(QString("aw_all"), code);
|
||||||
|
for (auto function : found) {
|
||||||
|
QString separator
|
||||||
|
= function.args.isEmpty() ? QString(",") : function.args.at(0);
|
||||||
|
QStringList required = keys.filter(QRegExp(function.body));
|
||||||
|
std::for_each(required.begin(), required.end(), [](QString &value) {
|
||||||
|
value = QString("%1: $%1").arg(value);
|
||||||
|
});
|
||||||
|
|
||||||
|
code.replace(function.what, required.join(separator));
|
||||||
|
}
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWPatternFunctions::insertKeyCount(QString code, const QStringList keys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for count in code" << code << "using list"
|
||||||
|
<< keys;
|
||||||
|
|
||||||
|
QList<AWPatternFunctions::AWFunction> found
|
||||||
|
= AWPatternFunctions::findFunctionCalls(QString("aw_count"), code);
|
||||||
|
for (auto function : found) {
|
||||||
|
int count = keys.filter(QRegExp(function.body)).count();
|
||||||
|
|
||||||
|
code.replace(function.what, QString::number(count));
|
||||||
|
}
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWPatternFunctions::insertKeyNames(QString code, const QStringList keys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for key names in code" << code << "using list"
|
||||||
|
<< keys;
|
||||||
|
|
||||||
|
QList<AWPatternFunctions::AWFunction> found
|
||||||
|
= AWPatternFunctions::findFunctionCalls(QString("aw_names"), code);
|
||||||
|
for (auto function : found) {
|
||||||
|
QString separator
|
||||||
|
= function.args.isEmpty() ? QString(",") : function.args.at(0);
|
||||||
|
QStringList required = keys.filter(QRegExp(function.body));
|
||||||
|
|
||||||
|
code.replace(function.what, required.join(separator));
|
||||||
|
}
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWPatternFunctions::insertKeys(QString code, const QStringList keys)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list"
|
||||||
|
<< keys;
|
||||||
|
|
||||||
|
QList<AWPatternFunctions::AWFunction> found
|
||||||
|
= AWPatternFunctions::findFunctionCalls(QString("aw_keys"), code);
|
||||||
|
for (auto function : found) {
|
||||||
|
QString separator
|
||||||
|
= function.args.isEmpty() ? QString(",") : function.args.at(0);
|
||||||
|
QStringList required = keys.filter(QRegExp(function.body));
|
||||||
|
std::for_each(required.begin(), required.end(), [](QString &value) {
|
||||||
|
value = QString("$%1").arg(value);
|
||||||
|
});
|
||||||
|
|
||||||
|
code.replace(function.what, required.join(separator));
|
||||||
|
}
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString AWPatternFunctions::insertMacros(QString code)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for macros in code" << code;
|
||||||
|
|
||||||
|
QList<AWPatternFunctions::AWFunction> found
|
||||||
|
= AWPatternFunctions::findFunctionCalls(QString("aw_macro"), code);
|
||||||
|
for (auto macro : found) {
|
||||||
|
// get macro params
|
||||||
|
if (macro.args.isEmpty()) {
|
||||||
|
qCWarning(LOG_AW) << "No macro name found for" << macro.what;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
QString name = macro.args.takeFirst();
|
||||||
|
// find macro usage
|
||||||
|
QList<AWPatternFunctions::AWFunction> macroUsage
|
||||||
|
= AWPatternFunctions::findFunctionCalls(
|
||||||
|
QString("aw_macro_%1").arg(name), code);
|
||||||
|
for (auto function : macroUsage) {
|
||||||
|
if (function.args.count() != macro.args.count()) {
|
||||||
|
qCWarning(LOG_AW) << "Invalid args count found for call"
|
||||||
|
<< function.what << "with macro"
|
||||||
|
<< macro.what;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// generate body to replace
|
||||||
|
QString result = macro.body;
|
||||||
|
std::for_each(macro.args.cbegin(), macro.args.cend(),
|
||||||
|
[&result, macro, function](const QString &arg) {
|
||||||
|
int index = macro.args.indexOf(arg);
|
||||||
|
result.replace(QString("$%1").arg(arg),
|
||||||
|
function.args.at(index));
|
||||||
|
});
|
||||||
|
// do replace
|
||||||
|
code.replace(function.what, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove macro from source pattern
|
||||||
|
code.remove(macro.what);
|
||||||
|
}
|
||||||
|
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWPatternFunctions::findKeys(const QString code,
|
||||||
|
const QStringList keys,
|
||||||
|
const bool isBars)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list"
|
||||||
|
<< keys;
|
||||||
|
|
||||||
|
QStringList selectedKeys;
|
||||||
|
for (auto key : keys)
|
||||||
|
if ((key.startsWith(QString("bar")) == isBars)
|
||||||
|
&& (code.contains(QString("$%1").arg(key)))) {
|
||||||
|
qCInfo(LOG_AW) << "Found key" << key << "with bar enabled"
|
||||||
|
<< isBars;
|
||||||
|
selectedKeys.append(key);
|
||||||
|
}
|
||||||
|
if (selectedKeys.isEmpty())
|
||||||
|
qCWarning(LOG_AW) << "No keys found";
|
||||||
|
|
||||||
|
return selectedKeys;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QStringList AWPatternFunctions::findLambdas(const QString code)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Looking for lambdas in code" << code;
|
||||||
|
|
||||||
|
QStringList selectedKeys;
|
||||||
|
// match the following construction ${{some code here}}
|
||||||
|
QRegularExpression lambdaRegexp(QString("\\$\\{\\{(?<body>.*?)\\}\\}"));
|
||||||
|
lambdaRegexp.setPatternOptions(
|
||||||
|
QRegularExpression::DotMatchesEverythingOption);
|
||||||
|
|
||||||
|
QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(code);
|
||||||
|
while (it.hasNext()) {
|
||||||
|
QRegularExpressionMatch match = it.next();
|
||||||
|
QString lambda = match.captured(QString("body"));
|
||||||
|
|
||||||
|
// append
|
||||||
|
qCInfo(LOG_AW) << "Found lambda" << lambda;
|
||||||
|
selectedKeys.append(lambda);
|
||||||
|
}
|
||||||
|
if (selectedKeys.isEmpty())
|
||||||
|
qCWarning(LOG_AW) << "No lambdas found";
|
||||||
|
|
||||||
|
return selectedKeys;
|
||||||
|
}
|
54
sources/awesome-widget/plugin/awpatternfunctions.h
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* This file is part of awesome-widgets *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is free software: you can redistribute it and/or *
|
||||||
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
* published by the Free Software Foundation, either version 3 of the *
|
||||||
|
* License, or (at your option) any later version. *
|
||||||
|
* *
|
||||||
|
* awesome-widgets is distributed in the hope that it will be useful, *
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||||
|
* GNU General Public License for more details. *
|
||||||
|
* *
|
||||||
|
* You should have received a copy of the GNU General Public License *
|
||||||
|
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
|
||||||
|
***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef AWPATTERNFUNCTIONS_H
|
||||||
|
#define AWPATTERNFUNCTIONS_H
|
||||||
|
|
||||||
|
#include <QString>
|
||||||
|
#include <QVariant>
|
||||||
|
|
||||||
|
|
||||||
|
class AWKeysAggregator;
|
||||||
|
|
||||||
|
namespace AWPatternFunctions
|
||||||
|
{
|
||||||
|
typedef struct {
|
||||||
|
QStringList args;
|
||||||
|
QString body;
|
||||||
|
QString what;
|
||||||
|
} AWFunction;
|
||||||
|
|
||||||
|
// insert methods
|
||||||
|
QString expandLambdas(QString code, AWKeysAggregator *aggregator,
|
||||||
|
const QVariantHash &metadata,
|
||||||
|
const QStringList &usedKeys);
|
||||||
|
QString expandTemplates(QString code);
|
||||||
|
QList<AWFunction> findFunctionCalls(const QString function, const QString code);
|
||||||
|
QString insertAllKeys(QString code, const QStringList keys);
|
||||||
|
QString insertKeyCount(QString code, const QStringList keys);
|
||||||
|
QString insertKeyNames(QString code, const QStringList keys);
|
||||||
|
QString insertKeys(QString code, const QStringList keys);
|
||||||
|
QString insertMacros(QString code);
|
||||||
|
// find methods
|
||||||
|
QStringList findKeys(const QString code, const QStringList keys,
|
||||||
|
const bool isBars);
|
||||||
|
QStringList findLambdas(const QString code);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWPATTERNFUNCTIONS_H */
|
192
sources/awesome-widget/plugin/awupdatehelper.cpp
Normal file
@ -0,0 +1,192 @@
|
|||||||
|
/***************************************************************************
|
||||||
|
* 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 "awupdatehelper.h"
|
||||||
|
|
||||||
|
#include <KI18n/KLocalizedString>
|
||||||
|
|
||||||
|
#include <QDesktopServices>
|
||||||
|
#include <QJsonDocument>
|
||||||
|
#include <QJsonParseError>
|
||||||
|
#include <QNetworkAccessManager>
|
||||||
|
#include <QNetworkReply>
|
||||||
|
#include <QNetworkRequest>
|
||||||
|
#include <QSettings>
|
||||||
|
#include <QtConcurrent/QtConcurrent>
|
||||||
|
|
||||||
|
#include "awdebug.h"
|
||||||
|
|
||||||
|
|
||||||
|
AWUpdateHelper::AWUpdateHelper(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
|
||||||
|
m_foundVersion = QVersionNumber::fromString(VERSION);
|
||||||
|
m_genericConfig = QString("%1/awesomewidgets/general.ini")
|
||||||
|
.arg(QStandardPaths::writableLocation(
|
||||||
|
QStandardPaths::GenericDataLocation));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AWUpdateHelper::~AWUpdateHelper()
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWUpdateHelper::checkUpdates(const bool showAnyway)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Show anyway" << showAnyway;
|
||||||
|
|
||||||
|
// showAnyway options requires to show message if no updates found on direct
|
||||||
|
// request. In case of automatic check no message will be shown
|
||||||
|
QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
|
||||||
|
connect(manager, &QNetworkAccessManager::finished,
|
||||||
|
[showAnyway, this](QNetworkReply *reply) {
|
||||||
|
return versionReplyRecieved(reply, showAnyway);
|
||||||
|
});
|
||||||
|
|
||||||
|
manager->get(QNetworkRequest(QUrl(VERSION_API)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool AWUpdateHelper::checkVersion()
|
||||||
|
{
|
||||||
|
QSettings settings(m_genericConfig, QSettings::IniFormat);
|
||||||
|
QVersionNumber version = QVersionNumber::fromString(
|
||||||
|
settings.value(QString("Version"), QString(VERSION)).toString());
|
||||||
|
// update version
|
||||||
|
settings.setValue(QString("Version"), QString(VERSION));
|
||||||
|
settings.sync();
|
||||||
|
qCInfo(LOG_AW) << "Found version" << version << "actual one is"
|
||||||
|
<< m_foundVersion;
|
||||||
|
|
||||||
|
if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
|
||||||
|
genMessageBox(i18n("Changelog of %1", QString(VERSION)),
|
||||||
|
QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
|
||||||
|
QMessageBox::Ok)
|
||||||
|
->open();
|
||||||
|
return true;
|
||||||
|
} else if (version != m_foundVersion) {
|
||||||
|
qCWarning(LOG_AW) << "No changelog information provided";
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
qCInfo(LOG_AW) << "No need to update version";
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWUpdateHelper::showInfo(const QVersionNumber version)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Version" << version;
|
||||||
|
|
||||||
|
QString text
|
||||||
|
= i18n("You are using the actual version %1", version.toString());
|
||||||
|
if (!QString(COMMIT_SHA).isEmpty())
|
||||||
|
text += QString(" (%1)").arg(QString(COMMIT_SHA));
|
||||||
|
return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
|
||||||
|
->open();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWUpdateHelper::showUpdates(const QVersionNumber version)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Version" << version;
|
||||||
|
|
||||||
|
QString text;
|
||||||
|
text += i18n("Current version : %1", QString(VERSION));
|
||||||
|
text += QString(COMMIT_SHA).isEmpty()
|
||||||
|
? QString("\n")
|
||||||
|
: QString(" (%1)\n").arg(QString(COMMIT_SHA));
|
||||||
|
text += i18n("New version : %1", version.toString()) + QString("\n\n");
|
||||||
|
text += i18n("Click \"Ok\" to download");
|
||||||
|
|
||||||
|
genMessageBox(i18n("There are updates"), text,
|
||||||
|
QMessageBox::Ok | QMessageBox::Cancel)
|
||||||
|
->open(this, SLOT(userReplyOnUpdates(QAbstractButton *)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button)
|
||||||
|
{
|
||||||
|
QMessageBox::ButtonRole ret
|
||||||
|
= static_cast<QMessageBox *>(sender())->buttonRole(button);
|
||||||
|
qCInfo(LOG_AW) << "User select" << ret;
|
||||||
|
|
||||||
|
switch (ret) {
|
||||||
|
case QMessageBox::AcceptRole:
|
||||||
|
QDesktopServices::openUrl(QString(RELEASES)
|
||||||
|
+ m_foundVersion.toString());
|
||||||
|
break;
|
||||||
|
case QMessageBox::RejectRole:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply,
|
||||||
|
const bool showAnyway)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Return code" << reply->error() << "with message"
|
||||||
|
<< reply->errorString() << "and show anyway" << showAnyway;
|
||||||
|
|
||||||
|
QJsonParseError error;
|
||||||
|
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
|
||||||
|
if ((reply->error() != QNetworkReply::NoError)
|
||||||
|
|| (error.error != QJsonParseError::NoError)) {
|
||||||
|
qCWarning(LOG_AW) << "Parse error" << error.errorString();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
reply->deleteLater();
|
||||||
|
|
||||||
|
// convert to map
|
||||||
|
QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
|
||||||
|
QString version = firstRelease[QString("tag_name")].toString();
|
||||||
|
version.remove(QString("V."));
|
||||||
|
m_foundVersion = QVersionNumber::fromString(version);
|
||||||
|
qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
|
||||||
|
|
||||||
|
QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
|
||||||
|
if (oldVersion < m_foundVersion)
|
||||||
|
return showUpdates(m_foundVersion);
|
||||||
|
else if (showAnyway)
|
||||||
|
return showInfo(m_foundVersion);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// additional method which is used to show message box which does not block UI
|
||||||
|
QMessageBox *
|
||||||
|
AWUpdateHelper::genMessageBox(const QString title, const QString body,
|
||||||
|
const QMessageBox::StandardButtons buttons)
|
||||||
|
{
|
||||||
|
qCDebug(LOG_AW) << "Construct message box with title" << title << "and body"
|
||||||
|
<< body;
|
||||||
|
|
||||||
|
QMessageBox *msgBox = new QMessageBox(nullptr);
|
||||||
|
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
|
msgBox->setModal(false);
|
||||||
|
msgBox->setWindowTitle(title);
|
||||||
|
msgBox->setText(body);
|
||||||
|
msgBox->setStandardButtons(buttons);
|
||||||
|
msgBox->setIcon(QMessageBox::Information);
|
||||||
|
|
||||||
|
return msgBox;
|
||||||
|
}
|
53
sources/awesome-widget/plugin/awupdatehelper.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 AWUPDATEHELPER_H
|
||||||
|
#define AWUPDATEHELPER_H
|
||||||
|
|
||||||
|
#include <QMessageBox>
|
||||||
|
#include <QObject>
|
||||||
|
#include <QVersionNumber>
|
||||||
|
|
||||||
|
|
||||||
|
class QNetworkReply;
|
||||||
|
|
||||||
|
class AWUpdateHelper : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit AWUpdateHelper(QObject *parent = nullptr);
|
||||||
|
virtual ~AWUpdateHelper();
|
||||||
|
void checkUpdates(const bool showAnyway = false);
|
||||||
|
bool checkVersion();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void showInfo(const QVersionNumber version);
|
||||||
|
void showUpdates(const QVersionNumber 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_genericConfig;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* AWUPDATEHELPER_H */
|
@ -0,0 +1,24 @@
|
|||||||
|
[Global]
|
||||||
|
IconName=system
|
||||||
|
Name=Awesome Widget
|
||||||
|
Comment=Awesome widget notifications
|
||||||
|
|
||||||
|
[info]
|
||||||
|
Name=Information
|
||||||
|
Comment=Information
|
||||||
|
Action=Popup
|
||||||
|
|
||||||
|
[Event/event]
|
||||||
|
Name=Event
|
||||||
|
Comment=Some event occurs
|
||||||
|
Action=Popup
|
||||||
|
|
||||||
|
[Event/system]
|
||||||
|
Name=System information
|
||||||
|
Comment=System information
|
||||||
|
Action=Popup
|
||||||
|
|
||||||
|
[Event/tag]
|
||||||
|
Name=Tag information
|
||||||
|
Comment=Tag information
|
||||||
|
Action=Popup
|
2
sources/awesome-widget/plugin/qmldir
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
module org.kde.plasma.private.awesomewidget
|
||||||
|
plugin awplugin
|
3
sources/awesomewidgets.kdev4
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[Project]
|
||||||
|
Manager=KDevCMakeManager
|
||||||
|
Name=awesome-widgets
|