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

2570 Commits (8d0554e45a8f8628b8b4dd233d983a3a4f1a6562)

Author SHA1 Message Date
l10n daemon script 8d5bb96bdb 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"
 2018-10-28 04:59:42 +01:00
l10n daemon script c3b51dcbdc 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"
 2018-10-25 06:01:19 +02:00
l10n daemon script 94a4675e63 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"
 2018-10-22 06:00:59 +02:00
l10n daemon script b0a2b69a2d 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"
 2018-10-20 06:05:01 +02:00
Kai Uwe Broulik 3d1b2381ec Merge branch 'Plasma/5.14' 2018-10-12 13:54:39 +02:00
Kai Uwe Broulik 1fe3c765cd Merge branch 'Plasma/5.12' into Plasma/5.14 2018-10-12 13:54:24 +02:00
Kai Uwe Broulik 980e390743 [kcmkwin/ruleswidget] Disable "Detect" button when countdown is running 
Avoids triggering an assert and communicates that the timeout is running.
Ideally, there was a countdown label of some sort but this is better than crashing.

BUG: 399644
FIXED-IN: 5.12.8

Differential Revision: https://phabricator.kde.org/D16124
 2018-10-12 13:51:25 +02:00
l10n daemon script 48002ab7fe 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"
 2018-10-10 06:54:14 +02:00
Vlad Zagorodniy 2872e37709 [kcmkwin/tabbox] Update window thumbnails 
Test Plan:
Preview the Thumbnails task switcher:
{F6293654}

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D15831
 2018-10-02 19:47:58 +03:00
l10n daemon script 4b24a538fc 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"
 2018-09-29 08:55:05 +02:00
l10n daemon script 0b8453c62f 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"
 2018-09-29 08:22:49 +02:00
l10n daemon script 9f9e9f796b 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"
 2018-09-29 06:04:44 +02:00
Vlad Zagorodniy 78ce54f88a [effects] Make scripted effects GHNS-able 
Summary:
Currently, if one wants to install a scripted effect from the KDE Store,
the effect won't show up in the Desktop Effects KCM. The reason for that
is kpackagetool5 doesn't know where to install effects (they have to be
installed under ${DATA_DIR}/kwin/effects).

Another problem is that even if the scripted effect is installed in the
right directory (e.g. ~/.local/share/kwin/effects), it won't be listed in
the Desktop Effects KCM because it doesn't have a desktop file in
kservices5 dir. Please notice that the effect will be "visible" for KWin, i.e.
you can enable it by editing kwinrc.

This diff addresses those 2 problems by:
* Adding a PackageStructure plugin for effects (so they are installed
  under kwin/effects/);
* Using KPackage::PackageLoader to get list of scripted effect in the
  Desktop Effects KCM.

Test Plan:
* Installed an effect from the KDE Store, it appeared in the Desktop Effects
  KCM;
* Removed it.

Reviewers: #kwin, mart, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: ngraham, davidedmundson, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D15372
 2018-09-28 20:17:30 +03:00
Laurent Montel b02d7ff96f Fix compile when we use QT_NO_NARROWING_CONVERSIONS_IN_CONNECT flags 2018-09-17 13:43:18 +02:00
l10n daemon script c7455c7177 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"
 2018-09-17 07:34:47 +02:00
l10n daemon script ce7e79cdd6 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"
 2018-09-17 05:41:57 +02:00
l10n daemon script a839dadf9b 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"
 2018-09-08 08:44:29 +02:00
l10n daemon script de6db0599e 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"
 2018-09-08 06:16:40 +02:00
l10n daemon script 1f4682f249 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"
 2018-09-02 05:50:35 +02:00
l10n daemon script 16c63efdb7 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"
 2018-08-30 05:51:44 +02:00
Yuri Chornoivan bf58da3e9a Fix minor EBN issues 2018-08-29 21:02:16 +03:00
l10n daemon script a5b820ee7e 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"
 2018-08-27 08:09:08 +02:00
l10n daemon script 5e2e9dfa32 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"
 2018-08-27 05:52:15 +02:00
l10n daemon script 57796645f8 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"
 2018-08-26 08:08:30 +02:00
l10n daemon script 67332d7c9d 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"
 2018-08-26 05:43:38 +02:00
l10n daemon script ef7079b3c5 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"
 2018-08-25 05:42:28 +02:00
l10n daemon script c2531b8637 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"
 2018-08-22 05:48:57 +02:00
l10n daemon script e3815aea00 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"
 2018-08-21 05:48:42 +02:00
l10n daemon script 7763b58688 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"
 2018-08-19 05:44:25 +02:00
l10n daemon script 061afd7742 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"
 2018-08-18 05:47:03 +02:00
l10n daemon script 51e30d541d 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"
 2018-08-17 05:55:32 +02:00
l10n daemon script 6fb78e9d1e 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"
 2018-08-16 11:04:26 +02:00
l10n daemon script 0f09f20ed3 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"
 2018-08-16 05:34:53 +02:00
Vlad Zagorodniy 4576d1bfa9 [kcmkwin/compositing] Make the Background Contrast effect searchable 
Summary: Depends on D14765

Reviewers: #kwin, #plasma, davidedmundson

Reviewed By: #kwin, #plasma, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D14766
 2018-08-15 12:08:04 +03:00
Vlad Zagorodniy a18633b2b8 [kcmkwin/compositing] Delete leftover after removed effects 
Summary:
We don't have anymore the following effects:

* Box Switch (was removed in 4.11);
* Explosion (was removed in 4.11);
* Outline (was removed in 4.11);
* Scale In (will be removed in 5.14);
* Taskbar Thumbnails (was removed in 4.95).

So, keywords for those effects should not be among search suggestions in
System Settings.

Reviewers: #kwin, #plasma, davidedmundson

Reviewed By: #kwin, #plasma, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D14765
 2018-08-15 12:07:38 +03:00
Vlad Zagorodniy 7746b3304e Merge branch 'Plasma/5.13' 2018-08-15 11:34:19 +03:00
Vlad Zagorodniy fca9dbd011 Merge branch 'Plasma/5.12' into Plasma/5.13 2018-08-15 11:34:03 +03:00
Bo Simonsen 22d898399b [kcmkwin] Use QtQuick.Controls 2.0 for Label and TextField 
Summary:
Using QtQuick.Controls for Label and TextField can result in blurry font rendering for a fractional scaling (e.g. 1,5). There is a work around for QtQuick.Controls 2.x therefore using QtQuick.Controls 2.0 for Label and TextField resolves the problem

BUG: 366451

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: ngraham, zzag, davidedmundson, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D14495
 2018-08-15 11:31:00 +03:00
l10n daemon script 3dab3d74cb 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"
 2018-08-11 07:46:02 +02:00
l10n daemon script 98e401a9f4 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"
 2018-08-11 07:20:54 +02:00
l10n daemon script cd6f56a443 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"
 2018-08-11 05:34:25 +02:00
Vlad Zagorodniy 119d0d8f8c [kcmkwin/compositing] Move show desktop effects to their own category 
Summary:
We have two exclusive categories in the Appearance category:
minimize-animations and show-desktop. But it's hard to draw a line
between them, i.e. one can't say whether given effect belongs to the
minimize-animations category or to the show-desktop category.

This change moves show desktop effects to their own category so we have only
one exclusive category in the Appearance category.

Before:
{F6160592, layout=center, size=full}

After:
{F6161173, layout=center, size=full}

Reviewers: #kwin, #plasma, #vdg, ngraham

Reviewed By: #vdg, ngraham

Subscribers: davidedmundson, graesslin, ngraham, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D14458
 2018-08-02 16:32:57 +03:00
Alistair Francis d7a1e33683 [kcmkwin/kwindecoration] Add missing QT include 
Summary: Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: zzag, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D14173
 2018-07-26 10:04:41 -07:00
Alistair Francis d723ce2c40 [kcmkwin/kwindecoration] Add missing QT include 
Summary: Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: zzag, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D14173
 2018-07-26 10:01:41 -07:00
l10n daemon script 8dfd4c04dd 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"
 2018-07-23 07:12:23 +02:00
l10n daemon script 3b3aa82f58 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"
 2018-07-23 05:24:40 +02:00
l10n daemon script 3eaf1a9972 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"
 2018-07-22 07:44:41 +02:00
l10n daemon script ff646f2bc0 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"
 2018-07-12 07:30:51 +02:00
l10n daemon script 8dd23c5054 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"
 2018-07-12 07:07:30 +02:00
l10n daemon script 835181f3ca 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"
 2018-07-12 05:15:22 +02:00