X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_options.pas;h=aebf686a6d997e511dd08db58578fb4b8e4d7f3f;hb=4c87d715a2cbbad04f3e785be4012422d675dca3;hp=aa7012f58f987771b474f9153853a64c0fd2218f;hpb=3c2fc40a5ba59f7570d4ae61c743de3ab1508434;p=d2df-editor.git

diff --git a/src/editor/f_options.pas b/src/editor/f_options.pas
index aa7012f..aebf686 100644
--- a/src/editor/f_options.pas
+++ b/src/editor/f_options.pas
@@ -82,7 +82,7 @@ type
 
 
     procedure bGridClick(Sender: TObject);
-    procedure FormActivate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
     procedure bOKClick(Sender: TObject);
     procedure bCancelClick(Sender: TObject);
     procedure bBackClick(Sender: TObject);
@@ -144,9 +144,8 @@ begin
     edD2dExe.Text := FindD2dDialog.FileName;
 end;
 
-procedure TOptionsForm.FormActivate(Sender: TObject);
-  const langfilename = 'editor';
-  var info: TSearchRec;
+procedure TOptionsForm.FormShow(Sender: TObject);
+  var list: TStringList;
 begin
   sDotColor.Brush.Color := DotColor;
   cbShowDots.Checked := DotEnable;
@@ -172,14 +171,10 @@ begin
   try
     cbLanguage.Items.BeginUpdate;
     cbLanguage.Items.Clear;
-    cbLanguage.Items.Add('Auto');
-    if FindFirst(LangDir + DirectorySeparator + langfilename + '.*.mo', faAnyFile, info) = 0 then
-    begin
-      repeat
-        cbLanguage.Items.Add(Copy(ExtractFileNameWithoutExt(info.Name), Length(langfilename) + 2));
-      until FindNext(info) <> 0;
-      FindClose(info);
-    end;
+    cbLanguage.Items.Add(MsgLabEsLanguageAuto);
+    list := g_Language_GetList();
+    cbLanguage.Items.AddStrings(list);
+    list.Free();
     cbLanguage.ItemIndex := IfThen(gLanguage = '', 0, cbLanguage.Items.IndexOf(gLanguage));
   finally
     cbLanguage.Items.EndUpdate;
@@ -216,13 +211,16 @@ var
 begin
   // General tab
 
-  if cbLanguage.ItemIndex <= 0 then str := '' else str := cbLanguage.Items[cbLanguage.ItemIndex];
-  if (str = '') or (gLanguage <> str) then
+  if cbLanguage.ItemIndex >= 0 then
   begin
-    gLanguage := str;
-    g_Language_Set(gLanguage);
+    if cbLanguage.ItemIndex = 0 then str := '' else str := cbLanguage.Items[cbLanguage.ItemIndex];
+    if (str = '') or (gLanguage <> str) then
+    begin
+      gLanguage := str;
+      g_Language_Set(gLanguage);
+    end;
   end;
-  
+
   DotColor := sDotColor.Brush.Color;
   DotEnable := cbShowDots.Checked;