GitLab

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"

GIT_SILENT

GIT_SILENT

GIT_SILENT

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"

When running "bluedevil-sendfile -u <device>" (or with -k) the file
selector that pops up is much too small. Use the dialog size suggested
by KFileWidget instead.

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"

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"

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"

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"

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"

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"

This is a total rewrite of the bluetooth KCMs with current technology and visual style. It combines the three individual KCMs into a single one using multiple pages.

Functionality-wise it is mostly equivalent, except for two differences.

1) The new KCM does not allow setting an adapter visibility timeout

2) There is no option to not receive files any more. It is somewhat redundant with the default setting of not receiving them automatically.

Adding new devices is not yet ported, instead this just opens the wizard just like the old KCM. We sure want to have it properly integrated at some point, but it's a rather complex piece in itself and the diff is already huge.

Fixes #1

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"

Summary:
Set a QScroller on the ListView

BUG: 406544

Test Plan:
Scrolling with touchpad: No change
Drag one finger on a touchscreen on the devicelist: List moves

Reviewers: #plasma, drosca, bshah

Reviewed By: bshah

Subscribers: bshah, ngraham, apol, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D21049

It's redundant visual noise since they all show up in an "Available
Devices" section anyway.

BUG: 425239
FIXED-IN: 5.20

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"

With frameworks/plasma-framework!46,
checkboxes will be able to have an icon property defined internally, no
need for a separate SVG. So if and when that lands, we can use that and
discard the bespoke SwitchButton component.

This is an alternative to
!4

otherwise the comment is used which has wrong capitalization for a
"title" use seen in the notification kcm (which prefers Name over
Comment)

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"

Tested; no regressions. The new remaining things that still need PC2 are
now labeled with the reason in the import line so you can easily see by
doing a `grep org.kde.plasma.components 2.0` in the repo.

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"

The Kirigami version uses QQC2 elements which don't respect the plasma
theme and color scheme, leading to thing slooking out of place
especially when using a dark color theme or scheme.

Depends on frameworks/plasma-framework!13

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"

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"

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"

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"

GIT_SILENT

GIT_SILENT

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"

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"