diff -Nru kde-workspace-4.8.0b/cmake/modules/UnixAuth.cmake kde-workspace-4.8.1/cmake/modules/UnixAuth.cmake --- kde-workspace-4.8.0b/cmake/modules/UnixAuth.cmake 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/cmake/modules/UnixAuth.cmake 2012-03-02 22:11:06.000000000 +0000 @@ -1,4 +1,4 @@ -find_package(PAM) +macro_optional_find_package(PAM) include(CheckFunctionExists) include(CheckLibraryExists) diff -Nru kde-workspace-4.8.0b/CMakeLists.txt kde-workspace-4.8.1/CMakeLists.txt --- kde-workspace-4.8.0b/CMakeLists.txt 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/CMakeLists.txt 2012-03-02 22:11:07.000000000 +0000 @@ -3,7 +3,7 @@ # Used e.g. in KDE4WorkspaceConfig.cmake, Alex set(KDE4WORKSPACE_VERSION_MAJOR 4) set(KDE4WORKSPACE_VERSION_MINOR 8) -set(KDE4WORKSPACE_VERSION_PATCH 00) +set(KDE4WORKSPACE_VERSION_PATCH 1) set(KDE4WORKSPACE_VERSION ${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION_MINOR}.${KDE4WORKSPACE_VERSION_PATCH} ) @@ -12,7 +12,7 @@ #search packages used by KDE set(QT_MIN_VERSION "4.7.0") -set(KDE_MIN_VERSION "4.8.0") +set(KDE_MIN_VERSION "4.8.1") set(SOPRANO_MIN_VERSION "2.5.63") find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED) find_package(Strigi REQUIRED) diff -Nru kde-workspace-4.8.0b/debian/changelog kde-workspace-4.8.1/debian/changelog --- kde-workspace-4.8.0b/debian/changelog 2012-03-05 11:57:36.000000000 +0000 +++ kde-workspace-4.8.1/debian/changelog 2012-03-07 17:06:25.000000000 +0000 @@ -1,3 +1,14 @@ +kde-workspace (4:4.8.1-0ubuntu1) precise; urgency=low + + [ Philip Muškovac ] + * New upstream release + - add networkmanager icons to kde-workspace-data.install + + [ Felix Geyer ] + * Drop libkwineffects1abi2-gles package since it's apparently obsolete. + + -- Philip Muškovac Wed, 07 Mar 2012 17:04:46 +0100 + kde-workspace (4:4.8.0b-0ubuntu6) precise; urgency=low * Add plasma-active as optional dependency of kde-workspace-bin diff -Nru kde-workspace-4.8.0b/debian/control kde-workspace-4.8.1/debian/control --- kde-workspace-4.8.0b/debian/control 2012-03-05 11:57:07.000000000 +0000 +++ kde-workspace-4.8.1/debian/control 2012-03-07 17:06:25.000000000 +0000 @@ -6,9 +6,9 @@ Uploaders: Sune Vuorela , Fathi Boudra , Armin Berres , Modestas Vainius , George Kiagiadakis , José Manuel Santamaría Lema -Build-Depends: kde-sc-dev-latest (>= 4:4.7.95), +Build-Depends: kde-sc-dev-latest (>= 4:4.8.1), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), dpkg-dev (>= 1.15.5), - libdlrestrictions-dev (>= 0.14), kdelibs5-dev (>= 4:4.7), kdepimlibs5-dev (>= 4:4.7), + libdlrestrictions-dev (>= 0.14), kdelibs5-dev (>= 4:4.8.1), kdepimlibs5-dev (>= 4:4.8.1), libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3), libqimageblitz-dev (>= 1:0.0.4-2), zlib1g-dev, @@ -428,7 +428,7 @@ Package: kde-window-manager-gles Section: x11 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, libkwineffects1abi2-gles, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, kde-window-manager-common (= ${binary:Version}) Provides: x-window-manager, kde-window-manager Replaces: kdebase-workspace-bin (<< 4:4.5.80) @@ -482,17 +482,6 @@ . This package is part of the KDE base workspace module. -Package: libkwineffects1abi2-gles -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: library used by effects for the KDE window manager - Open GL ES - This package contains a library used by effects for the KDE window manager. - This package was compiled with support for OpenGL ES 2.0, - before installing please make sure your video driver supports it. - . - This package is part of the KDE base workspace module. - Package: systemsettings Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff -Nru kde-workspace-4.8.0b/debian/kde-workspace-data.install kde-workspace-4.8.1/debian/kde-workspace-data.install --- kde-workspace-4.8.0b/debian/kde-workspace-data.install 2012-02-16 19:08:49.000000000 +0000 +++ kde-workspace-4.8.1/debian/kde-workspace-data.install 2012-03-07 17:06:25.000000000 +0000 @@ -271,6 +271,9 @@ usr/share/doc/kde/HTML/en/kcontrol/joystick/index.cache.bz2 usr/share/doc/kde/HTML/en/kcontrol/joystick/index.docbook usr/share/doc/kde/HTML/en/kcontrol/joystick/common +usr/share/icons/oxygen/22x22/apps/networkmanager.png +usr/share/icons/oxygen/32x32/apps/networkmanager.png +usr/share/icons/oxygen/64x64/apps/networkmanager.png usr/share/kde4/config/kfontinst.knsrc usr/share/kde4/apps/plasma/services/hotplug.operations usr/share/kde4/apps/plasma/services/powermanagementservice.operations Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/autostart/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/autostart/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/clock/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/clock/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/colors/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/colors/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/cursortheme/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/cursortheme/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/desktop/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/desktop/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/desktopthemedetails/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/desktopthemedetails/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/fontinst/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/fontinst/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/fonts/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/fonts/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/joystick/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/joystick/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/kcmaccess/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/kcmaccess/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/kcmsmserver/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/kcmsmserver/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/kcmstyle/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/kcmstyle/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/keyboard/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/keyboard/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/keys/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/keys/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/kwincompositing/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/kwincompositing/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/kwindecoration/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/kwindecoration/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/kwinscreenedges/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/kwinscreenedges/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/kwintabbox/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/kwintabbox/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/mouse/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/mouse/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/paths/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/paths/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/powerdevil/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/powerdevil/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/screensaver/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/screensaver/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/solid-actions/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/solid-actions/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/solid-hardware/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/solid-hardware/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/splashscreen/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/splashscreen/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/windowbehaviour/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/windowbehaviour/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/windowspecific/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/windowspecific/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kcontrol/workspaceoptions/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kcontrol/workspaceoptions/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kdm/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kdm/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kfontview/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kfontview/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kinfocenter/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kinfocenter/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/klipper/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/klipper/index.cache.bz2 differ diff -Nru kde-workspace-4.8.0b/doc/klipper/index.docbook kde-workspace-4.8.1/doc/klipper/index.docbook --- kde-workspace-4.8.0b/doc/klipper/index.docbook 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/doc/klipper/index.docbook 2012-03-02 22:11:07.000000000 +0000 @@ -30,8 +30,8 @@ &FDLNotice; -2011-06-20 -0.9.7 (&kde; 4.7) +2012-01-18 +0.9.7 (&kde; 4.8) &klipper; is the &kde; clipboard cut & paste utility. @@ -71,7 +71,6 @@ - To display the clipboard history, click on the &klipper; icon in the &kde; panel, or press &Ctrl;&Alt;V . Previous @@ -80,6 +79,10 @@ where it can be pasted into any &kde; or X application as usual. +The shortcut for this action has to be configured in the +System Tray Settings on the Entries +page. + You can search through the clipboard history by opening it (click on &klipper;) and typing your query. The results are updated as you type. In case you're wondering how to use the accelerator keys in @@ -231,7 +234,12 @@ - Adding Expressions/Actions Click the Add Action button Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/kmenuedit/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/kmenuedit/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/ksysguard/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/ksysguard/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/plasma-desktop/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/plasma-desktop/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/PolicyKit-kde/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/PolicyKit-kde/index.cache.bz2 differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/doc/systemsettings/index.cache.bz2 and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/doc/systemsettings/index.cache.bz2 differ diff -Nru kde-workspace-4.8.0b/kcontrol/access/kcmaccess.desktop kde-workspace-4.8.1/kcontrol/access/kcmaccess.desktop --- kde-workspace-4.8.0b/kcontrol/access/kcmaccess.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/access/kcmaccess.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -215,6 +215,7 @@ X-KDE-Keywords[pt]=acesso,acessibilidade,surdo,deficiente,campainha,campainha audível,campainha visível,teclado,teclas,teclas fixas,teclas lentas,teclas sonoras,navegação do rato,teclado numérico X-KDE-Keywords[pt_BR]=acesso,acessibilidade,surdo,deficiente,campainha,campainha audível,campainha visível,Teclado,teclas,teclas de aderência,teclas lentas,teclas de repercussão,navegação do mouse,teclado numérico X-KDE-Keywords[ro]=acces,accesibilitate,surd,handicap,clopoțel,clopoțel auzibil,clopoțel vizibil,tastatură,taste,taste persistente,taste fără repetiție,taste lente,navigare maus,taste numerice +X-KDE-Keywords[sk]=prístup,prístupnosť,hluchý,opitý,zvonček,hlasný zvonček,viditeľný zvonček,Klávesnica,klávesy,lepkavé klávesy,klákajúce klávesy,pomalé klávesy,navigácia myšou,numerická klávesnica X-KDE-Keywords[sr]=access,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num pad,приступ,приступачност,глув,оштећен,звоно,чујно,видно,тастатура,тастери,лепљиви,одскачући,спори,нумеричка X-KDE-Keywords[sr@ijekavian]=access,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num pad,приступ,приступачност,глув,оштећен,звоно,чујно,видно,тастатура,тастери,лепљиви,одскачући,спори,нумеричка X-KDE-Keywords[sr@ijekavianlatin]=access,accessibility,deaf,impaired,bell,audible bell,visible bell,Keyboard,keys,sticky keys,bounce keys,slow keys,mouse navigation,num pad,pristup,pristupačnost,gluv,oštećen,zvono,čujno,vidno,tastatura,tasteri,lepljivi,odskačući,spori,numerička diff -Nru kde-workspace-4.8.0b/kcontrol/autostart/autostart.desktop kde-workspace-4.8.1/kcontrol/autostart/autostart.desktop --- kde-workspace-4.8.0b/kcontrol/autostart/autostart.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/autostart/autostart.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -182,6 +182,7 @@ X-KDE-Keywords[pt_BR]=Gerenciador de inicialização X-KDE-Keywords[ro]=Administratorul de pornire automată X-KDE-Keywords[ru]=Автоматический запуск программ +X-KDE-Keywords[sk]=Správca automatického spustenia X-KDE-Keywords[sl]=Upravitelj samodejnega zagona X-KDE-Keywords[sr]=Autostart Manager,самопокретање,менаџер самопокретања X-KDE-Keywords[sr@ijekavian]=Autostart Manager,самопокретање,менаџер самопокретања diff -Nru kde-workspace-4.8.0b/kcontrol/bell/bell.desktop kde-workspace-4.8.1/kcontrol/bell/bell.desktop --- kde-workspace-4.8.0b/kcontrol/bell/bell.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/bell/bell.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -217,6 +217,7 @@ X-KDE-Keywords[pt]=Campainha,Áudio,Som,Volume,Frequência,Duração X-KDE-Keywords[pt_BR]=Campainha,Áudio,Som,Volume,Frequência,Duração X-KDE-Keywords[ro]=clopoțel,audio,sunet,volum,înălțime,durată +X-KDE-Keywords[sk]=Zvonček,Audio,Zvuk,Hlasitosť,Výška,Trvanie X-KDE-Keywords[sr]=Bell,Audio,Sound,Volume,Pitch,Duration,звоно,аудио,звук,јачина,трајање,висина X-KDE-Keywords[sr@ijekavian]=Bell,Audio,Sound,Volume,Pitch,Duration,звоно,аудио,звук,јачина,трајање,висина X-KDE-Keywords[sr@ijekavianlatin]=Bell,Audio,Sound,Volume,Pitch,Duration,zvono,audio,zvuk,jačina,trajanje,visina diff -Nru kde-workspace-4.8.0b/kcontrol/colors/colors.desktop kde-workspace-4.8.1/kcontrol/colors/colors.desktop --- kde-workspace-4.8.0b/kcontrol/colors/colors.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/colors/colors.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -216,6 +216,7 @@ X-KDE-Keywords[pt]=cores,esquema,contraste,cores dos elementos,esquema de cores X-KDE-Keywords[pt_BR]=cores,cores,esquema,contraste,Widget,cores,Esquema de Cores X-KDE-Keywords[ro]=culori,schemă,contrast,schemă de culori,schemă culori,culori controale +X-KDE-Keywords[sk]=farba,farby,schéma,kontrast,farby widgetov,Farebná schéma X-KDE-Keywords[sr]=colors,colours,scheme,contrast,Widget colors,Color Scheme,боје,шема,контраст,боје виџета,шема боја X-KDE-Keywords[sr@ijekavian]=colors,colours,scheme,contrast,Widget colors,Color Scheme,боје,шема,контраст,боје виџета,шема боја X-KDE-Keywords[sr@ijekavianlatin]=colors,colours,scheme,contrast,Widget colors,Color Scheme,boje,šema,kontrast,boje vidžeta,šema boja diff -Nru kde-workspace-4.8.0b/kcontrol/dateandtime/clock.desktop kde-workspace-4.8.1/kcontrol/dateandtime/clock.desktop --- kde-workspace-4.8.0b/kcontrol/dateandtime/clock.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/dateandtime/clock.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -208,7 +208,7 @@ X-KDE-Keywords[fi]=kello,päiväys,päivämäärä,aika,kellonaika,aikavyöhyke X-KDE-Keywords[ga]=clog,dáta,am,crios ama X-KDE-Keywords[hu]=óra,dátum,idő,időzóna -X-KDE-Keywords[ia]=horologio,data,tempore,zona de tempore +X-KDE-Keywords[ia]=horologio,data,tempore,fuso horari X-KDE-Keywords[it]=orologio,data,ora,fuso orario X-KDE-Keywords[kk]=clock,date,time,time zone X-KDE-Keywords[nb]=klokke,dato,tid,tidssone @@ -218,6 +218,7 @@ X-KDE-Keywords[pt]=relógio,data,hora,fuso-horário X-KDE-Keywords[pt_BR]=relógio,data,hora,fuso horário X-KDE-Keywords[ro]=ceas,dată,timp,data,ora,fus orar +X-KDE-Keywords[sk]=hodiny,dátum,čas,časové pásmo X-KDE-Keywords[sr]=clock,date,time,time zone,сат,часовник,датум,време,временска зона X-KDE-Keywords[sr@ijekavian]=clock,date,time,time zone,сат,часовник,датум,време,временска зона X-KDE-Keywords[sr@ijekavianlatin]=clock,date,time,time zone,sat,časovnik,datum,vreme,vremenska zona diff -Nru kde-workspace-4.8.0b/kcontrol/desktoppaths/desktoppath.desktop kde-workspace-4.8.1/kcontrol/desktoppaths/desktoppath.desktop --- kde-workspace-4.8.0b/kcontrol/desktoppaths/desktoppath.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/desktoppaths/desktoppath.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -215,6 +215,7 @@ X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,localizações,ecrã,pastas,arranque X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,localizações,área de trabalho,pastas,inicialização X-KDE-Keywords[ro]=konqueror,gestionare fișiere,căi,cale,birou,fișiere,dosare,pornire automată +X-KDE-Keywords[sk]=konqueror,správca súborov,cesty,plocha,adresáre,automatické spustenie X-KDE-Keywords[sr]=konqueror,filemanager,paths,desktop,directories,autostart,К‑освајач,менаџер фајлова,путање,површ,фасцикле,самопокретање X-KDE-Keywords[sr@ijekavian]=konqueror,filemanager,paths,desktop,directories,autostart,К‑освајач,менаџер фајлова,путање,површ,фасцикле,самопокретање X-KDE-Keywords[sr@ijekavianlatin]=konqueror,filemanager,paths,desktop,directories,autostart,K‑osvajač,menadžer fajlova,putanje,površ,fascikle,samopokretanje diff -Nru kde-workspace-4.8.0b/kcontrol/desktoptheme/desktoptheme.desktop kde-workspace-4.8.1/kcontrol/desktoptheme/desktoptheme.desktop --- kde-workspace-4.8.0b/kcontrol/desktoptheme/desktoptheme.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/desktoptheme/desktoptheme.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -156,6 +156,7 @@ X-KDE-Keywords[pt_BR]=Tema da área de trabalho X-KDE-Keywords[ro]=Tematica de birou X-KDE-Keywords[ru]=Тема рабочего стола +X-KDE-Keywords[sk]=Téma plochy X-KDE-Keywords[sl]=Tema za namizje X-KDE-Keywords[sr]=Desktop Theme,тема површи X-KDE-Keywords[sr@ijekavian]=Desktop Theme,тема површи diff -Nru kde-workspace-4.8.0b/kcontrol/fonts/fonts.desktop kde-workspace-4.8.1/kcontrol/fonts/fonts.desktop --- kde-workspace-4.8.0b/kcontrol/fonts/fonts.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/fonts/fonts.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -215,6 +215,7 @@ X-KDE-Keywords[nl]=lettertype,tekengrootte,stijlen,tekensets,paneel,besturingspaneel,bureaubladen,bestandsbeheerder,werkbalken,menu,venstertitel,titel,DPI X-KDE-Keywords[pt]=tipos de letra,tamanho de letra,estilos,codificações,codificações de caracteres,painel,painel de controlo,ecrãs,gestor de ficheiros,barras de ferramentas,menu,título da janela,título,PPP X-KDE-Keywords[pt_BR]=fontes,tamanho da fonte,estilos,codificações,codificações de caracteres,painel,painel de controle,áreas de trabalho,gerenciador de arquivos,barras de ferramentas,Menu,Título da janela,Título,PPP +X-KDE-Keywords[sk]=písmo,veľkosť písma,štýly,znakové sady, sady znakov,panel,ovládací panel,plochy,Správca súborov,Panely nástrojov,Ponuka,Titulok okna,Titulok,DPI X-KDE-Keywords[sr]=fonts,font size,styles,charsets,character sets,panel,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title,DPI,фонт,величина фонта,стил,кодирање,панел,контролни панел,површ,менаџер фајлова,траке алатки,мени,наслов прозора,тпи X-KDE-Keywords[sr@ijekavian]=fonts,font size,styles,charsets,character sets,panel,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title,DPI,фонт,величина фонта,стил,кодирање,панел,контролни панел,површ,менаџер фајлова,траке алатки,мени,наслов прозора,тпи X-KDE-Keywords[sr@ijekavianlatin]=fonts,font size,styles,charsets,character sets,panel,control panel,desktops,FileManager,Toolbars,Menu,Window Title,Title,DPI,font,veličina fonta,stil,kodiranje,panel,kontrolni panel,površ,menadžer fajlova,trake alatki,meni,naslov prozora,tpi diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/caldialog.cpp kde-workspace-4.8.1/kcontrol/hardware/joystick/caldialog.cpp --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/caldialog.cpp 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/caldialog.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by Martin Koller - * m.koller@surfeu.at + * kollix@aon.at * This file is part of the KDE Control Center Module for Joysticks * * This program is free software; you can redistribute it and/or modify diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/caldialog.h kde-workspace-4.8.1/kcontrol/hardware/joystick/caldialog.h --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/caldialog.h 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/caldialog.h 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef _CALDIALOG_H_ #define _CALDIALOG_H_ diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/joydevice.cpp kde-workspace-4.8.1/kcontrol/hardware/joystick/joydevice.cpp --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/joydevice.cpp 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/joydevice.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * @@ -8,15 +8,15 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * This program is distributed in the hope that it will be useful, * + * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "joydevice.h" diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/joydevice.h kde-workspace-4.8.1/kcontrol/hardware/joystick/joydevice.h --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/joydevice.h 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/joydevice.h 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef _JOYDEVICE_H_ #define _JOYDEVICE_H_ diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/joystick.cpp kde-workspace-4.8.1/kcontrol/hardware/joystick/joystick.cpp --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/joystick.cpp 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/joystick.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * @@ -80,7 +80,7 @@ setAboutData(new KAboutData("kcmjoystick", 0, ki18n("KDE Joystick Control Module"), "1.0", ki18n("KDE System Settings Module to test Joysticks"), KAboutData::License_GPL, ki18n("(c) 2004, Martin Koller"), - KLocalizedString(), "m.koller@surfeu.at")); + KLocalizedString(), "kollix@aon.at")); setQuickHelp( i18n("

Joystick

" "This module helps to check if your joystick is working correctly.
" diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/joystick.desktop kde-workspace-4.8.1/kcontrol/hardware/joystick/joystick.desktop --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/joystick.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/joystick.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -202,6 +202,7 @@ X-KDE-Keywords[pt]=joystick,comando X-KDE-Keywords[pt_BR]=joystick,gamepad X-KDE-Keywords[ro]=joystick,gamepad +X-KDE-Keywords[sk]=joystick,gamepad X-KDE-Keywords[sr]=joystick,gamepad,џојстик,гејмпад X-KDE-Keywords[sr@ijekavian]=joystick,gamepad,џојстик,гејмпад X-KDE-Keywords[sr@ijekavianlatin]=joystick,gamepad,džojstik,gejmpad diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/joystick.h kde-workspace-4.8.1/kcontrol/hardware/joystick/joystick.h --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/joystick.h 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/joystick.h 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/joywidget.cpp kde-workspace-4.8.1/kcontrol/hardware/joystick/joywidget.cpp --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/joywidget.cpp 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/joywidget.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/joywidget.h kde-workspace-4.8.1/kcontrol/hardware/joystick/joywidget.h --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/joywidget.h 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/joywidget.h 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003,2005,2006 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/poswidget.cpp kde-workspace-4.8.1/kcontrol/hardware/joystick/poswidget.cpp --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/poswidget.cpp 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/poswidget.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003,2005,2006 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * @@ -8,14 +8,14 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * - * This program is distributed in the hope that it will be useful, * + * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * - * Free Software Foundation, Inc., * + * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "poswidget.h" diff -Nru kde-workspace-4.8.0b/kcontrol/hardware/joystick/poswidget.h kde-workspace-4.8.1/kcontrol/hardware/joystick/poswidget.h --- kde-workspace-4.8.0b/kcontrol/hardware/joystick/poswidget.h 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/hardware/joystick/poswidget.h 2012-03-02 22:11:07.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2003,2005,2006 by Martin Koller * - * m.koller@surfeu.at * + * kollix@aon.at * * This file is part of the KDE Control Center Module for Joysticks * * * * This program is free software; you can redistribute it and/or modify * diff -Nru kde-workspace-4.8.0b/kcontrol/input/cursortheme.desktop kde-workspace-4.8.1/kcontrol/input/cursortheme.desktop --- kde-workspace-4.8.0b/kcontrol/input/cursortheme.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/input/cursortheme.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -144,6 +144,7 @@ X-KDE-Keywords[pt]=Rato,Cursor,Tema X-KDE-Keywords[pt_BR]=mouse,cursor,tema X-KDE-Keywords[ro]=tematica,maus,cursor +X-KDE-Keywords[sk]=Myš,Kurzor,Téma X-KDE-Keywords[sl]=Miška,Kazalka,Teme X-KDE-Keywords[sr]=Mouse,Cursor,Theme,миш,показивач,курсор,тема X-KDE-Keywords[sr@ijekavian]=Mouse,Cursor,Theme,миш,показивач,курсор,тема diff -Nru kde-workspace-4.8.0b/kcontrol/input/mouse.desktop kde-workspace-4.8.1/kcontrol/input/mouse.desktop --- kde-workspace-4.8.0b/kcontrol/input/mouse.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/input/mouse.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -215,6 +215,7 @@ X-KDE-Keywords[nl]=muis,muisversnelling,muisdrempel,muisknoppen,selectie,cursorvorm,invoerapparaten,knoppenmapping,klik,pictogrammen,terugkoppeling,aanwijzer,slepen,dubbelklik,mapping,rechtshandig,linkshandig X-KDE-Keywords[pt]=Rato,aceleração do rato,limiar do rato,botões do rato,selecção,forma do cursor,dispositivos de entrada,associação de botões,click,ícones,reacção,cursores,arrastar,duplo-click,associação,destro,esquerdino X-KDE-Keywords[pt_BR]=Mouse,aceleração do mouse,limiar do mouse,botões do mouse,seleção,forma do cursor,dispositivos de entrada,associação de botões,clique,ícones,feedback,ponteiros,arrastar,clique duplo,associação,destro,canhoto +X-KDE-Keywords[sk]=Myš,Zrýchlenie myši,Prah myši,Tlačidlá myši,Výber,Tvar kurzora,Vstupné zariadenia,Mapovanie tlačidiel,Klik,ikony,odozva,Ukazovatele,Drag,Dvojklik,mapovanie,pre pravákov,pre ľavákov X-KDE-Keywords[sr]=Mouse,Mouse acceleration,Mouse threshold,Mouse buttons,Selection,Cursor Shape,Input Devices,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,right handed,left handed,миш,убрзање миша,праг миша,дугмад миша,избор,облик показивача,облик курсора,улазни уређаји,мапирање дугмади,клик,иконе,одзив,превлачење,двоклик,десноруки,леворуки X-KDE-Keywords[sr@ijekavian]=Mouse,Mouse acceleration,Mouse threshold,Mouse buttons,Selection,Cursor Shape,Input Devices,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,right handed,left handed,миш,убрзање миша,праг миша,дугмад миша,избор,облик показивача,облик курсора,улазни уређаји,мапирање дугмади,клик,иконе,одзив,превлачење,двоклик,десноруки,леворуки X-KDE-Keywords[sr@ijekavianlatin]=Mouse,Mouse acceleration,Mouse threshold,Mouse buttons,Selection,Cursor Shape,Input Devices,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,right handed,left handed,miš,ubrzanje miša,prag miša,dugmad miša,izbor,oblik pokazivača,oblik kursora,ulazni uređaji,mapiranje dugmadi,klik,ikone,odziv,prevlačenje,dvoklik,desnoruki,levoruki diff -Nru kde-workspace-4.8.0b/kcontrol/keyboard/kcm_keyboard.desktop kde-workspace-4.8.1/kcontrol/keyboard/kcm_keyboard.desktop --- kde-workspace-4.8.0b/kcontrol/keyboard/kcm_keyboard.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/keyboard/kcm_keyboard.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -216,6 +216,7 @@ X-KDE-Keywords[nl]=toetsenbord,toetsenbordherhaling,klikvolume,invoerapparaten,herhaling,volume X-KDE-Keywords[pt]=teclado,repetição do teclado,volume das teclas,dispositivos de entrada,repetição,volume X-KDE-Keywords[pt_BR]=Teclado,repetição do teclado,volume das teclas,dispositivos de entrada,repetição,volume +X-KDE-Keywords[sk]=Klávesnica,Opakovanie klávesnice,Hlasitosť kliknutia,Vstupné zariadenia,opakovanie,hlasitosť X-KDE-Keywords[sr]=Keyboard,Keyboard repeat,Click volume,Input Devices,repeat,volume,тастатура,понављање тастатуре,јачина клика,улазни уређаји,понављање,јачина X-KDE-Keywords[sr@ijekavian]=Keyboard,Keyboard repeat,Click volume,Input Devices,repeat,volume,тастатура,понављање тастатуре,јачина клика,улазни уређаји,понављање,јачина X-KDE-Keywords[sr@ijekavianlatin]=Keyboard,Keyboard repeat,Click volume,Input Devices,repeat,volume,tastatura,ponavljanje tastature,jačina klika,ulazni uređaji,ponavljanje,jačina diff -Nru kde-workspace-4.8.0b/kcontrol/keys/keys.desktop kde-workspace-4.8.1/kcontrol/keys/keys.desktop --- kde-workspace-4.8.0b/kcontrol/keys/keys.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/keys/keys.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -199,9 +199,11 @@ X-KDE-Keywords[it]=tasti,scorciatoie globali di tastiera,schema di tasti,scorciatoie,scorciatoie delle applicazioni X-KDE-Keywords[kk]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts X-KDE-Keywords[nb]=Taster,Globale tastebindingeer,Tastaturutforming,Tastebindinger,snarveier,programsnarveier +X-KDE-Keywords[nds]=Tasten,Globaal Tasttowiesen,Tastatuurschema,Tasttowiesen,Tastkombinatschonen,Programm-Tastkombinatschonen X-KDE-Keywords[nl]=toetsen,globale toetsbindingen,toetsenschema,toetsbindingen,sneltoetsen,sneltoetsen van toepassing X-KDE-Keywords[pt]=Teclas,combinações de teclas,global,esquema de teclas,atalhos de teclado,atalhos,atalhos das aplicações X-KDE-Keywords[pt_BR]=Teclas,combinações de teclas global,esquema de teclas,atalhos de teclado,atalhos,atalhos dos aplicativos +X-KDE-Keywords[sk]=Klávesy,Globálne klávesové skratky,Klávesová schéma,Klávesové strakty,skratky,skratky aplikácie X-KDE-Keywords[sr]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,тастери,глобалне свезе тастера,шема тастера,свезе тастера,пречице,пречице програма X-KDE-Keywords[sr@ijekavian]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,тастери,глобалне свезе тастера,шема тастера,свезе тастера,пречице,пречице програма X-KDE-Keywords[sr@ijekavianlatin]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,tasteri,globalne sveze tastera,šema tastera,sveze tastera,prečice,prečice programa diff -Nru kde-workspace-4.8.0b/kcontrol/kfontinst/kcmfontinst/fontinst.desktop kde-workspace-4.8.1/kcontrol/kfontinst/kcmfontinst/fontinst.desktop --- kde-workspace-4.8.0b/kcontrol/kfontinst/kcmfontinst/fontinst.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/kfontinst/kcmfontinst/fontinst.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -40,6 +40,7 @@ Name[pt_BR]=Gerenciamento de fontes Name[ro]=Administrare fonturi Name[ru]=Управление шрифтами +Name[sk]=Správa písiem Name[sl]=Upravljanje pisav Name[sr]=Управљање фонтовима Name[sr@ijekavian]=Управљање фонтовима @@ -154,6 +155,7 @@ X-KDE-Keywords[nl]=lettertype,lettertypen,installatieprogramma,truetype,type1,bitmap X-KDE-Keywords[pt]=tipo de letra,tipos de letra,instalador,truetype,type1,imagem X-KDE-Keywords[pt_BR]=fonte,fontes,instalador,truetype,type1,bitmap,imagem +X-KDE-Keywords[sk]=písmo,písma,inštalátor,truetype,type1,bitmap X-KDE-Keywords[sr]=font,fonts,installer,truetype,type1,bitmap,фонт,фонтови,инсталатор,трутајп,тип‑1,битмапски X-KDE-Keywords[sr@ijekavian]=font,fonts,installer,truetype,type1,bitmap,фонт,фонтови,инсталатор,трутајп,тип‑1,битмапски X-KDE-Keywords[sr@ijekavianlatin]=font,fonts,installer,truetype,type1,bitmap,font,fontovi,instalator,Truetype,Type1,bitmapski diff -Nru kde-workspace-4.8.0b/kcontrol/launch/kcmlaunch.desktop kde-workspace-4.8.1/kcontrol/launch/kcmlaunch.desktop --- kde-workspace-4.8.0b/kcontrol/launch/kcmlaunch.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/launch/kcmlaunch.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -206,6 +206,7 @@ X-KDE-Keywords[nl]=toepassing,start,starten,bezet,cursor,terugkoppeling,muis,aanwijzer,op en neergaand,ronddraaiend,tollend,schijf,opstarten,programma,rapport,taakbalk X-KDE-Keywords[pt]=aplicação,início,lançamento,ocupado,cursor,reacção,rato,cursor,saltitante,rotação,rodar,disco,arranque,programa,relatório,barra de tarefas X-KDE-Keywords[pt_BR]=aplicativo,início,execução,ocupado,cursor,feedback,mouse,ponteiro,saltitante,rotação,rodar,disco,inicialização,programa,relatório,barra de tarefas +X-KDE-Keywords[sk]=aplikácia,spustenie,štart,zaneprázdnený,kurzor,odozva,myš,ukazovateľ,skákanie,rotácia,otáčanie,disk,spustenie,program,správa,taskbar X-KDE-Keywords[sr]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar,програм,покретање,заузет,показивач,курсор,одзив,миш,одскачући,ротирајући,обрћући,диск,извештај,трака задатака X-KDE-Keywords[sr@ijekavian]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar,програм,покретање,заузет,показивач,курсор,одзив,миш,одскачући,ротирајући,обрћући,диск,извештај,трака задатака X-KDE-Keywords[sr@ijekavianlatin]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar,program,pokretanje,zauzet,pokazivač,kursor,odziv,miš,odskačući,rotirajući,obrćući,disk,izveštaj,traka zadataka diff -Nru kde-workspace-4.8.0b/kcontrol/randr/module/randrmonitor.cpp kde-workspace-4.8.1/kcontrol/randr/module/randrmonitor.cpp --- kde-workspace-4.8.0b/kcontrol/randr/module/randrmonitor.cpp 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/randr/module/randrmonitor.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -213,7 +213,7 @@ Q_FOREACH(const QString monitor, activeMonitorsList) { //LVDS is the default type reported by most drivers, default is needed because the //NVIDIA binary blob always report default as active monitor. - if (!monitor.contains("LVDS") && !monitor.contains("default")) { + if (!monitor.contains("LVDS") && !monitor.contains("default") && !monitor.contains("eDP")) { inhibit = true; break; } diff -Nru kde-workspace-4.8.0b/kcontrol/randr/randr.desktop kde-workspace-4.8.1/kcontrol/randr/randr.desktop --- kde-workspace-4.8.0b/kcontrol/randr/randr.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/randr/randr.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -210,6 +210,7 @@ X-KDE-Keywords[nl]=scherm,resolutie,afmeting wijzigen,roondraaien,oriëntatie,scherm,kleurdiepte,grootte,horizontaal,verticaal,verversingssnelheid X-KDE-Keywords[pt]=ecrã,resolução,dimensionamento,rodar,orientação,ecrã,profundidade de cor,tamanho,horizontal,vertical,taxa de actualização X-KDE-Keywords[pt_BR]=tela,resolução,redimensionamento,girar,orientação,monitor,profundidade de cores,tamanho,horizontal,vertical,taxa de atualização +X-KDE-Keywords[sk]=obrazovka,rozlíšenie,zmena veľkosti,rotácie,orientácie,displej,farebná hĺbka,veľkosť,vodorovne,zvislo,obnovovacia frekvencia X-KDE-Keywords[sr]=screen,resolution,resize,rotate,orientation,display,color depth,size,horizontal,vertical,refresh rate,екран,резолуција,промени величину,ротирај,оријентација,приказ,дубина боја,број боја,величина,водоравно,усправно,учестаност освежавања X-KDE-Keywords[sr@ijekavian]=screen,resolution,resize,rotate,orientation,display,color depth,size,horizontal,vertical,refresh rate,екран,резолуција,промени величину,ротирај,оријентација,приказ,дубина боја,број боја,величина,водоравно,усправно,учестаност освежавања X-KDE-Keywords[sr@ijekavianlatin]=screen,resolution,resize,rotate,orientation,display,color depth,size,horizontal,vertical,refresh rate,ekran,rezolucija,promeni veličinu,rotiraj,orijentacija,prikaz,dubina boja,broj boja,veličina,vodoravno,uspravno,učestanost osvežavanja diff -Nru kde-workspace-4.8.0b/kcontrol/screensaver/screensaver.desktop kde-workspace-4.8.1/kcontrol/screensaver/screensaver.desktop --- kde-workspace-4.8.0b/kcontrol/screensaver/screensaver.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/screensaver/screensaver.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -217,6 +217,7 @@ X-KDE-Keywords[pt]=protector de ecrã,prioridade X-KDE-Keywords[pt_BR]=protetor de tela,Prioridade X-KDE-Keywords[ro]=protecție de ecran,prioritate +X-KDE-Keywords[sk]=šetriče obrazovky,Priorita X-KDE-Keywords[sr]=screensavers,Priority,чувар екрана,приоритет X-KDE-Keywords[sr@ijekavian]=screensavers,Priority,чувар екрана,приоритет X-KDE-Keywords[sr@ijekavianlatin]=screensavers,Priority,čuvar ekrana,prioritet diff -Nru kde-workspace-4.8.0b/kcontrol/smartcard/smartcard.desktop kde-workspace-4.8.1/kcontrol/smartcard/smartcard.desktop --- kde-workspace-4.8.0b/kcontrol/smartcard/smartcard.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/smartcard/smartcard.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -210,6 +210,7 @@ X-KDE-Keywords[nl]=Smartcard,PKCS,SSL,lezer,smart,card X-KDE-Keywords[pt]=Smartcard,inteligente,PKCS,SSL,leitor,cartão X-KDE-Keywords[pt_BR]=Smartcard,PKCS,SSL,leitor,inteligente,cartão +X-KDE-Keywords[sk]=Smartcard,PKCS,SSL,čítačka,smart,karta X-KDE-Keywords[sr]=Smartcard,PKCS,SSL,reader,smart,card,ПКЦС,ССЛ,читач,картица,смарт-картица X-KDE-Keywords[sr@ijekavian]=Smartcard,PKCS,SSL,reader,smart,card,ПКЦС,ССЛ,читач,картица,смарт-картица X-KDE-Keywords[sr@ijekavianlatin]=Smartcard,PKCS,SSL,reader,smart,card,PKCS,SSL,čitač,kartica,smart-kartica diff -Nru kde-workspace-4.8.0b/kcontrol/standard_actions/standard_actions.desktop kde-workspace-4.8.1/kcontrol/standard_actions/standard_actions.desktop --- kde-workspace-4.8.0b/kcontrol/standard_actions/standard_actions.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/standard_actions/standard_actions.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -183,9 +183,11 @@ X-KDE-Keywords[it]=tasti,scorciatoie globali di tastiera,schema di tasti,scorciatoie,scorciatoie delle applicazioni X-KDE-Keywords[kk]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts X-KDE-Keywords[nb]=Taster,Globale tastebindingeer,Tastaturutforming,Tastebindinger,snarveier,programsnarveier +X-KDE-Keywords[nds]=Tasten,Globaal Tasttowiesen,Tastatuurschema,Tasttowiesen,Tastkombinatschonen,Programm-Tastkombinatschonen X-KDE-Keywords[nl]=toetsen,globale toetsbindingen,toetsenschema,toetsbindingen,sneltoetsen,sneltoetsen van toepassing X-KDE-Keywords[pt]=Teclas,combinações de teclas,global,esquema de teclas,atalhos de teclado,atalhos,atalhos das aplicações X-KDE-Keywords[pt_BR]=Teclas,combinações de teclas global,esquema de teclas,atalhos de teclado,atalhos,atalhos dos aplicativos +X-KDE-Keywords[sk]=Klávesy,Globálne klávesové skratky,Klávesová schéma,Klávesové strakty,skratky,skratky aplikácie X-KDE-Keywords[sr]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,тастери,глобалне свезе тастера,шема тастера,свезе тастера,пречице,пречице програма X-KDE-Keywords[sr@ijekavian]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,тастери,глобалне свезе тастера,шема тастера,свезе тастера,пречице,пречице програма X-KDE-Keywords[sr@ijekavianlatin]=Keys,Global key bindings,Key scheme,Key bindings,shortcuts,application shortcuts,tasteri,globalne sveze tastera,šema tastera,sveze tastera,prečice,prečice programa diff -Nru kde-workspace-4.8.0b/kcontrol/style/style.desktop kde-workspace-4.8.1/kcontrol/style/style.desktop --- kde-workspace-4.8.0b/kcontrol/style/style.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/style/style.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -210,6 +210,7 @@ X-KDE-Keywords[nl]=stijl,stijlen,uiterlijk,widget,pictogrammen,werkbalk,tekst,accentuering,apps,KDE-toepassingen,thema,plasma X-KDE-Keywords[pt]=estilo,estilos,aparência,elemento,item,ícones,barras de ferramentas,texto,realce,aplicações,aplicações do KDE,tema,plasma X-KDE-Keywords[pt_BR]=estilo,estilos,aparência,widget,ícones,barras de ferramentas,texto,realce,aplicativos,aplicativos do KDE,tema,plasma +X-KDE-Keywords[sk]=štýl,štýly,vzhľad,widget,ikony,panely nástrojov,text,zvýraznenie,aplikácie,KDE aplikácie,téma,plasma X-KDE-Keywords[sr]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,theme,plasma,стил,стилови,изглед,виџет,иконе,траке алатки,текст,истицање,програми,КДЕ програми,тема,Плазма X-KDE-Keywords[sr@ijekavian]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,theme,plasma,стил,стилови,изглед,виџет,иконе,траке алатки,текст,истицање,програми,КДЕ програми,тема,Плазма X-KDE-Keywords[sr@ijekavianlatin]=style,styles,look,widget,icons,toolbars,text,highlight,apps,KDE applications,theme,plasma,stil,stilovi,izgled,vidžet,ikone,trake alatki,tekst,isticanje,programi,KDE programi,tema,Plasma diff -Nru kde-workspace-4.8.0b/kcontrol/workspaceoptions/workspaceoptions.desktop kde-workspace-4.8.1/kcontrol/workspaceoptions/workspaceoptions.desktop --- kde-workspace-4.8.0b/kcontrol/workspaceoptions/workspaceoptions.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/workspaceoptions/workspaceoptions.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -155,6 +155,7 @@ X-KDE-Keywords[nl]=plasma,werkruimte,shell,vormfactor,dashboard X-KDE-Keywords[pt]=plasma,área de trabalho,consola,proporção,painel X-KDE-Keywords[pt_BR]=plasma,espaço de trabalho,console,proporção,painel +X-KDE-Keywords[sk]=plasma,workspace,shell,formfactor,dashboard X-KDE-Keywords[sr]=plasma,workspace,shell,formfactor,dashboard,Плазма,радни простор,шкољка,подлога,инструмент-табла X-KDE-Keywords[sr@ijekavian]=plasma,workspace,shell,formfactor,dashboard,Плазма,радни простор,шкољка,подлога,инструмент-табла X-KDE-Keywords[sr@ijekavianlatin]=plasma,workspace,shell,formfactor,dashboard,Plasma,radni prostor,školjka,podloga,instrument-tabla diff -Nru kde-workspace-4.8.0b/kcontrol/xinerama/xinerama.desktop kde-workspace-4.8.1/kcontrol/xinerama/xinerama.desktop --- kde-workspace-4.8.0b/kcontrol/xinerama/xinerama.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kcontrol/xinerama/xinerama.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -197,6 +197,7 @@ X-KDE-Keywords=Xinerama,dual head,multihead,monitor X-KDE-Keywords[ca]=Xinerama,pantalla doble,pantalla múltiple,monitor X-KDE-Keywords[ca@valencia]=Xinerama,pantalla doble,pantalla múltiple,monitor +X-KDE-Keywords[cs]=Xinerama,dual head,multihead,monitor X-KDE-Keywords[da]=Xinerama,dual head,multihead,monitor X-KDE-Keywords[de]=Xinerama,dual head,multihead,monitor,Mehrbildschirmbetrieb,bildschirm X-KDE-Keywords[es]=Xinerama,doble cabeza,multicabeza,monitor @@ -210,6 +211,7 @@ X-KDE-Keywords[nl]=Xinerama,dual-head,multihead,monitor X-KDE-Keywords[pt]=Xinerama,duplo monitor,multi-monitor,monitor X-KDE-Keywords[pt_BR]=Xinerama,monitor duplo,multi-monitor,monitor +X-KDE-Keywords[sk]=Xinerama,dual head,multihead,monitor X-KDE-Keywords[sr]=Xinerama,dual head,multihead,monitor,Ксинерама,двоглави,вишеглави,монитор X-KDE-Keywords[sr@ijekavian]=Xinerama,dual head,multihead,monitor,Ксинерама,двоглави,вишеглави,монитор X-KDE-Keywords[sr@ijekavianlatin]=Xinerama,dual head,multihead,monitor,Xinerama,dvoglavi,višeglavi,monitor diff -Nru kde-workspace-4.8.0b/kdm/kcm/kdm.desktop kde-workspace-4.8.1/kdm/kcm/kdm.desktop --- kde-workspace-4.8.0b/kdm/kcm/kdm.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kdm/kcm/kdm.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -181,6 +181,7 @@ X-KDE-Keywords[nl]=kdm,schermbeheerder,xdm,gebruikers,aanmelden,begroeting,logo,stijlen,taal,land,lettertypen,achtergrond,achtergrondafbeelding,sessies,afsluiten,herstart X-KDE-Keywords[pt]=kdm,gestor de autenticação,xdm,utilizadores,conta,saudação,logótipo,estilos,língua,país,tipos de letra,fundo,papéis de parede,sessões,desligar,encerrar,reiniciar X-KDE-Keywords[pt_BR]=kdm,gerenciador de autenticação,xdm,usuários,autenticação,saudação,logotipo,estilos,idioma,país,fontes,plano de fundo,papéis de parede,sessões,desligar,encerrar,reiniciar +X-KDE-Keywords[sk]=kdm,display manager,xdm,používatelia,prihlásenie,uvítanie,Logo,štýly,jazyk,krajina,písma,pozadie,tapety,sedenia,vypnutie,reštart X-KDE-Keywords[sr]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,КДМ,менаџер пријављивања,ИксДМ,корисници,пријава,поздравни,логотип,стилови,језик,држава,земља,фонтови,позадина,тапети,сесије,гашење,ресетовање X-KDE-Keywords[sr@ijekavian]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,КДМ,менаџер пријављивања,ИксДМ,корисници,пријава,поздравни,логотип,стилови,језик,држава,земља,фонтови,позадина,тапети,сесије,гашење,ресетовање X-KDE-Keywords[sr@ijekavianlatin]=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart,KDM,menadžer prijavljivanja,XDM,korisnici,prijava,pozdravni,logotip,stilovi,jezik,država,zemlja,fontovi,pozadina,tapeti,sesije,gašenje,resetovanje diff -Nru kde-workspace-4.8.0b/kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop kde-workspace-4.8.1/kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop --- kde-workspace-4.8.0b/kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -23,6 +23,7 @@ Name[pt]=Ariya Name[pt_BR]=Ariya Name[ro]=Ariya +Name[sk]=Ariya Name[sl]=Ariya Name[sr]=Арија Name[sr@ijekavian]=Арија diff -Nru kde-workspace-4.8.0b/khotkeys/data/kde32b1.khotkeys kde-workspace-4.8.1/khotkeys/data/kde32b1.khotkeys --- kde-workspace-4.8.0b/khotkeys/data/kde32b1.khotkeys 2012-01-18 20:08:40.000000000 +0000 +++ kde-workspace-4.8.1/khotkeys/data/kde32b1.khotkeys 2012-03-02 22:11:07.000000000 +0000 @@ -1323,7 +1323,7 @@ Comment[tg]=Qt Designer Comment[th]=Qt Designer Comment[tr]=Qt Tasarımcı -Comment[ug]=Qt لايىھەلىگۈچ +Comment[ug]=Qt لايىھىلىگۈچ Comment[uk]=Qt Designer Comment[vi]=Trình thiết kế Qt Comment[wa]=Qt Designer diff -Nru kde-workspace-4.8.0b/khotkeys/kcm_hotkeys/khotkeys.desktop kde-workspace-4.8.1/khotkeys/kcm_hotkeys/khotkeys.desktop --- kde-workspace-4.8.0b/khotkeys/kcm_hotkeys/khotkeys.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/khotkeys/kcm_hotkeys/khotkeys.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -152,6 +152,7 @@ X-KDE-Keywords[nl]=globaal,toetsenbordsneltoets,hot-keys,hotkeys,KHotKeys,invoeracties,muisbeweging,acties,triggers,opstarten X-KDE-Keywords[pt]=global,atalhos de teclado,KHotKeys,acções de entrada,gestos do rato,acções,eventos,lançamento X-KDE-Keywords[pt_BR]=global,atalhos de teclado,KHotKeys,ações de entrada,gestos do mouse,ações,eventos,lançamento,execução +X-KDE-Keywords[sk]=globálne,globálne skratky,horúce klávesy,hotkeys,KHotKeys,vstupné akcie,gestá myši,akcie,spúšťače,spustenie X-KDE-Keywords[sr]=global,keyboard shortcuts,hot keys,hotkeys,KHotKeys,input actions,mouse gestures,actions,triggers,launch,глобалне,пречице са тастатуре,К‑пречице,радње улаза,гестови мишем,радње,окидачи,покретање X-KDE-Keywords[sr@ijekavian]=global,keyboard shortcuts,hot keys,hotkeys,KHotKeys,input actions,mouse gestures,actions,triggers,launch,глобалне,пречице са тастатуре,К‑пречице,радње улаза,гестови мишем,радње,окидачи,покретање X-KDE-Keywords[sr@ijekavianlatin]=global,keyboard shortcuts,hot keys,hotkeys,KHotKeys,input actions,mouse gestures,actions,triggers,launch,globalne,prečice sa tastature,K‑prečice,radnje ulaza,gestovi mišem,radnje,okidači,pokretanje diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/devinfo/devinfo.desktop kde-workspace-4.8.1/kinfocenter/Modules/devinfo/devinfo.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/devinfo/devinfo.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/devinfo/devinfo.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -137,6 +137,7 @@ X-KDE-Keywords[ca]=dispositiu,dispositius X-KDE-Keywords[ca@valencia]=dispositiu,dispositius X-KDE-Keywords[da]=enhed,enheder +X-KDE-Keywords[de]=Gerät,Geräte X-KDE-Keywords[es]=dispositivo,dispositivos X-KDE-Keywords[et]=seade,seadmed X-KDE-Keywords[fi]=laite,laitteet @@ -151,6 +152,7 @@ X-KDE-Keywords[pt]=dispositivo,dispositivos X-KDE-Keywords[pt_BR]=dispositivo,dispositivos X-KDE-Keywords[ro]=dispozitiv,dispozitive +X-KDE-Keywords[sk]=zariadenie,zariadenia X-KDE-Keywords[sr]=device,devices,уређај,уређаји X-KDE-Keywords[sr@ijekavian]=device,devices,уређај,уређаји X-KDE-Keywords[sr@ijekavianlatin]=device,devices,uređaj,uređaji diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/info/dma.desktop kde-workspace-4.8.1/kinfocenter/Modules/info/dma.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/info/dma.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/info/dma.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -218,6 +218,7 @@ X-KDE-Keywords[pt]=dma,canais de DMA,Informação do Sistema X-KDE-Keywords[pt_BR]=dma,canais de DMA,Informação do sistema X-KDE-Keywords[ro]=dma,canale DMA, informații sistem +X-KDE-Keywords[sk]=dma,DMA kanály,Systémové informácie X-KDE-Keywords[sr]=dma,DMA-Channels,System Information,ДМА,ДМА канали,системске информације X-KDE-Keywords[sr@ijekavian]=dma,DMA-Channels,System Information,ДМА,ДМА канали,системске информације X-KDE-Keywords[sr@ijekavianlatin]=dma,DMA-Channels,System Information,DMA,DMA kanali,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/info/interrupts.desktop kde-workspace-4.8.1/kinfocenter/Modules/info/interrupts.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/info/interrupts.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/info/interrupts.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -219,6 +219,7 @@ X-KDE-Keywords[pt]=Interrupções,IRQ,Informação do sistema X-KDE-Keywords[pt_BR]=Interrupções,IRQ,Informação do sistema X-KDE-Keywords[ro]=întreruperi;IRQ;informații;sistem +X-KDE-Keywords[sk]=Prerušenia,IRQ,Systémové informácie X-KDE-Keywords[sr]=Interrupts,IRQ,System Information,прекиди,ИРКу,системске информације X-KDE-Keywords[sr@ijekavian]=Interrupts,IRQ,System Information,прекиди,ИРКу,системске информације X-KDE-Keywords[sr@ijekavianlatin]=Interrupts,IRQ,System Information,prekidi,IRQ,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/info/ioports.desktop kde-workspace-4.8.1/kinfocenter/Modules/info/ioports.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/info/ioports.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/info/ioports.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -211,9 +211,11 @@ X-KDE-Keywords[it]=IO,I/O,porte di IO,porte di I/O,Porte,intervallo di IO,intervallo di I/O,Informazioni di sistema X-KDE-Keywords[kk]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information X-KDE-Keywords[nb]=IO,I/U,IO-porter,porter,IO-område,systeminformasjon +X-KDE-Keywords[nds]=In- un Utgaav,IO,I/O,IO-Porten,Porten,IO-Rebeet,Systeem-Informatschonen X-KDE-Keywords[nl]=IO,I/O,IO-Ports,I/O-Ports,poorten,IO-Range,I/O-Range,systeeminformatie X-KDE-Keywords[pt]=IO,I/O,ES,E/S,Portos IO,Portos ES,Portos I/O,Portos E/S,Portos,Gama de ES,Gama de E/S,Informação do Sistema X-KDE-Keywords[pt_BR]=IO,I/O,ES,E/S,Portas IO,Portas ES,Portas I/O,Portas E/S,Portas,Gama de ES,Gama de E/S,Informação do sistema +X-KDE-Keywords[sk]=IO,I/O,IO porty,I/O porty,Ports,IO rozsah,I/O rozsah,Systémové informácie X-KDE-Keywords[sr]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information,У/И,У/И портови,портови,У/И опсег,системске информације X-KDE-Keywords[sr@ijekavian]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information,У/И,У/И портови,портови,У/И опсег,системске информације X-KDE-Keywords[sr@ijekavianlatin]=IO,I/O,IO-Ports,I/O-Ports,Ports,IO-Range,I/O-Range,System Information,U/I,U/I portovi,portovi,U/I opseg,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/info/scsi.desktop kde-workspace-4.8.1/kinfocenter/Modules/info/scsi.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/info/scsi.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/info/scsi.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -212,11 +212,13 @@ X-KDE-Keywords[it]=SCSI,Bus SCSI,Informazioni di sistema X-KDE-Keywords[kk]=SCSI,SCSI-Bus,System Information X-KDE-Keywords[nb]=SCSI,SCSI-bus,systeminformasjon +X-KDE-Keywords[nds]=SCSI,SCSI-Bus,Systeem-Informatschonen X-KDE-Keywords[nl]=SCSI,SCSI-bus,systeeminformatie X-KDE-Keywords[pa]=SCSI,SCSI-ਬਸ,ਸਿਸਟਮ ਜਾਣਕਾਰੀ X-KDE-Keywords[pt]=Informação do sistema,SCSI X-KDE-Keywords[pt_BR]=SCSI,SCSI-Bus,Informação do sistema X-KDE-Keywords[ro]=SCSI;magistrala SCSI;informații sistem +X-KDE-Keywords[sk]=SCSI,SCSI zbernice,Systémové informácie X-KDE-Keywords[sr]=SCSI,SCSI-Bus,System Information,скази,скази магистрала,системске информације X-KDE-Keywords[sr@ijekavian]=SCSI,SCSI-Bus,System Information,скази,скази магистрала,системске информације X-KDE-Keywords[sr@ijekavianlatin]=SCSI,SCSI-Bus,System Information,SCSI,SCSI magistrala,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/info/xserver.desktop kde-workspace-4.8.1/kinfocenter/Modules/info/xserver.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/info/xserver.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/info/xserver.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -214,6 +214,7 @@ X-KDE-Keywords[nl]=X,X-Server,XServer,XFree86,scherm,videocard,systeeminformatie X-KDE-Keywords[pt]=X,Servidor-X,Servidor de X,XFree86,Ecrã,Placa Gráfica,Informação do Sistema X-KDE-Keywords[pt_BR]=X,Servidor-X,Servidor X,XFree86,Monitor,Placa de vídeo,Informação do sistema +X-KDE-Keywords[sk]=X,X-Server,XServer,XFree86,Obrazovka,Videokarta,Systémové informácie X-KDE-Keywords[sr]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,Икс,икс сервер,Икс‑фри86,Икс‑орг,приказ,видео картица,системске информације X-KDE-Keywords[sr@ijekavian]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,Икс,икс сервер,Икс‑фри86,Икс‑орг,приказ,видео картица,системске информације X-KDE-Keywords[sr@ijekavianlatin]=X,X-Server,XServer,XFree86,Display,VideoCard,System Information,X,X server,XFree86,XOrg,prikaz,video kartica,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/infosummary/kcm_infosummary.desktop kde-workspace-4.8.1/kinfocenter/Modules/infosummary/kcm_infosummary.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/infosummary/kcm_infosummary.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/infosummary/kcm_infosummary.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -140,6 +140,7 @@ X-KDE-Keywords[ca]=dispositiu,dispositius X-KDE-Keywords[ca@valencia]=dispositiu,dispositius X-KDE-Keywords[da]=enhed,enheder +X-KDE-Keywords[de]=Gerät,Geräte X-KDE-Keywords[es]=dispositivo,dispositivos X-KDE-Keywords[et]=seade,seadmed X-KDE-Keywords[fi]=laite,laitteet @@ -154,6 +155,7 @@ X-KDE-Keywords[pt]=dispositivo,dispositivos X-KDE-Keywords[pt_BR]=dispositivo,dispositivos X-KDE-Keywords[ro]=dispozitiv,dispozitive +X-KDE-Keywords[sk]=zariadenie,zariadenia X-KDE-Keywords[sr]=device,devices,уређај,уређаји X-KDE-Keywords[sr@ijekavian]=device,devices,уређај,уређаји X-KDE-Keywords[sr@ijekavianlatin]=device,devices,uređaj,uređaji diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/memory/kcm_memory.desktop kde-workspace-4.8.1/kinfocenter/Modules/memory/kcm_memory.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/memory/kcm_memory.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/memory/kcm_memory.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -213,6 +213,7 @@ X-KDE-Keywords[nl]=geheugen,RAM,virtueel geheugen,fysiek geheugen,gedeeld geheugen,swap,systeeminformatie X-KDE-Keywords[pt]=Memória,RAM,Memória virtual,Memória física,Memória partilhada,Paginação,Informação do Sistema X-KDE-Keywords[pt_BR]=Memória,RAM,Memória virtual,Memória física,Memória compartilhada,Swap,Informação do sistema +X-KDE-Keywords[sk]=Pamúť,RAM,Virtuálna pamäť,Fyzická pamäť,Zdieľaná pamäť,Swap,Systémové informácie X-KDE-Keywords[sr]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,меморија,РАМ,виртуелна меморија,физичка меморија,дељена меморија,размена,системске информације X-KDE-Keywords[sr@ijekavian]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,меморија,РАМ,виртуелна меморија,физичка меморија,дељена меморија,размена,системске информације X-KDE-Keywords[sr@ijekavianlatin]=Memory,RAM,Virtual memory,Physical memory,Shared memory,Swap,System Information,memorija,RAM,virtuelna memorija,fizička memorija,deljena memorija,razmena,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/opengl/opengl.desktop kde-workspace-4.8.1/kinfocenter/Modules/opengl/opengl.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/opengl/opengl.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/opengl/opengl.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -210,6 +210,7 @@ X-KDE-Keywords[nl]=OpenGL,DRI,GLX,3D,VideoCard,hardwareversnelling,Graphics,X,X11,Xserver,X-Server,XFree86,scherm X-KDE-Keywords[pt]=OpenGL,DRI,GLX,3D,Placa Gráfica,Aceleração por Hardware,Gráficos,X,X11,Servidor de X,Servidor-X,XFree86,Ecrã X-KDE-Keywords[pt_BR]=OpenGL,DRI,GLX,3D,Placa de vídeo,Aceleração por Hardware,Gráficos,X,X11,Servidor X,Servidor-X,XFree86,Monitor +X-KDE-Keywords[sk]=OpenGL,DRI,GLX,3D,Videokarta,Hardérová akcelerácia,Grafika,X,X11,Xserver,X-Server,XFree86,Obrazovka X-KDE-Keywords[sr]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,опенГЛ,ДРИ,ГЛИкс,3Д,видео картица,хардверско убрзање,графика,Икс,Икс11,икс сервер,Икс‑фри86,Икс‑орг,приказ,екран X-KDE-Keywords[sr@ijekavian]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,опенГЛ,ДРИ,ГЛИкс,3Д,видео картица,хардверско убрзање,графика,Икс,Икс11,икс сервер,Икс‑фри86,Икс‑орг,приказ,екран X-KDE-Keywords[sr@ijekavianlatin]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,OpenGL,DRI,GLX,3D,video kartica,hardversko ubrzanje,grafika,X,X11,X server,XFree86,XOrg,prikaz,ekran diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/pci/kcm_pci.desktop kde-workspace-4.8.1/kinfocenter/Modules/pci/kcm_pci.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/pci/kcm_pci.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/pci/kcm_pci.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -213,6 +213,7 @@ X-KDE-Keywords[nl]=PCI,PCI-apparaten,PCI-Bus,systeeminformatie X-KDE-Keywords[pt]=PCI,Dispositivos PCI,Barramento PCI,Informação do Sistema X-KDE-Keywords[pt_BR]=PCI,Dispositivos PCI,Barramento PCI,Informação do sistema +X-KDE-Keywords[sk]=PCI,PCI zariadenia,PCI zbernice,Systémové informácie X-KDE-Keywords[sr]=PCI,PCI-Devices,PCI-Bus,System Information,ПЦИ,ПЦИ уређаји,ПЦИ магистрала,системске информације X-KDE-Keywords[sr@ijekavian]=PCI,PCI-Devices,PCI-Bus,System Information,ПЦИ,ПЦИ уређаји,ПЦИ магистрала,системске информације X-KDE-Keywords[sr@ijekavianlatin]=PCI,PCI-Devices,PCI-Bus,System Information,PCI,PCI uređaji,PCI magistrala,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/samba/smbstatus.desktop kde-workspace-4.8.1/kinfocenter/Modules/samba/smbstatus.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/samba/smbstatus.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/samba/smbstatus.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -214,6 +214,7 @@ X-KDE-Keywords[pa]=SMB,SAMBA,ਵਿੰਡੋਜ਼ ਨੈੱਟਵਰਕ,LAN,ਸਿਸਟਮ ਜਾਣਕਾਰੀ X-KDE-Keywords[pt]=SMB,SAMBA,rede Windows,LAN,Informação do Sistema X-KDE-Keywords[pt_BR]=SMB,SAMBA,Rede Windows,LAN,Informação do sistema +X-KDE-Keywords[sk]=SMB,SAMBA,Sieť Windows,LAN,Systémové informácie X-KDE-Keywords[sr]=SMB,SAMBA,Windows network,LAN,System Information,СМБ,Самба,виндоуз мрежа,ЛАН,системске информације X-KDE-Keywords[sr@ijekavian]=SMB,SAMBA,Windows network,LAN,System Information,СМБ,Самба,виндоуз мрежа,ЛАН,системске информације X-KDE-Keywords[sr@ijekavianlatin]=SMB,SAMBA,Windows network,LAN,System Information,SMB,Samba,windows mreža,LAN,sistemske informacije diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/usbview/kcmusb.desktop kde-workspace-4.8.1/kinfocenter/Modules/usbview/kcmusb.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/usbview/kcmusb.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/usbview/kcmusb.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -206,6 +206,7 @@ X-KDE-Keywords[pt]=USB,dispositivos,visualizador,controlo X-KDE-Keywords[pt_BR]=USB,dispositivos,visualizador,controle X-KDE-Keywords[ro]=USB,dispozitive,vizualizator,control +X-KDE-Keywords[sk]=USB,zariadenia,prehliadač,ovládanie X-KDE-Keywords[sr]=USB,devices,viewer,control,УСБ,уређаји,приказивач,управљање X-KDE-Keywords[sr@ijekavian]=USB,devices,viewer,control,УСБ,уређаји,приказивач,управљање X-KDE-Keywords[sr@ijekavianlatin]=USB,devices,viewer,control,USB,uređaji,prikazivač,upravljanje diff -Nru kde-workspace-4.8.0b/kinfocenter/Modules/view1394/kcmview1394.desktop kde-workspace-4.8.1/kinfocenter/Modules/view1394/kcmview1394.desktop --- kde-workspace-4.8.0b/kinfocenter/Modules/view1394/kcmview1394.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kinfocenter/Modules/view1394/kcmview1394.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -203,6 +203,7 @@ X-KDE-Keywords[nl]=1394,Firewire,apparaten,viewer,besturing X-KDE-Keywords[pt]=1394,Firewire,dispositivos,visualizador,controlo X-KDE-Keywords[pt_BR]=1394,Firewire,dispositivos,visualizador,controle +X-KDE-Keywords[sk]=1394,Firewire,zariadenia,prehliadač,ovládanie X-KDE-Keywords[sr]=1394,Firewire,devices,viewer,control,фајервајер,уређаји,приказивач,управљање X-KDE-Keywords[sr@ijekavian]=1394,Firewire,devices,viewer,control,фајервајер,уређаји,приказивач,управљање X-KDE-Keywords[sr@ijekavianlatin]=1394,Firewire,devices,viewer,control,Firewire,uređaji,prikazivač,upravljanje diff -Nru kde-workspace-4.8.0b/krunner/CMakeLists.txt kde-workspace-4.8.1/krunner/CMakeLists.txt --- kde-workspace-4.8.0b/krunner/CMakeLists.txt 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/krunner/CMakeLists.txt 2012-03-02 22:11:07.000000000 +0000 @@ -50,6 +50,12 @@ kde4_add_kcfg_files(krunner_SRCS ${krunner_KCFG_SRCS}) qt4_add_dbus_adaptor(krunner_SRCS ${krunner_dbusAppXML} krunnerapp.h KRunnerApp) +if(WIN32) + set(BIN_PREFIX bin) +else(WIN32) + set(BIN_PREFIX ${CMAKE_INSTALL_PREFIX}/bin) +endif(WIN32) + dbus_add_activation_service(dbus/org.kde.krunner.service.in) if(NOT WIN32) diff -Nru kde-workspace-4.8.0b/krunner/dbus/org.kde.krunner.service.in kde-workspace-4.8.1/krunner/dbus/org.kde.krunner.service.in --- kde-workspace-4.8.0b/krunner/dbus/org.kde.krunner.service.in 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/krunner/dbus/org.kde.krunner.service.in 2012-03-02 22:11:07.000000000 +0000 @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.kde.krunner -Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner +Exec=@BIN_PREFIX@/krunner diff -Nru kde-workspace-4.8.0b/ksmserver/kcm/kcmsmserver.desktop kde-workspace-4.8.1/ksmserver/kcm/kcmsmserver.desktop --- kde-workspace-4.8.0b/ksmserver/kcm/kcmsmserver.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/ksmserver/kcm/kcmsmserver.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -181,6 +181,7 @@ X-KDE-Keywords[nl]=ksmserver,sessie,afmelden,bevestiging,opslaan,herstellen X-KDE-Keywords[pt]=ksmserver,sessão,encerrar,confirmação,gravar,repor X-KDE-Keywords[pt_BR]=ksmserver,sessão,encerrar,confirmação,salvar,restaurar +X-KDE-Keywords[sk]=ksmserver,sedenie,odhlásenie,potvrdenie,uložiť,obnoviť X-KDE-Keywords[sr]=ksmserver,session,logout,confirmation,save,restore,КСМ‑сервер,сесија,одјављивање,потврда,сачувати,обновити X-KDE-Keywords[sr@ijekavian]=ksmserver,session,logout,confirmation,save,restore,КСМ‑сервер,сесија,одјављивање,потврда,сачувати,обновити X-KDE-Keywords[sr@ijekavianlatin]=ksmserver,session,logout,confirmation,save,restore,KSMServer,sesija,odjavljivanje,potvrda,sačuvati,obnoviti diff -Nru kde-workspace-4.8.0b/ksmserver/server.h kde-workspace-4.8.1/ksmserver/server.h --- kde-workspace-4.8.0b/ksmserver/server.h 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/ksmserver/server.h 2012-03-02 22:11:07.000000000 +0000 @@ -126,6 +126,7 @@ void kcmPhase1Timeout(); void kcmPhase2Timeout(); void pendingShutdownTimeout(); + void logoutSoundTimeout(); void autoStart0(); void autoStart1(); diff -Nru kde-workspace-4.8.0b/ksmserver/shutdown.cpp kde-workspace-4.8.1/ksmserver/shutdown.cpp --- kde-workspace-4.8.0b/ksmserver/shutdown.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/ksmserver/shutdown.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -460,6 +460,12 @@ if ( state == Shutdown ) { KNotification *n = KNotification::event( "exitkde" , QString() , QPixmap() , 0l , KNotification::DefaultEvent ); // KDE says good bye connect(n, SIGNAL(closed()) , this, SLOT(logoutSoundFinished()) ); + // https://bugs.kde.org/show_bug.cgi?id=228005 + // if sound is not working for some reason (e.g. no phonon + // backends are installed) the closed() signal never happens + // and logoutSoundFinished() never gets called. Add this timer to make + // sure the shutdown procedure continues even if sound system is broken. + QTimer::singleShot(5000, this, SLOT(logoutSoundTimeout())); kDebug( 1218 ) << "Starting logout event"; state = WaitingForKNotify; createLogoutEffectWidget(); @@ -475,6 +481,15 @@ } +void KSMServer::logoutSoundTimeout() +{ + if (state != WaitingForKNotify) { + return; + } + kDebug( 1218 ) << "logout sound timeout"; + logoutSoundFinished(); +} + void KSMServer::startKilling() { kDebug( 1218 ) << "Starting killing clients"; diff -Nru kde-workspace-4.8.0b/ksplash/kcm/ksplashthememgr.desktop kde-workspace-4.8.1/ksplash/kcm/ksplashthememgr.desktop --- kde-workspace-4.8.0b/ksplash/kcm/ksplashthememgr.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/ksplash/kcm/ksplashthememgr.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -204,6 +204,7 @@ X-KDE-Keywords[nl]=splash-scherm,splash-thema,opstarten X-KDE-Keywords[pt]=ecrã inicial,tema inicial,arranque X-KDE-Keywords[pt_BR]=tela inicial,tema inicial,inicialização +X-KDE-Keywords[sk]=splash screen,splash theme,spustenie X-KDE-Keywords[sr]=splash screen,splash theme,startup,уводни екран,уводна тема,покретање X-KDE-Keywords[sr@ijekavian]=splash screen,splash theme,startup,уводни екран,уводна тема,покретање X-KDE-Keywords[sr@ijekavianlatin]=splash screen,splash theme,startup,uvodni ekran,uvodna tema,pokretanje diff -Nru kde-workspace-4.8.0b/ksplash/ksplashqml/main.cpp kde-workspace-4.8.1/ksplash/ksplashqml/main.cpp --- kde-workspace-4.8.0b/ksplash/ksplashqml/main.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/ksplash/ksplashqml/main.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -20,6 +20,7 @@ #include "SplashApp.h" #include +#include #include int main(int argc, char **argv) diff -Nru kde-workspace-4.8.0b/ksplash/ksplashqml/SplashWindow.cpp kde-workspace-4.8.1/ksplash/ksplashqml/SplashWindow.cpp --- kde-workspace-4.8.0b/ksplash/ksplashqml/SplashWindow.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/ksplash/ksplashqml/SplashWindow.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -47,6 +47,8 @@ rootContext()->setContextProperty("screenSize", size()); setSource(QUrl(themeDir(QApplication::arguments().at(1)) + "/main.qml")); setStyleSheet("background: #000000; border: none"); + setAttribute(Qt::WA_OpaquePaintEvent); + setAttribute(Qt::WA_NoSystemBackground); //be sure it will be eventually closed //FIXME: should never be stuck QTimer::singleShot(30000, this, SLOT(close())); diff -Nru kde-workspace-4.8.0b/kstyles/oxygen/oxygensplitterproxy.cpp kde-workspace-4.8.1/kstyles/oxygen/oxygensplitterproxy.cpp --- kde-workspace-4.8.0b/kstyles/oxygen/oxygensplitterproxy.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kstyles/oxygen/oxygensplitterproxy.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -297,7 +297,9 @@ if( mouseGrabber() == this ) releaseMouse(); // hide + parentWidget()->setUpdatesEnabled(false); hide(); + parentWidget()->setUpdatesEnabled(true); // set hover event if( _splitter ) diff -Nru kde-workspace-4.8.0b/kstyles/oxygen/oxygenstyle.cpp kde-workspace-4.8.1/kstyles/oxygen/oxygenstyle.cpp --- kde-workspace-4.8.0b/kstyles/oxygen/oxygenstyle.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kstyles/oxygen/oxygenstyle.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -1025,8 +1025,8 @@ // TabBar case PE_FrameTabBarBase: fcn = &Style::drawFrameTabBarBasePrimitive; break; case PE_FrameTabWidget: fcn = &Style::drawFrameTabWidgetPrimitive; break; - case PE_FrameWindow: fcn = &Style::drawFrameWindowPrimitive; break; + case PE_IndicatorTabClose: fcn = &Style::drawIndicatorTabClose; break; // arrows case PE_IndicatorArrowUp: fcn = &Style::drawIndicatorArrowUpPrimitive; break; @@ -2894,6 +2894,31 @@ return true; } + //___________________________________________________________________________________ + bool Style::drawIndicatorTabClose( const QStyleOption* option, QPainter* painter, const QWidget* ) const + { + if( _tabCloseIcon.isNull() ) { // load the icon on-demand: in the constructor, KDE is not yet ready to find it! + _tabCloseIcon = KIcon( "dialog-close" ); + if( _tabCloseIcon.isNull() ) return false; // still not found? cancel + } + const int size( pixelMetric(QStyle::PM_SmallIconSize) ); + QIcon::Mode mode; + if( option->state & State_Enabled ) + { + if( option->state & State_Raised ) mode = QIcon::Active; + else mode = QIcon::Normal; + } else mode = QIcon::Disabled; + + if (!(option->state & State_Raised) + && !(option->state & State_Sunken) + && !(option->state & QStyle::State_Selected)) + mode = QIcon::Disabled; + + QIcon::State state = option->state & State_Sunken ? QIcon::On:QIcon::Off; + QPixmap pixmap = _tabCloseIcon.pixmap(size, mode, state); + drawItemPixmap( painter, option->rect, Qt::AlignCenter, pixmap ); + return true; + } //___________________________________________________________________________________ bool Style::drawIndicatorArrowPrimitive( ArrowOrientation orientation, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const @@ -4869,8 +4894,12 @@ if( indicatorRect.adjusted( 2, 1, -2, -1 ).isValid() ) { indicatorRect.adjust( 1, 0, -1, -1 ); - QPixmap pixmap( helper().progressBarIndicator( palette, indicatorRect ) ); - painter->drawPixmap( indicatorRect.topLeft(), pixmap ); + + // calculate dimension + int dimension( 20 ); + if( pbOpt2 ) dimension = qMax( 5, horizontal ? indicatorRect.height() : indicatorRect.width() ); + TileSet* tileSet( helper().progressBarIndicator( palette, dimension ) ); + tileSet->render( indicatorRect, painter, TileSet::Full ); } return true; @@ -8070,7 +8099,6 @@ // frame focus if( StyleConfigData::viewDrawFocusIndicator() ) _frameFocusPrimitive = &Style::drawFrameFocusRectPrimitive; else _frameFocusPrimitive = &Style::emptyPrimitive; - } //_____________________________________________________________________ diff -Nru kde-workspace-4.8.0b/kstyles/oxygen/oxygenstyle.h kde-workspace-4.8.1/kstyles/oxygen/oxygenstyle.h --- kde-workspace-4.8.0b/kstyles/oxygen/oxygenstyle.h 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kstyles/oxygen/oxygenstyle.h 2012-03-02 22:11:07.000000000 +0000 @@ -62,6 +62,8 @@ #include #include +#include + namespace Oxygen { @@ -474,6 +476,7 @@ bool drawFrameTabBarBasePrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; bool drawFrameTabWidgetPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; bool drawFrameWindowPrimitive( const QStyleOption*, QPainter*, const QWidget* ) const; + bool drawIndicatorTabClose( const QStyleOption* option, QPainter* painter, const QWidget* widget ) const; bool drawIndicatorArrowUpPrimitive( const QStyleOption* option, QPainter* painter, const QWidget* widget ) const { return drawIndicatorArrowPrimitive( ArrowUp, option, painter, widget ); } @@ -904,6 +907,9 @@ //@} + //! tab close button icon (cached) + mutable KIcon _tabCloseIcon; + }; //_________________________________________________________________________ diff -Nru kde-workspace-4.8.0b/kstyles/oxygen/oxygenstylehelper.cpp kde-workspace-4.8.1/kstyles/oxygen/oxygenstylehelper.cpp --- kde-workspace-4.8.0b/kstyles/oxygen/oxygenstylehelper.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kstyles/oxygen/oxygenstylehelper.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -290,25 +290,22 @@ } //__________________________________________________________________________________________________________ - QPixmap StyleHelper::progressBarIndicator( const QPalette& pal, const QRect& rect ) + TileSet* StyleHelper::progressBarIndicator( const QPalette& pal, int dimension ) { const QColor highlight( pal.color( QPalette::Highlight ) ); - const quint64 key( ( quint64( highlight.rgba() ) << 32 ) | ( rect.width() << 16 ) | ( rect.height() ) ); + const quint64 key( ( quint64( highlight.rgba() ) << 32 ) | dimension ); - QPixmap *pixmap = _progressBarCache.object( key ); - if ( !pixmap ) + TileSet *tileSet = _progressBarCache.object( key ); + if ( !tileSet ) { - QRect local( rect ); - - // set topLeft corner to 0.0 - local.translate( -local.topLeft() ); + QRect local( 0, 0, dimension, dimension ); - pixmap = new QPixmap( local.size() ); - pixmap->fill( Qt::transparent ); + QPixmap pixmap( local.size() ); + pixmap.fill( Qt::transparent ); - QPainter p( pixmap ); + QPainter p( &pixmap ); p.setRenderHints( QPainter::Antialiasing ); p.setBrush( Qt::NoBrush ); @@ -386,10 +383,13 @@ p.end(); - _progressBarCache.insert( key, pixmap ); + // generate tileSet and save in cache + const int radius = qMin( 3, pixmap.width()/2 ); + tileSet = new TileSet( pixmap, radius, radius, pixmap.width()-2*radius, pixmap.height()-2*radius, true ); + _progressBarCache.insert( key, tileSet ); } - return *pixmap; + return tileSet; } diff -Nru kde-workspace-4.8.0b/kstyles/oxygen/oxygenstylehelper.h kde-workspace-4.8.1/kstyles/oxygen/oxygenstylehelper.h --- kde-workspace-4.8.0b/kstyles/oxygen/oxygenstylehelper.h 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kstyles/oxygen/oxygenstylehelper.h 2012-03-02 22:11:07.000000000 +0000 @@ -117,7 +117,7 @@ //@{ //! progressbar - QPixmap progressBarIndicator( const QPalette&, const QRect& ); + TileSet *progressBarIndicator( const QPalette&, int ); //! dial QPixmap dialSlab( const QColor& color, qreal shade, int size = 7 ) @@ -232,9 +232,6 @@ //! dock button cache PixmapCache _dockWidgetButtonCache; - //! progressbar cache - PixmapCache _progressBarCache; - typedef BaseCache TileSetCache; TileSetCache _cornerCache; TileSetCache _holeFlatCache; @@ -244,6 +241,7 @@ TileSetCache _dockFrameCache; TileSetCache _scrollHoleCache; TileSetCache _selectionCache; + TileSetCache _progressBarCache; #ifdef Q_WS_X11 diff -Nru kde-workspace-4.8.0b/kwin/activation.cpp kde-workspace-4.8.1/kwin/activation.cpp --- kde-workspace-4.8.0b/kwin/activation.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/activation.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -408,6 +408,25 @@ (!respectScreen || c->isOnScreen(prev ? prev->screen() : Workspace::self()->activeScreen())); } +Client *Workspace::clientUnderMouse(int screen) const +{ + QList::const_iterator it = stackingOrder().constEnd(); + while (it != stackingOrder().constBegin()) { + Client *client = *(--it); + + // rule out clients which are not really visible. + // the screen test is rather superflous for xrandr & twinview since the geometry would differ -> TODO: might be dropped + if (!(client->isShown(false) && client->isOnCurrentDesktop() && + client->isOnCurrentActivity() && client->isOnScreen(screen))) + continue; + + if (client->geometry().contains(QCursor::pos())) { + return client; + } + } + return 0; +} + // deactivates 'c' and activates next client bool Workspace::activateNextClient(Client* c) { @@ -436,22 +455,10 @@ Client* get_focus = NULL; if (options->nextFocusPrefersMouse) { - QList::const_iterator it = stackingOrder().constEnd(); - while (it != stackingOrder().constBegin()) { - Client *client = *(--it); - - // rule out clients which are not really visible. - // the screen test is rather superflous for xrandr & twinview since the geometry would differ -> TODO: might be dropped - if (!(client->isShown(false) && client->isOnCurrentDesktop() && - client->isOnCurrentActivity() && client->isOnScreen(c ? c->screen() : activeScreen()))) - continue; - - if (client->geometry().contains(QCursor::pos())) { - if (client != c && !client->isDesktop()) // should rather not happen, but it cannot get the focus. rest of usability is tested above - get_focus = client; - break; // unconditional break - we do not pass the focus to some client below an unusable one - } - + get_focus = clientUnderMouse(c ? c->screen() : activeScreen()); + if (get_focus && (get_focus == c || get_focus->isDesktop())) { + // should rather not happen, but it cannot get the focus. rest of usability is tested above + get_focus = 0; } } diff -Nru kde-workspace-4.8.0b/kwin/client.cpp kde-workspace-4.8.1/kwin/client.cpp --- kde-workspace-4.8.0b/kwin/client.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/client.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -831,10 +831,15 @@ noborder = true; updateDecoration(true); } - } - if (shape() && noBorder()) - XShapeCombineShape(display(), frameId(), ShapeBounding, + if (noBorder()) + XShapeCombineShape(display(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); + } else if (app_noborder) { + XShapeCombineMask(display(), frameId(), ShapeBounding, 0, 0, None, ShapeSet); + detectNoBorder(); + app_noborder = noborder; + updateDecoration(true); + } // Decoration mask (i.e. 'else' here) setting is done in setMask() // when the decoration calls it or when the decoration is created/destroyed @@ -2003,9 +2008,12 @@ // mminimize; - Ignore, bogus - E.g. shading or sending to another desktop is "minimizing" too // mmaximize; - Ignore, bogus - Maximizing is basically just resizing + const bool closabilityChanged = motif_may_close != mclose; motif_may_close = mclose; // Motif apps like to crash when they set this hint and WM closes them anyway if (isManaged()) updateDecoration(true); // Check if noborder state has changed + if (decoration && closabilityChanged) + decoration->reset(KDecoration::SettingButtons); } void Client::readIcons(Window win, QPixmap* icon, QPixmap* miniicon, QPixmap* bigicon, QPixmap* hugeicon) diff -Nru kde-workspace-4.8.0b/kwin/clients/oxygen/oxygenclient.cpp kde-workspace-4.8.1/kwin/clients/oxygen/oxygenclient.cpp --- kde-workspace-4.8.0b/kwin/clients/oxygen/oxygenclient.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/clients/oxygen/oxygenclient.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -975,6 +975,8 @@ QPixmap Client::renderTitleText( const QRect& rect, const QString& caption, const QColor& color, bool elide ) const { + if( !rect.isValid() ) return QPixmap(); + QPixmap out( rect.size() ); out.fill( Qt::transparent ); if( caption.isEmpty() || !color.isValid() ) return out; @@ -1435,19 +1437,18 @@ paint( painter ); // update buttons - if( compositingActive() ) + QList buttons( widget()->findChildren() ); + foreach( Button* button, buttons ) { - QList buttons( widget()->findChildren() ); - foreach( Button* button, buttons ) + if( ( button->isVisible() || isPreview() ) && event->rect().intersects( button->geometry() ) ) { - if( button->isVisible() && event->rect().intersects( button->geometry() ) ) - { - painter.save(); - painter.setViewport( button->geometry() ); - painter.setWindow( button->rect() ); - button->paint( painter ); - painter.restore(); - } + + painter.save(); + painter.setViewport( button->geometry() ); + painter.setWindow( button->rect() ); + button->paint( painter ); + painter.restore(); + } } @@ -1686,7 +1687,6 @@ } else if( !( isActive() && configuration().drawTitleOutline() ) ) { - geometry.adjust( buttonsLeftWidth() + layoutMetric( LM_TitleEdgeLeft ) , 0, -( buttonsRightWidth() + layoutMetric( LM_TitleEdgeRight )), 0 ); diff -Nru kde-workspace-4.8.0b/kwin/effects/presentwindows/presentwindows.cpp kde-workspace-4.8.1/kwin/effects/presentwindows/presentwindows.cpp --- kde-workspace-4.8.0b/kwin/effects/presentwindows/presentwindows.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kwin/effects/presentwindows/presentwindows.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -453,7 +453,7 @@ m_motionManager.manage(w); rearrangeWindows(); } - if (w == effects->findWindow(m_closeView->winId())) { + if (m_closeView && w == effects->findWindow(m_closeView->winId())) { winData->visible = true; winData->highlight = 1.0; m_closeWindow = w; @@ -527,7 +527,7 @@ Q_UNUSED(w); QMouseEvent* me = static_cast< QMouseEvent* >(e); - if (m_closeView->geometry().contains(me->pos())) { + if (m_closeView && m_closeView->geometry().contains(me->pos())) { if (!m_closeView->isVisible()) { updateCloseWindow(); } @@ -557,7 +557,7 @@ } if (m_highlightedWindow && m_motionManager.transformedGeometry(m_highlightedWindow).contains(me->pos())) updateCloseWindow(); - else + else if (m_closeView) m_closeView->hide(); if (e->type() == QEvent::MouseButtonRelease) { @@ -966,7 +966,8 @@ return; effects->addRepaintFull(); // Trigger the first repaint - m_closeView->hide(); + if (m_closeView) + m_closeView->hide(); // Work out which windows are on which screens EffectWindowList windowlist; @@ -1600,8 +1601,10 @@ m_highlightedWindow = NULL; m_windowFilter.clear(); - m_closeView = new CloseWindowView(); - connect(m_closeView, SIGNAL(close()), SLOT(closeWindow())); + if (!m_doNotCloseWindows) { + m_closeView = new CloseWindowView(); + connect(m_closeView, SIGNAL(close()), SLOT(closeWindow())); + } // Add every single window to m_windowData (Just calling [w] creates it) foreach (EffectWindow * w, effects->stackingOrder()) { @@ -1770,7 +1773,7 @@ return false; if (w->isSkipSwitcher()) return false; - if (w == effects->findWindow(m_closeView->winId())) + if (m_closeView && w == effects->findWindow(m_closeView->winId())) return false; if (m_tabBoxEnabled) return true; @@ -1803,7 +1806,8 @@ if (w == m_highlightedWindow || (w != NULL && !m_motionManager.isManaging(w))) return; - m_closeView->hide(); + if (m_closeView) + m_closeView->hide(); if (m_highlightedWindow) { effects->setElevatedWindow(m_highlightedWindow, false); m_highlightedWindow->addRepaintFull(); // Trigger the first repaint diff -Nru kde-workspace-4.8.0b/kwin/effects/translucency/translucency.cpp kde-workspace-4.8.1/kwin/effects/translucency/translucency.cpp --- kde-workspace-4.8.0b/kwin/effects/translucency/translucency.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kwin/effects/translucency/translucency.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -69,6 +69,13 @@ void TranslucencyEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) { + // We keep track of the windows that was last active so we know + // which one to fade out and which ones to paint as fully inactive + if (w == active && w != current) { + previous = current; + current = w; + } + moveresize_timeline.setCurrentTime(moveresize_timeline.currentTime() + time); activeinactive_timeline.setCurrentTime(activeinactive_timeline.currentTime() + time); @@ -77,13 +84,15 @@ // don't clear PAINT_WINDOW_OPAQUE, contents are not affected data.clip &= w->contentsRect().translated(w->pos()); // decoration cannot clip } - if (inactive != 1.0 && isInactive(w)) + if (inactive != 1.0 && (isInactive(w) || activeinactive_timeline.currentValue() < 1.0)) + data.setTranslucent(); + else if (moveresize != 1.0 && (w->isUserMove() || w->isUserResize() || w == fadeout)) { data.setTranslucent(); - if ((moveresize != 1.0 && (w->isUserMove() || w->isUserResize())) - || (dialogs != 1.0 && w->isDialog())) { + } + else if (dialogs != 1.0 && w->isDialog()) { data.setTranslucent(); } - if ((dropdownmenus != 1.0 && w->isDropdownMenu()) + else if ((dropdownmenus != 1.0 && w->isDropdownMenu()) || (popupmenus != 1.0 && w->isPopupMenu()) || (tornoffmenus != 1.0 && w->isMenu()) || (comboboxpopups != 1.0 && w->isComboBox())) { @@ -95,13 +104,6 @@ void TranslucencyEffect::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) { - // We keep track of the windows that was last active so we know - // which one to fade out and which ones to paint as fully inactive - if (w == active && w != current) { - previous = current; - current = w; - } - if (w->isDesktop() || w->isDock()) { effects->paintWindow(w, mask, region, data); return; @@ -114,6 +116,8 @@ data.opacity *= (inactive + ((1.0 - inactive) * (1.0 - activeinactive_timeline.currentValue()))); if (activeinactive_timeline.currentValue() < 1.0) w->addRepaintFull(); + else + previous = NULL; } } else { // Fading in @@ -136,8 +140,7 @@ data.opacity *= (moveresize + ((1.0 - moveresize) * (1.0 - progress))); if (progress < 1.0 && progress > 0.0) { w->addRepaintFull(); - if (fadeout != w) - fadeout = w; + fadeout = w; } } else { // Fading back to more opaque diff -Nru kde-workspace-4.8.0b/kwin/events.cpp kde-workspace-4.8.1/kwin/events.cpp --- kde-workspace-4.8.0b/kwin/events.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/events.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -342,29 +342,23 @@ case MapRequest: { updateXTime(); - // e->xmaprequest.window is different from e->xany.window - // TODO this shouldn't be necessary now - Client* c = findClient(WindowMatchPredicate(e->xmaprequest.window)); - if (!c) { -// don't check for the parent being the root window, this breaks when some app unmaps -// a window, changes something and immediately maps it back, without giving KWin -// a chance to reparent it back to root -// since KWin can get MapRequest only for root window children and -// children of WindowWrapper (=clients), the check is AFAIK useless anyway -// Note: Now the save-set support in Client::mapRequestEvent() actually requires that -// this code doesn't check the parent to be root. -// if ( e->xmaprequest.parent == root ) { - if (c = createClient(e->xmaprequest.window, false)) - c->windowEvent(e); - else // refused to manage, simply map it (most probably override redirect) - XMapRaised(display(), e->xmaprequest.window); - return true; - } else { + if (Client* c = findClient(WindowMatchPredicate(e->xmaprequest.window))) { + // e->xmaprequest.window is different from e->xany.window + // TODO this shouldn't be necessary now c->windowEvent(e); updateFocusChains(c, FocusChainUpdate); - return true; + } else if ( true /*|| e->xmaprequest.parent != root */ ) { + // NOTICE don't check for the parent being the root window, this breaks when some app unmaps + // a window, changes something and immediately maps it back, without giving KWin + // a chance to reparent it back to root + // since KWin can get MapRequest only for root window children and + // children of WindowWrapper (=clients), the check is AFAIK useless anyway + // NOTICE: The save-set support in Client::mapRequestEvent() actually requires that + // this code doesn't check the parent to be root. + if (!createClient(e->xmaprequest.window, false)) + XMapRaised(display(), e->xmaprequest.window); } - break; + return true; } case MapNotify: { if (e->xmap.override_redirect) { diff -Nru kde-workspace-4.8.0b/kwin/geometry.cpp kde-workspace-4.8.1/kwin/geometry.cpp --- kde-workspace-4.8.0b/kwin/geometry.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/geometry.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -1623,10 +1623,12 @@ kDebug(1212) << this << bool(value_mask & (CWX|CWWidth|CWY|CWHeight)) << bool(maximizeMode() & MaximizeVertical) << bool(maximizeMode() & MaximizeHorizontal); - if (maximizeMode() & MaximizeVertical) - value_mask &= ~(CWY|CWHeight); // do not allow clients to drop out of vertical ... - if (maximizeMode() & MaximizeHorizontal) - value_mask &= ~(CWX|CWWidth); // .. or horizontal maximization (MaximizeFull == MaximizeVertical|MaximizeHorizontal) + if (!app_noborder) { // + if (maximizeMode() & MaximizeVertical) + value_mask &= ~(CWY|CWHeight); // do not allow clients to drop out of vertical ... + if (maximizeMode() & MaximizeHorizontal) + value_mask &= ~(CWX|CWWidth); // .. or horizontal maximization (MaximizeFull == MaximizeVertical|MaximizeHorizontal) + } if (!(value_mask & (CWX|CWWidth|CWY|CWHeight))) { kDebug(1212) << "DENIED"; return; // nothing to (left) to do for use - bugs #158974, #252314 diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwincompositing/kwincompositing.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwincompositing/kwincompositing.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwincompositing/kwincompositing.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwincompositing/kwincompositing.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -197,6 +197,7 @@ 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 +X-KDE-Keywords[sk]=kwin,okno,správca,kompozícia,efekt X-KDE-Keywords[sr]=kwin,window,manager,compositing,effect,К‑вин,прозор,менаџер,слагање,ефекти X-KDE-Keywords[sr@ijekavian]=kwin,window,manager,compositing,effect,К‑вин,прозор,менаџер,слагање,ефекти X-KDE-Keywords[sr@ijekavianlatin]=kwin,window,manager,compositing,effect,KWin,prozor,menadžer,slaganje,efekti diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwindecoration/kwindecoration.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwindecoration/kwindecoration.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -176,6 +176,7 @@ X-KDE-Keywords[nl]=kwin,venster,beheerder,grens,stijl,thema,look,feel,indeling,knop,handel,rand,kwm,decoratie X-KDE-Keywords[pt]=kwin,gestor,janela,contorno,estilo,tema,aparência,comportamento,disposição,botão,pega,extremo,kwm,decoração X-KDE-Keywords[pt_BR]=kwin,gerenciador,janela,borda,estilo,tema,aparência,comportamento,leiaute,botão,canto,extremo,kwm,decoração +X-KDE-Keywords[sk]=kwin,okno,správca,rám,štýl,téma,vzhľad,cítenie,rozloženie,tlačidlo,spracovanie,okraj,kwm,dekorácia X-KDE-Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,К‑вин,прозор,менаџер,ивица,стила,тема,изглед,осећај,распоред,дугме,ручка,КВМ,декорација X-KDE-Keywords[sr@ijekavian]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,К‑вин,прозор,менаџер,ивица,стила,тема,изглед,осећај,распоред,дугме,ручка,КВМ,декорација X-KDE-Keywords[sr@ijekavianlatin]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,KWin,prozor,menadžer,ivica,stila,tema,izgled,osećaj,raspored,dugme,ručka,KWM,dekoracija diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwindesktop/desktop.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwindesktop/desktop.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwindesktop/desktop.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwindesktop/desktop.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -181,6 +181,7 @@ 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 X-KDE-Keywords[ro]=birou,birouri,număr,birou virtual +X-KDE-Keywords[sk]=plocha,plochy,počet,virtuálna plocha X-KDE-Keywords[sr]=desktop,desktops,number,virtual desktop,површ,број,виртуелна површ X-KDE-Keywords[sr@ijekavian]=desktop,desktops,number,virtual desktop,површ,број,виртуелна површ X-KDE-Keywords[sr@ijekavianlatin]=desktop,desktops,number,virtual desktop,površ,broj,virtuelna površ diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinactions.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinactions.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinactions.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinactions.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -205,6 +205,7 @@ X-KDE-Keywords[nl]=verdonkeren,maximaliseren,minimaliseren,naar onderen,bedieningsmenu,titelbalk,grootte wijzigen X-KDE-Keywords[pt]=enrolar,maximizar,minimizar,baixar,menu de operações,barra de título,dimensionar X-KDE-Keywords[pt_BR]=enrolar,maximizar,minimizar,baixar,menu de operações,barra de título,redimensionar +X-KDE-Keywords[sk]=tieň,maximalizácia,maximalizovanie,minimalizácia,minimalizovanie,nižsí,ponuka operácií,titulkový pruh,zmeniť veľkosť X-KDE-Keywords[sr]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize,сенка,максимизуј,минимизуј,спусти,мени радњи,насловна трака,промени величину X-KDE-Keywords[sr@ijekavian]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize,сенка,максимизуј,минимизуј,спусти,мени радњи,насловна трака,промени величину X-KDE-Keywords[sr@ijekavianlatin]=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize,senka,maksimizuj,minimizuj,spusti,meni radnji,naslovna traka,promeni veličinu diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -203,6 +203,7 @@ X-KDE-Keywords[nl]=verdonkering,grens,overheen bewegen,actieve grenzen X-KDE-Keywords[pt]=enrolamento,contorno,passagem,contornos activos X-KDE-Keywords[pt_BR]=enrolamento,borda,passagem,bordas ativas +X-KDE-Keywords[sk]=tieňovanie,okraj,hover,aktívne okraje X-KDE-Keywords[sr]=shading,border,hover,active borders,сенка,ивица,лебдење,активне ивице X-KDE-Keywords[sr@ijekavian]=shading,border,hover,active borders,сенка,ивица,лебдење,активне ивице X-KDE-Keywords[sr@ijekavianlatin]=shading,border,hover,active borders,senka,ivica,lebdenje,aktivne ivice diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinfocus.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinfocus.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinfocus.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinfocus.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -200,6 +200,7 @@ X-KDE-Keywords[nl]=focus,plaatsing,automatisch omhoog,omhoog,klik omhoog,toetsenbord,CDE,alt-tab,alle bureaublad X-KDE-Keywords[pt]=foco,colocação,elevação automática,elevar,carregar para elevar,teclado,CDE,Alt-Tab,todos os ecrãs X-KDE-Keywords[pt_BR]=foco,colocação,elevação automática,elevar,clicar para elevar,teclado,CDE,alt-tab,todas as áreas de trabalho +X-KDE-Keywords[sk]=zameranie,umiestnenie,automaticky zdvihnúť,zdvihnúť,klávesnica,CDE,alt-tab,všetky plochy X-KDE-Keywords[sr]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,фокус,постављење,аутоматско дизање,дизање,дизање кликом,тастатура,ЦДЕ,Alt-Tab,све површи X-KDE-Keywords[sr@ijekavian]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,фокус,постављење,аутоматско дизање,дизање,дизање кликом,тастатура,ЦДЕ,Alt-Tab,све површи X-KDE-Keywords[sr@ijekavianlatin]=focus,placement,auto raise,raise,click raise,keyboard,CDE,alt-tab,all desktop,fokus,postavljenje,automatsko dizanje,dizanje,dizanje klikom,tastatura,CDE,Alt-Tab,sve površi diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinmoving.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinmoving.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinmoving.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinmoving.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -202,6 +202,7 @@ X-KDE-Keywords[nl]=verplaatsen,smart,cascade,maximaliseren,zone vastzetten,vastzetten,grens X-KDE-Keywords[pt]=movimento,inteligente,cascata,maximizar,ajuste à zona,ajuste,contorno X-KDE-Keywords[pt_BR]=movimento,movimentação,inteligente,cascata,maximizar,ajuste à área,ajuste,borda +X-KDE-Keywords[sk]=presun,smart,kaskáda,maximalizácia,miinmalizácia,oblasť prichytenia,prichytenie,rám X-KDE-Keywords[sr]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,померање,паметно,наслагано,максимизуј,зона лепљења,лепљење,ивица X-KDE-Keywords[sr@ijekavian]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,померање,паметно,наслагано,максимизуј,зона лепљења,лепљење,ивица X-KDE-Keywords[sr@ijekavianlatin]=moving,smart,cascade,maximize,maximise,snap zone,snap,border,pomeranje,pametno,naslagano,maksimizuj,zona lepljenja,lepljenje,ivica diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinoptions.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinoptions.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwinoptions/kwinoptions.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwinoptions/kwinoptions.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -207,6 +207,7 @@ X-KDE-Keywords[nl]=focus,plaatsing,venstegedrag,animatie,omhoog,automatisch omhoog,vensters,frame,titelbalk,dubbelklik X-KDE-Keywords[pt]=foco,colocação,comportamento da janela,animação,elevar,elevar automaticamente,janelas,contorno,barra de título,duplo-click X-KDE-Keywords[pt_BR]=foco,colocação,comportamento da janela,animação,elevar,elevar automaticamente,janelas,contorno,barra de título,clique duplo +X-KDE-Keywords[sk]=zameranie,umiestnenie,správanie okien,animácia,zdvihnúť,automaticky zdvihnúť,okná,rám,titulkový pruh,dvojklik X-KDE-Keywords[sr]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick,фокус,постављење,понашање прозора,анимација,подигни,аутоматско подизање,прозор,оквир,насловна трака,двоклик X-KDE-Keywords[sr@ijekavian]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick,фокус,постављење,понашање прозора,анимација,подигни,аутоматско подизање,прозор,оквир,насловна трака,двоклик X-KDE-Keywords[sr@ijekavianlatin]=focus,placement,window behavior,animation,raise,auto raise,windows,frame,titlebar,doubleclick,fokus,postavljenje,ponašanje prozora,animacija,podigni,automatsko podizanje,prozor,okvir,naslovna traka,dvoklik diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwinrules/kwinrules.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwinrules/kwinrules.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwinrules/kwinrules.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwinrules/kwinrules.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -176,6 +176,7 @@ X-KDE-Keywords[nl]=grootte,positie,status,venstergedrag,vensters,specifiek,er omheen gewerkt,herinneren,regels X-KDE-Keywords[pt]=tamanho,posição,estado,comportamento da janela,janelas,específico,alternativas,recordar,regras X-KDE-Keywords[pt_BR]=tamanho,posição,estado,comportamento da janela,janelas,específico,alternativas,lembrar,regras +X-KDE-Keywords[sk]=veľkosť,poloha,stav,správanie okien,okná,špecifický,workaroundy,pamätať,pravidlá X-KDE-Keywords[sr]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,величина,положај,стање,понашање прозора,прозор,заобилазак,запамти,правила X-KDE-Keywords[sr@ijekavian]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,величина,положај,стање,понашање прозора,прозор,заобилазак,запамти,правила X-KDE-Keywords[sr@ijekavianlatin]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,veličina,položaj,stanje,ponašanje prozora,prozor,zaobilazak,zapamti,pravila diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwinscreenedges/kwinscreenedges.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwinscreenedges/kwinscreenedges.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwinscreenedges/kwinscreenedges.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwinscreenedges/kwinscreenedges.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -165,6 +165,7 @@ X-KDE-Keywords[nl]=kwin,venster,beheerder,effect,rand,grens,actie,schakelaar,bureaublad X-KDE-Keywords[pt]=kwin,janela,gestor,efeito,extremo,contorno,acção,mudar,ecrã X-KDE-Keywords[pt_BR]=kwin,janela,gerenciador,efeito,extremo,borda,ação,mudar,área de trabalho +X-KDE-Keywords[sk]=kwin,okno,správca,efekt,kraj,okraj,akcia,srepnúť,plocha X-KDE-Keywords[sr]=kwin,window,manager,effect,edge,border,action,switch,desktop,К‑вин,прозор,менаџер,ефекат,ивица,радња,пребаци,површ X-KDE-Keywords[sr@ijekavian]=kwin,window,manager,effect,edge,border,action,switch,desktop,К‑вин,прозор,менаџер,ефекат,ивица,радња,пребаци,површ X-KDE-Keywords[sr@ijekavianlatin]=kwin,window,manager,effect,edge,border,action,switch,desktop,KWin,prozor,menadžer,efekat,ivica,radnja,prebaci,površ diff -Nru kde-workspace-4.8.0b/kwin/kcmkwin/kwintabbox/kwintabbox.desktop kde-workspace-4.8.1/kwin/kcmkwin/kwintabbox/kwintabbox.desktop --- kde-workspace-4.8.0b/kwin/kcmkwin/kwintabbox/kwintabbox.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/kwin/kcmkwin/kwintabbox/kwintabbox.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -136,6 +136,7 @@ X-KDE-Keywords[nl]=venster,vensters,schakelaar,vensterwisselaar,wisseling,vensterwisseling,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[pt]=janela,janelas,selector,selector de janelas,mudar,mudança de janela,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[pt_BR]=janela,janelas,seletor,seletor de janelas,mudar,mudança de janela,alttab,alt-tab,alt+tab,alt tab +X-KDE-Keywords[sk]=okno,okná,prepínač,prepínanie okien,prepínanie,prepínač okien,alttab,alt-tab,alt+tab,alt tab X-KDE-Keywords[sr]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab,прозор,мењач,мењач прозора,мењање,пребацивање,AltTab,Alt-Tab,Alt+Tab,Alt Tab X-KDE-Keywords[sr@ijekavian]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab,прозор,мењач,мењач прозора,мењање,пребацивање,AltTab,Alt-Tab,Alt+Tab,Alt Tab X-KDE-Keywords[sr@ijekavianlatin]=window,windows,switcher,window switcher,switching,window switching,alttab,alt-tab,alt+tab,alt tab,prozor,menjač,menjač prozora,menjanje,prebacivanje,AltTab,Alt-Tab,Alt+Tab,Alt Tab diff -Nru kde-workspace-4.8.0b/kwin/libkwineffects/kwinglplatform.cpp kde-workspace-4.8.1/kwin/libkwineffects/kwinglplatform.cpp --- kde-workspace-4.8.0b/kwin/libkwineffects/kwinglplatform.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kwin/libkwineffects/kwinglplatform.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -366,10 +366,14 @@ chipset.contains("Q45/Q43") || chipset.contains("G41") || chipset.contains("B43") || - chipset.contains("Ironlake") || - chipset.contains("Sandybridge")) // GL 3.1, CL 1.1, DX 10.1 + chipset.contains("Ironlake")) return I965; + // GL 3.1, CL 1.1, DX 10.1 + if (chipset.contains("Sandybridge")) { + return SandyBridge; + } + return UnknownIntel; } diff -Nru kde-workspace-4.8.0b/kwin/scene.cpp kde-workspace-4.8.1/kwin/scene.cpp --- kde-workspace-4.8.0b/kwin/scene.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/scene.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -214,9 +214,6 @@ // This has to be done here because many effects schedule a repaint for // the next frame within Effects::prePaintWindow. topw->resetRepaints(topw->decorationRect()); - if (topw->hasShadow()) { - topw->resetRepaints(topw->shadow()->shadowRegion().boundingRect()); - } WindowPrePaintData data; data.mask = orig_mask | (w->isOpaque() ? PAINT_WINDOW_OPAQUE : PAINT_WINDOW_TRANSLUCENT); @@ -273,16 +270,13 @@ // This has to be done here because many effects schedule a repaint for // the next frame within Effects::prePaintWindow. topw->resetRepaints(topw->decorationRect()); - if (topw->hasShadow()) { - topw->resetRepaints(topw->shadow()->shadowRegion().boundingRect()); - } // Clip out the decoration for opaque windows; the decoration is drawn in the second pass if (w->isOpaque()) { // the window is fully opaque data.clip = w->clientShape().translated(w->x(), w->y()); } else if (topw->hasAlpha() && topw->opacity() == 1.0) { // the window is partially opaque - data.clip = (w->clientShape() & topw->opaqueRegion()).translated(w->x(), w->y()); + data.clip = (w->clientShape() & topw->opaqueRegion().translated(topw->clientPos())).translated(w->x(), w->y()); } else { data.clip = QRegion(); } diff -Nru kde-workspace-4.8.0b/kwin/scene_opengl.cpp kde-workspace-4.8.1/kwin/scene_opengl.cpp --- kde-workspace-4.8.0b/kwin/scene_opengl.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/scene_opengl.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -712,8 +712,8 @@ QVector texcoords; vertices.reserve(quads.count() * 6 * 2); texcoords.reserve(quads.count() * 6 * 2); - float width = tex->size().width(); - float height = tex->size().height(); + float width = rect.width(); + float height = rect.height(); #ifndef KWIN_HAVE_OPENGLES if (tex->target() == GL_TEXTURE_RECTANGLE_ARB) { width = 1.0; @@ -1586,18 +1586,11 @@ return; } - const QRectF outerRect(QPointF(-leftOffset(), -topOffset()), QPointF(topLevel()->width() + rightOffset(), topLevel()->height() + bottomOffset())); + const QRectF outerRect(QPointF(-leftOffset(), -topOffset()), + QPointF(topLevel()->width() + rightOffset(), topLevel()->height() + bottomOffset())); - // calculate the width - const qreal cornerWidth = topLeft.width() + topRight.width() + bottomLeft.width() + bottomRight.width(); - const qreal leftRightWidth = left.width() + right.width(); - const qreal topBottomWidth = top.width() + bottom.width(); - // calculate the height - const qreal cornerHeight = qMax(topLeft.height(), qMax(topRight.height(), qMax(bottomLeft.height(), bottomRight.height()))); - const qreal leftRightHeight = qMax(left.height(), right.height()); - - const qreal width = m_texture->width(); - const qreal height = m_texture->height(); + const qreal width = topLeft.width() + top.width() + topRight.width(); + const qreal height = topLeft.height() + left.height() + bottomLeft.height(); qreal tx1(0.0), tx2(0.0), ty1(0.0), ty2(0.0); @@ -1610,9 +1603,9 @@ topLeftQuad[ 3 ] = WindowVertex(outerRect.x(), outerRect.y() + topLeft.height(), tx1, ty2); m_shadowQuads.append(topLeftQuad); - tx2 = top.width()/width; - ty1 = (cornerHeight + leftRightHeight)/height; - ty2 = (cornerHeight + leftRightHeight + top.height())/height; + tx1 = tx2; + tx2 = (topLeft.width() + top.width())/width; + ty2 = top.height()/height; WindowQuad topQuad(WindowQuadShadowTop); topQuad[ 0 ] = WindowVertex(outerRect.x() + topLeft.width(), outerRect.y(), tx1, ty1); topQuad[ 1 ] = WindowVertex(outerRect.right() - topRight.width(), outerRect.y(), tx2, ty1); @@ -1620,9 +1613,8 @@ topQuad[ 3 ] = WindowVertex(outerRect.x() + topLeft.width(), outerRect.y() + top.height(), tx1, ty2); m_shadowQuads.append(topQuad); - tx1 = topLeft.width()/width; - tx2 = (topLeft.width() + topRight.width())/width; - ty1 = 0.0; + tx1 = tx2; + tx2 = 1.0; ty2 = topRight.height()/height; WindowQuad topRightQuad(WindowQuadShadowTopRight); topRightQuad[ 0 ] = WindowVertex(outerRect.right() - topRight.width(), outerRect.y(), tx1, ty1); @@ -1631,10 +1623,9 @@ topRightQuad[ 3 ] = WindowVertex(outerRect.right() - topRight.width(), outerRect.y() + topRight.height(), tx1, ty2); m_shadowQuads.append(topRightQuad); - tx1 = left.width()/width; - tx2 = leftRightWidth/width; - ty1 = cornerHeight/height; - ty2 = (cornerHeight+right.height())/height; + tx1 = (width - right.width())/width; + ty1 = topRight.height()/height; + ty2 = (topRight.height() + right.height())/height; WindowQuad rightQuad(WindowQuadShadowRight); rightQuad[ 0 ] = WindowVertex(outerRect.right() - right.width(), outerRect.y() + topRight.height(), tx1, ty1); rightQuad[ 1 ] = WindowVertex(outerRect.right(), outerRect.y() + topRight.height(), tx2, ty1); @@ -1642,10 +1633,9 @@ rightQuad[ 3 ] = WindowVertex(outerRect.right() - right.width(), outerRect.bottom() - bottomRight.height(), tx1, ty2); m_shadowQuads.append(rightQuad); - tx1 = (topLeft.width() + topRight.width() + bottomLeft.width())/width; - tx2 = cornerWidth/width; - ty1 = 0.0; - ty2 = bottomRight.height()/height; + tx1 = (width - bottomRight.width())/width; + ty1 = ty2; + ty2 = 1.0; WindowQuad bottomRightQuad(WindowQuadShadowBottomRight); bottomRightQuad[ 0 ] = WindowVertex(outerRect.right() - bottomRight.width(), outerRect.bottom() - bottomRight.height(), tx1, ty1); bottomRightQuad[ 1 ] = WindowVertex(outerRect.right(), outerRect.bottom() - bottomRight.height(), tx2, ty1); @@ -1653,10 +1643,9 @@ bottomRightQuad[ 3 ] = WindowVertex(outerRect.right() - bottomRight.width(), outerRect.bottom(), tx1, ty2); m_shadowQuads.append(bottomRightQuad); - tx1 = top.width()/width; - tx2 = topBottomWidth/width; - ty1 = (cornerHeight + leftRightHeight)/height; - ty2 = (cornerHeight + leftRightHeight + bottom.height())/height; + tx2 = tx1; + tx1 = bottomLeft.width()/width; + ty1 = (height - bottom.height())/height; WindowQuad bottomQuad(WindowQuadShadowBottom); bottomQuad[ 0 ] = WindowVertex(outerRect.x() + bottomLeft.width(), outerRect.bottom() - bottom.height(), tx1, ty1); bottomQuad[ 1 ] = WindowVertex(outerRect.right() - bottomRight.width(), outerRect.bottom() - bottom.height(), tx2, ty1); @@ -1664,10 +1653,9 @@ bottomQuad[ 3 ] = WindowVertex(outerRect.x() + bottomLeft.width(), outerRect.bottom(), tx1, ty2); m_shadowQuads.append(bottomQuad); - tx1 = (topLeft.width() + topRight.width())/width; - tx2 = (topLeft.width() + topRight.width() + bottomLeft.width())/width; - ty1 = 0.0; - ty2 = bottomLeft.height()/height; + tx1 = 0.0; + tx2 = bottomLeft.width()/width; + ty1 = (height - bottomLeft.height())/height; WindowQuad bottomLeftQuad(WindowQuadShadowBottomLeft); bottomLeftQuad[ 0 ] = WindowVertex(outerRect.x(), outerRect.bottom() - bottomLeft.height(), tx1, ty1); bottomLeftQuad[ 1 ] = WindowVertex(outerRect.x() + bottomLeft.width(), outerRect.bottom() - bottomLeft.height(), tx2, ty1); @@ -1675,10 +1663,9 @@ bottomLeftQuad[ 3 ] = WindowVertex(outerRect.x(), outerRect.bottom(), tx1, ty2); m_shadowQuads.append(bottomLeftQuad); - tx1 = 0.0; tx2 = left.width()/width; - ty1 = cornerHeight/height; - ty2 = (cornerHeight+left.height())/height; + ty2 = ty1; + ty1 = topLeft.height()/height; WindowQuad leftQuad(WindowQuadShadowLeft); leftQuad[ 0 ] = WindowVertex(outerRect.x(), outerRect.y() + topLeft.height(), tx1, ty1); leftQuad[ 1 ] = WindowVertex(outerRect.x() + left.width(), outerRect.y() + topLeft.height(), tx2, ty1); @@ -1697,29 +1684,22 @@ const QSize bottomLeft(shadowPixmap(ShadowElementBottomLeft).size()); const QSize left(shadowPixmap(ShadowElementLeft).size()); const QSize topLeft(shadowPixmap(ShadowElementTopLeft).size()); - // calculate the width - const int cornerWidth = topLeft.width() + topRight.width() + bottomLeft.width() + bottomRight.width(); - const int leftRightWidth = left.width() + right.width(); - const int topBottomWidth = top.width() + bottom.width(); - const int width = qMax(cornerWidth, qMax(leftRightWidth, topBottomWidth)); - // calculate the height - const int cornerHeight = qMax(topLeft.height(), qMax(topRight.height(), qMax(bottomLeft.height(), bottomRight.height()))); - const int leftRightHeight = qMax(left.height(), right.height()); - const int topBottomHeight = qMax(top.height(), bottom.height()); - const int height = cornerHeight + leftRightHeight + topBottomHeight; + + const int width = topLeft.width() + top.width() + topRight.width(); + const int height = topLeft.height() + left.height() + bottomLeft.height(); QImage image(width, height, QImage::Format_ARGB32); image.fill(Qt::transparent); QPainter p; p.begin(&image); p.drawPixmap(0, 0, shadowPixmap(ShadowElementTopLeft)); - p.drawPixmap(topLeft.width(), 0, shadowPixmap(ShadowElementTopRight)); - p.drawPixmap(topLeft.width() + topRight.width(), 0, shadowPixmap(ShadowElementBottomLeft)); - p.drawPixmap(topLeft.width() + topRight.width() + bottomLeft.width(), 0, shadowPixmap(ShadowElementBottomRight)); - p.drawPixmap(0, cornerHeight, shadowPixmap(ShadowElementLeft)); - p.drawPixmap(left.width(), cornerHeight, shadowPixmap(ShadowElementRight)); - p.drawPixmap(0, cornerHeight + leftRightHeight, shadowPixmap(ShadowElementTop)); - p.drawPixmap(top.width(), cornerHeight + leftRightHeight, shadowPixmap(ShadowElementBottom)); + p.drawPixmap(topLeft.width(), 0, shadowPixmap(ShadowElementTop)); + p.drawPixmap(topLeft.width() + top.width(), 0, shadowPixmap(ShadowElementTopRight)); + p.drawPixmap(0, topLeft.height(), shadowPixmap(ShadowElementLeft)); + p.drawPixmap(width - right.width(), topRight.height(), shadowPixmap(ShadowElementRight)); + p.drawPixmap(0, topLeft.height() + left.height(), shadowPixmap(ShadowElementBottomLeft)); + p.drawPixmap(bottomLeft.width(), height - bottom.height(), shadowPixmap(ShadowElementBottom)); + p.drawPixmap(bottomLeft.width() + bottom.width(), topRight.height() + right.height(), shadowPixmap(ShadowElementBottomRight)); p.end(); delete m_texture; diff -Nru kde-workspace-4.8.0b/kwin/shadow.cpp kde-workspace-4.8.1/kwin/shadow.cpp --- kde-workspace-4.8.0b/kwin/shadow.cpp 2012-01-18 20:08:41.000000000 +0000 +++ kde-workspace-4.8.1/kwin/shadow.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -206,6 +206,9 @@ { QVector data = Shadow::readX11ShadowProperty(m_topLevel->window()); if (data.isEmpty()) { + if (m_topLevel && m_topLevel->effectWindow() && m_topLevel->effectWindow()->sceneWindow()) + m_topLevel->effectWindow()->sceneWindow()->updateShadow(0); + deleteLater(); return false; } init(data); diff -Nru kde-workspace-4.8.0b/kwin/toplevel.cpp kde-workspace-4.8.1/kwin/toplevel.cpp --- kde-workspace-4.8.0b/kwin/toplevel.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/toplevel.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -366,6 +366,7 @@ if (hasShadow()) dirtyRect |= shadow()->shadowRegion().boundingRect(); if (dirtyRect.isValid()) { + resetRepaints(dirtyRect); dirtyRect.translate(pos()); workspace()->addRepaint(dirtyRect); } diff -Nru kde-workspace-4.8.0b/kwin/useractions.cpp kde-workspace-4.8.1/kwin/useractions.cpp --- kde-workspace-4.8.0b/kwin/useractions.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/useractions.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -419,10 +419,8 @@ desk_popup = new QMenu(popup); desk_popup->setFont(KGlobalSettings::menuFont()); - connect(desk_popup, SIGNAL(triggered(QAction*)), - this, SLOT(slotSendToDesktop(QAction*))); - connect(desk_popup, SIGNAL(aboutToShow()), - this, SLOT(desktopPopupAboutToShow())); + connect(desk_popup, SIGNAL(triggered(QAction*)), SLOT(slotSendToDesktop(QAction*))); + connect(desk_popup, SIGNAL(aboutToShow()), SLOT(desktopPopupAboutToShow())); QAction *action = desk_popup->menuAction(); // set it as the first item @@ -627,6 +625,8 @@ WindowOperation op = static_cast< WindowOperation >(action->data().toInt()); Client* c = active_popup_client ? active_popup_client : active_client; + if (!c) + return; QString type; switch(op) { case FullScreenOp: @@ -816,13 +816,17 @@ case Options::MouseRaise: workspace()->raiseClient(this); break; - case Options::MouseLower: + case Options::MouseLower: { workspace()->lowerClient(this); - // As this most likely makes the window no longer visible change the - // keyboard focus to the next available window. - //workspace()->activateNextClient( this ); // Doesn't work when we lower a child window - workspace()->activateClient(workspace()->topClientOnDesktop(workspace()->currentDesktop(), -1)); + // used to be activateNextClient(this), then topClientOnDesktop + // since this is a mouseOp it's however safe to use the client under the mouse instead + if (isActive()) { + Client *next = workspace()->clientUnderMouse(screen()); + if (next && next != this) + workspace()->requestFocus(next, false); + } break; + } case Options::MouseShade : toggleShade(); cancelShadeHoverTimer(); @@ -1126,17 +1130,18 @@ setCurrentDesktop(i); } +#define USABLE_ACTIVE_CLIENT (active_client && !(active_client->isDesktop() || active_client->isDock())) void Workspace::slotWindowToDesktop() { - const int i = senderValue(sender()); - if (i < 1) - return; - Client* c = active_popup_client ? active_popup_client : active_client; - if (i >= 1 && i <= numberOfDesktops() && c - && !c->isDesktop() - && !c->isDock()) - sendClientToDesktop(c, i, true); + if (USABLE_ACTIVE_CLIENT) { + const int i = senderValue(sender()); + if (i < 1) + return; + + if (i >= 1 && i <= numberOfDesktops()) + sendClientToDesktop(active_client, i, true); + } } void Workspace::slotSwitchToScreen() @@ -1153,25 +1158,20 @@ void Workspace::slotWindowToScreen() { - const int i = senderValue(sender()); - if (i < 0) - return; - Client* c = active_popup_client ? active_popup_client : active_client; - if (i >= 0 && i <= numScreens() && c - && !c->isDesktop() - && !c->isDock()) { - sendClientToScreen(c, i); + if (USABLE_ACTIVE_CLIENT) { + const int i = senderValue(sender()); + if (i < 0) + return; + if (i >= 0 && i <= numScreens()) { + sendClientToScreen(active_client, i); + } } } void Workspace::slotWindowToNextScreen() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c - && !c->isDesktop() - && !c->isDock()) { - sendClientToScreen(c, (c->screen() + 1) % numScreens()); - } + if (USABLE_ACTIVE_CLIENT) + sendClientToScreen(active_client, (active_client->screen() + 1) % numScreens()); } /*! @@ -1179,9 +1179,8 @@ */ void Workspace::slotWindowMaximize() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::MaximizeOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::MaximizeOp); } /*! @@ -1189,9 +1188,8 @@ */ void Workspace::slotWindowMaximizeVertical() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::VMaximizeOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::VMaximizeOp); } /*! @@ -1199,9 +1197,8 @@ */ void Workspace::slotWindowMaximizeHorizontal() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::HMaximizeOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::HMaximizeOp); } @@ -1210,8 +1207,8 @@ */ void Workspace::slotWindowMinimize() { - Client* c = active_popup_client ? active_popup_client : active_client; - performWindowOperation(c, Options::MinimizeOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::MinimizeOp); } /*! @@ -1219,8 +1216,8 @@ */ void Workspace::slotWindowShade() { - Client* c = active_popup_client ? active_popup_client : active_client; - performWindowOperation(c, Options::ShadeOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::ShadeOp); } /*! @@ -1228,9 +1225,8 @@ */ void Workspace::slotWindowRaise() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - raiseClient(c); + if (USABLE_ACTIVE_CLIENT) + raiseClient(active_client); } /*! @@ -1238,13 +1234,13 @@ */ void Workspace::slotWindowLower() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) { - lowerClient(c); + if (USABLE_ACTIVE_CLIENT) { + lowerClient(active_client); // As this most likely makes the window no longer visible change the // keyboard focus to the next available window. //activateNextClient( c ); // Doesn't work when we lower a child window - activateClient(topClientOnDesktop(currentDesktop(), -1)); + if (active_client->isActive()) + activateClient(topClientOnDesktop(currentDesktop(), -1)); } } @@ -1253,50 +1249,43 @@ */ void Workspace::slotWindowRaiseOrLower() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - raiseOrLowerClient(c); + if (USABLE_ACTIVE_CLIENT) + raiseOrLowerClient(active_client); } void Workspace::slotWindowOnAllDesktops() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - c->setOnAllDesktops(!c->isOnAllDesktops()); + if (USABLE_ACTIVE_CLIENT) + active_client->setOnAllDesktops(!active_client->isOnAllDesktops()); } void Workspace::slotWindowFullScreen() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::FullScreenOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::FullScreenOp); } void Workspace::slotWindowNoBorder() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::NoBorderOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::NoBorderOp); } void Workspace::slotWindowAbove() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::KeepAboveOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::KeepAboveOp); } void Workspace::slotWindowBelow() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::KeepBelowOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::KeepBelowOp); } void Workspace::slotSetupWindowShortcut() { - Client* c = active_popup_client ? active_popup_client : active_client; - if (c) - performWindowOperation(c, Options::SetupWindowShortcutOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::SetupWindowShortcutOp); } /*! @@ -1312,7 +1301,8 @@ */ void Workspace::slotWindowToNextDesktop() { - windowToNextDesktop(active_popup_client ? active_popup_client : active_client); + if (USABLE_ACTIVE_CLIENT) + windowToNextDesktop(active_client); } void Workspace::windowToNextDesktop(Client* c) @@ -1333,7 +1323,8 @@ */ void Workspace::slotWindowToPreviousDesktop() { - windowToPreviousDesktop(active_popup_client ? active_popup_client : active_client); + if (USABLE_ACTIVE_CLIENT) + windowToPreviousDesktop(active_client); } void Workspace::windowToPreviousDesktop(Client* c) @@ -1351,13 +1342,12 @@ void Workspace::slotWindowToDesktopRight() { - int d = desktopToRight(currentDesktop(), options->rollOverDesktops); - if (d == currentDesktop()) - return; - Client* c = active_popup_client ? active_popup_client : active_client; - if (c && !c->isDesktop() - && !c->isDock()) { - setClientIsMoving(c); + if (USABLE_ACTIVE_CLIENT) { + int d = desktopToRight(currentDesktop(), options->rollOverDesktops); + if (d == currentDesktop()) + return; + + setClientIsMoving(active_client); setCurrentDesktop(d); setClientIsMoving(NULL); } @@ -1365,13 +1355,12 @@ void Workspace::slotWindowToDesktopLeft() { - int d = desktopToLeft(currentDesktop(), options->rollOverDesktops); - if (d == currentDesktop()) - return; - Client* c = active_popup_client ? active_popup_client : active_client; - if (c && !c->isDesktop() - && !c->isDock()) { - setClientIsMoving(c); + if (USABLE_ACTIVE_CLIENT) { + int d = desktopToLeft(currentDesktop(), options->rollOverDesktops); + if (d == currentDesktop()) + return; + + setClientIsMoving(active_client); setCurrentDesktop(d); setClientIsMoving(NULL); } @@ -1379,13 +1368,12 @@ void Workspace::slotWindowToDesktopUp() { - int d = desktopAbove(currentDesktop(), options->rollOverDesktops); - if (d == currentDesktop()) - return; - Client* c = active_popup_client ? active_popup_client : active_client; - if (c && !c->isDesktop() - && !c->isDock()) { - setClientIsMoving(c); + if (USABLE_ACTIVE_CLIENT) { + int d = desktopAbove(currentDesktop(), options->rollOverDesktops); + if (d == currentDesktop()) + return; + + setClientIsMoving(active_client); setCurrentDesktop(d); setClientIsMoving(NULL); } @@ -1393,13 +1381,12 @@ void Workspace::slotWindowToDesktopDown() { - int d = desktopBelow(currentDesktop(), options->rollOverDesktops); - if (d == currentDesktop()) - return; - Client* c = active_popup_client ? active_popup_client : active_client; - if (c && !c->isDesktop() - && !c->isDock()) { - setClientIsMoving(c); + if (USABLE_ACTIVE_CLIENT) { + int d = desktopBelow(currentDesktop(), options->rollOverDesktops); + if (d == currentDesktop()) + return; + + setClientIsMoving(active_client); setCurrentDesktop(d); setClientIsMoving(NULL); } @@ -1630,8 +1617,8 @@ // TODO: why? // if ( tab_box->isVisible()) // return; - Client* c = active_popup_client ? active_popup_client : active_client; - performWindowOperation(c, Options::CloseOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::CloseOp); } /*! @@ -1639,8 +1626,8 @@ */ void Workspace::slotWindowMove() { - Client* c = active_popup_client ? active_popup_client : active_client; - performWindowOperation(c, Options::UnrestrictedMoveOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::UnrestrictedMoveOp); } /*! @@ -1648,10 +1635,12 @@ */ void Workspace::slotWindowResize() { - Client* c = active_popup_client ? active_popup_client : active_client; - performWindowOperation(c, Options::UnrestrictedResizeOp); + if (USABLE_ACTIVE_CLIENT) + performWindowOperation(active_client, Options::UnrestrictedResizeOp); } +#undef USABLE_ACTIVE_CLIENT + void Client::setShortcut(const QString& _cut) { QString cut = rules()->checkShortcut(_cut); diff -Nru kde-workspace-4.8.0b/kwin/workspace.h kde-workspace-4.8.1/kwin/workspace.h --- kde-workspace-4.8.0b/kwin/workspace.h 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/kwin/workspace.h 2012-03-02 22:11:07.000000000 +0000 @@ -144,6 +144,8 @@ */ Client* mostRecentlyActivatedClient() const; + Client* clientUnderMouse(int screen) const; + void activateClient(Client*, bool force = false); void requestFocus(Client* c, bool force = false); void takeActivity(Client* c, int flags, bool handled); // Flags are ActivityFlags diff -Nru kde-workspace-4.8.0b/libs/oxygen/oxygentileset.cpp kde-workspace-4.8.1/libs/oxygen/oxygentileset.cpp --- kde-workspace-4.8.0b/libs/oxygen/oxygentileset.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/libs/oxygen/oxygentileset.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -53,6 +53,7 @@ //______________________________________________________________ TileSet::TileSet( void ): + _stretch( false ), _w1(0), _h1(0), _w3(0), @@ -60,16 +61,25 @@ { _pixmaps.reserve(9); } //______________________________________________________________ - TileSet::TileSet(const QPixmap &pix, int w1, int h1, int w2, int h2): - _w1(w1), _h1(h1), _w3(0), _h3(0) + TileSet::TileSet(const QPixmap &pix, int w1, int h1, int w2, int h2, bool stretch ): + _stretch( stretch ), + _w1(w1), + _h1(h1), + _w3(0), + _h3(0) { _pixmaps.reserve(9); if (pix.isNull()) return; _w3 = pix.width() - (w1 + w2); _h3 = pix.height() - (h1 + h2); - int w = w2; while (w < _sideExtent && w2 > 0) w += w2; - int h = h2; while (h < _sideExtent && h2 > 0) h += h2; + int w = w2; + int h = h2; + if( !_stretch ) + { + while (w < _sideExtent && w2 > 0) w += w2; + while (h < _sideExtent && h2 > 0) h += h2; + } // initialise pixmap array initPixmap( _pixmaps, pix, _w1, _h1, QRect(0, 0, _w1, _h1) ); @@ -84,16 +94,25 @@ } //______________________________________________________________ - TileSet::TileSet(const QPixmap &pix, int w1, int h1, int w3, int h3, int x1, int y1, int w2, int h2) - : _w1(w1), _h1(h1), _w3(w3), _h3(h3) + TileSet::TileSet(const QPixmap &pix, int w1, int h1, int w3, int h3, int x1, int y1, int w2, int h2, bool stretch ): + _stretch( stretch ), + _w1(w1), + _h1(h1), + _w3(w3), + _h3(h3) { _pixmaps.reserve(9); if (pix.isNull()) return; int x2 = pix.width() - _w3; int y2 = pix.height() - _h3; - int w = w2; while (w < _sideExtent && w2 > 0) w += w2; - int h = h2; while (h < _sideExtent && h2 > 0) h += h2; + int w = w2; + int h = h2; + if( !_stretch ) + { + while (w < _sideExtent && w2 > 0) w += w2; + while (h < _sideExtent && h2 > 0) h += h2; + } // initialise pixmap array initPixmap( _pixmaps, pix, _w1, _h1, QRect(0, 0, _w1, _h1) ); @@ -116,6 +135,9 @@ void TileSet::render(const QRect &r, QPainter *p, Tiles t) const { + const bool oldHint( p->testRenderHint( QPainter::SmoothPixmapTransform ) ); + if( _stretch ) p->setRenderHint( QPainter::SmoothPixmapTransform, true ); + // check initialization if( _pixmaps.size() < 9 ) return; @@ -145,10 +167,13 @@ // calculate corner locations w -= wLeft + wRight; h -= hTop + hBottom; - int x1 = x0 + wLeft; - int x2 = x1 + w; - int y1 = y0 + hTop; - int y2 = y1 + h; + const int x1 = x0 + wLeft; + const int x2 = x1 + w; + const int y1 = y0 + hTop; + const int y2 = y1 + h; + + const int w2 = _pixmaps.at(7).width(); + const int h2 = _pixmaps.at(5).height(); // corner if( bits(t, Top|Left) ) p->drawPixmap(x0, y0, _pixmaps.at(0), 0, 0, wLeft, hTop); @@ -159,19 +184,45 @@ // top and bottom if( w > 0 ) { - if (t & Top ) p->drawTiledPixmap(x1, y0, w, hTop, _pixmaps.at(1)); - if (t & Bottom ) p->drawTiledPixmap(x1, y2, w, hBottom, _pixmaps.at(7), 0, _h3-hBottom); + if (t & Top ) + { + if( _stretch ) p->drawPixmap(x1, y0, w, hTop, _pixmaps.at(1)); + else p->drawTiledPixmap(x1, y0, w, hTop, _pixmaps.at(1)); + } + + if (t & Bottom ) + { + if( _stretch ) p->drawPixmap(x1, y2, w, hBottom, _pixmaps.at(7), 0, _h3-hBottom, w2, hBottom ); + else p->drawTiledPixmap(x1, y2, w, hBottom, _pixmaps.at(7), 0, _h3-hBottom ); + } + } // left and right if( h > 0 ) { - if (t & Left ) p->drawTiledPixmap(x0, y1, wLeft, h, _pixmaps.at(3)); - if (t & Right ) p->drawTiledPixmap(x2, y1, wRight, h, _pixmaps.at(5), _w3-wRight, 0); + if (t & Left ) + { + if( _stretch ) p->drawPixmap(x0, y1, wLeft, h, _pixmaps.at(3)); + else p->drawTiledPixmap(x0, y1, wLeft, h, _pixmaps.at(3)); + } + + if (t & Right ) + { + if( _stretch ) p->drawPixmap(x2, y1, wRight, h, _pixmaps.at(5), _w3-wRight, 0, wRight, h2 ); + else p->drawTiledPixmap(x2, y1, wRight, h, _pixmaps.at(5), _w3-wRight, 0 ); + } } // center - if ( (t & Center) && h > 0 && w > 0 ) p->drawTiledPixmap(x1, y1, w, h, _pixmaps.at(4)); + if ( (t & Center) && h > 0 && w > 0 ) + { + if( _stretch ) p->drawPixmap(x1, y1, w, h, _pixmaps.at(4)); + else p->drawTiledPixmap(x1, y1, w, h, _pixmaps.at(4)); + } + + if( _stretch ) p->setRenderHint( QPainter::SmoothPixmapTransform, oldHint ); + } //___________________________________________________________ diff -Nru kde-workspace-4.8.0b/libs/oxygen/oxygentileset.h kde-workspace-4.8.1/libs/oxygen/oxygentileset.h --- kde-workspace-4.8.0b/libs/oxygen/oxygentileset.h 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/libs/oxygen/oxygentileset.h 2012-03-02 22:11:07.000000000 +0000 @@ -49,7 +49,7 @@ @param w2 width of the not-left-or-right chunks @param h2 height of the not-top-or-bottom chunks */ - TileSet(const QPixmap&, int w1, int h1, int w2, int h2); + TileSet(const QPixmap&, int w1, int h1, int w2, int h2, bool stretch = false ); /*! Create a TileSet from a pixmap. The size of the top/left and bottom/right @@ -67,7 +67,7 @@ @param w2 width of the not-left-or-right chunks @param h2 height of the not-top-or-bottom chunks */ - TileSet(const QPixmap &pix, int w1, int h1, int w3, int h3, int x2, int y2, int w2, int h2); + TileSet(const QPixmap &pix, int w1, int h1, int w3, int h3, int x2, int y2, int w2, int h2, bool stretch = false ); //! empty constructor TileSet(); @@ -154,6 +154,9 @@ //! pixmap arry PixmapList _pixmaps; + // stretch pixmaps + bool _stretch; + // dimensions int _w1; int _h1; diff -Nru kde-workspace-4.8.0b/plasma/desktop/shell/controllerwindow.cpp kde-workspace-4.8.1/plasma/desktop/shell/controllerwindow.cpp --- kde-workspace-4.8.0b/plasma/desktop/shell/controllerwindow.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/desktop/shell/controllerwindow.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -494,7 +494,18 @@ if (info.windowType(NET::DesktopMask | NET::DockMask | NET::PopupMenuMask) == -1) { // an unfortunate little hack to allow windows to be tagged in a way that they don't // close the controller - if (widget->property("DoNotCloseController").isNull()) { + bool shouldClose = true; + QWidget *checkWidget = widget; + while (checkWidget) { + if (!checkWidget->property("DoNotCloseController").isNull()) { + shouldClose = false; + break; + } + + checkWidget = checkWidget->parentWidget(); + } + + if (shouldClose) { // single shot to work around Qt 4.8+ bug in event loop count in x11event handler QTimer::singleShot(0, this, SLOT(deleteLater())); } else { diff -Nru kde-workspace-4.8.0b/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.SaL/metadata.desktop kde-workspace-4.8.1/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.SaL/metadata.desktop --- kde-workspace-4.8.0b/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.SaL/metadata.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.SaL/metadata.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -39,7 +39,7 @@ Name[pa]=ਖੋਜ ਅਤੇ ਚਲਾਓ Name[pl]=Znajdź i uruchom Name[pt]=Pesquisa e Lançamento -Name[pt_BR]=Pesquisar e executar +Name[pt_BR]=Pesquisa e execução Name[ro]=Căutare și lansare Name[ru]=Поиск и запуск Name[sk]=Hľadať a spustiť diff -Nru kde-workspace-4.8.0b/plasma/generic/applets/icon/icon.cpp kde-workspace-4.8.1/plasma/generic/applets/icon/icon.cpp --- kde-workspace-4.8.0b/plasma/generic/applets/icon/icon.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/generic/applets/icon/icon.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -146,24 +146,23 @@ disconnect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, SLOT(checkService(QStringList))); + m_hasDesktopFile = false; delete m_watcher; m_watcher = 0; - if (m_url.isLocalFile()) { - m_watcher = new KDirWatch; - m_watcher->addFile(m_url.toLocalFile()); - connect(m_watcher, SIGNAL(deleted(QString)), this, SLOT(delayedDestroy())); - } // if local - // if executable + // if not a directory and executable // make desktop file // desktop file - m_hasDesktopFile = false; if (m_url.isLocalFile()) { + m_watcher = new KDirWatch; + m_watcher->addFile(m_url.toLocalFile()); + connect(m_watcher, SIGNAL(deleted(QString)), this, SLOT(delayedDestroy())); + QFileInfo fi(m_url.toLocalFile()); if (KDesktopFile::isDesktopFile(m_url.toLocalFile())) { m_hasDesktopFile = true; - } else if (fi.isExecutable()) { + } else if (!fi.isDir() && fi.isExecutable()) { const QString suggestedName = fi.baseName(); const QString file = KService::newServicePath(false, suggestedName); KDesktopFile df(file); diff -Nru kde-workspace-4.8.0b/plasma/generic/dataengines/time/plasma-dataengine-time.desktop kde-workspace-4.8.1/plasma/generic/dataengines/time/plasma-dataengine-time.desktop --- kde-workspace-4.8.0b/plasma/generic/dataengines/time/plasma-dataengine-time.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/generic/dataengines/time/plasma-dataengine-time.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -105,7 +105,7 @@ Comment[hi]=तारीख़ तथा समय समयक्षेत्र हिसाब से Comment[hr]=Datum i vrijeme po vremenskoj zoni Comment[hu]=Dátum és idő (időzónánként) -Comment[ia]=Data e tempore per zona de tempore +Comment[ia]=Data e tempore per fuso horari Comment[id]=Tanggal dan waktu menurut zona waktu Comment[is]=Stillingar dagssetningar og klukku eftir tímabeltum Comment[it]=Data e ora per fuso orario diff -Nru kde-workspace-4.8.0b/plasma/generic/runners/kill/plasma-runner-kill.desktop kde-workspace-4.8.1/plasma/generic/runners/kill/plasma-runner-kill.desktop --- kde-workspace-4.8.0b/plasma/generic/runners/kill/plasma-runner-kill.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/generic/runners/kill/plasma-runner-kill.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -112,7 +112,7 @@ Comment[pa]=ਐਪਲੀਕੇਸ਼ਨਾਂ ਰੋਕੋ, ਜੋ ਇਸ ਸਮੇਂ ਚੱਲ ਰਹੀਆਂ ਹਨ Comment[pl]=Zatrzymanie programów, które są obecnie uruchomione Comment[pt]=Parar as aplicações actualmente em execução -Comment[pt_BR]=Interrompe os aplicativos atualmente em execução +Comment[pt_BR]=Interrompe aplicativos em execução Comment[ro]=Oprește aplicații ce rulează momentan Comment[ru]=Завершение работы запущенных в данный момент приложений Comment[si]=දැනට ක්‍රියාකරන යෙදුම් නැවතීම diff -Nru kde-workspace-4.8.0b/plasma/generic/runners/locations/locationrunner.cpp kde-workspace-4.8.1/plasma/generic/runners/locations/locationrunner.cpp --- kde-workspace-4.8.0b/plasma/generic/runners/locations/locationrunner.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/generic/runners/locations/locationrunner.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -18,7 +18,6 @@ #include "locationrunner.h" -#include #include #include @@ -29,6 +28,7 @@ #include #include #include +#include #include @@ -48,60 +48,6 @@ { } -static void processUrl(KUrl &url, const QString &term) -{ - if (url.protocol().isEmpty()) { - const int idx = term.indexOf('/'); - - url.clear(); - url.setHost(term.left(idx)); - if (idx != -1) { - //allow queries - const int queryStart = term.indexOf('?', idx); - int pathLength = -1; - if ((queryStart > -1) && (idx < queryStart)) { - pathLength = queryStart - idx; - url.setQuery(term.mid(queryStart)); - } - - url.setPath(term.mid(idx, pathLength)); - } - if (term.startsWith("ftp")) { - url.setProtocol("ftp"); - } - else { - url.setProtocol("http"); - } - } -} - -//Suports accessing man/info-pages with '#' as the triggering shortcut -//Replaces the '#' sign with "man" and "##" with "info:" -QString manInfoLookup(QString term) -{ - if (term.startsWith("##")) { - return term.replace(0, 2, "info:"); - } else if (term.startsWith("#")) { - return term.replace(0, 1, "man:"); - } - - return term; -} - -//Any url that has a protocol or that looks like a url is accepted -bool couldBeUrl(const QString &term) -{ - //Does not support a port, as then everything that is before the colon would be interpreted as protocol - static const QString ip4vPart("(25[0-5]|2[0-4]\\d|1?\\d\\d?)");//0-255 is allowed - static const QString ipv4('(' + ip4vPart + "\\." + ip4vPart + "\\." + ip4vPart + "\\." + ip4vPart + ')'); - static const QString fqnd("([^/]+\\.[a-zA-Z]{2,})"); - static const QString host("^(" + ipv4 + '|' + fqnd + ")"); - QRegExp rx(host + "(/.*)?$", Qt::CaseSensitive, QRegExp::RegExp2); - - const KUrl url(term); - return (!url.protocol().isEmpty() || rx.exactMatch(term)); -} - void LocationsRunner::match(Plasma::RunnerContext &context) { @@ -141,11 +87,15 @@ match.setId("help"); context.addMatch(term, match); } else if (type == Plasma::RunnerContext::NetworkLocation || - (type == Plasma::RunnerContext::UnknownType && - (term.startsWith('#') || couldBeUrl(term)))) { + type == Plasma::RunnerContext::UnknownType) { + + bool filtered = KUriFilter::self()->filterUri(term, QStringList() << QLatin1String("kshorturifilter")); + + if (!filtered) { + return; + } - KUrl url(manInfoLookup(term)); - processUrl(url, term); + KUrl url(term); if (!KProtocolInfo::isKnownProtocol(url.protocol())) { return; @@ -180,36 +130,18 @@ void LocationsRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match) { - const QString location = context.query(); + Q_UNUSED(match) + + QString location = context.query(); if (location.isEmpty()) { return; } - QString data = match.data().toString(); - Plasma::RunnerContext::Type type = context.type(); //kDebug() << "command: " << context.query(); //kDebug() << "url: " << location << data; - KUrl urlToRun(location); - - if (location.startsWith('#')) { - urlToRun = manInfoLookup(location); - } else if ((type == Plasma::RunnerContext::NetworkLocation || type == Plasma::RunnerContext::UnknownType) && - (data.startsWith("http://") || data.startsWith("ftp://"))) { - // the text may have changed while we were running, so we have to refresh - // our content - processUrl(urlToRun, location); - } else if (type != Plasma::RunnerContext::NetworkLocation) { - QString path = QDir::cleanPath(KShell::tildeExpand(location)); - - //no protocol defined, might be a local folder - if (urlToRun.protocol().isEmpty() && (path[0] != '/')) { - path.prepend('/').prepend(QDir::currentPath()); - } - - urlToRun = path; - } + KUrl urlToRun(KUriFilter::self()->filteredUri(location, QStringList() << QLatin1String("kshorturifilter"))); new KRun(urlToRun, 0); } diff -Nru kde-workspace-4.8.0b/plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop kde-workspace-4.8.1/plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop --- kde-workspace-4.8.0b/plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -94,7 +94,7 @@ Comment[pa]=ਪਲਾਜ਼ਾਮ ਵਿਦਜੈੱਟ ਲੱਭੋ, ਜੋ ਕਿ ਇੱਕਲੇ ਵਿੰਡੋਜ਼ ਵਜੋਂ ਚੱਲ ਸਕਦੇ ਹਨ Comment[pl]=Znajdź elementy interfejsu, które mogą działać jako oddzielne okna Comment[pt]=Procurar elementos do Plasma que possam ser executados como janelas autónomas -Comment[pt_BR]=Localiza widgets do Plasma que possam ser executados como janelas autônomas +Comment[pt_BR]=Localiza widgets do Plasma que possam ser executados como janelas independentes Comment[ro]=Găsește controale Plasma ce pot rula în ferestre independente Comment[ru]=Поиск виджетов, способных работать как самостоятельные приложения Comment[si]=තනි කවුළු ලෙස ධාවනය කල හැකි ප්ලැස්මා විජට්ටු සොයන්න diff -Nru kde-workspace-4.8.0b/plasma/netbook/containments/sal/plasma-containment-sal.desktop kde-workspace-4.8.1/plasma/netbook/containments/sal/plasma-containment-sal.desktop --- kde-workspace-4.8.0b/plasma/netbook/containments/sal/plasma-containment-sal.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/plasma/netbook/containments/sal/plasma-containment-sal.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -38,7 +38,7 @@ Name[pa]=ਖੋਜ ਅਤੇ ਚਲਾਓ Name[pl]=Znajdź i uruchom Name[pt]=Pesquisa e Lançamento -Name[pt_BR]=Pesquisar e executar +Name[pt_BR]=Pesquisa e execução Name[ro]=Căutare și lansare Name[ru]=Поиск и запуск Name[sk]=Hľadať a spustiť @@ -88,7 +88,7 @@ Comment[pa]=ਖੋਜ ਇੰਟਰਫੇਸ ਨਾਲ ਪੂਰੀ ਸਕਰੀਨ ਉੱਤੇ ਐਪਲੀਕੇਸਨ ਲਾਂਚਰਖੋਜ ਇੰਟਰਫੇਸ ਨਾਲ ਪੂਰੀ ਸਕਰੀਨ ਉੱਤੇ ਐਪਲੀਕੇਸਨ ਕਖੋਜ ਇੰਟਰਫੇਸ ਨਾਲ ਪੂਰੀ ਸਕਰੀਨ ਉੱਤੇ ਐਪਲੀਕੇਸ਼ਣ ਖੋਜ ਇੰਟਰਫੇਸ ਨਾਲ ਪੂਰੀ ਖੋਜ ਇੰਟਰ Comment[pl]=Pełnoekranowy aktywator programów z interfejsem wyszukiwania Comment[pt]=Um lançador de aplicações de ecrã completo, com interface de pesquisa -Comment[pt_BR]=Um lançador de aplicativos de tela cheia completo, com interface de pesquisa +Comment[pt_BR]=Execução de aplicativos em tela cheia com interface de pesquisa Comment[ro]=Lansator de aplicații pe tot ecranul, cu interfață de căutare Comment[ru]=Полноэкранное меню запуска приложений с возможностью поиска Comment[sk]=Celoobrazovkový spúšťač aplikácií s rozhraním pre vyhľadávanie diff -Nru kde-workspace-4.8.0b/plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultSal/metadata.desktop kde-workspace-4.8.1/plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultSal/metadata.desktop --- kde-workspace-4.8.0b/plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultSal/metadata.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultSal/metadata.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -40,7 +40,7 @@ Name[pa]=ਖੋਜ ਅਤੇ ਚਲਾਓ Name[pl]=Znajdź i uruchom Name[pt]=Pesquisa e lançamento -Name[pt_BR]=Pesquisar e executar +Name[pt_BR]=Pesquisa e execução Name[ro]=Căutare și lansare Name[ru]=Поиск и запуск Name[si]=සොයා දියත් කරන්න diff -Nru kde-workspace-4.8.0b/plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop kde-workspace-4.8.1/plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop --- kde-workspace-4.8.0b/plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -40,7 +40,7 @@ Name[pa]=ਖੋਜ ਅਤੇ ਚਲਾਓ Name[pl]=Znajdź i uruchom Name[pt]=Pesquisa e lançamento -Name[pt_BR]=Pesquisar e executar +Name[pt_BR]=Pesquisa e execução Name[ro]=Căutare și lansare Name[ru]=Поиск и запуск Name[si]=සොයා දියත් කරන්න diff -Nru kde-workspace-4.8.0b/powerdevil/daemon/actions/bundled/handlebuttonevents.cpp kde-workspace-4.8.1/powerdevil/daemon/actions/bundled/handlebuttonevents.cpp --- kde-workspace-4.8.0b/powerdevil/daemon/actions/bundled/handlebuttonevents.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/daemon/actions/bundled/handlebuttonevents.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -26,6 +26,7 @@ #include #include +#include "PowerDevilSettings.h" #include "screensaver_interface.h" namespace PowerDevil { @@ -72,50 +73,53 @@ { switch (type) { case BackendInterface::LidClose: - processAction(m_lidAction); + // Check if the configuration makes it explicit or not + processAction(m_lidAction, PowerDevilSettings::doNotInhibitOnLidClose()); break; case BackendInterface::LidOpen: // In this case, let's send a wakeup event KIdleTime::instance()->simulateUserActivity(); break; case BackendInterface::PowerButton: - processAction(m_powerButtonAction); + // This one is always explicit + processAction(m_powerButtonAction, true); break; default: break; } } -void HandleButtonEvents::processAction(uint action) +void HandleButtonEvents::processAction(uint action, bool isExplicit) { // Basically, we simply trigger other actions :) switch ((SuspendSession::Mode)action) { case SuspendSession::TurnOffScreenMode: // Turn off screen - triggerAction("DPMSControl", qVariantFromValue< QString >("TurnOff")); + triggerAction("DPMSControl", qVariantFromValue< QString >("TurnOff"), isExplicit); break; default: - triggerAction("SuspendSession", qVariantFromValue< uint >(action)); + triggerAction("SuspendSession", qVariantFromValue< uint >(action), isExplicit); break; } } -void HandleButtonEvents::triggerAction(const QString& action, const QVariant &type) +void HandleButtonEvents::triggerAction(const QString& action, const QVariant &type, bool isExplicit) { PowerDevil::Action *helperAction = ActionPool::instance()->loadAction(action, KConfigGroup(), core()); if (helperAction) { QVariantMap args; args["Type"] = type; + args["Explicit"] = QVariant::fromValue(isExplicit); helperAction->trigger(args); } } void HandleButtonEvents::triggerImpl(const QVariantMap& args) { - // For now, let's just accept the phantomatic "32" button. + // For now, let's just accept the phantomatic "32" button. It is also always explicit if (args["Button"].toInt() == 32) { if (args.contains("Type")) { - triggerAction("SuspendSession", args["Type"]); + triggerAction("SuspendSession", args["Type"], true); } } } diff -Nru kde-workspace-4.8.0b/powerdevil/daemon/actions/bundled/handlebuttonevents.h kde-workspace-4.8.1/powerdevil/daemon/actions/bundled/handlebuttonevents.h --- kde-workspace-4.8.0b/powerdevil/daemon/actions/bundled/handlebuttonevents.h 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/daemon/actions/bundled/handlebuttonevents.h 2012-03-02 22:11:07.000000000 +0000 @@ -49,8 +49,8 @@ void onButtonPressed(PowerDevil::BackendInterface::ButtonType type); private: - void processAction(uint action); - void triggerAction(const QString &action, const QVariant &type); + void processAction(uint action, bool isExplicit); + void triggerAction(const QString &action, const QVariant &type, bool isExplicit); uint m_lidAction; uint m_powerButtonAction; diff -Nru kde-workspace-4.8.0b/powerdevil/daemon/backends/upower/backlighthelper.cpp kde-workspace-4.8.1/powerdevil/daemon/backends/upower/backlighthelper.cpp --- kde-workspace-4.8.0b/powerdevil/daemon/backends/upower/backlighthelper.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/daemon/backends/upower/backlighthelper.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -22,6 +22,7 @@ #include #include + #define PREFIX "/sys/class/backlight/" BacklightHelper::BacklightHelper(QObject * parent) @@ -34,9 +35,9 @@ { // find the first existing device with backlight support QStringList interfaces; - interfaces << "nv_backlight" << "intel_backlight" << "radeon_bl" << "mbp_backlight" - << "asus_laptop" << "toshiba" << "eeepc" << "thinkpad_screen" << "acpi_video1" - << "acpi_video0" << "apple_backlight" << "fujitsu-laptop" << "samsung" + interfaces << "nv_backlight" << "radeon_bl" << "mbp_backlight" << "asus_laptop" + << "toshiba" << "eeepc" << "thinkpad_screen" << "acpi_video1" << "acpi_video0" + << "intel_backlight" << "apple_backlight" << "fujitsu-laptop" << "samsung" << "nvidia_backlight" << "dell_backlight" << "sony" << "pwm-backlight" ; @@ -51,6 +52,16 @@ } } + //If none of our whitelisted interface is available, get the first one (if any) + if (m_dirname.isEmpty()) { + dir.setPath(PREFIX); + dir.setFilter(QDir::AllDirs | QDir::NoDot | QDir::NoDotDot | QDir::NoDotAndDotDot | QDir::Readable); + QStringList dirList = dir.entryList(); + if (!dirList.isEmpty()) { + m_dirname = dirList.first(); + } + } + if (m_dirname.isEmpty()) { qWarning() << "no kernel backlight interface found"; return; diff -Nru kde-workspace-4.8.0b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp kde-workspace-4.8.1/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp --- kde-workspace-4.8.0b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -252,8 +252,13 @@ m_onBattery = m_upowerInterface->onBattery(); QList deviceList = m_upowerInterface->EnumerateDevices(); - foreach (const QDBusObjectPath & device, deviceList) - slotDeviceAdded(device.path()); + foreach (const QDBusObjectPath & device, deviceList) { + OrgFreedesktopUPowerDeviceInterface * upowerDevice = + new OrgFreedesktopUPowerDeviceInterface(UPOWER_SERVICE, device.path(), QDBusConnection::systemBus(), this); + m_devices.insert(device.path(), upowerDevice); + } + + updateDeviceProps(); if (m_onBattery) setAcAdapterState(Unplugged); @@ -289,10 +294,12 @@ qlonglong remainingTime = 0; foreach(OrgFreedesktopUPowerDeviceInterface * upowerDevice, m_devices) { - if ((upowerDevice->type() == 2 || upowerDevice->type() == 3) && upowerDevice->powerSupply()) { - if (upowerDevice->state() == 1) // charging + uint type = upowerDevice->type(); + if (( type == 2 || type == 3) && upowerDevice->powerSupply()) { + uint state = upowerDevice->state(); + if (state == 1) // charging remainingTime += upowerDevice->timeToFull(); - else if (upowerDevice->state() == 2) //discharging + else if (state == 2) //discharging remainingTime += upowerDevice->timeToEmpty(); } } diff -Nru kde-workspace-4.8.0b/powerdevil/daemon/powerdevilpolicyagent.cpp kde-workspace-4.8.1/powerdevil/daemon/powerdevilpolicyagent.cpp --- kde-workspace-4.8.0b/powerdevil/daemon/powerdevilpolicyagent.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/daemon/powerdevilpolicyagent.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -257,6 +257,9 @@ m_busWatcher.data()->addWatchedService(service); } + kDebug() << "Added inhibition from an explicit DBus service, " << service << ", with cookie " << + m_lastCookie << " from " << appName << " with " << reason; + addInhibitionTypeHelper(m_lastCookie, static_cast< PolicyAgent::RequiredPolicies >(types)); return m_lastCookie; @@ -273,12 +276,14 @@ // Retrieve the service, if we've been called from DBus if (calledFromDBus() && !m_busWatcher.isNull()) { if (!message().service().isEmpty()) { + kDebug() << "DBus service " << message().service() << " is requesting inhibition"; m_cookieToBusService.insert(m_lastCookie, message().service()); m_busWatcher.data()->addWatchedService(message().service()); } } - kDebug() << "Added inhibition with cookie " << m_lastCookie; + kDebug() << "Added inhibition with cookie " << m_lastCookie << " from " << + appName << " with " << reason; addInhibitionTypeHelper(m_lastCookie, static_cast< PolicyAgent::RequiredPolicies >(types)); diff -Nru kde-workspace-4.8.0b/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop kde-workspace-4.8.1/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop --- kde-workspace-4.8.0b/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -37,6 +37,7 @@ Name[pt_BR]=Configurações da atividade Name[ro]=Configurări activitate Name[ru]=Настройка для комнат +Name[sk]=Nastavenie aktivity Name[sl]=Nastavitve dejavnosti Name[sr]=Поставке активности Name[sr@ijekavian]=Поставке активности @@ -71,6 +72,7 @@ Comment[pt_BR]=Configura as opções de gerenciamento de energia por atividade Comment[ro]=Configurează opțiunile de gestiune a alimentării pe activitate Comment[ru]=Настройка параметров энергосбережения отдельно для каждой комнаты +Comment[sk]=Nastaviť nastavenia správy napájania podľa aktivity Comment[sl]=Nastavitve upravljanja z energijo glede na dejavnost Comment[sr]=Подешавање поставки према активности за управљање напајањем Comment[sr@ijekavian]=Подешавање поставки према активности за управљање напајањем @@ -98,6 +100,7 @@ X-KDE-Keywords[nl]=systeem,energie,energiebeheer,laptop,batterij,suspension,AC,onderbreken,slapen,helderheid,prestaties,deksel,activiteit,activiteiten X-KDE-Keywords[pt]=sistema,energia,gestão de energia,portátil,bateria,suspensão,AC,suspender,hibernar,brilho,performance,tampo,actividade,actividades X-KDE-Keywords[pt_BR]=sistema,energia,gerenciamento de energia,energia,portátil,laptop,notebook,bateria,suspensão,AC,suspender,hibernar,brilho,desempenho,tampa,atividade,atividades +X-KDE-Keywords[sk]=systém,napájanie,správa napájanie,energia,laptop,batéria,uspanie,AC,uspať,hibernovať,jas,výkon,kryt,aktivita,aktivity X-KDE-Keywords[sr]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,activity,activities,систем,напајање,струја,управљање напајањем,лаптоп,батерија,суспендовање,АЦ,хибернација,светлина,осветљај,перформансе,поклопац,активност X-KDE-Keywords[sr@ijekavian]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,activity,activities,систем,напајање,струја,управљање напајањем,лаптоп,батерија,суспендовање,АЦ,хибернација,светлина,осветљај,перформансе,поклопац,активност X-KDE-Keywords[sr@ijekavianlatin]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,activity,activities,sistem,napajanje,struja,upravljanje napajanjem,laptop,baterija,suspendovanje,AC,hibernacija,svetlina,osvetljaj,performanse,poklopac,aktivnost diff -Nru kde-workspace-4.8.0b/powerdevil/kcmodule/global/GeneralPage.cpp kde-workspace-4.8.1/powerdevil/kcmodule/global/GeneralPage.cpp --- kde-workspace-4.8.0b/powerdevil/kcmodule/global/GeneralPage.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/kcmodule/global/GeneralPage.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -139,6 +139,7 @@ void GeneralPage::load() { lockScreenOnResume->setChecked(PowerDevilSettings::configLockScreen()); + doNotInhibitLid->setChecked(PowerDevilSettings::doNotInhibitOnLidClose()); lowSpin->setValue(PowerDevilSettings::batteryLowLevel()); criticalSpin->setValue(PowerDevilSettings::batteryCriticalLevel()); @@ -154,6 +155,7 @@ void GeneralPage::save() { PowerDevilSettings::setConfigLockScreen(lockScreenOnResume->isChecked()); + PowerDevilSettings::setDoNotInhibitOnLidClose(doNotInhibitLid->isChecked()); PowerDevilSettings::setBatteryLowLevel(lowSpin->value()); PowerDevilSettings::setBatteryCriticalLevel(criticalSpin->value()); diff -Nru kde-workspace-4.8.0b/powerdevil/kcmodule/global/generalPage.ui kde-workspace-4.8.1/powerdevil/kcmodule/global/generalPage.ui --- kde-workspace-4.8.0b/powerdevil/kcmodule/global/generalPage.ui 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/kcmodule/global/generalPage.ui 2012-03-02 22:11:07.000000000 +0000 @@ -205,7 +205,7 @@ - + @@ -241,6 +241,32 @@ + + + + When this option is selected, applications will not be allowed to inhibit sleep when the lid is closed + + + When this option is selected, applications will not be allowed to inhibit sleep when the lid is closed + + + Never prevent an action on lid close + + + + + + + When this option is selected, applications will not be allowed to inhibit sleep when the lid is closed + + + When this option is selected, applications will not be allowed to inhibit sleep when the lid is closed + + + + + + diff -Nru kde-workspace-4.8.0b/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop kde-workspace-4.8.1/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop --- kde-workspace-4.8.0b/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -20,7 +20,7 @@ Name[es]=Preferencias avanzadas Name[et]=Muud seadistused Name[eu]=Ezarpen aurreratuak -Name[fi]=Lisäasetuksets +Name[fi]=Lisäasetukset Name[ga]=Ardsocruithe Name[hu]=Speciális beállítások Name[ia]=Preferentias Avantiate @@ -36,6 +36,7 @@ Name[pt]=Configuração avançada Name[pt_BR]=Configurações avançadas Name[ro]=Configurări avansate +Name[sk]=Pokročilé nastavenia Name[sl]=Napredne nastavitve Name[sr]=Напредне поставке Name[sr@ijekavian]=Напредне поставке @@ -71,6 +72,7 @@ Comment[pt]=Configurar as opções avançadas de Gestão de Energia Comment[pt_BR]=Configura as opções avançadas de gerenciamento de energia Comment[ro]=Configurează opțiunile avansate de gestiune a alimentării +Comment[sk]=Nastaviť nastavenia pokročilej správy napájania Comment[sl]=Nastavi napredne nastavitve upravljanja z energijo Comment[sr]=Подешавање напредних поставки за управљање напајањем Comment[sr@ijekavian]=Подешавање напредних поставки за управљање напајањем @@ -98,6 +100,7 @@ X-KDE-Keywords[nl]=systeem,energie,energiebeheer,laptop,batterij,suspension,AC,onderbreken,slapen,helderheid,prestaties,deksel X-KDE-Keywords[pt]=sistema,energia,gestão de energia,portátil,bateria,suspensão,AC,suspender,hibernar,brilho,performance,tampo X-KDE-Keywords[pt_BR]=sistema,energia,gerenciamento de energia,energia,notebook,laptop,portátil,bateria,suspensão,AC,suspender,hibernar,brilho,desempenho,tampa +X-KDE-Keywords[sk]=systém,napájanie,správa napájanie,energia,laptop,batéria,uspanie,AC,uspať,hibernovať,jas,výkon,kryt X-KDE-Keywords[sr]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,систем,напајање,струја,управљање напајањем,лаптоп,батерија,суспендовање,АЦ,хибернација,светлина,осветљај,перформансе,поклопац X-KDE-Keywords[sr@ijekavian]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,систем,напајање,струја,управљање напајањем,лаптоп,батерија,суспендовање,АЦ,хибернација,светлина,осветљај,перформансе,поклопац X-KDE-Keywords[sr@ijekavianlatin]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,sistem,napajanje,struja,upravljanje napajanjem,laptop,baterija,suspendovanje,AC,hibernacija,svetlina,osvetljaj,performanse,poklopac diff -Nru kde-workspace-4.8.0b/powerdevil/kcmodule/profiles/EditPage.cpp kde-workspace-4.8.1/powerdevil/kcmodule/profiles/EditPage.cpp --- kde-workspace-4.8.0b/powerdevil/kcmodule/profiles/EditPage.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/kcmodule/profiles/EditPage.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -135,6 +135,7 @@ if (batteryCount == 0) { tabWidget->setTabEnabled(1, false); tabWidget->setTabEnabled(2, false); + tabWidget->setTabBarHidden(true); } if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.Solid.PowerManagement")) { diff -Nru kde-workspace-4.8.0b/powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop kde-workspace-4.8.1/powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop --- kde-workspace-4.8.0b/powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -35,6 +35,7 @@ Name[pt]=Configuração da Poupança de Energia Name[pt_BR]=Configurações de economia de energia Name[ro]=Configurări pentru economisirea energiei +Name[sk]=Nastavenia šetrenia energie Name[sl]=Nastavitve varčevanja z energijo Name[sr]=Поставке штедње енергије Name[sr@ijekavian]=Поставке штедње енергије @@ -70,6 +71,7 @@ Comment[pt]=Configurar as Opções de Poupança de Energia Comment[pt_BR]=Configura as opções de economia de energia Comment[ro]=Configurează economisirea energiei +Comment[sk]=Nastaviť nastavenia šetrenia energie Comment[sr]=Подешавање поставки штедње енергије Comment[sr@ijekavian]=Подешавање поставки штедње енергије Comment[sr@ijekavianlatin]=Podešavanje postavki štednje energije @@ -96,6 +98,7 @@ X-KDE-Keywords[nl]=systeem,energie,energiebeheer,laptop,batterij,suspension,AC,onderbreken,slapen,helderheid,prestaties,deksel X-KDE-Keywords[pt]=sistema,energia,gestão de energia,portátil,bateria,suspensão,AC,suspender,hibernar,brilho,performance,tampo X-KDE-Keywords[pt_BR]=sistema,energia,gerenciamento de energia,energia,notebook,laptop,portátil,bateria,suspensão,AC,suspender,hibernar,brilho,desempenho,tampa +X-KDE-Keywords[sk]=systém,napájanie,správa napájanie,energia,laptop,batéria,uspanie,AC,uspať,hibernovať,jas,výkon,kryt X-KDE-Keywords[sr]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,систем,напајање,струја,управљање напајањем,лаптоп,батерија,суспендовање,АЦ,хибернација,светлина,осветљај,перформансе,поклопац X-KDE-Keywords[sr@ijekavian]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,систем,напајање,струја,управљање напајањем,лаптоп,батерија,суспендовање,АЦ,хибернација,светлина,осветљај,перформансе,поклопац X-KDE-Keywords[sr@ijekavianlatin]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,sistem,napajanje,struja,upravljanje napajanjem,laptop,baterija,suspendovanje,AC,hibernacija,svetlina,osvetljaj,performanse,poklopac diff -Nru kde-workspace-4.8.0b/powerdevil/PowerDevilSettings.kcfg kde-workspace-4.8.1/powerdevil/PowerDevilSettings.kcfg --- kde-workspace-4.8.0b/powerdevil/PowerDevilSettings.kcfg 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/powerdevil/PowerDevilSettings.kcfg 2012-03-02 22:11:07.000000000 +0000 @@ -26,6 +26,9 @@ true + + true + diff -Nru kde-workspace-4.8.0b/solid/CMakeLists.txt kde-workspace-4.8.1/solid/CMakeLists.txt --- kde-workspace-4.8.0b/solid/CMakeLists.txt 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/solid/CMakeLists.txt 2012-03-02 22:11:07.000000000 +0000 @@ -3,6 +3,7 @@ add_subdirectory(kcm) add_subdirectory(solid-actions-kcm) +add_subdirectory(icons) IF("${CMAKE_SYSTEM}" MATCHES "Linux") add_subdirectory(solidshell) diff -Nru kde-workspace-4.8.0b/solid/icons/CMakeLists.txt kde-workspace-4.8.1/solid/icons/CMakeLists.txt --- kde-workspace-4.8.0b/solid/icons/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ kde-workspace-4.8.1/solid/icons/CMakeLists.txt 2012-03-02 22:11:07.000000000 +0000 @@ -0,0 +1 @@ +kde4_install_icons( ${ICON_INSTALL_DIR} ) Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/solid/icons/ox22-app-networkmanager.png and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/solid/icons/ox22-app-networkmanager.png differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/solid/icons/ox32-app-networkmanager.png and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/solid/icons/ox32-app-networkmanager.png differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/solid/icons/ox64-app-networkmanager.png and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/solid/icons/ox64-app-networkmanager.png differ diff -Nru kde-workspace-4.8.0b/solid/kcm/kcm_solid.desktop kde-workspace-4.8.1/solid/kcm/kcm_solid.desktop --- kde-workspace-4.8.0b/solid/kcm/kcm_solid.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/solid/kcm/kcm_solid.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -161,6 +161,7 @@ X-KDE-Keywords[pa]=ਸਾਲਡ,ਹਾਰਡਵੇਅਰ,ਪਾਵਰ,ਨੈੱਟਵਰਕ,ਖੋਜ,ਪਰਬੰਧ,ਪ੍ਰਬੰਧ X-KDE-Keywords[pt]=Solid,Hardware,Energia,Rede,Descoberta,Gestão X-KDE-Keywords[pt_BR]=Solid,Hardware,Energia,Rede,Descoberta,Gerenciamento +X-KDE-Keywords[sk]=Solid,Hardvér,Napájanie,Sieť,Discovery,Správa X-KDE-Keywords[sr]=Solid,Hardware,Power,Network,Discovery,Management,Солид,хардвер,напајање,струја,мрежа,откривање,управљање X-KDE-Keywords[sr@ijekavian]=Solid,Hardware,Power,Network,Discovery,Management,Солид,хардвер,напајање,струја,мрежа,откривање,управљање X-KDE-Keywords[sr@ijekavianlatin]=Solid,Hardware,Power,Network,Discovery,Management,Solid,hardver,napajanje,struja,mreža,otkrivanje,upravljanje diff -Nru kde-workspace-4.8.0b/solid/modemmanager-0.4/modemgsmnetworkinterface.cpp kde-workspace-4.8.1/solid/modemmanager-0.4/modemgsmnetworkinterface.cpp --- kde-workspace-4.8.0b/solid/modemmanager-0.4/modemgsmnetworkinterface.cpp 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/solid/modemmanager-0.4/modemgsmnetworkinterface.cpp 2012-03-02 22:11:07.000000000 +0000 @@ -43,6 +43,11 @@ this, SLOT(slotRegistrationInfoChanged(uint,QString,QString))); connect( &d->modemGsmNetworkIface, SIGNAL(SignalQuality(uint)), this, SIGNAL(signalQualityChanged(uint))); + + d->signalQuality = d->modemGsmNetworkIface.GetSignalQuality(); + d->registrationInfo = d->modemGsmNetworkIface.GetRegistrationInfo(); + d->accessTechnology = (Solid::Control::ModemInterface::AccessTechnology)d->modemGsmNetworkIface.accessTechnology(); + d->allowedMode = (Solid::Control::ModemInterface::AllowedMode)d->modemGsmNetworkIface.allowedMode(); } MMModemGsmNetworkInterface::~MMModemGsmNetworkInterface() @@ -69,27 +74,34 @@ } } +void MMModemGsmNetworkInterface::slotSignalQualityChanged(uint signalQuality) +{ + Q_D(MMModemGsmNetworkInterface); + d->signalQuality = signalQuality; + emit signalQualityChanged(d->signalQuality); +} + void MMModemGsmNetworkInterface::slotRegistrationInfoChanged(uint status, const QString & operatorCode, const QString &operatorName) { - RegistrationInfoType r; + Q_D(MMModemGsmNetworkInterface); - r.status = (Solid::Control::ModemGsmNetworkInterface::RegistrationStatus) status; - r.operatorCode = operatorCode; - r.operatorName = operatorName; + d->registrationInfo.status = (Solid::Control::ModemGsmNetworkInterface::RegistrationStatus) status; + d->registrationInfo.operatorCode = operatorCode; + d->registrationInfo.operatorName = operatorName; - emit registrationInfoChanged(r); + emit registrationInfoChanged(d->registrationInfo); } Solid::Control::ModemInterface::AllowedMode MMModemGsmNetworkInterface::getAllowedMode() const { Q_D(const MMModemGsmNetworkInterface); - return (Solid::Control::ModemInterface::AllowedMode) d->modemGsmNetworkIface.allowedMode(); + return d->allowedMode; } Solid::Control::ModemInterface::AccessTechnology MMModemGsmNetworkInterface::getAccessTechnology() const { Q_D(const MMModemGsmNetworkInterface); - return (Solid::Control::ModemInterface::AccessTechnology) d->modemGsmNetworkIface.accessTechnology(); + return d->accessTechnology; } void MMModemGsmNetworkInterface::registerToNetwork(const QString & networkId) @@ -130,26 +142,14 @@ RegistrationInfoType MMModemGsmNetworkInterface::getRegistrationInfo() { - Q_D(MMModemGsmNetworkInterface); - QDBusReply< RegistrationInfoType > registrationInfo = d->modemGsmNetworkIface.GetRegistrationInfo(); - - if (registrationInfo.isValid()) - return registrationInfo.value(); - - kDebug(1441) << "Error getting registration info for operator: " << registrationInfo.error().name() << ": " << registrationInfo.error().message(); - return RegistrationInfoType(); + Q_D(const MMModemGsmNetworkInterface); + return d->registrationInfo; } uint MMModemGsmNetworkInterface::getSignalQuality() { - Q_D(MMModemGsmNetworkInterface); - QDBusReply< uint > signalQuality = d->modemGsmNetworkIface.GetSignalQuality(); - - if (signalQuality.isValid()) - return signalQuality.value(); - - kDebug(1441) << "Error getting signal quality: " << signalQuality.error().name() << ": " << signalQuality.error().message(); - return 0; + Q_D(const MMModemGsmNetworkInterface); + return d->signalQuality; } void MMModemGsmNetworkInterface::setAllowedMode(const Solid::Control::ModemInterface::AllowedMode mode) diff -Nru kde-workspace-4.8.0b/solid/modemmanager-0.4/modemgsmnetworkinterface.h kde-workspace-4.8.1/solid/modemmanager-0.4/modemgsmnetworkinterface.h --- kde-workspace-4.8.0b/solid/modemmanager-0.4/modemgsmnetworkinterface.h 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/solid/modemmanager-0.4/modemgsmnetworkinterface.h 2012-03-02 22:11:07.000000000 +0000 @@ -50,6 +50,7 @@ Solid::Control::ModemInterface::AllowedMode getAllowedMode() const; Solid::Control::ModemInterface::AccessTechnology getAccessTechnology() const; public Q_SLOTS: + void slotSignalQualityChanged(uint signalQuality); void slotRegistrationInfoChanged(uint status, const QString & operatorCode, const QString &operatorName); void propertiesChanged(const QString & interface, const QVariantMap & properties); Q_SIGNALS: diff -Nru kde-workspace-4.8.0b/solid/modemmanager-0.4/modemgsmnetworkinterface_p.h kde-workspace-4.8.1/solid/modemmanager-0.4/modemgsmnetworkinterface_p.h --- kde-workspace-4.8.0b/solid/modemmanager-0.4/modemgsmnetworkinterface_p.h 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/solid/modemmanager-0.4/modemgsmnetworkinterface_p.h 2012-03-02 22:11:07.000000000 +0000 @@ -30,6 +30,10 @@ public: MMModemGsmNetworkInterfacePrivate(const QString &path, QObject *owner); OrgFreedesktopModemManagerModemGsmNetworkInterface modemGsmNetworkIface; + uint signalQuality; + Solid::Control::ModemGsmNetworkInterface::RegistrationInfoType registrationInfo; + Solid::Control::ModemInterface::AccessTechnology accessTechnology; + Solid::Control::ModemInterface::AllowedMode allowedMode; }; #endif diff -Nru kde-workspace-4.8.0b/solid/networkmanager-0.7/CMakeLists.txt kde-workspace-4.8.1/solid/networkmanager-0.7/CMakeLists.txt --- kde-workspace-4.8.0b/solid/networkmanager-0.7/CMakeLists.txt 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/solid/networkmanager-0.7/CMakeLists.txt 2012-03-02 22:11:07.000000000 +0000 @@ -59,5 +59,3 @@ install(TARGETS solid_networkmanager07 DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES solid_networkmanager07.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends ) - -kde4_install_icons( ${ICON_INSTALL_DIR} ) Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/solid/networkmanager-0.7/ox22-app-networkmanager.png and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/solid/networkmanager-0.7/ox22-app-networkmanager.png differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/solid/networkmanager-0.7/ox32-app-networkmanager.png and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/solid/networkmanager-0.7/ox32-app-networkmanager.png differ Binary files /tmp/GSnE0gPX_I/kde-workspace-4.8.0b/solid/networkmanager-0.7/ox64-app-networkmanager.png and /tmp/p6aBDyoGS2/kde-workspace-4.8.1/solid/networkmanager-0.7/ox64-app-networkmanager.png differ diff -Nru kde-workspace-4.8.0b/solid/networkmanager_fake-0.9/CMakeLists.txt kde-workspace-4.8.1/solid/networkmanager_fake-0.9/CMakeLists.txt --- kde-workspace-4.8.0b/solid/networkmanager_fake-0.9/CMakeLists.txt 2012-01-18 20:08:42.000000000 +0000 +++ kde-workspace-4.8.1/solid/networkmanager_fake-0.9/CMakeLists.txt 2012-03-02 22:11:07.000000000 +0000 @@ -38,5 +38,3 @@ install(TARGETS solid_networkmanager09_fake DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES solid_networkmanager09_fake.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends ) - -kde4_install_icons( ${ICON_INSTALL_DIR} ) diff -Nru kde-workspace-4.8.0b/solid/solid-actions-kcm/solid-actions.desktop kde-workspace-4.8.1/solid/solid-actions-kcm/solid-actions.desktop --- kde-workspace-4.8.0b/solid/solid-actions-kcm/solid-actions.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/solid/solid-actions-kcm/solid-actions.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -163,6 +163,7 @@ X-KDE-Keywords[pt]=Acções do Dispositivo Solid X-KDE-Keywords[pt_BR]=Ações do dispositivo Solid X-KDE-Keywords[ro]=Acțiuni dispozitiv Solid +X-KDE-Keywords[sk]=Akcie zariadení Solid X-KDE-Keywords[sr]=Solid Devices Actions,Солидове радње над уређајима X-KDE-Keywords[sr@ijekavian]=Solid Devices Actions,Солидове радње над уређајима X-KDE-Keywords[sr@ijekavianlatin]=Solid Devices Actions,Solidove radnje nad uređajima diff -Nru kde-workspace-4.8.0b/systemsettings/app/kdesystemsettings.desktop kde-workspace-4.8.1/systemsettings/app/kdesystemsettings.desktop --- kde-workspace-4.8.0b/systemsettings/app/kdesystemsettings.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/systemsettings/app/kdesystemsettings.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -32,6 +32,7 @@ GenericName[pt]=Configuração do Sistema KDE GenericName[pt_BR]=Configurações do sistema KDE GenericName[ro]=Configurări de sistem +GenericName[sk]=Nastavenie systému KDE GenericName[sl]=KDE-jeve sistemske nastavitve GenericName[sr]=КДЕ Системске поставке GenericName[sr@ijekavian]=КДЕ Системске поставке @@ -70,6 +71,7 @@ Name[pt]=Configuração do Sistema KDE Name[pt_BR]=Configurações do sistema KDE Name[ro]=Configurări de sistem KDE +Name[sk]=Nastavenie systému KDE Name[sl]=KDE-jeve sistemske nastavitve Name[sr]=КДЕ Системске поставке Name[sr@ijekavian]=КДЕ Системске поставке diff -Nru kde-workspace-4.8.0b/systemsettings/classic/settings-classic-view.desktop kde-workspace-4.8.1/systemsettings/classic/settings-classic-view.desktop --- kde-workspace-4.8.0b/systemsettings/classic/settings-classic-view.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/systemsettings/classic/settings-classic-view.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -28,6 +28,7 @@ X-KDE-Keywords[pt]=Configuração do Sistema X-KDE-Keywords[pt_BR]=Configurações do sistema X-KDE-Keywords[ro]=Configurări de sistem +X-KDE-Keywords[sk]=Systémové nastavenia X-KDE-Keywords[sl]=Sistemske nastavitve X-KDE-Keywords[sr]=System Settings,Системске поставке X-KDE-Keywords[sr@ijekavian]=System Settings,Системске поставке diff -Nru kde-workspace-4.8.0b/systemsettings/icons/settings-icon-view.desktop kde-workspace-4.8.1/systemsettings/icons/settings-icon-view.desktop --- kde-workspace-4.8.0b/systemsettings/icons/settings-icon-view.desktop 2012-01-23 10:10:13.000000000 +0000 +++ kde-workspace-4.8.1/systemsettings/icons/settings-icon-view.desktop 2012-03-02 22:11:07.000000000 +0000 @@ -28,6 +28,7 @@ X-KDE-Keywords[pt]=Configuração do Sistema X-KDE-Keywords[pt_BR]=Configurações do sistema X-KDE-Keywords[ro]=Configurări de sistem +X-KDE-Keywords[sk]=Systémové nastavenia X-KDE-Keywords[sl]=Sistemske nastavitve X-KDE-Keywords[sr]=System Settings,Системске поставке X-KDE-Keywords[sr@ijekavian]=System Settings,Системске поставке