Changeset 14 for trunk/Forms


Ignore:
Timestamp:
Nov 15, 2012, 9:48:48 AM (12 years ago)
Author:
chronos
Message:
  • Upraveno: Inicializace pohledů pro docházku přesunuto do modulu Docházka.
Location:
trunk/Forms
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormList.lfm

    r12 r14  
    1313  object ToolBar1: TToolBar
    1414    Left = 0
    15     Height = 46
    16     Top = 351
     15    Height = 42
     16    Top = 355
    1717    Width = 588
    1818    Align = alBottom
    19     ButtonHeight = 44
    20     ButtonWidth = 48
     19    ButtonHeight = 40
     20    ButtonWidth = 44
    2121    Images = FormMain.ImageList1
    2222    ParentShowHint = False
    … …  
    6262  object ListView1: TListView
    6363    Left = 0
    64     Height = 333
     64    Height = 337
    6565    Top = 0
    6666    Width = 588
    … …  
    8181    Left = 0
    8282    Height = 18
    83     Top = 333
     83    Top = 337
    8484    Width = 588
    8585    Align = alBottom

  • trunk/Forms/UFormMain.lfm

    r13 r14  
    11object FormMain: TFormMain
    2   Left = 194
     2  Left = 202
    33  Height = 455
    44  Top = 144
    55  Width = 733
    6   Caption = 'Attendance'
     6  Caption = 'ChronIS'
    77  ClientHeight = 436
    88  ClientWidth = 733
    … …  
    2323  object ToolBar1: TToolBar
    2424    Left = 0
    25     Height = 26
     25    Height = 42
    2626    Top = 0
    2727    Width = 733
     28    ButtonHeight = 40
     29    ButtonWidth = 44
    2830    Images = ImageList1
    2931    ParentShowHint = False
     32    ShowCaptions = True
    3033    ShowHint = True
    3134    TabOrder = 1
    3235    Visible = False
    3336    object ToolButton1: TToolButton
    34       Left = 47
     37      Left = 109
    3538      Top = 2
    36       Action = ASetting
     39      Action = ASettings
    3740    end
    3841    object ToolButton2: TToolButton
    39       Left = 70
     42      Left = 156
    4043      Top = 2
    4144      Action = AModuleList
    … …  
    4447      Left = 1
    4548      Top = 2
    46       Action = AConnectionSettings
     49      Action = AConnect
    4750    end
    4851    object ToolButton4: TToolButton
    49       Left = 24
     52      Left = 49
    5053      Top = 2
    5154      Action = ADisconnect
    … …  
    5457  object PageControl1: TPageControl
    5558    Left = 0
    56     Height = 390
    57     Top = 26
     59    Height = 374
     60    Top = 42
    5861    Width = 733
    5962    Align = alClient
    … …  
    7174        Caption = 'Database'
    7275        object MenuItem4: TMenuItem
    73           Action = AConnectionSettings
     76          Action = AConnect
     77          Bitmap.Data = {
     78            36040000424D3604000000000000360000002800000010000000100000000100
     79            2000000000000004000064000000640000000000000000000000B98C5700B98C
     80            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C
     81            5700B98C5700B98C5700B98C5700B98C57000C0C0CFFE9DDCDFFB98C5700B98C
     82            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C
     83            5700B98C5700B98C5700B98C57000C0C0CFFEADECDFF555555FFB98C5700B98C
     84            5700B98C5700B98C5700B98C5700B98C5700B98C5700969696FF969696FF9696
     85            96FF969696FF969696FF0C0C0CFFEADECDFF555555FFB98C5700B98C5700B98C
     86            5700B98C5700B98C5700B98C5700B98C5700777777FF0C0C0CFF0C0C0CFF0C0C
     87            0CFF0C0C0CFF0C0C0CFFE9DDCDFF555555FFB98C5700B98C5700B98C5700B98C
     88            5700B98C5700B98C5700B98C5700777777FF0C0C0CFFB98C57FFB98C57FFB98C
     89            57FFB98C57FFB98C57FF0C0C0CFFB98C5700B98C5700B98C5700B98C5700B98C
     90            5700B98C5700B98C5700777777FF0C0C0CFFEADECDFFB98C57FFB98C57FFB98C
     91            57FFB98C57FFB98C57FF0C0C0CFFB98C5700B98C5700B98C5700B98C5700B98C
     92            5700B98C5700969696FF0C0C0CFFB98C57FF0C0C0CFFEADECDFFB98C57FFB98C
     93            57FFB98C57FFB98C57FF0C0C0CFFB98C5700B98C5700B98C5700B98C5700B98C
     94            5700B98C57000C0C0CFFE9DDCDFFB98C57FFB98C57FF0C0C0CFFEADECDFFB98C
     95            57FFB98C57FFB98C57FF0C0C0CFFB98C5700B98C5700B98C5700B98C5700B98C
     96            5700B98C57000C0C0CFFE9DDCDFFB98C57FFB98C57FFB98C57FF0C0C0CFFEADE
     97            CDFFB98C57FFB98C57FF0C0C0CFFB98C5700B98C5700B98C5700B98C5700B98C
     98            5700B98C57000C0C0CFFE9DDCDFFB98C57FFB98C57FFB98C57FFB98C57FF0C0C
     99            0CFFEADECDFF555555FFB98C5700B98C5700B98C5700B98C5700B98C5700B98C
     100            5700B98C57000C0C0CFFE9DDCDFFB98C57FFB98C57FFB98C57FFB98C57FFB98C
     101            57FF0C0C0CFFB98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C
     102            5700777777FF555555FFB98C57FFEADECDFFEADECDFFE9DDCDFFE9DDCDFF5555
     103            55FFB98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C
     104            57000C0C0CFFEADECDFF555555FF555555FF555555FF555555FF555555FFB98C
     105            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C57000C0C
     106            0CFFEADECDFF555555FFB98C5700B98C5700B98C5700B98C5700B98C5700B98C
     107            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C57000C0C0CFFEADE
     108            CDFF555555FFB98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C
     109            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700E9DDCDFF5555
     110            55FFB98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C
     111            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700
     112          }
    74113        end
    75114        object MenuItem9: TMenuItem
    76115          Action = ADisconnect
     116          Bitmap.Data = {
     117            36040000424D3604000000000000360000002800000010000000100000000100
     118            2000000000000004000064000000640000000000000000000000B98C5700B98C
     119            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C57009696
     120            96FF969696FF969696FF969696FF969696FF0C0C0CFFE8DCCCFFB98C5700B98C
     121            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700777777FF0C0C
     122            0CFF0C0C0CFF0C0C0CFF0C0C0CFF0C0C0CFFE9DDCCFF393939FFB98C5700B98C
     123            5700B98C5700B98C5700B98C5700B98C5700B98C5700777777FF0C0C0CFFB88C
     124            57FFB88C57FFB88C57FFB88C57FFB88C57FF0C0C0CFFB98C5700B98C5700B98C
     125            5700B98C5700B98C5700B98C5700B98C5700B98C57000C0C0CFFE8DCCCFFB88C
     126            57FFB88C57FFB88C57FFB88C57FFB88C57FF0C0C0CFFB98C5700B98C5700B98C
     127            5700B98C5700B98C5700B98C5700B98C5700969696FF777777FF0C0C0CFFE9DD
     128            CCFFB88C57FFB88C57FFB88C57FFB88C57FF0C0C0CFFB98C5700B98C5700B98C
     129            5700B98C5700B98C5700B98C5700B98C5700003366FFE9DDCCFFE9DDCCFF0C0C
     130            0CFFE9DDCCFFB88C57FFB88C57FFB88C57FF0C0C0CFFB98C5700B98C5700B98C
     131            5700B98C5700777777FF969696FFB98C5700B98C5700003366FFE9DDCCFFE9DD
     132            CCFF0C0C0CFFE9DDCCFFB88C57FFB88C57FF0C0C0CFFB98C5700B98C5700B98C
     133            5700777777FF0C0C0CFF777777FF969696FFB98C5700B98C5700003366FFE9DD
     134            CCFFE9DDCCFF0C0C0CFFE9DDCCFF0C0C0CFFB98C5700B98C5700B98C57007777
     135            77FF0C0C0CFFB88C57FF0C0C0CFF777777FF969696FFB98C5700B98C57000033
     136            66FFE9DDCCFF777777FF0C0C0CFFB98C5700B98C5700B98C5700B98C57000C0C
     137            0CFFE8DCCCFFB88C57FFB88C57FF0C0C0CFF777777FF969696FFB98C5700B98C
     138            5700003366FFB98C5700B98C5700B98C5700B98C5700B98C5700B98C57000C0C
     139            0CFFE8DCCCFFB88C57FFB88C57FFB88C57FF0C0C0CFF777777FF969696FFB98C
     140            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C57000C0C
     141            0CFFE8DCCCFFB88C57FFB88C57FFB88C57FFB88C57FF0C0C0CFF777777FFB98C
     142            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C57000C0C
     143            0CFFE8DCCCFFB88C57FFB88C57FFB88C57FFB88C57FFB88C57FF0C0C0CFFB98C
     144            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700777777FF3939
     145            39FFB88C57FFE9DDCCFFE9DDCCFFE8DCCCFFE8DCCCFF555555FFB98C5700B98C
     146            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C57000C0C0CFFE9DD
     147            CCFF555555FF555555FF555555FF555555FF555555FFB98C5700B98C5700B98C
     148            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700E8DCCCFF3939
     149            39FFB98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C
     150            5700B98C5700B98C5700B98C5700B98C5700B98C5700B98C5700
     151          }
    77152        end
    78153      end
    79154      object MenuItem1: TMenuItem
    80         Action = ASetting
     155        Action = ASettings
     156        Bitmap.Data = {
     157          36040000424D3604000000000000360000002800000010000000100000000100
     158          2000000000000004000064000000640000000000000000000000000000000000
     159          0000000000000000000000000000000000003F3428FF3F3428FF3F3428FF3F34
     160          28FF000000000000000000000000000000000000000000000000000000000000
     161          0000000000003F3428FF3F3428FF00000000776D66FFE5DBD2FFE5DBD2FF776D
     162          66FF000000003F3428FF3F3428FF000000000000000000000000000000000000
     163          00003F3428FF877D73FFE1D9D1FF574D42FF766C63FFEDE5DDFFEDE5DDFF766C
     164          63FF574D42FFE1D9D1FF877D73FF3F3428FF0000000000000000000000003F34
     165          28FFB6B0A9FFE1D9D1FFC8BEB4FFE1D9D1FFC8BEB4FFEDE5DDFFEDE5DDFFC8BE
     166          B4FFE1D9D1FFC8BEB4FFE1D9D1FFB6B0A9FF3F3428FF00000000000000003F34
     167          28FFE1D9D1FFEBE7E2FFE1D9D1FFAEA7A0FFE2DDDAFFB7B1ABFFB7B1ABFFE2DD
     168          DAFFAEA7A0FFE1D9D1FFEBE7E2FFE1D9D1FF3F3428FF00000000000000000000
     169          000061564CFFE1D9D1FFACA39BFFE4E1DCFFAFA8A4FF695E53FF695E53FFAFA8
     170          A4FFE4E1DCFFACA39BFFE1D9D1FF61564CFF0000000000000000463B2FFF3E33
     171          28FF61564CFFAFA8A4FFC1BCB6FFAFA8A4FF695E53FFFFFFFF00FFFFFF00695E
     172          53FFAFA8A4FFC1BCB6FFAFA8A4FF61564CFF3E3328FF463B2FFF897E74FFE8E0
     173          D7FFE8E0D7FFB0ACA8FFE8E3DDFF695E53FFFFFFFF00FFFFFF00FFFFFF00FFFF
     174          FF00695E53FFE8E3DDFFB0ACA8FFE8E0D7FFE8E0D7FF897E74FF877B70FFFFFF
     175          FFFFFFFFFFFFBFBCB8FFD6CDC5FF695E53FFFFFFFF00FFFFFF00FFFFFF00FFFF
     176          FF00695E53FFD6CDC5FFBFBCB8FFFFFFFFFFFFFFFFFF877B70FF8E8378FF897D
     177          72FF84796CFFD8D5D3FFC9C2B9FFA99C90FF594F45FFFFFFFF00FFFFFF006056
     178          4DFFA99C90FFC9C2B9FFD8D5D3FF84796CFF897D72FF8E8378FF000000000000
     179          0000696053FFDFDFDEFFDFDFDEFFD1C4BAFF8E8377FF44392EFF44392EFF8E83
     180          77FFD1C4BAFFDFDFDEFFDFDFDEFF696053FF0000000000000000000000006960
     181          53FFF6F1EEFFBBAC9DFFDFD8D3FFEEEFEFFFEBE7E2FFE3D9D1FFE3D9D1FFEBE7
     182          E2FFEEEFEFFFDFD8D3FFBBAC9DFFF6F1EEFF696053FF0000000000000000675D
     183          50FFCDC6BFFFF6F1EEFFF8F7F4FFF8F7F4FFFFFFFFFFFCFDFDFFFCFDFDFFFFFF
     184          FFFFF8F7F4FFF8F7F4FFF6F1EEFFCDC6BFFF696053FF00000000000000000000
     185          0000998F83FFCCC5BEFFF6F1EEFF908377FF908377FFEDE7E0FFEDE7E0FF9083
     186          77FF908377FFF6F1EEFFCCC5BEFFA9A096FF0000000000000000000000000000
     187          0000000000009C9083FF9C9083FF00000000998D80FFFFFFFFFFFFFFFFFF998D
     188          80FF000000009C9083FF9C9083FF000000000000000000000000000000000000
     189          000000000000000000000000000000000000A19588FF9C9083FF9C9083FFA195
     190          88FF000000000000000000000000000000000000000000000000
     191        }
    81192      end
    82193      object MenuItem5: TMenuItem
    83194        Action = AModuleList
     195        Bitmap.Data = {
     196          36040000424D3604000000000000360000002800000010000000100000000100
     197          2000000000000004000064000000640000000000000000000000F5FCF600F5FC
     198          F600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FC
     199          F600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF60055AA
     200          5CFF51A658FF4EA354FF4A9F50FF4A9F50FFF5FCF600F5FCF6003F9243FF3C8F
     201          41FF3F9243FF49954CFFF5FCF600F5FCF600F5FCF600F5FCF600F5FCF6005CAC
     202          62FF84CD8CFF84CD8CFF82CA88FF4A9F50FFF5FCF600F5FCF600449648FF7BC7
     203          82FF75C27BFF388C3CFFF5FCF600F5FCF600F5FCF600F5FCF600F5FCF6005DB3
     204          64FF8ACF94FF55B860FF84CD8CFF64B46BFF4A9F50FF4A9F50FF5CAC62FF7BC7
     205          82FF7BC782FF3C8F41FFF5FCF600F5FCF600F5FCF600F5FCF600F5FCF60064B4
     206          6BFF8ACF94FF8ACF94FF64C071FF84CD8CFF84CD8CFF84CD8CFF82CA88FF58BA
     207          63FF7BC782FF3F9243FFF5FCF600F5FCF600F5FCF600F5FCF600F5FCF60061BC
     208          6AFF61BC6AFF71BF79FF8ACF94FF58BA63FF58BA63FF55B860FF50B55AFF50B5
     209          5AFF82CA88FF5CAC62FF449648FF3C8F41FF3C8F41FFF5FCF600F5FCF600F5FC
     210          F600F5FCF60061BC6AFF8ACF94FF5DBC69FF5DBC69FF58BA63FF55B860FF55B8
     211          60FF61BC6AFF82CA88FF82CA88FF7BC782FF3D9141FFF5FCF600F5FCF600F5FC
     212          F600F5FCF60068B970FF8ED796FF61BC6AFF61BC6AFF61BC6AFF58BA63FF58BA
     213          63FF64C071FF82CA88FF82CA88FF82CA88FF3F9243FFF5FCF600F5FCF6006BC5
     214          7BFF6CC376FF7BC782FF94D59DFF64C071FF64C071FF5DBC69FF5DBC69FF5DBC
     215          69FF84CD8CFF64B46BFF4A9F50FF479C4DFF449648FFF5FCF600F5FCF60072CB
     216          7CFF98D8A3FF98D8A3FF7BC782FF6CC376FF64C071FF64C071FF64C071FF64C0
     217          71FF8ACF94FF51A658FFF5FCF600F5FCF600F5FCF600F5FCF600F5FCF60075CE
     218          80FF9BD9A6FF9BD9A6FF99D7A0FF94D59DFF94D59DFF94D59DFF8ACF94FF8ACF
     219          94FF8ACF94FF55AA5CFFF5FCF600F5FCF600F5FCF600F5FCF600F5FCF60078D0
     220          82FF78D082FF72CB7CFF72CB7CFF6CC376FF99D7A0FF94D59DFF6CBC74FF6CBC
     221          74FF68B970FF64B46BFFF5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FC
     222          F600F5FCF600F5FCF600F5FCF60075CE80FF98D8A3FF8ACF94FF8ACF94FFF5FC
     223          F600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FC
     224          F600F5FCF600F5FCF600F5FCF60075CE80FF9BD9A6FF9BD9A6FF7BC782FFF5FC
     225          F600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FC
     226          F600F5FCF600F5FCF600F5FCF6008ED796FF75CE80FF72CB7CFF99D7A0FFF5FC
     227          F600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FC
     228          F600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FC
     229          F600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600F5FCF600
     230        }
    84231      end
    85232      object MenuItem2: TMenuItem
    86233        Action = AExit
     234        Bitmap.Data = {
     235          36040000424D3604000000000000360000002800000010000000100000000100
     236          2000000000000004000064000000640000000000000000000000000000000000
     237          0000000000000000000000000000000000FF0000000000000000000000000000
     238          0000000000000000000000000000000000000000000000000000000000000000
     239          00000000000000000000000000FF000000FF0000000000000000000000000000
     240          0000000000000000000000000000000000000000000000000000000000000000
     241          000000000000000000FF008484FF000000FF0000000000000000000000000000
     242          0000000000000000000000000000000000000000000000000000000000000000
     243          0000000000FF008484FF008484FF000000FF0000000000000000000000000000
     244          0000000000000000000000000000000000000000000000000000000000FF0000
     245          00FF008484FF008484FF008484FF000000FF000000FF000000FF000000FF0000
     246          00FF000000FF000000FF000000FF000000000000000000000000000000000000
     247          00FF008484FF008484FF008484FF000000FFFFFFFFFFFFFFFFFF000000FF0000
     248          0000000000000000000000000000000000000000000000000000000000000000
     249          00FF008484FF008484FF000000FF000000FFFFFFFFFFFFFFFFFF000000FF0000
     250          0000000000000000000000000000840000FF0000000000000000000000000000
     251          00FF008484FF008484FF008484FF000000FFFFFFFFFFFFFFFFFF000000FF0000
     252          00000000000000000000840000FF840000FF0000000000000000000000000000
     253          00FF008484FF008484FF008484FF000000FFFFFFFFFFFFFFFFFF000000FF0000
     254          000000000000840000FF840000FF840000FF840000FF840000FF000000000000
     255          00FF008484FF008484FF008484FF000000FFFFFFFFFFFFFFFFFF000000FF0000
     256          0000840000FF840000FF840000FF840000FF840000FF840000FF000000000000
     257          00FF008484FF008484FF008484FF000000FFFFFFFFFFFFFFFFFF000000FF0000
     258          000000000000840000FF840000FF840000FF840000FF840000FF000000000000
     259          00FF008484FF008484FF000000FFFFFFFFFFFFFFFFFFFFFFFFFF000000FF0000
     260          00000000000000000000840000FF840000FF0000000000000000000000000000
     261          00FF008484FF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF0000
     262          0000000000000000000000000000840000FF0000000000000000000000000000
     263          00FF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FF0000
     264          0000000000000000000000000000000000000000000000000000000000000000
     265          00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
     266          0000000000000000000000000000000000000000000000000000000000000000
     267          0000000000000000000000000000000000000000000000000000000000000000
     268          0000000000000000000000000000000000000000000000000000
     269        }
    87270      end
    88271    end
    … …  
    107290      OnExecute = AExitExecute
    108291    end
    109     object ASetting: TAction
    110       Caption = 'Setting'
    111       Hint = 'Show global setting'
     292    object ASettings: TAction
     293      Caption = 'Settings'
     294      Hint = 'Show global settings'
    112295      ImageIndex = 13
    113       OnExecute = ASettingExecute
     296      OnExecute = ASettingsExecute
    114297      ShortCut = 120
    115298    end
    116     object AConnectionSettings: TAction
    117       Caption = 'Connection settings'
     299    object AConnect: TAction
     300      Caption = 'Connect'
    118301      Hint = 'Connect to database'
    119302      ImageIndex = 21
    120       OnExecute = AConnectionSettingsExecute
     303      OnExecute = AConnectExecute
    121304      ShortCut = 121
    122305    end

  • trunk/Forms/UFormMain.lrt

    r13 r14  
    1 TFORMMAIN.CAPTION=Attendance
     1TFORMMAIN.CAPTION=ChronIS
    22TFORMMAIN.MENUITEMSYSTEM.CAPTION=System
    33TFORMMAIN.MENUITEM3.CAPTION=Database
    … …  
    66TFORMMAIN.AEXIT.CAPTION=Exit
    77TFORMMAIN.AEXIT.HINT=Close application
    8 TFORMMAIN.ASETTING.CAPTION=Setting
    9 TFORMMAIN.ASETTING.HINT=Show global setting
    10 TFORMMAIN.ACONNECTIONSETTINGS.CAPTION=Connection settings
    11 TFORMMAIN.ACONNECTIONSETTINGS.HINT=Connect to database
     8TFORMMAIN.ASETTINGS.CAPTION=Settings
     9TFORMMAIN.ASETTINGS.HINT=Show global settings
     10TFORMMAIN.ACONNECT.CAPTION=Connect
     11TFORMMAIN.ACONNECT.HINT=Connect to database
    1212TFORMMAIN.AMODULELIST.CAPTION=Modules
    1313TFORMMAIN.AMODULELIST.HINT=Show module management

  • trunk/Forms/UFormMain.pas

    r13 r14  
    1515
    1616  TFormMain = class(TForm)
    17     AConnectionSettings: TAction;
     17    AConnect: TAction;
    1818    ADisconnect: TAction;
    1919    AShowToolBar: TAction;
    2020    AModuleList: TAction;
    21     ASetting: TAction;
     21    ASettings: TAction;
    2222    AExit: TAction;
    2323    ActionList1: TActionList;
    … …  
    4141    ToolButton3: TToolButton;
    4242    ToolButton4: TToolButton;
    43     procedure AConnectionSettingsExecute(Sender: TObject);
     43    procedure AConnectExecute(Sender: TObject);
    4444    procedure ADisconnectExecute(Sender: TObject);
    4545    procedure AExitExecute(Sender: TObject);
    4646    procedure AModuleListExecute(Sender: TObject);
    47     procedure ASettingExecute(Sender: TObject);
     47    procedure ASettingsExecute(Sender: TObject);
    4848    procedure AShowToolBarExecute(Sender: TObject);
    4949    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
    … …  
    5555    ShowToolBar: Boolean;
    5656    procedure FormModuleListDestroy(Sender: TObject);
    57     procedure InitModules;
    58     procedure ReloadPages;
    5957  public
    6058    DataViewLists: TListObject; // TListObject<TDataViewList>
    6159    DataViewForms: TListObject; // TListObject<TDataViewForm>
     60    procedure RegisterDataViewForm(View: TDataViewForm);
     61    procedure RegisterDataViewList(View: TDataViewList);
     62    procedure UnregisterDataViewForm(View: TDataViewForm);
     63    procedure UnregisterDataViewList(View: TDataViewList);
     64
     65    procedure ReloadPages;
    6266    procedure UpdateInterface;
    6367    procedure LoadFromRegistry(AContext: TRegistryContext);
    … …  
    7579{$R *.lfm}
    7680
    77 resourcestring
    78   SPersonalId = 'Personal Id';
    79   SFirstName = 'First name';
    80   SSecondName = 'Second name';
    81   SEnabled = 'Enabled';
    82   SAddress = 'Address';
    83   SPort = 'Port';
    84   SType = 'Type';
    85   SName = 'Name';
    86   SFingerPrint = 'Fingerprint';
    87   SCardCode = 'Card code';
    88   SNote = 'Note';
    89   SLogin = 'Login';
    90   SPassword = 'Password';
    91   STerminal = 'Terminal';
    92   SUser = 'User';
    93   SDate = 'Date';
    94   STime = 'Time';
    95   SOperation = 'Operation';
    96   SDay = 'Day';
    97   SMonth = 'Month';
    98   SYear = 'Year';
    99   SKeyNumber = 'Key number';
    100   SText = 'Text';
    101   SAttendance = 'Attendance';
    102   SPassage = 'Passage';
    103   STimeFrom = 'Time from';
    104   STimeTo = 'Time to';
    105   SHoliday = 'Holiday';
    106   SLog = 'Log';
    107 
    10881{ TFormMain }
    10982
    … …  
    11588begin
    11689  DataViewLists := TListObject.Create;
     90  DataViewLists.OwnsObjects := False;
    11791  DataViewForms := TListObject.Create;
     92  DataViewForms.OwnsObjects := False;
     93
    11894  LoadFromRegistry(Core.RegistryContext);
    11995  Core.Init;
    12096  Core.PersistentForm.Load(Self);
    121   InitModules;
    12297  ReloadPages;
    12398end;
    … …  
    125100procedure TFormMain.FormDestroy(Sender: TObject);
    126101begin
     102  Core.Done;
    127103  SaveToRegistry(Core.RegistryContext);
     104  Core.PersistentForm.Save(Self);
    128105  FreeAndNil(DataViewForms);
    129106  FreeAndNil(DataViewLists);
    130   Core.PersistentForm.Save(Self);
    131   Core.Done;
    132107end;
    133108
    … …  
    144119    Core.FormModuleList.AddHandlerOnBeforeDestruction(FormModuleListDestroy);
    145120    Core.FormModuleList.Options := [mloAllowEnable, mloShowEnable,
    146       mloAllowInstall,  mloShowDescription, mloShowDependencies, mloShowInfoBar];
     121      mloAllowInstall,  mloShowDescription, mloShowDependencies, mloShowInfoBar,
     122      mloShowInstalled];
    147123    Core.CoolTranslator1.TranslateComponentRecursive(Core.FormModuleList)
    148124  end;
    … …  
    150126end;
    151127
    152 procedure TFormMain.AConnectionSettingsExecute(Sender: TObject);
     128procedure TFormMain.AConnectExecute(Sender: TObject);
    153129begin
    154130  FormConnection.LoadFromDatabase(Core.Database);
    … …  
    166142end;
    167143
    168 procedure TFormMain.ASettingExecute(Sender: TObject);
     144procedure TFormMain.ASettingsExecute(Sender: TObject);
    169145begin
    170146  FormSetting.ShowModal;
    … …  
    201177end;
    202178
    203 procedure TFormMain.InitModules;
    204 var
    205   NewDataView: TDataViewList;
    206   NewDataView2: TDataViewForm;
    207 begin
    208   NewDataView := TDataViewList.Create;
    209   with NewDataView do begin
    210     with Columns do begin
    211       AddItem(SEnabled, 'Enabled', True, 30);
    212       AddItem(SPersonalId, 'PersonalId', True, 80);
    213       AddItem(SLogin, 'Login', False, 80);
    214       AddItem(SPassword, 'Password', False, 80);
    215       AddItem(SFirstName, 'FirstName', True, 80);
    216       AddItem(SSecondName, 'SecondName', True, 80);
    217       AddItem(SCardCode, 'CardCode', True, 80);
    218       AddItem(SFingerPrint, 'FingerPrint', True, 80);
    219       AddItem(SNote, 'Note', False, 80);
    220     end;
    221     Name := 'User';
    222     Caption := SUser;
    223     ImageIndex := 9;
    224   end;
    225   DataViewLists.Add(NewDataView);
    226   NewDataView2 := TDataViewForm.Create;
    227   with NewDataView2 do begin
    228     Name := 'User';
    229     Caption := SUser;
    230     with Items do begin
    231       AddItem(SEnabled, 'Enabled', ctCheckBox, True, Bounds(1, 0, 1, 1));
    232       AddItem(SPersonalId, 'PersonalId', ctSpinEdit, True, Bounds(3, 0, 1, 1));
    233       AddItem(SLogin, 'Login', ctEdit, True, Bounds(1, 1, 1, 1));
    234       AddItem(SPassword, 'Password', ctEdit, True, Bounds(3, 1, 1, 1));
    235       AddItem(SFirstName, 'FirstName', ctEdit, True, Bounds(1, 2, 1, 1));
    236       AddItem(SSecondName, 'SecondName', ctEdit, True, Bounds(3, 2, 1, 1));
    237       AddItem(SCardCode, 'CardCode', ctEdit, True, Bounds(1, 3, 1, 1));
    238       AddItem(SFingerPrint, 'FingerPrint', ctEdit, True, Bounds(3, 3, 1, 1));
    239       AddItem(SNote, 'Note', ctMemo, True, Bounds(0, 5, 4, 4), alTop);
    240     end;
    241   end;
    242   DataViewForms.Add(NewDataView2);
    243 
    244   NewDataView := TDataViewList.Create;
    245   with NewDataView do begin
    246     with Columns do begin
    247       AddItem(STime, 'Time', True, 150);
    248       AddItem(SUser, 'User', True, 80);
    249       AddItem(SOperation, 'Operation', True, 80);
    250       AddItem(STerminal, 'Terminal', True, 80);
    251     end;
    252     Name := 'Passage';
    253     Caption := SPassage;
    254     ImageIndex := 12;
    255   end;
    256   DataViewLists.Add(NewDataView);
    257   NewDataView2 := TDataViewForm.Create;
    258   with NewDataView2 do begin
    259     with Items do begin
    260       AddItem(STime, 'Time', ctDate, True, Bounds(0, 0, 1, 1));
    261       with AddItem(SUser, 'User', ctReference, True, Bounds(3, 0, 1, 1)) do
    262         ReferencedTable := 'User';
    263       with AddItem(SOperation, 'Operation', ctReference, True, Bounds(0, 1, 1, 1)) do
    264         ReferencedTable := 'User';
    265       with AddItem(STerminal, 'Terminal', ctReference, True, Bounds(3, 1, 1, 1)) do
    266         ReferencedTable := 'User';
    267     end;
    268     Name := 'Passage';
    269     Caption := SPassage;
    270     ImageIndex := 12;
    271   end;
    272   DataViewForms.Add(NewDataView2);
    273 
    274   NewDataView := TDataViewList.Create;
    275   with NewDataView do begin
    276     with Columns do begin
    277       AddItem(SDate, 'Date', True, 80);
    278       AddItem(SUser, 'User', True, 80);
    279       AddItem(STimeFrom, 'TimeFrom', True, 120);
    280       AddItem(STimeTo, 'TimeTo', True, 120);
    281     end;
    282     Name := 'Attendance';
    283     Caption := SAttendance;
    284     ImageIndex := 14;
    285   end;
    286   DataViewLists.Add(NewDataView);
    287   NewDataView2 := TDataViewForm.Create;
    288   with NewDataView2 do begin
    289     with Items do begin
    290       AddItem(SUser, 'User', ctReference, True, Bounds(1, 0, 1, 1));
    291       AddItem(SDate, 'Date', ctDate, True, Bounds(3, 0, 1, 1));
    292       AddItem(STimeFrom, 'TimeFrom', ctTime, True, Bounds(1, 1, 1, 1));
    293       AddItem(STimeTo, 'TimeTo', ctTime, True, Bounds(3, 1, 1, 1));
    294     end;
    295     Name := 'Attendance';
    296     Caption := SAttendance;
    297     ImageIndex := 14;
    298   end;
    299   DataViewForms.Add(NewDataView2);
    300 
    301   NewDataView := TDataViewList.Create;
    302   with NewDataView do begin
    303     with Columns do begin
    304       AddItem(SEnabled, 'Enabled', True, 30);
    305       AddItem(SName, 'Name', True, 300);
    306       AddItem(SDay, 'Day', True, 50);
    307       AddItem(SMonth, 'Month', True, 50);
    308       AddItem(SYear, 'Year', True, 50);
    309     end;
    310     Name := 'Holiday';
    311     Caption := SHoliday;
    312     ImageIndex := 10;
    313   end;
    314   DataViewLists.Add(NewDataView);
    315 
    316   NewDataView := TDataViewList.Create;
    317   with NewDataView do begin
    318     with Columns do begin
    319       AddItem(SName, 'Name', True, 100);
    320       AddItem(SKeyNumber, 'KeyId', True, 100);
    321     end;
    322     Name := 'Operation';
    323     Caption := SOperation;
    324     ImageIndex := 13;
    325   end;
    326   DataViewLists.Add(NewDataView);
    327 
    328   NewDataView := TDataViewList.Create;
    329   with NewDataView do begin
    330     with Columns do begin
    331       AddItem(SName, 'Name', True, 80);
    332       AddItem(SEnabled, 'Enabled', True, 30);
    333       AddItem(SAddress, 'Address', True, 120);
    334       AddItem(SPort, 'Port', True, 50);
    335       AddItem(SType, 'Type', True, 80);
    336       AddItem(SNote, 'Note', True, 80);
    337     end;
    338     Name := 'Terminal';
    339     Caption := STerminal;
    340     ImageIndex := 8;
    341   end;
    342   DataViewLists.Add(NewDataView);
    343 
    344   NewDataView := TDataViewList.Create;
    345   with NewDataView do begin
    346     with Columns do begin
    347       AddItem(STime, 'Time', True, 120);
    348       AddItem(SUser, 'User', True, 80);
    349       AddItem(SText, 'Text', True, 400);
    350     end;
    351     Name := 'Log';
    352     Caption := SLog;
    353     ImageIndex := 11;
    354   end;
    355   DataViewLists.Add(NewDataView);
    356 end;
    357 
    358179procedure TFormMain.ReloadPages;
    359180var
    … …  
    361182  I: Integer;
    362183begin
     184  if Assigned(Core.FormList) then FreeAndNil(Core.FormList);
     185  for I := PageControl1.PageCount - 1 downto 0 do
     186    PageControl1.Pages[I].Free;
    363187  for I := 0 to DataViewLists.Count - 1 do
    364188  with TDataViewList(DataViewLists[I]) do begin
    … …  
    373197end;
    374198
     199procedure TFormMain.RegisterDataViewForm(View: TDataViewForm);
     200begin
     201  DataViewForms.Add(View);
     202end;
     203
     204procedure TFormMain.RegisterDataViewList(View: TDataViewList);
     205begin
     206  DataViewLists.Add(View);
     207end;
     208
     209procedure TFormMain.UnregisterDataViewForm(View: TDataViewForm);
     210begin
     211  DataViewForms.Remove(View);
     212end;
     213
     214procedure TFormMain.UnregisterDataViewList(View: TDataViewList);
     215begin
     216  DataViewLists.Remove(View);
     217end;
     218
    375219procedure TFormMain.UpdateInterface;
    376220begin
Note: See TracChangeset for help on using the changeset viewer.