Martina Flöser
4d669b1912
Port Plasma::Package to KPackage
...
Reviewers: #kwin
Subscribers: kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D3814
2016-12-26 17:41:06 +01:00
l10n daemon script
dd289b5dee
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-12-26 05:59:30 +01:00
l10n daemon script
879a1ee367
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-12-25 05:53:01 +01:00
l10n daemon script
404a5afad7
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-12-24 06:36:00 +01:00
l10n daemon script
286ad7104d
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-12-23 05:44:53 +01:00
l10n daemon script
1d622fbbc3
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-12-22 05:55:50 +01:00
Aleix Pol
1c394ab645
Add names to the knsrc files
...
Summary: This way they can be properly listed by Discover
Reviewers: graesslin, #plasma
Reviewed By: graesslin, #plasma
Subscribers: plasma-devel, kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D3765
2016-12-21 00:08:59 +01:00
l10n daemon script
13d389efd1
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-12-20 13:30:44 +01:00
Kai Uwe Broulik
17482609a1
[Scripts KCM] Use GHNS Button instead of creating a look-alike button
...
In the future the GHNS button might hide itself based on KIOSK restrictions.
Using the GHNS Button will ensure we don't need to manually do this here.
Differential Revision: https://phabricator.kde.org/D3647
2016-12-13 08:26:15 +01:00
David Edmundson
b1e76ed8c4
Use KPackage in kcmscripts
...
Test Plan: Tested all but show OSD appeared
Reviewers: #plasma, graesslin
Reviewed By: #plasma, graesslin
Subscribers: graesslin, plasma-devel, kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D2977
2016-10-07 13:27:19 +01:00
Allen Winter
31f067ede2
pedantic fixes
2016-07-16 13:14:44 -04:00
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
Anselmo L. S. Melo
00d507b7ff
Porting kcmkwin to Qt5/KF5: QStandardPaths
...
REVIEW: 111975
2013-08-13 17:55:49 -03: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
l10n daemon script
a2e9957860
SVN_SILENT made messages (.desktop file)
2013-06-10 03:46:39 +00:00
Script Kiddy
dfd72523b1
SVN_SILENT made messages (.desktop file)
2013-05-02 09:17:01 +02:00
Martin Gräßlin
32b6ef42b9
Strip module path from all Qt #include <>
...
Done with:
fixqt4headers.pl --strip-modules
REVIEW: 109176
2013-03-06 10:26:56 +01:00
Martin Gräßlin
898e120be9
Extract messages from scripts and scripting module
...
Messages in scripts are written to kwin_scripts.pot, messages in
scripting are written to kwin_scripting.pot. The cataloges are loaded in
the configuration interfaces and in main kwin.
REVIEW: 108975
2013-03-04 10:29:25 +01:00
Marco Martin
baf21f6b34
Merge branch 'KDE/4.10'
...
Conflicts:
plasma/generic/applets/batterymonitor/metadata.desktop
plasma/generic/applets/lock_logout/metadata.desktop
2013-01-31 17:00:02 +01:00
Script Kiddy
f193c56957
SVN_SILENT made messages (.desktop file)
2013-01-31 16:31:28 +01:00
Script Kiddy
ca2cf4d697
SVN_SILENT made messages (.desktop file)
2013-01-31 12:00:36 +01:00
Script Kiddy
1416c8d62c
SVN_SILENT made messages (.desktop file)
2013-01-30 16:27:26 +01:00
Script Kiddy
2ea65eb18e
SVN_SILENT made messages (.desktop file)
2013-01-26 13:21:28 +01:00
Script Kiddy
7d821f3814
SVN_SILENT made messages (.desktop file)
2013-01-26 09:04:17 +01:00
Albert Astals Cid
dec63fb987
Merge remote-tracking branch 'origin/KDE/4.10'
2013-01-07 11:04:39 +01:00
Script Kiddy
c6d91ac7eb
SVN_SILENT made messages (.desktop file)
2013-01-07 08:11:48 +01:00
Martin Gräßlin
533d57da60
Mark most ctors as explicit as reported by Krazy2 checker
2013-01-02 18:35:46 +01:00
Script Kiddy
12f341712c
SVN_SILENT made messages (.desktop file)
2012-12-24 09:05:36 +01:00
Script Kiddy
d7316b9fcb
SVN_SILENT made messages (.desktop file)
2012-12-23 08:01:50 +01:00
Script Kiddy
dc5da9b081
SVN_SILENT made messages (.desktop file)
2012-12-22 08:12:14 +01:00
Script Kiddy
e3c031824f
SVN_SILENT made messages (.desktop file)
2012-12-21 07:05:54 +01:00
Script Kiddy
ef0cae8dab
SVN_SILENT made messages (.desktop file)
2012-12-18 15:28:22 +01:00
Script Kiddy
a2472524c2
SVN_SILENT made messages (.desktop file)
2012-12-17 07:49:07 +01:00
Script Kiddy
dda5cbea69
SVN_SILENT made messages (.desktop file)
2012-12-13 07:29:15 +01:00
Script Kiddy
49a373b681
SVN_SILENT made messages (.desktop file)
2012-12-01 08:03:43 +01:00
Script Kiddy
5fc8da9ad7
SVN_SILENT made messages (.desktop file)
2012-11-30 07:40:50 +01:00
Script Kiddy
17ddc517b7
SVN_SILENT made messages (.desktop file)
2012-10-29 09:53:30 +01:00
Martin Gräßlin
5a33974bca
Merge branch 'KDE/4.9'
...
Conflicts:
plasma/desktop/shell/activitymanager/package/contents/ui/ActivityDelegate.qml
2012-10-24 20:40:07 +02:00
Martin Gräßlin
7f26069f25
Enable GHNS button for KWin scripts
...
Functionality had already been present for quite some time and now that
the category on kde-look exists, we can just show the button.
BUG: 296774
FIXED-IN: 4.9.3
REVIEW: 106963
2012-10-24 20:35:12 +02:00
Script Kiddy
f476d76ece
SVN_SILENT made messages (.desktop file)
2012-10-17 00:53:14 +02:00
Script Kiddy
2141dc821b
SVN_SILENT made messages (.desktop file)
2012-10-16 18:43:37 +02:00
Script Kiddy
2d36325197
SVN_SILENT made messages (.desktop file)
2012-10-13 11:13:24 +02:00
Script Kiddy
49a5582f24
SVN_SILENT made messages (.desktop file)
2012-10-01 15:50:20 +02:00
Script Kiddy
a916d99ada
SVN_SILENT made messages (.desktop file)
2012-09-22 17:37:32 +02:00
Script Kiddy
9c40152c03
SVN_SILENT made messages (.desktop file)
2012-08-10 17:29:15 +02:00
Script Kiddy
c79bf24903
SVN_SILENT made messages (.desktop file)
2012-08-06 09:32:20 +02:00
Script Kiddy
7b84b06fcc
SVN_SILENT made messages (.desktop file)
2012-07-27 10:37:01 +02:00
Script Kiddy
b909bdc5c4
SVN_SILENT made messages (.desktop file)
2012-07-21 11:43:56 +02:00
Script Kiddy
88710b0f60
SVN_SILENT made messages (.desktop file)
2012-07-19 10:14:19 +02:00
Script Kiddy
6c572929d8
SVN_SILENT made messages (.desktop file)
2012-07-18 10:04:35 +02:00