Changeset 19 for trunk


Ignore:
Timestamp:
Mar 22, 2018, 10:41:00 PM (6 years ago)
Author:
chronos
Message:
  • Added: Remember main form and preferences form dimensions.
  • Added: Windows installer script.
  • Added: 32-bit mysql library binary.
  • Removed: Dependency on synapse package which can't be compiled under 64-bit CPU.
Location:
trunk
Files:
10 added
3 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        66*.lrj
        77heaptrclog.trc
         8MyData.exe

  • trunk/Forms/UFormAbout.lfm

    r16 r19  
    11object FormAbout: TFormAbout
    22  Left = 522
    3   Height = 387
     3  Height = 329
    44  Top = 335
    5   Width = 524
     5  Width = 584
    66  Caption = 'About'
    7   ClientHeight = 387
    8   ClientWidth = 524
    9   DesignTimePPI = 120
     7  ClientHeight = 329
     8  ClientWidth = 584
     9  DesignTimePPI = 144
    1010  OnCreate = FormCreate
    1111  OnShow = FormShow
    1212  Position = poScreenCenter
    13   LCLVersion = '1.8.0.6'
     13  LCLVersion = '1.8.2.0'
    1414  object LabelDescription: TLabel
    1515    Left = 25
    1616    Height = 40
    1717    Top = 137
    18     Width = 474
     18    Width = 534
    1919    Align = alTop
    2020    AutoSize = False
    … …  
    2424  end
    2525  object ButtonClose: TButton
    26     Left = 383
     26    Left = 443
    2727    Height = 31
    28     Top = 337
     28    Top = 278
    2929    Width = 116
    3030    Anchors = [akRight, akBottom]
    … …  
    3535  object LabelContent: TLabel
    3636    Left = 25
    37     Height = 20
     37    Height = 25
    3838    Top = 202
    39     Width = 474
     39    Width = 534
    4040    Align = alTop
    4141    BorderSpacing.Around = 25
    … …  
    4646    Left = 20
    4747    Height = 31
    48     Top = 337
     48    Top = 279
    4949    Width = 220
    5050    Anchors = [akLeft, akBottom]
    … …  
    5757    Height = 112
    5858    Top = 0
    59     Width = 524
     59    Width = 584
    6060    Align = alTop
    6161    BevelOuter = bvNone
    6262    ClientHeight = 112
    63     ClientWidth = 524
     63    ClientWidth = 584
    6464    TabOrder = 2
    6565    object LabelAppName: TLabel
    … …  
    6767      Height = 80
    6868      Top = 24
    69       Width = 394
     69      Width = 454
    7070      Align = alCustom
    7171      Anchors = [akTop, akLeft, akRight, akBottom]

  • trunk/Forms/UFormMain.lfm

    r16 r19  
    55  Width = 1250
    66  Caption = 'MyData'
    7   ClientHeight = 815
     7  ClientHeight = 819
    88  ClientWidth = 1250
     9  DesignTimePPI = 144
    910  Menu = MainMenu1
    1011  OnActivate = FormActivate
    1112  OnClose = FormClose
    1213  OnShow = FormShow
    13   LCLVersion = '1.8.0.4'
     14  LCLVersion = '1.8.2.0'
    1415  WindowState = wsMaximized
    1516  object StatusBar1: TStatusBar
    1617    Left = 0
    17     Height = 30
    18     Top = 785
     18    Height = 36
     19    Top = 783
    1920    Width = 1250
    2021    Panels = <>

  • trunk/Forms/UFormMain.pas

    r17 r19  
    5656begin
    5757  Core.Done;
     58  Core.PersistentForm1.Save(Self);
    5859end;
    5960
    6061procedure TFormMain.FormShow(Sender: TObject);
    6162begin
     63  Core.PersistentForm1.Load(Self, True);
    6264  DockInit;
    6365end;

  • trunk/Forms/UFormPreferences.lfm

    r10 r19  
    77  ClientHeight = 422
    88  ClientWidth = 577
    9   LCLVersion = '1.5'
     9  DesignTimePPI = 144
     10  OnClose = FormClose
     11  OnShow = FormShow
     12  LCLVersion = '1.8.2.0'
    1013  object CheckBoxRememberDatabase: TCheckBox
    1114    Left = 18
    12     Height = 27
     15    Height = 29
    1316    Top = 20
    14     Width = 215
     17    Width = 194
    1518    Caption = 'Remember database'
    1619    TabOrder = 0
    … …  
    3841  object ComboBoxLanguage: TComboBox
    3942    Left = 192
    40     Height = 35
     43    Height = 33
    4144    Top = 64
    4245    Width = 292
    43     ItemHeight = 0
     46    ItemHeight = 25
    4447    Style = csDropDownList
    4548    TabOrder = 3
    … …  
    4952    Height = 25
    5053    Top = 65
    51     Width = 95
     54    Width = 81
    5255    Caption = 'Language:'
    5356    ParentColor = False

  • trunk/Forms/UFormPreferences.pas

    r10 r19  
    1818    ComboBoxLanguage: TComboBox;
    1919    Label1: TLabel;
     20    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     21    procedure FormShow(Sender: TObject);
    2022  private
    2123    { private declarations }
    … …  
    3739{ TFormPreferences }
    3840
     41procedure TFormPreferences.FormShow(Sender: TObject);
     42begin
     43  Core.PersistentForm1.Load(Self);
     44end;
     45
     46procedure TFormPreferences.FormClose(Sender: TObject;
     47  var CloseAction: TCloseAction);
     48begin
     49  Core.PersistentForm1.Save(Self)
     50end;
     51
    3952procedure TFormPreferences.Load(Preferences: TPreferences);
    4053begin

  • trunk/Forms/UFormRecord.lfm

    r16 r19  
    44  Top = 223
    55  Width = 858
    6   Caption = 'FormRecord'
     6  Caption = 'Record'
    77  ClientHeight = 649
    88  ClientWidth = 858
     9  DesignTimePPI = 144
    910  OnCreate = FormCreate
    1011  OnDestroy = FormDestroy
    1112  OnShow = FormShow
    1213  Position = poMainFormCenter
    13   LCLVersion = '1.8.0.4'
     14  LCLVersion = '1.8.2.0'
    1415  object Panel1: TPanel
    1516    Left = 4

  • trunk/Languages/MyData.cs.po

    r16 r19  
    99"MIME-Version: 1.0\n"
    1010"Content-Transfer-Encoding: 8bit\n"
    11 "X-Generator: Poedit 1.5.4\n"
     11"X-Generator: Poedit 2.0.6\n"
     12"Language: cs\n"
    1213
    1314#: tcore.aabout.caption
     15msgctxt "tcore.aabout.caption"
    1416msgid "About"
    15 msgstr ""
     17msgstr "O aplikaci"
    1618
    1719#: tcore.adatabaseconnect.caption
    … …  
    3234msgstr "Předvolby"
    3335
     36#: tformabout.buttonclose.caption
     37msgid "Close"
     38msgstr "Zavřít"
     39
     40#: tformabout.buttonhomepage.caption
     41msgid "Home page"
     42msgstr "Domovská stránka"
     43
     44#: tformabout.caption
     45msgctxt "tformabout.caption"
     46msgid "About"
     47msgstr "O aplikaci"
     48
     49#: tformabout.labelcontent.caption
     50msgid "   "
     51msgstr "   "
     52
    3453#: tformdatabases.aadd.caption
    3554msgid "New"
    … …  
    193212#: tformmain.menuitem7.caption
    194213msgid "Help"
    195 msgstr ""
     214msgstr "Nápověda"
    196215
    197216#: tformmain.menuitempreferences.caption
    … …  
    243262
    244263#: tformrecord.caption
    245 msgid "FormRecord"
    246 msgstr ""
     264msgid "Record"
     265msgstr "Záznam"
    247266
    248267#: tformrecords.aadd.caption
    … …  
    344363#: ucore.stypereference
    345364msgid "Reference"
    346 msgstr ""
     365msgstr "Odkaz"
    347366
    348367#: ucore.stypestring
    … …  
    360379#: uformabout.slicense
    361380msgid "License"
    362 msgstr ""
     381msgstr "Licence"
    363382
    364383#: uformabout.sreleasedate
    365384msgid "Release date"
    366 msgstr ""
     385msgstr "Datum uvolnění"
    367386
    368387#: uformabout.sversion
    369388msgid "Version"
    370 msgstr ""
     389msgstr "Verze"
    371390
    372391#: uformfields.sfieldsnotset
    … …  
    406425msgstr "Opravdu chcete odstranit tabulku '%s'?"
    407426
     427#: uhtmlclasses.sstringtoipconversionerror
     428msgid "String to IP address conversion error"
     429msgstr "Chyba převodu řetězce na IP adresu"
     430
    408431#: usqldatabase.sdatabasequeryerror
    409432msgid "Database query error: \"%s\""
    410433msgstr "Chyba požadavku databáze: \"%s\""
    411 

  • trunk/Languages/MyData.po

    r16 r19  
    33
    44#: tcore.aabout.caption
     5msgctxt "tcore.aabout.caption"
    56msgid "About"
    67msgstr ""
    … …  
    2324msgstr ""
    2425
     26#: tformabout.buttonclose.caption
     27msgid "Close"
     28msgstr ""
     29
     30#: tformabout.buttonhomepage.caption
     31msgid "Home page"
     32msgstr ""
     33
     34#: tformabout.caption
     35msgctxt "tformabout.caption"
     36msgid "About"
     37msgstr ""
     38
     39#: tformabout.labelcontent.caption
     40msgid "   "
     41msgstr ""
     42
    2543#: tformdatabases.aadd.caption
    2644msgid "New"
    … …  
    234252
    235253#: tformrecord.caption
    236 msgid "FormRecord"
     254msgid "Record"
    237255msgstr ""
    238256
    … …  
    397415msgstr ""
    398416
     417#: uhtmlclasses.sstringtoipconversionerror
     418msgid "String to IP address conversion error"
     419msgstr ""
     420
    399421#: usqldatabase.sdatabasequeryerror
    400422msgid "Database query error: \"%s\""

  • trunk/MyData.lpi

    r17 r19  
    2828          <SearchPaths>
    2929            <IncludeFiles Value="$(ProjOutDir)"/>
    30             <OtherUnitFiles Value="Forms;DbEngines;/usr/lib/mysql/;/usr/lib64/mysql/"/>
     30            <OtherUnitFiles Value="Forms;DbEngines;/usr/lib/mysql;/usr/lib64/mysql"/>
    3131            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
    3232          </SearchPaths>
    … …  
    7272      </local>
    7373    </RunParams>
    74     <RequiredPackages Count="8">
     74    <RequiredPackages Count="6">
    7575      <Item1>
    76         <PackageName Value="synapse"/>
    77         <DefaultFilename Value="Packages/synapse/synapse.lpk" Prefer="True"/>
     76        <PackageName Value="Database"/>
     77        <DefaultFilename Value="Packages/Database/Database.lpk" Prefer="True"/>
    7878      </Item1>
    7979      <Item2>
    80         <PackageName Value="Network"/>
    81         <DefaultFilename Value="Packages/Network/Network.lpk" Prefer="True"/>
     80        <PackageName Value="TemplateGenerics"/>
     81        <DefaultFilename Value="Packages/TemplateGenerics/TemplateGenerics.lpk" Prefer="True"/>
    8282      </Item2>
    8383      <Item3>
    84         <PackageName Value="CoolWeb"/>
    85         <DefaultFilename Value="Packages/CoolWeb/CoolWeb.lpk" Prefer="True"/>
     84        <PackageName Value="CoolTranslator"/>
     85        <DefaultFilename Value="Packages/CoolTranslator/CoolTranslator.lpk" Prefer="True"/>
    8686      </Item3>
    8787      <Item4>
    88         <PackageName Value="TemplateGenerics"/>
    89         <DefaultFilename Value="Packages/TemplateGenerics/TemplateGenerics.lpk" Prefer="True"/>
     88        <PackageName Value="FCL"/>
    9089      </Item4>
    9190      <Item5>
    92         <PackageName Value="CoolTranslator"/>
    93         <DefaultFilename Value="Packages/CoolTranslator/CoolTranslator.lpk" Prefer="True"/>
     91        <PackageName Value="Common"/>
     92        <DefaultFilename Value="Packages/Common/Common.lpk" Prefer="True"/>
    9493      </Item5>
    9594      <Item6>
    96         <PackageName Value="FCL"/>
     95        <PackageName Value="LCL"/>
    9796      </Item6>
    98       <Item7>
    99         <PackageName Value="Common"/>
    100         <DefaultFilename Value="Packages/Common/Common.lpk" Prefer="True"/>
    101       </Item7>
    102       <Item8>
    103         <PackageName Value="LCL"/>
    104       </Item8>
    10597    </RequiredPackages>
    106     <Units Count="18">
     98    <Units Count="20">
    10799      <Unit0>
    108100        <Filename Value="MyData.lpr"/>
    … …  
    209201        <Filename Value="Forms/UFormAbout.pas"/>
    210202        <IsPartOfProject Value="True"/>
    211         <HasResources Value="True"/>
     203        <ComponentName Value="FormAbout"/>
     204        <HasResources Value="True"/>
     205        <ResourceBaseClass Value="Form"/>
    212206      </Unit17>
     207      <Unit18>
     208        <Filename Value="UHtmlClasses.pas"/>
     209        <IsPartOfProject Value="True"/>
     210      </Unit18>
     211      <Unit19>
     212        <Filename Value="UXmlClasses.pas"/>
     213        <IsPartOfProject Value="True"/>
     214      </Unit19>
    213215    </Units>
    214216  </ProjectOptions>
    … …  
    220222    <SearchPaths>
    221223      <IncludeFiles Value="$(ProjOutDir)"/>
    222       <OtherUnitFiles Value="Forms;DbEngines;/usr/lib/mysql/;/usr/lib64/mysql/"/>
     224      <OtherUnitFiles Value="Forms;DbEngines;/usr/lib/mysql;/usr/lib64/mysql"/>
    223225      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
    224226    </SearchPaths>

  • trunk/MyData.lpr

    r16 r19  
    1010  Forms, UFormTables, UCore, Common, CoolTranslator,
    1111  UFormTable, UFormRecords, UFormRecord, UFormFields, UFormField,
    12   TemplateGenerics, CoolWeb, synapse, UFormMain, SysUtils,
     12  TemplateGenerics, UFormMain, SysUtils,
    1313  UFormConnect, UFormDatabases, UFormPreferences;
    1414

  • trunk/UCore.lfm

    r16 r19  
    33  OnDestroy = DataModuleDestroy
    44  OldCreateOrder = False
    5   Height = 462
    6   HorizontalOffset = 758
    7   VerticalOffset = 488
    8   Width = 653
     5  Height = 693
     6  HorizontalOffset = 640
     7  VerticalOffset = 275
     8  Width = 980
     9  PPI = 144
    910  object ImageList1: TImageList
    1011    Height = 32
    1112    Width = 32
    12     left = 294
    13     top = 136
     13    left = 441
     14    top = 204
    1415    Bitmap = {
    1516      4C690C000000200000002000000061C66E0061C66E0061C66E0061C66E0061C6
    … …  
    15561557    RootName = 'CONFIG'
    15571558    ReadOnly = False
    1558     left = 294
    1559     top = 216
     1559    left = 441
     1560    top = 324
    15601561  end
    15611562  object ActionList1: TActionList
    15621563    Images = ImageList1
    1563     left = 297
    1564     top = 77
     1564    left = 446
     1565    top = 116
    15651566    object AExit: TAction
    15661567      Caption = 'Exit'
    … …  
    15921593    POFilesFolder = 'Languages'
    15931594    OnTranslate = CoolTranslator1Translate
    1594     left = 288
    1595     top = 304
     1595    left = 432
     1596    top = 456
    15961597  end
    15971598  object ApplicationInfo1: TApplicationInfo
    … …  
    16101611    RegistryRoot = rrKeyCurrentUser
    16111612    License = 'CC0'
    1612     left = 80
    1613     top = 88
     1613    left = 120
     1614    top = 132
     1615  end
     1616  object PersistentForm1: TPersistentForm
     1617    MinVisiblePart = 50
     1618    EntireVisible = False
     1619    left = 121
     1620    top = 214
    16141621  end
    16151622end

  • trunk/UCore.pas

    r17 r19  
    77uses
    88  Classes, SysUtils, XMLConf, FileUtil, Controls, ActnList, UDatabase,
    9   UCoolTranslator, UApplicationInfo, Forms;
     9  UCoolTranslator, UApplicationInfo, UPersistentForm, Forms;
    1010
    1111type
    … …  
    2222    CoolTranslator1: TCoolTranslator;
    2323    ImageList1: TImageList;
     24    PersistentForm1: TPersistentForm;
    2425    XMLConfig1: TXMLConfig;
    2526    procedure AAboutExecute(Sender: TObject);
Note: See TracChangeset for help on using the changeset viewer.