From ee2d453f1f3f3efa28d6c9cea1d216a45702dfbc Mon Sep 17 00:00:00 2001 From: Script Kiddy Date: Fri, 19 Apr 2013 13:27:40 +0200 Subject: SVN_SILENT made messages (.desktop file) --- src/settings/kcm/kcmdolphingeneral.desktop | 2 +- src/settings/kcm/kcmdolphinnavigation.desktop | 6 +++--- src/settings/kcm/kcmdolphinviewmodes.desktop | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 2ecfd7936..5f3772d28 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -88,7 +88,7 @@ Comment[es]=Este servicio le permite hacer la configuración general de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini üldisi seadistusi. Comment[eu]=Zerbitzu honen bitartez Dolphin-en ezarpen orokorrak konfiguratu daitezke. 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[fr]=Ce service permet de configurer les paramètres généraux de Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de algemiene dolfyn opsjes ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir na socruithe ginearálta Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración xeral de Dolphin. diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 75c2de379..ab79449f5 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -18,7 +18,7 @@ Name[et]=Dolphini liikumine Name[eu]=Dolphin nabigazioa Name[fa]=ناوبری دلفین Name[fi]=Dolphin – selaus -Name[fr]=Navigation dans Dolphin +Name[fr]=Navigation avec Dolphin Name[fy]=Dolfyn navigaasje Name[ga]=Nascleanúint Dolphin Name[gl]=Configuración da navegación de Dolphin @@ -89,7 +89,7 @@ Comment[es]=Este servicio le permite configurar la navegación de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphini liikumist. Comment[eu]=Zerbitzu honen bitartez Dolphin-en nabigazioa konfiguratu daiteke. Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia. -Comment[fr]=Ce service permet de configurer la navigation dans Dolphin. +Comment[fr]=Ce service permet de configurer la navigation avec Dolphin. Comment[fy]=Mei dizze tsjinst kinne jo de dolfyn navigaasje ynstelle. Comment[ga]=Leis an tseirbhís seo is féidir nascleanúint Dolphin a chumrú. Comment[gl]=Este servizo permite modificar a configuración da navegación de Dolphin. @@ -243,7 +243,7 @@ Comment[es]=Configurar las preferencias de navegación del gestor de archivos Comment[et]=Failihalduri liikumise seadistamine Comment[eu]=Konfiguratu fitxategi-kudeatzailearen nabigazioa Comment[fi]=Tiedostonhallinnan selausasetukset -Comment[fr]=Configuration de la navigation dans le gestionnaire de fichiers +Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers Comment[fy]=Triembehearnavigaasje ynstelle Comment[ga]=Cumraigh nascleanúint bhainisteoir na gcomhad Comment[gl]=Configura as navegación co xestor de ficheiros diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 8c26e2e60..956d825ba 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -240,7 +240,7 @@ Comment[es]=Configurar los modos de vista del gestor de archivos Comment[et]=Failihalduri vaaterežiimide seadistamine Comment[eu]=Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak Comment[fi]=Tiedostonhallinnan katselutilojen asetukset -Comment[fr]=Configuration des modes d'affichage du gestionnaire de fichiers +Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers Comment[fy]=Triembehear werjeftemodus ynstelle Comment[ga]=Cumraigh amhairc bhainisteoir na gcomhad Comment[gl]=Configura os modos de visualización do xestor de ficheiros -- cgit v1.3 From 151c8d8c42115717151d88e17b55b60a74b5e791 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 22 Apr 2013 21:21:31 +0200 Subject: Always determine icons for the visible items first When entering a folder, KFileItemModelRolesUpdater has not yet been informed about the visible index range by the view when it tries to determine icons synchronously. This resulted in the problem that it tried to determine icons for all items in random order, and some visible icons were somtimes still unknown after the "synchronous icon loading" timeout of 200 ms. This commit tries to improve the situation by loading icons starting with the first item in increasing order. This should make it less likely that some visible items still have unknown icons after 200 ms. BUG: 316129 FIXED-IN: 4.10.3 REVIEW: 109843 --- src/kitemviews/kfileitemlistview.cpp | 1 + src/kitemviews/kfileitemmodelrolesupdater.cpp | 17 ++++++++++++++++- src/kitemviews/kfileitemmodelrolesupdater.h | 3 +++ src/kitemviews/kitemlistview.cpp | 5 +++++ src/kitemviews/kitemlistview.h | 2 ++ 5 files changed, 27 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index b7f7455b4..70ce11b1f 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -323,6 +323,7 @@ void KFileItemListView::updateVisibleIndexRange() const int index = firstVisibleIndex(); const int count = lastVisibleIndex() - index + 1; + m_modelRolesUpdater->setMaximumVisibleItems(maximumVisibleItems()); m_modelRolesUpdater->setVisibleIndexRange(index, count); if (m_updateIconSizeTimer->isActive()) { diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 9fca8a1f6..39d01e232 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -79,6 +79,7 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO m_iconSize(), m_firstVisibleIndex(0), m_lastVisibleIndex(-1), + m_maximumVisibleItems(100), m_roles(), m_enabledPlugins(), m_pendingVisibleItems(), @@ -178,6 +179,11 @@ void KFileItemModelRolesUpdater::setVisibleIndexRange(int index, int count) } } +void KFileItemModelRolesUpdater::setMaximumVisibleItems(int count) +{ + m_maximumVisibleItems = count; +} + void KFileItemModelRolesUpdater::setPreviewsShown(bool show) { if (show == m_previewShown) { @@ -670,7 +676,16 @@ void KFileItemModelRolesUpdater::startUpdating(const KItemRangeList& itemRanges) const int lastIndex = range.index + range.count - 1; for (int i = range.index; i <= lastIndex; ++i) { const KFileItem item = m_model->fileItem(i); - if (!hasValidIndexRange || (i >= m_firstVisibleIndex && i <= m_lastVisibleIndex)) { + bool visible; + if (hasValidIndexRange) { + visible = (i >= m_firstVisibleIndex && i <= m_lastVisibleIndex); + } else { + // If the view has not informed us about the visible range yet, + // just assume that the first items are visible. + visible = (i < m_maximumVisibleItems); + } + + if (visible) { m_pendingVisibleItems.insert(item); } else { m_pendingInvisibleItems.insert(item); diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index 68559d8dd..b837e8c7f 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -77,6 +77,8 @@ public: */ void setVisibleIndexRange(int index, int count); + void setMaximumVisibleItems(int count); + /** * If \a show is set to true, the "iconPixmap" role will be filled with a preview * of the file. If \a show is false the MIME type icon will be used for the "iconPixmap" @@ -254,6 +256,7 @@ private: QSize m_iconSize; int m_firstVisibleIndex; int m_lastVisibleIndex; + int m_maximumVisibleItems; QSet m_roles; QSet m_resolvableRoles; QStringList m_enabledPlugins; diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 9ebad7f8b..763b7e68f 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -208,6 +208,11 @@ qreal KItemListView::maximumItemOffset() const return m_layouter->maximumItemOffset(); } +int KItemListView::maximumVisibleItems() const +{ + return m_layouter->maximumVisibleItems(); +} + void KItemListView::setVisibleRoles(const QList& roles) { const QList previousRoles = m_visibleRoles; diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index cd59ddcb5..6d609a9df 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -92,6 +92,8 @@ public: qreal maximumItemOffset() const; + int maximumVisibleItems() const; + void setVisibleRoles(const QList& roles); QList visibleRoles() const; -- cgit v1.3 From 37e796522b3864758edb7756d60c44b4929200f3 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 22 Apr 2013 21:36:57 +0200 Subject: Comment out assertion to fix a crash when filtering in Icons/Compat View I'm not sure yet if there is a problem somewhere else in the code. For the time being, I think it's better to replace the assert by a TODO comment to prevent that users find out the hard way that there is something that we're not quite sure about. BUG: 317827 FIXED-IN: 4.10.3 --- src/kitemviews/kitemlistview.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 763b7e68f..a2629c565 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -1147,7 +1147,10 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) // Important: Don't read any m_layouter-property inside the for-loop in case if // multiple ranges are given! m_layouter accesses m_sizeHintResolver which is // updated in each loop-cycle and has only a consistent state after the loop. - Q_ASSERT(m_layouter->isDirty()); + // TODO: This assert can be hit when filtering in Icons and Compact view, + // see https://bugs.kde.org/show_bug.cgi?id=317827 comments 2 and 3. + // We should try to figure out if the assert is wrong or if there is a bug in the code. + //Q_ASSERT(m_layouter->isDirty()); #endif m_endTransactionAnimationHint = NoAnimation; endTransaction(); -- cgit v1.3 From 8a40b0ee4ad4d083b1c3de942bcbda1c93d46b20 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Tue, 23 Apr 2013 19:25:52 +0200 Subject: Do not dereference null pointer in KItemListViewAccessible BUG: 316285 FIXED-IN: 4.10.3 --- src/kitemviews/kitemlistviewaccessible.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index d4b8bf6e6..565c2151e 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -242,9 +242,15 @@ QRect KItemListViewAccessible::rect(int child) const if (!view()->isVisible()) { return QRect(); } - const QPoint origin = view()->scene()->views()[0]->mapToGlobal(QPoint(0, 0)); - const QRect viewRect = view()->geometry().toRect(); - return viewRect.translated(origin); + + const QGraphicsScene* scene = view()->scene(); + if (scene) { + const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0)); + const QRect viewRect = view()->geometry().toRect(); + return viewRect.translated(origin); + } else { + return QRect(); + } } int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const -- cgit v1.3 From 8f4d13dab8165e4c60c320d4b867e8476bdb041b Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Tue, 23 Apr 2013 19:31:08 +0200 Subject: Disable Find/Replace in the "rename inline" line edit These actions do not work correctly because renaming is considered finished as soon as the line edit loses focus, which happens when the "Replace" dialog pops up. BUG: 317772 FIXED-IN: 4.10.3 --- src/kitemviews/private/kitemlistroleeditor.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp index 4f4006010..9f3b53c05 100644 --- a/src/kitemviews/private/kitemlistroleeditor.cpp +++ b/src/kitemviews/private/kitemlistroleeditor.cpp @@ -32,6 +32,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) : setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setAcceptRichText(false); + enableFindReplace(false); document()->setDocumentMargin(0); if (parent) { -- cgit v1.3