Changeset 162 for trunk


Ignore:
Timestamp:
Jun 30, 2023, 10:01:24 PM (18 months ago)
Author:
chronos
Message:
  • Modified: Updated Common package.
Location:
trunk
Files:
12 added
7 deleted
50 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Core.lfm

    r160 r162  
    393393  end
    394394  object OpenDialog1: TOpenDialog
    395     Title = 'Open existing file'
    396395    Left = 384
    397396    Top = 365
    398397  end
    399398  object SaveDialog1: TSaveDialog
    400     Title = 'Save file as'
    401399    Left = 115
    402400    Top = 365
    … …  
    86378635    Top = 125
    86388636  end
    8639   object AboutDialog1: TAboutDialog
    8640     Translator = Translator
    8641     ThemeManager = ThemeManager1
    8642     ApplicationInfo = ApplicationInfo1
    8643     Left = 576
    8644     Top = 48
    8645   end
    86468637  object SelectDirectoryDialog1: TSelectDirectoryDialog
    86478638    Title = 'Select directory'

  • trunk/Core.lrj

    r158 r162  
    2121{"hash":154699365,"name":"tcore.anormalize.caption","sourcebytes":[78,111,114,109,97,108,105,122,101],"value":"Normalize"},
    2222{"hash":124337662,"name":"tcore.afileexport.caption","sourcebytes":[69,120,112,111,114,116,46,46,46],"value":"Export..."},
    23 {"hash":218146437,"name":"tcore.opendialog1.title","sourcebytes":[79,112,101,110,32,101,120,105,115,116,105,110,103,32,102,105,108,101],"value":"Open existing file"},
    24 {"hash":159035875,"name":"tcore.savedialog1.title","sourcebytes":[83,97,118,101,32,102,105,108,101,32,97,115],"value":"Save file as"},
    2523{"hash":190444780,"name":"tcore.applicationinfo1.description","sourcebytes":[118,67,97,114,100,32,102,105,108,101,115,32,109,97,110,97,103,101,109,101,110,116,32,116,111,111,108],"value":"vCard files management tool"},
    2624{"hash":51995065,"name":"tcore.selectdirectorydialog1.title","sourcebytes":[83,101,108,101,99,116,32,100,105,114,101,99,116,111,114,121],"value":"Select directory"}

  • trunk/Core.pas

    r158 r162  
    66  Classes, SysUtils, FileUtil, Controls, ActnList, Forms, Dialogs, ExtCtrls,
    77  LastOpenedList, ApplicationInfo, PersistentForm, ScaleDPI, Common,
    8   Translator, DataFile, VCard, Menus, RegistryEx, Theme, AboutDialog,
     8  Translator, DataFile, VCard, Menus, RegistryEx, Theme,
    99  Registry, VCardFile;
    1010
    … …  
    1515  TCore = class(TDataModule)
    1616    AAbout: TAction;
    17     AboutDialog1: TAboutDialog;
    1817    AFileExport: TAction;
    1918    ANormalize: TAction;
    … …  
    132131uses
    133132  FormMain, FormSettings, FormFindDuplicity, FormCompare, TestCase, FormNormalize,
    134   FormGenerate, FormError, FormFind, FormTest, FormSource, TestCases, FormExport;
     133  FormGenerate, FormError, FormFind, FormSource, TestCases, FormExport, FormEx,
     134  FormAbout, FormTests;
    135135
    136136resourcestring
    … …  
    214214
    215215procedure TCore.AAboutExecute(Sender: TObject);
    216 begin
    217   AboutDialog1.Show;
     216var
     217  FormAbout: TFormAbout;
     218begin
     219  FormAbout := TFormAbout.Create(nil);
     220  FormAbout.ApplicationInfo := ApplicationInfo1;
     221  FormAbout.ShowModal;
     222  FreeAndNil(FormAbout);
    218223end;
    219224
    … …  
    342347procedure TCore.ATestExecute(Sender: TObject);
    343348begin
    344   with TFormTest.Create(nil) do
     349  with TFormTests.Create(nil) do
    345350  try
    346351    TestCases := InitTestCases;
    … …  
    451456    ApplicationInfo1.RegistryKey + '\RecentFiles');
    452457
     458  TFormEx.ScaleDPI := ScaleDPI1;
     459  TFormEx.Translator := Translator;
     460  TFormEx.ThemeManager := ThemeManager1;
     461  TFormEx.PersistentForm := PersistentForm1;
     462
    453463  FormMain := TFormMain.Create(nil);
     464//  FormMain.Translator.POFilesFolder := 'Languages;Packages/Common/Languages';
    454465  FormMain.Show;
    455466end;

  • trunk/Forms/FormColumns.lfm

    r149 r162  
    11object FormColumns: TFormColumns
    2   Left = 731
     2  Left = 922
    33  Height = 540
    4   Top = 344
     4  Top = 450
    55  Width = 715
    66  Caption = 'Columns settings'
    … …  
    88  ClientWidth = 715
    99  DesignTimePPI = 144
    10   OnClose = FormClose
    1110  OnCreate = FormCreate
    1211  OnDestroy = FormDestroy

  • trunk/Forms/FormColumns.pas

    r149 r162  
    44
    55uses
    6   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, VCard;
     6  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, VCard, FormEx;
    77
    88type
    … …  
    1010  { TFormColumns }
    1111
    12   TFormColumns = class(TForm)
     12  TFormColumns = class(TFormEx)
    1313    ButtonUp: TButton;
    1414    ButtonToLeft: TButton;
    … …  
    2626    procedure ButtonToRightClick(Sender: TObject);
    2727    procedure ButtonUpClick(Sender: TObject);
    28     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    2928    procedure FormCreate(Sender: TObject);
    3029    procedure FormDestroy(Sender: TObject);
    … …  
    4544{$R *.lfm}
    4645
    47 uses
    48   Core;
    49 
    5046{ TFormColumns }
    5147
    5248procedure TFormColumns.FormShow(Sender: TObject);
    5349begin
    54   Core.Core.PersistentForm1.Load(Self);
    55 
    5650  ListBoxActive.Items.Assign(ActiveColumns);
    5751  ListBoxAvailable.Items.Assign(AvailableColumns);
    … …  
    8579  ListBox.Items.Objects[Index1] := ListBox.Items.Objects[Index2];
    8680  ListBox.Items.Objects[Index2] := TempObject;
    87 end;
    88 
    89 procedure TFormColumns.FormClose(Sender: TObject; var CloseAction: TCloseAction
    90   );
    91 begin
    92   Core.Core.PersistentForm1.Save(Self);
    9381end;
    9482
    … …  
    136124procedure TFormColumns.FormCreate(Sender: TObject);
    137125begin
    138   Core.Core.Translator.TranslateComponentRecursive(Self);
    139   Core.Core.ThemeManager1.UseTheme(Self);
    140126  ActiveColumns := TStringList.Create;
    141127  AvailableColumns := TStringList.Create;

  • trunk/Forms/FormCompare.lfm

    r158 r162  
    11object FormCompare: TFormCompare
    2   Left = 602
     2  Left = 846
    33  Height = 456
    4   Top = 639
     4  Top = 492
    55  Width = 867
    66  Caption = 'Compare'

  • trunk/Forms/FormCompare.pas

    r154 r162  
    55uses
    66  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, DataFile,
    7   VCardFile, VCard, Common, RegistryEx;
     7  VCardFile, VCard, Common, RegistryEx, FormEx;
    88
    99type
    … …  
    1111  { TFormCompare }
    1212
    13   TFormCompare = class(TForm)
     13  TFormCompare = class(TFormEx)
    1414    ButtonBrowse: TButton;
    1515    ButtonCancel: TButton;
    … …  
    5353procedure TFormCompare.FormCreate(Sender: TObject);
    5454begin
    55   Core.Core.Translator.TranslateComponentRecursive(Self);
    56   Core.Core.ThemeManager1.UseTheme(Self);
    5755  LeftVCard := TVCardFile.Create(nil);
    5856  RightVCard := TVCardFile.Create(nil);
    … …  
    6967begin
    7068  SaveConfig;
    71   Core.Core.PersistentForm1.Save(Self);
    7269end;
    7370
    … …  
    120117procedure TFormCompare.FormShow(Sender: TObject);
    121118begin
    122   Core.Core.PersistentForm1.Load(Self);
    123119  LoadConfig;
    124120end;

  • trunk/Forms/FormCompareSideBySide.lfm

    r159 r162  
    11object FormCompareSideBySide: TFormCompareSideBySide
    2   Left = 377
     2  Left = 684
    33  Height = 888
    4   Top = 269
     4  Top = 276
    55  Width = 1191
    66  Caption = 'Compare side by side'
    … …  
    1010  Menu = MainMenu1
    1111  OnActivate = FormActivate
    12   OnClose = FormClose
    1312  OnCreate = FormCreate
    1413  OnDestroy = FormDestroy

  • trunk/Forms/FormCompareSideBySide.pas

    r159 r162  
    77  VCard, Diff, LCLType, LCLIntf, ComCtrls, Buttons, Menus, ActnList, SynEdit,
    88  SynEditMiscClasses, SynHighlighterPosition, SynEditHighlighter, Common,
    9   SynEditEx;
     9  SynEditEx, FormEx;
    1010
    1111type
    … …  
    1313  { TFormCompareSideBySide }
    1414
    15   TFormCompareSideBySide = class(TForm)
     15  TFormCompareSideBySide = class(TFormEx)
    1616    ASwitchSides: TAction;
    1717    AReloadFiles: TAction;
    … …  
    4141    procedure ASwitchSidesExecute(Sender: TObject);
    4242    procedure FormActivate(Sender: TObject);
    43     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    4443    procedure FormCreate(Sender: TObject);
    4544    procedure FormDestroy(Sender: TObject);
    … …  
    8079
    8180uses
    82   Core, VCardFile;
     81  VCardFile;
    8382
    8483{ TFormCompareSideBySide }
    85 
    86 procedure TFormCompareSideBySide.FormClose(Sender: TObject; var CloseAction: TCloseAction
    87   );
    88 begin
    89   Core.Core.PersistentForm1.Save(Self);
    90 end;
    9184
    9285procedure TFormCompareSideBySide.ASwitchSidesExecute(Sender: TObject);
    … …  
    143136procedure TFormCompareSideBySide.FormCreate(Sender: TObject);
    144137begin
    145   Core.Core.Translator.TranslateComponentRecursive(Self);
    146   Core.Core.ThemeManager1.UseTheme(Self);
    147138  Diff := TDiff.Create(Self);
    148139
    … …  
    196187procedure TFormCompareSideBySide.FormShow(Sender: TObject);
    197188begin
    198   Core.Core.PersistentForm1.Load(Self);
    199189  UpdateInterface;
    200190  ReloadContent;

  • trunk/Forms/FormContact.lfm

    r160 r162  
    14761476  end
    14771477  object OpenPictureDialog1: TOpenPictureDialog
    1478     Title = 'Open existing file'
    14791478    Left = 168
    14801479    Top = 552
    14811480  end
    14821481  object SavePictureDialog1: TSavePictureDialog
    1483     Title = 'Save file as'
    14841482    Left = 169
    14851483    Top = 468

  • trunk/Forms/FormContact.lrj

    r149 r162  
    9797{"hash":368487,"name":"tformcontact.aphotoshow.caption","sourcebytes":[83,104,111,119],"value":"Show"},
    9898{"hash":163994172,"name":"tformcontact.aphotoseturl.caption","sourcebytes":[83,101,116,32,85,82,76],"value":"Set URL"},
    99 {"hash":218146437,"name":"tformcontact.openpicturedialog1.title","sourcebytes":[79,112,101,110,32,101,120,105,115,116,105,110,103,32,102,105,108,101],"value":"Open existing file"},
    100 {"hash":159035875,"name":"tformcontact.savepicturedialog1.title","sourcebytes":[83,97,118,101,32,102,105,108,101,32,97,115],"value":"Save file as"},
    10199{"hash":171928085,"name":"tformcontact.calendardialog1.title","sourcebytes":[83,101,108,101,99,116,32,100,97,116,101],"value":"Select date"},
    102100{"hash":11067,"name":"tformcontact.calendardialog1.okcaption","sourcebytes":[38,79,75],"value":"&OK"},

  • trunk/Forms/FormContact.pas

    r149 r162  
    77  ComCtrls, ActnList, Menus, ExtCtrls, ExtDlgs, Buttons, VCard, LCLIntf,
    88  FormProperties, DateUtils, {$IFDEF LCLGTK2}Gtk2Globals, {$ENDIF}ContactImage,
    9   ubarcodes;
     9  ubarcodes, FormEx;
    1010
    1111type
    … …  
    1313  { TFormContact }
    1414
    15   TFormContact = class(TForm)
     15  TFormContact = class(TFormEx)
    1616    APhotoSetUrl: TAction;
    1717    APhotoShow: TAction;
    … …  
    325325  if Visible then LastMouse.WinControl := PageControlContact.ActivePage;
    326326  {$ENDIF}
    327   Core.Core.PersistentForm1.Load(Self);
    328327  PhotoChange(nil);
    329328
    … …  
    695694
    696695  Core.Core.LastContactTabIndex := PageControlContact.TabIndex;
    697   Core.Core.PersistentForm1.Save(Self);
    698696end;
    699697
    … …  
    837835procedure TFormContact.FormCreate(Sender: TObject);
    838836begin
    839   Core.Core.Translator.TranslateComponentRecursive(Self);
    840   Core.Core.ThemeManager1.UseTheme(Self);
    841837  FContact := nil;
    842838  FormProperties := TFormProperties.Create(nil);

  • trunk/Forms/FormContacts.lfm

    r149 r162  
    255255  end
    256256  object SaveDialog1: TSaveDialog
     257    Title = 'Uložit soubor jako'
    257258    Left = 720
    258259    Top = 408
    259260  end
    260261  object OpenDialog1: TOpenDialog
     262    Title = 'Otevřít existující soubor'
    261263    Left = 720
    262264    Top = 480

  • trunk/Forms/FormContacts.lrj

    r149 r162  
    1919{"hash":19140,"name":"tformcontacts.acut.caption","sourcebytes":[67,117,116],"value":"Cut"},
    2020{"hash":5671589,"name":"tformcontacts.apaste.caption","sourcebytes":[80,97,115,116,101],"value":"Paste"},
    21 {"hash":174310419,"name":"tformcontacts.acolumns.caption","sourcebytes":[67,111,108,117,109,110,115],"value":"Columns"}
     21{"hash":174310419,"name":"tformcontacts.acolumns.caption","sourcebytes":[67,111,108,117,109,110,115],"value":"Columns"},
     22{"hash":201423615,"name":"tformcontacts.savedialog1.title","sourcebytes":[85,108,111,197,190,105,116,32,115,111,117,98,111,114,32,106,97,107,111],"value":"Ulo\u017Eit soubor jako"},
     23{"hash":45680018,"name":"tformcontacts.opendialog1.title","sourcebytes":[79,116,101,118,197,153,195,173,116,32,101,120,105,115,116,117,106,195,173,99,195,173,32,115,111,117,98,111,114],"value":"Otev\u0159\u00EDt existuj\u00EDc\u00ED soubor"}
    2224]}

  • trunk/Forms/FormContacts.pas

    r160 r162  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    7   Menus, ActnList, VCard, ListViewSort, LazUTF8, Clipbrd, RegistryEx,
     7  Menus, ActnList, VCard, ListViewSort, LazUTF8, Clipbrd, RegistryEx, FormEx,
    88  Generics.Collections;
    99
    … …  
    1212  { TFormContacts }
    1313
    14   TFormContacts = class(TForm)
     14  TFormContacts = class(TFormEx)
    1515    AAdd: TAction;
    1616    AClone: TAction;
    … …  
    385385  LoadFromRegistry(Context);
    386386  UpdateColumns;
    387   Core.Core.Translator.TranslateComponentRecursive(Self);
    388   Core.Core.ThemeManager1.UseTheme(Self);
    389   Core.Core.PersistentForm1.Load(Self);
    390387  ReloadList;
    391388  UpdateInterface;
    … …  
    672669begin
    673670  SaveToRegistry(Context);
    674   Core.Core.PersistentForm1.Save(Self);
    675671end;
    676672

  • trunk/Forms/FormError.lfm

    r158 r162  
    88  ClientWidth = 956
    99  DesignTimePPI = 144
    10   OnClose = FormClose
    11   OnCreate = FormCreate
    12   OnShow = FormShow
    1310  LCLVersion = '2.2.6.0'
    1411  object MemoErrors: TMemo

  • trunk/Forms/FormError.pas

    r149 r162  
    44
    55uses
    6   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls;
     6  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, FormEx;
    77
    88type
    … …  
    1010  { TFormError }
    1111
    12   TFormError = class(TForm)
     12  TFormError = class(TFormEx)
    1313    MemoErrors: TMemo;
    14     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    15     procedure FormCreate(Sender: TObject);
    16     procedure FormShow(Sender: TObject);
    1714  end;
    1815
    … …  
    2219{$R *.lfm}
    2320
    24 uses
    25   Core;
    26 
    27 { TFormError }
    28 
    29 procedure TFormError.FormCreate(Sender: TObject);
    30 begin
    31   Core.Core.Translator.TranslateComponentRecursive(Self);
    32   Core.Core.ThemeManager1.UseTheme(Self);
    33 end;
    34 
    35 procedure TFormError.FormShow(Sender: TObject);
    36 begin
    37   Core.Core.PersistentForm1.Load(Self);
    38 end;
    39 
    40 procedure TFormError.FormClose(Sender: TObject; var CloseAction: TCloseAction);
    41 begin
    42   Core.Core.PersistentForm1.Save(Self);
    43 end;
    44 
    4521end.
    4622

  • trunk/Forms/FormExport.lfm

    r160 r162  
    105105  end
    106106  object SaveDialog1: TSaveDialog
     107    Title = 'Uložit soubor jako'
    107108    Left = 350
    108109    Top = 163

  • trunk/Forms/FormExport.lrj

    r158 r162  
    55{"hash":31521658,"name":"tformexport.label1.caption","sourcebytes":[79,117,116,112,117,116,32,102,111,114,109,97,116,58],"value":"Output format:"},
    66{"hash":50353482,"name":"tformexport.label2.caption","sourcebytes":[79,117,116,112,117,116,32,102,105,108,101,58],"value":"Output file:"},
    7 {"hash":77164181,"name":"tformexport.buttonbrowse.caption","sourcebytes":[66,114,111,119,115,101],"value":"Browse"}
     7{"hash":77164181,"name":"tformexport.buttonbrowse.caption","sourcebytes":[66,114,111,119,115,101],"value":"Browse"},
     8{"hash":201423615,"name":"tformexport.savedialog1.title","sourcebytes":[85,108,111,197,190,105,116,32,115,111,117,98,111,114,32,106,97,107,111],"value":"Ulo\u017Eit soubor jako"}
    89]}

  • trunk/Forms/FormExport.pas

    r161 r162  
    55uses
    66  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
    7   Table, LazFileUtils;
     7  Table, LazFileUtils, FormEx;
    88
    99type
    … …  
    1111  { TFormExport }
    1212
    13   TFormExport = class(TForm)
     13  TFormExport = class(TFormEx)
    1414    ButtonBrowse: TButton;
    1515    ButtonCancel: TButton;
    … …  
    5050begin
    5151  SaveConfig;
    52   Core.Core.PersistentForm1.Save(Self);
    5352end;
    5453
    … …  
    8079  TableFormat: TTableFormat;
    8180begin
    82   Core.Core.Translator.TranslateComponentRecursive(Self);
    83   Core.Core.ThemeManager1.UseTheme(Self);
    84 
    8581  ComboBoxOutputFormat.Items.BeginUpdate;
    8682  try
    … …  
    106102procedure TFormExport.FormShow(Sender: TObject);
    107103begin
    108   Core.Core.PersistentForm1.Load(Self);
    109 
    110104  PrepareTable;
    111105  Table.GetOutputListView(ListView1);

  • trunk/Forms/FormFind.lfm

    r158 r162  
    99  ClientWidth = 807
    1010  DesignTimePPI = 144
    11   OnClose = FormClose
    1211  OnCreate = FormCreate
    1312  OnDestroy = FormDestroy

  • trunk/Forms/FormFind.pas

    r149 r162  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    7   ExtCtrls, StdCtrls, ActnList, Menus, VCard, FormContacts;
     7  ExtCtrls, StdCtrls, ActnList, Menus, VCard, FormContacts, FormEx;
    88
    99type
    … …  
    1111  { TFormFind }
    1212
    13   TFormFind = class(TForm)
     13  TFormFind = class(TFormEx)
    1414    ButtonFind: TButton;
    1515    ComboBoxField: TComboBox;
    … …  
    2020    procedure ComboBoxFieldChange(Sender: TObject);
    2121    procedure EditValueKeyPress(Sender: TObject; var Key: char);
    22     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    2322    procedure FormCreate(Sender: TObject);
    2423    procedure FormDestroy(Sender: TObject);
    … …  
    3837
    3938{$R *.lfm}
    40 
    41 uses
    42   Core;
    4339
    4440resourcestring
    … …  
    9389procedure TFormFind.FormCreate(Sender: TObject);
    9490begin
    95   Core.Core.Translator.TranslateComponentRecursive(Self);
    96   Core.Core.ThemeManager1.UseTheme(Self);
    97 
    9891  ContactFieldIndex := cfNone;
    9992
    … …  
    125118end;
    126119
    127 procedure TFormFind.FormClose(Sender: TObject;
    128   var CloseAction: TCloseAction);
    129 begin
    130   Core.Core.PersistentForm1.Save(Self);
    131 end;
    132 
    133120procedure TFormFind.FormDestroy(Sender: TObject);
    134121begin
    … …  
    138125procedure TFormFind.FormShow(Sender: TObject);
    139126begin
    140   Core.Core.PersistentForm1.Load(Self);
    141 
    142127  FormContacts.ManualDock(Self, nil, alClient);
    143128  FormContacts.Align := alClient;

  • trunk/Forms/FormFindDuplicity.lfm

    r155 r162  
    88  ClientWidth = 807
    99  DesignTimePPI = 144
    10   OnClose = FormClose
    1110  OnCreate = FormCreate
    1211  OnDestroy = FormDestroy
    … …  
    5655    object ComboBoxField: TComboBox
    5756      Left = 232
    58       Height = 33
     57      Height = 42
    5958      Top = 16
    6059      Width = 326
    61       ItemHeight = 25
     60      ItemHeight = 0
    6261      OnChange = ComboBoxFieldChange
    6362      ParentFont = False
    … …  
    6766    object Label1: TLabel
    6867      Left = 13
    69       Height = 25
     68      Height = 26
    7069      Top = 19
    71       Width = 125
     70      Width = 135
    7271      Caption = 'By contact field:'
    7372      ParentColor = False

  • trunk/Forms/FormFindDuplicity.pas

    r152 r162  
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    77  ExtCtrls, StdCtrls, ActnList, Menus, VCard, Generics.Collections, RegistryEx,
    8   Generics.Defaults;
     8  Generics.Defaults, FormEx;
    99
    1010type
    … …  
    2727  { TFormFindDuplicity }
    2828
    29   TFormFindDuplicity = class(TForm)
     29  TFormFindDuplicity = class(TFormEx)
    3030    AShowContacts: TAction;
    3131    ActionList1: TActionList;
    … …  
    4040    procedure ButtonMergeClick(Sender: TObject);
    4141    procedure ComboBoxFieldChange(Sender: TObject);
    42     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    4342    procedure FormCreate(Sender: TObject);
    4443    procedure FormDestroy(Sender: TObject);
    … …  
    165164procedure TFormFindDuplicity.FormCreate(Sender: TObject);
    166165begin
    167   Core.Core.Translator.TranslateComponentRecursive(Self);
    168   Core.Core.ThemeManager1.UseTheme(Self);
    169 
    170166  FoundItems := TFoundItems.Create;
    171167  ContactFieldIndex := cfFullName;
    … …  
    234230end;
    235231
    236 procedure TFormFindDuplicity.FormClose(Sender: TObject;
    237   var CloseAction: TCloseAction);
    238 begin
    239   Core.Core.PersistentForm1.Save(Self);
    240 end;
    241 
    242232procedure TFormFindDuplicity.FormDestroy(Sender: TObject);
    243233begin
    … …  
    247237procedure TFormFindDuplicity.FormShow(Sender: TObject);
    248238begin
    249   Core.Core.PersistentForm1.Load(Self);
    250239  Find;
    251240end;

  • trunk/Forms/FormGenerate.lfm

    r157 r162  
    99  DesignTimePPI = 144
    1010  OnClose = FormClose
    11   OnCreate = FormCreate
    1211  OnShow = FormShow
    1312  LCLVersion = '2.2.6.0'

  • trunk/Forms/FormGenerate.pas

    r157 r162  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    7   Spin, VCard;
     7  Spin, VCard, FormEx;
    88
    99type
    … …  
    1111  { TFormGenerate }
    1212
    13   TFormGenerate = class(TForm)
     13  TFormGenerate = class(TFormEx)
    1414    ButtonGenerate: TButton;
    1515    Label1: TLabel;
    … …  
    1717    procedure ButtonGenerateClick(Sender: TObject);
    1818    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    19     procedure FormCreate(Sender: TObject);
    2019    procedure FormShow(Sender: TObject);
    2120  public
    … …  
    9392begin
    9493  Core.Core.GenerateCount := SpinEditCount.Value;
    95   Core.Core.PersistentForm1.Save(Self);
    96 end;
    97 
    98 procedure TFormGenerate.FormCreate(Sender: TObject);
    99 begin
    100   Core.Core.Translator.TranslateComponentRecursive(Self);
    101   Core.Core.ThemeManager1.UseTheme(Self);
    10294end;
    10395
    10496procedure TFormGenerate.FormShow(Sender: TObject);
    10597begin
    106   Core.Core.PersistentForm1.Load(Self);
    10798  SpinEditCount.Value := Core.Core.GenerateCount;
    10899  UpdateInterface;

  • trunk/Forms/FormImage.pas

    r149 r162  
    55uses
    66  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
    7   ExtDlgs, ContactImage;
     7  ExtDlgs, ContactImage, FormEx;
    88
    99type
    … …  
    1111  { TFormImage }
    1212
    13   TFormImage = class(TForm)
     13  TFormImage = class(TFormEx)
    1414    ButtonCancel: TButton;
    1515    ButtonOk: TButton;
    … …  
    2626    procedure ButtonSaveClick(Sender: TObject);
    2727    procedure EditUrlChange(Sender: TObject);
    28     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    2928    procedure FormCreate(Sender: TObject);
    3029    procedure FormDestroy(Sender: TObject);
    … …  
    4746{ TFormImage }
    4847
    49 procedure TFormImage.FormClose(Sender: TObject; var CloseAction: TCloseAction);
    50 begin
    51   Core.Core.PersistentForm1.Save(Self);
    52 end;
    53 
    5448procedure TFormImage.FormCreate(Sender: TObject);
    5549begin
    56   Core.Core.Translator.TranslateComponentRecursive(Self);
    57   Core.Core.ThemeManager1.UseTheme(Self);
    58 
    5950  Image := TContactImage.Create(nil);
    6051  Image.OnChange := ImageChange;
    … …  
    9889procedure TFormImage.FormShow(Sender: TObject);
    9990begin
    100   Core.Core.PersistentForm1.Load(Self);
    101 
    10291  ImageChange(nil);
    10392end;

  • trunk/Forms/FormMain.lfm

    r158 r162  
    11object FormMain: TFormMain
    2   Left = 553
    3   Height = 796
    4   Top = 401
    5   Width = 1178
     2  Left = 534
     3  Height = 993
     4  Top = 223
     5  Width = 1491
    66  AllowDropFiles = True
    77  Caption = 'vCard Studio'
    8   ClientHeight = 762
    9   ClientWidth = 1178
     8  ClientHeight = 959
     9  ClientWidth = 1491
    1010  DesignTimePPI = 144
    1111  Menu = MainMenu1
    … …  
    2222    Height = 43
    2323    Top = 0
    24     Width = 1178
     24    Width = 1491
    2525    AutoSize = True
    2626    Bands = <   

  • trunk/Forms/FormMain.pas

    r158 r162  
    55uses
    66  Classes, SysUtils, LazFileUtils, Forms, Controls, Graphics, Dialogs, Menus,
    7   ComCtrls, FormContacts;
     7  ComCtrls, FormContacts, FormEx;
    88
    99type
    … …  
    1111  { TFormMain }
    1212
    13   TFormMain = class(TForm)
     13  TFormMain = class(TFormEx)
    1414    CoolBar1: TCoolBar;
    1515    MainMenu1: TMainMenu;
    … …  
    9595  SaveConfig;
    9696  FormContacts.Close;
    97   Core.Core.PersistentForm1.Save(Self);
    9897  Application.Terminate;
    9998end;
    … …  
    139138    SetToolbarHints;
    140139    Core.Core.Initialize;
    141     Core.Core.Translator.TranslateComponentRecursive(Self);
    142     Core.Core.ThemeManager1.UseTheme(Self);
    143     Core.Core.PersistentForm1.Load(Self);
    144     Core.Core.ScaleDPI1.ScaleControl(CoolBar1, Core.Core.ScaleDPI1.DesignDPI);
     140    Translator.TranslateComponentRecursive(Self);
     141    ThemeManager.UseTheme(Self);
     142    PersistentForm.Load(Self);
     143    ScaleDPI.ScaleControl(CoolBar1, Core.Core.ScaleDPI1.DesignDPI);
    145144    CoolBar1.AutosizeBands;
    146145

  • trunk/Forms/FormNameDetails.lfm

    r155 r162  
    1010  Constraints.MinWidth = 270
    1111  DesignTimePPI = 144
    12   OnClose = FormClose
    13   OnCreate = FormCreate
    14   OnShow = FormShow
    1512  LCLVersion = '2.2.6.0'
    1613  object EditFirstName: TEdit
    1714    Left = 192
    18     Height = 33
     15    Height = 43
    1916    Top = 61
    2017    Width = 361
    … …  
    2522  object Label1: TLabel
    2623    Left = 15
    27     Height = 25
     24    Height = 26
    2825    Top = 69
    29     Width = 37
     26    Width = 41
    3027    Caption = 'First:'
    3128    ParentColor = False
    … …  
    3431  object Label5: TLabel
    3532    Left = 15
    36     Height = 25
     33    Height = 26
    3734    Top = 161
    38     Width = 35
     35    Width = 39
    3936    Caption = 'Last:'
    4037    ParentColor = False
    … …  
    4340  object EditLastName: TEdit
    4441    Left = 192
    45     Height = 33
     42    Height = 43
    4643    Top = 154
    4744    Width = 361
    … …  
    5249  object EditMiddleName: TEdit
    5350    Left = 192
    54     Height = 33
     51    Height = 43
    5552    Top = 108
    5653    Width = 361
    … …  
    6158  object Label25: TLabel
    6259    Left = 15
    63     Height = 25
     60    Height = 26
    6461    Top = 119
    65     Width = 59
     62    Width = 63
    6663    Caption = 'Middle:'
    6764    ParentColor = False
    … …  
    7067  object Label26: TLabel
    7168    Left = 15
    72     Height = 25
     69    Height = 26
    7370    Top = 23
    74     Width = 36
     71    Width = 41
    7572    Caption = 'Title:'
    7673    ParentColor = False
    … …  
    7976  object EditTitleBefore: TEdit
    8077    Left = 192
    81     Height = 33
     78    Height = 43
    8279    Top = 15
    8380    Width = 361
    … …  
    8885  object Label27: TLabel
    8986    Left = 15
    90     Height = 25
     87    Height = 26
    9188    Top = 207
    92     Width = 48
     89    Width = 53
    9390    Caption = 'Suffix:'
    9491    ParentColor = False
    … …  
    9794  object EditTitleAfter: TEdit
    9895    Left = 192
    99     Height = 33
     96    Height = 43
    10097    Top = 200
    10198    Width = 361

  • trunk/Forms/FormNameDetails.pas

    r149 r162  
    44
    55uses
    6   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls;
     6  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, FormEx;
    77
    88type
    … …  
    1010  { TFormNameDetails }
    1111
    12   TFormNameDetails = class(TForm)
     12  TFormNameDetails = class(TFormEx)
    1313    ButtonOk: TButton;
    1414    ButtonCancel: TButton;
    … …  
    2323    Label27: TLabel;
    2424    Label5: TLabel;
    25     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    26     procedure FormCreate(Sender: TObject);
    27     procedure FormShow(Sender: TObject);
    2825  end;
    2926
    … …  
    3330{$R *.lfm}
    3431
    35 uses
    36   Core;
    37 
    38 { TFormNameDetails }
    39 
    40 procedure TFormNameDetails.FormClose(Sender: TObject;
    41   var CloseAction: TCloseAction);
    42 begin
    43   Core.Core.PersistentForm1.Save(Self);
    44 end;
    45 
    46 procedure TFormNameDetails.FormCreate(Sender: TObject);
    47 begin
    48   Core.Core.Translator.TranslateComponentRecursive(Self);
    49   Core.Core.ThemeManager1.UseTheme(Self);
    50 end;
    51 
    52 procedure TFormNameDetails.FormShow(Sender: TObject);
    53 begin
    54   Core.Core.PersistentForm1.Load(Self);
    55 end;
    56 
    5732end.
    5833

  • trunk/Forms/FormNormalize.lfm

    r158 r162  
    99  DesignTimePPI = 144
    1010  OnClose = FormClose
    11   OnCreate = FormCreate
    1211  OnShow = FormShow
    1312  LCLVersion = '2.2.6.0'

  • trunk/Forms/FormNormalize.pas

    r155 r162  
    66
    77uses
    8   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, RegistryEx;
     8  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, RegistryEx,
     9  FormEx;
    910
    1011type
    … …  
    1213  { TFormNormalize }
    1314
    14   TFormNormalize = class(TForm)
     15  TFormNormalize = class(TFormEx)
    1516    ButtonCancel: TButton;
    1617    ButtonProcess: TButton;
    … …  
    2526    procedure ButtonProcessClick(Sender: TObject);
    2627    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    27     procedure FormCreate(Sender: TObject);
    2828    procedure FormShow(Sender: TObject);
    2929  private
    … …  
    4141{ TFormNormalize }
    4242
    43 procedure TFormNormalize.FormCreate(Sender: TObject);
    44 begin
    45   Core.Core.Translator.TranslateComponentRecursive(Self);
    46   Core.Core.ThemeManager1.UseTheme(Self);
    47 end;
    48 
    4943procedure TFormNormalize.FormClose(Sender: TObject;
    5044  var CloseAction: TCloseAction);
    5145begin
    5246  SaveConfig;
    53   Core.Core.PersistentForm1.Save(Self);
    5447end;
    5548
    … …  
    7770begin
    7871  LoadConfig;
    79   Core.Core.PersistentForm1.Load(Self);
    8072end;
    8173

  • trunk/Forms/FormProperties.lfm

    r160 r162  
    88  ClientWidth = 1210
    99  DesignTimePPI = 144
    10   OnClose = FormClose
    1110  OnCreate = FormCreate
    1211  OnShow = FormShow
    … …  
    193192  end
    194193  object SaveDialog1: TSaveDialog
     194    Title = 'Uložit soubor jako'
    195195    Left = 760
    196196    Top = 448
    197197  end
    198198  object OpenDialog1: TOpenDialog
     199    Title = 'Otevřít existující soubor'
    199200    Left = 760
    200201    Top = 520

  • trunk/Forms/FormProperties.lrj

    r149 r162  
    1010{"hash":4863557,"name":"tformproperties.aclone.caption","sourcebytes":[67,108,111,110,101],"value":"Clone"},
    1111{"hash":201478110,"name":"tformproperties.asavevaluetofile.caption","sourcebytes":[83,97,118,101,32,118,97,108,117,101,32,116,111,32,102,105,108,101,46,46,46],"value":"Save value to file..."},
    12 {"hash":231494782,"name":"tformproperties.aloadvaluefromfile.caption","sourcebytes":[76,111,97,100,32,118,97,108,117,101,32,102,114,111,109,32,102,105,108,101,46,46,46],"value":"Load value from file..."}
     12{"hash":231494782,"name":"tformproperties.aloadvaluefromfile.caption","sourcebytes":[76,111,97,100,32,118,97,108,117,101,32,102,114,111,109,32,102,105,108,101,46,46,46],"value":"Load value from file..."},
     13{"hash":201423615,"name":"tformproperties.savedialog1.title","sourcebytes":[85,108,111,197,190,105,116,32,115,111,117,98,111,114,32,106,97,107,111],"value":"Ulo\u017Eit soubor jako"},
     14{"hash":45680018,"name":"tformproperties.opendialog1.title","sourcebytes":[79,116,101,118,197,153,195,173,116,32,101,120,105,115,116,117,106,195,173,99,195,173,32,115,111,117,98,111,114],"value":"Otev\u0159\u00EDt existuj\u00EDc\u00ED soubor"}
    1315]}

  • trunk/Forms/FormProperties.pas

    r149 r162  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    7   Menus, ActnList, VCard, DataFile, ListViewSort, LazUTF8,
     7  Menus, ActnList, VCard, DataFile, ListViewSort, LazUTF8, FormEx,
    88  Generics.Collections;
    99
    … …  
    1212  { TFormProperties }
    1313
    14   TFormProperties = class(TForm)
     14  TFormProperties = class(TFormEx)
    1515    AAdd: TAction;
    1616    AClone: TAction;
    … …  
    5151    procedure ASaveValueToFileExecute(Sender: TObject);
    5252    procedure ASelectAllExecute(Sender: TObject);
    53     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    5453    procedure FormCreate(Sender: TObject);
    5554    procedure FormShow(Sender: TObject);
    … …  
    204203procedure TFormProperties.FormShow(Sender: TObject);
    205204begin
    206   Core.Core.PersistentForm1.Load(Self);
    207205  ReloadList;
    208206  UpdateInterface;
    … …  
    336334end;
    337335
    338 procedure TFormProperties.FormClose(Sender: TObject; var CloseAction: TCloseAction
    339   );
    340 begin
    341   Core.Core.PersistentForm1.Save(Self);
    342 end;
    343 
    344336procedure TFormProperties.FormCreate(Sender: TObject);
    345337var
    346338  I: Integer;
    347339begin
    348   Core.Core.Translator.TranslateComponentRecursive(Self);
    349   Core.Core.ThemeManager1.UseTheme(Self);
    350 
    351340  FProperties := nil;
    352341  for I := 0 to ToolBar1.ButtonCount - 1 do begin

  • trunk/Forms/FormProperty.pas

    r155 r162  
    44
    55uses
    6   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, VCard;
     6  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, VCard,
     7  FormEx;
    78
    89type
    … …  
    1011  { TFormProperty }
    1112
    12   TFormProperty = class(TForm)
     13  TFormProperty = class(TFormEx)
    1314    ButtonCancel: TButton;
    1415    ButtonOk: TButton;
    … …  
    2627    procedure EditAttributesChange(Sender: TObject);
    2728    procedure EditNameChange(Sender: TObject);
    28     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    2929    procedure FormCreate(Sender: TObject);
    30     procedure FormShow(Sender: TObject);
    3130  private
    3231    FContactProperty: TContactProperty;
    … …  
    4342
    4443{$R *.lfm}
    45 
    46 uses
    47   Core;
    4844
    4945{ TFormProperty }
    … …  
    8985end;
    9086
    91 procedure TFormProperty.FormClose(Sender: TObject; var CloseAction: TCloseAction);
    92 begin
    93   Core.Core.PersistentForm1.Save(Self);
    94 end;
    95 
    9687procedure TFormProperty.FormCreate(Sender: TObject);
    9788begin
    98   Core.Core.Translator.TranslateComponentRecursive(Self);
    99   Core.Core.ThemeManager1.UseTheme(Self);
    100 
    10189  FContactProperty := nil;
    10290  TContact.GetFields.LoadToStrings(ComboBoxField.Items);
    103 end;
    104 
    105 procedure TFormProperty.FormShow(Sender: TObject);
    106 begin
    107   Core.Core.PersistentForm1.Load(Self);
    10891end;
    10992

  • trunk/Forms/FormSettings.lfm

    r161 r162  
    1010  Constraints.MinWidth = 526
    1111  DesignTimePPI = 144
    12   OnClose = FormClose
    13   OnCreate = FormCreate
    1412  OnShow = FormShow
    1513  Position = poScreenCenter
    … …  
    218216  end
    219217  object OpenDialog1: TOpenDialog
     218    Title = 'Otevřít existující soubor'
    220219    Left = 640
    221220    Top = 72

  • trunk/Forms/FormSettings.lrj

    r158 r162  
    1313{"hash":77164181,"name":"tformsettings.buttonbrowse.caption","sourcebytes":[66,114,111,119,115,101],"value":"Browse"},
    1414{"hash":99356634,"name":"tformsettings.label6.caption","sourcebytes":[68,101,102,97,117,108,116,32,112,104,111,110,101,32,99,111,117,110,116,114,121,32,112,114,101,102,105,120,58],"value":"Default phone country prefix:"},
    15 {"hash":112394474,"name":"tformsettings.label7.caption","sourcebytes":[68,101,102,97,117,108,116,32,105,110,116,101,114,110,97,116,105,111,110,97,108,32,99,97,108,108,32,112,114,101,102,105,120,58],"value":"Default international call prefix:"}
     15{"hash":112394474,"name":"tformsettings.label7.caption","sourcebytes":[68,101,102,97,117,108,116,32,105,110,116,101,114,110,97,116,105,111,110,97,108,32,99,97,108,108,32,112,114,101,102,105,120,58],"value":"Default international call prefix:"},
     16{"hash":45680018,"name":"tformsettings.opendialog1.title","sourcebytes":[79,116,101,118,197,153,195,173,116,32,101,120,105,115,116,117,106,195,173,99,195,173,32,115,111,117,98,111,114],"value":"Otev\u0159\u00EDt existuj\u00EDc\u00ED soubor"}
    1617]}

  • trunk/Forms/FormSettings.pas

    r152 r162  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    7   Menus, Spin, ExtCtrls, Languages;
     7  Menus, Spin, ExtCtrls, Languages, FormEx;
    88
    99type
    … …  
    1111  { TFormSettings }
    1212
    13   TFormSettings = class(TForm)
     13  TFormSettings = class(TFormEx)
    1414    ButtonBrowse: TButton;
    1515    ButtonOk: TButton;
    … …  
    3939    procedure CheckBoxAutomaticDPIChange(Sender: TObject);
    4040    procedure CheckBoxStartOnLogonChange(Sender: TObject);
    41     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    42     procedure FormCreate(Sender: TObject);
    4341    procedure FormShow(Sender: TObject);
    4442  private
    … …  
    6260procedure TFormSettings.FormShow(Sender: TObject);
    6361begin
    64   Core.Core.PersistentForm1.Load(Self);
    65 
    6662  Core.Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
    6763  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Core.Translator.Language);
    … …  
    9894begin
    9995  UpdateInterface;
    100 end;
    101 
    102 procedure TFormSettings.FormClose(Sender: TObject; var CloseAction: TCloseAction
    103   );
    104 begin
    105   Core.Core.PersistentForm1.Save(Self);
    106 end;
    107 
    108 procedure TFormSettings.FormCreate(Sender: TObject);
    109 begin
    110   Core.Core.Translator.TranslateComponentRecursive(Self);
    111   Core.Core.ThemeManager1.UseTheme(Self);
    11296end;
    11397

  • trunk/Forms/FormSource.lfm

    r149 r162  
    88  ClientWidth = 913
    99  DesignTimePPI = 144
    10   OnClose = FormClose
    1110  OnCreate = FormCreate
    1211  OnDestroy = FormDestroy

  • trunk/Forms/FormSource.pas

    r149 r162  
    55uses
    66  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ActnList, Menus,
    7   StdCtrls, SynEdit, SynHighlighterAny, VCardHighlighter, Common;
     7  StdCtrls, SynEdit, SynHighlighterAny, VCardHighlighter, Common, FormEx;
    88
    99type
    … …  
    1111  { TFormSource }
    1212
    13   TFormSource = class(TForm)
     13  TFormSource = class(TFormEx)
    1414    APaste: TAction;
    1515    ACopy: TAction;
    … …  
    2929    procedure APasteExecute(Sender: TObject);
    3030    procedure ASelectAllExecute(Sender: TObject);
    31     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    3231    procedure FormCreate(Sender: TObject);
    3332    procedure FormDestroy(Sender: TObject);
    … …  
    5150
    5251{ TFormSource }
    53 
    54 procedure TFormSource.FormClose(Sender: TObject; var CloseAction: TCloseAction);
    55 begin
    56   Core.Core.PersistentForm1.Save(Self);
    57 end;
    5852
    5953procedure TFormSource.ASelectAllExecute(Sender: TObject);
    … …  
    8276  I: Integer;
    8377begin
    84   Core.Core.Translator.TranslateComponentRecursive(Self);
    85   Core.Core.ThemeManager1.UseTheme(Self);
    86 
    8778  VCardHighlighter := TSynVCardHighlighter.Create(nil);
    8879  ContactFields := TContact.GetFields;
    … …  
    10293procedure TFormSource.FormShow(Sender: TObject);
    10394begin
    104   Core.Core.PersistentForm1.Load(Self);
    10595  UpdateTheme;
    10696end;

  • trunk/Languages/vCardStudio.cs.po

    r158 r162  
    263263msgstr "Zobrazit zdroj"
    264264
    265 #: tcore.opendialog1.title
    266 msgctxt "tcore.opendialog1.title"
    267 msgid "Open existing file"
    268 msgstr "Otevřít existující soubor"
    269 
    270 #: tcore.savedialog1.title
    271 msgctxt "tcore.savedialog1.title"
    272 msgid "Save file as"
    273 msgstr "Uložit soubor jako"
    274 
    275265#: tcore.selectdirectorydialog1.title
    276266msgid "Select directory"
    … …  
    792782msgstr "Uložit do souboru"
    793783
    794 #: tformcontact.openpicturedialog1.title
    795 msgctxt "tformcontact.openpicturedialog1.title"
    796 msgid "Open existing file"
    797 msgstr "Otevřít existující soubor"
    798 
    799 #: tformcontact.savepicturedialog1.title
    800 msgctxt "tformcontact.savepicturedialog1.title"
    801 msgid "Save file as"
    802 msgstr "Uložit soubor jako"
    803 
    804784#: tformcontact.speedbuttonaniversary.hint
    805785msgctxt "tformcontact.speedbuttonaniversary.hint"
    … …  
    964944msgstr "Pracovní telefon"
    965945
     946#: tformcontacts.opendialog1.title
     947msgctxt "tformcontacts.opendialog1.title"
     948msgid "Otevřít existující soubor"
     949msgstr ""
     950
     951#: tformcontacts.savedialog1.title
     952msgctxt "tformcontacts.savedialog1.title"
     953msgid "Uložit soubor jako"
     954msgstr ""
     955
    966956#: tformerror.caption
    967957msgid "Load errors"
    … …  
    996986msgstr "Výstupní soubor:"
    997987
     988#: tformexport.savedialog1.title
     989msgctxt "tformexport.savedialog1.title"
     990msgid "Uložit soubor jako"
     991msgstr ""
     992
    998993#: tformfind.buttonfind.caption
    999994msgctxt "tformfind.buttonfind.caption"
    … …  
    12501245msgstr "Hodnoty"
    12511246
     1247#: tformproperties.opendialog1.title
     1248msgctxt "tformproperties.opendialog1.title"
     1249msgid "Otevřít existující soubor"
     1250msgstr ""
     1251
     1252#: tformproperties.savedialog1.title
     1253msgctxt "tformproperties.savedialog1.title"
     1254msgid "Uložit soubor jako"
     1255msgstr ""
     1256
    12521257#: tformproperty.buttoncancel.caption
    12531258msgctxt "tformproperty.buttoncancel.caption"
    … …  
    13411346msgstr "DPI:"
    13421347
     1348#: tformsettings.opendialog1.title
     1349msgctxt "tformsettings.opendialog1.title"
     1350msgid "Otevřít existující soubor"
     1351msgstr ""
     1352
    13431353#: tformsource.acopy.caption
    13441354msgctxt "tformsource.acopy.caption"
    … …  
    13751385msgstr "Zdroj"
    13761386
    1377 #: tformtest.arun.caption
    1378 msgctxt "tformtest.arun.caption"
    1379 msgid "Run"
    1380 msgstr "Spustit"
    1381 
    1382 #: tformtest.ashow.caption
    1383 msgctxt "tformtest.ashow.caption"
    1384 msgid "Show"
    1385 msgstr "Ukázat"
    1386 
    1387 #: tformtest.buttonrun.caption
    1388 msgctxt "tformtest.buttonrun.caption"
    1389 msgid "Run"
    1390 msgstr "Spustit"
    1391 
    1392 #: tformtest.caption
    1393 msgctxt "tformtest.caption"
    1394 msgid "Test"
    1395 msgstr "Testování"
    1396 
    1397 #: tformtest.labelresult.caption
    1398 msgid "   "
    1399 msgstr "   "
    1400 
    1401 #: tformtest.listviewtestcases.columns[0].caption
    1402 msgctxt "tformtest.listviewtestcases.columns[0].caption"
    1403 msgid "Name"
    1404 msgstr "Jméno"
    1405 
    1406 #: tformtest.listviewtestcases.columns[1].caption
    1407 msgid "Result"
    1408 msgstr "Výsledek"
    1409 
    1410 #: tformtestcase.caption
    1411 msgid "Test case"
    1412 msgstr "Testový případ"
    1413 
    14141387#: vcardfile.svcardfile
    14151388msgctxt "vcardfile.svcardfile"
    14161389msgid "vCard file"
    14171390msgstr "Soubor vCard"
     1391

  • trunk/Languages/vCardStudio.pot

    r158 r162  
    253253msgstr ""
    254254
    255 #: tcore.opendialog1.title
    256 msgctxt "tcore.opendialog1.title"
    257 msgid "Open existing file"
    258 msgstr ""
    259 
    260 #: tcore.savedialog1.title
    261 msgctxt "tcore.savedialog1.title"
    262 msgid "Save file as"
    263 msgstr ""
    264 
    265255#: tcore.selectdirectorydialog1.title
    266256msgid "Select directory"
    … …  
    782772msgstr ""
    783773
    784 #: tformcontact.openpicturedialog1.title
    785 msgctxt "tformcontact.openpicturedialog1.title"
    786 msgid "Open existing file"
    787 msgstr ""
    788 
    789 #: tformcontact.savepicturedialog1.title
    790 msgctxt "tformcontact.savepicturedialog1.title"
    791 msgid "Save file as"
    792 msgstr ""
    793 
    794774#: tformcontact.speedbuttonaniversary.hint
    795775msgctxt "tformcontact.speedbuttonaniversary.hint"
    … …  
    954934msgstr ""
    955935
     936#: tformcontacts.opendialog1.title
     937msgctxt "tformcontacts.opendialog1.title"
     938msgid "Otevřít existující soubor"
     939msgstr ""
     940
     941#: tformcontacts.savedialog1.title
     942msgctxt "tformcontacts.savedialog1.title"
     943msgid "Uložit soubor jako"
     944msgstr ""
     945
    956946#: tformerror.caption
    957947msgid "Load errors"
    … …  
    986976msgstr ""
    987977
     978#: tformexport.savedialog1.title
     979msgctxt "tformexport.savedialog1.title"
     980msgid "Uložit soubor jako"
     981msgstr ""
     982
    988983#: tformfind.buttonfind.caption
    989984msgctxt "tformfind.buttonfind.caption"
    … …  
    12401235msgstr ""
    12411236
     1237#: tformproperties.opendialog1.title
     1238msgctxt "tformproperties.opendialog1.title"
     1239msgid "Otevřít existující soubor"
     1240msgstr ""
     1241
     1242#: tformproperties.savedialog1.title
     1243msgctxt "tformproperties.savedialog1.title"
     1244msgid "Uložit soubor jako"
     1245msgstr ""
     1246
    12421247#: tformproperty.buttoncancel.caption
    12431248msgctxt "tformproperty.buttoncancel.caption"
    … …  
    13311336msgstr ""
    13321337
     1338#: tformsettings.opendialog1.title
     1339msgctxt "tformsettings.opendialog1.title"
     1340msgid "Otevřít existující soubor"
     1341msgstr ""
     1342
    13331343#: tformsource.acopy.caption
    13341344msgctxt "tformsource.acopy.caption"
    … …  
    13651375msgstr ""
    13661376
    1367 #: tformtest.arun.caption
    1368 msgctxt "tformtest.arun.caption"
    1369 msgid "Run"
    1370 msgstr ""
    1371 
    1372 #: tformtest.ashow.caption
    1373 msgctxt "tformtest.ashow.caption"
    1374 msgid "Show"
    1375 msgstr ""
    1376 
    1377 #: tformtest.buttonrun.caption
    1378 msgctxt "tformtest.buttonrun.caption"
    1379 msgid "Run"
    1380 msgstr ""
    1381 
    1382 #: tformtest.caption
    1383 msgctxt "tformtest.caption"
    1384 msgid "Test"
    1385 msgstr ""
    1386 
    1387 #: tformtest.labelresult.caption
    1388 msgid "   "
    1389 msgstr ""
    1390 
    1391 #: tformtest.listviewtestcases.columns[0].caption
    1392 msgctxt "tformtest.listviewtestcases.columns[0].caption"
    1393 msgid "Name"
    1394 msgstr ""
    1395 
    1396 #: tformtest.listviewtestcases.columns[1].caption
    1397 msgid "Result"
    1398 msgstr ""
    1399 
    1400 #: tformtestcase.caption
    1401 msgid "Test case"
    1402 msgstr ""
    1403 
    14041377#: vcardfile.svcardfile
    14051378msgctxt "vcardfile.svcardfile"

  • trunk/Languages/vCardStudio.sv.po

    r158 r162  
    264264msgstr ""
    265265
    266 #: tcore.opendialog1.title
    267 msgctxt "tcore.opendialog1.title"
    268 msgid "Open existing file"
    269 msgstr "Öppna en befintlig fil"
    270 
    271 #: tcore.savedialog1.title
    272 msgctxt "tcore.savedialog1.title"
    273 msgid "Save file as"
    274 msgstr "Spara fil som"
    275 
    276266#: tcore.selectdirectorydialog1.title
    277267msgid "Select directory"
    … …  
    793783msgstr ""
    794784
    795 #: tformcontact.openpicturedialog1.title
    796 msgctxt "tformcontact.openpicturedialog1.title"
    797 msgid "Open existing file"
    798 msgstr "Öppna en befintlig fil"
    799 
    800 #: tformcontact.savepicturedialog1.title
    801 msgctxt "tformcontact.savepicturedialog1.title"
    802 msgid "Save file as"
    803 msgstr "Spara fil som"
    804 
    805785#: tformcontact.speedbuttonaniversary.hint
    806786msgctxt "tformcontact.speedbuttonaniversary.hint"
    … …  
    970950msgid "Work phone"
    971951msgstr "Jobb telefon"
     952
     953#: tformcontacts.opendialog1.title
     954msgctxt "tformcontacts.opendialog1.title"
     955msgid "Otevřít existující soubor"
     956msgstr ""
     957
     958#: tformcontacts.savedialog1.title
     959msgctxt "tformcontacts.savedialog1.title"
     960msgid "Uložit soubor jako"
     961msgstr ""
    972962
    973963#: tformerror.caption
    … …  
    1004994msgstr ""
    1005995
     996#: tformexport.savedialog1.title
     997msgctxt "tformexport.savedialog1.title"
     998msgid "Uložit soubor jako"
     999msgstr ""
     1000
    10061001#: tformfind.buttonfind.caption
    10071002msgctxt "tformfind.buttonfind.caption"
    … …  
    12601255msgstr ""
    12611256
     1257#: tformproperties.opendialog1.title
     1258msgctxt "tformproperties.opendialog1.title"
     1259msgid "Otevřít existující soubor"
     1260msgstr ""
     1261
     1262#: tformproperties.savedialog1.title
     1263msgctxt "tformproperties.savedialog1.title"
     1264msgid "Uložit soubor jako"
     1265msgstr ""
     1266
    12621267#: tformproperty.buttoncancel.caption
    12631268msgctxt "tformproperty.buttoncancel.caption"
    … …  
    13511356msgstr "DPI:"
    13521357
     1358#: tformsettings.opendialog1.title
     1359msgctxt "tformsettings.opendialog1.title"
     1360msgid "Otevřít existující soubor"
     1361msgstr ""
     1362
    13531363#: tformsource.acopy.caption
    13541364msgctxt "tformsource.acopy.caption"
    … …  
    13851395msgstr ""
    13861396
    1387 #: tformtest.arun.caption
    1388 msgctxt "tformtest.arun.caption"
    1389 msgid "Run"
    1390 msgstr "Kör"
    1391 
    1392 #: tformtest.ashow.caption
    1393 msgctxt "tformtest.ashow.caption"
    1394 msgid "Show"
    1395 msgstr "Visa"
    1396 
    1397 #: tformtest.buttonrun.caption
    1398 msgctxt "tformtest.buttonrun.caption"
    1399 msgid "Run"
    1400 msgstr "Kör"
    1401 
    1402 #: tformtest.caption
    1403 msgctxt "tformtest.caption"
    1404 msgid "Test"
    1405 msgstr "Testa"
    1406 
    1407 #: tformtest.labelresult.caption
    1408 msgid "   "
    1409 msgstr ""
    1410 
    1411 #: tformtest.listviewtestcases.columns[0].caption
    1412 msgctxt "tformtest.listviewtestcases.columns[0].caption"
    1413 msgid "Name"
    1414 msgstr "Namn"
    1415 
    1416 #: tformtest.listviewtestcases.columns[1].caption
    1417 msgid "Result"
    1418 msgstr "Resultat"
    1419 
    1420 #: tformtestcase.caption
    1421 msgid "Test case"
    1422 msgstr "Testfall"
    1423 
    14241397#: vcardfile.svcardfile
    14251398msgctxt "vcardfile.svcardfile"

  • trunk/Packages/Common/Common.lpk

    r158 r162  
    1111      <PathDelim Value="\"/>
    1212      <SearchPaths>
     13        <OtherUnitFiles Value="Forms"/>
    1314        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
    1415      </SearchPaths>
    … …  
    4142Source: https://svn.zdechov.net/PascalClassLibrary/Common/"/>
    4243    <License Value="Copy left."/>
    43     <Version Minor="11"/>
    44     <Files Count="34">
     44    <Version Minor="12"/>
     45    <Files Count="36">
    4546      <Item1>
    4647        <Filename Value="StopWatch.pas"/>
    … …  
    159160      </Item26>
    160161      <Item27>
    161         <Filename Value="FormAbout.pas"/>
    162         <UnitName Value="FormAbout"/>
     162        <Filename Value="PixelPointer.pas"/>
     163        <UnitName Value="PixelPointer"/>
    163164      </Item27>
    164165      <Item28>
    165         <Filename Value="AboutDialog.pas"/>
    166         <HasRegisterProc Value="True"/>
    167         <UnitName Value="AboutDialog"/>
     166        <Filename Value="DataFile.pas"/>
     167        <UnitName Value="DataFile"/>
    168168      </Item28>
    169169      <Item29>
    170         <Filename Value="PixelPointer.pas"/>
    171         <UnitName Value="PixelPointer"/>
     170        <Filename Value="TestCase.pas"/>
     171        <UnitName Value="TestCase"/>
    172172      </Item29>
    173173      <Item30>
    174         <Filename Value="DataFile.pas"/>
    175         <UnitName Value="DataFile"/>
     174        <Filename Value="Generics.pas"/>
     175        <UnitName Value="Generics"/>
    176176      </Item30>
    177177      <Item31>
    178         <Filename Value="TestCase.pas"/>
    179         <UnitName Value="TestCase"/>
    180       </Item31>
    181       <Item32>
    182         <Filename Value="Generics.pas"/>
    183         <UnitName Value="Generics"/>
    184       </Item32>
    185       <Item33>
    186178        <Filename Value="CommonPackage.pas"/>
    187179        <Type Value="Main Unit"/>
    188180        <UnitName Value="CommonPackage"/>
     181      </Item31>
     182      <Item32>
     183        <Filename Value="Table.pas"/>
     184        <UnitName Value="Table"/>
     185      </Item32>
     186      <Item33>
     187        <Filename Value="FormEx.pas"/>
     188        <HasRegisterProc Value="True"/>
     189        <UnitName Value="FormEx"/>
    189190      </Item33>
    190191      <Item34>
    191         <Filename Value="Table.pas"/>
    192         <UnitName Value="Table"/>
     192        <Filename Value="Forms\FormTests.pas"/>
     193        <UnitName Value="FormTests"/>
    193194      </Item34>
     195      <Item35>
     196        <Filename Value="Forms\FormTest.pas"/>
     197        <UnitName Value="FormTest"/>
     198      </Item35>
     199      <Item36>
     200        <Filename Value="Forms\FormAbout.pas"/>
     201        <UnitName Value="FormAbout"/>
     202      </Item36>
    194203    </Files>
    195204    <CompatibilityMode Value="True"/>

  • trunk/Packages/Common/CommonPackage.pas

    r158 r162  
    1313  XML, ApplicationInfo, SyncCounter, ListViewSort, PersistentForm, FindFile,
    1414  ScaleDPI, Theme, StringTable, MetaCanvas, Geometric, Translator, Languages,
    15   FormAbout, AboutDialog, PixelPointer, DataFile, TestCase, Generics, Table,
    16   LazarusPackageIntf;
     15  PixelPointer, DataFile, TestCase, Generics, Table, FormEx, FormTests,
     16  FormTest, FormAbout, LazarusPackageIntf;
    1717
    1818implementation
    … …  
    3131  RegisterUnit('Theme', @Theme.Register);
    3232  RegisterUnit('Translator', @Translator.Register);
    33   RegisterUnit('AboutDialog', @AboutDialog.Register);
     33  RegisterUnit('FormEx', @FormEx.Register);
    3434end;
    3535

  • trunk/Packages/Common/Forms/FormAbout.lfm

    r161 r162  
    11object FormAbout: TFormAbout
    2   Left = 1014
    3   Height = 349
    4   Top = 577
    5   Width = 609
     2  Left = 624
     3  Height = 402
     4  Top = 622
     5  Width = 702
    66  Caption = 'About'
    7   ClientHeight = 349
    8   ClientWidth = 609
    9   DesignTimePPI = 125
     7  ClientHeight = 402
     8  ClientWidth = 702
     9  DesignTimePPI = 144
    1010  OnShow = FormShow
    1111  Position = poScreenCenter
    12   LCLVersion = '2.2.4.0'
     12  LCLVersion = '2.2.6.0'
    1313  object LabelDescription: TLabel
    14     Left = 26
    15     Height = 22
    16     Top = 117
    17     Width = 557
     14    Left = 30
     15    Height = 26
     16    Top = 135
     17    Width = 642
    1818    Align = alTop
    19     BorderSpacing.Left = 26
    20     BorderSpacing.Right = 26
    21     BorderSpacing.Bottom = 26
     19    BorderSpacing.Left = 30
     20    BorderSpacing.Right = 30
     21    BorderSpacing.Bottom = 30
    2222    Caption = 'Description'
    2323    ParentColor = False
    … …  
    2626  end
    2727  object LabelContent: TLabel
    28     Left = 26
    29     Height = 22
    30     Top = 165
    31     Width = 557
     28    Left = 30
     29    Height = 26
     30    Top = 191
     31    Width = 642
    3232    Align = alTop
    33     BorderSpacing.Around = 26
     33    BorderSpacing.Around = 30
    3434    Caption = '   '
    3535    ParentColor = False
    … …  
    3838  object PanelTop: TPanel
    3939    Left = 0
    40     Height = 117
     40    Height = 135
    4141    Top = 0
    42     Width = 609
     42    Width = 702
    4343    Align = alTop
    4444    BevelOuter = bvNone
    45     ClientHeight = 117
    46     ClientWidth = 609
     45    ClientHeight = 135
     46    ClientWidth = 702
    4747    FullRepaint = False
    4848    ParentFont = False
    4949    TabOrder = 0
    5050    object LabelAppName: TLabel
    51       Left = 94
    52       Height = 73
    53       Top = 17
    54       Width = 489
     51      Left = 108
     52      Height = 84
     53      Top = 20
     54      Width = 564
    5555      Anchors = [akTop, akLeft, akRight]
    5656      AutoSize = False
    57       BorderSpacing.Around = 26
     57      BorderSpacing.Around = 30
    5858      Caption = 'Title'
    59       Font.Height = -52
     59      Font.Height = -60
    6060      ParentColor = False
    6161      ParentFont = False
    … …  
    6363    end
    6464    object ImageLogo: TImage
    65       Left = 21
    66       Height = 64
    67       Top = 26
    68       Width = 62
     65      Left = 24
     66      Height = 74
     67      Top = 30
     68      Width = 71
    6969      Proportional = True
    7070      Stretch = True
    … …  
    7373  object PanelButtons: TPanel
    7474    Left = 0
    75     Height = 65
    76     Top = 284
    77     Width = 609
     75    Height = 75
     76    Top = 327
     77    Width = 702
    7878    Align = alBottom
    7979    BevelOuter = bvNone
    80     ClientHeight = 65
    81     ClientWidth = 609
     80    ClientHeight = 75
     81    ClientWidth = 702
    8282    TabOrder = 1
    8383    object ButtonHomePage: TButton
    84       Left = 21
    85       Height = 33
    86       Top = 21
    87       Width = 229
     84      Left = 24
     85      Height = 38
     86      Top = 24
     87      Width = 264
    8888      Anchors = [akLeft, akBottom]
    8989      Caption = 'Home page'
    … …  
    9393    end
    9494    object ButtonClose: TButton
    95       Left = 461
    96       Height = 33
    97       Top = 21
    98       Width = 122
     95      Left = 531
     96      Height = 38
     97      Top = 24
     98      Width = 141
    9999      Anchors = [akRight, akBottom]
    100100      Caption = 'Close'

  • trunk/Packages/Common/Forms/FormAbout.pas

    r161 r162  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
    7   StdCtrls, ExtCtrls, ApplicationInfo, Common, Translator, Theme;
     7  StdCtrls, ExtCtrls, ApplicationInfo, Common, FormEx;
    88
    99type
    1010  { TFormAbout }
    1111
    12   TFormAbout = class(TForm)
     12  TFormAbout = class(TFormEx)
    1313    ButtonClose: TButton;
    1414    ButtonHomePage: TButton;
    … …  
    2121    procedure ButtonHomePageClick(Sender: TObject);
    2222    procedure FormShow(Sender: TObject);
     23  private
     24    FApplicationInfo: TApplicationInfo;
    2325  public
    24     AboutDialog: TObject; //TAboutDialog
    2526    procedure UpdateInterface;
     27    property ApplicationInfo: TApplicationInfo read FApplicationInfo write
     28      FApplicationInfo;
    2629  end;
    2730
    … …  
    3033
    3134{$R *.lfm}
    32 
    33 uses
    34   AboutDialog;
    3535
    3636resourcestring
    … …  
    4343procedure TFormAbout.FormShow(Sender: TObject);
    4444begin
    45   if Assigned(AboutDialog) then
    46   with TAboutDialog(AboutDialog) do begin
    47     if Assigned(Translator) then
    48       Translator.TranslateComponentRecursive(Self);
    49     if Assigned(ThemeManager) then
    50       ThemeManager.UseTheme(Self);
    51 
    52     if Assigned(ApplicationInfo) then
    53     with ApplicationInfo do begin
    54       LabelAppName.Caption := AppName;
    55       LabelContent.Caption := SVersion + ': ' + Version + LineEnding +
    56         SReleaseDate + ': ' + DateToStr(ReleaseDate) + LineEnding +
    57         SLicense + ': ' + License;
    58       LabelDescription.Caption := Description;
    59       ImageLogo.Picture.Bitmap.Assign(Icon);
    60     end;
     45  if Assigned(ApplicationInfo) then
     46  with ApplicationInfo do begin
     47    LabelAppName.Caption := AppName;
     48    LabelContent.Caption := SVersion + ': ' + Version + LineEnding +
     49      SReleaseDate + ': ' + DateToStr(ReleaseDate) + LineEnding +
     50      SLicense + ': ' + License;
     51    LabelDescription.Caption := Description;
     52    ImageLogo.Picture.Bitmap.Assign(Icon);
    6153  end;
    6254  UpdateInterface;
    … …  
    6557procedure TFormAbout.UpdateInterface;
    6658begin
    67   ButtonHomePage.Enabled := Assigned(AboutDialog) and
    68     Assigned(TAboutDialog(AboutDialog).ApplicationInfo);
     59  ButtonHomePage.Enabled := Assigned(ApplicationInfo);
    6960end;
    7061
    7162procedure TFormAbout.ButtonHomePageClick(Sender: TObject);
    7263begin
    73   OpenWebPage(TAboutDialog(AboutDialog).ApplicationInfo.HomePage);
     64  OpenWebPage(ApplicationInfo.HomePage);
    7465end;
    7566

  • trunk/Packages/Common/Languages

    • Property svn:ignore set to
      *.mo

  • trunk/Packages/Common/Translator.pas

    r159 r162  
    173173begin
    174174  FPoFiles.Clear;
    175   if Assigned(FLanguage) then
    176   try
     175  if Assigned(FLanguage) then begin
    177176    LocaleShort := GetLocaleShort;
    178     //ShowMessage(ExtractFileDir(Application.ExeName) +
    179     //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
    180177    SearchMask := '*';
    181178    if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
    … …  
    184181    for J := 0 to LangDirs.Count - 1 do begin
    185182      FileList := FindAllFiles(LangDirs[J], SearchMask);
    186       for I := 0 to FileList.Count - 1 do begin
    187         FileName := FileList[I];
    188         //FileName := FindLocaleFileName('.po');
    189         if FileExists(FileName) and (
    190         ((LocaleShort = '') and (Pos('.', FileName) = Pos(PoExt, FileName))) or
    191         (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
     183      try
     184        for I := 0 to FileList.Count - 1 do begin
     185          FileName := FileList[I];
     186          //FileName := FindLocaleFileName('.po');
     187           if FileExists(FileName) and (
     188          ((LocaleShort = '') and (Pos('.', FileName) = Pos(PoExt, FileName))) or
     189          (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
     190        end;
     191      finally
     192        FileList.Free;
    192193      end;
    193194    end;
    194195    LangDirs.Free;
    195   finally
    196     FileList.Free;
    197196  end;
    198197end;

  • trunk/vCardStudio.lpi

    r158 r162  
    123123      </Item7>
    124124    </RequiredPackages>
    125     <Units Count="27">
     125    <Units Count="25">
    126126      <Unit0>
    127127        <Filename Value="vCardStudio.lpr"/>
    … …  
    206206      </Unit11>
    207207      <Unit12>
    208         <Filename Value="Forms\FormTest.pas"/>
    209         <IsPartOfProject Value="True"/>
    210         <ComponentName Value="FormTest"/>
    211         <HasResources Value="True"/>
    212         <ResourceBaseClass Value="Form"/>
     208        <Filename Value="Test.pas"/>
     209        <IsPartOfProject Value="True"/>
    213210      </Unit12>
    214211      <Unit13>
    215         <Filename Value="Test.pas"/>
    216         <IsPartOfProject Value="True"/>
     212        <Filename Value="Forms\FormImage.pas"/>
     213        <IsPartOfProject Value="True"/>
     214        <ComponentName Value="FormImage"/>
     215        <HasResources Value="True"/>
     216        <ResourceBaseClass Value="Form"/>
    217217      </Unit13>
    218218      <Unit14>
    219         <Filename Value="Forms\FormTestCase.pas"/>
    220         <IsPartOfProject Value="True"/>
    221         <ComponentName Value="FormTestCase"/>
     219        <Filename Value="Forms\FormNameDetails.pas"/>
     220        <IsPartOfProject Value="True"/>
     221        <ComponentName Value="FormNameDetails"/>
    222222        <HasResources Value="True"/>
    223223        <ResourceBaseClass Value="Form"/>
    224224      </Unit14>
    225225      <Unit15>
    226         <Filename Value="Forms\FormImage.pas"/>
    227         <IsPartOfProject Value="True"/>
    228         <ComponentName Value="FormImage"/>
     226        <Filename Value="Forms\FormSource.pas"/>
     227        <IsPartOfProject Value="True"/>
     228        <ComponentName Value="FormSource"/>
    229229        <HasResources Value="True"/>
    230230        <ResourceBaseClass Value="Form"/>
    231231      </Unit15>
    232232      <Unit16>
    233         <Filename Value="Forms\FormNameDetails.pas"/>
    234         <IsPartOfProject Value="True"/>
    235         <ComponentName Value="FormNameDetails"/>
    236         <HasResources Value="True"/>
    237         <ResourceBaseClass Value="Form"/>
     233        <Filename Value="VCardHighlighter.pas"/>
     234        <IsPartOfProject Value="True"/>
    238235      </Unit16>
    239236      <Unit17>
    240         <Filename Value="Forms\FormSource.pas"/>
    241         <IsPartOfProject Value="True"/>
    242         <ComponentName Value="FormSource"/>
     237        <Filename Value="Forms\FormCompareSideBySide.pas"/>
     238        <IsPartOfProject Value="True"/>
     239        <ComponentName Value="FormCompareSideBySide"/>
    243240        <HasResources Value="True"/>
    244241        <ResourceBaseClass Value="Form"/>
    245242      </Unit17>
    246243      <Unit18>
    247         <Filename Value="VCardHighlighter.pas"/>
     244        <Filename Value="Diff.pas"/>
    248245        <IsPartOfProject Value="True"/>
    249246      </Unit18>
    250247      <Unit19>
    251         <Filename Value="Forms\FormCompareSideBySide.pas"/>
    252         <IsPartOfProject Value="True"/>
    253         <ComponentName Value="FormCompareSideBySide"/>
    254         <HasResources Value="True"/>
    255         <ResourceBaseClass Value="Form"/>
     248        <Filename Value="TestCases.pas"/>
     249        <IsPartOfProject Value="True"/>
    256250      </Unit19>
    257251      <Unit20>
    258         <Filename Value="Diff.pas"/>
     252        <Filename Value="VCardFile.pas"/>
    259253        <IsPartOfProject Value="True"/>
    260254      </Unit20>
    261255      <Unit21>
    262         <Filename Value="TestCases.pas"/>
    263         <IsPartOfProject Value="True"/>
     256        <Filename Value="Forms\FormColumns.pas"/>
     257        <IsPartOfProject Value="True"/>
     258        <ComponentName Value="FormColumns"/>
     259        <HasResources Value="True"/>
     260        <ResourceBaseClass Value="Form"/>
    264261      </Unit21>
    265262      <Unit22>
    266         <Filename Value="VCardFile.pas"/>
    267         <IsPartOfProject Value="True"/>
     263        <Filename Value="Forms\FormCompare.pas"/>
     264        <IsPartOfProject Value="True"/>
     265        <ComponentName Value="FormCompare"/>
     266        <HasResources Value="True"/>
     267        <ResourceBaseClass Value="Form"/>
    268268      </Unit22>
    269269      <Unit23>
    270         <Filename Value="Forms\FormColumns.pas"/>
    271         <IsPartOfProject Value="True"/>
    272         <ComponentName Value="FormColumns"/>
     270        <Filename Value="Forms\FormNormalize.pas"/>
     271        <IsPartOfProject Value="True"/>
     272        <ComponentName Value="FormNormalize"/>
    273273        <HasResources Value="True"/>
    274274        <ResourceBaseClass Value="Form"/>
    275275      </Unit23>
    276276      <Unit24>
    277         <Filename Value="Forms\FormCompare.pas"/>
    278         <IsPartOfProject Value="True"/>
    279         <ComponentName Value="FormCompare"/>
     277        <Filename Value="Forms\FormExport.pas"/>
     278        <IsPartOfProject Value="True"/>
     279        <ComponentName Value="FormExport"/>
    280280        <HasResources Value="True"/>
    281281        <ResourceBaseClass Value="Form"/>
    282282      </Unit24>
    283       <Unit25>
    284         <Filename Value="Forms\FormNormalize.pas"/>
    285         <IsPartOfProject Value="True"/>
    286         <ComponentName Value="FormNormalize"/>
    287         <HasResources Value="True"/>
    288         <ResourceBaseClass Value="Form"/>
    289       </Unit25>
    290       <Unit26>
    291         <Filename Value="Forms\FormExport.pas"/>
    292         <IsPartOfProject Value="True"/>
    293         <ComponentName Value="FormExport"/>
    294         <HasResources Value="True"/>
    295         <ResourceBaseClass Value="Form"/>
    296       </Unit26>
    297283    </Units>
    298284  </ProjectOptions>
Note: See TracChangeset for help on using the changeset viewer.