Contents of /trunk/qt4/patches/qt-4.8.7-systemtrayicon.patch
Parent Directory | Revision Log
Revision 2912 -
(show annotations)
(download)
Thu Apr 27 14:32:52 2017 UTC (7 years, 5 months ago) by niro
File size: 142165 byte(s)
Thu Apr 27 14:32:52 2017 UTC (7 years, 5 months ago) by niro
File size: 142165 byte(s)
-fix missing systemtray icons, patch from kubuntu
1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
3 | <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> |
4 | <head> |
5 | <title>svntogit/packages.git - Git clone of the 'packages' repository |
6 | </title> |
7 | <meta name='generator' content='cgit v0.12'/> |
8 | <meta name='robots' content='index, nofollow'/> |
9 | <link rel='stylesheet' type='text/css' href='/cgit.css'/> |
10 | <link rel='shortcut icon' href='/favicon.ico'/> |
11 | <link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4' type='application/atom+xml'/> |
12 | <link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
13 | <link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
14 | <link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
15 | </head> |
16 | <body> |
17 | <div id="archnavbar"><!-- Arch Linux global navigation bar --> |
18 | <div id="archnavbarlogo"> |
19 | <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> |
20 | </div> |
21 | <div id="archnavbarmenu"> |
22 | <ul id="archnavbarlist"> |
23 | <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> |
24 | <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> |
25 | <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> |
26 | <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> |
27 | <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> |
28 | <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> |
29 | <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> |
30 | </ul> |
31 | </div> |
32 | </div><!-- #archnavbar --> |
33 | <div id='cgit'><table id='header'> |
34 | <tr> |
35 | <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> |
36 | <tr><td class='sub'>Git clone of the 'packages' repository |
37 | </td><td class='sub right'></td></tr></table> |
38 | <table class='tabs'><tr><td> |
39 | <a href='/svntogit/packages.git/?h=packages/qt4'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/qt4'>refs</a><a href='/svntogit/packages.git/log/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/kubuntu_14_systemtrayicon.diff'> |
40 | <input type='hidden' name='h' value='packages/qt4'/><select name='qt'> |
41 | <option value='grep'>log msg</option> |
42 | <option value='author'>author</option> |
43 | <option value='committer'>committer</option> |
44 | <option value='range'>range</option> |
45 | </select> |
46 | <input class='txt' type='text' size='10' name='q' value=''/> |
47 | <input type='submit' value='search'/> |
48 | </form> |
49 | </td></tr></table> |
50 | <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/qt4'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/qt4'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>kubuntu_14_systemtrayicon.diff</a></div><div class='content'>blob: 2466a16b47ea681ed1258e16f1596d27b234d0a8 (<a href='/svntogit/packages.git/plain/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>plain</a>) |
51 | <table summary='blob content' class='blob'> |
52 | <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> |
53 | <a id='n2' href='#n2'>2</a> |
54 | <a id='n3' href='#n3'>3</a> |
55 | <a id='n4' href='#n4'>4</a> |
56 | <a id='n5' href='#n5'>5</a> |
57 | <a id='n6' href='#n6'>6</a> |
58 | <a id='n7' href='#n7'>7</a> |
59 | <a id='n8' href='#n8'>8</a> |
60 | <a id='n9' href='#n9'>9</a> |
61 | <a id='n10' href='#n10'>10</a> |
62 | <a id='n11' href='#n11'>11</a> |
63 | <a id='n12' href='#n12'>12</a> |
64 | <a id='n13' href='#n13'>13</a> |
65 | <a id='n14' href='#n14'>14</a> |
66 | <a id='n15' href='#n15'>15</a> |
67 | <a id='n16' href='#n16'>16</a> |
68 | <a id='n17' href='#n17'>17</a> |
69 | <a id='n18' href='#n18'>18</a> |
70 | <a id='n19' href='#n19'>19</a> |
71 | <a id='n20' href='#n20'>20</a> |
72 | <a id='n21' href='#n21'>21</a> |
73 | <a id='n22' href='#n22'>22</a> |
74 | <a id='n23' href='#n23'>23</a> |
75 | <a id='n24' href='#n24'>24</a> |
76 | <a id='n25' href='#n25'>25</a> |
77 | <a id='n26' href='#n26'>26</a> |
78 | <a id='n27' href='#n27'>27</a> |
79 | <a id='n28' href='#n28'>28</a> |
80 | <a id='n29' href='#n29'>29</a> |
81 | <a id='n30' href='#n30'>30</a> |
82 | <a id='n31' href='#n31'>31</a> |
83 | <a id='n32' href='#n32'>32</a> |
84 | <a id='n33' href='#n33'>33</a> |
85 | <a id='n34' href='#n34'>34</a> |
86 | <a id='n35' href='#n35'>35</a> |
87 | <a id='n36' href='#n36'>36</a> |
88 | <a id='n37' href='#n37'>37</a> |
89 | <a id='n38' href='#n38'>38</a> |
90 | <a id='n39' href='#n39'>39</a> |
91 | <a id='n40' href='#n40'>40</a> |
92 | <a id='n41' href='#n41'>41</a> |
93 | <a id='n42' href='#n42'>42</a> |
94 | <a id='n43' href='#n43'>43</a> |
95 | <a id='n44' href='#n44'>44</a> |
96 | <a id='n45' href='#n45'>45</a> |
97 | <a id='n46' href='#n46'>46</a> |
98 | <a id='n47' href='#n47'>47</a> |
99 | <a id='n48' href='#n48'>48</a> |
100 | <a id='n49' href='#n49'>49</a> |
101 | <a id='n50' href='#n50'>50</a> |
102 | <a id='n51' href='#n51'>51</a> |
103 | <a id='n52' href='#n52'>52</a> |
104 | <a id='n53' href='#n53'>53</a> |
105 | <a id='n54' href='#n54'>54</a> |
106 | <a id='n55' href='#n55'>55</a> |
107 | <a id='n56' href='#n56'>56</a> |
108 | <a id='n57' href='#n57'>57</a> |
109 | <a id='n58' href='#n58'>58</a> |
110 | <a id='n59' href='#n59'>59</a> |
111 | <a id='n60' href='#n60'>60</a> |
112 | <a id='n61' href='#n61'>61</a> |
113 | <a id='n62' href='#n62'>62</a> |
114 | <a id='n63' href='#n63'>63</a> |
115 | <a id='n64' href='#n64'>64</a> |
116 | <a id='n65' href='#n65'>65</a> |
117 | <a id='n66' href='#n66'>66</a> |
118 | <a id='n67' href='#n67'>67</a> |
119 | <a id='n68' href='#n68'>68</a> |
120 | <a id='n69' href='#n69'>69</a> |
121 | <a id='n70' href='#n70'>70</a> |
122 | <a id='n71' href='#n71'>71</a> |
123 | <a id='n72' href='#n72'>72</a> |
124 | <a id='n73' href='#n73'>73</a> |
125 | <a id='n74' href='#n74'>74</a> |
126 | <a id='n75' href='#n75'>75</a> |
127 | <a id='n76' href='#n76'>76</a> |
128 | <a id='n77' href='#n77'>77</a> |
129 | <a id='n78' href='#n78'>78</a> |
130 | <a id='n79' href='#n79'>79</a> |
131 | <a id='n80' href='#n80'>80</a> |
132 | <a id='n81' href='#n81'>81</a> |
133 | <a id='n82' href='#n82'>82</a> |
134 | <a id='n83' href='#n83'>83</a> |
135 | <a id='n84' href='#n84'>84</a> |
136 | <a id='n85' href='#n85'>85</a> |
137 | <a id='n86' href='#n86'>86</a> |
138 | <a id='n87' href='#n87'>87</a> |
139 | <a id='n88' href='#n88'>88</a> |
140 | <a id='n89' href='#n89'>89</a> |
141 | <a id='n90' href='#n90'>90</a> |
142 | <a id='n91' href='#n91'>91</a> |
143 | <a id='n92' href='#n92'>92</a> |
144 | <a id='n93' href='#n93'>93</a> |
145 | <a id='n94' href='#n94'>94</a> |
146 | <a id='n95' href='#n95'>95</a> |
147 | <a id='n96' href='#n96'>96</a> |
148 | <a id='n97' href='#n97'>97</a> |
149 | <a id='n98' href='#n98'>98</a> |
150 | <a id='n99' href='#n99'>99</a> |
151 | <a id='n100' href='#n100'>100</a> |
152 | <a id='n101' href='#n101'>101</a> |
153 | <a id='n102' href='#n102'>102</a> |
154 | <a id='n103' href='#n103'>103</a> |
155 | <a id='n104' href='#n104'>104</a> |
156 | <a id='n105' href='#n105'>105</a> |
157 | <a id='n106' href='#n106'>106</a> |
158 | <a id='n107' href='#n107'>107</a> |
159 | <a id='n108' href='#n108'>108</a> |
160 | <a id='n109' href='#n109'>109</a> |
161 | <a id='n110' href='#n110'>110</a> |
162 | <a id='n111' href='#n111'>111</a> |
163 | <a id='n112' href='#n112'>112</a> |
164 | <a id='n113' href='#n113'>113</a> |
165 | <a id='n114' href='#n114'>114</a> |
166 | <a id='n115' href='#n115'>115</a> |
167 | <a id='n116' href='#n116'>116</a> |
168 | <a id='n117' href='#n117'>117</a> |
169 | <a id='n118' href='#n118'>118</a> |
170 | <a id='n119' href='#n119'>119</a> |
171 | <a id='n120' href='#n120'>120</a> |
172 | <a id='n121' href='#n121'>121</a> |
173 | <a id='n122' href='#n122'>122</a> |
174 | <a id='n123' href='#n123'>123</a> |
175 | <a id='n124' href='#n124'>124</a> |
176 | <a id='n125' href='#n125'>125</a> |
177 | <a id='n126' href='#n126'>126</a> |
178 | <a id='n127' href='#n127'>127</a> |
179 | <a id='n128' href='#n128'>128</a> |
180 | <a id='n129' href='#n129'>129</a> |
181 | <a id='n130' href='#n130'>130</a> |
182 | <a id='n131' href='#n131'>131</a> |
183 | <a id='n132' href='#n132'>132</a> |
184 | <a id='n133' href='#n133'>133</a> |
185 | <a id='n134' href='#n134'>134</a> |
186 | <a id='n135' href='#n135'>135</a> |
187 | <a id='n136' href='#n136'>136</a> |
188 | <a id='n137' href='#n137'>137</a> |
189 | <a id='n138' href='#n138'>138</a> |
190 | <a id='n139' href='#n139'>139</a> |
191 | <a id='n140' href='#n140'>140</a> |
192 | <a id='n141' href='#n141'>141</a> |
193 | <a id='n142' href='#n142'>142</a> |
194 | <a id='n143' href='#n143'>143</a> |
195 | <a id='n144' href='#n144'>144</a> |
196 | <a id='n145' href='#n145'>145</a> |
197 | <a id='n146' href='#n146'>146</a> |
198 | <a id='n147' href='#n147'>147</a> |
199 | <a id='n148' href='#n148'>148</a> |
200 | <a id='n149' href='#n149'>149</a> |
201 | <a id='n150' href='#n150'>150</a> |
202 | <a id='n151' href='#n151'>151</a> |
203 | <a id='n152' href='#n152'>152</a> |
204 | <a id='n153' href='#n153'>153</a> |
205 | <a id='n154' href='#n154'>154</a> |
206 | <a id='n155' href='#n155'>155</a> |
207 | <a id='n156' href='#n156'>156</a> |
208 | <a id='n157' href='#n157'>157</a> |
209 | <a id='n158' href='#n158'>158</a> |
210 | <a id='n159' href='#n159'>159</a> |
211 | <a id='n160' href='#n160'>160</a> |
212 | <a id='n161' href='#n161'>161</a> |
213 | <a id='n162' href='#n162'>162</a> |
214 | <a id='n163' href='#n163'>163</a> |
215 | <a id='n164' href='#n164'>164</a> |
216 | <a id='n165' href='#n165'>165</a> |
217 | <a id='n166' href='#n166'>166</a> |
218 | <a id='n167' href='#n167'>167</a> |
219 | <a id='n168' href='#n168'>168</a> |
220 | <a id='n169' href='#n169'>169</a> |
221 | <a id='n170' href='#n170'>170</a> |
222 | <a id='n171' href='#n171'>171</a> |
223 | <a id='n172' href='#n172'>172</a> |
224 | <a id='n173' href='#n173'>173</a> |
225 | <a id='n174' href='#n174'>174</a> |
226 | <a id='n175' href='#n175'>175</a> |
227 | <a id='n176' href='#n176'>176</a> |
228 | <a id='n177' href='#n177'>177</a> |
229 | <a id='n178' href='#n178'>178</a> |
230 | <a id='n179' href='#n179'>179</a> |
231 | <a id='n180' href='#n180'>180</a> |
232 | <a id='n181' href='#n181'>181</a> |
233 | <a id='n182' href='#n182'>182</a> |
234 | <a id='n183' href='#n183'>183</a> |
235 | <a id='n184' href='#n184'>184</a> |
236 | <a id='n185' href='#n185'>185</a> |
237 | <a id='n186' href='#n186'>186</a> |
238 | <a id='n187' href='#n187'>187</a> |
239 | <a id='n188' href='#n188'>188</a> |
240 | <a id='n189' href='#n189'>189</a> |
241 | <a id='n190' href='#n190'>190</a> |
242 | <a id='n191' href='#n191'>191</a> |
243 | <a id='n192' href='#n192'>192</a> |
244 | <a id='n193' href='#n193'>193</a> |
245 | <a id='n194' href='#n194'>194</a> |
246 | <a id='n195' href='#n195'>195</a> |
247 | <a id='n196' href='#n196'>196</a> |
248 | <a id='n197' href='#n197'>197</a> |
249 | <a id='n198' href='#n198'>198</a> |
250 | <a id='n199' href='#n199'>199</a> |
251 | <a id='n200' href='#n200'>200</a> |
252 | <a id='n201' href='#n201'>201</a> |
253 | <a id='n202' href='#n202'>202</a> |
254 | <a id='n203' href='#n203'>203</a> |
255 | <a id='n204' href='#n204'>204</a> |
256 | <a id='n205' href='#n205'>205</a> |
257 | <a id='n206' href='#n206'>206</a> |
258 | <a id='n207' href='#n207'>207</a> |
259 | <a id='n208' href='#n208'>208</a> |
260 | <a id='n209' href='#n209'>209</a> |
261 | <a id='n210' href='#n210'>210</a> |
262 | <a id='n211' href='#n211'>211</a> |
263 | <a id='n212' href='#n212'>212</a> |
264 | <a id='n213' href='#n213'>213</a> |
265 | <a id='n214' href='#n214'>214</a> |
266 | <a id='n215' href='#n215'>215</a> |
267 | <a id='n216' href='#n216'>216</a> |
268 | <a id='n217' href='#n217'>217</a> |
269 | <a id='n218' href='#n218'>218</a> |
270 | <a id='n219' href='#n219'>219</a> |
271 | <a id='n220' href='#n220'>220</a> |
272 | <a id='n221' href='#n221'>221</a> |
273 | <a id='n222' href='#n222'>222</a> |
274 | <a id='n223' href='#n223'>223</a> |
275 | <a id='n224' href='#n224'>224</a> |
276 | <a id='n225' href='#n225'>225</a> |
277 | <a id='n226' href='#n226'>226</a> |
278 | <a id='n227' href='#n227'>227</a> |
279 | <a id='n228' href='#n228'>228</a> |
280 | <a id='n229' href='#n229'>229</a> |
281 | <a id='n230' href='#n230'>230</a> |
282 | <a id='n231' href='#n231'>231</a> |
283 | <a id='n232' href='#n232'>232</a> |
284 | <a id='n233' href='#n233'>233</a> |
285 | <a id='n234' href='#n234'>234</a> |
286 | <a id='n235' href='#n235'>235</a> |
287 | <a id='n236' href='#n236'>236</a> |
288 | <a id='n237' href='#n237'>237</a> |
289 | <a id='n238' href='#n238'>238</a> |
290 | <a id='n239' href='#n239'>239</a> |
291 | <a id='n240' href='#n240'>240</a> |
292 | <a id='n241' href='#n241'>241</a> |
293 | <a id='n242' href='#n242'>242</a> |
294 | <a id='n243' href='#n243'>243</a> |
295 | <a id='n244' href='#n244'>244</a> |
296 | <a id='n245' href='#n245'>245</a> |
297 | <a id='n246' href='#n246'>246</a> |
298 | <a id='n247' href='#n247'>247</a> |
299 | <a id='n248' href='#n248'>248</a> |
300 | <a id='n249' href='#n249'>249</a> |
301 | <a id='n250' href='#n250'>250</a> |
302 | <a id='n251' href='#n251'>251</a> |
303 | <a id='n252' href='#n252'>252</a> |
304 | <a id='n253' href='#n253'>253</a> |
305 | <a id='n254' href='#n254'>254</a> |
306 | <a id='n255' href='#n255'>255</a> |
307 | <a id='n256' href='#n256'>256</a> |
308 | <a id='n257' href='#n257'>257</a> |
309 | <a id='n258' href='#n258'>258</a> |
310 | <a id='n259' href='#n259'>259</a> |
311 | <a id='n260' href='#n260'>260</a> |
312 | <a id='n261' href='#n261'>261</a> |
313 | <a id='n262' href='#n262'>262</a> |
314 | <a id='n263' href='#n263'>263</a> |
315 | <a id='n264' href='#n264'>264</a> |
316 | <a id='n265' href='#n265'>265</a> |
317 | <a id='n266' href='#n266'>266</a> |
318 | <a id='n267' href='#n267'>267</a> |
319 | <a id='n268' href='#n268'>268</a> |
320 | <a id='n269' href='#n269'>269</a> |
321 | <a id='n270' href='#n270'>270</a> |
322 | <a id='n271' href='#n271'>271</a> |
323 | <a id='n272' href='#n272'>272</a> |
324 | <a id='n273' href='#n273'>273</a> |
325 | <a id='n274' href='#n274'>274</a> |
326 | <a id='n275' href='#n275'>275</a> |
327 | <a id='n276' href='#n276'>276</a> |
328 | <a id='n277' href='#n277'>277</a> |
329 | <a id='n278' href='#n278'>278</a> |
330 | <a id='n279' href='#n279'>279</a> |
331 | <a id='n280' href='#n280'>280</a> |
332 | <a id='n281' href='#n281'>281</a> |
333 | <a id='n282' href='#n282'>282</a> |
334 | <a id='n283' href='#n283'>283</a> |
335 | <a id='n284' href='#n284'>284</a> |
336 | <a id='n285' href='#n285'>285</a> |
337 | <a id='n286' href='#n286'>286</a> |
338 | <a id='n287' href='#n287'>287</a> |
339 | <a id='n288' href='#n288'>288</a> |
340 | <a id='n289' href='#n289'>289</a> |
341 | <a id='n290' href='#n290'>290</a> |
342 | <a id='n291' href='#n291'>291</a> |
343 | <a id='n292' href='#n292'>292</a> |
344 | <a id='n293' href='#n293'>293</a> |
345 | <a id='n294' href='#n294'>294</a> |
346 | <a id='n295' href='#n295'>295</a> |
347 | <a id='n296' href='#n296'>296</a> |
348 | <a id='n297' href='#n297'>297</a> |
349 | <a id='n298' href='#n298'>298</a> |
350 | <a id='n299' href='#n299'>299</a> |
351 | <a id='n300' href='#n300'>300</a> |
352 | <a id='n301' href='#n301'>301</a> |
353 | <a id='n302' href='#n302'>302</a> |
354 | <a id='n303' href='#n303'>303</a> |
355 | <a id='n304' href='#n304'>304</a> |
356 | <a id='n305' href='#n305'>305</a> |
357 | <a id='n306' href='#n306'>306</a> |
358 | <a id='n307' href='#n307'>307</a> |
359 | <a id='n308' href='#n308'>308</a> |
360 | <a id='n309' href='#n309'>309</a> |
361 | <a id='n310' href='#n310'>310</a> |
362 | <a id='n311' href='#n311'>311</a> |
363 | <a id='n312' href='#n312'>312</a> |
364 | <a id='n313' href='#n313'>313</a> |
365 | <a id='n314' href='#n314'>314</a> |
366 | <a id='n315' href='#n315'>315</a> |
367 | <a id='n316' href='#n316'>316</a> |
368 | <a id='n317' href='#n317'>317</a> |
369 | <a id='n318' href='#n318'>318</a> |
370 | <a id='n319' href='#n319'>319</a> |
371 | <a id='n320' href='#n320'>320</a> |
372 | <a id='n321' href='#n321'>321</a> |
373 | <a id='n322' href='#n322'>322</a> |
374 | <a id='n323' href='#n323'>323</a> |
375 | <a id='n324' href='#n324'>324</a> |
376 | <a id='n325' href='#n325'>325</a> |
377 | <a id='n326' href='#n326'>326</a> |
378 | <a id='n327' href='#n327'>327</a> |
379 | <a id='n328' href='#n328'>328</a> |
380 | <a id='n329' href='#n329'>329</a> |
381 | <a id='n330' href='#n330'>330</a> |
382 | <a id='n331' href='#n331'>331</a> |
383 | <a id='n332' href='#n332'>332</a> |
384 | <a id='n333' href='#n333'>333</a> |
385 | <a id='n334' href='#n334'>334</a> |
386 | <a id='n335' href='#n335'>335</a> |
387 | <a id='n336' href='#n336'>336</a> |
388 | <a id='n337' href='#n337'>337</a> |
389 | <a id='n338' href='#n338'>338</a> |
390 | <a id='n339' href='#n339'>339</a> |
391 | <a id='n340' href='#n340'>340</a> |
392 | <a id='n341' href='#n341'>341</a> |
393 | <a id='n342' href='#n342'>342</a> |
394 | <a id='n343' href='#n343'>343</a> |
395 | <a id='n344' href='#n344'>344</a> |
396 | <a id='n345' href='#n345'>345</a> |
397 | <a id='n346' href='#n346'>346</a> |
398 | <a id='n347' href='#n347'>347</a> |
399 | <a id='n348' href='#n348'>348</a> |
400 | <a id='n349' href='#n349'>349</a> |
401 | <a id='n350' href='#n350'>350</a> |
402 | <a id='n351' href='#n351'>351</a> |
403 | <a id='n352' href='#n352'>352</a> |
404 | <a id='n353' href='#n353'>353</a> |
405 | <a id='n354' href='#n354'>354</a> |
406 | <a id='n355' href='#n355'>355</a> |
407 | <a id='n356' href='#n356'>356</a> |
408 | <a id='n357' href='#n357'>357</a> |
409 | <a id='n358' href='#n358'>358</a> |
410 | <a id='n359' href='#n359'>359</a> |
411 | <a id='n360' href='#n360'>360</a> |
412 | <a id='n361' href='#n361'>361</a> |
413 | <a id='n362' href='#n362'>362</a> |
414 | <a id='n363' href='#n363'>363</a> |
415 | <a id='n364' href='#n364'>364</a> |
416 | <a id='n365' href='#n365'>365</a> |
417 | <a id='n366' href='#n366'>366</a> |
418 | <a id='n367' href='#n367'>367</a> |
419 | <a id='n368' href='#n368'>368</a> |
420 | <a id='n369' href='#n369'>369</a> |
421 | <a id='n370' href='#n370'>370</a> |
422 | <a id='n371' href='#n371'>371</a> |
423 | <a id='n372' href='#n372'>372</a> |
424 | <a id='n373' href='#n373'>373</a> |
425 | <a id='n374' href='#n374'>374</a> |
426 | <a id='n375' href='#n375'>375</a> |
427 | <a id='n376' href='#n376'>376</a> |
428 | <a id='n377' href='#n377'>377</a> |
429 | <a id='n378' href='#n378'>378</a> |
430 | <a id='n379' href='#n379'>379</a> |
431 | <a id='n380' href='#n380'>380</a> |
432 | <a id='n381' href='#n381'>381</a> |
433 | <a id='n382' href='#n382'>382</a> |
434 | <a id='n383' href='#n383'>383</a> |
435 | <a id='n384' href='#n384'>384</a> |
436 | <a id='n385' href='#n385'>385</a> |
437 | <a id='n386' href='#n386'>386</a> |
438 | <a id='n387' href='#n387'>387</a> |
439 | <a id='n388' href='#n388'>388</a> |
440 | <a id='n389' href='#n389'>389</a> |
441 | <a id='n390' href='#n390'>390</a> |
442 | <a id='n391' href='#n391'>391</a> |
443 | <a id='n392' href='#n392'>392</a> |
444 | <a id='n393' href='#n393'>393</a> |
445 | <a id='n394' href='#n394'>394</a> |
446 | <a id='n395' href='#n395'>395</a> |
447 | <a id='n396' href='#n396'>396</a> |
448 | <a id='n397' href='#n397'>397</a> |
449 | <a id='n398' href='#n398'>398</a> |
450 | <a id='n399' href='#n399'>399</a> |
451 | <a id='n400' href='#n400'>400</a> |
452 | <a id='n401' href='#n401'>401</a> |
453 | <a id='n402' href='#n402'>402</a> |
454 | <a id='n403' href='#n403'>403</a> |
455 | <a id='n404' href='#n404'>404</a> |
456 | <a id='n405' href='#n405'>405</a> |
457 | <a id='n406' href='#n406'>406</a> |
458 | <a id='n407' href='#n407'>407</a> |
459 | <a id='n408' href='#n408'>408</a> |
460 | <a id='n409' href='#n409'>409</a> |
461 | <a id='n410' href='#n410'>410</a> |
462 | <a id='n411' href='#n411'>411</a> |
463 | <a id='n412' href='#n412'>412</a> |
464 | <a id='n413' href='#n413'>413</a> |
465 | <a id='n414' href='#n414'>414</a> |
466 | <a id='n415' href='#n415'>415</a> |
467 | <a id='n416' href='#n416'>416</a> |
468 | <a id='n417' href='#n417'>417</a> |
469 | <a id='n418' href='#n418'>418</a> |
470 | <a id='n419' href='#n419'>419</a> |
471 | <a id='n420' href='#n420'>420</a> |
472 | <a id='n421' href='#n421'>421</a> |
473 | <a id='n422' href='#n422'>422</a> |
474 | <a id='n423' href='#n423'>423</a> |
475 | <a id='n424' href='#n424'>424</a> |
476 | <a id='n425' href='#n425'>425</a> |
477 | <a id='n426' href='#n426'>426</a> |
478 | <a id='n427' href='#n427'>427</a> |
479 | <a id='n428' href='#n428'>428</a> |
480 | <a id='n429' href='#n429'>429</a> |
481 | <a id='n430' href='#n430'>430</a> |
482 | <a id='n431' href='#n431'>431</a> |
483 | <a id='n432' href='#n432'>432</a> |
484 | <a id='n433' href='#n433'>433</a> |
485 | <a id='n434' href='#n434'>434</a> |
486 | <a id='n435' href='#n435'>435</a> |
487 | <a id='n436' href='#n436'>436</a> |
488 | <a id='n437' href='#n437'>437</a> |
489 | <a id='n438' href='#n438'>438</a> |
490 | <a id='n439' href='#n439'>439</a> |
491 | <a id='n440' href='#n440'>440</a> |
492 | <a id='n441' href='#n441'>441</a> |
493 | <a id='n442' href='#n442'>442</a> |
494 | <a id='n443' href='#n443'>443</a> |
495 | <a id='n444' href='#n444'>444</a> |
496 | <a id='n445' href='#n445'>445</a> |
497 | <a id='n446' href='#n446'>446</a> |
498 | <a id='n447' href='#n447'>447</a> |
499 | <a id='n448' href='#n448'>448</a> |
500 | <a id='n449' href='#n449'>449</a> |
501 | <a id='n450' href='#n450'>450</a> |
502 | <a id='n451' href='#n451'>451</a> |
503 | <a id='n452' href='#n452'>452</a> |
504 | <a id='n453' href='#n453'>453</a> |
505 | <a id='n454' href='#n454'>454</a> |
506 | <a id='n455' href='#n455'>455</a> |
507 | <a id='n456' href='#n456'>456</a> |
508 | <a id='n457' href='#n457'>457</a> |
509 | <a id='n458' href='#n458'>458</a> |
510 | <a id='n459' href='#n459'>459</a> |
511 | <a id='n460' href='#n460'>460</a> |
512 | <a id='n461' href='#n461'>461</a> |
513 | <a id='n462' href='#n462'>462</a> |
514 | <a id='n463' href='#n463'>463</a> |
515 | <a id='n464' href='#n464'>464</a> |
516 | <a id='n465' href='#n465'>465</a> |
517 | <a id='n466' href='#n466'>466</a> |
518 | <a id='n467' href='#n467'>467</a> |
519 | <a id='n468' href='#n468'>468</a> |
520 | <a id='n469' href='#n469'>469</a> |
521 | <a id='n470' href='#n470'>470</a> |
522 | <a id='n471' href='#n471'>471</a> |
523 | <a id='n472' href='#n472'>472</a> |
524 | <a id='n473' href='#n473'>473</a> |
525 | <a id='n474' href='#n474'>474</a> |
526 | <a id='n475' href='#n475'>475</a> |
527 | <a id='n476' href='#n476'>476</a> |
528 | <a id='n477' href='#n477'>477</a> |
529 | <a id='n478' href='#n478'>478</a> |
530 | <a id='n479' href='#n479'>479</a> |
531 | <a id='n480' href='#n480'>480</a> |
532 | <a id='n481' href='#n481'>481</a> |
533 | <a id='n482' href='#n482'>482</a> |
534 | <a id='n483' href='#n483'>483</a> |
535 | <a id='n484' href='#n484'>484</a> |
536 | <a id='n485' href='#n485'>485</a> |
537 | <a id='n486' href='#n486'>486</a> |
538 | <a id='n487' href='#n487'>487</a> |
539 | <a id='n488' href='#n488'>488</a> |
540 | <a id='n489' href='#n489'>489</a> |
541 | <a id='n490' href='#n490'>490</a> |
542 | <a id='n491' href='#n491'>491</a> |
543 | <a id='n492' href='#n492'>492</a> |
544 | <a id='n493' href='#n493'>493</a> |
545 | <a id='n494' href='#n494'>494</a> |
546 | <a id='n495' href='#n495'>495</a> |
547 | <a id='n496' href='#n496'>496</a> |
548 | <a id='n497' href='#n497'>497</a> |
549 | <a id='n498' href='#n498'>498</a> |
550 | <a id='n499' href='#n499'>499</a> |
551 | <a id='n500' href='#n500'>500</a> |
552 | <a id='n501' href='#n501'>501</a> |
553 | <a id='n502' href='#n502'>502</a> |
554 | <a id='n503' href='#n503'>503</a> |
555 | <a id='n504' href='#n504'>504</a> |
556 | <a id='n505' href='#n505'>505</a> |
557 | <a id='n506' href='#n506'>506</a> |
558 | <a id='n507' href='#n507'>507</a> |
559 | <a id='n508' href='#n508'>508</a> |
560 | <a id='n509' href='#n509'>509</a> |
561 | <a id='n510' href='#n510'>510</a> |
562 | <a id='n511' href='#n511'>511</a> |
563 | <a id='n512' href='#n512'>512</a> |
564 | <a id='n513' href='#n513'>513</a> |
565 | <a id='n514' href='#n514'>514</a> |
566 | <a id='n515' href='#n515'>515</a> |
567 | <a id='n516' href='#n516'>516</a> |
568 | <a id='n517' href='#n517'>517</a> |
569 | <a id='n518' href='#n518'>518</a> |
570 | <a id='n519' href='#n519'>519</a> |
571 | <a id='n520' href='#n520'>520</a> |
572 | <a id='n521' href='#n521'>521</a> |
573 | <a id='n522' href='#n522'>522</a> |
574 | <a id='n523' href='#n523'>523</a> |
575 | <a id='n524' href='#n524'>524</a> |
576 | <a id='n525' href='#n525'>525</a> |
577 | <a id='n526' href='#n526'>526</a> |
578 | <a id='n527' href='#n527'>527</a> |
579 | <a id='n528' href='#n528'>528</a> |
580 | <a id='n529' href='#n529'>529</a> |
581 | <a id='n530' href='#n530'>530</a> |
582 | <a id='n531' href='#n531'>531</a> |
583 | <a id='n532' href='#n532'>532</a> |
584 | <a id='n533' href='#n533'>533</a> |
585 | <a id='n534' href='#n534'>534</a> |
586 | <a id='n535' href='#n535'>535</a> |
587 | <a id='n536' href='#n536'>536</a> |
588 | <a id='n537' href='#n537'>537</a> |
589 | <a id='n538' href='#n538'>538</a> |
590 | <a id='n539' href='#n539'>539</a> |
591 | <a id='n540' href='#n540'>540</a> |
592 | <a id='n541' href='#n541'>541</a> |
593 | <a id='n542' href='#n542'>542</a> |
594 | <a id='n543' href='#n543'>543</a> |
595 | <a id='n544' href='#n544'>544</a> |
596 | <a id='n545' href='#n545'>545</a> |
597 | <a id='n546' href='#n546'>546</a> |
598 | <a id='n547' href='#n547'>547</a> |
599 | <a id='n548' href='#n548'>548</a> |
600 | <a id='n549' href='#n549'>549</a> |
601 | <a id='n550' href='#n550'>550</a> |
602 | <a id='n551' href='#n551'>551</a> |
603 | <a id='n552' href='#n552'>552</a> |
604 | <a id='n553' href='#n553'>553</a> |
605 | <a id='n554' href='#n554'>554</a> |
606 | <a id='n555' href='#n555'>555</a> |
607 | <a id='n556' href='#n556'>556</a> |
608 | <a id='n557' href='#n557'>557</a> |
609 | <a id='n558' href='#n558'>558</a> |
610 | <a id='n559' href='#n559'>559</a> |
611 | <a id='n560' href='#n560'>560</a> |
612 | <a id='n561' href='#n561'>561</a> |
613 | <a id='n562' href='#n562'>562</a> |
614 | <a id='n563' href='#n563'>563</a> |
615 | <a id='n564' href='#n564'>564</a> |
616 | <a id='n565' href='#n565'>565</a> |
617 | <a id='n566' href='#n566'>566</a> |
618 | <a id='n567' href='#n567'>567</a> |
619 | <a id='n568' href='#n568'>568</a> |
620 | <a id='n569' href='#n569'>569</a> |
621 | <a id='n570' href='#n570'>570</a> |
622 | <a id='n571' href='#n571'>571</a> |
623 | <a id='n572' href='#n572'>572</a> |
624 | <a id='n573' href='#n573'>573</a> |
625 | <a id='n574' href='#n574'>574</a> |
626 | <a id='n575' href='#n575'>575</a> |
627 | <a id='n576' href='#n576'>576</a> |
628 | <a id='n577' href='#n577'>577</a> |
629 | <a id='n578' href='#n578'>578</a> |
630 | <a id='n579' href='#n579'>579</a> |
631 | <a id='n580' href='#n580'>580</a> |
632 | <a id='n581' href='#n581'>581</a> |
633 | <a id='n582' href='#n582'>582</a> |
634 | <a id='n583' href='#n583'>583</a> |
635 | <a id='n584' href='#n584'>584</a> |
636 | <a id='n585' href='#n585'>585</a> |
637 | <a id='n586' href='#n586'>586</a> |
638 | <a id='n587' href='#n587'>587</a> |
639 | <a id='n588' href='#n588'>588</a> |
640 | <a id='n589' href='#n589'>589</a> |
641 | <a id='n590' href='#n590'>590</a> |
642 | <a id='n591' href='#n591'>591</a> |
643 | <a id='n592' href='#n592'>592</a> |
644 | <a id='n593' href='#n593'>593</a> |
645 | <a id='n594' href='#n594'>594</a> |
646 | <a id='n595' href='#n595'>595</a> |
647 | <a id='n596' href='#n596'>596</a> |
648 | <a id='n597' href='#n597'>597</a> |
649 | <a id='n598' href='#n598'>598</a> |
650 | <a id='n599' href='#n599'>599</a> |
651 | <a id='n600' href='#n600'>600</a> |
652 | <a id='n601' href='#n601'>601</a> |
653 | <a id='n602' href='#n602'>602</a> |
654 | <a id='n603' href='#n603'>603</a> |
655 | <a id='n604' href='#n604'>604</a> |
656 | <a id='n605' href='#n605'>605</a> |
657 | <a id='n606' href='#n606'>606</a> |
658 | <a id='n607' href='#n607'>607</a> |
659 | <a id='n608' href='#n608'>608</a> |
660 | <a id='n609' href='#n609'>609</a> |
661 | <a id='n610' href='#n610'>610</a> |
662 | <a id='n611' href='#n611'>611</a> |
663 | <a id='n612' href='#n612'>612</a> |
664 | <a id='n613' href='#n613'>613</a> |
665 | <a id='n614' href='#n614'>614</a> |
666 | <a id='n615' href='#n615'>615</a> |
667 | <a id='n616' href='#n616'>616</a> |
668 | <a id='n617' href='#n617'>617</a> |
669 | <a id='n618' href='#n618'>618</a> |
670 | <a id='n619' href='#n619'>619</a> |
671 | <a id='n620' href='#n620'>620</a> |
672 | <a id='n621' href='#n621'>621</a> |
673 | <a id='n622' href='#n622'>622</a> |
674 | <a id='n623' href='#n623'>623</a> |
675 | <a id='n624' href='#n624'>624</a> |
676 | <a id='n625' href='#n625'>625</a> |
677 | <a id='n626' href='#n626'>626</a> |
678 | <a id='n627' href='#n627'>627</a> |
679 | <a id='n628' href='#n628'>628</a> |
680 | <a id='n629' href='#n629'>629</a> |
681 | <a id='n630' href='#n630'>630</a> |
682 | <a id='n631' href='#n631'>631</a> |
683 | <a id='n632' href='#n632'>632</a> |
684 | <a id='n633' href='#n633'>633</a> |
685 | <a id='n634' href='#n634'>634</a> |
686 | <a id='n635' href='#n635'>635</a> |
687 | <a id='n636' href='#n636'>636</a> |
688 | <a id='n637' href='#n637'>637</a> |
689 | <a id='n638' href='#n638'>638</a> |
690 | <a id='n639' href='#n639'>639</a> |
691 | <a id='n640' href='#n640'>640</a> |
692 | <a id='n641' href='#n641'>641</a> |
693 | <a id='n642' href='#n642'>642</a> |
694 | <a id='n643' href='#n643'>643</a> |
695 | <a id='n644' href='#n644'>644</a> |
696 | <a id='n645' href='#n645'>645</a> |
697 | <a id='n646' href='#n646'>646</a> |
698 | <a id='n647' href='#n647'>647</a> |
699 | <a id='n648' href='#n648'>648</a> |
700 | <a id='n649' href='#n649'>649</a> |
701 | <a id='n650' href='#n650'>650</a> |
702 | <a id='n651' href='#n651'>651</a> |
703 | <a id='n652' href='#n652'>652</a> |
704 | <a id='n653' href='#n653'>653</a> |
705 | <a id='n654' href='#n654'>654</a> |
706 | <a id='n655' href='#n655'>655</a> |
707 | <a id='n656' href='#n656'>656</a> |
708 | <a id='n657' href='#n657'>657</a> |
709 | <a id='n658' href='#n658'>658</a> |
710 | <a id='n659' href='#n659'>659</a> |
711 | <a id='n660' href='#n660'>660</a> |
712 | <a id='n661' href='#n661'>661</a> |
713 | <a id='n662' href='#n662'>662</a> |
714 | <a id='n663' href='#n663'>663</a> |
715 | <a id='n664' href='#n664'>664</a> |
716 | <a id='n665' href='#n665'>665</a> |
717 | <a id='n666' href='#n666'>666</a> |
718 | <a id='n667' href='#n667'>667</a> |
719 | <a id='n668' href='#n668'>668</a> |
720 | <a id='n669' href='#n669'>669</a> |
721 | <a id='n670' href='#n670'>670</a> |
722 | <a id='n671' href='#n671'>671</a> |
723 | <a id='n672' href='#n672'>672</a> |
724 | <a id='n673' href='#n673'>673</a> |
725 | <a id='n674' href='#n674'>674</a> |
726 | <a id='n675' href='#n675'>675</a> |
727 | <a id='n676' href='#n676'>676</a> |
728 | <a id='n677' href='#n677'>677</a> |
729 | <a id='n678' href='#n678'>678</a> |
730 | <a id='n679' href='#n679'>679</a> |
731 | <a id='n680' href='#n680'>680</a> |
732 | <a id='n681' href='#n681'>681</a> |
733 | <a id='n682' href='#n682'>682</a> |
734 | <a id='n683' href='#n683'>683</a> |
735 | <a id='n684' href='#n684'>684</a> |
736 | <a id='n685' href='#n685'>685</a> |
737 | <a id='n686' href='#n686'>686</a> |
738 | <a id='n687' href='#n687'>687</a> |
739 | <a id='n688' href='#n688'>688</a> |
740 | <a id='n689' href='#n689'>689</a> |
741 | <a id='n690' href='#n690'>690</a> |
742 | <a id='n691' href='#n691'>691</a> |
743 | <a id='n692' href='#n692'>692</a> |
744 | <a id='n693' href='#n693'>693</a> |
745 | <a id='n694' href='#n694'>694</a> |
746 | <a id='n695' href='#n695'>695</a> |
747 | <a id='n696' href='#n696'>696</a> |
748 | <a id='n697' href='#n697'>697</a> |
749 | <a id='n698' href='#n698'>698</a> |
750 | <a id='n699' href='#n699'>699</a> |
751 | <a id='n700' href='#n700'>700</a> |
752 | <a id='n701' href='#n701'>701</a> |
753 | <a id='n702' href='#n702'>702</a> |
754 | <a id='n703' href='#n703'>703</a> |
755 | <a id='n704' href='#n704'>704</a> |
756 | <a id='n705' href='#n705'>705</a> |
757 | <a id='n706' href='#n706'>706</a> |
758 | <a id='n707' href='#n707'>707</a> |
759 | <a id='n708' href='#n708'>708</a> |
760 | <a id='n709' href='#n709'>709</a> |
761 | <a id='n710' href='#n710'>710</a> |
762 | <a id='n711' href='#n711'>711</a> |
763 | <a id='n712' href='#n712'>712</a> |
764 | <a id='n713' href='#n713'>713</a> |
765 | <a id='n714' href='#n714'>714</a> |
766 | <a id='n715' href='#n715'>715</a> |
767 | <a id='n716' href='#n716'>716</a> |
768 | <a id='n717' href='#n717'>717</a> |
769 | <a id='n718' href='#n718'>718</a> |
770 | <a id='n719' href='#n719'>719</a> |
771 | <a id='n720' href='#n720'>720</a> |
772 | <a id='n721' href='#n721'>721</a> |
773 | <a id='n722' href='#n722'>722</a> |
774 | <a id='n723' href='#n723'>723</a> |
775 | <a id='n724' href='#n724'>724</a> |
776 | <a id='n725' href='#n725'>725</a> |
777 | <a id='n726' href='#n726'>726</a> |
778 | <a id='n727' href='#n727'>727</a> |
779 | <a id='n728' href='#n728'>728</a> |
780 | <a id='n729' href='#n729'>729</a> |
781 | <a id='n730' href='#n730'>730</a> |
782 | <a id='n731' href='#n731'>731</a> |
783 | <a id='n732' href='#n732'>732</a> |
784 | <a id='n733' href='#n733'>733</a> |
785 | <a id='n734' href='#n734'>734</a> |
786 | <a id='n735' href='#n735'>735</a> |
787 | <a id='n736' href='#n736'>736</a> |
788 | <a id='n737' href='#n737'>737</a> |
789 | <a id='n738' href='#n738'>738</a> |
790 | <a id='n739' href='#n739'>739</a> |
791 | <a id='n740' href='#n740'>740</a> |
792 | <a id='n741' href='#n741'>741</a> |
793 | <a id='n742' href='#n742'>742</a> |
794 | <a id='n743' href='#n743'>743</a> |
795 | <a id='n744' href='#n744'>744</a> |
796 | <a id='n745' href='#n745'>745</a> |
797 | <a id='n746' href='#n746'>746</a> |
798 | <a id='n747' href='#n747'>747</a> |
799 | <a id='n748' href='#n748'>748</a> |
800 | <a id='n749' href='#n749'>749</a> |
801 | <a id='n750' href='#n750'>750</a> |
802 | <a id='n751' href='#n751'>751</a> |
803 | <a id='n752' href='#n752'>752</a> |
804 | <a id='n753' href='#n753'>753</a> |
805 | <a id='n754' href='#n754'>754</a> |
806 | <a id='n755' href='#n755'>755</a> |
807 | <a id='n756' href='#n756'>756</a> |
808 | <a id='n757' href='#n757'>757</a> |
809 | <a id='n758' href='#n758'>758</a> |
810 | <a id='n759' href='#n759'>759</a> |
811 | <a id='n760' href='#n760'>760</a> |
812 | <a id='n761' href='#n761'>761</a> |
813 | <a id='n762' href='#n762'>762</a> |
814 | <a id='n763' href='#n763'>763</a> |
815 | <a id='n764' href='#n764'>764</a> |
816 | <a id='n765' href='#n765'>765</a> |
817 | <a id='n766' href='#n766'>766</a> |
818 | <a id='n767' href='#n767'>767</a> |
819 | <a id='n768' href='#n768'>768</a> |
820 | <a id='n769' href='#n769'>769</a> |
821 | <a id='n770' href='#n770'>770</a> |
822 | <a id='n771' href='#n771'>771</a> |
823 | <a id='n772' href='#n772'>772</a> |
824 | <a id='n773' href='#n773'>773</a> |
825 | <a id='n774' href='#n774'>774</a> |
826 | <a id='n775' href='#n775'>775</a> |
827 | <a id='n776' href='#n776'>776</a> |
828 | <a id='n777' href='#n777'>777</a> |
829 | <a id='n778' href='#n778'>778</a> |
830 | <a id='n779' href='#n779'>779</a> |
831 | <a id='n780' href='#n780'>780</a> |
832 | <a id='n781' href='#n781'>781</a> |
833 | <a id='n782' href='#n782'>782</a> |
834 | <a id='n783' href='#n783'>783</a> |
835 | <a id='n784' href='#n784'>784</a> |
836 | <a id='n785' href='#n785'>785</a> |
837 | <a id='n786' href='#n786'>786</a> |
838 | <a id='n787' href='#n787'>787</a> |
839 | <a id='n788' href='#n788'>788</a> |
840 | <a id='n789' href='#n789'>789</a> |
841 | <a id='n790' href='#n790'>790</a> |
842 | <a id='n791' href='#n791'>791</a> |
843 | <a id='n792' href='#n792'>792</a> |
844 | <a id='n793' href='#n793'>793</a> |
845 | <a id='n794' href='#n794'>794</a> |
846 | <a id='n795' href='#n795'>795</a> |
847 | <a id='n796' href='#n796'>796</a> |
848 | <a id='n797' href='#n797'>797</a> |
849 | <a id='n798' href='#n798'>798</a> |
850 | <a id='n799' href='#n799'>799</a> |
851 | <a id='n800' href='#n800'>800</a> |
852 | <a id='n801' href='#n801'>801</a> |
853 | <a id='n802' href='#n802'>802</a> |
854 | <a id='n803' href='#n803'>803</a> |
855 | <a id='n804' href='#n804'>804</a> |
856 | <a id='n805' href='#n805'>805</a> |
857 | <a id='n806' href='#n806'>806</a> |
858 | <a id='n807' href='#n807'>807</a> |
859 | <a id='n808' href='#n808'>808</a> |
860 | <a id='n809' href='#n809'>809</a> |
861 | <a id='n810' href='#n810'>810</a> |
862 | <a id='n811' href='#n811'>811</a> |
863 | <a id='n812' href='#n812'>812</a> |
864 | <a id='n813' href='#n813'>813</a> |
865 | <a id='n814' href='#n814'>814</a> |
866 | <a id='n815' href='#n815'>815</a> |
867 | <a id='n816' href='#n816'>816</a> |
868 | <a id='n817' href='#n817'>817</a> |
869 | <a id='n818' href='#n818'>818</a> |
870 | <a id='n819' href='#n819'>819</a> |
871 | <a id='n820' href='#n820'>820</a> |
872 | <a id='n821' href='#n821'>821</a> |
873 | <a id='n822' href='#n822'>822</a> |
874 | <a id='n823' href='#n823'>823</a> |
875 | <a id='n824' href='#n824'>824</a> |
876 | <a id='n825' href='#n825'>825</a> |
877 | <a id='n826' href='#n826'>826</a> |
878 | <a id='n827' href='#n827'>827</a> |
879 | <a id='n828' href='#n828'>828</a> |
880 | <a id='n829' href='#n829'>829</a> |
881 | <a id='n830' href='#n830'>830</a> |
882 | <a id='n831' href='#n831'>831</a> |
883 | <a id='n832' href='#n832'>832</a> |
884 | <a id='n833' href='#n833'>833</a> |
885 | <a id='n834' href='#n834'>834</a> |
886 | <a id='n835' href='#n835'>835</a> |
887 | <a id='n836' href='#n836'>836</a> |
888 | <a id='n837' href='#n837'>837</a> |
889 | <a id='n838' href='#n838'>838</a> |
890 | <a id='n839' href='#n839'>839</a> |
891 | <a id='n840' href='#n840'>840</a> |
892 | <a id='n841' href='#n841'>841</a> |
893 | <a id='n842' href='#n842'>842</a> |
894 | <a id='n843' href='#n843'>843</a> |
895 | <a id='n844' href='#n844'>844</a> |
896 | <a id='n845' href='#n845'>845</a> |
897 | <a id='n846' href='#n846'>846</a> |
898 | <a id='n847' href='#n847'>847</a> |
899 | <a id='n848' href='#n848'>848</a> |
900 | <a id='n849' href='#n849'>849</a> |
901 | <a id='n850' href='#n850'>850</a> |
902 | <a id='n851' href='#n851'>851</a> |
903 | <a id='n852' href='#n852'>852</a> |
904 | <a id='n853' href='#n853'>853</a> |
905 | <a id='n854' href='#n854'>854</a> |
906 | <a id='n855' href='#n855'>855</a> |
907 | <a id='n856' href='#n856'>856</a> |
908 | <a id='n857' href='#n857'>857</a> |
909 | <a id='n858' href='#n858'>858</a> |
910 | <a id='n859' href='#n859'>859</a> |
911 | <a id='n860' href='#n860'>860</a> |
912 | <a id='n861' href='#n861'>861</a> |
913 | <a id='n862' href='#n862'>862</a> |
914 | <a id='n863' href='#n863'>863</a> |
915 | <a id='n864' href='#n864'>864</a> |
916 | <a id='n865' href='#n865'>865</a> |
917 | <a id='n866' href='#n866'>866</a> |
918 | <a id='n867' href='#n867'>867</a> |
919 | <a id='n868' href='#n868'>868</a> |
920 | <a id='n869' href='#n869'>869</a> |
921 | <a id='n870' href='#n870'>870</a> |
922 | <a id='n871' href='#n871'>871</a> |
923 | <a id='n872' href='#n872'>872</a> |
924 | <a id='n873' href='#n873'>873</a> |
925 | <a id='n874' href='#n874'>874</a> |
926 | <a id='n875' href='#n875'>875</a> |
927 | <a id='n876' href='#n876'>876</a> |
928 | <a id='n877' href='#n877'>877</a> |
929 | <a id='n878' href='#n878'>878</a> |
930 | <a id='n879' href='#n879'>879</a> |
931 | <a id='n880' href='#n880'>880</a> |
932 | <a id='n881' href='#n881'>881</a> |
933 | <a id='n882' href='#n882'>882</a> |
934 | <a id='n883' href='#n883'>883</a> |
935 | <a id='n884' href='#n884'>884</a> |
936 | <a id='n885' href='#n885'>885</a> |
937 | <a id='n886' href='#n886'>886</a> |
938 | <a id='n887' href='#n887'>887</a> |
939 | <a id='n888' href='#n888'>888</a> |
940 | <a id='n889' href='#n889'>889</a> |
941 | <a id='n890' href='#n890'>890</a> |
942 | <a id='n891' href='#n891'>891</a> |
943 | <a id='n892' href='#n892'>892</a> |
944 | <a id='n893' href='#n893'>893</a> |
945 | <a id='n894' href='#n894'>894</a> |
946 | <a id='n895' href='#n895'>895</a> |
947 | <a id='n896' href='#n896'>896</a> |
948 | <a id='n897' href='#n897'>897</a> |
949 | <a id='n898' href='#n898'>898</a> |
950 | <a id='n899' href='#n899'>899</a> |
951 | <a id='n900' href='#n900'>900</a> |
952 | <a id='n901' href='#n901'>901</a> |
953 | <a id='n902' href='#n902'>902</a> |
954 | <a id='n903' href='#n903'>903</a> |
955 | <a id='n904' href='#n904'>904</a> |
956 | <a id='n905' href='#n905'>905</a> |
957 | <a id='n906' href='#n906'>906</a> |
958 | <a id='n907' href='#n907'>907</a> |
959 | <a id='n908' href='#n908'>908</a> |
960 | <a id='n909' href='#n909'>909</a> |
961 | <a id='n910' href='#n910'>910</a> |
962 | <a id='n911' href='#n911'>911</a> |
963 | <a id='n912' href='#n912'>912</a> |
964 | <a id='n913' href='#n913'>913</a> |
965 | <a id='n914' href='#n914'>914</a> |
966 | <a id='n915' href='#n915'>915</a> |
967 | <a id='n916' href='#n916'>916</a> |
968 | <a id='n917' href='#n917'>917</a> |
969 | <a id='n918' href='#n918'>918</a> |
970 | <a id='n919' href='#n919'>919</a> |
971 | <a id='n920' href='#n920'>920</a> |
972 | <a id='n921' href='#n921'>921</a> |
973 | <a id='n922' href='#n922'>922</a> |
974 | <a id='n923' href='#n923'>923</a> |
975 | <a id='n924' href='#n924'>924</a> |
976 | <a id='n925' href='#n925'>925</a> |
977 | <a id='n926' href='#n926'>926</a> |
978 | <a id='n927' href='#n927'>927</a> |
979 | <a id='n928' href='#n928'>928</a> |
980 | <a id='n929' href='#n929'>929</a> |
981 | <a id='n930' href='#n930'>930</a> |
982 | <a id='n931' href='#n931'>931</a> |
983 | <a id='n932' href='#n932'>932</a> |
984 | <a id='n933' href='#n933'>933</a> |
985 | <a id='n934' href='#n934'>934</a> |
986 | <a id='n935' href='#n935'>935</a> |
987 | <a id='n936' href='#n936'>936</a> |
988 | <a id='n937' href='#n937'>937</a> |
989 | <a id='n938' href='#n938'>938</a> |
990 | <a id='n939' href='#n939'>939</a> |
991 | <a id='n940' href='#n940'>940</a> |
992 | <a id='n941' href='#n941'>941</a> |
993 | <a id='n942' href='#n942'>942</a> |
994 | <a id='n943' href='#n943'>943</a> |
995 | <a id='n944' href='#n944'>944</a> |
996 | <a id='n945' href='#n945'>945</a> |
997 | <a id='n946' href='#n946'>946</a> |
998 | <a id='n947' href='#n947'>947</a> |
999 | <a id='n948' href='#n948'>948</a> |
1000 | <a id='n949' href='#n949'>949</a> |
1001 | <a id='n950' href='#n950'>950</a> |
1002 | <a id='n951' href='#n951'>951</a> |
1003 | <a id='n952' href='#n952'>952</a> |
1004 | <a id='n953' href='#n953'>953</a> |
1005 | <a id='n954' href='#n954'>954</a> |
1006 | <a id='n955' href='#n955'>955</a> |
1007 | <a id='n956' href='#n956'>956</a> |
1008 | <a id='n957' href='#n957'>957</a> |
1009 | <a id='n958' href='#n958'>958</a> |
1010 | <a id='n959' href='#n959'>959</a> |
1011 | <a id='n960' href='#n960'>960</a> |
1012 | <a id='n961' href='#n961'>961</a> |
1013 | <a id='n962' href='#n962'>962</a> |
1014 | <a id='n963' href='#n963'>963</a> |
1015 | <a id='n964' href='#n964'>964</a> |
1016 | <a id='n965' href='#n965'>965</a> |
1017 | <a id='n966' href='#n966'>966</a> |
1018 | <a id='n967' href='#n967'>967</a> |
1019 | <a id='n968' href='#n968'>968</a> |
1020 | <a id='n969' href='#n969'>969</a> |
1021 | <a id='n970' href='#n970'>970</a> |
1022 | <a id='n971' href='#n971'>971</a> |
1023 | <a id='n972' href='#n972'>972</a> |
1024 | <a id='n973' href='#n973'>973</a> |
1025 | <a id='n974' href='#n974'>974</a> |
1026 | <a id='n975' href='#n975'>975</a> |
1027 | <a id='n976' href='#n976'>976</a> |
1028 | <a id='n977' href='#n977'>977</a> |
1029 | <a id='n978' href='#n978'>978</a> |
1030 | <a id='n979' href='#n979'>979</a> |
1031 | <a id='n980' href='#n980'>980</a> |
1032 | <a id='n981' href='#n981'>981</a> |
1033 | <a id='n982' href='#n982'>982</a> |
1034 | <a id='n983' href='#n983'>983</a> |
1035 | <a id='n984' href='#n984'>984</a> |
1036 | <a id='n985' href='#n985'>985</a> |
1037 | <a id='n986' href='#n986'>986</a> |
1038 | <a id='n987' href='#n987'>987</a> |
1039 | <a id='n988' href='#n988'>988</a> |
1040 | <a id='n989' href='#n989'>989</a> |
1041 | <a id='n990' href='#n990'>990</a> |
1042 | <a id='n991' href='#n991'>991</a> |
1043 | <a id='n992' href='#n992'>992</a> |
1044 | <a id='n993' href='#n993'>993</a> |
1045 | <a id='n994' href='#n994'>994</a> |
1046 | <a id='n995' href='#n995'>995</a> |
1047 | <a id='n996' href='#n996'>996</a> |
1048 | <a id='n997' href='#n997'>997</a> |
1049 | <a id='n998' href='#n998'>998</a> |
1050 | <a id='n999' href='#n999'>999</a> |
1051 | <a id='n1000' href='#n1000'>1000</a> |
1052 | <a id='n1001' href='#n1001'>1001</a> |
1053 | <a id='n1002' href='#n1002'>1002</a> |
1054 | <a id='n1003' href='#n1003'>1003</a> |
1055 | <a id='n1004' href='#n1004'>1004</a> |
1056 | <a id='n1005' href='#n1005'>1005</a> |
1057 | <a id='n1006' href='#n1006'>1006</a> |
1058 | <a id='n1007' href='#n1007'>1007</a> |
1059 | <a id='n1008' href='#n1008'>1008</a> |
1060 | <a id='n1009' href='#n1009'>1009</a> |
1061 | <a id='n1010' href='#n1010'>1010</a> |
1062 | <a id='n1011' href='#n1011'>1011</a> |
1063 | <a id='n1012' href='#n1012'>1012</a> |
1064 | <a id='n1013' href='#n1013'>1013</a> |
1065 | <a id='n1014' href='#n1014'>1014</a> |
1066 | <a id='n1015' href='#n1015'>1015</a> |
1067 | <a id='n1016' href='#n1016'>1016</a> |
1068 | <a id='n1017' href='#n1017'>1017</a> |
1069 | <a id='n1018' href='#n1018'>1018</a> |
1070 | <a id='n1019' href='#n1019'>1019</a> |
1071 | <a id='n1020' href='#n1020'>1020</a> |
1072 | <a id='n1021' href='#n1021'>1021</a> |
1073 | <a id='n1022' href='#n1022'>1022</a> |
1074 | <a id='n1023' href='#n1023'>1023</a> |
1075 | <a id='n1024' href='#n1024'>1024</a> |
1076 | <a id='n1025' href='#n1025'>1025</a> |
1077 | <a id='n1026' href='#n1026'>1026</a> |
1078 | <a id='n1027' href='#n1027'>1027</a> |
1079 | <a id='n1028' href='#n1028'>1028</a> |
1080 | <a id='n1029' href='#n1029'>1029</a> |
1081 | <a id='n1030' href='#n1030'>1030</a> |
1082 | <a id='n1031' href='#n1031'>1031</a> |
1083 | <a id='n1032' href='#n1032'>1032</a> |
1084 | <a id='n1033' href='#n1033'>1033</a> |
1085 | <a id='n1034' href='#n1034'>1034</a> |
1086 | <a id='n1035' href='#n1035'>1035</a> |
1087 | <a id='n1036' href='#n1036'>1036</a> |
1088 | <a id='n1037' href='#n1037'>1037</a> |
1089 | <a id='n1038' href='#n1038'>1038</a> |
1090 | <a id='n1039' href='#n1039'>1039</a> |
1091 | <a id='n1040' href='#n1040'>1040</a> |
1092 | <a id='n1041' href='#n1041'>1041</a> |
1093 | <a id='n1042' href='#n1042'>1042</a> |
1094 | <a id='n1043' href='#n1043'>1043</a> |
1095 | <a id='n1044' href='#n1044'>1044</a> |
1096 | <a id='n1045' href='#n1045'>1045</a> |
1097 | <a id='n1046' href='#n1046'>1046</a> |
1098 | <a id='n1047' href='#n1047'>1047</a> |
1099 | <a id='n1048' href='#n1048'>1048</a> |
1100 | <a id='n1049' href='#n1049'>1049</a> |
1101 | <a id='n1050' href='#n1050'>1050</a> |
1102 | <a id='n1051' href='#n1051'>1051</a> |
1103 | <a id='n1052' href='#n1052'>1052</a> |
1104 | <a id='n1053' href='#n1053'>1053</a> |
1105 | <a id='n1054' href='#n1054'>1054</a> |
1106 | <a id='n1055' href='#n1055'>1055</a> |
1107 | <a id='n1056' href='#n1056'>1056</a> |
1108 | <a id='n1057' href='#n1057'>1057</a> |
1109 | <a id='n1058' href='#n1058'>1058</a> |
1110 | <a id='n1059' href='#n1059'>1059</a> |
1111 | <a id='n1060' href='#n1060'>1060</a> |
1112 | <a id='n1061' href='#n1061'>1061</a> |
1113 | <a id='n1062' href='#n1062'>1062</a> |
1114 | <a id='n1063' href='#n1063'>1063</a> |
1115 | <a id='n1064' href='#n1064'>1064</a> |
1116 | <a id='n1065' href='#n1065'>1065</a> |
1117 | <a id='n1066' href='#n1066'>1066</a> |
1118 | <a id='n1067' href='#n1067'>1067</a> |
1119 | <a id='n1068' href='#n1068'>1068</a> |
1120 | <a id='n1069' href='#n1069'>1069</a> |
1121 | <a id='n1070' href='#n1070'>1070</a> |
1122 | <a id='n1071' href='#n1071'>1071</a> |
1123 | <a id='n1072' href='#n1072'>1072</a> |
1124 | <a id='n1073' href='#n1073'>1073</a> |
1125 | <a id='n1074' href='#n1074'>1074</a> |
1126 | <a id='n1075' href='#n1075'>1075</a> |
1127 | <a id='n1076' href='#n1076'>1076</a> |
1128 | <a id='n1077' href='#n1077'>1077</a> |
1129 | <a id='n1078' href='#n1078'>1078</a> |
1130 | <a id='n1079' href='#n1079'>1079</a> |
1131 | <a id='n1080' href='#n1080'>1080</a> |
1132 | <a id='n1081' href='#n1081'>1081</a> |
1133 | <a id='n1082' href='#n1082'>1082</a> |
1134 | <a id='n1083' href='#n1083'>1083</a> |
1135 | <a id='n1084' href='#n1084'>1084</a> |
1136 | <a id='n1085' href='#n1085'>1085</a> |
1137 | <a id='n1086' href='#n1086'>1086</a> |
1138 | <a id='n1087' href='#n1087'>1087</a> |
1139 | <a id='n1088' href='#n1088'>1088</a> |
1140 | <a id='n1089' href='#n1089'>1089</a> |
1141 | <a id='n1090' href='#n1090'>1090</a> |
1142 | <a id='n1091' href='#n1091'>1091</a> |
1143 | <a id='n1092' href='#n1092'>1092</a> |
1144 | <a id='n1093' href='#n1093'>1093</a> |
1145 | <a id='n1094' href='#n1094'>1094</a> |
1146 | <a id='n1095' href='#n1095'>1095</a> |
1147 | <a id='n1096' href='#n1096'>1096</a> |
1148 | <a id='n1097' href='#n1097'>1097</a> |
1149 | <a id='n1098' href='#n1098'>1098</a> |
1150 | <a id='n1099' href='#n1099'>1099</a> |
1151 | <a id='n1100' href='#n1100'>1100</a> |
1152 | <a id='n1101' href='#n1101'>1101</a> |
1153 | <a id='n1102' href='#n1102'>1102</a> |
1154 | <a id='n1103' href='#n1103'>1103</a> |
1155 | <a id='n1104' href='#n1104'>1104</a> |
1156 | <a id='n1105' href='#n1105'>1105</a> |
1157 | <a id='n1106' href='#n1106'>1106</a> |
1158 | <a id='n1107' href='#n1107'>1107</a> |
1159 | <a id='n1108' href='#n1108'>1108</a> |
1160 | <a id='n1109' href='#n1109'>1109</a> |
1161 | <a id='n1110' href='#n1110'>1110</a> |
1162 | <a id='n1111' href='#n1111'>1111</a> |
1163 | <a id='n1112' href='#n1112'>1112</a> |
1164 | <a id='n1113' href='#n1113'>1113</a> |
1165 | <a id='n1114' href='#n1114'>1114</a> |
1166 | <a id='n1115' href='#n1115'>1115</a> |
1167 | <a id='n1116' href='#n1116'>1116</a> |
1168 | <a id='n1117' href='#n1117'>1117</a> |
1169 | <a id='n1118' href='#n1118'>1118</a> |
1170 | <a id='n1119' href='#n1119'>1119</a> |
1171 | <a id='n1120' href='#n1120'>1120</a> |
1172 | <a id='n1121' href='#n1121'>1121</a> |
1173 | <a id='n1122' href='#n1122'>1122</a> |
1174 | <a id='n1123' href='#n1123'>1123</a> |
1175 | <a id='n1124' href='#n1124'>1124</a> |
1176 | <a id='n1125' href='#n1125'>1125</a> |
1177 | <a id='n1126' href='#n1126'>1126</a> |
1178 | <a id='n1127' href='#n1127'>1127</a> |
1179 | <a id='n1128' href='#n1128'>1128</a> |
1180 | <a id='n1129' href='#n1129'>1129</a> |
1181 | <a id='n1130' href='#n1130'>1130</a> |
1182 | <a id='n1131' href='#n1131'>1131</a> |
1183 | <a id='n1132' href='#n1132'>1132</a> |
1184 | <a id='n1133' href='#n1133'>1133</a> |
1185 | <a id='n1134' href='#n1134'>1134</a> |
1186 | <a id='n1135' href='#n1135'>1135</a> |
1187 | <a id='n1136' href='#n1136'>1136</a> |
1188 | <a id='n1137' href='#n1137'>1137</a> |
1189 | <a id='n1138' href='#n1138'>1138</a> |
1190 | <a id='n1139' href='#n1139'>1139</a> |
1191 | <a id='n1140' href='#n1140'>1140</a> |
1192 | <a id='n1141' href='#n1141'>1141</a> |
1193 | <a id='n1142' href='#n1142'>1142</a> |
1194 | <a id='n1143' href='#n1143'>1143</a> |
1195 | <a id='n1144' href='#n1144'>1144</a> |
1196 | <a id='n1145' href='#n1145'>1145</a> |
1197 | <a id='n1146' href='#n1146'>1146</a> |
1198 | <a id='n1147' href='#n1147'>1147</a> |
1199 | <a id='n1148' href='#n1148'>1148</a> |
1200 | <a id='n1149' href='#n1149'>1149</a> |
1201 | <a id='n1150' href='#n1150'>1150</a> |
1202 | <a id='n1151' href='#n1151'>1151</a> |
1203 | <a id='n1152' href='#n1152'>1152</a> |
1204 | <a id='n1153' href='#n1153'>1153</a> |
1205 | <a id='n1154' href='#n1154'>1154</a> |
1206 | <a id='n1155' href='#n1155'>1155</a> |
1207 | <a id='n1156' href='#n1156'>1156</a> |
1208 | <a id='n1157' href='#n1157'>1157</a> |
1209 | <a id='n1158' href='#n1158'>1158</a> |
1210 | <a id='n1159' href='#n1159'>1159</a> |
1211 | <a id='n1160' href='#n1160'>1160</a> |
1212 | <a id='n1161' href='#n1161'>1161</a> |
1213 | <a id='n1162' href='#n1162'>1162</a> |
1214 | <a id='n1163' href='#n1163'>1163</a> |
1215 | <a id='n1164' href='#n1164'>1164</a> |
1216 | <a id='n1165' href='#n1165'>1165</a> |
1217 | <a id='n1166' href='#n1166'>1166</a> |
1218 | <a id='n1167' href='#n1167'>1167</a> |
1219 | <a id='n1168' href='#n1168'>1168</a> |
1220 | <a id='n1169' href='#n1169'>1169</a> |
1221 | <a id='n1170' href='#n1170'>1170</a> |
1222 | <a id='n1171' href='#n1171'>1171</a> |
1223 | <a id='n1172' href='#n1172'>1172</a> |
1224 | <a id='n1173' href='#n1173'>1173</a> |
1225 | <a id='n1174' href='#n1174'>1174</a> |
1226 | <a id='n1175' href='#n1175'>1175</a> |
1227 | <a id='n1176' href='#n1176'>1176</a> |
1228 | <a id='n1177' href='#n1177'>1177</a> |
1229 | <a id='n1178' href='#n1178'>1178</a> |
1230 | <a id='n1179' href='#n1179'>1179</a> |
1231 | <a id='n1180' href='#n1180'>1180</a> |
1232 | <a id='n1181' href='#n1181'>1181</a> |
1233 | <a id='n1182' href='#n1182'>1182</a> |
1234 | <a id='n1183' href='#n1183'>1183</a> |
1235 | <a id='n1184' href='#n1184'>1184</a> |
1236 | <a id='n1185' href='#n1185'>1185</a> |
1237 | <a id='n1186' href='#n1186'>1186</a> |
1238 | <a id='n1187' href='#n1187'>1187</a> |
1239 | <a id='n1188' href='#n1188'>1188</a> |
1240 | <a id='n1189' href='#n1189'>1189</a> |
1241 | <a id='n1190' href='#n1190'>1190</a> |
1242 | <a id='n1191' href='#n1191'>1191</a> |
1243 | <a id='n1192' href='#n1192'>1192</a> |
1244 | <a id='n1193' href='#n1193'>1193</a> |
1245 | <a id='n1194' href='#n1194'>1194</a> |
1246 | <a id='n1195' href='#n1195'>1195</a> |
1247 | <a id='n1196' href='#n1196'>1196</a> |
1248 | <a id='n1197' href='#n1197'>1197</a> |
1249 | <a id='n1198' href='#n1198'>1198</a> |
1250 | <a id='n1199' href='#n1199'>1199</a> |
1251 | <a id='n1200' href='#n1200'>1200</a> |
1252 | <a id='n1201' href='#n1201'>1201</a> |
1253 | <a id='n1202' href='#n1202'>1202</a> |
1254 | <a id='n1203' href='#n1203'>1203</a> |
1255 | <a id='n1204' href='#n1204'>1204</a> |
1256 | <a id='n1205' href='#n1205'>1205</a> |
1257 | <a id='n1206' href='#n1206'>1206</a> |
1258 | <a id='n1207' href='#n1207'>1207</a> |
1259 | <a id='n1208' href='#n1208'>1208</a> |
1260 | <a id='n1209' href='#n1209'>1209</a> |
1261 | <a id='n1210' href='#n1210'>1210</a> |
1262 | <a id='n1211' href='#n1211'>1211</a> |
1263 | <a id='n1212' href='#n1212'>1212</a> |
1264 | <a id='n1213' href='#n1213'>1213</a> |
1265 | <a id='n1214' href='#n1214'>1214</a> |
1266 | <a id='n1215' href='#n1215'>1215</a> |
1267 | <a id='n1216' href='#n1216'>1216</a> |
1268 | <a id='n1217' href='#n1217'>1217</a> |
1269 | <a id='n1218' href='#n1218'>1218</a> |
1270 | <a id='n1219' href='#n1219'>1219</a> |
1271 | <a id='n1220' href='#n1220'>1220</a> |
1272 | <a id='n1221' href='#n1221'>1221</a> |
1273 | <a id='n1222' href='#n1222'>1222</a> |
1274 | <a id='n1223' href='#n1223'>1223</a> |
1275 | <a id='n1224' href='#n1224'>1224</a> |
1276 | <a id='n1225' href='#n1225'>1225</a> |
1277 | <a id='n1226' href='#n1226'>1226</a> |
1278 | <a id='n1227' href='#n1227'>1227</a> |
1279 | <a id='n1228' href='#n1228'>1228</a> |
1280 | <a id='n1229' href='#n1229'>1229</a> |
1281 | <a id='n1230' href='#n1230'>1230</a> |
1282 | <a id='n1231' href='#n1231'>1231</a> |
1283 | <a id='n1232' href='#n1232'>1232</a> |
1284 | <a id='n1233' href='#n1233'>1233</a> |
1285 | <a id='n1234' href='#n1234'>1234</a> |
1286 | <a id='n1235' href='#n1235'>1235</a> |
1287 | <a id='n1236' href='#n1236'>1236</a> |
1288 | <a id='n1237' href='#n1237'>1237</a> |
1289 | <a id='n1238' href='#n1238'>1238</a> |
1290 | <a id='n1239' href='#n1239'>1239</a> |
1291 | <a id='n1240' href='#n1240'>1240</a> |
1292 | <a id='n1241' href='#n1241'>1241</a> |
1293 | <a id='n1242' href='#n1242'>1242</a> |
1294 | <a id='n1243' href='#n1243'>1243</a> |
1295 | <a id='n1244' href='#n1244'>1244</a> |
1296 | <a id='n1245' href='#n1245'>1245</a> |
1297 | <a id='n1246' href='#n1246'>1246</a> |
1298 | <a id='n1247' href='#n1247'>1247</a> |
1299 | <a id='n1248' href='#n1248'>1248</a> |
1300 | <a id='n1249' href='#n1249'>1249</a> |
1301 | <a id='n1250' href='#n1250'>1250</a> |
1302 | <a id='n1251' href='#n1251'>1251</a> |
1303 | <a id='n1252' href='#n1252'>1252</a> |
1304 | <a id='n1253' href='#n1253'>1253</a> |
1305 | <a id='n1254' href='#n1254'>1254</a> |
1306 | <a id='n1255' href='#n1255'>1255</a> |
1307 | <a id='n1256' href='#n1256'>1256</a> |
1308 | <a id='n1257' href='#n1257'>1257</a> |
1309 | <a id='n1258' href='#n1258'>1258</a> |
1310 | <a id='n1259' href='#n1259'>1259</a> |
1311 | <a id='n1260' href='#n1260'>1260</a> |
1312 | <a id='n1261' href='#n1261'>1261</a> |
1313 | <a id='n1262' href='#n1262'>1262</a> |
1314 | <a id='n1263' href='#n1263'>1263</a> |
1315 | <a id='n1264' href='#n1264'>1264</a> |
1316 | <a id='n1265' href='#n1265'>1265</a> |
1317 | <a id='n1266' href='#n1266'>1266</a> |
1318 | <a id='n1267' href='#n1267'>1267</a> |
1319 | <a id='n1268' href='#n1268'>1268</a> |
1320 | <a id='n1269' href='#n1269'>1269</a> |
1321 | <a id='n1270' href='#n1270'>1270</a> |
1322 | <a id='n1271' href='#n1271'>1271</a> |
1323 | <a id='n1272' href='#n1272'>1272</a> |
1324 | <a id='n1273' href='#n1273'>1273</a> |
1325 | <a id='n1274' href='#n1274'>1274</a> |
1326 | <a id='n1275' href='#n1275'>1275</a> |
1327 | <a id='n1276' href='#n1276'>1276</a> |
1328 | <a id='n1277' href='#n1277'>1277</a> |
1329 | <a id='n1278' href='#n1278'>1278</a> |
1330 | <a id='n1279' href='#n1279'>1279</a> |
1331 | <a id='n1280' href='#n1280'>1280</a> |
1332 | <a id='n1281' href='#n1281'>1281</a> |
1333 | <a id='n1282' href='#n1282'>1282</a> |
1334 | <a id='n1283' href='#n1283'>1283</a> |
1335 | <a id='n1284' href='#n1284'>1284</a> |
1336 | <a id='n1285' href='#n1285'>1285</a> |
1337 | <a id='n1286' href='#n1286'>1286</a> |
1338 | <a id='n1287' href='#n1287'>1287</a> |
1339 | <a id='n1288' href='#n1288'>1288</a> |
1340 | <a id='n1289' href='#n1289'>1289</a> |
1341 | <a id='n1290' href='#n1290'>1290</a> |
1342 | <a id='n1291' href='#n1291'>1291</a> |
1343 | <a id='n1292' href='#n1292'>1292</a> |
1344 | <a id='n1293' href='#n1293'>1293</a> |
1345 | <a id='n1294' href='#n1294'>1294</a> |
1346 | <a id='n1295' href='#n1295'>1295</a> |
1347 | <a id='n1296' href='#n1296'>1296</a> |
1348 | <a id='n1297' href='#n1297'>1297</a> |
1349 | <a id='n1298' href='#n1298'>1298</a> |
1350 | <a id='n1299' href='#n1299'>1299</a> |
1351 | <a id='n1300' href='#n1300'>1300</a> |
1352 | <a id='n1301' href='#n1301'>1301</a> |
1353 | <a id='n1302' href='#n1302'>1302</a> |
1354 | <a id='n1303' href='#n1303'>1303</a> |
1355 | <a id='n1304' href='#n1304'>1304</a> |
1356 | <a id='n1305' href='#n1305'>1305</a> |
1357 | <a id='n1306' href='#n1306'>1306</a> |
1358 | <a id='n1307' href='#n1307'>1307</a> |
1359 | <a id='n1308' href='#n1308'>1308</a> |
1360 | <a id='n1309' href='#n1309'>1309</a> |
1361 | <a id='n1310' href='#n1310'>1310</a> |
1362 | <a id='n1311' href='#n1311'>1311</a> |
1363 | <a id='n1312' href='#n1312'>1312</a> |
1364 | <a id='n1313' href='#n1313'>1313</a> |
1365 | <a id='n1314' href='#n1314'>1314</a> |
1366 | <a id='n1315' href='#n1315'>1315</a> |
1367 | <a id='n1316' href='#n1316'>1316</a> |
1368 | <a id='n1317' href='#n1317'>1317</a> |
1369 | <a id='n1318' href='#n1318'>1318</a> |
1370 | <a id='n1319' href='#n1319'>1319</a> |
1371 | <a id='n1320' href='#n1320'>1320</a> |
1372 | <a id='n1321' href='#n1321'>1321</a> |
1373 | <a id='n1322' href='#n1322'>1322</a> |
1374 | <a id='n1323' href='#n1323'>1323</a> |
1375 | <a id='n1324' href='#n1324'>1324</a> |
1376 | <a id='n1325' href='#n1325'>1325</a> |
1377 | <a id='n1326' href='#n1326'>1326</a> |
1378 | <a id='n1327' href='#n1327'>1327</a> |
1379 | <a id='n1328' href='#n1328'>1328</a> |
1380 | <a id='n1329' href='#n1329'>1329</a> |
1381 | <a id='n1330' href='#n1330'>1330</a> |
1382 | <a id='n1331' href='#n1331'>1331</a> |
1383 | <a id='n1332' href='#n1332'>1332</a> |
1384 | <a id='n1333' href='#n1333'>1333</a> |
1385 | <a id='n1334' href='#n1334'>1334</a> |
1386 | <a id='n1335' href='#n1335'>1335</a> |
1387 | <a id='n1336' href='#n1336'>1336</a> |
1388 | <a id='n1337' href='#n1337'>1337</a> |
1389 | <a id='n1338' href='#n1338'>1338</a> |
1390 | <a id='n1339' href='#n1339'>1339</a> |
1391 | <a id='n1340' href='#n1340'>1340</a> |
1392 | <a id='n1341' href='#n1341'>1341</a> |
1393 | <a id='n1342' href='#n1342'>1342</a> |
1394 | <a id='n1343' href='#n1343'>1343</a> |
1395 | <a id='n1344' href='#n1344'>1344</a> |
1396 | <a id='n1345' href='#n1345'>1345</a> |
1397 | <a id='n1346' href='#n1346'>1346</a> |
1398 | <a id='n1347' href='#n1347'>1347</a> |
1399 | <a id='n1348' href='#n1348'>1348</a> |
1400 | <a id='n1349' href='#n1349'>1349</a> |
1401 | <a id='n1350' href='#n1350'>1350</a> |
1402 | <a id='n1351' href='#n1351'>1351</a> |
1403 | <a id='n1352' href='#n1352'>1352</a> |
1404 | <a id='n1353' href='#n1353'>1353</a> |
1405 | <a id='n1354' href='#n1354'>1354</a> |
1406 | <a id='n1355' href='#n1355'>1355</a> |
1407 | <a id='n1356' href='#n1356'>1356</a> |
1408 | <a id='n1357' href='#n1357'>1357</a> |
1409 | <a id='n1358' href='#n1358'>1358</a> |
1410 | <a id='n1359' href='#n1359'>1359</a> |
1411 | <a id='n1360' href='#n1360'>1360</a> |
1412 | <a id='n1361' href='#n1361'>1361</a> |
1413 | <a id='n1362' href='#n1362'>1362</a> |
1414 | <a id='n1363' href='#n1363'>1363</a> |
1415 | <a id='n1364' href='#n1364'>1364</a> |
1416 | <a id='n1365' href='#n1365'>1365</a> |
1417 | <a id='n1366' href='#n1366'>1366</a> |
1418 | <a id='n1367' href='#n1367'>1367</a> |
1419 | <a id='n1368' href='#n1368'>1368</a> |
1420 | <a id='n1369' href='#n1369'>1369</a> |
1421 | <a id='n1370' href='#n1370'>1370</a> |
1422 | <a id='n1371' href='#n1371'>1371</a> |
1423 | <a id='n1372' href='#n1372'>1372</a> |
1424 | <a id='n1373' href='#n1373'>1373</a> |
1425 | <a id='n1374' href='#n1374'>1374</a> |
1426 | <a id='n1375' href='#n1375'>1375</a> |
1427 | <a id='n1376' href='#n1376'>1376</a> |
1428 | <a id='n1377' href='#n1377'>1377</a> |
1429 | <a id='n1378' href='#n1378'>1378</a> |
1430 | <a id='n1379' href='#n1379'>1379</a> |
1431 | <a id='n1380' href='#n1380'>1380</a> |
1432 | <a id='n1381' href='#n1381'>1381</a> |
1433 | <a id='n1382' href='#n1382'>1382</a> |
1434 | <a id='n1383' href='#n1383'>1383</a> |
1435 | <a id='n1384' href='#n1384'>1384</a> |
1436 | <a id='n1385' href='#n1385'>1385</a> |
1437 | <a id='n1386' href='#n1386'>1386</a> |
1438 | <a id='n1387' href='#n1387'>1387</a> |
1439 | <a id='n1388' href='#n1388'>1388</a> |
1440 | <a id='n1389' href='#n1389'>1389</a> |
1441 | <a id='n1390' href='#n1390'>1390</a> |
1442 | <a id='n1391' href='#n1391'>1391</a> |
1443 | <a id='n1392' href='#n1392'>1392</a> |
1444 | <a id='n1393' href='#n1393'>1393</a> |
1445 | <a id='n1394' href='#n1394'>1394</a> |
1446 | <a id='n1395' href='#n1395'>1395</a> |
1447 | <a id='n1396' href='#n1396'>1396</a> |
1448 | <a id='n1397' href='#n1397'>1397</a> |
1449 | <a id='n1398' href='#n1398'>1398</a> |
1450 | <a id='n1399' href='#n1399'>1399</a> |
1451 | <a id='n1400' href='#n1400'>1400</a> |
1452 | <a id='n1401' href='#n1401'>1401</a> |
1453 | <a id='n1402' href='#n1402'>1402</a> |
1454 | <a id='n1403' href='#n1403'>1403</a> |
1455 | <a id='n1404' href='#n1404'>1404</a> |
1456 | <a id='n1405' href='#n1405'>1405</a> |
1457 | <a id='n1406' href='#n1406'>1406</a> |
1458 | <a id='n1407' href='#n1407'>1407</a> |
1459 | <a id='n1408' href='#n1408'>1408</a> |
1460 | <a id='n1409' href='#n1409'>1409</a> |
1461 | <a id='n1410' href='#n1410'>1410</a> |
1462 | <a id='n1411' href='#n1411'>1411</a> |
1463 | <a id='n1412' href='#n1412'>1412</a> |
1464 | <a id='n1413' href='#n1413'>1413</a> |
1465 | <a id='n1414' href='#n1414'>1414</a> |
1466 | <a id='n1415' href='#n1415'>1415</a> |
1467 | <a id='n1416' href='#n1416'>1416</a> |
1468 | <a id='n1417' href='#n1417'>1417</a> |
1469 | <a id='n1418' href='#n1418'>1418</a> |
1470 | <a id='n1419' href='#n1419'>1419</a> |
1471 | <a id='n1420' href='#n1420'>1420</a> |
1472 | <a id='n1421' href='#n1421'>1421</a> |
1473 | <a id='n1422' href='#n1422'>1422</a> |
1474 | <a id='n1423' href='#n1423'>1423</a> |
1475 | <a id='n1424' href='#n1424'>1424</a> |
1476 | <a id='n1425' href='#n1425'>1425</a> |
1477 | <a id='n1426' href='#n1426'>1426</a> |
1478 | <a id='n1427' href='#n1427'>1427</a> |
1479 | <a id='n1428' href='#n1428'>1428</a> |
1480 | <a id='n1429' href='#n1429'>1429</a> |
1481 | <a id='n1430' href='#n1430'>1430</a> |
1482 | <a id='n1431' href='#n1431'>1431</a> |
1483 | <a id='n1432' href='#n1432'>1432</a> |
1484 | <a id='n1433' href='#n1433'>1433</a> |
1485 | <a id='n1434' href='#n1434'>1434</a> |
1486 | <a id='n1435' href='#n1435'>1435</a> |
1487 | <a id='n1436' href='#n1436'>1436</a> |
1488 | <a id='n1437' href='#n1437'>1437</a> |
1489 | <a id='n1438' href='#n1438'>1438</a> |
1490 | <a id='n1439' href='#n1439'>1439</a> |
1491 | <a id='n1440' href='#n1440'>1440</a> |
1492 | <a id='n1441' href='#n1441'>1441</a> |
1493 | <a id='n1442' href='#n1442'>1442</a> |
1494 | <a id='n1443' href='#n1443'>1443</a> |
1495 | <a id='n1444' href='#n1444'>1444</a> |
1496 | <a id='n1445' href='#n1445'>1445</a> |
1497 | <a id='n1446' href='#n1446'>1446</a> |
1498 | <a id='n1447' href='#n1447'>1447</a> |
1499 | <a id='n1448' href='#n1448'>1448</a> |
1500 | <a id='n1449' href='#n1449'>1449</a> |
1501 | <a id='n1450' href='#n1450'>1450</a> |
1502 | <a id='n1451' href='#n1451'>1451</a> |
1503 | <a id='n1452' href='#n1452'>1452</a> |
1504 | <a id='n1453' href='#n1453'>1453</a> |
1505 | <a id='n1454' href='#n1454'>1454</a> |
1506 | <a id='n1455' href='#n1455'>1455</a> |
1507 | <a id='n1456' href='#n1456'>1456</a> |
1508 | <a id='n1457' href='#n1457'>1457</a> |
1509 | <a id='n1458' href='#n1458'>1458</a> |
1510 | <a id='n1459' href='#n1459'>1459</a> |
1511 | <a id='n1460' href='#n1460'>1460</a> |
1512 | <a id='n1461' href='#n1461'>1461</a> |
1513 | <a id='n1462' href='#n1462'>1462</a> |
1514 | <a id='n1463' href='#n1463'>1463</a> |
1515 | <a id='n1464' href='#n1464'>1464</a> |
1516 | <a id='n1465' href='#n1465'>1465</a> |
1517 | <a id='n1466' href='#n1466'>1466</a> |
1518 | </pre></td> |
1519 | <td class='lines'><pre><code>Description: Introduce a plugin system for QSystemTrayIcon. |
1520 | Designed to be used with sni-qt (https://launchpad.net/sni-qt) |
1521 | Author: agateau@kde.org |
1522 | Forwarded: no |
1523 | |
1524 | Introduce a plugin system for QSystemTrayIcon. Designed to be used with sni-qt |
1525 | (https://launchpad.net/sni-qt) |
1526 | <span class="hl kwb">---</span> |
1527 | examples/desktop/systray/window.cpp | 40 ++ |
1528 | examples/desktop/systray/window.h | 6 |
1529 | src/gui/util/qabstractsystemtrayiconsys.cpp | 65 +++ |
1530 | src/gui/util/qabstractsystemtrayiconsys_p.h | 106 ++++++ |
1531 | src/gui/util/qsystemtrayicon.cpp | 6 |
1532 | src/gui/util/qsystemtrayicon_p.h | 85 ++--- |
1533 | src/gui/util/qsystemtrayicon_x11.cpp | 356 ++++----------------- |
1534 | src/gui/util/qxembedsystemtrayicon_x11.cpp | 469 ++++++++++++++++++++++++++++ |
1535 | src/gui/util/qxembedsystemtrayicon_x11_p.h | 104 ++++++ |
1536 | src/gui/util/util.pri | 7 |
1537 | 10 files changed, 916 insertions(+), 328 deletions(-) |
1538 | |
1539 | <span class="hl kwb">--- a/examples/desktop/systray/window.cpp</span> |
1540 | <span class="hl kwa">+++ b/examples/desktop/systray/window.cpp</span> |
1541 | <span class="hl kwd">@@ -158,15 +158,23 @@</span> |
1542 | iconComboBox->addItem(QIcon(":/images/bad.svg"), tr("Bad")); |
1543 | iconComboBox->addItem(QIcon(":/images/heart.svg"), tr("Heart")); |
1544 | iconComboBox->addItem(QIcon(":/images/trash.svg"), tr("Trash")); |
1545 | <span class="hl kwa">+ iconComboBox->addItem(QIcon::fromTheme("system-file-manager"), tr("File Manager"));</span> |
1546 | |
1547 | showIconCheckBox = new QCheckBox(tr("Show icon")); |
1548 | showIconCheckBox->setChecked(true); |
1549 | |
1550 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1551 | <span class="hl kwa">+ jitToolTipCheckBox = new QCheckBox(tr("Just In Time Tooltip"));</span> |
1552 | <span class="hl kwa">+#endif</span> |
1553 | <span class="hl kwa">+</span> |
1554 | QHBoxLayout *iconLayout = new QHBoxLayout; |
1555 | iconLayout->addWidget(iconLabel); |
1556 | iconLayout->addWidget(iconComboBox); |
1557 | iconLayout->addStretch(); |
1558 | iconLayout->addWidget(showIconCheckBox); |
1559 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1560 | <span class="hl kwa">+ iconLayout->addWidget(jitToolTipCheckBox);</span> |
1561 | <span class="hl kwa">+#endif</span> |
1562 | iconGroupBox->setLayout(iconLayout); |
1563 | } |
1564 | |
1565 | <span class="hl kwd">@@ -254,5 +262,37 @@</span> |
1566 | trayIconMenu->addAction(quitAction); |
1567 | |
1568 | trayIcon = new QSystemTrayIcon(this); |
1569 | <span class="hl kwa">+ QByteArray category = qgetenv("SNI_CATEGORY");</span> |
1570 | <span class="hl kwa">+ if (!category.isEmpty()) {</span> |
1571 | <span class="hl kwa">+ trayIcon->setProperty("_qt_sni_category", QString::fromLocal8Bit(category));</span> |
1572 | <span class="hl kwa">+ }</span> |
1573 | trayIcon->setContextMenu(trayIconMenu); |
1574 | <span class="hl kwa">+</span> |
1575 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1576 | <span class="hl kwa">+ trayIcon->installEventFilter(this);</span> |
1577 | <span class="hl kwa">+#endif</span> |
1578 | <span class="hl kwa">+}</span> |
1579 | <span class="hl kwa">+</span> |
1580 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1581 | <span class="hl kwa">+bool Window::eventFilter(QObject *, QEvent *event)</span> |
1582 | <span class="hl kwa">+{</span> |
1583 | <span class="hl kwa">+ switch(event->type()) {</span> |
1584 | <span class="hl kwa">+ case QEvent::ToolTip:</span> |
1585 | <span class="hl kwa">+ if (jitToolTipCheckBox->isChecked()) {</span> |
1586 | <span class="hl kwa">+ QString timeString = QTime::currentTime().toString();</span> |
1587 | <span class="hl kwa">+ trayIcon->setToolTip(tr("Current Time: %1").arg(timeString));</span> |
1588 | <span class="hl kwa">+ }</span> |
1589 | <span class="hl kwa">+ break;</span> |
1590 | <span class="hl kwa">+ case QEvent::Wheel: {</span> |
1591 | <span class="hl kwa">+ QWheelEvent *wheelEvent = static_cast<QWheelEvent*>(event);</span> |
1592 | <span class="hl kwa">+ int delta = wheelEvent->delta() > 0 ? 1 : -1;</span> |
1593 | <span class="hl kwa">+ int index = (iconComboBox->currentIndex() + delta) % iconComboBox->count();</span> |
1594 | <span class="hl kwa">+ iconComboBox->setCurrentIndex(index);</span> |
1595 | <span class="hl kwa">+ break;</span> |
1596 | <span class="hl kwa">+ }</span> |
1597 | <span class="hl kwa">+ default:</span> |
1598 | <span class="hl kwa">+ break;</span> |
1599 | <span class="hl kwa">+ }</span> |
1600 | <span class="hl kwa">+ return false;</span> |
1601 | } |
1602 | <span class="hl kwa">+#endif</span> |
1603 | <span class="hl kwb">--- a/examples/desktop/systray/window.h</span> |
1604 | <span class="hl kwa">+++ b/examples/desktop/systray/window.h</span> |
1605 | <span class="hl kwd">@@ -69,6 +69,9 @@</span> |
1606 | |
1607 | protected: |
1608 | void closeEvent(QCloseEvent *event); |
1609 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1610 | <span class="hl kwa">+ bool eventFilter(QObject *object, QEvent *event);</span> |
1611 | <span class="hl kwa">+#endif</span> |
1612 | |
1613 | private slots: |
1614 | void setIcon(int index); |
1615 | <span class="hl kwd">@@ -86,6 +89,9 @@</span> |
1616 | QLabel *iconLabel; |
1617 | QComboBox *iconComboBox; |
1618 | QCheckBox *showIconCheckBox; |
1619 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1620 | <span class="hl kwa">+ QCheckBox *jitToolTipCheckBox;</span> |
1621 | <span class="hl kwa">+#endif</span> |
1622 | |
1623 | QGroupBox *messageGroupBox; |
1624 | QLabel *typeLabel; |
1625 | <span class="hl kwb">--- /dev/null</span> |
1626 | <span class="hl kwa">+++ b/src/gui/util/qabstractsystemtrayiconsys.cpp</span> |
1627 | <span class="hl kwd">@@ -0,0 +1,65 @@</span> |
1628 | <span class="hl kwa">+/****************************************************************************</span> |
1629 | <span class="hl kwa">+**</span> |
1630 | <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span> |
1631 | <span class="hl kwa">+** All rights reserved.</span> |
1632 | <span class="hl kwa">+** Contact: Nokia Corporation (qt-info@nokia.com)</span> |
1633 | <span class="hl kwa">+**</span> |
1634 | <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span> |
1635 | <span class="hl kwa">+**</span> |
1636 | <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span> |
1637 | <span class="hl kwa">+** GNU Lesser General Public License Usage</span> |
1638 | <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span> |
1639 | <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span> |
1640 | <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span> |
1641 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span> |
1642 | <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span> |
1643 | <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span> |
1644 | <span class="hl kwa">+**</span> |
1645 | <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span> |
1646 | <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span> |
1647 | <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span> |
1648 | <span class="hl kwa">+**</span> |
1649 | <span class="hl kwa">+** GNU General Public License Usage</span> |
1650 | <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span> |
1651 | <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span> |
1652 | <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span> |
1653 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span> |
1654 | <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span> |
1655 | <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span> |
1656 | <span class="hl kwa">+**</span> |
1657 | <span class="hl kwa">+** Other Usage</span> |
1658 | <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span> |
1659 | <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span> |
1660 | <span class="hl kwa">+**</span> |
1661 | <span class="hl kwa">+**</span> |
1662 | <span class="hl kwa">+**</span> |
1663 | <span class="hl kwa">+**</span> |
1664 | <span class="hl kwa">+**</span> |
1665 | <span class="hl kwa">+** $QT_END_LICENSE$</span> |
1666 | <span class="hl kwa">+**</span> |
1667 | <span class="hl kwa">+****************************************************************************/</span> |
1668 | <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span> |
1669 | <span class="hl kwa">+</span> |
1670 | <span class="hl kwa">+#include "qabstractsystemtrayiconsys_p.h"</span> |
1671 | <span class="hl kwa">+</span> |
1672 | <span class="hl kwa">+</span> |
1673 | <span class="hl kwa">+QSystemTrayIconSysFactoryInterface::QSystemTrayIconSysFactoryInterface()</span> |
1674 | <span class="hl kwa">+{</span> |
1675 | <span class="hl kwa">+}</span> |
1676 | <span class="hl kwa">+</span> |
1677 | <span class="hl kwa">+/////////////////////////////////////////////////</span> |
1678 | <span class="hl kwa">+QAbstractSystemTrayIconSys::QAbstractSystemTrayIconSys(QSystemTrayIcon *icon)</span> |
1679 | <span class="hl kwa">+: trayIcon(icon)</span> |
1680 | <span class="hl kwa">+{</span> |
1681 | <span class="hl kwa">+}</span> |
1682 | <span class="hl kwa">+</span> |
1683 | <span class="hl kwa">+QAbstractSystemTrayIconSys::~QAbstractSystemTrayIconSys()</span> |
1684 | <span class="hl kwa">+{</span> |
1685 | <span class="hl kwa">+}</span> |
1686 | <span class="hl kwa">+</span> |
1687 | <span class="hl kwa">+void QAbstractSystemTrayIconSys::sendActivated(QSystemTrayIcon::ActivationReason reason)</span> |
1688 | <span class="hl kwa">+{</span> |
1689 | <span class="hl kwa">+ qtsystray_sendActivated(trayIcon, reason);</span> |
1690 | <span class="hl kwa">+}</span> |
1691 | <span class="hl kwa">+</span> |
1692 | <span class="hl kwa">+#endif</span> |
1693 | <span class="hl kwb">--- /dev/null</span> |
1694 | <span class="hl kwa">+++ b/src/gui/util/qabstractsystemtrayiconsys_p.h</span> |
1695 | <span class="hl kwd">@@ -0,0 +1,106 @@</span> |
1696 | <span class="hl kwa">+/****************************************************************************</span> |
1697 | <span class="hl kwa">+**</span> |
1698 | <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span> |
1699 | <span class="hl kwa">+** All rights reserved.</span> |
1700 | <span class="hl kwa">+** Contact: Nokia Corporation (qt-info@nokia.com)</span> |
1701 | <span class="hl kwa">+**</span> |
1702 | <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span> |
1703 | <span class="hl kwa">+**</span> |
1704 | <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span> |
1705 | <span class="hl kwa">+** GNU Lesser General Public License Usage</span> |
1706 | <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span> |
1707 | <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span> |
1708 | <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span> |
1709 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span> |
1710 | <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span> |
1711 | <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span> |
1712 | <span class="hl kwa">+**</span> |
1713 | <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span> |
1714 | <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span> |
1715 | <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span> |
1716 | <span class="hl kwa">+**</span> |
1717 | <span class="hl kwa">+** GNU General Public License Usage</span> |
1718 | <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span> |
1719 | <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span> |
1720 | <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span> |
1721 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span> |
1722 | <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span> |
1723 | <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span> |
1724 | <span class="hl kwa">+**</span> |
1725 | <span class="hl kwa">+** Other Usage</span> |
1726 | <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span> |
1727 | <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span> |
1728 | <span class="hl kwa">+**</span> |
1729 | <span class="hl kwa">+**</span> |
1730 | <span class="hl kwa">+**</span> |
1731 | <span class="hl kwa">+**</span> |
1732 | <span class="hl kwa">+**</span> |
1733 | <span class="hl kwa">+** $QT_END_LICENSE$</span> |
1734 | <span class="hl kwa">+**</span> |
1735 | <span class="hl kwa">+****************************************************************************/</span> |
1736 | <span class="hl kwa">+</span> |
1737 | <span class="hl kwa">+#ifndef QABSTRACTSYSTEMTRAYICONSYS_P_H</span> |
1738 | <span class="hl kwa">+#define QABSTRACTSYSTEMTRAYICONSYS_P_H</span> |
1739 | <span class="hl kwa">+</span> |
1740 | <span class="hl kwa">+//</span> |
1741 | <span class="hl kwa">+// W A R N I N G</span> |
1742 | <span class="hl kwa">+// -------------</span> |
1743 | <span class="hl kwa">+//</span> |
1744 | <span class="hl kwa">+// This file is not part of the Qt API. It exists for the convenience</span> |
1745 | <span class="hl kwa">+// of a number of Qt sources files. This header file may change from</span> |
1746 | <span class="hl kwa">+// version to version without notice, or even be removed.</span> |
1747 | <span class="hl kwa">+//</span> |
1748 | <span class="hl kwa">+// We mean it.</span> |
1749 | <span class="hl kwa">+//</span> |
1750 | <span class="hl kwa">+</span> |
1751 | <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span> |
1752 | <span class="hl kwa">+</span> |
1753 | <span class="hl kwa">+#include <qfactoryinterface.h></span> |
1754 | <span class="hl kwa">+#include <qsystemtrayicon.h></span> |
1755 | <span class="hl kwa">+</span> |
1756 | <span class="hl kwa">+class QAbstractSystemTrayIconSys;</span> |
1757 | <span class="hl kwa">+</span> |
1758 | <span class="hl kwa">+class Q_GUI_EXPORT QSystemTrayIconSysFactoryInterface : public QObject, public QFactoryInterface</span> |
1759 | <span class="hl kwa">+{</span> |
1760 | <span class="hl kwa">+ Q_OBJECT</span> |
1761 | <span class="hl kwa">+public:</span> |
1762 | <span class="hl kwa">+ QSystemTrayIconSysFactoryInterface();</span> |
1763 | <span class="hl kwa">+ virtual QAbstractSystemTrayIconSys * create(QSystemTrayIcon *) = 0;</span> |
1764 | <span class="hl kwa">+ virtual bool isAvailable() const = 0;</span> |
1765 | <span class="hl kwa">+</span> |
1766 | <span class="hl kwa">+ // \reimp</span> |
1767 | <span class="hl kwa">+ virtual QStringList keys() const { return QStringList() << QLatin1String("default"); }</span> |
1768 | <span class="hl kwa">+</span> |
1769 | <span class="hl kwa">+Q_SIGNALS:</span> |
1770 | <span class="hl kwa">+ void availableChanged(bool);</span> |
1771 | <span class="hl kwa">+};</span> |
1772 | <span class="hl kwa">+</span> |
1773 | <span class="hl kwa">+#define QSystemTrayIconSysFactoryInterface_iid "com.nokia.qt.QSystemTrayIconSysFactoryInterface"</span> |
1774 | <span class="hl kwa">+Q_DECLARE_INTERFACE(QSystemTrayIconSysFactoryInterface, QSystemTrayIconSysFactoryInterface_iid)</span> |
1775 | <span class="hl kwa">+</span> |
1776 | <span class="hl kwa">+class QRect;</span> |
1777 | <span class="hl kwa">+</span> |
1778 | <span class="hl kwa">+class Q_GUI_EXPORT QAbstractSystemTrayIconSys</span> |
1779 | <span class="hl kwa">+{</span> |
1780 | <span class="hl kwa">+public:</span> |
1781 | <span class="hl kwa">+ QAbstractSystemTrayIconSys(QSystemTrayIcon *icon);</span> |
1782 | <span class="hl kwa">+ virtual ~QAbstractSystemTrayIconSys();</span> |
1783 | <span class="hl kwa">+</span> |
1784 | <span class="hl kwa">+ virtual QRect geometry() const = 0;</span> |
1785 | <span class="hl kwa">+ virtual void updateVisibility() = 0;</span> |
1786 | <span class="hl kwa">+ virtual void updateIcon() = 0;</span> |
1787 | <span class="hl kwa">+ virtual void updateToolTip() = 0;</span> |
1788 | <span class="hl kwa">+ virtual void updateMenu() = 0;</span> |
1789 | <span class="hl kwa">+ virtual void showMessage(const QString &title, const QString &message,</span> |
1790 | <span class="hl kwa">+ QSystemTrayIcon::MessageIcon icon, int msecs) = 0;</span> |
1791 | <span class="hl kwa">+</span> |
1792 | <span class="hl kwa">+ void sendActivated(QSystemTrayIcon::ActivationReason);</span> |
1793 | <span class="hl kwa">+</span> |
1794 | <span class="hl kwa">+protected:</span> |
1795 | <span class="hl kwa">+ QSystemTrayIcon *trayIcon;</span> |
1796 | <span class="hl kwa">+};</span> |
1797 | <span class="hl kwa">+</span> |
1798 | <span class="hl kwa">+#endif // QT_NO_SYSTEMTRAYICON</span> |
1799 | <span class="hl kwa">+</span> |
1800 | <span class="hl kwa">+#endif // QABSTRACTSYSTEMTRAYICONSYS_P_H</span> |
1801 | <span class="hl kwa">+</span> |
1802 | <span class="hl kwb">--- a/src/gui/util/qsystemtrayicon.cpp</span> |
1803 | <span class="hl kwa">+++ b/src/gui/util/qsystemtrayicon.cpp</span> |
1804 | <span class="hl kwd">@@ -287,12 +287,6 @@</span> |
1805 | */ |
1806 | bool QSystemTrayIcon::event(QEvent *e) |
1807 | { |
1808 | <span class="hl kwb">-#if defined(Q_WS_X11)</span> |
1809 | <span class="hl kwb">- if (e->type() == QEvent::ToolTip) {</span> |
1810 | <span class="hl kwb">- Q_D(QSystemTrayIcon);</span> |
1811 | <span class="hl kwb">- return d->sys->deliverToolTipEvent(e);</span> |
1812 | <span class="hl kwb">- }</span> |
1813 | <span class="hl kwb">-#endif</span> |
1814 | return QObject::event(e); |
1815 | } |
1816 | |
1817 | <span class="hl kwb">--- a/src/gui/util/qsystemtrayicon_p.h</span> |
1818 | <span class="hl kwa">+++ b/src/gui/util/qsystemtrayicon_p.h</span> |
1819 | <span class="hl kwd">@@ -62,10 +62,17 @@</span> |
1820 | #include "QtGui/qpixmap.h" |
1821 | #include "QtCore/qstring.h" |
1822 | #include "QtCore/qpointer.h" |
1823 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1824 | <span class="hl kwa">+#include "QtCore/qset.h"</span> |
1825 | <span class="hl kwa">+#endif</span> |
1826 | |
1827 | QT_BEGIN_NAMESPACE |
1828 | |
1829 | <span class="hl kwa">+#if defined(Q_WS_X11)</span> |
1830 | <span class="hl kwa">+class QAbstractSystemTrayIconSys;</span> |
1831 | <span class="hl kwa">+#else</span> |
1832 | class QSystemTrayIconSys; |
1833 | <span class="hl kwa">+#endif</span> |
1834 | class QToolButton; |
1835 | class QLabel; |
1836 | |
1837 | <span class="hl kwd">@@ -75,6 +82,9 @@</span> |
1838 | |
1839 | public: |
1840 | QSystemTrayIconPrivate() : sys(0), visible(false) { } |
1841 | <span class="hl kwa">+ #if defined(Q_WS_X11)</span> |
1842 | <span class="hl kwa">+ ~QSystemTrayIconPrivate();</span> |
1843 | <span class="hl kwa">+ #endif</span> |
1844 | |
1845 | void install_sys(); |
1846 | void remove_sys(); |
1847 | <span class="hl kwd">@@ -90,7 +100,11 @@</span> |
1848 | QPointer<QMenu> menu; |
1849 | QIcon icon; |
1850 | QString toolTip; |
1851 | <span class="hl kwa">+ #if defined(Q_WS_X11)</span> |
1852 | <span class="hl kwa">+ QAbstractSystemTrayIconSys *sys;</span> |
1853 | <span class="hl kwa">+ #else</span> |
1854 | QSystemTrayIconSys *sys; |
1855 | <span class="hl kwa">+ #endif</span> |
1856 | bool visible; |
1857 | }; |
1858 | |
1859 | <span class="hl kwd">@@ -123,60 +137,37 @@</span> |
1860 | }; |
1861 | |
1862 | #if defined(Q_WS_X11) |
1863 | <span class="hl kwb">-QT_BEGIN_INCLUDE_NAMESPACE</span> |
1864 | <span class="hl kwb">-#include <QtCore/qcoreapplication.h></span> |
1865 | <span class="hl kwb">-#include <X11/Xlib.h></span> |
1866 | <span class="hl kwb">-#include <X11/Xatom.h></span> |
1867 | <span class="hl kwb">-#include <X11/Xutil.h></span> |
1868 | <span class="hl kwb">-QT_END_INCLUDE_NAMESPACE</span> |
1869 | <span class="hl kwa">+class QSystemTrayIconSysFactoryInterface;</span> |
1870 | |
1871 | <span class="hl kwb">-class QSystemTrayIconSys : public QWidget</span> |
1872 | <span class="hl kwa">+/**</span> |
1873 | <span class="hl kwa">+ * This class acts as a composite QSystemTrayIconSysFactory: It can create</span> |
1874 | <span class="hl kwa">+ * instances of QAbstractSystemTrayIconSys* using either a plugin or the</span> |
1875 | <span class="hl kwa">+ * builtin factory and will cause QSystemTrayIconPrivate to recreate their</span> |
1876 | <span class="hl kwa">+ * 'sys' instances if the plugin availability changes.</span> |
1877 | <span class="hl kwa">+ */</span> |
1878 | <span class="hl kwa">+class QSystemTrayIconSysFactory : public QObject</span> |
1879 | { |
1880 | <span class="hl kwb">- friend class QSystemTrayIconPrivate;</span> |
1881 | <span class="hl kwb">-</span> |
1882 | <span class="hl kwa">+ Q_OBJECT</span> |
1883 | public: |
1884 | <span class="hl kwb">- QSystemTrayIconSys(QSystemTrayIcon *q);</span> |
1885 | <span class="hl kwb">- ~QSystemTrayIconSys();</span> |
1886 | <span class="hl kwb">- enum {</span> |
1887 | <span class="hl kwb">- SYSTEM_TRAY_REQUEST_DOCK = 0,</span> |
1888 | <span class="hl kwb">- SYSTEM_TRAY_BEGIN_MESSAGE = 1,</span> |
1889 | <span class="hl kwb">- SYSTEM_TRAY_CANCEL_MESSAGE =2</span> |
1890 | <span class="hl kwb">- };</span> |
1891 | <span class="hl kwb">-</span> |
1892 | <span class="hl kwb">- void addToTray();</span> |
1893 | <span class="hl kwb">- void updateIcon();</span> |
1894 | <span class="hl kwb">- XVisualInfo* getSysTrayVisualInfo();</span> |
1895 | <span class="hl kwb">-</span> |
1896 | <span class="hl kwb">- // QObject::event is public but QWidget's ::event() re-implementation</span> |
1897 | <span class="hl kwb">- // is protected ;(</span> |
1898 | <span class="hl kwb">- inline bool deliverToolTipEvent(QEvent *e)</span> |
1899 | <span class="hl kwb">- { return QWidget::event(e); }</span> |
1900 | <span class="hl kwb">-</span> |
1901 | <span class="hl kwb">- static Window sysTrayWindow;</span> |
1902 | <span class="hl kwb">- static QList<QSystemTrayIconSys *> trayIcons;</span> |
1903 | <span class="hl kwb">- static QCoreApplication::EventFilter oldEventFilter;</span> |
1904 | <span class="hl kwb">- static bool sysTrayTracker(void *message, long *result);</span> |
1905 | <span class="hl kwb">- static Window locateSystemTray();</span> |
1906 | <span class="hl kwb">- static Atom sysTraySelection;</span> |
1907 | <span class="hl kwb">- static XVisualInfo sysTrayVisual;</span> |
1908 | <span class="hl kwa">+ QSystemTrayIconSysFactory();</span> |
1909 | <span class="hl kwa">+ void registerSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);</span> |
1910 | <span class="hl kwa">+ void unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);</span> |
1911 | |
1912 | <span class="hl kwb">-protected:</span> |
1913 | <span class="hl kwb">- void paintEvent(QPaintEvent *pe);</span> |
1914 | <span class="hl kwb">- void resizeEvent(QResizeEvent *re);</span> |
1915 | <span class="hl kwb">- bool x11Event(XEvent *event);</span> |
1916 | <span class="hl kwb">- void mousePressEvent(QMouseEvent *event);</span> |
1917 | <span class="hl kwb">- void mouseDoubleClickEvent(QMouseEvent *event);</span> |
1918 | <span class="hl kwb">-#ifndef QT_NO_WHEELEVENT</span> |
1919 | <span class="hl kwb">- void wheelEvent(QWheelEvent *event);</span> |
1920 | <span class="hl kwb">-#endif</span> |
1921 | <span class="hl kwb">- bool event(QEvent *e);</span> |
1922 | <span class="hl kwa">+ QAbstractSystemTrayIconSys *create(QSystemTrayIcon *) const;</span> |
1923 | <span class="hl kwa">+</span> |
1924 | <span class="hl kwa">+ bool isAvailable() const;</span> |
1925 | <span class="hl kwa">+</span> |
1926 | <span class="hl kwa">+private Q_SLOTS:</span> |
1927 | <span class="hl kwa">+ void refreshTrayIconPrivates();</span> |
1928 | |
1929 | private: |
1930 | <span class="hl kwb">- QPixmap background;</span> |
1931 | <span class="hl kwb">- QSystemTrayIcon *q;</span> |
1932 | <span class="hl kwb">- Colormap colormap;</span> |
1933 | <span class="hl kwa">+ QSystemTrayIconSysFactoryInterface *factory() const;</span> |
1934 | <span class="hl kwa">+ void loadPluginFactory();</span> |
1935 | <span class="hl kwa">+</span> |
1936 | <span class="hl kwa">+ QSystemTrayIconSysFactoryInterface *pluginFactory;</span> |
1937 | <span class="hl kwa">+ QSet<QSystemTrayIconPrivate *> trayIconPrivates;</span> |
1938 | }; |
1939 | <span class="hl kwb">-#endif // Q_WS_X11</span> |
1940 | <span class="hl kwa">+#endif</span> |
1941 | |
1942 | QT_END_NAMESPACE |
1943 | |
1944 | <span class="hl kwb">--- a/src/gui/util/qsystemtrayicon_x11.cpp</span> |
1945 | <span class="hl kwa">+++ b/src/gui/util/qsystemtrayicon_x11.cpp</span> |
1946 | <span class="hl kwd">@@ -38,311 +38,122 @@</span> |
1947 | ** $QT_END_LICENSE$ |
1948 | ** |
1949 | ****************************************************************************/ |
1950 | <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span> |
1951 | <span class="hl kwa">+</span> |
1952 | <span class="hl kwa">+#include <private/qfactoryloader_p.h></span> |
1953 | |
1954 | <span class="hl kwb">-#include "private/qt_x11_p.h"</span> |
1955 | <span class="hl kwb">-#include "qlabel.h"</span> |
1956 | <span class="hl kwb">-#include "qx11info_x11.h"</span> |
1957 | <span class="hl kwb">-#include "qpainter.h"</span> |
1958 | <span class="hl kwb">-#include "qpixmap.h"</span> |
1959 | <span class="hl kwb">-#include "qbitmap.h"</span> |
1960 | <span class="hl kwb">-#include "qevent.h"</span> |
1961 | <span class="hl kwb">-#include "qapplication.h"</span> |
1962 | <span class="hl kwb">-#include "qlist.h"</span> |
1963 | <span class="hl kwb">-#include "qmenu.h"</span> |
1964 | <span class="hl kwb">-#include "qtimer.h"</span> |
1965 | #include "qsystemtrayicon_p.h" |
1966 | <span class="hl kwb">-#include "qpaintengine.h"</span> |
1967 | <span class="hl kwa">+#include "qabstractsystemtrayiconsys_p.h"</span> |
1968 | <span class="hl kwa">+#include "qcoreapplication.h"</span> |
1969 | <span class="hl kwa">+#include "qxembedsystemtrayicon_x11_p.h"</span> |
1970 | |
1971 | <span class="hl kwb">-#ifndef QT_NO_SYSTEMTRAYICON</span> |
1972 | QT_BEGIN_NAMESPACE |
1973 | |
1974 | <span class="hl kwb">-Window QSystemTrayIconSys::sysTrayWindow = XNone;</span> |
1975 | <span class="hl kwb">-QList<QSystemTrayIconSys *> QSystemTrayIconSys::trayIcons;</span> |
1976 | <span class="hl kwb">-QCoreApplication::EventFilter QSystemTrayIconSys::oldEventFilter = 0;</span> |
1977 | <span class="hl kwb">-Atom QSystemTrayIconSys::sysTraySelection = XNone;</span> |
1978 | <span class="hl kwb">-XVisualInfo QSystemTrayIconSys::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};</span> |
1979 | <span class="hl kwb">-</span> |
1980 | <span class="hl kwb">-// Locate the system tray</span> |
1981 | <span class="hl kwb">-Window QSystemTrayIconSys::locateSystemTray()</span> |
1982 | <span class="hl kwb">-{</span> |
1983 | <span class="hl kwb">- Display *display = QX11Info::display();</span> |
1984 | <span class="hl kwb">- if (sysTraySelection == XNone) {</span> |
1985 | <span class="hl kwb">- int screen = QX11Info::appScreen();</span> |
1986 | <span class="hl kwb">- QString net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen);</span> |
1987 | <span class="hl kwb">- sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);</span> |
1988 | <span class="hl kwb">- }</span> |
1989 | <span class="hl kwb">-</span> |
1990 | <span class="hl kwb">- return XGetSelectionOwner(QX11Info::display(), sysTraySelection);</span> |
1991 | <span class="hl kwb">-}</span> |
1992 | <span class="hl kwa">+Q_GLOBAL_STATIC(QSystemTrayIconSysFactory, qt_guiSystemTrayIconSysFactory)</span> |
1993 | |
1994 | <span class="hl kwb">-XVisualInfo* QSystemTrayIconSys::getSysTrayVisualInfo()</span> |
1995 | <span class="hl kwa">+QSystemTrayIconSysFactory::QSystemTrayIconSysFactory()</span> |
1996 | <span class="hl kwa">+: pluginFactory(0)</span> |
1997 | { |
1998 | <span class="hl kwb">- Display *display = QX11Info::display();</span> |
1999 | <span class="hl kwb">-</span> |
2000 | <span class="hl kwb">- if (!sysTrayVisual.visual) {</span> |
2001 | <span class="hl kwb">- Window win = locateSystemTray();</span> |
2002 | <span class="hl kwb">- if (win != XNone) {</span> |
2003 | <span class="hl kwb">- Atom actual_type;</span> |
2004 | <span class="hl kwb">- int actual_format;</span> |
2005 | <span class="hl kwb">- ulong nitems, bytes_remaining;</span> |
2006 | <span class="hl kwb">- uchar *data = 0;</span> |
2007 | <span class="hl kwb">- int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,</span> |
2008 | <span class="hl kwb">- False, XA_VISUALID, &actual_type,</span> |
2009 | <span class="hl kwb">- &actual_format, &nitems, &bytes_remaining, &data);</span> |
2010 | <span class="hl kwb">- VisualID vid = 0;</span> |
2011 | <span class="hl kwb">- if (result == Success && data && actual_type == XA_VISUALID && actual_format == 32 &&</span> |
2012 | <span class="hl kwb">- nitems == 1 && bytes_remaining == 0)</span> |
2013 | <span class="hl kwb">- vid = *(VisualID*)data;</span> |
2014 | <span class="hl kwb">- if (data)</span> |
2015 | <span class="hl kwb">- XFree(data);</span> |
2016 | <span class="hl kwb">- if (vid == 0)</span> |
2017 | <span class="hl kwb">- return 0;</span> |
2018 | <span class="hl kwb">-</span> |
2019 | <span class="hl kwb">- uint mask = VisualIDMask;</span> |
2020 | <span class="hl kwb">- XVisualInfo *vi, rvi;</span> |
2021 | <span class="hl kwb">- int count;</span> |
2022 | <span class="hl kwb">- rvi.visualid = vid;</span> |
2023 | <span class="hl kwb">- vi = XGetVisualInfo(display, mask, &rvi, &count);</span> |
2024 | <span class="hl kwb">- if (vi) {</span> |
2025 | <span class="hl kwb">- sysTrayVisual = vi[0];</span> |
2026 | <span class="hl kwb">- XFree((char*)vi);</span> |
2027 | <span class="hl kwb">- }</span> |
2028 | <span class="hl kwb">- if (sysTrayVisual.depth != 32)</span> |
2029 | <span class="hl kwb">- memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2030 | <span class="hl kwb">- }</span> |
2031 | <span class="hl kwb">- }</span> |
2032 | <span class="hl kwb">-</span> |
2033 | <span class="hl kwb">- return sysTrayVisual.visual ? &sysTrayVisual : 0;</span> |
2034 | } |
2035 | |
2036 | <span class="hl kwb">-bool QSystemTrayIconSys::sysTrayTracker(void *message, long *result)</span> |
2037 | <span class="hl kwa">+void QSystemTrayIconSysFactory::loadPluginFactory()</span> |
2038 | { |
2039 | <span class="hl kwb">- bool retval = false;</span> |
2040 | <span class="hl kwb">- if (QSystemTrayIconSys::oldEventFilter)</span> |
2041 | <span class="hl kwb">- retval = QSystemTrayIconSys::oldEventFilter(message, result);</span> |
2042 | <span class="hl kwb">-</span> |
2043 | <span class="hl kwb">- if (trayIcons.isEmpty())</span> |
2044 | <span class="hl kwb">- return retval;</span> |
2045 | <span class="hl kwb">-</span> |
2046 | <span class="hl kwb">- Display *display = QX11Info::display();</span> |
2047 | <span class="hl kwb">- XEvent *ev = (XEvent *)message;</span> |
2048 | <span class="hl kwb">- if (ev->type == DestroyNotify && ev->xany.window == sysTrayWindow) {</span> |
2049 | <span class="hl kwb">- sysTrayWindow = locateSystemTray();</span> |
2050 | <span class="hl kwb">- memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2051 | <span class="hl kwb">- for (int i = 0; i < trayIcons.count(); i++) {</span> |
2052 | <span class="hl kwb">- if (sysTrayWindow == XNone) {</span> |
2053 | <span class="hl kwb">- QBalloonTip::hideBalloon();</span> |
2054 | <span class="hl kwb">- trayIcons[i]->hide(); // still no luck</span> |
2055 | <span class="hl kwb">- trayIcons[i]->destroy();</span> |
2056 | <span class="hl kwb">- trayIcons[i]->create();</span> |
2057 | <span class="hl kwb">- } else</span> |
2058 | <span class="hl kwb">- trayIcons[i]->addToTray(); // add it to the new tray</span> |
2059 | <span class="hl kwb">- }</span> |
2060 | <span class="hl kwb">- retval = true;</span> |
2061 | <span class="hl kwb">- } else if (ev->type == ClientMessage && sysTrayWindow == XNone) {</span> |
2062 | <span class="hl kwb">- static Atom manager_atom = XInternAtom(display, "MANAGER", False);</span> |
2063 | <span class="hl kwb">- XClientMessageEvent *cm = (XClientMessageEvent *)message;</span> |
2064 | <span class="hl kwb">- if ((cm->message_type == manager_atom) && ((Atom)cm->data.l[1] == sysTraySelection)) {</span> |
2065 | <span class="hl kwb">- sysTrayWindow = cm->data.l[2];</span> |
2066 | <span class="hl kwb">- memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2067 | <span class="hl kwb">- XSelectInput(display, sysTrayWindow, StructureNotifyMask);</span> |
2068 | <span class="hl kwb">- for (int i = 0; i < trayIcons.count(); i++) {</span> |
2069 | <span class="hl kwb">- trayIcons[i]->addToTray();</span> |
2070 | <span class="hl kwb">- }</span> |
2071 | <span class="hl kwb">- retval = true;</span> |
2072 | <span class="hl kwb">- }</span> |
2073 | <span class="hl kwb">- } else if (ev->type == PropertyNotify && ev->xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &&</span> |
2074 | <span class="hl kwb">- ev->xproperty.window == sysTrayWindow) {</span> |
2075 | <span class="hl kwb">- memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2076 | <span class="hl kwb">- for (int i = 0; i < trayIcons.count(); i++) {</span> |
2077 | <span class="hl kwb">- trayIcons[i]->addToTray();</span> |
2078 | <span class="hl kwb">- }</span> |
2079 | <span class="hl kwb">- }</span> |
2080 | <span class="hl kwb">-</span> |
2081 | <span class="hl kwb">- return retval;</span> |
2082 | <span class="hl kwb">-}</span> |
2083 | <span class="hl kwb">-</span> |
2084 | <span class="hl kwb">-QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *q)</span> |
2085 | <span class="hl kwb">- : QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint),</span> |
2086 | <span class="hl kwb">- q(q), colormap(0)</span> |
2087 | <span class="hl kwb">-{</span> |
2088 | <span class="hl kwb">- setAttribute(Qt::WA_AlwaysShowToolTips);</span> |
2089 | <span class="hl kwb">- setAttribute(Qt::WA_QuitOnClose, false);</span> |
2090 | <span class="hl kwb">- setAttribute(Qt::WA_NoSystemBackground, true);</span> |
2091 | <span class="hl kwb">- setAttribute(Qt::WA_PaintOnScreen);</span> |
2092 | <span class="hl kwb">-</span> |
2093 | <span class="hl kwb">- static bool eventFilterAdded = false;</span> |
2094 | <span class="hl kwb">- Display *display = QX11Info::display();</span> |
2095 | <span class="hl kwb">- if (!eventFilterAdded) {</span> |
2096 | <span class="hl kwb">- oldEventFilter = qApp->setEventFilter(sysTrayTracker);</span> |
2097 | <span class="hl kwb">- eventFilterAdded = true;</span> |
2098 | <span class="hl kwb">- Window root = QX11Info::appRootWindow();</span> |
2099 | <span class="hl kwb">- XWindowAttributes attr;</span> |
2100 | <span class="hl kwb">- XGetWindowAttributes(display, root, &attr);</span> |
2101 | <span class="hl kwb">- if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {</span> |
2102 | <span class="hl kwb">- (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden</span> |
2103 | <span class="hl kwb">- XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection</span> |
2104 | <span class="hl kwb">- }</span> |
2105 | <span class="hl kwa">+ if (pluginFactory) {</span> |
2106 | <span class="hl kwa">+ return;</span> |
2107 | } |
2108 | <span class="hl kwb">- if (trayIcons.isEmpty()) {</span> |
2109 | <span class="hl kwb">- sysTrayWindow = locateSystemTray();</span> |
2110 | <span class="hl kwb">- if (sysTrayWindow != XNone)</span> |
2111 | <span class="hl kwb">- XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events</span> |
2112 | <span class="hl kwa">+#ifndef QT_NO_LIBRARY</span> |
2113 | <span class="hl kwa">+ QFactoryLoader loader(QSystemTrayIconSysFactoryInterface_iid, QLatin1String("/systemtrayicon"));</span> |
2114 | <span class="hl kwa">+ pluginFactory = qobject_cast<QSystemTrayIconSysFactoryInterface *>(loader.instance(QLatin1String("default")));</span> |
2115 | <span class="hl kwa">+ if (pluginFactory) {</span> |
2116 | <span class="hl kwa">+ // Set parent to ensure factory destructor is called when application</span> |
2117 | <span class="hl kwa">+ // is closed</span> |
2118 | <span class="hl kwa">+ pluginFactory->setParent(QCoreApplication::instance());</span> |
2119 | <span class="hl kwa">+ connect(pluginFactory, SIGNAL(availableChanged(bool)), SLOT(refreshTrayIconPrivates()));</span> |
2120 | } |
2121 | <span class="hl kwb">- trayIcons.append(this);</span> |
2122 | <span class="hl kwb">- setMouseTracking(true);</span> |
2123 | <span class="hl kwb">-#ifndef QT_NO_TOOLTIP</span> |
2124 | <span class="hl kwb">- setToolTip(q->toolTip());</span> |
2125 | <span class="hl kwb">-#endif</span> |
2126 | <span class="hl kwb">- if (sysTrayWindow != XNone)</span> |
2127 | <span class="hl kwb">- addToTray();</span> |
2128 | <span class="hl kwa">+#endif // QT_NO_LIBRARY</span> |
2129 | } |
2130 | |
2131 | <span class="hl kwb">-QSystemTrayIconSys::~QSystemTrayIconSys()</span> |
2132 | <span class="hl kwa">+QSystemTrayIconSysFactoryInterface *QSystemTrayIconSysFactory::factory() const</span> |
2133 | { |
2134 | <span class="hl kwb">- trayIcons.removeAt(trayIcons.indexOf(this));</span> |
2135 | <span class="hl kwb">- Display *display = QX11Info::display();</span> |
2136 | <span class="hl kwb">- if (trayIcons.isEmpty()) {</span> |
2137 | <span class="hl kwb">- if (sysTrayWindow == XNone)</span> |
2138 | <span class="hl kwb">- return;</span> |
2139 | <span class="hl kwb">- if (display)</span> |
2140 | <span class="hl kwb">- XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray</span> |
2141 | <span class="hl kwb">- sysTrayWindow = XNone;</span> |
2142 | <span class="hl kwa">+ if (!pluginFactory) {</span> |
2143 | <span class="hl kwa">+ const_cast<QSystemTrayIconSysFactory*>(this)->loadPluginFactory();</span> |
2144 | } |
2145 | <span class="hl kwb">- if (colormap)</span> |
2146 | <span class="hl kwb">- XFreeColormap(display, colormap);</span> |
2147 | <span class="hl kwa">+ if (pluginFactory && pluginFactory->isAvailable()) {</span> |
2148 | <span class="hl kwa">+ return pluginFactory;</span> |
2149 | <span class="hl kwa">+ }</span> |
2150 | <span class="hl kwa">+ static QXEmbedSystemTrayIconSysFactory def;</span> |
2151 | <span class="hl kwa">+ return def.isAvailable() ? &def : 0;</span> |
2152 | } |
2153 | |
2154 | <span class="hl kwb">-void QSystemTrayIconSys::addToTray()</span> |
2155 | <span class="hl kwa">+void QSystemTrayIconSysFactory::refreshTrayIconPrivates()</span> |
2156 | { |
2157 | <span class="hl kwb">- Q_ASSERT(sysTrayWindow != XNone);</span> |
2158 | <span class="hl kwb">- Display *display = QX11Info::display();</span> |
2159 | <span class="hl kwb">-</span> |
2160 | <span class="hl kwb">- XVisualInfo *vi = getSysTrayVisualInfo();</span> |
2161 | <span class="hl kwb">- if (vi && vi->visual) {</span> |
2162 | <span class="hl kwb">- Window root = RootWindow(display, vi->screen);</span> |
2163 | <span class="hl kwb">- Window p = root;</span> |
2164 | <span class="hl kwb">- if (QWidget *pw = parentWidget())</span> |
2165 | <span class="hl kwb">- p = pw->effectiveWinId();</span> |
2166 | <span class="hl kwb">- colormap = XCreateColormap(display, root, vi->visual, AllocNone);</span> |
2167 | <span class="hl kwb">- XSetWindowAttributes wsa;</span> |
2168 | <span class="hl kwb">- wsa.background_pixmap = 0;</span> |
2169 | <span class="hl kwb">- wsa.colormap = colormap;</span> |
2170 | <span class="hl kwb">- wsa.background_pixel = 0;</span> |
2171 | <span class="hl kwb">- wsa.border_pixel = 0;</span> |
2172 | <span class="hl kwb">- Window wid = XCreateWindow(display, p, -1, -1, 1, 1,</span> |
2173 | <span class="hl kwb">- 0, vi->depth, InputOutput, vi->visual,</span> |
2174 | <span class="hl kwb">- CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &wsa);</span> |
2175 | <span class="hl kwb">- create(wid);</span> |
2176 | <span class="hl kwb">- } else {</span> |
2177 | <span class="hl kwb">- XSetWindowBackgroundPixmap(display, winId(), ParentRelative);</span> |
2178 | <span class="hl kwb">- }</span> |
2179 | <span class="hl kwb">-</span> |
2180 | <span class="hl kwb">- // GNOME, NET WM Specification</span> |
2181 | <span class="hl kwb">- static Atom netwm_tray_atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False);</span> |
2182 | <span class="hl kwb">- long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast<long>(winId()), 0, 0 };</span> |
2183 | <span class="hl kwb">- XEvent ev;</span> |
2184 | <span class="hl kwb">- memset(&ev, 0, sizeof(ev));</span> |
2185 | <span class="hl kwb">- ev.xclient.type = ClientMessage;</span> |
2186 | <span class="hl kwb">- ev.xclient.window = sysTrayWindow;</span> |
2187 | <span class="hl kwb">- ev.xclient.message_type = netwm_tray_atom;</span> |
2188 | <span class="hl kwb">- ev.xclient.format = 32;</span> |
2189 | <span class="hl kwb">- memcpy((char *)&ev.xclient.data, (const char *) l, sizeof(l));</span> |
2190 | <span class="hl kwb">- XSendEvent(display, sysTrayWindow, False, 0, &ev);</span> |
2191 | <span class="hl kwb">- setMinimumSize(22, 22); // required at least on GNOME</span> |
2192 | <span class="hl kwb">-}</span> |
2193 | <span class="hl kwb">-</span> |
2194 | <span class="hl kwb">-void QSystemTrayIconSys::updateIcon()</span> |
2195 | <span class="hl kwb">-{</span> |
2196 | <span class="hl kwb">- update();</span> |
2197 | <span class="hl kwb">-}</span> |
2198 | <span class="hl kwb">-</span> |
2199 | <span class="hl kwb">-void QSystemTrayIconSys::resizeEvent(QResizeEvent *re)</span> |
2200 | <span class="hl kwb">-{</span> |
2201 | <span class="hl kwb">- QWidget::resizeEvent(re);</span> |
2202 | <span class="hl kwb">- updateIcon();</span> |
2203 | <span class="hl kwb">-}</span> |
2204 | <span class="hl kwb">-</span> |
2205 | <span class="hl kwb">-void QSystemTrayIconSys::paintEvent(QPaintEvent*)</span> |
2206 | <span class="hl kwb">-{</span> |
2207 | <span class="hl kwb">- QPainter p(this);</span> |
2208 | <span class="hl kwb">- if (!getSysTrayVisualInfo()) {</span> |
2209 | <span class="hl kwb">- const QRegion oldSystemClip = p.paintEngine()->systemClip();</span> |
2210 | <span class="hl kwb">- const QRect clearedRect = oldSystemClip.boundingRect();</span> |
2211 | <span class="hl kwb">- XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),</span> |
2212 | <span class="hl kwb">- clearedRect.width(), clearedRect.height(), False);</span> |
2213 | <span class="hl kwb">- QPaintEngine *pe = p.paintEngine();</span> |
2214 | <span class="hl kwb">- pe->setSystemClip(clearedRect);</span> |
2215 | <span class="hl kwb">- q->icon().paint(&p, rect());</span> |
2216 | <span class="hl kwb">- pe->setSystemClip(oldSystemClip);</span> |
2217 | <span class="hl kwb">- } else {</span> |
2218 | <span class="hl kwb">- p.setCompositionMode(QPainter::CompositionMode_Source);</span> |
2219 | <span class="hl kwb">- p.fillRect(rect(), Qt::transparent);</span> |
2220 | <span class="hl kwb">- p.setCompositionMode(QPainter::CompositionMode_SourceOver);</span> |
2221 | <span class="hl kwb">- q->icon().paint(&p, rect());</span> |
2222 | <span class="hl kwa">+ Q_FOREACH(QSystemTrayIconPrivate *trayIconPrivate, trayIconPrivates) {</span> |
2223 | <span class="hl kwa">+ if (trayIconPrivate->sys) {</span> |
2224 | <span class="hl kwa">+ delete trayIconPrivate->sys;</span> |
2225 | <span class="hl kwa">+ trayIconPrivate->sys = 0;</span> |
2226 | <span class="hl kwa">+ }</span> |
2227 | <span class="hl kwa">+ // When visible is true, sys is usually not 0 but it can be 0 if the</span> |
2228 | <span class="hl kwa">+ // call to install_sys() failed.</span> |
2229 | <span class="hl kwa">+ if (trayIconPrivate->visible) {</span> |
2230 | <span class="hl kwa">+ trayIconPrivate->install_sys();</span> |
2231 | <span class="hl kwa">+ }</span> |
2232 | } |
2233 | } |
2234 | |
2235 | <span class="hl kwb">-void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev)</span> |
2236 | <span class="hl kwa">+void QSystemTrayIconSysFactory::registerSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)</span> |
2237 | { |
2238 | <span class="hl kwb">- QPoint globalPos = ev->globalPos();</span> |
2239 | <span class="hl kwb">- if (ev->button() == Qt::RightButton && q->contextMenu())</span> |
2240 | <span class="hl kwb">- q->contextMenu()->popup(globalPos);</span> |
2241 | <span class="hl kwb">-</span> |
2242 | <span class="hl kwb">- if (QBalloonTip::isBalloonVisible()) {</span> |
2243 | <span class="hl kwb">- emit q->messageClicked();</span> |
2244 | <span class="hl kwb">- QBalloonTip::hideBalloon();</span> |
2245 | <span class="hl kwb">- }</span> |
2246 | <span class="hl kwb">-</span> |
2247 | <span class="hl kwb">- if (ev->button() == Qt::LeftButton)</span> |
2248 | <span class="hl kwb">- emit q->activated(QSystemTrayIcon::Trigger);</span> |
2249 | <span class="hl kwb">- else if (ev->button() == Qt::RightButton)</span> |
2250 | <span class="hl kwb">- emit q->activated(QSystemTrayIcon::Context);</span> |
2251 | <span class="hl kwb">- else if (ev->button() == Qt::MidButton)</span> |
2252 | <span class="hl kwb">- emit q->activated(QSystemTrayIcon::MiddleClick);</span> |
2253 | <span class="hl kwa">+ trayIconPrivates.insert(trayIconPrivate);</span> |
2254 | } |
2255 | |
2256 | <span class="hl kwb">-void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev)</span> |
2257 | <span class="hl kwa">+void QSystemTrayIconSysFactory::unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)</span> |
2258 | { |
2259 | <span class="hl kwb">- if (ev->button() == Qt::LeftButton)</span> |
2260 | <span class="hl kwb">- emit q->activated(QSystemTrayIcon::DoubleClick);</span> |
2261 | <span class="hl kwa">+ trayIconPrivates.remove(trayIconPrivate);</span> |
2262 | } |
2263 | |
2264 | <span class="hl kwb">-#ifndef QT_NO_WHEELEVENT</span> |
2265 | <span class="hl kwb">-void QSystemTrayIconSys::wheelEvent(QWheelEvent *e)</span> |
2266 | <span class="hl kwa">+QAbstractSystemTrayIconSys *QSystemTrayIconSysFactory::create(QSystemTrayIcon *trayIcon) const</span> |
2267 | { |
2268 | <span class="hl kwb">- QApplication::sendEvent(q, e);</span> |
2269 | <span class="hl kwa">+ QSystemTrayIconSysFactoryInterface *f = factory();</span> |
2270 | <span class="hl kwa">+ if (!f) {</span> |
2271 | <span class="hl kwa">+ qWarning("No systemtrayicon available");</span> |
2272 | <span class="hl kwa">+ return 0;</span> |
2273 | <span class="hl kwa">+ }</span> |
2274 | <span class="hl kwa">+ return f->create(trayIcon);</span> |
2275 | } |
2276 | <span class="hl kwb">-#endif</span> |
2277 | |
2278 | <span class="hl kwb">-bool QSystemTrayIconSys::event(QEvent *e)</span> |
2279 | <span class="hl kwa">+bool QSystemTrayIconSysFactory::isAvailable() const</span> |
2280 | { |
2281 | <span class="hl kwb">- if (e->type() == QEvent::ToolTip) {</span> |
2282 | <span class="hl kwb">- return QApplication::sendEvent(q, e);</span> |
2283 | <span class="hl kwb">- }</span> |
2284 | <span class="hl kwb">- return QWidget::event(e);</span> |
2285 | <span class="hl kwa">+ return factory();</span> |
2286 | } |
2287 | |
2288 | <span class="hl kwb">-bool QSystemTrayIconSys::x11Event(XEvent *event)</span> |
2289 | <span class="hl kwa">+////////////////////////////////////////////////</span> |
2290 | <span class="hl kwa">+QSystemTrayIconPrivate::~QSystemTrayIconPrivate()</span> |
2291 | { |
2292 | <span class="hl kwb">- if (event->type == ReparentNotify)</span> |
2293 | <span class="hl kwb">- show();</span> |
2294 | <span class="hl kwb">- return QWidget::x11Event(event);</span> |
2295 | <span class="hl kwa">+ qt_guiSystemTrayIconSysFactory()->unregisterSystemTrayIconPrivate(this);</span> |
2296 | <span class="hl kwa">+ delete sys;</span> |
2297 | } |
2298 | |
2299 | <span class="hl kwb">-////////////////////////////////////////////////////////////////////////////</span> |
2300 | void QSystemTrayIconPrivate::install_sys() |
2301 | { |
2302 | Q_Q(QSystemTrayIcon); |
2303 | <span class="hl kwb">- if (!sys)</span> |
2304 | <span class="hl kwb">- sys = new QSystemTrayIconSys(q);</span> |
2305 | <span class="hl kwa">+ if (!sys) {</span> |
2306 | <span class="hl kwa">+ // Register ourself even if create() fails: our "sys" will get created</span> |
2307 | <span class="hl kwa">+ // later by refreshTrayIconPrivates() if a systemtray becomes</span> |
2308 | <span class="hl kwa">+ // available. This situation can happen for applications which are</span> |
2309 | <span class="hl kwa">+ // started at login time, while the desktop itself is starting up.</span> |
2310 | <span class="hl kwa">+ qt_guiSystemTrayIconSysFactory()->registerSystemTrayIconPrivate(this);</span> |
2311 | <span class="hl kwa">+ sys = qt_guiSystemTrayIconSysFactory()->create(q);</span> |
2312 | <span class="hl kwa">+ if (!sys) {</span> |
2313 | <span class="hl kwa">+ return;</span> |
2314 | <span class="hl kwa">+ }</span> |
2315 | <span class="hl kwa">+ }</span> |
2316 | <span class="hl kwa">+ sys->updateVisibility();</span> |
2317 | } |
2318 | |
2319 | QRect QSystemTrayIconPrivate::geometry_sys() const |
2320 | { |
2321 | <span class="hl kwb">- if (!sys)</span> |
2322 | <span class="hl kwb">- return QRect();</span> |
2323 | <span class="hl kwb">- return QRect(sys->mapToGlobal(QPoint(0, 0)), sys->size());</span> |
2324 | <span class="hl kwa">+ if (!sys || !visible)</span> |
2325 | <span class="hl kwa">+ return QRect();</span> |
2326 | <span class="hl kwa">+ return sys->geometry();</span> |
2327 | } |
2328 | |
2329 | void QSystemTrayIconPrivate::remove_sys() |
2330 | <span class="hl kwd">@@ -350,35 +161,35 @@</span> |
2331 | if (!sys) |
2332 | return; |
2333 | QBalloonTip::hideBalloon(); |
2334 | <span class="hl kwb">- sys->hide(); // this should do the trick, but...</span> |
2335 | <span class="hl kwb">- delete sys; // wm may resize system tray only for DestroyEvents</span> |
2336 | <span class="hl kwb">- sys = 0;</span> |
2337 | <span class="hl kwa">+ sys->updateVisibility();</span> |
2338 | } |
2339 | |
2340 | void QSystemTrayIconPrivate::updateIcon_sys() |
2341 | { |
2342 | <span class="hl kwb">- if (!sys)</span> |
2343 | <span class="hl kwa">+ if (!sys || !visible)</span> |
2344 | return; |
2345 | sys->updateIcon(); |
2346 | } |
2347 | |
2348 | void QSystemTrayIconPrivate::updateMenu_sys() |
2349 | { |
2350 | <span class="hl kwb">-</span> |
2351 | <span class="hl kwa">+ if (!sys || !visible)</span> |
2352 | <span class="hl kwa">+ return;</span> |
2353 | <span class="hl kwa">+ sys->updateMenu();</span> |
2354 | } |
2355 | |
2356 | void QSystemTrayIconPrivate::updateToolTip_sys() |
2357 | { |
2358 | <span class="hl kwb">- if (!sys)</span> |
2359 | <span class="hl kwa">+ if (!sys || !visible)</span> |
2360 | return; |
2361 | #ifndef QT_NO_TOOLTIP |
2362 | <span class="hl kwb">- sys->setToolTip(toolTip);</span> |
2363 | <span class="hl kwa">+ sys->updateToolTip();</span> |
2364 | #endif |
2365 | } |
2366 | |
2367 | bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() |
2368 | { |
2369 | <span class="hl kwb">- return QSystemTrayIconSys::locateSystemTray() != XNone;</span> |
2370 | <span class="hl kwa">+ return qt_guiSystemTrayIconSysFactory()->isAvailable();</span> |
2371 | } |
2372 | |
2373 | bool QSystemTrayIconPrivate::supportsMessages_sys() |
2374 | <span class="hl kwd">@@ -389,12 +200,9 @@</span> |
2375 | void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title, |
2376 | QSystemTrayIcon::MessageIcon icon, int msecs) |
2377 | { |
2378 | <span class="hl kwb">- if (!sys)</span> |
2379 | <span class="hl kwa">+ if (!sys || !visible)</span> |
2380 | return; |
2381 | <span class="hl kwb">- QPoint g = sys->mapToGlobal(QPoint(0, 0));</span> |
2382 | <span class="hl kwb">- QBalloonTip::showBalloon(icon, message, title, sys->q,</span> |
2383 | <span class="hl kwb">- QPoint(g.x() + sys->width()/2, g.y() + sys->height()/2),</span> |
2384 | <span class="hl kwb">- msecs);</span> |
2385 | <span class="hl kwa">+ sys->showMessage(message, title, icon, msecs);</span> |
2386 | } |
2387 | |
2388 | QT_END_NAMESPACE |
2389 | <span class="hl kwb">--- /dev/null</span> |
2390 | <span class="hl kwa">+++ b/src/gui/util/qxembedsystemtrayicon_x11.cpp</span> |
2391 | <span class="hl kwd">@@ -0,0 +1,469 @@</span> |
2392 | <span class="hl kwa">+/****************************************************************************</span> |
2393 | <span class="hl kwa">+**</span> |
2394 | <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span> |
2395 | <span class="hl kwa">+** All rights reserved.</span> |
2396 | <span class="hl kwa">+** Contact: Nokia Corporation (qt-info@nokia.com)</span> |
2397 | <span class="hl kwa">+**</span> |
2398 | <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span> |
2399 | <span class="hl kwa">+**</span> |
2400 | <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span> |
2401 | <span class="hl kwa">+** GNU Lesser General Public License Usage</span> |
2402 | <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span> |
2403 | <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span> |
2404 | <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span> |
2405 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span> |
2406 | <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span> |
2407 | <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span> |
2408 | <span class="hl kwa">+**</span> |
2409 | <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span> |
2410 | <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span> |
2411 | <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span> |
2412 | <span class="hl kwa">+**</span> |
2413 | <span class="hl kwa">+** GNU General Public License Usage</span> |
2414 | <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span> |
2415 | <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span> |
2416 | <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span> |
2417 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span> |
2418 | <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span> |
2419 | <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span> |
2420 | <span class="hl kwa">+**</span> |
2421 | <span class="hl kwa">+** Other Usage</span> |
2422 | <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span> |
2423 | <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span> |
2424 | <span class="hl kwa">+**</span> |
2425 | <span class="hl kwa">+**</span> |
2426 | <span class="hl kwa">+**</span> |
2427 | <span class="hl kwa">+**</span> |
2428 | <span class="hl kwa">+**</span> |
2429 | <span class="hl kwa">+** $QT_END_LICENSE$</span> |
2430 | <span class="hl kwa">+**</span> |
2431 | <span class="hl kwa">+****************************************************************************/</span> |
2432 | <span class="hl kwa">+#include "qxembedsystemtrayicon_x11_p.h"</span> |
2433 | <span class="hl kwa">+</span> |
2434 | <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span> |
2435 | <span class="hl kwa">+</span> |
2436 | <span class="hl kwa">+#include "private/qt_x11_p.h"</span> |
2437 | <span class="hl kwa">+#include "qapplication.h"</span> |
2438 | <span class="hl kwa">+#include "qevent.h"</span> |
2439 | <span class="hl kwa">+#include "qlist.h"</span> |
2440 | <span class="hl kwa">+#include "qmenu.h"</span> |
2441 | <span class="hl kwa">+#include "qpainter.h"</span> |
2442 | <span class="hl kwa">+#include "qpaintengine.h"</span> |
2443 | <span class="hl kwa">+#include "qsystemtrayicon_p.h"</span> |
2444 | <span class="hl kwa">+#include "qx11info_x11.h"</span> |
2445 | <span class="hl kwa">+</span> |
2446 | <span class="hl kwa">+QT_BEGIN_INCLUDE_NAMESPACE</span> |
2447 | <span class="hl kwa">+#include <QtCore/qcoreapplication.h></span> |
2448 | <span class="hl kwa">+#include <X11/Xlib.h></span> |
2449 | <span class="hl kwa">+#include <X11/Xatom.h></span> |
2450 | <span class="hl kwa">+#include <X11/Xutil.h></span> |
2451 | <span class="hl kwa">+QT_END_INCLUDE_NAMESPACE</span> |
2452 | <span class="hl kwa">+</span> |
2453 | <span class="hl kwa">+QT_BEGIN_NAMESPACE</span> |
2454 | <span class="hl kwa">+</span> |
2455 | <span class="hl kwa">+class QSystemTrayIconWidget : public QWidget</span> |
2456 | <span class="hl kwa">+{</span> |
2457 | <span class="hl kwa">+public:</span> |
2458 | <span class="hl kwa">+ QSystemTrayIconWidget(QSystemTrayIcon *q, QXEmbedSystemTrayIconSys *s);</span> |
2459 | <span class="hl kwa">+ ~QSystemTrayIconWidget();</span> |
2460 | <span class="hl kwa">+</span> |
2461 | <span class="hl kwa">+ static Window locateSystemTray();</span> |
2462 | <span class="hl kwa">+</span> |
2463 | <span class="hl kwa">+protected:</span> |
2464 | <span class="hl kwa">+ void paintEvent(QPaintEvent *pe);</span> |
2465 | <span class="hl kwa">+ void resizeEvent(QResizeEvent *re);</span> |
2466 | <span class="hl kwa">+ bool x11Event(XEvent *event);</span> |
2467 | <span class="hl kwa">+ void mousePressEvent(QMouseEvent *event);</span> |
2468 | <span class="hl kwa">+ void mouseDoubleClickEvent(QMouseEvent *event);</span> |
2469 | <span class="hl kwa">+#ifndef QT_NO_WHEELEVENT</span> |
2470 | <span class="hl kwa">+ void wheelEvent(QWheelEvent *event);</span> |
2471 | <span class="hl kwa">+#endif</span> |
2472 | <span class="hl kwa">+ bool event(QEvent *e);</span> |
2473 | <span class="hl kwa">+</span> |
2474 | <span class="hl kwa">+private:</span> |
2475 | <span class="hl kwa">+ enum {</span> |
2476 | <span class="hl kwa">+ SYSTEM_TRAY_REQUEST_DOCK = 0,</span> |
2477 | <span class="hl kwa">+ SYSTEM_TRAY_BEGIN_MESSAGE = 1,</span> |
2478 | <span class="hl kwa">+ SYSTEM_TRAY_CANCEL_MESSAGE =2</span> |
2479 | <span class="hl kwa">+ };</span> |
2480 | <span class="hl kwa">+</span> |
2481 | <span class="hl kwa">+ void addToTray();</span> |
2482 | <span class="hl kwa">+ static XVisualInfo* getSysTrayVisualInfo();</span> |
2483 | <span class="hl kwa">+</span> |
2484 | <span class="hl kwa">+ static Window sysTrayWindow;</span> |
2485 | <span class="hl kwa">+ static QList<QSystemTrayIconWidget *> trayIcons;</span> |
2486 | <span class="hl kwa">+ static QCoreApplication::EventFilter oldEventFilter;</span> |
2487 | <span class="hl kwa">+ static bool sysTrayTracker(void *message, long *result);</span> |
2488 | <span class="hl kwa">+ static Atom sysTraySelection;</span> |
2489 | <span class="hl kwa">+ static XVisualInfo sysTrayVisual;</span> |
2490 | <span class="hl kwa">+</span> |
2491 | <span class="hl kwa">+ QSystemTrayIcon *q;</span> |
2492 | <span class="hl kwa">+ QXEmbedSystemTrayIconSys *sys;</span> |
2493 | <span class="hl kwa">+ Colormap colormap;</span> |
2494 | <span class="hl kwa">+};</span> |
2495 | <span class="hl kwa">+</span> |
2496 | <span class="hl kwa">+Window QSystemTrayIconWidget::sysTrayWindow = XNone;</span> |
2497 | <span class="hl kwa">+QList<QSystemTrayIconWidget *> QSystemTrayIconWidget::trayIcons;</span> |
2498 | <span class="hl kwa">+QCoreApplication::EventFilter QSystemTrayIconWidget::oldEventFilter = 0;</span> |
2499 | <span class="hl kwa">+Atom QSystemTrayIconWidget::sysTraySelection = XNone;</span> |
2500 | <span class="hl kwa">+XVisualInfo QSystemTrayIconWidget::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};</span> |
2501 | <span class="hl kwa">+</span> |
2502 | <span class="hl kwa">+QSystemTrayIconWidget::QSystemTrayIconWidget(QSystemTrayIcon* q, QXEmbedSystemTrayIconSys* sys)</span> |
2503 | <span class="hl kwa">+: QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)</span> |
2504 | <span class="hl kwa">+, q(q)</span> |
2505 | <span class="hl kwa">+, sys(sys)</span> |
2506 | <span class="hl kwa">+, colormap(0)</span> |
2507 | <span class="hl kwa">+{</span> |
2508 | <span class="hl kwa">+ setAttribute(Qt::WA_AlwaysShowToolTips);</span> |
2509 | <span class="hl kwa">+ setAttribute(Qt::WA_QuitOnClose, false);</span> |
2510 | <span class="hl kwa">+ setAttribute(Qt::WA_NoSystemBackground, true);</span> |
2511 | <span class="hl kwa">+ setAttribute(Qt::WA_PaintOnScreen);</span> |
2512 | <span class="hl kwa">+ setMouseTracking(true);</span> |
2513 | <span class="hl kwa">+#ifndef QT_NO_TOOLTIP</span> |
2514 | <span class="hl kwa">+ setToolTip(q->toolTip());</span> |
2515 | <span class="hl kwa">+#endif</span> |
2516 | <span class="hl kwa">+</span> |
2517 | <span class="hl kwa">+ static bool eventFilterAdded = false;</span> |
2518 | <span class="hl kwa">+ Display *display = QX11Info::display();</span> |
2519 | <span class="hl kwa">+ if (!eventFilterAdded) {</span> |
2520 | <span class="hl kwa">+ oldEventFilter = qApp->setEventFilter(sysTrayTracker);</span> |
2521 | <span class="hl kwa">+ eventFilterAdded = true;</span> |
2522 | <span class="hl kwa">+ Window root = QX11Info::appRootWindow();</span> |
2523 | <span class="hl kwa">+ XWindowAttributes attr;</span> |
2524 | <span class="hl kwa">+ XGetWindowAttributes(display, root, &attr);</span> |
2525 | <span class="hl kwa">+ if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {</span> |
2526 | <span class="hl kwa">+ (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden</span> |
2527 | <span class="hl kwa">+ XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection</span> |
2528 | <span class="hl kwa">+ }</span> |
2529 | <span class="hl kwa">+ }</span> |
2530 | <span class="hl kwa">+ if (trayIcons.isEmpty()) {</span> |
2531 | <span class="hl kwa">+ sysTrayWindow = locateSystemTray();</span> |
2532 | <span class="hl kwa">+ if (sysTrayWindow != XNone)</span> |
2533 | <span class="hl kwa">+ XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events</span> |
2534 | <span class="hl kwa">+ }</span> |
2535 | <span class="hl kwa">+ trayIcons.append(this);</span> |
2536 | <span class="hl kwa">+ if (sysTrayWindow != XNone)</span> |
2537 | <span class="hl kwa">+ addToTray();</span> |
2538 | <span class="hl kwa">+}</span> |
2539 | <span class="hl kwa">+</span> |
2540 | <span class="hl kwa">+QSystemTrayIconWidget::~QSystemTrayIconWidget()</span> |
2541 | <span class="hl kwa">+{</span> |
2542 | <span class="hl kwa">+ trayIcons.removeAt(trayIcons.indexOf(this));</span> |
2543 | <span class="hl kwa">+ Display *display = QX11Info::display();</span> |
2544 | <span class="hl kwa">+ if (trayIcons.isEmpty()) {</span> |
2545 | <span class="hl kwa">+ if (sysTrayWindow == XNone)</span> |
2546 | <span class="hl kwa">+ return;</span> |
2547 | <span class="hl kwa">+ if (display)</span> |
2548 | <span class="hl kwa">+ XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray</span> |
2549 | <span class="hl kwa">+ sysTrayWindow = XNone;</span> |
2550 | <span class="hl kwa">+ }</span> |
2551 | <span class="hl kwa">+ if (colormap)</span> |
2552 | <span class="hl kwa">+ XFreeColormap(display, colormap);</span> |
2553 | <span class="hl kwa">+}</span> |
2554 | <span class="hl kwa">+</span> |
2555 | <span class="hl kwa">+void QSystemTrayIconWidget::resizeEvent(QResizeEvent *re)</span> |
2556 | <span class="hl kwa">+{</span> |
2557 | <span class="hl kwa">+ QWidget::resizeEvent(re);</span> |
2558 | <span class="hl kwa">+ update();</span> |
2559 | <span class="hl kwa">+}</span> |
2560 | <span class="hl kwa">+</span> |
2561 | <span class="hl kwa">+void QSystemTrayIconWidget::paintEvent(QPaintEvent*)</span> |
2562 | <span class="hl kwa">+{</span> |
2563 | <span class="hl kwa">+ QPainter p(this);</span> |
2564 | <span class="hl kwa">+ if (!getSysTrayVisualInfo()) {</span> |
2565 | <span class="hl kwa">+ const QRegion oldSystemClip = p.paintEngine()->systemClip();</span> |
2566 | <span class="hl kwa">+ const QRect clearedRect = oldSystemClip.boundingRect();</span> |
2567 | <span class="hl kwa">+ XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),</span> |
2568 | <span class="hl kwa">+ clearedRect.width(), clearedRect.height(), False);</span> |
2569 | <span class="hl kwa">+ QPaintEngine *pe = p.paintEngine();</span> |
2570 | <span class="hl kwa">+ pe->setSystemClip(clearedRect);</span> |
2571 | <span class="hl kwa">+ q->icon().paint(&p, rect());</span> |
2572 | <span class="hl kwa">+ pe->setSystemClip(oldSystemClip);</span> |
2573 | <span class="hl kwa">+ } else {</span> |
2574 | <span class="hl kwa">+ p.setCompositionMode(QPainter::CompositionMode_Source);</span> |
2575 | <span class="hl kwa">+ p.fillRect(rect(), Qt::transparent);</span> |
2576 | <span class="hl kwa">+ p.setCompositionMode(QPainter::CompositionMode_SourceOver);</span> |
2577 | <span class="hl kwa">+ q->icon().paint(&p, rect());</span> |
2578 | <span class="hl kwa">+ }</span> |
2579 | <span class="hl kwa">+}</span> |
2580 | <span class="hl kwa">+</span> |
2581 | <span class="hl kwa">+void QSystemTrayIconWidget::mousePressEvent(QMouseEvent *ev)</span> |
2582 | <span class="hl kwa">+{</span> |
2583 | <span class="hl kwa">+ QPoint globalPos = ev->globalPos();</span> |
2584 | <span class="hl kwa">+ if (ev->button() == Qt::RightButton && q->contextMenu())</span> |
2585 | <span class="hl kwa">+ q->contextMenu()->popup(globalPos);</span> |
2586 | <span class="hl kwa">+</span> |
2587 | <span class="hl kwa">+ if (QBalloonTip::isBalloonVisible()) {</span> |
2588 | <span class="hl kwa">+ QMetaObject::invokeMethod(q, "messageClicked");</span> |
2589 | <span class="hl kwa">+ QBalloonTip::hideBalloon();</span> |
2590 | <span class="hl kwa">+ }</span> |
2591 | <span class="hl kwa">+</span> |
2592 | <span class="hl kwa">+ if (ev->button() == Qt::LeftButton)</span> |
2593 | <span class="hl kwa">+ qtsystray_sendActivated(q, QSystemTrayIcon::Trigger);</span> |
2594 | <span class="hl kwa">+ else if (ev->button() == Qt::RightButton)</span> |
2595 | <span class="hl kwa">+ qtsystray_sendActivated(q, QSystemTrayIcon::Context);</span> |
2596 | <span class="hl kwa">+ else if (ev->button() == Qt::MidButton)</span> |
2597 | <span class="hl kwa">+ qtsystray_sendActivated(q, QSystemTrayIcon::MiddleClick);</span> |
2598 | <span class="hl kwa">+}</span> |
2599 | <span class="hl kwa">+</span> |
2600 | <span class="hl kwa">+void QSystemTrayIconWidget::mouseDoubleClickEvent(QMouseEvent *ev)</span> |
2601 | <span class="hl kwa">+{</span> |
2602 | <span class="hl kwa">+ if (ev->button() == Qt::LeftButton)</span> |
2603 | <span class="hl kwa">+ qtsystray_sendActivated(q, QSystemTrayIcon::DoubleClick);</span> |
2604 | <span class="hl kwa">+}</span> |
2605 | <span class="hl kwa">+</span> |
2606 | <span class="hl kwa">+#ifndef QT_NO_WHEELEVENT</span> |
2607 | <span class="hl kwa">+void QSystemTrayIconWidget::wheelEvent(QWheelEvent *e)</span> |
2608 | <span class="hl kwa">+{</span> |
2609 | <span class="hl kwa">+ sys->sendWheelEventToTrayIcon(e->delta(), e->orientation());</span> |
2610 | <span class="hl kwa">+}</span> |
2611 | <span class="hl kwa">+#endif</span> |
2612 | <span class="hl kwa">+</span> |
2613 | <span class="hl kwa">+bool QSystemTrayIconWidget::event(QEvent *e)</span> |
2614 | <span class="hl kwa">+{</span> |
2615 | <span class="hl kwa">+ if (e->type() == QEvent::ToolTip) {</span> |
2616 | <span class="hl kwa">+ sys->sendToolTipEventToTrayIcon();</span> |
2617 | <span class="hl kwa">+ }</span> |
2618 | <span class="hl kwa">+ return QWidget::event(e);</span> |
2619 | <span class="hl kwa">+}</span> |
2620 | <span class="hl kwa">+</span> |
2621 | <span class="hl kwa">+bool QSystemTrayIconWidget::x11Event(XEvent *event)</span> |
2622 | <span class="hl kwa">+{</span> |
2623 | <span class="hl kwa">+ if (event->type == ReparentNotify)</span> |
2624 | <span class="hl kwa">+ show();</span> |
2625 | <span class="hl kwa">+ return QWidget::x11Event(event);</span> |
2626 | <span class="hl kwa">+}</span> |
2627 | <span class="hl kwa">+</span> |
2628 | <span class="hl kwa">+// Locate the system tray</span> |
2629 | <span class="hl kwa">+Window QSystemTrayIconWidget::locateSystemTray()</span> |
2630 | <span class="hl kwa">+{</span> |
2631 | <span class="hl kwa">+ Display *display = QX11Info::display();</span> |
2632 | <span class="hl kwa">+ if (sysTraySelection == XNone) {</span> |
2633 | <span class="hl kwa">+ int screen = QX11Info::appScreen();</span> |
2634 | <span class="hl kwa">+ QString net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen);</span> |
2635 | <span class="hl kwa">+ sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);</span> |
2636 | <span class="hl kwa">+ }</span> |
2637 | <span class="hl kwa">+</span> |
2638 | <span class="hl kwa">+ return XGetSelectionOwner(QX11Info::display(), sysTraySelection);</span> |
2639 | <span class="hl kwa">+}</span> |
2640 | <span class="hl kwa">+</span> |
2641 | <span class="hl kwa">+XVisualInfo* QSystemTrayIconWidget::getSysTrayVisualInfo()</span> |
2642 | <span class="hl kwa">+{</span> |
2643 | <span class="hl kwa">+ Display *display = QX11Info::display();</span> |
2644 | <span class="hl kwa">+</span> |
2645 | <span class="hl kwa">+ if (!sysTrayVisual.visual) {</span> |
2646 | <span class="hl kwa">+ Window win = locateSystemTray();</span> |
2647 | <span class="hl kwa">+ if (win != XNone) {</span> |
2648 | <span class="hl kwa">+ Atom actual_type;</span> |
2649 | <span class="hl kwa">+ int actual_format;</span> |
2650 | <span class="hl kwa">+ ulong nitems, bytes_remaining;</span> |
2651 | <span class="hl kwa">+ uchar *data = 0;</span> |
2652 | <span class="hl kwa">+ int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,</span> |
2653 | <span class="hl kwa">+ False, XA_VISUALID, &actual_type,</span> |
2654 | <span class="hl kwa">+ &actual_format, &nitems, &bytes_remaining, &data);</span> |
2655 | <span class="hl kwa">+ VisualID vid = 0;</span> |
2656 | <span class="hl kwa">+ if (result == Success && data && actual_type == XA_VISUALID && actual_format == 32 &&</span> |
2657 | <span class="hl kwa">+ nitems == 1 && bytes_remaining == 0)</span> |
2658 | <span class="hl kwa">+ vid = *(VisualID*)data;</span> |
2659 | <span class="hl kwa">+ if (data)</span> |
2660 | <span class="hl kwa">+ XFree(data);</span> |
2661 | <span class="hl kwa">+ if (vid == 0)</span> |
2662 | <span class="hl kwa">+ return 0;</span> |
2663 | <span class="hl kwa">+</span> |
2664 | <span class="hl kwa">+ uint mask = VisualIDMask;</span> |
2665 | <span class="hl kwa">+ XVisualInfo *vi, rvi;</span> |
2666 | <span class="hl kwa">+ int count;</span> |
2667 | <span class="hl kwa">+ rvi.visualid = vid;</span> |
2668 | <span class="hl kwa">+ vi = XGetVisualInfo(display, mask, &rvi, &count);</span> |
2669 | <span class="hl kwa">+ if (vi) {</span> |
2670 | <span class="hl kwa">+ sysTrayVisual = vi[0];</span> |
2671 | <span class="hl kwa">+ XFree((char*)vi);</span> |
2672 | <span class="hl kwa">+ }</span> |
2673 | <span class="hl kwa">+ if (sysTrayVisual.depth != 32)</span> |
2674 | <span class="hl kwa">+ memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2675 | <span class="hl kwa">+ }</span> |
2676 | <span class="hl kwa">+ }</span> |
2677 | <span class="hl kwa">+</span> |
2678 | <span class="hl kwa">+ return sysTrayVisual.visual ? &sysTrayVisual : 0;</span> |
2679 | <span class="hl kwa">+}</span> |
2680 | <span class="hl kwa">+</span> |
2681 | <span class="hl kwa">+bool QSystemTrayIconWidget::sysTrayTracker(void *message, long *result)</span> |
2682 | <span class="hl kwa">+{</span> |
2683 | <span class="hl kwa">+ bool retval = false;</span> |
2684 | <span class="hl kwa">+ if (QSystemTrayIconWidget::oldEventFilter)</span> |
2685 | <span class="hl kwa">+ retval = QSystemTrayIconWidget::oldEventFilter(message, result);</span> |
2686 | <span class="hl kwa">+</span> |
2687 | <span class="hl kwa">+ if (trayIcons.isEmpty())</span> |
2688 | <span class="hl kwa">+ return retval;</span> |
2689 | <span class="hl kwa">+</span> |
2690 | <span class="hl kwa">+ Display *display = QX11Info::display();</span> |
2691 | <span class="hl kwa">+ XEvent *ev = (XEvent *)message;</span> |
2692 | <span class="hl kwa">+ if (ev->type == DestroyNotify && ev->xany.window == sysTrayWindow) {</span> |
2693 | <span class="hl kwa">+ sysTrayWindow = locateSystemTray();</span> |
2694 | <span class="hl kwa">+ memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2695 | <span class="hl kwa">+ for (int i = 0; i < trayIcons.count(); i++) {</span> |
2696 | <span class="hl kwa">+ if (sysTrayWindow == XNone) {</span> |
2697 | <span class="hl kwa">+ QBalloonTip::hideBalloon();</span> |
2698 | <span class="hl kwa">+ trayIcons[i]->hide(); // still no luck</span> |
2699 | <span class="hl kwa">+ trayIcons[i]->destroy();</span> |
2700 | <span class="hl kwa">+ trayIcons[i]->create();</span> |
2701 | <span class="hl kwa">+ } else</span> |
2702 | <span class="hl kwa">+ trayIcons[i]->addToTray(); // add it to the new tray</span> |
2703 | <span class="hl kwa">+ }</span> |
2704 | <span class="hl kwa">+ retval = true;</span> |
2705 | <span class="hl kwa">+ } else if (ev->type == ClientMessage && sysTrayWindow == XNone) {</span> |
2706 | <span class="hl kwa">+ static Atom manager_atom = XInternAtom(display, "MANAGER", False);</span> |
2707 | <span class="hl kwa">+ XClientMessageEvent *cm = (XClientMessageEvent *)message;</span> |
2708 | <span class="hl kwa">+ if ((cm->message_type == manager_atom) && ((Atom)cm->data.l[1] == sysTraySelection)) {</span> |
2709 | <span class="hl kwa">+ sysTrayWindow = cm->data.l[2];</span> |
2710 | <span class="hl kwa">+ memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2711 | <span class="hl kwa">+ XSelectInput(display, sysTrayWindow, StructureNotifyMask);</span> |
2712 | <span class="hl kwa">+ for (int i = 0; i < trayIcons.count(); i++) {</span> |
2713 | <span class="hl kwa">+ trayIcons[i]->addToTray();</span> |
2714 | <span class="hl kwa">+ }</span> |
2715 | <span class="hl kwa">+ retval = true;</span> |
2716 | <span class="hl kwa">+ }</span> |
2717 | <span class="hl kwa">+ } else if (ev->type == PropertyNotify && ev->xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &&</span> |
2718 | <span class="hl kwa">+ ev->xproperty.window == sysTrayWindow) {</span> |
2719 | <span class="hl kwa">+ memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));</span> |
2720 | <span class="hl kwa">+ for (int i = 0; i < trayIcons.count(); i++) {</span> |
2721 | <span class="hl kwa">+ trayIcons[i]->addToTray();</span> |
2722 | <span class="hl kwa">+ }</span> |
2723 | <span class="hl kwa">+ }</span> |
2724 | <span class="hl kwa">+</span> |
2725 | <span class="hl kwa">+ return retval;</span> |
2726 | <span class="hl kwa">+}</span> |
2727 | <span class="hl kwa">+</span> |
2728 | <span class="hl kwa">+void QSystemTrayIconWidget::addToTray()</span> |
2729 | <span class="hl kwa">+{</span> |
2730 | <span class="hl kwa">+ Q_ASSERT(sysTrayWindow != XNone);</span> |
2731 | <span class="hl kwa">+ Display *display = QX11Info::display();</span> |
2732 | <span class="hl kwa">+</span> |
2733 | <span class="hl kwa">+ XVisualInfo *vi = getSysTrayVisualInfo();</span> |
2734 | <span class="hl kwa">+ if (vi && vi->visual) {</span> |
2735 | <span class="hl kwa">+ Window root = RootWindow(display, vi->screen);</span> |
2736 | <span class="hl kwa">+ Window p = root;</span> |
2737 | <span class="hl kwa">+ if (QWidget *pw = parentWidget())</span> |
2738 | <span class="hl kwa">+ p = pw->effectiveWinId();</span> |
2739 | <span class="hl kwa">+ colormap = XCreateColormap(display, root, vi->visual, AllocNone);</span> |
2740 | <span class="hl kwa">+ XSetWindowAttributes wsa;</span> |
2741 | <span class="hl kwa">+ wsa.background_pixmap = 0;</span> |
2742 | <span class="hl kwa">+ wsa.colormap = colormap;</span> |
2743 | <span class="hl kwa">+ wsa.background_pixel = 0;</span> |
2744 | <span class="hl kwa">+ wsa.border_pixel = 0;</span> |
2745 | <span class="hl kwa">+ Window wid = XCreateWindow(display, p, -1, -1, 1, 1,</span> |
2746 | <span class="hl kwa">+ 0, vi->depth, InputOutput, vi->visual,</span> |
2747 | <span class="hl kwa">+ CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &wsa);</span> |
2748 | <span class="hl kwa">+ create(wid);</span> |
2749 | <span class="hl kwa">+ } else {</span> |
2750 | <span class="hl kwa">+ XSetWindowBackgroundPixmap(display, winId(), ParentRelative);</span> |
2751 | <span class="hl kwa">+ }</span> |
2752 | <span class="hl kwa">+</span> |
2753 | <span class="hl kwa">+ // GNOME, NET WM Specification</span> |
2754 | <span class="hl kwa">+ static Atom netwm_tray_atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False);</span> |
2755 | <span class="hl kwa">+ long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast<long>(winId()), 0, 0 };</span> |
2756 | <span class="hl kwa">+ XEvent ev;</span> |
2757 | <span class="hl kwa">+ memset(&ev, 0, sizeof(ev));</span> |
2758 | <span class="hl kwa">+ ev.xclient.type = ClientMessage;</span> |
2759 | <span class="hl kwa">+ ev.xclient.window = sysTrayWindow;</span> |
2760 | <span class="hl kwa">+ ev.xclient.message_type = netwm_tray_atom;</span> |
2761 | <span class="hl kwa">+ ev.xclient.format = 32;</span> |
2762 | <span class="hl kwa">+ memcpy((char *)&ev.xclient.data, (const char *) l, sizeof(l));</span> |
2763 | <span class="hl kwa">+ XSendEvent(display, sysTrayWindow, False, 0, &ev);</span> |
2764 | <span class="hl kwa">+ setMinimumSize(22, 22); // required at least on GNOME</span> |
2765 | <span class="hl kwa">+}</span> |
2766 | <span class="hl kwa">+</span> |
2767 | <span class="hl kwa">+////////////////////////////////////////////////////////////////////////////</span> |
2768 | <span class="hl kwa">+QXEmbedSystemTrayIconSys::QXEmbedSystemTrayIconSys(QSystemTrayIcon *q)</span> |
2769 | <span class="hl kwa">+: QAbstractSystemTrayIconSys(q)</span> |
2770 | <span class="hl kwa">+, widget(0)</span> |
2771 | <span class="hl kwa">+{</span> |
2772 | <span class="hl kwa">+}</span> |
2773 | <span class="hl kwa">+</span> |
2774 | <span class="hl kwa">+QXEmbedSystemTrayIconSys::~QXEmbedSystemTrayIconSys()</span> |
2775 | <span class="hl kwa">+{</span> |
2776 | <span class="hl kwa">+ delete widget;</span> |
2777 | <span class="hl kwa">+}</span> |
2778 | <span class="hl kwa">+</span> |
2779 | <span class="hl kwa">+QRect QXEmbedSystemTrayIconSys::geometry() const</span> |
2780 | <span class="hl kwa">+{</span> |
2781 | <span class="hl kwa">+ if (!widget)</span> |
2782 | <span class="hl kwa">+ return QRect();</span> |
2783 | <span class="hl kwa">+ return QRect(widget->mapToGlobal(QPoint(0, 0)), widget->size());</span> |
2784 | <span class="hl kwa">+}</span> |
2785 | <span class="hl kwa">+</span> |
2786 | <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateIcon()</span> |
2787 | <span class="hl kwa">+{</span> |
2788 | <span class="hl kwa">+ if (!widget)</span> |
2789 | <span class="hl kwa">+ return;</span> |
2790 | <span class="hl kwa">+ widget->update();</span> |
2791 | <span class="hl kwa">+}</span> |
2792 | <span class="hl kwa">+</span> |
2793 | <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateToolTip()</span> |
2794 | <span class="hl kwa">+{</span> |
2795 | <span class="hl kwa">+ if (!widget)</span> |
2796 | <span class="hl kwa">+ return;</span> |
2797 | <span class="hl kwa">+ widget->setToolTip(trayIcon->toolTip());</span> |
2798 | <span class="hl kwa">+}</span> |
2799 | <span class="hl kwa">+</span> |
2800 | <span class="hl kwa">+void QXEmbedSystemTrayIconSys::showMessage(const QString &message, const QString &title,</span> |
2801 | <span class="hl kwa">+ QSystemTrayIcon::MessageIcon icon, int msecs)</span> |
2802 | <span class="hl kwa">+{</span> |
2803 | <span class="hl kwa">+ if (!widget)</span> |
2804 | <span class="hl kwa">+ return;</span> |
2805 | <span class="hl kwa">+ QPoint point = geometry().center();</span> |
2806 | <span class="hl kwa">+ QBalloonTip::showBalloon(icon, message, title, trayIcon, point, msecs);</span> |
2807 | <span class="hl kwa">+}</span> |
2808 | <span class="hl kwa">+</span> |
2809 | <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateVisibility()</span> |
2810 | <span class="hl kwa">+{</span> |
2811 | <span class="hl kwa">+ bool visible = trayIcon->isVisible();</span> |
2812 | <span class="hl kwa">+ if (visible && !widget)</span> |
2813 | <span class="hl kwa">+ widget = new QSystemTrayIconWidget(trayIcon, this);</span> |
2814 | <span class="hl kwa">+ else if (!visible && widget) {</span> |
2815 | <span class="hl kwa">+ delete widget;</span> |
2816 | <span class="hl kwa">+ widget = 0;</span> |
2817 | <span class="hl kwa">+ }</span> |
2818 | <span class="hl kwa">+}</span> |
2819 | <span class="hl kwa">+</span> |
2820 | <span class="hl kwa">+void QXEmbedSystemTrayIconSys::sendToolTipEventToTrayIcon()</span> |
2821 | <span class="hl kwa">+{</span> |
2822 | <span class="hl kwa">+#ifndef QT_NO_TOOLTIP</span> |
2823 | <span class="hl kwa">+ // Pass the event through QSystemTrayIcon so that it gets a chance to</span> |
2824 | <span class="hl kwa">+ // update the tooltip, then asks widget to show the tooltip</span> |
2825 | <span class="hl kwa">+ Q_ASSERT(widget);</span> |
2826 | <span class="hl kwa">+ QPoint globalPos = QCursor::pos();</span> |
2827 | <span class="hl kwa">+ QPoint pos = widget->mapFromGlobal(globalPos);</span> |
2828 | <span class="hl kwa">+ QHelpEvent event(QEvent::ToolTip, pos, globalPos);</span> |
2829 | <span class="hl kwa">+ QApplication::sendEvent(trayIcon, &event);</span> |
2830 | <span class="hl kwa">+#endif</span> |
2831 | <span class="hl kwa">+}</span> |
2832 | <span class="hl kwa">+</span> |
2833 | <span class="hl kwa">+void QXEmbedSystemTrayIconSys::sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation)</span> |
2834 | <span class="hl kwa">+{</span> |
2835 | <span class="hl kwa">+#ifndef QT_NO_WHEELEVENT</span> |
2836 | <span class="hl kwa">+ Q_ASSERT(widget);</span> |
2837 | <span class="hl kwa">+ QPoint globalPos = QCursor::pos();</span> |
2838 | <span class="hl kwa">+ QPoint pos = widget->mapFromGlobal(globalPos);</span> |
2839 | <span class="hl kwa">+ QWheelEvent event(pos, globalPos, delta, Qt::NoButton, Qt::NoModifier, orientation);</span> |
2840 | <span class="hl kwa">+ QApplication::sendEvent(trayIcon, &event);</span> |
2841 | <span class="hl kwa">+#endif</span> |
2842 | <span class="hl kwa">+}</span> |
2843 | <span class="hl kwa">+</span> |
2844 | <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateMenu()</span> |
2845 | <span class="hl kwa">+{</span> |
2846 | <span class="hl kwa">+}</span> |
2847 | <span class="hl kwa">+</span> |
2848 | <span class="hl kwa">+/////////////////////////////////////////////////////////////</span> |
2849 | <span class="hl kwa">+QAbstractSystemTrayIconSys * QXEmbedSystemTrayIconSysFactory::create(QSystemTrayIcon *icon)</span> |
2850 | <span class="hl kwa">+{</span> |
2851 | <span class="hl kwa">+ return new QXEmbedSystemTrayIconSys(icon);</span> |
2852 | <span class="hl kwa">+}</span> |
2853 | <span class="hl kwa">+</span> |
2854 | <span class="hl kwa">+bool QXEmbedSystemTrayIconSysFactory::isAvailable() const</span> |
2855 | <span class="hl kwa">+{</span> |
2856 | <span class="hl kwa">+ return QSystemTrayIconWidget::locateSystemTray() != XNone;</span> |
2857 | <span class="hl kwa">+}</span> |
2858 | <span class="hl kwa">+</span> |
2859 | <span class="hl kwa">+QT_END_NAMESPACE</span> |
2860 | <span class="hl kwa">+#endif //QT_NO_SYSTEMTRAYICON</span> |
2861 | <span class="hl kwb">--- /dev/null</span> |
2862 | <span class="hl kwa">+++ b/src/gui/util/qxembedsystemtrayicon_x11_p.h</span> |
2863 | <span class="hl kwd">@@ -0,0 +1,104 @@</span> |
2864 | <span class="hl kwa">+/****************************************************************************</span> |
2865 | <span class="hl kwa">+**</span> |
2866 | <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span> |
2867 | <span class="hl kwa">+** All rights reserved.</span> |
2868 | <span class="hl kwa">+** Contact: Nokia Corporation (qt-info@nokia.com)</span> |
2869 | <span class="hl kwa">+**</span> |
2870 | <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span> |
2871 | <span class="hl kwa">+**</span> |
2872 | <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span> |
2873 | <span class="hl kwa">+** GNU Lesser General Public License Usage</span> |
2874 | <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span> |
2875 | <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span> |
2876 | <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span> |
2877 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span> |
2878 | <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span> |
2879 | <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span> |
2880 | <span class="hl kwa">+**</span> |
2881 | <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span> |
2882 | <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span> |
2883 | <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span> |
2884 | <span class="hl kwa">+**</span> |
2885 | <span class="hl kwa">+** GNU General Public License Usage</span> |
2886 | <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span> |
2887 | <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span> |
2888 | <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span> |
2889 | <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span> |
2890 | <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span> |
2891 | <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span> |
2892 | <span class="hl kwa">+**</span> |
2893 | <span class="hl kwa">+** Other Usage</span> |
2894 | <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span> |
2895 | <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span> |
2896 | <span class="hl kwa">+**</span> |
2897 | <span class="hl kwa">+**</span> |
2898 | <span class="hl kwa">+**</span> |
2899 | <span class="hl kwa">+**</span> |
2900 | <span class="hl kwa">+**</span> |
2901 | <span class="hl kwa">+** $QT_END_LICENSE$</span> |
2902 | <span class="hl kwa">+**</span> |
2903 | <span class="hl kwa">+****************************************************************************/</span> |
2904 | <span class="hl kwa">+</span> |
2905 | <span class="hl kwa">+#ifndef QXEMBEDSYSTEMTRAYICON_X11_P_H</span> |
2906 | <span class="hl kwa">+#define QXEMBEDSYSTEMTRAYICON_X11_P_H</span> |
2907 | <span class="hl kwa">+</span> |
2908 | <span class="hl kwa">+//</span> |
2909 | <span class="hl kwa">+// W A R N I N G</span> |
2910 | <span class="hl kwa">+// -------------</span> |
2911 | <span class="hl kwa">+//</span> |
2912 | <span class="hl kwa">+// This file is not part of the Qt API. It exists for the convenience</span> |
2913 | <span class="hl kwa">+// of a number of Qt sources files. This header file may change from</span> |
2914 | <span class="hl kwa">+// version to version without notice, or even be removed.</span> |
2915 | <span class="hl kwa">+//</span> |
2916 | <span class="hl kwa">+// We mean it.</span> |
2917 | <span class="hl kwa">+//</span> |
2918 | <span class="hl kwa">+</span> |
2919 | <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span> |
2920 | <span class="hl kwa">+</span> |
2921 | <span class="hl kwa">+#include "qabstractsystemtrayiconsys_p.h"</span> |
2922 | <span class="hl kwa">+</span> |
2923 | <span class="hl kwa">+QT_BEGIN_NAMESPACE</span> |
2924 | <span class="hl kwa">+</span> |
2925 | <span class="hl kwa">+class QSystemTrayIconWidget;</span> |
2926 | <span class="hl kwa">+</span> |
2927 | <span class="hl kwa">+class QXEmbedSystemTrayIconSys : public QAbstractSystemTrayIconSys</span> |
2928 | <span class="hl kwa">+{</span> |
2929 | <span class="hl kwa">+public:</span> |
2930 | <span class="hl kwa">+ QXEmbedSystemTrayIconSys(QSystemTrayIcon *);</span> |
2931 | <span class="hl kwa">+ ~QXEmbedSystemTrayIconSys();</span> |
2932 | <span class="hl kwa">+</span> |
2933 | <span class="hl kwa">+ QRect geometry() const;</span> |
2934 | <span class="hl kwa">+</span> |
2935 | <span class="hl kwa">+ void updateVisibility();</span> |
2936 | <span class="hl kwa">+</span> |
2937 | <span class="hl kwa">+ void updateIcon();</span> |
2938 | <span class="hl kwa">+</span> |
2939 | <span class="hl kwa">+ void updateToolTip();</span> |
2940 | <span class="hl kwa">+</span> |
2941 | <span class="hl kwa">+ void updateMenu();</span> |
2942 | <span class="hl kwa">+</span> |
2943 | <span class="hl kwa">+ void showMessage(const QString &message, const QString &title,</span> |
2944 | <span class="hl kwa">+ QSystemTrayIcon::MessageIcon icon, int msecs);</span> |
2945 | <span class="hl kwa">+</span> |
2946 | <span class="hl kwa">+private:</span> |
2947 | <span class="hl kwa">+ friend class QSystemTrayIconWidget;</span> |
2948 | <span class="hl kwa">+ QSystemTrayIconWidget *widget;</span> |
2949 | <span class="hl kwa">+</span> |
2950 | <span class="hl kwa">+ void sendToolTipEventToTrayIcon();</span> |
2951 | <span class="hl kwa">+</span> |
2952 | <span class="hl kwa">+ void sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation);</span> |
2953 | <span class="hl kwa">+};</span> |
2954 | <span class="hl kwa">+</span> |
2955 | <span class="hl kwa">+struct QXEmbedSystemTrayIconSysFactory : public QSystemTrayIconSysFactoryInterface</span> |
2956 | <span class="hl kwa">+{</span> |
2957 | <span class="hl kwa">+ QAbstractSystemTrayIconSys * create(QSystemTrayIcon *trayIcon);</span> |
2958 | <span class="hl kwa">+ bool isAvailable() const;</span> |
2959 | <span class="hl kwa">+};</span> |
2960 | <span class="hl kwa">+</span> |
2961 | <span class="hl kwa">+</span> |
2962 | <span class="hl kwa">+QT_END_NAMESPACE</span> |
2963 | <span class="hl kwa">+</span> |
2964 | <span class="hl kwa">+#endif // QT_NO_SYSTEMTRAYICON</span> |
2965 | <span class="hl kwa">+</span> |
2966 | <span class="hl kwa">+#endif // QXEMBEDSYSTEMTRAYICON_X11_P_H</span> |
2967 | <span class="hl kwa">+</span> |
2968 | <span class="hl kwb">--- a/src/gui/util/util.pri</span> |
2969 | <span class="hl kwa">+++ b/src/gui/util/util.pri</span> |
2970 | <span class="hl kwd">@@ -29,8 +29,13 @@</span> |
2971 | } |
2972 | |
2973 | unix:x11 { |
2974 | <span class="hl kwa">+ HEADERS += \</span> |
2975 | <span class="hl kwa">+ util/qabstractsystemtrayiconsys_p.h \</span> |
2976 | <span class="hl kwa">+ util/qxembedsystemtrayicon_x11_p.h</span> |
2977 | SOURCES += \ |
2978 | <span class="hl kwb">- util/qsystemtrayicon_x11.cpp</span> |
2979 | <span class="hl kwa">+ util/qabstractsystemtrayiconsys.cpp \</span> |
2980 | <span class="hl kwa">+ util/qsystemtrayicon_x11.cpp \</span> |
2981 | <span class="hl kwa">+ util/qxembedsystemtrayicon_x11.cpp</span> |
2982 | } |
2983 | |
2984 | embedded|qpa { |
2985 | </code></pre></td></tr></table> |
2986 | </div> <!-- class=content --> |
2987 | <div class="foot" style="padding-left:1em;padding-right:1em;"> |
2988 | <p>Copyright © 2002-2016 <a href="mailto:jvinet@zeroflux.org" |
2989 | title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" |
2990 | title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo |
2991 | are recognized trademarks. Some rights reserved. The registered trademark |
2992 | Linux® is used pursuant to a sublicense from LMI, the exclusive licensee |
2993 | of Linus Torvalds, owner of the mark on a world-wide basis.</p> |
2994 | </div> |
2995 | </div> <!-- id=cgit --> |
2996 | </body> |
2997 | </html> |