diff options
25 files changed, 203 insertions, 104 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ab4d46481..6640b804b 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.16.0") +set(KF5_MIN_VERSION "5.19.0") set(ECM_MIN_VERSION "1.6.0") # ECM setup @@ -23,7 +23,7 @@ include(GenerateExportHeader) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h" @@ -86,7 +86,7 @@ set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets" TYPE OPTIONAL ) -find_package(KF5FileMetaData 4.97) +find_package(KF5FileMetaData 5.19.0) set_package_properties(KF5FileMetaData PROPERTIES URL "https://projects.kde.org/kfilemetadata" TYPE OPTIONAL diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index af283cf00..0830d4b8b 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -427,16 +427,11 @@ void DolphinContextMenu::addShowMenuBarAction() bool DolphinContextMenu::placeExists(const QUrl& url) const { - PlacesItemModel model; - - const int count = model.count(); - for (int i = 0; i < count; ++i) { - const QUrl placeUrl = model.placesItem(i)->url(); - if (placeUrl.matches(url, QUrl::StripTrailingSlash)) { - return true; - } - } - + // Creating up a PlacesItemModel to find out if 'url' is one of the Places + // can be expensive because the model asks Solid for the devices which are + // available, which can take some time. + // TODO: Consider restoring this check if the handling of Places and devices + // will be decoupled in the future. return false; } diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 25d83443c..1f6af812e 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -1,15 +1,15 @@ [Desktop Entry] Type=Service Name=Dolphin View +Name[ar]=منظور دولفين +Name[ast]=Vista de Dolphin Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin -Name[da]=Dolphin-visning Name[de]=Dolphin-Ansicht Name[el]=Dolphin View Name[en_GB]=Dolphin View Name[es]=Vista de Dolphin -Name[et]=Dolphini vaade Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin @@ -56,6 +56,8 @@ Actions=icons;details;compact; [Desktop Action icons] Name=Icons +Name[ar]=الأيقونات +Name[ast]=Iconos Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony @@ -64,7 +66,6 @@ Name[de]=Symbole Name[el]=Εικονίδια Name[en_GB]=Icons Name[es]=Iconos -Name[et]=Ikoonid Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas @@ -102,15 +103,15 @@ Exec=dolphin [Desktop Action compact] Name=Compact +Name[ar]=متراصّ +Name[ast]=Compautu Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní -Name[da]=Kompakt Name[de]=Kompakt Name[el]=Σύμπτυξη Name[en_GB]=Compact Name[es]=Compacto -Name[et]=Kompaktne Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta @@ -146,15 +147,15 @@ Exec=dolphin [Desktop Action details] Name=Details +Name[ar]=التّفاصيل +Name[ast]=Detalles Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti -Name[da]=Detaljer Name[de]=Details Name[el]=Λεπτομέρειες Name[en_GB]=Details Name[es]=Detalles -Name[et]=Üksikasjad Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 5f6fed0dc..8626f947d 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -41,7 +41,6 @@ KFileItemModel::KFileItemModel(QObject* parent) : KItemModelBase("text", parent), m_dirLister(0), - m_naturalSorting(GeneralSettings::naturalSorting()), m_sortDirsFirst(true), m_sortRole(NameRole), m_sortingProgressPercent(-1), @@ -58,9 +57,10 @@ KFileItemModel::KFileItemModel(QObject* parent) : m_expandedDirs(), m_urlsToExpand() { - m_collator.setCaseSensitivity(Qt::CaseInsensitive); m_collator.setNumericMode(true); + loadSortingSettings(); + m_dirLister = new KFileItemModelDirLister(this); m_dirLister->setDelayedMimeTypes(true); @@ -106,8 +106,7 @@ KFileItemModel::KFileItemModel(QObject* parent) : m_resortAllItemsTimer->setSingleShot(true); connect(m_resortAllItemsTimer, &QTimer::timeout, this, &KFileItemModel::resortAllItems); - connect(GeneralSettings::self(), &GeneralSettings::naturalSortingChanged, - this, &KFileItemModel::slotNaturalSortingChanged); + connect(GeneralSettings::self(), &GeneralSettings::sortingChoiceChanged, this, &KFileItemModel::slotSortingChoiceChanged); } KFileItemModel::~KFileItemModel() @@ -783,6 +782,27 @@ void KFileItemModel::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder pre resortAllItems(); } +void KFileItemModel::loadSortingSettings() +{ + using Choice = GeneralSettings::EnumSortingChoice; + switch (GeneralSettings::sortingChoice()) { + case Choice::NaturalSorting: + m_naturalSorting = true; + m_collator.setCaseSensitivity(Qt::CaseInsensitive); + break; + case Choice::CaseSensitiveSorting: + m_naturalSorting = false; + m_collator.setCaseSensitivity(Qt::CaseSensitive); + break; + case Choice::CaseInsensitiveSorting: + m_naturalSorting = false; + m_collator.setCaseSensitivity(Qt::CaseInsensitive); + break; + default: + Q_UNREACHABLE(); + } +} + void KFileItemModel::resortAllItems() { m_resortAllItemsTimer->stop(); @@ -1103,9 +1123,9 @@ void KFileItemModel::slotClear() m_expandedDirs.clear(); } -void KFileItemModel::slotNaturalSortingChanged() +void KFileItemModel::slotSortingChoiceChanged() { - m_naturalSorting = GeneralSettings::naturalSorting(); + loadSortingSettings(); resortAllItems(); } @@ -2200,7 +2220,7 @@ const KFileItemModel::RoleInfoMap* KFileItemModel::rolesInfoMap(int& count) { "track", TrackRole, I18N_NOOP2_NOSTRIP("@label", "Track"), I18N_NOOP2_NOSTRIP("@label", "Audio"), true, true }, { "path", PathRole, I18N_NOOP2_NOSTRIP("@label", "Path"), I18N_NOOP2_NOSTRIP("@label", "Other"), false, false }, { "destination", DestinationRole, I18N_NOOP2_NOSTRIP("@label", "Link Destination"), I18N_NOOP2_NOSTRIP("@label", "Other"), false, false }, - { "copiedFrom", CopiedFromRole, I18N_NOOP2_NOSTRIP("@label", "Copied From"), I18N_NOOP2_NOSTRIP("@label", "Other"), true, false }, + { "originUrl", OriginUrlRole, I18N_NOOP2_NOSTRIP("@label", "Downloaded From"), I18N_NOOP2_NOSTRIP("@label", "Other"), true, false }, { "permissions", PermissionsRole, I18N_NOOP2_NOSTRIP("@label", "Permissions"), I18N_NOOP2_NOSTRIP("@label", "Other"), false, false }, { "owner", OwnerRole, I18N_NOOP2_NOSTRIP("@label", "Owner"), I18N_NOOP2_NOSTRIP("@label", "Other"), false, false }, { "group", GroupRole, I18N_NOOP2_NOSTRIP("@label", "User Group"), I18N_NOOP2_NOSTRIP("@label", "Other"), false, false }, diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 167f508cf..8a0df72b9 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -273,7 +273,7 @@ private slots: void slotItemsDeleted(const KFileItemList& items); void slotRefreshItems(const QList<QPair<KFileItem, KFileItem> >& items); void slotClear(); - void slotNaturalSortingChanged(); + void slotSortingChoiceChanged(); void dispatchPendingItemsToInsert(); @@ -285,7 +285,7 @@ private: // User visible roles available with Baloo: CommentRole, TagsRole, RatingRole, ImageSizeRole, OrientationRole, WordCountRole, LineCountRole, ArtistRole, AlbumRole, DurationRole, TrackRole, - CopiedFromRole, + OriginUrlRole, // Non-visible roles: IsDirRole, IsLinkRole, IsExpandedRole, IsExpandableRole, ExpandedParentsCountRole, // Mandatory last entry: @@ -416,6 +416,11 @@ private: void removeFilteredChildren(const KItemRangeList& parents); /** + * Loads the selected choice of sorting method from Dolphin General Settings + */ + void loadSortingSettings(); + + /** * Maps the QByteArray-roles to RoleTypes and provides translation- and * group-contexts. */ diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index d3d3745fc..9f89de8e7 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -717,7 +717,13 @@ void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& itemUrl) // the corresponding file has been deleted in the meantime. return; } + applyChangedBalooRolesForItem(item); +#endif +} +void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &item) +{ +#ifdef HAVE_BALOO Baloo::File file(item.localPath()); file.load(); @@ -745,7 +751,7 @@ void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& itemUrl) this, &KFileItemModelRolesUpdater::slotItemsChanged); #else #ifndef Q_CC_MSVC - Q_UNUSED(itemUrl); + Q_UNUSED(item); #endif #endif } @@ -1089,7 +1095,7 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte #ifdef HAVE_BALOO if (m_balooFileMonitor) { m_balooFileMonitor->addFile(item.localPath()); - applyChangedBalooRoles(item.localPath()); + applyChangedBalooRolesForItem(item); } #endif return data; diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index f3d40a6c5..cd86fce1e 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -211,6 +211,7 @@ private slots: void resolveRecentlyChangedItems(); void applyChangedBalooRoles(const QString& file); + void applyChangedBalooRolesForItem(const KFileItem& file); void slotDirectoryContentsCountReceived(const QString& path, int count); diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index c9d521ce7..94b49dbde 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -194,12 +194,12 @@ void KItemListContainer::wheelEvent(QWheelEvent* event) } } else { const int numDegrees = event->angleDelta().y() / 8; - const int numSteps = numDegrees / 15; + 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() / 4); + smoothScroller->scrollTo(scrollBar->value() - numSteps * scrollBar->pageStep() / 12); } } diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index 920ce0671..b49499483 100644 --- a/src/kitemviews/private/kbaloorolesprovider.cpp +++ b/src/kitemviews/private/kbaloorolesprovider.cpp @@ -109,6 +109,9 @@ QHash<QByteArray, QVariant> KBalooRolesProvider::roleValues(const Baloo::File& f if (roles.contains("comment")) { values.insert("comment", md.userComment()); } + if (roles.contains("originUrl")) { + values.insert("originUrl", md.originUrl()); + } return values; } @@ -143,8 +146,8 @@ KBalooRolesProvider::KBalooRolesProvider() : { "artist", "artist" }, { "album", "album" }, { "duration", "duration" }, - { "trackNumber", "track" } - // { "http://www.semanticdesktop.org/ontologies/2010/04/30/ndo#copiedFrom", "copiedFrom" } + { "trackNumber", "track" }, + { "originUrl", "originUrl" } }; for (unsigned int i = 0; i < sizeof(propertyInfoList) / sizeof(PropertyInfo); ++i) { diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp index 2bd467aa5..c89d3cf8f 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.cpp +++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp @@ -19,6 +19,7 @@ #include "kitemlistsmoothscroller.h" +#include <QApplication> #include <QEvent> #include <QPropertyAnimation> #include <QScrollBar> @@ -200,8 +201,8 @@ void KItemListSmoothScroller::handleWheelEvent(QWheelEvent* event) numPixels = event->pixelDelta().y(); } else { const int numDegrees = event->angleDelta().y() / 8; - const int numSteps = numDegrees / 15; - numPixels = numSteps * m_scrollBar->pageStep() / 4; + const int numSteps = qApp->wheelScrollLines() * numDegrees / 15; + numPixels = numSteps * m_scrollBar->pageStep() / 12; } int value = m_scrollBar->value(); if (event->modifiers().testFlag(Qt::ShiftModifier)) { diff --git a/src/main.cpp b/src/main.cpp index f51932913..9610753d8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -53,7 +53,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING), i18nc("@title", "File Manager"), KAboutLicense::GPL, - i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); + i18nc("@info:credit", "(C) 2006-2016 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta")); aboutData.setHomepage("http://dolphin.kde.org"); aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"), i18nc("@info:credit", "Maintainer (since 2014) and developer"), diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 64b91b1d2..872622cbc 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -5,6 +5,7 @@ <project_license>GPL-2.0+</project_license> <name>Dolphin</name> <name xml:lang="ar">دولفين</name> + <name xml:lang="ast">Dolphin</name> <name xml:lang="bs">Dolphin</name> <name xml:lang="ca">Dolphin</name> <name xml:lang="ca-valencia">Dolphin</name> @@ -47,6 +48,7 @@ <name xml:lang="zh-TW">Dolphin</name> <summary>File Manager</summary> <summary xml:lang="ar">مدير ملفات</summary> + <summary xml:lang="ast">Xestor de ficheros</summary> <summary xml:lang="bs">Upravitelj datoteka</summary> <summary xml:lang="ca">Gestor de fitxers</summary> <summary xml:lang="ca-valencia">Gestor de fitxers</summary> @@ -64,7 +66,7 @@ <summary xml:lang="ia">Gerente de File</summary> <summary xml:lang="it">Gestore file</summary> <summary xml:lang="ko">파일 관리자</summary> - <summary xml:lang="lt">Failų tvarkyklė</summary> + <summary xml:lang="lt">Failų tvarkytuvė</summary> <summary xml:lang="nb">Filbehandler</summary> <summary xml:lang="nds">Dateipleger</summary> <summary xml:lang="nl">Bestandsbeheerder</summary> @@ -90,6 +92,7 @@ <description> <p>Dolphin is a lightweight file manager. It has been designed with ease of use and simplicity in mind, while still allowing flexibility and customisation. This means that you can do your file management exactly the way you want to do it.</p> <p xml:lang="ar">دولفين هو مدير ملفات خفيف. صُمِّم دولفين مع أخذ سهولة الاستخدام والبساطة بعين الاعتبار، مع السماح بالمرونة والتخصيص. يعني هذا أنه يمكنك إدارة ملفاتك كما تريد تمامًا.</p> + <p xml:lang="ast">Dolphin ye un xestor de ficheros llixeru. Diseñóse cola facilidá d'usu y cenciellez na miente entrín entá permite la flexibilidá y personalización. Esto quier dicir que pues facer la to xestión de ficheros exautamente como tu quies facela.</p> <p xml:lang="bs">Dolphinje lagan file manager. On je bio dizajniran sa lakoćom korišćenja i jednostavnosti u vidu, još omogućavajući fleksibilnost i prilagođavanje. To znači da možete da radite svoje upravljanje datotekama onako kako želite da to uradi.</p> <p xml:lang="ca">El Dolphin és un gestor de fitxers lleuger. S'ha dissenyat pensant a facilitar el seu ús i que sigui simple, permetent la flexibilitat i la personalització. Això vol dir que podeu fer la gestió dels vostres fitxers de la manera exacta com ho vulgueu fer.</p> <p xml:lang="ca-valencia">El Dolphin és un gestor de fitxers lleuger. S'ha dissenyat pensant a facilitar el seu ús i que siga simple, permetent la flexibilitat i la personalització. Això vol dir que podeu fer la gestió dels vostres fitxers de la manera exacta com ho vulgueu fer.</p> @@ -128,6 +131,7 @@ <p xml:lang="zh-TW">Dolphin 是一套輕量級的檔案管理員。它設計的理念是易用與簡單，但仍然保持足夠的彈性。這表示您可以用您想要使用的方式來管理您的檔案。</p> <p>Features:</p> <p xml:lang="ar">المزايا:</p> + <p xml:lang="ast">Carauterístiques</p> <p xml:lang="bs">Svojstva:</p> <p xml:lang="ca">Característiques:</p> <p xml:lang="ca-valencia">Característiques:</p> @@ -170,6 +174,7 @@ <p xml:lang="zh-TW">功能：</p> <ul> <li>Navigation (or breadcrumb) bar for URLs, allowing you to quickly navigate through the hierarchy of files and folders.</li> + <li xml:lang="ast">Barra de navegación </li> <li xml:lang="bs">Navigacijska (ili mrvična) traka za URL, dopušta vam da se brzo krećete kroz hijerarhiju datoteka i direktorija.</li> <li xml:lang="ca">Barra de navegació (o fil d'Ariadna) pels URL, permetent una navegació ràpida per la jerarquia de fitxers i carpetes.</li> <li xml:lang="ca-valencia">Barra de navegació (o fil d'Ariadna) pels URL, permetent una navegació ràpida per la jerarquia de fitxers i carpetes.</li> @@ -207,6 +212,7 @@ <li xml:lang="zh-TW">網址導覽列讓您可以快速瀏覽檔案與資料夾。</li> <li>Supports several different kinds of view styles and properties and allows you to configure the view exactly how you want it.</li> <li xml:lang="ar">يدعم العديد من الأنواع المختلفة من الخصائص وأنماط العرض ويسمح لك بضبط العرض كما تريد تمامًا.</li> + <li xml:lang="ast">Sofitalla delles tribes de vista y propiedaes diferentes y permítete configurar la vista exautamente como tu quies.</li> <li xml:lang="bs">Dopušta vište vrsta stilova pogleda i svojstava i dopšta vam da konfigurišete pogled baš kako želite.</li> <li xml:lang="ca">Accepta diferents classes diverses d'estils de visualització i propietats i us permet configurar la visualització exactament com la vulgueu.</li> <li xml:lang="ca-valencia">Accepta diferents classes diverses d'estils de visualització i propietats i vos permet configurar la visualització exactament com la vulgueu.</li> @@ -245,6 +251,7 @@ <li xml:lang="zh-TW">網址導覽列讓您可以快速瀏覽檔案與資料夾。</li> <li>Split view, allowing you to easily copy or move files between locations.</li> <li xml:lang="ar">العرض المقسوم، يسمح لك بنسخ ونقل الملفات بين مكانين بسهولة.</li> + <li xml:lang="ast">Vista dixebrada, permítete copiar y mover ficheros d'un mou cenciellu ente allugamientos.</li> <li xml:lang="bs">Razdvaja pogled, dopuštajući lako kopiranje ili pomijeranje datoteka između lokacija</li> <li xml:lang="ca">Divisió de visualització, permetent copiar o moure fitxers fàcilment entre les ubicacions.</li> <li xml:lang="ca-valencia">Divisió de visualització, permetent copiar o moure fitxers fàcilment entre les ubicacions.</li> @@ -283,6 +290,7 @@ <li xml:lang="zh-TW">支援數個檢視模式，您也可以調整檢視模式的屬性。</li> <li>Additional information and shortcuts are available as dock-able panels, allowing you to move them around freely and display exactly what you want.</li> <li xml:lang="ar">تتوفر معلومات واختصارات إضافية كلوحات قابلة للرصف، مما يسمح لك بنقلها بحريّة وعرضها بالضبط كما تريد.</li> + <li xml:lang="ast">Tán disponibles atayos ya información adicional como paneles anclables, permitiéndote movelos pehí d'un mou llibre y amosar exautamente lo tu quies.</li> <li xml:lang="bs">Dodatne informacije i kratice su dostupne kao usidreni paneli, dopuštajući vam da se krećete slobodno i prikažete šta želite.</li> <li xml:lang="ca">Hi ha informació addicional i dreceres disponibles com a plafons que es poden acoblar, permetent moure'ls lliurement i mostrar exactament el què vulgueu.</li> <li xml:lang="ca-valencia">Hi ha informació addicional i dreceres disponibles com a plafons que es poden acoblar, permetent moure'ls lliurement i mostrar exactament el què vulgueu.</li> @@ -320,6 +328,7 @@ <li xml:lang="zh-TW">分割檢視讓您可以輕鬆複製或移動檔案。</li> <li>Multiple tab support</li> <li xml:lang="ar">دعم تعدّد الألسنة</li> + <li xml:lang="ast">Sofitu de múltiples llingüetes</li> <li xml:lang="bs">Podrška za više kartica</li> <li xml:lang="ca">Implementació de pestanyes múltiples</li> <li xml:lang="ca-valencia">Implementació de pestanyes múltiples</li> @@ -361,6 +370,7 @@ <li xml:lang="zh-TW">額外資訊與嵌入式面板捷徑讓您可以輕易顯示您常用的項目。</li> <li>Informational dialogues are displayed in an unobtrusive way.</li> <li xml:lang="ar">حواريات المعلومات تُعرَض بطريقة غير مُزعجة.</li> + <li xml:lang="ast">Los diálogos d'información amuésense d'un mou discretu.</li> <li xml:lang="bs">Informativni dijalozi su prikazani na nenametljiv način.</li> <li xml:lang="ca">Els diàlegs informatius es mostren d'una manera no molesta.</li> <li xml:lang="ca-valencia">Els diàlegs informatius es mostren d'una manera no molesta.</li> @@ -398,6 +408,7 @@ <li xml:lang="zh-TW">支援多分頁</li> <li>Undo/redo support</li> <li xml:lang="ar">دعم التراجع والإعادة</li> + <li xml:lang="ast">Sofitu de desfechura/refechura</li> <li xml:lang="bs">Podrška za poništavanje/ponavljanje akcija</li> <li xml:lang="ca">Implementació de desfer/refer</li> <li xml:lang="ca-valencia">Implementació de desfer/refer</li> @@ -438,6 +449,7 @@ <li xml:lang="zh-TW">以不唐突的方式顯示資訊對話框。</li> <li>Transparent network access through the KIO system.</li> <li xml:lang="ar">اتصال شبكيّ مباشر باستخدام نظام KIO.</li> + <li xml:lang="ast">Accesu tresparente a la rede pente'l sistema KIO.</li> <li xml:lang="bs">Transparentni mrežni pristup kroz KIO sistem.</li> <li xml:lang="ca">Accés transparent a la xarxa a través del sistema KIO.</li> <li xml:lang="ca-valencia">Accés transparent a la xarxa a través del sistema KIO.</li> diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index e900add72..7b8e19414 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -1,14 +1,14 @@ [Desktop Entry] Name=Dolphin +Name[ar]=دولفين +Name[ast]=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin -Name[da]=Dolphin Name[de]=Dolphin Name[el]=Dolphin Name[en_GB]=Dolphin Name[es]=Dolphin -Name[et]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin @@ -46,15 +46,15 @@ Type=Application X-DocPath=dolphin/index.html Categories=Qt;KDE;System;FileTools;FileManager; GenericName=File Manager +GenericName[ar]=مدير ملفّات +GenericName[ast]=Xestor de ficheros GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů -GenericName[da]=Filhåndtering GenericName[de]=Dateiverwaltung GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager GenericName[es]=Gestor de archivos -GenericName[et]=Failihaldur GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 013b99731..0d8ac6981 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -1161,7 +1161,6 @@ QUrl PlacesItemModel::createSearchUrl(const QUrl& url) QUrl PlacesItemModel::searchUrlForType(const QString& type) { Baloo::Query query; - query.addType("File"); query.addType(type); return query.toSearchUrl(); diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 743d9113a..a925a97c9 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -478,7 +478,7 @@ void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url) if (!customDir.isEmpty()) { setSearchPath(QUrl::fromLocalFile(customDir)); } else { - setSearchPath(QDir::homePath()); + setSearchPath(QUrl::fromLocalFile(QDir::homePath())); } setText(query.searchString()); diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg index 9ff14d1f7..de7390bbd 100644 --- a/src/settings/dolphin_generalsettings.kcfg +++ b/src/settings/dolphin_generalsettings.kcfg @@ -8,7 +8,7 @@ <include>QUrl</include> <include>KCompletion</include> <kcfgfile name="dolphinrc"/> - <signal name="naturalSortingChanged" /> + <signal name="sortingChoiceChanged" /> <group name="General"> <entry name="EditableUrl" type="Bool"> <label>Should the URL be editable for the user</label> @@ -93,10 +93,15 @@ <label>Enlarge Small Previews</label> <default>true</default> </entry> - <entry name="NaturalSorting" type="Bool"> - <label>Natural sorting of items</label> - <default>true</default> - <emit signal="naturalSortingChanged" /> + <entry name="SortingChoice" type="Enum"> + <choices> + <choice name="NaturalSorting" /> + <choice name="CaseInsensitiveSorting" /> + <choice name="CaseSensitiveSorting" /> + </choices> + <label>Choose Natural, Case Sensitive, or Case Insensitive order of sorting the items</label> + <default>0</default> + <emit signal="sortingChoiceChanged" /> </entry> </group> </kcfg> diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 093a1f4e1..86a4ad3bb 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -39,6 +39,8 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : m_showToolTips(0), m_showSelectionToggle(0), m_naturalSorting(0), + m_caseSensitiveSorting(0), + m_caseInsensitiveSorting(0), m_renameInline(0) { QVBoxLayout* topLayout = new QVBoxLayout(this); @@ -54,22 +56,32 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : viewPropsLayout->addWidget(m_localViewProps); viewPropsLayout->addWidget(m_globalViewProps); + // Sorting properties + QGroupBox* sortingPropsBox = new QGroupBox(i18nc("@title:group", "Sorting Mode"), this); + sortingPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); + + m_naturalSorting = new QRadioButton(i18nc("option:radio", "Natural sorting"), sortingPropsBox); + m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical sorting, case insensitive"), sortingPropsBox); + m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical sorting, case sensitive"), sortingPropsBox); + + QVBoxLayout* sortingPropsLayout = new QVBoxLayout(sortingPropsBox); + sortingPropsLayout->addWidget(m_naturalSorting); + sortingPropsLayout->addWidget(m_caseInsensitiveSorting); + sortingPropsLayout->addWidget(m_caseSensitiveSorting); + // 'Show tooltips' m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this); // 'Show selection marker' m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this); - // 'Natural sorting of items' - m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), this); - // 'Inline renaming of items' m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"), this); topLayout->addWidget(viewPropsBox); + topLayout->addWidget(sortingPropsBox); topLayout->addWidget(m_showToolTips); topLayout->addWidget(m_showSelectionToggle); - topLayout->addWidget(m_naturalSorting); topLayout->addWidget(m_renameInline); topLayout->addStretch(); @@ -79,7 +91,9 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : connect(m_globalViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); connect(m_showToolTips, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); connect(m_showSelectionToggle, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); - connect(m_naturalSorting, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); + connect(m_naturalSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); + connect(m_caseInsensitiveSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); + connect(m_caseSensitiveSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); connect(m_renameInline, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); } @@ -94,10 +108,9 @@ void BehaviorSettingsPage::applySettings() const bool useGlobalViewProps = m_globalViewProps->isChecked(); settings->setGlobalViewProps(useGlobalViewProps); - settings->setShowToolTips(m_showToolTips->isChecked()); settings->setShowSelectionToggle(m_showSelectionToggle->isChecked()); - settings->setNaturalSorting(m_naturalSorting->isChecked()); + setSortingChoiceValue(settings); settings->setRenameInline(m_renameInline->isChecked()); settings->save(); @@ -127,7 +140,37 @@ void BehaviorSettingsPage::loadSettings() m_showToolTips->setChecked(GeneralSettings::showToolTips()); m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle()); - m_naturalSorting->setChecked(GeneralSettings::naturalSorting()); m_renameInline->setChecked(GeneralSettings::renameInline()); + + loadSortingChoiceSettings(); } +void BehaviorSettingsPage::setSortingChoiceValue(GeneralSettings *settings) +{ + using Choice = GeneralSettings::EnumSortingChoice; + if (m_naturalSorting->isChecked()) { + settings->setSortingChoice(Choice::NaturalSorting); + } else if (m_caseInsensitiveSorting->isChecked()) { + settings->setSortingChoice(Choice::CaseInsensitiveSorting); + } else if (m_caseSensitiveSorting->isChecked()) { + settings->setSortingChoice(Choice::CaseSensitiveSorting); + } +} + +void BehaviorSettingsPage::loadSortingChoiceSettings() +{ + using Choice = GeneralSettings::EnumSortingChoice; + switch (GeneralSettings::sortingChoice()) { + case Choice::NaturalSorting: + m_naturalSorting->setChecked(true); + break; + case Choice::CaseInsensitiveSorting: + m_caseInsensitiveSorting->setChecked(true); + break; + case Choice::CaseSensitiveSorting: + m_caseSensitiveSorting->setChecked(true); + break; + default: + Q_UNREACHABLE(); + } +} diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h index 6e491696c..6213734f1 100644 --- a/src/settings/general/behaviorsettingspage.h +++ b/src/settings/general/behaviorsettingspage.h @@ -22,6 +22,7 @@ #include <settings/settingspagebase.h> #include <QUrl> +#include "dolphin_generalsettings.h" class QCheckBox; class QLabel; @@ -46,6 +47,8 @@ public: private: void loadSettings(); + void setSortingChoiceValue(GeneralSettings* settings); + void loadSortingChoiceSettings(); private: QUrl m_url; @@ -56,7 +59,11 @@ private: QCheckBox* m_showToolTips; QLabel* m_configureToolTips; QCheckBox* m_showSelectionToggle; - QCheckBox* m_naturalSorting; + + QRadioButton* m_naturalSorting; + QRadioButton* m_caseSensitiveSorting; + QRadioButton* m_caseInsensitiveSorting; + QCheckBox* m_renameInline; }; diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index 37e05197a..07cd73e33 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -45,7 +45,6 @@ // default settings namespace { - const bool UseThumbnails = true; const int MaxRemotePreviewSize = 0; // 0 MB } diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index d63ed2519..55ce19177 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -1,13 +1,13 @@ Name=Dolphin General +Name[ar]=دولفين العامّ +Name[ast]=Xeneral de Dolphin Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin -Name[da]=Dolphin generelt Name[de]=Dolphin allgemein Name[el]=Dolphin Γενικά Name[en_GB]=Dolphin General Name[es]=Preferencias generales de Dolphin -Name[et]=Dolphin üldiselt Name[fi]=Dolphin – yleiset Name[fr]=Dolphin général Name[gl]=Xerais de Dolphin @@ -40,15 +40,15 @@ Name[x-test]=xxDolphin Generalxx Name[zh_CN]=Dolphin 常规 Name[zh_TW]=Dolphin 一般 Comment=This service allows configuration of general Dolphin settings. +Comment[ar]=تسمح هذه الخدمة بضبط إعدادات دولفين العامّة. +Comment[ast]=Esti serviciu permite la configuración de los axustes xenerales de Dolphin. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. 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[da]=Denne tjeneste muliggør konfiguration af generelle Dolphin-indstillinger. 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[et]=See teenus võimaldab seadistada Dolphini üldisi seadistusi. 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. @@ -58,7 +58,7 @@ Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin. Comment[it]=Questo servizio permette di configurare le impostazioni generali di Dolphin. Comment[ja]=Dolphin の全般的な設定を行います Comment[ko]=이 서비스는 일반 Dolphin 설정을 담당합니다. -Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendruosius nuostatas. +Comment[lt]=Ši tarnyba leidžia konfigūruoti Dolphin bendrąsias nuostatas. 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. @@ -91,15 +91,15 @@ X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-general # ctxt: Random file browsing settings. Name=General +Name[ar]=عامّ +Name[ast]=Xeneral Name[ca]=General Name[ca@valencia]=General Name[cs]=Obecné -Name[da]=Generelt Name[de]=Allgemein Name[el]=Γενικά Name[en_GB]=General Name[es]=General -Name[et]=Üldine Name[fi]=Yleiset Name[fr]=Général Name[gl]=Xerais @@ -131,15 +131,15 @@ Name[x-test]=xxGeneralxx Name[zh_CN]=常规 Name[zh_TW]=一般 Comment=Configure general file manager settings +Comment[ar]=اضبط إعدادات مدير الملفّات العامّة +Comment[ast]=Configura los axustes xenerales del xestor de ficheros 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[da]=Konfiguration af generelle indstillinger for filhåndtering 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[et]=Failihalduri üldine seadistamine 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. @@ -170,15 +170,15 @@ Comment[x-test]=xxConfigure general file manager settingsxx Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager +X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات +X-KDE-Keywords[ast]=xestor de ficheros 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[da]=filhåndtering 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[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index b2148b902..e1470b965 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -1,13 +1,13 @@ Name=Dolphin Navigation +Name[ar]=التّنقّل في دولفين +Name[ast]=Navegación de Dolphin Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu -Name[da]=Dolphin-navigation Name[de]=Dolphin-Navigation Name[el]=Dolphin Πλοήγηση Name[en_GB]=Dolphin Navigation Name[es]=Navegación de Dolphin -Name[et]=Dolphini liikumine Name[fi]=Dolphin – selaus Name[fr]=Navigation avec Dolphin Name[gl]=Navegación de Dolphin @@ -40,15 +40,15 @@ Name[x-test]=xxDolphin Navigationxx Name[zh_CN]=Dolphin 导航 Name[zh_TW]=Dolphin 導覽 Comment=This service allows configuration of the Dolphin navigation. +Comment[ar]=تسمح هذه الخدمة بضبط التّنقّل في دولفين. +Comment[ast]=Esti serviciu permite la configuración de la navegación de Dolphin. 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[da]=Denne tjeneste muliggør konfiguration af Dolphin-navigation. 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[et]=See teenus võimaldab seadistada Dolphinis liikumist. 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. @@ -90,15 +90,15 @@ X-KDE-PluginKeyword=dolphinnavigation X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-navigation Name=Navigation +Name[ar]=التّنقّل +Name[ast]=Navegación Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace -Name[da]=Navigation Name[de]=Navigation Name[el]=Πλοήγηση Name[en_GB]=Navigation Name[es]=Navegación -Name[et]=Liikumine Name[fi]=Selaus Name[fr]=Navigation Name[gl]=Navegación @@ -131,15 +131,15 @@ Name[x-test]=xxNavigationxx Name[zh_CN]=导航 Name[zh_TW]=導覽 Comment=Configure file manager navigation +Comment[ar]=اضبط التّنقّل في مدير الملفّات +Comment[ast]=Configura la navegación del xestor de ficheros 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[da]=Indstil navigation i filhåndtering 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[et]=Failihalduris liikumise seadistamine Comment[fi]=Tiedostonhallinnan selausasetukset Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers Comment[gl]=Configurar a navegación do xestor de ficheiros. @@ -171,15 +171,15 @@ Comment[x-test]=xxConfigure file manager navigationxx Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager +X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات +X-KDE-Keywords[ast]=xestor de ficheros 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[da]=filhåndtering 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[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index e82ee56e8..2c33eefec 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -1,13 +1,13 @@ Name=Dolphin Services +Name[ar]=خدمات دولفين +Name[ast]=Servicios de Dolphin Name[ca]=Serveis del Dolphin Name[ca@valencia]=Serveis del Dolphin Name[cs]=Služby Dolphinu -Name[da]=Dolphin-tjenester Name[de]=Dolphin-Dienste Name[el]=Dolphin Υπηρεσίες Name[en_GB]=Dolphin Services Name[es]=Servicios de Dolphin -Name[et]=Dolphini teenused Name[fi]=Dolphin – palvelut Name[fr]=Services de Dolphin Name[gl]=Servizos de Dolphin @@ -50,15 +50,15 @@ X-KDE-PluginKeyword=dolphinservices X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-services Name=Services +Name[ar]=الخدمات +Name[ast]=Servicios Name[ca]=Serveis Name[ca@valencia]=Serveis Name[cs]=Služby -Name[da]=Tjenester Name[de]=KDE-Dienste Name[el]=Υπηρεσίες Name[en_GB]=Services Name[es]=Servicios -Name[et]=Teenused Name[fi]=Palvelut Name[fr]=Services Name[gl]=Servizos @@ -90,15 +90,15 @@ Name[x-test]=xxServicesxx Name[zh_CN]=服务 Name[zh_TW]=服務 Comment=Configure file manager services +Comment[ar]=اضبط خدمات مدير الملفّات +Comment[ast]=Configura los servicios del xestor de ficheros 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[da]=Indstil filhåndteringstjenester Comment[de]=Dateiverwaltungs-Dienste einrichten Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστή αρχείων Comment[en_GB]=Configure file manager services Comment[es]=Configurar los servicios del gestor de archivos -Comment[et]=Failihalduri teenuste seadistamine Comment[fi]=Tiedostonhallinnan palveluasetukset Comment[fr]=Configuration des services du gestionnaire de fichiers Comment[gl]=Configurar servizos de xestores de ficheiros. @@ -129,15 +129,15 @@ Comment[x-test]=xxConfigure file manager servicesxx Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager +X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات +X-KDE-Keywords[ast]=xestor de ficheros 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[da]=filhåndtering 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[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 89ddac218..f421ae5c6 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -1,13 +1,13 @@ Name=Dolphin View Modes +Name[ar]=أوضاع المنظور في دولفين +Name[ast]=Moos de vista de Dolphin Name[ca]=Modes de vista del Dolphin Name[ca@valencia]=Modes de vista del Dolphin Name[cs]=Režimy pohledů Dolphinu -Name[da]=Dolphins visningstilstande Name[de]=Dolphin-Ansichtsmodi Name[el]=Dolphin Λειτουργίες Προβολής Name[en_GB]=Dolphin View Modes Name[es]=Modos de vistas de Dolphin -Name[et]=Dolphini vaaterežiimid Name[fi]=Dolphin – näkymät Name[fr]=Modes d'affichage de Dolphin Name[gl]=Modos de vista de Dolphin @@ -39,15 +39,15 @@ Name[x-test]=xxDolphin View Modesxx Name[zh_CN]=Dolphin 视图模式 Name[zh_TW]=設定檔案管理員服務 Comment=This service allows configuration of the Dolphin view modes. +Comment[ar]=تسمح هذه الخدمة بضبط أوضاع المنظور في دولفين. +Comment[ast]=Esti serviciu permite la configuración de los moos de vista de Dolphin. Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphin. 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[da]=Denne tjeneste muliggør konfiguration af Dolphins visningstilstande. 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[et]=See teenus võimaldab seadistada Dolphini vaaterežiime. 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. @@ -89,15 +89,15 @@ X-KDE-PluginKeyword=dolphinviewmodes X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-viewmodes Name=View Modes +Name[ar]=أوضاع المنظور +Name[ast]=Moos de vista Name[ca]=Modes de vista Name[ca@valencia]=Modes de vista Name[cs]=Režimy pohledu -Name[da]=Visningstilstande Name[de]=Ansichts-Modi Name[el]=Λειτουργίες Προβολής Name[en_GB]=View Modes Name[es]=Modos de vistas -Name[et]=Vaaterežiimid Name[fi]=Näkymät Name[fr]=Modes d'affichage Name[gl]=Modos de vista @@ -130,15 +130,15 @@ Name[x-test]=xxView Modesxx Name[zh_CN]=视图模式 Name[zh_TW]=檢視模式 Comment=Configure file manager view modes +Comment[ar]=اضبط أوضاع المنظور في مدير الملفّات +Comment[ast]=Configura los moos de vista del xestor de ficheros 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[da]=Indstil filhåndteringens visningstilstande 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[et]=Failihalduri vaaterežiimide seadistamine 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. @@ -170,15 +170,15 @@ Comment[x-test]=xxConfigure file manager view modesxx Comment[zh_CN]=配置文件管理器视图模式 Comment[zh_TW]=設定檔案管理員檢視模式 X-KDE-Keywords=file manager +X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات +X-KDE-Keywords[ast]=xestor de ficheros 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[da]=filhåndtering 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[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index ac538a648..99214d61b 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -209,7 +209,8 @@ void DolphinViewActionHandler::createActions() connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting); KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>("show_hidden_files"); - showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files")); + showHiddenFiles->setText(i18nc("@action:inmenu View", "Hidden Files")); + showHiddenFiles->setToolTip(i18nc("@info", "Visibility of hidden files and folders")); m_actionCollection->setDefaultShortcuts(showHiddenFiles, {Qt::ALT + Qt::Key_Period, Qt::Key_F8}); connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles); @@ -377,8 +378,8 @@ void DolphinViewActionHandler::updateViewActions() slotSortRoleChanged(m_currentView->sortRole()); slotZoomLevelChanged(m_currentView->zoomLevel(), -1); - QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); - showHiddenFilesAction->setChecked(m_currentView->hiddenFilesShown()); + // Updates the "show_hidden_files" action state and icon + slotHiddenFilesShownChanged(m_currentView->hiddenFilesShown()); } void DolphinViewActionHandler::zoomIn() @@ -479,6 +480,8 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown) { QAction* showHiddenFilesAction = m_actionCollection->action("show_hidden_files"); showHiddenFilesAction->setChecked(shown); + + showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? "visibility" : "hint")); } void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable) diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index aca976663..80a17efc6 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -2,15 +2,14 @@ Type=ServiceType X-KDE-ServiceType=FileViewVersionControlPlugin Comment=Version Control Plugin for File Views +Comment[ast]=Complementu de control de versiones pa vistes de ficheros 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[da]=Versionsstyringsplugin til filvisninger 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[et]=Failivaadete versioonihaldusplugin 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. |