--- oup/current/DataAccess/Access_OUP_ADB.pas	2007/02/21 03:12:33	109
+++ oup/current/DataAccess/Access_OUP_ADB.pas	2007/02/22 00:37:39	112
@@ -261,6 +261,12 @@ var
       name := fields.Strings[2];
       extension := fields.Strings[0];
     end;
+    if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
+    begin
+      id := fields.Strings[2];
+      name := fields.Strings[1];
+      extension := fields.Strings[0];
+    end;
   end;
 
 begin
@@ -274,10 +280,7 @@ begin
     begin
       if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
       begin
-        if AppSettings.FilenumbersAsHex then
-          id := IntToHex(Fdat_files[i].ID, 4)
-        else
-          id := FormatNumber(Fdat_files[i].ID, 5, '0');
+        id := FormatNumber(Fdat_files[i].ID, 5, '0');
         name := Fdat_files[i].Name;
         extension := Fdat_files[i].Extension;
 
@@ -285,6 +288,7 @@ begin
           ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
           ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
           ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
+          ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
         end;
       end;
     end;
@@ -293,7 +297,7 @@ begin
   if list.Count > 0 then
   begin
     fields := TStringList.Create;
-    if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc] then
+    if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
       for i := 0 to list.Count - 1 do
       begin
         getfields;