Martin Gräßlin
969e6b85e7
Merge branch 'master' into frameworks-scratch
...
Conflicts:
CMakeLists.txt
kwin/client.cpp
kwin/effects/highlightwindow/highlightwindow.cpp
kwin/libkwineffects/kwingltexture.cpp
kwin/libkwineffects/kwinxrenderutils.cpp
kwin/scene_opengl.cpp
kwin/workspace.cpp
plasma/desktop/applets/kickoff/CMakeLists.txt
plasma/desktop/applets/taskmanager/package/contents/code/tools.js
plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
plasma/desktop/applets/taskmanager/package/contents/ui/main.qml
plasma/desktop/applets/taskmanager/package/metadata.desktop
plasma/desktop/applets/taskmanager/plugin/textlabel.h
plasma/desktop/applets/tasks/CMakeLists.txt
plasma/desktop/applets/tasks/package/metadata.desktop
plasma/desktop/applets/tasks/tasks.cpp
plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
plasma/generic/applets/activitybar/activitybar.cpp
plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-09-24 11:28:38 +02:00
Martin Gräßlin
36d0a90859
KIntSpinBox -> QSpinBox in kwin/effects configs
2013-09-09 07:38:30 +02:00
Thomas Lübking
809d261067
align GUI object name to kcfg name
...
BUG: 315866
FIXED-IN: 4.11.1
REVIEW: 112237
2013-08-25 17:05:37 +02:00
Salva Ardid
b8630d19ec
Use KConfigXT in DimInactive Effect
...
REVIEW: 106422
2012-09-14 10:39:27 +02:00
Martin Gräßlin
11aeee10d5
Option to not dim kept above windows in dim inactive effect.
...
Thanks to Jin Liu for providing the patch.
FEATURE: 233639
svn path=/trunk/KDE/kdebase/workspace/; revision=1114493
2010-04-13 18:42:05 +00:00
Andrius Štikonas
f3dad43a18
Use KIntSpinBox instead of QSpinBox for better integration with KDE. As a bonus this allows to use plural suffix in spinboxes since KDE 4.3 if necessary.
...
svn path=/trunk/KDE/kdebase/workspace/; revision=989742
2009-06-30 20:09:04 +00:00
Lucas Murray
846496d2c1
Cleaned up the effects/ directory by moving each individual effect into
...
its own directory, cleaned up the effect config macros and renamed
"MakeTransparent" to "Translucency" so that it matches its visible name.
svn path=/trunk/KDE/kdebase/workspace/; revision=921749
2009-02-05 15:35:38 +00:00
