Merge remote-tracking branch 'origin/KDE/4.7' into frameworks

Conflicts:
	CMakeLists.txt
	cmake/modules/FindNepomuk.cmake
	kdecore/tests/kstandarddirstest.cpp
	kdeui/util/kkeyserver.h
	kio/kio/accessmanagerreply_p.h
	kio/kio/hostinfo.cpp
	plasma/containment.cpp
	plasma/data/services/plasma.protocol
	plasma/popupapplet.cpp
	plasma/tooltipcontent.h
	plasma/widgets/videowidget.h

abstractrunner.h

@@ -101,7 +101,7 @@ class PLASMA_EXPORT AbstractRunner : public QObject
          *
          * Each runner is executed in its own thread. Whenever the user input changes this
          * method is called again. Thus, it needs to be thread-safe. Also, all matches need
-         * to be reported once this method returns. Asyncroneous runners therefore need
+         * to be reported once this method returns. Asynchronous runners therefore need
          * to make use of a local event loop to wait for all matches.
          *
          * It is recommended to use local status data in async runners. The simplest way is

data/services/plasma.protocol

@@ -18,15 +18,18 @@ Description[el]=Ένα πρωτόκολλο υπηρεσιών Plasma
 Description[es]=Un protocolo para los servicios de Plasma
 Description[et]=Plasma teenuste protokoll
 Description[eu]=Plasma zerbitzuentzako protokolo bat
-Description[fi]=Plasma-palvelujen protokolla
+Description[fi]=Plasma-palvelujen yhteyskäytäntö
+Description[fr]=Un protocole pour les services Plasma
 Description[hr]=Protokol za servise u Plasmi
 Description[hu]=Protokoll a Plazma-szolgáltatáshoz
 Description[ia]=un protocollo per servicios de Plasma
 Description[is]=Samskiptamáti fyrir Plasma-þjónustur
+Description[it]=Un protocollo per servizi plasma
 Description[ja]=Plasma サービスのためのプロトコル
 Description[kk]=Plasma қызметінің протоколы
 Description[km]=ពិធីការ​សម្រាប់​សេវា​កម្ម​ប្លាស្មា
 Description[ko]=Plasma 서비스 프로토콜
+Description[lv]=Plasma servisu protokols
 Description[nb]=En protokoll for plasma-tjenester
 Description[nds]=En Protokoll för Plasma-Deensten
 Description[nl]=Een protocol voor Plasma-services
@@ -42,6 +45,7 @@ Description[sr@ijekavian]=Протокол за плазма сервисе
 Description[sr@ijekavianlatin]=Protokol za plasma servise
 Description[sr@latin]=Protokol za plasma servise
 Description[sv]=Ett protokoll för Plasma-tjänster
+Description[th]=โพรโทคอลสำหรับใช้กับบริการของพลาสมา
 Description[tr]=Plasma servisleri için bir protokol
 Description[ug]=پلازما(Plasma) مۇلازىمىتىنىڭ كېلىشىمى
 Description[uk]=Протокол для служб Плазми

data/servicetypes/plasma-service.desktop

@@ -16,6 +16,7 @@ Comment[es]=Servicio de Plasma
 Comment[et]=Plasma teenus
 Comment[eu]=Plasma zerbitzua
 Comment[fi]=Plasma-palvelu
+Comment[fr]=Service Plasma
 Comment[gl]=Servizo do Plasma
 Comment[hr]=Servis u Plasmi
 Comment[hu]=Plazma-szolgáltatás
@@ -27,6 +28,7 @@ Comment[kk]=Plasma қызметі
 Comment[km]=សេវា​​ប្លាស្មា
 Comment[ko]=Plasma 서비스
 Comment[lt]=Plasma tarnyba
+Comment[lv]=Plasma serviss
 Comment[nb]=Plasma-tjeneste
 Comment[nds]=Plasma-Deenst
 Comment[nl]=Plasma-service

data/servicetypes/plasma-toolbox.desktop

@@ -16,6 +16,7 @@ Comment[es]=Caja de herramientas de Plasma
 Comment[et]=Plasma tööriistakast
 Comment[eu]=Plasma tresna-kutxa
 Comment[fi]=Plasma-työkalurivi
+Comment[fr]=Boîte à outils Plasma
 Comment[gl]=Barra de ferramentas do Plasma
 Comment[hr]=Plasma alatni okvir
 Comment[hu]=Plazma-eszközkészlet
@@ -28,6 +29,7 @@ Comment[km]=ប្រអប់​ឧបករណ៍​ប្លាស្មា
 Comment[ko]=Plasma 도구 상자
 Comment[ku]=Qutiya amûrên Plasma
 Comment[lt]=Pasma įrankinė
+Comment[lv]=Plasma rīkkopa
 Comment[nb]=Plasma-verktøykasse
 Comment[nds]=Plasma-Warktüüchkist
 Comment[nl]=Plasma-hulpmiddelen

dataengine.h

@@ -83,7 +83,10 @@ class PLASMA_EXPORT DataEngine : public QObject
          * This method is called when the DataEngine is started. When this
          * method is called the DataEngine is fully constructed and ready to be
          * used. This method should be reimplemented by DataEngine subclasses
-         * which have the need to perform a startup routine.
+         * which need to perform a startup routine.
+         *
+         * The default implementation does nothing. Reimplementations in
+         * subclasses don't need to call this one.
          **/
         virtual void init();
 

popupapplet.cpp

@@ -92,10 +92,9 @@ void PopupApplet::setPopupIcon(const QIcon &icon)
 
 void PopupApplet::setPopupIcon(const QString &iconName)
 {
-    if (Applet::d->package) {
-        //Attempt1: is it in the plasmoid package?
-        const QString file = Applet::d->package->filePath("images", iconName);
-
+    // Attempt 1: is it in the plasmoid package?
+    if (package()) {
+        const QString file = package()->filePath("images", iconName);
         if (!file.isEmpty()) {
             setPopupIcon(KIcon(file));
             return;
@@ -430,7 +429,7 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
 
 void PopupAppletPrivate::appletActivated()
 {
-    internalTogglePopup();
+    internalTogglePopup(true);
 }
 
 QSizeF PopupApplet::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
@@ -703,7 +702,7 @@ void PopupAppletPrivate::iconSizeChanged(int group)
     }
 }
 
-void PopupAppletPrivate::internalTogglePopup()
+void PopupAppletPrivate::internalTogglePopup(bool fromActivatedSignal)
 {
     if (autohideTimer) {
         autohideTimer->stop();
@@ -714,6 +713,11 @@ void PopupAppletPrivate::internalTogglePopup()
     Plasma::Dialog *dialog = dialogPtr.data();
     if (!dialog) {
         q->setFocus(Qt::ShortcutFocusReason);
+        if (!fromActivatedSignal) {
+            QObject::disconnect(q, SIGNAL(activate()), q, SLOT(appletActivated()));
+            emit q->activate();
+            QObject::connect(q, SIGNAL(activate()), q, SLOT(appletActivated()));
+        }
         return;
     }
 
@@ -734,6 +738,11 @@ void PopupAppletPrivate::internalTogglePopup()
             (q->graphicsWidget() == static_cast<Applet*>(q)->d->extender.data() &&
              static_cast<Applet*>(q)->d->extender.data()->isEmpty())) {
             // we have nothing to show, so let's not.
+            if (!fromActivatedSignal) {
+                QObject::disconnect(q, SIGNAL(activate()), q, SLOT(appletActivated()));
+                emit q->activate();
+                QObject::connect(q, SIGNAL(activate()), q, SLOT(appletActivated()));
+            }
             return;
         }
 

private/popupapplet_p.h

@@ -35,7 +35,7 @@ public:
     ~PopupAppletPrivate();
 
     void iconSizeChanged(int group);
-    void internalTogglePopup();
+    void internalTogglePopup(bool fromActivatedSignal = false);
     void hideTimedPopup();
     void clearPopupLostFocus();
     void dialogSizeChanged();

tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop

@@ -14,6 +14,7 @@ Name[et]=Test
 Name[eu]=Proba
 Name[fa]=آزمون
 Name[fi]=Testi
+Name[fr]=Test
 Name[gl]=Proba
 Name[hr]=Test
 Name[hu]=Teszt
@@ -26,6 +27,7 @@ Name[km]=សាកល្បង
 Name[ko]=테스트
 Name[ku]=Bicaribîne
 Name[lt]=Testas
+Name[lv]=Tests
 Name[nb]=Test
 Name[nds]=Utproberen
 Name[nl]=Test
@@ -65,6 +67,7 @@ Comment[es]=Un complemento de pruebas
 Comment[et]=Libaplugin testimiseks
 Comment[eu]=Probatarako gezurretazko plugin bat
 Comment[fi]=Tyhjä testausliitännäinen
+Comment[fr]=Un module factice de test
 Comment[gl]=Un engadido para probas
 Comment[hr]=Lažan priključak za testiranje
 Comment[hu]=Üres bővítmény teszteléshez
@@ -77,6 +80,7 @@ Comment[km]=កម្មវិធី​ជំនួយ​ដំបូង​ស
 Comment[ko]=테스트를 위한 뼈대 플러그인
 Comment[ku]=Pêvekekî hêsan ji bo ceribandinê
 Comment[lt]=Netikras priedas testavimui
+Comment[lv]=Testēšanai paredzēts spraudnis
 Comment[nb]=Et attrapp-programtillegg for testing
 Comment[nds]=En Platzholler-Moduul för't Utproberen
 Comment[nl]=Een dummy plugin voor testen

theme.cpp

@@ -860,16 +860,20 @@ void Theme::setFont(const QFont &font, FontRole role)
 QFont Theme::font(FontRole role) const
 {
     switch (role) {
-    case DesktopFont:
-    {
+    case DesktopFont: {
         KConfigGroup cg(KGlobal::config(), "General");
         return cg.readEntry("desktopFont", d->generalFont);
-    }
-    break;
+        }
+        break;
+
     case DefaultFont:
     default:
         return d->generalFont;
         break;
+
+    case SmallestFont:
+        return KGlobalSettings::smallestReadableFont();
+        break;
     }
 
     return d->generalFont;

theme.h

@@ -77,7 +77,8 @@ class PLASMA_EXPORT Theme : public QObject
 
         enum FontRole {
             DefaultFont = 0, /**< The standard text font */
-            DesktopFont /**< The standard text font */
+            DesktopFont, /**< The standard text font */
+            SmallestFont /**< The smallest readable font */
         };
 
         /**