| Age | Commit message (Collapse) | Author |
|---|
|
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"
|
|
|
|
REVIEW: 126771
|
|
|
|
Dolphin users can now choose between 3 different sorting modes:
* natural sorting
* case insensitive sorting
* case sensitive sorting
REVIEW: 126467
BUG: 148550
FIXED-IN: 16.04.0
|
|
|
|
|
|
|
|
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 15b20cd077c6743bb5ec947f5f3e014a4a32b110, I added KFileMetaData to
the required build dependencies in order to make the version increase
in 6c5930c229c8b96aae45e19ad4b7a1c57caa6ddc effective, and ensure that
the build fails at the CMake stage if the KFileMetaData version is too
old.
However, I had missed that KFileMetaData was already an optional
dependency. This commit makes it optional again and adjusts the
required version.
Thanks to Christoph Feck for notifying me about this issue and sorry
for the stupid mistake.
CCMAIL: [email protected]
|
|
|
|
Dolphin needs version 5.19 of kfilemetadata since
2257b94e4fc425a62bcdc065791566a20c517052
|
|
|
|
This prevents that the setup of the PlacesItemModel queries Solid for
the available devices, which can take some time.
Places can be added multiple times now using the context menu, but this
has always been possible with drag and drop anyway.
See https://forum.kde.org/viewtopic.php?f=223&t=130617 for a dicsussion
on this topic.
REVIEW: 126904
|
|
This brings back the functionality to show where a file originally was downloaded
from using xattr originUrl.
REVIEW: 126927
|
|
|
|
qApp->isSessionRestored() specifies whether the application has been
restored by session management. This is obviously wrong here. Use
qApp->isSavingSession() instead.
BUG: 353548
FIXED-IN: 15.12.2
REVIEW: 126917
|
|
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 not necessary because the sub menus are children of the main
menu, such that they are deleted together with the other actions by
QMenu::clear().
This prevents a crash that can happen if a sub menu is open while
another menu action is clicked.
Thanks to Fabian Vogt and Wolfgang Bauer for investigating this issue!
BUG: 354558
FIXED-IN: 15.12.2
REVIEW: 126693
|
|
when setting a different "mouse wheel scrolls by" value in the
mouse kcm, the user expects every view to scroll more or less
accordingly (even if it's not strictlya text view)
This makes the scroll in dolphin take that into account
REVIEW:126718
|
|
REVIEW: 125094
|
|
|
|
|
|
|
|
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"
|
|
|
|
dolphin is using
-DTRANSLATION_DOMAIN=\"dolphin\"
that is wrong for applications, apps need to use
KLocalizedString::setApplicationDomain
since that makes some other things like the transltators tab in the about
dialog show.
I have not removed -DTRANSLATION_DOMAIN=\"dolphin\" because on the other hand
this code is also a library (i.e. the dolphin kpart).
The "being pedandly correct" fix would be using -DTRANSLATION_DOMAIN=\"dolphin\"
only to compile the files that are part of the kpart but that's prone to
break at some point and using both KLocalizedString::setApplicationDomain and
-DTRANSLATION_DOMAIN does not create any problem so i went that route
CCMAIL: [email protected]
|
|
|
|
|
|
|
|
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"
|
|
addType("File") will create a invalid query for baloo. Currently seems
there is no replacement for it, so just remove it.
REVIEW: 126109
FIXED-IN: 15.12
BUG: 348902
|
|
|
