GitLab

This reverts commit af2c76ee.

It's unnecessary now that ToolBar colors come from the QQC2 style in
the manner that we need here.

The QQC2 ToolBar that it lives inside provides its own margins, so
adding more is uncecessary. Now the search field aligns vertically with
the items above it when it's being displayed as a header above the
sidebar list.

This will fall back to the current Window colors when using a color
scheme without Header colors, so there is no visual change right now.
However this ensures that we are prepared for the new Breeze color
scheme once it lands.

The whole concept is almost unused and there's no point in having it there but empty

See also https://phabricator.kde.org/T13553

(cherry picked from commit 5a971b78)

(cherry picked from commit 231e6cf1)

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"

(cherry picked from commit 44978290)

I don't see why anyone would deselect that. The result is just super broken

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"

The slider gallery's layout was a bit misaligned. I converted it to a FormLayout, which fixed the problems. I removed the tooltips built into the sliders because I didn't think they were necessary, but it might be nice to have that kind of feature built into qqc2-desktop-style sliders.

(cherry picked from commit 093758d8)

(cherry picked from commit 11f1878a)

Summary:
This patch fixes navigation regressions caused by larger cards in the gallery.

- Keyboard focus is properly handled
- Cards collapse to a smaller form when a second page is present
- A home button is present to allow returning to the large-form cards

Test Plan:
{F8241913}

{F8241912}

Reviewers: #vdg, #kirigami, ndavis, mart

Reviewed By: #vdg, #kirigami, ndavis, mart

Subscribers: mart, ndavis, ngraham, plasma-devel

Tags: #plasma, #kirigami

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

Summary:
Card now has a correct default height.

Depends on D29127

Test Plan: Main page cards display correctly, both in single and double column mode.

Reviewers: #kirigami, mart

Reviewed By: #kirigami, mart

Subscribers: plasma-devel

Tags: #plasma, #kirigami

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

(cherry picked from commit 5944f695)

Summary: The gallery listing is now a CardsLayout of cards with images and has a search bar.

Test Plan: {F8225697}

Reviewers: #vdg, #kirigami, mart

Reviewed By: #vdg, #kirigami, mart

Subscribers: plasma-devel

Tags: #plasma, #kirigami

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

Test Plan: {F8225962}

Reviewers: #kirigami, ngraham

Reviewed By: #kirigami, ngraham

Subscribers: ngraham, plasma-devel

Tags: #plasma, #kirigami

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

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"

Should fix the binary factory build.

GIT_SILENT manually merge release versions from release/19.12 branch, in future this will be cherry picked along with the branch commit

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"