From 2cc2a34c106a5e0da0a1b280e1fe86d1e8e9d7a7 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Tue, 11 Jan 2011 00:58:31 +0000 Subject: [PATCH] Resolve TODO: Use Tracker's NaturalCompare in ImageFileNavigator in order to preserve a consistent display order regardless of whether Tracker scripting or the internal navigator is being used to iterate through images. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40201 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/showimage/ImageFileNavigator.cpp | 4 ++-- src/apps/showimage/Jamfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/apps/showimage/ImageFileNavigator.cpp b/src/apps/showimage/ImageFileNavigator.cpp index 977a7e495a..ecaadefdda 100644 --- a/src/apps/showimage/ImageFileNavigator.cpp +++ b/src/apps/showimage/ImageFileNavigator.cpp @@ -33,6 +33,7 @@ #include "ProgressWindow.h" #include "ShowImageConstants.h" +#include "Utilities.h" class Navigator { @@ -344,8 +345,7 @@ FolderNavigator::_BuildEntryList() /*static*/ int FolderNavigator::_CompareRefs(const entry_ref* refA, const entry_ref* refB) { - // TODO: natural sorting? Collating via current locale? - return strcasecmp(refA->name, refB->name); + return BPrivate::NaturalCompare(refA->name, refB->name); } diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile index 541f405f85..40f7c861eb 100644 --- a/src/apps/showimage/Jamfile +++ b/src/apps/showimage/Jamfile @@ -4,6 +4,7 @@ UsePrivateSystemHeaders ; UsePrivateHeaders tracker shared ; UsePublicHeaders [ FDirName be_apps Tracker ] ; SubDirHdrs $(HAIKU_TOP) src kits tracker ; +UseHeaders [ FDirName $(HAIKU_TOP) src kits tracker ] : false ; Application ShowImage : Filter.cpp