Author: anevilyak Date: 2011-01-11 01:58:31 +0100 (Tue, 11 Jan 2011) New Revision: 40201 Changeset: http://dev.haiku-os.org/changeset/40201 Modified: haiku/trunk/src/apps/showimage/ImageFileNavigator.cpp haiku/trunk/src/apps/showimage/Jamfile Log: 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. Modified: haiku/trunk/src/apps/showimage/ImageFileNavigator.cpp =================================================================== --- haiku/trunk/src/apps/showimage/ImageFileNavigator.cpp 2011-01-11 00:53:33 UTC (rev 40200) +++ haiku/trunk/src/apps/showimage/ImageFileNavigator.cpp 2011-01-11 00:58:31 UTC (rev 40201) @@ -33,6 +33,7 @@ #include "ProgressWindow.h" #include "ShowImageConstants.h" +#include "Utilities.h" class Navigator { @@ -344,8 +345,7 @@ /*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); } Modified: haiku/trunk/src/apps/showimage/Jamfile =================================================================== --- haiku/trunk/src/apps/showimage/Jamfile 2011-01-11 00:53:33 UTC (rev 40200) +++ haiku/trunk/src/apps/showimage/Jamfile 2011-01-11 00:58:31 UTC (rev 40201) @@ -4,6 +4,7 @@ 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