Commit graph

2563 commits

Author SHA1 Message Date
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
Thomas Lübking
6f61723cee Merge branch 'KDE/4.11' 2013-09-24 00:52:39 +02:00
Thomas Lübking
3eb0b27d00 windowgeometry effect, keep hint inside screen
and use passed geometry parameter to position the labels
(required with resize effect because the actual geometry is
not updated)

REVIEW: 112849
2013-09-24 00:50:55 +02:00
Thomas Lübking
149e97fcb9 reset invert shader on viewport resize
General problem known from bug #325154

BUG: 325154
FXED-IN: 4.11.2
REVIEW: 112877
2013-09-24 00:50:54 +02:00
l10n daemon script
a0be69adde SVN_SILENT made messages (.desktop file) 2013-09-23 04:08:07 +00:00
Martin Gräßlin
3afa7bf5a4 Only react on own shortcut changed in desktopgrid 2013-09-09 09:02:19 +02:00
l10n daemon script
24f68febf1 SVN_SILENT made messages (.desktop file) 2013-09-09 06:48:54 +00:00
Martin Gräßlin
47cc0d77f5 KFooInput -> Q(Double)SpinBox in mouseclick effect config
And with that the effect configs do not need kde4support any more.
2013-09-09 07:47:36 +02:00
Martin Gräßlin
36d0a90859 KIntSpinBox -> QSpinBox in kwin/effects configs 2013-09-09 07:38:30 +02:00
Martin Gräßlin
e7a9655223 Use KShortcutsEditor directly instead of subclass
We don't need the GlobalShortcutsEditor anymore as the action type
can now be set as a property.
2013-09-09 06:57:06 +02:00
l10n daemon script
52cea9285d SVN_SILENT made messages (.desktop file) 2013-09-09 04:11:16 +00:00
Martin Gräßlin
caad13ff95 Use new components based Find XCB 2013-09-09 06:03:35 +02:00
Thomas Lübking
42beb68855 Merge branch 'KDE/4.11' 2013-09-09 00:07:58 +02:00
Thomas Lübking
a61002224f re-read dashboard kcfg on reconfigure
BUG: 324034
FIXED-IN: 4.11.2
REVIEW: 112280
2013-09-08 23:47:53 +02:00
Thomas Lübking
2a5861faef highlight effect: windowAdded false positive exits
When a window is added while the effect is running
it shall either be highlighted or hidden, but not exit
the effect what happened, because the property notification
is invoked to test whether the window has a highlight
property (questionable since the effect is running, but
valid - could be different X11 client) and that routine
exits the effect if no property is found (assuming it was
withdrawn)

REVIEW: 112494
2013-09-08 23:43:57 +02:00
Thomas Lübking
140c4856b7 ignore minimized windows in scalein effect
BUG: 324326
FIXED-IN: 4.11.2
REVIEW: 112425
2013-09-08 23:43:13 +02:00
Martin Gräßlin
86b9ce67a0 Use QLocale in WindowGeometryEffect 2013-09-05 10:48:30 +02:00
Martin Gräßlin
95a6329fe5 Remove some no longer needed includes
less warnings
2013-09-05 10:39:47 +02:00
Martin Gräßlin
de59774190 KIcon -> QIcon::fromTheme in kwin effects 2013-09-05 10:29:33 +02:00
Martin Gräßlin
211682ab67 KGlobalSettings::dndEventDelay() -> QApplication::startDragDistance() 2013-09-04 16:35:16 +02:00
Martin Gräßlin
139201a2e2 KGlobal::config() -> KSharedConfig::openConfig()
KWin Core says good bye to KGlobal. We will not miss the threading
issues.
2013-09-04 16:11:40 +02:00
Martin Gräßlin
57905c0cc2 And we got rid of KDebug
Usages of kBacktrace got dropped.
2013-09-02 13:14:39 +02:00
Martin Gräßlin
987fd41d24 Port KWin/Effects from KDebug to QDebug
Still using KDE4Support as it's used in other areas.
2013-09-02 11:03:29 +02:00
Thomas Lübking
5f1d913a11 Merge branch 'KDE/4.11' 2013-08-27 08:11:11 +02:00
Thomas Lübking
9001af8e5a reset custom cube shaders on screen change
the reset/setup invokes the viewport dimensions...

BUG: 323311
FIXED-IN: 4.11.1
REVIEW: 112133
2013-08-27 07:53:02 +02:00
Thomas Lübking
1a82bbd2a4 Merge branch 'KDE/4.11' 2013-08-25 17:07:54 +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
Martin Gräßlin
8051e08361 Add missing target link libraries in kwin/effects 2013-08-23 09:38:44 +02:00
Martin Gräßlin
37334f400a Drop no longer needed XLib includes from KWin 2013-08-20 10:29:20 +02:00
Martin Gräßlin
bf3bcd7f6f Drop linking to kdecore in KWin
Left-over from when kdebug was not yet moved to kde4support.
2013-08-20 09:16:14 +02:00
Martin Gräßlin
84a2f3020b Use Qt5:: in target link libraries in KWin 2013-08-20 09:14:24 +02:00
Martin Gräßlin
5ca6654eb8 Fix linking
KDEUI is dead which caused collateral damage.
2013-08-20 08:47:47 +02:00
Reza Shah
61f452723e Port KWin effects away from KAction and KShortcut to Qt5/KF5 classes.
REVIEW: 111898
2013-08-15 04:13:12 +09:00
Anselmo L. S. Melo
bef5b71898 Porting effects to Qt5/KF5: QStandardPaths
REVIEW: 111977
2013-08-13 17:56:04 -03:00
Martin Gräßlin
388944314a Drop QPixmap ctor of XRenderPicture
Was a todo to remove it as it's just using a toImage. Removing this
ctor should make it for the user more obvious that put image is used.
2013-08-13 09:57:50 +02:00
l10n daemon script
df17849412 SVN_SILENT made messages (.desktop file) 2013-08-13 04:19:10 +00:00
Sebastian Kügler
08a53e6a11 Remove K_EXPORT_PLUGIN macros
Include .moc file in configs_builtins.cpp, and reenable the build of the
configs.

REVIEW:111940
2013-08-08 13:47:25 +02:00
Martin Gräßlin
ed5d4048b6 foo.moc -> moc_foo.cpp in KWin effects config 2013-08-07 13:04:01 +02:00
Martin Gräßlin
9291b18cee Merge branch 'master' into frameworks-scratch
Conflicts:
	CMakeLists.txt
	kwin/effects.cpp
	kwin/effects/logout/logout.cpp
	kwin/effects/presentwindows/main.qml
	kwin/effects/presentwindows/presentwindows.cpp
	kwin/effects/presentwindows/presentwindows.h
	kwin/effects/zoom/zoom_config.cpp
	kwin/libkwineffects/kwinglutils_funcs.cpp
	kwin/libkwineffects/kwinxrenderutils.cpp
	kwin/nvidiahack.cpp
	kwin/xcbutils.h
	plasma/desktop/containments/desktop/plasma-containment-desktop.desktop
	plasma/generic/wallpapers/image/image.cpp
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-08-07 10:10:06 +02:00
Thomas Lübking
65a476d638 crossfade for resize effect
REVIEW: 111383
2013-08-06 23:26:51 +02:00
Thomas Lübking
341aaae068 Merge branch 'KDE/4.11' 2013-08-06 23:07:16 +02:00
Thomas Lübking
c2219f973b crossfade for resize effect
REVIEW: 111383
2013-08-06 23:06:40 +02:00
Martin Gräßlin
5d0433f20b Drop some no longer needed includes
Less warnings
2013-08-06 11:38:52 +02:00
Sebastian Kügler
0ac47d9b18 Disable effect config build
With the fixed KPluginFactory macro, the KWIN_EFFECT_CONFIG_* macros
seem to break. I'm looking for a solution to fix up the macro in
kwineffects.h, or otherwise the usage in the plugins.
The problem is that the macros of each plugin export the exact same
class name, which is going to clash.

Until I've found a solution, disable build of the config files, so it's
not too disruptive for others.

CCMAIL:kwin@kde.org
2013-08-06 05:17:43 +02:00
Eike Hein
5435568f86 Fix build.
Not sure why kdeclarative gets its own subdir, nor why
there is no CMake module to to add it to the include dirs
on find_package, but this matches what plasma-framework
does at the moment.
2013-08-06 03:03:57 +02:00
Thomas Lübking
7fce0006c0 Merge branch 'KDE/4.11' 2013-08-05 21:02:45 +02:00
Thomas Lübking
971fe0107c support fps counter text on xrender
BUG: 323006
FIXED-IN: 4.11
REVIEW: 111878
2013-08-05 20:43:28 +02:00
Thomas Lübking
18f8493dee no layer repaints for the window geometry labels
insufficient since there can be windows/content on top of the
moved window and the labels are painted on top of the scene

BUG: 318390
FIXED-IN: 4.11
REVIEW: 111861
2013-08-05 20:43:28 +02:00
Martin Gräßlin
7bd86505f5 Port add/remove buttons in DesktopGrid to QtQuick 2
With this change we no longer need to link QtDeclarative in the Effects.
2013-08-05 14:55:37 +02:00
Martin Gräßlin
47cf35720f Present Window's close button ported to QtQuick 2 2013-08-05 14:08:23 +02:00
Martin Gräßlin
35bb48df2c Small update to the needed target link libs 2013-08-05 11:33:35 +02:00
Anselmo L. S. Melo
633db54cba Fix build: KConfigWidgets
Fix build after kdelibs-frameworks commit 2929fe7d932 which removed kdeui link to
KConfigWidgets.

REVIEW: 111865
2013-08-05 11:04:41 +02:00
l10n daemon script
71a4814f4c SVN_SILENT made messages (.desktop file) 2013-08-05 06:54:55 +00:00
l10n daemon script
30aac961f0 SVN_SILENT made messages (.desktop file) 2013-08-05 04:16:04 +00:00
l10n daemon script
ba0be05c78 SVN_SILENT made messages (.desktop file) 2013-08-04 04:29:45 +00:00
l10n daemon script
ca6b7653c0 SVN_SILENT made messages (.desktop file) 2013-08-03 04:00:09 +00:00
Thomas Lübking
a18cf4fd35 Merge branch 'KDE/4.11' 2013-08-02 22:08:49 +02:00
Thomas Lübking
90615561e4 desk-grid: bind sc editor keyChange to kcm changed
BUG: 316177
FIXED-IN: 4.11
REVIEW: 111812
2013-08-02 22:07:10 +02:00
Thomas Lübking
2f5ceb15e4 exit cube on doubleclick
more natural than (preserved) rmb exit and also for
single touch devices

REVIEW: 111730
2013-08-02 22:02:42 +02:00
Thomas Lübking
bc80d2417a re-fix bouncing startup feedback
BUG: 304253
FIXED-IN: 4.11
REVIEW: 111729
2013-08-02 22:01:25 +02:00
Thomas Lübking
bac8dc095f fix rendertarget warning on xrender
accidental GL call in non GL compositing
2013-08-02 21:59:55 +02:00
Thomas Lübking
57485cfefc fix magnifier effect exit
precision is usually enough to end on exactly "1.0"
so the effect was "hidden" but the mouse still polled.
2013-08-02 21:58:32 +02:00
l10n daemon script
2f46414ea7 SVN_SILENT made messages (.desktop file) 2013-07-31 06:46:21 +00:00
l10n daemon script
50dfc83d2e SVN_SILENT made messages (.desktop file) 2013-07-31 04:07:19 +00:00
l10n daemon script
8cae78b2d8 SVN_SILENT made messages (.desktop file) 2013-07-30 07:20:00 +00:00
l10n daemon script
68bf8072b2 SVN_SILENT made messages (.desktop file) 2013-07-30 04:11:51 +00:00
l10n daemon script
87a7569100 SVN_SILENT made messages (.desktop file) 2013-07-27 04:01:18 +00:00
Martin Gräßlin
a8fd910a01 Effects need to link KF5::KDE4Attic for KLocale 2013-07-25 16:59:20 +02:00
Thomas Lübking
0b4d56a326 Merge branch 'KDE/4.11' 2013-07-24 21:05:16 +02:00
Thomas Lübking
3aa2e22b32 fix passive startup feedback
BUG: 260727
FIXED-IN: 4.11
REVIEW: 111634
2013-07-24 21:04:32 +02:00
Thomas Lübking
2a98e58d5e remove mouse polling from cube effect
entirely superfluous and causes laggy interaction

BUG: 308439
FIXED-IN: 4.11
REVIEW: 111669
2013-07-24 21:03:53 +02:00
Martin Gräßlin
99b9f79b3b Fix linking of Effects and Effect Configs 2013-07-24 09:58:44 +02:00
Martin Gräßlin
5e0484bc17 Disable KDeclarative in PresentWindows and DesktopGrid
QML code needs porting to QtQuick2
2013-07-24 09:58:44 +02:00
Martin Gräßlin
ba7d50fdc5 Disable global shortcut handling in all effects
KAction and KShortcut needs porting, so disabled for now.
2013-07-24 09:58:44 +02:00
Martin Gräßlin
2144f547d0 Port effect configs to new KCModule ctor 2013-07-24 09:58:43 +02:00
Martin Gräßlin
5ae59f4fc7 Add missing kdebug include 2013-07-24 09:58:43 +02:00
Martin Gräßlin
9ab751042a Drop X11_XCB library dependency
We don't need it anymore - the xcb connection is also provided by
QX11Info.
2013-07-24 09:58:43 +02:00
Martin Gräßlin
330d40f425 Fix no cast to/from ASCII intrduced issues
* "" needs to be wrapped in QStringLiteral
* QString::fromUtf8 needed for const char* and QByteArray
* QByteArray::constData() needed to get to the const char*
2013-07-24 09:58:33 +02:00
Martin Gräßlin
1d2c2d5982 Use Q_SLOTS and Q_SIGNALS instead of slots and signals
Fixes compilation with Qt5/KF5 setup.
2013-07-24 09:46:54 +02:00
l10n daemon script
f433daf0cb SVN_SILENT made messages (.desktop file) 2013-07-24 06:42:52 +00:00
l10n daemon script
25c88fca98 SVN_SILENT made messages (.desktop file) 2013-07-24 04:07:39 +00:00
l10n daemon script
467b772a90 SVN_SILENT made messages (.desktop file) 2013-07-21 04:08:51 +00:00
Weng Xuetian
f876fe6a84 Merge branch 'KDE/4.11' 2013-07-20 07:57:12 -04:00
l10n daemon script
52461e5885 SVN_SILENT made messages (.desktop file) 2013-07-20 06:40:25 +00:00
Thomas Lübking
84b92a53d3 Merge branch 'KDE/4.11' 2013-07-19 22:20:16 +02:00
Thomas Lübking
674a1a051f fix logout effect shaderfile locations
CCBUG: 322136
REVIEW: 111600
2013-07-19 22:18:14 +02:00
Thomas Lübking
141e57e725 Merge branch 'KDE/4.11' 2013-07-19 21:23:54 +02:00
Thomas Lübking
d9b567699c connect shortcut editor changed signal
BUG: 322441
FIXED-IN: 4.11
REVIEW: 111550
2013-07-19 21:19:02 +02:00
Thomas Lübking
b6c4f0a7fb fake mouse move to unhover close window on hide
BUG: 322260
FIXED-IN: 4.11
REVIEW: 111538
2013-07-19 21:17:16 +02:00
Thomas Lübking
287acae1db handle closebutton arm state inside effect only
the enabled/disabled change is a useless distraction

implicitly fixes
BUG: 321810
FIXED-IN: 4.11
REVIEW: 111538
2013-07-19 21:16:44 +02:00
l10n daemon script
2fc1ae684b SVN_SILENT made messages (.desktop file) 2013-07-14 06:59:57 +00:00
l10n daemon script
7bd89eb6ee SVN_SILENT made messages (.desktop file) 2013-07-14 04:16:47 +00:00
l10n daemon script
88e8e01ea7 SVN_SILENT made messages (.desktop file) 2013-07-13 06:44:24 +00:00
l10n daemon script
e02722e034 SVN_SILENT made messages (.desktop file) 2013-07-13 03:58:16 +00:00
Montel Laurent
185d9306d0 Fix order 2013-07-12 18:25:57 +02:00
l10n daemon script
f203861b12 SVN_SILENT made messages (.desktop file) 2013-07-10 02:34:48 +00:00
l10n daemon script
d9215dd4e1 SVN_SILENT made messages (.desktop file) 2013-07-09 23:40:46 +00:00
Martin Gräßlin
71940e879d Fix modulation in Invert effect
Thanks to Kevin for spotting and providing a fix.

BUG: 322013
FIXED-IN: 4.11
2013-07-08 08:31:51 +02:00
Christoph Feck
4e897f2315 Fix crash after zoom when not using XRender
Commit for bug 304435 missed a check for OpenGL.
OK'd by Thomas Lübking.

BUG: 322073
2013-07-08 00:22:27 +02:00
l10n daemon script
205c557f89 SVN_SILENT made messages (.desktop file) 2013-07-05 03:48:50 +00:00