diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index 8f43216..bd785e5 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Build/Installer.fbl6 b/Build/Installer.fbl6
index 6b788d3..3478578 100644
Binary files a/Build/Installer.fbl6 and b/Build/Installer.fbl6 differ
diff --git a/Source/Cliente/Etiquetas.RES b/Source/Cliente/Etiquetas.RES
index 3fae228..4bc60bf 100644
Binary files a/Source/Cliente/Etiquetas.RES and b/Source/Cliente/Etiquetas.RES differ
diff --git a/Source/Cliente/Etiquetas.dproj b/Source/Cliente/Etiquetas.dproj
index 39e4e9f..a450365 100644
--- a/Source/Cliente/Etiquetas.dproj
+++ b/Source/Cliente/Etiquetas.dproj
@@ -53,7 +53,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1000FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.1.0EtiquetasEtiquetas1.0.1.0Etiquetas.dprFalse
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1000FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.2.0EtiquetasEtiquetas1.0.2.0Etiquetas.dprFalse
diff --git a/Source/Cliente/Etiquetas.rc b/Source/Cliente/Etiquetas.rc
index 501b672..ab0bf89 100644
--- a/Source/Cliente/Etiquetas.rc
+++ b/Source/Cliente/Etiquetas.rc
@@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "1.0.0.0\0"
VALUE "InternalName", "Etiquetas\0"
VALUE "ProductName", "Etiquetas\0"
- VALUE "ProductVersion", "1.0.1.0\0"
+ VALUE "ProductVersion", "1.0.2.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionPaciente.dfm b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionPaciente.dfm
deleted file mode 100644
index 2e122ab..0000000
--- a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionPaciente.dfm
+++ /dev/null
@@ -1,668 +0,0 @@
-inherited frViewDatosYSeleccionProveedor: TfrViewDatosYSeleccionProveedor
- Width = 350
- Height = 202
- ExplicitWidth = 350
- ExplicitHeight = 202
- object dxLayoutControl1: TdxLayoutControl
- Left = 0
- Top = 0
- Width = 350
- Height = 211
- Margins.Left = 0
- Margins.Top = 0
- Margins.Right = 0
- Margins.Bottom = 0
- Align = alTop
- ParentBackground = True
- TabOrder = 0
- TabStop = False
- AutoContentSizes = [acsWidth, acsHeight]
- DesignSize = (
- 350
- 211)
- object edtlNombre: TcxDBTextEdit
- Left = 64
- Top = 41
- Anchors = [akLeft, akTop, akRight]
- AutoSize = False
- DataBinding.DataField = 'NOMBRE'
- DataBinding.DataSource = DADataSource
- Enabled = False
- ParentFont = False
- Properties.ReadOnly = True
- Properties.UseLeftAlignmentOnEditing = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 2
- Height = 21
- Width = 276
- end
- object edtNIFCIF: TcxDBTextEdit
- Left = 64
- Top = 68
- Anchors = [akLeft, akTop, akRight]
- AutoSize = False
- DataBinding.DataField = 'NIF_CIF'
- DataBinding.DataSource = DADataSource
- Enabled = False
- ParentFont = False
- Properties.ReadOnly = True
- Properties.UseLeftAlignmentOnEditing = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 3
- Height = 21
- Width = 562
- end
- object edtCalle: TcxDBTextEdit
- Left = 64
- Top = 95
- Anchors = [akLeft, akTop, akRight]
- AutoSize = False
- DataBinding.DataField = 'CALLE'
- DataBinding.DataSource = DADataSource
- Enabled = False
- ParentFont = False
- Properties.ReadOnly = True
- Properties.UseLeftAlignmentOnEditing = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 4
- Height = 21
- Width = 562
- end
- object edtPoblacion: TcxDBTextEdit
- Left = 64
- Top = 122
- Anchors = [akLeft, akTop, akRight]
- AutoSize = False
- DataBinding.DataField = 'POBLACION'
- DataBinding.DataSource = DADataSource
- Enabled = False
- ParentFont = False
- Properties.ReadOnly = True
- Properties.UseLeftAlignmentOnEditing = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 5
- Height = 21
- Width = 177
- end
- object edtProvincia: TcxDBTextEdit
- Left = 64
- Top = 149
- Anchors = [akLeft, akTop, akRight]
- AutoSize = False
- DataBinding.DataField = 'PROVINCIA'
- DataBinding.DataSource = DADataSource
- Enabled = False
- ParentFont = False
- Properties.ReadOnly = True
- Properties.UseLeftAlignmentOnEditing = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 7
- Height = 21
- Width = 327
- end
- object edtCodigoPostal: TcxDBTextEdit
- Left = 258
- Top = 122
- Anchors = [akLeft, akTop, akRight]
- AutoSize = False
- DataBinding.DataField = 'CODIGO_POSTAL'
- DataBinding.DataSource = DADataSource
- Enabled = False
- ParentFont = False
- Properties.ReadOnly = True
- Properties.UseLeftAlignmentOnEditing = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 6
- Height = 21
- Width = 82
- end
- object Button1: TBitBtn
- Left = 10
- Top = 10
- Width = 120
- Height = 25
- Action = actElegirContacto
- Caption = 'Elegir un proveedor'
- TabOrder = 0
- Glyph.Data = {
- 36040000424D3604000000000000360000002800000010000000100000000100
- 2000000000000004000000000000000000000000000000000000FF00FF00FF00
- FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10
- AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00B118C10040407B00344A830031498F002F4596002F4499002F4597003148
- 900033498500374678005A3E5300D201D200FF00FF00FF00FF00FF00FF00FF00
- FF004E42860035508100314990002E429C002C3CA6002B3AAA002B3BA7002D40
- 9E0030479200344F840038577500A0189F00FF00FF00FF00FF00FF00FF00FF00
- FF004C428900334D89002F4499002B3CA8002835B4002631BB002734B6002A3A
- AB002E429C00324B8C0036537B00B015B100FF00FF00FF00FF00FF00FF00FF00
- FF008726B300324A8D002D409E002938AF003138B6007A7BCB002830BF002835
- B2002D3FA10031499000483B8700EC01EC00FF00FF00FF00FF00FF00FF00FF00
- FF00F002F60051379D002D409F002937B000808AA300D2D3D3008181BB002834
- B2002D3FA2003A3F9300C511CE00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00EE02F4007324B7003C359300598CAE00498CBB004A81A600392A
- 71005929A600D608E100FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B
- C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F
- D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4
- D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7
- DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9
- DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198
- C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F
- A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378
- AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116
- E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
- end
- object Button2: TBitBtn
- Left = 136
- Top = 10
- Width = 149
- Height = 25
- Action = actAnadirContacto
- Caption = 'Dar de alta un proveedor'
- TabOrder = 1
- Glyph.Data = {
- 36040000424D3604000000000000360000002800000010000000100000000100
- 2000000000000004000000000000000000000000000000000000FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D5BFB1006947
- 3100694731006947310069473100694731006947310069473100694731006947
- 3100694731006947310069473100694731006947310069473100D5BFB100F6F2
- EF00B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A2
- 9300B7A29300B7A29300B7A29300B7A29300B7A2930069473100D5BFB100271E
- 80001C0D6F001C0D6F001C0D6F001C0D6F001C0D6F001C0D6F00271E8000E3D5
- CE00E0D1C900DFCFC600DCCBC100DBC9BF00B7A2930069473100D5BFB1005C51
- A8002F308B00352CA0003526A4003526A500332C9E002E2F8D001C0D6F00E7DB
- D500A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB1008079
- BC00302E95003626A60044329B0045329E003727A700302C95001C0D6F00EAE0
- DA00E7DBD500E4D7D000E2D3CB00DFCFC600B7A2930069473100D5BFB100D1CD
- E8004B41A700452D9400718FAB006F91A600463092001C0D6F00EFE8E300EDE4
- DF00A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB100FFFF
- FF00C9B9DD004F9DA000559BC8004E96C2004E8E8F00B0A8C200F2ECE800EFE8
- E300EDE4DF00EAE0DA00E7DBD500E4D7D000B7A2930069473100D5BFB100FFFF
- FF00A5CDE8005DA9DD005CA9DD0057A4D900519ACC00A0BACA00F5F0ED00F2EC
- E800EFE8E300EDE4DF00EAE0DA00E7DBD500B7A2930069473100D5BFB100ECF6
- FA006CB9DF0065B1E50065B0E5005FABDF0056A2D700689EBE00F7F4F100F5F0
- ED00F2ECE800006000000060000000600000B7A2930069473100D5BFB100E9F6
- FA005BB0D5005CA6D50065AFDF0062AEE20058A3D8003285A700FAF8F600F7F4
- F100F7A073000060000033CB510000600000B7A2930069473100D5BFB100F4FA
- FC0078C0DD0056A0CD00569DCA00539CCA00448DBB003285A700FDFCFB000060
- 0000006000000060000040D86500006000000060000000600000D5BFB100FFFF
- FF00CEEAF40062B5DE005DA7D5004B92BE003285A700C6DCE600FFFFFF000060
- 000060F898005AF28F004DE57A0040D865003AD25C0000600000D5BFB100FFFF
- FF00FFFFFF00CEEAF400A5CDE800A5CDE800CEEAF400FFFFFF00FFFFFF000060
- 000000600000006000005AF28F00006000000060000000600000D5BFB100D5BF
- B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BF
- B100D5BFB1000060000060F8980000600000D5BFB100D5BFB100FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00006000000060000000600000FF00FF00FF00FF00}
- end
- object Button3: TBitBtn
- Left = 142
- Top = 176
- Width = 198
- Height = 25
- Action = actVerContacto
- Caption = 'Ver ficha completa del proveedor...'
- TabOrder = 8
- Glyph.Data = {
- 36040000424D3604000000000000360000002800000010000000100000000100
- 2000000000000004000000000000000000000000000000000000FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D3BDAE006543
- 2E0065432E0065432E0065432E0065432E0065432E0065432E0065432E006543
- 2E0065432E0065432E0065432E0065432E0065432E0065432E00D3BDAE00F6F1
- EE00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F
- 8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F0065432E00D3BDAE00241B
- 7C00190B6B00190B6B00190B6B00190B6B00190B6B00190B6B00241B7C00E2D3
- CC00DFCFC700DECDC400DBC9BF00DAC7BD00B49F8F0065432E00D3BDAE00584D
- A5002C2D870031299D003123A1003123A20030299B002B2C8900190B6B00E6DA
- D3009E7058009E7058009E7058009E705800B49F8F0065432E00D3BDAE007C75
- B9002D2B92003223A300402F9800412F9B003324A4002D299200190B6B00E9DF
- D800E6DAD300E3D5CE00E1D1C900DECDC400B49F8F0065432E00D3BDAE00CFCB
- E700473DA400412A90006D8BA8006B8DA300422D8E00190B6B00EEE7E200ECE3
- DE009E7058009E7058009E7058009E705800B49F8F0065432E00D3BDAE00FFFF
- FF00C7B6DC004B9A9D005198C6004A93C0004A8A8B00ADA5C000F1EBE700EEE7
- E200ECE3DE00E9DFD800E6DAD300E3D5CE00B49F8F0065432E00D3BDAE00FFFF
- FF00A2CBE70059A6DC0058A6DC0053A1D7004D97CA009DB7C800F5EFEC00F1EB
- E700EEE7E200ECE3DE00E9DFD800E6DAD300B49F8F0065432E00D3BDAE00EBF6
- FA0068B6DE0061AEE40061ADE4005BA8DE00529FD500649BBC00F7F4F000F5EF
- EC00F1EBE700EEE7E200ECE3DE00E9DFD800B49F8F0065432E00D3BDAE00E8F6
- FA0057ADD30058A3D30061ACDE005EABE10054A0D6002F81A400FAF8F600F7F4
- F000F79D6F00F79D6F00F79D6F00F79D6F00B49F8F0065432E00D3BDAE00F4FA
- FC0074BEDC00529DCB00529AC8004F99C8004089B8002F81A400FDFCFB00FAF8
- F600F7F4F000F5EFEC00F1EBE700EEE7E200B49F8F0065432E00D3BDAE00FFFF
- FF00CCE9F4005EB2DD0059A4D300478EBC002F81A400C4DBE500FFFFFF00FDFC
- FB00F79D6F00F79D6F00F79D6F00F79D6F00B49F8F0065432E00D3BDAE00FFFF
- FF00FFFFFF00CCE9F400A2CBE700A2CBE700CCE9F400FFFFFF00FFFFFF00FFFF
- FF00FEFEFD00FCFAF900F9F6F400F6F1EE00F2EDE90065432E00D3BDAE00D3BD
- AE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BD
- AE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
- FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
- end
- object dxLayoutControl1Group_Root: TdxLayoutGroup
- ShowCaption = False
- Hidden = True
- ShowBorder = False
- object dxLayoutControl1Group1: TdxLayoutGroup
- ShowCaption = False
- Hidden = True
- LayoutDirection = ldHorizontal
- ShowBorder = False
- object dxLayoutControl1Item7: TdxLayoutItem
- Caption = 'Button1'
- ShowCaption = False
- Control = Button1
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item8: TdxLayoutItem
- Caption = 'Button2'
- ShowCaption = False
- Control = Button2
- ControlOptions.ShowBorder = False
- end
- end
- object dxLayoutControl1Item1: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Caption = 'Nombre:'
- Control = edtlNombre
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item2: TdxLayoutItem
- Caption = 'NIF/CIF'
- Control = edtNIFCIF
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item3: TdxLayoutItem
- Caption = 'Calle:'
- Control = edtCalle
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Group2: TdxLayoutGroup
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- ShowCaption = False
- Hidden = True
- LayoutDirection = ldHorizontal
- ShowBorder = False
- object dxLayoutControl1Item4: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Caption = 'Poblaci'#243'n:'
- Control = edtPoblacion
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item6: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahRight
- Caption = 'C.P.:'
- Control = edtCodigoPostal
- ControlOptions.ShowBorder = False
- end
- end
- object dxLayoutControl1Item5: TdxLayoutItem
- Caption = 'Provincia:'
- Control = edtProvincia
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item9: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahRight
- Caption = 'Button3'
- ShowCaption = False
- Control = Button3
- ControlOptions.ShowBorder = False
- end
- end
- end
- object DADataSource: TDADataSource
- Left = 8
- Top = 160
- end
- object ActionList1: TActionList
- Images = PngImageList
- Left = 40
- Top = 160
- object actElegirContacto: TAction
- Caption = 'Elegir un proveedor'
- ImageIndex = 1
- OnExecute = actElegirContactoExecute
- end
- object actAnadirContacto: TAction
- Caption = 'Dar de alta un proveedor'
- ImageIndex = 0
- OnExecute = actAnadirContactoExecute
- end
- object actVerContacto: TAction
- Caption = 'Ver ficha completa del proveedor...'
- ImageIndex = 2
- OnExecute = actVerContactoExecute
- OnUpdate = actVerContactoUpdate
- end
- end
- object PngImageList: TPngImageList
- PngImages = <
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 610000000970485973000017120000171201679FD25200000A4D694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF
- F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A
- 561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5
- 7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8
- 1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC
- 01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200
- C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05
- 00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2
- 00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C
- CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97
- 4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313
- 48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F
- 223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA
- 560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED
- 2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383
- FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A
- F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86
- 4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432
- 79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0
- 812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C
- 0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70
- 170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261
- 48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA
- 90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F
- 5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961
- 5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402
- 8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2
- 272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93
- 48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90
- 6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452
- A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650
- 2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83
- 1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7
- 192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295
- 3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9
- 09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685
- 46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9
- EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C
- 4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED
- EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB
- 79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31
- 3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87
- 67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94
- 6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85
- A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6
- 5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29
- D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B
- 743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6
- 4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD
- D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7
- C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E
- 3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B
- FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5
- 0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1
- 15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0
- 476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67
- BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845
- F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC
- A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7
- 6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA
- 68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C
- 949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423
- F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433
- DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317
- 772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2
- A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17
- 955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4
- EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E
- CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9
- 26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD
- 8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF
- B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C
- 7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD
- EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293
- E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7
- 5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F
- EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6
- EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07
- FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247
- CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73
- ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC
- CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F
- F73EE77CFEFC2FF784F3FB25D29F33000002254944415478DA95936D48535118
- C7FFB7E58535192C322B880A217A238841238212E94B048EA217E88B26158210
- 548322082422FD52862D30823230BF14A4511823D2185834B60537F37DA516B2
- B6B6E6BABB77F7DC97EE3DE6192303F7C0E1790E9CFFEFFFF0F01C0EA5443D0C
- 567782B312D7DB3F642C55EF7DB41D1D1DF5686CEC446FDD1018A0B67A1BBD88
- 89287ECF0CD3BA7CFD56382A76CD3F3AC531485BFB499C3FD7CDEE0C60897F84
- FC90E608E28914E2D959EC3FE1C7DAAA3D1460394B8A8244364B8F5577DD1A9C
- 071CDABB015383D7F1EB6B0C9A66620D0D994C06493985A39742283B6D638E67
- 2E57E37EEB407107073DAB301EB800E438ACB0DB613301393187E8F418BC17DF
- 83A81AAE3D056E0ED871B8C98D6777C3B853D387078F9F2F002AF13DD80C5ECE
- C39AB34214C89284597525DCC7DBA0AA3A85ACF139997311C09A413CD20D71E2
- 95D53F544290CD29D0377A51B5FB18155B670144888637EF3E160362810F087E
- BB812D3A6F7690475806DCEB1AB0F940CD3F622B07434201E071AAE8F75DC1CF
- A482CA861D20CB74241F0E6372F2337CE302155FBDFDA268273C3B5717008EC0
- 138CBEEC814BE621963B613397CC2ECE215596C7D854124D42843993BF9D8485
- 9102406A6FC1CC1701152A8FE50AE88EE6791D691BC1742C85B391105AEE05FE
- DF41B4EE08D26971D1F575B91CA8ED7B4D5D35DDA05937F3A7D18902609F7B13
- BA7ADE96F4AFAC6080E6567FC962B68986B1E4CFB868FC01A6204E3EB3788BD6
- 0000000049454E44AE426082}
- Name = 'PngImage0'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 61000000097048597300000AC400000AC401666D82D400000A4D694343505068
- 6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF
- F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A
- 561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5
- 7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8
- 1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC
- 01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200
- C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05
- 00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2
- 00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C
- CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97
- 4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313
- 48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F
- 223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA
- 560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED
- 2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383
- FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A
- F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86
- 4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432
- 79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0
- 812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C
- 0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70
- 170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261
- 48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA
- 90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F
- 5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961
- 5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402
- 8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2
- 272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93
- 48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90
- 6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452
- A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650
- 2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83
- 1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7
- 192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295
- 3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9
- 09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685
- 46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9
- EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C
- 4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED
- EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB
- 79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31
- 3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87
- 67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94
- 6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85
- A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6
- 5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29
- D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B
- 743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6
- 4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD
- D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7
- C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E
- 3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B
- FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5
- 0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1
- 15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0
- 476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67
- BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845
- F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC
- A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7
- 6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA
- 68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C
- 949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423
- F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433
- DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317
- 772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2
- A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17
- 955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4
- EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E
- CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9
- 26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD
- 8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF
- B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C
- 7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD
- EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293
- E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7
- 5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F
- EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6
- EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07
- FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247
- CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73
- ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC
- CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F
- F73EE77CFEFC2FF784F3FB25D29F33000002B44944415478DA7D925F4853511C
- C77F67F75EF7A799BB9A6E3A5B85A0203EA820F892502121119A523E14141A41
- F5A244819144E4430F452F99580385A4D0CC2009410B940CCC4CA60BB2F04F43
- 65B639B7DD6DF7EEFED93D9D2D144DE60F0E07CEF97D3FE7F7FBFE0EC218433C
- 1042B01973AFAF5C0088DDF007B82CCF7AD0E15C70DFBF63774EC0B6D8D2FD0F
- 70F65C6C345BD8673C1FD5F8FD41F0F903E0F571FCA8E34F4DE7E0FCC89E80BE
- E6727D7E699ECBA0D7668A920CA15004DCDE0028B204EE7561AEA9FD5B19490D
- 2707DCABA8CC31A70F531A0A045186154F042C19FBC1A803F8E5F2E0B61EE7C9
- F9656E2429E0537B75E34658B2CB0A02D6B41FF20F9A00A90A48621478418047
- 2FA71ABA865D5D4901939DD575D66C733FCD3089B398A2804CCA97451144318A
- EFDA271BFBC7579203DEB41DCD2EC93FEC6252521204555549FF72C2038E8B28
- 35AD1F2A577DE2E89E5398B6D7F6A6A51ACE25920820168B5721C3C4ECEADCE5
- C79315E4D8BB27A0BBB9DC5A54689E326A198B4AEEE26D6C04C3D2ADE7D34D5F
- 7EF83B928E311E2DD6828C9C5CE629C2A6B3D67A1B4A05F20722C49BDE0D9C6B
- 084E3804E1EA8BEF4B33DB3FD416A0E550119B9E478F6762B590151408D5D543
- 71552DAC0DBC0561F01504F631E0A534A121257466646CE1E32E40EBF1D227AC
- 1E5D677919D8A8025AD041E6892A08BF1F8010B1D46F60C8A2614DC4CB0FBE3A
- 4A30877D3B00B74F95B94C14B699C8EB6904601463A0555490290491140A823A
- 1A027A1AFC64B77B17EBD7C6BC7D3B00374F972DA6D2E8489AF84F6C9054A055
- 6222F156603410D652C011711CD4BDFCFB9AE7B3BB6307E0FCB1E24B590C7A98
- C150E946ACA2F8EB14B9520940A43410411A08A8587AA78DCDFE1C9A69C01276
- EE9A0219E5019D8D2E305A0C36D05384031A2C2AB2129579C52773FC6ACC4DD2
- 968826B0A9F90BC88690F0ED1F7E3F0000000049454E44AE426082}
- Name = 'PngImage1'
- Background = clWindow
- end
- item
- PngImage.Data = {
- 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
- 610000000970485973000017120000171201679FD252000001FA4944415478DA
- A5934B6813511486BF342610A2C50A86A220150BA2145C58D120828ABA2AD2BA
- F0B510C48D1B1154A828A55D5877825474AB45375D58A80B9385292DA8A8B151
- 6B6D8DB50F43C1B4C624364C1E73E7E19DA96408B50BCDC0E5CC65E6FFFE7FCE
- DCE3324D936A2E577FE46355041BD076B0C9DE280B23E412E3F6FD9A4DDBF107
- 76965F3464524D33109A8E2A7459350E1FBFEC002CF1FCEB1EF28B82F98534C9
- 5C9203A7EFB2A1712F9A6E70A557AD706EA88970FFD1C012E0E8BECDCC3EEF22
- 33338DAECBA7A64E36FB8B5431C389EBB12557B93461D8CED6FE71F8A5036809
- AE271EBA0879177E9F0FB704284A9ED8B7498EB5476D71671F2B276809D63337
- D481B75892EEC86F5429140A7CD7D6D17CEA4E85B3D5070B181A8A3A00AB07C9
- B70F512643567E8410E4F22A46432B8D7B4E2E130BD9C4672F629580A9D02B86
- E76EB0CDF0CA0425A205D8B5F11C5B8F1C5A26B6D6F09B0F0E2058AB11B97495
- D44F95FAB34D881A831F0F26989A9EA0FDEB275B7CEDD6938A1EECDE117000FE
- 701FF1A703D4153D28AB6B71E3C2A72C92F6A8C413292E8CBD2F3B8B3F67213A
- 3AEE000AB7BB49CC8E11D03CAC92BFDB251D4A5E93B45B90984973FEDD08DDF7
- C22B27889D69239355FE7A54EBD6FA690D0FDAAEBA61DAD59075F4F31707B0BF
- 790BBDFD83FF3C076540D7CD9EFF1FA66AC7F93783B161288AF0DFC000000000
- 49454E44AE426082}
- Name = 'PngImage2'
- Background = clWindow
- end>
- Left = 72
- Top = 160
- Bitmap = {}
- end
-end
diff --git a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionPaciente.pas b/Source/Modulos/Contactos/Views/uViewDatosYSeleccionPaciente.pas
deleted file mode 100644
index 2d9e409..0000000
--- a/Source/Modulos/Contactos/Views/uViewDatosYSeleccionPaciente.pas
+++ /dev/null
@@ -1,265 +0,0 @@
-unit uViewDatosYSeleccionPaciente;
-
-interface
-
-uses
- Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
- Dialogs, uViewBase, StdCtrls, cxControls, cxContainer, cxEdit, cxLabel,
- cxDBLabel, ExtCtrls, DB, uDADataTable, uBizContactos,
- ComCtrls, ToolWin, ActnList, ImgList, PngImageList, cxTextEdit, cxDBEdit,
- pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
- DBCtrls,
- uPacientesController, dxLayoutControl, Buttons, uDAInterfaces;
-
-type
- IViewDatosYSeleccionPaciente = interface(IViewBase)
- ['{EE8C51BD-618D-4211-A247-6FA9BD8EBFD9}']
- function GetController: IPacientesController;
- procedure SetController(Value: IPacientesController);
- property Controller: IPacientesController read GetController write SetController;
-
- function GetPaciente: IBizPaciente;
- procedure SetPaciente(Value: IBizPaciente);
- property Paciente: IBizPaciente read GetPaciente write SetPaciente;
-
- function GetID_Paciente: integer;
- procedure SetID_Paciente(const Value: integer);
- property ID_Paciente: integer read GetID_Paciente write SetID_Paciente;
-
- function GetOnPacienteChanged : TNotifyEvent;
- procedure SetOnPacienteChanged (const Value : TNotifyEvent);
- property OnPacienteChanged : TNotifyEvent read GetOnPacienteChanged
- write SetOnPacienteChanged;
-
- function GetMsgElegirPaciente: String;
- procedure SetMsgElegirPaciente(const Value: String);
- property MsgElegirPaciente : String read GetMsgElegirPaciente
- write SetMsgElegirPaciente;
- end;
-
- TfrViewDatosYSeleccionPaciente = class(TfrViewBase, IViewDatosYSeleccionPaciente)
- DADataSource: TDADataSource;
- ActionList1: TActionList;
- actElegirContacto: TAction;
- actAnadirContacto: TAction;
- actVerContacto: TAction;
- PngImageList: TPngImageList;
- dxLayoutControl1Group_Root: TdxLayoutGroup;
- dxLayoutControl1: TdxLayoutControl;
- dxLayoutControl1Item1: TdxLayoutItem;
- edtlNombre: TcxDBTextEdit;
- dxLayoutControl1Item2: TdxLayoutItem;
- edtNIFCIF: TcxDBTextEdit;
- dxLayoutControl1Item3: TdxLayoutItem;
- edtCalle: TcxDBTextEdit;
- dxLayoutControl1Item4: TdxLayoutItem;
- edtPoblacion: TcxDBTextEdit;
- dxLayoutControl1Item5: TdxLayoutItem;
- edtProvincia: TcxDBTextEdit;
- dxLayoutControl1Item6: TdxLayoutItem;
- edtCodigoPostal: TcxDBTextEdit;
- Button1: TBitBtn;
- dxLayoutControl1Item7: TdxLayoutItem;
- Button2: TBitBtn;
- dxLayoutControl1Item8: TdxLayoutItem;
- Button3: TBitBtn;
- dxLayoutControl1Item9: TdxLayoutItem;
- dxLayoutControl1Group1: TdxLayoutGroup;
- dxLayoutControl1Group2: TdxLayoutGroup;
- procedure actElegirContactoExecute(Sender: TObject);
- procedure actAnadirContactoExecute(Sender: TObject);
- procedure actVerContactoExecute(Sender: TObject);
- procedure actVerContactoUpdate(Sender: TObject);
- private
- FController : IPacientesController;
- FPaciente : IBizPaciente;
- FOnPacienteChanged : TNotifyEvent;
- FMsgElegirPaciente : String;
- protected
- function GetController: IPacientesController;
- procedure SetController(Value: IPacientesController);
- function GetPaciente: IBizPaciente;
- procedure SetPaciente(Value: IBizPaciente);
- function GetOnPacienteChanged : TNotifyEvent;
- procedure SetOnPacienteChanged (const Value : TNotifyEvent);
- function GetMsgElegirPaciente: String;
- procedure SetMsgElegirPaciente(const Value: String);
- procedure SetReadOnly(Value: Boolean); override;
- function GetID_Paciente: integer;
- procedure SetID_Paciente(const Value: integer);
-
- procedure ElegirPacienteInternal; virtual;
- procedure VerFichaPacienteInternal; virtual;
- procedure NuevoPacienteInternal; virtual;
- public
- constructor Create(AOwner: TComponent); override;
- destructor Destroy; override;
- property MsgElegirPaciente : String read GetMsgElegirPaciente write SetMsgElegirPaciente;
- property Controller: IPacientesController read GetController write SetController;
- property Paciente: IBizPaciente read GetPaciente write SetPaciente;
- property ID_Paciente: integer read GetID_Paciente write SetID_Paciente;
- property OnPacienteChanged : TNotifyEvent read GetOnPacienteChanged write SetOnPacienteChanged;
- end;
-
-implementation
-
-{$R *.dfm}
-
-uses
- uDataModulePacientes, Math;
-
-procedure TfrViewDatosYSeleccionPaciente.actElegirContactoExecute(Sender: TObject);
-begin
- inherited;
- ElegirPacienteInternal;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.actAnadirContactoExecute(
- Sender: TObject);
-begin
- inherited;
- NuevoPacienteInternal
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.actVerContactoExecute(Sender: TObject);
-begin
- inherited;
- VerFichaPacienteInternal;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.actVerContactoUpdate(Sender: TObject);
-begin
- inherited;
- (Sender as TAction).Enabled := (Length(edtlNombre.Text) > 0);
-end;
-
-constructor TfrViewDatosYSeleccionPaciente.Create(AOwner: TComponent);
-begin
- inherited;
- FMsgElegirPaciente := '';
- FController := NIL;
-end;
-
-destructor TfrViewDatosYSeleccionPaciente.Destroy;
-begin
- FController := NIL;
- inherited;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.ElegirPacienteInternal;
-var
- APaciente : IBizPaciente;
-begin
- inherited;
- APaciente := (Controller.ElegirContacto(Controller.BuscarTodos,
- FMsgElegirPaciente, False) as IBizPaciente);
-
- if Assigned(APaciente) then
- begin
- Self.Update;
- ShowHourglassCursor;
- try
- Paciente := APaciente;
- finally
- HideHourglassCursor;
- end;
- end;
-end;
-
-function TfrViewDatosYSeleccionPaciente.GetPaciente: IBizPaciente;
-begin
- Result := FPaciente;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.NuevoPacienteInternal;
-var
- APaciente : IBizPaciente;
-begin
- inherited;
- APaciente := (Controller.Nuevo as IBizPaciente);
- Controller.Ver(APaciente);
- Paciente := APaciente;
-end;
-
-function TfrViewDatosYSeleccionPaciente.GetController: IPacientesController;
-begin
- if not Assigned(FController) then
- FController := TPacientesController.Create;
- Result := FController;
-end;
-
-function TfrViewDatosYSeleccionPaciente.GetID_Paciente: integer;
-begin
- Result := -1;
- if Assigned(FPaciente) then
- Result := FPaciente.ID;
-end;
-
-function TfrViewDatosYSeleccionPaciente.GetMsgElegirPaciente: String;
-begin
- Result := FMsgElegirPaciente;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.SetPaciente(Value: IBizPaciente);
-begin
- FPaciente := Value;
- if Assigned(FPaciente) then
- begin
- DADataSource.DataTable := FPaciente.DataTable;
- if not FPaciente.DataTable.Active then
- FPaciente.DataTable.Active := True;
- end
- else
- DADataSource.DataTable := NIL;
-
- if Assigned(FOnPacienteChanged) then
- FOnPacienteChanged(Self);
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.SetReadOnly(Value: Boolean);
-begin
- inherited;
-
- if (csLoading in Self.ComponentState) then
- Exit;
-
- actAnadirContacto.Enabled := not ReadOnly;
- actElegirContacto.Enabled := not ReadOnly;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.VerFichaPacienteInternal;
-begin
- Controller.Ver(Paciente);
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.SetController(Value: IPacientesController);
-begin
- if Assigned(FController) then
- FController := NIL;
-
- FController := Value;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.SetID_Paciente(const Value: integer);
-begin
- Self.Paciente := IBizPaciente(Controller.Buscar(Value));
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.SetMsgElegirPaciente(
- const Value: String);
-begin
- FMsgElegirPaciente := Value;
-end;
-
-function TfrViewDatosYSeleccionPaciente.GetOnPacienteChanged: TNotifyEvent;
-begin
- Result := FOnPacienteChanged;
-end;
-
-procedure TfrViewDatosYSeleccionPaciente.SetOnPacienteChanged(
- const Value: TNotifyEvent);
-begin
- FOnPacienteChanged := Value;
-end;
-
-end.
diff --git a/Source/Modulos/Medicaciones/Views/uViewMedicacion.dfm b/Source/Modulos/Medicaciones/Views/uViewMedicacion.dfm
index a231342..01ee0fb 100644
--- a/Source/Modulos/Medicaciones/Views/uViewMedicacion.dfm
+++ b/Source/Modulos/Medicaciones/Views/uViewMedicacion.dfm
@@ -131,6 +131,8 @@ inherited frViewMedicacion: TfrViewMedicacion
inherited dxLayoutControl1: TdxLayoutControl
Width = 596
Height = 136
+ ExplicitWidth = 596
+ ExplicitHeight = 136
inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
diff --git a/Source/Modulos/Medicaciones/Views/uViewMedicacion.pas b/Source/Modulos/Medicaciones/Views/uViewMedicacion.pas
index 4f8c8e4..48bec9b 100644
--- a/Source/Modulos/Medicaciones/Views/uViewMedicacion.pas
+++ b/Source/Modulos/Medicaciones/Views/uViewMedicacion.pas
@@ -87,11 +87,6 @@ begin
inherited;
if not (VarIsNull(DisplayValue) or (DisplayValue = '')) then
begin
- if (edtFechaHasta.Date < edtFechaDesde.Date) then
- begin
- ShowWarningMessage('La fecha inicial debe ser anterior a la fecha inicial');
- edtFechaDesde.SetFocus;
- end;
end;
end;
@@ -101,11 +96,6 @@ begin
inherited;
if not (VarIsNull(DisplayValue) or (DisplayValue = '')) then
begin
- if (edtFechaHasta.Date < edtFechaDesde.Date) then
- begin
- ShowWarningMessage('La fecha final debe ser posterior a la fecha inicial');
- edtFechaHasta.SetFocus;
- end;
end;
end;
@@ -133,4 +123,5 @@ begin
end;
end;
+
end.
diff --git a/Source/Servidor/Etiquetas_Server.dproj b/Source/Servidor/Etiquetas_Server.dproj
index 7efa1ac..9fb643c 100644
--- a/Source/Servidor/Etiquetas_Server.dproj
+++ b/Source/Servidor/Etiquetas_Server.dproj
@@ -40,7 +40,7 @@
Delphi.Personality
- FalseTrueFalse/standaloneTrueFalse1010FalseFalseFalseFalseFalse30821252Rodax Software1.0.1.0Etiquetas ServerEtiquetas Server1.0.1.0martes, 27 de diciembre de 2011 18:22
+ FalseTrueFalse/standaloneTrueFalse1020FalseFalseFalseFalseFalse30821252Rodax Software1.0.2.0Etiquetas ServerEtiquetas Server1.0.2.0jueves, 29 de diciembre de 2011 17:12
ExpressPrinting System by Developer Express Inc.
Etiquetas_Server.dpr
diff --git a/Source/Servidor/Etiquetas_Server.rc b/Source/Servidor/Etiquetas_Server.rc
index 5e4e9ab..9951e68 100644
--- a/Source/Servidor/Etiquetas_Server.rc
+++ b/Source/Servidor/Etiquetas_Server.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo farmacia\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
-FILEVERSION 1,0,1,0
-PRODUCTVERSION 1,0,1,0
+FILEVERSION 1,0,2,0
+PRODUCTVERSION 1,0,2,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -13,11 +13,11 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software\0"
- VALUE "FileVersion", "1.0.1.0\0"
+ VALUE "FileVersion", "1.0.2.0\0"
VALUE "InternalName", "Etiquetas Server\0"
VALUE "ProductName", "Etiquetas Server\0"
- VALUE "ProductVersion", "1.0.1.0\0"
- VALUE "CompileDate", "jueves, 29 de diciembre de 2011 17:12\0"
+ VALUE "ProductVersion", "1.0.2.0\0"
+ VALUE "CompileDate", "lunes, 30 de enero de 2012 12:24\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Servidor/Etiquetas_Server.res b/Source/Servidor/Etiquetas_Server.res
index bf82d40..c273ce0 100644
Binary files a/Source/Servidor/Etiquetas_Server.res and b/Source/Servidor/Etiquetas_Server.res differ