diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/wx/content_panel.cc | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,8 @@ +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. diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 59886229c..6d4a11868 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -40,8 +40,6 @@ #include <boost/foreach.hpp> #include <iostream> -#include "lib/image_filename_sorter.cc" - using std::list; using std::string; using std::cout; @@ -518,10 +516,11 @@ void 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 */ |