Commit graph

5089 commits

Author SHA1 Message Date
l10n daemon script
189d5cd0f9 SVN_SILENT made messages (after extraction) 2016-03-07 08:19:21 +00:00
l10n daemon script
20cb1492e7 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2016-02-19 09:23:18 +00:00
Frank Reininghaus
6bc4f18f60 Make KFileMetaData optional again
In 15b20cd077, I added KFileMetaData to
the required build dependencies in order to make the version increase
in 6c5930c229 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: cfeck@kde.org
2016-02-17 22:10:54 +01:00
Albert Astals Cid
ab3afbbf22 GIT_SILENT Upgrade KDE Applications version to 15.12.2. 2016-02-12 06:10:46 +01:00
Frank Reininghaus
6c5930c229 Increase the required KF5 version
Dolphin needs version 5.19 of kfilemetadata since
2257b94e4f
2016-02-10 22:36:28 +01:00
Frank Reininghaus
15b20cd077 Detect FileMetaData framework at CMake stage becasuse Dolphin needs it 2016-02-10 22:36:28 +01:00
Frank Reininghaus
d094c8ffe6 DolphinContextMenu: Do not check if the clicked folder is in the Places
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
2016-02-10 22:36:01 +01:00
Kai Uwe Broulik
2257b94e4f Support KFileMetadata OriginUrl as "Downloaded From"
This brings back the functionality to show where a file originally was downloaded
from using xattr originUrl.

REVIEW: 126927
2016-02-09 22:11:00 +01:00
Wolfgang Bauer
08819ca3b1 Merge branch 'Applications/15.12' 2016-01-28 21:10:05 +01:00
Wolfgang Bauer
bf1dbee1d6 Fix check whether window is closed by session management
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
2016-01-28 21:03:14 +01:00
l10n daemon script
3b8623b040 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2016-01-20 12:38:42 +00:00
Aleix Pol
7c343f21dd include KDEFrameworksCompilerSettings as suggested in the documentation 2016-01-19 13:14:00 +01:00
l10n daemon script
b336066e1d SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2016-01-15 09:54:42 +00:00
Frank Reininghaus
adb7c47885 Update copyright year 2016-01-14 20:45:49 +01:00
Frank Reininghaus
0743843ebb Merge branch 'Applications/15.12' 2016-01-14 20:41:32 +01:00
Frank Reininghaus
ddc050f235 Do not delete sub menus of the control menu explicitly
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
2016-01-14 20:36:28 +01:00
Marco Martin
570d0e55b6 Take into account QApplication::wheelScrollLines() in wheel events
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
2016-01-12 14:01:51 +01:00
Roman Gilg
a3acc36a66 Adding icon for hidden files
REVIEW: 125094
2016-01-12 10:35:56 +01:00
l10n daemon script
508ad6cbd0 SVN_SILENT made messages (.desktop file) 2016-01-10 14:42:09 +00:00
Albert Astals Cid
caa38bd851 GIT_SILENT Upgrade KDE Applications version to 15.12.1. 2016-01-07 00:02:10 +01:00
l10n daemon script
ce14d709c7 SVN_SILENT made messages (.desktop file) 2015-12-30 12:12:44 +00:00
l10n daemon script
889a574fcd SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2015-12-30 09:19:37 +00:00
l10n daemon script
0004b0dd0a SVN_SILENT made messages (after extraction) 2015-12-30 06:45:51 +00:00
l10n daemon script
013a854aca SVN_SILENT made messages (after extraction) 2015-12-17 10:36:05 +00:00
l10n daemon script
8b66fa05a7 SVN_SILENT made messages (after extraction) 2015-12-17 07:20:35 +00:00
Valentin Rusu
e5b3a37f66 Fix compilation when baloo is not present 2015-12-13 16:14:53 +02:00
l10n daemon script
2d8448f88d SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2015-12-09 09:04:05 +00:00
Albert Astals Cid
a489b0c5ba GIT_SILENT Upgrade KDE Applications version to 15.12.0. 2015-12-08 16:49:30 +01:00
l10n daemon script
4b97e6fc80 SVN_SILENT made messages (.desktop file) 2015-12-08 12:50:49 +00:00
l10n daemon script
bb3bfa8989 SVN_SILENT made messages (after extraction) 2015-12-08 11:11:12 +00:00
l10n daemon script
c0d5537afb SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2015-12-08 10:05:01 +00:00
l10n daemon script
9c432e6905 SVN_SILENT made messages (after extraction) 2015-12-08 07:55:54 +00:00
l10n daemon script
0fc2c24039 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2015-12-07 10:14:12 +00:00
Albert Astals Cid
87793aecce GIT_SILENT Upgrade KDE Applications version to 15.11.90. 2015-12-02 22:10:39 +01:00
l10n daemon script
d3c9d3c31f SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2015-11-30 10:26:25 +00:00
Albert Astals Cid
090f3e90ea Merge remote-tracking branch 'origin/Applications/15.12' 2015-11-29 19:32:15 +01:00
Albert Astals Cid
d00b531c74 Call KLocalizedString::setApplicationDomain("dolphin");
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: kfm-devel@kde.org
2015-11-29 19:19:33 +01:00
David Faure
35b35d0c5f Fix wrong path->URL conversion. 2015-11-28 23:45:07 +01:00
Vishesh Handa
34aaff4124 Fix -Wunused-const-variable 2015-11-27 01:32:07 +01:00
David Faure
3a50ef642a Fix incorrect QString -> QUrl conversion. 2015-11-26 00:01:46 +01:00
l10n daemon script
0587f994dc SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2015-11-21 18:58:19 +00:00
Weng Xuetian
ed3bb94ea0 Fix search in places panel.
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
2015-11-19 09:40:51 -08:00
l10n daemon script
f3269481ec SVN_SILENT made messages (after extraction) 2015-11-19 08:54:08 +00:00
Albert Astals Cid
581ee6d0c8 GIT_SILENT Upgrade KDE Applications version to 15.11.80. 2015-11-18 00:39:00 +01:00
l10n daemon script
e0dfcb9e1d SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2015-11-17 12:50:56 +00:00
l10n daemon script
c96add9c68 SVN_SILENT made messages (after extraction) 2015-11-17 09:42:50 +00:00
l10n daemon script
c4f3c40b83 SVN_SILENT made messages (.desktop file) 2015-11-16 13:50:57 +00:00
Andreas Cord-Landwehr
3c09528f3c Enable KCrash crash handler. 2015-11-14 22:37:40 +01:00
Emmanuel Pescosta
727d2513c0 Merge branch 'Applications/15.08' 2015-11-09 09:33:20 +01:00
Albert Astals Cid
6f87ffa2b0 GIT_SILENT Upgrade KDE Applications version to 15.08.3. 2015-11-04 23:26:11 +01:00