Merge remote branch 'origin/KDE/4.8'

This commit is contained in:
Aaron Seigo 2011-12-22 16:18:29 +01:00
commit b0f8408c46
16 changed files with 49 additions and 33 deletions

View File

@ -104,6 +104,27 @@ public:
*/ */
Containment *addContainment(const QString &name, const QVariantList &args = QVariantList()); Containment *addContainment(const QString &name, const QVariantList &args = QVariantList());
/**
* Loads a containment with delayed initialization, primarily useful
* for implementations of loadDefaultLayout. The caller is responsible
* for all initializating, saving and notification of a new containment.
*
* @param name the plugin name for the containment, as given by
* KPluginInfo::pluginName(). If an empty string is passed in, the defalt
* containment plugin will be used (usually DesktopContainment). If the
* string literal "null" is passed in, then no plugin will be loaded and
* a simple Containment object will be created instead.
* @param args argument list to pass to the containment
*
* @return a pointer to the containment on success, or 0 on failure. Failure can
* be caused by the Immutability type being too restrictive, as containments can't be added
* when widgets are locked, or if the requested containment plugin can not be located
* or successfully loaded.
* @see addContainment
**/
Containment *addContainmentDelayed(const QString &name,
const QVariantList &args = QVariantList());
/** /**
* Returns the Containment, if any, for a given physical screen and desktop * Returns the Containment, if any, for a given physical screen and desktop
* *
@ -438,27 +459,6 @@ protected:
**/ **/
virtual void loadDefaultLayout(); virtual void loadDefaultLayout();
/**
* Loads a containment with delayed initialization, primarily useful
* for implementations of loadDefaultLayout. The caller is responsible
* for all initializating, saving and notification of a new containment.
*
* @param name the plugin name for the containment, as given by
* KPluginInfo::pluginName(). If an empty string is passed in, the defalt
* containment plugin will be used (usually DesktopContainment). If the
* string literal "null" is passed in, then no plugin will be loaded and
* a simple Containment object will be created instead.
* @param args argument list to pass to the containment
*
* @return a pointer to the containment on success, or 0 on failure. Failure can
* be caused by the Immutability type being too restrictive, as containments can't be added
* when widgets are locked, or if the requested containment plugin can not be located
* or successfully loaded.
* @see addContainment
**/
Containment *addContainmentDelayed(const QString &name,
const QVariantList &args = QVariantList());
/** /**
* Maps a stock animation to one of the semantic animations. Used to control things such * Maps a stock animation to one of the semantic animations. Used to control things such
* as what animation is used to make a Plasma::Appear appear in a containment. * as what animation is used to make a Plasma::Appear appear in a containment.

View File

@ -69,6 +69,7 @@ Name[th]=ชุดสะสม
Name[tr]=Koleksiyon Name[tr]=Koleksiyon
Name[ug]=توپلام Name[ug]=توپلام
Name[uk]=Збірка Name[uk]=Збірка
Name[vi]=B sưu tp
Name[wa]=Ramexhnêye Name[wa]=Ramexhnêye
Name[x-test]=xxCollectionxx Name[x-test]=xxCollectionxx
Name[zh_CN]= Name[zh_CN]=

View File

@ -20,6 +20,7 @@ Description[et]=Plasma teenuste protokoll
Description[eu]=Plasma zerbitzuentzako protokolo bat Description[eu]=Plasma zerbitzuentzako protokolo bat
Description[fi]=Plasma-palvelujen yhteyskäytäntö Description[fi]=Plasma-palvelujen yhteyskäytäntö
Description[fr]=Un protocole pour les services Plasma Description[fr]=Un protocole pour les services Plasma
Description[gl]=Un protocolo para servizos do Plasma
Description[hr]=Protokol za servise u Plasmi Description[hr]=Protokol za servise u Plasmi
Description[hu]=Protokoll a Plazma-szolgáltatáshoz Description[hu]=Protokoll a Plazma-szolgáltatáshoz
Description[ia]=un protocollo per servicios de Plasma Description[ia]=un protocollo per servicios de Plasma
@ -46,10 +47,10 @@ Description[sr@ijekavian]=Протокол за плазма сервисе
Description[sr@ijekavianlatin]=Protokol za plasma servise Description[sr@ijekavianlatin]=Protokol za plasma servise
Description[sr@latin]=Protokol za plasma servise Description[sr@latin]=Protokol za plasma servise
Description[sv]=Ett protokoll för Plasma-tjänster Description[sv]=Ett protokoll för Plasma-tjänster
Description[th]=โพรโทคอลสำหรับใช้กับบริการของพลาสมา
Description[tr]=Plasma servisleri için bir protokol Description[tr]=Plasma servisleri için bir protokol
Description[ug]=پلازما(Plasma) مۇلازىمىتىنىڭ كېلىشىمى Description[ug]=پلازما(Plasma) مۇلازىمىتىنىڭ كېلىشىمى
Description[uk]=Протокол для служб Плазми Description[uk]=Протокол для служб Плазми
Description[vi]=Một giao thức cho các dịch vụ Plasma
Description[x-test]=xxA protocol for Plasma servicesxx Description[x-test]=xxA protocol for Plasma servicesxx
Description[zh_CN]=Plasma 服务协议 Description[zh_CN]=Plasma 服务协议
Description[zh_TW]=Plasma 服務協定 Description[zh_TW]=Plasma 服務協定

View File

@ -72,6 +72,7 @@ Comment[th]=กลไกแสดงความเคลื่อนไหว
Comment[tr]=Plasma Canlandırma Motoru Comment[tr]=Plasma Canlandırma Motoru
Comment[ug]=Plasma جانلاندۇرۇم ماتورى Comment[ug]=Plasma جانلاندۇرۇم ماتورى
Comment[uk]=Рушій анімації Плазми Comment[uk]=Рушій анімації Плазми
Comment[vi]=Cơ chế hot nh Plasma
Comment[wa]=Moteur d' animåcion di Plasma Comment[wa]=Moteur d' animåcion di Plasma
Comment[x-test]=xxPlasma Animation Enginexx Comment[x-test]=xxPlasma Animation Enginexx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -73,6 +73,7 @@ Comment[th]=แอพเพล็ตของพลาสมา
Comment[tr]=Plasma programcığı Comment[tr]=Plasma programcığı
Comment[ug]=Plasma قوللانچاق Comment[ug]=Plasma قوللانچاق
Comment[uk]=Аплет Плазми Comment[uk]=Аплет Плазми
Comment[vi]=Tiu dng Plasma
Comment[wa]=Aplikete di Plasma Comment[wa]=Aplikete di Plasma
Comment[x-test]=xxPlasma appletxx Comment[x-test]=xxPlasma appletxx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -71,8 +71,9 @@ Comment[ta]=பிளாஸ்மா தரவு இயந்திரம்
Comment[tg]=Системаи маълумотии Plasma Comment[tg]=Системаи маълумотии Plasma
Comment[th]= Comment[th]=
Comment[tr]=Plasma Veri Motoru Comment[tr]=Plasma Veri Motoru
Comment[ug]=Plasma سانلىق-مەلۇمات ماتورى Comment[ug]=Plasma سانلىق مەلۇمات ماتورى
Comment[uk]=Рушій даних Плазми Comment[uk]=Рушій даних Плазми
Comment[vi]=Cơ chế d liu Plasma
Comment[wa]=Moteur di dnêyes di Plasma Comment[wa]=Moteur di dnêyes di Plasma
Comment[x-test]=xxPlasma Data Enginexx Comment[x-test]=xxPlasma Data Enginexx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -67,6 +67,7 @@ Comment[th]=นิยามโครงสร้างแพกเกจขอ
Comment[tr]=Plasma paketi yapı tanımlaması Comment[tr]=Plasma paketi yapı tanımlaması
Comment[ug]=Plasma بوغچا قۇرۇلما ئېنىقلىمىسى Comment[ug]=Plasma بوغچا قۇرۇلما ئېنىقلىمىسى
Comment[uk]=Опис структури пакунка плазми Comment[uk]=Опис структури пакунка плазми
Comment[vi]=Đnh nghĩa cu trúc gói Plasma
Comment[wa]=Definixha del sitructeure do pacaedje di Plasma Comment[wa]=Definixha del sitructeure do pacaedje di Plasma
Comment[x-test]=xxPlasma package structure definitionxx Comment[x-test]=xxPlasma package structure definitionxx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -22,6 +22,7 @@ Comment[en_GB]=KRunner plugin
Comment[es]=Complemento para KRunner Comment[es]=Complemento para KRunner
Comment[et]=KRunneri plugin Comment[et]=KRunneri plugin
Comment[eu]=KRnner plugin-a Comment[eu]=KRnner plugin-a
Comment[fa]=وصله KRunner
Comment[fi]=KRunner-liitännäinen Comment[fi]=KRunner-liitännäinen
Comment[fr]=Module KRunner Comment[fr]=Module KRunner
Comment[fy]=KRunner plugin Comment[fy]=KRunner plugin
@ -74,6 +75,7 @@ Comment[th]=โปรแกรมเสริมของ KRunner
Comment[tr]=KRunner eklentisi Comment[tr]=KRunner eklentisi
Comment[ug]=KRunner قىستۇرما Comment[ug]=KRunner قىستۇرما
Comment[uk]=Додаток до KRunner Comment[uk]=Додаток до KRunner
Comment[vi]=Phn b sung KRunner
Comment[wa]=Tchôke-divins KRunner Comment[wa]=Tchôke-divins KRunner
Comment[x-test]=xxKRunner pluginxx Comment[x-test]=xxKRunner pluginxx
Comment[zh_CN]=KRunner Comment[zh_CN]=KRunner

View File

@ -70,6 +70,7 @@ Comment[th]=ส่วนเสริมภาษาสคริปต์สำ
Comment[tr]=Plasma için betik dili eklentisi Comment[tr]=Plasma için betik dili eklentisi
Comment[ug]=Plasma نىڭ قوليازما تىل كېڭەيتىلمىسى Comment[ug]=Plasma نىڭ قوليازما تىل كېڭەيتىلمىسى
Comment[uk]=Розширення скриптових мов для Плазми Comment[uk]=Розширення скриптових мов для Плазми
Comment[vi]=Phn m rng ngôn ng lnh cho Plasma
Comment[wa]=Rawete di lingaedje di scriptaedje po Plasma Comment[wa]=Rawete di lingaedje di scriptaedje po Plasma
Comment[x-test]=xxScripting language extension for Plasmaxx Comment[x-test]=xxScripting language extension for Plasmaxx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -50,6 +50,7 @@ Comment[th]=บริการของพลาสมา
Comment[tr]=Plasma servisi Comment[tr]=Plasma servisi
Comment[ug]=Plasma مۇلازىمىتى Comment[ug]=Plasma مۇلازىمىتى
Comment[uk]=Служба Плазми Comment[uk]=Служба Плазми
Comment[vi]=Dch v Plasma
Comment[wa]=Siervice di Plasma Comment[wa]=Siervice di Plasma
Comment[x-test]=xxPlasma servicexx Comment[x-test]=xxPlasma servicexx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -52,6 +52,7 @@ Comment[th]=กล่องเครื่องมือของพลาส
Comment[tr]=Plasma araç kutusu Comment[tr]=Plasma araç kutusu
Comment[ug]=Plasma قورال ساندۇقى Comment[ug]=Plasma قورال ساندۇقى
Comment[uk]=Набір інструментів Плазми Comment[uk]=Набір інструментів Плазми
Comment[vi]=Hp công c Plasma
Comment[wa]=Boesse ås usteyes di Plasma Comment[wa]=Boesse ås usteyes di Plasma
Comment[x-test]=xxPlasma toolboxxx Comment[x-test]=xxPlasma toolboxxx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -71,6 +71,7 @@ Comment[th]=ภาพพื้นหลังของพลาสมา
Comment[tr]=Plasma duvar kağıdı Comment[tr]=Plasma duvar kağıdı
Comment[ug]=Plasma تام قەغىزى Comment[ug]=Plasma تام قەغىزى
Comment[uk]=Тло стільниці Плазми Comment[uk]=Тло стільниці Плазми
Comment[vi]=Hình nn Plasma
Comment[wa]=Tapisreye di Plasma Comment[wa]=Tapisreye di Plasma
Comment[x-test]=xxPlasma wallpaperxx Comment[x-test]=xxPlasma wallpaperxx
Comment[zh_CN]=Plasma Comment[zh_CN]=Plasma

View File

@ -922,15 +922,14 @@ void PopupAppletPrivate::updateDialogPosition(bool move)
const QPoint appletPos = view->mapToGlobal(view->mapFromScene(q->scenePos())); const QPoint appletPos = view->mapToGlobal(view->mapFromScene(q->scenePos()));
QPoint dialogPos; QPoint dialogPos = dialog->pos();
if (!q->containment() || view == q->containment()->view()) { if (move) {
kDebug() << "requesting with" << q->scenePos(); if (!q->containment() || view == q->containment()->view()) {
dialogPos = corona->popupPosition(q, dialog->size(), popupAlignment); dialogPos = corona->popupPosition(q, dialog->size(), popupAlignment);
} else { } else {
kDebug() << "requesting with" << q->parentItem(); dialogPos = corona->popupPosition(q->parentItem(), dialog->size(), popupAlignment);
dialogPos = corona->popupPosition(q->parentItem(), dialog->size(), popupAlignment); }
} }
kDebug() << "dialog position is" << dialogPos <<" with location" << q->location() << "<<<<<<<<<<<<<<<<<<<<<<<<";
bool reverse = false; bool reverse = false;
if (q->formFactor() == Plasma::Vertical) { if (q->formFactor() == Plasma::Vertical) {

View File

@ -64,8 +64,9 @@ Name[ta]=பொதியின் மூலத்தரவு சோதனைக
Name[tg]=Файли санҷишии стсетмаи metadata Name[tg]=Файли санҷишии стсетмаи metadata
Name[th]= Name[th]=
Name[tr]=Paket metadata test dosyası Name[tr]=Paket metadata test dosyası
Name[ug]=بوغچا مېتا سانلىق-مەلۇمات سىناق ھۆججەت Name[ug]=بوغچا مېتا سانلىق مەلۇمات سىناق ھۆججەت
Name[uk]=Файл перевірки метаданих пакунка Name[uk]=Файл перевірки метаданих пакунка
Name[vi]=Tp tin kim tra d liu lý lch Plasma
Name[wa]=Fitchî d' asprouvaedje des meta-dnêyes do pacaedje Name[wa]=Fitchî d' asprouvaedje des meta-dnêyes do pacaedje
Name[x-test]=xxPackage metadata test filexx Name[x-test]=xxPackage metadata test filexx
Name[zh_CN]= Name[zh_CN]=
@ -137,6 +138,7 @@ Comment[th]=แฟ้มทดสอบพื้นที่ทำงาน ส
Comment[tr]=PackageMetaData sınıfını test etmek için bir desktop dosyası. Comment[tr]=PackageMetaData sınıfını test etmek için bir desktop dosyası.
Comment[ug]=PackageMetaData خىلىدىكى سىناشقا ئىشلىتىدىغان desktop تىپىدىكى ھۆججەت. Comment[ug]=PackageMetaData خىلىدىكى سىناشقا ئىشلىتىدىغان desktop تىپىدىكى ھۆججەت.
Comment[uk]=Тестовий стільничний файл для перевірки класу PackageMetaData. Comment[uk]=Тестовий стільничний файл для перевірки класу PackageMetaData.
Comment[vi]=Mt tp tin th đ kim tra lp PackageMetaData.
Comment[wa]=On fitchî desktop di saye pos asprouver l' classe PackageMetaData. Comment[wa]=On fitchî desktop di saye pos asprouver l' classe PackageMetaData.
Comment[x-test]=xxA test desktop file to test the PackageMetaData class.xx Comment[x-test]=xxA test desktop file to test the PackageMetaData class.xx
Comment[zh_CN]= PackageMetaData desktop Comment[zh_CN]= PackageMetaData desktop

View File

@ -47,8 +47,9 @@ Name[sr@latin]=Proba
Name[sv]=Test Name[sv]=Test
Name[th]= Name[th]=
Name[tr]=Deneme Name[tr]=Deneme
Name[ug]=سىناق Name[ug]=سىنا
Name[uk]=Тест Name[uk]=Тест
Name[vi]=Kim tra
Name[wa]=Sayî Name[wa]=Sayî
Name[x-test]=xxTestxx Name[x-test]=xxTestxx
Name[zh_CN]= Name[zh_CN]=
@ -101,6 +102,7 @@ Comment[th]=โปรแกรมเสริมเทียมสำหรั
Comment[tr]=Denemek için sahte bir eklenti Comment[tr]=Denemek için sahte bir eklenti
Comment[ug]=سىناشقا ئىشلىتىدىغان قىستۇرما Comment[ug]=سىناشقا ئىشلىتىدىغان قىستۇرما
Comment[uk]=Додаток для тестування Comment[uk]=Додаток для тестування
Comment[vi]=Mt phn b sung gi đ kim th
Comment[wa]=On fås tchôke-divins po l' asprouvaedje Comment[wa]=On fås tchôke-divins po l' asprouvaedje
Comment[x-test]=xxA dummy plugin for testingxx Comment[x-test]=xxA dummy plugin for testingxx
Comment[zh_CN]= Comment[zh_CN]=

View File

@ -69,6 +69,7 @@ Name[th]=กลไกทดสอบข้อมูล
Name[tr]=Test Veri Motoru Name[tr]=Test Veri Motoru
Name[ug]=سىناققا ئىشلىتىدىغان ماتور Name[ug]=سىناققا ئىشلىتىدىغان ماتور
Name[uk]=Перевірка рушія даних Name[uk]=Перевірка рушія даних
Name[vi]=Cơ chế kim tra d liu
Name[wa]=Moteur di dnêyes d' asprouvaedje Name[wa]=Moteur di dnêyes d' asprouvaedje
Name[x-test]=xxTest Data Enginexx Name[x-test]=xxTest Data Enginexx
Name[zh_CN]= Name[zh_CN]=