From 63a0f15c9ef8d237610836e712968937c0f0e7a5 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 23 Apr 2015 11:17:03 +0200 Subject: [PATCH 01/23] Update version number for 5.3.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a61f1a1d8..263eccca45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(KWIN) -set(PROJECT_VERSION "5.2.95") +set(PROJECT_VERSION "5.3.0") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From e8a070ac30513af88b449482bc7d72f579ccf8aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Apr 2015 11:53:06 +0000 Subject: [PATCH 02/23] SVN_SILENT made messages (.desktop file) --- effects/eyeonscreen/package/metadata.desktop | 12 ++++++++++++ effects/windowaperture/package/metadata.desktop | 12 ++++++++++++ scripts/minimizeall/metadata.desktop | 10 ++++++++++ 3 files changed, 34 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 9b45e6843f..864a62c92a 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -4,12 +4,18 @@ Name[ca]=Ull a la pantalla Name[es]=Ojo a la pantalla Name[fi]=eye On Screen Name[gl]=Ollo na pantalla +Name[it]=eye On Screen Name[nl]=eye On Screen Name[pt]=Olho no Ecrã Name[pt_BR]=Olho na tela Name[ro]=ochi pe ecran +Name[ru]=Втягивание окон в центр экрана Name[sk]=oko na obrazovke Name[sl]=Oko na zaslonu +Name[sr]=Око на екрану +Name[sr@ijekavian]=Око на екрану +Name[sr@ijekavianlatin]=Oko na ekranu +Name[sr@latin]=Oko na ekranu Name[sv]=Ögat på skärmen Name[uk]=Око на екрані Name[x-test]=xxeye On Screenxx @@ -20,11 +26,17 @@ Comment[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo. Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muistuttaa sinua jostain. Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo. +Comment[it]=Risucchia le finestre nel desktop per mostrare l'ultima. Potrebbe ricordarti qualcosa. Comment[nl]=Laat vensters wegzinken in het bureaublad om deze te tonen. Dit kan u aan iets herinneren. Comment[pt]=Suga as janelas para o ecrã mostrar a última. Isto podê-lo-á recordar de algo. Comment[pt_BR]=Suga as janelas na área de trabalho para mostrar a última. Isso pode lembrá-lo de algo. +Comment[ru]=Для просмотра рабочего стола окна временно втягиваются в центр экрана Comment[sk]=Prisaje okná na plochu na zobrazenie druhého. Comment[sl]=Posrka okna v namizje, da je to prikazano. To vas bo morda na nekaj spomnilo. +Comment[sr]=Усисава прозоре у површ да би је приказао. Можда вас подсети на нешто. +Comment[sr@ijekavian]=Усисава прозоре у површ да би је приказао. Можда вас подсети на нешто. +Comment[sr@ijekavianlatin]=Usisava prozore u površ da bi je prikazao. Možda vas podseti na nešto. +Comment[sr@latin]=Usisava prozore u površ da bi je prikazao. Možda vas podseti na nešto. Comment[sv]=Sug in fönster i skrivbordet för att visa det senare. Det kanske påminner dig om någonting. Comment[uk]=Втягнути вікна до стільниці, щоб показати останню. Так вам простіше буде щось згадати. Comment[x-test]=xxSuck windows into desktop to show the latter. This might remind you of something.xx diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 967f877f37..24e0ccf8ad 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -5,12 +5,18 @@ Name[cs]=Mřížka oken Name[es]=Apertura de ventanas Name[fi]=Ikkunoiden siirto näytön kulmiin Name[gl]=Apertura das xanelas +Name[it]=Apertura delle finestre Name[nl]=Vensteropening Name[pt]=Aperto das Janelas Name[pt_BR]=Aperto das janelas Name[ro]=Diafragmă fereastră +Name[ru]=Разбрасывание окон в стороны Name[sk]=Otvor okien Name[sl]=Zaslonka okna +Name[sr]=Бленда прозора +Name[sr@ijekavian]=Бленда прозора +Name[sr@ijekavianlatin]=Blenda prozora +Name[sr@latin]=Blenda prozora Name[sv]=Fönsteröppning Name[uk]=Апертура вікна Name[x-test]=xxWindow Aperturexx @@ -21,11 +27,17 @@ Comment[ca]=Mou la finestra cap a les cantonades en mostrar l'escriptori Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. +Comment[it]=Sposta la finestra negli angoli quando mostri il desktop Comment[nl]=Schuif venster in de hoeken tijdens het tonen van het bureaublad Comment[pt]=Mover a janela para os cantos, enquanto mostra o ecrã Comment[pt_BR]=Move a janela para os cantos, enquanto mostra a área de trabalho +Comment[ru]=Для просмотра рабочего стола окна временно разлетаются в разные стороны Comment[sk]=Posun okna do rohov počas zobrazenia plochy Comment[sl]=Premakne okno v kote med prikazovanjem namizja +Comment[sr]=Помера прозор у углове при показивању површи +Comment[sr@ijekavian]=Помера прозор у углове при показивању површи +Comment[sr@ijekavianlatin]=Pomera prozor u uglove pri pokazivanju površi +Comment[sr@latin]=Pomera prozor u uglove pri pokazivanju površi Comment[sv]=Flytta fönster till hörnen medan skrivbordet visas Comment[uk]=Пересувати вікна в куток на час перегляду стільниці Comment[x-test]=xxMove window into the corners while showing desktopxx diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index dbef5d88a9..47c737f790 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -5,12 +5,17 @@ Name[cs]=MinimalizovatVše Name[es]=Maximizar todo Name[fi]=Pienennä kaikki Name[gl]=Minimizalo todo +Name[it]=Minimizza tutto Name[nl]=Alles-minimaliseren Name[pt]=Maximização Total Name[pt_BR]=Minimizar tudo Name[ru]=Сворачивание всех окон Name[sk]=Minimalizovať všetko Name[sl]=Skrči vse +Name[sr]=Минимизовање свега +Name[sr@ijekavian]=Минимизовање свега +Name[sr@ijekavianlatin]=Minimizovanje svega +Name[sr@latin]=Minimizovanje svega Name[sv]=Minimera alla Name[uk]=Мінімізувати усі Name[x-test]=xxMinimizeAllxx @@ -19,12 +24,17 @@ Comment=Adds a shortcut to minimize all windows or unminimize all such way minim Comment[ca]=Afegeix una drecera per a minimitzar totes les finestres o desminimitzar-les si estan minimitzades Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palauttaa kaikki samalla tavalla pienennetyt ikkunat +Comment[it]=Aggiunge una scorciatoia per minimizzare tutte le finestre o ripristinare le finestre così minimizzate Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren of maakt de minimalisatie van dezen ongedaan Comment[pt]=Adiciona um atalho para minimizar todas as janelas ou retirá-las desse estado Comment[pt_BR]=Adiciona um atalho para minimizar todas as janelas ou retirá-las desse estado Comment[ru]=Добавляет глобальную комбинацию клавиш для сворачивания и восстановления из свёрнутого всех окон Comment[sk]=Pridá skratku na minimalizáciu všetkých okien alebo obnoví všetky takto minimalizované okná Comment[sl]=Doda bližnjico za skrčenje vseh oken ali pa povečanje tako skrčenih oken +Comment[sr]=Додаје пречицу за минимизовање свих прозора или обнављање овако минимизованих прозора +Comment[sr@ijekavian]=Додаје пречицу за минимизовање свих прозора или обнављање овако минимизованих прозора +Comment[sr@ijekavianlatin]=Dodaje prečicu za minimizovanje svih prozora ili obnavljanje ovako minimizovanih prozora +Comment[sr@latin]=Dodaje prečicu za minimizovanje svih prozora ili obnavljanje ovako minimizovanih prozora Comment[sv]=Lägger till en genväg för att minimera alla fönster eller återställa alla fönster som minimerats på detta sätt Comment[uk]=Додає кнопку для мінімізації усіх вікон або скасування такої мінімізації для усіх вікон Comment[x-test]=xxAdds a shortcut to minimize all windows or unminimize all such way minimized windowsxx From 5aeedeb8e963a8f4b8b7e22463b524d0218f8362 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Apr 2015 11:33:58 +0000 Subject: [PATCH 03/23] SVN_SILENT made messages (.desktop file) --- clients/aurorae/themes/plastik/package/metadata.desktop | 1 + effects/maximize/package/metadata.desktop | 1 + kcmkwin/kwindesktop/desktop.desktop | 1 + scripts/desktopchangeosd/metadata.desktop | 1 + scripts/enforcedeco/metadata.desktop | 1 + scripts/synchronizeskipswitcher/metadata.desktop | 1 + scripts/videowall/metadata.desktop | 1 + 7 files changed, 7 insertions(+) diff --git a/clients/aurorae/themes/plastik/package/metadata.desktop b/clients/aurorae/themes/plastik/package/metadata.desktop index 5b0fe35b47..00e6705124 100644 --- a/clients/aurorae/themes/plastik/package/metadata.desktop +++ b/clients/aurorae/themes/plastik/package/metadata.desktop @@ -114,6 +114,7 @@ Comment[mr]=केडीई 3 मधील क्लासिक शैली Comment[nb]=Det klassiske temaet kjent fra KDE 3 Comment[nds]=Dat klass'sche Muster ut KDE 3 Comment[nl]=Het klassieke thema bekend van KDE 3 +Comment[nn]=Klassisk KDE 3-tema Comment[pl]=Klasyczny wystój znany z KDE 3 Comment[pt]=O tema clássico conhecido do KDE 3 Comment[pt_BR]=Tema clássico do KDE 3 diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index 101a27b905..b379fa4b69 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -25,6 +25,7 @@ Comment[mr]=चौकट मोठी/पुन्हस्थापित क Comment[nb]=Animering for et vindu som maksimeres/tilbakestilles fra maksimering Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstellt warrt Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren +Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting. Comment[pl]=Animacja dla okna mającego zostać zmaksymalizowanym/przywróconym z maksymalizacji Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index d02930a29d..23a9d68b15 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -94,6 +94,7 @@ Comment[lt]=Naršymas, Skaičius ir išdėstymas virtualių darbastalių Comment[nb]=Navigering, antall og utlegg av virtuelle skrivebord Comment[nds]=Tall, Anornen un dat Anstüern vun de virtuellen Schriefdischen fastleggen Comment[nl]=Navigatie door, aantal en indeling van virtuele bureaubladen +Comment[nn]=Navigasjon, nummer og vising av virtuelle skrivebord Comment[pl]=Poruszanie się, liczba i układ wirtualnych pulpitów Comment[pt]=Navegação, Número e Disposição dos Ecrãs Virtuais Comment[pt_BR]=Navegação, quantidade e leiaute das áreas de trabalho virtuais diff --git a/scripts/desktopchangeosd/metadata.desktop b/scripts/desktopchangeosd/metadata.desktop index 13b0161173..d28084e5f7 100644 --- a/scripts/desktopchangeosd/metadata.desktop +++ b/scripts/desktopchangeosd/metadata.desktop @@ -72,6 +72,7 @@ Comment[mr]=डेस्कटॉप बदल संकेत देणार Comment[nb]=En tekst på skjermen som viser skrivebordsbytte Comment[nds]=En Op-Schirm-Dorstellen för't Wesseln vun den Schriefdisch Comment[nl]=Een on screen display (OSD) die de wijziging van het bureaublad aangeeft +Comment[nn]=Bruk skjermmelding ved skrivebordbyte Comment[pa]=ਡੈਸਕਟਾਪ ਬਦਲਣ ਨੂੰ ਸਕਰੀਨ ਉੱਤੇ ਦਰਸਾਉਣ ਵਾਲਾ Comment[pl]=Wyświetlacz na ekranie wskazujący zmianę pulpitu Comment[pt]=Uma apresentação que indica a mudança do ecrã diff --git a/scripts/enforcedeco/metadata.desktop b/scripts/enforcedeco/metadata.desktop index 2ccacd2d88..c9cba09c5e 100644 --- a/scripts/enforcedeco/metadata.desktop +++ b/scripts/enforcedeco/metadata.desktop @@ -54,6 +54,7 @@ Comment[ko]=클라이언트에서 장식되는 창의 기능 오류를 수정합 Comment[nb]=Retter opp manglende funksjonalitet for vinduer som er dekorert fra klientsiden. Comment[nds]=Richt dat, wenn vun den Client dekoreert Finstern wiss Könen nich hebbt Comment[nl]=Repareert functionele onvolkomenheden voor gedecoreerde vensters aan de zijde van de client. +Comment[nn]=Reparerer vindaugsdekorasjonsmanglar hjå klient. Comment[pl]=Naprawia niedobory funkcjonalne dla okien wystrojonych po stronie klienta. Comment[pt]=Fixa as deficiências funcionais para as janelas decoradas pelo cliente. Comment[pt_BR]=Fixa as deficiências funcionais para as janelas decoradas pelo cliente. diff --git a/scripts/synchronizeskipswitcher/metadata.desktop b/scripts/synchronizeskipswitcher/metadata.desktop index 456aecbeac..4d76582c87 100644 --- a/scripts/synchronizeskipswitcher/metadata.desktop +++ b/scripts/synchronizeskipswitcher/metadata.desktop @@ -68,6 +68,7 @@ Comment[mr]=स्किप कार्यपट्टीत निवडले Comment[nb]=Skjuler alle vinduer merket med Hopp over Oppgavelinja så de heller ikke blir tatt med i vindusbyttere (f.eks. Alt+TAB) Comment[nds]=Finstern mit de Instellen, se dukt nich op den Programmbalken op, warrt bi't Finsterwesseln versteken (a.B. bi Alt+Tab) Comment[nl]=Verbergt alle vensters gemarkeerd als Taakbalkoverslaan om ook te worden uitgesloten van vensterschakelaars (bijv. Alt+Tab) +Comment[nn]=Alle vindauge som ikkje høyrer til «oppgåvehandsamaren» vil bli utelatne frå «vindaugebytaren» (eksempelvis «Alt + Tab») Comment[pl]=Ukrywa wszystkie okna oznaczone jako "pomiń pasek zadań", tak aby były one wykluczone także z układów przełączania okien (np. Alt+Tab) Comment[pt]=Esconde todas as janelas marcadas como 'Ignorar a Barra de Tarefas' para também serem excluídas dos selectores de janelas (p.ex., Alt+Tab) Comment[pt_BR]=Oculta todas as janelas marcadas como 'Ignorar a barra de tarefas' para também serem excluídas dos seletores de janelas (p.ex., Alt+Tab) diff --git a/scripts/videowall/metadata.desktop b/scripts/videowall/metadata.desktop index efe7861de4..7c2f42d21d 100644 --- a/scripts/videowall/metadata.desktop +++ b/scripts/videowall/metadata.desktop @@ -72,6 +72,7 @@ Comment[mr]=सर्व जोडलेल्या स्क्रीन्स Comment[nb]=Sprer fullskjerms videospiller over alle tilkoblede skjermer for å lage en Videovegg Comment[nds]=Wiest Videos in Heelschirmbedrief över all tokoppelt Schirmen, so dat en Videowand dor bi rutkummt Comment[nl]=Verdeelt de videospeler in modus volledig scherm over alle aangesloten schermen om een Videomuur te creëren +Comment[nn]=«Videovegg»: filmframsyning i fullskjermsmodus vil dekka alle tilgjengelege skjermar. Comment[pl]=Rozciąga pełnoekranowy odtwarzacz filmów na wszystkie podłączone ekrany, tworząc ścianę wideo Comment[pt]=Espalha o leitor de vídeo em todos os ecrãs ligados para criar um painel de vídeo Comment[pt_BR]=Espalha o reprodutor de vídeo em tela cheia sobre todas as telas ligadas para criar um painel de vídeo From 3b93e2e8261b33ea553e23c6d38231d98e652b7e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 25 Apr 2015 11:59:16 +0000 Subject: [PATCH 04/23] SVN_SILENT made messages (.desktop file) --- effects/eyeonscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 2 ++ scripts/minimizeall/metadata.desktop | 2 ++ 3 files changed, 6 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 864a62c92a..491777a229 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -6,6 +6,7 @@ Name[fi]=eye On Screen Name[gl]=Ollo na pantalla Name[it]=eye On Screen Name[nl]=eye On Screen +Name[pl]=Oko na ekranie Name[pt]=Olho no Ecrã Name[pt_BR]=Olho na tela Name[ro]=ochi pe ecran @@ -28,6 +29,7 @@ Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muis Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo. Comment[it]=Risucchia le finestre nel desktop per mostrare l'ultima. Potrebbe ricordarti qualcosa. Comment[nl]=Laat vensters wegzinken in het bureaublad om deze te tonen. Dit kan u aan iets herinneren. +Comment[pl]=Zasysa okna na pulpicie, aby go pokazać. Powinno nasuwać pewne skojarzenia. Comment[pt]=Suga as janelas para o ecrã mostrar a última. Isto podê-lo-á recordar de algo. Comment[pt_BR]=Suga as janelas na área de trabalho para mostrar a última. Isso pode lembrá-lo de algo. Comment[ru]=Для просмотра рабочего стола окна временно втягиваются в центр экрана diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 24e0ccf8ad..b8ff9d6a29 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -7,6 +7,7 @@ Name[fi]=Ikkunoiden siirto näytön kulmiin Name[gl]=Apertura das xanelas Name[it]=Apertura delle finestre Name[nl]=Vensteropening +Name[pl]=Przesłona okna Name[pt]=Aperto das Janelas Name[pt_BR]=Aperto das janelas Name[ro]=Diafragmă fereastră @@ -29,6 +30,7 @@ Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. Comment[it]=Sposta la finestra negli angoli quando mostri il desktop Comment[nl]=Schuif venster in de hoeken tijdens het tonen van het bureaublad +Comment[pl]=Rozsuwa okna w narożniki, podczas pokazywania pulpitu Comment[pt]=Mover a janela para os cantos, enquanto mostra o ecrã Comment[pt_BR]=Move a janela para os cantos, enquanto mostra a área de trabalho Comment[ru]=Для просмотра рабочего стола окна временно разлетаются в разные стороны diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 47c737f790..545bb5e87b 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -7,6 +7,7 @@ Name[fi]=Pienennä kaikki Name[gl]=Minimizalo todo Name[it]=Minimizza tutto Name[nl]=Alles-minimaliseren +Name[pl]=MinimalizujWszystko Name[pt]=Maximização Total Name[pt_BR]=Minimizar tudo Name[ru]=Сворачивание всех окон @@ -26,6 +27,7 @@ Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaura Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palauttaa kaikki samalla tavalla pienennetyt ikkunat Comment[it]=Aggiunge una scorciatoia per minimizzare tutte le finestre o ripristinare le finestre così minimizzate Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren of maakt de minimalisatie van dezen ongedaan +Comment[pl]=Dodaje skrót do zminimalizowania wszystkich okien lub działania odwrotnego dla wszystkich w ten sposób zminimalizowanych okien Comment[pt]=Adiciona um atalho para minimizar todas as janelas ou retirá-las desse estado Comment[pt_BR]=Adiciona um atalho para minimizar todas as janelas ou retirá-las desse estado Comment[ru]=Добавляет глобальную комбинацию клавиш для сворачивания и восстановления из свёрнутого всех окон From 88a15d10ae84f1800e3f26fe44ee5b3aeb795e6d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Apr 2015 12:17:37 +0000 Subject: [PATCH 05/23] SVN_SILENT made messages (.desktop file) --- effects/eyeonscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 2 ++ scripts/minimizeall/metadata.desktop | 2 ++ 3 files changed, 6 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 491777a229..9b686828e4 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=eye On Screen Name[ca]=Ull a la pantalla +Name[en_GB]=eye On Screen Name[es]=Ojo a la pantalla Name[fi]=eye On Screen Name[gl]=Ollo na pantalla @@ -24,6 +25,7 @@ Name[zh_CN]=注视屏幕 Icon=preferences-system-windows-effect-eyeonscreen Comment=Suck windows into desktop to show the latter. This might remind you of something. Comment[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom. +Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something. Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo. Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muistuttaa sinua jostain. Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo. diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index b8ff9d6a29..2027bc58ba 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -2,6 +2,7 @@ Name=Window Aperture Name[ca]=Obertura de finestra Name[cs]=Mřížka oken +Name[en_GB]=Window Aperture Name[es]=Apertura de ventanas Name[fi]=Ikkunoiden siirto näytön kulmiin Name[gl]=Apertura das xanelas @@ -25,6 +26,7 @@ Name[zh_CN]=窗口光圈 Icon=preferences-system-windows-effect-windowaperture Comment=Move window into the corners while showing desktop Comment[ca]=Mou la finestra cap a les cantonades en mostrar l'escriptori +Comment[en_GB]=Move window into the corners while showing desktop Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 545bb5e87b..bbfa7e3734 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -2,6 +2,7 @@ Name=MinimizeAll Name[ca]=MinimitzaTot Name[cs]=MinimalizovatVše +Name[en_GB]=MinimiseAll Name[es]=Maximizar todo Name[fi]=Pienennä kaikki Name[gl]=Minimizalo todo @@ -23,6 +24,7 @@ Name[x-test]=xxMinimizeAllxx Name[zh_CN]=最小化所有 Comment=Adds a shortcut to minimize all windows or unminimize all such way minimized windows Comment[ca]=Afegeix una drecera per a minimitzar totes les finestres o desminimitzar-les si estan minimitzades +Comment[en_GB]=Adds a shortcut to minimise all windows or unminimise all such way minimised windows Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palauttaa kaikki samalla tavalla pienennetyt ikkunat Comment[it]=Aggiunge una scorciatoia per minimizzare tutte le finestre o ripristinare le finestre così minimizzate From dd86680b7270ffb7a2c92dcc69aa3e36ea900242 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 28 Apr 2015 15:34:57 +0000 Subject: [PATCH 06/23] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwincompositing/kcmkwineffects.desktop | 2 +- scripts/minimizeall/metadata.desktop | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index 7f06022182..c51ff51340 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -99,7 +99,7 @@ X-KDE-Keywords[bs]=kwin, prozor, menadžer, kompozicija, efekat, 3D efekti, 2Def 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 -X-KDE-Keywords[de]=KWin,Fenster,Verwaltung,Compositing,Effekt,2D-Effekte,3D-Effekte,OpenGL,XRender,Videoeinstellungen,Gradische Effekte,Desktopeffekte,Arbeitsflächeneffekte,Animation,Fensterverwaltungs-Effekte,Fensterwechsel-Effekte,Decktopwechsel,Arbeitsflächenwechsel,Animationsgeschwindigkeit,Deskto-Animation,Arbeitsflächen-Animation,Treiber,Treibereinstellung,Rendering,Rendern,Invertierungseffekt,Bildschirmlupeneffekt,Vergrößerungseffekt,Einrasteffekt,Maus folgen,Zooneffekt,Dashboard.Effekt,Explosionseffekt,Überblendungseffekt,Gleiteneffekt,Fensterhervorhebungs-Effekt,Anmeldungseffekt,Abmeldungseffekt,Animierter Minimierungseffekt,Mausmarkierungseffekt,Skalierungseffekt,Bildschirmeffekt,Blatteffekt,Folieneffekt,Vorschaueffekt der Kontrollleiste,Vorschaueffekt,Durchsichtigkeit,Durchsichtigkeitseffekt,Fenstergeometrieffekt,Effekt Wabernde Fenster,Programmstartanzeigeneffekt,Inaktiveffekt,Bildschirmabdunkelungseffekt,FPS-Effekt,Zeichnungsbereicheffekt,Kasten mit Minibilderneffekt,3D-Fenstergalerieeffekt,Desktopgittereffekt,3D-Fensterstapelumschalteffekt,Umrisseffekt,Fensteranzeigeeffekt,Fenstergrößenänderungseffekt +X-KDE-Keywords[de]=KWin,Fenster,Verwaltung,Compositing,Effekt,2D-Effekte,3D-Effekte,OpenGL,XRender,Videoeinstellungen,Gradische Effekte,Desktopeffekte,Arbeitsflächeneffekte,Animation,Fensterverwaltungs-Effekte,Fensterwechsel-Effekte,Decktopwechsel,Arbeitsflächenwechsel,Animationsgeschwindigkeit,Deskto-Animation,Arbeitsflächen-Animation,Treiber,Treibereinstellung,Rendering,Rendern,Invertierungseffekt,Bildschirmlupeneffekt,Vergrößerungseffekt,Einrasteffekt,Maus folgen,Zoomeffekt,Dashboard.Effekt,Explosionseffekt,Überblendungseffekt,Gleiteneffekt,Fensterhervorhebungs-Effekt,Anmeldungseffekt,Abmeldungseffekt,Animierter Minimierungseffekt,Mausmarkierungseffekt,Skalierungseffekt,Bildschirmeffekt,Blatteffekt,Folieneffekt,Vorschaueffekt der Kontrollleiste,Vorschaueffekt,Durchsichtigkeit,Durchsichtigkeitseffekt,Fenstergeometrieffekt,Effekt Wabernde Fenster,Programmstartanzeigeneffekt,Inaktiveffekt,Bildschirmabdunkelungseffekt,FPS-Effekt,Zeichnungsbereicheffekt,Kasten mit Minibilderneffekt,3D-Fenstergalerieeffekt,Desktopgittereffekt,3D-Fensterstapelumschalteffekt,Umrisseffekt,Fensteranzeigeeffekt,Fenstergrößenänderungseffekt X-KDE-Keywords[el]=kwin,παράθυρο,διαχειριστής,σύνθεση,εφέ,3D εφέ,2D εφέ,OpenGL,XRender,ρυθμίσεις βίντεο,γραφικά εφέ,εφέ επιφάνειας εργασίας,κινούμενες εικόνες,διάφορες κινούμενες εικόνες,εφέ διαχείρισης παραθύρου,εφέ εναλλαγής παραθύρου,εφέ εναλλαγής επιφάνειας εργασίας,κινούμενες εικόνες,ταχύτητα κινούμενων εικόνων,κινούμενες εικόνες επιφάνειας εργασίας,οδηγοί,ρυθμίσεις οδηγών,αποτύπωση,αποτύπωση,αναστροφή εφέ,εφέ μεγεθυντικού φακού,εφέ μεγέθυνσης,εφέ χειριστή snap,εφέ ίχνους ποντικιού,εφέ ζουμ,εφέ θόλωσης,εφέ πίνακα,εφέ έκρηξης,εφέ εξασθένισης,εφέ εξασθένισης επιφάνειας εργασίας,εφέ κατεδάφισης,εφέ ολίσθησης,εφέ τονισμού παραθύρου,εφέ εισόδου,εφέ εξόδου,εφέ μαγικής λάμπας,εφέ ελαχιστοποίησης κινούμενων εικόνων,εφέ σημείωσης με ποντίκι,εφέ κλιμάκωσης,εφέ στιγμιότυπου,εφέ φύλλου,εφέ κύλισης,εφέ κυλιόμενων αναδυόμενων,εφέ εικόνων επισκόπησης γραμμής εργασιών,εφέ παράπλευρων εικόνων επισκόπησης,διαύγεια,εφέ διαύγειας,διαφάνεια,εφέ γεωμετρίας παραθύρου,εφέ ταλαντευόμενων παραθύρων,εφέ ανάδρασης έναρξης,εφέ προγόνου διαλόγου,εφέ θαμπού αδρανούς,εφέ θολής οθόνης,εφέ πίσω κύλισης,eye candy,candy,εφέ εμφάνισης FPS,εφέ εμφάνισης σχεδιασμάτων,εφέ εναλλαγής πλαισίου,εφέ καλυμμένης εναλλαγής,εφέ κύβου επιφάνειας εργασίας,εφέ κινούμενων εικόνων κύβου επιφάνειας εργασίας,εφέ καννάβου επιφάνειας εργασίας,εφέ εναλλαγής στοίβας,εφέ περιγράμματος,εφέ παρουσίας παραθύρου,εφέ αλλαγής μεγέθους παραθύρου X-KDE-Keywords[en_GB]=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[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio,animaciones,animaciones diversas,efectos de la gestión de ventanas,efecto de cambio de ventana,efecto de cambio de escritorio,velocidad de animación,animaciones del escritorio,controladores,preferencias del controlador,renderización,renderizar,efecto de inversión,efecto de espejo,efecto de lupa,efecto auxiliar de instantánea,efecto de seguimiento del ratón,efecto de ampliación,efecto borroso,efecto del tablero de mandos,efecto de explosión,efecto de desvanecimiento,efecto de desvanecimiento del escritorio,efecto de romper en pedazos,efecto de planeo,efecto de resaltar ventanas,efecto de inicio de sesión,efecto de final de sesión,efecto de lámpara mágica,efecto de animación al minimizar,efecto de marcas del ratón,efecto de escalado,efecto de captura de pantalla,efecto de hoja,efecto de deslizamiento,efecto de ventanas emergentes deslizantes,efecto de miniaturas de la barra de tareas,efecto de miniaturas laterales,transparencia,efecto de transparencia,efecto de geometría de las ventanas,efecto de ventanas gelatinosas,efecto de notificación de inicio,efecto de padre de la ventana,efecto de oscurecer inactiva,efecto de oscurecer la pantalla,efecto atrás,efectos atractivos,efecto de mostrar FPS,efecto de mostrar pintura,efecto de selección de ventana en caja,efecto de selección de ventana en modo carátula,efecto de cubo del escritorio,efecto de animación del cubo del escritorio,efecto de rejilla del escritorio,efecto de selección de ventana en modo cascada,efecto de contorno,efecto de presentación de ventanas,efecto de cambiar tamaño de las ventanas diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index bbfa7e3734..bca36ae069 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -2,6 +2,7 @@ Name=MinimizeAll Name[ca]=MinimitzaTot Name[cs]=MinimalizovatVše +Name[de]=Alle minimieren Name[en_GB]=MinimiseAll Name[es]=Maximizar todo Name[fi]=Pienennä kaikki From 01b64c10c013593d844ed0861397b92e79688e8e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 14 May 2015 12:10:27 +0000 Subject: [PATCH 07/23] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwincompositing/kcmkwineffects.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 +- kcmkwin/kwinscripts/kwinscripts.desktop | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index c51ff51340..ef7f559e79 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -29,6 +29,7 @@ Name[hu]=Asztali effektusok Name[ia]=Effectos de scriptorio Name[id]=Efek Desktop Name[it]=Effetti del desktop +Name[ja]=デスクトップ効果 Name[ko]=데스크톱 효과 Name[lt]=Darbastalio efektai Name[nb]=Skrivebordseffekter diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 91788d1bc8..9f04c6a52d 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -82,7 +82,7 @@ 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[ca]=Cantonades i vores actives de la pantalla Comment[cs]=Aktivní rohy a hrany obrazovky Comment[da]=Aktive skærmhjørner og -kanter Comment[de]=Aktive Bildschirmränder diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index b269261b45..1718f4d688 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -108,7 +108,7 @@ Name[zh_CN]=KWin 脚本 Name[zh_TW]=KWin 文稿 Comment=Manage KWin scripts Comment[bs]=Podesi KWin skripte -Comment[ca]=Gestiona scripts del KWin +Comment[ca]=Gestiona els scripts del KWin Comment[ca@valencia]=Gestiona scripts del KWin Comment[cs]=Spravovat skripty KWinu Comment[da]=Håndtér KWin-scripts From f0e0568b3717ed9e3fe3efc6e7a607172c91d935 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 May 2015 12:12:44 +0000 Subject: [PATCH 08/23] SVN_SILENT made messages (.desktop file) --- effects/dashboard/dashboard_config.desktop | 2 +- kcmkwin/kwincompositing/kcmkwineffects.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/effects/dashboard/dashboard_config.desktop b/effects/dashboard/dashboard_config.desktop index 66a8a27ca9..de25b623bc 100644 --- a/effects/dashboard/dashboard_config.desktop +++ b/effects/dashboard/dashboard_config.desktop @@ -17,7 +17,7 @@ Name[ca@valencia]=Tauler Name[cs]=Dashboard Name[csb]=Panel Name[da]=Instrumentbræt -Name[de]=Dashboard +Name[de]=Übersichtsseite Name[el]=Πίνακας συστατικών Name[en_GB]=Dashboard Name[eo]=Stirtablo diff --git a/kcmkwin/kwincompositing/kcmkwineffects.desktop b/kcmkwin/kwincompositing/kcmkwineffects.desktop index ef7f559e79..d3f004f62e 100644 --- a/kcmkwin/kwincompositing/kcmkwineffects.desktop +++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop @@ -100,7 +100,7 @@ X-KDE-Keywords[bs]=kwin, prozor, menadžer, kompozicija, efekat, 3D efekti, 2Def 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 -X-KDE-Keywords[de]=KWin,Fenster,Verwaltung,Compositing,Effekt,2D-Effekte,3D-Effekte,OpenGL,XRender,Videoeinstellungen,Gradische Effekte,Desktopeffekte,Arbeitsflächeneffekte,Animation,Fensterverwaltungs-Effekte,Fensterwechsel-Effekte,Decktopwechsel,Arbeitsflächenwechsel,Animationsgeschwindigkeit,Deskto-Animation,Arbeitsflächen-Animation,Treiber,Treibereinstellung,Rendering,Rendern,Invertierungseffekt,Bildschirmlupeneffekt,Vergrößerungseffekt,Einrasteffekt,Maus folgen,Zoomeffekt,Dashboard.Effekt,Explosionseffekt,Überblendungseffekt,Gleiteneffekt,Fensterhervorhebungs-Effekt,Anmeldungseffekt,Abmeldungseffekt,Animierter Minimierungseffekt,Mausmarkierungseffekt,Skalierungseffekt,Bildschirmeffekt,Blatteffekt,Folieneffekt,Vorschaueffekt der Kontrollleiste,Vorschaueffekt,Durchsichtigkeit,Durchsichtigkeitseffekt,Fenstergeometrieffekt,Effekt Wabernde Fenster,Programmstartanzeigeneffekt,Inaktiveffekt,Bildschirmabdunkelungseffekt,FPS-Effekt,Zeichnungsbereicheffekt,Kasten mit Minibilderneffekt,3D-Fenstergalerieeffekt,Desktopgittereffekt,3D-Fensterstapelumschalteffekt,Umrisseffekt,Fensteranzeigeeffekt,Fenstergrößenänderungseffekt +X-KDE-Keywords[de]=KWin,Fenster,Verwaltung,Compositing,Effekt,2D-Effekte,3D-Effekte,OpenGL,XRender,Videoeinstellungen,Gradische Effekte,Desktopeffekte,Arbeitsflächeneffekte,Animation,Fensterverwaltungs-Effekte,Fensterwechsel-Effekte,Decktopwechsel,Arbeitsflächenwechsel,Animationsgeschwindigkeit,Deskto-Animation,Arbeitsflächen-Animation,Treiber,Treibereinstellung,Rendering,Rendern,Invertierungseffekt,Bildschirmlupeneffekt,Vergrößerungseffekt,Einrasteffekt,Maus folgen,Zoomeffekt,Dashboard, Übersichtsseite.Effekt,Explosionseffekt,Überblendungseffekt,Gleiteneffekt,Fensterhervorhebungs-Effekt,Anmeldungseffekt,Abmeldungseffekt,Animierter Minimierungseffekt,Mausmarkierungseffekt,Skalierungseffekt,Bildschirmeffekt,Blatteffekt,Folieneffekt,Vorschaueffekt der Kontrollleiste,Vorschaueffekt,Durchsichtigkeit,Durchsichtigkeitseffekt,Fenstergeometrieffekt,Effekt Wabernde Fenster,Programmstartanzeigeneffekt,Inaktiveffekt,Bildschirmabdunkelungseffekt,FPS-Effekt,Zeichnungsbereicheffekt,Kasten mit Minibilderneffekt,3D-Fenstergalerieeffekt,Desktopgittereffekt,3D-Fensterstapelumschalteffekt,Umrisseffekt,Fensteranzeigeeffekt,Fenstergrößenänderungseffekt X-KDE-Keywords[el]=kwin,παράθυρο,διαχειριστής,σύνθεση,εφέ,3D εφέ,2D εφέ,OpenGL,XRender,ρυθμίσεις βίντεο,γραφικά εφέ,εφέ επιφάνειας εργασίας,κινούμενες εικόνες,διάφορες κινούμενες εικόνες,εφέ διαχείρισης παραθύρου,εφέ εναλλαγής παραθύρου,εφέ εναλλαγής επιφάνειας εργασίας,κινούμενες εικόνες,ταχύτητα κινούμενων εικόνων,κινούμενες εικόνες επιφάνειας εργασίας,οδηγοί,ρυθμίσεις οδηγών,αποτύπωση,αποτύπωση,αναστροφή εφέ,εφέ μεγεθυντικού φακού,εφέ μεγέθυνσης,εφέ χειριστή snap,εφέ ίχνους ποντικιού,εφέ ζουμ,εφέ θόλωσης,εφέ πίνακα,εφέ έκρηξης,εφέ εξασθένισης,εφέ εξασθένισης επιφάνειας εργασίας,εφέ κατεδάφισης,εφέ ολίσθησης,εφέ τονισμού παραθύρου,εφέ εισόδου,εφέ εξόδου,εφέ μαγικής λάμπας,εφέ ελαχιστοποίησης κινούμενων εικόνων,εφέ σημείωσης με ποντίκι,εφέ κλιμάκωσης,εφέ στιγμιότυπου,εφέ φύλλου,εφέ κύλισης,εφέ κυλιόμενων αναδυόμενων,εφέ εικόνων επισκόπησης γραμμής εργασιών,εφέ παράπλευρων εικόνων επισκόπησης,διαύγεια,εφέ διαύγειας,διαφάνεια,εφέ γεωμετρίας παραθύρου,εφέ ταλαντευόμενων παραθύρων,εφέ ανάδρασης έναρξης,εφέ προγόνου διαλόγου,εφέ θαμπού αδρανούς,εφέ θολής οθόνης,εφέ πίσω κύλισης,eye candy,candy,εφέ εμφάνισης FPS,εφέ εμφάνισης σχεδιασμάτων,εφέ εναλλαγής πλαισίου,εφέ καλυμμένης εναλλαγής,εφέ κύβου επιφάνειας εργασίας,εφέ κινούμενων εικόνων κύβου επιφάνειας εργασίας,εφέ καννάβου επιφάνειας εργασίας,εφέ εναλλαγής στοίβας,εφέ περιγράμματος,εφέ παρουσίας παραθύρου,εφέ αλλαγής μεγέθους παραθύρου X-KDE-Keywords[en_GB]=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[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio,animaciones,animaciones diversas,efectos de la gestión de ventanas,efecto de cambio de ventana,efecto de cambio de escritorio,velocidad de animación,animaciones del escritorio,controladores,preferencias del controlador,renderización,renderizar,efecto de inversión,efecto de espejo,efecto de lupa,efecto auxiliar de instantánea,efecto de seguimiento del ratón,efecto de ampliación,efecto borroso,efecto del tablero de mandos,efecto de explosión,efecto de desvanecimiento,efecto de desvanecimiento del escritorio,efecto de romper en pedazos,efecto de planeo,efecto de resaltar ventanas,efecto de inicio de sesión,efecto de final de sesión,efecto de lámpara mágica,efecto de animación al minimizar,efecto de marcas del ratón,efecto de escalado,efecto de captura de pantalla,efecto de hoja,efecto de deslizamiento,efecto de ventanas emergentes deslizantes,efecto de miniaturas de la barra de tareas,efecto de miniaturas laterales,transparencia,efecto de transparencia,efecto de geometría de las ventanas,efecto de ventanas gelatinosas,efecto de notificación de inicio,efecto de padre de la ventana,efecto de oscurecer inactiva,efecto de oscurecer la pantalla,efecto atrás,efectos atractivos,efecto de mostrar FPS,efecto de mostrar pintura,efecto de selección de ventana en caja,efecto de selección de ventana en modo carátula,efecto de cubo del escritorio,efecto de animación del cubo del escritorio,efecto de rejilla del escritorio,efecto de selección de ventana en modo cascada,efecto de contorno,efecto de presentación de ventanas,efecto de cambiar tamaño de las ventanas From 7a7d79a1689416f52fc11404b9400696600fa412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Thu, 30 Apr 2015 21:15:58 +0200 Subject: [PATCH 09/23] break desktopshowing state from cover & flipswitch REVIEW: 123550 CCBUG: 346837 --- effects/coverswitch/coverswitch.cpp | 1 + effects/flipswitch/flipswitch.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/effects/coverswitch/coverswitch.cpp b/effects/coverswitch/coverswitch.cpp index fa6ec84a3f..92772d4b2f 100644 --- a/effects/coverswitch/coverswitch.cpp +++ b/effects/coverswitch/coverswitch.cpp @@ -420,6 +420,7 @@ void CoverSwitchEffect::slotTabBoxAdded(int mode) if (effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this) return; if (!mActivated) { + effects->setShowingDesktop(false); // only for windows mode if (((mode == TabBoxWindowsMode && primaryTabBox) || (mode == TabBoxWindowsAlternativeMode && secondaryTabBox) || diff --git a/effects/flipswitch/flipswitch.cpp b/effects/flipswitch/flipswitch.cpp index f429b05806..63a16debe5 100644 --- a/effects/flipswitch/flipswitch.cpp +++ b/effects/flipswitch/flipswitch.cpp @@ -407,6 +407,7 @@ void FlipSwitchEffect::slotTabBoxAdded(int mode) if (effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this) return; // only for windows mode + effects->setShowingDesktop(false); if (((mode == TabBoxWindowsMode && m_tabbox) || (mode == TabBoxWindowsAlternativeMode && m_tabboxAlternative) || (mode == TabBoxCurrentAppWindowsMode && m_tabbox) || From 5d09eaae1ff20887f20e48bbf91fcdb35cd20669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sun, 3 May 2015 14:26:18 +0200 Subject: [PATCH 10/23] do not switch desktop on resizing windows REVIEW: 123599 --- autotests/mock_client.cpp | 5 +++++ autotests/mock_client.h | 1 + screenedge.cpp | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/autotests/mock_client.cpp b/autotests/mock_client.cpp index bdd17371d0..f5625dc112 100644 --- a/autotests/mock_client.cpp +++ b/autotests/mock_client.cpp @@ -85,6 +85,11 @@ void Client::setHiddenInternal(bool set) m_hiddenInternal = set; } +bool Client::isResize() const +{ + return false; +} + void Client::setGeometry(const QRect &rect) { m_geometry = rect; diff --git a/autotests/mock_client.h b/autotests/mock_client.h index ee267ffba1..63528ed726 100644 --- a/autotests/mock_client.h +++ b/autotests/mock_client.h @@ -38,6 +38,7 @@ public: bool isActive() const; bool isFullScreen() const; bool isHiddenInternal() const; + bool isResize() const; QRect geometry() const; void setActive(bool active); diff --git a/screenedge.cpp b/screenedge.cpp index 7f45d762f2..6ab6186bed 100644 --- a/screenedge.cpp +++ b/screenedge.cpp @@ -188,7 +188,8 @@ void Edge::handle(const QPoint &cursorPos) unreserve(); return; } - if ((edges()->isDesktopSwitchingMovingClients() && Workspace::self()->getMovingClient()) || + Client *movingClient = Workspace::self()->getMovingClient(); + if ((edges()->isDesktopSwitchingMovingClients() && movingClient && !movingClient->isResize()) || (edges()->isDesktopSwitching() && isScreenEdge())) { // always switch desktops in case: // moving a Client and option for switch on client move is enabled @@ -196,7 +197,7 @@ void Edge::handle(const QPoint &cursorPos) switchDesktop(cursorPos); return; } - if (Workspace::self()->getMovingClient()) { + if (movingClient) { // if we are moving a window we don't want to trigger the actions. This just results in // problems, e.g. Desktop Grid activated or screen locker activated which just cannot // work as we hold a grab. From e0c3b4eed35b6db0f32cb6aefe6f5b4cfd96172d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 5 May 2015 00:03:06 +0200 Subject: [PATCH 11/23] window aperture always needs to cancel even if the window is invisible fade out instead of NOOP or "restorage" BUG: 347174 REVIEW: 123636 --- .../package/contents/code/main.js | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/effects/windowaperture/package/contents/code/main.js b/effects/windowaperture/package/contents/code/main.js index f5fe4b0265..52396a6781 100644 --- a/effects/windowaperture/package/contents/code/main.js +++ b/effects/windowaperture/package/contents/code/main.js @@ -39,7 +39,26 @@ var badBadWindowsEffect = { break; // ignore invisible windows and such that do not have to be restored - if (!w.visible || (!showing && w.offToCornerId === undefined)) { + if (!w.visible) { + if (!(showing || w.offToCornerId === undefined)) { // we still need to stop this + cancel(w.offToCornerId); + delete w.offToCornerId; + effects.setElevatedWindow(w, false); + if (!w.dock) { + animate({ + window: w, + duration: badBadWindowsEffect.duration, + animations: [{ + type: Effect.Opacity, + from: 0.2, + to: 0.0 + }] + }); + } + } + continue; + } + if (!showing && w.offToCornerId === undefined) { continue; } From c2ba7658208ff50eed350cfa6f4dd44f2db77a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 5 May 2015 12:23:45 +0200 Subject: [PATCH 12/23] updateXTime before sending a takeFocus message old timestamps confuse clients BUG: 347153 REVIEW: 123639 --- client.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client.cpp b/client.cpp index a6fbf3ea92..d38388747d 100644 --- a/client.cpp +++ b/client.cpp @@ -1548,8 +1548,10 @@ void Client::takeFocus() m_client.focus(); else demandAttention(false); // window cannot take input, at least withdraw urgency - if (info->supportsProtocol(NET::TakeFocusProtocol)) + if (info->supportsProtocol(NET::TakeFocusProtocol)) { + updateXTime(); sendClientMessage(window(), atoms->wm_protocols, atoms->wm_take_focus); + } workspace()->setShouldGetFocus(this); } From 56fce0adc7ebd59d8fbfa682fb598eeb82e98541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 5 May 2015 12:24:41 +0200 Subject: [PATCH 13/23] make switchWindow FROM stickies act on current VD it's probably the user expectation and few windows are on all desktops BUG: 331512 REVIEW: 123640 --- useractions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/useractions.cpp b/useractions.cpp index ce1c28e13a..1432627f9b 100644 --- a/useractions.cpp +++ b/useractions.cpp @@ -1682,7 +1682,7 @@ void Workspace::switchWindow(Direction direction) Client *c = active_client; Client *switchTo = 0; int bestScore = 0; - int d = c->desktop(); + int d = c->isOnAllDesktops() ? VirtualDesktopManager::self()->current() : c->desktop(); // Centre of the active window QPoint curPos(c->pos().x() + c->geometry().width() / 2, c->pos().y() + c->geometry().height() / 2); From 0b334f2a7001c4b5ea66d2a948f865019e944e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Wed, 6 May 2015 23:18:39 +0200 Subject: [PATCH 14/23] desk grid: do not recreate DesktopButtonsViews Same issue as with present windows closers: qml is slow Interestingly "hide" means "hide" here and there're also no visual artifacts. BUG: 347339 REVIEW: 123668 --- effects/desktopgrid/desktopgrid.cpp | 33 +++++++++++++++++------------ 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp index 40617edc07..759ecaf4ba 100644 --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -1117,18 +1117,34 @@ void DesktopGridEffect::setup() } bool enableAdd = effects->numberOfDesktops() < 20; bool enableRemove = effects->numberOfDesktops() > 1; + + QHash< DesktopButtonsView*, EffectWindow* >::iterator it = m_desktopButtonsViews.begin(); for (int i = 0; i < effects->numScreens(); ++i) { - DesktopButtonsView* view = new DesktopButtonsView(); + DesktopButtonsView *view; + if (it == m_desktopButtonsViews.end()) { + view = new DesktopButtonsView(); + m_desktopButtonsViews.insert(view, NULL); + it = m_desktopButtonsViews.end(); // changed through insert! + connect(view, SIGNAL(addDesktop()), SLOT(slotAddDesktop())); + connect(view, SIGNAL(removeDesktop()), SLOT(slotRemoveDesktop())); + } else { + view = it.key(); + ++it; + } view->setAddDesktopEnabled(enableAdd); view->setRemoveDesktopEnabled(enableRemove); - connect(view, SIGNAL(addDesktop()), SLOT(slotAddDesktop())); - connect(view, SIGNAL(removeDesktop()), SLOT(slotRemoveDesktop())); const QRect screenRect = effects->clientArea(FullScreenArea, i, 1); view->setGeometry(screenRect.right() + 1 - view->width(), screenRect.bottom() + 1 - view->height(), view->width(), view->height()); view->show(); - m_desktopButtonsViews.insert(view, NULL); + } + while (it != m_desktopButtonsViews.end()) { + if (*it && (*it)->isDeleted()) + (*it)->unrefWindow(); + DesktopButtonsView *view = it.key(); + it = m_desktopButtonsViews.erase(it); + view->deleteLater(); } } @@ -1208,15 +1224,6 @@ void DesktopGridEffect::finish() } m_proxy = 0; } - - QHash< DesktopButtonsView*, EffectWindow* >::iterator i = m_desktopButtonsViews.begin(); - while (i != m_desktopButtonsViews.end()) { - if (*i && (*i)->isDeleted()) - (*i)->unrefWindow(); - DesktopButtonsView *view = i.key(); - i = m_desktopButtonsViews.erase(i); - view->deleteLater(); - } } void DesktopGridEffect::globalShortcutChanged(QAction *action, const QKeySequence& seq) From f916cb1aa593991a6062f71774a252ab6d8891a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Fri, 8 May 2015 22:55:21 +0200 Subject: [PATCH 15/23] forward resource modes next to crtcs modes will be required for proper refreshrate detection --- xcbutils.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xcbutils.h b/xcbutils.h index 7ff7a8902a..6355d46b29 100644 --- a/xcbutils.h +++ b/xcbutils.h @@ -1125,6 +1125,12 @@ public: } return xcb_randr_get_screen_resources_crtcs(data()); } + inline xcb_randr_mode_info_t *modes() { + if (isNull()) { + return nullptr; + } + return xcb_randr_get_screen_resources_modes(data()); + } }; XCB_WRAPPER_DATA(CrtcGammaData, xcb_randr_get_crtc_gamma, xcb_randr_crtc_t) @@ -1173,6 +1179,12 @@ public: } return xcb_randr_get_screen_resources_current_crtcs(data()); } + inline xcb_randr_mode_info_t *modes() { + if (isNull()) { + return nullptr; + } + return xcb_randr_get_screen_resources_current_modes(data()); + } }; XCB_WRAPPER(SetCrtcConfig, xcb_randr_set_crtc_config, xcb_randr_crtc_t, xcb_timestamp_t, xcb_timestamp_t, int16_t, int16_t, xcb_randr_mode_t, uint16_t, uint32_t, const xcb_randr_output_t*) From 03ab846da82642b92af2d0e24d8bfb50c2f767bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Fri, 8 May 2015 22:57:13 +0200 Subject: [PATCH 16/23] add refreshRate to Screens. STUB but for XRandr! the randr refreshrate is calculated from the current mode --- autotests/mock_screens.cpp | 5 +++++ autotests/mock_screens.h | 1 + screens.cpp | 12 ++++++++++++ screens.h | 4 ++++ screens_xrandr.cpp | 29 +++++++++++++++++++++++++++++ screens_xrandr.h | 2 ++ 6 files changed, 53 insertions(+) diff --git a/autotests/mock_screens.cpp b/autotests/mock_screens.cpp index 84fce28335..6129492c62 100644 --- a/autotests/mock_screens.cpp +++ b/autotests/mock_screens.cpp @@ -37,6 +37,11 @@ QRect MockScreens::geometry(int screen) const return m_geometries.at(screen); } +float MockScreens::refreshRate(int screen) const +{ + return 60.0f; +} + QSize MockScreens::size(int screen) const { return geometry(screen).size(); diff --git a/autotests/mock_screens.h b/autotests/mock_screens.h index 3bc6c38283..d97fcaf3c7 100644 --- a/autotests/mock_screens.h +++ b/autotests/mock_screens.h @@ -33,6 +33,7 @@ public: virtual ~MockScreens(); QRect geometry(int screen) const override; int number(const QPoint &pos) const override; + float refreshRate(int screen) const override; QSize size(int screen) const override; void init() override; diff --git a/screens.cpp b/screens.cpp index 9ac8e6ef9e..5f2fa41494 100644 --- a/screens.cpp +++ b/screens.cpp @@ -85,6 +85,18 @@ void Screens::init() m_currentFollowsMouse = settings.activeMouseScreen(); } +QString Screens::name(int screen) const +{ + qWarning("%s::name(int screen) is a stub, please reimplement it!", metaObject()->className()); + return QLatin1String("DUMMY"); +} + +float Screens::refreshRate(int screen) const +{ + qWarning("%s::refreshRate(int screen) is a stub, please reimplement it!", metaObject()->className()); + return 60.0f; +} + void Screens::reconfigure() { if (!m_config) { diff --git a/screens.h b/screens.h index 0d8369e337..a09b156481 100644 --- a/screens.h +++ b/screens.h @@ -69,6 +69,10 @@ public: * @see geometryChanged() **/ QRect geometry() const; + /** + * @returns current refreshrate of the @p screen. + **/ + virtual float refreshRate(int screen) const; /** * @returns size of the @p screen. * diff --git a/screens_xrandr.cpp b/screens_xrandr.cpp index dd8f809f17..6f63509a6d 100644 --- a/screens_xrandr.cpp +++ b/screens_xrandr.cpp @@ -20,6 +20,7 @@ along with this program. If not, see . #include "screens_xrandr.h" #include "xcbutils.h" + namespace KWin { @@ -36,6 +37,7 @@ void XRandRScreens::update() { auto fallback = [this]() { m_geometries << QRect(); + m_refreshRates << -1.0f; setCount(1); }; m_geometries.clear(); @@ -45,16 +47,35 @@ void XRandRScreens::update() return; } xcb_randr_crtc_t *crtcs = resources.crtcs(); + xcb_randr_mode_info_t *modes = resources.modes(); QVector infos(resources->num_crtcs); for (int i = 0; i < resources->num_crtcs; ++i) { infos[i] = Xcb::RandR::CrtcInfo(crtcs[i], resources->config_timestamp); } + for (int i = 0; i < resources->num_crtcs; ++i) { + float refreshRate = -1.0f; Xcb::RandR::CrtcInfo info(infos.at(i)); + for (int j = 0; j < resources->num_modes; ++j) { + if (info->mode == modes[j].id) { + if (modes[j].htotal*modes[j].vtotal) { // BUG 313996 + // refresh rate calculation - WTF was wikipedia 1998 when I needed it? + int dotclock = modes[j].dot_clock, + vtotal = modes[j].vtotal; + if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) + dotclock *= 2; + if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) + vtotal *= 2; + refreshRate = dotclock/float(modes[j].htotal*vtotal); + } + break; // found mode + } + } const QRect geo = info.rect(); if (geo.isValid()) { m_geometries << geo; + m_refreshRates << refreshRate; } } if (m_geometries.isEmpty()) { @@ -103,6 +124,14 @@ int XRandRScreens::number(const QPoint &pos) const return bestScreen; } +float XRandRScreens::refreshRate(int screen) const +{ + if (screen >= m_refreshRates.size() || screen < 0) { + return -1.0f; + } + return m_refreshRates.at(screen); +} + QSize XRandRScreens::size(int screen) const { const QRect geo = geometry(screen); diff --git a/screens_xrandr.h b/screens_xrandr.h index ed96241efe..7cfba3bb32 100644 --- a/screens_xrandr.h +++ b/screens_xrandr.h @@ -37,6 +37,7 @@ public: void init() override; QRect geometry(int screen) const override; int number(const QPoint& pos) const override; + float refreshRate(int screen) const override; QSize size(int screen) const override; using QObject::event; @@ -49,6 +50,7 @@ private: template void update(); QVector m_geometries; + QVector m_refreshRates; }; } // namespace From b85d5666c13d8946531b98b79b4b91f727cc0583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sat, 9 May 2015 12:21:50 +0200 Subject: [PATCH 17/23] add OutputInfo class to obtain output names --- xcbutils.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/xcbutils.h b/xcbutils.h index 6355d46b29..5885d77946 100644 --- a/xcbutils.h +++ b/xcbutils.h @@ -1131,6 +1131,12 @@ public: } return xcb_randr_get_screen_resources_modes(data()); } + inline uint8_t *names() { + if (isNull()) { + return nullptr; + } + return xcb_randr_get_screen_resources_names(data()); + } }; XCB_WRAPPER_DATA(CrtcGammaData, xcb_randr_get_crtc_gamma, xcb_randr_crtc_t) @@ -1165,6 +1171,30 @@ public: } return QRect(info->x, info->y, info->width, info->height); } + inline xcb_randr_output_t *outputs() { + const CrtcInfoData::reply_type *info = data(); + if (!info || info->num_outputs == 0 || info->mode == XCB_NONE || info->status != XCB_RANDR_SET_CONFIG_SUCCESS) { + return nullptr; + } + return xcb_randr_get_crtc_info_outputs(info); + } +}; + +XCB_WRAPPER_DATA(OutputInfoData, xcb_randr_get_output_info, xcb_randr_output_t, xcb_timestamp_t) +class OutputInfo : public Wrapper +{ +public: + OutputInfo() = default; + OutputInfo(const OutputInfo&) = default; + explicit OutputInfo(xcb_randr_output_t c, xcb_timestamp_t t) : Wrapper(c, t) {} + + inline QString name() { + const OutputInfoData::reply_type *info = data(); + if (!info || info->num_crtcs == 0 || info->num_modes == 0 || info->status != XCB_RANDR_SET_CONFIG_SUCCESS) { + return QString(); + } + return QString::fromUtf8(reinterpret_cast(xcb_randr_get_output_info_name(info)), info->name_len); + } }; XCB_WRAPPER_DATA(CurrentResourcesData, xcb_randr_get_screen_resources_current, xcb_window_t) From 5779e6844dc3b40c304ebc936b3eb1e37ea8b51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sat, 9 May 2015 12:22:31 +0200 Subject: [PATCH 18/23] add Screens::name(int screen); STUB but for XRandr required to compare __GL_SYNC_DISPLAY_DEVICE and later on to assign windows to an output rather than a screen number --- autotests/mock_screens.cpp | 5 +++++ autotests/mock_screens.h | 1 + screens.h | 4 ++++ screens_xrandr.cpp | 30 +++++++++++++++++++++++++++++- screens_xrandr.h | 2 ++ 5 files changed, 41 insertions(+), 1 deletion(-) diff --git a/autotests/mock_screens.cpp b/autotests/mock_screens.cpp index 6129492c62..13b39a06cc 100644 --- a/autotests/mock_screens.cpp +++ b/autotests/mock_screens.cpp @@ -37,6 +37,11 @@ QRect MockScreens::geometry(int screen) const return m_geometries.at(screen); } +QString MockScreens::name(int screen) const +{ + return QLatin1String("MoccaScreen"); // mock-a-screen =) +} + float MockScreens::refreshRate(int screen) const { return 60.0f; diff --git a/autotests/mock_screens.h b/autotests/mock_screens.h index d97fcaf3c7..5c6b8c2d1d 100644 --- a/autotests/mock_screens.h +++ b/autotests/mock_screens.h @@ -33,6 +33,7 @@ public: virtual ~MockScreens(); QRect geometry(int screen) const override; int number(const QPoint &pos) const override; + QString name(int screen) const override; float refreshRate(int screen) const override; QSize size(int screen) const override; void init() override; diff --git a/screens.h b/screens.h index a09b156481..fd7daa364d 100644 --- a/screens.h +++ b/screens.h @@ -69,6 +69,10 @@ public: * @see geometryChanged() **/ QRect geometry() const; + /** + * The output name of the screen (usually eg. LVDS-1, VGA-0 or DVI-I-1 etc.) + */ + virtual QString name(int screen) const; /** * @returns current refreshrate of the @p screen. **/ diff --git a/screens_xrandr.cpp b/screens_xrandr.cpp index 6f63509a6d..bd73e6b682 100644 --- a/screens_xrandr.cpp +++ b/screens_xrandr.cpp @@ -41,6 +41,7 @@ void XRandRScreens::update() setCount(1); }; m_geometries.clear(); + m_names.clear(); T resources(rootWindow()); if (resources.isNull()) { fallback(); @@ -55,8 +56,17 @@ void XRandRScreens::update() } for (int i = 0; i < resources->num_crtcs; ++i) { - float refreshRate = -1.0f; Xcb::RandR::CrtcInfo info(infos.at(i)); + + xcb_randr_output_t *outputs = info.outputs(); + QVector outputInfos(outputs ? resources->num_outputs : 0); + if (outputs) { + for (int i = 0; i < resources->num_outputs; ++i) { + outputInfos[i] = Xcb::RandR::OutputInfo(outputs[i], resources->config_timestamp); + } + } + + float refreshRate = -1.0f; for (int j = 0; j < resources->num_modes; ++j) { if (info->mode == modes[j].id) { if (modes[j].htotal*modes[j].vtotal) { // BUG 313996 @@ -72,10 +82,20 @@ void XRandRScreens::update() break; // found mode } } + const QRect geo = info.rect(); if (geo.isValid()) { m_geometries << geo; m_refreshRates << refreshRate; + QString name; + for (int j = 0; j < info->num_outputs; ++j) { + Xcb::RandR::OutputInfo outputInfo(outputInfos.at(j)); + if (crtcs[i] == outputInfo->crtc) { + name = outputInfo.name(); + break; + } + } + m_names << name; } } if (m_geometries.isEmpty()) { @@ -103,6 +123,14 @@ QRect XRandRScreens::geometry(int screen) const return m_geometries.at(screen); } +QString XRandRScreens::name(int screen) const +{ + if (screen >= m_names.size() || screen < 0) { + return QString(); + } + return m_names.at(screen); +} + int XRandRScreens::number(const QPoint &pos) const { int bestScreen = 0; diff --git a/screens_xrandr.h b/screens_xrandr.h index 7cfba3bb32..e491ce00f6 100644 --- a/screens_xrandr.h +++ b/screens_xrandr.h @@ -36,6 +36,7 @@ public: virtual ~XRandRScreens(); void init() override; QRect geometry(int screen) const override; + QString name(int screen) const override; int number(const QPoint& pos) const override; float refreshRate(int screen) const override; QSize size(int screen) const override; @@ -51,6 +52,7 @@ private: void update(); QVector m_geometries; QVector m_refreshRates; + QVector m_names; }; } // namespace From c08038e0a63f51202762fa72943d5cd3884a82f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sat, 9 May 2015 16:46:21 +0200 Subject: [PATCH 19/23] prefer query Screens::refreshRate() ScreenInfo::rate is reporting 50Hz (on at least nvidia) ... AGAIN! * sigh* In addition we check for __GL_SYNC_DISPLAY_DEVICE to pick the rate of the screen that the driver will actually sync to (hopefully...) The patch is limited to nvidia systems for 5.3, applied everywhere in master (ie. will be in 5.4 unless there's some problem) BUG: 347360 REVIEW: 123693 --- options.cpp | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/options.cpp b/options.cpp index 7362c6b80a..804f05b7aa 100644 --- a/options.cpp +++ b/options.cpp @@ -29,6 +29,7 @@ along with this program. If not, see . #include #include "compositingprefs.h" +#include "screens.h" #include "settings.h" #include "xcbutils.h" #include @@ -43,21 +44,44 @@ namespace KWin int currentRefreshRate() { int rate = -1; - if (options->refreshRate() > 0) // use manually configured refresh rate + QString syncScreenName(QLatin1String("primary screen")); + if (options->refreshRate() > 0) { // use manually configured refresh rate rate = options->refreshRate(); - else if (Xcb::Extensions::self()->isRandrAvailable()) { + } else if (GLPlatform::instance()->driver() == Driver_NVidia && + Screens::self()->count() > 0) { + // prefer the refreshrate calculated from the screens mode information + // at least the nvidia driver reports 50Hz BS ... *again*! + int syncScreen = 0; + if (Screens::self()->count() > 1) { + const QByteArray syncDisplayDevice(qgetenv("__GL_SYNC_DISPLAY_DEVICE")); + // if __GL_SYNC_DISPLAY_DEVICE is exported, the GPU shall sync to that device + // so we try to use its refresh rate + if (!syncDisplayDevice.isEmpty()) { + for (int i = 0; i < Screens::self()->count(); ++i) { + if (Screens::self()->name(i) == syncDisplayDevice) { + syncScreenName = Screens::self()->name(i); + syncScreen = i; + break; + } + } + } + } + rate = qRound(Screens::self()->refreshRate(syncScreen)); // TODO forward float precision? + } else if (Xcb::Extensions::self()->isRandrAvailable()) { + // last restort - query XRandR screenInfo rate - probably wrong on nvidia systems Xcb::RandR::ScreenInfo screenInfo(rootWindow()); rate = screenInfo->rate; } // 0Hz or less is invalid, so we fallback to a default rate if (rate <= 0) - rate = 60; + rate = 60; // and not shitty 50Hz for sure! *grrr* + // QTimer gives us 1msec (1000Hz) at best, so we ignore anything higher; // however, additional throttling prevents very high rates from taking place anyway else if (rate > 1000) rate = 1000; - qCDebug(KWIN_CORE) << "Vertical Refresh rate " << rate << "Hz"; + qCDebug(KWIN_CORE) << "Vertical Refresh rate " << rate << "Hz (" << syncScreenName << ")"; return rate; } From 89195c7e83f4d8be18fede81f14b69e5747b30e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sun, 10 May 2015 11:15:16 +0200 Subject: [PATCH 20/23] ignore elevation list while screen is locked elevated windows would appear above the locker pot. leaking information BUG: 347466 --- effects.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects.h b/effects.h index 59339ae5de..c9a74b3183 100644 --- a/effects.h +++ b/effects.h @@ -462,6 +462,8 @@ private: inline QList EffectsHandlerImpl::elevatedWindows() const { + if (isScreenLocked()) + return QList(); return elevated_windows; } From 82e0601af97c508580e255759064c25fb02c276d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 12 May 2015 21:23:56 +0200 Subject: [PATCH 21/23] stall wobbling while screen is transformed transformed screens prevent hardware clipping leading through filtering subquads This requires to subquad in the painting pass what is not supported for non rectangular qauds ands presently aborts (in debug builds) if any quad is transformed (as by eg. the wobbling) REVIEW: 123733 BUG: 338972 --- effects/wobblywindows/wobblywindows.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/wobblywindows/wobblywindows.cpp b/effects/wobblywindows/wobblywindows.cpp index 1f6765b46b..6c92b8f2aa 100644 --- a/effects/wobblywindows/wobblywindows.cpp +++ b/effects/wobblywindows/wobblywindows.cpp @@ -303,7 +303,7 @@ void WobblyWindowsEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& da void WobblyWindowsEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) { - if (windows.contains(w)) { + if (!(mask & PAINT_SCREEN_TRANSFORMED) && windows.contains(w)) { WindowWobblyInfos& wwi = windows[w]; int tx = w->geometry().x(); int ty = w->geometry().y(); From 87a3d01a75e2371ae4c74ce71f2a7446a91ca7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Tue, 12 May 2015 21:32:07 +0200 Subject: [PATCH 22/23] lazy setting of xbc properties on qApp just a wild guess - the crashes showed up somewhen after the early setting of the property/ X11Info access - if this indeed is the cause, they should disappear or only appear after actually using the detect button. We'll see. CCBUG: 346748 REVIEW: 123777 --- kcmkwin/kwinrules/detectwidget.cpp | 2 ++ kcmkwin/kwinrules/kcm.cpp | 4 ---- kcmkwin/kwinrules/main.cpp | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp index b9b049e8f5..2e855b30a2 100644 --- a/kcmkwin/kwinrules/detectwidget.cpp +++ b/kcmkwin/kwinrules/detectwidget.cpp @@ -171,6 +171,8 @@ QByteArray DetectDialog::selectedMachine() const void DetectDialog::selectWindow() { if (!KWin::Cursor::self()) { + qApp->setProperty("x11Connection", QVariant::fromValue(QX11Info::connection())); + qApp->setProperty("x11RootWindow", QVariant::fromValue(QX11Info::appRootWindow())); KWin::Cursor::create(this); } // use a dialog, so that all user input is blocked diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp index bb3efc4df6..ca0fe5056c 100644 --- a/kcmkwin/kwinrules/kcm.cpp +++ b/kcmkwin/kwinrules/kcm.cpp @@ -41,10 +41,6 @@ KCMRules::KCMRules(QWidget *parent, const QVariantList &) : KCModule(parent) , config("kwinrulesrc") { - if (QX11Info::isPlatformX11()) { - qApp->setProperty("x11Connection", QVariant::fromValue(QX11Info::connection())); - qApp->setProperty("x11RootWindow", QVariant::fromValue(QX11Info::appRootWindow())); - } QVBoxLayout *layout = new QVBoxLayout(this); layout->setMargin(0); diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp index 4b66eb366f..c9e80d2ca8 100644 --- a/kcmkwin/kwinrules/main.cpp +++ b/kcmkwin/kwinrules/main.cpp @@ -245,10 +245,6 @@ KWIN_EXPORT int kdemain(int argc, char* argv[]) app.setApplicationDisplayName(i18n("KWin")); app.setApplicationName("kwin_rules_dialog"); app.setApplicationVersion("1.0"); - if (QX11Info::isPlatformX11()) { - app.setProperty("x11Connection", QVariant::fromValue(QX11Info::connection())); - app.setProperty("x11RootWindow", QVariant::fromValue(QX11Info::appRootWindow())); - } bool whole_app = false; bool id_ok = false; Window id = None; From e6176ffc020b888f49a1326e2e8bcec5a6b4901a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Sun, 17 May 2015 22:13:25 +0200 Subject: [PATCH 23/23] fix CM reselection only return early if we cannot create a selectionwatcher, otherwise the claiming code turns unreachable after the creation of cm_selection BUG: 347813 REVIEW: 123826 --- composite.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composite.cpp b/composite.cpp index a62ab3033d..bafa9613d3 100644 --- a/composite.cpp +++ b/composite.cpp @@ -289,10 +289,11 @@ void Compositor::claimCompositorSelection() sprintf(selection_name, "_NET_WM_CM_S%d", Application::x11ScreenNumber()); cm_selection = new CompositorSelectionOwner(selection_name); connect(cm_selection, SIGNAL(lostOwnership()), SLOT(finish())); - } else { - // no X11 yet - return; } + + if (!cm_selection) // no X11 yet + return; + if (!cm_selection->owning) { cm_selection->claim(true); // force claiming cm_selection->owning = true;