From a916d99adaf3af359c2d10d51e235c1e8f27694e Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Sat, 22 Sep 2012 17:37:32 +0200 Subject: [PATCH 1/2] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwinscripts/kwinscripts.desktop | 3 +++ kwin.notifyrc | 2 ++ scripting/kwinscript.desktop | 1 + scripts/videowall/metadata.desktop | 1 + tabbox/qml/clients/big_icons/metadata.desktop | 1 + tabbox/qml/clients/compact/metadata.desktop | 1 + tabbox/qml/clients/informative/metadata.desktop | 1 + tabbox/qml/clients/present_windows/metadata.desktop | 1 + tabbox/qml/clients/small_icons/metadata.desktop | 1 + tabbox/qml/clients/text/metadata.desktop | 1 + 10 files changed, 13 insertions(+) diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index ba3096051b..b34b13035e 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -17,6 +17,7 @@ X-KDE-Keywords[el]=σενάριο kwin X-KDE-Keywords[es]=guion de kwin X-KDE-Keywords[et]=kwini skript X-KDE-Keywords[fi]=kwin-skripti +X-KDE-Keywords[ga]=Script kwin X-KDE-Keywords[hu]=kwin szkript X-KDE-Keywords[ia]=Script de kwin X-KDE-Keywords[it]=Script kwin @@ -51,6 +52,7 @@ Name[el]=Σενάρια KWin Name[es]=Guiones de KWin Name[et]=KWini skriptid Name[fi]=KWin-skriptit +Name[ga]=Scripteanna KWin Name[hu]=KWin szkriptek Name[ia]=Scripts de KWin Name[it]=Script kwin @@ -84,6 +86,7 @@ Comment[el]=Διαχείριση σεναρίων KWin Comment[es]=Gestionar guiones de KWin Comment[et]=KWini skriptide haldamine Comment[fi]=KWin-skriptien hallinta +Comment[ga]=Bainistigh scripteanna KWin Comment[hu]=KWin szkriptek kezelése Comment[ia]=Gere scriptos de KWin Comment[it]=Gestione script kwin diff --git a/kwin.notifyrc b/kwin.notifyrc index 2c5c0ed9fc..ae89033b7b 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -7540,6 +7540,7 @@ Name[el]=Επαναφορά παραθύρου πλήρης οθόνης Name[es]=Ventana a pantalla completa restaurada Name[et]=Aken on täisekraanist taastatud Name[fi]=Ikkunan koko näytön tila palautettu +Name[ga]=Athchóiríodh Fuinneog ón Mód Lánscáileáin Name[hu]=Az ablak teljes képernyőről visszaállítva Name[ia]=Fenestra de schermo plen restabilite Name[it]=Finestra a schermo pieno ripristinata @@ -7572,6 +7573,7 @@ Comment[el]=Ένα παράθυρο επανήλθε από πλήρης οθό Comment[es]=Una ventana se ha restaurado desde pantalla completa Comment[et]=Aken on täisekraanist taastatud Comment[fi]=Ikkuna on palautettu koko näytön tilasta +Comment[ga]=Athchóiríodh fuinneog ón mód lánscáileáin Comment[hu]=Az ablak vissza lett állítva a teljes képernyőről Comment[ia]=Un fenestra ha essite restabilite ab schermo plen Comment[it]=La finestra è stata ripristinata da schermo pieno diff --git a/scripting/kwinscript.desktop b/scripting/kwinscript.desktop index 6ba5719f54..abe62afb1e 100644 --- a/scripting/kwinscript.desktop +++ b/scripting/kwinscript.desktop @@ -11,6 +11,7 @@ Comment[el]=Σενάριο KWin Comment[es]=Guion de KWin Comment[et]=KWini skript Comment[fi]=KWin-skripti +Comment[ga]=Script KWin Comment[hu]=KWin parancsfájl Comment[ia]=Script de kwin Comment[it]=Script kwin diff --git a/scripts/videowall/metadata.desktop b/scripts/videowall/metadata.desktop index 48c2a1ce4c..79790ee8b5 100644 --- a/scripts/videowall/metadata.desktop +++ b/scripts/videowall/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Τοίχος με οθόνες Name[es]=Panel de vídeo Name[et]=Videosein Name[fi]=Videoseinä +Name[ga]=Balla Físe Name[hu]=Videófal Name[ia]=Muro de Video Name[it]=Parete video diff --git a/tabbox/qml/clients/big_icons/metadata.desktop b/tabbox/qml/clients/big_icons/metadata.desktop index 6ca12dc672..f071771664 100644 --- a/tabbox/qml/clients/big_icons/metadata.desktop +++ b/tabbox/qml/clients/big_icons/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Μεγάλα εικονίδια Name[es]=Iconos grandes Name[et]=Suured ikoonid Name[fi]=Suuret kuvakkeet +Name[ga]=Deilbhíní Móra Name[hu]=Nagy ikonok Name[ia]=Icones grande Name[it]=Icone grandi diff --git a/tabbox/qml/clients/compact/metadata.desktop b/tabbox/qml/clients/compact/metadata.desktop index e1ba7f72d2..927f02cdd5 100644 --- a/tabbox/qml/clients/compact/metadata.desktop +++ b/tabbox/qml/clients/compact/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Συμπαγές Name[es]=Compacto Name[et]=Kompaktne Name[fi]=Tiivis +Name[ga]=Dlúth Name[hu]=Kompakt Name[ia]=Compacte Name[it]=Compatto diff --git a/tabbox/qml/clients/informative/metadata.desktop b/tabbox/qml/clients/informative/metadata.desktop index 912f974788..4855145694 100644 --- a/tabbox/qml/clients/informative/metadata.desktop +++ b/tabbox/qml/clients/informative/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Ενημερωτικό Name[es]=Informativo Name[et]=Informatiivne Name[fi]=Informatiivinen +Name[ga]=Faisnéiseach Name[hu]=Informatív Name[ia]=Informative Name[it]=Informativo diff --git a/tabbox/qml/clients/present_windows/metadata.desktop b/tabbox/qml/clients/present_windows/metadata.desktop index 091fea09f5..cbf7577aad 100644 --- a/tabbox/qml/clients/present_windows/metadata.desktop +++ b/tabbox/qml/clients/present_windows/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Κάνναβος Name[es]=Rejilla Name[et]=Võrgustik Name[fi]=Ruudukko +Name[ga]=Greille Name[hu]=Rács Name[ia]=Grillia Name[it]=Griglia diff --git a/tabbox/qml/clients/small_icons/metadata.desktop b/tabbox/qml/clients/small_icons/metadata.desktop index 8ca64aae33..7d87a36d17 100644 --- a/tabbox/qml/clients/small_icons/metadata.desktop +++ b/tabbox/qml/clients/small_icons/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Μικρά εικονίδια Name[es]=Iconos pequeños Name[et]=Väikesed ikoonid Name[fi]=Pienet kuvakkeet +Name[ga]=Deilbhíní Beaga Name[hu]=Kis ikonok Name[ia]=Icones parve Name[it]=Icone piccole diff --git a/tabbox/qml/clients/text/metadata.desktop b/tabbox/qml/clients/text/metadata.desktop index cc05c0ba16..84f7721bff 100644 --- a/tabbox/qml/clients/text/metadata.desktop +++ b/tabbox/qml/clients/text/metadata.desktop @@ -8,6 +8,7 @@ Name[el]=Εικονίδια κειμένου Name[es]=Iconos de texto Name[et]=Tekstiikoonid Name[fi]=Tekstikuvakkeet +Name[ga]=Deilbhíní Téacs Name[hu]=Szövegikonok Name[ia]=Icones de texto Name[it]=Icone testuali From 16ea7617f379c129a4674ae1732085cedbf47924 Mon Sep 17 00:00:00 2001 From: Ni Hui Date: Sun, 23 Sep 2012 13:23:41 +0800 Subject: [PATCH 2/2] fix build without scripting --- effects.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/effects.cpp b/effects.cpp index 608ddd6778..012597cd0b 100644 --- a/effects.cpp +++ b/effects.cpp @@ -30,7 +30,9 @@ along with this program. If not, see . #ifdef KWIN_BUILD_TABBOX #include "tabbox.h" #endif +#ifdef KWIN_BUILD_SCRIPTING #include "scripting/scriptedeffect.h" +#endif #include "thumbnailitem.h" #include "workspace.h" #include "kwinglutils.h" @@ -1282,6 +1284,7 @@ bool EffectsHandlerImpl::loadEffect(const QString& name, bool checkDefault) bool EffectsHandlerImpl::loadScriptedEffect(const QString& name, KService *service) { +#ifdef KWIN_BUILD_SCRIPTING const KDesktopFile df("services", service->entryPath()); const QString scriptName = df.desktopGroup().readEntry("X-Plasma-MainScript", ""); if (scriptName.isEmpty()) { @@ -1301,6 +1304,11 @@ bool EffectsHandlerImpl::loadScriptedEffect(const QString& name, KService *servi effect_order.insert(service->property("X-KDE-Ordering").toInt(), EffectPair(name, effect)); effectsChanged(); return true; +#else + Q_UNUSED(name) + Q_UNUSED(service) + return false; +#endif } void EffectsHandlerImpl::unloadEffect(const QString& name)