From 5ad49db96d2baac9c37553faa8529f7104b7ffb0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 May 2020 09:03:41 +0200 Subject: GIT_SILENT made messages (after extraction) --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index c3d2c7fc0..3ae080ffc 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -342,7 +342,7 @@
  • Mer informasjon og snarveier er tilgjengelige som dokkbare ruter, som du kan flytte fritt rundt og bruke til å vise akkurat hva du vil.
  • Bito-Infos un Leestekens laat sik as Paneels andocken, Du kannst ehr verschuven un se jüst dat wiesen laten, wat Du weten wullt.
  • Extra informatie en sneltoetsen zijn beschikbaar als vast te zetten panelen, die u vrij kunt verplaatsen en precies kunt tonen wat u wilt.
    • -
  • Tilleggsinformasjon og snarvegar er tilgjengelege som dokkbare ruter, som du kan flytta fritt rundt og bruka til å visa det du ønskjer.
    • +
  • Tilleggsinformasjon og snarvegar er tilgjengelege som dokkpanel, som du kan flytta fritt rundt og bruka til å visa det du ønskjer.
  • Dodatkowe szczegóły i skróty dostępne jako dokowalne panele, umożliwiające ich dowolne przenoszenie i wyświetlanie dopasowane do potrzeb.
  • Estão disponíveis informações e atalhos adicionais como painéis acopláveis, permitindo-lhe movê-los à vontade e apresentar como desejar.
  • As informações e atalhos adicionais estão disponíveis na forma de painéis acopláveis, permitindo-lhe movê-los à vontade e apresentar como desejar.
    • -- cgit v1.3 From 2afd02f5ee57985924716db0224fe5dbbb0eae54 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Mon, 11 May 2020 23:07:46 +0200 Subject: GIT_SILENT Update Appstream for new release --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 3ae080ffc..c3b650ef8 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -589,9 +589,9 @@ dolphin + - -- cgit v1.3 From 57d9eee90035f5d408f324c89c184efaddb9414b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 May 2020 09:20:03 +0200 Subject: GIT_SILENT made messages (after extraction) --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index c3b650ef8..c77e4e12e 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -198,7 +198,7 @@
  • Η γραμμή πλοήγησης (ή ιχνηλάτησης) για URL, σας επιτρέπει να πλοηγηθείτε γρήγορα μέσα από την ιεραρχία αρχείων και φακέλων.
  • Navigation (or breadcrumb) bar for URLs, allowing you to quickly navigate through the hierarchy of files and folders.
  • barra de navegación (o de ruta completa) para URL que permite navegar rápidamente a través de la jerarquía de archivos y carpetas.
    • -
  • Liikumisriba IRL-idele, mis lubab kiiresti liigelda failide ja kataloogide hierarhias.
    • +
  • Liikumisriba URL-idele, mis lubab kiiresti liigelda failide ja kataloogide hierarhias.
  • Nabigatzeko (edo ogi-apurren) barra URLentzako, fitxategi eta karpeten hierarkian zehar azkar nabigatzeko aukera ematen dizuna.
  • Osoiterivi, jonka avulla siirtyminen tiedostojen ja kansioiden hierarkiassa on nopeaa.
  • Barre de navigation (ou fil d'Ariane) permettant de naviguer rapidement dans la hiérarchie de fichiers et de dossiers.
    • -- cgit v1.3 From 99cf24c03def1c0722ba8dbd86a27b9dbc521f43 Mon Sep 17 00:00:00 2001 From: Méven Car Date: Sat, 16 May 2020 09:59:54 +0200 Subject: Left-elide file/folders while keeping their extension visible Summary: Tweak behavior introduced in D19471. BUG: 404955 Test Plan: Before: {F8325282} After: {F8325283} {F8325284} Reviewers: ngraham, #dolphin, elvisangelaccio, #vdg Reviewed By: ngraham, #dolphin, elvisangelaccio, #vdg Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D29794 --- src/kitemviews/kstandarditemlistwidget.cpp | 30 ++++++++++++++++++++++++------ src/kitemviews/kstandarditemlistwidget.h | 2 ++ 2 files changed, 26 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 4bbbf17a8..13f80996d 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -1113,6 +1113,26 @@ void KStandardItemListWidget::updateTextsCache() } } +QString KStandardItemListWidget::elideRightKeepExtension(const QString &text, int elidingWidth) const +{ + auto extensionIndex = text.lastIndexOf('.'); + if (extensionIndex != -1) { + // has file extension + auto extensionLength = text.length() - extensionIndex; + auto extensionWidth = m_customizedFontMetrics.width(text.right(extensionLength)); + if (elidingWidth > extensionWidth && extensionLength < 6 && (float(extensionWidth) / float(elidingWidth)) < 0.3) { + // if we have room to display the file extension and the extension is not too long + QString ret = m_customizedFontMetrics.elidedText(text.chopped(extensionLength), + Qt::ElideRight, + elidingWidth - extensionWidth); + ret.append(text.right(extensionLength)); + return ret; + } + } + return m_customizedFontMetrics.elidedText(text,Qt::ElideRight, + elidingWidth); +} + void KStandardItemListWidget::updateIconsLayoutTextCache() { // +------+ @@ -1164,9 +1184,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache() qreal lastLineWidth; do { QString lastTextLine = nameText.mid(line.textStart()); - lastTextLine = m_customizedFontMetrics.elidedText(lastTextLine, - Qt::ElideMiddle, - elidingWidth); + lastTextLine = elideRightKeepExtension(lastTextLine, elidingWidth); const QString elidedText = nameText.left(line.textStart()) + lastTextLine; nameTextInfo->staticText.setText(elidedText); @@ -1221,7 +1239,7 @@ void KStandardItemListWidget::updateIconsLayoutTextCache() textLine.setLineWidth(maxWidth); requiredWidth = textLine.naturalTextWidth(); if (requiredWidth > maxWidth) { - const QString elidedText = m_customizedFontMetrics.elidedText(text, Qt::ElideMiddle, maxWidth); + const QString elidedText = elideRightKeepExtension(text, maxWidth); textInfo->staticText.setText(elidedText); requiredWidth = m_customizedFontMetrics.width(elidedText); } else if (role == "rating") { @@ -1270,7 +1288,7 @@ void KStandardItemListWidget::updateCompactLayoutTextCache() qreal requiredWidth = m_customizedFontMetrics.width(text); if (requiredWidth > maxWidth) { requiredWidth = maxWidth; - const QString elidedText = m_customizedFontMetrics.elidedText(text, Qt::ElideMiddle, maxWidth); + const QString elidedText = elideRightKeepExtension(text, maxWidth); textInfo->staticText.setText(elidedText); } @@ -1327,7 +1345,7 @@ void KStandardItemListWidget::updateDetailsLayoutTextCache() } if (requiredWidth > availableTextWidth) { - text = m_customizedFontMetrics.elidedText(text, Qt::ElideMiddle, availableTextWidth); + text = elideRightKeepExtension(text, availableTextWidth); requiredWidth = m_customizedFontMetrics.width(text); } diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index c8102e421..e7f2de2e0 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -209,6 +209,8 @@ private: QRectF roleEditingRect(const QByteArray &role) const; + QString elideRightKeepExtension(const QString &text, int elidingWidth) const; + /** * Closes the role editor and returns the focus back * to the KItemListContainer. -- cgit v1.3