Components, Pas2JS: improved/simplified layout of 'Pas2JS webservers' dialog, cleaned up duplicate file from LPK, regenerated translations and updated Russian translation

git-svn-id: trunk@60026 -
2025-11-04 07:43:13 +01:00 · 2019-01-07 16:37:00 +00:00 · 2019-01-07 16:37:00 +00:00 · 45498478c5
commit 45498478c5
parent 6f819f1f40
11 changed files with 48 additions and 52 deletions
--- a/components/pas2js/frmpas2jswebservers.lfm
+++ b/components/pas2js/frmpas2jswebservers.lfm
@ -10,26 +10,17 @@ object PasJSWebserverProcessesForm: TPasJSWebserverProcessesForm
  OnCreate = FormCreate
  OnDestroy = FormDestroy
  OnShow = FormShow
-  LCLVersion = '1.9.0.0'
-  object LLCount: TLabel
-    Left = 16
-    Height = 17
-    Top = 8
-    Width = 185
-    AutoSize = False
-    Caption = 'Number of webserver processes:'
-    ParentColor = False
-  end
+  LCLVersion = '2.1.0.0'
  object LCount: TLabel
-    AnchorSideLeft.Control = LLCount
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = LLCount
-    Left = 209
-    Height = 17
-    Top = 8
-    Width = 39
-    BorderSpacing.Left = 8
-    Caption = 'LCount'
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Left = 6
+    Height = 15
+    Top = 6
+    Width = 171
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    Caption = 'Number of webserver processes:'
    ParentColor = False
  end
  object LVProcesses: TListView
@ -40,15 +31,12 @@ object PasJSWebserverProcessesForm: TPasJSWebserverProcessesForm
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 8
-    Height = 189
-    Top = 48
-    Width = 628
+    Left = 6
+    Height = 195
+    Top = 44
+    Width = 632
    Anchors = [akTop, akLeft, akRight, akBottom]
-    BorderSpacing.Left = 8
-    BorderSpacing.Top = 8
-    BorderSpacing.Right = 8
-    BorderSpacing.Bottom = 8
+    BorderSpacing.Around = 6
    Columns = <    
      item
        Caption = 'Port'
@ -68,7 +56,7 @@ object PasJSWebserverProcessesForm: TPasJSWebserverProcessesForm
      item
        AutoSize = True
        Caption = 'Additional info'
-        Width = 88
+        Width = 94
      end>
    SmallImages = ILProcesses
    StateImages = ILProcesses
@ -76,15 +64,18 @@ object PasJSWebserverProcessesForm: TPasJSWebserverProcessesForm
    ViewStyle = vsReport
  end
  object SBrefresh: TSpeedButton
-    AnchorSideTop.Control = LLCount
+    AnchorSideTop.Control = Owner
    AnchorSideRight.Control = Owner
    AnchorSideRight.Side = asrBottom
-    Left = 598
+    Left = 606
    Height = 32
-    Top = 8
-    Width = 38
+    Top = 6
+    Width = 32
    Anchors = [akTop, akRight]
-    BorderSpacing.Right = 8
+    AutoSize = True
+    BorderSpacing.Around = 6
+    Constraints.MinHeight = 32
+    Constraints.MinWidth = 32
    Glyph.Data = {
      36040000424D3604000000000000360000002800000010000000100000000100
      2000000000000004000064000000640000000000000000000000FFFFFF00A465
--- a/components/pas2js/frmpas2jswebservers.pp
+++ b/components/pas2js/frmpas2jswebservers.pp
@ -14,7 +14,6 @@ type

  TPasJSWebserverProcessesForm = class(TForm)
    ILProcesses: TImageList;
-    LLCount: TLabel;
    LCount: TLabel;
    LVProcesses: TListView;
    SBrefresh: TSpeedButton;
@ -72,7 +71,7 @@ end;
 procedure TPasJSWebserverProcessesForm.Localize;

 begin
-  LLCount.Caption:= SWebserversCount;
+  LCount.Caption:=Format(SWebserversCount, ['0']);
  Caption:=SWebserversCaption;
  With LVProcesses do
    begin
@ -145,10 +144,10 @@ begin
  if (C=Nil) or (C.ServerInstances=Nil) or (C.ServerInstances.Count=0) then
    begin
    LVProcesses.Items.Clear;
-    LCount.Caption:='0';
+    LCount.Caption:=Format(SWebserversCount, ['0']);
    exit;
    end;
-  LCount.Caption:=IntToStr(C.ServerInstances.Count);
+  LCount.Caption:=Format(SWebserversCount, [IntToStr(C.ServerInstances.Count)]);
  With LVProcesses.Items do
    try
      BeginUpdate;
--- a/components/pas2js/languages/strpas2jsdesign.fr.po
+++ b/components/pas2js/languages/strpas2jsdesign.fr.po
@ -52,7 +52,9 @@ msgid "Web server processes"
 msgstr "Processus serveur Web"

 #: strpas2jsdesign.swebserverscount
-msgid "Number of webserver processes:"
+#, fuzzy,badformat
+#| msgid "Number of webserver processes:"
+msgid "Number of webserver processes: %s"
 msgstr "Nombre de processus serveur Web :"

 #: strpas2jsdesign.swebserversextra
--- a/components/pas2js/languages/strpas2jsdesign.hu.po
+++ b/components/pas2js/languages/strpas2jsdesign.hu.po
@ -52,7 +52,9 @@ msgid "Web server processes"
 msgstr "Webkiszolgáló folyamatai"

 #: strpas2jsdesign.swebserverscount
-msgid "Number of webserver processes:"
+#, fuzzy,badformat
+#| msgid "Number of webserver processes:"
+msgid "Number of webserver processes: %s"
 msgstr "Webkiszolgáló folyamatainak száma:"

 #: strpas2jsdesign.swebserversextra
--- a/components/pas2js/languages/strpas2jsdesign.po
+++ b/components/pas2js/languages/strpas2jsdesign.po
@ -42,7 +42,7 @@ msgid "Web server processes"
 msgstr ""

 #: strpas2jsdesign.swebserverscount
-msgid "Number of webserver processes:"
+msgid "Number of webserver processes: %s"
 msgstr ""

 #: strpas2jsdesign.swebserversextra
--- a/components/pas2js/languages/strpas2jsdesign.pt_BR.po
+++ b/components/pas2js/languages/strpas2jsdesign.pt_BR.po
@ -56,7 +56,9 @@ msgid "Web server processes"
 msgstr "Processos servidores web"

 #: strpas2jsdesign.swebserverscount
-msgid "Number of webserver processes:"
+#, fuzzy,badformat
+#| msgid "Number of webserver processes:"
+msgid "Number of webserver processes: %s"
 msgstr "Número de processos servidores web:"

 #: strpas2jsdesign.swebserversextra
--- a/components/pas2js/languages/strpas2jsdesign.ru.po
+++ b/components/pas2js/languages/strpas2jsdesign.ru.po
@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"X-Generator: Poedit 1.8.5\n"
+"X-Generator: Poedit 1.7.7\n"

 #: strpas2jsdesign.pjsdnodejsappdescription
 msgid "A pas2js program running in node.js"
@ -52,8 +52,8 @@ msgid "Web server processes"
 msgstr "Процессы веб-серверов"

 #: strpas2jsdesign.swebserverscount
-msgid "Number of webserver processes:"
-msgstr "Количество процессов веб-серверов:"
+msgid "Number of webserver processes: %s"
+msgstr "Количество процессов веб-серверов: %s"

 #: strpas2jsdesign.swebserversextra
 msgid "Additional info"
--- a/components/pas2js/languages/strpas2jsdesign.uk.po
+++ b/components/pas2js/languages/strpas2jsdesign.uk.po
@ -54,7 +54,9 @@ msgid "Web server processes"
 msgstr "Процеси веб-серверів"

 #: strpas2jsdesign.swebserverscount
-msgid "Number of webserver processes:"
+#, fuzzy,badformat
+#| msgid "Number of webserver processes:"
+msgid "Number of webserver processes: %s"
 msgstr "Кількість процесів веб-серверів:"

 #: strpas2jsdesign.swebserversextra
--- a/components/pas2js/languages/strpas2jsdesign.zh_CN.po
+++ b/components/pas2js/languages/strpas2jsdesign.zh_CN.po
@ -53,7 +53,9 @@ msgid "Web server processes"
 msgstr "Web服务器进程(server processes)"

 #: strpas2jsdesign.swebserverscount
-msgid "Number of webserver processes:"
+#, fuzzy,badformat
+#| msgid "Number of webserver processes:"
+msgid "Number of webserver processes: %s"
 msgstr "Web服务器进程(server processes)的数量"

 #: strpas2jsdesign.swebserversextra
--- a/components/pas2js/pas2jsdsgn.lpk
+++ b/components/pas2js/pas2jsdsgn.lpk
@ -18,7 +18,7 @@
    <Description Value="Adds a Lazarus project for pas2js browser applications."/>
    <License Value="GPL-2"/>
    <Version Major="1" Release="1"/>
-    <Files Count="10">
+    <Files Count="9">
      <Item1>
        <Filename Value="pjsdsgnregister.pas"/>
        <HasRegisterProc Value="True"/>
@ -56,10 +56,6 @@
        <Filename Value="pjsprojectoptions.pp"/>
        <UnitName Value="pjsprojectoptions"/>
      </Item9>
-      <Item10>
-        <Filename Value="pjsprojectoptions.pp"/>
-        <UnitName Value="pjsprojectoptions"/>
-      </Item10>
    </Files>
    <i18n>
      <EnableI18N Value="True"/>
--- a/components/pas2js/strpas2jsdesign.pp
+++ b/components/pas2js/strpas2jsdesign.pp
@ -20,7 +20,7 @@ Resourcestring
  SWebserversBaseDir = 'Root directory';
  SWebserversProject = 'Project';
  SWebserversExtra   = 'Additional info';
-  SWebserversCount   = 'Number of webserver processes:';
+  SWebserversCount   = 'Number of webserver processes: %s';
  SWebserversCaption = 'Web server processes';

  // Dynamic texts webservers form