yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14469 commits 3 branches 0 tags 96 MiB
Commit graph

124 commits

Author SHA1 Message Date
l10n daemon script
0990566c63 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"
 2016-05-31 11:06:54 +00:00
l10n daemon script
bd3083e81f 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"
 2016-01-30 09:40:55 +00:00
l10n daemon script
6bb9f6db7b 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-11-17 13:07:36 +00:00
l10n daemon script
3433b05c97 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-11-04 17:27:21 +00:00
l10n daemon script
c342be5961 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-10-03 11:20:49 +00:00
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
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
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
Johannes Leuschner
9e5f7009b3 Correcting Exec command in kwinscripts.desktop 
BUG: 334177
FIXED-IN: 5.1.1
 2014-10-29 11:45:57 +01:00
l10n daemon script
dcff2f9e6a SVN_SILENT made messages (.desktop file) 2014-10-25 09:39:36 +00:00
Sebastian Kügler
b82bce4d5b Adapt to latet changes from review 2014-07-01 12:44:42 +02:00
Sebastian Kügler
b5000a21b7 Adapt to new systemsettings categories 
Roughly, this moves the systemsettings-visible KCModules under either
Workspace | Window Behavior and Workspace | Desktop Behavior, as laid
out here: http://forum.kde.org/viewtopic.php?f=285&t=121053&start=30#p313837
 2014-07-01 12:44:41 +02:00
l10n daemon script
28c7f3c47d SVN_SILENT made messages (.desktop file) 2014-06-29 08:41:34 +00:00
l10n daemon script
e73f6b2278 SVN_SILENT made messages (.desktop file) 2014-06-10 10:37:36 +00:00
Martin Gräßlin
53975ccd9c [kcmkwin/scripts] Add missing ki18n_wrap_ui 2014-06-04 09:24:37 +02:00
Martin Gräßlin
8aa02a6daa [kcmkwin/scripting] Fix DBus service name 
org.kde.kwin -> org.kde.KWin
 2014-05-15 08:50:56 +02:00
Andreas Hartmetz
9c73055a10 Adapt to changes in KAboutData. 2014-05-14 05:04:40 +02:00
Martin Gräßlin
1c2f27945c Adjust kcmkwins to new ki18n 
Define the TRANSLATION_DOMAIN in each of the kcms and use
ki18n_wrap_ui.
 2014-05-05 08:03:55 +02:00
l10n daemon script
7553c411c2 SVN_SILENT made messages (.desktop file) 2014-05-03 08:32:58 +00:00
l10n daemon script
2f28437e24 SVN_SILENT made messages (.desktop file) 2014-05-02 08:51:14 +00:00
l10n daemon script
2838a9b606 SVN_SILENT made messages (.desktop file) 2014-04-29 10:12:33 +00:00
l10n daemon script
15aa971aab SVN_SILENT made messages (.desktop file) 2014-04-29 04:54:44 +00:00
Martin Gräßlin
ee20101142 Fix deprecated warnings for KAboutData 
Ctor with catalog name got deprecated, use ctor without it.
 2014-04-28 17:11:20 +02:00
l10n daemon script
e1f418f4d0 SVN_SILENT made messages (.desktop file) 2014-04-28 09:00:35 +00:00
l10n daemon script
f44575ddbf SVN_SILENT made messages (.desktop file) 2014-04-28 05:16:52 +00:00
l10n daemon script
69c3289c18 SVN_SILENT made messages (.desktop file) 2014-04-27 21:02:43 +00:00
l10n daemon script
e6db000065 SVN_SILENT made messages (.desktop file) 2014-04-04 05:29:27 +00:00
l10n daemon script
eef56c98b2 SVN_SILENT made messages (.desktop file) 2014-04-03 05:10:09 +00:00
l10n daemon script
10f89d6019 SVN_SILENT made messages (.desktop file) 2014-03-24 04:35:26 +00:00
Martin Gräßlin
dbf2218338 [kwin] kde4_add_ui_files -> qt5_wrap_ui 
Less deprecated CMake usage.
 2014-03-18 11:06:56 +01:00
Aleix Pol
c72e519d9c Remove KDE/ prefix in include directories 
It's unneeded and deprecated since KF5.
 2014-03-17 16:24:10 +01:00
l10n daemon script
6f8c3dd771 SVN_SILENT made messages (.desktop file) 2014-02-18 05:12:30 +00:00
Martin Gräßlin
a6c47e0314 [kwin] Add ProvidersUrl to *.knsrc 
That at least inits the GHNS download dialog.
 2014-02-03 13:04:12 +01:00
Martin Gräßlin
16c44810cb [kwin] Drop more unused includes 
--warnings
 2014-02-03 11:45:35 +01:00
l10n daemon script
22a5e1109f SVN_SILENT made messages (.desktop file) 2014-01-19 04:06:03 +00:00
Martin Gräßlin
930a6b5e05 Ensure the KDE4Support KNS headers are not included 
This should hopefully unbreak the Jenkins build.
 2014-01-15 20:32:40 +01:00
l10n daemon script
63165c870f SVN_SILENT made messages (.desktop file) 2013-12-23 03:57:54 +00:00
Martin Klapetek
54bc491c46 Port to KF5 renaming changes 2013-12-11 21:41:47 +01:00
Aleix Pol
f8468b4043 Drop KDE4Support in kde-workspace/kwin 
REVIEW: 114316
 2013-12-05 20:24:02 +01:00
Aleix Pol
7b110f0671 Improve CMake usage 
It's basically a run of the port-cmake.sh script in here, mostly the changes
are the following:
- Using KF5::* targets
- Using the proper macros, following recent developments in frameworks
 2013-11-15 13:37:47 +01:00
Aurélien Gâteau
05b6de1002 ${KDE4Support_LIBRARIES} => KF5::KDE4Support 
Fixes a few link errors
 2013-10-29 13:00:46 +01:00
Sebastian Kügler
b68867463e Change KF5::plasma to KF5::Plasma 
Library name has changed in plasma-framework to bring it in line with
KF5:CamelCasing naming.
 2013-10-16 01:36:56 +02:00
Sebastian Kügler
ab08d3da9b Don't look for plasma headers under KDE 2013-09-30 11:32:16 +02:00
Martin Gräßlin
c118b1147d [kwinscripts] Adjust target link libraries for kwinscripts KCM 2013-09-30 11:19:02 +02:00
Martin Gräßlin
2e47f34398 [kwinscripts] Disable installing a local script for the moment 
Plasma::Package changed in a way that it's not just a trivial change
to get it compile again.
 2013-09-30 11:17:40 +02:00
Martin Gräßlin
469a0c255c [kwinscript] Adjustments to obsoleted members 
* KAboutData
* removing insert catalog
* KIcon -> QIcon::fromTheme
* missing moc
 2013-09-30 11:16:36 +02:00
Martin Gräßlin
5bdb960413 [kwinscripts] kcmshell4 -> kcmshell5 2013-09-30 11:14:33 +02:00
Martin Gräßlin
6ada27e294 [kwinscripts] slots -> Q_SLOTS 2013-09-30 11:14:05 +02:00
Martin Gräßlin
2017f82670 [kwinscripts] KFileDialog -> QFileDialog 2013-09-30 11:13:38 +02: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