From 7b84b06fccf0cb1ff12bd7c3ab2eee6988af6494 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Fri, 27 Jul 2012 10:37:01 +0200 Subject: [PATCH 1/5] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwinoptions/kwinactions.desktop | 2 +- kcmkwin/kwinscripts/kwinscripts.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 7d1daea774..678dd994a6 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -125,7 +125,7 @@ Comment[es]=Configuración del teclado y del ratón Comment[et]=Klaviatuuri ja hiire seadistamine Comment[eu]=Konfiguratu teklatua eta saguaren ezarpenak Comment[fa]=پیکربندی تنظیمات صفحه کلید و موشی -Comment[fi]=Muokkaa näppäimistön ja hiiren asetuksia +Comment[fi]=Näppäimistön ja hiiren asetukset Comment[fr]=Configuration des paramètres du clavier et de la souris Comment[fy]=Hjir kinne jo de ynstellings fan toetseboerd en mûs ynstelle Comment[ga]=Cumraigh socruithe an mhéarchláir agus na luiche diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index 1c65f14a8b..27d367664c 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -80,7 +80,7 @@ Comment[da]=Håndtér KWin-scripts Comment[de]=KWin-Skripte verwalten Comment[es]=Gestionar guiones de KWin Comment[et]=KWini skriptide haldamine -Comment[fi]=Hallitse KWin-skriptejä +Comment[fi]=KWin-skriptien hallinta Comment[hu]=KWin szkriptek kezelése Comment[ia]=Gere scriptos de KWin Comment[it]=Gestione script kwin From 9eb1cc43a3563436032eca28c994512c7aeb1995 Mon Sep 17 00:00:00 2001 From: Andre Woebbeking Date: Fri, 27 Jul 2012 22:12:59 +0200 Subject: [PATCH 2/5] link X11 lib (for gold?) --- tabbox/tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tabbox/tests/CMakeLists.txt b/tabbox/tests/CMakeLists.txt index f8377ac929..3478e99265 100644 --- a/tabbox/tests/CMakeLists.txt +++ b/tabbox/tests/CMakeLists.txt @@ -14,4 +14,4 @@ set( testTabBoxClientModel_SRCS kde4_add_unit_test( testTabBoxClientModel TESTNAME testTabBoxClientModel ${testTabBoxClientModel_SRCS} ) -target_link_libraries( testTabBoxClientModel ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTTEST_LIBRARY} ) +target_link_libraries( testTabBoxClientModel ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_LIBRARIES} ) From 52404247f3a22ad159e7bf1d3b7ad69128a0590c Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Wed, 1 Aug 2012 11:40:14 +0200 Subject: [PATCH 3/5] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwindecoration/kwindecoration.desktop | 2 +- kcmkwin/kwinoptions/kwinoptions.desktop | 4 ++-- kcmkwin/kwinrules/kwinrules.desktop | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index 17510c61c1..e95284242d 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -166,7 +166,7 @@ X-KDE-Keywords[da]=kwin,vindueshåndtering,window,manager,kant,stil,tema,udseend X-KDE-Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen X-KDE-Keywords[es]=kwin,ventana,gestor,borde,estilo,tema,aspecto,sensación,disposición,botón,asa,borde,kwm,decoración X-KDE-Keywords[et]=kwin,aken,haldur,piire,stiil,teema,välimus,paigutus,nupp,pide,serv,kwm,dekoratsioon -X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,kehys,reunus,tyyli,teema,ulkoasu,käyttäytyminen,asettelu,painike,kahva,kulma,reuna,kwm,koriste +X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,kehys,reunus,tyyli,teema,ulkoasu,toiminta,asettelu,painike,kahva,kulma,reuna,kwm,koriste X-KDE-Keywords[fr]=kwin,fenêtre,gestionnaire,composition,bordure,style,thème,apparence,comportement,disposition,bouton,prise en main,bord,kwm,décoration X-KDE-Keywords[ga]=kwin,fuinneog,bainisteoir,imlíne,stíl,téama,cuma,brath,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán X-KDE-Keywords[hu]=kwin,ablak,kezelő,szegély,stílus,téma,kinézet,megjelenés,elrendezés,gomb,kezel,szél,kwm,dekoráció diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 7df86c129b..2931d0702a 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -37,7 +37,7 @@ Name[es]=Comportamiento de la ventana Name[et]=Akende käitumine Name[eu]=Leihoen portaera Name[fa]=رفتار پنجره -Name[fi]=Ikkunoiden käyttäytyminen +Name[fi]=Ikkunoiden toiminta Name[fr]=Comportement des fenêtres Name[fy]=Finstergedrach Name[ga]=Oibriú na bhFuinneog @@ -196,7 +196,7 @@ X-KDE-Keywords[da]=fokus,placering,vinduesopførsel,animation,hæv,autohæv,vind X-KDE-Keywords[de]=Aktivierung,Platzierung,Fensterverhalten,Animation,Nach vorn/hinten, Fenster,Rahmen,Umrandung,Titelleiste,Doppelklick X-KDE-Keywords[es]=foco,localización,comportamiento de la ventana,animación,elevación,autoelevación,ventanas,marco,barra de título,doble clic X-KDE-Keywords[et]=fookus,asetus,paigutus,akende käitumine,animeerimine,animatsioon,esiletoomine,automaatne esiletoomine,aknad,raam,tiitliriba,topeltklõps -X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,ikkunoiden käyttäytyminen,animaatio,nosta,automaattinen nosto,ikkunat,kehys,otsikkopalkki,kaksoisnapsautus,tuplanapsautus,kaksoisklikkaus,tuplaklikkaus +X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,ikkunoiden toiminta,animaatio,nosta,automaattinen nosto,ikkunat,kehys,otsikkopalkki,kaksoisnapsautus,tuplanapsautus,kaksoisklikkaus,tuplaklikkaus X-KDE-Keywords[fr]=focus,placement,comportement de la fenêtre,animation,agrandissement,agrandissement automatique,fenêtres,cadre,barre de titre,double clic X-KDE-Keywords[ga]=fócas,láithriú,oibriú na bhfuinneog,beochan,ardaigh,uathardaigh,fuinneoga,fráma,ceannteideal,déchliceáil X-KDE-Keywords[hu]=fókus,elhelyezés,ablakműködés,animáció,felemelés,automatikus felemelés,ablakok,keret,címsor,dupla kattintás diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index e098003466..80723e783f 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -165,7 +165,7 @@ X-KDE-Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifi X-KDE-Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln X-KDE-Keywords[es]=tamaño,posición,estado,comportamiento de la ventana,ventanas,específicos,soluciones,recordatorio,reglas X-KDE-Keywords[et]=suurus,asukoht,olek,akende käitumine,aknad,meeldejätmine,reeglid -X-KDE-Keywords[fi]=koko,sijainti,tila,ikkunan käyttäytyminen,ikkunat,erikoisasetukset,ikkunakohtaiset,korjaukset,muista,muistaminen,säännöt +X-KDE-Keywords[fi]=koko,sijainti,tila,ikkunoiden toiminta,ikkunat,erikoisasetukset,ikkunakohtaiset,korjaukset,muista,muistaminen,säännöt X-KDE-Keywords[fr]=taille,position,état,comportement de la fenêtre,fenêtres,spécifique,contournements,rappel,règles X-KDE-Keywords[ga]=méid,ionad,staid,oibriú na bhfuinneog,fuinneoga,sainiúil,réitigh seiftithe,meabhraigh,rialacha X-KDE-Keywords[hu]=méret,elhelyezkedés,állapot,ablakműködés,ablakok,specifikus,kerülő megoldások,megjegyzés,szabályok From 5c7d046d138ddaab6f7320ebd1d5f53a0e01c4cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 30 Jul 2012 20:00:25 +0200 Subject: [PATCH 4/5] Install event filter on Aurorae Decoration to handle WheelEvents Unfortunately QtQuick 1 does not provide a way to receive Wheel events. But the window decoration needs to pass wheel events on the titlebar to KWin core. In order to process also Wheel Events in Aurorae an event filter is installed on the widget and in case the mouse positon is on the title bar the titlebarMouseWheelOperation is invoked. BUG: 304248 FIXED-IN: 4.9.1 REVIEW: 105801 --- clients/aurorae/src/aurorae.cpp | 18 ++++++++++++++++++ clients/aurorae/src/aurorae.h | 1 + 2 files changed, 19 insertions(+) diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp index ed5942eff0..64b4901cf6 100644 --- a/clients/aurorae/src/aurorae.cpp +++ b/clients/aurorae/src/aurorae.cpp @@ -193,6 +193,7 @@ void AuroraeClient::init() createMainWidget(); widget()->setAttribute(Qt::WA_TranslucentBackground); widget()->setAttribute(Qt::WA_NoSystemBackground); + widget()->installEventFilter(this); m_view = new QGraphicsView(m_scene, widget()); m_view->setAttribute(Qt::WA_TranslucentBackground); m_view->setWindowFlags(Qt::X11BypassWindowManagerHint); @@ -213,6 +214,23 @@ void AuroraeClient::init() connect(AuroraeFactory::instance()->theme(), SIGNAL(themeChanged()), SLOT(themeChanged())); } +bool AuroraeClient::eventFilter(QObject *object, QEvent *event) +{ + // we need to filter the wheel events on the decoration + // QML does not yet provide a way to accept wheel events, this will change with Qt 5 + // TODO: remove in KDE5 + // see BUG: 304248 + if (object != widget() || event->type() != QEvent::Wheel) { + return KDecorationUnstable::eventFilter(object, event); + } + QWheelEvent *wheel = static_cast(event); + if (mousePosition(wheel->pos()) == PositionCenter) { + titlebarMouseWheelOperation(wheel->delta()); + return true; + } + return false; +} + void AuroraeClient::activeChange() { emit activeChanged(); diff --git a/clients/aurorae/src/aurorae.h b/clients/aurorae/src/aurorae.h index 9c20787869..b3586fd250 100644 --- a/clients/aurorae/src/aurorae.h +++ b/clients/aurorae/src/aurorae.h @@ -105,6 +105,7 @@ class AuroraeClient : public KDecorationUnstable public: AuroraeClient(KDecorationBridge* bridge, KDecorationFactory* factory); virtual ~AuroraeClient(); + virtual bool eventFilter(QObject *object, QEvent *event); virtual void activeChange(); virtual void borders(int& left, int& right, int& top, int& bottom) const; virtual void captionChange(); From 46441998a39f8ba78b5f2154231508f8b252140d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sun, 29 Jul 2012 22:03:11 +0200 Subject: [PATCH 5/5] Do not accept left mouse press events on titlebar in Aurorae Accepting the mouse events breaks moving the window by dragging the title bar. The reason is that it eats the mouse event and by that never reaches KWin core to perform the movement. Other mouse buttons need to be accepted for handling the window operations. Also we need to listen in general to left mouse button for the double click operation. BUG: 304249 FIXED-IN: 4.9.1 REVIEW: 105784 --- clients/aurorae/src/qml/aurorae.qml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/clients/aurorae/src/qml/aurorae.qml b/clients/aurorae/src/qml/aurorae.qml index 00982b4891..f1538736eb 100644 --- a/clients/aurorae/src/qml/aurorae.qml +++ b/clients/aurorae/src/qml/aurorae.qml @@ -155,7 +155,13 @@ Decoration { acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton anchors.fill: parent onDoubleClicked: decoration.titlebarDblClickOperation() - onPressed: decoration.titlePressed(mouse.button, mouse.buttons) + onPressed: { + if (mouse.button == Qt.LeftButton) { + mouse.accepted = false; + } else { + decoration.titlePressed(mouse.button, mouse.buttons); + } + } onReleased: decoration.titleReleased(mouse.button, mouse.buttons) } Behavior on color {