Ticket #9402: 0001-Support-sensitive-insensitive-and-natural-name-sort.2.patch

src/interface/LocalListView.cpp

@@ -799 +799 @@
 class CLocalListViewSort : public CListViewSort
 {
 public:
-    CLocalListViewSort(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode)
-        : m_fileData(fileData), m_dirSortMode(dirSortMode)
+    CLocalListViewSort(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : m_fileData(fileData), m_dirSortMode(dirSortMode), m_nameSortMode(nameSortMode)
     {
     }
 
@@ -811 +811 @@
     #define CMP(f, data1, data2) \
         {\
             int res = f(data1, data2);\
-            if (res == -1)\
+            if (res < 0)\
                 return true;\
-            else if (res == 1)\
+            else if (res > 0)\
                 return false;\
         }
 
     #define CMP_LESS(f, data1, data2) \
         {\
             int res = f(data1, data2);\
-            if (res == -1)\
+            if (res < 0)\
                 return true;\
             else\
                 return false;\
@@ -868 +868 @@
 
     inline int CmpName(const CLocalFileData &data1, const CLocalFileData &data2) const
     {
-#ifdef __WXMSW__
-        return data1.name.CmpNoCase(data2.name);
-#else
-        return data1.name.Cmp(data2.name);
-#endif
+        switch (m_nameSortMode)
+        {
+        case namesort_casesensitive:
+            return CmpCase(data1.name, data2.name);
+
+        default:
+        case namesort_caseinsensitive:
+            return CmpNoCase(data1.name, data2.name);
+
+        case namesort_natural:
+            return CmpNatural(data1.name, data2.name);
+        }
     }
 
     inline int CmpSize(const CLocalFileData &data1, const CLocalFileData &data2) const
@@ -907 +914 @@
 protected:
     std::vector<CLocalFileData>& m_fileData;
 
-    DirSortMode m_dirSortMode;
+    const enum DirSortMode m_dirSortMode;
+    const enum NameSortMode m_nameSortMode;
 };
 
 template<class T> class CReverseSort : public T
 {
 public:
-    CReverseSort(std::vector<CLocalFileData>& fileData, enum CLocalListViewSort::DirSortMode dirSortMode, CLocalListView* pListView)
-        : T(fileData, dirSortMode, pListView)
+    CReverseSort(std::vector<CLocalFileData>& fileData, enum CLocalListViewSort::DirSortMode dirSortMode, enum CLocalListViewSort::NameSortMode nameSortMode, CLocalListView* pListView)
+        : T(fileData, dirSortMode, nameSortMode, pListView)
     {
     }
 
@@ -927 +935 @@
 class CLocalListViewSortName : public CLocalListViewSort
 {
 public:
-    CLocalListViewSortName(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, CLocalListView* pListView)
-        : CLocalListViewSort(fileData, dirSortMode)
+    CLocalListViewSortName(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CLocalListView* pListView)
+        : CLocalListViewSort(fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -947 +955 @@
 class CLocalListViewSortSize : public CLocalListViewSort
 {
 public:
-    CLocalListViewSortSize(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, CLocalListView* pListView)
-        : CLocalListViewSort(fileData, dirSortMode)
+    CLocalListViewSortSize(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CLocalListView* pListView)
+        : CLocalListViewSort(fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -969 +977 @@
 class CLocalListViewSortType : public CLocalListViewSort
 {
 public:
-    CLocalListViewSortType(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, CLocalListView* pListView)
-        : CLocalListViewSort(fileData, dirSortMode)
+    CLocalListViewSortType(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CLocalListView* pListView)
+        : CLocalListViewSort(fileData, dirSortMode, nameSortMode)
     {
         m_pListView = pListView;
     }
@@ -1000 +1008 @@
 class CLocalListViewSortTime : public CLocalListViewSort
 {
 public:
-    CLocalListViewSortTime(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, CLocalListView* pListView)
-        : CLocalListViewSort(fileData, dirSortMode)
+    CLocalListViewSortTime(std::vector<CLocalFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CLocalListView* pListView)
+        : CLocalListViewSort(fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -1022 +1030 @@
 CFileListCtrl<CLocalFileData>::CSortComparisonObject CLocalListView::GetSortComparisonObject()
 {
     CLocalListViewSort::DirSortMode dirSortMode = GetDirSortMode();
+    CLocalListViewSort::NameSortMode nameSortMode = GetNameSortMode();
 
     if (!m_sortDirection)
     {
         if (m_sortColumn == 1)
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortSize(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortSize(m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 2)
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortType(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortType(m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 3)
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortTime(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortTime(m_fileData, dirSortMode, nameSortMode, this));
         else
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortName(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortName(m_fileData, dirSortMode, nameSortMode, this));
     }
     else
     {
         if (m_sortColumn == 1)
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortSize_Reverse(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortSize_Reverse(m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 2)
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortType_Reverse(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortType_Reverse(m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 3)
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortTime_Reverse(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortTime_Reverse(m_fileData, dirSortMode, nameSortMode, this));
         else
-            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortName_Reverse(m_fileData, dirSortMode, this));
+            return CFileListCtrl<CLocalFileData>::CSortComparisonObject(new CLocalListViewSortName_Reverse(m_fileData, dirSortMode, nameSortMode, this));
     }
 }
 

src/interface/LocalTreeView.cpp

@@ -9 +9 @@
 #include "inputdialog.h"
 #include "local_filesys.h"
 #include "dragdropmanager.h"
+#include "Options.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -701 +702 @@
     wxTreeItemId item;
 };
 
-static bool sortfunc(const wxString& a, const wxString& b)
-{
-#ifdef __WXMSW__
-    return b.CmpNoCase(a) > 0;
-#else
-    return b.Cmp(a) > 0;
-#endif
-}
-
 void CLocalTreeView::Refresh()
 {
     wxLogNull nullLog;
@@ -718 +710 @@
 
     std::list<t_dir> dirsToCheck;
 
+    switch (COptions::Get()->GetOptionVal(OPTION_FILELIST_NAMESORT))
+    {
+    case 0:
+    default:
+        m_nameSortMode = CListViewSort::namesort_caseinsensitive;
+        break;
+    case 1:
+        m_nameSortMode = CListViewSort::namesort_casesensitive;
+        break;
+    case 2:
+        m_nameSortMode = CListViewSort::namesort_natural;
+        break;
+    }
+
 #ifdef __WXMSW__
     int prevErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
 
@@ -775 +781 @@
         }
 
         // Step 2: Enumerate subdirectories on disk and sort them
-        std::list<wxString> dirs;
+        wxArrayString dirs;
 
         wxString file;
         const wxLongLong size(-1);
@@ -796 +802 @@
 
             dirs.push_back(file);
         }
-        dirs.sort(sortfunc);
+        dirs.Sort(CListViewSort::GetCmpFunction(m_nameSortMode));
 
         bool inserted = false;
 
         // Step 3: Merge list of subdirectories with subtree.
         wxTreeItemId child = GetLastChild(dir.item);
-        std::list<wxString>::reverse_iterator iter = dirs.rbegin();
+        wxArrayString::reverse_iterator iter = dirs.rbegin();
         while (child || iter != dirs.rend())
         {
             int cmp;
@@ -911 +917 @@
 {
     wxString label1 = GetItemText(item1);
     wxString label2 = GetItemText(item2);
-#ifdef __WXMSW__
-    return label1.CmpNoCase(label2);
-#else
-    return label1.Cmp(label2);
-#endif
+
+    switch (m_nameSortMode)
+    {
+    case CListViewSort::namesort_casesensitive:
+        return CListViewSort::CmpCase(label1, label2);
+
+    default:
+    case CListViewSort::namesort_caseinsensitive:
+        return CListViewSort::CmpNoCase(label1, label2);
+
+    case CListViewSort::namesort_natural:
+        return CListViewSort::CmpNatural(label1, label2);
+    }
 }
 
 void CLocalTreeView::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2)

src/interface/LocalTreeView.h

@@ -4 +4 @@
 #include "systemimagelist.h"
 #include "state.h"
 #include "treectrlex.h"
+#include "filelistctrl.h"
 
 class CQueueView;
 
@@ -88 +89 @@
 
     wxTreeItemId m_contextMenuItem;
     wxTreeItemId m_dropHighlight;
+    enum CListViewSort::NameSortMode m_nameSortMode;
 };
 
 #endif

src/interface/Options.cpp

@@ -46 +46 @@
     const Flags flags; // internal items won't get written to settings file nor loaded from there
 };
 
+#ifdef __WXMSW__
+//case insensitive
+#define DEFAULT_FILENAME_SORT   _T("0")
+#else
+//case sensitive
+#define DEFAULT_FILENAME_SORT   _T("1")
+#endif
+
 static const t_Option options[OPTIONS_NUM] =
 {
     // Note: A few options are versioned due to a changed
@@ -126 +134 @@
     { "File Pane Swap", number, _T("0"), normal },
     { "Last local directory", string, _T(""), normal },
     { "Filelist directory sort", number, _T("0"), normal },
+    { "Filelist name sort", number, DEFAULT_FILENAME_SORT, normal },
     { "Queue successful autoclear", number, _T("0"), normal },
     { "Queue column widths", string, _T(""), normal },
     { "Local filelist colwidths", string, _T(""), normal },
@@ -456 +465 @@
             value = 0;
         break;
     case OPTION_FILELIST_DIRSORT:
+    case OPTION_FILELIST_NAMESORT:
         if (value < 0 || value > 2)
             value = 0;
         break;

src/interface/Options.h

@@ -31 +31 @@
     OPTION_FILEPANE_SWAP,
     OPTION_LASTLOCALDIR,
     OPTION_FILELIST_DIRSORT,
+    OPTION_FILELIST_NAMESORT,
     OPTION_QUEUE_SUCCESSFUL_AUTOCLEAR,
     OPTION_QUEUE_COLUMN_WIDTHS,
     OPTION_LOCALFILELIST_COLUMN_WIDTHS,

src/interface/RemoteListView.cpp

@@ -901 +901 @@
 class CRemoteListViewSort : public CListViewSort
 {
 public:
-    CRemoteListViewSort(const CDirectoryListing* const pDirectoryListing, enum DirSortMode dirSortMode)
-        : m_pDirectoryListing(pDirectoryListing), m_dirSortMode(dirSortMode)
+    CRemoteListViewSort(const CDirectoryListing* const pDirectoryListing, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : m_pDirectoryListing(pDirectoryListing), m_dirSortMode(dirSortMode), m_nameSortMode(nameSortMode)
     {
     }
 
     #define CMP(f, data1, data2) \
         {\
             int res = f(data1, data2);\
-            if (res == -1)\
+            if (res < 0)\
                 return true;\
-            else if (res == 1)\
+            else if (res > 0)\
                 return false;\
         }
 
     #define CMP_LESS(f, data1, data2) \
         {\
             int res = f(data1, data2);\
-            if (res == -1)\
+            if (res < 0)\
                 return true;\
             else\
                 return false;\
@@ -966 +966 @@
 
     inline int CmpName(const CDirentry &data1, const CDirentry &data2) const
     {
-#ifdef __WXMSW__
-        return data1.name.CmpNoCase(data2.name);
-#else
-        return data1.name.Cmp(data2.name);
-#endif
+        switch (m_nameSortMode)
+        {
+        case namesort_casesensitive:
+            return CmpCase(data1.name, data2.name);
+
+        default:
+        case namesort_caseinsensitive:
+            return CmpNoCase(data1.name, data2.name);
+
+        case namesort_natural:
+            return CmpNatural(data1.name, data2.name);
+        }
     }
 
     inline int CmpSize(const CDirentry &data1, const CDirentry &data2) const
@@ -1006 +1013 @@
     const CDirectoryListing* const m_pDirectoryListing;
 
     const enum DirSortMode m_dirSortMode;
+    const enum NameSortMode m_nameSortMode;
 };
 
 template<class T> class CReverseSort : public T
 {
 public:
-    CReverseSort(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum CRemoteListViewSort::DirSortMode dirSortMode, CRemoteListView* const pRemoteListView)
-        : T(pDirectoryListing, fileData, dirSortMode, pRemoteListView)
+    CReverseSort(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum CRemoteListViewSort::DirSortMode dirSortMode, enum CRemoteListViewSort::NameSortMode nameSortMode, CRemoteListView* const pRemoteListView)
+        : T(pDirectoryListing, fileData, dirSortMode, nameSortMode, pRemoteListView)
     {
     }
 
@@ -1025 +1033 @@
 class CRemoteListViewSortName : public CRemoteListViewSort
 {
 public:
-    CRemoteListViewSortName(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, CRemoteListView* const pRemoteListView)
-        : CRemoteListViewSort(pDirectoryListing, dirSortMode)
+    CRemoteListViewSortName(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CRemoteListView* const pRemoteListView)
+        : CRemoteListViewSort(pDirectoryListing, dirSortMode, nameSortMode)
     {
     }
 
@@ -1045 +1053 @@
 class CRemoteListViewSortSize : public CRemoteListViewSort
 {
 public:
-    CRemoteListViewSortSize(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, CRemoteListView* const pRemoteListView)
-        : CRemoteListViewSort(pDirectoryListing, dirSortMode)
+    CRemoteListViewSortSize(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CRemoteListView* const pRemoteListView)
+        : CRemoteListViewSort(pDirectoryListing, dirSortMode, nameSortMode)
     {
     }
 
@@ -1067 +1075 @@
 class CRemoteListViewSortType : public CRemoteListViewSort
 {
 public:
-    CRemoteListViewSortType(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, CRemoteListView* const pRemoteListView)
-        : CRemoteListViewSort(pDirectoryListing, dirSortMode), m_pRemoteListView(pRemoteListView), m_fileData(fileData)
+    CRemoteListViewSortType(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CRemoteListView* const pRemoteListView)
+        : CRemoteListViewSort(pDirectoryListing, dirSortMode, nameSortMode), m_pRemoteListView(pRemoteListView), m_fileData(fileData)
     {
     }
 
@@ -1100 +1108 @@
 class CRemoteListViewSortTime : public CRemoteListViewSort
 {
 public:
-    CRemoteListViewSortTime(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, CRemoteListView* const pRemoteListView)
-        : CRemoteListViewSort(pDirectoryListing, dirSortMode)
+    CRemoteListViewSortTime(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CRemoteListView* const pRemoteListView)
+        : CRemoteListViewSort(pDirectoryListing, dirSortMode, nameSortMode)
     {
     }
 
@@ -1122 +1130 @@
 class CRemoteListViewSortPermissions : public CRemoteListViewSort
 {
 public:
-    CRemoteListViewSortPermissions(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, CRemoteListView* const pRemoteListView)
-        : CRemoteListViewSort(pDirectoryListing, dirSortMode)
+    CRemoteListViewSortPermissions(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CRemoteListView* const pRemoteListView)
+        : CRemoteListViewSort(pDirectoryListing, dirSortMode, nameSortMode)
     {
     }
 
@@ -1144 +1152 @@
 class CRemoteListViewSortOwnerGroup : public CRemoteListViewSort
 {
 public:
-    CRemoteListViewSortOwnerGroup(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, CRemoteListView* const pRemoteListView)
-        : CRemoteListViewSort(pDirectoryListing, dirSortMode)
+    CRemoteListViewSortOwnerGroup(const CDirectoryListing* const pDirectoryListing, std::vector<CGenericFileData>& fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode, CRemoteListView* const pRemoteListView)
+        : CRemoteListViewSort(pDirectoryListing, dirSortMode, nameSortMode)
     {
     }
 
@@ -2956 +2964 @@
 CFileListCtrl<CGenericFileData>::CSortComparisonObject CRemoteListView::GetSortComparisonObject()
 {
     CRemoteListViewSort::DirSortMode dirSortMode = GetDirSortMode();
+    CRemoteListViewSort::NameSortMode nameSortMode = GetNameSortMode();
 
     const CDirectoryListing* pDirectoryListing = m_pDirectoryListing.Value();
     if (!m_sortDirection)
     {
         if (m_sortColumn == 1)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortSize(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortSize(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 2)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortType(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortType(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 3)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortTime(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortTime(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 4)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortPermissions(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortPermissions(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 5)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortOwnerGroup(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortOwnerGroup(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortName(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortName(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
     }
     else
     {
         if (m_sortColumn == 1)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortSize_Reverse(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortSize_Reverse(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 2)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortType_Reverse(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortType_Reverse(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 3)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortTime_Reverse(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortTime_Reverse(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 4)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortPermissions_Reverse(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortPermissions_Reverse(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else if (m_sortColumn == 5)
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortOwnerGroup_Reverse(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortOwnerGroup_Reverse(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
         else
-            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortName_Reverse(pDirectoryListing, m_fileData, dirSortMode, this));
+            return CFileListCtrl<CGenericFileData>::CSortComparisonObject(new CRemoteListViewSortName_Reverse(pDirectoryListing, m_fileData, dirSortMode, nameSortMode, this));
     }
 }
 

src/interface/RemoteTreeView.cpp

@@ -11 +11 @@
 #include "queue.h"
 #include "QueueView.h"
 #include "themeprovider.h"
+#include "Options.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -281 +282 @@
 {
     m_busy = true;
 
+    switch (COptions::Get()->GetOptionVal(OPTION_FILELIST_NAMESORT))
+    {
+    case 0:
+    default:
+        m_nameSortMode = CListViewSort::namesort_caseinsensitive;
+        break;
+    case 1:
+        m_nameSortMode = CListViewSort::namesort_casesensitive;
+        break;
+    case 2:
+        m_nameSortMode = CListViewSort::namesort_natural;
+        break;
+    }
+
     if (!pListing)
     {
         m_ExpandAfterList = wxTreeItemId();
@@ -555 +570 @@
     SortChildren(parent);
 }
 
-static bool sortfunc(const wxString& a, const wxString& b)
-{
-    int cmp = a.CmpNoCase(b);
-
-    if (!cmp)
-        cmp = a.Cmp(b);
-
-    return cmp < 0;
-}
-
-
 void CRemoteTreeView::RefreshItem(wxTreeItemId parent, const CDirectoryListing& listing, bool will_select_parent)
 {
     SetItemImages(parent, false);
@@ -582 +586 @@
 
     const wxString path = listing.path.GetPath();
 
-    std::list<wxString> dirs;
+    wxArrayString dirs;
     for (unsigned int i = 0; i < listing.GetCount(); i++)
     {
         if (!listing[i].is_dir())
@@ -592 +596 @@
             dirs.push_back(listing[i].name);
     }
 
-    dirs.sort(sortfunc);
+    dirs.Sort(CListViewSort::GetCmpFunction(m_nameSortMode));
 
     bool inserted = false;
     child = GetLastChild(parent);
-    std::list<wxString>::reverse_iterator iter = dirs.rbegin();
+    wxArrayString::reverse_iterator iter = dirs.rbegin();
     while (child && iter != dirs.rend())
     {
         int cmp = GetItemText(child).CmpNoCase(*iter);
@@ -702 +706 @@
     wxString label1 = GetItemText(item1);
     wxString label2 = GetItemText(item2);
 
-    int cmp = label1.CmpNoCase(label2);
-    if (cmp)
-        return cmp;
-    return label1.Cmp(label2);
+    switch (m_nameSortMode)
+    {
+    case CListViewSort::namesort_casesensitive:
+        return CListViewSort::CmpCase(label1, label2);
+
+    default:
+    case CListViewSort::namesort_caseinsensitive:
+        return CListViewSort::CmpNoCase(label1, label2);
+
+    case CListViewSort::namesort_natural:
+        return CListViewSort::CmpNatural(label1, label2);
+    }
 }
 
 void CRemoteTreeView::OnItemExpanding(wxTreeEvent& event)

src/interface/RemoteTreeView.h

@@ -5 +5 @@
 #include "state.h"
 #include "filter.h"
 #include "treectrlex.h"
+#include "filelistctrl.h"
 
 class CQueueView;
 class CRemoteTreeView : public wxTreeCtrlEx, CSystemImageList, CStateEventHandler
@@ -71 +72 @@
     void OnMenuGeturl(wxCommandEvent& event);
 
     wxTreeItemId m_contextMenuItem;
+    enum CListViewSort::NameSortMode m_nameSortMode;
+
 };
 
 #endif

src/interface/filelistctrl.cpp

@@ -433 +433 @@
     return dirSortMode;
 }
 
+template<class CFileData> CListViewSort::NameSortMode CFileListCtrl<CFileData>::GetNameSortMode()
+{
+    const int nameSortOption = COptions::Get()->GetOptionVal(OPTION_FILELIST_NAMESORT);
+
+    enum CListViewSort::NameSortMode nameSortMode;
+    switch (nameSortOption)
+    {
+    case 0:
+    default:
+        nameSortMode = CListViewSort::namesort_caseinsensitive;
+        break;
+    case 1:
+        nameSortMode = CListViewSort::namesort_casesensitive;
+        break;
+    case 2:
+        nameSortMode = CListViewSort::namesort_natural;
+        break;
+    }
+
+    return nameSortMode;
+}
+
 template<class CFileData> void CFileListCtrl<CFileData>::OnColumnClicked(wxListEvent &event)
 {
     int col = m_pVisibleColumnMapping[event.GetColumn()];

src/interface/filelistctrl.h

@@ -33 +33 @@
         dirsort_onbottom,
         dirsort_inline
     };
+    enum NameSortMode
+    {
+        namesort_caseinsensitive,
+        namesort_casesensitive,
+        namesort_natural
+    };
 
     virtual bool operator()(int a, int b) const = 0;
     virtual ~CListViewSort() {} // Without this empty destructor GCC complains
+
+    static int CmpCase(const wxString& str1, const wxString& str2)
+    {
+        return str1.Cmp(str2);
+    }
+
+    static int CmpNoCase(const wxString& str1, const wxString& str2)
+    {
+        int cmp = str1.CmpNoCase(str2);
+        if (cmp)
+            return cmp;
+        return str1.Cmp(str2);
+    }
+
+    static int CmpNatural(const wxString& str1, const wxString& str2)
+    {
+        wxString::const_iterator p1 = str1.begin();
+        wxString::const_iterator p2 = str2.begin();
+
+        int res = 0;
+        int zeroCount = 0;
+        bool isNumber = false;
+        for (; p1 != str1.end() && p2 != str2.end(); ++p1, ++p2) {
+            int diff = (int)wxTolower(*p1) - (int)wxTolower(*p2);
+            if (isNumber) {
+                if (res == 0)
+                    res = diff;
+                int nbDigits = (wxIsdigit(*p1) ? 1 : 0) + (wxIsdigit(*p2) ? 1 : 0);
+                if (nbDigits == 0 && res == 0) {
+                    if (zeroCount)
+                        break;
+                    isNumber = false;
+                } else if (nbDigits != 2)
+                    break;
+            } else if (wxIsdigit(*p1) && wxIsdigit(*p2)) {
+                zeroCount = 0;
+                for(; *p1 == '0' && p1+1 != str1.end() && wxIsdigit(*(p1+1)); ++p1)
+                    zeroCount++;
+                for(; *p2 == '0' && p2+1 != str2.end() && wxIsdigit(*(p2+1)); ++p2)
+                    zeroCount--;
+                res = *p1 - *p2;
+                isNumber = true;
+            } else if (diff)
+                return diff;
+        }
+
+        if (res == 0 && isNumber)
+            res = zeroCount;
+
+        if (p1 == str1.end() && p2 == str2.end())
+            return res;
+        if (!isNumber || res == 0)
+             return p1 == str1.end() ? -1 : 1;
+        if (p1 != str1.end() && wxIsdigit(*p1))
+            return 1;       //more digits
+        if (p2 != str2.end() && wxIsdigit(*p2))
+            return -1;      //fewer digits
+        return res;         //same length, compare first different digit in the sequence
+    }
+
+    typedef int (* CompareFunction)(const wxString&, const wxString&);
+    static CompareFunction GetCmpFunction(NameSortMode mode)
+    {
+        switch (mode)
+        {
+        default:
+        case CListViewSort::namesort_caseinsensitive:
+            return &CListViewSort::CmpNoCase;
+        case CListViewSort::namesort_casesensitive:
+            return &CListViewSort::CmpCase;
+        case CListViewSort::namesort_natural:
+            return &CListViewSort::CmpNatural;
+        }
+    }
 };
 
 namespace genericTypes {
@@ -100 +180 @@
     void InitSort(int optionID); // Has to be called after initializing columns
     void SortList(int column = -1, int direction = -1, bool updateSelections = true);
     enum CListViewSort::DirSortMode GetDirSortMode();
+    enum CListViewSort::NameSortMode GetNameSortMode();
     virtual CSortComparisonObject GetSortComparisonObject() = 0;
 
     // An empty path denotes a virtual file

src/interface/resources/settings.xrc

@@ -1687 +1687 @@
                 </object>
                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
               </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>_Name sorting mode:</label>
+                </object>
+                <flag>wxALIGN_CENTRE_VERTICAL</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="ID_NAMESORTMODE">
+                   <selection>0</selection>
+                   <content>
+                     <item>Case insensitive (default)</item>
+                     <item>Case sensitive</item>
+                     <item>Natural sort</item>
+                   </content>
+                 </object>
+                 <flag>wxALIGN_CENTRE_VERTICAL</flag>
+              </object>
+              <vgap>5</vgap>
               <hgap>5</hgap>
             </object>
             <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
@@ -2215 +2233 @@
       </object>
     </object>
   </object>
-</resource>
- No newline at end of file
+</resource>

src/interface/search.cpp

@@ -63 +63 @@
 class CSearchSort : public CListViewSort
 {
 public:
-    CSearchSort(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData> &fileData, enum DirSortMode dirSortMode)
-        : m_fileData(fileData), m_dirSortMode(dirSortMode), m_pListCtrl(pListCtrl)
+    CSearchSort(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData> &fileData, enum DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : m_fileData(fileData), m_dirSortMode(dirSortMode), m_nameSortMode(nameSortMode), m_pListCtrl(pListCtrl)
     {
     }
 
     #define CMP(f, data1, data2) \
         {\
             int res = f(data1, data2);\
-            if (res == -1)\
+            if (res < 0)\
                 return true;\
-            else if (res == 1)\
+            else if (res > 0)\
                 return false;\
         }
 
     #define CMP_LESS(f, data1, data2) \
         {\
             int res = f(data1, data2);\
-            if (res == -1)\
+            if (res < 0)\
                 return true;\
             else\
                 return false;\
@@ -128 +128 @@
 
     inline int CmpName(const CDirentry &data1, const CDirentry &data2) const
     {
-#ifdef __WXMSW__
-        return data1.name.CmpNoCase(data2.name);
-#else
-        return data1.name.Cmp(data2.name);
-#endif
+        switch (m_nameSortMode)
+        {
+        case namesort_casesensitive:
+            return CmpCase(data1.name, data2.name);
+
+        default:
+        case namesort_caseinsensitive:
+            return CmpNoCase(data1.name, data2.name);
+
+        case namesort_natural:
+            return CmpNatural(data1.name, data2.name);
+        }
     }
 
     inline int CmpSize(const CDirentry &data1, const CDirentry &data2) const
@@ -168 +175 @@
     std::vector<CSearchFileData> &m_fileData;
 
     const enum DirSortMode m_dirSortMode;
+    const enum NameSortMode m_nameSortMode;
 
     CSearchDialogFileList* m_pListCtrl;
 };
@@ -175 +183 @@
 template<class T> class CReverseSort : public T
 {
 public:
-    CReverseSort(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : T(pListCtrl, fileData, dirSortMode)
+    CReverseSort(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum CSearchSort::NameSortMode nameSortMode)
+        : T(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -189 +197 @@
 class CSearchSortName : public CSearchSort
 {
 public:
-    CSearchSortName(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : CSearchSort(pListCtrl, fileData, dirSortMode)
+    CSearchSortName(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : CSearchSort(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -209 +217 @@
 class CSearchSortPath : public CSearchSort
 {
 public:
-    CSearchSortPath(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : CSearchSort(pListCtrl, fileData, dirSortMode)
+    CSearchSortPath(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : CSearchSort(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -232 +240 @@
 class CSearchSortSize : public CSearchSort
 {
 public:
-    CSearchSortSize(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : CSearchSort(pListCtrl, fileData, dirSortMode)
+    CSearchSortSize(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : CSearchSort(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -254 +262 @@
 class CSearchSortType : public CSearchSort
 {
 public:
-    CSearchSortType(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : CSearchSort(pListCtrl, fileData, dirSortMode)
+    CSearchSortType(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : CSearchSort(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -281 +289 @@
 class CSearchSortTime : public CSearchSort
 {
 public:
-    CSearchSortTime(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : CSearchSort(pListCtrl, fileData, dirSortMode)
+    CSearchSortTime(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : CSearchSort(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -303 +311 @@
 class CSearchSortPermissions : public CSearchSort
 {
 public:
-    CSearchSortPermissions(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : CSearchSort(pListCtrl, fileData, dirSortMode)
+    CSearchSortPermissions(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : CSearchSort(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -325 +333 @@
 class CSearchSortOwnerGroup : public CSearchSort
 {
 public:
-    CSearchSortOwnerGroup(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode)
-        : CSearchSort(pListCtrl, fileData, dirSortMode)
+    CSearchSortOwnerGroup(CSearchDialogFileList* pListCtrl, std::vector<CSearchFileData>& fileData, enum CSearchSort::DirSortMode dirSortMode, enum NameSortMode nameSortMode)
+        : CSearchSort(pListCtrl, fileData, dirSortMode, nameSortMode)
     {
     }
 
@@ -389 +397 @@
 CFileListCtrl<CSearchFileData>::CSortComparisonObject CSearchDialogFileList::GetSortComparisonObject()
 {
     CSearchSort::DirSortMode dirSortMode = GetDirSortMode();
+    CSearchSort::NameSortMode nameSortMode = GetNameSortMode();
 
     if (!m_sortDirection)
     {
         if (m_sortColumn == 1)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPath(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPath(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 2)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortSize(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortSize(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 3)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortType(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortType(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 4)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortTime(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortTime(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 5)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPermissions(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPermissions(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 6)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortOwnerGroup(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortOwnerGroup(this, m_fileData, dirSortMode, nameSortMode));
         else
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortName(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortName(this, m_fileData, dirSortMode, nameSortMode));
     }
     else
     {
         if (m_sortColumn == 1)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPath_Reverse(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPath_Reverse(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 2)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortSize_Reverse(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortSize_Reverse(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 3)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortType_Reverse(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortType_Reverse(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 4)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortTime_Reverse(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortTime_Reverse(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 5)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPermissions_Reverse(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortPermissions_Reverse(this, m_fileData, dirSortMode, nameSortMode));
         else if (m_sortColumn == 6)
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortOwnerGroup_Reverse(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortOwnerGroup_Reverse(this, m_fileData, dirSortMode, nameSortMode));
         else
-            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortName_Reverse(this, m_fileData, dirSortMode));
+            return CFileListCtrl<CSearchFileData>::CSortComparisonObject(new CSearchSortName_Reverse(this, m_fileData, dirSortMode, nameSortMode));
     }
 }
 

src/interface/settings/optionspage_filelists.cpp

@@ -10 +10 @@
     bool failure = false;
 
     SetChoice(XRCID("ID_SORTMODE"), m_pOptions->GetOptionVal(OPTION_FILELIST_DIRSORT), failure);
+    SetChoice(XRCID("ID_NAMESORTMODE"), m_pOptions->GetOptionVal(OPTION_FILELIST_NAMESORT), failure);
 
     SetTextFromOption(XRCID("ID_COMPARISON_THRESHOLD"), OPTION_COMPARISON_THRESHOLD, failure);
 
@@ -22 +23 @@
 bool COptionsPageFilelists::SavePage()
 {
     m_pOptions->SetOption(OPTION_FILELIST_DIRSORT, GetChoice(XRCID("ID_SORTMODE")));
+    m_pOptions->SetOption(OPTION_FILELIST_NAMESORT, GetChoice(XRCID("ID_NAMESORTMODE")));
 
     SetOptionFromText(XRCID("ID_COMPARISON_THRESHOLD"), OPTION_COMPARISON_THRESHOLD);
 

tests/Makefile.am

@@ -10 +10 @@
         ipaddress.cpp \
         dirparsertest.cpp \
         localpathtest.cpp \
-        serverpathtest.cpp
+        serverpathtest.cpp \
+        cmpnatural.cpp
 
 test_CPPFLAGS = $(WX_CPPFLAGS)
 test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS)

new file tests/cmpnatural.cpp

@@ +1 @@
+#include <libfilezilla.h>
+#include <wx/imaglist.h>
+#include <wx/scrolwin.h>
+#include <wx/listctrl.h>
+#include <../interface/filelistctrl.h>
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <list>
+
+/*
+ * This testsuite asserts the correctness of the
+ * functions handling natural sort
+ */
+
+class CNaturalSortTest : public CppUnit::TestFixture
+{
+    CPPUNIT_TEST_SUITE(CNaturalSortTest);
+    CPPUNIT_TEST(testEmpty);
+    CPPUNIT_TEST(testCaseInsensitive);
+    CPPUNIT_TEST(testString);
+    CPPUNIT_TEST(testNumber);
+    CPPUNIT_TEST(testMixed);
+    CPPUNIT_TEST(testSeq);
+    CPPUNIT_TEST(testPair);
+    CPPUNIT_TEST(testFractional);
+    CPPUNIT_TEST_SUITE_END();
+
+public:
+    void setUp() {}
+    void tearDown() {}
+
+    void testEmpty();
+    void testCaseInsensitive();
+    void testString();
+    void testNumber();
+    void testMixed();
+    void testSeq();
+    void testPair();
+    void testFractional();
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(CNaturalSortTest);
+
+void CNaturalSortTest::testEmpty()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T(""), _T("")) == 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T(""), _T("x")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("x"), _T("")) > 0);
+}
+
+void CNaturalSortTest::testCaseInsensitive()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a"), _T("A")) == 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("B"), _T("b")) == 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a"), _T("B")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("A"), _T("b")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("afFasFAc"), _T("aFfaSFaC")) == 0);
+}
+
+void CNaturalSortTest::testString()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a"), _T("b")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("b"), _T("a")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a"), _T("ab")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("ab"), _T("a")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("affasfac"), _T("affasfac")) == 0);
+}
+
+void CNaturalSortTest::testNumber()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1"), _T("1")) == 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1"), _T("2")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("2"), _T("1")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("15"), _T("25")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("25"), _T("15")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("15"), _T("17")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("17"), _T("15")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1"), _T("10")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10"), _T("1")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("2"), _T("17")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("17"), _T("2")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("2"), _T("02")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("02"), _T("2")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("02"), _T("1")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1"), _T("02")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("02"), _T("3")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("3"), _T("02")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("25"), _T("021")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("021"), _T("25")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("2100"), _T("02005")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("02005"), _T("2100")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("010"), _T("02")) > 0);
+}
+
+void CNaturalSortTest::testMixed()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("0"), _T("a")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a"), _T("0")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("abc1xx"), _T("abc2xx")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("abc1bb"), _T("abc2aa")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("abc2"), _T("1")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10abc"), _T("10def")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10def"), _T("10abc")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10abc2"), _T("10abc3")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10abc3"), _T("10abc2")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10abc"), _T("10abc3")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10abc3"), _T("10abc")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1"), _T("1abc")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1abc"), _T("1")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("2"), _T("1abc")) > 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1abc"), _T("2")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1def"), _T("10abc")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("10abc"), _T("1def")) > 0);
+}
+
+void CNaturalSortTest::testSeq()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a"), _T("a0")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a0"), _T("a1")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a1"), _T("a1a")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a1a"), _T("a1b")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a1b"), _T("a2")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a2"), _T("a10")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("a10"), _T("a20")) < 0);
+}
+
+void CNaturalSortTest::testPair()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("x2-g8"), _T("x2-y7")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("x2-y7"), _T("x2-y08")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("x2-y08"), _T("x8-y8")) < 0);
+}
+
+void CNaturalSortTest::testFractional()
+{
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1.001"), _T("1.002")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1.002"), _T("1.010")) < 0);
+    //CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1.010"), _T("1.02")) < 0);   //this fraction case would break 010 > 02
+    //CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1.02"), _T("1.1")) < 0);     //this fraction case would break 02 > 1
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1.1"), _T("1.3")) < 0);
+    CPPUNIT_ASSERT(CListViewSort::CmpNatural(_T("1.3"), _T("1.15")) < 0);
+}