GitLab

CCBUG: 412721

CCBUG: 412721

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"

CCBUG: 411965


(cherry picked from commit ec4391fb)

Dominik Haumann authored Sep 29, 2019 and Christoph Cullmann committed Sep 29, 2019

(cherry picked from commit c5b8abf0)

(cherry picked from commit 209f2f74)

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"

Test with `kate --reverse`

without this, we don't scale properly on e.g. Windows

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"

stop button no longer did show up
now it does again
code now uses widget name an not just index to make usage more clear

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"

BUG: 410742

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"

Summary:
When the find and replace toolview is in the left or right sidebars, move the combo boxes on their own rows so they have more space.
This patch changes the position of the combo boxes when the toolview width is smaller than its height.
The goal is to be able to see a large string in the find and/or replace combo boxes within a moderately narrow toolview.

Test Plan:
Original suggestion, widgets are not grouped:
{F6930229}
{F6930232}

2nd suggestion, buttons are small:
{F6931264}
{F6931265}

3rd suggestion:
{F6933433}

toolview height Vs combobox width:

before, 22 result lines, the combobox needs to be expanded
{F7021390}

after, 20 result lines, the combobox is large
{F7021407}

Reviewers: #kate, sars, #vdg, ngraham

Reviewed By: #kate, sars, #vdg, ngraham

Subscribers: cullmann, ngraham, kwrite-devel

Tags: #kate, #vdg

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

this handles symlinks in paths + .. correctly

BUG: 339061

works fine for me, too, even for minimized windows

BUG: 407288

terminals still don't want to get focus :/
CCBUG: 407495

From the Qt docs: If you pass the Qt::UniqueConnection type, the
connection will only be made if it is not a duplicate. If there
is already a duplicate (exact same signal to the exact same slot
on the same objects), the connection will fail and connect will
return an invalid QMetaObject::Connection.

In this case, the first connect worked, but the second time the
connect was already there, so an invalid QMetaObject::Connection
was returned, leading to the assert.

I think we don't need the assert.