From 84954b9e4fa422d636512ff6374e5cc77275e976 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 19 Feb 2015 11:34:15 +0100 Subject: [PATCH 1/9] Update version number for 5.2.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d9c59325d..814911acae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(KWIN) -set(PROJECT_VERSION "5.2.0") +set(PROJECT_VERSION "5.2.1") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From ae3d2092eb38e5b8bca6cd37efed1c6605e41ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Thu, 19 Feb 2015 14:38:09 +0100 Subject: [PATCH 2/9] extract UI messages correctly --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 814911acae..82ce4e62ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,7 +426,7 @@ qt5_add_dbus_interface( kwin_KDEINIT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.freede qt5_add_resources( kwin_KDEINIT_SRCS resources.qrc ) -qt5_wrap_ui(kwin_KDEINIT_SRCS +ki18n_wrap_ui(kwin_KDEINIT_SRCS shortcutdialog.ui ) From 63ff7263a34b144a94f579c2b3b0537b1038df18 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 19 Feb 2015 17:06:15 +0100 Subject: [PATCH 3/9] use ecm_optional_add_subdirectory instead of add_subdirectory for docs, the translations may be incomplete --- doc/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 33cf92ac1e..2768884c20 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,7 +1,7 @@ -add_subdirectory(desktop) -add_subdirectory(kwincompositing) -add_subdirectory(kwindecoration) -add_subdirectory(kwinscreenedges) -add_subdirectory(kwintabbox) -add_subdirectory(windowbehaviour) -add_subdirectory(windowspecific) +ecm_optional_add_subdirectory(desktop) +ecm_optional_add_subdirectory(kwincompositing) +ecm_optional_add_subdirectory(kwindecoration) +ecm_optional_add_subdirectory(kwinscreenedges) +ecm_optional_add_subdirectory(kwintabbox) +ecm_optional_add_subdirectory(windowbehaviour) +ecm_optional_add_subdirectory(windowspecific) From 325a479e6efd2044c9ae18116742486d5e2120a6 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 19 Feb 2015 17:12:18 +0100 Subject: [PATCH 4/9] add include(ECMOptionalAddSubdirectory) --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82ce4e62ee..fa8d1e6d63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ include(KDECMakeSettings) include(KDECompilerSettings) include(ECMInstallIcons) +include(ECMOptionalAddSubdirectory) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) From a59a89d36c294b39ffa60465760e231b911b527d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Feb 2015 11:32:22 +0000 Subject: [PATCH 5/9] SVN_SILENT made messages (.desktop file) --- effects/dashboard/dashboard_config.desktop | 2 +- kcmkwin/kwincompositing/kcmkwineffects.desktop | 3 +++ kcmkwin/kwincompositing/kwincompositing.desktop | 3 +++ kcmkwin/kwindecoration/kwindecoration.desktop | 1 + kcmkwin/kwindesktop/desktop.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 1 + kcmkwin/kwinoptions/kwinadvanced.desktop | 1 + kcmkwin/kwinoptions/kwinfocus.desktop | 1 + kcmkwin/kwinoptions/kwinmoving.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 2 ++ kcmkwin/kwinrules/kwinrules.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 ++ kcmkwin/kwintabbox/kwintabbox.desktop | 1 + scripts/enforcedeco/metadata.desktop | 2 ++ 14 files changed, 21 insertions(+), 1 deletion(-) diff --git a/effects/dashboard/dashboard_config.desktop b/effects/dashboard/dashboard_config.desktop index ef4c5217e7..2508591dcd 100644 --- a/effects/dashboard/dashboard_config.desktop +++ b/effects/dashboard/dashboard_config.desktop @@ -12,7 +12,7 @@ Name[be@latin]=Dashboard Name[bg]=Табло Name[bn]=ড্যাশবোর্ড Name[bn_IN]=Dashboard -Name[bs]=instrument-tabla +Name[bs]=Instrument-tabla Name[ca]=Tauler Name[ca@valencia]=Tauler Name[cs]=Dashboard diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index 3b6abe4f19..59bde97e2f 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=desktopbehavior X-KDE-Weight=50 Name=Desktop Effects +Name[bs]=Efekti površi Name[ca]=Efectes d'escriptori Name[ca@valencia]=Efectes d'escriptori Name[cs]=Efekty na ploše @@ -53,6 +54,7 @@ Name[x-test]=xxDesktop Effectsxx Name[zh_CN]=桌面特效 Name[zh_TW]=桌面效果 Comment=Desktop Effects +Comment[bs]=Efekti površi Comment[ca]=Efectes d'escriptori Comment[cs]=Efekty na ploše Comment[da]=Skrivebordseffekter @@ -87,6 +89,7 @@ Comment[x-test]=xxDesktop Effectsxx Comment[zh_CN]=桌面特效 X-KDE-Keywords=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,animation speed,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,dashboard effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect +X-KDE-Keywords[bs]=kwin, prozor, menadžer, kompozicija, efekat, 3D efekti, 2Defekti, OpenGL, XRender, video postavke, grafički efekti, desktopefekti, animacije, razne animacije, efekti upravljanja prozor, prozorprebacivanje efekat, desktop prebacivanje efekat, animacije, brzinu animacije, desktopanimacije, vozači, postavke upravljačkog programa, rendering, čine obrnuti efekt, gledajućiefekat stakla, lupa efekat, snap pomagač učinak, učinak track miša, zoomefekt, zamućenje efekt, dashboard efekt, efekt eksplozije, fade efekt, fadedesktop efekt, raspasti efekt, klizni efekt, naglašavaju efekat prozora, loginefekt, logout efekt, magija efekat lampa, minimizirati animacija učinak, Mark mišaefekat, skala na snazi, screenshot efekt, list efekt, povucite efekt, kliznapopups efekat, taskbar sličice efekat, thumbnail stranuefekta, providnost, providnost efekt, transparentnost, geometrija prozorefekta, klimave prozore efekat, startup povratne informacije efekat, dijalog roditelja X-KDE-Keywords[ca]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes d'escriptori,animacions,animacions diverses,efectes de gestió de finestra,efecte de canvi de finestra,efecte de canvi d'escriptori,animacions,velocitat d'animació,animacions d'escriptori,controladors,configuració de controladors,renderització,render,efecte d'inversió,efecte d'aparença de vidre,efecte de lupa,efecte ajudant de desplaçament,efecte de seguiment de ratolí,efecte de zoom,efecte de difuminat,efecte de tauler,efecte d'explosió,efecte d'esvaïment,efecte d'esvaïment d'escriptori,efecte de trencament,efecte de lliscament,efecte de ressaltat de finestra,efecte de connexió,efecte de desconnexió,efecte de làmpada màgica,efecte d'animació de minimització,efecte de marca de ratolí,efecte d'apropament,efecte de captura de pantalla,efecte de full,efecte de diapositiva,efecte de missatges emergents lliscants,efecte de miniatures de barra de tasques,efecte de miniatures laterals,translucidesa,efecte de translucidesa,transparència,efecte de geometria de finestra,efecte de finestres sacsejades,efecte de confirmació d'engegada,efecte de diàleg principal,efecte d'enfosquiment d'inactiu,efecte d'enfosquiment de pantalla, efecte de diapositiva prèvia,decoració,efecte per mostrar FPS,efecte de mostra de pintat,efecte de quadre de commutació,efecte de canvi de coberta,efecte de cub d'escriptori,efecte d'animació de cub d'escriptori,efecte de graella d'escriptori,efecte de canvi en roda,efecte de contorn,efecte de presentació de finestres,efecte de redimensió de finestra X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes d'escriptori,animacions,animacions diverses,efectes de gestió de finestra,efecte de canvi de finestra,efecte de canvi d'escriptori,animacions,velocitat d'animació,animacions d'escriptori,controladors,configuració de controladors,renderització,render,efecte d'inversió,efecte d'aparença de vidre,efecte de lupa,efecte ajudant de desplaçament,efecte de seguiment de ratolí,efecte de zoom,efecte de difuminat,efecte de tauler,efecte d'explosió,efecte d'esvaïment,efecte d'esvaïment d'escriptori,efecte de trencament,efecte de lliscament,efecte de ressaltat de finestra,efecte de connexió,efecte de desconnexió,efecte de làmpada màgica,efecte d'animació de minimització,efecte de marca de ratolí,efecte d'apropament,efecte de captura de pantalla,efecte de full,efecte de diapositiva,efecte de missatges emergents lliscants,efecte de miniatures de barra de tasques,efecte de miniatures laterals,translucidesa,efecte de translucidesa,transparència,efecte de geometria de finestra,efecte de finestres sacsejades,efecte de confirmació d'engegada,efecte de diàleg principal,efecte d'enfosquiment d'inactiu,efecte d'enfosquiment de pantalla, efecte de diapositiva prèvia,decoració,efecte per mostrar FPS,efecte de mostra de pintat,efecte de quadre de commutació,efecte de canvi de coberta,efecte de cub d'escriptori,efecte d'animació de cub d'escriptori,efecte de graella d'escriptori,efecte de canvi en roda,efecte de contorn,efecte de presentació de finestres,efecte de redimensió de finestra X-KDE-Keywords[da]=kwin,vindue,vindueshåndtering,compositing,effekter,3D-effekter,2D-effekter,OpenGL,XRender,grafiske effekter,skrivebordseffekter,animationer,diverse animationer,vindueshåndteringseffekter,effekt til skift af vinduer,effekt til skrivebordsskift,animationshastighed,skrivebordsanimationer,drivere,driverindstillinger,rendering,render,invertereffect,kikkerteffekt,forstørrelsesglaseffekt,hægtehjælpereffekt,følg musen-effekt,zoomeffect,sløreffekt,instrumentbræt,eksplosionseffekt,fade-effect,svæve-effect,fremhæv vindue-effekt,login-effekt,log ud-effekt,magisk lampe-effekt,minimer-effekt,musemærke-effekt,skalerind-effekt,skærmbillede-effekt,glide-effekt,glidende pop-op-effekt,opgavelinjeminiaturer-effekt,gennemsigtighed,transparens,ugennemsigtighed,vinduesgeometri-effekt,wobbly,blævrende vinduer,eye candy,øjeguf,vis FPS-effekt,cube,terning,gitter diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index b143600862..6b3f5129de 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=display X-KDE-Weight=60 Name=Compositor +Name[bs]=Compositor Name[ca]=Compositor Name[ca@valencia]=Compositor Name[cs]=Kompozitor @@ -50,6 +51,7 @@ Name[x-test]=xxCompositorxx Name[zh_CN]=混成器 Name[zh_TW]=組合器 Comment=Compositor Settings for Desktop Effects +Comment[bs]=Postavke Compositor-a za Desktop Efekte Comment[ca]=Arranjament del compositor pels efectes d'escriptori Comment[cs]=Nastavení kompozitoru pro efekty pracovní plochy Comment[da]=Compositor-indstillinger til skrivebordseffekter @@ -83,6 +85,7 @@ Comment[x-test]=xxCompositor Settings for Desktop Effectsxx Comment[zh_CN]=桌面特效混成器设置 X-KDE-Keywords=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects +X-KDE-Keywords[bs]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects, efekti, video postavke, kompozicija, desktop efekti, menadžer X-KDE-Keywords[ca]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes d'escriptori X-KDE-Keywords[ca@valencia]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes d'escriptori X-KDE-Keywords[da]=kwin,vindue,håndtering,window,manager,compositing,effekt,3D effekter,2D effekter,OpenGL,XRender,video-indstillinger,grafiske effekter,skrivebordseffekter,desktop effects diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 9168169806..3b401d002b 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -74,6 +74,7 @@ Name[zh_CN]=窗口装饰 Name[zh_TW]=視窗裝飾 Comment=Look and Feel of Window Titles +Comment[bs]=Izgled i osjećaj naslova prozora Comment[ca]=Aspecte i comportament dels títols de les finestres Comment[cs]=Vzhled a dekorace titulků oken Comment[da]=Udseendet af vinduestitler diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index 5a27b7446d..928ad7da5a 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -76,6 +76,7 @@ Name[zh_CN]=虚拟桌面 Name[zh_TW]=虛擬桌面 Comment=Navigation, Number and Layout of Virtual Desktops +Comment[bs]=Navigacija, broj i izgled virtualnih desktopa Comment[ca]=Navegació, nombre i disposició dels escriptoris virtuals Comment[cs]=Navigace, počet a rozvržení virtuálních ploch Comment[da]=Navigation, antal og layout af virtuelle skriveborde diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index b2661205d6..37d5579553 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -101,6 +101,7 @@ Name[zh_CN]=动作 Name[zh_TW]=動作 Comment=Mouse Actions on Windows +Comment[bs]=Akcioje miša na prozorima Comment[ca]=Accions del ratolí en les finestres Comment[cs]=Činnosti myši na oknech Comment[da]=Musehandlinger på vinduer diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 16dd9c8a29..5d01af26d8 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -100,6 +100,7 @@ Name[zh_CN]=高级 Name[zh_TW]=進階 Comment=Advanced Window Management Features +Comment[bs]=Napredne mogućnosti upravljanja prozoeima Comment[ca]=Característiques avançades de la gestió de finestres Comment[cs]=Pokročilé vlastností správy oken Comment[da]=Avancerede vindueshåndteringsegenskaber diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index bd809d7d30..6e1f78798b 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -98,6 +98,7 @@ Name[zh_CN]=焦点 Name[zh_TW]=焦點 Comment=Active Window Policy +Comment[bs]=Pravila aktivnih prozora Comment[ca]=Política de finestra activa Comment[cs]=Chování aktivního okna Comment[da]=Politik for aktivt vindue diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index c019f15127..4480dde421 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -99,6 +99,7 @@ Name[zh_CN]=移动 Name[zh_TW]=移動 Comment=Window Moving +Comment[bs]=Kretanje prozora Comment[ca]=Moviment de les finestres Comment[cs]=Posun oken Comment[da]=Flytning af vinduer diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index bd845a142c..c64102129b 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -102,6 +102,7 @@ Name[zh_CN]=窗口行为 Name[zh_TW]=視窗行為 Comment=Window Actions and Behavior +Comment[bs]=Akcije i ponašanje prozora Comment[ca]=Accions i comportament de les finestres Comment[cs]=Činnosti a chování oken Comment[da]=Vindueshandlinger og -opførsel @@ -135,6 +136,7 @@ Comment[x-test]=xxWindow Actions and Behaviorxx Comment[zh_CN]=窗口行为 X-KDE-Keywords=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick +X-KDE-Keywords[bs]=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick,fokus,pozicioniranje,ponašanje prozora,akcije prozora,animacija,podizanje,okvir,naslovna traka X-KDE-Keywords[ca]=focus,emplaçament,comportament de finestra,accions de la finestra,animació,elevació,elevació automàtica,finestres,marc,barra de títol,clic doble X-KDE-Keywords[da]=fokus,placering,vinduesopførsel,vindueshandlinger,animation,hæv,autohæv,vinduesramme,titelbjælke,dobbeltklik X-KDE-Keywords[de]=Aktivierung,Platzierung,Fensterverhalten,Fensteraktionen,Animation,Nach vorn/hinten, Fenster,Rahmen,Umrandung,Titelleiste,Doppelklick diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index 8a50c028e0..979e08b4cb 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -75,6 +75,7 @@ Name[zh_CN]=窗口规则 Name[zh_TW]=視窗規則 Comment=Individual Window Behavior +Comment[bs]=Ponašanje pojedinog prozora Comment[ca]=Comportament individual de les finestres Comment[cs]=Chování individuálních oken Comment[da]=Opførsel af enkeltvinduer diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index be475c5024..dd15838731 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -82,6 +82,7 @@ Name[zh_CN]=屏幕边缘 Name[zh_TW]=螢幕邊緣 Comment=Active Screen Corners and Edges +Comment[bs]=Ivice i uglovi aktivnog ekrana Comment[ca]=Cantonades i vores de la pantalla activa Comment[cs]=Aktivní rohy a hrany obrazovky Comment[da]=Aktive skærmhjørner og -kanter @@ -114,6 +115,7 @@ Comment[x-test]=xxActive Screen Corners and Edgesxx Comment[zh_CN]=活动屏幕边缘 X-KDE-Keywords=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners +X-KDE-Keywords[bs]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners, prozor, menadćer, efekt, uigao, ivica, akcija, prebacivanje, desktop ivice, ivice ekrana, maksimitiranje prozora, ponašanje ekrana, virtualni desktop X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,cantonada,vora,borde,acció,canvi,escriptori,vores de pantalla del kwin,vores d'escriptori,vores de pantalla,maximitza finestres,mosaic de finestres,costat de pantalla,comportament de pantalla,canvi d'escriptori,escriptori virtual,cantonades de pantalla X-KDE-Keywords[da]=kwin,vindue,håndtering,manager,effekt,hjørne,kant,handling,skift,skrivebord,kwin skærmkanter,skrivebordskanter,skærmkanter,maksimer vinduer,tile windows,fliser,felter,siden af skærmen,skærmens opførsel,skift skrivebord,virtuelle skriveborde,skærmhjørner,hjørner X-KDE-Keywords[de]=KWin,Fenster,Verwaltung,Effekt,Kante,Rand,Aktion,Wechseln,Desktop,Arbeitsfläche,KWin Bildschirmkanten,Desktopkanten,Bildschirmkanten,Fenster maximieren,Fenster kacheln,Bildschirmseite,Bildschirmverhalten,Desktop wechseln,Arbeitsfläche wechseln,Virtueller Desktop,Virtuelle Arbeitsfläche,Bildschirmecken diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index c0cd66cfcc..c77200dbb6 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -72,6 +72,7 @@ Name[x-test]=xxTask Switcherxx Name[zh_CN]=任务切换器 Name[zh_TW]=工作切換器 Comment=Navigation Through Windows +Comment[bs]=Kretanje kroz prozore Comment[ca]=Navegació per les finestres Comment[cs]=Navigace skrz okna Comment[da]=Navigation igennem vinduer diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop index be24a23929..c7ddf17fa6 100644 --- a/scripts/enforcedeco/metadata.desktop +++ b/scripts/enforcedeco/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Enforces Window Decorations on GTK+ window +Name[bs]=Forsira dekoracije prozora u GTK+ prozoru Name[ca]=Força la decoració de les finestres a les finestres GTK+ Name[cs]=Vynutí dekoraci oken na okně GTK+ Name[da]=Gennemtvinger vinduesdekorationer på GTK+-vinduer @@ -32,6 +33,7 @@ Name[uk]=Примусове декорування вікон для прогр Name[x-test]=xxEnforces Window Decorations on GTK+ windowxx Name[zh_CN]=强制对 GTK+ 窗口使用窗口装饰 Comment=Fixes functional deficits for client side decorated windows. +Comment[bs]=Popravlja funkcionalne nedostatke klijentskih dekoracija prozora Comment[ca]=Corregeix els dèficits funcionals amb les finestres decorades a la banda del client. Comment[da]=Løser funktionelle mangler ved vinduer med dekorationer på klientsiden. Comment[de]=Behebt funktionale Defizite von Fenstern, die durch Klient-Programme dekoriert werden. From 777dc698314f1e695557a27aee7ca6fdd1a6e66a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 25 Feb 2015 11:29:12 +0000 Subject: [PATCH 6/9] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwincompositing/kcmkwineffects.desktop | 1 + kcmkwin/kwincompositing/kwincompositing.desktop | 1 + kcmkwin/kwindecoration/kwindecoration.desktop | 1 + kcmkwin/kwindesktop/desktop.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 1 + kcmkwin/kwinoptions/kwinadvanced.desktop | 1 + kcmkwin/kwinoptions/kwinfocus.desktop | 1 + kcmkwin/kwinoptions/kwinmoving.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 2 ++ kcmkwin/kwinrules/kwinrules.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 ++ kcmkwin/kwintabbox/kwintabbox.desktop | 1 + scripts/enforcedeco/metadata.desktop | 2 ++ 13 files changed, 16 insertions(+) diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index 59bde97e2f..c72b45f12c 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -87,6 +87,7 @@ Comment[sv]=Skrivbordseffekter Comment[uk]=Ефекти стільниці Comment[x-test]=xxDesktop Effectsxx Comment[zh_CN]=桌面特效 +Comment[zh_TW]=桌面效果 X-KDE-Keywords=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,animation speed,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,dashboard effect,explosion effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale in effect,screenshot effect,sheet effect,slide effect,sliding popups effect,taskbar thumbnails effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,box switch effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,outline effect,present windows effect,resize window effect X-KDE-Keywords[bs]=kwin, prozor, menadžer, kompozicija, efekat, 3D efekti, 2Defekti, OpenGL, XRender, video postavke, grafički efekti, desktopefekti, animacije, razne animacije, efekti upravljanja prozor, prozorprebacivanje efekat, desktop prebacivanje efekat, animacije, brzinu animacije, desktopanimacije, vozači, postavke upravljačkog programa, rendering, čine obrnuti efekt, gledajućiefekat stakla, lupa efekat, snap pomagač učinak, učinak track miša, zoomefekt, zamućenje efekt, dashboard efekt, efekt eksplozije, fade efekt, fadedesktop efekt, raspasti efekt, klizni efekt, naglašavaju efekat prozora, loginefekt, logout efekt, magija efekat lampa, minimizirati animacija učinak, Mark mišaefekat, skala na snazi, screenshot efekt, list efekt, povucite efekt, kliznapopups efekat, taskbar sličice efekat, thumbnail stranuefekta, providnost, providnost efekt, transparentnost, geometrija prozorefekta, klimave prozore efekat, startup povratne informacije efekat, dijalog roditelja diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 6b3f5129de..8b8a03be97 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -83,6 +83,7 @@ Comment[sv]=Sammansättningsinställningar för skrivbordseffekter Comment[uk]=Параметри засобу композиції для ефектів стільниці Comment[x-test]=xxCompositor Settings for Desktop Effectsxx Comment[zh_CN]=桌面特效混成器设置 +Comment[zh_TW]=桌面效果使用的組合器組態 X-KDE-Keywords=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects X-KDE-Keywords[bs]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects, efekti, video postavke, kompozicija, desktop efekti, menadžer diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 3b401d002b..356c0d249b 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -106,6 +106,7 @@ Comment[sv]=Namnlisternas utseende och känsla Comment[uk]=Вигляд і поведінка смужок заголовків вікон Comment[x-test]=xxLook and Feel of Window Titlesxx Comment[zh_CN]=窗口标题的观感 +Comment[zh_TW]=視窗標題列的外觀與感覺 X-KDE-Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration X-KDE-Keywords[bs]=kwin,prozor,upravitelj,granica,stil,tema,izgled,osjećati,izgled,dugme,držati,ivica,kwm,dekoracija diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index 928ad7da5a..b37d6c091f 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -107,6 +107,7 @@ Comment[sv]=Navigering, antal och layout av virtuella skrivbord Comment[uk]=Навігація, кількість та компонування віртуальних стільниць Comment[x-test]=xxNavigation, Number and Layout of Virtual Desktopsxx Comment[zh_CN]=虚拟桌面的切换，数量和布局 +Comment[zh_TW]=虛擬桌面的導覽、編號與佈局 X-KDE-Keywords=desktop,desktops,number,virtual desktop,multiple desktops,pager,pager widget,pager applet,pager settings X-KDE-Keywords[bs]=pozadina,pozadine,broj,virtuelna pozadina,višestruka pozadina,pejdžer,dodatak pejdžeru,aplet pejdžer,pejdžer postavke X-KDE-Keywords[ca]=escriptori,escriptoris,nombre,escriptori virtual,escriptoris múltiples,paginador,estri paginador,miniaplicació de paginació,arranjament de paginador diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 37d5579553..565528ff36 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -133,6 +133,7 @@ Comment[sv]=Musåtgärder för fönster Comment[uk]=Дії над вікнами за допомогою миші Comment[x-test]=xxMouse Actions on Windowsxx Comment[zh_CN]=窗口的鼠标动作 +Comment[zh_TW]=視窗上的滑鼠動作 X-KDE-Keywords=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize X-KDE-Keywords[bs]=sjena,povećali,povećala,smanjiti,umanjiti,sniziti,izbornik operacija,naslovnica,promjena veličine diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 5d01af26d8..50b15dd1c8 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -132,6 +132,7 @@ Comment[sv]=Avancerade fönsterhanteringsfunktioner Comment[uk]=Додаткові можливості з керування вікнами Comment[x-test]=xxAdvanced Window Management Featuresxx Comment[zh_CN]=高级窗口管理特性 +Comment[zh_TW]=進階視窗管理功能 X-KDE-Keywords=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior X-KDE-Keywords[bs]=sjenčanje, granične, lebdjenje, aktivne granice, popločavanje, Kartice, tabovanje, prozorno tabovanje, grupiranje prozora, pločica, prozorna pločica, plasman przora, plasman prozorâ, napredo ponašanje prozora diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 6e1f78798b..17dca25dbe 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -129,6 +129,7 @@ Comment[sv]=Aktiv fönsterprincip Comment[uk]=Правила для задіяння вікон Comment[x-test]=xxActive Window Policyxx Comment[zh_CN]=活动窗口策略 +Comment[zh_TW]=作用中視窗政策 X-KDE-Keywords=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,focus follows mouse,focus prevention,focus stealing,focus policy,window focus behavior,window screen behavior X-KDE-Keywords[bs]=fokus, smještaj, automatski rast, rast, kliknite na rast, tastatura, CDE, Alt-Tab, cijeli desktop, fokus slijedi miša, fokus prevenciju, usredotoči krade, fokus politike, fokus prozora ponašanje, prozor zaslon ponašanje diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index 4480dde421..c42afc0ec4 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -131,6 +131,7 @@ Comment[sv]=Fönsterförflyttning Comment[uk]=Пересування вікон Comment[x-test]=xxWindow Movingxx Comment[zh_CN]=窗口移动 +Comment[zh_TW]=視窗移動 X-KDE-Keywords=moving,smart,cascade,maximize,maximise,snap zone,snap,border X-KDE-Keywords[bs]=pomjeranje,pametno,kaskada,povećali,povećalo,namjestiti zonu,namjestiti,granica diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index c64102129b..5c889958ee 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -134,6 +134,7 @@ Comment[sv]=Fönsteråtgärder och beteende Comment[uk]=Реакція і поведінка вікон Comment[x-test]=xxWindow Actions and Behaviorxx Comment[zh_CN]=窗口行为 +Comment[zh_TW]=視窗動作與行為 X-KDE-Keywords=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick X-KDE-Keywords[bs]=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick,fokus,pozicioniranje,ponašanje prozora,akcije prozora,animacija,podizanje,okvir,naslovna traka @@ -166,6 +167,7 @@ X-KDE-Keywords[sv]=fokus,placering,fönsterbeteende,animering,höj,höj automati X-KDE-Keywords[uk]=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick,фокус,розташування,місце,вікно,поведінка,поведінка вікон,дії,реакція,дії з вікнами,реакція вікон,анімація,підняти,підняття,автоматична,автоматично,рамка,заголовок,смужка заголовка,клацання,подвійне X-KDE-Keywords[x-test]=xxfocusxx,xxplacementxx,xxwindow behaviorxx,xxwindow actionsxx,xxanimationxx,xxraisexx,xxauto raisexx,xxwindowsxx,xxframexx,xxtitlebarxx,xxdoubleclickxx X-KDE-Keywords[zh_CN]=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick,焦点,位置,窗口行为,窗口动作,动画,升起,自动升起,窗口,边框,标题栏,双击 +X-KDE-Keywords[zh_TW]=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick Categories=Qt;KDE;X-KDE-settings-looknfeel; diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index 979e08b4cb..ca3d2827e8 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -107,6 +107,7 @@ Comment[sv]=Individuellt fönsterbeteende Comment[uk]=Поведінка окремих вікон Comment[x-test]=xxIndividual Window Behaviorxx Comment[zh_CN]=个别窗口行为 +Comment[zh_TW]=個別視窗行為 X-KDE-Keywords=size,position,state,window behavior,windows,specific,workarounds,remember,rules X-KDE-Keywords[bs]=veličina,pozicija,grad,reagiranje prozora,prozori,specifičan,workarounds,sjećati se,pravila diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index dd15838731..d4c0e0a0dd 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -113,6 +113,7 @@ Comment[sv]=Aktiva skärmhörn och kanter Comment[uk]=Активні кути та краї екрана Comment[x-test]=xxActive Screen Corners and Edgesxx Comment[zh_CN]=活动屏幕边缘 +Comment[zh_TW]=作用中螢幕的角落與邊緣 X-KDE-Keywords=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners X-KDE-Keywords[bs]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners, prozor, menadćer, efekt, uigao, ivica, akcija, prebacivanje, desktop ivice, ivice ekrana, maksimitiranje prozora, ponašanje ekrana, virtualni desktop @@ -145,3 +146,4 @@ X-KDE-Keywords[sv]=kwin,fönster,hanterare,effekt,kant,gräns,åtgärd,byta,skri X-KDE-Keywords[uk]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,вікно,керування,край,кут,межа,сторона,бік,дія,перемикання,стільниця,краї екрана,максимізація,мозаїка,плитка,край екрана,поведінка екрана,перемикання стільниць,віртуальна стільниця X-KDE-Keywords[x-test]=xxkwinxx,xxwindowxx,xxmanagerxx,xxeffectxx,xxcornerxx,xxedgexx,xxborderxx,xxactionxx,xxswitchxx,xxdesktopxx,xxkwin screen edgesxx,xxdesktop edgesxx,xxscreen edgesxx,xxmaximize windowsxx,xxtile windowsxx,xxside of screenxx,xxscreen behaviorxx,xxswitch desktopxx,xxvirtual desktopxx,xxscreen cornersxx X-KDE-Keywords[zh_CN]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners,窗口,管理,特效,角,边缘,动作,切换,桌面,kwin 屏幕边缘,屏幕边缘,桌面边缘,最大化窗口,平铺窗口,屏幕行为,桌面切换,虚拟桌面,屏幕角落 +X-KDE-Keywords[zh_TW]=kwin,window,manager,effect,corner,edge,border,action,switch,desktop,kwin screen edges,desktop edges,screen edges,maximize windows,tile windows,side of screen,screen behavior,switch desktop,virtual desktop,screen corners diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index c77200dbb6..2824ed601c 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -103,6 +103,7 @@ Comment[sv]=Navigering via fönster Comment[uk]=Навігація ввікнами Comment[x-test]=xxNavigation Through Windowsxx Comment[zh_CN]=遍历窗口 +Comment[zh_TW]=透過視窗導覽 X-KDE-Keywords=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[bs]=prozor,prozori,razmijenjivati,razimjenjivati prozor,gašenje prozora,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[ca]=finestra,finestres,commutador,commutador de finestres,commutació,commutació de finestres,alttab,alt-tab,alt+tab,alt tab diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop index c7ddf17fa6..bc837fccfa 100644 --- a/scripts/enforcedeco/metadata.desktop +++ b/scripts/enforcedeco/metadata.desktop @@ -32,6 +32,7 @@ Name[sv]=Tvingar fönsterdekorationer på GTK+ fönster Name[uk]=Примусове декорування вікон для програм на основі GTK+ Name[x-test]=xxEnforces Window Decorations on GTK+ windowxx Name[zh_CN]=强制对 GTK+ 窗口使用窗口装饰 +Name[zh_TW]=GTK+ 視窗的視窗裝飾 Comment=Fixes functional deficits for client side decorated windows. Comment[bs]=Popravlja funkcionalne nedostatke klijentskih dekoracija prozora Comment[ca]=Corregeix els dèficits funcionals amb les finestres decorades a la banda del client. @@ -62,6 +63,7 @@ Comment[sv]=Fixar funktionella svagheter för fönster dekorerade på klientsida Comment[uk]=Виправляє недостатність функціональних можливостей для декорованих вікон на боці клієнта. Comment[x-test]=xxFixes functional deficits for client side decorated windows.xx Comment[zh_CN]=修复客户端窗口装饰的功能缺失。 +Comment[zh_TW]=修補客戶端視窗裝飾不足的功能。 Icon=preferences-system-windows-script-enforcedeco X-Plasma-API=javascript From 25fc115a9c3210fb430925786542f40dc7be6f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Thu, 5 Mar 2015 00:44:47 +0100 Subject: [PATCH 7/9] Fix loading of effect config plugins X-KDE-ParentComponents is a list, so we have to check if this list contains the plugin, not do a string comparison. It seems the queryparser has become a bit stricter in this case. This query should be fixed anyway, however, and it fixes a fairly important bug in the effect system. REVIEW:122821 --- kcmkwin/kwincompositing/effectconfig.cpp | 2 +- kcmkwin/kwindesktop/main.cpp | 2 +- kcmkwin/kwintabbox/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kcmkwin/kwincompositing/effectconfig.cpp b/kcmkwin/kwincompositing/effectconfig.cpp index 5ea433596e..ee4eb03f66 100644 --- a/kcmkwin/kwincompositing/effectconfig.cpp +++ b/kcmkwin/kwincompositing/effectconfig.cpp @@ -65,7 +65,7 @@ void EffectConfig::openConfig(const QString &serviceName, bool scripted, const Q } } else { kcm = KPluginTrader::createInstanceFromQuery(s_pluginDir, QString(), - QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(serviceName), + QStringLiteral("'%1' in [X-KDE-ParentComponents]").arg(serviceName), &dialog); } if (!kcm) { diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp index c736924660..87c8606d78 100644 --- a/kcmkwin/kwindesktop/main.cpp +++ b/kcmkwin/kwindesktop/main.cpp @@ -619,7 +619,7 @@ void KWinDesktopConfig::slotConfigureEffectClicked() QPointer configDialog = new QDialog(this); KCModule *kcm = KPluginTrader::createInstanceFromQuery(QStringLiteral("kwin/effects/configs/"), QString(), - QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(effect), + QStringLiteral("'%1' in [X-KDE-ParentComponents]").arg(effect), configDialog); if (!kcm) { delete configDialog; diff --git a/kcmkwin/kwintabbox/main.cpp b/kcmkwin/kwintabbox/main.cpp index 632f4643df..a97bdfa596 100644 --- a/kcmkwin/kwintabbox/main.cpp +++ b/kcmkwin/kwintabbox/main.cpp @@ -539,7 +539,7 @@ void KWinTabBoxConfig::configureEffectClicked() const QString name = BuiltInEffects::nameForEffect(effect == CoverSwitch ? BuiltInEffect::CoverSwitch : BuiltInEffect::FlipSwitch); KCModule *kcm = KPluginTrader::createInstanceFromQuery(QStringLiteral("kwin/effects/configs/"), QString(), - QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(name), + QStringLiteral("'%1' in [X-KDE-ParentComponents]").arg(name), configDialog); if (!kcm) { delete configDialog; From 99f49fa53b30af7239d0477769e82107dce8f6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Mon, 2 Mar 2015 16:00:10 +0100 Subject: [PATCH 8/9] do not delete and recreate close button loading the QML/view is not very efficient BUG: 344676 --- effects/presentwindows/presentwindows.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index 07660c2af9..704e1f897e 100755 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -132,6 +132,10 @@ void PresentWindowsEffect::reconfigure(ReconfigureFlags) m_showCaptions = PresentWindowsConfig::drawWindowCaptions(); m_showIcons = PresentWindowsConfig::drawWindowIcons(); m_doNotCloseWindows = !PresentWindowsConfig::allowClosingWindows(); + if (m_doNotCloseWindows) { + delete m_closeView; + m_closeView = nullptr; + } m_ignoreMinimized = PresentWindowsConfig::ignoreMinimized(); m_accuracy = PresentWindowsConfig::accuracy() * 20; m_fillGaps = PresentWindowsConfig::fillGaps(); @@ -1421,7 +1425,7 @@ void PresentWindowsEffect::setActive(bool active) m_highlightedWindow = NULL; m_windowFilter.clear(); - if (!m_doNotCloseWindows) { + if (!(m_doNotCloseWindows || m_closeView)) { m_closeView = new CloseWindowView(); connect(m_closeView, &CloseWindowView::requestClose, this, &PresentWindowsEffect::closeWindow); } @@ -1505,8 +1509,8 @@ void PresentWindowsEffect::setActive(bool active) winData->visible = (w->isOnDesktop(desktop) || w->isOnAllDesktops()) && !w->isMinimized() && (w->isCurrentTab() || winData->visible); } - delete m_closeView; - m_closeView = 0; + if (m_closeView) + m_closeView->hide(); // Move all windows back to their original position foreach (EffectWindow * w, m_motionManager.managedWindows()) From bd28862154960851813c4e099aa246331c2b9450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Mon, 16 Feb 2015 23:38:56 +0100 Subject: [PATCH 9/9] calc undecorated offset *before* removing deco point of the calculation is to know how much the window must be moved to de-compensate for the deco but calculateGravitation() w/o a deco (thus now w/o borderTop() etc.) is NOOP. BUG: 344234 --- client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.cpp b/client.cpp index 12fbd5083c..ef31481d5e 100644 --- a/client.cpp +++ b/client.cpp @@ -542,9 +542,9 @@ void Client::destroyDecoration() { QRect oldgeom = geometry(); if (m_decoration) { + QPoint grav = calculateGravitation(true); delete m_decoration; m_decoration = nullptr; - QPoint grav = calculateGravitation(true); plainResize(sizeForClientSize(clientSize()), ForceGeometrySet); move(grav); if (compositing())