Fixed sorting issue on Linux

Kagamma · Dec 28, 2023 · 1bb20b6 · 1bb20b6
1 parent 4f9cbb4
commit 1bb20b6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/forms/form.chat.pas b/src/forms/form.chat.pas
@@ -237,6 +237,7 @@ function TFormChat.LoadServiceList: String;
   ComboBoxService.ItemIndex := 0;
 
   SL := TStringList.Create;
+  SL.Sorted := True;
   FindAllFiles(SL, GetPhysDirPath('data/scripts/' + Save.Settings.Skin + '/services'), '*.evil', False);
   for I := 0 to SL.Count - 1 do
   begin

diff --git a/src/forms/form.settings.lfm b/src/forms/form.settings.lfm
@@ -49,6 +49,7 @@ object FormSettings: TFormSettings
   }
   Position = poScreenCenter
   ShowInTaskBar = stAlways
+  LCLVersion = '3.99.0.0'
   OnShow = FormShow
   object PanelButtons: TPanel
     Left = 0
@@ -702,8 +703,8 @@ object FormSettings: TFormSettings
           Top = 16
           Width = 594
           Caption = 'IMAP'
-          ClientHeight = 204
-          ClientWidth = 590
+          ClientHeight = 206
+          ClientWidth = 576
           TabOrder = 0
           object LabelEmailServer: TLabel
             Left = 24
@@ -800,8 +801,8 @@ object FormSettings: TFormSettings
           Top = 250
           Width = 594
           Caption = 'SMTP'
-          ClientHeight = 178
-          ClientWidth = 590
+          ClientHeight = 180
+          ClientWidth = 576
           TabOrder = 1
           object LabelEmailSmtpServer: TLabel
             Left = 24
@@ -891,8 +892,8 @@ object FormSettings: TFormSettings
           Align = alTop
           BorderSpacing.Left = 64
           Caption = 'Vosk'
-          ClientHeight = 68
-          ClientWidth = 631
+          ClientHeight = 70
+          ClientWidth = 617
           TabOrder = 0
           object LabelSTTModel1: TLabel
             Left = 24
@@ -947,8 +948,8 @@ object FormSettings: TFormSettings
           Align = alTop
           BorderSpacing.Left = 64
           Caption = 'whisper.cpp (experimental)'
-          ClientHeight = 68
-          ClientWidth = 631
+          ClientHeight = 70
+          ClientWidth = 617
           TabOrder = 2
           object LabelSTTModel2: TLabel
             Left = 24

diff --git a/src/forms/form.settings.pas b/src/forms/form.settings.pas
@@ -255,7 +255,9 @@ procedure TFormSettings.FormShow(Sender: TObject);
 
   ComboBoxSkin.Items.Clear;
   SL := TStringList.Create;
+  SL.Sorted := True;
   SL2 := TStringList.Create;
+  SL2.Sorted := True;
   FindAllDirectories(SL, 'data/sprites', False);
   FindAllDirectories(SL, GetOSLocalDir + 'data/sprites', False);
   FindAllDirectories(SL2, 'data/scripts', False);
@@ -299,6 +301,7 @@ procedure TFormSettings.FormShow(Sender: TObject);
   // Vosk loader
   ComboBoxSTTVoskModel.Clear;
   SL := TStringList.Create;
+  SL.Sorted := True;
   FindAllDirectories(SL, 'data/nn/vosk', False);
   for I := 0 to SL.Count - 1 do
   begin
@@ -314,6 +317,7 @@ procedure TFormSettings.FormShow(Sender: TObject);
   // whisper loader
   ComboBoxSTTWhisperModel.Clear;
   SL := TStringList.Create;
+  SL.Sorted := True;
   FindAllFiles(SL, 'data/nn/whisper.cpp', '*.bin', False);
   for I := 0 to SL.Count - 1 do
   begin
@@ -327,6 +331,7 @@ procedure TFormSettings.FormShow(Sender: TObject);
   SL.Free;
 
   SL := TStringList.Create;
+  SL.Sorted := True;
   FindAllFiles(SL, 'data/fonts', '', False);
   for I := 0 to SL.Count - 1 do
   begin