Commit graph

1674 commits

Author SHA1 Message Date
Anselmo L. S. Melo
d258759ac9 Port from KTemporaryFile to QTemporaryFile
REVIEW: 112742
2013-09-24 08:07:41 -03:00
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
l10n daemon script
52cea9285d SVN_SILENT made messages (.desktop file) 2013-09-09 04:11:16 +00:00
Thomas Lübking
5f1d913a11 Merge branch 'KDE/4.11' 2013-08-27 08:11:11 +02:00
Thomas Lübking
29e230dca3 enforce reactivation threshold to be 50ms bigger
than actication threshold.
Things don't work otherwise.

BUG: 323588
FIXED-IN: 4.11.1
REVIEW: 112125
2013-08-27 07:53:02 +02:00
Anselmo L. S. Melo
00d507b7ff Porting kcmkwin to Qt5/KF5: QStandardPaths
REVIEW: 111975
2013-08-13 17:55:49 -03:00
l10n daemon script
3b2f744b49 SVN_SILENT made messages (.desktop file) 2013-08-13 07:25:19 +00: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
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
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
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
Thomas Lübking
0b4d56a326 Merge branch 'KDE/4.11' 2013-07-24 21:05:16 +02:00
Thomas Lübking
10e7ef75ba harmonize combo/lineedit enabling connections
BUG: 322650
FIXED-IN: 4.11
REVIEW: 111627
2013-07-24 21:04:08 +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
l10n daemon script
467b772a90 SVN_SILENT made messages (.desktop file) 2013-07-21 04:08:51 +00:00
l10n daemon script
52461e5885 SVN_SILENT made messages (.desktop file) 2013-07-20 06:40:25 +00:00
Thomas Lübking
f97fa509ae align initial slider and desscription
BUG: 322522
FIXED-IN: 4.11
REVIEW: 111565
2013-07-19 21:19:49 +02:00
l10n daemon script
205c557f89 SVN_SILENT made messages (.desktop file) 2013-07-05 03:48:50 +00:00
l10n daemon script
dcd670692b SVN_SILENT made messages (.desktop file) 2013-07-01 03:54:58 +00:00
Casian Andrei
0c20edb250 Enable color correction check box for the appropriate compositing types
REVIEW: 111055
2013-06-24 21:33:12 +03:00
l10n daemon script
5510335da9 SVN_SILENT made messages (.desktop file) 2013-06-24 03:57:22 +00:00
l10n daemon script
502d003ef5 SVN_SILENT made messages (.desktop file) 2013-06-23 04:02:47 +00:00
l10n daemon script
a2e9957860 SVN_SILENT made messages (.desktop file) 2013-06-10 03:46:39 +00:00
l10n daemon script
31fb163a07 SVN_SILENT made messages (.desktop file) 2013-06-07 03:40:35 +00:00
l10n daemon script
34c8d6feb6 SVN_SILENT made messages (.desktop file) 2013-06-05 04:54:40 +00:00
l10n daemon script
020f6fd612 SVN_SILENT made messages (.desktop file) 2013-05-30 04:29:57 +00:00
Oliver Henshaw
47acf4ee9a Merge remote-tracking branch 'origin/KDE/4.10' into master
Conflicts:
	kwin/scripting/scripting.cpp
	powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop
	solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop
2013-05-28 17:36:53 +01:00
Oliver Henshaw
b61bca0f3d add qml import paths in correct order
addImportPath prepends the path to importPathList so we must add our
paths in reverse order.

Based on the fix for kdeclarative.cpp in kdelibs
400b9f2e9d10386bb175b6123fe0cdaafeaffe61

REVIEW: 110670
2013-05-28 17:23:19 +01:00
Oliver Henshaw
2d5ebd3b8d Replace foreach with java-style iterator
In preparation for reversing the loop.

REVIEW: 110670
2013-05-28 17:23:09 +01:00
l10n daemon script
3a0999688f SVN_SILENT made messages (.desktop file) 2013-05-24 03:35:07 +00:00
Yuri Chornoivan
0ef7822d65 Fix typos 2013-05-23 08:34:36 +03:00
Thomas Lübking
e5028bb7fc redesign focus config GUI
REVIEW: 110001
2013-05-22 22:24:23 +02:00
l10n daemon script
a3b09b7ac4 SVN_SILENT made messages (.desktop file) 2013-05-22 03:36:01 +00:00
Martin Gräßlin
0ccb774309 Fix Typo 2013-05-21 09:27:38 +02:00
Script Kiddy
7e1386f415 SVN_SILENT made messages (.desktop file) 2013-05-18 10:23:03 +02:00
Script Kiddy
d2c32dc36e SVN_SILENT made messages (.desktop file) 2013-05-17 14:36:18 +02:00
Script Kiddy
e5316fa9d9 SVN_SILENT made messages (.desktop file) 2013-05-17 09:43:27 +02:00
Martin Gräßlin
dfec59c60e Port getStringProperty to XCB 2013-05-13 08:48:19 +02:00
Montel Laurent
dd8cf0b678 normalize signal/slot 2013-05-11 14:09:15 +02:00
Script Kiddy
68ddc5f236 SVN_SILENT made messages (.desktop file) 2013-05-11 10:34:17 +02:00
Script Kiddy
44c8899fee SVN_SILENT made messages (.desktop file) 2013-05-10 11:04:42 +02:00
Fredrik Höglund
f06990a7e7 kwin: Refactor the UI for compositing type selection
Remove the "Use OpenGL 2 shaders" checkbox, and add "OpenGL 2.0"
and "OpenGL 3.1" options in the compositing type combobox.
2013-05-08 18:33:01 +02:00
Script Kiddy
5a32f8e813 SVN_SILENT made messages (.desktop file) 2013-05-06 09:31:10 +02:00