Merge branch 'KDE/4.8'

This commit is contained in:
Marco Martin 2012-01-20 16:31:32 +01:00
commit 47535d561b
13 changed files with 22 additions and 1 deletions

View file

@ -66,6 +66,15 @@ void Deleted::copyToDeleted(Toplevel* c)
{ {
assert(dynamic_cast< Deleted* >(c) == NULL); assert(dynamic_cast< Deleted* >(c) == NULL);
Toplevel::copyToDeleted(c); Toplevel::copyToDeleted(c);
// In some cases the window has been deleted before the sync request which marks
// the window ready for painting has finished. This is especially troublesome
// when effects reference the deleted window and the unreferencing is part of
// the rendering pass (e.g. Effect::postPaintScreen/postPaintWindow), which will
// never be executed because we remove it every time from the stacking list in
// Workspace::performCompositing.
if (!c->readyForPainting()) {
QTimer::singleShot(0, this, SLOT(discard()));
}
desk = c->desktop(); desk = c->desktop();
activityList = c->activities(); activityList = c->activities();
contentsRect = QRect(c->clientPos(), c->clientSize()); contentsRect = QRect(c->clientPos(), c->clientSize());

View file

@ -35,7 +35,6 @@ public:
// used by effects to keep the window around for e.g. fadeout effects when it's destroyed // used by effects to keep the window around for e.g. fadeout effects when it's destroyed
void refWindow(); void refWindow();
void unrefWindow(bool delay = false); void unrefWindow(bool delay = false);
void discard(allowed_t);
virtual int desktop() const; virtual int desktop() const;
virtual QStringList activities() const; virtual QStringList activities() const;
virtual QPoint clientPos() const; virtual QPoint clientPos() const;
@ -58,6 +57,8 @@ public:
} }
void layoutDecorationRects(QRect &left, QRect &top, QRect &right, QRect &bottom) const; void layoutDecorationRects(QRect &left, QRect &top, QRect &right, QRect &bottom) const;
QRect decorationRect() const; QRect decorationRect() const;
public slots:
void discard(allowed_t = Allowed);
protected: protected:
virtual void debug(QDebug& stream) const; virtual void debug(QDebug& stream) const;
virtual bool shouldUnredirect() const; virtual bool shouldUnredirect() const;

View file

@ -190,6 +190,7 @@ X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,koostaminen,tehoste
X-KDE-Keywords[ga]=kwin,fuinneog,bainisteoir,comhshuíomh,maisíocht X-KDE-Keywords[ga]=kwin,fuinneog,bainisteoir,comhshuíomh,maisíocht
X-KDE-Keywords[hu]=kwin,ablak,kezelő,kompozitálás,effektus X-KDE-Keywords[hu]=kwin,ablak,kezelő,kompozitálás,effektus
X-KDE-Keywords[ia]=kwin,fenestra,gerente,composite,effecto X-KDE-Keywords[ia]=kwin,fenestra,gerente,composite,effecto
X-KDE-Keywords[it]=kwin,gestore,finestre,composizione,effetti
X-KDE-Keywords[kk]=kwin,window,manager,compositing,effect X-KDE-Keywords[kk]=kwin,window,manager,compositing,effect
X-KDE-Keywords[nb]=kwin,vindu,behandler,sammensetting,effekt X-KDE-Keywords[nb]=kwin,vindu,behandler,sammensetting,effekt
X-KDE-Keywords[nds]=KWin,Finster,Pleger,Tosamensetten,Effekt X-KDE-Keywords[nds]=KWin,Finster,Pleger,Tosamensetten,Effekt

View file

@ -170,6 +170,7 @@ X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,kehys,reunus,tyyli,teema,u
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[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ó 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ó
X-KDE-Keywords[ia]=kwin,fenestra,gerente,margine,stilo,thema,aspecto,sentir,disposition,button,maneator,bordo,kwm,decoration X-KDE-Keywords[ia]=kwin,fenestra,gerente,margine,stilo,thema,aspecto,sentir,disposition,button,maneator,bordo,kwm,decoration
X-KDE-Keywords[it]=kwin,gestore,finestre,bordo,stile,tema,aspetto,disposizione,pulsante,gestore,kwm,decorazione
X-KDE-Keywords[kk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration X-KDE-Keywords[kk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
X-KDE-Keywords[nb]=kwin,vindu,behandler,ramme,stil,tema,lås,utforming,knapp,håndtak,kant,kwm X-KDE-Keywords[nb]=kwin,vindu,behandler,ramme,stil,tema,lås,utforming,knapp,håndtak,kant,kwm
X-KDE-Keywords[nl]=kwin,venster,beheerder,grens,stijl,thema,look,feel,indeling,knop,handel,rand,kwm,decoratie X-KDE-Keywords[nl]=kwin,venster,beheerder,grens,stijl,thema,look,feel,indeling,knop,handel,rand,kwm,decoratie

View file

@ -172,6 +172,7 @@ X-KDE-Keywords[fi]=työpöytä,työpöydät,numero,luku,virtuaalityöpöytä
X-KDE-Keywords[ga]=deasc,deasca,uimhir,deasc fhíorúil X-KDE-Keywords[ga]=deasc,deasca,uimhir,deasc fhíorúil
X-KDE-Keywords[hu]=asztal,asztalok,szám,virtuális asztal X-KDE-Keywords[hu]=asztal,asztalok,szám,virtuális asztal
X-KDE-Keywords[ia]=scriptorio,scriptorios,numero,scriptorio virtual X-KDE-Keywords[ia]=scriptorio,scriptorios,numero,scriptorio virtual
X-KDE-Keywords[it]=desktop,numero,desktop virtuale
X-KDE-Keywords[kk]=desktop,desktops,number,virtual desktop X-KDE-Keywords[kk]=desktop,desktops,number,virtual desktop
X-KDE-Keywords[nb]=skrivebord,antall,virtuelt skrivebord X-KDE-Keywords[nb]=skrivebord,antall,virtuelt skrivebord
X-KDE-Keywords[nds]=Schriefdisch,Schriefdischen,Tall,Virtuell Schriefdisch X-KDE-Keywords[nds]=Schriefdisch,Schriefdischen,Tall,Virtuell Schriefdisch

View file

@ -199,6 +199,7 @@ X-KDE-Keywords[fi]=varjosta,rullaa,suurenna,pienennä,laske,toimintovalikko,otsi
X-KDE-Keywords[ga]=scáth,scáthaigh,uasmhéadaigh,íosmhéadaigh,íoslaghdaigh,laghdaigh,roghchlár oibríochta,barra teidil,athraigh méid X-KDE-Keywords[ga]=scáth,scáthaigh,uasmhéadaigh,íosmhéadaigh,íoslaghdaigh,laghdaigh,roghchlár oibríochta,barra teidil,athraigh méid
X-KDE-Keywords[hu]=árnyék,maximalizálás,maximalizálás,minimalizálás,minimalizálás,alacsonyabb,műveletek menü,címsáv,átméretezés X-KDE-Keywords[hu]=árnyék,maximalizálás,maximalizálás,minimalizálás,minimalizálás,alacsonyabb,műveletek menü,címsáv,átméretezés
X-KDE-Keywords[ia]=tinta,maximisa,maximisa,minimisa,minimisa,plus basse,menu de operationes,barra de titulo, redimensionar X-KDE-Keywords[ia]=tinta,maximisa,maximisa,minimisa,minimisa,plus basse,menu de operationes,barra de titulo, redimensionar
X-KDE-Keywords[it]=ombra,massimizza,minimizza,abbassa,menu operazioni,barra del titolo,ridimensiona
X-KDE-Keywords[kk]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize X-KDE-Keywords[kk]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize
X-KDE-Keywords[nb]=rull,maksimer,minimer,senk,handlinger,meny,tittellinje,endre størrelse X-KDE-Keywords[nb]=rull,maksimer,minimer,senk,handlinger,meny,tittellinje,endre størrelse
X-KDE-Keywords[nl]=verdonkeren,maximaliseren,minimaliseren,naar onderen,bedieningsmenu,titelbalk,grootte wijzigen X-KDE-Keywords[nl]=verdonkeren,maximaliseren,minimaliseren,naar onderen,bedieningsmenu,titelbalk,grootte wijzigen

View file

@ -197,6 +197,7 @@ X-KDE-Keywords[fi]=rullaus,kehys,reuna,leijunta,aktiiviset reunat,aktiiviset keh
X-KDE-Keywords[ga]=scáthú,imlíne,foluain,imlínte beo X-KDE-Keywords[ga]=scáthú,imlíne,foluain,imlínte beo
X-KDE-Keywords[hu]=árnyékolás,szegély,takarás,aktív szegélyek X-KDE-Keywords[hu]=árnyékolás,szegély,takarás,aktív szegélyek
X-KDE-Keywords[ia]=degradation,margine,flottar,margines active X-KDE-Keywords[ia]=degradation,margine,flottar,margines active
X-KDE-Keywords[it]=ombreggiatura,bordo,passaggio del mouse,bordi attivi
X-KDE-Keywords[kk]=shading,border,hover,active borders X-KDE-Keywords[kk]=shading,border,hover,active borders
X-KDE-Keywords[nb]=rulling,ramme,sveve,aktive kanter X-KDE-Keywords[nb]=rulling,ramme,sveve,aktive kanter
X-KDE-Keywords[nl]=verdonkering,grens,overheen bewegen,actieve grenzen X-KDE-Keywords[nl]=verdonkering,grens,overheen bewegen,actieve grenzen

View file

@ -194,6 +194,7 @@ X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,automaattinen nosto,nosta,nosto
X-KDE-Keywords[ga]=fócas,láithriú,uathardaigh,ardaigh,gliogardaigh,méarchlár,CDE,alt-tab,gach deasc X-KDE-Keywords[ga]=fócas,láithriú,uathardaigh,ardaigh,gliogardaigh,méarchlár,CDE,alt-tab,gach deasc
X-KDE-Keywords[hu]=fókusz,elhelyezés,automatikus felemelés,felemelés,felemelés kattintásra,billentyűzet,CDE,alt-tab,összes asztal X-KDE-Keywords[hu]=fókusz,elhelyezés,automatikus felemelés,felemelés,felemelés kattintásra,billentyűzet,CDE,alt-tab,összes asztal
X-KDE-Keywords[ia]=focus,placiamento,auto altiar,altiar,altiar de click,claviero,CDE,alt-tab,tote scriptorio X-KDE-Keywords[ia]=focus,placiamento,auto altiar,altiar,altiar de click,claviero,CDE,alt-tab,tote scriptorio
X-KDE-Keywords[it]=fuoco,posizionamento,sollevamento automatico,sollevamento,sollevamento al clic,tastiera,CDE,alt-tab,tutti i desktop
X-KDE-Keywords[kk]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop X-KDE-Keywords[kk]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop
X-KDE-Keywords[nb]=fokus,plassering,autohev,hev,klikk-hev,tastatur,CDE,alt-tab,alle skrivebord X-KDE-Keywords[nb]=fokus,plassering,autohev,hev,klikk-hev,tastatur,CDE,alt-tab,alle skrivebord
X-KDE-Keywords[nl]=focus,plaatsing,automatisch omhoog,omhoog,klik omhoog,toetsenbord,CDE,alt-tab,alle bureaublad X-KDE-Keywords[nl]=focus,plaatsing,automatisch omhoog,omhoog,klik omhoog,toetsenbord,CDE,alt-tab,alle bureaublad

View file

@ -195,6 +195,7 @@ X-KDE-Keywords[et]=liigutamine,nutikas,kaskaad,maksimeerimine,haardetsoon,haaram
X-KDE-Keywords[fi]=siirtäminen,älykäs,porrastus,suurentaminen,tarttuminen,kiinnitysalue,tartunta,kiinnitys,kiinnittyminen,reuna X-KDE-Keywords[fi]=siirtäminen,älykäs,porrastus,suurentaminen,tarttuminen,kiinnitysalue,tartunta,kiinnitys,kiinnittyminen,reuna
X-KDE-Keywords[hu]=mozgatás,intelligens,lépcsőzetes,maximalizálás,maximalizálás,vonzási távolság,szegély X-KDE-Keywords[hu]=mozgatás,intelligens,lépcsőzetes,maximalizálás,maximalizálás,vonzási távolság,szegély
X-KDE-Keywords[ia]=movente,intelligente,cascada,maximisa,maximiza,zona de ruptura,margine X-KDE-Keywords[ia]=movente,intelligente,cascada,maximisa,maximiza,zona de ruptura,margine
X-KDE-Keywords[it]=spostamento,intelligente,cascata,massimizza,zona di aggancio,agganciamento,bordo
X-KDE-Keywords[kk]=moving,smart,cascade,maximize,maximise,snap zone,snap,border X-KDE-Keywords[kk]=moving,smart,cascade,maximize,maximise,snap zone,snap,border
X-KDE-Keywords[nb]=flytting,smart,kaskade,maksimer,gripesone,gripe,kant X-KDE-Keywords[nb]=flytting,smart,kaskade,maksimer,gripesone,gripe,kant
X-KDE-Keywords[nl]=verplaatsen,smart,cascade,maximaliseren,zone vastzetten,vastzetten,grens X-KDE-Keywords[nl]=verplaatsen,smart,cascade,maximaliseren,zone vastzetten,vastzetten,grens

View file

@ -200,6 +200,7 @@ X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,ikkunoiden käyttäytyminen,ani
X-KDE-Keywords[ga]=fócas,láithriú,oibriú na bhfuinneog,beochan,ardaigh,uathardaigh,fuinneoga,fráma,ceannteideal,déchliceáil 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 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
X-KDE-Keywords[ia]=focus,placiamento,comportamento de fenestra,animation,altiar,auto altiar,fenestras,quadro,barra de titulo,duple click X-KDE-Keywords[ia]=focus,placiamento,comportamento de fenestra,animation,altiar,auto altiar,fenestras,quadro,barra de titulo,duple click
X-KDE-Keywords[it]=fuoco,posizionamento,comportamento della finestra,animazione,sollevamento,sollevamento automatico,finestre,riquadro,barra del titolo,doppio clic
X-KDE-Keywords[kk]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick X-KDE-Keywords[kk]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick
X-KDE-Keywords[nb]=fokus,plassering,vindusppførsel,animering,hev,autohev,vinduer,ramme,tittellinje,dobbeltklikk X-KDE-Keywords[nb]=fokus,plassering,vindusppførsel,animering,hev,autohev,vinduer,ramme,tittellinje,dobbeltklikk
X-KDE-Keywords[nl]=focus,plaatsing,venstegedrag,animatie,omhoog,automatisch omhoog,vensters,frame,titelbalk,dubbelklik X-KDE-Keywords[nl]=focus,plaatsing,venstegedrag,animatie,omhoog,automatisch omhoog,vensters,frame,titelbalk,dubbelklik

View file

@ -169,6 +169,7 @@ X-KDE-Keywords[fi]=koko,sijainti,tila,ikkunan käyttäytyminen,ikkunat,erikoisas
X-KDE-Keywords[ga]=méid,ionad,staid,oibriú na bhfuinneog,fuinneoga,sainiúil,réitigh seiftithe,meabhraigh,rialacha 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 X-KDE-Keywords[hu]=méret,elhelyezkedés,állapot,ablakműködés,ablakok,specifikus,kerülő megoldások,megjegyzés,szabályok
X-KDE-Keywords[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas X-KDE-Keywords[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas
X-KDE-Keywords[it]=dimensione,posizione,stato,comportamento della finestra,finestre,specifico,espedienti,ricorda,regole
X-KDE-Keywords[kk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules X-KDE-Keywords[kk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules
X-KDE-Keywords[nb]=størrelsse,plassering,vindusoppførsel,vindu,bestemt,løsninger,husk,regler X-KDE-Keywords[nb]=størrelsse,plassering,vindusoppførsel,vindu,bestemt,løsninger,husk,regler
X-KDE-Keywords[nl]=grootte,positie,status,venstergedrag,vensters,specifiek,er omheen gewerkt,herinneren,regels X-KDE-Keywords[nl]=grootte,positie,status,venstergedrag,vensters,specifiek,er omheen gewerkt,herinneren,regels

View file

@ -158,6 +158,7 @@ X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,tehoste,kulma,reuna,toimin
X-KDE-Keywords[ga]=kwin,fuinneog,bainisteoir,maisíocht,ciumhais,imlíne,gníomh,athraigh,athrú,deasc X-KDE-Keywords[ga]=kwin,fuinneog,bainisteoir,maisíocht,ciumhais,imlíne,gníomh,athraigh,athrú,deasc
X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,szél,szegély,művelet,váltás,asztal X-KDE-Keywords[hu]=kwin,ablak,kezelő,effektus,szél,szegély,művelet,váltás,asztal
X-KDE-Keywords[ia]=kwin,fenestra,gerente,effecto,bordo,margine,action,commuta,scriptorio X-KDE-Keywords[ia]=kwin,fenestra,gerente,effecto,bordo,margine,action,commuta,scriptorio
X-KDE-Keywords[it]=kwin,gestore,finestra,effetto,bordo,azione,cambio,desktop
X-KDE-Keywords[kk]=kwin,window,manager,effect,edge,border,action,switch,desktop X-KDE-Keywords[kk]=kwin,window,manager,effect,edge,border,action,switch,desktop
X-KDE-Keywords[nb]=kwin,vindu,behandler,effekt,kant,ramme,handling,bytte,skrivebord X-KDE-Keywords[nb]=kwin,vindu,behandler,effekt,kant,ramme,handling,bytte,skrivebord
X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,rand,grens,actie,schakelaar,bureaublad X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,rand,grens,actie,schakelaar,bureaublad

View file

@ -129,6 +129,7 @@ X-KDE-Keywords[et]=aken,aknad,lülitaja,akende vahetaja,vahetamine,lülitamine,a
X-KDE-Keywords[fi]=ikkuna,ikkunat,vaihtaja,vaihto,ikkunan vaihtaja,vaihtaminen,ikkunan vaihtaminen,ikkunan vaihto,alttab,alt-tab,alt+tab,alt tab,altsarkain,alt-sarkain,alt+sarkain,alt sarkain X-KDE-Keywords[fi]=ikkuna,ikkunat,vaihtaja,vaihto,ikkunan vaihtaja,vaihtaminen,ikkunan vaihtaminen,ikkunan vaihto,alttab,alt-tab,alt+tab,alt tab,altsarkain,alt-sarkain,alt+sarkain,alt sarkain
X-KDE-Keywords[hu]=ablak,ablakok,váltó,ablakváltó,váltás,ablakváltás,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[hu]=ablak,ablakok,váltó,ablakváltó,váltás,ablakváltás,alttab,alt-tab,alt+tab,alt tab
X-KDE-Keywords[ia]=fenestra,fenestras,commutator,commutator de fenestra,commutar,commutar fenestra,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[ia]=fenestra,fenestras,commutator,commutator de fenestra,commutar,commutar fenestra,alttab,alt-tab,alt+tab,alt tab
X-KDE-Keywords[it]=finestra,finestre,scambiatore,scambiafinestre,scambio,scambio finestre,alttab,alt-tab,alt+tab,alt tab
X-KDE-Keywords[kk]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[kk]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab
X-KDE-Keywords[nb]=vindu,vinduer,bytter,vindusbytter,bytte,vindusbytte,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[nb]=vindu,vinduer,bytter,vindusbytter,bytte,vindusbytte,alttab,alt-tab,alt+tab,alt tab
X-KDE-Keywords[nl]=venster,vensters,schakelaar,vensterwisselaar,wisseling,vensterwisseling,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[nl]=venster,vensters,schakelaar,vensterwisselaar,wisseling,vensterwisseling,alttab,alt-tab,alt+tab,alt tab