Commit graph

60 commits

Author SHA1 Message Date
l10n daemon script
ee60653640 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"
2019-05-08 05:51:51 +02:00
l10n daemon script
ef3f1e57ba 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"
2019-04-12 05:58:07 +02:00
l10n daemon script
8e1485b4c8 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"
2019-04-06 06:06:15 +02:00
l10n daemon script
5cba424dc0 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"
2019-03-19 05:59:50 +01:00
Vlad Zagorodniy
b91cfae308 [kcmkwin] Rename EffectModel to EffectsModel
Summary: Model names have plural form.

Test Plan: Compiles.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: davidedmundson, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18712
2019-03-18 13:10:51 +02:00
Vlad Zagorodniy
dc3bc5f7b7 [kcmkwin] Remove some name duplication in EffectModel
Summary: `effect.effectStatus` looks very weird.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18707
2019-03-18 13:10:33 +02:00
Vlad Zagorodniy
bc34a9d653 [kcmkwin] Don't discard unsaved changes when reloading effects model
Summary:
If an effect is installed or removed, then all not yet committed changes
will be lost. This is undesired behaviour.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: davidedmundson, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18705
2019-03-18 13:09:44 +02:00
Vlad Zagorodniy
1faa861bd5 [kcmkwin] Add requestConfigure to effects model
Summary:
The main motivation for adding this method is to avoid code duplication.
Both virtual desktops kcm and desktop effects kcm have their own logic
to create configuration dialogs for effects.

On the bright side, if we add support for declarative effect kcms, we
will need to change only this method.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18704
2019-03-18 13:09:03 +02:00
Vlad Zagorodniy
2211a951e7 [kcmkwin] Split out Desktop Effects KCM
Summary:
A while ago desktop effects and compositing settings lived under the
same roof

{F6584639}

{F6584642}

but time has passed and now those two have their own kcms. This causes
some issues:

* for newcomers it's harder to find code of the Desktop Effects KCM;
* git history doesn't look good, e.g. "[kcmkwin/compositing] Add some
  bugs to Desktop Effects KCM to fix later";
* in general, the mix of two doesn't look good in the code.

This change splits out the Desktop Effects KCM. Unfortunately, in order
to have more nicer code I had to refactor EffectModel a little bit.

Before:

{F6584669}

After:

{F6587570}

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: davidedmundson, ltoscano, mart, ngraham, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D18703
2019-03-18 13:08:32 +02:00
Rivo Laks
89b9872eef Remove kwineffects config module as it's functionality is now offered by kwincompositing module
svn path=/trunk/KDE/kdebase/workspace/; revision=714019
2007-09-18 14:44:03 +00:00
Script Kiddy
12a90ad01a SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=712396
2007-09-14 10:18:47 +00:00
Script Kiddy
b61130d037 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=711906

The following changes were in SVN, but were removed from git:

M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/triplegears.jpg.desktop
2007-09-13 05:55:01 +00:00
Script Kiddy
d9d648e579 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=710142

The following changes were in SVN, but were removed from git:

M	wallpapers/kde_box.png.desktop
M	wallpapers/konqui.svgz.desktop
2007-09-09 06:15:09 +00:00
Script Kiddy
e8e02db3f1 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=706753

The following changes were in SVN, but were removed from git:

M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/andes-venezolanos.svgz.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-08-31 07:59:14 +00:00
Matthias Kretz
78bec90fbe port to KPluginFactory
svn path=/trunk/KDE/kdebase/workspace/; revision=705777
2007-08-28 14:58:52 +00:00
Matthias Kretz
8cb674aa75 compile using KDE3_SUPPORT for KCModule; fix forward decl.
svn path=/trunk/KDE/kdebase/workspace/; revision=705387
2007-08-27 20:48:55 +00:00
Thiago Macieira
d2aee14a35 Remove use of k_funcinfo
svn path=/trunk/KDE/kdebase/workspace/; revision=702583
2007-08-20 21:33:48 +00:00
Script Kiddy
1819a26980 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=702200

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/moon.svgz.desktop
2007-08-20 07:37:38 +00:00
Script Kiddy
ac71f71d10 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=701736

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/aurora.svgz.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-08-19 06:11:40 +00:00
Script Kiddy
62678ad1f4 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=700288

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/alta-badia.jpg.desktop
M	wallpapers/andes-venezolanos.svgz.desktop
M	wallpapers/aurora.svgz.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/konqui.svgz.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/stelvio.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-08-15 06:11:48 +00:00
Script Kiddy
d781e2bff3 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=699436

The following changes were in SVN, but were removed from git:

M	wallpapers/KDE34.png.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
2007-08-13 05:38:36 +00:00
Script Kiddy
d7579555fd SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=699159
2007-08-12 05:41:50 +00:00
Script Kiddy
d3f83ad297 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=698492

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/kde_box.png.desktop
2007-08-10 06:30:15 +00:00
Script Kiddy
63d5be3eb6 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=698098
2007-08-09 05:49:22 +00:00
Laurent Montel
994c800d79 Adapt to new KWarning/kFatal/kDebug api
svn path=/trunk/KDE/kdebase/workspace/; revision=695877
2007-08-03 06:59:24 +00:00
Script Kiddy
9bfd158be3 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=694108
2007-07-30 04:47:23 +00:00
Script Kiddy
9d30e8e178 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=693808

The following changes were in SVN, but were removed from git:

M	wallpapers/KDE34.png.desktop
M	wallpapers/kde_box.png.desktop
2007-07-29 05:20:59 +00:00
Jakob Petsovits
daade7d676 Make the desktop files of the KCMs use icons in icon naming
specification style. KInfoCenter KCMs left out for now,
but I think I got hold of all other KCMs in workspace.

If you want to see some of those icons (in System Settings or
for single KCMs), do a kbuildsycoca4. In order to function
correctly, we still need fallbacks implemented.

CCMAIL: kde-artists@kde.org

svn path=/trunk/KDE/kdebase/workspace/; revision=693746
2007-07-28 21:48:43 +00:00
Script Kiddy
573f2f4e07 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=693473

The following changes were in SVN, but were removed from git:

M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
2007-07-28 05:36:34 +00:00
Matthias Kretz
652d0fcec3 port to value based KPluginInfo
svn path=/trunk/KDE/kdebase/workspace/; revision=691115
2007-07-22 23:10:53 +00:00
Gerd Fleischer
d33949b4d4 make it work with systemsettings
svn path=/trunk/KDE/kdebase/workspace/; revision=691029
2007-07-22 19:29:15 +00:00
Script Kiddy
f0aaf16e6a SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=689367
2007-07-18 05:47:25 +00:00
Script Kiddy
6ea0340fb7 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=688104

The following changes were in SVN, but were removed from git:

M	wallpapers/KDE34.png.desktop
M	wallpapers/kde_box.png.desktop
2007-07-15 05:44:15 +00:00
Laurent Montel
5257c7f9aa Remove not necessary cmake variable (already defined
into lib dependancy)


svn path=/trunk/KDE/kdebase/workspace/; revision=686169
2007-07-10 19:37:23 +00:00
Allen Winter
5c93175949 remove kde4_automoc()
svn path=/trunk/KDE/kdebase/workspace/; revision=685984
2007-07-10 09:14:12 +00:00
Script Kiddy
8e937c9c2e SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=685927

The following changes were in SVN, but were removed from git:

M	wallpapers/sunshine-after-the-rain.jpg.desktop
2007-07-10 04:37:45 +00:00
Rivo Laks
379bdf9b7f Add accessibility category and move some effects there
svn path=/trunk/KDE/kdebase/workspace/; revision=683230
2007-07-04 12:34:58 +00:00
Chusslove Illich
bdb46a1769 Interface modifications to KCmdLineArgs, KAboutData and KComponentData; BIC, SIC. Most of the depending code has been auto-converted to new API.
svn path=/trunk/KDE/kdebase/workspace/; revision=682259
2007-07-02 08:49:20 +00:00
Script Kiddy
4497741460 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=681732

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/andes-venezolanos.svgz.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-06-30 04:34:16 +00:00
Script Kiddy
285a0b1259 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=681471
2007-06-29 04:24:44 +00:00
Script Kiddy
3aa37f6506 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=680810
2007-06-27 05:24:25 +00:00
Script Kiddy
df78e401bd SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=680394

The following changes were in SVN, but were removed from git:

M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
2007-06-26 05:21:32 +00:00
Dirk Mueller
1e3214ed73 include cleanup to separate workspace
svn path=/trunk/KDE/kdebase/workspace/; revision=678951
2007-06-22 16:32:06 +00:00
Script Kiddy
3adff6e6ff SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=678317
2007-06-21 05:01:20 +00:00
Laurent Montel
3ce597e439 Port to new api
svn path=/trunk/KDE/kdebase/workspace/; revision=677432
2007-06-19 06:41:55 +00:00
Script Kiddy
8d7ed92f84 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=676551
2007-06-17 05:52:33 +00:00
Script Kiddy
7935106bba SVN_SILENT made messages (.desktop file, second try)
svn path=/trunk/KDE/kdebase/workspace/; revision=676131

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/andes-venezolanos.svgz.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-06-16 05:23:15 +00:00
Laurent Montel
ab2fa82d7c Fix include
svn path=/trunk/KDE/kdebase/workspace/; revision=675269
2007-06-13 21:26:08 +00:00
Script Kiddy
470f0e9e52 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=675092

The following changes were in SVN, but were removed from git:

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/aurora.svgz.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
2007-06-13 17:57:01 +00:00
Script Kiddy
92727530fe SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=672108

The following changes were in SVN, but were removed from git:

M	wallpapers/KDE34.png.desktop
2007-06-06 04:42:35 +00:00