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"

This is needed for example for MÁV train tickets.

Will need KF 5.88 to actually work though.

BUG: 444324

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"

Much more convenient than picking on the map manually, if the address is
reasonably complete.

Happens easily with the -1 of a not yet select combo box.

This also avoids insanely long transfers being added for partially imported
trips.

It shows the thumbnail (e.g. a movie poster), when available,
alternatively the logo or icon (e.g. airline logo)

Requires the latest KHC to work.

* Split confidential details from bare minimum information required to show
* Make it easy to switch between Qr code and details with a Kirigami.NavigationTabBar
* When importing certificate, switch to it directly

Also de-duplicate the mode icon QML logic while at it.

Kai Uwe Broulik authored Oct 08, 2021 and Volker Krause committed Oct 13, 2021

Avoids an awkward gap

Kai Uwe Broulik authored Oct 08, 2021 and Volker Krause committed Oct 13, 2021

When an item is inside a Layout, its width (and height) gets managed by said
layout, taking into account minimum/maximum/preferredWidth and implicitWidth.

Assigning width manually, does not behave as one expect here, since
Kirigami.Icon has an implicit size (of 32) and so with the nature of a ListView
creating delegates as you scroll, it becomes somewhat random which size
wins in the end, and might even change as an item goes out of view and back in.

While at it, use `smallMedium`, which, from the actual looks of the outcome
of this bug, is what the delegate should have been using. (Imho small is too small)

GIT_SILENT

Adds a tooltip for accessibility but keeps the button
icon-only as the arrow is quite self-explanatory

Kai Uwe Broulik authored Oct 09, 2021 and Volker Krause committed Oct 09, 2021

Avoids the layout shifting around as some connections have
it while others don't

The icons aren't particularly great

To match Kirigami's AbstractCard background

Avoids an awkward gap

Kai Uwe Broulik authored Oct 08, 2021 and Volker Krause committed Oct 08, 2021

When an item is inside a Layout, its width (and height) gets managed by said
layout, taking into account minimum/maximum/preferredWidth and implicitWidth.

Assigning width manually, does not behave as one expect here, since
Kirigami.Icon has an implicit size (of 32) and so with the nature of a ListView
creating delegates as you scroll, it becomes somewhat random which size
wins in the end, and might even change as an item goes out of view and back in.

While at it, use `smallMedium`, which, from the actual looks of the outcome
of this bug, is what the delegate should have been using. (Imho small is too small)

Kai Uwe Broulik authored Oct 08, 2021 and Volker Krause committed Oct 08, 2021

I suck at geography and flags, allow showing the names of the countries.

During a visual inspection, this information is typically what an
establishment is looking for. Make it bold and green/orange
depending on status.

Obviously :)


(cherry picked from commit ee623e02)

Obviously :)

BUG: 443200
FIXED-IN: 21.08.3

(cherry picked from commit c099a358)