]>
Commit | Line | Data |
---|---|---|
49d7072e | 1 | Index: dataengines/ocs/plasma-dataengine-ocs.desktop |
5cf56c08 | 2 | =================================================================== |
49d7072e AM |
3 | --- dataengines/ocs/plasma-dataengine-ocs.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) |
4 | +++ dataengines/ocs/plasma-dataengine-ocs.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
5 | @@ -14,6 +14,7 @@ | |
6 | Name[nb]=Åpne samarbeidstjenester | |
7 | Name[nds]=Open-Collaboration-Deensten | |
8 | Name[nn]=Opne samarbeidtenester | |
9 | +Name[pl]=Usługi do współpracy (Open Collaboration) | |
10 | Name[pt]=Serviços Abertos de Colaboração | |
11 | Name[pt_BR]=Serviços abertos de colaboração | |
12 | Name[ro]=Servicii de Colaborare Deschisă | |
13 | @@ -22,6 +23,7 @@ | |
14 | Name[sr]=Сервиси отворене сарадње | |
15 | Name[sr@latin]=Servisi otvorene saradnje | |
16 | Name[sv]=Öppna sammarbetstjänster | |
17 | +Name[tr]=Açık İşbirliği Servisleri | |
18 | Name[uk]=Служби Open Collaboration | |
19 | Name[wa]=Siervices Open Collaboration | |
20 | Name[x-test]=xxOpen Collaboration Servicesxx | |
21 | Index: dataengines/ocs/lib/activity.h | |
22 | =================================================================== | |
23 | --- dataengines/ocs/lib/activity.h (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
24 | +++ dataengines/ocs/lib/activity.h (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
25 | @@ -36,9 +36,12 @@ | |
26 | { | |
27 | public: | |
28 | typedef QList<Activity> List; | |
29 | - | |
30 | + | |
31 | Activity(); | |
32 | ||
33 | + void setId( const QString & ); | |
34 | + QString id() const; | |
35 | + | |
36 | void setUser( const QString & ); | |
37 | QString user() const; | |
38 | ||
39 | @@ -52,7 +55,8 @@ | |
40 | QString link() const; | |
41 | ||
42 | private: | |
43 | - QString m_user; | |
44 | + QString m_id; | |
45 | + QString m_user; | |
46 | QDateTime m_timestamp; | |
47 | QString m_message; | |
48 | QString m_link; | |
49 | Index: dataengines/ocs/lib/activityparser.cpp | |
50 | =================================================================== | |
51 | --- dataengines/ocs/lib/activityparser.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
52 | +++ dataengines/ocs/lib/activityparser.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
53 | @@ -45,7 +45,9 @@ | |
54 | xml.readNext(); | |
55 | ||
56 | if ( xml.isStartElement() ) { | |
57 | - if ( xml.name() == "personid" ) { | |
58 | + if ( xml.name() == "id" ) { | |
59 | + activity.setId( xml.readElementText() ); | |
60 | + } else if ( xml.name() == "personid" ) { | |
61 | activity.setUser( xml.readElementText() ); | |
62 | } else if ( xml.name() == "timestamp" ) { | |
63 | QString timestampString = xml.readElementText(); | |
64 | Index: dataengines/ocs/lib/activity.cpp | |
65 | =================================================================== | |
66 | --- dataengines/ocs/lib/activity.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
67 | +++ dataengines/ocs/lib/activity.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
68 | @@ -29,6 +29,16 @@ | |
69 | { | |
70 | } | |
71 | ||
72 | +void Activity::setId( const QString &id ) | |
73 | +{ | |
74 | + m_id = id; | |
75 | +} | |
76 | + | |
77 | +QString Activity::id() const | |
78 | +{ | |
79 | + return m_id; | |
80 | +} | |
81 | + | |
82 | void Activity::setUser( const QString &u ) | |
83 | { | |
84 | m_user = u; | |
85 | Index: dataengines/ocs/ocsengine.cpp | |
86 | =================================================================== | |
87 | --- dataengines/ocs/ocsengine.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
88 | +++ dataengines/ocs/ocsengine.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
89 | @@ -177,12 +177,7 @@ | |
90 | return true; | |
91 | kDebug() << "for name" << name; | |
92 | if (name == I18N_NOOP("activity")) { | |
93 | - foreach(const Attica::Activity &activity, m_activities ) { | |
94 | - setData(name, I18N_NOOP("user"), activity.user()); | |
95 | - setData(name, I18N_NOOP("timestamp"), activity.timestamp()); | |
96 | - setData(name, I18N_NOOP("message"), activity.message()); | |
97 | - } | |
98 | - return true; | |
99 | + | |
100 | } else if (name.startsWith("Friends-")) { | |
101 | ||
102 | } | |
103 | @@ -196,7 +191,16 @@ | |
104 | if (!j->error()) { | |
105 | Attica::ActivityListJob *job = static_cast<Attica::ActivityListJob *>( j ); | |
106 | m_activities = job->ActivityList(); | |
107 | - updateSourceEvent(I18N_NOOP("activity")); | |
108 | + | |
109 | + foreach(const Attica::Activity &activity, m_activities ) { | |
110 | + Plasma::DataEngine::Data activityData; | |
111 | + activityData["id"] = activity.id(); | |
112 | + activityData["user"] = activity.user(); | |
113 | + activityData["timestamp"] = activity.timestamp(); | |
114 | + activityData["message"] = activity.message(); | |
115 | + | |
116 | + setData("activity", activity.id(), activityData); | |
117 | + } | |
118 | } | |
119 | } | |
120 | ||
121 | Index: dataengines/potd/oseiprovider.desktop | |
122 | =================================================================== | |
123 | --- dataengines/potd/oseiprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
124 | +++ dataengines/potd/oseiprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
125 | @@ -24,6 +24,7 @@ | |
126 | Name[nds]=Osei-Anbeder | |
127 | Name[nl]=Osei-provider | |
128 | Name[nn]=Osei-tilbydar | |
129 | +Name[pl]=Usługodawca Osei | |
130 | Name[pt]=Fornecedor do Osei | |
131 | Name[pt_BR]=Fornecedor Osei | |
132 | Name[ro]=Furnizor Osei | |
133 | @@ -56,6 +57,7 @@ | |
134 | Comment[nds]=Osei-Anbeder | |
135 | Comment[nl]=Osei-provider | |
136 | Comment[nn]=Osei-tilbydar | |
137 | +Comment[pl]=Usługodawca Osei | |
138 | Comment[pt]=Fornecedor do Osei | |
139 | Comment[pt_BR]=Fornecedor Osei | |
140 | Comment[ro]=Furnizor Osei | |
141 | Index: dataengines/potd/wcpotdprovider.desktop | |
142 | =================================================================== | |
143 | --- dataengines/potd/wcpotdprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
144 | +++ dataengines/potd/wcpotdprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
145 | @@ -25,6 +25,7 @@ | |
146 | Name[nds]=Wc-BiV-Anbeder | |
147 | Name[nl]=Wcpotd-provider | |
148 | Name[nn]=Wcpotd-tilbydar | |
149 | +Name[pl]=Usługodawca Wcpotd | |
150 | Name[pt]=Fornecedor do Wcpotd | |
151 | Name[pt_BR]=Fornecedor Wcpotd | |
152 | Name[ro]=Furnizor Wcpotd | |
153 | @@ -58,6 +59,7 @@ | |
154 | Comment[nds]=Wc-BiV-Anbeder | |
155 | Comment[nl]=Wcpotd-provider | |
156 | Comment[nn]=Wcpotd-tilbydar | |
157 | +Comment[pl]=Usługodawca Wcpotd | |
158 | Comment[pt]=Fornecedor do Wcpotd | |
159 | Comment[pt_BR]=Fornecedor Wcpotd | |
160 | Comment[ro]=Furnizor Wcpotd | |
161 | Index: dataengines/potd/plasma_potdprovider.desktop | |
162 | =================================================================== | |
163 | --- dataengines/potd/plasma_potdprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
164 | +++ dataengines/potd/plasma_potdprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
165 | @@ -20,6 +20,7 @@ | |
166 | Comment[nds]=Moduul för Plasma sien BiV-Karn | |
167 | Comment[nl]=Plugin voor Plasma-PoTD-engine | |
168 | Comment[nn]=Programtillegg for Plasma PoTD-motoren | |
169 | +Comment[pl]=Wtyczka silnika PoTD Plazmy | |
170 | Comment[pt]='Plugin' do Motor da Imagem do Dia do Plasma | |
171 | Comment[pt_BR]=Plug-in para o mecanismo PoTD do Plasma | |
172 | Comment[ro]=Modul pentru motorul de imagine a zilei Plasma | |
173 | Index: dataengines/potd/plasma-dataengine-potd.desktop | |
174 | =================================================================== | |
175 | --- dataengines/potd/plasma-dataengine-potd.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
176 | +++ dataengines/potd/plasma-dataengine-potd.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
177 | @@ -19,6 +19,7 @@ | |
178 | Name[nl]=Afbeelding van de dag | |
179 | Name[nn]=Dagens bilete | |
180 | Name[pa]=ਅੱਜ ਦੀ ਤਸਵੀਰ | |
181 | +Name[pl]=Obraz dnia | |
182 | Name[pt]=Imagem do Dia | |
183 | Name[pt_BR]=Imagem do dia | |
184 | Name[ro]=Imaginea zilei | |
185 | @@ -52,6 +53,7 @@ | |
186 | Comment[nds]=Datenkarn för't Halen vun verscheden Biller för Vundaag ut't Internet. | |
187 | Comment[nl]=Gegevensengine voor het verkrijgen van online afbeeldingen-van-de-dag. | |
188 | Comment[nn]=Datamotor for henting av dagens bilete | |
189 | +Comment[pl]=Silnik danych do pobierania różnych "obrazów dnia". | |
190 | Comment[pt]=Motor de dados para obter diversas Imagens do Dia a nível 'online'. | |
191 | Comment[pt_BR]=Mecanismo de dados para obter várias imagens do dia online. | |
192 | Comment[ro]=Motor de date pentru obținerea Imaginii zilei din diverse locuri. | |
193 | Index: dataengines/potd/flickrprovider.desktop | |
194 | =================================================================== | |
195 | --- dataengines/potd/flickrprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
196 | +++ dataengines/potd/flickrprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
197 | @@ -25,6 +25,7 @@ | |
198 | Name[nl]=Flickr-provider | |
199 | Name[nn]=Flickr-tilbydar | |
200 | Name[pa]=ਫਲਿੱਕਰ ਪਰੋਵਾਇਡਰ | |
201 | +Name[pl]=Usługodawca Flickr | |
202 | Name[pt]=Fornecedor do Flickr | |
203 | Name[pt_BR]=Fornecedor Flickr | |
204 | Name[ro]=Furnizor Flickr | |
205 | @@ -58,6 +59,7 @@ | |
206 | Comment[nl]=Flickr-provider | |
207 | Comment[nn]=Flickr-tilbydar | |
208 | Comment[pa]=ਫਲਿੱਕਰ ਪਰੋਵਾਇਡਰ | |
209 | +Comment[pl]=Usługodawca Flickr | |
210 | Comment[pt]=Fornecedor do Flickr | |
211 | Comment[pt_BR]=Fornecedor Flickr | |
212 | Comment[ro]=Furnizor Flickr | |
213 | Index: dataengines/potd/apodprovider.desktop | |
214 | =================================================================== | |
215 | --- dataengines/potd/apodprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
216 | +++ dataengines/potd/apodprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
217 | @@ -24,6 +24,7 @@ | |
218 | Name[nds]=ABiV-Anbeder | |
219 | Name[nl]=Apod-provider | |
220 | Name[nn]=Apod-tilbydar | |
221 | +Name[pl]=Usługodawca Apod | |
222 | Name[pt]=Fornecedor do Apod | |
223 | Name[pt_BR]=Fornecedor Apod | |
224 | Name[ro]=Furnizor Apod | |
225 | @@ -56,6 +57,7 @@ | |
226 | Comment[nds]=ABiV-Anbeder | |
227 | Comment[nl]=Apod-provider | |
228 | Comment[nn]=Apod-tilbydar | |
229 | +Comment[pl]=Usługodawca Apod | |
230 | Comment[pt]=Fornecedor do Apod | |
231 | Comment[pt_BR]=Fornecedor Apod | |
232 | Comment[ro]=Furnizor Apod | |
233 | Index: dataengines/potd/epodprovider.desktop | |
234 | =================================================================== | |
235 | --- dataengines/potd/epodprovider.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
236 | +++ dataengines/potd/epodprovider.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
237 | @@ -24,6 +24,7 @@ | |
238 | Name[nds]=EBiV-Anbeder | |
239 | Name[nl]=Epod-provider | |
240 | Name[nn]=Epod-tilbydar | |
241 | +Name[pl]=Usługodawca Epod | |
242 | Name[pt]=Fornecedor do Epod | |
243 | Name[pt_BR]=Fornecedor Epod | |
244 | Name[ro]=Furnizor Epod | |
245 | @@ -56,6 +57,7 @@ | |
246 | Comment[nds]=EBiV-Anbeder | |
247 | Comment[nl]=Epod-provider | |
248 | Comment[nn]=Epod-tilbydar | |
249 | +Comment[pl]=Usługodawca Epod | |
250 | Comment[pt]=Fornecedor do Epod | |
251 | Comment[pt_BR]=Fornecedor Epod | |
252 | Comment[ro]=Furnizor Epod | |
253 | Index: dataengines/comic/plasma-dataengine-comic.desktop | |
254 | =================================================================== | |
255 | --- dataengines/comic/plasma-dataengine-comic.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
256 | +++ dataengines/comic/plasma-dataengine-comic.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
257 | @@ -62,6 +62,7 @@ | |
258 | Comment[nds]=Internet-Comics | |
259 | Comment[nl]=Online stripverhalen | |
260 | Comment[nn]=Teikneseriar på nettet | |
261 | +Comment[pl]=Komiksy online | |
262 | Comment[pt]=Bandas desenhadas 'online' | |
263 | Comment[pt_BR]=Tirinhas online | |
264 | Comment[ro]=Benzi desenate online | |
265 | Index: dataengines/rememberthemilk/plasma-engine-rtm.desktop | |
266 | =================================================================== | |
267 | --- dataengines/rememberthemilk/plasma-engine-rtm.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
268 | +++ dataengines/rememberthemilk/plasma-engine-rtm.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
269 | @@ -18,6 +18,7 @@ | |
270 | Name[nl]=Engine voor The Milk onthouden | |
271 | Name[nn]=Datamotor for Remember The Milk | |
272 | Name[pa]=ਰੀਮੈਂਬਰ ਦਾ ਮਿਲਕ ਇੰਜਣ | |
273 | +Name[pl]=Silnik Remember The Milk | |
274 | Name[pt]=Motor para Recordar as Tarefas | |
275 | Name[pt_BR]=Mecanismo Remember The Milk | |
276 | Name[ro]=Motor Nu uita laptele | |
277 | @@ -50,6 +51,7 @@ | |
278 | Comment[nl]=Een engine om samen te werken met Remember The Milk. | |
279 | Comment[nn]=Datamotor for Remember The Milk | |
280 | Comment[pa]=ਰੀਮੈਂਬਰ ਦਾ ਮਿਲਕ ਨਾਲ ਕੰਮ ਕਰਨ ਲਈ ਇੰਜਣ ਹੈ। | |
281 | +Comment[pl]=Silnik pracujący z Remember the Milk. | |
282 | Comment[pt]=Um motor para funcionar com a 'applet' de recordação de tarefas. | |
283 | Comment[pt_BR]=Um mecanismo para trabalhar com o Remember The Milk. | |
284 | Comment[ro]=Motor pentru lucrul cu Remember the Milk. | |
285 | Index: dataengines/microblog/plasma-dataengine-microblog.desktop | |
286 | =================================================================== | |
287 | --- dataengines/microblog/plasma-dataengine-microblog.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
288 | +++ dataengines/microblog/plasma-dataengine-microblog.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
289 | @@ -17,6 +17,7 @@ | |
290 | Name[nds]=Mikronettdagbook | |
291 | Name[nn]=Mikroblogging | |
292 | Name[pa]=ਮਾਈਕਰੋਬਲਾਗ | |
293 | +Name[pl]=Mikroblog | |
294 | Name[pt]=Micro-blog | |
295 | Name[pt_BR]=Micro-blog | |
296 | Name[sk]=Mikroblogovanie | |
297 | @@ -46,6 +47,7 @@ | |
298 | Comment[nds]=Mikro-Nettdaagbookdeensten "identi.ca" un "twitter" | |
299 | Comment[nl]=identi.ca en twitter micro-blogging-services | |
300 | Comment[nn]=Mikrobloggingstenestene identi.ca og Twitter | |
301 | +Comment[pl]=Usługi mikrobloga identi.ca i twitter | |
302 | Comment[pt]=serviços de micro-blogs identi.ca e twitter | |
303 | Comment[pt_BR]=Serviços de microblogagem identi.ca e twitter | |
304 | Comment[ro]=Servicii de micro-blogging identi.ca și twitter | |
305 | @@ -54,6 +56,7 @@ | |
306 | Comment[sr]=Микроблогерски сервиси Идентика и Твитер | |
307 | Comment[sr@latin]=Mikroblogerski servisi identi.ca i Twitter | |
308 | Comment[sv]=Mikrowebbjournaltjänsterna identi.ca och twitter | |
309 | +Comment[tr]=identi.ca ve twitter mini-günlük servisleri | |
310 | Comment[uk]=Служби мікроблогів identi.ca і twitter | |
311 | Comment[wa]=Siervices identi.ca eyet twitter micro-blogging | |
312 | Comment[x-test]=xxidenti.ca and twitter micro-blogging servicesxx | |
313 | Index: applets/magnifique/plasma-applet-magnifique.desktop | |
314 | =================================================================== | |
315 | --- applets/magnifique/plasma-applet-magnifique.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
316 | +++ applets/magnifique/plasma-applet-magnifique.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
317 | @@ -11,7 +11,20 @@ | |
318 | Name[wa]=Magnifike | |
319 | Name[x-test]=xxMagnifiquexx | |
320 | Name[zh_CN]=魅影 | |
321 | -Comment = a magnification glass for Plasma canvas | |
322 | +Comment=A magnification glass for the Plasma desktop | |
323 | +Comment[es]=Una lente de aumento para el escritorio Plasma | |
324 | +Comment[et]=Plasma töölaua suurendusklaas | |
325 | +Comment[is]=Stækkunargler fyrir Plasma skjáborðið | |
326 | +Comment[it]=Una lente d'ingrandimento per il desktop Plasma | |
327 | +Comment[nds]=En Kiekglas för den Plasma-Schriefdisch | |
328 | +Comment[nl]=Een vergrootglas voor het Plasma bureaublad | |
329 | +Comment[nn]=Eit forstørringsglas til Plasma-skrivebordet | |
330 | +Comment[pt]=Uma lupa de ampliação para o ambiente de trabalho Plasma | |
331 | +Comment[pt_BR]=Uma lente de aumento para a área de trabalho Plasma | |
332 | +Comment[sv]=Ett förstoringsglas för Plasmaskrivbordet | |
333 | +Comment[uk]=Збільшувальне скло для стільниці Плазми | |
334 | +Comment[x-test]=xxA magnification glass for the Plasma desktopxx | |
335 | +Comment[zh_TW]=Plasma 桌面上的放大鏡 | |
336 | Type=Service | |
337 | Icon=zoom-in | |
338 | ||
339 | Index: applets/opendesktop/contactwidget.cpp | |
340 | =================================================================== | |
341 | --- applets/opendesktop/contactwidget.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
342 | +++ applets/opendesktop/contactwidget.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
343 | @@ -195,13 +195,13 @@ | |
344 | ||
345 | void ContactWidget::sendMessage() | |
346 | { | |
347 | - QUrl url = QString("http://www.opendesktop.org/messages/?action=newmessage&username=%1").arg(user()); | |
348 | + QUrl url = QString("https://www.opendesktop.org/messages/?action=newmessage&username=%1").arg(user()); | |
349 | new KRun(url, m_nameLabel->nativeWidget()); | |
350 | } | |
351 | ||
352 | void ContactWidget::addFriend() | |
353 | { | |
354 | - KUrl url = QString("http://www.opendesktop.org/usermanager/relationadd.php?username=%1").arg(user()); | |
355 | + KUrl url = QString("https://www.opendesktop.org/usermanager/relationadd.php?username=%1").arg(user()); | |
356 | kDebug() << "add friend" << user() << url.url(); | |
357 | new KRun(url, m_nameLabel->nativeWidget()); | |
358 | } | |
359 | Index: applets/opendesktop/plasma-applet-opendesktop.desktop | |
360 | =================================================================== | |
361 | --- applets/opendesktop/plasma-applet-opendesktop.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
362 | +++ applets/opendesktop/plasma-applet-opendesktop.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
363 | @@ -27,6 +27,7 @@ | |
364 | Comment[nl]=Communiceer met het sociale bureaublad | |
365 | Comment[nn]=Kommuniser via openDesktop | |
366 | Comment[pa]=ਸਮਾਜਿਕ ਡੈਸਕਟਾਪ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਸੰਚਾਰ | |
367 | +Comment[pl]=Komunikacja przy użyciu Pulpitu społecznościowego | |
368 | Comment[pt]=Comunicar com o Ambiente de Trabalho Social | |
369 | Comment[pt_BR]=Comunique-se usando o Ambiente de Trabalho Social | |
370 | Comment[ro]=Comunicați utilizînd Biroul Social | |
371 | @@ -35,6 +36,7 @@ | |
372 | Comment[sr]=Комуницирање путем Друштвене површи | |
373 | Comment[sr@latin]=Komuniciranje putem Društvene površi | |
374 | Comment[sv]=Kommunicera med användning av det sociala skrivbordet | |
375 | +Comment[tr]=Sosyal Masaüstünü kullanarak iletişim kur | |
376 | Comment[uk]=Спілкування за допомогою соціальної стільниці | |
377 | Comment[wa]=Comuniker e s' siervant do Scribanne sociå | |
378 | Comment[x-test]=xxCommunicate using the Social Desktopxx | |
379 | @@ -72,6 +74,7 @@ | |
380 | Keywords[nl]=Hulpmiddelen | |
381 | Keywords[nn]=Verktøy | |
382 | Keywords[pa]=ਸਹੂਲਤਾਂ | |
383 | +Keywords[pl]=Narzędzia | |
384 | Keywords[pt]=Utilitários | |
385 | Keywords[pt_BR]=Utilitários | |
386 | Keywords[ro]=Utilitare | |
387 | @@ -80,6 +83,7 @@ | |
388 | Keywords[sr]=Алатке | |
389 | Keywords[sr@latin]=Alatke | |
390 | Keywords[sv]=Verktyg | |
391 | +Keywords[tr]=Yardımcı Araçlar | |
392 | Keywords[uk]=Інструменти | |
393 | Keywords[wa]=Usteyes | |
394 | Keywords[x-test]=xxUtilitiesxx | |
395 | Index: applets/opendesktop/opendesktop.cpp | |
396 | =================================================================== | |
397 | --- applets/opendesktop/opendesktop.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
398 | +++ applets/opendesktop/opendesktop.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
399 | @@ -115,8 +115,8 @@ | |
400 | } else { | |
401 | connectPerson(m_username); | |
402 | connectFriends(m_username); | |
403 | + connectGeolocation(); | |
404 | } | |
405 | - connectGeolocation(); | |
406 | } | |
407 | ||
408 | void OpenDesktop::connectGeolocation() | |
409 | @@ -422,6 +422,9 @@ | |
410 | m_displayedUser = m_username; | |
411 | connectPerson(m_username); | |
412 | connectFriends(m_username); | |
413 | + if (!m_username.isEmpty()) { | |
414 | + connectGeolocation(); | |
415 | + } | |
416 | cg.writeEntry("username", m_username); | |
417 | emit configNeedsSaving(); | |
418 | setConfigurationRequired(false); | |
419 | @@ -439,7 +442,7 @@ | |
420 | ||
421 | void OpenDesktop::registerAccount() | |
422 | { | |
423 | - KUrl url("http://www.opendesktop.org/usermanager/new.php"); | |
424 | + KUrl url("https://www.opendesktop.org/usermanager/new.php"); | |
425 | kDebug() << "register new account" << url.url(); | |
426 | new KRun(url, ui.registerButton); | |
427 | } | |
428 | Index: applets/mediaplayer/plasma-applet-mediaplayer.desktop | |
429 | =================================================================== | |
430 | --- applets/mediaplayer/plasma-applet-mediaplayer.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
431 | +++ applets/mediaplayer/plasma-applet-mediaplayer.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
432 | @@ -20,6 +20,7 @@ | |
433 | Name[nl]=Mediaspeler | |
434 | Name[nn]=Mediespelar | |
435 | Name[pa]=ਮੀਡਿਆ ਪਲੇਅਰ | |
436 | +Name[pl]=Odtwarzacz multimedialny | |
437 | Name[pt]=Reprodutor Multimédia | |
438 | Name[pt_BR]=Reprodutor de mídia | |
439 | Name[ro]=Redare multimedia | |
440 | @@ -28,6 +29,7 @@ | |
441 | Name[sr]=медија плејер | |
442 | Name[sr@latin]=medija plejer | |
443 | Name[sv]=Mediaspelare | |
444 | +Name[tr]=Ortam Oynatıcı | |
445 | Name[uk]=Медіапрогравач | |
446 | Name[wa]=Djouweu d' media | |
447 | Name[x-test]=xxMedia Playerxx | |
448 | @@ -53,6 +55,7 @@ | |
449 | Comment[nl]=Widget die video en geluid kan afspelen | |
450 | Comment[nn]=Element som kan spela video og lyd | |
451 | Comment[pa]=ਵਿਦਜੈਟ, ਜੋ ਕਿ ਵੀਡਿਓ ਅਤੇ ਸਾਊਂਡ ਚਲਾ ਸਕਦਾ ਹੈ | |
452 | +Comment[pl]=Element interfejsu, który potrafi odtwarzać wideo i dźwięk | |
453 | Comment[pt]=Um elemento que pode reproduzir vídeo e áudio | |
454 | Comment[pt_BR]=Widget que pode tocar som e vídeo | |
455 | Comment[ro]=COntrol ce poate reda video și sunet | |
456 | @@ -61,6 +64,7 @@ | |
457 | Comment[sr]=Виџет за пуштање филмова и музике | |
458 | Comment[sr@latin]=Vidžet za puštanje filmova i muzike | |
459 | Comment[sv]=Grafisk komponent som kan spela video och ljud | |
460 | +Comment[tr]=Ses çalabilen ve video oynatabilen gereç | |
461 | Comment[uk]=Віджет, призначений для відтворення відео і звуку | |
462 | Comment[wa]=Ahesse ki sait djouwer des videyos et do son | |
463 | Comment[x-test]=xxWidget that can play video and soundxx | |
464 | Index: applets/lancelot/app/src/models/ContactsKopete.h | |
465 | =================================================================== | |
466 | --- applets/lancelot/app/src/models/ContactsKopete.h (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
467 | +++ applets/lancelot/app/src/models/ContactsKopete.h (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
468 | @@ -31,19 +31,21 @@ | |
469 | ContactsKopete(); | |
470 | ~ContactsKopete(); | |
471 | ||
472 | - void timerEvent(QTimerEvent * event); | |
473 | - | |
474 | protected: | |
475 | void activate(int index); | |
476 | void load(); | |
477 | + void load(bool forceReload); | |
478 | void updateContactData(const QString & contactId); | |
479 | + void timerEvent(QTimerEvent * event); | |
480 | ||
481 | protected Q_SLOTS: | |
482 | void contactChanged(const QString & contactId); | |
483 | ||
484 | private: | |
485 | org::kde::Kopete * m_interface; | |
486 | - QBasicTimer m_timer; | |
487 | + QBasicTimer m_delayTimer; | |
488 | + QBasicTimer m_checkRunningTimer; | |
489 | + QStringList m_contactsToUpdate; | |
490 | QString m_kopeteAvatarsDir; | |
491 | bool m_kopeteRunning : 1; | |
492 | bool m_noOnlineContacts : 1; | |
493 | Index: applets/lancelot/app/src/models/ContactsKopete.cpp | |
494 | =================================================================== | |
495 | --- applets/lancelot/app/src/models/ContactsKopete.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
496 | +++ applets/lancelot/app/src/models/ContactsKopete.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
497 | @@ -25,11 +25,12 @@ | |
498 | ||
499 | // #define UPDATE_INTERVAL 15000 | |
500 | #define CHECK_RUNNING_INTERVAL 5000 | |
501 | +#define DELAY_INTERVAL 500 | |
502 | ||
503 | namespace Models { | |
504 | ||
505 | ContactsKopete::ContactsKopete() | |
506 | - : m_interface(NULL), m_kopeteRunning(true) | |
507 | + : m_interface(NULL), m_kopeteRunning(false) | |
508 | { | |
509 | setSelfTitle(i18n("Contacts")); | |
510 | setSelfIcon(KIcon("kopete")); | |
511 | @@ -40,14 +41,27 @@ | |
512 | m_kopeteAvatarsDir = KStandardDirs::locate( | |
513 | "data", "kopete/avatars/Contacts/"); | |
514 | ||
515 | - m_timer.start(CHECK_RUNNING_INTERVAL, this); | |
516 | + m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this); | |
517 | load(); | |
518 | } | |
519 | ||
520 | void ContactsKopete::timerEvent(QTimerEvent * event) | |
521 | { | |
522 | - if (event->timerId() == m_timer.timerId()) { | |
523 | + if (event->timerId() == m_checkRunningTimer.timerId()) { | |
524 | load(); | |
525 | + } else if (event->timerId() == m_delayTimer.timerId()) { | |
526 | + qDebug() << "ContactsKopete::contactChanged [delayed]:" | |
527 | + << m_contactsToUpdate.size(); | |
528 | + m_delayTimer.stop(); | |
529 | + // checking whether we have a large update | |
530 | + if (m_contactsToUpdate.size() > 5) { | |
531 | + load(true); | |
532 | + } else { | |
533 | + foreach(QString contact, m_contactsToUpdate) { | |
534 | + updateContactData(contact); | |
5cf56c08 | 535 | + } |
5cf56c08 | 536 | + } |
49d7072e | 537 | + m_contactsToUpdate.clear(); |
5cf56c08 | 538 | } |
5cf56c08 | 539 | } |
49d7072e AM |
540 | |
541 | @@ -70,42 +84,65 @@ | |
542 | ||
543 | void ContactsKopete::load() | |
544 | { | |
545 | + load(false); | |
546 | +} | |
547 | + | |
548 | +void ContactsKopete::load(bool forceReload) | |
549 | +{ | |
550 | setEmitInhibited(true); | |
551 | - clear(); | |
552 | + bool statusChanged = false; | |
553 | + // clear(); | |
554 | ||
555 | if (!m_interface->isValid()) { | |
556 | - m_kopeteRunning = false; | |
557 | - m_timer.start(CHECK_RUNNING_INTERVAL, this); | |
558 | + if (m_kopeteRunning) { | |
559 | + qDebug() << "ContactsKopete::disconnecting D-Bus"; | |
560 | + disconnect(m_interface, SIGNAL(contactChanged(const QString &)), | |
561 | + this, SLOT(contactChanged(const QString &))); | |
562 | + statusChanged = true; | |
563 | + } | |
564 | ||
565 | - if (addService("kopete")) { | |
566 | - Item * item = const_cast < Item * > (& itemAt(0)); | |
567 | - item->title = i18n("Messaging client"); | |
568 | - item->description = i18n("Messaging client is not running"); | |
569 | - } else { | |
570 | - add(i18n("Unable to find Kopete"), "", | |
571 | - KIcon("application-x-executable"), QVariant("http://kopete.kde.org")); | |
572 | + if (forceReload || statusChanged) { | |
573 | + clear(); | |
574 | + m_kopeteRunning = false; | |
575 | + m_checkRunningTimer.start(CHECK_RUNNING_INTERVAL, this); | |
576 | + | |
577 | + if (addService("kopete")) { | |
578 | + Item * item = const_cast < Item * > (& itemAt(0)); | |
579 | + item->title = i18n("Messaging client"); | |
580 | + item->description = i18n("Messaging client is not running"); | |
581 | + } else { | |
582 | + add(i18n("Unable to find Kopete"), "", | |
583 | + KIcon("application-x-executable"), QVariant("http://kopete.kde.org")); | |
584 | + } | |
5cf56c08 | 585 | } |
49d7072e AM |
586 | } else { |
587 | - connect(m_interface, SIGNAL(contactChanged(const QString &)), | |
588 | - this, SLOT(contactChanged(const QString &))); | |
589 | + if (!m_kopeteRunning) { | |
590 | + qDebug() << "ContactsKopete::connecting D-Bus"; | |
591 | + connect(m_interface, SIGNAL(contactChanged(const QString &)), | |
592 | + this, SLOT(contactChanged(const QString &))); | |
593 | + statusChanged = true; | |
594 | + } | |
595 | ||
596 | - m_kopeteRunning = true; | |
597 | - m_noOnlineContacts = false; | |
598 | - // m_timer.start(UPDATE_INTERVAL, this); | |
599 | + if (forceReload || statusChanged) { | |
600 | + qDebug() << "ContactsKopete::load: full"; | |
601 | + clear(); | |
602 | + m_kopeteRunning = true; | |
603 | + m_noOnlineContacts = false; | |
604 | ||
605 | - QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online"); | |
606 | - if (!contacts.isValid()) { | |
607 | - m_kopeteRunning = false; | |
608 | - return; | |
609 | - } | |
610 | + QDBusReply < QStringList > contacts = m_interface->contactsByFilter("online"); | |
611 | + if (!contacts.isValid()) { | |
612 | + m_kopeteRunning = false; | |
613 | + return; | |
5cf56c08 | 614 | + } |
49d7072e AM |
615 | |
616 | - foreach (const QString& contact, contacts.value()) { | |
617 | - updateContactData(contact); | |
618 | - } | |
619 | + foreach (const QString& contact, contacts.value()) { | |
620 | + updateContactData(contact); | |
5cf56c08 | 621 | + } |
49d7072e AM |
622 | |
623 | - if (size() == 0) { | |
624 | - add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant()); | |
625 | - m_noOnlineContacts = true; | |
626 | + if (size() == 0) { | |
627 | + add(i18n("No online contacts"), "", KIcon("user-offline"), QVariant()); | |
628 | + m_noOnlineContacts = true; | |
629 | + } | |
630 | } | |
5cf56c08 | 631 | } |
49d7072e AM |
632 | setEmitInhibited(false); |
633 | @@ -177,8 +214,13 @@ | |
634 | ||
635 | void ContactsKopete::contactChanged(const QString & contactId) | |
636 | { | |
637 | - qDebug() << "ContactsKopete::contactChanged:" << contactId; | |
638 | - updateContactData(contactId); | |
639 | + // qDebug() << "ContactsKopete::contactChanged:" << contactId; | |
640 | + // updateContactData(contactId); | |
641 | + // delaying the update | |
642 | + if (!m_contactsToUpdate.contains(contactId)) { | |
643 | + m_contactsToUpdate << contactId; | |
644 | + } | |
645 | + m_delayTimer.start(DELAY_INTERVAL, this); | |
5cf56c08 | 646 | } |
49d7072e AM |
647 | |
648 | } // namespace Models | |
649 | Index: applets/lancelot/app/src/lancelot.notifyrc | |
5cf56c08 | 650 | =================================================================== |
49d7072e AM |
651 | --- applets/lancelot/app/src/lancelot.notifyrc (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) |
652 | +++ applets/lancelot/app/src/lancelot.notifyrc (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
653 | @@ -25,6 +25,7 @@ | |
654 | Comment[nds]=Lancelot-Menü | |
655 | Comment[nl]=Lancelot-menu | |
656 | Comment[nn]=Lancelot-meny | |
657 | +Comment[pl]=Menu Lancelota | |
658 | Comment[pt]=Menu do Lancelot | |
659 | Comment[pt_BR]=Menu do Lancelot | |
660 | Comment[ro]=Meniul Lancelot | |
661 | @@ -63,6 +64,7 @@ | |
662 | Name[nds]=Bruuk-Logbook is anmaakt | |
663 | Name[nl]=Loggen van gebruik is geactiveerd | |
664 | Name[nn]=Brukar-logging er påslått | |
665 | +Name[pl]=Logowanie użycia jest włączone | |
666 | Name[pt]=O registo de utilizações está activo | |
667 | Name[pt_BR]=O registro do uso está ativado | |
668 | Name[ro]=Jurnalizarea utilizării este activată | |
669 | @@ -97,6 +99,7 @@ | |
670 | Comment[nds]=Bloots bi den eersten Oproop wiest. Bescheed dor över, dat Bruuk-Logbook is nu anmaakt. | |
671 | Comment[nl]=Wordt alleen bij de eerste start getoond. Geeft aan dat gebruik loggen is geactiveerd. | |
672 | Comment[nn]=Vis berre ved første start. Merk at brukslogginga er slått på. | |
673 | +Comment[pl]=Pokazane tylko pierwsze uruchomienie. Powiadamia, że logowanie użycia jest włączone. | |
674 | Comment[pt]=Mostrar apenas no primeiro lançamento. Notifica que o registo de utilizações está activo. | |
675 | Comment[pt_BR]=Exibir somente na primeira inicialização. Notifica que o registro de uso está 'ligado'. | |
676 | Comment[ro]=Afișat numai la prima lansare. Notifică că jurnalizarea utilizării este activată. | |
677 | @@ -132,6 +135,7 @@ | |
678 | Name[nl]=Fout bij openen van log | |
679 | Name[nn]=Feil ved opning av loggen | |
680 | Name[pa]=ਲਾਗ ਖੋਲ੍ਹਣ ਲਈ ਗਲਤੀ | |
681 | +Name[pl]=Błąd podczas otwierania dziennika | |
682 | Name[pt]=Ocorreu um erro ao aceder ao registo | |
683 | Name[pt_BR]=Erro ao abri o log | |
684 | Name[ro]=Eroare la deschiderea jurnalului | |
685 | @@ -167,6 +171,7 @@ | |
686 | Comment[nl]=Het openen van het logbestand is mislukt. | |
687 | Comment[nn]=Klarte ikkje opna loggfila. | |
688 | Comment[pa]=ਲਾਗ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ। | |
689 | +Comment[pl]=Nieudane otwarcie dziennika. | |
690 | Comment[pt]=Não foi possível aceder ao ficheiro de registo. | |
691 | Comment[pt_BR]=Falha ao abrir o arquivo de log. | |
692 | Comment[ro]=Eșec la deschiderea fișierului-jurnal. | |
693 | Index: applets/lancelot/app/src/QtDisplay.h | |
694 | =================================================================== | |
695 | --- applets/lancelot/app/src/QtDisplay.h (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
696 | +++ applets/lancelot/app/src/QtDisplay.h (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
697 | @@ -33,12 +33,7 @@ | |
698 | #include <QTimer> | |
699 | #include <QMainWindow> | |
700 | ||
701 | -#include <X11/Xlib.h> | |
702 | -#include <X11/extensions/composite.h> | |
703 | -#include <X11/extensions/Xcomposite.h> | |
704 | #include <X11/extensions/Xrender.h> | |
705 | -#include <X11/extensions/shape.h> | |
706 | -#include <X11/extensions/Xdamage.h> | |
707 | ||
708 | /** | |
709 | About QtDisplay Class | |
710 | Index: applets/lancelot/app/src/launcher/plasma-applet-lancelot-launcher.desktop | |
711 | =================================================================== | |
712 | --- applets/lancelot/app/src/launcher/plasma-applet-lancelot-launcher.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
713 | +++ applets/lancelot/app/src/launcher/plasma-applet-lancelot-launcher.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
714 | @@ -30,7 +30,7 @@ | |
715 | Name[nl]=Lancelot-starter | |
716 | Name[nn]=Lancelot programstartar | |
717 | Name[pa]=ਲਾਂਸੀਕੋਤ ਲਾਂਚਰ | |
718 | -Name[pl]=Lancelot | |
719 | +Name[pl]=Lancelot (program uruchamiający) | |
720 | Name[pt]=Lançador do Lancelot | |
721 | Name[pt_BR]=Lançador do Lancelot | |
722 | Name[ro]=Lansatorul Lancelot | |
723 | Index: applets/lancelot/app/src/CMakeLists.txt | |
724 | =================================================================== | |
725 | --- applets/lancelot/app/src/CMakeLists.txt (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
726 | +++ applets/lancelot/app/src/CMakeLists.txt (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
727 | @@ -9,12 +9,19 @@ | |
728 | # Checking for Composite Begin # | |
729 | ######################################################### | |
730 | ||
731 | -message ("Composite libraries?") | |
732 | -if( X11_Xcomposite_FOUND AND X11_Xdamage_FOUND ) | |
733 | +if(X11_Xrender_FOUND ) | |
734 | set( LANCELOT_HAVE_COMPOSITING 1 ) | |
735 | - message ("Composite libraries found") | |
736 | -endif( X11_Xcomposite_FOUND AND X11_Xdamage_FOUND ) | |
737 | +endif( X11_Xrender_FOUND ) | |
738 | ||
739 | +macro_log_feature(LANCELOT_HAVE_COMPOSITING | |
740 | + "XRender" | |
741 | + "Lancelot compositing support" | |
742 | + "http://www.x.org/" | |
743 | + FALSE | |
744 | + "" | |
745 | + "STRONGLY_RECOMMENDED: XRender extension is required for Lancelot compositing support") | |
746 | + | |
747 | + | |
748 | configure_file(config-lancelot.h.cmake | |
749 | ${CMAKE_CURRENT_BINARY_DIR}/config-lancelot.h ) | |
5cf56c08 | 750 | |
49d7072e AM |
751 | Index: applets/weatherstation/weatherstation.cpp |
752 | =================================================================== | |
753 | --- applets/weatherstation/weatherstation.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
754 | +++ applets/weatherstation/weatherstation.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
755 | @@ -45,12 +45,22 @@ | |
5cf56c08 | 756 | { |
49d7072e AM |
757 | m_lcd = new LCD(this); |
758 | m_lcd->setSvg("weatherstation/lcd"); | |
759 | - // So we don't show in panel | |
760 | - m_lcd->setMinimumSize(m_lcd->preferredSize() / 2); | |
761 | + // i18n: This and other all-caps messages are pieces of text shown on | |
762 | + // an LCD-like image mimicking a electronic weather station display. | |
763 | + // If weather station displays in your country are always in English, | |
764 | + // you may want to consider leaving these strings in English too, | |
765 | + // to achieve a more realistic feeling. | |
766 | + m_lcd->setLabel("pressure-label", i18n("PRESSURE")); | |
767 | + m_lcd->setLabel("weather-label", i18n("CURRENT WEATHER")); | |
768 | + m_lcd->setLabel("temperature-label", i18n("OUTDOOR TEMP")); | |
769 | + m_lcd->setLabel("humidity-label", i18n("HUMIDITY")); | |
770 | + m_lcd->setLabel("wind-label", i18n("WIND")); | |
771 | + m_lcd->setLabel("provider-label", QString()); | |
772 | connect(m_lcd, SIGNAL(clicked(const QString&)), this, SLOT(clicked(const QString&))); | |
773 | ||
774 | m_lcdPanel = new LCD(this); | |
775 | m_lcdPanel->setSvg("weatherstation/lcd_panel"); | |
776 | + m_lcdPanel->setLabel("temperature-label", i18n("OUTDOOR TEMP")); | |
777 | m_lcdPanel->hide(); | |
778 | ||
779 | //m_lcd->setItemOn("under_construction"); | |
780 | @@ -144,13 +154,13 @@ | |
781 | setWind(value(data["Wind Speed"].toString(), | |
782 | WeatherUtils::getUnitString(data["Wind Speed Unit"].toInt(), true)), | |
783 | data["Wind Direction"].toString()); | |
784 | - m_lcd->setLabel("label0", data["Credit"].toString()); | |
785 | + m_lcd->setLabel("provider-label", data["Credit"].toString()); | |
786 | m_url = data["Credit Url"].toString(); | |
787 | - m_lcd->setItemClickable("label0", !m_url.isEmpty()); | |
788 | + m_lcd->setItemClickable("provider-click", !m_url.isEmpty()); | |
5cf56c08 | 789 | |
49d7072e AM |
790 | if (m_showToolTip) { |
791 | Plasma::ToolTipContent ttc(data["Place"].toString(), | |
792 | - i18n("Last updated: ") + QDateTime::currentDateTime().toString()); | |
793 | + i18n("Last updated: %1", KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::FancyLongDate))); | |
794 | Plasma::ToolTipManager::self()->setContent(this, ttc); | |
795 | } | |
796 | } | |
797 | @@ -224,9 +234,10 @@ | |
798 | current = fromCondition(condition); | |
799 | m_lcd->setGroup("weather", current); | |
800 | ||
801 | - QString s = fitValue(Conversion::Converter::self()->convert(pressure, pressureUnit()), 5); | |
802 | + Conversion::Value value = Conversion::Converter::self()->convert(pressure, pressureUnit()); | |
803 | + QString s = fitValue(value, 5); | |
804 | m_lcd->setNumber("pressure", s); | |
805 | - m_lcd->setGroup("pressure_unit", QStringList() << pressureUnit()); | |
806 | + m_lcd->setLabel("pressure-unit-label", value.unit()->symbol()); | |
807 | ||
808 | qreal t; | |
809 | if (tendencyString.toLower() == "rising") { | |
810 | @@ -249,8 +260,8 @@ | |
811 | void WeatherStation::setTemperature(const Conversion::Value& temperature) | |
812 | { | |
813 | Conversion::Value v = Conversion::Converter::self()->convert(temperature, temperatureUnit()); | |
814 | - m_lcd->setGroup("temp_unit", QStringList() << temperatureUnit()); | |
815 | - m_lcdPanel->setGroup("temp_unit", QStringList() << temperatureUnit()); | |
816 | + m_lcd->setLabel("temperature-unit-label", v.unit()->symbol()); | |
817 | + m_lcdPanel->setLabel("temperature-unit-label", v.unit()->symbol()); | |
818 | m_lcd->setNumber("temperature", fitValue(v , 4)); | |
819 | m_lcdPanel->setNumber("temperature", fitValue(v , 3)); | |
820 | setLCDIcon(); | |
821 | @@ -269,7 +280,8 @@ | |
822 | void WeatherStation::setWind(const Conversion::Value& speed, const QString& dir) | |
5cf56c08 | 823 | { |
49d7072e AM |
824 | //kDebug() << speed.number() << speed.unit()->symbol() << dir; |
825 | - QString s = fitValue(Conversion::Converter::self()->convert(speed, speedUnit()), 3); | |
826 | + Conversion::Value value = Conversion::Converter::self()->convert(speed, speedUnit()); | |
827 | + QString s = fitValue(value, 3); | |
828 | ||
829 | if (dir == "N/A") { | |
830 | m_lcd->setGroup("wind", QStringList()); | |
831 | @@ -277,7 +289,7 @@ | |
832 | m_lcd->setGroup("wind", QStringList() << dir); | |
833 | } | |
834 | m_lcd->setNumber("wind_speed", s); | |
835 | - m_lcd->setGroup("wind_unit", QStringList() << speedUnit()); | |
836 | + m_lcd->setLabel("wind-unit-label", value.unit()->symbol()); | |
5cf56c08 | 837 | } |
838 | ||
49d7072e AM |
839 | void WeatherStation::clicked(const QString &name) |
840 | Index: applets/weatherstation/lcd.cpp | |
841 | =================================================================== | |
842 | --- applets/weatherstation/lcd.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
843 | +++ applets/weatherstation/lcd.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
844 | @@ -39,12 +39,13 @@ | |
845 | // lcd numbers did not look good with that. | |
846 | KSvgRenderer svg; | |
847 | bool dirty; | |
848 | + bool xmlDirty; | |
849 | QPixmap img; | |
850 | QStringList items; | |
851 | QMap<QString, QStringList> groups; | |
852 | - QHash<QString, QColor> colors; | |
853 | - QHash<QString, QString> labels; | |
854 | + QHash<QString, QDomText> texts; | |
855 | QStringList clickable; | |
856 | + QDomDocument doc; | |
857 | ||
858 | static const QString A; | |
859 | static const QString B; | |
860 | @@ -149,39 +150,43 @@ | |
861 | return r; | |
862 | } | |
863 | ||
864 | - void updateImage() | |
865 | + void checkIfDirty() | |
866 | { | |
867 | - if (l->size().toSize() != img.size()) { | |
868 | - img = QPixmap(l->size().toSize()); | |
869 | + if (xmlDirty) { | |
870 | + //kDebug() << "xml dirty"; | |
871 | + svg.load(doc.toByteArray(0)); | |
872 | + xmlDirty = false; | |
873 | } | |
874 | - img.fill(Qt::transparent); | |
875 | + if (dirty || (l->size().toSize() != img.size() && l->size().toSize() != QSize(0, 0))) { | |
876 | + //kDebug() << "Making bitmap" << l->size(); | |
877 | + if (l->size().toSize() != img.size()) { | |
878 | + img = QPixmap(l->size().toSize()); | |
879 | + } | |
880 | + img.fill(Qt::transparent); | |
881 | ||
882 | - QPainter p(&img); | |
883 | + QPainter p(&img); | |
884 | ||
885 | - xScale = l->size().width() / svg.defaultSize().width(); | |
886 | - yScale = l->size().height() / svg.defaultSize().height(); | |
887 | - p.setRenderHint(QPainter::TextAntialiasing, true); | |
888 | - p.setRenderHint(QPainter::Antialiasing, true); | |
889 | - p.setRenderHint(QPainter::SmoothPixmapTransform, true); | |
890 | + xScale = l->size().width() / svg.defaultSize().width(); | |
891 | + yScale = l->size().height() / svg.defaultSize().height(); | |
892 | + p.setRenderHint(QPainter::TextAntialiasing, true); | |
893 | + p.setRenderHint(QPainter::Antialiasing, true); | |
894 | + p.setRenderHint(QPainter::SmoothPixmapTransform, true); | |
895 | ||
896 | - p.save(); | |
897 | - p.scale(l->size().width() / svg.defaultSize().width(), | |
898 | - l->size().height() / svg.defaultSize().height()); | |
899 | + p.save(); | |
900 | + p.scale(l->size().width() / svg.defaultSize().width(), | |
901 | + l->size().height() / svg.defaultSize().height()); | |
902 | ||
903 | - foreach (const QString& item, items) { | |
904 | - paint(&p, item); | |
905 | + foreach (const QString& item, items) { | |
906 | + paint(&p, item); | |
907 | + } | |
908 | + p.restore(); | |
909 | + dirty = false; | |
910 | } | |
911 | - p.restore(); | |
912 | - foreach (const QString& label, labels.keys()) { | |
913 | - text(&p, label); | |
914 | - } | |
915 | - dirty = false; | |
916 | } | |
917 | ||
918 | void parseXml() | |
919 | { | |
920 | QIODevice *device = KFilterDev::deviceForFile(content, "application/x-gzip"); | |
921 | - QDomDocument doc; | |
922 | ||
923 | doc.setContent(device); | |
924 | QList<QDomNodeList> lists; | |
925 | @@ -196,13 +201,22 @@ | |
926 | QString id = element.attribute("id"); | |
927 | if ((pos = id.lastIndexOf(':')) > -1) { | |
928 | groups[id.left(pos)] << id.mid(pos + 1); | |
929 | - } else if (element.tagName() == "rect") { | |
930 | - if (rx.indexIn(element.attribute("style")) > -1) { | |
931 | - colors[id] = QColor(rx.cap(1)); | |
932 | - } | |
933 | } | |
934 | } | |
935 | } | |
936 | + QDomNodeList list = doc.elementsByTagName("text"); | |
937 | + for (int i = 0; i < list.count(); ++i) { | |
938 | + QDomElement element = list.item(i).toElement(); | |
939 | + QDomNodeList l = element.elementsByTagName("tspan"); | |
940 | + QDomElement e = l.item(0).toElement(); | |
941 | + for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) { | |
942 | + QDomText t = n.toText(); | |
943 | + if (!t.isNull()) { | |
944 | + texts[element.attribute("id")] = t; | |
945 | + } | |
946 | + } | |
947 | + } | |
948 | + | |
949 | //kDebug() << groups; | |
950 | delete device; | |
951 | } | |
952 | @@ -222,35 +236,6 @@ | |
953 | } | |
954 | return result; | |
955 | } | |
956 | - | |
957 | - void text(QPainter *p, const QString elementID) | |
958 | - { | |
959 | - QString text = labels[elementID]; | |
960 | - | |
961 | - if (svg.elementExists(elementID)) { | |
962 | - QRectF elementRect = scaledRect(elementID); | |
963 | - Qt::Alignment align = Qt::AlignCenter; | |
964 | - | |
965 | - p->setPen(QPen(colors[elementID])); | |
966 | - p->setFont(fitText(p, text, elementRect)); | |
967 | - if (elementRect.width() > elementRect.height()) { | |
968 | - p->drawText(elementRect, align, text); | |
969 | - } else { | |
970 | - p->save(); | |
971 | - QPointF rotateCenter( | |
972 | - elementRect.left() + elementRect.width() / 2, | |
973 | - elementRect.top() + elementRect.height() / 2); | |
974 | - p->translate(rotateCenter); | |
975 | - p->rotate(-90); | |
976 | - p->translate(elementRect.height() / -2, | |
977 | - elementRect.width() / -2); | |
978 | - QRectF r(0, 0, elementRect.height(), elementRect.width()); | |
979 | - p->drawText(r, align, text); | |
980 | - p->restore(); | |
981 | - } | |
982 | - //p->drawRect(elementRect); | |
983 | - } | |
984 | - } | |
985 | }; | |
986 | ||
987 | QMap<QChar, QStringList> LCD::Private::sevenSegmentDigits; | |
988 | @@ -287,10 +272,9 @@ | |
5cf56c08 | 989 | } else { |
49d7072e AM |
990 | d->content = Plasma::Theme::defaultTheme()->imagePath(svg); |
991 | } | |
992 | - d->svg.load(d->content); | |
993 | d->parseXml(); | |
994 | - setPreferredSize(d->svg.defaultSize()); | |
995 | d->dirty = true; | |
996 | + d->xmlDirty = true; | |
997 | update(); | |
998 | } | |
999 | ||
1000 | @@ -304,9 +288,7 @@ | |
1001 | Q_UNUSED(option) | |
1002 | Q_UNUSED(widget) | |
1003 | ||
1004 | - if (d->dirty || size().toSize() != d->img.size()) { | |
1005 | - d->updateImage(); | |
1006 | - } | |
1007 | + d->checkIfDirty(); | |
1008 | p->drawPixmap(0, 0, d->img); | |
1009 | } | |
1010 | ||
1011 | @@ -386,19 +368,20 @@ | |
5cf56c08 | 1012 | |
49d7072e | 1013 | void LCD::setLabel(const QString &name, const QString &text) |
5cf56c08 | 1014 | { |
49d7072e AM |
1015 | - d->labels[name] = text; |
1016 | + if (d->texts[name].data() != text) { | |
1017 | + d->texts[name].setData(text); | |
1018 | + d->xmlDirty = true; | |
1019 | + } | |
1020 | } | |
5cf56c08 | 1021 | |
49d7072e AM |
1022 | QString LCD::label(const QString &name) const |
1023 | { | |
1024 | - return d->labels[name]; | |
1025 | + return d->texts[name].data(); | |
1026 | } | |
5cf56c08 | 1027 | |
49d7072e AM |
1028 | QPixmap LCD::toPixmap() |
1029 | { | |
1030 | - if (d->dirty || size().toSize() != d->img.size()) { | |
1031 | - d->updateImage(); | |
1032 | - } | |
1033 | + d->checkIfDirty(); | |
1034 | return d->img; | |
1035 | } | |
5cf56c08 | 1036 | |
49d7072e AM |
1037 | @@ -431,4 +414,18 @@ |
1038 | } | |
1039 | } | |
1040 | ||
1041 | +QSizeF LCD::sizeHint(Qt::SizeHint which, const QSizeF& constraint) const | |
1042 | +{ | |
1043 | + QSizeF s = QGraphicsWidget::sizeHint(which, constraint); | |
1044 | + d->checkIfDirty(); | |
1045 | + if (which == Qt::PreferredSize) { | |
1046 | + s = d->svg.defaultSize(); | |
1047 | + } else if (which == Qt::MinimumSize) { | |
1048 | + s = d->svg.defaultSize() / 2; | |
1049 | + } else { | |
1050 | + s = QGraphicsWidget::sizeHint(which, constraint); | |
1051 | + } | |
1052 | + return s; | |
1053 | +} | |
1054 | + | |
1055 | #include "lcd.moc" | |
1056 | Index: applets/weatherstation/lcd.h | |
1057 | =================================================================== | |
1058 | --- applets/weatherstation/lcd.h (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1059 | +++ applets/weatherstation/lcd.h (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1060 | @@ -139,14 +139,15 @@ | |
1061 | * Reimplemented from QGraphicsWidget | |
1062 | */ | |
1063 | void paint(QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *widget); | |
1064 | - | |
1065 | + | |
1066 | signals: | |
1067 | void clicked(const QString &name); | |
1068 | ||
1069 | protected: | |
1070 | virtual void hoverMoveEvent(QGraphicsSceneHoverEvent* event); | |
1071 | virtual void mousePressEvent(QGraphicsSceneMouseEvent* event); | |
1072 | - | |
1073 | + virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint = QSizeF()) const; | |
1074 | + | |
1075 | private: | |
1076 | class Private; | |
1077 | Private * const d; | |
1078 | Index: applets/weatherstation/lcd_panel.svgz | |
1079 | =================================================================== | |
1080 | Nie można wyświetlić: plik binarny. | |
1081 | svn:mime-type = application/octet-stream | |
1082 | Index: applets/weatherstation/lcd.svgz | |
1083 | =================================================================== | |
1084 | Nie można wyświetlić: plik binarny. | |
1085 | svn:mime-type = application/octet-stream | |
1086 | Index: applets/bubblemon/plasma-applet-bubblemon.desktop | |
1087 | =================================================================== | |
1088 | --- applets/bubblemon/plasma-applet-bubblemon.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1089 | +++ applets/bubblemon/plasma-applet-bubblemon.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1090 | @@ -28,6 +28,7 @@ | |
1091 | Comment[nds]=En smuck Blaas, de Dien Systeem bekieken deit | |
1092 | Comment[nl]=Een prachtige bubbel die uw systeem monitort. | |
1093 | Comment[nn]=Fin boble som overvaker systemet | |
1094 | +Comment[pl]=Bąbelek monitorujący system. | |
1095 | Comment[pt]=Uma bolha bonita que vigia o seu sistema. | |
1096 | Comment[pt_BR]=Uma bonita bolha que monitora o seu sistema. | |
1097 | Comment[ro]=Un balon drăguț ce vă monitorizează sistemul. | |
1098 | @@ -36,6 +37,7 @@ | |
1099 | Comment[sr]=Пријатни балон који надзире систем. | |
1100 | Comment[sr@latin]=Prijatni balon koji nadzire sistem. | |
1101 | Comment[sv]=En snygg bubbla som övervakar systemet. | |
1102 | +Comment[tr]=Sisteminizi izleyen sevimli bir baloncuk. | |
1103 | Comment[uk]=Гарненька бульбашка, яка спостерігає за вашою системою. | |
1104 | Comment[wa]=Ene djoleye bouye ki corwaite vosse sistinme. | |
1105 | Comment[x-test]=xxA pretty bubble that monitors your system.xx | |
1106 | Index: applets/systemloadviewer/plasma-applet-systemloadviewer.desktop | |
1107 | =================================================================== | |
1108 | --- applets/systemloadviewer/plasma-applet-systemloadviewer.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1109 | +++ applets/systemloadviewer/plasma-applet-systemloadviewer.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1110 | @@ -22,6 +22,7 @@ | |
1111 | Name[nl]=Systeembelastingweergave | |
1112 | Name[nn]=Systemlast-oversikt | |
1113 | Name[pa]=ਸਿਸਟਮ ਲੋਡ ਦਰਸ਼ਕ | |
1114 | +Name[pl]=Przeglądarka obciążenia systemu | |
1115 | Name[pt]=Visualizador da Carga do Sistema | |
1116 | Name[pt_BR]=Visualizador de carga do sistema | |
1117 | Name[ro]=Vizualizator încărcare sistem | |
1118 | @@ -58,6 +59,7 @@ | |
1119 | Comment[nl]=Kleine CPU/RAM/Swap-monitor | |
1120 | Comment[nn]=Overvak prosessor, minne og veksleminne | |
1121 | Comment[pa]=ਨਿੰਮਾ CPU/RAM/ਸਵੈਪ ਮਾਨੀਟਰ | |
1122 | +Comment[pl]=Mały monitor procesora/pamięci | |
1123 | Comment[pt]=Monitor minúsculo de CPU/RAM/Memória Virtual | |
1124 | Comment[pt_BR]=Pequeno monitor do CPU/RAM/Swap | |
1125 | Comment[ro]=Monitor minuscul pentru procesor/memorie/swap | |
1126 | Index: applets/unitconverter/plasma-applet-unitconverter.desktop | |
1127 | =================================================================== | |
1128 | --- applets/unitconverter/plasma-applet-unitconverter.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1129 | +++ applets/unitconverter/plasma-applet-unitconverter.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1130 | @@ -67,6 +67,7 @@ | |
1131 | Comment[nl]=Plasmoid voor eenheden converteren | |
1132 | Comment[nn]=Konverter mellom ulike einingar | |
1133 | Comment[pa]=ਯੂਨਿਟ ਬਦਲਣ ਲਈ ਪਲਾਜ਼ਮੋਇਡ | |
1134 | +Comment[pl]=Plazmoid do konwersji jednostek | |
1135 | Comment[pt]=Plasmóide para converter unidades | |
1136 | Comment[pt_BR]=Plasmóide para converter unidades | |
1137 | Comment[ro]=Plasmoid pentru conversia unităților | |
1138 | Index: applets/previewer/plasma-previewer.cpp | |
1139 | =================================================================== | |
1140 | --- applets/previewer/plasma-previewer.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1141 | +++ applets/previewer/plasma-previewer.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1142 | @@ -55,6 +55,7 @@ | |
1143 | m_base(0), | |
1144 | m_dialog(0), | |
1145 | m_part(0), | |
1146 | + m_currentFile(QString()), | |
1147 | m_previewWidget(0) | |
5cf56c08 | 1148 | { |
49d7072e AM |
1149 | new PreviewerAdaptor(this); |
1150 | @@ -68,6 +69,10 @@ | |
1151 | setAcceptDrops(true); | |
5cf56c08 | 1152 | |
49d7072e AM |
1153 | resize(PreviewWidget::suggestedWidth(), 150); |
1154 | + if (args.count()) { | |
1155 | + kDebug() << "Opening file from arg passed into applet ..." << args.value(0).toString(); | |
1156 | + m_currentFile = args.value(0).toString(); | |
1157 | + } | |
1158 | } | |
5cf56c08 | 1159 | |
49d7072e AM |
1160 | Previewer::~Previewer() |
1161 | @@ -99,6 +104,9 @@ | |
5cf56c08 | 1162 | { |
49d7072e AM |
1163 | setPopupIcon("previewer"); |
1164 | setupActions(); | |
1165 | + if (!m_currentFile.isEmpty()) { | |
1166 | + openFile(m_currentFile); | |
1167 | + } | |
1168 | } | |
1169 | ||
1170 | void Previewer::constraintsEvent(Plasma::Constraints constraints) | |
1171 | @@ -257,7 +265,7 @@ | |
1172 | m_dialog->setWindowFlags(Qt::FramelessWindowHint); | |
1173 | m_dialog->show(); | |
1174 | ||
1175 | - int buttonCode = KMessageBox::questionYesNo(m_dialog, i18n("Are you sure you want to remove:\n%1", cur.pathOrUrl()), | |
1176 | + int buttonCode = KMessageBox::questionYesNo(m_dialog, i18n("Are you sure you want to remove:\n%1", cur.pathOrUrl()), | |
1177 | i18n("Deleting File")); | |
1178 | ||
1179 | m_dialog->setWindowFlags(Qt::X11BypassWindowManagerHint); | |
1180 | Index: applets/news/news.css | |
1181 | =================================================================== | |
1182 | --- applets/news/news.css (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1183 | +++ applets/news/news.css (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1184 | @@ -1,13 +1,13 @@ | |
1185 | -.header { font-size:11pt; font-weight:bold; color:#fcfcfc; background-color:#4f4f4f; } | |
1186 | -.date { font-size:10pt; font-weight:bold; color:#fcfcfc; background-color:#333333; } | |
1187 | -.line-0 { font-size:10pt; color:#fcfcfc; background-color:#0f0f0f; } | |
1188 | -.line-1 { font-size:10pt; color:#fcfcfc; background-color:#2f2f2f; } | |
1189 | -.time { font-size:7pt; color:#cccccc; padding-top:3px; } | |
1190 | +.header { font-size:11pt; font-weight:bold; color:#000; background-color:rgba(255,255,255,0.45); } | |
1191 | +.date { font-size:10pt; font-weight:bold; color:#000; background-color:rgba(255,255,255,0.45); } | |
1192 | +.line-0 { font-size:10pt; color:#000; background-color:rgba(255,255,255,0.25); } | |
1193 | +.line-1 { font-size:10pt; color:#000; background-color:transparent; } | |
1194 | +.time { font-size:7pt; color:#555; padding-top:3px; } | |
1195 | .title, .description { } | |
1196 | .description { font-size:9pt; } | |
1197 | .text { width:100%; } | |
1198 | .title_with_description { font-weight:bold; } | |
1199 | -a { text-decoration:none; color:#fcfcfc; } | |
1200 | +a { text-decoration:none; color:#222; } | |
1201 | table { width:100%; border-spacing:0px; } | |
1202 | td { vertical-align: top; } | |
1203 | -body { margin:0px; background-color:#000000 } | |
1204 | +body { margin:0px; background-color:transparent } | |
1205 | Index: applets/rememberthemilk/plasma-applet-rememberthemilk.desktop | |
1206 | =================================================================== | |
1207 | --- applets/rememberthemilk/plasma-applet-rememberthemilk.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1208 | +++ applets/rememberthemilk/plasma-applet-rememberthemilk.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1209 | @@ -32,6 +32,7 @@ | |
1210 | Comment[nds]=Opgavenlist-Lüttprogramm "Dor An Denken" | |
1211 | Comment[nl]=Applet voor takenlijst van The Milk onthouden | |
1212 | Comment[nn]=Hugselista Remember The Milk | |
1213 | +Comment[pl]=Lista rzeczy do zrobienia Remember The Milk | |
1214 | Comment[pt]='Applet' de lista de tarefas e itens por-fazer | |
1215 | Comment[pt_BR]=Miniaplicativo de lista de tarefas do Remember The Milk | |
1216 | Comment[ro]=Miniaplicație cu listă de sarcini Nu uita laptele | |
1217 | Index: applets/notes/notes.cpp | |
1218 | =================================================================== | |
1219 | --- applets/notes/notes.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1220 | +++ applets/notes/notes.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1221 | @@ -411,7 +411,13 @@ | |
1222 | const qreal ypad = geometry().height() / 15; | |
1223 | m_layout->setContentsMargins(xpad, ypad, xpad, ypad); | |
1224 | m_font.setPointSize(fontSize()); | |
1225 | - m_textEdit->nativeWidget()->setFont(m_font); | |
1226 | + | |
1227 | + QString cssWeight = m_font.bold() ? "bold" : "normal"; | |
1228 | + QString cssStyle = m_font.italic() ? "italic" : "normal"; | |
1229 | + QString cssSize = QString::number(m_font.pointSize()) + QString("pt"); | |
1230 | + QString css = QString("QTextEdit { font-family:%1; font-size:%2; font-weight:%3;" | |
1231 | + "font-style:%4; }").arg(m_font.family(), cssSize, cssWeight, cssStyle); | |
1232 | + m_textEdit->nativeWidget()->setStyleSheet(css); | |
1233 | } | |
1234 | } | |
1235 | ||
1236 | @@ -560,7 +566,6 @@ | |
1237 | cg.writeEntry("font", newFont); | |
1238 | m_font = newFont; | |
1239 | m_font.setPointSize(fontSize()); | |
1240 | - m_textEdit->nativeWidget()->setFont(newFont); | |
1241 | } | |
1242 | ||
1243 | if (m_customFontSize != ui.customFontSizeSpinBox->value()) { | |
1244 | Index: applets/calculator/plasma-applet-calculator.desktop | |
1245 | =================================================================== | |
1246 | --- applets/calculator/plasma-applet-calculator.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1247 | +++ applets/calculator/plasma-applet-calculator.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1248 | @@ -30,7 +30,6 @@ | |
1249 | Name[nn]=Kalkulator | |
1250 | Name[oc]=Calculeta | |
1251 | Name[pa]=ਕੈਲਕੂਲੇਟਰ | |
1252 | -Name[pl]=Kalkulator | |
1253 | Name[pt]=Calculadora | |
1254 | Name[pt_BR]=Calculadora | |
1255 | Name[ru]=Калькулятор | |
1256 | Index: applets/rssnow/news.cpp | |
1257 | =================================================================== | |
1258 | --- applets/rssnow/news.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1259 | +++ applets/rssnow/news.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1260 | @@ -263,6 +263,8 @@ | |
1261 | if (m_logo) { | |
1262 | m_layout->addItem(m_header); | |
1263 | m_header->show(); | |
1264 | + } else { | |
1265 | + m_header->hide(); | |
1266 | } | |
1267 | ||
1268 | qDeleteAll(m_scrollerList); | |
1269 | @@ -336,6 +338,7 @@ | |
1270 | ||
1271 | KConfigGroup cg = config(); | |
1272 | cg.writeEntry("feeds", m_feedlist); | |
1273 | + emit configNeedsSaving(); | |
5cf56c08 | 1274 | |
49d7072e AM |
1275 | updateScrollers(); |
1276 | connectToEngine(); | |
1277 | @@ -345,12 +348,12 @@ | |
5cf56c08 | 1278 | |
49d7072e | 1279 | void News::constraintsEvent(Plasma::Constraints constraints) |
5cf56c08 | 1280 | { |
49d7072e AM |
1281 | - kDebug() << "constrainsUpdated : " << constraints; |
1282 | + //kDebug() << "constrainsUpdated : " << constraints; | |
1283 | if (constraints & Plasma::FormFactorConstraint || constraints & Plasma::SizeConstraint ) { | |
1284 | if (formFactor() == Plasma::Horizontal) { | |
1285 | int minSize = (m_feedlist.size() * m_scrollerList.first()->minimumSize().height()) + m_header->size().height(); | |
1286 | - kDebug() << "minimum size to contain all scrollers: " << minSize; | |
1287 | - if (geometry().height() < minSize && !m_collapsed) { | |
1288 | + //kDebug() << "minimum size to contain all scrollers: " << minSize << m_feedlist; | |
1289 | + if (contentsRect().height() < minSize) { | |
1290 | //group all feeds together so it can fit (only a single time): | |
1291 | QString allfeeds; | |
1292 | foreach (const QString &feed, m_feedlist) { | |
1293 | @@ -367,7 +370,10 @@ | |
1294 | m_collapsed = true; | |
1295 | updateScrollers(); | |
1296 | } else { | |
1297 | - //TODO: restore default settings. | |
1298 | + m_collapsed = false; | |
1299 | + m_logo = config().readEntry("logo", true); | |
1300 | + m_feedlist = config().readEntry("feeds", QStringList("http://dot.kde.org/rss.xml")); | |
1301 | + updateScrollers(); | |
1302 | } | |
1303 | } | |
1304 | } | |
1305 | Index: applets/rssnow/single-feed.cpp | |
1306 | =================================================================== | |
1307 | --- applets/rssnow/single-feed.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1308 | +++ applets/rssnow/single-feed.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1309 | @@ -26,6 +26,7 @@ | |
1310 | #include <kdebug.h> | |
1311 | #include <kicon.h> | |
1312 | #include <kcursor.h> | |
1313 | +#include <kglobalsettings.h> | |
1314 | ||
1315 | //Plasma | |
1316 | #include <plasma/svg.h> | |
1317 | @@ -50,9 +51,6 @@ | |
1318 | m_background = new Plasma::Svg(this); | |
1319 | m_background->setImagePath("rssnow/background"); | |
1320 | ||
1321 | - QFont font = Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont); | |
1322 | - font.setPointSize(font.pointSize() - 2); //because it looks prettier, but | |
1323 | - | |
1324 | //ok, so why use a QGraphicsTextItem and not display it? It causes a lot of | |
1325 | //clipping issues, so it's easier to only use the convert to plain text | |
1326 | //functionality of QGraphicsTextItem. TODO: find a more direct and elegant | |
1327 | @@ -75,10 +73,7 @@ | |
1328 | qreal width = m_rect.width(); | |
1329 | ||
1330 | p->setRenderHint(QPainter::Antialiasing); | |
1331 | - QFont font = Plasma::Theme::defaultTheme()->font(Plasma::Theme::DefaultFont); | |
1332 | - // FIXME: currently there is nothing else than DefaultFont for Theme | |
1333 | - // so we calculate the size | |
1334 | - font.setPixelSize(height/5); | |
1335 | + QFont font = KGlobalSettings::smallestReadableFont(); | |
5cf56c08 | 1336 | |
49d7072e AM |
1337 | //paint background |
1338 | m_background->paint(p, 0, 0); | |
1339 | Index: applets/weather/plasma-applet-weather.desktop | |
1340 | =================================================================== | |
1341 | --- applets/weather/plasma-applet-weather.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1342 | +++ applets/weather/plasma-applet-weather.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1343 | @@ -24,6 +24,7 @@ | |
1344 | Name[nl]=Weersvoorspelling | |
1345 | Name[nn]=Vêrmelding | |
1346 | Name[pa]=ਮੌਸਮ ਭਵਿੱਖਬਾਣੀ | |
1347 | +Name[pl]=Prognoza pogody | |
1348 | Name[pt]=Previsão Meteorológica | |
1349 | Name[pt_BR]=Previsão meteorológica | |
1350 | Name[ro]=Prognoza vremii | |
1351 | @@ -61,6 +62,7 @@ | |
1352 | Comment[nl]=Toont weerinformatie | |
1353 | Comment[nn]=Vis vêrinformasjon | |
1354 | Comment[pa]=ਮੌਸਮ ਜਾਣਕਾਰੀ ਵੇਖੋ | |
1355 | +Comment[pl]=Pokazuje informacje o pogodzie | |
1356 | Comment[pt]=Mostra informações meteorológicas | |
1357 | Comment[pt_BR]=Exibe informações meteorológicas | |
1358 | Comment[ro]=Afișează informații meteorologice | |
1359 | Index: applets/pastebin/plasma_pastebin.notifyrc | |
1360 | =================================================================== | |
1361 | --- applets/pastebin/plasma_pastebin.notifyrc (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1362 | +++ applets/pastebin/plasma_pastebin.notifyrc (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1363 | @@ -37,6 +37,7 @@ | |
1364 | Comment[nl]=Pastebin-widget | |
1365 | Comment[nn]=Teksttavle-element | |
1366 | Comment[pa]=ਪੇਸਟਬਿਨ ਵਿਦਗੈਟ | |
1367 | +Comment[pl]=Element interfejsu: Pastebin | |
1368 | Comment[pt]=Item de Colagem | |
1369 | Comment[pt_BR]=Widget do Pastebin | |
1370 | Comment[ro]=Control Coș de lipire | |
1371 | @@ -76,6 +77,7 @@ | |
1372 | Name[nds]=Pastebin-Link kopeert | |
1373 | Name[nl]=Pastebin-koppeling gekopieerd | |
1374 | Name[nn]=Kopiert teksttavle-lenkje | |
1375 | +Name[pl]=Skopiowany odnośnik pastebin | |
1376 | Name[pt]=Ligação do PasteBin copiada | |
1377 | Name[pt_BR]=Link do pastebin copiado | |
1378 | Name[ro]=Legătura pentru Coșul de lipire copiată | |
1379 | @@ -111,6 +113,7 @@ | |
1380 | Comment[nds]=De Pastebin-URL wöör na de Twischenaflaag kopeert | |
1381 | Comment[nl]=De pastebin-URL is gekopieerd naar het klembord | |
1382 | Comment[nn]=Teksttavle-adressa er kopiert til utklippstavla | |
1383 | +Comment[pl]=Adres pastebin został skopiowany do schowka | |
1384 | Comment[pt]=O URL do PasteBin foi copiado para a área de transferência | |
1385 | Comment[pt_BR]=O URL do pastebin foi copiado para a área de transferência | |
1386 | Comment[ro]=URL-ul coșului de lipire a fost copiat în clipboard | |
1387 | Index: applets/microblog/plasma-applet-microblog.desktop | |
1388 | =================================================================== | |
1389 | --- applets/microblog/plasma-applet-microblog.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1390 | +++ applets/microblog/plasma-applet-microblog.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1391 | @@ -17,6 +17,7 @@ | |
1392 | Name[nds]=Mikronettdagbook | |
1393 | Name[nn]=Mikroblogging | |
1394 | Name[pa]=ਮਾਈਕਰੋਬਲਾਗ | |
1395 | +Name[pl]=Mikroblog | |
1396 | Name[pt]=Micro-blog | |
1397 | Name[pt_BR]=Micro-blog | |
1398 | Name[sk]=Mikroblogovanie | |
1399 | @@ -50,6 +51,7 @@ | |
1400 | Comment[nds]=Dien Mikronettdaagbook-Status opfrischen un ankieken | |
1401 | Comment[nl]=Werk uw microblogstatus bij bekijk deze. | |
1402 | Comment[nn]=Oppdater og vis mikrobloggstatusen din | |
1403 | +Comment[pl]=Uaktualnianie i przeglądanie statusu mikrobloga. | |
1404 | Comment[pt]=Actualizar e ver o estado do seu micro-blog. | |
1405 | Comment[pt_BR]=Atualizar e exibir o status do seu micro-blog. | |
1406 | Comment[ro]=Actualizați și vizualizați-vă starea pe microblog. | |
1407 | Index: wallpapers/weather/plasma-wallpaper-weather.desktop | |
1408 | =================================================================== | |
1409 | --- wallpapers/weather/plasma-wallpaper-weather.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1410 | +++ wallpapers/weather/plasma-wallpaper-weather.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1411 | @@ -23,6 +23,7 @@ | |
1412 | Name[nl]=Weer | |
1413 | Name[nn]=Vêr | |
1414 | Name[pa]=ਮੌਸਮ | |
1415 | +Name[pl]=Pogoda | |
1416 | Name[pt]=Meteorologia | |
1417 | Name[pt_BR]=Previsão do tempo | |
1418 | Name[ro]=Vreme | |
1419 | Index: wallpapers/marble/plasma-wallpaper-marble.desktop | |
1420 | =================================================================== | |
1421 | --- wallpapers/marble/plasma-wallpaper-marble.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1422 | +++ wallpapers/marble/plasma-wallpaper-marble.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1423 | @@ -19,6 +19,7 @@ | |
1424 | Name[nds]=Eer | |
1425 | Name[nn]=Globus | |
1426 | Name[pa]=ਗਲੋਬ | |
1427 | +Name[pl]=Glob | |
1428 | Name[pt]=Globo | |
1429 | Name[pt_BR]=Globo | |
1430 | Name[ro]=Glob | |
1431 | Index: wallpapers/virus/plasma-wallpaper-virus.desktop | |
1432 | =================================================================== | |
1433 | --- wallpapers/virus/plasma-wallpaper-virus.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1434 | +++ wallpapers/virus/plasma-wallpaper-virus.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1435 | @@ -9,6 +9,7 @@ | |
1436 | Name[km]=វីរុស | |
1437 | Name[lv]=Vīruss | |
1438 | Name[pa]=ਵਾਈਰਸ | |
1439 | +Name[pl]=Wirus | |
1440 | Name[pt]=Vírus | |
1441 | Name[pt_BR]=Vírus | |
1442 | Name[sk]=Vírus | |
1443 | Index: wallpapers/virus/virus.cpp | |
1444 | =================================================================== | |
1445 | --- wallpapers/virus/virus.cpp (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1446 | +++ wallpapers/virus/virus.cpp (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1447 | @@ -54,7 +54,7 @@ | |
1448 | Virus::~Virus() | |
5cf56c08 | 1449 | { |
49d7072e AM |
1450 | alife.exit(0); |
1451 | - while(!alife.isFinished()) ; | |
1452 | + alife.wait(); | |
1453 | } | |
1454 | ||
1455 | void Virus::init(const KConfigGroup &config) | |
1456 | Index: wallpapers/pattern/patterns/pavement.desktop | |
1457 | =================================================================== | |
1458 | --- wallpapers/pattern/patterns/pavement.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1459 | +++ wallpapers/pattern/patterns/pavement.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1460 | @@ -19,6 +19,7 @@ | |
1461 | Comment[nds]=Stieg | |
1462 | Comment[nl]=Bestrating | |
1463 | Comment[nn]=Fortau | |
1464 | +Comment[pl]=Ścieżka | |
1465 | Comment[pt]=Calçada | |
1466 | Comment[pt_BR]=Pavimento | |
1467 | Comment[ro]=Pavaj | |
1468 | Index: wallpapers/pattern/patterns/flowers.desktop | |
1469 | =================================================================== | |
1470 | --- wallpapers/pattern/patterns/flowers.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1471 | +++ wallpapers/pattern/patterns/flowers.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1472 | @@ -20,6 +20,7 @@ | |
1473 | Comment[nl]=Bloemen | |
1474 | Comment[nn]=Blomar | |
1475 | Comment[pa]=ਫੁੱਲ | |
1476 | +Comment[pl]=Kwiaty | |
1477 | Comment[pt]=Flores | |
1478 | Comment[pt_BR]=Flores | |
1479 | Comment[ro]=Flori | |
1480 | Index: wallpapers/pattern/patterns/triangles.desktop | |
1481 | =================================================================== | |
1482 | --- wallpapers/pattern/patterns/triangles.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1483 | +++ wallpapers/pattern/patterns/triangles.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1484 | @@ -18,6 +18,7 @@ | |
1485 | Comment[nl]=Driehoeken | |
1486 | Comment[nn]=Trekantar | |
1487 | Comment[pa]=ਤਿਕੋਣਾਂ | |
1488 | +Comment[pl]=Trójkąty | |
1489 | Comment[pt]=Triângulos | |
1490 | Comment[pt_BR]=Triângulos | |
1491 | Comment[ro]=Triunghiuri | |
1492 | Index: wallpapers/pattern/patterns/fish.desktop | |
1493 | =================================================================== | |
1494 | --- wallpapers/pattern/patterns/fish.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1495 | +++ wallpapers/pattern/patterns/fish.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1496 | @@ -20,6 +20,7 @@ | |
1497 | Comment[nl]=Visnet | |
1498 | Comment[nn]=Fiskegarn | |
1499 | Comment[pa]=ਫਿਸ਼ ਨੈੱਟ | |
1500 | +Comment[pl]=Sieć na ryby | |
1501 | Comment[pt]=Rede de Pesca | |
1502 | Comment[pt_BR]=Rede de pesca | |
1503 | Comment[ro]=Plasă pescărească | |
1504 | Index: wallpapers/pattern/patterns/stonewall2.desktop | |
1505 | =================================================================== | |
1506 | --- wallpapers/pattern/patterns/stonewall2.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1507 | +++ wallpapers/pattern/patterns/stonewall2.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1508 | @@ -17,6 +17,7 @@ | |
1509 | Comment[nds]=Steenmuur 2 vun Tigert | |
1510 | Comment[nl]=Stenen muur 2, door Tigert | |
1511 | Comment[nn]=Steinmur 2 av Tigert | |
1512 | +Comment[pl]=Stonewall 2, autor: Tigert | |
1513 | Comment[pt]=Stonewall 2 de Tigert | |
1514 | Comment[pt_BR]=Parede de pedras 2 por Tigert | |
1515 | Comment[ro]=Stonewall 2 de Tigert | |
1516 | Index: wallpapers/pattern/patterns/night-rock.desktop | |
1517 | =================================================================== | |
1518 | --- wallpapers/pattern/patterns/night-rock.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1519 | +++ wallpapers/pattern/patterns/night-rock.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1520 | @@ -19,6 +19,7 @@ | |
1521 | Comment[nds]=Nachtrock vun Tigert | |
1522 | Comment[nl]=Night Rock, door Tigert | |
1523 | Comment[nn]=Nattfjell av Tigert | |
1524 | +Comment[pl]=Night Rock, autor:Tigert | |
1525 | Comment[pt]=Night Rock de Tigert | |
1526 | Comment[pt_BR]=Rocha noturna por Tigert | |
1527 | Comment[ro]=Stîncă nocturnă de Tigert | |
1528 | Index: wallpapers/pattern/plasma-wallpaper-pattern.desktop | |
1529 | =================================================================== | |
1530 | --- wallpapers/pattern/plasma-wallpaper-pattern.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1531 | +++ wallpapers/pattern/plasma-wallpaper-pattern.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1532 | @@ -22,6 +22,7 @@ | |
1533 | Name[nl]=Patroon | |
1534 | Name[nn]=Mønster | |
1535 | Name[pa]=ਪੈਟਰਨ | |
1536 | +Name[pl]=Wzór | |
1537 | Name[pt]=Padrão | |
1538 | Name[pt_BR]=Padrão | |
1539 | Name[ro]=Model | |
1540 | Index: runners/browserhistory/browserhistory.desktop | |
1541 | =================================================================== | |
1542 | --- runners/browserhistory/browserhistory.desktop (.../tags/KDE/4.3.0/kdeplasma-addons) (wersja 1013433) | |
1543 | +++ runners/browserhistory/browserhistory.desktop (.../branches/KDE/4.3/kdeplasma-addons) (wersja 1013433) | |
1544 | @@ -21,6 +21,7 @@ | |
1545 | Name[nl]=Webbrowser-geschiedenis | |
1546 | Name[nn]=Nettlesarlogg | |
1547 | Name[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਅਤੀਤ | |
1548 | +Name[pl]=Historia przeglądarki | |
1549 | Name[pt]=Histórico do Navegador Web | |
1550 | Name[pt_BR]=Histórico do navegador da Internet | |
1551 | Name[ro]=Istoricul navigatorului web |