17 files changed, 64 insertions, 28 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a5e5a688..413260bd5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,6 @@ generate_export_header(dolphinvcs BASE_NAME dolphin)
 target_link_libraries(
     dolphinvcs PUBLIC
     Qt5::Widgets
-    KF5::KIOCore
 )
 
 set_target_properties(dolphinvcs PROPERTIES
@@ -143,10 +142,11 @@ target_link_libraries(
     KF5::KIOWidgets
     KF5::KIOFileWidgets
     KF5::Completion
-    KF5::TextEditor
+    KF5::TextWidgets
     KF5::WindowSystem
     KF5::ConfigCore
     KF5::NewStuff
+    KF5::Parts
 )
 
 if(HAVE_BALOO)
@@ -380,7 +380,7 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )
 install( FILES dolphinui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphin )
-install( FILES dolphin.appdata.xml DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata )
+install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
 install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
 ${KDE_INSTALL_KSERVICES5DIR} )
 install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f7a761307..5a731512b 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1335,7 +1335,7 @@ void DolphinMainWindow::createControlButton()
     Q_ASSERT(!m_controlButton);
 
     m_controlButton = new QToolButton(this);
-    m_controlButton->setIcon(QIcon::fromTheme("applications-system"));
+    m_controlButton->setIcon(QIcon::fromTheme("application-menu"));
     m_controlButton->setText(i18nc("@action", "Control"));
     m_controlButton->setPopupMode(QToolButton::InstantPopup);
     m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 64c01f13b..335c87a80 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -9,6 +9,7 @@ Name[es]=Vista de Dolphin
 Name[fi]=Dolphin-näkymä
 Name[fr]=Vue de Dolphin
 Name[gl]=Vista de Dolphin
+Name[hu]=Dolphin nézet
 Name[ia]=Vista de Dolphin
 Name[id]=Tampilan Dolphin
 Name[it]=Vista di Dolphin
@@ -58,6 +59,7 @@ Name[es]=Iconos
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
 Name[gl]=Iconas
+Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
 Name[it]=Icone
@@ -98,6 +100,7 @@ Name[es]=Compacto
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
+Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Sederhana
 Name[it]=Compatta
@@ -135,6 +138,7 @@ Name[es]=Detalles
 Name[fi]=Yksityiskohdat
 Name[fr]=Détails
 Name[gl]=Detalles
+Name[hu]=Részletek
 Name[ia]=Detalios
 Name[id]=Detail
 Name[it]=Dettagli
diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index e70f47890..2bd467aa5 100644
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -172,7 +172,7 @@ bool KItemListSmoothScroller::eventFilter(QObject* obj, QEvent* event)
 
     case QEvent::Wheel:
         handleWheelEvent(static_cast<QWheelEvent*>(event));
-        break;
+        return true; // eat event so that QScrollBar does not scroll one step more by itself
 
     default:
         break;
@@ -192,15 +192,25 @@ void KItemListSmoothScroller::slotAnimationStateChanged(QAbstractAnimation::Stat
 
 void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event)
 {
-    const int numDegrees = event->delta() / 8;
-    const int numSteps = numDegrees / 15;
-
     const bool previous = m_smoothScrolling;
 
     m_smoothScrolling = true;
-    const int value = m_scrollBar->value();
-    const int pageStep = m_scrollBar->pageStep();
-    m_scrollBar->setValue(value - numSteps * pageStep);
+    int numPixels;
+    if (!event->pixelDelta().isNull()) {
+        numPixels = event->pixelDelta().y();
+    } else {
+        const int numDegrees = event->angleDelta().y() / 8;
+        const int numSteps = numDegrees / 15;
+        numPixels = numSteps * m_scrollBar->pageStep() / 4;
+    }
+    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;
 
diff --git a/src/dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 64a1edf76..64a1edf76 100644
--- a/src/dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 0d25c1750..9c9408341 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -8,6 +8,7 @@ Name[es]=Dolphin
 Name[fi]=Dolphin
 Name[fr]=Dolphin
 Name[gl]=Dolphin
+Name[hu]=Dolphin
 Name[ia]=Dolphin
 Name[id]=Dolphin
 Name[it]=Dolphin
@@ -48,6 +49,7 @@ GenericName[es]=Gestor de archivos
 GenericName[fi]=Tiedostonhallinta
 GenericName[fr]=Gestionnaire de fichiers
 GenericName[gl]=Xestor de ficheiros
+GenericName[hu]=Fájlkezelő
 GenericName[ia]=Gerente de file
 GenericName[id]=Manajer Berkas
 GenericName[it]=Gestore dei file
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index fad8c7fa5..2a9c88e4e 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -144,7 +144,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     if (icon().isEmpty()) {
         switch (type) {
         case RecentlySavedType: setIcon("chronometer"); break;
-        case SearchForType:     setIcon("nepomuk"); break;
+        case SearchForType:     setIcon("system-search"); break;
         case PlacesType:
         default:                setIcon("folder");
         }
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index b660399dc..e9a309289 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -7,6 +7,7 @@ Name[es]=Preferencias generales de Dolphin
 Name[fi]=Dolphin – yleiset
 Name[fr]=Dolphin général
 Name[gl]=Xerais de Dolphin
+Name[hu]=Dolphin: Általános
 Name[ia]=Dolphin General
 Name[id]=Dolphin Umum
 Name[it]=Impostazioni generali di Dolphin
@@ -42,6 +43,7 @@ Comment[es]=Este servicio permite configurar las preferencias generales de Dolph
 Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia.
 Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin.
 Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin.
+Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin általános beállításainak módosítását.
 Comment[ia]=Iste servicio permitte configuration del preferentias general de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin.
 Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin.
@@ -87,6 +89,7 @@ Name[es]=General
 Name[fi]=Yleiset
 Name[fr]=Général
 Name[gl]=Xerais
+Name[hu]=Általános
 Name[ia]=General
 Name[id]=Umum
 Name[it]=Generale
@@ -121,6 +124,7 @@ Comment[es]=Configurar las preferencias generales del gestor de archivos
 Comment[fi]=Tiedostonhallinnan yleisasetukset
 Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers
 Comment[gl]=Configurar opcións xerais de xestores de ficheiros.
+Comment[hu]=A fájlkezelő általános beállításainak módosítása
 Comment[ia]=Configura preferentias del gerente general de file
 Comment[id]=Konfigurasi pengaturan manajer berkas umum
 Comment[it]=Configura le impostazioni generali del gestore dei file
@@ -154,6 +158,7 @@ X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index fab72ef57..f2547264c 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -7,6 +7,7 @@ Name[es]=Navegación de Dolphin
 Name[fi]=Dolphin – selaus
 Name[fr]=Navigation avec Dolphin
 Name[gl]=Navegación de Dolphin
+Name[hu]=Dolphin: Navigáció
 Name[ia]=Navigation de Dolphin
 Name[id]=Navigasi Dolphin
 Name[it]=Navigazione di Dolphin
@@ -42,6 +43,7 @@ Comment[es]=Este servicio permite configurar la navegación de Dolphin.
 Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia.
 Comment[fr]=Ce service permet de configurer la navigation avec Dolphin.
 Comment[gl]=Este servizo permite configurar a navegación de Dolphin.
+Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin navigálásának beállítását.
 Comment[ia]=Iste servicio permitte le configuration del navigation de Dolphin.
 Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin.
 Comment[it]=Questo servizio permette di configurare la navigazione con Dolphin.
@@ -86,6 +88,7 @@ Name[es]=Navegación
 Name[fi]=Selaus
 Name[fr]=Navigation
 Name[gl]=Navegación
+Name[hu]=Navigálás
 Name[ia]=Navigation
 Name[id]=Navigasi
 Name[it]=Navigazione
@@ -121,6 +124,7 @@ Comment[es]=Configurar la navegación del gestor de archivos
 Comment[fi]=Tiedostonhallinnan selausasetukset
 Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers
 Comment[gl]=Configurar a navegación do xestor de ficheiros.
+Comment[hu]=A fájlkezelő navigálásának beállítása
 Comment[ia]=Configura navigation del gerente de file
 Comment[id]=Konfigurasi navigasi manajer berkas
 Comment[it]=Configura la navigazione col gestore dei file
@@ -156,6 +160,7 @@ X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index e70eeba2e..840a273e2 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -7,6 +7,7 @@ Name[es]=Servicios de Dolphin
 Name[fi]=Dolphin – palvelut
 Name[fr]=Services de Dolphin
 Name[gl]=Servizos de Dolphin
+Name[hu]=Dolphin szolgáltatások
 Name[ia]=Servicios de Dolphin
 Name[id]=Layanan Dolphin
 Name[it]=Servizi di Dolphin
@@ -51,6 +52,7 @@ Name[es]=Servicios
 Name[fi]=Palvelut
 Name[fr]=Services
 Name[gl]=Servizos
+Name[hu]=Szolgáltatások
 Name[ia]=Servicios
 Name[id]=Layanan
 Name[it]=Servizi
@@ -84,6 +86,7 @@ Comment[es]=Configurar los servicios del gestor de archivos
 Comment[fi]=Tiedostonhallinnan palveluasetukset
 Comment[fr]=Configuration des services du gestionnaire de fichiers
 Comment[gl]=Configurar servizos de xestores de ficheiros.
+Comment[hu]=A fájlkezelő szolgáltatásainak beállítása
 Comment[ia]=Configura servicios del gerente de file
 Comment[id]=Konfigurasi layanan manajer berkas
 Comment[it]=Configura i servizi del gestore dei file
@@ -118,6 +121,7 @@ X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 3bba12e1e..efb34c30f 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -7,6 +7,7 @@ Name[es]=Modos de vistas de Dolphin
 Name[fi]=Dolphin – näkymät
 Name[fr]=Modes d'affichage de Dolphin
 Name[gl]=Modos de vista de Dolphin
+Name[hu]=Dolphin: Nézetmódok
 Name[ia]=Modos de vista de Dolphin
 Name[id]=Mode Tampilan Dolphin
 Name[it]=Viste di Dolphin
@@ -42,6 +43,7 @@ Comment[es]=Este servicio permite configurar los modos de las vistas de Dolphin.
 Comment[fi]=Tällä palvelulla voi muokata Dolphinin katselutilojen asetuksia.
 Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin.
 Comment[gl]=Este servizo permite configurar os modos de vista de Dolphin.
+Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin nézetmódjainak beállítását.
 Comment[ia]=Iste servicio permitte configuration de le modos de vista de Dolphin
 Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin.
 Comment[it]=Questo servizio permette di configurare le viste di Dolphin.
@@ -86,6 +88,7 @@ Name[es]=Modos de vistas
 Name[fi]=Näkymät
 Name[fr]=Modes d'affichage
 Name[gl]=Modos de vista
+Name[hu]=Nézetmódok
 Name[ia]=Modos de vista
 Name[id]=Mode Tampilan
 Name[it]=Viste
@@ -121,6 +124,7 @@ Comment[es]=Configura los modos de vistas del gestor de archivos
 Comment[fi]=Tiedostonhallinnan katselutilojen asetukset
 Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers
 Comment[gl]=Configurar os modos de vista do xestor de ficheiros.
+Comment[hu]=A fájlkezelő nézetmódjainak beállítása
 Comment[ia]=Configura le modos de vista del gerente de file
 Comment[id]=Konfigurasi mode tampilan manajer berkas
 Comment[it]=Configura le viste del gestore dei file
@@ -156,6 +160,7 @@ X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[fi]=tiedostonhallinta
 X-KDE-Keywords[fr]=gestionnaire de fichiers
 X-KDE-Keywords[gl]=xestor de ficheiros
+X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[id]=manajer berkas
 X-KDE-Keywords[it]=gestore dei file
diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index e34731fa4..e170e7b5b 100644
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -71,10 +71,10 @@ private:
     bool m_activateItemOnSingleClick;
 };
 
-Q_DECLARE_METATYPE(KFileItemListView::ItemLayout);
-Q_DECLARE_METATYPE(Qt::Orientation);
-Q_DECLARE_METATYPE(KItemListController::SelectionBehavior);
-Q_DECLARE_METATYPE(KItemSet);
+Q_DECLARE_METATYPE(KFileItemListView::ItemLayout)
+Q_DECLARE_METATYPE(Qt::Orientation)
+Q_DECLARE_METATYPE(KItemListController::SelectionBehavior)
+Q_DECLARE_METATYPE(KItemSet)
 
 class KItemListControllerTest : public QObject
 {
@@ -209,7 +209,7 @@ struct ViewState {
 
 // We have to define a typedef for the pair in order to make the test compile.
 typedef QPair<KeyPress, ViewState> keyPressViewStatePair;
-Q_DECLARE_METATYPE(QList<keyPressViewStatePair>);
+Q_DECLARE_METATYPE(QList<keyPressViewStatePair>)
 
 /**
  * This function provides the data for the actual test function
diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index 7cf60df42..b183de302 100644
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -322,12 +322,12 @@ namespace {
     };
 }
 
-Q_DECLARE_METATYPE(KItemSet);
-Q_DECLARE_METATYPE(ChangeType);
-Q_DECLARE_METATYPE(KItemRange);
-Q_DECLARE_METATYPE(KItemRangeList);
-Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode);
-Q_DECLARE_METATYPE(QList<int>);
+Q_DECLARE_METATYPE(KItemSet)
+Q_DECLARE_METATYPE(ChangeType)
+Q_DECLARE_METATYPE(KItemRange)
+Q_DECLARE_METATYPE(KItemRangeList)
+Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode)
+Q_DECLARE_METATYPE(QList<int>)
 
 /**
  * The following function provides a generic way to test the selection functionality.
diff --git a/src/tests/kitemrangetest.cpp b/src/tests/kitemrangetest.cpp
index ce7b48012..5e4ea653f 100644
--- a/src/tests/kitemrangetest.cpp
+++ b/src/tests/kitemrangetest.cpp
@@ -22,8 +22,8 @@
 #include <QTest>
 #include <QVector>
 
-Q_DECLARE_METATYPE(QVector<int>);
-Q_DECLARE_METATYPE(KItemRangeList);
+Q_DECLARE_METATYPE(QVector<int>)
+Q_DECLARE_METATYPE(KItemRangeList)
 
 class KItemRangeTest : public QObject
 {
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 07b40dceb..5023859df 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -77,7 +77,7 @@
 
 namespace {
     const int MaxModeEnum = DolphinView::CompactView;
-};
+}
 
 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index 509fc2cc8..1c673a5d5 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -10,6 +10,7 @@ Comment[es]=Complemento de control de versiones para las vistas de archivos
 Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille
 Comment[fr]=Module externe pour le contrôle de version applicable aux vues de fichiers
 Comment[gl]=Complemento de control de versión para vistas de ficheiros.
+Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez
 Comment[ia]=Plugin de controlo de version pro vistas de file
 Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas
 Comment[it]=Estensione di controllo delle versioni per le viste dei file
diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index e5a267848..85835e062 100644
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -23,9 +23,9 @@
 #include <dolphin_export.h>
 
 #include <QObject>
-#include <KFileItem>
 #include <QAction>
-
+class KFileItemList;
+class KFileItem;
 /**
  * @brief Base class for version control plugins.
  *