Changeset 10 for trunk


Ignore:
Timestamp:
Jun 9, 2011, 9:33:21 AM (13 years ago)
Author:
george
Message:
  • Added: Application meta information.
  • Added: Empty settings form.
  • Modified: Server connect configuration is now stored in system registry.
Location:
trunk
Files:
7 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:ignore
      •  

        old new  
        33chronis
        44heaptrclog.trc
         5chronis.exe
  • trunk/Forms/ULoginForm.lfm

    r7 r10  
    99  ClientHeight = 177
    1010  ClientWidth = 405
    11   LCLVersion = '0.9.29'
     11  LCLVersion = '0.9.31'
    1212  object Label1: TLabel
    1313    Left = 16
    1414    Height = 14
    1515    Top = 48
    16     Width = 61
     16    Width = 53
    1717    Caption = 'Username:'
    1818    ParentColor = False
     
    2222    Height = 14
    2323    Top = 80
    24     Width = 57
     24    Width = 51
    2525    Caption = 'Password:'
    2626    ParentColor = False
     
    4444  object Edit1: TEdit
    4545    Left = 88
    46     Height = 23
     46    Height = 21
    4747    Top = 40
    4848    Width = 104
     
    5151  object MaskEdit1: TMaskEdit
    5252    Left = 88
    53     Height = 23
     53    Height = 21
    5454    Top = 71
    5555    Width = 104
  • trunk/Forms/ULoginForm.lrt

    r7 r10  
    1 TLOGINFORM.LOGINFORM.CAPTION=Login
     1TLOGINFORM.CAPTION=Login
    22TLOGINFORM.LABEL1.CAPTION=Username:
    33TLOGINFORM.LABEL2.CAPTION=Password:
    44TLOGINFORM.BUTTONCANCEL.CAPTION=Close
    55TLOGINFORM.BUTTONLOGIN.CAPTION=Login
     6TLOGINFORM.MASKEDIT1.TEXT=*
  • trunk/Forms/UMainForm.lfm

    r9 r10  
    11object MainForm: TMainForm
    2   Left = 255
    3   Height = 445
    4   Top = 75
    5   Width = 649
     2  Left = 268
     3  Height = 451
     4  Top = 156
     5  Width = 646
    66  ActiveControl = Panel1
    77  Caption = 'ChronIS'
    8   ClientHeight = 418
    9   ClientWidth = 649
     8  ClientHeight = 432
     9  ClientWidth = 646
    1010  Menu = MainMenu1
    1111  OnClose = FormClose
     
    1313  OnDestroy = FormDestroy
    1414  OnShow = FormShow
    15   LCLVersion = '0.9.29'
     15  LCLVersion = '0.9.31'
    1616  object Panel1: TPanel
    1717    Left = 0
    18     Height = 418
     18    Height = 432
    1919    Top = 0
    2020    Width = 184
    2121    Align = alLeft
    2222    BevelOuter = bvNone
    23     ClientHeight = 418
     23    ClientHeight = 432
    2424    ClientWidth = 184
    2525    TabOrder = 0
    2626    object Label1: TLabel
    2727      Left = 7
    28       Height = 18
     28      Height = 14
    2929      Top = 4
    30       Width = 51
     30      Width = 39
    3131      Caption = 'Groups:'
    3232      ParentColor = False
     
    3434    object TreeView1: TTreeView
    3535      Left = 4
    36       Height = 394
     36      Height = 408
    3737      Top = 19
    3838      Width = 180
    3939      Anchors = [akTop, akLeft, akRight, akBottom]
    40       DefaultItemHeight = 19
     40      DefaultItemHeight = 16
    4141      Images = ImageListActions
    4242      ReadOnly = True
     
    4848  object Panel2: TPanel
    4949    Left = 189
    50     Height = 418
     50    Height = 432
    5151    Top = 0
    52     Width = 460
     52    Width = 457
    5353    Align = alClient
    5454    BevelOuter = bvNone
    55     ClientHeight = 418
    56     ClientWidth = 460
     55    ClientHeight = 432
     56    ClientWidth = 457
    5757    TabOrder = 1
    5858    object Label2: TLabel
    5959      Left = 2
    60       Height = 18
     60      Height = 14
    6161      Top = 4
    62       Width = 54
     62      Width = 43
    6363      Caption = 'Reports:'
    6464      ParentColor = False
     
    6666    object ListView1: TListView
    6767      Left = 2
    68       Height = 362
     68      Height = 376
    6969      Top = 19
    70       Width = 456
     70      Width = 453
    7171      Anchors = [akTop, akLeft, akRight, akBottom]
    7272      Columns = <>
     
    8686      Left = 3
    8787      Height = 25
    88       Top = 389
     88      Top = 403
    8989      Width = 75
    9090      Action = AItemAdd
     
    9595      Left = 83
    9696      Height = 25
    97       Top = 389
     97      Top = 403
    9898      Width = 75
    9999      Action = AItemDelete
     
    104104  object Splitter1: TSplitter
    105105    Left = 184
    106     Height = 418
     106    Height = 432
    107107    Top = 0
    108108    Width = 5
     
    166166      OnExecute = AToggleFullscreenExecute
    167167      ShortCut = 122
     168    end
     169    object AConnect: TAction
     170      Caption = 'Connect'
     171      Hint = 'Connect'
     172      OnExecute = AConnectExecute
     173    end
     174    object ASettings: TAction
     175      Caption = 'Settings'
     176      Hint = 'Settings'
     177      OnExecute = ASettingsExecute
    168178    end
    169179  end
     
    296306    object MenuItem13: TMenuItem
    297307      Caption = 'Server'
     308      object MenuItem17: TMenuItem
     309        Action = AConnect
     310      end
    298311      object MenuItem14: TMenuItem
    299312        Action = AExit
     
    305318        Action = AToggleFullscreen
    306319      end
     320      object MenuItem16: TMenuItem
     321        Action = ASettings
     322      end
    307323    end
    308324    object MenuItem12: TMenuItem
  • trunk/Forms/UMainForm.lrt

    r7 r10  
    1 TMAINFORM.MAINFORM.CAPTION=ChronIS
     1TMAINFORM.CAPTION=ChronIS
    22TMAINFORM.LABEL1.CAPTION=Groups:
    33TMAINFORM.LABEL2.CAPTION=Reports:
     
    1414TMAINFORM.AEXIT.CAPTION=Exit
    1515TMAINFORM.ATOGGLEFULLSCREEN.CAPTION=Fullscreen mode
     16TMAINFORM.ACONNECT.CAPTION=Connect
     17TMAINFORM.ACONNECT.HINT=Connect
     18TMAINFORM.ASETTINGS.CAPTION=Settings
     19TMAINFORM.ASETTINGS.HINT=Settings
    1620TMAINFORM.MENUITEM13.CAPTION=Server
    1721TMAINFORM.MENUITEM11.CAPTION=View
  • trunk/Forms/UMainForm.pas

    r9 r10  
    1717
    1818  TMainForm = class(TForm)
     19    AConnect: TAction;
     20    ASettings: TAction;
    1921    AToggleFullscreen: TAction;
    2022    AExit: TAction;
     
    4446    MenuItem14: TMenuItem;
    4547    MenuItem15: TMenuItem;
     48    MenuItem16: TMenuItem;
     49    MenuItem17: TMenuItem;
    4650    MenuItem2: TMenuItem;
    4751    MenuItem3: TMenuItem;
     
    5963    Splitter1: TSplitter;
    6064    TreeView1: TTreeView;
     65    procedure AConnectExecute(Sender: TObject);
    6166    procedure AExitExecute(Sender: TObject);
    6267    procedure AItemAddExecute(Sender: TObject);
     
    6671    procedure AObjectGroupAddGroupExecute(Sender: TObject);
    6772    procedure AObjectGroupEditExecute(Sender: TObject);
     73    procedure ASettingsExecute(Sender: TObject);
    6874    procedure AToggleFullscreenExecute(Sender: TObject);
    6975    procedure ButtonAddClick(Sender: TObject);
     
    8591    RegistryKey: string;
    8692    RegistryRootKey: HKEY;
    87     procedure LoadConfiguration;
    8893    procedure LoadFromRegistry;
    8994    procedure SaveToRegistry;
     95    procedure InitStructure;
    9096  public
    9197    SelectedObjectId: Integer;
     
    112118
    113119uses
    114   UItemView, UItemEdit, UItemAdd;
     120  UItemView, UItemEdit, UItemAdd, ULoginForm, USettingForm, UApplicationInfo;
    115121
    116122{$R *.lfm}
    117123
    118124{ TMainForm }
    119 
    120 procedure TMainForm.LoadConfiguration;
    121 var
    122   Config: TXMLDocument;
    123   I1: Integer;
    124   I2: Integer;
    125   I3: Integer;
    126 begin
    127   if FileExists(ConfigFileName) then try
    128     ReadXMLFile(Config, ConfigFileName);
    129     for I1 := 0 to Config.ChildNodes.Count - 1 do
    130     with Config.ChildNodes[I1] do begin
    131       if NodeName = 'configuration' then
    132       for I2 := 0 to ChildNodes.Count - 1 do
    133       with ChildNodes[I2] do begin
    134         if NodeName = 'database' then
    135         for I3 := 0 to ChildNodes.Count - 1 do
    136         with ChildNodes[I3] do begin
    137           if NodeName = 'hostname' then
    138             System.Database.HostName := TextContent;
    139           if NodeName = 'schema' then
    140             System.Database.Database := TextContent;
    141           if NodeName = 'username' then
    142             System.Database.UserName := TextContent;
    143           if NodeName = 'password' then
    144             System.Database.Password := TextContent;
    145         end;
    146       end;
    147     end;
    148   finally
    149     Config.Free;
    150   end;
    151 end;
    152125
    153126procedure TMainForm.LoadFromRegistry;
     
    158131    OpenKey(RegistryKey, True);
    159132    Panel1.Width := ReadIntegerWithDefault('GroupTreeWidth', 200);
     133    System.Database.Database := ReadStringWithDefault('DatabaseSchema', 'chronis');
     134    System.Database.Hostname := ReadStringWithDefault('DatabaseHostName', 'localhost');
     135    System.Database.UserName := ReadStringWithDefault('DatabaseUserName', 'chronis');
     136    System.Database.Password := ReadStringWithDefault('DatabasePassword', '');
    160137  finally
    161138    Free;
     
    170147    OpenKey(RegistryKey, True);
    171148    WriteInteger('GroupTreeWidth', Panel1.Width);
     149    WriteString('DatabaseSchema', System.Database.Database);
     150    WriteString('DatabaseHostName', System.Database.Hostname);
     151    WriteString('DatabaseUserName', System.Database.UserName);
     152    WriteString('DatabasePassword', System.Database.Password);
    172153  finally
    173154    Free;
     
    175156end;
    176157
     158procedure TMainForm.InitStructure;
     159begin
     160
     161end;
     162
    177163procedure TMainForm.FormCreate(Sender: TObject);
    178164begin
    179165  System := TChronisBase.Create;
    180166  System.Database := TSqlDatabase.Create;
    181   LoadConfiguration;
    182   System.Database.Connect;
    183167  TreeState := TTreeState.Create;
    184168  Report := TReport.Create;
     
    187171  SelectedObject.Base := System;
    188172  RegistryRootKey := HKEY_CURRENT_USER;
    189   RegistryKey := '\Software\Chronosoft\Chronis';
     173  RegistryKey := '\Software\' + ApplicationInfo.CompanyName + '\' +
     174    ApplicationInfo.Name;
    190175  PersistentForm := TPersistentForm.Create;
    191176  PersistentForm.RegistryKey := RegistryKey;
     
    237222    ItemEditForm.Show;
    238223  end;
     224end;
     225
     226procedure TMainForm.ASettingsExecute(Sender: TObject);
     227begin
     228  SettingForm.ShowModal;
    239229end;
    240230
     
    281271end;
    282272
     273procedure TMainForm.AConnectExecute(Sender: TObject);
     274begin
     275  LoginForm.ShowModal;
     276end;
     277
    283278procedure TMainForm.FormShow(Sender: TObject);
    284279begin
    285280  PersistentForm.Load(Self);
     281  LoadFromRegistry;
     282  System.Database.Connect;
     283  InitStructure;
    286284  LoadTree;
    287   LoadFromRegistry;
    288285end;
    289286
  • trunk/chronis.lpi

    r9 r10  
    2020      <StringTable ProductVersion=""/>
    2121    </VersionInfo>
    22     <BuildModes Count="1">
    23       <Item1 Name="default" Default="True"/>
     22    <BuildModes Count="2" Active="Debug">
     23      <Item1 Name="Debug" Default="True"/>
     24      <Item2 Name="Release">
     25        <CompilerOptions>
     26          <Version Value="10"/>
     27          <Target>
     28            <Filename Value="chronis"/>
     29          </Target>
     30          <SearchPaths>
     31            <IncludeFiles Value="$(ProjOutDir)"/>
     32            <Libraries Value="/usr/lib/mysql;/usr/lib64/mysql"/>
     33            <OtherUnitFiles Value="Common;Forms"/>
     34            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     35          </SearchPaths>
     36          <Parsing>
     37            <SyntaxOptions>
     38              <SyntaxMode Value="Delphi"/>
     39              <CStyleOperator Value="False"/>
     40              <AllowLabel Value="False"/>
     41              <CPPInline Value="False"/>
     42            </SyntaxOptions>
     43          </Parsing>
     44          <CodeGeneration>
     45            <Checks>
     46              <IOChecks Value="True"/>
     47              <RangeChecks Value="True"/>
     48              <OverflowChecks Value="True"/>
     49              <StackChecks Value="True"/>
     50            </Checks>
     51          </CodeGeneration>
     52          <Linking>
     53            <Debugging>
     54              <UseLineInfoUnit Value="False"/>
     55            </Debugging>
     56            <Options>
     57              <Win32>
     58                <GraphicApplication Value="True"/>
     59              </Win32>
     60            </Options>
     61          </Linking>
     62          <Other>
     63            <CompilerMessages>
     64              <UseMsgFile Value="True"/>
     65            </CompilerMessages>
     66            <CompilerPath Value="$(CompPath)"/>
     67          </Other>
     68        </CompilerOptions>
     69      </Item2>
    2470    </BuildModes>
    2571    <PublishOptions>
     
    3581      </local>
    3682    </RunParams>
    37     <RequiredPackages Count="2">
     83    <RequiredPackages Count="3">
    3884      <Item1>
    39         <PackageName Value="TemplateGenerics"/>
     85        <PackageName Value="LCLBase"/>
     86        <MinVersion Valid="True"/>
    4087      </Item1>
    4188      <Item2>
     89        <PackageName Value="TemplateGenerics"/>
     90      </Item2>
     91      <Item3>
    4292        <PackageName Value="LCL"/>
    43       </Item2>
     93      </Item3>
    4494    </RequiredPackages>
    45     <Units Count="24">
     95    <Units Count="27">
    4696      <Unit0>
    4797        <Filename Value="chronis.lpr"/>
    4898        <IsPartOfProject Value="True"/>
    4999        <UnitName Value="chronis"/>
    50         <EditorIndex Value="10"/>
    51         <WindowIndex Value="0"/>
    52         <TopLine Value="1"/>
    53         <CursorPos X="21" Y="5"/>
     100        <EditorIndex Value="8"/>
     101        <WindowIndex Value="0"/>
     102        <TopLine Value="14"/>
     103        <CursorPos X="1" Y="33"/>
    54104        <UsageCount Value="274"/>
    55105        <Loaded Value="True"/>
     
    94144        <IsPartOfProject Value="True"/>
    95145        <UnitName Value="UPersistentForm"/>
    96         <EditorIndex Value="14"/>
     146        <EditorIndex Value="10"/>
    97147        <WindowIndex Value="0"/>
    98148        <TopLine Value="55"/>
     
    107157        <UnitName Value="USqlDatabase"/>
    108158        <IsVisibleTab Value="True"/>
    109         <EditorIndex Value="8"/>
    110         <WindowIndex Value="0"/>
    111         <TopLine Value="204"/>
    112         <CursorPos X="43" Y="225"/>
     159        <EditorIndex Value="7"/>
     160        <WindowIndex Value="0"/>
     161        <TopLine Value="209"/>
     162        <CursorPos X="25" Y="225"/>
    113163        <UsageCount Value="264"/>
    114164        <Loaded Value="True"/>
     
    119169        <IsPartOfProject Value="True"/>
    120170        <UnitName Value="URegistry"/>
    121         <EditorIndex Value="11"/>
    122         <WindowIndex Value="0"/>
    123         <TopLine Value="1"/>
    124         <CursorPos X="10" Y="8"/>
     171        <EditorIndex Value="9"/>
     172        <WindowIndex Value="0"/>
     173        <TopLine Value="19"/>
     174        <CursorPos X="1" Y="31"/>
    125175        <UsageCount Value="264"/>
    126176        <Loaded Value="True"/>
     
    164214        <ResourceBaseClass Value="Form"/>
    165215        <UnitName Value="ULoginForm"/>
    166         <EditorIndex Value="16"/>
    167         <WindowIndex Value="0"/>
    168         <TopLine Value="1"/>
    169         <CursorPos X="1" Y="1"/>
     216        <EditorIndex Value="12"/>
     217        <WindowIndex Value="0"/>
     218        <TopLine Value="14"/>
     219        <CursorPos X="54" Y="24"/>
    170220        <UsageCount Value="317"/>
    171221        <Loaded Value="True"/>
     
    180230        <ResourceBaseClass Value="Form"/>
    181231        <UnitName Value="UMainForm"/>
    182         <EditorIndex Value="3"/>
    183         <WindowIndex Value="0"/>
    184         <TopLine Value="1"/>
    185         <CursorPos X="47" Y="17"/>
     232        <EditorIndex Value="2"/>
     233        <WindowIndex Value="0"/>
     234        <TopLine Value="168"/>
     235        <CursorPos X="3" Y="174"/>
    186236        <UsageCount Value="317"/>
    187237        <Loaded Value="True"/>
     
    202252        <ResourceBaseClass Value="Form"/>
    203253        <UnitName Value="UItemAdd"/>
    204         <EditorIndex Value="15"/>
     254        <EditorIndex Value="11"/>
    205255        <WindowIndex Value="0"/>
    206256        <TopLine Value="1"/>
     
    221271      <Unit14>
    222272        <Filename Value="../../PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericDictionary.inc"/>
    223         <EditorIndex Value="2"/>
    224273        <WindowIndex Value="0"/>
    225274        <TopLine Value="43"/>
    226275        <CursorPos X="1" Y="60"/>
    227276        <UsageCount Value="16"/>
    228         <Loaded Value="True"/>
    229277      </Unit14>
    230278      <Unit15>
    231279        <Filename Value="../../PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericList.inc"/>
    232         <EditorIndex Value="5"/>
    233280        <WindowIndex Value="0"/>
    234281        <TopLine Value="68"/>
    235282        <CursorPos X="1" Y="85"/>
    236283        <UsageCount Value="13"/>
    237         <Loaded Value="True"/>
    238284      </Unit15>
    239285      <Unit16>
     
    255301        <Filename Value="/usr/share/fpcsrc/2.4.0/packages/fcl-registry/src/registry.pp"/>
    256302        <UnitName Value="registry"/>
    257         <EditorIndex Value="12"/>
    258303        <WindowIndex Value="0"/>
    259304        <TopLine Value="1"/>
    260305        <CursorPos X="6" Y="1"/>
    261306        <UsageCount Value="19"/>
    262         <Loaded Value="True"/>
    263307        <DefaultSyntaxHighlighter Value="Delphi"/>
    264308      </Unit18>
    265309      <Unit19>
    266310        <Filename Value="/usr/share/fpcsrc/2.4.0/packages/fcl-registry/src/regdef.inc"/>
    267         <EditorIndex Value="13"/>
    268311        <WindowIndex Value="0"/>
    269312        <TopLine Value="1"/>
    270313        <CursorPos X="3" Y="21"/>
    271314        <UsageCount Value="19"/>
    272         <Loaded Value="True"/>
    273315        <DefaultSyntaxHighlighter Value="Delphi"/>
    274316      </Unit19>
    275317      <Unit20>
    276         <Filename Value="usystem.pas"/>
     318        <Filename Value="USystem.pas"/>
    277319        <IsPartOfProject Value="True"/>
    278320        <UnitName Value="USystem"/>
    279         <EditorIndex Value="7"/>
    280         <WindowIndex Value="0"/>
    281         <TopLine Value="21"/>
    282         <CursorPos X="15" Y="38"/>
    283         <UsageCount Value="36"/>
     321        <EditorIndex Value="6"/>
     322        <WindowIndex Value="0"/>
     323        <TopLine Value="58"/>
     324        <CursorPos X="3" Y="70"/>
     325        <UsageCount Value="37"/>
    284326        <Loaded Value="True"/>
    285327        <DefaultSyntaxHighlighter Value="Delphi"/>
     
    288330        <Filename Value="../../../lazarus/lcl/comctrls.pp"/>
    289331        <UnitName Value="ComCtrls"/>
    290         <EditorIndex Value="6"/>
    291332        <WindowIndex Value="0"/>
    292333        <TopLine Value="912"/>
    293334        <CursorPos X="14" Y="929"/>
    294335        <UsageCount Value="16"/>
    295         <Loaded Value="True"/>
    296336      </Unit21>
    297337      <Unit22>
    298338        <Filename Value="../../PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericListObject.inc"/>
    299         <EditorIndex Value="9"/>
    300339        <WindowIndex Value="0"/>
    301340        <TopLine Value="1"/>
    302341        <CursorPos X="15" Y="18"/>
    303342        <UsageCount Value="14"/>
    304         <Loaded Value="True"/>
    305343      </Unit22>
    306344      <Unit23>
    307345        <Filename Value="/usr/share/fpcsrc/2.4.0/rtl/inc/ustringh.inc"/>
    308         <EditorIndex Value="4"/>
    309346        <WindowIndex Value="0"/>
    310347        <TopLine Value="1"/>
    311348        <CursorPos X="11" Y="30"/>
    312349        <UsageCount Value="11"/>
    313         <Loaded Value="True"/>
    314350        <DefaultSyntaxHighlighter Value="Delphi"/>
    315351      </Unit23>
     352      <Unit24>
     353        <Filename Value="UCore.pas"/>
     354        <IsPartOfProject Value="True"/>
     355        <ComponentName Value="Core"/>
     356        <ResourceBaseClass Value="DataModule"/>
     357        <UnitName Value="UCore"/>
     358        <EditorIndex Value="5"/>
     359        <WindowIndex Value="0"/>
     360        <TopLine Value="3"/>
     361        <CursorPos X="28" Y="15"/>
     362        <UsageCount Value="21"/>
     363        <Loaded Value="True"/>
     364        <LoadedDesigner Value="True"/>
     365        <DefaultSyntaxHighlighter Value="Delphi"/>
     366      </Unit24>
     367      <Unit25>
     368        <Filename Value="Forms/USettingForm.pas"/>
     369        <IsPartOfProject Value="True"/>
     370        <ComponentName Value="SettingForm"/>
     371        <ResourceBaseClass Value="Form"/>
     372        <UnitName Value="USettingForm"/>
     373        <EditorIndex Value="4"/>
     374        <WindowIndex Value="0"/>
     375        <TopLine Value="1"/>
     376        <CursorPos X="1" Y="1"/>
     377        <UsageCount Value="21"/>
     378        <Loaded Value="True"/>
     379        <LoadedDesigner Value="True"/>
     380        <DefaultSyntaxHighlighter Value="Delphi"/>
     381      </Unit25>
     382      <Unit26>
     383        <Filename Value="Application/UApplicationInfo.pas"/>
     384        <IsPartOfProject Value="True"/>
     385        <UnitName Value="UApplicationInfo"/>
     386        <EditorIndex Value="3"/>
     387        <WindowIndex Value="0"/>
     388        <TopLine Value="37"/>
     389        <CursorPos X="48" Y="56"/>
     390        <UsageCount Value="20"/>
     391        <Loaded Value="True"/>
     392        <DefaultSyntaxHighlighter Value="Delphi"/>
     393      </Unit26>
    316394    </Units>
    317395    <JumpHistory Count="30" HistoryIndex="29">
    318396      <Position1>
    319         <Filename Value="usystem.pas"/>
    320         <Caret Line="116" Column="45" TopLine="99"/>
     397        <Filename Value="Common/USqlDatabase.pas"/>
     398        <Caret Line="179" Column="40" TopLine="159"/>
    321399      </Position1>
    322400      <Position2>
    323         <Filename Value="usystem.pas"/>
    324         <Caret Line="131" Column="10" TopLine="114"/>
     401        <Filename Value="Common/USqlDatabase.pas"/>
     402        <Caret Line="224" Column="26" TopLine="209"/>
    325403      </Position2>
    326404      <Position3>
    327         <Filename Value="usystem.pas"/>
    328         <Caret Line="203" Column="1" TopLine="170"/>
     405        <Filename Value="Forms/UMainForm.pas"/>
     406        <Caret Line="17" Column="47" TopLine="1"/>
    329407      </Position3>
    330408      <Position4>
    331         <Filename Value="usystem.pas"/>
    332         <Caret Line="25" Column="31" TopLine="18"/>
     409        <Filename Value="Forms/UMainForm.pas"/>
     410        <Caret Line="240" Column="46" TopLine="232"/>
    333411      </Position4>
    334412      <Position5>
    335         <Filename Value="usystem.pas"/>
    336         <Caret Line="131" Column="15" TopLine="111"/>
     413        <Filename Value="Forms/UMainForm.pas"/>
     414        <Caret Line="242" Column="46" TopLine="234"/>
    337415      </Position5>
    338416      <Position6>
    339417        <Filename Value="Forms/UMainForm.pas"/>
    340         <Caret Line="128" Column="7" TopLine="111"/>
     418        <Caret Line="287" Column="23" TopLine="285"/>
    341419      </Position6>
    342420      <Position7>
    343         <Filename Value="usystem.pas"/>
    344         <Caret Line="132" Column="16" TopLine="114"/>
     421        <Filename Value="chronis.lpr"/>
     422        <Caret Line="26" Column="73" TopLine="15"/>
    345423      </Position7>
    346424      <Position8>
    347         <Filename Value="usystem.pas"/>
    348         <Caret Line="8" Column="60" TopLine="1"/>
     425        <Filename Value="Common/USqlDatabase.pas"/>
     426        <Caret Line="218" Column="30" TopLine="209"/>
    349427      </Position8>
    350428      <Position9>
    351         <Filename Value="usystem.pas"/>
    352         <Caret Line="131" Column="10" TopLine="114"/>
     429        <Filename Value="Common/USqlDatabase.pas"/>
     430        <Caret Line="87" Column="3" TopLine="75"/>
    353431      </Position9>
    354432      <Position10>
    355         <Filename Value="usystem.pas"/>
    356         <Caret Line="70" Column="7" TopLine="47"/>
     433        <Filename Value="Forms/ULoginForm.pas"/>
     434        <Caret Line="12" Column="43" TopLine="14"/>
    357435      </Position10>
    358436      <Position11>
    359         <Filename Value="usystem.pas"/>
    360         <Caret Line="54" Column="6" TopLine="43"/>
     437        <Filename Value="Forms/USettingForm.pas"/>
     438        <Caret Line="1" Column="1" TopLine="1"/>
    361439      </Position11>
    362440      <Position12>
    363         <Filename Value="usystem.pas"/>
    364         <Caret Line="34" Column="9" TopLine="17"/>
     441        <Filename Value="Forms/UMainForm.pas"/>
     442        <Caret Line="135" Column="5" TopLine="128"/>
    365443      </Position12>
    366444      <Position13>
    367         <Filename Value="usystem.pas"/>
    368         <Caret Line="17" Column="15" TopLine="7"/>
     445        <Filename Value="Forms/UMainForm.pas"/>
     446        <Caret Line="137" Column="5" TopLine="130"/>
    369447      </Position13>
    370448      <Position14>
    371         <Filename Value="usystem.pas"/>
    372         <Caret Line="134" Column="21" TopLine="114"/>
     449        <Filename Value="Forms/UMainForm.pas"/>
     450        <Caret Line="247" Column="25" TopLine="245"/>
    373451      </Position14>
    374452      <Position15>
    375         <Filename Value="Forms/UItemAdd.pas"/>
    376         <Caret Line="23" Column="67" TopLine="27"/>
     453        <Filename Value="Forms/UMainForm.pas"/>
     454        <Caret Line="122" Column="62" TopLine="113"/>
    377455      </Position15>
    378456      <Position16>
    379         <Filename Value="Forms/UItemAdd.pas"/>
    380         <Caret Line="151" Column="1" TopLine="122"/>
     457        <Filename Value="Forms/UMainForm.pas"/>
     458        <Caret Line="123" Column="62" TopLine="114"/>
    381459      </Position16>
    382460      <Position17>
    383         <Filename Value="Forms/UItemAdd.pas"/>
    384         <Caret Line="84" Column="1" TopLine="78"/>
     461        <Filename Value="Forms/UMainForm.pas"/>
     462        <Caret Line="144" Column="16" TopLine="126"/>
    385463      </Position17>
    386464      <Position18>
    387         <Filename Value="Forms/UItemAdd.pas"/>
    388         <Caret Line="76" Column="20" TopLine="60"/>
     465        <Filename Value="Forms/UMainForm.pas"/>
     466        <Caret Line="102" Column="20" TopLine="90"/>
    389467      </Position18>
    390468      <Position19>
    391         <Filename Value="Forms/UItemEdit.pas"/>
    392         <Caret Line="92" Column="12" TopLine="85"/>
     469        <Filename Value="Forms/UMainForm.pas"/>
     470        <Caret Line="93" Column="1" TopLine="81"/>
    393471      </Position19>
    394472      <Position20>
    395         <Filename Value="Forms/UItemAdd.pas"/>
    396         <Caret Line="95" Column="15" TopLine="76"/>
     473        <Filename Value="Forms/UMainForm.pas"/>
     474        <Caret Line="124" Column="1" TopLine="103"/>
    397475      </Position20>
    398476      <Position21>
    399         <Filename Value="Forms/UItemAdd.pas"/>
    400         <Caret Line="94" Column="1" TopLine="80"/>
     477        <Filename Value="Forms/UMainForm.pas"/>
     478        <Caret Line="7" Column="48" TopLine="1"/>
    401479      </Position21>
    402480      <Position22>
    403         <Filename Value="Forms/UItemAdd.pas"/>
    404         <Caret Line="101" Column="21" TopLine="84"/>
     481        <Filename Value="Forms/UMainForm.pas"/>
     482        <Caret Line="93" Column="27" TopLine="81"/>
    405483      </Position22>
    406484      <Position23>
    407         <Filename Value="Forms/UItemAdd.pas"/>
    408         <Caret Line="79" Column="1" TopLine="72"/>
     485        <Filename Value="Forms/UMainForm.pas"/>
     486        <Caret Line="125" Column="33" TopLine="105"/>
    409487      </Position23>
    410488      <Position24>
    411         <Filename Value="Forms/UItemAdd.pas"/>
    412         <Caret Line="97" Column="33" TopLine="80"/>
     489        <Filename Value="Forms/UMainForm.pas"/>
     490        <Caret Line="162" Column="1" TopLine="157"/>
    413491      </Position24>
    414492      <Position25>
    415         <Filename Value="Forms/UItemAdd.pas"/>
    416         <Caret Line="102" Column="77" TopLine="85"/>
     493        <Filename Value="Forms/UMainForm.pas"/>
     494        <Caret Line="161" Column="15" TopLine="157"/>
    417495      </Position25>
    418496      <Position26>
    419         <Filename Value="Forms/UItemAdd.pas"/>
    420         <Caret Line="92" Column="40" TopLine="67"/>
     497        <Filename Value="Forms/UMainForm.pas"/>
     498        <Caret Line="276" Column="1" TopLine="271"/>
    421499      </Position26>
    422500      <Position27>
    423         <Filename Value="Forms/UMainForm.pas"/>
    424         <Caret Line="159" Column="63" TopLine="131"/>
     501        <Filename Value="Common/USqlDatabase.pas"/>
     502        <Caret Line="172" Column="28" TopLine="159"/>
    425503      </Position27>
    426504      <Position28>
    427         <Filename Value="Forms/UMainForm.pas"/>
    428         <Caret Line="1" Column="1" TopLine="1"/>
     505        <Filename Value="Common/USqlDatabase.pas"/>
     506        <Caret Line="221" Column="32" TopLine="209"/>
    429507      </Position28>
    430508      <Position29>
    431509        <Filename Value="Forms/UMainForm.pas"/>
    432         <Caret Line="401" Column="25" TopLine="383"/>
     510        <Caret Line="95" Column="29" TopLine="91"/>
    433511      </Position29>
    434512      <Position30>
    435513        <Filename Value="Forms/UMainForm.pas"/>
    436         <Caret Line="17" Column="47" TopLine="1"/>
     514        <Caret Line="174" Column="3" TopLine="168"/>
    437515      </Position30>
    438516    </JumpHistory>
    439517  </ProjectOptions>
    440518  <CompilerOptions>
    441     <Version Value="9"/>
     519    <Version Value="10"/>
    442520    <Target>
    443521      <Filename Value="chronis"/>
     
    445523    <SearchPaths>
    446524      <IncludeFiles Value="$(ProjOutDir)"/>
    447       <Libraries Value="/usr/lib/mysql/;/usr/lib64/mysql/"/>
    448       <OtherUnitFiles Value="Common;Forms"/>
     525      <Libraries Value="/usr/lib/mysql;/usr/lib64/mysql"/>
     526      <OtherUnitFiles Value="Common;Forms;Application"/>
    449527      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
    450528    </SearchPaths>
     
    477555    </Linking>
    478556    <Other>
     557      <CompilerMessages>
     558        <UseMsgFile Value="True"/>
     559      </CompilerMessages>
     560      <CustomOptions Value="-dDEBUG"/>
    479561      <CompilerPath Value="$(CompPath)"/>
    480562    </Other>
     
    483565    <BreakPoints Count="1">
    484566      <Item1>
     567        <Kind Value="bpkSource"/>
    485568        <Source Value="../../PascalClassLibrary/Generics/TemplateGenerics/Generic/GenericListObject.inc"/>
    486569        <Line Value="52"/>
  • trunk/chronis.lpr

    r9 r10  
    99  Interfaces, // this includes the LCL widgetset
    1010  Forms, UPersistentForm, URegistry, USqlDatabase, UTreeState, SysUtils,
    11   UItemView, UItemEdit, ULoginForm, UMainForm, UItemAdd, TemplateGenerics, USystem
     11  UItemView, UItemEdit, ULoginForm, UMainForm, UItemAdd, TemplateGenerics,
     12  USystem, UCore, UApplicationInfo, USettingForm
    1213  { you can add units after this };
    1314
    1415{$R *.res}
    1516
     17{$IFDEF DEBUG}
    1618const
    1719  HeapTraceLog = 'heaptrclog.trc';
     20{$ENDIF}
     21
    1822begin
     23  {$IFDEF DEBUG}
    1924  // Heap trace
    2025  DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
    2126  SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
     27  {$ENDIF}
     28
    2229  Application.Initialize;
     30  Application.CreateForm(TCore, Core);
    2331  Application.CreateForm(TMainForm, MainForm);
     32  Application.CreateForm(TLoginForm, LoginForm);
    2433  Application.CreateForm(TItemViewForm, ItemViewForm);
    2534  Application.CreateForm(TItemEditForm, ItemEditForm);
    2635  Application.CreateForm(TItemAddForm, ItemAddForm);
     36  Application.CreateForm(TSettingForm, SettingForm);
    2737  Application.Run;
    2838end.
  • trunk/languages/chronis.cs.po

    r8 r10  
    55"POT-Creation-Date: \n"
    66"PO-Revision-Date: \n"
    7 "Last-Translator: Chronos <robie@centrum.cz>\n"
     7"Last-Translator: Jiří Hajda <software@mezservis.cz>\n"
    88"Language-Team: \n"
    99"MIME-Version: 1.0\n"
     
    3535#: TITEMEDITFORM.BUTTONSAVE.CAPTION
    3636#| msgid "Uložit"
     37msgctxt "TITEMEDITFORM.BUTTONSAVE.CAPTION"
    3738msgid "Save"
    3839msgstr "Uložit"
     
    7071msgstr "Přihlášení"
    7172
     73#: TLOGINFORM.CAPTION
     74msgctxt "TLOGINFORM.CAPTION"
     75msgid "Login"
     76msgstr "Přihásit"
     77
    7278#: TLOGINFORM.LABEL1.CAPTION
    7379msgid "Username:"
     
    7884msgstr "Heslo:"
    7985
    80 #: TLOGINFORM.LOGINFORM.CAPTION
    81 msgctxt "TLOGINFORM.LOGINFORM.CAPTION"
    82 msgid "Login"
    83 msgstr "Přihásit"
     86#: TLOGINFORM.MASKEDIT1.TEXT
     87msgid "*"
     88msgstr "*"
     89
     90#: TMAINFORM.ACONNECT.CAPTION
     91msgctxt "TMAINFORM.ACONNECT.CAPTION"
     92msgid "Connect"
     93msgstr "Připojit"
     94
     95#: TMAINFORM.ACONNECT.HINT
     96msgctxt "TMAINFORM.ACONNECT.HINT"
     97msgid "Connect"
     98msgstr "Připojit"
    8499
    85100#: TMAINFORM.AEXIT.CAPTION
     
    145160msgstr "Upravit"
    146161
     162#: TMAINFORM.ASETTINGS.CAPTION
     163msgctxt "TMAINFORM.ASETTINGS.CAPTION"
     164msgid "Settings"
     165msgstr "Nastavení"
     166
     167#: TMAINFORM.ASETTINGS.HINT
     168msgctxt "TMAINFORM.ASETTINGS.HINT"
     169msgid "Settings"
     170msgstr "Nastavení"
     171
    147172#: TMAINFORM.ATOGGLEFULLSCREEN.CAPTION
    148173#| msgid "Fullscreen mode F11"
     
    150175msgstr "Režim celé obrazovky"
    151176
     177#: TMAINFORM.CAPTION
     178msgctxt "TMAINFORM.CAPTION"
     179msgid "ChronIS"
     180msgstr "ChronIS"
     181
    152182#: TMAINFORM.LABEL1.CAPTION
    153183#| msgid "Skupiny:"
     
    160190msgstr "Výpisy:"
    161191
    162 #: TMAINFORM.MAINFORM.CAPTION
    163 msgid "ChronIS"
    164 msgstr "ChronIS"
    165 
    166192#: TMAINFORM.MENUITEM11.CAPTION
    167193msgctxt "TMAINFORM.MENUITEM11.CAPTION"
     
    177203msgstr "Server"
    178204
     205#: TSETTINGFORM.BUTTONCANCEL.CAPTION
     206msgctxt "TSETTINGFORM.BUTTONCANCEL.CAPTION"
     207msgid "Cancel"
     208msgstr "Zrušit"
     209
     210#: TSETTINGFORM.BUTTONSAVE.CAPTION
     211msgctxt "TSETTINGFORM.BUTTONSAVE.CAPTION"
     212msgid "Save"
     213msgstr "Uložit"
     214
     215#: TSETTINGFORM.CAPTION
     216msgctxt "TSETTINGFORM.CAPTION"
     217msgid "Settings"
     218msgstr "Nastavení"
     219
     220#: TSETTINGFORM.LABEL1.CAPTION
     221msgid "Server address:"
     222msgstr "Adresa serveru:"
     223
    179224#: umainform.sgroup
    180225msgid "Groups"
    181 msgstr ""
     226msgstr "Skupiny"
    182227
    183228#: umainform.sitemnotfound
     
    191236#: usqldatabase.sdatabasequeryerror
    192237msgid "Database query error: \"%s\""
    193 msgstr ""
    194 
     238msgstr "Chyba databázového dotazu: \"%s\""
     239
  • trunk/languages/chronis.po

    r8 r10  
    2222
    2323#: TITEMEDITFORM.BUTTONSAVE.CAPTION
     24msgctxt "TITEMEDITFORM.BUTTONSAVE.CAPTION"
    2425msgid "Save"
    2526msgstr ""
     
    5354msgstr ""
    5455
     56#: TLOGINFORM.CAPTION
     57msgctxt "TLOGINFORM.CAPTION"
     58msgid "Login"
     59msgstr ""
     60
    5561#: TLOGINFORM.LABEL1.CAPTION
    5662msgid "Username:"
     
    6167msgstr ""
    6268
    63 #: TLOGINFORM.LOGINFORM.CAPTION
    64 msgctxt "TLOGINFORM.LOGINFORM.CAPTION"
    65 msgid "Login"
     69#: TLOGINFORM.MASKEDIT1.TEXT
     70msgid "*"
     71msgstr ""
     72
     73#: TMAINFORM.ACONNECT.CAPTION
     74msgctxt "TMAINFORM.ACONNECT.CAPTION"
     75msgid "Connect"
     76msgstr ""
     77
     78#: TMAINFORM.ACONNECT.HINT
     79msgctxt "TMAINFORM.ACONNECT.HINT"
     80msgid "Connect"
    6681msgstr ""
    6782
     
    118133msgstr ""
    119134
     135#: TMAINFORM.ASETTINGS.CAPTION
     136msgctxt "TMAINFORM.ASETTINGS.CAPTION"
     137msgid "Settings"
     138msgstr ""
     139
     140#: TMAINFORM.ASETTINGS.HINT
     141msgctxt "TMAINFORM.ASETTINGS.HINT"
     142msgid "Settings"
     143msgstr ""
     144
    120145#: TMAINFORM.ATOGGLEFULLSCREEN.CAPTION
    121146msgid "Fullscreen mode"
    122147msgstr ""
    123148
     149#: TMAINFORM.CAPTION
     150msgctxt "TMAINFORM.CAPTION"
     151msgid "ChronIS"
     152msgstr ""
     153
    124154#: TMAINFORM.LABEL1.CAPTION
    125155msgid "Groups:"
     
    128158#: TMAINFORM.LABEL2.CAPTION
    129159msgid "Reports:"
    130 msgstr ""
    131 
    132 #: TMAINFORM.MAINFORM.CAPTION
    133 msgid "ChronIS"
    134160msgstr ""
    135161
     
    147173msgstr ""
    148174
     175#: TSETTINGFORM.BUTTONCANCEL.CAPTION
     176msgctxt "TSETTINGFORM.BUTTONCANCEL.CAPTION"
     177msgid "Cancel"
     178msgstr ""
     179
     180#: TSETTINGFORM.BUTTONSAVE.CAPTION
     181msgctxt "TSETTINGFORM.BUTTONSAVE.CAPTION"
     182msgid "Save"
     183msgstr ""
     184
     185#: TSETTINGFORM.CAPTION
     186msgctxt "TSETTINGFORM.CAPTION"
     187msgid "Settings"
     188msgstr ""
     189
     190#: TSETTINGFORM.LABEL1.CAPTION
     191msgid "Server address:"
     192msgstr ""
     193
    149194#: umainform.sgroup
    150195msgid "Groups"
Note: See TracChangeset for help on using the changeset viewer.