Hello community, here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2016-08-29 14:32:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin (Old) and /work/SRC/openSUSE:Factory/.dolphin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin" Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2016-07-21 07:42:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dolphin.new/dolphin.changes 2016-08-29 14:32:34.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:02:32 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:33:07 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- dolphin-16.04.3.tar.xz New: ---- dolphin-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin.spec ++++++ --- /var/tmp/diff_new_pack.C4jRCf/_old 2016-08-29 14:32:37.000000000 +0200 +++ /var/tmp/diff_new_pack.C4jRCf/_new 2016-08-29 14:32:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: dolphin -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: KDE File Manager License: GPL-2.0+ @@ -128,11 +128,11 @@ %{_kf5_bindir}/dolphin %{_kf5_applicationsdir}/org.kde.dolphin.desktop %{_kf5_applicationsdir}/org.kde.dolphinsu.desktop -%dir %{_kf5_sharedir}/kxmlgui5 -%dir %{_kf5_sharedir}/kxmlgui5/dolphin -%{_kf5_sharedir}/kxmlgui5/dolphin/dolphinui.rc -%dir %{_kf5_sharedir}/appdata -%{_kf5_sharedir}/appdata/org.kde.dolphin.appdata.xml +%dir %{_kf5_kxmlguidir} +%dir %{_kf5_kxmlguidir}/dolphin +%{_kf5_kxmlguidir}/dolphin/dolphinui.rc +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.dolphin.appdata.xml %{_kf5_bindir}/servicemenuinstallation %{_kf5_bindir}/servicemenudeinstallation %dir %{_kf5_htmldir}/en @@ -147,9 +147,9 @@ %{_kf5_libdir}/libdolphinprivate.so.* %dir %{_kf5_plugindir} %{_kf5_plugindir}/dolphinpart.so -%dir %{_kf5_sharedir}/kxmlgui5 -%dir %{_kf5_sharedir}/kxmlgui5/dolphinpart -%{_kf5_sharedir}/kxmlgui5/dolphinpart/dolphinpart.rc +%dir %{_kf5_kxmlguidir} +%dir %{_kf5_kxmlguidir}/dolphinpart +%{_kf5_kxmlguidir}/dolphinpart/dolphinpart.rc %dir %{_kf5_servicesdir} %{_kf5_servicesdir}/dolphinpart.desktop %dir %{_kf5_servicetypesdir} @@ -176,5 +176,6 @@ %{_kf5_libdir}/cmake/DolphinVcs/ %{_kf5_prefix}/include/Dolphin/ %{_kf5_prefix}/include/dolphin_export.h +%{_includedir}/dolphinvcs_export.h %changelog ++++++ dolphin-16.04.3.tar.xz -> dolphin-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/CMakeLists.txt new/dolphin-16.08.0/CMakeLists.txt --- old/dolphin-16.04.3/CMakeLists.txt 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/CMakeLists.txt 2016-08-10 01:01:57.000000000 +0200 @@ -4,12 +4,12 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") -set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") -set(KF5_MIN_VERSION "5.19.0") +set(KF5_MIN_VERSION "5.21.0") set(ECM_MIN_VERSION "1.6.0") # ECM setup @@ -102,6 +102,8 @@ ) endif() +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + add_subdirectory(src) add_subdirectory(doc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/doc/index.docbook new/dolphin-16.08.0/doc/index.docbook --- old/dolphin-16.04.3/doc/index.docbook 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/doc/index.docbook 2016-08-10 01:01:57.000000000 +0200 @@ -1,7 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY dolphin "<application>Dolphin</application>"> - <!ENTITY kappname "&dolphin;"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> @@ -72,12 +70,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2015-08-02</date> -<releaseinfo>Applications 15.08</releaseinfo> +<date>2016-06-01</date> +<releaseinfo>Applications 16.04</releaseinfo> <abstract> <para> -&dolphin; is the default file manager for &kde;, designed with usability as a primary focus. +&dolphin; is the default file manager by &kde;, designed with usability as a primary focus. </para> </abstract> @@ -95,7 +93,7 @@ <title>Introduction</title> <para> -&dolphin; is &kde;'s default file manager. It aims to improve usability at the +&dolphin; is &plasma;'s default file manager. It aims to improve usability at the user interface level. &dolphin; focuses only on being a file manager whereas &konqueror;, which was &kde;'s default file manager in &kde; 3 and can still be used for file management, is a universal viewer for many file types. @@ -357,12 +355,12 @@ the <guilabel>Name</guilabel> header, which is always the first column in this view. </para> <para> -The details view allows you to view the current directory +The details view allows you to view the current folder in a tree-like fashion if <link linkend="preferences-dialog-viewmodes-details"> -<guilabel>Expandable folders</guilabel></link> are enabled: +<guilabel>Expandable folders</guilabel></link> are enabled: Each subfolder of the current folder can be -<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon>></guiicon> -or <guiicon>v</guiicon> icon next to it.</para></listitem> +<quote>expanded</quote> or <quote>collapsed</quote> by clicking on the <guiicon>+</guiicon> +or <guiicon>-</guiicon> icon next to it.</para></listitem> </itemizedlist> </para> @@ -1146,16 +1144,9 @@ <itemizedlist> <listitem><para> -&dolphin; can be configured to open items with a single mouse click -(<guilabel>Single-click to open files and folders</guilabel>) or a double mouse -click (<guilabel>Double-click to open files and folders</guilabel>). In the -latter case, a single mouse click will select the file or folder. -</para> -<note> -<para>This is a system wide setting and can be changed in the &systemsettings; in the -<menuchoice><guimenu>Input Devices</guimenu> <guimenuitem>Mouse</guimenuitem></menuchoice> -module as well.</para> -</note> +The option to open items with a single or double mouse click is a system wide setting and can be +changed in the &systemsettings; in the <menuchoice><guimenu>Input Devices</guimenu> +<guimenuitem>Mouse</guimenuitem></menuchoice> module.</para> </listitem> <listitem><para> @@ -1295,28 +1286,18 @@ <link linkend="view-properties"> view properties</link> are stored for each folder or if common view properties are to be used for all folders. </para></listitem> -<listitem><para> -When hovering over a file or folder with the mouse, a small window with relevant -information is shown if <guilabel>Show tooltips</guilabel> is enabled. -</para></listitem> - -<listitem><para> -<guilabel>Show selection marker</guilabel> shows a small <guibutton>+</guibutton> -or <guibutton>-</guibutton> button above an item's icon if the item is hovered over -with the mouse. These can be used to select or deselect the item. -</para></listitem> <listitem><para> -<guilabel>Natural sorting of items</guilabel> controls how items are sorted in -the view. If this option is enabled, the sort order of three example files +<guilabel>Sorting Mode</guilabel> controls how items are sorted in +the view. If <guilabel>Natural sorting</guilabel> is enabled, the sort order of three example files will be <orderedlist> <listitem><para>File1,</para></listitem> <listitem><para>File2,</para></listitem> <listitem><para>File10.</para></listitem> </orderedlist> -If this option is disabled, the normal alphabetical sorting will be used, which -leads to the sort order +If this option is disabled, the normal alphabetical sorting case sensitive or case insensitive +will be used, which leads to the sort order <orderedlist> <listitem><para>File1,</para></listitem> <listitem><para>File10,</para></listitem> @@ -1325,7 +1306,18 @@ </para></listitem> <listitem><para> -Enable <guilabel>Rename inline</guilabel> to use this mode if only one item is currently selected. +When hovering over a file or folder with the mouse, a small window with relevant +information is shown if <guilabel>Show tooltips</guilabel> is enabled. +</para></listitem> + +<listitem><para> +<guilabel>Show selection marker</guilabel> shows a small <guibutton>+</guibutton> +or <guibutton>-</guibutton> button above an item's icon if the item is hovered over +with the mouse. These can be used to select or deselect the item. +</para></listitem> + +<listitem><para> +Enable <guilabel>Rename inline</guilabel> to use this mode if only one item is currently selected. If this option is disabled or several items are selected, a dialog will be displayed for renaming. </para></listitem> @@ -1381,11 +1373,6 @@ </itemizedlist> </para> -<note><para> -Since &dolphin; 4.9 the <guimenuitem>Delete</guimenuitem>, -<guimenuitem>Copy To</guimenuitem>, and <guimenuitem>Move To</guimenuitem> -commands of the context menu have to be enabled on the Services page. -</para></note> </sect3> @@ -1539,6 +1526,17 @@ <varlistentry> <term><menuchoice> <shortcut> +<keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo> +</shortcut> +<guimenu>File</guimenu> +<guimenuitem>Undo close tab</guimenuitem> +</menuchoice></term> +<listitem><para><action>Reopens the last closed tab.</action></para></listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<shortcut> <keycombo action="simul"><keycap>F2</keycap></keycombo> </shortcut> <guimenu>File</guimenu> @@ -2102,21 +2100,6 @@ </chapter> -<appendix id="installation"> -<title>How to get &dolphin;</title> - -&install.intro.documentation; - -<para>For instructions on acquiring &kde; please see <ulink -url="http://www.kde.org";>http://www.kde.org</ulink> or read the chapter -<ulink url="help:/fundamentals/install.html">Installing &kde;</ulink> -in the &kde; Fundamentals.</para> - -<para>For further information about &dolphin; you might want to visit -<ulink url="http://userbase.kde.org/Dolphin";>http://userbase.kde.org/Dolphin</ulink>.</para> - -</appendix> - &documentation.index; </book> Files old/dolphin-16.04.3/doc/preferences-general-behavior.png and new/dolphin-16.08.0/doc/preferences-general-behavior.png differ Files old/dolphin-16.04.3/doc/preferences-navigation.png and new/dolphin-16.08.0/doc/preferences-navigation.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/CMakeLists.txt new/dolphin-16.08.0/src/CMakeLists.txt --- old/dolphin-16.04.3/src/CMakeLists.txt 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/CMakeLists.txt 2016-08-10 01:01:57.000000000 +0200 @@ -23,8 +23,7 @@ ) add_library(dolphinvcs ${dolphinvcs_LIB_SRCS}) - -generate_export_header(dolphinvcs BASE_NAME dolphin) +generate_export_header(dolphinvcs BASE_NAME dolphinvcs) target_link_libraries( dolphinvcs PUBLIC @@ -48,7 +47,7 @@ install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel) install(FILES ${dolphinvcs_LIB_HEADERS} DESTINATION "${KDE_INSTALL_INCLUDEDIR}/Dolphin" COMPONENT Devel) ########### next target ############### @@ -131,6 +130,7 @@ ) add_library(dolphinprivate ${dolphinprivate_LIB_SRCS}) +generate_export_header(dolphinprivate BASE_NAME dolphin) target_link_libraries( dolphinprivate PUBLIC @@ -170,6 +170,7 @@ ) install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel) ########################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/dolphincontextmenu.cpp new/dolphin-16.08.0/src/dolphincontextmenu.cpp --- old/dolphin-16.04.3/src/dolphincontextmenu.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/dolphincontextmenu.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -37,6 +37,7 @@ #include <KJobWidgets> #include <KMimeTypeTrader> #include <KNewFileMenu> +#include <KPluginMetaData> #include <KService> #include <KLocalizedString> #include <KStandardAction> @@ -503,6 +504,7 @@ const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals); const KConfigGroup showGroup = config.group("Show"); + QSet<QString> addedPlugins; foreach (const KService::Ptr& service, pluginServices) { if (!showGroup.readEntry(service->desktopEntryName(), true)) { // The plugin has been disabled @@ -513,6 +515,30 @@ if (abstractPlugin) { abstractPlugin->setParent(this); addActions(abstractPlugin->actions(props, m_mainWindow)); + addedPlugins << service->desktopEntryName(); + } + } + + const auto jsonPlugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kfileitemaction"), [](const KPluginMetaData& metaData) { + return metaData.serviceTypes().contains(QStringLiteral("KFileItemAction/Plugin")); + }); + + foreach (const auto& jsonMetadata, jsonPlugins) { + // The plugin has been disabled + if (!showGroup.readEntry(jsonMetadata.pluginId(), true)) { + continue; + } + + // The plugin also has a .desktop file and has already been added. + if (addedPlugins.contains(jsonMetadata.pluginId())) { + continue; + } + + KPluginFactory *factory = KPluginLoader(jsonMetadata.fileName()).factory(); + KAbstractFileItemActionPlugin* abstractPlugin = factory->create<KAbstractFileItemActionPlugin>(); + if (abstractPlugin) { + abstractPlugin->setParent(this); + addActions(abstractPlugin->actions(props, m_mainWindow)); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/dolphinmainwindow.cpp new/dolphin-16.08.0/src/dolphinmainwindow.cpp --- old/dolphin-16.04.3/src/dolphinmainwindow.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/dolphinmainwindow.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -83,7 +83,7 @@ // Used for GeneralSettings::version() to determine whether // an updated version of Dolphin is running. const int CurrentDolphinVersion = 200; -}; +} DolphinMainWindow::DolphinMainWindow() : KXmlGuiWindow(0), @@ -1099,7 +1099,7 @@ compareFiles->setEnabled(false); connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles); - if (KAuthorized::authorizeKAction(QStringLiteral("shell_access"))) { + if (KAuthorized::authorize(QStringLiteral("shell_access"))) { QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal")); openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); @@ -1208,7 +1208,7 @@ // Setup "Terminal" #ifndef Q_OS_WIN - if (KAuthorized::authorizeKAction(QStringLiteral("shell_access"))) { + if (KAuthorized::authorize(QStringLiteral("shell_access"))) { DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); terminalDock->setLocked(lock); terminalDock->setObjectName(QStringLiteral("terminalDock")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/dolphinpart.cpp new/dolphin-16.08.0/src/dolphinpart.cpp --- old/dolphin-16.04.3/src/dolphinpart.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/dolphinpart.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -222,7 +222,7 @@ m_findFileAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find"))); connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile); - if (KAuthorized::authorizeKAction(QStringLiteral("shell_access"))) { + if (KAuthorized::authorize(QStringLiteral("shell_access"))) { m_openTerminalAction = actionCollection()->addAction(QStringLiteral("open_terminal")); m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/dolphinviewcontainer.cpp new/dolphin-16.08.0/src/dolphinviewcontainer.cpp --- old/dolphin-16.04.3/src/dolphinviewcontainer.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/dolphinviewcontainer.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -95,7 +95,7 @@ m_view = new DolphinView(url, this); connect(m_view, &DolphinView::urlChanged, - m_urlNavigator, &KUrlNavigator::setUrl); + m_urlNavigator, &KUrlNavigator::setLocationUrl); connect(m_view, &DolphinView::urlChanged, m_messageWidget, &KMessageWidget::hide); connect(m_view, &DolphinView::directoryLoadingCompleted, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/kfileitemmodelrolesupdater.cpp new/dolphin-16.08.0/src/kitemviews/kfileitemmodelrolesupdater.cpp --- old/dolphin-16.04.3/src/kitemviews/kfileitemmodelrolesupdater.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/kfileitemmodelrolesupdater.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -374,9 +374,9 @@ m_balooFileMonitor->clear(); } else { QStringList newFileList; - foreach (const QString& itemUrl, m_balooFileMonitor->files()) { - if (m_model->index(itemUrl) >= 0) { - newFileList.append(itemUrl); + foreach (const QString& file, m_balooFileMonitor->files()) { + if (m_model->index(QUrl::fromLocalFile(file)) >= 0) { + newFileList.append(file); } } m_balooFileMonitor->setFiles(newFileList); @@ -707,10 +707,10 @@ updateChangedItems(); } -void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& itemUrl) +void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& file) { #ifdef HAVE_BALOO - const KFileItem item = m_model->fileItem(itemUrl); + const KFileItem item = m_model->fileItem(QUrl::fromLocalFile(file)); if (item.isNull()) { // itemUrl is not in the model anymore, probably because diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/kitemlistcontainer.cpp new/dolphin-16.08.0/src/kitemviews/kitemlistcontainer.cpp --- old/dolphin-16.04.3/src/kitemviews/kitemlistcontainer.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/kitemlistcontainer.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -185,27 +185,7 @@ KItemListSmoothScroller* smoothScroller = scrollHorizontally ? m_horizontalSmoothScroller : m_verticalSmoothScroller; - const QScrollBar* scrollBar = smoothScroller->scrollBar(); - if (!event->pixelDelta().isNull()) { - const int numPixels = event->pixelDelta().y(); - if (event->modifiers().testFlag(Qt::ShiftModifier)) { - const int scrollingDirection = numPixels > 0 ? 1 : -1; - smoothScroller->scrollTo(scrollBar->value() - scrollBar->pageStep() * scrollingDirection); - } else { - smoothScroller->scrollTo(scrollBar->value() - numPixels); - } - } else { - const int numDegrees = event->angleDelta().y() / 8; - const int numSteps = qApp->wheelScrollLines() * numDegrees / 15; - if (event->modifiers().testFlag(Qt::ShiftModifier)) { - const int scrollingDirection = numSteps > 0 ? 1 : -1; - smoothScroller->scrollTo(scrollBar->value() - scrollBar->pageStep() * scrollingDirection); - } else { - smoothScroller->scrollTo(scrollBar->value() - numSteps * scrollBar->pageStep() / 12); - } - } - - event->accept(); + smoothScroller->handleWheelEvent(event); } void KItemListContainer::slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/kitemset.h new/dolphin-16.08.0/src/kitemviews/kitemset.h --- old/dolphin-16.04.3/src/kitemviews/kitemset.h 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/kitemset.h 2016-08-10 01:01:57.000000000 +0200 @@ -20,6 +20,8 @@ #ifndef KITEMSET_H #define KITEMSET_H +#include "dolphin_export.h" + #include <kitemviews/kitemrange.h> /** @@ -40,7 +42,7 @@ * The complexity of most operations depends on the number of ranges. */ -class KItemSet +class DOLPHIN_EXPORT KItemSet { public: KItemSet(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/kstandarditemlistwidget.cpp new/dolphin-16.08.0/src/kitemviews/kstandarditemlistwidget.cpp --- old/dolphin-16.04.3/src/kitemviews/kstandarditemlistwidget.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/kstandarditemlistwidget.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -850,6 +850,15 @@ KItemListWidget::hideEvent(event); } +bool KStandardItemListWidget::event(QEvent *event) +{ + if (event->type() == QEvent::WindowDeactivate || event->type() == QEvent::WindowActivate) { + m_dirtyContent = true; + } + + return KItemListWidget::event(event); +} + void KStandardItemListWidget::slotCutItemsChanged() { const QUrl itemUrl = data().value("url").toUrl(); @@ -954,7 +963,7 @@ iconName = QStringLiteral("unknown"); } const QStringList overlays = values["iconOverlays"].toStringList(); - m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight); + m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight, isSelected() && isActiveWindow() ? QIcon::Selected : QIcon::Normal); } else if (m_pixmap.width() / m_pixmap.devicePixelRatio() != maxIconWidth || m_pixmap.height() / m_pixmap.devicePixelRatio() != maxIconHeight) { // A custom pixmap has been applied. Assure that the pixmap @@ -1438,11 +1447,11 @@ m_roleEditor = 0; } -QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size) +QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size, QIcon::Mode mode) { static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown")); size *= qApp->devicePixelRatio(); - const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size); + const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size) % ":" % QString::number(mode); QPixmap pixmap; if (!QPixmapCache::find(key, pixmap)) { @@ -1467,7 +1476,7 @@ requestedSize = size; } - pixmap = icon.pixmap(requestedSize / qApp->devicePixelRatio(), requestedSize / qApp->devicePixelRatio()); + pixmap = icon.pixmap(requestedSize / qApp->devicePixelRatio(), requestedSize / qApp->devicePixelRatio(), mode); if (requestedSize != size) { KPixmapModifier::scale(pixmap, QSize(size, size)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/kstandarditemlistwidget.h new/dolphin-16.08.0/src/kitemviews/kstandarditemlistwidget.h --- old/dolphin-16.04.3/src/kitemviews/kstandarditemlistwidget.h 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/kstandarditemlistwidget.h 2016-08-10 01:01:57.000000000 +0200 @@ -183,6 +183,7 @@ virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; + bool event(QEvent *event) Q_DECL_OVERRIDE; private slots: void slotCutItemsChanged(); @@ -212,7 +213,7 @@ */ void closeRoleEditor(); - static QPixmap pixmapForIcon(const QString& name, const QStringList& overlays, int size); + static QPixmap pixmapForIcon(const QString& name, const QStringList& overlays, int size, QIcon::Mode mode); /** * @return Preferred size of the rating-image based on the given diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/private/kitemlistselectiontoggle.cpp new/dolphin-16.08.0/src/kitemviews/private/kitemlistselectiontoggle.cpp --- old/dolphin-16.04.3/src/kitemviews/private/kitemlistselectiontoggle.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/private/kitemlistselectiontoggle.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -89,7 +89,7 @@ void KItemListSelectionToggle::updatePixmap() { - const QString icon = m_checked ? QStringLiteral("list-remove") : QStringLiteral("list-add"); + const QString icon = m_checked ? QStringLiteral("emblem-remove") : QStringLiteral("emblem-added"); const KIconLoader::States state = m_hovered ? KIconLoader::ActiveState : KIconLoader::DisabledState; m_pixmap = KIconLoader::global()->loadIcon(icon, KIconLoader::Desktop, iconSize(), state); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/private/kitemlistsmoothscroller.cpp new/dolphin-16.08.0/src/kitemviews/private/kitemlistsmoothscroller.cpp --- old/dolphin-16.04.3/src/kitemviews/private/kitemlistsmoothscroller.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/private/kitemlistsmoothscroller.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -172,8 +172,7 @@ break; case QEvent::Wheel: - handleWheelEvent(static_cast<QWheelEvent*>(event)); - return true; // eat event so that QScrollBar does not scroll one step more by itself + return false; // we're the ones sending them default: break; @@ -196,25 +195,11 @@ const bool previous = m_smoothScrolling; m_smoothScrolling = true; - int numPixels; - if (!event->pixelDelta().isNull()) { - numPixels = event->pixelDelta().y(); - } else { - const int numDegrees = event->angleDelta().y() / 8; - const int numSteps = qApp->wheelScrollLines() * numDegrees / 15; - numPixels = numSteps * m_scrollBar->pageStep() / 12; - } - int value = m_scrollBar->value(); - if (event->modifiers().testFlag(Qt::ShiftModifier)) { - const int scrollingDirection = numPixels > 0 ? 1 : -1; - value -= m_scrollBar->pageStep() * scrollingDirection; - } else { - value -= numPixels; - } - m_scrollBar->setValue(value); - m_smoothScrolling = previous; + QWheelEvent copy = *event; + QApplication::sendEvent(m_scrollBar, ©); + event->setAccepted(copy.isAccepted()); - event->accept(); + m_smoothScrolling = previous; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/kitemviews/private/kitemlistsmoothscroller.h new/dolphin-16.08.0/src/kitemviews/private/kitemlistsmoothscroller.h --- old/dolphin-16.04.3/src/kitemviews/private/kitemlistsmoothscroller.h 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/kitemviews/private/kitemlistsmoothscroller.h 2016-08-10 01:01:57.000000000 +0200 @@ -77,6 +77,11 @@ // stable. bool requestScrollBarUpdate(int newMaximum); + /** + * Forwards wheel events to the scrollbar, ensuring smooth and proper scrolling + */ + void handleWheelEvent(QWheelEvent* event); + protected: virtual bool eventFilter(QObject* obj, QEvent* event); @@ -85,13 +90,6 @@ QAbstractAnimation::State oldState); private: - /** - * Results into a smooth-scrolling of the target dependent on the direction - * of the wheel event. - */ - void handleWheelEvent(QWheelEvent* event); - -private: bool m_scrollBarPressed; bool m_smoothScrolling; QScrollBar* m_scrollBar; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/main.cpp new/dolphin-16.08.0/src/main.cpp --- old/dolphin-16.04.3/src/main.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/main.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -100,7 +100,7 @@ aboutData.setupCommandLine(&parser); // command line options - parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"), i18nc("@info:shell", "The files and directories passed as arguments " + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("select"), i18nc("@info:shell", "The files and folders passed as arguments " "will be selected."))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view."))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/org.kde.dolphin.appdata.xml new/dolphin-16.08.0/src/org.kde.dolphin.appdata.xml --- old/dolphin-16.04.3/src/org.kde.dolphin.appdata.xml 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/org.kde.dolphin.appdata.xml 2016-08-10 01:01:57.000000000 +0200 @@ -62,6 +62,7 @@ <summary xml:lang="fi">Tiedostonhallinta</summary> <summary xml:lang="fr">Gestionnaire de fichier</summary> <summary xml:lang="gl">Xestor de ficheiros</summary> + <summary xml:lang="he">מנהל קבצים</summary> <summary xml:lang="hu">Fájlkezelő</summary> <summary xml:lang="ia">Gerente de File</summary> <summary xml:lang="it">Gestore file</summary> @@ -105,6 +106,7 @@ <p xml:lang="fi">Dolphin on kevyt tiedostonhallinta. Se on suunniteltu helppokäyttöiseksi ja yksinkertaiseksi, mutta silti joustavaksi ja mukautettavaksi. Voit siis hallita tiedostojasi juuri niin kuin haluat.</p> <p xml:lang="fr">Dolphin est un gestionnaire de fichier léger. Il a été conçu en gardant à l'esprit la simplicité et l'aisance à l'usage, tout en permettant flexibilité et personnalisation. Cela signifie que vous pouvez gérer vos fichiers de la manière exacte que vous voulez.</p> <p xml:lang="gl">Dolphin é un xestor de ficheiros lixeiro. Deseñouse pensando na facilidade de uso e maila simplicidade, pero permitindo flexibilidade e personalización. Noutras palabras, permítelle xestionar os seus ficheiros do xeito que máis lle agrade.</p> + <p xml:lang="he">Dolphin הוא מנהל קבצים קל־משקל. הוא עוצב לקלות שימוש ופשטות, תוך כדי אפשור גמישות והתאמה אישית. זה אומר שתוכל לנהל את קבציך איך שאתה רוצה לעשות זאת.</p> <p xml:lang="hu">A Dolphin egy pehelysúlyú fájlkezelő. Az egyszerű használatot és az egyszerűséget szem előtt tartva tervezték, miközben továbbra is lehetővé teszi a rugalmasságot és a testre szabhatóságot. Ez azt jelenti, hogy pontosan oly módon végezheti a fájlkezelést, ahogy csak akarja.</p> <p xml:lang="ia">Dolphin es un gerente de file legier. Il ha essite designate con facilitate de uso e simplicitate in le mente, mentre il permitte ancora flexibilitate e personalisation. Isto significa que tu pote facer le gerente de file exactemente como tu lo vole.</p> <p xml:lang="it">Dolphin è un gestore file leggero. È stato progettato per essere facile da utilizzare e pensando alla semplicità, garantendo al contempo flessibilità e personalizzazione. Ciò significa che puoi gestire i tuoi file come meglio desideri.</p> @@ -145,6 +147,7 @@ <p xml:lang="fi">Ominaisuudet:</p> <p xml:lang="fr">Fonctionnalités :</p> <p xml:lang="gl">Funcionalidades:</p> + <p xml:lang="he">תכונות:</p> <p xml:lang="hu">Szolgáltatások:</p> <p xml:lang="ia">Characteristicas:</p> <p xml:lang="it">Funzionalità:</p> @@ -342,6 +345,7 @@ <li xml:lang="fi">Useiden välilehtien tuki</li> <li xml:lang="fr">Prise en charge des onglets multiples</li> <li xml:lang="gl">Permite abrir varias lapelas.</li> + <li xml:lang="he">תמיכה בכרטיסיות</li> <li xml:lang="hu">Több lap támogatása</li> <li xml:lang="ia">Supporto de scheda multiple</li> <li xml:lang="it">Supporto di schede multiple</li> @@ -421,6 +425,7 @@ <li xml:lang="fi">Tuki muutosten kumoamiselle ja tekemiselle uudelleen</li> <li xml:lang="fr">Prise en charge d'annulation et recommencement</li> <li xml:lang="gl">Permite desfacer e refacer.</li> + <li xml:lang="he">תמיכה בביטול וביצוע חוזר</li> <li xml:lang="hu">Visszavonás/ismétlés támogatás</li> <li xml:lang="ia">Supporto de annulla/reface</li> <li xml:lang="it">Supporto di annulla/rifai</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/panels/folders/folderspanel.cpp new/dolphin-16.08.0/src/panels/folders/folderspanel.cpp --- old/dolphin-16.04.3/src/panels/folders/folderspanel.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/panels/folders/folderspanel.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -240,7 +240,7 @@ event->buttons(), event->modifiers()); - KIO::DropJob *job = DragAndDropHelper::dropUrls(destItem.url(), &dropEvent, this); + KIO::DropJob *job = DragAndDropHelper::dropUrls(destItem.mostLocalUrl(), &dropEvent, this); if (job) { connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/panels/information/informationpanelcontent.cpp new/dolphin-16.08.0/src/panels/information/informationpanelcontent.cpp --- old/dolphin-16.04.3/src/panels/information/informationpanelcontent.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/panels/information/informationpanelcontent.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -314,14 +314,12 @@ m_preview->setVisible(isChecked); InformationPanelSettings::setPreviewsShown(isChecked); } else if (action == configureAction) { - FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog(); + FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog(this); dialog->setDescription(i18nc("@label::textbox", "Select which data should be shown in the information panel:")); dialog->setItems(m_metaDataWidget->items()); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->show(); - dialog->raise(); - dialog->activateWindow(); connect(dialog, &FileMetaDataConfigurationDialog::destroyed, this, &InformationPanelContent::refreshMetaData); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/panels/places/placesitem.cpp new/dolphin-16.08.0/src/panels/places/placesitem.cpp --- old/dolphin-16.04.3/src/panels/places/placesitem.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/panels/places/placesitem.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -276,12 +276,12 @@ Solid::Block *block = m_device.as<Solid::Block>(); if (block) { const QString device = block->device(); - setUrl(QStringLiteral("audiocd:/?device=%1").arg(device)); + setUrl(QUrl(QStringLiteral("audiocd:/?device=%1").arg(device))); } else { - setUrl(QStringLiteral("audiocd:/")); + setUrl(QUrl(QStringLiteral("audiocd:/"))); } } else if (m_mtp) { - setUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi())); + setUrl(QUrl(QStringLiteral("mtp:udi=%1").arg(m_device.udi()))); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/panels/places/placesitemmodel.cpp new/dolphin-16.08.0/src/panels/places/placesitemmodel.cpp --- old/dolphin-16.04.3/src/panels/places/placesitemmodel.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/panels/places/placesitemmodel.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -1099,17 +1099,17 @@ const int year = date.year(); const int month = date.month(); const int day = date.day(); - timelineUrl = "timeline:/" + timelineDateString(year, month) + - '/' + timelineDateString(year, month, day); + timelineUrl = QUrl("timeline:/" + timelineDateString(year, month) + + '/' + timelineDateString(year, month, day)); } else if (path.endsWith(QLatin1String("thismonth"))) { const QDate date = QDate::currentDate(); - timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month()); + timelineUrl = QUrl("timeline:/" + timelineDateString(date.year(), date.month())); } else if (path.endsWith(QLatin1String("lastmonth"))) { const QDate date = QDate::currentDate().addMonths(-1); - timelineUrl = "timeline:/" + timelineDateString(date.year(), date.month()); + timelineUrl = QUrl("timeline:/" + timelineDateString(date.year(), date.month())); } else { Q_ASSERT(path.endsWith(QLatin1String("today"))); - timelineUrl= url; + timelineUrl = url; } return timelineUrl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/settings/dolphin_generalsettings.kcfg new/dolphin-16.08.0/src/settings/dolphin_generalsettings.kcfg --- old/dolphin-16.04.3/src/settings/dolphin_generalsettings.kcfg 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/settings/dolphin_generalsettings.kcfg 2016-08-10 01:01:57.000000000 +0200 @@ -43,7 +43,7 @@ <default>false</default> </entry> <entry name="GlobalViewProps" type="Bool"> - <label>Should the view properties be used for all directories</label> + <label>Should the view properties be used for all folders</label> <default>false</default> </entry> <entry name="BrowseThroughArchives" type="Bool"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/settings/kcm/kcmdolphingeneral.cpp new/dolphin-16.08.0/src/settings/kcm/kcmdolphingeneral.cpp --- old/dolphin-16.04.3/src/settings/kcm/kcmdolphingeneral.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/settings/kcm/kcmdolphingeneral.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -48,7 +48,7 @@ QTabWidget* tabWidget = new QTabWidget(this); // initialize 'Behavior' tab - BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QDir::homePath(), tabWidget); + BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget); tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior")); connect(behaviorPage, &BehaviorSettingsPage::changed, this, static_cast<void(DolphinGeneralConfigModule::*)()>(&DolphinGeneralConfigModule::changed)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/settings/kcm/kcmdolphingeneral.desktop new/dolphin-16.08.0/src/settings/kcm/kcmdolphingeneral.desktop --- old/dolphin-16.04.3/src/settings/kcm/kcmdolphingeneral.desktop 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/settings/kcm/kcmdolphingeneral.desktop 2016-08-10 01:01:57.000000000 +0200 @@ -64,6 +64,7 @@ Comment[nb]=Med denne tjenesten kan du sette opp generelle innstillinger for Dolphin. Comment[nl]=Met deze dienst kunt u algemene Dolphin-instellingen configureren. Comment[nn]=Denne tenesta lèt deg setja opp generelle innstillingar for Dolphin. +Comment[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ। Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin. @@ -157,6 +158,7 @@ Comment[nb]=Sett opp generelle innstillinger for filbehandleren Comment[nl]=Algemene bestandsbeheerderinstellingen configureren Comment[nn]=Set opp generelle innstillingar for filhandsamaren +Comment[pa]=ਆਮ ਫਾਇਲ ਮੈਨੇਜਰ ਸੈਟਿੰਗ ਸੰਰਚਨਾ Comment[pl]=Ustawienia ogólne zarządzania plikami Comment[pt]=Configurar as definições gerais do gestor de ficheiros Comment[pt_BR]=Configura as opções gerais do gerenciador de arquivos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/settings/kcm/kcmdolphinnavigation.desktop new/dolphin-16.08.0/src/settings/kcm/kcmdolphinnavigation.desktop --- old/dolphin-16.04.3/src/settings/kcm/kcmdolphinnavigation.desktop 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/settings/kcm/kcmdolphinnavigation.desktop 2016-08-10 01:01:57.000000000 +0200 @@ -64,6 +64,7 @@ Comment[nb]=Med denne tjenesten kan du sette opp navigasjon for Dolphin. Comment[nl]=Met deze dienst kunt u Dolphin-navigatie configureren. Comment[nn]=Denne tenesta lèt deg setja opp navigasjonen for Dolphin. +Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ। Comment[pl]=Ta usługa umożliwia ustawienie nawigacji w Dolphinie. Comment[pt]=Este serviço permite a configuração da navegação do Dolphin. Comment[pt_BR]=Este serviço permite configurar a navegação do Dolphin. @@ -157,6 +158,7 @@ Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nl]=Bestandsbeheerdernavigatie configureren Comment[nn]=Set opp navigasjonen i filhandsamaren +Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਨੇਵੀਗੇਸ਼ਨ ਸੰਰਚਨਾ Comment[pl]=Ustawienia nawigacji w zarządzaniu plikami Comment[pt]=Configurar a navegação do gestor de ficheiros Comment[pt_BR]=Configura a navegação do gerenciador de arquivos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/settings/kcm/kcmdolphinservices.desktop new/dolphin-16.08.0/src/settings/kcm/kcmdolphinservices.desktop --- old/dolphin-16.04.3/src/settings/kcm/kcmdolphinservices.desktop 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/settings/kcm/kcmdolphinservices.desktop 2016-08-10 01:01:57.000000000 +0200 @@ -115,6 +115,7 @@ Comment[nb]=Sett opp tjenester i filbehandleren Comment[nl]=Bestandsbeheerderservices configureren Comment[nn]=Set opp tenester i filhandsamaren +Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਦੀਆਂ ਸਰਵਿਸਾਂ ਦੀ ਸੰਰਚਨਾ Comment[pl]=Ustawienia usług zarządzania plikami Comment[pt]=Configurar os serviços do gestor de ficheiros Comment[pt_BR]=Configura os serviços do gerenciador de arquivos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/settings/kcm/kcmdolphinviewmodes.desktop new/dolphin-16.08.0/src/settings/kcm/kcmdolphinviewmodes.desktop --- old/dolphin-16.04.3/src/settings/kcm/kcmdolphinviewmodes.desktop 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/settings/kcm/kcmdolphinviewmodes.desktop 2016-08-10 01:01:57.000000000 +0200 @@ -22,6 +22,7 @@ Name[nb]=Dolphin visningsmåter Name[nl]=Dolphin-weergavemodussen Name[nn]=Dolphin-visingar +Name[pa]=ਡਾਲਫਿਨ ਝਲਕ ਢੰਗ Name[pl]=Tryby widoku Dolphina Name[pt]=Modos de Visualização do Dolphin Name[pt_BR]=Modos de exibição do Dolphin @@ -63,6 +64,7 @@ Comment[nb]=Med denne tjenesten kan du sette opp Dolphins visningsmåter. Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren. Comment[nn]=Denne tenesta lèt deg setja opp Dolphin-visingsmodusar. +Comment[pa]=ਇਹ ਸਰਵਿਸ ਡਾਲਫਿਨ ਝਲਕ ਮੋਡ ਦੀ ਸੰਰਚਨਾ ਵਾਸਤੇ ਹੈ। Comment[pl]=Ta usługa umożliwia ustawienie trybów widoku Dolphina. Comment[pt]=Este serviço permite a configuração dos modos de visualização do Dolphin. Comment[pt_BR]=Este serviço permite configurar os modos de exibição do Dolphin. @@ -156,6 +158,7 @@ Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nl]=Bestandsbeheerderweergavemodussen configureren Comment[nn]=Set opp visingsmodusane i filhandsamaren +Comment[pa]=ਫਾਇਲ ਮੈਨੇਜਰ ਝਲਕ ਮੋਡ ਸੰਰਚਨਾ Comment[pl]=Ustawienia trybów widoku zarządzania plikami Comment[pt]=Configurar os modos de visualização do gestor de ficheiros Comment[pt_BR]=Configura os modos de exibição do gerenciador de arquivos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/settings/services/servicessettingspage.cpp new/dolphin-16.08.0/src/settings/services/servicessettingspage.cpp --- old/dolphin-16.04.3/src/settings/services/servicessettingspage.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/settings/services/servicessettingspage.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -30,6 +30,7 @@ #include <KLocalizedString> #include <KMessageBox> #include <KNS3/Button> +#include <KPluginMetaData> #include <KService> #include <KServiceTypeTrader> #include <QStandardPaths> @@ -228,6 +229,19 @@ } } + // Load JSON-based plugins that implement the KFileItemActionPlugin interface + const auto jsonPlugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kfileitemaction"), [](const KPluginMetaData& metaData) { + return metaData.serviceTypes().contains(QStringLiteral("KFileItemAction/Plugin")); + }); + + foreach (const auto& jsonMetadata, jsonPlugins) { + const QString desktopEntryName = jsonMetadata.pluginId(); + if (!isInServicesList(desktopEntryName)) { + const bool checked = showGroup.readEntry(desktopEntryName, true); + addRow(jsonMetadata.iconName(), jsonMetadata.name(), desktopEntryName, checked); + } + } + m_sortModel->sort(Qt::DisplayRole); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/statusbar/mountpointobservercache.cpp new/dolphin-16.08.0/src/statusbar/mountpointobservercache.cpp --- old/dolphin-16.04.3/src/statusbar/mountpointobservercache.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/statusbar/mountpointobservercache.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -62,10 +62,10 @@ } else { // Even if determining the mount point failed, the observer might still // be able to retrieve information about the url. - cachedObserverUrl = url.toLocalFile(); + cachedObserverUrl = url; } } else { - cachedObserverUrl = url.url(); + cachedObserverUrl = url; } MountPointObserver* observer = m_observerForMountPoint.value(cachedObserverUrl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/tests/CMakeLists.txt new/dolphin-16.08.0/src/tests/CMakeLists.txt --- old/dolphin-16.04.3/src/tests/CMakeLists.txt 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/tests/CMakeLists.txt 2016-08-10 01:01:57.000000000 +0200 @@ -9,7 +9,6 @@ # KItemSetTest set(kitemsettest_SRCS kitemsettest.cpp - ../kitemviews/kitemset.cpp ) add_executable(kitemsettest ${kitemsettest_SRCS}) @@ -31,9 +30,6 @@ # KItemListSelectionManagerTest set(kitemlistselectionmanagertest_SRCS kitemlistselectionmanagertest.cpp - ../kitemviews/kitemlistselectionmanager.cpp - ../kitemviews/kitemmodelbase.cpp - ../kitemviews/kitemset.cpp ) add_executable(kitemlistselectionmanagertest ${kitemlistselectionmanagertest_SRCS}) @@ -45,17 +41,6 @@ set(kitemlistcontrollertest_SRCS kitemlistcontrollertest.cpp testdir.cpp - ../kitemviews/kfileitemmodel.cpp - ../kitemviews/kfileitemlistview.cpp - ../kitemviews/kfileitemlistwidget.cpp - ../kitemviews/kitemmodelbase.cpp - ../kitemviews/kitemlistview.cpp - ../kitemviews/kitemlistcontainer.cpp - ../kitemviews/kitemlistwidget.cpp - ../kitemviews/kitemlistviewaccessible.cpp - ../kitemviews/kitemset.cpp - ../kitemviews/kstandarditemlistview.cpp - ../kitemviews/kstandarditemlistwidget.cpp ../dolphindebug.cpp ) @@ -72,16 +57,6 @@ set(kfileitemlistviewtest_SRCS kfileitemlistviewtest.cpp testdir.cpp - ../kitemviews/kfileitemmodel.cpp - ../kitemviews/kfileitemlistview.cpp - ../kitemviews/kitemmodelbase.cpp - ../kitemviews/kitemlistview.cpp - ../kitemviews/kitemlistviewaccessible.cpp - ../kitemviews/kitemlistcontainer.cpp - ../kitemviews/kitemlistwidget.cpp - ../kitemviews/kitemset.cpp - ../kitemviews/kstandarditemlistview.cpp - ../kitemviews/kstandarditemlistwidget.cpp ../dolphindebug.cpp ) @@ -98,9 +73,6 @@ set(kfileitemmodeltest_SRCS kfileitemmodeltest.cpp testdir.cpp - ../kitemviews/kfileitemmodel.cpp - ../kitemviews/kitemmodelbase.cpp - ../kitemviews/kitemset.cpp ../dolphindebug.cpp ) @@ -117,8 +89,6 @@ set(kfileitemmodelbenchmark_SRCS kfileitemmodelbenchmark.cpp testdir.cpp - ../kitemviews/kfileitemmodel.cpp - ../kitemviews/kitemmodelbase.cpp ../dolphindebug.cpp ) @@ -133,7 +103,6 @@ # KItemListKeyboardSearchManagerTest set(kitemlistkeyboardsearchmanagertest_SRCS kitemlistkeyboardsearchmanagertest.cpp - ../kitemviews/private/kitemlistkeyboardsearchmanager.cpp ) add_executable(kitemlistkeyboardsearchmanagertest ${kitemlistkeyboardsearchmanagertest_SRCS}) @@ -161,9 +130,6 @@ # KStandardItemModelTest set(kstandarditemmodeltest_SRCS kstandarditemmodeltest.cpp - ../kitemviews/kstandarditem.cpp - ../kitemviews/kstandarditemmodel.cpp - ../kitemviews/kitemmodelbase.cpp ../dolphindebug.cpp ) @@ -176,7 +142,6 @@ set(viewpropertiestest_SRCS viewpropertiestest.cpp testdir.cpp - ../views/viewproperties.cpp ../dolphindebug.cpp ) kconfig_add_kcfg_files(viewpropertiestest_SRCS GENERATE_MOC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/views/dolphinview.cpp new/dolphin-16.08.0/src/views/dolphinview.cpp --- old/dolphin-16.04.3/src/views/dolphinview.cpp 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/views/dolphinview.cpp 2016-08-10 01:01:57.000000000 +0200 @@ -1031,7 +1031,7 @@ destUrl = url(); } else { // The item represents a directory or desktop-file - destUrl = destItem.url(); + destUrl = destItem.mostLocalUrl(); } QDropEvent dropEvent(event->pos().toPoint(), @@ -1278,7 +1278,7 @@ if (desktopFile.hasLinkType()) { const QString linkUrl = desktopFile.readUrl(); if (!linkUrl.startsWith(QLatin1String("http"))) { - return linkUrl; + return QUrl::fromUserInput(linkUrl); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/views/versioncontrol/fileviewversioncontrolplugin.desktop new/dolphin-16.08.0/src/views/versioncontrol/fileviewversioncontrolplugin.desktop --- old/dolphin-16.04.3/src/views/versioncontrol/fileviewversioncontrolplugin.desktop 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/views/versioncontrol/fileviewversioncontrolplugin.desktop 2016-08-10 01:01:57.000000000 +0200 @@ -24,6 +24,7 @@ Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar +Comment[pa]=ਫਾਇਲ ਝਲਕ ਲਈ ਵਰਜਨ ਕੰਟਰੋਲ ਪਲੱਗਇਨ Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików Comment[pt]='Plugin' de Controlo de Versões para as Áreas de Ficheiros Comment[pt_BR]=Extensão de controle de versões para as visualizações de arquivos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-16.04.3/src/views/versioncontrol/kversioncontrolplugin.h new/dolphin-16.08.0/src/views/versioncontrol/kversioncontrolplugin.h --- old/dolphin-16.04.3/src/views/versioncontrol/kversioncontrolplugin.h 2016-07-02 17:56:37.000000000 +0200 +++ new/dolphin-16.08.0/src/views/versioncontrol/kversioncontrolplugin.h 2016-08-10 01:01:57.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KVERSIONCONTROLPLUGIN_H #define KVERSIONCONTROLPLUGIN_H -#include <dolphin_export.h> +#include <dolphinvcs_export.h> #include <QObject> #include <QAction> @@ -81,7 +81,7 @@ * * @since 4.8 */ -class DOLPHIN_EXPORT KVersionControlPlugin : public QObject +class DOLPHINVCS_EXPORT KVersionControlPlugin : public QObject { Q_OBJECT @@ -165,16 +165,16 @@ /** * Is invoked after the version control information has been * received. It is assured that - * KVersionControlPluginV2::beginInfoRetrieval() has been + * KVersionControlPlugin::beginRetrieval() has been * invoked before. */ virtual void endRetrieval() = 0; /** * @return The version for the item \p item. - * It is assured that KVersionControlPlugin::beginInfoRetrieval() has been + * It is assured that KVersionControlPlugin::beginRetrieval() has been * invoked before and that the file is part of the directory specified - * in beginInfoRetrieval(). + * in beginRetrieval(). */ virtual ItemVersion itemVersion(const KFileItem& item) const = 0;
