Changeset 164


Ignore:
Timestamp:
Jun 30, 2023, 10:51:35 PM (10 months ago)
Author:
chronos
Message:
  • Fixed: Build under Windows.
  • Fixed: Correctly apply theme to contacts form.
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Core.pas

    r162 r164  
    66  Classes, SysUtils, FileUtil, Controls, ActnList, Forms, Dialogs, ExtCtrls,
    77  LastOpenedList, ApplicationInfo, PersistentForm, ScaleDPI, Common,
    8   Translator, DataFile, VCard, Menus, RegistryEx, Theme,
     8  Translator, DataFile, VCard, Menus, RegistryEx, Theme, FormMain,
    99  Registry, VCardFile;
    1010
    … …  
    8181    ProfilePhotoFileName: string;
    8282    RecentFileRegistryContext: TRegistryContext;
    83     FormMain: TForm;
     83    FormMain: TFormMain;
    8484    procedure FileModified(Sender: TObject);
    8585    function FindFirstNonOption: string;
    … …  
    130130
    131131uses
    132   FormMain, FormSettings, FormFindDuplicity, FormCompare, TestCase, FormNormalize,
     132  FormSettings, FormFindDuplicity, FormCompare, TestCase, FormNormalize,
    133133  FormGenerate, FormError, FormFind, FormSource, TestCases, FormExport, FormEx,
    134134  FormAbout, FormTests;
    … …  
    337337    if ShowModal = mrOK then begin
    338338      SaveData;
    339       //ThemeManager1.UseTheme(FormMain);
    340       //ThemeManager1.UseTheme(FormContacts);
     339      FormMain.SettingsChanged;
    341340    end;
    342341  finally
    … …  
    461460  TFormEx.PersistentForm := PersistentForm1;
    462461
     462  Initialize;
     463
    463464  FormMain := TFormMain.Create(nil);
    464 //  FormMain.Translator.POFilesFolder := 'Languages;Packages/Common/Languages';
    465465  FormMain.Show;
    466466end;

  • trunk/Forms/FormMain.lfm

    r162 r164  
    11object FormMain: TFormMain
    2   Left = 534
    3   Height = 993
    4   Top = 223
    5   Width = 1491
     2  Left = 0
     3  Height = 1360
     4  Top = 40
     5  Width = 2560
    66  AllowDropFiles = True
    77  Caption = 'vCard Studio'
    8   ClientHeight = 959
    9   ClientWidth = 1491
     8  ClientHeight = 1330
     9  ClientWidth = 2560
    1010  DesignTimePPI = 144
    1111  Menu = MainMenu1
    … …  
    1818  OnShow = FormShow
    1919  LCLVersion = '2.2.6.0'
     20  WindowState = wsMaximized
    2021  object CoolBar1: TCoolBar
    2122    Left = 0
    2223    Height = 43
    2324    Top = 0
    24     Width = 1491
     25    Width = 2560
    2526    AutoSize = True
    2627    Bands = <   

  • trunk/Forms/FormMain.pas

    r162 r164  
    7575    FormContacts: TFormContacts;
    7676    procedure UpdateInterface;
     77    procedure SettingsChanged;
    7778  end;
    7879
    … …  
    137138  try
    138139    SetToolbarHints;
    139     Core.Core.Initialize;
    140     Translator.TranslateComponentRecursive(Self);
    141     ThemeManager.UseTheme(Self);
    142     PersistentForm.Load(Self);
    143140    ScaleDPI.ScaleControl(CoolBar1, Core.Core.ScaleDPI1.DesignDPI);
    144141    CoolBar1.AutosizeBands;
    … …  
    245242end;
    246243
     244procedure TFormMain.SettingsChanged;
     245begin
     246  ThemeManager.UseTheme(Self);
     247  Translator.TranslateComponentRecursive(Self);
     248  FormContacts.ThemeManager.UseTheme(FormContacts);
     249  FormContacts.Translator.TranslateComponentRecursive(FormContacts);
     250end;
     251
    247252end.
    248253

  • trunk/Forms/FormSettings.lfm

    r162 r164  
    11object FormSettings: TFormSettings
    2   Left = 798
     2  Left = 851
    33  Height = 613
    4   Top = 204
     4  Top = 413
    55  Width = 857
    66  Caption = 'Settings'
    … …  
    4242    Width = 845
    4343    HorzScrollBar.Page = 520
    44     VertScrollBar.Page = 491
     44    VertScrollBar.Page = 481
    4545    Anchors = [akTop, akLeft, akRight, akBottom]
    46     ClientHeight = 538
    47     ClientWidth = 843
     46    ClientHeight = 536
     47    ClientWidth = 841
    4848    TabOrder = 2
    4949    object Label1: TLabel
    5050      Left = 24
    51       Height = 26
     51      Height = 25
    5252      Top = 24
    53       Width = 88
     53      Width = 81
    5454      Caption = 'Language:'
    5555      ParentColor = False
    … …  
    5858    object ComboBoxLanguage: TComboBox
    5959      Left = 240
    60       Height = 42
     60      Height = 33
    6161      Top = 16
    6262      Width = 264
    63       ItemHeight = 0
     63      ItemHeight = 25
    6464      ParentFont = False
    6565      Style = csDropDownList
    … …  
    6868    object CheckBoxAutomaticDPI: TCheckBox
    6969      Left = 24
    70       Height = 30
     70      Height = 29
    7171      Top = 416
    72       Width = 148
     72      Width = 145
    7373      Caption = 'Automatic DPI'
    7474      OnChange = CheckBoxAutomaticDPIChange
    … …  
    7979    object SpinEditDPI: TSpinEdit
    8080      Left = 241
    81       Height = 43
     81      Height = 33
    8282      Top = 448
    8383      Width = 145
    … …  
    9191    object LabelDPI: TLabel
    9292      Left = 56
    93       Height = 26
     93      Height = 25
    9494      Top = 456
    95       Width = 35
     95      Width = 32
    9696      Caption = 'DPI:'
    9797      ParentColor = False
    … …  
    101101    object CheckBoxReopenLastFileOnStart: TCheckBox
    102102      Left = 24
    103       Height = 30
     103      Height = 29
    104104      Top = 368
    105       Width = 226
     105      Width = 217
    106106      Caption = 'Reopen last file on start'
    107107      ParentFont = False
    … …  
    110110    object Label2: TLabel
    111111      Left = 24
    112       Height = 26
     112      Height = 25
    113113      Top = 72
    114       Width = 63
     114      Width = 57
    115115      Caption = 'Theme:'
    116116      ParentColor = False
    … …  
    119119    object ComboBoxTheme: TComboBox
    120120      Left = 240
    121       Height = 42
     121      Height = 33
    122122      Top = 64
    123123      Width = 264
    124       ItemHeight = 0
     124      ItemHeight = 25
    125125      ParentFont = False
    126126      Style = csDropDownList
    … …  
    129129    object Label3: TLabel
    130130      Left = 24
    131       Height = 26
     131      Height = 25
    132132      Top = 120
    133       Width = 186
     133      Width = 174
    134134      Caption = 'Default vCard version:'
    135135      ParentColor = False
    … …  
    137137    object EditDefaultVcardVersion: TEdit
    138138      Left = 240
    139       Height = 43
     139      Height = 33
    140140      Top = 112
    141141      Width = 144
    … …  
    144144    object Label4: TLabel
    145145      Left = 24
    146       Height = 26
     146      Height = 25
    147147      Top = 165
    148       Width = 133
     148      Width = 126
    149149      Caption = 'Map query URL:'
    150150      ParentColor = False
    … …  
    152152    object EditMapUrl: TEdit
    153153      Left = 240
    154       Height = 43
     154      Height = 33
    155155      Top = 160
    156       Width = 588
     156      Width = 586
    157157      Anchors = [akTop, akLeft, akRight]
    158158      TabOrder = 6
    … …  
    160160    object Label5: TLabel
    161161      Left = 24
    162       Height = 26
     162      Height = 25
    163163      Top = 212
    164       Width = 120
     164      Width = 114
    165165      Caption = 'Compare tool:'
    166166      ParentColor = False
    … …  
    168168    object EditCompareTool: TEdit
    169169      Left = 241
    170       Height = 43
     170      Height = 33
    171171      Top = 208
    172       Width = 464
     172      Width = 462
    173173      Anchors = [akTop, akLeft, akRight]
    174174      TabOrder = 7
    175175    end
    176176    object ButtonBrowse: TButton
    177       Left = 715
     177      Left = 713
    178178      Height = 38
    179179      Top = 210
    … …  
    186186    object Label6: TLabel
    187187      Left = 24
    188       Height = 26
     188      Height = 25
    189189      Top = 264
    190       Width = 248
     190      Width = 231
    191191      Caption = 'Default phone country prefix:'
    192192      ParentColor = False
    … …  
    194194    object EditDefaultPhoneCountryPrefix: TEdit
    195195      Left = 376
    196       Height = 43
     196      Height = 33
    197197      Top = 260
    198198      Width = 144
    … …  
    201201    object Label7: TLabel
    202202      Left = 24
    203       Height = 26
     203      Height = 25
    204204      Top = 312
    205       Width = 267
     205      Width = 243
    206206      Caption = 'Default international call prefix:'
    207207      ParentColor = False
    … …  
    209209    object EditDefaultInternationalCallPrefix: TEdit
    210210      Left = 376
    211       Height = 43
     211      Height = 33
    212212      Top = 308
    213213      Width = 144
    … …  
    216216  end
    217217  object OpenDialog1: TOpenDialog
    218     Title = 'Otevřít existující soubor'
    219218    Left = 640
    220219    Top = 72

  • trunk/Forms/FormSettings.lrj

    r162 r164  
    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:"},
    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"}
     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:"}
    1716]}

  • trunk/Forms/FormSettings.pas

    r162 r164  
    4040    procedure CheckBoxStartOnLogonChange(Sender: TObject);
    4141    procedure FormShow(Sender: TObject);
    42   private
    43     { private declarations }
    4442  public
    4543    procedure LoadData;

  • trunk/Languages/vCardStudio.cs.po

    r162 r164  
    13461346msgstr "DPI:"
    13471347
    1348 #: tformsettings.opendialog1.title
    1349 msgctxt "tformsettings.opendialog1.title"
    1350 msgid "Otevřít existující soubor"
    1351 msgstr ""
    1352 
    13531348#: tformsource.acopy.caption
    13541349msgctxt "tformsource.acopy.caption"

  • trunk/Languages/vCardStudio.pot

    r162 r164  
    13361336msgstr ""
    13371337
    1338 #: tformsettings.opendialog1.title
    1339 msgctxt "tformsettings.opendialog1.title"
    1340 msgid "Otevřít existující soubor"
    1341 msgstr ""
    1342 
    13431338#: tformsource.acopy.caption
    13441339msgctxt "tformsource.acopy.caption"

  • trunk/Languages/vCardStudio.sv.po

    r162 r164  
    13561356msgstr "DPI:"
    13571357
    1358 #: tformsettings.opendialog1.title
    1359 msgctxt "tformsettings.opendialog1.title"
    1360 msgid "Otevřít existující soubor"
    1361 msgstr ""
    1362 
    13631358#: tformsource.acopy.caption
    13641359msgctxt "tformsource.acopy.caption"

  • trunk/Packages/Common/Common.pas

    r158 r164  
    6565function GetFileFilterItemExt(Filter: string; Index: Integer): string;
    6666function IntToBin(Data: Int64; Count: Byte): string;
    67 function Implode(Separator: Char; List: TList<string>): string;
    68 function Implode(Separator: Char; List: TStringList; Around: string = ''): string;
     67function Implode(Separator: string; List: TList<string>): string;
     68function Implode(Separator: string; List: TStringList; Around: string = ''): string;
    6969function LastPos(const SubStr: String; const S: String): Integer;
    7070function LoadFileToStr(const FileName: TFileName): AnsiString;
    … …  
    207207end;*)
    208208
    209 function Implode(Separator: Char; List: TStringList; Around: string = ''): string;
     209function Implode(Separator: string; List: TStringList; Around: string = ''): string;
    210210var
    211211  I: Integer;
    … …  
    326326end;
    327327
    328 function Implode(Separator: Char; List: TList<string>): string;
     328function Implode(Separator: string; List: TList<string>): string;
    329329var
    330330  I: Integer;

  • trunk/Packages/Common/Languages/FormAbout.cs.po

    r163 r164  
    2727msgstr "Verze"
    2828
    29 #: tformabout.caption
    30 msgid "About"
    31 msgstr "O aplikaci"

  • trunk/Packages/Common/Languages/FormAbout.pot

    r163 r164  
    1414msgstr ""
    1515
    16 #: tformabout.caption
    17 msgid "About"
    18 msgstr ""
    19 

  • trunk/Packages/VCard/Languages/QuotedPrintable.cs.po

    r157 r164  
    1616msgid "Decode error"
    1717msgstr "Chyba dekódování"
     18

  • trunk/Packages/VCard/Languages/VCard.cs.po

    r157 r164  
    447447msgid "YouTube"
    448448msgstr "YouTube"
     449
Note: See TracChangeset for help on using the changeset viewer.