l10n daemon script
aa0f2c88f0
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-10 11:46:53 +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
56860e63f5
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-07 21:21:42 +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
Martin Gräßlin
5d37ccfce0
Drop PreventScreenLocking electric border
...
It was broken on so many ways, it's unbelievable:
* action was read but did nothing
* config was saved into a different file than read from
REVIEW: 125701
CCBUG: 331841
2015-10-21 08:14:50 +02:00
Martin Gräßlin
c408e9ccec
Drop remaning code for ShowDashboard
...
Removes the ElectricAction for ShowDashboard and the relevant code
in screenedges and the KCM.
Also a leftover in the glide effect.
REVIEW: 125700
BUG: 353928
2015-10-21 08:12:01 +02: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
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
262da1b7c9
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-07 13:20:00 +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
l10n daemon script
a14e62dadc
SVN_SILENT made messages (.desktop file)
2015-02-22 10:26:29 +00:00
l10n daemon script
e178851846
SVN_SILENT made messages (.desktop file)
2015-01-27 11:24:24 +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
Martin Gräßlin
5ceb1b4f75
Merge branch 'Plasma/5.1'
...
Conflicts:
CMakeLists.txt
geometry.cpp
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-12-10 13:52:27 +01:00
Martin Gräßlin
a2393a5c84
[kcmkwin/screenedges] Drop check whether Compositing is enabled
...
Reading the configured value might be wrong, so it's better to not
check at all.
REVIEW: 121312
2014-12-10 13:49:07 +01:00
l10n daemon script
8629054181
SVN_SILENT made messages (.desktop file)
2014-11-06 09:38:04 +00:00
l10n daemon script
ccc7e52dc9
SVN_SILENT made messages (.desktop file)
2014-11-02 22:35:50 +00:00
l10n daemon script
a010bbc6a7
SVN_SILENT made messages (.desktop file)
2014-11-02 21:49:41 +00:00
l10n daemon script
7d9831d8b4
SVN_SILENT made messages (.desktop file)
2014-10-23 08:55:48 +00:00
l10n daemon script
dbdcb9938c
SVN_SILENT made messages (.desktop file)
2014-10-18 09:33:15 +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
493e9b3238
SVN_SILENT made messages (.desktop file)
2014-09-02 10:43:26 +00:00
l10n daemon script
5114d9b5da
SVN_SILENT made messages (.desktop file)
2014-08-31 08:41:36 +00:00
l10n daemon script
ed02a9fb96
SVN_SILENT made messages (.desktop file)
2014-08-28 08:49:28 +00:00
l10n daemon script
f2fc577770
SVN_SILENT made messages (.desktop file)
2014-08-24 08:45:33 +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
2f5daf5f4b
SVN_SILENT made messages (after extraction)
2014-08-07 07:56:52 +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
l10n daemon script
ae9689a105
SVN_SILENT made messages (.desktop file)
2014-07-14 03:49:40 +00: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
026f5ea660
SVN_SILENT made messages (.desktop file)
2014-06-20 09:01:14 +00:00
l10n daemon script
4a88e1b005
SVN_SILENT made messages (.desktop file)
2014-06-16 08:24:58 +00:00
l10n daemon script
eb5abedbe7
SVN_SILENT made messages (.desktop file)
2014-06-12 08:30:34 +00:00
l10n daemon script
ea866906f0
SVN_SILENT made messages (.desktop file)
2014-06-11 08:21:08 +00:00
l10n daemon script
e73f6b2278
SVN_SILENT made messages (.desktop file)
2014-06-10 10:37:36 +00:00
l10n daemon script
9b869958b3
SVN_SILENT made messages (.desktop file)
2014-06-08 08:27:53 +00:00
l10n daemon script
4c49449bcb
SVN_SILENT made messages (.desktop file)
2014-06-07 08:25:25 +00:00
l10n daemon script
abe62085e8
SVN_SILENT made messages (.desktop file)
2014-06-06 08:52:09 +00:00
l10n daemon script
bbcacffd23
SVN_SILENT made messages (.desktop file)
2014-06-05 08:37:44 +00:00
Sebastian Kügler
999baabcfa
[kwin] Streamline Comment fields of KCMs
...
This patch applies a common language and type-setting to the
systemsettings modules in kwin.
Considerations:
- The comment field might repeat the name, or give more detail about the
specific settings on this page, this makes sense with how
systemsettings and kcmshell present it
- Mentioning the words settings, configure, options, etc. is avoided --
it is clear from the context that these are settings and options.
- Title-case throughout in line with human interface guidelines, see
http://techbase.kde.org/Projects/Usability/HIG/Capitalization
- The comment ends up being the title, so the
- tech slang is avoided as much as possible, but left in where really
necessary
- I've left the Name field "mostly untouched", as that one is key for
the user to find the right module in systemsettings' icon view and in
the sidebars
The most prominent change is "Compositor" to "Graphics Compositor" (in
the Title field). This is more like a "suggestion", if you don't like
it, I'll take it out again. Reasoning: "Compositor" is a very technical
term, people who know graphics might recognize it. Others might not
understand that "composite" is about graphics -- hence the
specialization. Please enter the commit message for your changes. Lines starting
REVIEW:118338
2014-06-04 13:31:33 +02:00
Martin Gräßlin
7f04a76b9a
[kcmscreenedges] Call reconfigureEffect on save
...
Explicitly call reconfigureEffect on the Effects which can be enabled
through the screenedges kcm.
BUG: 334791
REVIEW: 118138
2014-05-16 07:38:01 +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
7fcecc616c
Drop "kwin4_effect_" prefix for BuiltIn Effects
...
This removes all the hacks to add kwin4_effect_ to the name of the Effect
and adjusts the desktop files of the effect configuration's parent
component.
Note: the scripted effects still start with kwin4_effect_ prefix.
REVIEW: 117367
2014-04-28 13:52:50 +02:00
Martin Gräßlin
a20903986a
[kcmkwin/screenedges] Use BuiltInEffects to find the Desktop Effects
...
Instead of using the KServiceTypeTrader we just ask the BuiltInEffects
for the name of our Effects.
2014-04-28 13:51:30 +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
Martin Gräßlin
9874187099
[kwin] Add a KWIN_SOURCE_DIR to the CMakeLists.txt
...
This is used to get to KWin's sources instead of
KDEBASE_WORKSPACE_SOURCE_DIR.
2014-03-18 12:08:14 +01: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
16c44810cb
[kwin] Drop more unused includes
...
--warnings
2014-02-03 11:45:35 +01:00
Martin Gräßlin
014cdf9267
[kwin] Mark unused variables as unused
...
--warnings
2014-02-03 11:36:21 +01:00
l10n daemon script
551c0c49e6
SVN_SILENT made messages (.desktop file)
2014-01-20 04:05:30 +00:00
l10n daemon script
eac8a41fed
SVN_SILENT made messages (.desktop file)
2014-01-15 04:10:52 +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
l10n daemon script
865bcdce38
SVN_SILENT made messages (.desktop file)
2013-11-03 03:52:50 +00:00
Bhushan Shah
935851a2b5
kDebug -> qDebug in kwin
2013-11-01 17:00:41 +05:30
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
Martin Gräßlin
62a0a08a0e
Welcome back KWin screen edges KCM
...
Screenedges KCM is adjusted to build against Qt5. Most notable
changes:
* no longer links kworkspace as ScreenPreviewWidget got moved into
the KCM
* ui file is adjusted to not crash (see git log of kcmdesktop)
2013-09-29 10:27:48 +02:00
Martin Gräßlin
a4a436807f
Make the ScreenPreviewWidget useable again
...
Removes the functionality for Plasma::Wallpapers as that doesn't exist
any more and is not needed by the Screenedges KCM. The KCM still has
way too many functionality, but that can stay for the moment as it's
probably best to reimplement the monitor and the actions in QML.
2013-09-29 10:27:48 +02:00
Martin Gräßlin
fc41374111
Move ScreenPreviewWidget from kworspace libs to KWin's screenedges kcm
...
The ScreenPreviewWidget doesn't make much sense any more for the general
useage as it's not QML based and thus not suited for any usage in Plasma.
This means that features like previewing the Plasma wallpaper cannot
work any more.
The Widget is only used in a few KCMs (KDM, Screensavers, Screenedges).
Currently we expect that KDM and legacy X Screensavers won't make it into
the next release, it makes sense to just move the widget to screenedges
where it's still useful.
This change has been discussed with notmart.
2013-09-29 10:27:47 +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
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
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
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
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
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
Thomas Lübking
551c9f4c22
expose ElectricBorderCornerRatio to config GUI
...
BUG: 308993
FIXED-IN: 4.11
REVIEW: 109683
2013-04-28 17:39:16 +02:00
Thomas Lübking
8cf6e39eab
general tabbox support for screenedges
...
REVIEW: 109362
BUG: 316288
FIXED-IN: 4.11
2013-04-16 22:07:07 +02:00
Script Kiddy
6fc4e30441
SVN_SILENT made messages (.desktop file)
2013-04-04 09:29:03 +02:00
Martin Gräßlin
98a04893a6
Use mgraesslin@kde.org for my mail address in Copyright and AboutData
2013-03-12 13:17:53 +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
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