From 5b40492a847946c87029b8d58e6b051753689705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Fri, 16 Dec 2011 17:36:27 +0100 Subject: [PATCH 1/8] add support for graphicssystem selection REVIEW: 103430 CCBUG: 289904 (cherry picked from commit ded4ed4e9dc32316c41a43b6e906bece4b92338f) --- composite.cpp | 13 +++++++++++-- libkwineffects/kwinglobals.cpp | 3 ++- main.cpp | 16 ++++++++++++++++ workspace.cpp | 14 ++++++++++++++ workspace.h | 1 + 5 files changed, 44 insertions(+), 3 deletions(-) diff --git a/composite.cpp b/composite.cpp index 8c793ea823..6e5c27363b 100644 --- a/composite.cpp +++ b/composite.cpp @@ -232,8 +232,17 @@ void Workspace::finishCompositing() void Workspace::fallbackToXRenderCompositing() { finishCompositing(); - options->compositingMode = XRenderCompositing; - setupCompositing(); + KConfigGroup config(KSharedConfig::openConfig("kwinrc"), "Compositing"); + config.writeEntry("Backend", "XRender"); + config.writeEntry("GraphicsSystem", "native"); + config.sync(); + if (Extensions::nonNativePixmaps()) { // must restart to change the graphicssystem + restartKWin("automatic graphicssystem change for XRender backend"); + return; + } else { + options->compositingMode = XRenderCompositing; + setupCompositing(); + } } void Workspace::lostCMSelection() diff --git a/libkwineffects/kwinglobals.cpp b/libkwineffects/kwinglobals.cpp index 69fc99af1e..575813ee3f 100644 --- a/libkwineffects/kwinglobals.cpp +++ b/libkwineffects/kwinglobals.cpp @@ -134,7 +134,8 @@ void Extensions::init() kDebug(1212) << "Extensions: shape: 0x" << QString::number(shape_version, 16) << " composite: 0x" << QString::number(composite_version, 16) << " render: 0x" << QString::number(render_version, 16) - << " fixes: 0x" << QString::number(fixes_version, 16) << endl; + << " fixes: 0x" << QString::number(fixes_version, 16) + << " non_native_pixmaps: " << non_native_pixmaps << endl; } void Extensions::fillExtensionsData(const char**& extensions, int& nextensions, int*&opcodes, int*& error_bases) diff --git a/main.cpp b/main.cpp index 3773063da2..d61db714b9 100644 --- a/main.cpp +++ b/main.cpp @@ -409,6 +409,22 @@ KDE_EXPORT int kdemain(int argc, char * argv[]) KWorkSpace::trimMalloc(); + // the raster graphicssystem has a quite terrible performance on the XRender backend or when not + // compositing at all while some to many decorations suffer from bad performance of the native + // graphicssystem (lack of implementation, QGradient internally uses the raster system and + // XPutImage's the result because some graphics drivers have insufficient or bad performing + // implementations of XRenderCreate*Gradient) + // + // Therefore we allow configurationa and do some automagic selection to discourage + // ""known to be stupid" ideas ;-P + // The invalid system parameter "" will use the systems default graphicssystem + // "!= XRender" is intended since eg. pot. SW backends likely would profit from raster as well + KConfigGroup config(KSharedConfig::openConfig("kwinrc"), "Compositing"); + QString preferredSystem("native"); + if (config.readEntry("Enabled", true) && config.readEntry("Backend", "OpenGL") != "XRender") + preferredSystem = ""; + QApplication::setGraphicsSystem(config.readEntry("GraphicsSystem", preferredSystem)); + Display* dpy = XOpenDisplay(NULL); if (!dpy) { fprintf(stderr, "%s: FATAL ERROR while trying to open display %s\n", diff --git a/workspace.cpp b/workspace.cpp index 3c67ae6085..b4fd27746d 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -1044,10 +1044,24 @@ void Workspace::slotReconfigure() } } +void Workspace::restartKWin(const QString &reason) +{ + kDebug(1212) << "restarting kwin for:" << reason; + char cmd[1024]; // copied from crashhandler - maybe not the best way to do? + sprintf(cmd, "%s --replace &", QFile::encodeName(QCoreApplication::applicationFilePath()).constData()); + system(cmd); +} + void Workspace::slotReinitCompositing() { // Reparse config. Config options will be reloaded by setupCompositing() KGlobal::config()->reparseConfiguration(); + const QString graphicsSystem = KConfigGroup(KSharedConfig::openConfig("kwinrc"), "Compositing").readEntry("GraphicsSystem", ""); + if ((Extensions::nonNativePixmaps() && graphicsSystem == "native") || + (!Extensions::nonNativePixmaps() && (graphicsSystem == "raster" || graphicsSystem == "raster")) ) { + restartKWin("explicitly reconfigured graphicsSystem change"); + return; + } // Update any settings that can be set in the compositing kcm. #ifdef KWIN_BUILD_SCREENEDGES diff --git a/workspace.h b/workspace.h index 60693243d4..9438f3ef03 100644 --- a/workspace.h +++ b/workspace.h @@ -702,6 +702,7 @@ private: void initShortcuts(); void initDesktopPopup(); void initActivityPopup(); + void restartKWin(const QString &reason); void discardPopup(); void setupWindowShortcut(Client* c); void checkCursorPos(); From 8aa05a477bfc534dcd9b55487906af86f6fc539d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Thu, 29 Dec 2011 23:32:55 +0100 Subject: [PATCH 2/8] implement isActive in resize effect (cherry picked from commit 60281f9cc3c515db1c36139842374353bca3cb3a) --- effects/resize/resize.h | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/resize/resize.h b/effects/resize/resize.h index 88d29db4f2..0411d6d813 100644 --- a/effects/resize/resize.h +++ b/effects/resize/resize.h @@ -36,6 +36,7 @@ public: virtual inline bool provides(Effect::Feature ef) { return ef == Effect::Resize; } + inline bool isActive() const { return m_active; } virtual void prePaintScreen(ScreenPrePaintData& data, int time); virtual void prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time); virtual void paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data); From 48c28a9b3db2ac55377cf9342cac3bc10ab3b9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Thu, 29 Dec 2011 23:33:45 +0100 Subject: [PATCH 3/8] add dbus debug "activeEffects" REVIEW: 103572 CCBUG: 288948 CCBUG: 290025 (cherry picked from commit 089aeee91b807d13c0c2b86fa18d05776bef5190) --- composite.cpp | 7 +++++++ effects.cpp | 12 ++++++++++++ effects.h | 1 + org.kde.KWin.xml | 3 +++ workspace.h | 1 + 5 files changed, 24 insertions(+) diff --git a/composite.cpp b/composite.cpp index 6e5c27363b..55a7144007 100644 --- a/composite.cpp +++ b/composite.cpp @@ -275,6 +275,13 @@ void Workspace::toggleCompositing() } } +QStringList Workspace::activeEffects() const +{ + if (effects) + return static_cast< EffectsHandlerImpl* >(effects)->activeEffects(); + return QStringList(); +} + void Workspace::updateCompositeBlocking(Client *c) { if (c) { // if c == 0 we just check if we can resume diff --git a/effects.cpp b/effects.cpp index e388b33e4a..6c252c9e65 100644 --- a/effects.cpp +++ b/effects.cpp @@ -1253,6 +1253,18 @@ void EffectsHandlerImpl::effectsChanged() } } +QStringList EffectsHandlerImpl::activeEffects() const +{ + QStringList ret; + for(QVector< KWin::EffectPair >::const_iterator it = loaded_effects.constBegin(), + end = loaded_effects.constEnd(); it != end; ++it) { + if (it->second->isActive()) { + ret << it->first; + } + } + return ret; +} + EffectFrame* EffectsHandlerImpl::effectFrame(EffectFrameStyle style, bool staticSize, const QPoint& position, Qt::Alignment alignment) const { return new EffectFrameImpl(style, staticSize, position, alignment); diff --git a/effects.h b/effects.h index 6530871e8e..f4ad2fbd85 100644 --- a/effects.h +++ b/effects.h @@ -170,6 +170,7 @@ public: QStringList listOfEffects() const; QList elevatedWindows() const; + QStringList activeEffects() const; public Q_SLOTS: void slotClientGroupItemSwitched(EffectWindow* from, EffectWindow* to); diff --git a/org.kde.KWin.xml b/org.kde.KWin.xml index bd993ed90f..f89b2c70f1 100644 --- a/org.kde.KWin.xml +++ b/org.kde.KWin.xml @@ -81,5 +81,8 @@ + + + diff --git a/workspace.h b/workspace.h index 9438f3ef03..092b6a72ff 100644 --- a/workspace.h +++ b/workspace.h @@ -459,6 +459,7 @@ public: void previousTileLayout(); bool stopActivity(const QString &id); bool startActivity(const QString &id); + QStringList activeEffects() const; void setCurrentScreen(int new_screen); From e1d15d9c2118029c5459888100169ee3a1b1854c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Fri, 30 Dec 2011 01:18:04 +0100 Subject: [PATCH 4/8] present windows: keep highlighted windows in screen REVIEW: 103574 (cherry picked from commit 629e8d3885129db2be19bd313e07d6fa02caddc1) --- effects/presentwindows/presentwindows.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp index 52b713a81e..3b4ae26aad 100755 --- a/effects/presentwindows/presentwindows.cpp +++ b/effects/presentwindows/presentwindows.cpp @@ -343,8 +343,9 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region data.brightness *= interpolate(0.40, 1.0, winData->highlight); if (m_motionManager.isManaging(w)) { - if (w->isDesktop()) + if (w->isDesktop()) { effects->paintWindow(w, mask, region, data); + } m_motionManager.apply(w, data); QRect rect = m_motionManager.transformedGeometry(w).toRect(); @@ -353,8 +354,9 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region QRect area = effects->clientArea(FullScreenArea, w); QSizeF effSize(w->width()*data.xScale, w->height()*data.yScale); float tScale = sqrt((area.width()*area.height()) / (16.0*effSize.width()*effSize.height())); - if (tScale < 1.05) + if (tScale < 1.05) { tScale = 1.05; + } if (effSize.width()*tScale > area.width()) tScale = area.width() / effSize.width(); if (effSize.height()*tScale > area.height()) @@ -364,16 +366,21 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region if (scale < tScale) // don't use lanczos during transition mask &= ~PAINT_WINDOW_LANCZOS; - const QPoint ac = area.center(); - const QPoint wc = rect.center(); + const float df = (tScale-1.0f)*0.5f; + int tx = qRound(rect.width()*df); + int ty = qRound(rect.height()*df); + QRect tRect(rect.adjusted(-tx, -ty, tx, ty)); + tx = qMax(tRect.x(), area.x()) + qMin(0, area.right()-tRect.right()); + ty = qMax(tRect.y(), area.y()) + qMin(0, area.bottom()-tRect.bottom()); + tx = qRound((tx-rect.x())*winData->highlight); + ty = qRound((ty-rect.y())*winData->highlight); - data.xScale *= scale; - data.yScale *= scale; - const int tx = -w->width()*data.xScale*(scale-1.0)*(0.5+(wc.x() - ac.x())/area.width()); - const int ty = -w->height()*data.yScale*(scale-1.0)*(0.5+(wc.y() - ac.y())/area.height()); rect.translate(tx,ty); rect.setWidth(rect.width()*scale); rect.setHeight(rect.height()*scale); + + data.xScale *= scale; + data.yScale *= scale; data.xTranslate += tx; data.yTranslate += ty; } From 2a54c47ed1b2179c8fb7b4d5fdd5dfcab4fa9212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Mon, 2 Jan 2012 18:12:04 +0100 Subject: [PATCH 5/8] Fix one list pollution in tabbing code REVIEW: 103612 BUG: 290387 (cherry picked from commit 67b3dc9e619b60552ddf1c6506453037cd7830cf) --- clientgroup.cpp | 50 ++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/clientgroup.cpp b/clientgroup.cpp index abf6e6384d..2ccc737839 100644 --- a/clientgroup.cpp +++ b/clientgroup.cpp @@ -270,35 +270,39 @@ void ClientGroup::setVisible(Client* c) void ClientGroup::updateStates(Client* main, Client* only) { - for (ClientList::const_iterator i = clients_.constBegin(); i != clients_.constEnd(); ++i) - if ((*i) != main && (!only || (*i) == only)) { - if ((*i)->isMinimized() != main->isMinimized()) { + ClientList toBeRemoved; + for (ClientList::const_iterator i = clients_.constBegin(), end = clients_.constEnd(); i != end; ++i) { + Client *c = (*i); + if (c != main && (!only || c == only)) { + if (c->isMinimized() != main->isMinimized()) { if (main->isMinimized()) - (*i)->minimize(true); + c->minimize(true); else - (*i)->unminimize(true); + c->unminimize(true); } - if ((*i)->isShade() != main->isShade()) - (*i)->setShade(main->isShade() ? ShadeNormal : ShadeNone); - if ((*i)->geometry() != main->geometry()) - (*i)->setGeometry(main->geometry()); - if ((*i)->desktop() != main->desktop()) - (*i)->setDesktop(main->desktop()); - if ((*i)->isOnAllDesktops() != main->isOnAllDesktops()) - (*i)->setOnAllDesktops(main->isOnAllDesktops()); - if ((*i)->activities() != main->activities()) - (*i)->setOnActivities(main->activities()); - if ((*i)->keepAbove() != main->keepAbove()) - (*i)->setKeepAbove(main->keepAbove()); - if ((*i)->keepBelow() != main->keepBelow()) - (*i)->setKeepBelow(main->keepBelow()); + if (c->isShade() != main->isShade()) + c->setShade(main->isShade() ? ShadeNormal : ShadeNone); + if (c->geometry() != main->geometry()) + c->setGeometry(main->geometry()); + if (c->desktop() != main->desktop()) + c->setDesktop(main->desktop()); + if (c->isOnAllDesktops() != main->isOnAllDesktops()) + c->setOnAllDesktops(main->isOnAllDesktops()); + if (c->activities() != main->activities()) + c->setOnActivities(main->activities()); + if (c->keepAbove() != main->keepAbove()) + c->setKeepAbove(main->keepAbove()); + if (c->keepBelow() != main->keepBelow()) + c->setKeepBelow(main->keepBelow()); // If it's not possible to have the same states then ungroup them, TODO: Check all states - if ((*i)->geometry() != main->geometry()) - remove(*i); - if ((*i)->desktop() != main->desktop()) - remove(*i); + if (c->geometry() != main->geometry() || c->desktop() != main->desktop()) + toBeRemoved << c; } + } + + for (ClientList::const_iterator i = toBeRemoved.constBegin(), end = toBeRemoved.constEnd(); i != end; ++i) + remove(*i); } void ClientGroup::updateItems() From 375e2257fe20ac2c66754f34f23c761f3835f2ea Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Tue, 3 Jan 2012 16:57:38 +0100 Subject: [PATCH 6/8] SVN_SILENT made messages (.desktop file) --- kcmkwin/kwincompositing/kwincompositing.desktop | 2 ++ kcmkwin/kwindecoration/kwindecoration.desktop | 2 ++ kcmkwin/kwindesktop/desktop.desktop | 2 ++ kcmkwin/kwinoptions/kwinactions.desktop | 2 ++ kcmkwin/kwinoptions/kwinadvanced.desktop | 2 ++ kcmkwin/kwinoptions/kwinfocus.desktop | 2 ++ kcmkwin/kwinoptions/kwinmoving.desktop | 1 + kcmkwin/kwinoptions/kwinoptions.desktop | 2 ++ kcmkwin/kwinrules/kwinrules.desktop | 2 ++ kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 2 ++ kcmkwin/kwintabbox/kwintabbox.desktop | 1 + 11 files changed, 20 insertions(+) diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 377c5e1acd..6b94d7aef2 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -185,6 +185,8 @@ X-KDE-Keywords[da]=kwin,vindueshåndtering,window,manager,compositing,effekter X-KDE-Keywords[de]=kwin,fenster,manager,effekt,verwaltung,compositing X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,efekt X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,koostaminen,tehoste +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[ia]=kwin,fenestra,gerente,composite,effecto X-KDE-Keywords[kk]=kwin,window,manager,compositing,effect X-KDE-Keywords[nb]=kwin,vindu,behandler,sammensetting,effekt diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index b0090380e7..ddd2ac1183 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -165,6 +165,8 @@ 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[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[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[ia]=kwin,fenestra,gerente,margine,stilo,thema,aspecto,sentir,disposition,button,maneator,bordo,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 diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index 71b787a761..95315ae0cd 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -167,6 +167,8 @@ X-KDE-Keywords[da]=skrivebord,skriveborde,antal,virtuelle skriveborde X-KDE-Keywords[de]=Arbeitsfläche,Desktop,Anzahl,Virtuelle Arbeitsfläche X-KDE-Keywords[et]=töölaud,töölauad,arv,virtuaalne töölaud 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[hu]=asztal,asztalok,szám,virtuális asztal X-KDE-Keywords[ia]=scriptorio,scriptorios,numero,scriptorio virtual X-KDE-Keywords[kk]=desktop,desktops,number,virtual desktop X-KDE-Keywords[nb]=skrivebord,antall,virtuelt skrivebord diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 20ca71bfb2..6e8a625802 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -194,6 +194,8 @@ X-KDE-Keywords[da]=skyg,maksimer,minimer,nedre,operationsmenu,titellinje,ændr s X-KDE-Keywords[de]=Fensterheber,Maximieren,Minimieren,Nach oben/unten,Titelleiste,Größe ändern X-KDE-Keywords[et]=varjamine,peitmine,maksimeerimine,minimeerimine,allakerimine,üleskerimine,menüü,tiitliriba,suuruse muutmine X-KDE-Keywords[fi]=varjosta,rullaa,suurenna,pienennä,laske,toimintovalikko,otsikkopalkki,muuta kokoa +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[ia]=tinta,maximisa,maximisa,minimisa,minimisa,plus basse,menu de operationes,barra de titulo, redimensionar 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 diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 9aa95418c6..bf92b8c8c1 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -192,6 +192,8 @@ X-KDE-Keywords[da]=skyg,kant,hover,aktive kanter X-KDE-Keywords[de]=Schatten,Umrandung,Aktive Ränder,Schweben,Fensterheber X-KDE-Keywords[et]=varjamine,piire,aktiivsed piirded,hiire all X-KDE-Keywords[fi]=rullaus,kehys,reuna,leijunta,aktiiviset reunat,aktiiviset kehykset +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[ia]=degradation,margine,flottar,margines active X-KDE-Keywords[kk]=shading,border,hover,active borders X-KDE-Keywords[nb]=rulling,ramme,sveve,aktive kanter diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index adb35d869b..62d509ffcf 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -188,6 +188,8 @@ X-KDE-Keywords[ca]=focus,situació,elevació automàtica,elevació,elevació de X-KDE-Keywords[da]=fokus,placering,autohæv,hæv,klikhæv,tastatur,CDE,alt-tab,alle skriveborde X-KDE-Keywords[et]=fookus,paigutus,automaatne esiletoomine,esiletoomine,klõpsuga esiletoomine,klaviatuur,CDE,alt-tab,kõik töölauad X-KDE-Keywords[fi]=kohdistus,sijoittelu,sijoitus,automaattinen nosto,nosta,nosto,nosta napsauttamalla,näppäimistö,CDE,alt-tab,alt-sarkain +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[ia]=focus,placiamento,auto altiar,altiar,altiar de click,claviero,CDE,alt-tab,tote scriptorio 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 diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index 42fcc0722b..83f005addb 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -191,6 +191,7 @@ X-KDE-Keywords[da]=flytning,smart,kaskade,maksimer,hægtzone,hægt,kant X-KDE-Keywords[de]=Verschieben,Gestaffelt,Maximieren,Minimieren,Einrastzone,Ränder X-KDE-Keywords[et]=liigutamine,nutikas,kaskaad,maksimeerimine,haardetsoon,haaramine,piire 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[ia]=movente,intelligente,cascada,maximisa,maximiza,zona de ruptura,margine X-KDE-Keywords[kk]=moving,smart,cascade,maximize,maximise,snap zone,snap,border X-KDE-Keywords[nb]=flytting,smart,kaskade,maksimer,gripesone,gripe,kant diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index 456e9cc958..e9d348a52d 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -194,6 +194,8 @@ X-KDE-Keywords[ca]=focus,situació,comportament de finestra,animació,elevació, X-KDE-Keywords[da]=fokus,placering,vinduesopførsel,animation,hæv,autohæv,vinduesramme,titelbjælke,dobbeltklik 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[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[ia]=focus,placiamento,comportamento de fenestra,animation,altiar,auto altiar,fenestras,quadro,barra de titulo,duple click 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 diff --git a/kcmkwin/kwinrules/kwinrules.desktop b/kcmkwin/kwinrules/kwinrules.desktop index ccf302fb22..bf17703eb2 100644 --- a/kcmkwin/kwinrules/kwinrules.desktop +++ b/kcmkwin/kwinrules/kwinrules.desktop @@ -163,6 +163,8 @@ X-KDE-Keywords[ca]=mida,posició,estat,comportament de finestra,finestres,espec X-KDE-Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifikt,workarounds,husk,regler 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,korjaukset,muista,muistaminen,säännöt +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[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas 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 diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index fa9f06acbf..26da3d8c12 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -152,6 +152,8 @@ X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,vora,acció,commutació,escriptor X-KDE-Keywords[da]=kwin,vindueshåndtering,window,manager,effekt,kant,handling,skrift,skrivebord X-KDE-Keywords[et]=kwin,aken,haldur,efekt,serv,piire,toiming,lülitamine,töölaud X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,ikkunaohjelma,tehoste,kulma,reuna,toiminto,vaihda,vaihto,vaihtaminen,työpöytä +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[ia]=kwin,fenestra,gerente,effecto,bordo,margine,action,commuta,scriptorio 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 diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index e2b28b282b..ee439b23c8 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -125,6 +125,7 @@ X-KDE-Keywords[ca]=finestra,finestres,commutador,commutador de finestres,commuta X-KDE-Keywords[da]=vindue,vinduer,skifter,vinduesskifter,skift,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[et]=aken,aknad,lülitaja,akende vahetaja,vahetamine,lülitamine,akende lülitamine,alttab,alt-tab,alt+tab,alt tab 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[ia]=fenestra,fenestras,commutator,commutator de fenestra,commutar,commutar fenestra,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 From d08182e72fd5131f21a40a3cfc5bfac213686705 Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Wed, 4 Jan 2012 09:38:43 +0100 Subject: [PATCH 7/8] SVN_SILENT made messages (.desktop file) --- effects/highlightwindow/highlightwindow.desktop | 2 +- effects/login/login.desktop | 2 +- effects/login/login_config.desktop | 2 +- effects/logout/logout.desktop | 2 +- effects/magnifier/magnifier.desktop | 2 +- effects/showfps/showfps.desktop | 2 +- effects/taskbarthumbnail/taskbarthumbnail.desktop | 2 +- effects/trackmouse/trackmouse.desktop | 2 +- kcmkwin/kwincompositing/kwincompositing.desktop | 1 + kcmkwin/kwindesktop/desktop.desktop | 1 + 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/effects/highlightwindow/highlightwindow.desktop b/effects/highlightwindow/highlightwindow.desktop index 88974f8906..d29add41ce 100644 --- a/effects/highlightwindow/highlightwindow.desktop +++ b/effects/highlightwindow/highlightwindow.desktop @@ -125,7 +125,7 @@ Comment[sr@latin]=Isticanje odgovarajućih prozora pri lebdenju nad stavkama u t Comment[sv]=Markera motsvarande fönster när pekaren hålls över poster i aktivitetsfältet Comment[th]=เน้นหน้าต่างที่สัมพันธ์กับการเคลื่อนเมาส์มาอยู่เหนือรายการที่อยู่ในถาดงานบนแถบพาเนลระบบ Comment[tr]=Bir pencerenin görev çubuğundaki girdisi üzerine gelindiğinde o pencereyi vurgula -Comment[ug]=چاشقىنەك نۇر بەلگە ۋەزىپە بالداقتا تۇرغاندا مۇناسىپ كۆزنەكنى يورۇت +Comment[ug]=چاشقىنەك نۇربەلگە ۋەزىپە بالداقتا تۇرغاندا مۇناسىپ كۆزنەكنى يورۇت Comment[uk]=Підсвічування відповідного вікна у відповідь на наведення вказівника миші на елементи панелі задач Comment[wa]=Met en evidince li bon purnea cwand l' cursoe passe pa dzeu ls intrêyes del båre des bouyes Comment[x-test]=xxHighlight the appropriate window when hovering over taskbar entriesxx diff --git a/effects/login/login.desktop b/effects/login/login.desktop index b156fd8172..dc67ab55eb 100644 --- a/effects/login/login.desktop +++ b/effects/login/login.desktop @@ -76,7 +76,7 @@ Name[te]=లాగిన్ Name[tg]=Воридот Name[th]=ลงบันทึกเข้าระบบ Name[tr]=Giriş -Name[ug]=تىزىمغا كىر +Name[ug]=كىرىش Name[uk]=Вхід Name[uz]=Kirish Name[uz@cyrillic]=Кириш diff --git a/effects/login/login_config.desktop b/effects/login/login_config.desktop index 16a560a5f0..cb071e4546 100644 --- a/effects/login/login_config.desktop +++ b/effects/login/login_config.desktop @@ -83,7 +83,7 @@ Name[te]=లాగిన్ Name[tg]=Воридот Name[th]=ลงบันทึกเข้าระบบ Name[tr]=Giriş -Name[ug]=تىزىمغا كىر +Name[ug]=كىرىش Name[uk]=Вхід Name[uz]=Kirish Name[uz@cyrillic]=Кириш diff --git a/effects/logout/logout.desktop b/effects/logout/logout.desktop index 5ce93ae212..ee426ff5dd 100644 --- a/effects/logout/logout.desktop +++ b/effects/logout/logout.desktop @@ -76,7 +76,7 @@ Name[te]=లాగ్అవుట్ Name[tg]=Баромадан Name[th]=ลงบันทึกออกจากระบบ Name[tr]=Çıkış -Name[ug]=تىزىمدىن چىق +Name[ug]=تىزىمدىن چىىش Name[uk]=Вихід Name[uz]=Chiqish Name[uz@cyrillic]=Чиқиш diff --git a/effects/magnifier/magnifier.desktop b/effects/magnifier/magnifier.desktop index edaf4957ab..8583b8199a 100644 --- a/effects/magnifier/magnifier.desktop +++ b/effects/magnifier/magnifier.desktop @@ -147,7 +147,7 @@ Comment[sv]=Förstorar den del av skärmen som är nära muspekaren Comment[ta]=Magnify the section of the screen that is near the mouse cursor Comment[th]=แว่นขยายบางส่วนของหน้าจอที่อยู่ใกล้กับตัวชี้ของเมาส์ Comment[tr]=Farenin altındaki ekran bölümünü büyüt -Comment[ug]=چاشقىنەك نۇر بەلگىسى ئەتراپىنى چوڭايتىدۇ +Comment[ug]=چاشقىنەك نۇربەلگىسى ئەتراپىنى چوڭايتىدۇ Comment[uk]=Збільшення частини екрана поруч з вказівником миші Comment[wa]=Met l' loupe sol seccion del waitroûle k' est dlé l' cursoe del sori Comment[x-test]=xxMagnify the section of the screen that is near the mouse cursorxx diff --git a/effects/showfps/showfps.desktop b/effects/showfps/showfps.desktop index 4d8e2092ca..f18b8b81a2 100644 --- a/effects/showfps/showfps.desktop +++ b/effects/showfps/showfps.desktop @@ -141,7 +141,7 @@ Comment[ta]=Display KWin's performance in the corner of the screen Comment[te]=స్క్రీన్ మూలలో KWinయొక్క పనితనమును ప్రదర్శించుము Comment[th]=แสดงประสิทธิภาพของ KWin ในมุมของหน้าจอ Comment[tr]=KWin başarımını ekranın köşesinde göster -Comment[ug]=ئېكران بۇلۇڭىدا KWin نىڭ ئۈنۈم سانلىق مەلۇماتىنى كۆرسەت +Comment[ug]=ئېكران بۇلۇڭىدا KWin نىڭ ئۈنۈم سانلىق-مەلۇماتىنى كۆرسەت Comment[uk]=Показ параметра швидкодії KWin (частоти кадрів) у куті екрана Comment[wa]=Håyner les performance di KWin el coine del waitroûle Comment[x-test]=xxDisplay KWin's performance in the corner of the screenxx diff --git a/effects/taskbarthumbnail/taskbarthumbnail.desktop b/effects/taskbarthumbnail/taskbarthumbnail.desktop index ea9e9b730f..19ce007b87 100644 --- a/effects/taskbarthumbnail/taskbarthumbnail.desktop +++ b/effects/taskbarthumbnail/taskbarthumbnail.desktop @@ -138,7 +138,7 @@ Comment[sv]=Visa miniatyrbilder av fönster när pekaren hålls över deras post Comment[ta]=Display window thumbnails when hovering over taskbar entries Comment[th]=แสดงภาพย่อของหน้าต่างเมื่อเคลื่อนเมาส์มาอยู่เหนือรายการในแถบงาน Comment[tr]=Bir pencerenin görev çubuğundaki girdisi üzerine gelindiğinde o pencerenin küçük resmini gösterir -Comment[ug]=چاشقىنەك نۇر بەلگە ۋەزىپە بالداقتا تۇرغاندا كۆزنەكنىڭ كىچىك سۈرىتىنى كۆرسەت +Comment[ug]=چاشقىنەك نۇربەلگە ۋەزىپە بالداقتا تۇرغاندا كۆزنەكنىڭ كىچىك سۈرىتىنى كۆرسەت Comment[uk]=Показ мініатюр вікон, коли вказівник буде наведено на елемент панелі задач Comment[wa]=Håyene les prévoeyaedjes des purneas cwand l' cursoe passe pa dzeu ls intrêyes sol båre des bouyes Comment[x-test]=xxDisplay window thumbnails when hovering over taskbar entriesxx diff --git a/effects/trackmouse/trackmouse.desktop b/effects/trackmouse/trackmouse.desktop index 8decdf9a58..d0cf8871ef 100644 --- a/effects/trackmouse/trackmouse.desktop +++ b/effects/trackmouse/trackmouse.desktop @@ -144,7 +144,7 @@ Comment[sv]=Visa en lokaliseringseffekt för muspekaren om aktiverad Comment[ta]=Display a mouse cursor locating effect when activated Comment[th]=เมื่อทำงานแล้ว จะมีลูกเล่นแสดงตำแหน่งตัวชี้ของเมาส์ Comment[tr]=Etkinleştirildiğinde fare imlecinin konumlandırma efektini gösterir -Comment[ug]=ئاكتىپلىغاندا چاشقىنەك نۇر بەلگىسىنى ئورۇن بەلگىلەش ئۈنۈمىنى كۆرسىتىدۇ +Comment[ug]=ئاكتىپلىغاندا چاشقىنەك نۇربەلگىسىنى ئورۇن بەلگىلەش ئۈنۈمىنى كۆرسىتىدۇ Comment[uk]=Показ наближення вказівника миші Comment[wa]=Håyene èn efet d' trovaedje do cursoe del sori cwand èn alaedje Comment[x-test]=xxDisplay a mouse cursor locating effect when activatedxx diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 6b94d7aef2..1831716ed9 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -190,6 +190,7 @@ X-KDE-Keywords[hu]=kwin,ablak,kezelő,kompozitálás,effektus X-KDE-Keywords[ia]=kwin,fenestra,gerente,composite,effecto X-KDE-Keywords[kk]=kwin,window,manager,compositing,effect X-KDE-Keywords[nb]=kwin,vindu,behandler,sammensetting,effekt +X-KDE-Keywords[nds]=KWin,Finster,Pleger,Tosamensetten,Effekt X-KDE-Keywords[nl]=kwin,venster,beheerder,compositing,effect X-KDE-Keywords[pt]=kwin,janela,gestor,composição,efeito X-KDE-Keywords[pt_BR]=kwin,janela,gerenciador,composição,efeito diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index 95315ae0cd..0e9ffe226b 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -172,6 +172,7 @@ X-KDE-Keywords[hu]=asztal,asztalok,szám,virtuális asztal X-KDE-Keywords[ia]=scriptorio,scriptorios,numero,scriptorio virtual X-KDE-Keywords[kk]=desktop,desktops,number,virtual desktop X-KDE-Keywords[nb]=skrivebord,antall,virtuelt skrivebord +X-KDE-Keywords[nds]=Schriefdisch,Schriefdischen,Tall,Virtuell Schriefdisch X-KDE-Keywords[nl]=bureaublad,bureaubladen,nummer,virtueel bureaublad X-KDE-Keywords[pt]=ecrã,ecrãs,número,ecrã virtual X-KDE-Keywords[pt_BR]=área de trabalho,áreas de trabalho,número,área de trabalho virtual From f1dfdef1abcaafa30cf32d73432fee9b4a6dbacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 4 Jan 2012 19:47:59 +0100 Subject: [PATCH 8/8] No longer enable BoxSwitch by default Thanks to terietor for noticing this problem. --- effects/boxswitch/boxswitch.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/boxswitch/boxswitch.desktop b/effects/boxswitch/boxswitch.desktop index 07680a2d1b..65b8e0ab2a 100644 --- a/effects/boxswitch/boxswitch.desktop +++ b/effects/boxswitch/boxswitch.desktop @@ -155,6 +155,6 @@ X-KDE-PluginInfo-Version=0.1.0 X-KDE-PluginInfo-Category=Window Management X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true +X-KDE-PluginInfo-EnabledByDefault=false X-KDE-Library=kwin4_effect_builtins X-KDE-Ordering=50