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"

See: https://bugs.kde.org/show_bug.cgi?id=268913
See: !422

General idea:

* anonymous session is
  * still without name (and not explicitly displayed)
  * is saved whenever the named session would be
  * is saved to "Last session" so it can be restored (if kate sessions are configured to restore the last one on start)
* its possible to store the configuration (plugins loaded, etc...) as session default
* the new session is created from defaults and stored as anonymous

Since the sidebar is collapsed, the plugin view is not
visible to the user, so it makes sense to show the
tool view (by expanding the sidebar) instead.

When their sidebar is collapsed, plugin views are still
technically visible (e.g. isVisible() returns true), but
visually they are hidden. This leads to a visual mismatch
of state (e.g. toggling the plugin view will disable it
instead of showing).

This commit makes it so that active plugin views are hidden
when their sidebar is collapsed, and then they are restored
when their sidebar is expanded again.

This ensures that the tool view can be restored
not just through moving the splitter via mouse,
but also by showing/hiding tool views.

This enables a user to temporarily hide
multiple (persistent) tool views on one sidebar
without having to hide each individual toolview.

BUG: 439535

This reverts commit fba7677a.

Christoph Cullmann authored Jul 07, 2021 and Jan Paul Batrina committed Jul 11, 2021

if people want to hide the toolview,
there is the button or shortcut

this avoids that collapsing via dragging leads
to confusion

BUG: 439535

as discussed in

!450

Splitter of views space should react on mouse double click by
resizing the viewspace to 50/50 split.

Bug: 438983

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"

Reason: Almost all editors and even many programs (konsole) do this in
KDE and other operating systems.

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 b1e3e8ce)

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"

we properly report this now in the "Output" pane
no need to have this on the terminal, too

1. We were refreshing the model twice!
2. Using set.insert() to check for duplicates is bad here as we
   keep growing in size..., use count() instead

we use the strings from the tools in internal
API calls like insertText

these calls assume line endings are just \n

BUG: 436753

CCBUG: 436753

it looks more consistent, if this is one message
it is only one 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"

Mufeed Ali authored Jun 21, 2021 and Christoph Cullmann committed Jul 01, 2021

- Use PlasmoidHeading for displaying search bar
- Stop using variables from 'units'
- Remove unused "Item"s
- Use better paddings and spacings

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"

Task: https://phabricator.kde.org/T14564

Always call QTabWidget::removeTab() so that the widget represented by that
tab is removed from the underlying QStackedWidget, otherwise the code could
try accessing a MatchModel object that has already been deleted as its parent
Results object has been deleted.

Only set m_curResults to nullptr if it belongs to the tab being closed,
e.g. if you have two or more search tabs, you can click the close button
of a tab other than the current one.