From 17136c5da5d83e689fb7e77e8f1195750137f22e Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Tue, 8 Jan 2013 22:33:48 +0100 Subject: SVN_SILENT made messages (.desktop file) --- src/dolphinpart.desktop | 1 + src/settings/kcm/kcmdolphingeneral.desktop | 5 +++++ src/settings/kcm/kcmdolphinnavigation.desktop | 6 +++++- src/settings/kcm/kcmdolphinservices.desktop | 3 +++ src/settings/kcm/kcmdolphinviewmodes.desktop | 5 +++++ src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 6 files changed, 20 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index caafdd6ee..a553034a2 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -217,6 +217,7 @@ Name[km]=តូច​ល្មម Name[ko]=축소됨 Name[lt]=Kompaktiškas Name[lv]=Kompakts +Name[mr]=संक्षिप्त Name[nb]=Kompakt Name[nds]=Drang Name[nl]=Compact diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 524625991..2b5af8205 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -40,6 +40,7 @@ Name[lv]=Dolphin pamata Name[mai]=सामान्य डाल्फिन Name[mk]=Делфин - општо Name[ml]=ഡോള്‍ഫിന്‍ പൊതുവെ +Name[mr]=डॉल्फिन सामान्य Name[ms]=Dolphin Umum Name[nb]=Dolphin generelt Name[nds]=Dolphin allmeen @@ -109,6 +110,7 @@ Comment[lv]=Šis serviss ļauj konfigurēt Dolphin pamata iestatījumus. Comment[mai]=ई सेवा अहाँकेँ सामान्य डॉल्फिन सेटिंग केँ विन्यस्त करै दैछ. Comment[mk]=Овој сервис овозможува конфигурација на општите поставувања на Делфин. Comment[ml]=പൊതുവായ ഡോള്‍ഫിന്‍ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു. +Comment[mr]=ही सेवा तुम्हाला डॉल्फिनच्या सामान्य व्यवस्थेचे संयोजन करण्यास मदत करते. Comment[ms]=Servis ini membenarkan tetapan bagi tetapan umum Dolphin. Comment[nb]=Denne tjenesten tilbyr oppsett av generelle Dolphin-innstillinger. Comment[nds]=Mit dissen Deenst laat sik allmeen Dolphin-Optschonen instellen. @@ -193,6 +195,7 @@ Name[lv]=Pamata Name[mai]=सामान्य Name[mk]=Општо Name[ml]=പൊതുവായ +Name[mr]=सामान्य Name[ms]=Umum Name[nb]=Generelt Name[nds]=Allmeen @@ -262,6 +265,7 @@ Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas Comment[lv]=Konfigurē failu pārvaldnieka pamata iestatījumus Comment[mk]=Конфигурирајте ги општите поставувања за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ പൊതുവായ സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക +Comment[mr]=फाइल व्यवस्थापकाच्या सामान्य व्यवस्थेचे संयोजन करा Comment[ms]=Selaraskan tetapan pengurus fail Comment[nb]=Tilpass generelle filbehandler-innstillinger Comment[nds]=Den Dateipleger allmeen instellen @@ -314,6 +318,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks +X-KDE-Keywords[mr]=फाइल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 69b6d6ed9..cf4bdf898 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -41,6 +41,7 @@ Name[lv]=Dolphin navigācija Name[mai]=डाल्फिन संचरण Name[mk]=Навигација во Делфин Name[ml]=ഡോള്‍ഫിന്‍ നാവിഗേഷന്‍ +Name[mr]=डॉल्फिन संचारण Name[ms]=Navigasi Dolphin Name[nb]=Navigasjon i Dolphin Name[nds]=Dolphin-Navigeren @@ -110,6 +111,7 @@ Comment[lv]=Šis serviss ļauj konfigurēt Dolphin navigācijas iestatījumus. Comment[mai]=ई सेवा अहाँकेँ डॉल्फिन संचरण केँ विन्यस्त करै दैछ Comment[mk]=Овој сервис овозможува конфигурација на навигацијата во Делфин. Comment[ml]=ഡോള്‍ഫിനകത്തു് നീങ്ങുന്നതു് ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു. +Comment[mr]=ही सेवा तुम्हाला डॉल्फिन संचारणाचे संयोजन करण्यास मदत करते. Comment[ms]=Servis ini membenarkan tetapan bagi pengemudian Dolphin. Comment[nb]=Denne tjenesten tilbyr oppsett av Dolphin-navigasjon Comment[nds]=Mit dissen Deenst lett sik de Dolphin-Navigeren instellen. @@ -192,7 +194,7 @@ Name[lv]=Navigācija Name[mai]=नेविगेशन Name[mk]=Навигација Name[ml]=നാവിഗേഷന്‍ -Name[mr]=संचारण पटल +Name[mr]=संचारण Name[ms]=Navigasi Name[nb]=Navigasjon Name[nds]=Navigeren @@ -263,6 +265,7 @@ Comment[lv]=Konfigurēē failu pārvaldnieka navigāciju Comment[mai]=फाइलक प्रबंधक संचरणकेँ बिन्यस्त करू Comment[mk]=Конфигурирајте ја навигацијата за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ നീക്കങ്ങള്‍ ക്രമീകരിയ്ക്കുക +Comment[mr]=फाइल व्यवस्थापक संचारण संयोजीत करा Comment[ms]=Selaraskan tetapan pengurus fail Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nds]=De Dateipleger-Navigeren instellen @@ -315,6 +318,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks +X-KDE-Keywords[mr]=फाइल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index ccea94b0c..e3477950f 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -40,6 +40,7 @@ Name[lv]=Dolphin servisi Name[mai]=डाल्फिन सेवा Name[mk]=Сервиси во Делфин Name[ml]=ഡോള്‍ഫിന്‍ സേവനങ്ങള്‍ +Name[mr]=डॉल्फिन सेवा Name[ms]=Servis Dolphin Name[nb]=Dolphin-tjenester Name[nds]=Dolphin-Deensten @@ -214,6 +215,7 @@ Comment[lv]=Konfigurē failu pārvaldnieka servisus Comment[mai]=फाइलक प्रबंधकक सेवा बिन्यस्त करू Comment[mk]=Конфигурирајте ги сервисите за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ സേവനങ്ങള്‍ ക്രമീകരിയ്ക്കുക +Comment[mr]=फाइल व्यवस्थापक सेवा संयोजीत करा Comment[ms]=Selaraskan tetapan pengurus fail Comment[nb]=Sett opp tjenester i filbehandleren Comment[nds]=Dateipleger-Deensten instellen @@ -265,6 +267,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks +X-KDE-Keywords[mr]=फाइल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 236630ac4..b2eaa79a2 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -40,6 +40,7 @@ Name[lv]=Dolphin skata režīmi Name[mai]=डाल्फिनक दृश्य विधि Name[mk]=Режими на преглед во Делфин Name[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ +Name[mr]=डॉल्फिन दृश्य पद्धत Name[ms]=Mod Paparan Dolphin Name[nb]=Dolphin visningsmåter Name[nds]=Dolphin-Ansichten @@ -109,6 +110,7 @@ Comment[lv]=Šis serviss ļauj konfigurēt Dolphin skata režīmus. Comment[mai]=ई सेवा अहाँकेँ डॉल्फिन दृश्य मोड केँ विन्यस्त करै दैछ Comment[mk]=Овој сервис овозможува конфигурација на режимите за преглед во Делфин. Comment[ml]=ഡോള്‍ഫിന്‍ അവതരണദശകള്‍ ക്രമീകരിയ്ക്കാന്‍ ഈ സേവനം അനുവദിയ്ക്കുന്നു. +Comment[mr]=ही सेवा तुम्हाला डॉल्फिन दृश्य पद्धतिचे संयोजन करण्यास मदत करते. Comment[nb]=Denne tjenesten tilbyr oppsett av Dolphin visningsmåter. Comment[nds]=Mit dissen Deenst laat sik de Dolphin-Ansichten instellen. Comment[nl]=Met deze dienst kunt u Dolphin-weergavemodussen configureren. @@ -189,6 +191,7 @@ Name[lv]=Skata režīmi Name[mai]=दृश्यक विधि Name[mk]=Режими на преглед Name[ml]=അവതരണ ദശകള്‍ +Name[mr]=दृश्य पद्धती Name[ms]=Mod Paparan Name[nb]=Visningsmåter Name[nds]=Ansichten @@ -260,6 +263,7 @@ Comment[lv]=Konfigurē failu pārvaldnieka skata režīmus Comment[mai]=फाइलक प्रबंधक दृश्य विधि बिन्यस्त करू Comment[mk]=Конфигурирајте ги режимите за преглед за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക +Comment[mr]=फाइल व्यवस्थापक दृश्य पद्धत संयोजीत करा Comment[ms]=Selaraskan mod pengurus fail Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nds]=Den Dateipleger sien Ansichten instellen @@ -312,6 +316,7 @@ X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[lv]=failu pārvaldnieks +X-KDE-Keywords[mr]=फाइल व्यवस्थापक X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nds]=Dateipleger X-KDE-Keywords[nl]=bestandsbeheerder diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index f6616d167..1c559c823 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -39,6 +39,7 @@ Comment[lt]=Versijų kontrolės priedas failų tvarkyklėms Comment[lv]=Versiju kontroles spraudnis Failu skatiem Comment[mk]=Приклучок за „Преглед на датотеки“ за контрола на верзии Comment[ml]=ഫയല്‍ അവതരണത്തിനുള്ള വേര്‍ഷന്‍ കണ്ട്രോള്‍ സംയോജകം +Comment[mr]=फाईल दृश्या करीता आवृत्ती नियंत्रण प्लगइन Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nds]=Verschoonkuntrull-Moduul för Dateiansichten Comment[nl]=Plugin voor versiecontrole op bestandoverzichten -- cgit v1.3 From f7216ca5911049a159b436683f65545c2f962770 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 9 Jan 2013 16:17:55 +0100 Subject: Show the file name as plain text in the rename dialog BUG: 312812 BUG: 262464 FIXED-IN: 4.10 REVIEW: 108291 --- src/views/renamedialog.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 65125c3aa..07add113a 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -72,6 +72,7 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : m_newName = items.first().name(); editLabel = new QLabel(i18nc("@label:textbox", "Rename the item %1 to:", m_newName), page); + editLabel->setTextFormat(Qt::PlainText); } else { m_newName = i18nc("@info:status", "New name #"); editLabel = new QLabel(i18ncp("@label:textbox", -- cgit v1.3 From 4fd99ef4a3a8148ac5a692984fbd996ba6ecfed8 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 9 Jan 2013 16:24:15 +0100 Subject: Show the real audio file duration in additional informations Big Thanks to Frank Reininghaus and Vishesh Handa! BUG: 311794 REVIEW: 108281 FIXED-IN: 4.10 --- src/kitemviews/private/knepomukrolesprovider.cpp | 2 +- src/kitemviews/private/knepomukrolesprovider.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/kitemviews/private/knepomukrolesprovider.cpp b/src/kitemviews/private/knepomukrolesprovider.cpp index 1bdac6dfc..3b1899278 100644 --- a/src/kitemviews/private/knepomukrolesprovider.cpp +++ b/src/kitemviews/private/knepomukrolesprovider.cpp @@ -183,7 +183,7 @@ QString KNepomukRolesProvider::orientationFromValue(int value) const QString KNepomukRolesProvider::durationFromValue(int value) const { QTime duration; - duration = duration.addMSecs(value); + duration = duration.addSecs(value); return duration.toString("hh:mm:ss"); } diff --git a/src/kitemviews/private/knepomukrolesprovider.h b/src/kitemviews/private/knepomukrolesprovider.h index 8290b571e..b8c7e51e6 100644 --- a/src/kitemviews/private/knepomukrolesprovider.h +++ b/src/kitemviews/private/knepomukrolesprovider.h @@ -73,7 +73,7 @@ private: /** * @return Duration in the format HH::MM::SS for the value given - * in milliseconds. + * in seconds. */ QString durationFromValue(int value) const; -- cgit v1.3 From d7373195f0a4bc9ec22332ad5260aa22e556d2d5 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 9 Jan 2013 22:10:04 +0100 Subject: Fix information panel interpreting html tags Only fixes the most obvious file name, the other entries in the table probably have to be fixed in the FileMetaDataWidget. REVIEW: 108307 BUG: 262464 (cherry picked from commit 3d7d900d2830c71255ff8c02f5f7439224cd4122) --- src/panels/information/informationpanelcontent.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 85571befd..9b0dd0092 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -105,6 +105,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : QFont font = m_nameLabel->font(); font.setBold(true); m_nameLabel->setFont(font); + m_nameLabel->setTextFormat(Qt::PlainText); m_nameLabel->setAlignment(Qt::AlignHCenter); m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); -- cgit v1.3 From 2a7e8b41d31f6395f3ca3803ed82a9a8094dda22 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Fri, 11 Jan 2013 16:57:43 +0100 Subject: Only use parallel sorting when sorting by name The reentrant natural comparison of strings is the only really expensive operation. Other comparison functions are much cheaper and might not be reentrant at all. Therefore, we disable parallel sorting when not sorting by name to prevent crashes and other unpleasant behaviour. BUG: 312679 FIXED-IN: 4.10 REVIEW: 108309 --- src/kitemviews/private/kfileitemmodelsortalgorithm.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/kitemviews/private/kfileitemmodelsortalgorithm.cpp b/src/kitemviews/private/kfileitemmodelsortalgorithm.cpp index 9588d19bf..ab650efea 100644 --- a/src/kitemviews/private/kfileitemmodelsortalgorithm.cpp +++ b/src/kitemviews/private/kfileitemmodelsortalgorithm.cpp @@ -26,8 +26,17 @@ void KFileItemModelSortAlgorithm::sort(KFileItemModel* model, QList::iterator begin, QList::iterator end) { - static const int numberOfThreads = QThread::idealThreadCount(); - parallelSort(model, begin, end, numberOfThreads); + if (model->sortRole() == model->roleForType(KFileItemModel::NameRole)) { + // Sorting by name can be expensive, in particular if natural sorting is + // enabled. Use all CPU cores to speed up the sorting process. + static const int numberOfThreads = QThread::idealThreadCount(); + parallelSort(model, begin, end, numberOfThreads); + } else { + // Sorting by other roles is quite fast. Use only one thread to prevent + // problems caused by non-reentrant comparison functions, see + // https://bugs.kde.org/show_bug.cgi?id=312679 + sequentialSort(model, begin, end); + } } void KFileItemModelSortAlgorithm::sequentialSort(KFileItemModel* model, -- cgit v1.3 From d3b92d2d670f39aee1b48e676cdfa4067211f515 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Fri, 11 Jan 2013 17:12:34 +0100 Subject: Slightly reduce the tinting for selected icons and previews The intention of the tinting was to make it more obvious in icons view which icons are selected. However, some icons and previews look quite ugly with the current tinting value of 1.0 (i.e., the value passed to KIconEffect::colorize). A slight reduction of this value to 0.8 makes this a little less ugly. However, the real fix is to remove the tinting altogether and find something better to indicate which items are selected. CCBUG: 309722 --- src/kitemviews/kstandarditemlistwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index e1f0f9df1..f3414e3f2 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -840,7 +840,7 @@ void KStandardItemListWidget::updatePixmapCache() if (isSelected()) { const QColor color = palette().brush(QPalette::Normal, QPalette::Highlight).color(); QImage image = m_pixmap.toImage(); - KIconEffect::colorize(image, color, 1.0f); + KIconEffect::colorize(image, color, 0.8f); m_pixmap = QPixmap::fromImage(image); } } -- cgit v1.3