vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,411 Commits
9 Branches
228 Tags
302 MiB
Commit Graph

656 Commits (105cda7769311de1d0ae51de9378e6b6c591637c)

Author SHA1 Message Date
l10n daemon script 99237c9b3f SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-06-01 10:08:03 +00:00
l10n daemon script cea4b7faeb SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-05-15 10:25:45 +00:00
l10n daemon script a3c7eac1b8 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-05-14 10:21:14 +00:00
l10n daemon script b4c8fa64b8 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-04-28 13:46:57 +00:00
l10n daemon script a00f1f3ad4 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-04-21 13:24:50 +00:00
l10n daemon script 01b61a9ede SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-03-16 10:12:25 +00:00
l10n daemon script 9361fb8610 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-03-15 09:56:33 +00:00
Hrvoje Senjan 3b1f345f4d Merge remote-tracking branch 'origin/Plasma/5.2' 2015-03-13 15:52:24 +01:00
Hrvoje Senjan 9bddd0fe8a Fix installation of GHNS material 
plasmapkg is no more

Reviewed-by: Martin Gräßlin
 2015-03-13 15:51:20 +01:00
Sebastian Kügler 25fc115a9c Fix loading of effect config plugins 
X-KDE-ParentComponents is a list, so we have to check if this list
contains the plugin, not do a string comparison. It seems the
queryparser has become a bit stricter in this case. This query should be
fixed anyway, however, and it fixes a fairly important bug in the effect
system.

REVIEW:122821
 2015-03-06 13:16:17 +01:00
Sebastian Kügler 69fccf9c28 Fix loading of effect config plugins 
X-KDE-ParentComponents is a list, so we have to check if this list
contains the plugin, not do a string comparison. It seems the
queryparser has become a bit stricter in this case. This query should be
fixed anyway, however, and it fixes a fairly important bug in the effect
system.

REVIEW:122821
 2015-03-06 12:22:05 +01:00
l10n daemon script 777dc69831 SVN_SILENT made messages (.desktop file) 2015-02-25 11:29:12 +00:00
l10n daemon script a59a89d36c SVN_SILENT made messages (.desktop file) 2015-02-22 11:32:22 +00:00
l10n daemon script a14e62dadc SVN_SILENT made messages (.desktop file) 2015-02-22 10:26:29 +00:00
Martin Gräßlin 881ddeb18b Merge branch 'Plasma/5.2' 2015-02-04 14:45:06 +01:00
Martin Gräßlin d3b801da3d [kcmkwin/compositing] Drop not used qml based ui 
We switched back to widgets, drop the QtQuick controls based view.
 2015-02-04 14:44:30 +01:00
Martin Gräßlin 04d6bd2874 [kcmkwin/compositing] Fix ordering of items in keep window thumbnail combo box 
BUG: 343399
FIXED-IN: 5.2.1
REVIEW: 122424
 2015-02-04 14:05:16 +01:00
l10n daemon script 795ebbb879 SVN_SILENT made messages (.desktop file) 2015-01-27 12:18:48 +00:00
l10n daemon script e178851846 SVN_SILENT made messages (.desktop file) 2015-01-27 11:24:24 +00:00
l10n daemon script 56b830202e SVN_SILENT made messages (.desktop file) 2015-01-21 09:49:18 +00:00
l10n daemon script 2734f709ad SVN_SILENT made messages (.desktop file) 2015-01-21 08:55:56 +00:00
l10n daemon script bf7bf73464 SVN_SILENT made messages (.desktop file) 2015-01-15 09:02:26 +00:00
l10n daemon script d173ff7412 SVN_SILENT made messages (.desktop file) 2015-01-13 12:47:17 +00:00
Jan Grulich bc2a138d92 Fix build due to undefined reference 
effectModelTest had undefined reference to KWin:WindowPaintData::setProjectionMatrix() for me
 2014-12-07 22:01:15 +01:00
Pino Toscano 1884798991 fixuifiles 2014-11-20 08:04:54 +01:00
l10n daemon script 6f0ff3ff7e SVN_SILENT made messages (.desktop file) 2014-11-06 08:51:14 +00:00
l10n daemon script a010bbc6a7 SVN_SILENT made messages (.desktop file) 2014-11-02 21:49:41 +00:00
Martin Gräßlin f750fef8b7 Merge branch 'Plasma/5.1' 
Conflicts:
	CMakeLists.txt
	kcmkwin/kwincompositing/kcmkwineffects.desktop
	kcmkwin/kwincompositing/kwincompositing.desktop
	kcmkwin/kwindecoration/kwindecoration.desktop
	kcmkwin/kwindesktop/desktop.desktop
	kcmkwin/kwinoptions/kwinactions.desktop
	kcmkwin/kwinoptions/kwinadvanced.desktop
	kcmkwin/kwinoptions/kwinfocus.desktop
	kcmkwin/kwinoptions/kwinmoving.desktop
	kcmkwin/kwinoptions/kwinoptions.desktop
	kcmkwin/kwinrules/kwinrules.desktop
	kcmkwin/kwinscreenedges/kwinscreenedges.desktop
	kcmkwin/kwintabbox/kwintabbox.desktop
	scripts/enforcedeco/metadata.desktop
 2014-10-28 15:03:15 +01:00
Martin Gräßlin 4625d0076c [kcm-effects] Use Loader for the Video Item 
Currently just opening the Desktop Effects KCM loads QtMultimedia which
in turn loads gstreamer 0.10. If one opens any other KCM in
systemsettings and changes without applying the change, the window
freezes when the warning dialog gets shown, because the warning message
pulls in Phonon with maybe the Gstreamer backend which uses
gstreamer 1.0. This is bad, bad and breaks everything.

By using a Loader the problem scope gets reduced. It still happens but
only if one actually watches a video. Only opening the KCM doesn't
trigger the problem any more.

REVIEW: 120842
 2014-10-28 12:57:19 +01:00
l10n daemon script 7d9831d8b4 SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:48 +00:00
l10n daemon script 87878572de SVN_SILENT made messages (.desktop file) 2014-10-21 11:18:35 +00:00
l10n daemon script 5288363274 SVN_SILENT made messages (.desktop file) 2014-10-17 09:07:36 +00:00
l10n daemon script b9a379cee2 SVN_SILENT made messages (.desktop file) 2014-10-10 10:13:56 +00:00
l10n daemon script 98b2402688 SVN_SILENT made messages (.desktop file) 2014-10-10 09:32:35 +00:00
l10n daemon script 91ff859d5f SVN_SILENT made messages (.desktop file) 2014-09-27 09:33:56 +00:00
l10n daemon script 857610668e SVN_SILENT made messages (.desktop file) 2014-09-27 08:47:58 +00:00
l10n daemon script 08540b45eb SVN_SILENT made messages (.desktop file) 2014-09-21 08:48:08 +00:00
l10n daemon script 1205c9c170 SVN_SILENT made messages (.desktop file) 2014-09-07 08:46:08 +00:00
l10n daemon script baf37deacd SVN_SILENT made messages (.desktop file) 2014-09-01 08:42:05 +00:00
l10n daemon script 5114d9b5da SVN_SILENT made messages (.desktop file) 2014-08-31 08:41:36 +00:00
l10n daemon script f2fc577770 SVN_SILENT made messages (.desktop file) 2014-08-24 08:45:33 +00:00
l10n daemon script 36b404057d SVN_SILENT made messages (.desktop file) 2014-08-15 09:08:57 +00:00
l10n daemon script 1478a08c31 SVN_SILENT made messages (.desktop file) 2014-08-14 08:44:45 +00:00
l10n daemon script 3340a5fa1a SVN_SILENT made messages (after extraction) 2014-08-08 08:31:20 +00:00
l10n daemon script b48595e86a SVN_SILENT made messages (after extraction) 2014-08-06 07:57:49 +00:00
l10n daemon script 2c78ff8bfd SVN_SILENT made messages (.desktop file) 2014-07-25 10:15:29 +00:00
Lukáš Tinkl b3cf1f14cc Merge branch 'Plasma/5.0' 2014-07-23 03:36:34 +02:00
Lukáš Tinkl 0e4dd60507 i18n fixes 2014-07-23 03:35:36 +02:00
l10n daemon script 5179d4d3c9 SVN_SILENT made messages (.desktop file) 2014-07-16 09:40:44 +00:00
l10n daemon script ae9689a105 SVN_SILENT made messages (.desktop file) 2014-07-14 03:49:40 +00:00