Commit 91c51f29 authored by llea's avatar llea

Fix ring for incoming call.

Add apply skin feature.
parent 4f9dd6ce
......@@ -51,8 +51,7 @@ void AudioBuffer::resize (size_t newsize)
void
AudioBuffer::setData (short *buf, int vol) {
short *databuf = data;
short *databuf = (short*)data;
for (int i = 0; i < (int)size; i++) {
databuf[i] = buf[i]*vol/100;
}
......
......@@ -148,7 +148,7 @@
</widget>
<widget class="QLayoutWidget" row="0" column="1">
<property name="name">
<cstring>layout19</cstring>
<cstring>layout18</cstring>
</property>
<vbox>
<property name="name">
......@@ -867,16 +867,35 @@
<attribute name="title">
<string>Themes</string>
</attribute>
<widget class="QPushButton">
<property name="name">
<cstring>buttonApplySkin</cstring>
</property>
<property name="geometry">
<rect>
<x>136</x>
<y>40</y>
<width>80</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>&amp;Apply</string>
</property>
<property name="accel">
<string>Alt+A</string>
</property>
</widget>
<widget class="QComboBox">
<property name="name">
<cstring>SkinChoice</cstring>
</property>
<property name="geometry">
<rect>
<x>20</x>
<y>70</y>
<width>120</width>
<height>20</height>
<x>12</x>
<y>42</y>
<width>110</width>
<height>27</height>
</rect>
</property>
</widget>
......@@ -1136,7 +1155,7 @@ Montreal, Quebec H2T 1S6&lt;/p&gt;</string>
</widget>
<images>
<image name="image0">
<data format="PNG" length="3603">89504e470d0a1a0a0000000d49484452000000ad0000003008060000006357fade00000dda49444154789ced5d5f685bd71dfe095270465694b187b8946197b5e00c4ae5b90ff2d6926bfa32c529addc3e24defa20c519b1b787d5695f9ca4b86a1e5247856c76873b2b1066b5609c3c388a076156868b5c706a7964480117e4e10db998e118116e8c097c7bb8bad2fd73cebde75c29a9d3e8bc7c89eef9f33be7fece77bff3bbe75c1388688288ea8600b0060040a68cd801eade4e039f58acd941532b450040607c0e740ea0e1692e2a4960f0460e00f05d77bc818f2f7a2a98db005400fe780a9405e8dcb434faf34064060d076ea034ca1500a05c76675459549240b1a43624440385502823763446f4c2a832189bcf351cb781aee89a21b7a12290a82fb33a61607cae21191ae8888e19b001f8f30f9f61ade88fa71a8edb402e722fe43654f8e31e18732c054a00343e074a00a1ab4b0080e9bc166510adc77f7eba76c705303a3e81c8c97e44fafacb1841e4643f46e223008062b1f8f8481200a999fa4e68b5a462240e44fafa113ca420d217f15eff43b08f85f561d8f39aa128c131650a78248c0b15c022d0d61140a663096d1d01043a82dcff0f0dc71e0b661f1a8e55ecaf9bbd33b08dc7e07b839e26f243b18f81f699b7036986154991d9254f1ad70be3464ef69b6e44a83b8cd1f10900c064721a88034a77a8723dd011c4527669f733ae6e7fbd1c0266870d740411e9ebaf8969eb6a1f076d3f289b921ab4e0eeb0c1a94c4d1a57b99c11772898191669fe006205400948cda61cebc70a6abf116ee56ba81f450ff601081e526c4f20acb88cd723b0cf2dbf6f8288a2449420a22800df875788f6f4103d10c348204b895fb5132f45ff96a54bcbedc2f5f170f2c83af5bef88c2f61b49781d9ec128e9ff81d6dd33635511305954e1a1b89bb963321809e63bdb4facd6aa51e238694100df445a9f585e77c9d87146cdfdba6a67d4db470334d099fcf67ac2f3d9fc1e9b3a769ebde1605dadaa8ebaf9ffb743bdbbf68a7ce5b5db47d6fdb547fa0ad8d022f05e8d4bba7ccf5c581835fb4531335d1854f2e50d7abbff08d8d4f20f19744a5bcffc07edafaf62e6dd336e5d3594a3c6db64747dd6e56fff2b7b25abb00ba8e1caed467ccd7b4af89169434adf7ad53f333e5fb22605fd3bea64a7f2bf60118fb2c41b3d76669f5db55533bfe03fb29fde675bafff67ddafbf40f7c09b2cc3c2f6fb89c92ac86757b8326b48701768d16ea0e032b40663e2334e3f5f2c1438ad69132d30ebe375861a4e06b0aa002b9d70a95f642dd219b7d85378ab6eb23f1519b7dea0c1039d96faacfaa0d4d8c582cffced0a4faff878663fcf12ab1353fd2d05e771ada0b758701409350e571d0f317de28d6669f85f10b6f14b5df5780f0d163e6f12e337d8569a3334bb8f42f0f8cf8e334e1441793650788e85349e676c2d8d91e6af6b199c3ca94075f6eb731889529dadadaa8eb975dd47bacc7cc6800b2cb596a6fffb98da10f76046064a4b1cf12646492eb3357aacc63b1237f2b4bd7af5da7331f9ea36dda26ff3e3f0df40d506fef5be6764ac0c1ae761bf38d7504a1b713ed8bd2c06f8ffba27dfd585e5eb631f5b1b78fd1e1d7bb7dc9e4347affd943d1ad28d19e266a7fa99d064e44b5fe5ada091f0953eb0767dcc781d12f4ff61d394cd11303a45f0f29216a1b3967babfa7876398bd364bdbb44dc19783d4f9e74f7d9a86d8a92d1e9bdbe050ed46fd98563a9a0060243e8acda42a1445a83003a3bea5ec12500242dd6153796451610a1bc390b69ab63292cebc998e254c4e4df39970b1ca50fa6a9e65af3a63d1f0967eb0faabb78b2cecfd71185764511e8790a93e7d112b6b1f56cced878f1e33313ae661bb7f00a031ad072d6bc4e01f7a68e1874cb2a50b5fadd27b375bebc2b49ab65da5de179f93d3a844b45e2ca2b9b999d25f2e50d7379dd4f377bb66356ab981f74fd1f2ad2c6ddddbe232b69eff6e1cb854d672bab65dfd66957a4f442be5636787e8f0ebdd3e2b535b35b0510b9f7af7548591a3ffb8c961b2089697ef54ec1af8fa2b1b53ad7fbb4ef48088f61035eddb4b631f5fa8f493c598464695190769fb049e8846f4eff3d3dccc75cde303e3b533a2531a59a81fe3661c18511653b32913634c8c4fc0c870c1438a167b2eaf6627a7a6990c8322b80c5ed184e57659e5dda2207a7911cd28d3ffa5ec12b33f5686d435ad711c580c2d6b9fb57dd178b9af5852f1cc9ff6d6cc80d36fae534f5b339b6e89e8ca9d757aeb5a33d176ed8c8bb33d5c863269b140bb6b3ee34c8f1ccd929531ade5bbba43a8acce0dcc64d45e36263a99a54454cb67d4782c0da763cfd163d09f04f923594a7c20a619ad4c2ba3fd8d4f1afd77e638d4a0699d98d6e9c9b35e2c425f2b105007061c9b7364da4a2abf31abb5bdc9db0eda0bf638ede454f949a06a9099cf981855d79c9877d07830af9a59d7599a598f3238d9678a7f82b16a2e5699cc55334a302d4fd31a9f40c1d714f313c1629fb4a6b5dab152bdae476b2af6a91abbeb6b864af420e2356aa0a3ff3aa1ff30976179c9f7599ae87f5d9eda1d3cdb436d9c1979bfa4e2f8c0715abe7347582b05dadae8a3331f51ebf3ad648dcffa0feca7ed7bf7999acec60cc3c0c16b668da6338e95e178f14f23b61e68a5d14f2e50eb0b9a864f1c52a0dbc1d28cad075a299cba5a17a6ed54ccf1639171b8da1d861e6765d9a76b73ab1dc635016f3c5a9f6fa52b9f2729e1f3f92827fb06cc80e1f26618af69289df3f886cc81690d8c30121f012f4eb89954d91a0a1a33eb7153cc680c8b5279555b84a67d4b3033a8ce0c8b5a3975a6dcbe839da9d99429bfdede487cd46e979e5fb747bf8e6af9ccbcc49b43437ff5fe307f9fa9d63f341cd3fa9d85691c44ed737cf3c8682f72b21f5804306f1e67f2b4eff56275d756ad2953d8048dc9b5ef8feffecd2d0d7c7848b24c57dc81eb6e2ee95402964a92d10a878ee9272d066f00ca66f53065e354f0f703c599f6bcd86eae5a93a83d4e1d6be1307720513b43abe5099159db04c0a9cf703db3b659d789a272269ede5e6c3e8718caa7a4ebd0dee862011194372d01c86d98fb935a2942496ad7359c430cdecffce536361183b9beb06aae4f8c69c71e89bf5652ad4cebb59c08668af6f8b4d5617971ec9a1c08d5bd21817198b57409ccfe66d650537f4717edf5faf3e67e1455fe7d1abc2171e60f40d86137a071fcdc99f61131ac35d5c2b45ecb093d9a2cf5590f6386a7325cbb9524c0634a11c6e3f683335eb11a274a8c53afd181d41d4049f2c75be8cc1f80968b29eeb859cbbb32edc348b90d4dc3a6f22e8ebb0b99d68d411597684ca058deab21db3ef8fdc8acb1993636efa11d03c6e625181cfc5d828e7b461ccab58cb1cb91938707ebbde0323aa4e14cd908804d465be11d6fdaf4bb645a91ef42f8e3f25a37369f93665aaea3c84c14997ae1fca5a196b1aae61ebc91036fed41e79cbf44c48fd3e6c18d1284af0254d4a4036501baecc1690b8c76cb62bf924a00add8f385a7b06b995626eeedf8668fe5409c7e80cbb4b57d472236cf8ea3c3452bf3185a04fd79f7fa6d3358c790e5c5c1603a07bac89f79d24ecb9b91160d1dbe6a3f5b667594ddc5b47c4dcbc2c88cd8d9342f4cfb28342d0f336b9bd2670d030931cdefb8daad38d8d89ce30c71d3a64ca72df2ebb3b52fb92ade4d9a36500452c63366d01cddb87f393c2570a202fc7eec0a4dcb409953dd2d0508c7d1b9cc547558bee67d284c6bd1d4d67cfef3ee8eb79b342d8f39d41d20ac56f3b9adb2076f3c069a56b03c0b5b2e8a6ff027105178ca3ea3008044ce8c099cc6653aad0bd3f25015e8d86ed1b442a788c178c2940c8e0e80152f3531da2ed3b4baddb2670e453f8955fbc985671708ef74926cf2bacb2bf39bbbd4f9931f399e5c387e0ee0952ffefe3e35974f75ca9c7cd0d1373c0d637db157f274fad59f55eaebba9cc1cdff76123db842ca4f7ba8b757ec4cdbfe8fafd0d603f171981832ef6f65dd3fe133751cbc0320cea8d7693ff3fd1d60ef53445efdc9bfe70add7ddf79bf74c5835b58ab7901f49abc30add0ee2e2267a61598c9f5d2b4a2f67a612663f91ce72c9e54fb0c6c1963dbc3d5b06b80931f05c6b57b1f9bd7c259bcfae9dc34729b96278ef1feeaff98bc5d14d21e6e510661a7956c47464bb9d51381cbde01a70921a16995a4fc073444bea8ced2e6bc78bb57891099617f118819ed801657758a0af0e2d2a38b056e94c11f0746170bb672641e700f5f82f1b243d1c3f710944d7107f0f2c4709af129c3c982ba6b5aa6c3b88f8f0c532b7a1cdd6575aeef8ee3312053733ae4177db2a104041c9ebcbafd664d4bdebf30a36b1c9924fb3d04ffbe1ecaf7896b51274deb15750de9a6698ddf8f10d6b40c4cde2ee0d7d7f8a7984d9ad670ff5aff789dfe7def30b79cf2ec02ed7fbb93025fe7895e3948f4659ed2ff39485bf7d2b4ecb0c6509e4d53fa9dae8ad6bcbf039c798a88a57945b5a91517005c12a8cf75352b8243e99c14d10a45250c28f5e688cae1a13a31ad75156ed4ac4c26318cdfe00d39bb591a91c54081f139c77a276f03d6dd685eb1a8b2e3b24ebbbbf46d8c9efaedf0c4d0c79b59300249cd795e3b81209264bf9e28fac6c88ad67daf5e9137b06ed7ebfa3724ac7649949bbc5d30ed4fe569dfc0f81c94a4f6a2a3b21fd7c1f1266f6bfb68fde7b5f2cae50cc26a9df6f142d3b24ab2fa373e5a2ea62a7f9b83ab6d9c3406130bdab7bb9c92ecf70fbc6ac2067ebfd191a9bcfcad05de61c74052ee9dbcd0abcd063e91e89a4145fdb4a1287a95040d7c32502c23aadac54b7c5514fd714d83ed868169e0ee45f1026531ffb01856d904f70d48031b6844e90299b54dc73341b2585378a4814f247aaf005a1cd2cb9e05fdec4f83591be805eb531180c9db5a5c2f3c95b19d830fabd54d128dbf81dbc05af1ff246a91a21391b6b20000000049454e44ae426082</data>
<data format="PNG" length="3586">89504e470d0a1a0a0000000d49484452000000ad0000003008060000006357fade00000dc949444154789ced5d5f681cc71dfe1d38452ea29c4b1fac108a149a80540839557938b5095e9197ca72484ec983ad360f77968ba5f625720245b68372f183235fc0ad94a2546730951210921fe4930aa2928bcc296057a7a2723238702a6a390551ce429893380c5f1ff6766fffccecceec9d1c39be79f9ecdbf9f39bd9df7cfbcd6f675604221a25a28a21006c0000902c220a40c5dba9e2538b653b68e27e1600101899075d026860928bca38d0379706007cdb1dafe2938b9e0aa6b75402f5c712a035802e4d4aa33f0384a75175e02a4aa35c0100ca7577469545651cc8eee4ab12a28a42289411059511bd30aa0c4617d355c7ada22bba66486fe511885796599d3030325f950c557444c70cd802fc99fd67582bfa6389aae356918bdc0be9ad3cfc310f8c399c00c5011a9907c581f61bcb0080c93535ca205a8ffff264f98e0b60686414e1b33d0877f714318cf0d91e0cc6060100d96cf6c991240012d3959dd0f99d3c066340b8bb07c1630ac2dd61eff5ef837d2cac0cc35e560dc50e1c533283c7c2b8c80358051a5b0248b764d0d81240a025c8fd7fff40f48960f6fe81a86e7fc5ec9d836d3cfadeeff33491f7c53e06da675e01d20c2b92c2b3cb9e34ae17c60d9fed31dd88f68e10864646010063e393400c503adaf5eb8196209653cb079f7135fb2be510303b6ca0258870774f594c5b51fb3868fb41c94b6ad0acbbc306279265695ce57a52dca16066582cf10710f7011480c46cc2b17edc47f937c2ad7c19f523ebc13e00c1638aed09840d97f17a0cf6b9e5f78d12518488e2441401e0fb688ae85027d123310c075214ff6533f152e4af29bab6d22c5c1f0fc74e6c52d74bcffae2467b19984a2de3f499dfd21eed510dd5505069a5e1c1986b391302e83cd545eb5fafebf518b15d69a7deee0835bcf8bcaff59882bd877b54535b434bb71628eef3f98cf52d2c2671fee279da7eb84d81c6466afbcb173ecdcee62f9ba9f56e1bed3ddc33d51f686ca4c0cb013af7de39737d31a0e9cb66aaa11abaf2e9156a7bede7bee19151c4ff1cd7cbfb8f1ea1ed6f1ed01eedd1da528ae2df33dba3a16637ab7f6b77536abb00da4e1cd7eb33e6aba9ada125658136bb37a9eed9e27d11b0afa6b646efaf6e1f80e1cfe3347b7396d6bf5937b5e33f7a8416de9aa1dd7776e9f00fbeef8b9365e67979c3e5946435acdb1b34a13d0cb06bb4f68e10b00124179342335e2b1f3ca6a81d29326ddffb7d3a23055f57803c907d3da7b7d7ded16eb32ff766de767d303664b76f0e089fed31d567d5862646cc157f676852edfffd0351fe7815d89a1f4b00f2ea389bec035409551c072d7feecd7c79f659183ff7665efd7d03089d3c651eef22d3eb4c1b995ec6b57f7960c41f2d10ceb43159b697883e93646e278c5eeca43a1f9b39ac4cd9f44ab38d41ac4cd1d8d8486dbf68a3ae539d664603905a495173f3cf6c0cddd412809191863f8f93914966a6a74acc63b163ed6e8a666eced0858f2ed11eed91bfd64fbdddbdd4d5f5b6b99d02d0d4da6c63bee19620b47622dd11eafdcd695fa4bb072b2b2b36a63ef5ce293afe46876f7c7c125dffeca4c87684e8500d35bfdc4cbd67226a7f2ded844e84a8e1c30beee3c0e89727fb4e1ca7c8995ed2aeb72bedd43878c9747fcf0f44317b7396f6688f82af04a9f54f9ff9540d51282f1eabed45b0a5adca31ad743401c0606c08b8211645d0998151df726a192800ed1d215379a4a033858d61485d4d5b194963de744b066313937c265c2d3194b69a67da3b67d1f0967eb0faabb58b14ecfd711857a4501c8776537dda2256d63edc37b71f3a79cac4e85884edfe0180cab41eb4ac1183bfefa4a56798644b57be5aa7f76f35548469556dbb4e5d2f3d2fa7518968339b455d5d1d2ddc5ea2b6af5ba9f36f76cd6ad472bd1f9ca395bb29da7eb8cd656c2dff831870ada8e5346dbbfef53a759d89e8e5a317fbe9f81b1d3e2b535b35b0510b9f7bef9ccec891bfdfe23059182b2bf774bb7afff1958da936bfd9247a444487886a6a0fd3f02757f47eb218d3c8a832e3206d9fc013d188fe5a3fcd4fcfa81e1f18299f119dd2e052e51837edc088b298984d98186374641446860b1e53541d5d5ccd8e4d4c3219065970195cd784c57659e5dda2205a7911cd28d3ffe5d432b33f5686d434ad711c580c2d6b9fb57dd178b92fbb93c7b37f3c5c36034ebeb5499d8d756cba25a2a97b9bf4f6cd3aa2bdf21917173bb90c65d2628166d77cc6991e3e99222b635acbb775b4435f9d1b98c9a8bd6c4c743645f1889acfa8f1581a4ec3ce93a7a03d09d64ea428fea19866b432ad8cf6373e69b4df99e35086a675625aa727cf66360b6dad404005187078de9169f5547c63566e7b63ab0eda0bf638edd844f149905721b9983431aaa639b1e8a0f1605e35b3aeb334b3166570b2cf14ff0463d59c2d3199ab6694605a9ea6353e8182af2b6606b6d827ad69ad766c94ae6bd11addbe3c805c69cda0470fc25ea3061afa67083dc7b90ccb4bbecf1788fed7e6a9ddbe8b9dd4c89991bb3b799cee3d4d2bf7ee096ba54063237d7ce1636a78a181acf159ffd123b4f77097a9e96ccc300034dd346b348d71ac0cc78b7f1ab1e168030d7d7a851a5e54357cfc9802cd0e96666c38da40a1c48d8a306dab628e1f8b8cc38d8e10b4382bcb3e4d9b5bed30ae0978e3d1f042034d7d314e719fcf4759d93760060c1537c3784dfd0b698f6fc81c98d6c00883b141f0e284b801b6864291998b7153cca90c8b4271559b83aa7d0b3033a8c60caba57283b141473b13b30953fe52b921bb5d5a7ecd1eed3a4ae5928b126f0e0dfdd5fac3fcdd6057ff4054ed770aa67110b5cff1cd23a3bdf0d91e60156a14c1909f3ced7bbd5adab5556e4a6672a061b9f6fdb183bfb9a58afb8724cb7479c075379774da013205c9688543c7b493167d7380922f1da6ac9e0afe6ea038d35e16dbcd556e12b5c7a963f51ce60ec4cb67e87c71422437720038f519ae273772159d2879cec4d3da8b2ea61145f1947405da1bba934118c54d4b00d25be6fe24ee67a18cabd7559c4714decffca5b77288c25c5fc8529f18d30e3f167fd553b94cebb59c08a673f6f8b4d5617971ecb21c08a5bd21811198b5f40e98fd4d6ea0acfe0eddb1d7ebcf98fb9177b85f7d731267fe00841c76031ac7cf9d691f13c35a53394cebb59cd0a3c9529ff530666822c9b55b1907784c29c278dc7e70c62b8af2fa1be5d46b74a07c0150c6f9e32d74e60f40fdd50477dcace55d99763f527a4bd5b0893517c73d804cebc6a08a4b3426902beed5906d1ffc7e2437d84c1b5df4d08e01a38b120c0efe2e41c73d230ee5ea87d9e5c8c9c38385fd70d9a2431ace940d02c831167721b0ed72d3a6df26d38a7c17c21f93d7bad1c5b434d3721d4566a2c8d40be72f0dd50f973477df5c1abcb5075d72fe12113f4e9b01374a10ba01504e950eb406d0750f4e9b65b45b14fb7ada0168c39e2f348103cbb432716fc7377b2c07e2f4035ca62def3b12d145761c1d2e5a99c7d022e8cfb8d76f9bc11ab65b5e1cf42da44157f9334fda697933d2a2a14337ec67cbac8e72b09896af6959189e163b9be685691f87a6e5617223277dd6301017d3fc8eab5dddc186e71d67889b36653a6d8e5f9fad7dc955f141d2b4811c90309e3183eae8c6fdcba109811315e0f7e340685a06ca9ceaaecf42388ece65a692c3f235efbe30ad45535bf3f92fbb3bde41d2b43ce6c817cc9add6d95dd37f704685ac1f22cacbf2abec19f4044a109fb8c0200123933e6f16dae1bd38ac4eb0e22d31a35add02962309e303b064707c08a979a18ed80695acd6ed93387a29fc42affe4c2734b84775b493679dde595fcf5036afdf10f1d4f2e9cbe04f0ca677fb74b75c5539d32271f34f40d4cc2585ff4d5353affda4ff5fadaae2771ebbfad448fa648f949277575899d693bf2c9146d3f121f87d17ef3fe56d6fd133e53c7c17b00628c7a9df633ef1680c3cf1079f527ffa1297af081f37e69dd83eb59ab7941e67b5c4c2bb4bb8bc89969056672a534ada8bd5e98c9583ecd398b27d53e03eb87d9f67035ec06e0e4478111f5de4717d57016af7eba34896cdef2c431de5fed1f63ab5921ede1166510765ac97664b4945b3d61b8ec1d709a10129a561997ff8086c817d559da9c176ff72a11c2d3ec2f0231a31d50e3aa4e51015e5c7ae84e861b65f0c780a13b195b39320fb8872fc1e43c78ac87ef2128797107f0f2c4709af109c3c9828a6b5aa6c3b88f8f0c532b5a1cdd6575aeed8ee3312053733ae4177db2610708383c7935fbcd9a96bc7f6146d3383249f67b08feda4e5aeb16d7a24e9ad62b6a1ad24dd31abf1f21ac691938be9ac1af6ef24f319b34ade1fe35fc6186fefdf038b79cf2dc121d79b79502b7d7885e6d22babd460bff69a2ed870bb4e2b0c6509e5ba08577db74adb95b002e3c43c4d2bca2dad48a4b00ae09d4e7ba9a15c1fe85b414d10a45250c28f5e6888ae1a10a31ad75156ed4ac4c26318c5fdf9c9cdd2c8dc862a0c0c8bc63bd63ab8075379a57cc831d97cd3bf889b68dd153bf1d9e18da78330b8621a9392fab27104492ecd71345df1859d1baefd52bf206d6ed7a45ff8684d52e897263ab19d3fe549ef60d8ccc4319575f74e8fb711d1c6f6c55dd47ebbfac9657ae27114285f6f142d5b2ca78e96f7cd45f4de87f9b83ab6d9c340613b3eab7bb9c92ecf70fbc6ac22a7eb7d191a9bcfcad05de61c7c0b8dc3b79a1579b557c2ad13d232aa70d45d1ab24a8e2d381621951d22e5ee2aba2e88fa91aec200c4c150f2e8a17288af9fd6258c5e10d4815ab6844e902c98d9ce39920592c2b3c52c5a712bd5700350ee965cf8276f6a7caac55f48295a908c0d8aa1ad70b4d246de7e043286d92a8fe0ddc2a968bff073b2dade7ee67c12d0000000049454e44ae426082</data>
</image>
</images>
<connections>
......@@ -1170,6 +1189,12 @@ Montreal, Quebec H2T 1S6&lt;/p&gt;</string>
<receiver>ConfigurationPanel</receiver>
<slot>useStunSlot(int)</slot>
</connection>
<connection>
<sender>buttonApplySkin</sender>
<signal>clicked()</signal>
<receiver>ConfigurationPanel</receiver>
<slot>applySkinSlot()</slot>
</connection>
</connections>
<tabstops>
<tabstop>fullName</tabstop>
......@@ -1213,6 +1238,7 @@ Montreal, Quebec H2T 1S6&lt;/p&gt;</string>
<slot>saveSlot()</slot>
<slot>changeTabSlot()</slot>
<slot>useStunSlot( int id )</slot>
<slot>applySkinSlot()</slot>
</slots>
<functions>
<function access="private" specifier="non virtual">init()</function>
......
......@@ -226,3 +226,9 @@ void ConfigurationPanel::useStunSlot(int id)
{
Config::set("Signalisations", "STUN.useStun", id);
}
void ConfigurationPanel::applySkinSlot()
{
Config::set("Preferences", "Themes.skinChoice", SkinChoice->currentText());
}
This diff is collapsed.
/****************************************************************************
** Form interface generated from reading ui file 'configurationpanel.ui'
**
** Created: Mon Jan 31 18:13:29 2005
** Created: Wed Feb 2 17:25:45 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......@@ -104,6 +104,7 @@ public:
QWidget* CodecsPage_3;
QTabWidget* Tab_Preferences;
QWidget* DriversPage_4;
QPushButton* buttonApplySkin;
QComboBox* SkinChoice;
QWidget* TabPage;
QLabel* textLabel1_2;
......@@ -124,13 +125,14 @@ public slots:
virtual void saveSlot();
virtual void changeTabSlot();
virtual void useStunSlot( int id );
virtual void applySkinSlot();
protected:
QGridLayout* ConfigurationPanelLayout;
QVBoxLayout* layout8;
QHBoxLayout* layout7;
QSpacerItem* Horizontal_Spacing2;
QVBoxLayout* layout19;
QVBoxLayout* layout18;
QGridLayout* groupBox1Layout;
QVBoxLayout* stunButtonGroupLayout;
QGridLayout* SettingsDTMFLayout;
......
......@@ -33,29 +33,33 @@
// This is the default constructor, it must be called with pixname being
// the base name for the picture used as button pixmap.
JPushButton::JPushButton (QWidget* parent, const char* name,
const char* pixname) : QLabel (parent, name) {
// Load pictures
this->loadPixmaps(pixname);
const char* pixname) : QLabel (parent, name) {
// Create transparency bitmasks
QImage tmpImg[2];
MyCreateHeuristicMask (*(this->btnImg[0]), tmpImg[0]);
mask[0] = tmpImg[0];
guiWidget = (QtGUIMainWindow*)parent;
MyCreateHeuristicMask (*(this->btnImg[1]), tmpImg[1]);
mask[1] = tmpImg[1];
// Load pictures
this->loadPixmaps(pixname);
// Resize ourself
resize (this->btnImg[0]->width(), this->btnImg[0]->height() );
// Set default pixmap (released)
setMask (mask[0]);
setPixmap (*(this->btnImg[0]));
// Create transparency bitmasks
QImage tmpImg[2];
MyCreateHeuristicMask (*(this->btnImg[0]), tmpImg[0]);
mask[0] = tmpImg[0];
// Default cursor is pointing hand
setCursor (QCursor (Qt::PointingHandCursor));
MyCreateHeuristicMask (*(this->btnImg[1]), tmpImg[1]);
mask[1] = tmpImg[1];
setFocusPolicy(QWidget::NoFocus);
// Resize ourself
resize (this->btnImg[0]->width(), this->btnImg[0]->height() );
// Set default pixmap (released)
setMask (mask[0]);
setPixmap (*(this->btnImg[0]));
// Default cursor is pointing hand
setCursor (QCursor (Qt::PointingHandCursor));
setFocusPolicy(QWidget::NoFocus);
show();
}
// Delete allocated items
......@@ -73,10 +77,10 @@ JPushButton::loadPixmaps (const char* pixname) {
QString pressedPixmapPath, releasedPixmapPath;
pressedPixmapPath = Skin::getPath(QString(SKINDIR),
QtGUIMainWindow::setPathSkin(),
guiWidget->setPathSkin(),
QString(pixname) + PRESS_PREFIX + ".png");
releasedPixmapPath = Skin::getPath(QString(SKINDIR),
QtGUIMainWindow::setPathSkin(),
guiWidget->setPathSkin(),
QString(pixname) + REL_PREFIX + ".png");
this->btnImg[0] = new QImage (releasedPixmapPath);
......
......@@ -32,6 +32,8 @@
#define PRESS_PREFIX "_on"
#define REL_PREFIX "_off"
class QtGUIMainWindow;
class JPushButton : public QLabel {
Q_OBJECT
......@@ -40,6 +42,8 @@ public:
~JPushButton (void);
private:
QtGUIMainWindow* guiWidget;
void iAmPressed (void);
void iAmReleased (void);
QImage* btnImg[2];
......@@ -49,6 +53,7 @@ private:
// This function was derived from QImage::createHeuristicMask()
int MyCreateHeuristicMask (const QImage &, QImage &, long = -1 );
protected:
void mousePressEvent (QMouseEvent *);
void mouseReleaseEvent (QMouseEvent *);
......
......@@ -82,7 +82,6 @@ public:
bool getCallInProgress (void);
void setCallInProgress (bool);
#endif
bool transferedCall (void);
void ringTone (bool);
......
......@@ -88,6 +88,9 @@ MyDisplay::MyDisplay (QWidget *parent, const char *name, QtGUIMainWindow* qtgui)
this->qtgui = qtgui;
this->initGraphics();
this->initText();
// Graphics engine animation thread
this->animationThread = new MyDisplayThread (this);
this->animationThread->start();
}
/**
......@@ -177,8 +180,8 @@ MyDisplay::initGraphics (void) {
this->setGeometry (0, 0, centerImage.width(), centerImage.height());
// Graphics engine animation thread
this->animationThread = new MyDisplayThread (this);
this->animationThread->start();
// this->animationThread = new MyDisplayThread (this);
// this->animationThread->start();
}
/**
......
......@@ -58,6 +58,7 @@ public:
QString & getStatus (void);
void setTimer (const QString &);
QString & getTimer (void);
void initGraphics (void);
bool inFunction;
QString *textBuffer;
......@@ -82,7 +83,6 @@ private:
MyDisplayThread *animationThread;
QtGUIMainWindow *qtgui;
void initGraphics (void);
void initText (void);
void renderText (QPainter &, QFontMetrics &, QString &);
void renderStatus (QPainter &, QFontMetrics &, QString &);
......
......@@ -28,11 +28,12 @@
NumericKeypad::NumericKeypad (QWidget *parent, const char *name, WFlags f)
: TransQWidget (NULL, name, f) {
mainWindow = (TransQWidget *)parent;
gui = (QtGUIMainWindow*)parent;
this->setCaption("DTMF keypad");
// Load background image phone
setbgPixmap (new QPixmap (Skin::getPath(QString(SKINDIR),
QtGUIMainWindow::setPathSkin(),
gui->setPathSkin(),
QString(PIXMAP_KEYPAD))));
// Transform pixmap to QImage
......@@ -44,7 +45,7 @@ NumericKeypad::NumericKeypad (QWidget *parent, const char *name, WFlags f)
transparencyMask ();
QString skinfilename(Skin::getPath(QString(SKINDIR),
QtGUIMainWindow::setPathSkin(),
gui->setPathSkin(),
QString(FILE_INI)));
pt = new Point(skinfilename);
......
......@@ -24,6 +24,8 @@
#include "point.h"
#include "transqwidget.h"
class QtGUIMainwindow;
class NumericKeypad : public TransQWidget {
Q_OBJECT
public:
......@@ -48,6 +50,7 @@ public:
private:
Point *pt;
TransQWidget* mainWindow;
QtGUIMainWindow* gui;
void keyPressEvent (QKeyEvent*);
};
......
/****************************************************************************
** Form implementation generated from reading ui file 'phonebook.ui'
**
** Created: Mon Jan 31 18:13:29 2005
** Created: Wed Feb 2 17:25:45 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
/****************************************************************************
** Form interface generated from reading ui file 'phonebook.ui'
**
** Created: Mon Jan 31 18:13:29 2005
** Created: Wed Feb 2 17:25:44 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
......@@ -38,6 +38,7 @@ Point::~Point (void) {
}
}
/**
* Extract the substring before the comma
*/
......
......@@ -98,7 +98,6 @@ MyTrayIcon::mousePressEvent (QMouseEvent *e)
QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f,
Manager *mngr)
: TransQWidget (parent, name, f) {
// Create configuration panel
panel = new ConfigurationPanel (0, 0, false);
......@@ -115,152 +114,34 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f,
key = new DTMF ();
buf = new short[SIZEBUF];
// Load file configuration skin
QString skinfilename(Skin::getPath(QString(SKINDIR), setPathSkin(),
QString(FILE_INI)));
this->pt = new Point(skinfilename.ascii());
// Initialisations
this->initSpkrVolumePosition();
this->initMicVolumePosition();
this->initButtons();
this->initBlinkTimer();
// Initialisation variables for ringing and message
msgVar = false;
b_dialtone = false;
// Load background image phone
setbgPixmap (new QPixmap (Skin::getPath(QString(SKINDIR),
setPathSkin(),
QString(PIXMAP_PHONE))));
// Transform pixmap to QImage
setSourceImage ();
this->setMaximumSize (getSourceImage().width(), getSourceImage().height());
this->setGeometry (MAIN_INITIAL_POSITION,
MAIN_INITIAL_POSITION,
getSourceImage().width(),
getSourceImage().height());
// Calculate just one time the transparency mask bit to bit
transparencyMask ();
// By default, keyboard mapping mode is numerical mode
this->setMode(NUM_MODE);
// Connect blinkTimer signals to blink slot
connect(blinkTimer, SIGNAL(timeout()),this, SLOT(blinkMessageSlot()));
connect (blinkTimer, SIGNAL(timeout()), this, SLOT(blinkRingSlot()) );
connect (blinkTimer, SIGNAL(timeout()), this, SLOT(blinkLineSlot()));
// Line pixmaps initialisation
for (int i = 0; i < NUMBER_OF_LINES; i++) {
for (int j = 0; j < NUMBER_OF_STATES; j++) {
TabLinePixmap[i][j] = QPixmap(Skin::getPath(QString(SKINDIR),
setPathSkin(),
QString(PIXMAP_LINE(i, j))));
}
}
// Create new display and numeric keypad
lcd = new MyDisplay(this, 0, this);
keypad = new NumericKeypad (this, NULL, Qt::WDestructiveClose |
Qt::WStyle_Customize |
Qt::WStyle_NoBorder);
// Initialisation of variables
currentLineNumber = -1;
onLine = currentLineNumber;
chosenLine = -1;
choose = false;
noChoose = false;
transfer = false;
msgVar = false;
b_dialtone = false;
apply = false;
this->first = true;
// Message pixmaps initialisation
TabMsgPixmap[0] = QPixmap(Skin::getPath(QString(SKINDIR), setPathSkin(),
PIXMAP_MESSAGE_OFF));
TabMsgPixmap[1] = QPixmap(Skin::getPath(QString(SKINDIR), setPathSkin(),
PIXMAP_MESSAGE_ON));
// Create new display and numeric keypad
lcd = new MyDisplay(this, 0, this);
keypad = new NumericKeypad (this, NULL, Qt::WDestructiveClose |
Qt::WStyle_Customize |
Qt::WStyle_NoBorder);
// Initialisation of all that concern the skin
initSkin();
this->initBlinkTimer();
this->first = true;
// By default, keyboard mapping mode is numerical mode
this->setMode(NUM_MODE);
// Move
setMainLCD ();
// Connect to append url in display
connect (urlinput->buttonOK, SIGNAL(clicked()), this, SLOT(stripSlot()));
// Connect to save settings
connect (panel->buttonSave, SIGNAL(clicked()), this, SLOT(save()));
// Handle keyboard events
// Connect for clicked numeric keypad button
connect ((QObject*)keypad->key0, SIGNAL(clicked()), this,
SLOT(pressedKey0()));
connect ((QObject*)keypad->key1, SIGNAL(clicked()), this,
SLOT(pressedKey1()));
connect ((QObject*)keypad->key2, SIGNAL(clicked()), this,
SLOT(pressedKey2()));
connect ((QObject*)keypad->key3, SIGNAL(clicked()), this,
SLOT(pressedKey3()));
connect ((QObject*)keypad->key4, SIGNAL(clicked()), this,
SLOT(pressedKey4()));
connect ((QObject*)keypad->key5, SIGNAL(clicked()), this,
SLOT(pressedKey5()));
connect ((QObject*)keypad->key6, SIGNAL(clicked()), this,
SLOT(pressedKey6()));
connect ((QObject*)keypad->key7, SIGNAL(clicked()), this,
SLOT(pressedKey7()));
connect ((QObject*)keypad->key8, SIGNAL(clicked()), this,
SLOT(pressedKey8()));
connect ((QObject*)keypad->key9, SIGNAL(clicked()), this,
SLOT(pressedKey9()));
connect ((QObject*)keypad->keyStar, SIGNAL(clicked()), this,
SLOT(pressedKeyStar()));
connect ((QObject*)keypad->keyHash, SIGNAL(clicked()), this,
SLOT(pressedKeyHash()));
connect ((QObject*)keypad->keyClose, SIGNAL(clicked()), this,
SLOT(dtmfKeypad()));
// Connections for the lines
connect (callmanager->phLines[0]->button(), SIGNAL(clicked()), this,
SLOT(button_line0()));
connect (callmanager->phLines[1]->button(), SIGNAL(clicked()), this,
SLOT(button_line1()));
connect (callmanager->phLines[2]->button(), SIGNAL(clicked()), this,
SLOT(button_line2()));
connect (callmanager->phLines[3]->button(), SIGNAL(clicked()), this,
SLOT(button_line3()));
connect (callmanager->phLines[4]->button(), SIGNAL(clicked()), this,
SLOT(button_line4()));
connect (callmanager->phLines[5]->button(), SIGNAL(clicked()), this,
SLOT(button_line5()));
// Misc
connect (phoneKey_msg, SIGNAL(clicked()), this, SLOT(button_msg()));
connect (phoneKey_transf, SIGNAL(clicked()), this, SLOT(button_transfer()));
connect (phoneKey_conf, SIGNAL(clicked()), this, SLOT(button_conf()));
connect (dial_button, SIGNAL(clicked()), this, SLOT(dial()));
connect (mute_button, SIGNAL(clicked()), this, SLOT(button_mute()));
connect (hangup_button, SIGNAL(clicked()), this, SLOT(hangupLine()));
connect (configuration_button,SIGNAL(clicked()),this,SLOT(configuration()));
connect (addr_book_button, SIGNAL(clicked()), this,SLOT(addressBook()));
connect (dtmf_button, SIGNAL(clicked()), this, SLOT(dtmfKeypad()));
// Connect to reduce
connect (reduce_button, SIGNAL(clicked()), this, SLOT(reduceHandle()));
// Connect to quit with keyboard
connect (this, SIGNAL(keyPressed(int)), this, SLOT(quitApplication()));
// Connect to quit with quit button
connect (quit_button, SIGNAL(clicked()), this, SLOT(quitApplication()));
// To register when program is launched
//if (Config::getb("Preferences", "Options.autoregister")
// and panel->password->text() == "") {
// configuration ();
//}
// Change window title and Icon.
this->setCaption(PROGNAME);
this->setIcon(QPixmap(Skin::getPathPixmap(QString(PIXDIR),
......@@ -277,19 +158,39 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f,
Skin::getPathPixmap(QString(PIXDIR), QString(TRAY_ICON))),
NULL, mypop, parent, name);
trayicon->show();
connect(trayicon, SIGNAL(clickedLeft()), this, SLOT(clickHandle()));
// Connections for volume control
connect(vol_spkr, SIGNAL(setVolumeValue(int)), this,
SLOT(volumeSpkrChanged(int)));
connect(vol_mic, SIGNAL(setVolumeValue(int)), this,
SLOT(volumeMicChanged(int)));
// Connect to handle trayicon
connect(trayicon, SIGNAL(clickedLeft()), this, SLOT(clickHandle()));
// Connect blinkTimer signals to blink slot
connect(blinkTimer, SIGNAL(timeout()),this, SLOT(blinkMessageSlot()));
connect (blinkTimer, SIGNAL(timeout()), this, SLOT(blinkRingSlot()) );
connect (blinkTimer, SIGNAL(timeout()), this, SLOT(blinkLineSlot()));
// Connect to append url in display
connect (urlinput->buttonOK, SIGNAL(clicked()), this, SLOT(stripSlot()));
// Connect to save settings
connect (panel->buttonSave, SIGNAL(clicked()), this, SLOT(save()));
// Connect to apply skin
connect (panel->buttonApplySkin, SIGNAL(clicked()), this,SLOT(applySkin()));
}
/**
* Destructor
*/
QtGUIMainWindow::~QtGUIMainWindow(void) {
deleteButtons();
delete panel;
delete blinkTimer;
delete keypad;
delete lcd;
delete urlinput;
delete callmanager;
delete mypop;
delete trayicon;
delete pt;
}
void
QtGUIMainWindow::deleteButtons (void) {
delete phoneKey_transf;
delete phoneKey_msg;
delete phoneKey_conf;
......@@ -309,22 +210,11 @@ QtGUIMainWindow::~QtGUIMainWindow(void) {
delete vol_spkr;
delete micVolVector;
delete spkrVolVector;
delete panel;
delete blinkTimer;
delete keypad;
delete lcd;
delete urlinput;
delete callmanager;
delete mypop;
delete trayicon;
for (int j = 0; j < NUMBER_OF_LINES; j++) {
delete callmanager->phLines[j]->button();
}
}
///////////////////////////////////////////////////////////////////////////////
// Private Methods implementations
///////////////////////////////////////////////////////////////////////////////
......@@ -346,18 +236,74 @@ QtGUIMainWindow::setPathSkin (void) {
"Preferences", "Themes.skinChoice", "metal"));
}
/**
* Init variable with ring choice
*/
QString
QtGUIMainWindow::ringFile(void) {
return QString(Config::getchar(
"Audio", "Rings.ringChoice", "konga.ul"));
}
/**
* Get whole path for rings
*/
QString
QtGUIMainWindow::getRingFile (void) {
QString ringFilename(Skin::getPathRing(QString(RINGDIR), ringFile()));
return ringFilename;
}
void