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"

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"

A blacklist of one known problematic character was added, but really it
seems we should mimic the entire test.

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"

As discussed in https://mail.kde.org/pipermail/plasma-devel/2020-August/118263.html we agreed that requiring C++17 in Plasma is fine.

There's no code that actually uses C++17 features yet, but specifying the requirement anyway has advantages.
1) It documents the policy in a much more discoverable place than a wiki page or similar could do
2) Building in 17 mode allows the compiler to do some stuff implicitly, like guranteed copy elision

Bhushan Shah authored Aug 18, 2020 and Bhushan Shah committed Aug 24, 2020

We currently need the lookandfeel and style kcm in plasma-workspace, but
appearantly they depend on the krdb so best solution is to move all kcms
together

They are taken from plasma-desktop at the commit :
8447c08e878ccbde9c5516ba8a912993ea199cb9

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"

It is about to be deprecated

See https://phabricator.kde.org/T12177

"Show" vs "Show always" is technically precise, but awkward in practice,
and I don't think the distinction is helpful. People are accustomed to
media controls appearing on demand, so I think we can safely put it in a
group with the label "Show".

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"

There were three principal sources of errors and warnings:
1. Un-ported `onFooChanged` statements
2. `config.fontSize` being unconditionally referenced from components
   without access to it (it comes from the SDDM config)
3. Accessing units from the context property rather than the singleton

All are fixed now. Tested with:
1. `sddm-greeter --test-mode --theme ~/kde/usr/share/sddm/themes/breeze/`
2. `~/kde/usr/lib64/libexec/kscreenlocker_greet --testing --theme ~/kde/src/plasma-workspace/lookandfeel`
3. `/kde/usr/lib64/libexec/ksmserver-logout-greeter --fakearg`

No regressions found.

BUG: 425349
FIXED-IN: 5.20

Nicolas Fella authored Aug 13, 2020 and David Edmundson committed Aug 20, 2020

I'm 92% sure this does nothing given we don't have anything resembling 'panel' in the autostarted things.

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 existing method was overly complicated given that KPackage can load packages
relative to the default package root. Also it didn't work because QStandardPaths
defaults to LocateFile, not finding any packages.

For the interactive console this is done in !158

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"

Allows showing two Spectacle screenshot notifications at the same time,
at least on my laptop...

Fabian Vogt authored Aug 18, 2020 and Alexander Lohnau committed Aug 18, 2020

If there's no firefox profile found, m_favicon and m_fetchsqlitefav are
nullptr.

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"

There's no point in keeping the search text if you're clearing all
entries, since doing that removes all data that the search field would
be searching through.

Otherwise if you search for some text and it produces no results, the
search field becomes disabled so you can't change or clear your search
and use the applet again!

This option is just too nerdy to show a UI for. We keep the logic for it
in the code (it's just two lines) but it's now only available for people
who know about this and manually add "popupOnNewDevice=false" to their
plasma-org.kde.plasma.desktop-appletsrc file.

This prevents the applet from being too cluttered with options with the
new design.

Right now the Device Notifier applet has two settings: what kind of
devices to show, and whether or not to open on new device attachment.

My sense is that nobody knows that these options exist because they're
hidden away in a config window that you can only access by
right-clicking on the item in the system tray.

Furthermore, the setting for what kind of devices to show is more useful
than we give it credit for; when set to "All devices", the applet functions
as an always-visible way to access all of the machine's disks. This is
quite handy.

Accordingly, this commit removes the config window and moves all of the
settings into the main UI of the applet using PlasmoidHeaders--one
header and one footer, exactly like the plasma-pa applet.

With this change, the "Show all devices" feature becomes discoverable:
when you plug in a flash drive or whatever, the applet will pop open,
showing you the combobox that chooses what it will display. In this moment,
you can notice it, play with it, and configure it to show all devices if
you'd like.

Accordingly again, the name of the applet is renamed to "Disks &
Devices" since "Device Notifier" is not an accurate name. It was only
ever accurate when using the applet's default settings, and now that
non-default settings are made more discoverable, it feels appropriate
to give it a more generally appropriate name.

If Qt is compiled with GLESv2, we can not link against the Qt5::Gui_GL,
that causes the cmake error.

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 being done for the KCM itself in frameworks/kio!103 (comment 89627)
So the name needs to be changed here too if that lands.

While we're at it, let's also improve the comment.

Benjamin Port authored Aug 11, 2020 and Benjamin Port committed Aug 14, 2020

- desktop theme
- icons

It's now done automatically in the tooltip itself; see
frameworks/plasma-framework!51

Plasma Mobile shell currently have a action in pull-down panel to take
screenshot, without this it can not take screenshot.