diff options
22 files changed, 167 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 22da59632..df70c7c13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set (KDE_APPLICATIONS_VERSION_MICRO "3") 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.7.0") +set(KF5_MIN_VERSION "5.16.0") set(ECM_MIN_VERSION "1.6.0") # ECM setup @@ -29,13 +29,13 @@ ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h" ) -ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINVCS +ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake" SOVERSION 5 ) -ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE +ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE SOVERSION 5 ) @@ -62,7 +62,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Solid IconThemes Completion - TextEditor + TextWidgets WindowSystem Notifications ) diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake index 0fd2f4c1f..71ad9067d 100644 --- a/cmake/DbusInterfaceMacros.cmake +++ b/cmake/DbusInterfaceMacros.cmake @@ -4,7 +4,7 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu ${output_xml_file} ) add_custom_target( - ${output_xml_file} + ${output_xml_file}_target SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} ) install( @@ -13,6 +13,6 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu ) add_dependencies( ${main_project_target} - ${output_xml_file} + ${output_xml_file}_target ) endmacro () diff --git a/doc/index.docbook b/doc/index.docbook index fe3357c2f..3749831ab 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -2,7 +2,6 @@ <!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 package "kde-baseapps"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> @@ -73,8 +72,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2013-06-28</date> -<releaseinfo>4.11 (&kde; 4.11)</releaseinfo> +<date>2015-08-02</date> +<releaseinfo>Applications 15.08</releaseinfo> <abstract> <para> @@ -2070,8 +2069,9 @@ tracking system. The &kde; bug tracker can be found at &dolphin; </para> <para> -Program copyright 2006–2013 Peter Penz <email>[email protected]</email> and -Frank Reininghaus <email>[email protected]</email></para> +Program copyright 2006–2014 Peter Penz <email>[email protected]</email>, +Frank Reininghaus <email>[email protected]</email> and Emmanuel Pescosta +<email>[email protected]</email> </para> <para> Contributors: <itemizedlist> @@ -2104,8 +2104,8 @@ Documentation copyright 2009 Frank Reininghaus <email>[email protected]</ <appendix id="installation"> <title>How to get &dolphin;</title> -<para>&dolphin; is part of the &package; package which is an essential part of -&kde;.</para> + +&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 @@ -2113,7 +2113,6 @@ url="http://www.kde.org">http://www.kde.org</ulink> or read the chapter in the &kde; Fundamentals.</para> <para>For further information about &dolphin; you might want to visit -<ulink url="http://dolphin.kde.org">http://dolphin.kde.org</ulink> or <ulink url="http://userbase.kde.org/Dolphin">http://userbase.kde.org/Dolphin</ulink>.</para> </appendix> 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 1cde29ce2..9b05168fd 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1336,7 +1336,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 397042074..8941e8465 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -5,11 +5,13 @@ Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin Name[de]=Dolphin-Ansicht +Name[el]=Dolphin View Name[en_GB]=Dolphin View 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 @@ -19,6 +21,7 @@ Name[lt]=Dolphin žiūryklė Name[nb]=Dolphin visning Name[nl]=Dolphin-weergave Name[nn]=Dolphin-vising +Name[pa]=ਡਾਲਫਿਨ ਝਲਕ Name[pl]=Widok Dolphina Name[pt]=Área do Dolphin Name[pt_BR]=Visualização do Dolphin @@ -55,11 +58,13 @@ Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony Name[de]=Symbole +Name[el]=Εικονίδια Name[en_GB]=Icons 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 @@ -69,6 +74,7 @@ Name[lt]=Piktogramos Name[nb]=Ikoner Name[nl]=Pictogrammen Name[nn]=Ikon +Name[pa]=ਆਈਕਾਨ Name[pl]=Ikony Name[pt]=Ícones Name[pt_BR]=Ícones @@ -96,11 +102,13 @@ Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní Name[de]=Kompakt +Name[el]=Σύμπτυξη Name[en_GB]=Compact Name[es]=Compacto Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta +Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Sederhana Name[it]=Compatta @@ -108,6 +116,7 @@ Name[ko]=축소됨 Name[lt]=Kompaktiškas Name[nb]=Kompakt Name[nl]=Compact +Name[pa]=ਸੰਖਿਪਤ Name[pl]=Kompaktowy Name[pt]=Compacta Name[pt_BR]=Compacto @@ -134,11 +143,13 @@ Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti Name[de]=Details +Name[el]=Λεπτομέρειες Name[en_GB]=Details 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 @@ -148,6 +159,7 @@ Name[lt]=Informacija Name[nb]=Detaljer Name[nl]=Details Name[nn]=Detaljar +Name[pa]=ਵੇਰਵੇ Name[pl]=Szczegóły Name[pt]=Detalhes Name[pt_BR]=Detalhes diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index b03fd9c1a..d3d3745fc 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -29,6 +29,8 @@ #include <KJobWidgets> #include <KIO/JobUiDelegate> #include <KIO/PreviewJob> +#include <KPluginLoader> +#include <KOverlayIconPlugin> #include "private/kpixmapmodifier.h" #include "private/kdirectorycontentscounter.h" @@ -47,6 +49,7 @@ #include <Baloo/FileMonitor> #endif + // #define KFILEITEMMODELROLESUPDATER_DEBUG namespace { @@ -129,6 +132,18 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO m_directoryContentsCounter = new KDirectoryContentsCounter(m_model, this); connect(m_directoryContentsCounter, &KDirectoryContentsCounter::result, this, &KFileItemModelRolesUpdater::slotDirectoryContentsCountReceived); + + auto plugins = KPluginLoader::instantiatePlugins(QStringLiteral("kf5/overlayicon"), nullptr, this); + foreach (QObject *it, plugins) { + auto plugin = qobject_cast<KOverlayIconPlugin*>(it); + if (plugin) { + m_overlayIconsPlugin.append(plugin); + connect(plugin, &KOverlayIconPlugin::overlaysChanged, this, &KFileItemModelRolesUpdater::slotOverlaysChanged); + } else { + // not our/valid plugin, so delete the created object + it->deleteLater(); + } + } } KFileItemModelRolesUpdater::~KFileItemModelRolesUpdater() @@ -278,7 +293,7 @@ void KFileItemModelRolesUpdater::setRoles(const QSet<QByteArray>& roles) } } - if (hasBalooRole && !m_balooFileMonitor) { + if (hasBalooRole && m_balooConfig.fileIndexingEnabled() && !m_balooFileMonitor) { m_balooFileMonitor = new Baloo::FileMonitor(this); connect(m_balooFileMonitor, &Baloo::FileMonitor::fileMetaDataChanged, this, &KFileItemModelRolesUpdater::applyChangedBalooRoles); @@ -1065,7 +1080,11 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte data.insert("type", item.mimeComment()); } - data.insert("iconOverlays", item.overlays()); + QStringList overlays = item.overlays(); + foreach(KOverlayIconPlugin *it, m_overlayIconsPlugin) { + overlays.append(it->getOverlays(item.url())); + } + data.insert("iconOverlays", overlays); #ifdef HAVE_BALOO if (m_balooFileMonitor) { @@ -1076,6 +1095,22 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte return data; } +void KFileItemModelRolesUpdater::slotOverlaysChanged(const QUrl& url, const QStringList &) +{ + const KFileItem item = m_model->fileItem(url); + if (item.isNull()) { + return; + } + const int index = m_model->index(item); + QHash<QByteArray, QVariant> data = m_model->data(index); + QStringList overlays = item.overlays(); + foreach (KOverlayIconPlugin *it, m_overlayIconsPlugin) { + overlays.append(it->getOverlays(url)); + } + data.insert("iconOverlays", overlays); + m_model->setData(index, data); +} + void KFileItemModelRolesUpdater::updateAllPreviews() { if (m_state == Paused) { diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index 216b0a501..f3d40a6c5 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -36,6 +36,7 @@ class KDirectoryContentsCounter; class KFileItemModel; class QPixmap; class QTimer; +class KOverlayIconPlugin; namespace KIO { class PreviewJob; @@ -46,6 +47,7 @@ namespace KIO { { class FileMonitor; } + #include <Baloo/IndexerConfig> #endif /** @@ -183,6 +185,11 @@ private slots: void slotPreviewJobFinished(); /** + * Is invoked when one of the KOverlayIconPlugin emit the signal that an overlay has changed + */ + void slotOverlaysChanged(const QUrl& url, const QStringList&); + + /** * Resolves the sort role of the next item in m_pendingSortRole, applies it * to the model, and invokes itself if there are any pending items left. If * that is not the case, \a startUpdating() is called. @@ -333,8 +340,11 @@ private: KDirectoryContentsCounter* m_directoryContentsCounter; + QList<KOverlayIconPlugin*> m_overlayIconsPlugin; + #ifdef HAVE_BALOO Baloo::FileMonitor* m_balooFileMonitor; + Baloo::IndexerConfig m_balooConfig; #endif }; 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 dcc7134f8..dcc7134f8 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 497963623..63b4d1f59 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -4,11 +4,13 @@ Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin Name[de]=Dolphin +Name[el]=Dolphin Name[en_GB]=Dolphin Name[es]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin +Name[hu]=Dolphin Name[ia]=Dolphin Name[id]=Dolphin Name[it]=Dolphin @@ -18,6 +20,7 @@ Name[lt]=Dolphin Name[nb]=Dolphin Name[nl]=Dolphin Name[nn]=Dolphin +Name[pa]=ਡਾਲਫਿਨ Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin @@ -45,11 +48,13 @@ GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů GenericName[de]=Dateiverwaltung +GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager 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 @@ -59,6 +64,7 @@ GenericName[lt]=Failų tvarkyklė GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder GenericName[nn]=Filhandsamar +GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos 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 e7d6941dc..5ff155c99 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -3,11 +3,13 @@ Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin Name[de]=Dolphin allgemein +Name[el]=Dolphin Γενικά Name[en_GB]=Dolphin General 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 @@ -17,6 +19,7 @@ Name[lt]=Dolphin bendrieji Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen Name[nn]=Generelt for Dolphin +Name[pa]=ਡਾਲਫਿਨ ਆਮ Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin @@ -39,11 +42,13 @@ Comment[ca]=Aquest servei permet la configuració de l'arranjament general del D Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general del Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. Comment[de]=Mit diesem Dienst können allgemeine Einstellungen von Dolphin eingerichtet werden. +Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση των γενικών ρυθμίσεων του Dolphin Comment[en_GB]=This service allows configuration of general Dolphin settings. Comment[es]=Este servicio permite configurar las preferencias generales de Dolphin. 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. @@ -85,11 +90,13 @@ Name[ca]=General Name[ca@valencia]=General Name[cs]=Obecné Name[de]=Allgemein +Name[el]=Γενικά Name[en_GB]=General 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 @@ -99,6 +106,7 @@ Name[lt]=Bendra Name[nb]=Generelt Name[nl]=Algemeen Name[nn]=Generelt +Name[pa]=ਆਮ Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral @@ -120,11 +128,13 @@ Comment[ca]=Configura les opcions generals del gestor de fitxers Comment[ca@valencia]=Configura les opcions generals del gestor de fitxers Comment[cs]=Obecné nastavení správce souborů Comment[de]=Allgemeine Einstellungen an der Dateiverwaltung vornehmen +Comment[el]=Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων Comment[en_GB]=Configure general file manager settings 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,11 +164,13 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[de]=Dateiverwaltung +X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager 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 @@ -167,6 +179,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 39f66cee0..b969dcb2a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -3,11 +3,13 @@ Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu Name[de]=Dolphin-Navigation +Name[el]=Dolphin Πλοήγηση Name[en_GB]=Dolphin Navigation 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 @@ -17,6 +19,7 @@ Name[lt]=Dolphin navigacija Name[nb]=Navigasjon i Dolphin Name[nl]=Dolphin-navigatie Name[nn]=Navigasjon i Dolphin +Name[pa]=ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Dolphina Name[pt]=Navegação do Dolphin Name[pt_BR]=Navegação do Dolphin @@ -39,11 +42,13 @@ Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. Comment[de]=Mit diesem Dienst kann die Navigation für Dolphin eingerichtet werden. +Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση της πλοήγησης του Dolphin Comment[en_GB]=This service allows configuration of the Dolphin navigation. 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. @@ -84,11 +89,13 @@ Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace Name[de]=Navigation +Name[el]=Πλοήγηση Name[en_GB]=Navigation 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 @@ -98,6 +105,7 @@ Name[lt]=Navigacija Name[nb]=Navigasjon Name[nl]=Navigatie Name[nn]=Navigasjon +Name[pa]=ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Name[pt]=Navegação Name[pt_BR]=Navegação @@ -120,11 +128,13 @@ Comment[ca]=Configura la navegació del gestor de fitxers Comment[ca@valencia]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů Comment[de]=Einstellungen zur Navigation mit der Dateiverwaltung +Comment[el]=Διαμόρφωση πλοήγησης του διαχειριστή αρχείων Comment[en_GB]=Configure file manager navigation 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,11 +166,13 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[de]=Dateiverwaltung +X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager 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 @@ -169,6 +181,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index f2102f17a..c8d3cca11 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -3,11 +3,13 @@ Name[ca]=Serveis del Dolphin Name[ca@valencia]=Serveis del Dolphin Name[cs]=Služby Dolphinu Name[de]=Dolphin-Dienste +Name[el]=Dolphin Υπηρεσίες Name[en_GB]=Dolphin Services 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 @@ -16,6 +18,7 @@ Name[ko]=Dolphin 서비스 Name[lt]=Dolphin tarnybos Name[nb]=Dolphin-tjenester Name[nl]=Dolphin-services +Name[pa]=ਡਾਲਫਿਨ ਸੇਵਾਵਾਂ Name[pl]=Usługi Dolphina Name[pt]=Serviços do Dolphin Name[pt_BR]=Serviços do Dolphin @@ -48,11 +51,13 @@ Name[ca]=Serveis Name[ca@valencia]=Serveis Name[cs]=Služby Name[de]=KDE-Dienste +Name[el]=Υπηρεσίες Name[en_GB]=Services 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 @@ -61,6 +66,7 @@ Name[ko]=서비스 Name[lt]=Paslaugos Name[nb]=Tjenester Name[nl]=Services +Name[pa]=ਸੇਵਾਵਾਂ Name[pl]=Usługi Name[pt]=Serviços Name[pt_BR]=Serviços @@ -82,11 +88,13 @@ Comment[ca]=Configura els serveis del gestor de fitxers Comment[ca@valencia]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů Comment[de]=Dateiverwaltungs-Dienste einrichten +Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστή αρχείων Comment[en_GB]=Configure file manager services 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 @@ -117,11 +125,13 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[de]=Dateiverwaltung +X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager 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 @@ -130,6 +140,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 1f99f304c..9e273adc8 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -3,11 +3,13 @@ Name[ca]=Modes de vista del Dolphin Name[ca@valencia]=Modes de vista del Dolphin Name[cs]=Režimy pohledů Dolphinu Name[de]=Dolphin-Ansichtsmodi +Name[el]=Dolphin Λειτουργίες Προβολής Name[en_GB]=Dolphin View Modes 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 @@ -39,11 +41,13 @@ Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphi Comment[ca@valencia]=Este servei permet la configuració dels modes de vista del Dolphin. Comment[cs]=Tato služba umožňuje nastavení režimů pohledu Dolphinu. Comment[de]=Mit diesem Dienst können Dolphin-Ansichtsmodi eingerichtet werden. +Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση των λειτουργιών προβολής του Dolphin Comment[en_GB]=This service allows configuration of the Dolphin view modes. 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. @@ -84,11 +88,13 @@ Name[ca]=Modes de vista Name[ca@valencia]=Modes de vista Name[cs]=Režimy pohledu Name[de]=Ansichts-Modi +Name[el]=Λειτουργίες Προβολής Name[en_GB]=View Modes 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 @@ -98,6 +104,7 @@ Name[lt]=Rodymo būdai Name[nb]=Visningsmåter Name[nl]=Weergavemodi Name[nn]=Visingsmodusar +Name[pa]=ਵੇਖਣ ਢੰਗ Name[pl]=Tryby widoku Name[pt]=Modos de Visualização Name[pt_BR]=Modos de exibição @@ -120,11 +127,13 @@ Comment[ca]=Configura els modes de vista del gestor de fitxers Comment[ca@valencia]=Configura els modes de vista del gestor de fitxers Comment[cs]=Nastavení režimů pohledu správce souborů Comment[de]=Dateiverwaltungs-Ansichten einrichten +Comment[el]=Διαμόρφωση των λειτουργιών προβολής του διαχειριστή αρχείων Comment[en_GB]=Configure file manager view modes 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,11 +165,13 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[de]=Dateiverwaltung +X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager 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 @@ -169,6 +180,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos 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 82ded450f..172a991ac 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -6,11 +6,13 @@ Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory Comment[de]=Versionskontroll-Modul für Dateiansichten +Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων Comment[en_GB]=Version Control Plugin for File Views 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. * |