[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-25 23:53:01
Message-ID: 1232927581.039787.24971.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 916778 by abizjak:
SVN_SILENT Merge upstream changes.
M +4 -6 containment.cpp
M +0 -1 servicetypes/plasma-animator.desktop
M +0 -1 servicetypes/plasma-applet-extenderapplet.desktop
M +0 -1 servicetypes/plasma-applet.desktop
M +0 -1 servicetypes/plasma-containment.desktop
M +0 -1 servicetypes/plasma-dataengine.desktop
M +0 -1 servicetypes/plasma-packagestructure.desktop [TRAILING SPACE]
M +0 -1 servicetypes/plasma-runner.desktop
M +0 -1 servicetypes/plasma-scriptengine.desktop
M +0 -1 servicetypes/plasma-wallpaper.desktop
M +0 -2 tests/packagemetadatatest.desktop [TRAILING SPACE]
M +0 -1 tests/testengine/plasma-dataengine-testengine.desktop
M +9 -4 widgets/tabbar.cpp
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/containment.cpp \
#916777:916778 @@ -1602,12 +1602,10 @@
}
bool canConfig = unlocked || \
KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
- if (canConfig) {
- action = actions().action("activity settings");
- if (action) {
- action->setVisible(canConfig);
- action->setEnabled(canConfig);
- }
+ action = actions().action("activity settings");
+ if (action) {
+ action->setVisible(canConfig);
+ action->setEnabled(canConfig);
}
// tell the applets too
--- branches/work/plasma-desktoplayout-4.2/kdelibs-plasma/servicetypes/plasma-animator.desktop \
#916777:916778 @@ -41,7 +41,6 @@
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 \
#916777:916778 @@ -31,7 +31,6 @@
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 \
#916777:916778 @@ -42,7 +42,6 @@
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 \
#916777:916778 @@ -38,7 +38,6 @@
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 \
#916777:916778 @@ -41,7 +41,6 @@
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 \
#916777:916778 @@ -39,7 +39,6 @@
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 \
#916777:916778 @@ -44,7 +44,6 @@
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 \
#916777:916778 @@ -39,7 +39,6 @@
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 \
#916777:916778 @@ -41,7 +41,6 @@
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 \
#916777:916778 @@ -33,7 +33,6 @@
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]=Пробни фајл метаподатака пакета
@@ -81,7 +80,6 @@
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 \
#916777:916778 @@ -35,7 +35,6 @@
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/tabbar.cpp \
#916777:916778 @@ -360,18 +360,23 @@
return;
}
- int currentIndex = d->tabProxy->native->currentIndex();
-
+ int oldCurrentIndex = d->tabProxy->native->currentIndex();
d->tabProxy->native->removeTab(index);
QGraphicsWidget *page = d->pages.takeAt(index);
- if (index == currentIndex) {
- setCurrentIndex(currentIndex);
+ int currentIndex = d->tabProxy->native->currentIndex();
+
+ if (oldCurrentIndex == index) {
+ d->tabWidgetLayout->removeAt(1);
}
scene()->removeItem(page);
page->deleteLater();
+ if (oldCurrentIndex != currentIndex) {
+ setCurrentIndex(currentIndex);
+ }
+
d->updateTabWidgetMode();
d->tabProxy->setPreferredSize(d->tabProxy->native->sizeHint());
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic