as I think this is less surprising than trying to do it by number.
Numerically-named files are much more likely to be added using
"Add folder.."
+2016-01-07 c.hetherington <cth@carlh.net>
+
+ * Sort image files added using "Add file(s)..." alphabetically
+ rather than trying to find numbers in the filenames.
+
2016-01-07 Carl Hetherington <cth@carlh.net>
* Version 2.6.12 released.
#include <boost/foreach.hpp>
#include <iostream>
-#include "lib/image_filename_sorter.cc"
-
using std::list;
using std::string;
using std::cout;
ContentPanel::add_files (list<boost::filesystem::path> paths)
{
/* It has been reported that the paths returned from e.g. wxFileDialog are not always sorted;
- I can't reproduce that, but sort them anyway.
+ I can't reproduce that, but sort them anyway. Don't use ImageFilenameSorter as a normal
+ alphabetical sort is expected here.
*/
- paths.sort (ImageFilenameSorter ());
+ paths.sort ();
/* XXX: check for lots of files here and do something */