Changeset 207 for trunk/Forms


Ignore:
Timestamp:
Sep 20, 2021, 10:16:37 AM (3 years ago)
Author:
chronos
Message:
  • Modified: Updated Common package.
  • Modified: CoolTranslator package merged into Common package.
  • Fixed: Build with Lazarus 2.0.12
Location:
trunk/Forms
Files:
3 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormAcronym.pas

    r174 r207  
    6868procedure TFormAcronym.FormCreate(Sender: TObject);
    6969begin
    70   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     70  Core.Translator.TranslateComponentRecursive(Self);
    7171  Core.ThemeManager.UseTheme(Self);
    7272end;

  • trunk/Forms/UFormAcronyms.pas

    r204 r207  
    258258  FocusAcronym := nil;
    259259  MeaningCount := 0;
    260   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     260  Core.Translator.TranslateComponentRecursive(Self);
    261261  Core.ThemeManager.UseTheme(Self);
    262262  for I := 0 to ToolBar1.ButtonCount - 1 do

  • trunk/Forms/UFormCategories.pas

    r174 r207  
    187187  I: Integer;
    188188begin
    189   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     189  Core.Translator.TranslateComponentRecursive(Self);
    190190  Core.ThemeManager.UseTheme(Self);
    191191  for I := 0 to ToolBar1.ButtonCount - 1 do

  • trunk/Forms/UFormCategorySelect.pas

    r174 r207  
    5050procedure TFormCategorySelect.FormCreate(Sender: TObject);
    5151begin
    52   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     52  Core.Translator.TranslateComponentRecursive(Self);
    5353  Core.ThemeManager.UseTheme(Self);
    5454end;

  • trunk/Forms/UFormCheck.pas

    r206 r207  
    207207  AcronymDbSummary := TAcronymDb.Create;
    208208  AcronymDbContent := TAcronymDb.Create;
    209   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     209  Core.Translator.TranslateComponentRecursive(Self);
    210210  Core.ThemeManager.UseTheme(Self);
    211211  ReportItems := TReportItems.Create;

  • trunk/Forms/UFormExport.pas

    r184 r207  
    6767procedure TFormExport.FormCreate(Sender: TObject);
    6868begin
    69   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     69  Core.Translator.TranslateComponentRecursive(Self);
    7070  Core.ThemeManager.UseTheme(Self);
    7171end;

  • trunk/Forms/UFormImport.pas

    r184 r207  
    6969procedure TFormImport.FormCreate(Sender: TObject);
    7070begin
    71   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     71  Core.Translator.TranslateComponentRecursive(Self);
    7272  Core.ThemeManager.UseTheme(Self);
    7373end;

  • trunk/Forms/UFormImportFormat.pas

    r174 r207  
    160160procedure TFormImportFormat.FormCreate(Sender: TObject);
    161161begin
    162   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     162  Core.Translator.TranslateComponentRecursive(Self);
    163163  Core.ThemeManager.UseTheme(Self);
    164164  YesNoString[False] := SNo;

  • trunk/Forms/UFormImportFormats.pas

    r174 r207  
    189189  I: Integer;
    190190begin
    191   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     191  Core.Translator.TranslateComponentRecursive(Self);
    192192  Core.ThemeManager.UseTheme(Self);
    193193  for I := 0 to ToolBar1.ButtonCount - 1 do

  • trunk/Forms/UFormImportPattern.pas

    r174 r207  
    5353procedure TFormImportPattern.FormCreate(Sender: TObject);
    5454begin
    55   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     55  Core.Translator.TranslateComponentRecursive(Self);
    5656  Core.ThemeManager.UseTheme(Self);
    5757  InitControls;

  • trunk/Forms/UFormImportSource.pas

    r174 r207  
    9898procedure TFormImportSource.FormCreate(Sender: TObject);
    9999begin
    100   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     100  Core.Translator.TranslateComponentRecursive(Self);
    101101  Core.ThemeManager.UseTheme(Self);
    102102end;

  • trunk/Forms/UFormImportSources.pas

    r204 r207  
    354354  I: Integer;
    355355begin
    356   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     356  Core.Translator.TranslateComponentRecursive(Self);
    357357  Core.ThemeManager.UseTheme(Self);
    358358  for I := 0 to ToolBar1.ButtonCount - 1 do

  • trunk/Forms/UFormMain.lfm

    r203 r207  
    11object FormMain: TFormMain
    22  Left = 395
    3   Height = 602
     3  Height = 722
    44  Top = 261
    5   Width = 847
     5  Width = 1016
    66  Caption = 'Acronym Decoder'
    7   ClientHeight = 577
    8   ClientWidth = 847
    9   DesignTimePPI = 120
     7  ClientHeight = 688
     8  ClientWidth = 1016
     9  DesignTimePPI = 144
    1010  Menu = MainMenu1
    1111  OnClose = FormClose
    … …  
    1616  OnResize = FormResize
    1717  OnShow = FormShow
    18   LCLVersion = '2.0.2.0'
     18  LCLVersion = '2.0.12.0'
    1919  object PanelMain: TPanel
    2020    Left = 0
    21     Height = 479
    22     Top = 70
    23     Width = 847
     21    Height = 580
     22    Top = 81
     23    Width = 1016
    2424    Align = alClient
    2525    BevelOuter = bvNone
    26     ClientHeight = 479
    27     ClientWidth = 847
     26    ClientHeight = 580
     27    ClientWidth = 1016
     28    ParentFont = False
    2829    TabOrder = 0
    2930    object ListViewFilter1: TListViewFilter
    30       Left = 4
    31       Height = 38
    32       Top = 4
    33       Width = 838
     31      Left = 5
     32      Height = 46
     33      Top = 5
     34      Width = 1005
    3435      OnChange = ListViewFilter1Change
    3536      Anchors = [akTop, akLeft, akRight]
    3637    end
    3738    object ListViewAcronyms: TListView
    38       Left = 4
    39       Height = 432
    40       Top = 42
    41       Width = 838
     39      Left = 5
     40      Height = 524
     41      Top = 50
     42      Width = 1005
    4243      Anchors = [akTop, akLeft, akRight, akBottom]
    4344      Columns = <     
    4445        item
    4546          Caption = 'Name'
    46           Width = 125
     47          Width = 150
    4748        end     
    4849        item
    4950          Caption = 'Meaning'
    50           Width = 375
     51          Width = 450
    5152        end     
    5253        item
    5354          Caption = 'Categories'
    54           Width = 434
     55          Width = 521
    5556        end>
    5657      OwnerData = True
     58      ParentFont = False
    5759      PopupMenu = PopupMenuFilter
    5860      ReadOnly = True
    … …  
    6769  object PanelParam: TPanel
    6870    Left = 0
    69     Height = 32
    70     Top = 38
    71     Width = 847
     71    Height = 38
     72    Top = 43
     73    Width = 1016
    7274    Align = alTop
    7375    BevelOuter = bvNone
    74     ClientHeight = 32
    75     ClientWidth = 847
     76    ClientHeight = 38
     77    ClientWidth = 1016
     78    ParentFont = False
    7679    TabOrder = 1
    7780    object CheckBoxExactLength: TCheckBox
    78       Left = 10
    79       Height = 24
    80       Top = 4
    81       Width = 107
     81      Left = 12
     82      Height = 30
     83      Top = 5
     84      Width = 132
    8285      Action = AFilterSameLength
     86      ParentFont = False
    8387      TabOrder = 0
    8488    end
    8589    object CheckBoxCaseSensitive: TCheckBox
    86       Left = 200
    87       Height = 24
    88       Top = 4
    89       Width = 133
     90      Left = 240
     91      Height = 30
     92      Top = 5
     93      Width = 165
    9094      Action = AFilterSameLetterCase
     95      ParentFont = False
    9196      TabOrder = 1
    9297    end
    9398    object CheckBoxEnabledCategories: TCheckBox
    94       Left = 450
    95       Height = 24
    96       Top = 4
    97       Width = 151
     99      Left = 540
     100      Height = 30
     101      Top = 5
     102      Width = 187
    98103      Action = AFilterEnabledCategories
     104      ParentFont = False
    99105      TabOrder = 2
    100106    end
    … …  
    102108  object CoolBar1: TCoolBar
    103109    Left = 0
    104     Height = 38
     110    Height = 43
    105111    Top = 0
    106     Width = 847
     112    Width = 1016
    107113    AutoSize = True
    108114    Bands = <   
    … …  
    136142      end>
    137143    Images = Core.ImageList1
     144    ParentFont = False
    138145    object ToolBarFile: TToolBar
    139146      AnchorSideLeft.Control = CoolBar1
    140147      AnchorSideTop.Control = CoolBar1
    141148      Left = 24
    142       Height = 28
    143       Top = 5
    144       Width = 132
     149      Height = 33
     150      Top = 5
     151      Width = 159
    145152      Align = alNone
    146153      AutoSize = True
    … …  
    151158      EdgeOuter = esNone
    152159      Images = Core.ImageList1
     160      ParentFont = False
    153161      ParentShowHint = False
    154162      ShowHint = True
    … …  
    161169      end
    162170      object ToolButton6: TToolButton
    163         Left = 30
     171        Left = 36
    164172        Top = 0
    165173        Action = AFileOpen
    … …  
    168176      end
    169177      object ToolButton7: TToolButton
    170         Left = 74
     178        Left = 89
    171179        Top = 0
    172180        Action = AFileSave
    173181      end
    174182      object ToolButton12: TToolButton
    175         Left = 103
     183        Left = 124
    176184        Top = 0
    177185        Action = AFileClose
    … …  
    182190      AnchorSideTop.Control = CoolBar1
    183191      Left = 188
    184       Height = 28
    185       Top = 5
    186       Width = 117
     192      Height = 33
     193      Top = 5
     194      Width = 141
    187195      Align = alNone
    188196      AutoSize = True
    … …  
    193201      EdgeOuter = esNone
    194202      Images = Core.ImageList1
     203      ParentFont = False
    195204      ParentShowHint = False
    196205      ShowHint = True
    … …  
    203212      end
    204213      object ToolButton3: TToolButton
    205         Left = 30
     214        Left = 36
    206215        Top = 0
    207216        Action = AShowCategories
    208217      end
    209218      object ToolButton5: TToolButton
    210         Left = 59
     219        Left = 71
    211220        Top = 0
    212221        Action = AShowImportSources
    213222      end
    214223      object ToolButton4: TToolButton
    215         Left = 88
     224        Left = 106
    216225        Top = 0
    217226        Action = AShowImportFormats
    … …  
    222231      AnchorSideTop.Control = CoolBar1
    223232      Left = 337
    224       Height = 28
    225       Top = 5
    226       Width = 59
     233      Height = 33
     234      Top = 5
     235      Width = 71
    227236      Align = alNone
    228237      AutoSize = True
    … …  
    233242      EdgeOuter = esNone
    234243      Images = Core.ImageList1
     244      ParentFont = False
    235245      ParentShowHint = False
    236246      ShowHint = True
    … …  
    238248      Transparent = True
    239249      object ToolButton11: TToolButton
    240         Left = 30
     250        Left = 36
    241251        Top = 0
    242252        Action = ASettings
    … …  
    252262      AnchorSideTop.Control = CoolBar1
    253263      Left = 428
    254       Height = 28
    255       Top = 5
    256       Width = 88
     264      Height = 33
     265      Top = 5
     266      Width = 106
    257267      Align = alNone
    258268      AutoSize = True
    … …  
    263273      EdgeOuter = esNone
    264274      Images = Core.ImageList1
     275      ParentFont = False
    265276      ParentShowHint = False
    266277      ShowHint = True
    … …  
    274285      end
    275286      object ToolButton13: TToolButton
    276         Left = 30
     287        Left = 36
    277288        Top = 0
    278289        Action = AFilterSameLetterCase
    … …  
    280291      end
    281292      object ToolButton8: TToolButton
    282         Left = 59
     293        Left = 71
    283294        Top = 0
    284295        Action = AFilterEnabledCategories
    … …  
    289300  object StatusBar1: TStatusBar
    290301    Left = 0
    291     Height = 28
    292     Top = 549
    293     Width = 847
     302    Height = 27
     303    Top = 661
     304    Width = 1016
    294305    Panels = <   
    295306      item
    296         Width = 250
     307        Width = 300
    297308      end   
    298309      item
    299         Width = 250
     310        Width = 300
    300311      end>
     312    ParentFont = False
    301313    SimplePanel = False
    302314  end
    303315  object ActionList1: TActionList
    304316    Images = Core.ImageList1
    305     left = 590
    306     top = 240
     317    Left = 708
     318    Top = 288
    307319    object AExit: TAction
    308320      Caption = 'Exit'
    … …  
    426438  object MainMenu1: TMainMenu
    427439    Images = Core.ImageList1
    428     left = 590
    429     top = 170
     440    Left = 708
     441    Top = 204
    430442    object MenuItem8: TMenuItem
    431443      Caption = 'File'
    … …  
    515527  object OpenDialog1: TOpenDialog
    516528    DefaultExt = '.adp'
    517     left = 100
    518     top = 260
     529    Left = 120
     530    Top = 312
    519531  end
    520532  object SaveDialog1: TSaveDialog
    521533    DefaultExt = '.adp'
    522534    Filter = 'Acronym Decoder project (.adp)|*.adp|All files|*.*'
    523     left = 100
    524     top = 180
     535    Left = 120
     536    Top = 216
    525537  end
    526538  object LastOpenedList1: TLastOpenedList
    527539    MaxCount = 10
    528540    OnChange = LastOpenedList1Change
    529     left = 330
    530     top = 300
     541    Left = 396
     542    Top = 360
    531543  end
    532544  object ListViewSort1: TListViewSort
    … …  
    537549    Column = 2
    538550    Order = soDown
    539     left = 590
    540     top = 320
     551    Left = 708
     552    Top = 384
    541553  end
    542554  object PopupMenuOpenRecent: TPopupMenu
    543555    Images = Core.ImageList1
    544     left = 100
    545     top = 350
     556    Left = 120
     557    Top = 420
    546558  end
    547559  object PopupMenuFilter: TPopupMenu
    548     left = 345
    549     top = 181
     560    Left = 414
     561    Top = 217
    550562    object MenuItem1: TMenuItem
    551563      Action = AManageAcronym
    … …  
    556568    end
    557569  end
     570  object AboutDialog1: TAboutDialog
     571    Translator = Core.Translator
     572    ThemeManager = Core.ThemeManager
     573    ApplicationInfo = Core.ApplicationInfo1
     574    Left = 392
     575    Top = 448
     576  end
    558577end

  • trunk/Forms/UFormMain.pas

    r204 r207  
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
    99  ComCtrls, StdCtrls, ExtCtrls, ActnList, Grids, UAcronym, UPersistentForm,
    10   URegistry, ULastOpenedList, UListViewSort, UJobProgressView,
     10  URegistry, ULastOpenedList, UListViewSort, UJobProgressView, UAboutDialog,
    1111  Registry, fgl, LazUTF8, LazFileUtils;
    1212
    … …  
    1616
    1717  TFormMain = class(TForm)
     18    AboutDialog1: TAboutDialog;
    1819    ADocumentCheck: TAction;
    1920    AFilterEnabledCategories: TAction;
    … …  
    439440procedure TFormMain.AShowAboutExecute(Sender: TObject);
    440441begin
    441   FormAbout := TFormAbout.Create(Self);
    442   try
    443     FormAbout.ApplicationInfo := Core.ApplicationInfo1;
    444     FormAbout.ShowModal;
    445   finally
    446     FreeAndNil(FormAbout);
    447   end;
     442  AboutDialog1.Show;
    448443end;
    449444
    … …  
    760755  // If installed in Linux system then use installation directory for po files
    761756  if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
    762     Core.CoolTranslator1.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
     757    Core.Translator.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
    763758  {$ENDIF}
    764759

  • trunk/Forms/UFormSettings.pas

    r184 r207  
    8181procedure TFormSettings.FormCreate(Sender: TObject);
    8282begin
    83   Core.CoolTranslator1.TranslateComponentRecursive(Self);
     83  Core.Translator.TranslateComponentRecursive(Self);
    8484  Core.ThemeManager.UseTheme(Self);
    8585  Core.ThemeManager.Themes.LoadToStrings(ComboBoxTheme.Items);
    86   Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
     86  Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
    8787end;
    8888
    8989procedure TFormSettings.Load;
    9090begin
    91   ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
     91  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator.Language);
    9292  if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
    9393  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager.Theme);
    … …  
    105105begin
    106106  if ComboBoxLanguage.ItemIndex <> -1 then
    107     Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
     107    Core.Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
    108108  if ComboBoxTheme.ItemIndex <> -1 then
    109109    Core.ThemeManager.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
Note: See TracChangeset for help on using the changeset viewer.