[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/plasma-desktoplayout-4.2/kdelibs-plasma (silent)
From: Ambroz Bizjak <ambrop7 () gmail ! com>
Date: 2009-01-30 21:36:07
Message-ID: 1233351367.134279.32244.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 918863 by abizjak:
SVN_SILENT Merge upstream changes.
M +3 -0 applet.cpp
M +5 -0 applet.h
M +2 -10 containment.cpp
M +1 -1 containment.h
M +1 -1 popupapplet.cpp
M +1 -1 private/containment_p.h
M +1 -0 servicetypes/plasma-animator.desktop
M +1 -0 servicetypes/plasma-applet-extenderapplet.desktop
M +2 -0 servicetypes/plasma-applet.desktop
M +2 -0 servicetypes/plasma-containment.desktop
M +1 -0 servicetypes/plasma-dataengine.desktop
M +1 -0 servicetypes/plasma-packagestructure.desktop [TRAILING SPACE]
M +1 -0 servicetypes/plasma-runner.desktop
M +2 -0 servicetypes/plasma-scriptengine.desktop
M +2 -0 servicetypes/plasma-wallpaper.desktop [TRAILING SPACE]
M +3 -0 tests/packagemetadatatest.desktop [TRAILING SPACE]
M +2 -0 tests/testengine/plasma-dataengine-testengine.desktop
M +3 -1 widgets/busywidget.cpp
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/applet.cpp #918862:918863
@@ -133,6 +133,9 @@
Applet::~Applet()
{
+ //let people know that i will die
+ emit appletDestroyed(this);
+
if (d->transient) {
d->resetConfigurationObject();
} else if (d->extender) {
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/applet.h #918862:918863
@@ -619,6 +619,11 @@
*/
void activate();
+ /**
+ * Emitted when the applet is deleted
+ */
+ void appletDestroyed(Plasma::Applet *applet);
+
public Q_SLOTS:
/**
* Sets the immutability type for this applet (not immutable,
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/containment.cpp \
#918862:918863 @@ -742,7 +742,7 @@
connect(applet, SIGNAL(configNeedsSaving()), this, SIGNAL(configNeedsSaving()));
connect(applet, SIGNAL(releaseVisualFocus()), this, \
SIGNAL(releaseVisualFocus()));
- connect(applet, SIGNAL(destroyed(QObject*)), this, \
SLOT(appletDestroyed(QObject*))); + connect(applet, \
SIGNAL(appletDestroyed(Plasma::Applet*)), this, \
SLOT(appletDestroyed(Plasma::Applet*)));
if (pos != QPointF(-1, -1)) {
applet->setPos(pos);
@@ -1709,16 +1709,8 @@
return true;
}
-void ContainmentPrivate::appletDestroyed(QObject *object)
+void ContainmentPrivate::appletDestroyed(Plasma::Applet *applet)
{
- // we do a static_cast here since it really isn't an Applet by this
- // point anymore since we are in the qobject dtor. we don't actually
- // try and do anything with it, we just need the value of the pointer
- // so this unsafe looking code is actually just fine.
- //
- // NOTE: DO NOT USE THE applet VARIABLE FOR ANYTHING OTHER THAN COMPARING
- // THE ADDRESS! ACTUALLY USING THE OBJECT WILL RESULT IN A CRASH!!!
- Applet *applet = static_cast<Plasma::Applet*>(object);
applets.removeAll(applet);
if (focusedApplet == applet) {
focusedApplet = 0;
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/containment.h \
#918862:918863 @@ -507,7 +507,7 @@
const QGraphicsItem *toolBoxItem() const;
private:
- Q_PRIVATE_SLOT(d, void appletDestroyed(QObject*))
+ Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))
Q_PRIVATE_SLOT(d, void containmentAppletAnimationComplete(QGraphicsItem \
*item,
\
Plasma::Animator::Animation anim)) Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/popupapplet.cpp \
#918862:918863 @@ -428,7 +428,7 @@
bool PopupApplet::isPopupShowing() const
{
- return !d->dialog || d->dialog->isVisible();
+ return d->dialog && d->dialog->isVisible();
}
PopupAppletPrivate::PopupAppletPrivate(PopupApplet *applet)
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/private/containment_p.h \
#918862:918863 @@ -75,7 +75,7 @@
void positionContainments();
void setLockToolText();
void handleDisappeared(AppletHandle *handle);
- void appletDestroyed(QObject*);
+ void appletDestroyed(Plasma::Applet*);
void containmentAppletAnimationComplete(QGraphicsItem *item, \
Plasma::Animator::Animation anim); void zoomIn();
void zoomOut();
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-animator.desktop \
#918862:918863 @@ -41,6 +41,7 @@
Comment[pt]=Motor de Animação do Plasma
Comment[pt_BR]=Mecanismo de animação do Plasma
Comment[ro]=Motor de animație Plasma
+Comment[ru]=Движок анимации для Plasma
Comment[sk]=Engine animácii plasmy
Comment[sl]=Animacijski pogon za Plasmo
Comment[sr]=Плазма мотор анимација
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-applet-extenderapplet.desktop \
#918862:918863 @@ -31,6 +31,7 @@
Name[pt]=Contentor de Extensão Interno
Name[pt_BR]=Recipiente de extensão interna
Name[ro]=Container extensibil intern
+Name[ru]=Внутренний контейнер
Name[sk]=Vnútorný predlžovací kontajner
Name[sl]=Notranji razširitveni vsebovalnik
Name[sr]=унутрашњи садржалац проширивача
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-applet.desktop \
#918862:918863 @@ -30,6 +30,7 @@
Comment[km]=អាប់ភ្លេតប្លាស្មា
Comment[ko]=Plasma 플릿
Comment[ku]=Sepanoka Plasma
+Comment[lt]=Plasma įskiepis
Comment[lv]=Plasma aplets
Comment[mai]=प्लाजमा एप्पलेट
Comment[ml]=പ്ലാസ്മ ലഘുപ്രയോഗം
@@ -42,6 +43,7 @@
Comment[pt]='Applet' do Plasma
Comment[pt_BR]=Miniaplicativo do Plasma
Comment[ro]=Miniaplicație Plasma
+Comment[ru]=Виджет Plasma
Comment[sl]=Plasma programček
Comment[sr]=Плазма аплет
Comment[sr@latin]=Plasma aplet
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-containment.desktop \
#918862:918863 @@ -26,6 +26,7 @@
Comment[ja]=Plasma アプレットの入れ物、背景の描画
Comment[km]=ឧបករណ៍ផ្ទុកអាប់ភ្លេតប្លាស្មា \
និងកម្មវិធីគូរផ្ទៃខាងក្រោយ
Comment[ku]=Embarvanê sepanoka Plasma û nexşevanê rûerdê
+Comment[lt]=Plasma įskiepio dėklas ir fono paišiklis
Comment[lv]=Plasma apletu turis un fona zīmētājs
Comment[mai]=प्लाजमा एप्पलेट कंटेनर \
आओर पृष् भूमि पेंटर \
Comment[ml]=പ്ലാസ്മ ലഘുപ്രയോഗം \
കണ്ടൈനറും പശ്ചാത്തല \
പെയിന്ററും @@ -38,6 +39,7 @@
Comment[pt]=Contentor de 'applets' do Plasma e pintor do fundo
Comment[pt_BR]=Recipiente de miniaplicativos do Plasma e pintor de plano de fundo
Comment[ro]=Container de miniaplicații Plasma și desenator de fundal
+Comment[ru]=Контейнер и модуль отрисовки виджета \
Plasma Comment[sk]=Plasma applet kontajner a popisovať na pozadí
Comment[sl]=Vsebnik programčkov in izrisovalnik ozadja za Plasmo
Comment[sr]=Садржалац плазма аплетâ и исцртавач \
позадине
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-dataengine.desktop \
#918862:918863 @@ -41,6 +41,7 @@
Comment[pt]=Motor de Dados do Plasma
Comment[pt_BR]=Mecanismo de dados do Plasma
Comment[ro]=Motor de date Plasma
+Comment[ru]=Источник данных Plasma
Comment[sl]=Podatkovni pogon za Plasmo
Comment[sr]=Плазма датомотор
Comment[sr@latin]=Plasma datomotor
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-packagestructure.desktop \
#918862:918863 @@ -39,6 +39,7 @@
Comment[pt]=Definição da estrutura de pacotes do Plasma
Comment[pt_BR]=Definição de estrutura de pacote do Plasma
Comment[ro]=Definiție de structură a pachetului Plasma
+Comment[ru]=Определение структуры пакета Plasma
Comment[sk]=Balík definícii štruktúry plasmy
Comment[sl]=Definicija strukture paketa za Plasmo
Comment[sr]=Дефиниција структуре плазма пакета
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-runner.desktop \
#918862:918863 @@ -44,6 +44,7 @@
Comment[pt]='Plugin' do KRunner
Comment[pt_BR]=Plug-in do KRunner
Comment[ro]=Modul KRunner
+Comment[ru]= асширение KRunner
Comment[sk]=KRunner rozšírenie
Comment[sl]=Vstavek za KRunner
Comment[sr]=Прикључак за К‑извођач
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-scriptengine.desktop \
#918862:918863 @@ -27,6 +27,7 @@
Comment[km]=ផ្នែកបន្ថែមភាសាស្គ្រីបសម្រាប់ប្លាស្មា
Comment[ko]=Plasma 스크립트 언어 확장
Comment[ku]=Pêveka zimanê skrîpt kirinê ji bo Plasma
+Comment[lt]=Scenarijų kalbos praplėtimas, skirtas Plasma
Comment[lv]=Skriptēšanas valodu Plasma paplašinājums
Comment[mai]=प्लाजमाक लेल स्क्रिप्टिंग \
भाषाक विस्तार \
Comment[ml]=പ്ലാസ്മയ്ക്കുള്ള \
സ്ക്രിപ്റ്റിങ്ങ് ഭാഷാ \
എക്സ്റ്റന്ഷന് @@ -39,6 +40,7 @@
Comment[pt]=Extensão de linguagens de programação para o Plasma
Comment[pt_BR]=Extensão de linguagem de script do Plasma
Comment[ro]=Extensie de limbaj pentru scripturi Plasma
+Comment[ru]=Поддержка скриптовых языков для Plasma
Comment[sk]=Rozšírenie skryptovacieho jazyku pre Plasmu
Comment[sl]=Razširitev s skriptnim jezikom za Plasmo
Comment[sr]=Проширење Плазме за скриптне језике
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-wallpaper.desktop \
#918862:918863 @@ -29,6 +29,7 @@
Comment[km]=ផ្ទាំងរូបភាពប្លាស្មា
Comment[ko]=Plasma 배경 그림
Comment[ku]=Wêne-rûerdê Plasma
+Comment[lt]=Plasma apmušalas
Comment[lv]=Plasma ekrāntapete
Comment[mai]=प्लाजमा वालपेपर
Comment[ml]=പ്ലാസ്മ ചുമര്ച്ചിത്രം
@@ -41,6 +42,7 @@
Comment[pt]=Papel de parede do Plasma
Comment[pt_BR]=Papel de parede do Plasma
Comment[ro]=Fundal Plasma
+Comment[ru]=Обои Plasma
Comment[sk]=Plasma Pozadie
Comment[sl]=Tapeta za Plasmo
Comment[sr]=Плазма тапет
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/tests/packagemetadatatest.desktop \
#918862:918863 @@ -21,6 +21,7 @@
Name[km]=ឯកសារសាកល្បងទិន្នន័យមេតាកញ្ចប់
Name[ko]=패키지 메타데이터 테스트 파일
Name[ku]=Pela ceribandinê ya serdana yê pakêtê
+Name[lt]=Paketo metaduomenų bandomasis failas
Name[lv]=Pakotņu metadatu testa fails
Name[mai]=संकुलक मेटाडाटा जाँचि फाइल
Name[ml]=പാക്കേജ് മെറ്റാഡാറ്റാ \
പരിശോധനാ ഫയല് @@ -33,6 +34,7 @@
Name[pt]=Ficheiro de testes de meta-dados dos pacotes
Name[pt_BR]=Arquivo de teste dos metadados do pacote
Name[ro]=Fișier de testat metadatele pachetelor
+Name[ru]=Тестовый файл метаданных пакета
Name[sk]=Balík metadát testovacieho súboru
Name[sl]=Datoteka za test metapodatkov paketa
Name[sr]=Пробни фајл метаподатака пакета
@@ -80,6 +82,7 @@
Comment[pt]=Um ficheiro 'desktop' de testes da classe PackageMetaData.
Comment[pt_BR]=Um arquivo desktop de testes para a classe PackageMetaData.
Comment[ro]=Un fișier de probă pentru a verifica clasa PackageMetadata.
+Comment[ru]=Тестовый файл .desktop для проверки класса \
PackageMetaData. Comment[sk]=Testovací súbor na ploche na testovanie \
PackageMetaData triedy. Comment[sl]=Namizna datoteka za test razreda \
PackageMetaData. Comment[sr]=Пробни .десктоп фајл за класу \
PackageMetaData.
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/tests/testengine/plasma-dataengine-testengine.desktop \
#918862:918863 @@ -23,6 +23,7 @@
Name[km]=សាកល្បងម៉ាស៊ីនទិន្នន័យ
Name[ko]=테스트 데이터 엔진
Name[ku]=Motora Dane Ceribandinê
+Name[lt]=Bandomasis duomenų variklis
Name[lv]=Testēšanas datu dzinējs
Name[mai]=जाँचि डाटा इंडन
Name[ml]=പരിശോധനാ ഡാറ്റാ എഞ്ചിന്
@@ -35,6 +36,7 @@
Name[pt]=Motor de Dados de Teste
Name[pt_BR]=Mecanismo de dados de teste
Name[ro]=Motor de date pentru teste
+Name[ru]=Тестовый источник данных
Name[sk]=Engine testovacích dát
Name[sl]=Preizkusni pogon s podatki
Name[sr]=пробни датомотор података
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/widgets/busywidget.cpp \
#918862:918863 @@ -36,7 +36,9 @@
public:
BusyWidgetPrivate()
: svg(0),
- timerId(0)
+ timerId(0),
+ rotationAngle(0),
+ rotation(0)
{
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic