Mailinglist Archive: opensuse-commit (1192 mails)
| < Previous | Next > |
commit kdetoys3
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 26 Aug 2008 02:11:54 +0200
- Message-id: <20080826001155.07B42678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdetoys3
checked in at Tue Aug 26 02:11:54 CEST 2008.
--------
--- KDE/kdetoys3/kdetoys3.changes 2008-02-18 17:33:20.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdetoys3/kdetoys3.changes 2008-08-20
18:32:14.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Aug 20 18:31:57 CEST 2008 - coolo@xxxxxxx
+
+- update to KDE 3.5.10
+ * translation update, desktop files validate
+
+-------------------------------------------------------------------
+Sat Jun 28 03:11:47 CEST 2008 - dmueller@xxxxxxx
+
+- add 3_5_BRACH.diff
+
+-------------------------------------------------------------------
Old:
----
kdetoys-3.5.9.tar.bz2
New:
----
3_5_BRANCH.diff
kdetoys-3.5.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdetoys3.spec ++++++
--- /var/tmp/diff_new_pack.C24278/_old 2008-08-26 02:11:15.000000000 +0200
+++ /var/tmp/diff_new_pack.C24278/_new 2008-08-26 02:11:15.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package kdetoys3 (Version 3.5.9)
+# spec file for package kdetoys3 (Version 3.5.10)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -16,13 +23,13 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: Nice Toys for KDE
-Version: 3.5.9
+Version: 3.5.10
Release: 1
Url: http://www.kde.org
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}'
kdelibs3`)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdetoys-%{version}.tar.bz2
-#Patch0: 3_5_BRANCH.diff
+Patch0: 3_5_BRANCH.diff
Patch1: artwork.diff
%description
@@ -48,7 +55,7 @@
%prep
%setup -n kdetoys-%{version} -q
-#%patch
+%patch0
%patch1
. /etc/opt/kde3/common_options
update_admin
@@ -93,6 +100,11 @@
/opt/kde3/share/services/*.desktop
%changelog
+* Wed Aug 20 2008 coolo@xxxxxxx
+- update to KDE 3.5.10
+ * translation update, desktop files validate
+* Sat Jun 28 2008 dmueller@xxxxxxx
+- add 3_5_BRACH.diff
* Mon Feb 18 2008 dmueller@xxxxxxx
- update to 3.5.9
* Tue Oct 09 2007 stbinner@xxxxxxx
@@ -113,7 +125,7 @@
- update to 3.5.5 release tarball
* Wed Aug 23 2006 stbinner@xxxxxxx
- add 3_5_BRANCH.diff (updated translations)
-* Sun Jul 23 2006 coolo@xxxxxxx
+* Mon Jul 24 2006 coolo@xxxxxxx
- update to KDE 3.5.4:
* increased version number
* Wed May 24 2006 stbinner@xxxxxxx
@@ -185,7 +197,7 @@
- update to version 3.1.95 ( KDE 3.2 RC1 )
* Tue Jan 13 2004 adrian@xxxxxxx
- update to snapshot 2004011309
-* Mon Dec 01 2003 adrian@xxxxxxx
+* Tue Dec 02 2003 adrian@xxxxxxx
- update to 3.1.94 ( KDE 3.2 beta 2 )
* Fri Nov 14 2003 adrian@xxxxxxx
- update to new snapshot from 2003102409
@@ -282,7 +294,7 @@
- 2.2rc1
* Fri Jun 29 2001 adrian@xxxxxxx
- 2.2beta1
-* Mon Apr 16 2001 adrian@xxxxxxx
+* Tue Apr 17 2001 adrian@xxxxxxx
- 2.2alpha1
* Sun Apr 08 2001 adrian@xxxxxxx
- -O2 for alpha and ppc
@@ -290,7 +302,7 @@
- neededforbuild fix
* Tue Mar 27 2001 ro@xxxxxxx
- changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets>
-* Tue Mar 20 2001 adrian@xxxxxxx
+* Wed Mar 21 2001 adrian@xxxxxxx
- update to final 2.1.1
* Mon Mar 19 2001 ro@xxxxxxx
- fixed neededforbuild
@@ -320,7 +332,7 @@
- update to RC 1
* Mon Aug 21 2000 adrian@xxxxxxx
- update to beta 4 / 1.93
-* Fri Jul 21 2000 adrian@xxxxxxx
+* Sat Jul 22 2000 adrian@xxxxxxx
- update to beta 3
* Mon Jul 17 2000 adrian@xxxxxxx
- update to snapshot from 17.07.2000
++++++ 3_5_BRANCH.diff ++++++
package: kdetoys-3.5.10.tar.bz2
kdemod: kdetoys
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD:
+svn di between //tags/KDE/3.5.10/kdetoys and //branches/KDE/3.5/kdetoys
Eigenschaftsänderungen: .
___________________________________________________________________
Gelöscht: svn:mergeinfo
Hinzugefügt: svn:externals
+ admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
++++++ kdetoys-3.5.9.tar.bz2 -> kdetoys-3.5.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/admin/cvs.sh
new/kdetoys-3.5.10/admin/cvs.sh
--- old/kdetoys-3.5.9/admin/cvs.sh 2008-02-13 14:18:49.000000000 +0100
+++ new/kdetoys-3.5.10/admin/cvs.sh 2008-08-19 22:24:11.000000000 +0200
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.9\""
+ VERSION="\"3.5.10\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/amor.desktop
new/kdetoys-3.5.10/amor/amor.desktop
--- old/kdetoys-3.5.9/amor/amor.desktop 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/amor/amor.desktop 2008-08-19 20:14:10.000000000
+0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=AMOR
Name[af]=Amor
Name[ar]=برنامج AMOR
@@ -72,4 +71,4 @@
GenericName[zh_TW]=畫面擷取程式
Terminal=false
X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Amusement;
+Categories=Qt;KDE;Utility;Amusement;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/billyrc
new/kdetoys-3.5.10/amor/data/billyrc
--- old/kdetoys-3.5.9/amor/data/billyrc 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/amor/data/billyrc 2008-08-19 20:14:10.000000000
+0200
@@ -57,7 +57,8 @@
Description[th]=บิลลี่ตัวจ้อย
Description[tr]=Küçük Billy
Description[uk]=Маленький Біллі
-Description[uz]=Кичик Билли
+Description[uz]=Kichik Billi
+Description[uz@cyrillic]=Кичик Билли
Description[ven]=Billy Mutuku
Description[zh_CN]=小小比利
Description[zh_TW]=小比利
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/bonhommerc
new/kdetoys-3.5.10/amor/data/bonhommerc
--- old/kdetoys-3.5.9/amor/data/bonhommerc 2007-10-08 11:49:38.000000000
+0200
+++ new/kdetoys-3.5.10/amor/data/bonhommerc 2008-08-19 20:14:10.000000000
+0200
@@ -81,7 +81,8 @@
About[th]=โดย Jean-Claude Dumas
About[tr]=Jean-Claude Dumas
About[uk]=Автор: Jean-Claude Dumas
-About[uz]=Жеан-Клауде Думас (Jean-Claude Dumas) яратган
+About[uz]=Jean-Klaude Dumas (Jean-Claude Dumas) yaratgan
+About[uz@cyrillic]=Жеан-Клауде Думас (Jean-Claude Dumas) яратган
About[ven]=Nga Jean-Claude Dumas
About[wa]=Sicrît pa Jean-Claude Dumas
About[xh]=Ngu Jean-Claude Dumas
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/bsdrc
new/kdetoys-3.5.10/amor/data/bsdrc
--- old/kdetoys-3.5.9/amor/data/bsdrc 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/amor/data/bsdrc 2008-08-19 20:14:10.000000000 +0200
@@ -57,7 +57,8 @@
Description[th]=สัญลักษณ์ของ FreeBSD
Description[tr]=FreeBSD Maskotu
Description[uk]=Талісман FreeBSD
-Description[uz]=FreeBSD тумори
+Description[uz]=FreeBSD tumori
+Description[uz@cyrillic]=FreeBSD тумори
Description[ven]=Mascot ya BSD dza mahala
Description[wa]=Mascote FreeBSD
Description[zh_CN]=FreeBSD 吉祥物
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/eyesrc
new/kdetoys-3.5.10/amor/data/eyesrc
--- old/kdetoys-3.5.9/amor/data/eyesrc 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/amor/data/eyesrc 2008-08-19 20:14:10.000000000 +0200
@@ -58,7 +58,8 @@
Description[th]=ดวงตาแสนโง่
Description[tr]=Çılgın Gözler
Description[uk]=Шалені очі
-Description[uz]=Жиннинамо кўзлар
+Description[uz]=Jinninamo koʻzlar
+Description[uz@cyrillic]=Жиннинамо кўзлар
Description[ven]=Mato a tshipengo
Description[zh_CN]=疯狂双眼
Description[zh_TW]=瘋狂的眼睛
@@ -117,7 +118,8 @@
About[th]=โดย Jean-Claude Dumas
About[tr]=Jean-Claude Dumas
About[uk]=Автор: Jean-Claude Dumas
-About[uz]=Жеан-Клауде Думас (Jean-Claude Dumas) яратган
+About[uz]=Jean-Klaude Dumas (Jean-Claude Dumas) yaratgan
+About[uz@cyrillic]=Жеан-Клауде Думас (Jean-Claude Dumas) яратган
About[ven]=Nga Jean-Claude Dumas
About[wa]=Sicrît pa Jean-Claude Dumas
About[xh]=Ngu Jean-Claude Dumas
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/ghostrc
new/kdetoys-3.5.10/amor/data/ghostrc
--- old/kdetoys-3.5.9/amor/data/ghostrc 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/amor/data/ghostrc 2008-08-19 20:14:10.000000000
+0200
@@ -54,7 +54,8 @@
Description[th]=ผีน้อยสปุ๊คกี้
Description[tr]=Şirin Hayalet
Description[uk]=Невловимий привид
-Description[uz]=Арвоҳ Спуки
+Description[uz]=Arvoh Spuki
+Description[uz@cyrillic]=Арвоҳ Спуки
Description[ven]=Tshipuku
Description[zh_CN]=蒙面幽灵
About=By Martin R. Jones\nBased on an icon by the KDE artist team.
@@ -113,7 +114,8 @@
About[th]=โดย Martin R. Jones\nโดยใช้พื้นฐานจากไอคอนของกลุ่มศิลปิน KDE
About[tr]=Martin R. Jones\nKDE sanatçı ekibinin bir simgesine dayanır.
About[uk]=Автор: Martin R. Jones\nЗроблено з піктограми від команди мистецтв
KDE.
-About[uz]=Мартин Р. Жоунс (Martin R. Jones) яратган\nKDE тасвирчилар жамоаси
яратган нишончада асосланган.
+About[uz]=Martin R. Jouns (Martin R. Jones) yaratgan\nKDE tasvirchilar jamoasi
yaratgan nishonchada asoslangan.
+About[uz@cyrillic]=Мартин Р. Жоунс (Martin R. Jones) яратган\nKDE тасвирчилар
жамоаси яратган нишончада асосланган.
About[ven]=Nga Martin R. Jones\nZwo di sendeka nga aikhonu nga tshigwada tsha
vhamvumvusi vha KDE.
About[xh]= Martin R. Jones\nYamelene kwiqhosa leqela labazobi be KDE.
About[zh_CN]=作者：Martin R. Jones\n基于 KDE 艺术组制作的一个图标。
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/nekorc
new/kdetoys-3.5.10/amor/data/nekorc
--- old/kdetoys-3.5.9/amor/data/nekorc 2007-10-08 11:49:38.000000000 +0200
+++ new/kdetoys-3.5.10/amor/data/nekorc 2008-08-19 20:14:10.000000000 +0200
@@ -16,7 +16,7 @@
Description[tg]=Пишак
Description[th]=เน็คโก้
Description[tr]=Mırnav
-Description[uz]=Неко
+Description[uz@cyrillic]=Неко
Description[zh_CN]=Neko小猫咪
About=Artwork from oneko by Masayuki Koba\nAMOR'd by Chris Spiegel
About[af]=Kunswerk van oneko deur Masayuki Koba\Namor'd deur Chris Spiegel
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/pingurc
new/kdetoys-3.5.10/amor/data/pingurc
--- old/kdetoys-3.5.9/amor/data/pingurc 2007-10-08 11:49:38.000000000 +0200
+++ new/kdetoys-3.5.10/amor/data/pingurc 2008-08-19 20:14:10.000000000
+0200
@@ -16,7 +16,8 @@
Description[tg]=Тукс
Description[th]=ตุ๊กซ์
Description[tr]=Penguen (Hareketli)
-Description[uz]=Такс
+Description[uz]=Taks
+Description[uz@cyrillic]=Такс
Description[zh_CN]=Tux小企鹅
About=By Frank Pieczynski\nBased on graphics of the game "pingus".
About[af]=Deur Frank Pieczynski\nBased op grafieka van die speletjie "pingus".
@@ -74,7 +75,8 @@
About[th]=โดย Frank Pieczynski\nโดยใช้พื้นฐานกราฟิกจากเกม "pingus"
About[tr]=Frank Pieczynski\nPingus oyunundan esinlenilmiştir.
About[uk]=Автор: Frank Pieczynski\nПобудовано з графіки для гри "pingus".
-About[uz]=Франк Писцински (Frank Pieczynski) яратган\nPingus ўйинининг
графикасида асосланган.
+About[uz]=Frank Pissinski (Frank Pieczynski) yaratgan\nPingus oʻyinining
grafikasida asoslangan.
+About[uz@cyrillic]=Франк Писцински (Frank Pieczynski) яратган\nPingus
ўйинининг графикасида асосланган.
About[ven]=Nga Frank Pieczynski\nZwo di sendeka nga girafu ya mutambo "pingus".
About[xh]=Ngu Frank Pieczynski\nyamelene nemizobo yomdlalo "pingus".
About[zh_CN]=作者：Frank Pieczynski\n基于“pingus”游戏中的图形。
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/taorc
new/kdetoys-3.5.10/amor/data/taorc
--- old/kdetoys-3.5.9/amor/data/taorc 2007-10-08 11:49:38.000000000 +0200
+++ new/kdetoys-3.5.10/amor/data/taorc 2008-08-19 20:14:10.000000000 +0200
@@ -13,7 +13,7 @@
Description[sr]=Тао
Description[ta]= Tao
Description[th]=เต๋า
-Description[uz]=Тао
+Description[uz@cyrillic]=Тао
Description[zh_CN]=道
About=By Daniel Pfeiffer <occitan@xxxxxxxxxxxxx>\nYin Yang symbol inspired by
my Tai Chi practice.
About[af]=Deur Daniel Pfeiffer <occitan@xxxxxxxxxxxxx>\nYin Yang simbool
geïnspireer Deur my Tai Chi oefening.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/tuxrc
new/kdetoys-3.5.10/amor/data/tuxrc
--- old/kdetoys-3.5.9/amor/data/tuxrc 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/amor/data/tuxrc 2008-08-19 20:14:10.000000000 +0200
@@ -55,7 +55,8 @@
Description[th]=ตุ๊กซ์ที่เคลื่อนไหวไม่ได้
Description[tr]=Haraketsiz Penguen
Description[uk]=Неоживлений Tux
-Description[uz]=Анимациясиз Такс
+Description[uz]=Animatsiyasiz Taks
+Description[uz@cyrillic]=Анимациясиз Такс
Description[ven]=Tux i songo itwaho zwazwipuka
Description[xh]=Okungaphiliswanga Tux
Description[zh_CN]=没有动画的 Tux 小企鹅
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/amor/data/wormrc
new/kdetoys-3.5.10/amor/data/wormrc
--- old/kdetoys-3.5.9/amor/data/wormrc 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/amor/data/wormrc 2008-08-19 20:14:10.000000000 +0200
@@ -56,7 +56,8 @@
Description[th]=หนอนตัวจิ๋ว
Description[tr]=Küçük Kurtçuk
Description[uk]=Хробачок
-Description[uz]=Кичкина чувалчанг
+Description[uz]=Kichkina chuvalchang
+Description[uz@cyrillic]=Кичкина чувалчанг
Description[xh]=Umbungu Omncinci
Description[zh_CN]=小虫虫
Description[zh_TW]=小蟲
@@ -115,7 +116,8 @@
About[th]=โดย Bartosz Trudnowski\nสร้างจากภรรยาผมเอง
About[tr]=Bartosz Trudnowski\nEşim için yaptım
About[uk]=Автор: Bartosz Trudnowski\nЗроблено моєю жінкою
-About[uz]=Бартосз Трудновски (Bartosz Trudnowski) яратган\nТурмуш ўртоғим учун
яратилган.
+About[uz]=Bartosz Trudnovski (Bartosz Trudnowski) yaratgan\nTurmush oʻrtogʻim
uchun yaratilgan.
+About[uz@cyrillic]=Бартосз Трудновски (Bartosz Trudnowski) яратган\nТурмуш
ўртоғим учун яратилган.
About[ven]=Nga Bartosz Trudnowski\nZwo itelwa musadzi wanga
About[xh]=Ngu Bartosz Trudnowski\nYenzelwe inkosikazi yam
About[zh_CN]=作者：Bartosz Trudnowski\n为我妻子而作
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/configure new/kdetoys-3.5.10/configure
--- old/kdetoys-3.5.9/configure 2008-02-13 16:12:21.000000000 +0100
+++ new/kdetoys-3.5.10/configure 2008-08-20 17:52:00.000000000 +0200
@@ -2617,7 +2617,7 @@
# Define the identity of the package.
PACKAGE=kdetoys
- VERSION="3.5.9"
+ VERSION="3.5.10"
cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/configure.in
new/kdetoys-3.5.10/configure.in
--- old/kdetoys-3.5.9/configure.in 2008-02-13 16:12:01.000000000 +0100
+++ new/kdetoys-3.5.10/configure.in 2008-08-20 17:51:44.000000000 +0200
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdetoys, "3.5.9") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdetoys, "3.5.10") dnl searches for some needed programs
KDE_SET_PREFIX
Files old/kdetoys-3.5.9/doc/amor/index.cache.bz2 and
new/kdetoys-3.5.10/doc/amor/index.cache.bz2 differ
Files old/kdetoys-3.5.9/doc/kmoon/index.cache.bz2 and
new/kdetoys-3.5.10/doc/kmoon/index.cache.bz2 differ
Files old/kdetoys-3.5.9/doc/kodo/index.cache.bz2 and
new/kdetoys-3.5.10/doc/kodo/index.cache.bz2 differ
Files old/kdetoys-3.5.9/doc/kteatime/index.cache.bz2 and
new/kdetoys-3.5.10/doc/kteatime/index.cache.bz2 differ
Files old/kdetoys-3.5.9/doc/kweather/index.cache.bz2 and
new/kdetoys-3.5.10/doc/kweather/index.cache.bz2 differ
Files old/kdetoys-3.5.9/doc/kworldclock/index.cache.bz2 and
new/kdetoys-3.5.10/doc/kworldclock/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/eyesapplet/eyesapplet.desktop
new/kdetoys-3.5.10/eyesapplet/eyesapplet.desktop
--- old/kdetoys-3.5.9/eyesapplet/eyesapplet.desktop 2007-10-08
11:49:38.000000000 +0200
+++ new/kdetoys-3.5.10/eyesapplet/eyesapplet.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Name=Eyes
Name[af]=Oë
Name[ar]=عيون
@@ -58,7 +57,8 @@
Name[th]=ดวงตา
Name[tr]=Gözler
Name[uk]=Очі
-Name[uz]=Кўзлар
+Name[uz]=Koʻzlar
+Name[uz@cyrillic]=Кўзлар
Name[ven]=Mato
Name[wa]=Ouys
Name[xh]=Amehlo
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/eyesapplet/eyes.cpp
new/kdetoys-3.5.10/eyesapplet/eyes.cpp
--- old/kdetoys-3.5.9/eyesapplet/eyes.cpp 2005-09-10 10:21:23.000000000
+0200
+++ new/kdetoys-3.5.10/eyesapplet/eyes.cpp 2008-08-19 20:14:10.000000000
+0200
@@ -20,6 +20,7 @@
#include <qpainter.h>
#include <qcursor.h>
+#include <qimage.h>
#include <klocale.h>
#include <kglobal.h>
@@ -28,11 +29,13 @@
#include "eyes.h"
#include "eyes.moc"
+#define AAFACTOR 4
+
extern "C"
{
KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
{
- KGlobal::locale()->insertCatalogue("keyesapplet");
+ KGlobal::locale()->insertCatalogue("keyesapplet");
EyesApplet *applet = new EyesApplet(configFile, KPanelApplet::Normal,
0, parent, "keyesapplet");
return applet;
}
@@ -42,7 +45,12 @@
QWidget *parent, const char *name)
: KPanelApplet( configFile, t, actions, parent, name )
{
- startTimer(41); // 24 frames/second ;-)
+ setWFlags(WNoAutoErase);
+ setBackgroundOrigin(AncestorOrigin);
+ startTimer(50);
+ oldleft = QPoint(-1, -1);
+ oldright = QPoint(-1, -1);
+ oldMouse = QPoint(-1, -1);
}
int EyesApplet::widthForHeight(int h) const
@@ -61,106 +69,134 @@
void EyesApplet::timerEvent(QTimerEvent*)
{
- // draw pupils
- QPainter p(this);
- drawPupils(&p);
-}
-
-void EyesApplet::paintEvent(QPaintEvent* e)
-{
- // draw background
- QWidget::paintEvent(e);
-
+ QPoint mouse = mapFromGlobal(QCursor::pos());
+ if (mouse != oldMouse)
+ update();
+}
+
+void EyesApplet::paintEvent(QPaintEvent*)
+{
+ int spWidth = width() * AAFACTOR;
+ int spHeight = height() * AAFACTOR;
+
+ if (spWidth != _cache.width() || spHeight != _cache.height())
+ _cache.resize(spWidth, spHeight);
+
+ QPainter paint(&_cache);
+
+ if (paletteBackgroundPixmap())
+ {
+ QPixmap bg(width(), height());
+ QPainter p(&bg);
+ QPoint offset = backgroundOffset();
+ p.drawTiledPixmap(0, 0, width(), height(), *paletteBackgroundPixmap(),
offset.x(), offset.y());
+ p.end();
+ QImage bgImage = bg.convertToImage().scale(spWidth, spHeight);
+ paint.drawImage(0, 0, bgImage);
+ }
+ else
+ {
+ _cache.fill(paletteBackgroundColor());
+ }
+
// draw eyes, no pupils
- QPainter p(this);
- p.setPen(QPen(black, 2));
- p.setBrush(QBrush(white));
-
- int w = width()-1;
- int h = height()-1;
-
+ paint.setPen(QPen(black, 2 * AAFACTOR));
+ paint.setBrush(QBrush(white));
+
+ int w = spWidth; // - AAFACTOR * 2;
+ int h = spHeight; // - AAFACTOR * 2;
+
// left eye
- p.drawEllipse(0, 0, w/2, h);
-
+ paint.drawEllipse(AAFACTOR, AAFACTOR, w/2 - AAFACTOR, h - AAFACTOR * 2);
+
// right eye
- p.drawEllipse(w/2, 0, w/2, h);
-
+ paint.drawEllipse(w/2, AAFACTOR, w/2 - AAFACTOR, h - AAFACTOR * 2);
+
// draw pupils
- oldleft = QPoint(-1, -1);
- oldright = QPoint(-1, -1);
- drawPupils(&p);
+ drawPupils(&paint);
+ paint.end();
+
+ QPainter paintFinal(this);
+ QImage spImage = _cache.convertToImage();
+ QImage displayImage = spImage.smoothScale(size());
+ paintFinal.drawImage(0, 0, displayImage);
+ paintFinal.end();
}
void EyesApplet::drawPupils(QPainter* p)
{
QPoint pos, mouse, vect;
double cos_alpha,sin_alpha;
-
- mouse = mapFromGlobal(QCursor::pos());
- int tmp = QMIN(height(),width())/6;
+
+ int w = width() * AAFACTOR;
+ int h = height() * AAFACTOR;
+
+ oldMouse = mapFromGlobal(QCursor::pos());
+ mouse = oldMouse * AAFACTOR;
+ int tmp = QMIN(h, w)/6;
// left pupil
- vect.setX(mouse.x() - width()/4);
- vect.setY(mouse.y() - height()/2);
+ vect.setX(mouse.x() - h / 4);
+ vect.setY(mouse.y() - h / 2);
cos_alpha = vect.x() / sqrt(double(vect.x() * vect.x() + vect.y() *
vect.y()));
sin_alpha = vect.y() / sqrt(double(vect.x() * vect.x() + vect.y() *
vect.y()));
- if(vect.x() * vect.x() + vect.y() * vect.y() > (width()/4 - tmp) *
(width()/4 - tmp)*
- cos_alpha * cos_alpha+ (height()/2-tmp) * (height()/2-tmp) * sin_alpha
* sin_alpha) {
- pos.setX(int((width()/4-tmp) * cos_alpha+width()/4));
- pos.setY(int((height()/2-tmp) * sin_alpha+height()/2));
+ if(vect.x() * vect.x() + vect.y() * vect.y() > (w/4 - tmp) * (w/4 - tmp)*
+ cos_alpha * cos_alpha+ (h/2-tmp) * (h/2-tmp) * sin_alpha * sin_alpha) {
+ pos.setX(int((w/4-tmp) * cos_alpha+w/4));
+ pos.setY(int((h/2-tmp) * sin_alpha+h/2));
}
else
- pos = mouse;
+ pos = mouse;
if(pos != oldleft) {
- int sizeEye=QMIN(height(),width())/6;
+ int sizeEye=QMIN(h,w)/6;
- // draw over old pos
- p->setPen(QPen(NoPen));
- p->setBrush(QBrush(white));
- p->drawEllipse(oldleft.x() - sizeEye/2, oldleft.y() - sizeEye/2,
sizeEye, sizeEye);
+// // draw over old pos
+// p->setPen(QPen(NoPen));
+// p->setBrush(QBrush(white));
+// p->drawEllipse(oldleft.x() - sizeEye/2, oldleft.y() - sizeEye/2,
sizeEye, sizeEye);
// draw left pupil
p->setPen(QPen(NoPen));
- p->setBrush(QBrush(black));
- p->drawEllipse(pos.x() - sizeEye/2, pos.y() - sizeEye/2, sizeEye,
sizeEye);
+ p->setBrush(QBrush(black));
+ p->drawEllipse(pos.x() - sizeEye/2, pos.y() - sizeEye/2, sizeEye,
sizeEye);
- oldleft = pos;
+ //oldleft = pos;
}
// right pupil
- vect.setX(mouse.x() - 3*width()/4);
- vect.setY(mouse.y() - height()/2);
+ vect.setX(mouse.x() - 3*w/4);
+ vect.setY(mouse.y() - h/2);
cos_alpha = vect.x()/sqrt(double(vect.x()*vect.x()+vect.y()*vect.y()));
sin_alpha = vect.y()/sqrt(double(vect.x()*vect.x()+vect.y()*vect.y()));
- if(vect.x()*vect.x() + vect.y()*vect.y() > (width()/4-tmp)*(width()/4-tmp)
-
*cos_alpha*cos_alpha+(height()/2-tmp)*(height()/2-tmp)*sin_alpha*sin_alpha)
+ if(vect.x()*vect.x() + vect.y()*vect.y() > (w/4-tmp)*(w/4-tmp)
+ *cos_alpha*cos_alpha+(h/2-tmp)*(h/2-tmp)*sin_alpha*sin_alpha)
{
- pos.setX(int((width()/4-tmp)*cos_alpha+3*width()/4));
- pos.setY(int((height()/2-tmp)*sin_alpha+height()/2));
+ pos.setX(int((w/4-tmp)*cos_alpha+3*w/4));
+ pos.setY(int((h/2-tmp)*sin_alpha+h/2));
}
else
- pos = mouse;
+ pos = mouse;
if(pos != oldright) {
- int sizeEye=QMIN(height(),width())/6;
+ int sizeEye=QMIN(h,w)/6;
- // draw over old pos
- p->setPen(QPen(NoPen));
- p->setBrush(QBrush(white));
- p->drawEllipse(oldright.x() - sizeEye/2, oldright.y() - sizeEye/2,
sizeEye, sizeEye);
+// // draw over old pos
+// p->setPen(QPen(NoPen));
+// p->setBrush(QBrush(white));
+// p->drawEllipse(oldright.x() - sizeEye/2, oldright.y() - sizeEye/2,
sizeEye, sizeEye);
// draw left pupil
p->setPen(QPen(NoPen));
- p->setBrush(QBrush(black));
+ p->setBrush(QBrush(black));
p->drawEllipse(pos.x() - sizeEye/2, pos.y() - sizeEye/2, sizeEye,
sizeEye);
- oldright = pos;
+ //oldright = pos;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/eyesapplet/eyes.h
new/kdetoys-3.5.10/eyesapplet/eyes.h
--- old/kdetoys-3.5.9/eyesapplet/eyes.h 2005-09-10 10:21:23.000000000 +0200
+++ new/kdetoys-3.5.10/eyesapplet/eyes.h 2008-08-19 20:14:10.000000000
+0200
@@ -19,6 +19,7 @@
#ifndef __eyes_h__
#define __eyes_h__
+#include <qpixmap.h>
#include <kpanelapplet.h>
class EyesApplet : public KPanelApplet
@@ -40,7 +41,8 @@
private:
void drawPupils(QPainter* p);
- QPoint oldleft, oldright;
+ QPoint oldleft, oldright, oldMouse;
+ QPixmap _cache;
};
#endif // __eyes_h__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/fifteenapplet/kfifteenapplet.desktop
new/kdetoys-3.5.10/fifteenapplet/kfifteenapplet.desktop
--- old/kdetoys-3.5.9/fifteenapplet/kfifteenapplet.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/fifteenapplet/kfifteenapplet.desktop 2008-08-19
20:14:09.000000000 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Name=Fifteen Pieces
Name[af]=Vyftien Dele
Name[ar]=خمسة عشرة قطعة
@@ -55,7 +54,8 @@
Name[th]=เกมสิบห้าชิ้น
Name[tr]=Onbeş Parça
Name[uk]=П'ятнашки
-Name[uz]=Ўн бешта тош
+Name[uz]=Oʻn beshta tosh
+Name[uz@cyrillic]=Ўн бешта тош
Name[ven]=Zwipida zwa fumi na zwitanu
Name[wa]=Djeu des cwénze pîces
Name[xh]=Amaceba alishumi elinesihlanu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kdetoys.lsm
new/kdetoys-3.5.10/kdetoys.lsm
--- old/kdetoys-3.5.9/kdetoys.lsm 2008-02-13 10:52:07.000000000 +0100
+++ new/kdetoys-3.5.10/kdetoys.lsm 2008-08-19 21:44:12.000000000 +0200
@@ -1,7 +1,7 @@
Begin4
Title: kdetoys
-Version: 3.5.9
-Entered-date: 2008-02-13
+Version: 3.5.10
+Entered-date: 2008-08-26
Description: Toy applications for the K Desktop Environment (KDE)
Keywords: KDE X11 desktop Qt
Author: http://bugs.kde.org/ (KDE Bugtracking System)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kmoon/kmoonapplet.desktop
new/kdetoys-3.5.10/kmoon/kmoonapplet.desktop
--- old/kdetoys-3.5.9/kmoon/kmoonapplet.desktop 2008-02-13 10:38:05.000000000
+0100
+++ new/kdetoys-3.5.10/kmoon/kmoonapplet.desktop 2008-08-19
20:14:09.000000000 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Icon=kmoon
Name=Moon Phase
Name[be]=Фаза луны
Files old/kdetoys-3.5.9/kmoon/pics/moon14.png and
new/kdetoys-3.5.10/kmoon/pics/moon14.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kodo/kodo.desktop
new/kdetoys-3.5.10/kodo/kodo.desktop
--- old/kdetoys-3.5.9/kodo/kodo.desktop 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kodo/kodo.desktop 2008-08-19 20:14:09.000000000
+0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Exec=kodo
Icon=kodo
@@ -67,4 +66,4 @@
Name[tg]=Кодо
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Amusement;
+Categories=Qt;KDE;Utility;Amusement;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kteatime/eventsrc
new/kdetoys-3.5.10/kteatime/eventsrc
--- old/kdetoys-3.5.9/kteatime/eventsrc 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kteatime/eventsrc 2008-08-19 20:14:10.000000000
+0200
@@ -54,7 +54,8 @@
Comment[tg]=Пухтани Чойи KDE
Comment[tr]=Çay Pişirici
Comment[uk]=Приготування чаю KDE
-Comment[uz]=KDE чой дамловчи
+Comment[uz]=KDE choy damlovchi
+Comment[uz@cyrillic]=KDE чой дамловчи
Comment[wa]=Li fjheu di té di KDE
Comment[zh_CN]=KDE 煮茶器
Comment[zh_TW]=KDE 煮茶器
@@ -113,7 +114,8 @@
Name[tg]=Чой тайёр шуд
Name[tr]=Çay hazır
Name[uk]=Чай готовий
-Name[uz]=Чой тайёр
+Name[uz]=Choy tayyor
+Name[uz@cyrillic]=Чой тайёр
Name[wa]=Li té est presse
Name[zh_CN]=茶沏好了
Name[zh_TW]=茶煮好了
@@ -171,7 +173,8 @@
Comment[tg]=Чой тайёр шуд
Comment[tr]=Çay hazır
Comment[uk]=Чай готовий
-Comment[uz]=Чой тайёр
+Comment[uz]=Choy tayyor
+Comment[uz@cyrillic]=Чой тайёр
Comment[wa]=Li té est presse
Comment[zh_CN]=茶沏好了
Comment[zh_TW]=茶煮好了
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kteatime/kteatime.desktop
new/kdetoys-3.5.10/kteatime/kteatime.desktop
--- old/kdetoys-3.5.9/kteatime/kteatime.desktop 2008-02-13 10:38:05.000000000
+0100
+++ new/kdetoys-3.5.10/kteatime/kteatime.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KTeaTime
Name[ar]=برنامج تحضير الشاي KTeaTime
Name[bn]=কে-টী-টাইম
@@ -70,4 +69,4 @@
DocPath=kteatime/index.html
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Amusement;
+Categories=Qt;KDE;Utility;Amusement;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/ktux/ktux.desktop
new/kdetoys-3.5.10/ktux/ktux.desktop
--- old/kdetoys-3.5.9/ktux/ktux.desktop 2008-02-13 10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/ktux/ktux.desktop 2008-08-19 20:14:09.000000000
+0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KTux
Name[af]=Ktux
Name[bg]=Тъкс
@@ -79,7 +78,8 @@
Name[th]=ติดตั้ง...
Name[tr]=Kurulum...
Name[uk]=Встановити...
-Name[uz]=Ўрнатиш
+Name[uz]=Oʻrnatish
+Name[uz@cyrillic]=Ўрнатиш
Name[ven]=Vhekanya...
Name[wa]=Apontyî...
Name[xh]=Iyacwangciswa...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/dockwidget.cpp
new/kdetoys-3.5.10/kweather/dockwidget.cpp
--- old/kdetoys-3.5.9/kweather/dockwidget.cpp 2007-05-14 09:40:37.000000000
+0200
+++ new/kdetoys-3.5.10/kweather/dockwidget.cpp 2008-08-19 20:14:10.000000000
+0200
@@ -24,6 +24,7 @@
#include <qlayout.h>
#include <qlabel.h>
#include <qtimer.h>
+#include <qobjectlist.h>
#include <kdebug.h>
#include <kglobalsettings.h>
@@ -33,12 +34,11 @@
const char *name) : QWidget(parent,name), m_locationCode( location ),
m_orientation( Horizontal )
{
m_font = KGlobalSettings::generalFont();
+ setBackgroundOrigin( AncestorOrigin );
initDock();
connect(m_button, SIGNAL( clicked() ), SIGNAL( buttonClicked() ));
m_weatherService = new WeatherService_stub( "KWeatherService",
"WeatherService" );
-
- setBackgroundOrigin( AncestorOrigin );
}
dockwidget::~dockwidget()
@@ -191,6 +191,8 @@
layout->addWidget(m_lblWind);
layout->addWidget(m_lblPres);
+ mainLayout->addSpacing(8);
+
updateFont();
QTimer::singleShot( 0, this, SLOT( showWeather() ) );
@@ -366,7 +368,7 @@
}
updateFont();
- return w;
+ return w + 4;
}
int dockwidget::heightForWidth( int w )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/kcmweather.desktop
new/kdetoys-3.5.10/kweather/kcmweather.desktop
--- old/kdetoys-3.5.9/kweather/kcmweather.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kweather/kcmweather.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=configure
Type=Service
ServiceTypes=KCModule
@@ -64,7 +63,8 @@
Name[tg]=Нишон диҳед
Name[tr]=Görünüm
Name[uk]=Дисплей
-Name[uz]=Кўрсатиш
+Name[uz]=Koʻrsatish
+Name[uz@cyrillic]=Кўрсатиш
Name[wa]=Håynaedje
Name[zh_CN]=显示
Name[zh_TW]=顯示
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/kcmweatherservice.desktop
new/kdetoys-3.5.10/kweather/kcmweatherservice.desktop
--- old/kdetoys-3.5.9/kweather/kcmweatherservice.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kweather/kcmweatherservice.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Icon=kweather
Type=Service
ServiceTypes=KCModule
@@ -65,7 +64,8 @@
Name[tg]=Хизмати Ҳаво
Name[tr]=Hava Servisi
Name[uk]=Служба погоди
-Name[uz]=Об-ҳаво хизмати
+Name[uz]=Ob-havo xizmati
+Name[uz@cyrillic]=Об-ҳаво хизмати
Name[wa]=Siervice meteyo
Name[zh_CN]=气象服务
Name[zh_TW]=氣象服務
@@ -121,7 +121,8 @@
Comment[tg]=Соз Кардани Хизмати Ҳаво
Comment[tr]=Hava Servis Ayarı
Comment[uk]=Налаштування служби погоди
-Comment[uz]=Об-ҳаво хизматини ўрнатиш
+Comment[uz]=Ob-havo xizmatini oʻrnatish
+Comment[uz@cyrillic]=Об-ҳаво хизматини ўрнатиш
Comment[wa]=Apontiaedje do siervice meteyo
Comment[zh_CN]=气象服务设置
Comment[zh_TW]=氣象服務設定
@@ -173,7 +174,8 @@
Keywords[tg]=kҳаво, хизмати ҳаво, дигаргуниҳо, танзимотҳо
Keywords[tr]=kweather, hava servisi, ayar, seçenek
Keywords[uk]=kweather, служба погоди, налаштування, параметри
-Keywords[uz]=kweather, об-ҳаво хизмати, мослаш, мосламалар
+Keywords[uz]=kweather, ob-havo xizmati, moslash, moslamalar
+Keywords[uz@cyrillic]=kweather, об-ҳаво хизмати, мослаш, мосламалар
Keywords[wa]=kweather, meteyo, tins, siervice meteyo, apontyî, apontiaedjes
Keywords[zh_CN]=kweather, weather service, configure, settings, 气象服务, 配置, 设置
DocPath=kweather?anchor=weather-service
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/kweather.cpp
new/kdetoys-3.5.10/kweather/kweather.cpp
--- old/kdetoys-3.5.9/kweather/kweather.cpp 2007-05-14 09:40:37.000000000
+0200
+++ new/kdetoys-3.5.10/kweather/kweather.cpp 2008-08-19 20:14:10.000000000
+0200
@@ -31,6 +31,7 @@
#include <qfile.h>
#include <qtimer.h>
+#include <qpalette.h>
#include "kweather.h"
#include "reportview.h"
@@ -54,26 +55,27 @@
mFirstRun( false ), mReport( 0 ), mClient( 0 ),
mContextMenu( 0 ), mWeatherService( 0 ), settingsDialog( 0 ),
mTextColor(Qt::black)
{
- kdDebug(12004) << "Constructor " << endl;
- setObjId("weatherIface");
-
- loadPrefs();
- initContextMenu();
- initDCOP();
-
- dockWidget = new dockwidget(reportLocation, this, "dockwidget");
- connect(dockWidget, SIGNAL(buttonClicked()), SLOT(doReport()));
- dockWidget->setViewMode(mViewMode);
- dockWidget->setPaletteForegroundColor(mTextColor);
-
- timeOut = new QTimer(this, "timeOut" );
- connect(timeOut, SIGNAL(timeout()), SLOT(timeout()));
- timeOut->start(10*60*1000);
-
- if(mFirstRun)
- preferences();
- else
- timeout();
+ kdDebug(12004) << "Constructor " << endl;
+ setObjId("weatherIface");
+
+ setBackgroundOrigin( QWidget::AncestorOrigin );
+ loadPrefs();
+ initContextMenu();
+ initDCOP();
+
+ dockWidget = new dockwidget(reportLocation, this, "dockwidget");
+ connect(dockWidget, SIGNAL(buttonClicked()), SLOT(doReport()));
+ dockWidget->setViewMode(mViewMode);
+ setLabelColor();
+
+ timeOut = new QTimer(this, "timeOut" );
+ connect(timeOut, SIGNAL(timeout()), SLOT(timeout()));
+ timeOut->start(10*60*1000);
+
+ if(mFirstRun)
+ preferences();
+ else
+ timeout();
}
kweather::~kweather()
@@ -98,27 +100,27 @@
void kweather::initDCOP()
{
- if ( !mClient )
- mClient = KApplication::dcopClient();
-
- if(!mClient->isAttached())
- mClient->attach();
-
- if(!attach())
- return;
-
- kdDebug(12004) << "attached to the server..." << endl;
-
- if ( mWeatherService )
- delete mWeatherService;
-
- mWeatherService = new WeatherService_stub( "KWeatherService",
"WeatherService" );
-
- if (!connectDCOPSignal(0, 0, "fileUpdate(QString)",
- "refresh(QString)",false))
- kdDebug(12004) << "Could not attach dcop signal..." << endl;
- else
- kdDebug(12004) << "attached dcop signals..." << endl;
+ if ( !mClient )
+ mClient = KApplication::dcopClient();
+
+ if(!mClient->isAttached())
+ mClient->attach();
+
+ if(!attach())
+ return;
+
+ kdDebug(12004) << "attached to the server..." << endl;
+
+ if ( mWeatherService )
+ delete mWeatherService;
+
+ mWeatherService = new WeatherService_stub( "KWeatherService",
"WeatherService" );
+
+ if (!connectDCOPSignal(0, 0, "fileUpdate(QString)",
+ "refresh(QString)",false))
+ kdDebug(12004) << "Could not attach dcop signal..." << endl;
+ else
+ kdDebug(12004) << "attached dcop signals..." << endl;
}
/** about box */
@@ -182,21 +184,21 @@
return;
}
- kdDebug(12004) << "Showing out the report" << endl;
- if ( mReport == 0 )
- {
- mReport = new reportView(reportLocation);
-
- connect( mReport, SIGNAL( finished() ), SLOT(
slotReportFinished() ) );
- }
-
- mReport->show();
- mReport->raise();
+ kdDebug(12004) << "Showing out the report" << endl;
+ if ( mReport == 0 )
+ {
+ mReport = new reportView(reportLocation);
+
+ connect( mReport, SIGNAL( finished() ), SLOT( slotReportFinished() ) );
+ }
+
+ mReport->show();
+ mReport->raise();
}
void kweather::slotReportFinished(){
- mReport->delayedDestruct();
- mReport = 0;
+ mReport->delayedDestruct();
+ mReport = 0;
}
/** load the application */
@@ -220,15 +222,15 @@
/** Save the application mPrefs. */
void kweather::savePrefs(){
- kdDebug(12004) << "Saving Prefs..." << endl;
- KConfig *kcConfig = config();
-
- kcConfig->setGroup("General Options");
- kcConfig->writeEntry("logging", logOn);
- kcConfig->writeEntry("report_location", reportLocation);
- kcConfig->writeEntry("smallview_mode", mViewMode);
- kcConfig->writePathEntry("log_file_name", fileName );
- kcConfig->sync();
+ kdDebug(12004) << "Saving Prefs..." << endl;
+ KConfig *kcConfig = config();
+
+ kcConfig->setGroup("General Options");
+ kcConfig->writeEntry("logging", logOn);
+ kcConfig->writeEntry("report_location", reportLocation);
+ kcConfig->writeEntry("smallview_mode", mViewMode);
+ kcConfig->writePathEntry("log_file_name", fileName );
+ kcConfig->sync();
}
void kweather::showWeather()
@@ -278,46 +280,46 @@
}
/** get new data */
-void kweather::timeout(){
-
- if ( !mWeatherService )
- initDCOP();
-
- if ( mWeatherService )
- {
- // isEmtpy is true for null and 0 length strings
- if ( !reportLocation.isEmpty() )
- {
- kdDebug(12004)<< "Requesting new data for " <<
reportLocation << endl;
- mWeatherService->update(reportLocation);
- }
- }
+void kweather::timeout()
+{
+ if ( !mWeatherService )
+ initDCOP();
+
+ if ( mWeatherService )
+ {
+ // isEmtpy is true for null and 0 length strings
+ if ( !reportLocation.isEmpty() )
+ {
+ kdDebug(12004)<< "Requesting new data for " << reportLocation << endl;
+ mWeatherService->update(reportLocation);
+ }
+ }
}
int kweather::widthForHeight(int h) const
{
- //kdDebug(12004) << "widthForHeight " << h << endl;
- dockWidget->setOrientation(Horizontal);
- int w = dockWidget->widthForHeight(h);
- return w;
+ //kdDebug(12004) << "widthForHeight " << h << endl;
+ dockWidget->setOrientation(Horizontal);
+ int w = dockWidget->widthForHeight(h);
+ return w;
}
int kweather::heightForWidth(int w) const
{
- kdDebug(12004) << "heightForWidth " << w<< endl;
- dockWidget->setOrientation(Vertical);
- int h = dockWidget->heightForWidth( w );
- return h;
+ kdDebug(12004) << "heightForWidth " << w<< endl;
+ dockWidget->setOrientation(Vertical);
+ int h = dockWidget->heightForWidth( w );
+ return h;
}
void kweather::refresh(QString stationID)
{
- kdDebug(12004) << "refresh " << stationID << endl;
- if( stationID == reportLocation)
- {
- showWeather();
- writeLogEntry();
- }
+ kdDebug(12004) << "refresh " << stationID << endl;
+ if( stationID == reportLocation)
+ {
+ showWeather();
+ writeLogEntry();
+ }
}
void kweather::slotPrefsAccepted()
@@ -328,7 +330,7 @@
dockWidget->setLocationCode(reportLocation);
dockWidget->setViewMode(mViewMode);
- dockWidget->setPaletteForegroundColor(mTextColor);
+ setLabelColor();
emit updateLayout();
if (logOn && !fileName.isEmpty())
@@ -406,8 +408,18 @@
void kweather::resizeEvent(QResizeEvent *e)
{
- kdDebug(12004) << "KWeather Resize event " << e->size() << endl;
- dockWidget->resizeView(e->size());
+ kdDebug(12004) << "KWeather Resize event " << e->size() << endl;
+ dockWidget->resizeView(e->size());
+}
+
+void kweather::setLabelColor()
+{
+ setPaletteForegroundColor(mTextColor);
+}
+
+void kweather::paletteChange(const QPalette &)
+{
+ setLabelColor();
}
#include "kweather.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/kweather.desktop
new/kdetoys-3.5.10/kweather/kweather.desktop
--- old/kdetoys-3.5.9/kweather/kweather.desktop 2008-02-13 10:38:05.000000000
+0100
+++ new/kdetoys-3.5.10/kweather/kweather.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
Type=Plugin
-Encoding=UTF-8
Comment=Stay informed of the weather outside
Comment[ar]=كن على علم دوماً بحالة الطقس في الخارج
Comment[be]=Застаньцеся інфармаванымі аб надвор'і
@@ -48,7 +47,8 @@
Comment[tg]=Дар бораи ҳаво огоҳ шавед
Comment[tr]=Hava durumundan haberdar olun
Comment[uk]=Інформація про погодні умови надворі
-Comment[uz]=Ернинг турли жойидаги об-ҳаво ҳақида маълумот
+Comment[uz]=Yerning turli joyidagi ob-havo haqida maʼlumot
+Comment[uz@cyrillic]=Ернинг турли жойидаги об-ҳаво ҳақида маълумот
Comment[zh_CN]=知晓户外天气
Comment[zh_TW]=留住外面的天氣報告
Name=Weather Report
@@ -102,7 +102,8 @@
Name[tg]=Ахборот дар бораи ҳаво
Name[tr]=Hava Durumu
Name[uk]=Інформація про погоду
-Name[uz]=Об-ҳаво ҳақида ҳисобот
+Name[uz]=Ob-havo haqida hisobot
+Name[uz@cyrillic]=Об-ҳаво ҳақида ҳисобот
Name[wa]=Rapoirt meteyo
Name[zh_CN]=气象报告
Name[zh_TW]=氣象報告
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/kweather.h
new/kdetoys-3.5.10/kweather/kweather.h
--- old/kdetoys-3.5.9/kweather/kweather.h 2007-05-14 09:40:37.000000000
+0200
+++ new/kdetoys-3.5.10/kweather/kweather.h 2008-08-19 20:14:10.000000000
+0200
@@ -28,57 +28,63 @@
class reportView;
class KPopupMenu;
class WeatherService_stub;
+class QPalette;
class kweather : public KPanelApplet, public weatherIface
{
Q_OBJECT
public:
- kweather(const QString& configFile, Type t = Normal, int actions = 0,
QWidget *parent = 0, const char *name = 0);
- ~kweather();
- void help();
- void resizeEvent(QResizeEvent*);
- int heightForWidth(int i) const;
- int widthForHeight(int i) const;
- void refresh(QString);
+ kweather(const QString& configFile, Type t = Normal, int actions = 0,
QWidget *parent = 0, const char *name = 0);
+ ~kweather();
+ void help();
+ void resizeEvent(QResizeEvent*);
+ int heightForWidth(int i) const;
+ int widthForHeight(int i) const;
+ void refresh(QString);
+ void setBackground();
+ void setLabelColor();
public slots: // Public slots
- void preferences();
- void about();
+ void preferences();
+ void about();
+
+protected:
+ void paletteChange(const QPalette &);
protected slots:
- void doReport();
- void timeout();
- void slotPrefsAccepted();
- void slotReportFinished();
- void slotUpdateNow();
+ void doReport();
+ void timeout();
+ void slotPrefsAccepted();
+ void slotReportFinished();
+ void slotUpdateNow();
private: // Private methods
- void initContextMenu();
- void initDCOP();
- void loadPrefs();
- void savePrefs();
- void showWeather();
- void writeLogEntry();
- void mousePressEvent(QMouseEvent *e);
-
- bool attach();
-
- QString reportLocation;
- QString fileName;
- QString metarData;
- bool logOn;
- bool mFirstRun;
- int mViewMode;
- QTimer *timeOut;
- dockwidget *dockWidget;
- reportView *mReport;
- DCOPClient *mClient;
- //DCOPRef *mWeatherService;
- KPopupMenu *mContextMenu;
- WeatherService_stub *mWeatherService;
- KCMultiDialog *settingsDialog;
- QColor mTextColor;
+ void initContextMenu();
+ void initDCOP();
+ void loadPrefs();
+ void savePrefs();
+ void showWeather();
+ void writeLogEntry();
+ void mousePressEvent(QMouseEvent *e);
+
+ bool attach();
+
+ QString reportLocation;
+ QString fileName;
+ QString metarData;
+ bool logOn;
+ bool mFirstRun;
+ int mViewMode;
+ QTimer *timeOut;
+ dockwidget *dockWidget;
+ reportView *mReport;
+ DCOPClient *mClient;
+ //DCOPRef *mWeatherService;
+ KPopupMenu *mContextMenu;
+ WeatherService_stub *mWeatherService;
+ KCMultiDialog *settingsDialog;
+ QColor mTextColor;
};
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/kweatherreport.desktop
new/kdetoys-3.5.10/kweather/kweatherreport.desktop
--- old/kdetoys-3.5.9/kweather/kweatherreport.desktop 2007-05-14
09:40:37.000000000 +0200
+++ new/kdetoys-3.5.10/kweather/kweatherreport.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Exec=kweatherreport
Icon=kweatherreport
MimeType=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/kweatherservice.desktop
new/kdetoys-3.5.10/kweather/kweatherservice.desktop
--- old/kdetoys-3.5.9/kweather/kweatherservice.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kweather/kweatherservice.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=KWeatherService
Name[ar]=خدمة الأرصاد الجوية KWeatherService
@@ -25,7 +24,8 @@
Name[ta]= K வானிலை சேவை
Name[tg]=KХизматиҲаво
Name[th]=รายงานอากาศ K
-Name[uz]=Об-ҳаво хизмати
+Name[uz]=Ob-havo xizmati
+Name[uz@cyrillic]=Об-ҳаво хизмати
Name[wa]=Siervice meteyo
Name[xh]=Inkonzo ye KWeather
Name[zh_CN]=K 气象服务
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/weatherbar_add.desktop
new/kdetoys-3.5.10/kweather/weatherbar_add.desktop
--- old/kdetoys-3.5.9/kweather/weatherbar_add.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kweather/weatherbar_add.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Link
URL=
Icon=weather_sidebar
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/weatherbar.desktop
new/kdetoys-3.5.10/kweather/weatherbar.desktop
--- old/kdetoys-3.5.9/kweather/weatherbar.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kweather/weatherbar.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Link
URL=
Icon=weather_sidebar
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/weatherbutton.cpp
new/kdetoys-3.5.10/kweather/weatherbutton.cpp
--- old/kdetoys-3.5.9/kweather/weatherbutton.cpp 2005-10-10
16:58:37.000000000 +0200
+++ new/kdetoys-3.5.10/kweather/weatherbutton.cpp 2008-08-19
20:14:10.000000000 +0200
@@ -47,32 +47,45 @@
void WeatherButton::drawButton( QPainter *p )
{
- if ( isDown() || isOn() )
- {
- p->setPen( Qt::black );
- p->drawLine( 0, 0, width()-1, 0 );
- p->drawLine( 0, 0, 0, height()-1 );
- p->setPen( colorGroup().light() );
- p->drawLine( 0, height()-1, width()-1, height()-1 );
- p->drawLine( width()-1, 0, width()-1, height()-1 );
- }
-
- drawButtonLabel( p );
+ drawButtonLabel(p);
}
void WeatherButton::drawButtonLabel( QPainter *p )
{
- if ( pixmap() )
+ if (!pixmap())
{
- QPixmap pix = m_highlight? m_activeIcon : m_normalIcon;
+ return;
+ }
- if ( isOn() || isDown() )
- p->translate( 2, 2 );
+ QPixmap pix = m_highlight? m_activeIcon : m_normalIcon;
- p->drawPixmap( pixmapOrigin(), pix );
+ if (isOn() || isDown())
+ {
+ pix = pix.convertToImage().smoothScale(pix.width() - 2,
+ pix.height() - 2);
}
+
+ int h = height();
+ int w = width();
+ int ph = pix.height();
+ int pw = pix.width();
+ int margin = 3;
+ QPoint origin(margin / 2, margin / 2);
+
+ if (ph < (h - margin))
+ {
+ origin.setY((h - ph) / 2);
+ }
+
+ if (pw < (w - margin))
+ {
+ origin.setX((w - pw) / 2);
+ }
+
+ p->drawPixmap(origin, pix);
}
+
void WeatherButton::setPixmap( const QPixmap &pix )
{
QButton::setPixmap( pix );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kweather/weather_stations.desktop
new/kdetoys-3.5.10/kweather/weather_stations.desktop
--- old/kdetoys-3.5.9/kweather/weather_stations.desktop 2007-05-14
09:40:37.000000000 +0200
+++ new/kdetoys-3.5.10/kweather/weather_stations.desktop 2008-08-19
20:14:10.000000000 +0200
@@ -1654,7 +1654,7 @@
[EU]
name=Europe
-states=AB OS BE BA BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU MT
MD NL NO PL PT RO RU SK SI SP SE CH TR UA UK YU
+states=AB OS BE BA BY BG CZ HR CY DK EE FI FR MK DE GI GR HU IE IS IT LV LT LU
MT MD NL NO PL PT RO RU SK SI SP SE CH TR UA UK YU
[EU_AB]
name=Albania
@@ -1711,6 +1711,15 @@
loc2=Sofia LBSF ------ ---
loc3=Varna LBWN ------ ---
+[EU_BY]
+name=Belarus
+loc0=Brest UMBB ------ ---
+loc1=Gomel UMGG ------ ---
+loc2=Grodno UMMG ------ ---
+loc3=Minsk UMMS ------ ---
+loc4=Minsk-International/Loszica UMMM ------ ---
+loc5=Vitebsk UMII ------ ---
+
[EU_CZ]
name=Czech Republic
loc0=Brno LKTB ------ ---
@@ -2113,7 +2122,7 @@
loc38=Mont-de-Marsan LFBM ------ ---
loc39=Nancy-Essey LFSN ------ ---
loc40=Nancy-Ochey LFSO ------ ---
-loc41=Nantes\\ Adlantique LFRS ------ ---
+loc41=Nantes\\ Atlantique LFRS ------ ---
loc42=Nice-Côte\\ d'Azur LFMN ------ ---
loc43=Nimes-Garons LFTW ------ ---
loc44=Paris/Charles\\ De\\ Gaulle LFPG ------ ---
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kworldwatch/kdeworld.desktop
new/kdetoys-3.5.10/kworldwatch/kdeworld.desktop
--- old/kdetoys-3.5.9/kworldwatch/kdeworld.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kworldwatch/kdeworld.desktop 2008-08-19
20:14:09.000000000 +0200
@@ -55,7 +55,8 @@
Comment[th]=นาฬิกาทั่วโลกของ KDE โดย Matthias Hoelzer-Kluepfel
Comment[tr]=Matthias Hoelzer-Kluepfel'den KDE Dünya Saati
Comment[uk]=Всесвітній годинник KDE від Matthias Hoelzer-Kluepfel
-Comment[uz]=Матиас Ҳўлцер-Клюпфел (Matthias Hoelzer-Kluepfel) яратган KDE дунё
соати
+Comment[uz]=Matias Hoʻlser-Klyupfel (Matthias Hoelzer-Kluepfel) yaratgan KDE
dunyo soati
+Comment[uz@cyrillic]=Матиас Ҳўлцер-Клюпфел (Matthias Hoelzer-Kluepfel) яратган
KDE дунё соати
Comment[ven]=Tshifhinga tsha lifhasi nga Matthias Hoelzer-Kluepfel
Comment[wa]=Ôrlodje daegnrece po KDE, sicrît pa Matthias Hoelzer-Kluepfel
Comment[xh]=Ukhangelo lwehlabathi lwe KDE ngu Matthias Hoelzer-Kluepfel
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kworldwatch/kworldclock.desktop
new/kdetoys-3.5.10/kworldwatch/kworldclock.desktop
--- old/kdetoys-3.5.9/kworldwatch/kworldclock.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kworldwatch/kworldclock.desktop 2008-08-19
20:14:09.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=KWorldClock
Name[bn]=কে-ওয়ার্ল্ড-ক্লক
Name[de]=Weltzeituhr
@@ -78,4 +77,4 @@
Type=Application
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Amusement;
+Categories=Qt;KDE;Utility;Amusement;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdetoys-3.5.9/kworldwatch/kwwapplet.desktop
new/kdetoys-3.5.10/kworldwatch/kwwapplet.desktop
--- old/kdetoys-3.5.9/kworldwatch/kwwapplet.desktop 2008-02-13
10:38:05.000000000 +0100
+++ new/kdetoys-3.5.10/kworldwatch/kwwapplet.desktop 2008-08-19
20:14:09.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Plugin
Icon=kworldclock
Name=World Wide Watch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |