From 15113e1a5e839331bfe3b28f498fe31c6885430d Mon Sep 17 00:00:00 2001 From: david Date: Fri, 30 May 2008 16:56:23 +0000 Subject: [PATCH] - Repaso global - Habilitado portapapeles git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@392 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Usuarios/Model/schUsuariosClient_Intf.pas | 24 +- .../Usuarios/Model/schUsuariosServer_Intf.pas | 24 +- .../Usuarios/Views/uViewUsuario.dfm | 33 + .../Usuarios/Views/uViewUsuario.pas | 8 +- Source/Base/Base.dpk | 8 +- Source/Base/Base.dproj | 108 ++-- .../Controladores/uControllerDetallesBase.pas | 1 + Source/Base/Utiles/ClipboardUtils.pas | 148 +++++ Source/Base/Utiles/Ctltortf.pas | 581 ++++++++++++++++++ Source/Base/Utiles/uGridClipboardUtils.pas | 518 ++++++++++++++++ .../{uGridUtils.pas => uGridStatusUtils.pas} | 22 +- Source/Base/Utiles/uIntegerListUtils.pas | 2 +- Source/Base/Utiles/uRTFUtils.pas | 203 ++++++ Source/Base/Utiles/uSistemaFunc.pas | 18 + Source/Cliente/FactuGES.dproj | 36 -- Source/GUIBase/GUIBase.dproj | 92 +-- Source/GUIBase/uEditorDBItem.dfm | 4 - Source/GUIBase/uViewDetallesBase.dfm | 110 ++-- Source/GUIBase/uViewDetallesBase.pas | 314 ++++++---- Source/GUIBase/uViewGrid.dfm | 2 +- Source/GUIBase/uViewGrid.pas | 2 +- Source/GUIBase/uViewGridBase.pas | 2 +- .../Views/uEditorAlbaranCliente.dfm | 131 ++-- .../Views/uEditorAlbaranDevCliente.dfm | 12 - .../Views/uEditorAlbaranesCliente.pas | 2 +- .../Views/uEditorElegirAlbaranesCliente.pas | 2 +- .../Views/uViewAlbaranCliente.dfm | 188 ++++-- .../Views/uViewAlbaranCliente.pas | 8 +- .../Views/uViewAlbaranDevCliente.dfm | 143 +++-- .../Views/uViewAlbaranDevCliente.pas | 8 +- .../Plugin/AlbaranesProveedor_plugin.cfg | 40 ++ .../Views/AlbaranesProveedor_view.cfg | 40 ++ .../Views/uEditorAlbaranDevProveedor.dfm | 12 - .../Views/uEditorAlbaranProveedor.dfm | 12 - .../Views/uEditorAlbaranesProveedor.pas | 2 +- .../Views/uEditorElegirAlbaranesProveedor.pas | 2 +- .../Almacenes/Views/uEditorAlmacenes.dfm | 8 - .../Articulos/Views/Articulos_view.dproj | 14 +- .../Views/uEditorElegirArticulos.pas | 2 +- .../Views/uViewDetallesArticulos.dfm | 4 + .../Views/uViewDetallesArticulos.pas | 6 +- .../Contactos/Views/uEditorClientes.dfm | 8 - .../Contactos/Views/uEditorClientes.pas | 2 +- .../Contactos/Views/uEditorElegirClientes.dfm | 8 - .../Contactos/Views/uEditorElegirClientes.pas | 2 +- .../Views/uEditorElegirProveedores.dfm | 8 - .../Views/uEditorElegirProveedores.pas | 2 +- .../Contactos/Views/uEditorEmpleados.dfm | 8 - .../Contactos/Views/uEditorEmpleados.pas | 2 +- .../Contactos/Views/uEditorProveedores.dfm | 8 - .../Contactos/Views/uEditorProveedores.pas | 2 +- .../Views/uEditorElegirFacturasCliente.dfm | 8 - .../Views/uEditorElegirFacturasCliente.pas | 2 +- .../Views/uEditorFacturaCliente.dfm | 9 - .../Views/uEditorFacturasCliente.dfm | 8 - .../Views/uEditorFacturasCliente.pas | 2 +- .../Views/uViewDetallesFacturaCliente.dfm | 86 --- .../Views/uViewDetallesFacturaCliente.pas | 11 +- .../uViewElegirArticulosFacturasCliente.dfm | 18 +- .../uViewElegirArticulosFacturasCliente.pas | 8 +- .../Views/uViewFacturaCliente.dfm | 77 ++- .../Views/uViewFacturaCliente.pas | 8 +- .../Views/uEditorFacturasProveedor.dfm | 8 - .../Views/uEditorFacturasProveedor.pas | 2 +- .../Controller/Familias_controller.cfg | 39 ++ .../Views/uEditorHistoricoMovimientos.dfm | 8 - .../Views/uEditorHistoricoMovimientos.pas | Bin 7790 -> 7796 bytes .../Views/uEditorDetalleReservas.dfm | 8 - .../Views/uEditorDetalleReservas.pas | Bin 7076 -> 7082 bytes .../Views/uEditorElegirArticulosAlmacen.dfm | 8 - .../Views/uEditorElegirArticulosAlmacen.pas | 2 +- .../Views/uEditorEntradaSalidaArticulos.dfm | 8 - .../Inventario/Views/uEditorInventario.dfm | 8 - .../Inventario/Views/uEditorInventario.pas | 2 +- Source/Modulos/Obras/Views/uEditorObras.dfm | 8 - .../PedidosProveedor_controller.cfb | Bin 0 -> 4178 bytes .../Views/uEditorElegirPedidosProveedor.dfm | 8 - .../Views/uEditorElegirPedidosProveedor.pas | 2 +- .../Views/uEditorPedidoProveedor.pas | 2 +- .../Views/uEditorPedidosProveedor.dfm | 8 - .../Views/uEditorPedidosProveedor.pas | 2 +- .../uEditorElegirPresupuestosCliente.pas | 2 +- .../Views/uEditorPresupuestoCliente.dfm | 9 - .../Views/uEditorPresupuestosCliente.pas | 2 +- .../Views/uViewDetallesPresupuestoCliente.dfm | 139 ++--- .../Views/uEditorElegirRecibosCliente.dfm | Bin 7973 -> 14084 bytes .../Views/uEditorElegirRecibosCliente.pas | 10 +- .../Views/uEditorRecibosCliente.dfm | 8 - .../Views/uEditorRecibosCliente.pas | 2 +- .../Views/uEditorElegirRecibosProveedor.dfm | 8 - .../Views/uEditorElegirRecibosProveedor.pas | 2 +- .../Views/uEditorRecibosProveedor.dfm | 8 - .../Views/uEditorRemesasCliente.pas | 2 +- .../Views/uEditorRemesasProveedor.pas | 2 +- Source/Servidor/FactuGES_Server.RES | Bin 23196 -> 23200 bytes Source/Servidor/FactuGES_Server.rc | 2 +- Source/Servidor/uServerMainForm.dfm | 11 +- 97 files changed, 2528 insertions(+), 985 deletions(-) create mode 100644 Source/Base/Utiles/ClipboardUtils.pas create mode 100644 Source/Base/Utiles/Ctltortf.pas create mode 100644 Source/Base/Utiles/uGridClipboardUtils.pas rename Source/Base/Utiles/{uGridUtils.pas => uGridStatusUtils.pas} (92%) create mode 100644 Source/Base/Utiles/uRTFUtils.pas create mode 100644 Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.cfg create mode 100644 Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.cfg create mode 100644 Source/Modulos/Familias/Controller/Familias_controller.cfg create mode 100644 Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.cfb diff --git a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas index 19b37c90..560506b1 100644 --- a/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas +++ b/Source/ApplicationBase/Usuarios/Model/schUsuariosClient_Intf.pas @@ -9,12 +9,12 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_USUARIOS = '{18238182-68F3-4CCD-8B76-C307A41B5EF7}'; - RID_USUARIOS_EVENTOS = '{D4A4F285-457C-44C7-A76D-3D5A9FBAB6C7}'; - RID_USUARIOS_LOGON = '{44400882-287E-4EFC-8C03-AF919EF4868D}'; - RID_PERMISOS = '{CCB894E4-E131-4989-9CAA-08EADFD0186A}'; - RID_PERMISOSEX = '{555705FA-FCF2-48B2-B2D8-DC488D48C451}'; - RID_PERFILES = '{0AED66D4-81D4-4E48-8BCB-8FEA425DCE37}'; + RID_USUARIOS = '{190ECFD6-8BF8-463A-A069-134DC883028F}'; + RID_USUARIOS_EVENTOS = '{CA759DA6-3907-41E0-8214-9BC7C8630DE0}'; + RID_USUARIOS_LOGON = '{243F3788-11A9-45F4-B185-AA2D73BE1D71}'; + RID_PERMISOS = '{F3432FFB-2820-4EB5-89C6-0D64DB88682D}'; + RID_PERMISOSEX = '{05E24A98-1A49-4D0F-A11E-49B4B37F7489}'; + RID_PERFILES = '{6C36D997-1C57-4896-A3CE-4B74F465AC38}'; { Data table names } nme_USUARIOS = 'USUARIOS'; @@ -129,7 +129,7 @@ const type { IUSUARIOS } IUSUARIOS = interface(IDAStronglyTypedDataTable) - ['{5F277EA3-FF65-43CC-B1A8-50D00B3E3822}'] + ['{4039ABB1-B663-4DFA-8549-14CA71056FD6}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -296,7 +296,7 @@ type { IUSUARIOS_EVENTOS } IUSUARIOS_EVENTOS = interface(IDAStronglyTypedDataTable) - ['{7FC08ED8-B62A-4453-A226-24B40BB04CCC}'] + ['{6E1A8BC6-48E1-4831-A571-4DCF7C3A8DA6}'] { Property getters and setters } function GetAPLICACIONValue: String; procedure SetAPLICACIONValue(const aValue: String); @@ -427,7 +427,7 @@ type { IUSUARIOS_LOGON } IUSUARIOS_LOGON = interface(IDAStronglyTypedDataTable) - ['{845645BA-5BAD-44ED-84C2-74D3F81E0083}'] + ['{9343561D-EEC6-478D-891D-E1BE34EB2FD4}'] { Property getters and setters } function GetLOGONIDValue: String; procedure SetLOGONIDValue(const aValue: String); @@ -510,7 +510,7 @@ type { IPERMISOS } IPERMISOS = interface(IDAStronglyTypedDataTable) - ['{1D5F033A-E579-4522-8956-ECC91BA8C7FB}'] + ['{BDFA2EDF-FEA0-4089-AD25-8D484E9CC6CA}'] { Property getters and setters } function GetID_USUARIOValue: Integer; procedure SetID_USUARIOValue(const aValue: Integer); @@ -581,7 +581,7 @@ type { IPERMISOSEX } IPERMISOSEX = interface(IDAStronglyTypedDataTable) - ['{F66BA47E-0FBC-4722-8B77-30EFAEEA322D}'] + ['{5CF900FA-631D-4FC6-99AF-F173251A0378}'] { Property getters and setters } function GetID_USUARIOValue: Integer; procedure SetID_USUARIOValue(const aValue: Integer); @@ -664,7 +664,7 @@ type { IPERFILES } IPERFILES = interface(IDAStronglyTypedDataTable) - ['{A0CEAB90-971B-4ED8-B5FE-878458800586}'] + ['{2738B3A7-8644-46C1-AD68-CFA62CE0809E}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); diff --git a/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas b/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas index 34ccc4e0..1390df9f 100644 --- a/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas +++ b/Source/ApplicationBase/Usuarios/Model/schUsuariosServer_Intf.pas @@ -9,17 +9,17 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_USUARIOSDelta = '{688C2060-89DB-41D0-A50A-C2BDE4B94D1A}'; - RID_USUARIOS_EVENTOSDelta = '{4E223C46-38E2-40E2-BE89-AC621F603773}'; - RID_USUARIOS_LOGONDelta = '{BE97DDD1-B35B-4F26-AABC-CEEC3086C437}'; - RID_PERMISOSDelta = '{5C7AFB8C-8585-4A61-ACF8-10F7D370098B}'; - RID_PERMISOSEXDelta = '{C226534A-2B76-4384-AC0D-33760634C8CE}'; - RID_PERFILESDelta = '{F37D69E0-A239-418E-87B6-9354DEDD1956}'; + RID_USUARIOSDelta = '{4AA9CBE4-007A-4CAD-844C-05539CD289CA}'; + RID_USUARIOS_EVENTOSDelta = '{0918F32D-4334-419F-9936-186CC23BC165}'; + RID_USUARIOS_LOGONDelta = '{15D6AADF-D24A-4BAE-96D5-2A26AD60E3DA}'; + RID_PERMISOSDelta = '{CE343111-2CF7-4C07-A7C5-CB72513E533C}'; + RID_PERMISOSEXDelta = '{99649DB7-B027-45F5-A665-76B477807E8D}'; + RID_PERFILESDelta = '{A09AC663-B18E-4894-B84C-9FEA6C000A44}'; type { IUSUARIOSDelta } IUSUARIOSDelta = interface(IUSUARIOS) - ['{688C2060-89DB-41D0-A50A-C2BDE4B94D1A}'] + ['{4AA9CBE4-007A-4CAD-844C-05539CD289CA}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldUSERNAMEValue : String; @@ -185,7 +185,7 @@ type { IUSUARIOS_EVENTOSDelta } IUSUARIOS_EVENTOSDelta = interface(IUSUARIOS_EVENTOS) - ['{4E223C46-38E2-40E2-BE89-AC621F603773}'] + ['{0918F32D-4334-419F-9936-186CC23BC165}'] { Property getters and setters } function GetOldAPLICACIONValue : String; function GetOldID_USUARIOValue : Integer; @@ -316,7 +316,7 @@ type { IUSUARIOS_LOGONDelta } IUSUARIOS_LOGONDelta = interface(IUSUARIOS_LOGON) - ['{BE97DDD1-B35B-4F26-AABC-CEEC3086C437}'] + ['{15D6AADF-D24A-4BAE-96D5-2A26AD60E3DA}'] { Property getters and setters } function GetOldLOGONIDValue : String; function GetOldID_USUARIOValue : Integer; @@ -398,7 +398,7 @@ type { IPERMISOSDelta } IPERMISOSDelta = interface(IPERMISOS) - ['{5C7AFB8C-8585-4A61-ACF8-10F7D370098B}'] + ['{CE343111-2CF7-4C07-A7C5-CB72513E533C}'] { Property getters and setters } function GetOldID_USUARIOValue : Integer; function GetOldMODULOValue : String; @@ -468,7 +468,7 @@ type { IPERMISOSEXDelta } IPERMISOSEXDelta = interface(IPERMISOSEX) - ['{C226534A-2B76-4384-AC0D-33760634C8CE}'] + ['{99649DB7-B027-45F5-A665-76B477807E8D}'] { Property getters and setters } function GetOldID_USUARIOValue : Integer; function GetOldMODULOValue : String; @@ -550,7 +550,7 @@ type { IPERFILESDelta } IPERFILESDelta = interface(IPERFILES) - ['{F37D69E0-A239-418E-87B6-9354DEDD1956}'] + ['{A09AC663-B18E-4894-B84C-9FEA6C000A44}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldUSERNAMEValue : String; diff --git a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm index bfb74722..d06a6c19 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm +++ b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm @@ -13,6 +13,7 @@ inherited frViewUsuario: TfrViewUsuario Align = alTop ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth] DesignSize = ( 509 @@ -53,12 +54,16 @@ inherited frViewUsuario: TfrViewUsuario Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 Width = 164 end @@ -73,12 +78,16 @@ inherited frViewUsuario: TfrViewUsuario Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 108 end @@ -97,12 +106,16 @@ inherited frViewUsuario: TfrViewUsuario Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 Width = 194 end @@ -111,14 +124,20 @@ inherited frViewUsuario: TfrViewUsuario Top = 167 Properties.EchoMode = eemPassword Properties.PasswordChar = '*' + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 Width = 121 end @@ -127,14 +146,20 @@ inherited frViewUsuario: TfrViewUsuario Top = 194 Properties.EchoMode = eemPassword Properties.PasswordChar = '*' + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 5 Width = 372 end @@ -146,14 +171,22 @@ inherited frViewUsuario: TfrViewUsuario Properties.ImmediateUpdateText = True Properties.PostPopupValueOnTab = True Properties.OnValidate = cbPerfilPropertiesValidate + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 3 Width = 194 end diff --git a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas index 66f47e55..6fbc1603 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas @@ -8,7 +8,13 @@ uses dxLayoutControl, cxCurrencyEdit, uCustomView, cxControls, DB, uDAInterfaces, uDADataTable, ActnList, cxCheckBox, cxDBEdit, cxMaskEdit, cxSpinEdit, cxHyperLinkEdit, cxContainer, cxEdit, cxTextEdit, Buttons, PngSpeedButton, - uBizUsuarios, cxDropDownEdit, ExtCtrls; + uBizUsuarios, cxDropDownEdit, ExtCtrls, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue, + dxSkinsdxLCPainter; type IViewUsuario = interface(IViewBase) diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk index d377d839..f521b9bb 100644 --- a/Source/Base/Base.dpk +++ b/Source/Base/Base.dpk @@ -88,7 +88,7 @@ contains uConfigurarConexion in 'Conexion\uConfigurarConexion.pas' {fConfigurarConexion: TForm}, uSistemaFunc in 'Utiles\uSistemaFunc.pas', FactuGES_Intf in '..\Servicios\FactuGES_Intf.pas', - uGridUtils in 'Utiles\uGridUtils.pas', + uGridStatusUtils in 'Utiles\uGridStatusUtils.pas', uDateUtils in 'Utiles\uDateUtils.pas', uDataModuleConfiguracion in 'Configuracion\uDataModuleConfiguracion.pas' {dmConfiguracion: TDataModule}, uViewRegistryUtils in 'Utiles\ClassRegistry\uViewRegistryUtils.pas', @@ -106,6 +106,10 @@ contains schBase_Intf in 'schBase_Intf.pas', uDataModuleBase in 'uDataModuleBase.pas' {DataModuleBase: TDataModule}, uStringsUtils in 'Utiles\uStringsUtils.pas', - uAppInfoUtils in 'Utiles\uAppInfoUtils.pas'; + uAppInfoUtils in 'Utiles\uAppInfoUtils.pas', + Ctltortf in 'Utiles\Ctltortf.pas', + uRTFUtils in 'Utiles\uRTFUtils.pas', + ClipboardUtils in 'Utiles\ClipboardUtils.pas', + uGridClipboardUtils in 'Utiles\uGridClipboardUtils.pas'; end. diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 3ac2560d..c915d5eb 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,58 +53,58 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm @@ -132,18 +132,22 @@ + + - + + + diff --git a/Source/Base/Controladores/uControllerDetallesBase.pas b/Source/Base/Controladores/uControllerDetallesBase.pas index 14f8e038..9568ee95 100644 --- a/Source/Base/Controladores/uControllerDetallesBase.pas +++ b/Source/Base/Controladores/uControllerDetallesBase.pas @@ -33,6 +33,7 @@ type procedure ActualizarTotales(ADataTable: IDAStronglyTypedDataTable); function DarTotalImporteTotal(ADataTable: IDAStronglyTypedDataTable): Double; function LocalizarPosicion(ADataTable: IDAStronglyTypedDataTable; const APosicion: Integer): Boolean; + procedure Renumerar(DataTable: TDADataTable; LocalizaPosicion: Integer); function DarListaTiposDetalle: TStringList; end; diff --git a/Source/Base/Utiles/ClipboardUtils.pas b/Source/Base/Utiles/ClipboardUtils.pas new file mode 100644 index 00000000..856d9b4e --- /dev/null +++ b/Source/Base/Utiles/ClipboardUtils.pas @@ -0,0 +1,148 @@ +{+------------------------------------------------------------ + | Unit ClipboardUtils + | + | Version: 1.1 Created: 05/05/96, 12:56:57 + | Last Modified: 18.3.2001 + | Author : P. Below + | Project: Common Utilities + | Description: + | Routines to copy string lists and stream to and + | from the clipboard. + +------------------------------------------------------------} +Unit ClipboardUtils; + +interface + +Uses Classes; + + Procedure CopyStringsToClipboard( fmt: Cardinal; S: TStrings ); + Procedure CopyStreamToClipboard( fmt: Cardinal; S: TStream ); + Procedure CopyStringsFromClipboard( fmt: Cardinal; S: TStrings ); + Procedure CopyStreamFromClipboard( fmt: Cardinal; S: TStream ); + Function GetClipFmtname( fmt: Word ): String; + +Implementation + +Uses WinTypes, WinProcs, SysUtils, Clipbrd; + +Procedure CopyStringsToClipboard( fmt: Cardinal; S: TStrings ); + Var + MemStr: TMemoryStream; + Begin + MemStr := TMemoryStream.Create; + try + S.SaveToStream(MemStr); + CopyStreamToClipboard( fmt, MemStr ); + finally + MemStr.Free; + end; + End; { CopyStringsToClipboard } + +Procedure CopyStreamToClipboard( fmt: Cardinal; S: TStream ); + Var + hMem: THandle; + pMem: Pointer; + Begin + S.Position := 0; + hMem := GlobalAlloc( GHND or GMEM_DDESHARE, S.Size ); + If hMem <> 0 Then Begin + pMem := GlobalLock( hMem ); + If pMem <> Nil Then Begin + try + S.Read( pMem^, S.Size ); + S.Position := 0; + finally + GlobalUnlock( hMem ); + end; + Clipboard.Open; + try + Clipboard.SetAsHandle( fmt, hMem ); + finally + Clipboard.Close; + end; + End { If } + Else Begin + GlobalFree( hMem ); + OutOfMemoryError; + End; + End { If } + Else + OutOfMemoryError; + End; { CopyStreamToClipboard } + +Procedure CopyStringsFromClipboard( fmt: Cardinal; S: TStrings ); + Var + MemStr: TMemoryStream; + Begin + MemStr:= TMemoryStream.Create; + try + CopyStreamFromClipboard( fmt, MemStr ); + MemStr.Position := 0; + S.LoadFromStream( MemStr ); + finally + MemStr.Free; + end; + End; { CopyStringsFromClipboard } + +Procedure CopyStreamFromClipboard( fmt: Cardinal; S: TStream ); + Var + hMem: THandle; + pMem: Pointer; + Begin + hMem := Clipboard.GetAsHandle( fmt ); + If hMem <> 0 Then Begin + pMem := GlobalLock( hMem ); + If pMem <> Nil Then Begin + try + S.Write( pMem^, GlobalSize( hMem )); + S.Position := 0; + finally + GlobalUnlock( hMem ); + end; + End { If } + Else + raise Exception.Create( + 'CopyStreamFromClipboard: could not lock global handle '+ + 'obtained from clipboard!'); + End; { If } + End; { CopyStreamFromClipboard } + +Function GetClipFmtname( fmt: Word ): String; +Var + buf: Array [0..60] of Char; +Begin + If GetclipboardFormatName( fmt, buf, Pred(Sizeof(buf))) <> 0 Then + Result := StrPas(buf) + Else + Case fmt of + 1: Result := 'CF_TEXT'; + 2: Result := 'CF_BITMAP'; + 3: Result := 'CF_METAFILEPICT'; + 4: Result := 'CF_SYLK'; + 5: Result := 'CF_DIF'; + 6: Result := 'CF_TIFF'; + 7: Result := 'CF_OEMTEXT'; + 8: Result := 'CF_DIB'; + 9: Result := 'CF_PALETTE'; + 10: Result := 'CF_PENDATA'; + 11: Result := 'CF_RIFF'; + 12: Result := 'CF_WAVE'; + 13: Result := 'CF_UNICODETEXT'; + 14: Result := 'CF_ENHMETAFILE'; + 15: Result := 'CF_HDROP (Win 95)'; + 16: Result := 'CF_LOCALE (Win 95)'; + 17: Result := 'CF_MAX (Win 95)'; + $0080: Result := 'CF_OWNERDISPLAY'; + $0081: Result := 'CF_DSPTEXT'; + $0082: Result := 'CF_DSPBITMAP'; + $0083: Result := 'CF_DSPMETAFILEPICT'; + $008E: Result := 'CF_DSPENHMETAFILE'; + $0200..$02FF: Result := 'private format'; + $0300..$03FF: Result := 'GDI object'; + Else + Result := 'unknown format'; + End; {Case} +End; + + +End { Unit ClipboardUtils }. diff --git a/Source/Base/Utiles/Ctltortf.pas b/Source/Base/Utiles/Ctltortf.pas new file mode 100644 index 00000000..a04bf0e0 --- /dev/null +++ b/Source/Base/Utiles/Ctltortf.pas @@ -0,0 +1,581 @@ +{*************************************************************} +{ Delphi Control to RTF Conversion VCL } +{ Version: 1.0 } +{ Author: K. Nishita } +{ E-Mail: info@nishita.com } +{ Home Page: http://nishita.com } +{ Created: 3/1/2000 } +{ Type: Freeware } +{ Legal: Copyright (c) 1999 by K. Nishita } +{*************************************************************} +{ This component convert Delphi grid, edit, listbox, memo, } +{ and label to Rich Text Format. } +{*************************************************************} +{ Please see example program for more information. } +{*************************************************************} +{ IMPORTANT NOTE: } +{ This software is provided 'as-is', without any express or } +{ implied warranty. In no event will the author be held } +{ liable for any damages arising from the use of this } +{ software. } +{ Permission is granted to anyone to use this software for } +{ any purpose, including commercial applications, and to } +{ alter it and redistribute it freely, subject to the } +{ following restrictions: } +{ 1. The origin of this software must not be misrepresented, } +{ you must not claim that you wrote the original software. } +{ If you use this software in a product, an acknowledgment } +{ in the product documentation would be appreciated but is } +{ not required. } +{ 2. Altered source versions must be plainly marked as such, } +{ and must not be misrepresented as being the original } +{ software. } +{ 3. This notice may not be removed or altered from any } +{ source distribution. } +{ 4. You must register this software by visiting } +{ http://nishita.com. } +{*************************************************************} + +unit CtlToRTF; + +interface + +uses + SysUtils, {$IFDEF WIN32} Windows, {$ELSE} WinTypes, WinProcs,{$ENDIF} Messages, Classes, Graphics, Controls, + StdCtrls, ExtCtrls, Grids, Forms, cxGridTableView; + +type + TCtrlToRTF = class(TComponent) + private + { Private declarations } + FFileName:string; + RTF:TMemoryStream; + FontTable:TStringList; + procedure StreamWriteStr(var ms: TMemoryStream; s: string); + function GetRTFFontTableName(FontName:string):string; + function GetRTFFontAttrib(Style:TFontStyles):string; + function GetRTFFontSize(Size:Integer):string; + function GetRTFAlignment(Alignment:TAlignment):string; + function GetRTFFontColorTableName(Color:TColor):string; + function GetRTF: String; + + protected + { Protected declarations } + public + { Public declarations } + constructor Create(AOwner: TComponent); override; + destructor Destroy; override; + procedure CreateRTFHeader; + procedure AddFontToTable(Font:TFont); + procedure ImageToRTF(Image:TImage;Alignment:TAlignment); + procedure MemoToRTF(Memo:TMemo); + procedure ListBoxToRTF(pList:TListBox); + procedure StringListToRTF(pStringList:TStringList;Font:TFont;Alignment:TAlignment); + procedure StringToRTF(pString:String;Font:TFont;Alignment:TAlignment); + procedure TextBufToRTF(TextBuf:pointer;size:word;Font:TFont;Alignment:TAlignment); + procedure LabelToRTF(pLabel:TLabel); + procedure EditToRTF(pEdit:TEdit); + procedure GridToRTF(Grid:TStringGrid); + procedure cxGridViewToRTF(cxGridView:TcxGridTableView); + procedure SaveToFile(pFileName:String); + published + property RTFText : String read GetRTF; + end; + +procedure Register; + +implementation + +//{$IFDEF WIN32} +// {$R *.D32} +//{$ELSE} +// {$R *.D16} +//{$ENDIF} + +constructor TCtrlToRTF.Create(AOwner: TComponent); +begin +inherited Create(AOwner); +RTF:=TMemoryStream.Create; +FontTable:=TStringList.Create; +end; + +destructor TCtrlToRTF.Destroy; +begin +RTF.Free; +FontTable.Free; +inherited Destroy; +end; + +procedure TCtrlToRTF.CreateRTFHeader; +var i:Integer; +begin +StreamWriteStr(RTF,'{\rtf1\ansi\ansicpg1252\deff0\deftab720'); +StreamWriteStr(RTF,'{\fonttbl'); +for i:=0 to FontTable.count-1 do +StreamWriteStr(RTF,FontTable.Strings[i]); +StreamWriteStr(RTF,'}'); +StreamWriteStr(RTF,'{\colortbl'); +StreamWriteStr(RTF,'\red0\green0\blue0;'); {Black} +StreamWriteStr(RTF,'\red128\green0\blue0;'); {Maroon} +StreamWriteStr(RTF,'\red0\green128\blue0;'); {Green} +StreamWriteStr(RTF,'\red128\green128\blue0;'); {Olive} +StreamWriteStr(RTF,'\red0\green0\blue128;'); {Navy} +StreamWriteStr(RTF,'\red128\green0\blue128;'); {Purple} +StreamWriteStr(RTF,'\red0\green128\blue128;'); {Teal} +StreamWriteStr(RTF,'\red128\green128\blue128;'); {Gray} +StreamWriteStr(RTF,'\red192\green192\blue192;'); {Silver} +StreamWriteStr(RTF,'\red255\green0\blue0;'); {Red} +StreamWriteStr(RTF,'\red0\green255\blue0;'); {Lime} +StreamWriteStr(RTF,'\red255\green255\blue0;'); {Yellow} +StreamWriteStr(RTF,'\red0\green0\blue255;'); {Blue} +StreamWriteStr(RTF,'\red255\green0\blue255;'); {Fuchsia} +StreamWriteStr(RTF,'\red0\green255\blue255;'); {Aqua} +StreamWriteStr(RTF,'\red255\green255\blue255;'); {White} +StreamWriteStr(RTF,'}'); +end; + +procedure TCtrlToRTF.cxGridViewToRTF(cxGridView: TcxGridTableView); +var i,j:Integer; + Temp:double; + FontColor,FontAttrib,FontSize,FontName:String; +begin +{FontColor:=GetRTFFontColorTableName(cxGridView.Font.Color); +FontSize:=GetRTFFontSize(cxGridView.Font.Size); +FontAttrib:=GetRTFFontAttrib(cxGridView.Font.Style); +FontName:=GetRTFFontTableName(cxGridView.Font.Name);} + +CreateRTFHeader; + +FontColor:=GetRTFFontColorTableName(Windows.GetSysColor(COLOR_BTNTEXT)); +FontSize:=GetRTFFontSize(8); +FontAttrib:=GetRTFFontAttrib([]); +FontName:=GetRTFFontTableName('Tahoma'); + + +StreamWriteStr(RTF,'\par \pard\plain\cgrid'); +StreamWriteStr(RTF,'{\stylesheet{\nowidctlpar\widctlpar\adjustright \fs20\cgrid \snext0 Normal;}'); +StreamWriteStr(RTF,'{\*\cs10 \additive Default Paragraph Font;}}'); +StreamWriteStr(RTF,'{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta'); +StreamWriteStr(RTF,'.}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang'); +StreamWriteStr(RTF,'{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1'+'\pnindent720\pnhang{\pntxta'); +StreamWriteStr(RTF,'.}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta'); +StreamWriteStr(RTF,')}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta'); +StreamWriteStr(RTF,')}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang'); +StreamWriteStr(RTF,'{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720'+ +'\pnhang{\pntxtb (}{\pntxta'); +StreamWriteStr(RTF,')}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta'); +StreamWriteStr(RTF,')}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}'); + +for i:=0 to cxGridView.Controller.SelectedRowCount-1 do +begin + StreamWriteStr(RTF,'\trowd'); + StreamWriteStr(RTF,'\trgaph108'); + StreamWriteStr(RTF,'\trrh260'); + StreamWriteStr(RTF,'\trleft90'); + StreamWriteStr(RTF,'\trbrdrt\brdrs\brdrw10'); + StreamWriteStr(RTF,'\trbrdrl\brdrs\brdrw10'); + StreamWriteStr(RTF,'\trbrdrb\brdrs\brdrw10'); + StreamWriteStr(RTF,'\trbrdrr\brdrs\brdrw10'); + StreamWriteStr(RTF,'\trbrdrh\brdrs\brdrw10'); + StreamWriteStr(RTF,'\trbrdrv\brdrs\brdrw10'); + + for j:=0 to cxGridView.VisibleColumnCount-1 do + begin + StreamWriteStr(RTF,'\clvertalt'); + StreamWriteStr(RTF,'\clbrdrt\brdrs\brdrw10'); + StreamWriteStr(RTF,'\clbrdrl\brdrs\brdrw10'); + StreamWriteStr(RTF,'\clbrdrb\brdrs\brdrw10'); + StreamWriteStr(RTF,'\clbrdrr\brdrs\brdrw10'); + // ¿¿¿¿¿ if (j 0 then +begin +Result := '\f'+IntToStr(i); +Exit; +end; +end; +end; + +function TCtrlToRTF.GetRTFFontAttrib(Style:TFontStyles):string; +var retval:string; +begin +retval:=''; +if fsBold in Style then +retval := retval+'\b'; +if fsItalic in Style then +retval := retval+'\c'; +if fsUnderline in Style then +retval := retval+'\ul'; +if fsStrikeOut in Style then +retval := retval+'\strike'; +Result:=retval; +end; + +function TCtrlToRTF.GetRTFFontSize(Size:Integer):string; +begin +Result:='\fs'+IntToStr(size*2); +end; + +function TCtrlToRTF.GetRTF: String; +var + A : TStringList; +begin + StreamWriteStr(RTF,#13#10+'}}'); + RTF.Position := 0; + A := TStringList.Create; + try + A.LoadFromStream(RTF); + Result := A.Text; + finally + FreeANDNIL(A); + end; +end; + +function TCtrlToRTF.GetRTFAlignment(Alignment:TAlignment):string; +var Align:String; +begin +if Alignment = taCenter then Align := '\qc' +else if Alignment = taRightJustify then Align := '\qr' +else Align:=''; +Result := Align; +end; + +function TCtrlToRTF.GetRTFFontColorTableName(Color:TColor):string; +begin +if Color = clBlack then Result:='\cf0' +else if Color =clMaroon then Result:='\cf1' +else if Color =clGreen then Result:='\cf2' +else if Color =clOlive then Result:='\cf3' +else if Color =clNavy then Result:='\cf4' +else if Color =clPurple then Result:='\cf5' +else if Color =clTeal then Result:='\cf6' +else if Color =clGray then Result:='\cf7' +else if Color =clSilver then Result:='\cf8' +else if Color =clRed then Result:='\cf9' +else if Color =clLime then Result:='\cf10' +else if Color =clYellow then Result:='\cf11' +else if Color =clBlue then Result:='\cf12' +else if Color =clFuchsia then Result:='\cf13' +else if Color =clAqua then Result:='\cf14' +else if Color =clWhite then Result:='\cf15'; +end; + +procedure TCtrlToRTF.AddFontToTable(Font:TFont); +var DC: HDC; + SaveFont: HFont; + SysMetrics, Metrics: TTextMetric; + Temp:byte; +I: Integer; +charset,family:string; +begin +DC := GetDC(0); +SaveFont := SelectObject(DC, Font.Handle); +GetTextMetrics(DC, Metrics); +SelectObject(DC, SaveFont); +ReleaseDC(0, DC); +for I:=0 to FontTable.Count-1 do +begin +if Pos(Font.Name,FontTable.Strings[i]) > 0 then +Exit; +end; +case Metrics.tmCharSet of +ANSI_CHARSET: charset:='fcharset0'; +DEFAULT_CHARSET: charset:='fcharset1'; +SYMBOL_CHARSET: charset:='fcharset2'; +SHIFTJIS_CHARSET: charset:='fcharset128'; +OEM_CHARSET: charset:='fcharset255'; +else charset:=''; +end; +Temp:=Metrics.tmPitchAndFamily; +Temp:= (Temp shr 4) shl 4; +case Temp of +FF_DECORATIVE: family:='fdecorative'; +FF_DONTCARE: family:='fdontcare'; +FF_MODERN: family:='fmodern'; +FF_ROMAN: family:='froman'; +FF_SCRIPT: family:='fscript'; +FF_SWISS: family:='fswiss'; +else family:='froman'; +end; +FontTable.Add('{\f'+IntToStr(FontTable.Count)+'\'+family+'\'+charset+' '+font.name+';}'); +end; + +procedure TCtrlToRTF.SaveToFile(pFileName:String); +begin +StreamWriteStr(RTF,#13#10+'}}'); +RTF.SaveToFile(pFileName); +end; + +procedure TCtrlToRTF.StreamWriteStr(var ms: TMemoryStream; s: string); +begin +ms.Write(s[1], Length(s)); +end; + +procedure Register; +begin + RegisterComponents('CynapSYS', [TCtrlToRTF]); +end; + +end. + \ No newline at end of file diff --git a/Source/Base/Utiles/uGridClipboardUtils.pas b/Source/Base/Utiles/uGridClipboardUtils.pas new file mode 100644 index 00000000..619990b2 --- /dev/null +++ b/Source/Base/Utiles/uGridClipboardUtils.pas @@ -0,0 +1,518 @@ +unit uGridClipboardUtils; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, cxGrid; + +procedure PegarSeleccionGridDesdePortapapeles (AGrid : TcxGrid); +procedure CopiarSeleccionGridAlPortapapeles (AGrid : TcxGrid); +procedure CortarSeleccionGridAlPortapapeles (AGrid : TcxGrid); +function HayDatosEnPortapapeles: Boolean; + + +procedure CopiarGridAlPortapapelesRTF (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); +procedure CopiarGridAlPortapapelesHTML (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); +procedure CopiarGridAlPortapapelesTXT (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); +procedure CopiarGridAlPortapapelesExcel (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); + +implementation + +uses + cxVariants, CtlToRTF, Clipbrd, DB, cxExport, cxGridExportLink, cxCustomData, + uSistemaFunc, ClipboardUtils, cxDBData, cxGridLevel, uStringsUtils, + cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, + cxGridTableView, cxGridDBTableView, cxGridDBDataDefinitions, uGridStatusUtils; + + + +procedure RenumerarCampoPosicion(ADataSet : TDataSet); +var + iContador : Integer; + AField : TField; +begin + AField := ADataSet.FindField('POSICION'); + if Assigned(AField) and not (ADataSet.IsEmpty) then + begin + ADataSet.Last; + iContador := ADataSet.RecordCount; + repeat + ADataSet.Edit; + AField.AsInteger := iContador - 1; + ADataSet.Post; + AdataSet.Prior; + iContador := iContador - 1; + until ADataSet.BOF; + end; +end; + + +{$REGION 'LoadGridRowsFromStream'} +procedure LoadGridRowsFromStream(AView : TcxGridDBTableView; AStream: TStream; + var ACaption : String); +var + AValueNameList: TStringList; + AValueTypeList: TStringList; + ADataSet : TDataSet; + ARecordID : Integer; + ARecordIndex : Integer; + bEstabaVacia : Boolean; + + iContador : Integer; + AValueName, AValueType : String; + iCols, NumCols : integer; + NumFilas: Integer; + AReader: TcxReader; + AValue : Variant; + AIndex : integer; + + function _BuscarColumna (const AName, ATypeValue : String; var AIndex : Integer) : Boolean; + var + i : Integer; + bNombreOk : Boolean; + begin + AIndex := -1; + Result := False; + for i := 0 to AView.ItemCount - 1 do + begin + bNombreOk := False; + if (AView.Items[i].DataBinding is TcxGridItemDBDataBinding) then + with (AView.Items[i].DataBinding as TcxGridItemDBDataBinding) do + bNombreOk := (FieldName = AName) + else + bNombreOk := (AView.Items[i].Caption = AName); + + if bNombreOk and (AView.Items[i].DataBinding.ValueType = ATypeValue) then + begin + AIndex := i; + Result := True; + Break; + end; + end; + end; + + +begin + if not Assigned(AView) then + raise Exception.Create('Vista no asignada (SaveGridViewToStream)'); + + if not Assigned(AStream) then + raise Exception.Create('Stream no asignado (SaveGridViewToStream)'); + + ADataSet := AView.DataController.DataSource.DataSet; + AReader := TcxReader.Create(AStream); + AValueNameList := TStringList.Create; + AValueTypeList := TStringList.Create; + + try + AIndex := -1; + ACaption := AReader.ReadString; + NumCols := AReader.ReadInteger; // nº de columnas + for iContador := 0 to NumCols - 1 do + begin + AValueName := AReader.ReadString; + AValueType := AReader.ReadString; + + AValueNameList.Add(AValueName); + AValueTypeList.Add(AValueType); + end; + + NumFilas := AReader.ReadInteger; + bEstabaVacia := ADataSet.IsEmpty; + + AView.DataController.BeginUpdate; + try + + // Localizar el punto donde se empieza a insertar + if not bEstabaVacia then + begin + ARecordIndex := AView.DataController.FocusedRecordIndex; + if ARecordIndex >= 0 then + ARecordID := AView.DataController.GetRecordId(ARecordIndex); + ADataSet.Locate(AView.DataController.KeyFieldNames, ARecordID, []); + end; + + for iContador := 0 to NumFilas - 1 do + begin + // Insertar una tupla de la forma adecuada + if bEstabaVacia then + ADataSet.Append + else begin + if iContador > 0 then + ADataSet.Next; + ADataSet.Insert; + end; + + try + for iCols := 0 to NumCols - 1 do + begin + AValue := AReader.ReadVariant; + if (Pos(AValueNameList[iCols], AView.DataController.KeyFieldNames) = 0) then + if _BuscarColumna(AValueNameList[iCols], AValueTypeList[iCols], AIndex) then + begin + if AIndex <> -1 then + ADataSet.FieldByName(AView.DataController.GetItemField(AIndex).FieldName).Value := AValue; + end; + end; + finally + ADataSet.Post; + end; + end; + + RenumerarCampoPosicion(ADataSet); + + finally + AView.DataController.EndUpdate; + end; + finally + FreeANDNIL(AReader); + FreeANDNIL(AValueNameList); + FreeANDNIL(AValueTypeList); + end; +end; +{$ENDREGION} + +{$REGION 'SaveGridRowsToStream'} +procedure SaveGridRowsToStream(AView : TcxGridDBTableView; AStream: TStream; + const ACaption : String; const ASoloSeleccion : Boolean = false); +var + AWriter: TcxWriter; + i, j : integer; + AName, AValueType : String; + + procedure _CopyForEachRowProc(ARowIndex: Integer; ARowInfo: TcxRowInfo); + var + iCols: Integer; + begin + for iCols := 0 to AView.ItemCount - 1 do + AWriter.WriteVariant(AView.DataController.GetRowValue(ARowInfo, iCols)); + end; + +begin + if not Assigned(AView) then + raise Exception.Create('Vista no asignada (SaveGridViewToStream)'); + + if not Assigned(AStream) then + raise Exception.Create('Stream no asignado (SaveGridViewToStream)'); + + if EsCadenaVacia(ACaption) then + raise Exception.Create('Etiqueta no asignada (SaveGridViewToStream)'); + + AWriter := TcxWriter.Create(AStream); + try + AWriter.WriteString(ACaption); + + AWriter.WriteInteger(AView.ItemCount); + for i := 0 to AView.ItemCount - 1 do + begin + AName := ''; + AValueType := ''; + + if AView.Items[i].DataBinding is TcxGridItemDBDataBinding then + AName := (AView.Items[i].DataBinding as TcxGridItemDBDataBinding).FieldName; + + if EsCadenaVacia(AName) then + AName := AView.Items[i].Caption; + + AValueType := AView.Items[i].DataBinding.ValueType; + + AWriter.WriteString(AName); + AWriter.WriteString(AValueType); + end; + + with AView.DataController do + begin + if ASoloSeleccion then + begin + AWriter.WriteInteger(GetSelectedCount); + for I := 0 to GetSelectedCount - 1 do + begin + J := GetSelectedRowIndex(I); + _CopyForEachRowProc(J, GetRowInfo(J)); + end; + end + else begin + AWriter.WriteInteger(GetRowCount); + for I := 0 to GetRowCount - 1 do + _CopyForEachRowProc(I, GetRowInfo(I)); + end; + end; + finally + FreeANDNIL(AWriter); + end; +end; +{$ENDREGION} + + +function HTMLToClipFmt(const AHTML: string): string; +const + CR = #13#10; + DescriptionSize = 105; + HeaderSize = 47; + FooterSize1 = 58; + FooterSize2 = 24; + + function GetHeader: string; + begin + Result := 'Version:0.9' + CR; + Result := Result + Format('StartHTML:%.10d', [DescriptionSize]) + CR; + Result := Result + Format('EndHTML:%.10d', [DescriptionSize + HeaderSize + Length(AHTML) + FooterSize1]) + CR; + Result := Result + Format('StartFragment:%.10d', [DescriptionSize + HeaderSize]) + CR; + Result := Result + Format('EndFragment:%.10d', [DescriptionSize + HeaderSize + Length(AHTML) + FooterSize2]) + CR; + Result := Result + '' + CR + '' + '' + '' + '
';
+  end;
+
+  function GetFooter: string;
+  begin
+    Result := '
'; + Result := Result + '' + CR + '' +end; + +begin + Result := GetHeader + AHTML + GetFooter; +end; + +function FormatHTMLClipboardHeader(HTMLText: string): string; +{http://www.swissdelphicenter.ch/torry/showcode.php?id=1391} +const + CrLf = #13#10; +begin + Result := 'Version:0.9' + CrLf; + Result := Result + 'StartHTML:-1' + CrLf; + Result := Result + 'EndHTML:-1' + CrLf; + Result := Result + 'StartFragment:000081' + CrLf; + Result := Result + 'EndFragment:°°°°°°' + CrLf; + Result := Result + HTMLText + CrLf; + Result := StringReplace(Result, '°°°°°°', Format('%.6d', [Length(Result)]), []); +end; + + +procedure CopiarGridAlPortapapelesHTML (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); + const + CR = #13#10; + DescriptionSize = 105; + HeaderSize = 47; + FooterSize1 = 58; + FooterSize2 = 24; + + function GetHeader(const AHTML: string): string; + begin + Result := 'Version:0.9' + CR; + Result := Result + Format('StartHTML:%.10d', [DescriptionSize]) + CR; + Result := Result + Format('EndHTML:%.10d', [DescriptionSize + HeaderSize + Length(AHTML) + FooterSize1]) + CR; + Result := Result + Format('StartFragment:%.10d', [DescriptionSize + HeaderSize]) + CR; + Result := Result + Format('EndFragment:%.10d', [DescriptionSize + HeaderSize + Length(AHTML) + FooterSize2]) + CR; + Result := Result + '' + CR + '' + '' + '' + '
';
+  end;
+
+  function GetFooter: string;
+  begin
+    Result := '
'; + Result := Result + '' + CR + '' + end; + +var + AFicheroTMP : String; + AStringList : TStringList; + HTMLText : String; + CF_HTML : Cardinal; +begin + if not Assigned(AGrid) then + raise Exception.Create('Vista no asignada (CopiarSeleccionGridAlPortapapelesTXT)'); + + AFicheroTMP := DarFicheroHTMLTemporal; + ExportGridToHTML(AFicheroTMP, AGrid, True, not ASoloSeleccion); + + if FileExists(AFicheroTMP) then + begin + AStringList := TStringList.Create; + try + AStringList.LoadFromFile(AFicheroTMP); + HTMLText := AStringList.Text; + AStringList.Insert(0, GetHeader(HTMLText)); + AStringList.Add(GetFooter); + + CF_HTML := RegisterClipboardFormat ('HTML Format'); + if CF_HTML = 0 then + raise Exception.Create('Error al registrar formato CF_HTML (CopiarSeleccionGridAlPortapapelesHTML)'); + + CopyStringsToClipboard(CF_HTML, AStringList); + finally + FreeANDNIL(AStringList); + DeleteFile(AFicheroTMP) + end; + end; +end; + +procedure CopiarGridAlPortapapelesRTF (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); +var + ARTFConv : TCtrlToRTF; + AStringList : TStringList; + CF_RTF : Cardinal; +begin + if not Assigned(AGrid) then + raise Exception.Create('Grid no asignado (CopiarSeleccionGridAlPortapapelesTXT)'); + + ARTFConv := TCtrlToRTF.Create(NIL); + try + ARTFConv.cxGridViewToRTF(TcxGridTableView(AGrid.ActiveView)); + + CF_RTF := RegisterClipboardFormat('Rich Text Format'); + if CF_RTF = 0 then + raise Exception.Create('Error al registrar formato CF_RTF (CopiarSeleccionGridAlPortapapelesRTF)'); + + AStringList := TStringList.Create; + try + AStringList.Add(ARTFConv.RTFText); + CopyStringsToClipboard(CF_RTF, AStringList); + finally + FreeANDNIL(AStringList); + end; + finally + FreeANDNIL(ARTFConv); + end; +end; + + +procedure CopiarGridAlPortapapelesTXT (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); +{var + iFilas, iCols : Integer;} +begin + if not Assigned(AGrid) then + raise Exception.Create('Grid no asignado (CopiarSeleccionGridAlPortapapelesTXT)'); + + TcxGridTableView(AGrid.ActiveView).CopyToClipboard(not ASoloSeleccion); + +{ for iFilas := 0 to AGrid.ActiveView.Controller.SelectedRowCount-1 do + begin + for iCols := 0 to cxGridView.VisibleColumnCount-1 do + begin + + end; + StreamWriteStr(RTF, cxGridView.DataController.DisplayTexts[cxGridView.Controller.SelectedRows[i].RecordIndex, cxGridView.VisibleColumns[j].Index] +'\cell '); + } +end; + +procedure CopiarGridAlPortapapelesExcel (AGrid : TcxGrid; const ASoloSeleccion : Boolean = false); +var + AFicheroTMP : String; + AStream : TFileStream; + CF_HTML : Cardinal; +begin + if not Assigned(AGrid) then + raise Exception.Create('Vista no asignada (CopiarSeleccionGridAlPortapapelesTXT)'); + + AFicheroTMP := DarFicheroExcelTemporal; + ExportGridToExcel(AFicheroTMP, AGrid, True, not ASoloSeleccion); + + if FileExists(AFicheroTMP) then + begin + AStream := TFileStream.Create(AFicheroTMP, fmOpenRead); + try + CF_HTML := RegisterClipboardFormat ('HTML Format'); + if CF_HTML = 0 then + raise Exception.Create('Error al registrar formato CF_HTML (CopiarSeleccionGridAlPortapapelesHTML)'); + + CopyStreamToClipboard(CF_HTML, AStream); + finally + FreeANDNIL(AStream); + DeleteFile(AFicheroTMP) + end; + end; +end; + + +procedure CopiarSeleccionGridAlPortapapeles (AGrid : TcxGrid); +var + AMemStream : TMemoryStream; + CF_FACTUGES : Cardinal; + AGridStatus : TcxGridStatus; +begin + if not Assigned(AGrid) then + raise Exception.Create('Grid no asignado (CopiarSeleccionGridAlPortapapelesTXT)'); + + AGridStatus := TcxGridStatus.Create(TcxGridDBTableView(AGrid.ActiveView)); + Clipboard.Open; + try + CopiarGridAlPortapapelesTXT(AGrid); + CopiarGridAlPortapapelesRTF(AGrid); + CopiarGridAlPortapapelesHTML(AGrid); + + AMemStream := TMemoryStream.Create; + try + SaveGridRowsToStream(TcxGridDBTableView(AGrid.ActiveView), AMemStream, AGrid.ActiveView.Name, True); + CF_FACTUGES := RegisterClipboardFormat ('FactuGES Format'); + if CF_FACTUGES = 0 then + raise Exception.Create('Error al registrar formato CF_HTML (CopiarSeleccionGridAlPortapapelesHTML)'); + CopyStreamToClipboard(CF_FACTUGES, AMemStream); + finally + FreeAndNil(AMemStream); + end; + finally + Clipboard.Close; + AGridStatus.Restore(TcxGridDBTableView(AGrid.ActiveView)); + FreeAndNil(AGridStatus); + end; +end; + + +procedure CortarSeleccionGridAlPortapapeles (AGrid : TcxGrid); +begin + ShowHourglassCursor; + try + CopiarSeleccionGridAlPortapapeles(AGrid); + AGrid.ActiveView.DataController.DeleteSelection; + RenumerarCampoPosicion(TcxGridDBTableView(AGrid.ActiveView).DataController.DataSet); + finally + HideHourglassCursor; + end; +end; + + +procedure PegarSeleccionGridDesdePortapapeles (AGrid : TcxGrid); +var + AMemStream : TMemoryStream; + CF_FACTUGES : Cardinal; + ACaption : String; + AGridStatus : TcxGridStatus; +begin + if not Assigned(AGrid) then + raise Exception.Create('Grid no asignado (PegarSeleccionGridDesdePortapapeles)'); + + CF_FACTUGES := RegisterClipboardFormat ('FactuGES Format'); + if CF_FACTUGES = 0 then + raise Exception.Create('Error al registrar formato CF_FACTUGES (PegarSeleccionGridDesdePortapapeles)'); + + if not Clipboard.HasFormat(CF_FACTUGES) then + raise Exception.Create('No hay nada en el portapapeles'); + + AGridStatus := TcxGridStatus.Create(TcxGridDBTableView(AGrid.ActiveView)); + Clipboard.Open; + try + AMemStream := TMemoryStream.Create; + try + CopyStreamFromClipboard(CF_FACTUGES, AMemStream); + LoadGridRowsFromStream(TcxGridDBTableView(AGrid.ActiveView), AMemStream, ACaption); + finally + FreeAndNil(AMemStream); + end; + finally + Clipboard.Close; + AGridStatus.Restore(TcxGridDBTableView(AGrid.ActiveView)); + FreeAndNil(AGridStatus); + end; +end; + +function HayDatosEnPortapapeles: Boolean; +var + CF_FACTUGES : Cardinal; +begin + CF_FACTUGES := RegisterClipboardFormat ('FactuGES Format'); + if CF_FACTUGES = 0 then + raise Exception.Create('Error al registrar formato CF_FACTUGES (HayDatosEnPortapapeles)'); + + Result := Clipboard.HasFormat(CF_FACTUGES); +end; + +end. diff --git a/Source/Base/Utiles/uGridUtils.pas b/Source/Base/Utiles/uGridStatusUtils.pas similarity index 92% rename from Source/Base/Utiles/uGridUtils.pas rename to Source/Base/Utiles/uGridStatusUtils.pas index abcffa37..1eecac80 100644 --- a/Source/Base/Utiles/uGridUtils.pas +++ b/Source/Base/Utiles/uGridStatusUtils.pas @@ -1,4 +1,4 @@ -unit uGridUtils; +unit uGridStatusUtils; interface @@ -56,11 +56,11 @@ procedure SeleccionarFilasDesdeGrid(const AView : TcxGridDBTableView; implementation - uses uDADataTable, uDAInterfaces, cxVariants; +{$REGION 'TRecordInfos'} procedure TRecordInfos.Notify(Ptr: Pointer; Action: TListNotification); begin if Action in [lnExtracted, lnDeleted] then @@ -188,12 +188,15 @@ procedure TcxGridStatus.LoadGridViewTopFocusedRecords(AView: TcxGridDBTableView) var ARecord: TcxCustomGridRecord; begin - ARecord := FindRecordEx(AView, AFocusedRow); - if Assigned(ARecord) then - ARecord.Focused := True; - ARecord := FindRecordEx(AView, TopRow); - if Assigned(ARecord) then - AView.Controller.TopRowIndex := ARecord.Index; + if Assigned(AFocusedRow) then + begin + ARecord := FindRecordEx(AView, AFocusedRow); + if Assigned(ARecord) then + ARecord.Focused := True; + ARecord := FindRecordEx(AView, TopRow); + if Assigned(ARecord) then + AView.Controller.TopRowIndex := ARecord.Index; + end; end; type @@ -289,9 +292,10 @@ begin finally AView.EndUpdate; AGridStatus.Restore(AView); + FreeANDNIL(AGridStatus); HideHourglassCursor; end; end; - +{$ENDREGION} end. diff --git a/Source/Base/Utiles/uIntegerListUtils.pas b/Source/Base/Utiles/uIntegerListUtils.pas index 62994ac7..b5caef0a 100644 --- a/Source/Base/Utiles/uIntegerListUtils.pas +++ b/Source/Base/Utiles/uIntegerListUtils.pas @@ -20,7 +20,7 @@ implementation function TIntegerList.GetInteger(Index: integer): integer; begin - result := Integer(Items[index]); + Result := Integer(Items[index]); end; procedure TIntegerList.SetInteger(Index: integer; Value: integer); diff --git a/Source/Base/Utiles/uRTFUtils.pas b/Source/Base/Utiles/uRTFUtils.pas new file mode 100644 index 00000000..cecd2584 --- /dev/null +++ b/Source/Base/Utiles/uRTFUtils.pas @@ -0,0 +1,203 @@ +unit uRTFUtils; + +interface + +function RtfToText(ARTFText: String): String; + +implementation + +uses + Forms, Classes, SysUtils, StdCtrls, ComCtrls; + + +{ + Convert RTF enabled text to plain. + http://www.delphipraxis.net/topic45179.html +} + +// HAY QUE LIMPIAR LA CADENA DE ENTRADA DE SALTOS DE LÍNEA (#$D#$A) POR QUE +// SI NO, NO ES UNA CADENA CON TEXTO RTF VÁLIDO + +function RtfToText(ARTFText: String): String; +const + SaltoLinea = #13#10; //--> #$D#$A +var + aSource: string; // <- Para almacenar la cadena de entrada sin saltos de línea + Source: string; + NChar: Integer; + + function ProcessGroupRecursevly: string; + + function HexToInt(HexStr: String): Integer; + begin + result := StrToInt('$' + HexStr); + end; + + procedure SkipStar; + var + BracesOpened: Integer; + Escaped: Boolean; + begin + BracesOpened:=1; + Escaped:=false; + while BracesOpened>0 + do begin + Inc (NChar); + case Source [NChar] of + '{': if Escaped + then Escaped:=false + else Inc (BracesOpened); + '}': if Escaped + then Escaped:=false + else Dec (BracesOpened); + '\': Escaped:=not Escaped; + else Escaped:=false; + end; + end; + end; + + function UnicodeCharCode2ANSIChar (aCode: LongInt): Char; + type + TUnicode2ANSITable=array [$0410..$044f] of Char; + const + Unicode2ANSITable: TUnicode2AnsiTable=('À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Æ', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ð', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', '×', 'Ø', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'Þ', 'ß', + 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ð', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', '÷', 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'þ', 'ÿ'); + begin + if (Low (Unicode2ANSITable)<=aCode) and (aCode<=High (Unicode2ANSITable)) then + UnicodeCharCode2ANSIChar:=Unicode2ANSITable [aCode] + else UnicodeCharCode2ANSIChar:='?'; + end; + + var + Control, NumericValue, TextValue: string; + begin + Result:=''; + Inc (NChar); + while NChar<=Length (Source) + do case Source [NChar] of + '{': Result:=Result+ProcessGroupRecursevly; + '}': begin + Inc (NChar); + Break; + end; + '\': begin + Inc (NChar); + case Source [NChar] of + '''': begin + Result:=Result+Chr (HexToInt (Copy (Source, NChar+1, 2))); + Inc (NChar, 3); + end; + '~': Result:=Result+#$20; + '*': SkipStar; + 'a'..'z': begin + Control:=''; + while Source [NChar] in ['a'..'z'] + do begin + Control:=Control+Source [NChar]; + Inc (NChar); + end; + if Source [NChar]='-' + then begin + NumericValue:=Source [NChar]; + Inc (NChar); + end + else NumericValue:=''; + while Source [NChar] in ['0'..'9'] + do begin + NumericValue:=NumericValue+Source [NChar]; + Inc (NChar); + end; + if Source [NChar]='{' + then ProcessGroupRecursevly; + TextValue:=''; + if not (Source [NChar] in ['a'..'z', '{', '}', '\']) + then begin + Inc (NChar); + while not (Source [NChar] in ['{', '}', '\']) + do begin + TextValue:=TextValue+Source [NChar]; + Inc (NChar); + end; + end; + if (Control='line') or (Control='par') + then Result:=Result+#$0D#$0A + else if Control='tab' + then Result:=Result+#$09 + else if Control='u' + then Result:=Result+UnicodeCharCode2ANSIChar (StrToInt (NumericValue)) + else if Control='colortbl' + then TextValue:=''; + if Length (TextValue)>0 + then if (not ((TextValue [Length (TextValue)]=';') and (Source [NChar]='}'))) + then begin + Result:=Result+TextValue; + TextValue:=''; + end; + end; + else begin + Result:=Result+Source [NChar]; + Inc (NChar); + end; + end; + end; + else begin + Result:=Result+Source [NChar]; + Inc (NChar); + end; + end; + end; + + function InitSource: Boolean; + var + BracesCount: Integer; + Escaped: Boolean; + begin + if Copy (aSource, 1, 5) <> '{\rtf' then + InitSource:=false + else begin + Source:=''; + BracesCount:=0; + Escaped:=false; + NChar:=1; + while (NChar<=Length (aSource)) and (BracesCount>=0) + do begin + if not (aSource [NChar] in [#$0D, #$0A]) + then begin + Source:=Source+aSource [NChar]; + case aSource [NChar] of + '{': if not Escaped + then Inc (BracesCount) + else Escaped:=false; + '}': if not Escaped + then Dec (BracesCount) + else Escaped:=false; + '\': Escaped:=true; + else Escaped:=false; + end; + end; + Inc (NChar); + end; + InitSource:=BracesCount=0; + end; + end; + +begin + // Hay que quitar el salto de línea al final de la aSource RTF + aSource := StringReplace(ARTFText, SaltoLinea, '', [rfReplaceAll]); + + // o bien: + // + //aSource := Copy( cLinea, 1, length(cLinea)-2) ); + + if InitSource then + begin + NChar:=1; + Result:= PChar(ProcessGroupRecursevly); + end + else + Result := PChar(aSource); +end; + +end. + + diff --git a/Source/Base/Utiles/uSistemaFunc.pas b/Source/Base/Utiles/uSistemaFunc.pas index fcce8117..a5749625 100644 --- a/Source/Base/Utiles/uSistemaFunc.pas +++ b/Source/Base/Utiles/uSistemaFunc.pas @@ -33,6 +33,8 @@ function DarFicheroTemporal : String; function DarFicheroJPGTemporal : String; function DarFicheroBMPTemporal : String; function DarFicheroTIFFTemporal : String; +function DarFicheroHTMLTemporal : String; +function DarFicheroExcelTemporal : String; function DarFicheroWordExportar (var Fichero : String) : Boolean; function DarVersionFichero (Executable : String) : String; function DarFechaFichero (Executable : String) : String; @@ -145,6 +147,22 @@ begin Result := Copy(Cadena, 0, (Length(Cadena)-3)) + 'bmp'; end; +function DarFicheroExcelTemporal : String; +var + Cadena : String; +begin + Cadena := DarFicheroTemporal; + Result := Copy(Cadena, 0, (Length(Cadena)-3)) + 'xls'; +end; + +function DarFicheroHTMLTemporal : String; +var + Cadena : String; +begin + Cadena := DarFicheroTemporal; + Result := Copy(Cadena, 0, (Length(Cadena)-3)) + 'html'; +end; + function DarFicheroJPGTemporal : String; var Cadena : String; diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 2d4ad558..ad5bddc4 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -75,42 +75,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ExpressPrinting System by Developer Express Inc. PluginSDK for Delphi 10 (Runtime) Microsoft Office 2000 Sample Automation Server Wrapper Components diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index e1a4ad76..0a198f1b 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,52 +58,52 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 9edf8834..dd33b20b 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -47,10 +47,6 @@ inherited fEditorDBItem: TfEditorDBItem TabOrder = 2 object pagGeneral: TTabSheet Caption = 'General' - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 end end inherited StatusBar: TJvStatusBar diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index df60793f..bed9fcaa 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase Left = 0 Top = 0 Width = 451 - Height = 68 + Height = 73 AutoSize = True ButtonWidth = 141 Caption = 'ToolBar1' @@ -42,30 +42,29 @@ inherited frViewDetallesBase: TfrViewDetallesBase Top = 0 Action = actSubir AutoSize = True - Wrap = True end object ToolButton4: TToolButton - Left = 0 - Top = 22 + Left = 184 + Top = 0 Action = actBajar AutoSize = True end object ToolButton14: TToolButton - Left = 56 - Top = 22 + Left = 240 + Top = 0 Action = FontEdit1 AutoSize = True Wrap = True end object FontName: TJvFontComboBox Left = 0 - Top = 44 + Top = 22 Width = 145 Height = 22 DroppedDownWidth = 145 MaxMRUCount = 0 FontName = 'Tahoma' - ItemIndex = 42 + ItemIndex = 43 Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg] Sorted = True TabOrder = 2 @@ -75,7 +74,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object FontSize: TEdit Left = 145 - Top = 44 + Top = 22 Width = 26 Height = 22 Hint = 'Font Size|Select font size' @@ -86,7 +85,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object UpDown1: TUpDown Left = 171 - Top = 44 + Top = 22 Width = 16 Height = 22 Associate = FontSize @@ -95,7 +94,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton13: TToolButton Left = 187 - Top = 44 + Top = 22 Width = 8 Caption = 'ToolButton13' ImageIndex = 10 @@ -103,64 +102,62 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton6: TToolButton Left = 195 - Top = 44 + Top = 22 Action = RichEditBold1 AutoSize = True end object ToolButton7: TToolButton Left = 261 - Top = 44 + Top = 22 Action = RichEditItalic1 AutoSize = True end object ToolButton8: TToolButton Left = 328 - Top = 44 + Top = 22 Action = RichEditUnderline1 AutoSize = True end object ToolButton12: TToolButton - Left = 411 - Top = 44 + Left = 0 + Top = 22 Width = 8 Caption = 'ToolButton12' ImageIndex = 10 + Wrap = True Style = tbsSeparator end object ToolButton9: TToolButton - Left = 419 - Top = 44 + Left = 0 + Top = 52 Action = RichEditAlignLeft1 AutoSize = True end object ToolButton10: TToolButton - Left = 564 - Top = 44 + Left = 145 + Top = 52 Action = RichEditAlignCenter1 AutoSize = True end object ToolButton11: TToolButton - Left = 689 - Top = 44 + Left = 270 + Top = 52 Action = RichEditAlignRight1 AutoSize = True end end object cxGrid: TcxGrid Left = 0 - Top = 94 + Top = 99 Width = 451 - Height = 210 + Height = 205 Align = alClient TabOrder = 1 LookAndFeel.Kind = lfStandard LookAndFeel.NativeStyle = True - ExplicitTop = 99 - ExplicitHeight = 205 object cxGridView: TcxGridDBTableView NavigatorButtons.ConfirmDelete = False FilterBox.Visible = fvNever - OnCustomDrawCell = cxGridViewCustomDrawCell OnEditing = cxGridViewEditing OnEditKeyDown = cxGridViewEditKeyDown OnEditValueChanged = cxGridViewEditValueChanged @@ -176,11 +173,10 @@ inherited frViewDetallesBase: TfrViewDetallesBase Kind = skSum end> DataController.Summary.SummaryGroups = <> - OptionsBehavior.AlwaysShowEditor = True OptionsBehavior.CellHints = True + OptionsBehavior.CopyCaptionsToClipboard = False OptionsBehavior.FocusCellOnTab = True OptionsBehavior.GoToNextCellOnEnter = True - OptionsBehavior.BestFitMaxRecordCount = 20 OptionsBehavior.FocusCellOnCycle = True OptionsCustomize.ColumnFiltering = False OptionsCustomize.ColumnGrouping = False @@ -193,6 +189,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase OptionsSelection.MultiSelect = True OptionsSelection.UnselectFocusedRecordOnExit = False OptionsView.CellEndEllipsis = True + OptionsView.NoDataToDisplayInfoText = '' OptionsView.CellAutoHeight = True OptionsView.ColumnAutoWidth = True OptionsView.GridLineColor = cl3DLight @@ -331,12 +328,11 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object TBXDock1: TTBXDock Left = 0 - Top = 68 + Top = 73 Width = 451 Height = 26 BackgroundOnToolbars = False UseParentBackground = True - ExplicitTop = 73 object TBXToolbar1: TTBXToolbar Left = 0 Top = 0 @@ -526,14 +522,20 @@ inherited frViewDetallesBase: TfrViewDetallesBase object actDetallesCortar: TAction Category = 'Editar' Caption = 'Cortar' + OnExecute = actDetallesCortarExecute + OnUpdate = actDetallesCortarUpdate end object actDetallesCopiar: TAction Category = 'Editar' Caption = 'Copiar' + OnExecute = actDetallesCopiarExecute + OnUpdate = actDetallesCopiarUpdate end object actDetallesPegar: TAction Category = 'Editar' Caption = 'Pegar' + OnExecute = actDetallesPegarExecute + OnUpdate = actDetallesPegarUpdate end object actAnadirCapitulo: TAction Category = 'Operaciones' @@ -563,6 +565,16 @@ inherited frViewDetallesBase: TfrViewDetallesBase OnExecute = actAnadirDescuentoExecute OnUpdate = actAnadirDescuentoUpdate end + object actExportar: TAction + Category = 'Editar' + Caption = 'Exportar a Microsoft Excel' + end + object actSeleccionarTodo: TAction + Category = 'Editar' + Caption = 'Seleccionar todo' + OnExecute = actSeleccionarTodoExecute + OnUpdate = actSeleccionarTodoUpdate + end end object DADataSource: TDADataSource Left = 8 @@ -944,19 +956,31 @@ inherited frViewDetallesBase: TfrViewDetallesBase PopupMenus = < item GridView = cxGridView - HitTypes = [gvhtCell] + HitTypes = [gvhtNone, gvhtCell, gvhtRecord, gvhtRowIndicator] Index = 0 - end - item - HitTypes = [] - Index = 1 + PopupMenu = GridGeneralPopupMenu end> Left = 112 Top = 136 end - object GridIndicatorPopupMenu: TPopupMenu + object GridGeneralPopupMenu: TPopupMenu Left = 144 Top = 136 + object Copiar1: TMenuItem + Action = actDetallesCortar + end + object Copiar2: TMenuItem + Action = actDetallesCopiar + end + object Pegar1: TMenuItem + Action = actDetallesPegar + end + object N3: TMenuItem + Caption = '-' + end + object Aadir2: TMenuItem + Action = actAnadir + end object Eliminar1: TMenuItem Action = actEliminar end @@ -969,5 +993,17 @@ inherited frViewDetallesBase: TfrViewDetallesBase object Bajar1: TMenuItem Action = actBajar end + object N4: TMenuItem + Caption = '-' + end + object Seleccionartodo1: TMenuItem + Action = actSeleccionarTodo + end + object Anchoautomtico2: TMenuItem + Action = actAnchoAutomatico + end + object ExportaraMicrosoftExcel1: TMenuItem + Action = actExportar + end end end diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas index 5971ceee..41ce3dfb 100644 --- a/Source/GUIBase/uViewDetallesBase.pas +++ b/Source/GUIBase/uViewDetallesBase.pas @@ -9,7 +9,8 @@ uses uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ImgList, PngImageList, cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, - uGridUtils, uControllerDetallesBase, cxCurrencyEdit, ExtCtrls, Grids, DBGrids, StdCtrls, + uGridStatusUtils, uControllerDetallesBase, cxCurrencyEdit, + ExtCtrls, Grids, DBGrids, StdCtrls, ExtActns, StdActns, cxRichEdit, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, @@ -27,9 +28,14 @@ type procedure ContraerTodo; procedure AjustarAncho; + procedure GotoFirst; + procedure GotoLast; + procedure SaveGridStatus; procedure RestoreGridStatus; + procedure SeleccionarTodo; + procedure BeginUpdate; procedure EndUpdate; @@ -128,11 +134,22 @@ type TBXItem16: TTBXItem; TBXSeparatorItem7: TTBXSeparatorItem; cxGridPopupMenu: TcxGridPopupMenu; - GridIndicatorPopupMenu: TPopupMenu; + GridGeneralPopupMenu: TPopupMenu; dsds1: TMenuItem; Bajar1: TMenuItem; Eliminar1: TMenuItem; N1: TMenuItem; + Copiar1: TMenuItem; + Copiar2: TMenuItem; + Pegar1: TMenuItem; + N3: TMenuItem; + Aadir2: TMenuItem; + N4: TMenuItem; + Anchoautomtico2: TMenuItem; + actExportar: TAction; + ExportaraMicrosoftExcel1: TMenuItem; + actSeleccionarTodo: TAction; + Seleccionartodo1: TMenuItem; procedure actAnadirExecute(Sender: TObject); procedure actEliminarExecute(Sender: TObject); procedure actSubirExecute(Sender: TObject); @@ -165,9 +182,6 @@ type procedure TBXItem13Click(Sender: TObject); procedure actAnchoAutomaticoExecute(Sender: TObject); procedure actAnchoAutomaticoUpdate(Sender: TObject); - procedure cxGridViewCustomDrawCell(Sender: TcxCustomGridTableView; - ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; - var ADone: Boolean); procedure actAnadirCapituloUpdate(Sender: TObject); procedure actAnadirTituloUpdate(Sender: TObject); procedure actAnadirSubtotalUpdate(Sender: TObject); @@ -176,6 +190,14 @@ type procedure actAnadirTituloExecute(Sender: TObject); procedure actAnadirSubtotalExecute(Sender: TObject); procedure actAnadirDescuentoExecute(Sender: TObject); + procedure actDetallesCopiarExecute(Sender: TObject); + procedure actDetallesCopiarUpdate(Sender: TObject); + procedure actDetallesPegarExecute(Sender: TObject); + procedure actSeleccionarTodoExecute(Sender: TObject); + procedure actSeleccionarTodoUpdate(Sender: TObject); + procedure actDetallesPegarUpdate(Sender: TObject); + procedure actDetallesCortarExecute(Sender: TObject); + procedure actDetallesCortarUpdate(Sender: TObject); private FController : IControllerDetallesBase; FDetalles: IDAStronglyTypedDataTable; @@ -190,9 +212,8 @@ type function GetDetalles: IDAStronglyTypedDataTable; procedure SetDetalles(const Value: IDAStronglyTypedDataTable); - function darPosicionCAMPO(const Nombre:String): Integer; - function darListaSeleccionados: TIntegerArray; - + function DarPosicionCAMPO(const Nombre:String): Integer; + function DarListaSeleccionados: TIntegerArray; protected function HayQueRecalcular(AItem: TcxCustomGridTableItem): Boolean; virtual; function EsTipoEditable(AItem: TcxCustomGridTableItem): Boolean; virtual; @@ -200,9 +221,11 @@ type function DarFuentePorDefecto(const ATipo : String = TIPO_DETALLE_CONCEPTO): TFont; virtual; function GetFocusedView : TcxGridDBTableView; virtual; function GetGrid : TcxGrid; virtual; - procedure SeleccionarRowActual; + procedure SeleccionarFilaActual; public + procedure GotoFirst; + procedure GotoLast; procedure BeginUpdate; procedure EndUpdate; procedure SaveGridStatus; @@ -210,20 +233,20 @@ type procedure ExpandirTodo; procedure ContraerTodo; procedure AjustarAncho; - function IsEmpty : Boolean; + procedure SeleccionarTodo; + function IsEmpty : Boolean; destructor Destroy; override; property _FocusedView : TcxGridDBTableView read GetFocusedView; property _Grid : TcxGrid read GetGrid; property Controller: IControllerDetallesBase read GetController write SetController; property Detalles: IDAStronglyTypedDataTable read GetDetalles write SetDetalles; - end; implementation {$R *.dfm} uses - uDMBase, uCalculosUtils, dxOffice11; + uDMBase, uCalculosUtils, dxOffice11, uSistemaFunc, uGridClipboardUtils; function EnumFontsProc(var LogFont: TLogFont; var TextMetric: TTextMetric; FontType: Integer; Data: Pointer): Integer; stdcall; @@ -239,29 +262,29 @@ var begin // Debo quitar el multiselect porque provoca que se quede seleccionado // el registro actual y no el nuevo registro que voy a añadir - bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect; + bEsMultiSelect := _FocusedView.OptionsSelection.MultiSelect; if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := False; + _FocusedView.OptionsSelection.MultiSelect := False; - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; if Assigned(Controller) and Assigned(FDetalles) then begin - Controller.add(FDetalles, TIPO_DETALLE_TITULO); - Controller.add(FDetalles, TIPO_DETALLE_CONCEPTO); - Controller.add(FDetalles, TIPO_DETALLE_CONCEPTO); - Controller.add(FDetalles, TIPO_DETALLE_SUBTOTAL); + Controller.Add(FDetalles, TIPO_DETALLE_TITULO); + Controller.Add(FDetalles, TIPO_DETALLE_CONCEPTO); + Controller.Add(FDetalles, TIPO_DETALLE_CONCEPTO); + Controller.Add(FDetalles, TIPO_DETALLE_SUBTOTAL); // Controller.add(FDetalles, TIPO_DETALLE_DESCUENTO); end; finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; // Dejo la propiedad MultiSelect como estaba if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect; + _FocusedView.OptionsSelection.MultiSelect := bEsMultiSelect; end; end; @@ -279,22 +302,21 @@ begin // el registro actual y no el nuevo registro que voy a añadir bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect; if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := False; + _FocusedView.OptionsSelection.MultiSelect := False; - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; - if Assigned(Controller) - and Assigned(FDetalles) then - Controller.add(FDetalles, TIPO_DETALLE_DESCUENTO); + if Assigned(Controller) and Assigned(FDetalles) then + Controller.Add(FDetalles, TIPO_DETALLE_DESCUENTO); finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; // Dejo la propiedad MultiSelect como estaba if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect; + _FocusedView.OptionsSelection.MultiSelect := bEsMultiSelect; end; end; @@ -312,21 +334,21 @@ begin // el registro actual y no el nuevo registro que voy a añadir bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect; if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := False; + _FocusedView.OptionsSelection.MultiSelect := False; - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; if Assigned(Controller) and Assigned(FDetalles) then Controller.Add(FDetalles, TIPO_DETALLE_CONCEPTO); finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; // Dejo la propiedad MultiSelect como estaba if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect; + _FocusedView.OptionsSelection.MultiSelect := bEsMultiSelect; end; end; @@ -338,21 +360,21 @@ begin // el registro actual y no el nuevo registro que voy a añadir bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect; if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := False; + _FocusedView.OptionsSelection.MultiSelect := False; - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; if Assigned(Controller) and Assigned(FDetalles) then - Controller.add(FDetalles, TIPO_DETALLE_SUBTOTAL); + Controller.Add(FDetalles, TIPO_DETALLE_SUBTOTAL); finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; // Dejo la propiedad MultiSelect como estaba if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect; + _FocusedView.OptionsSelection.MultiSelect := bEsMultiSelect; end; end; @@ -372,19 +394,19 @@ begin if bEsMultiSelect then cxGridView.OptionsSelection.MultiSelect := False; - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; if Assigned(Controller) and Assigned(FDetalles) then - Controller.add(FDetalles, TIPO_DETALLE_TITULO); + Controller.Add(FDetalles, TIPO_DETALLE_TITULO); finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; // Dejo la propiedad MultiSelect como estaba if bEsMultiSelect then - cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect; + _FocusedView.OptionsSelection.MultiSelect := bEsMultiSelect; end; end; @@ -399,17 +421,16 @@ var AuxTop, AuxRow:Integer; begin - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if Assigned(Controller) - and Assigned(FDetalles) then + if Assigned(Controller) and Assigned(FDetalles) then begin AuxTop := cxGridView.Controller.TopRowIndex; AuxRow := cxGridView.DataController.FocusedRowIndex; - Controller.delete(FDetalles, darListaSeleccionados); + Controller.Delete(FDetalles, darListaSeleccionados); - if(FDetalles.RecordCount > 0) then + if (FDetalles.RecordCount > 0) then begin //Selecciona en el grid el registro siguiente if (AuxRow < cxGridView.DataController.RowCount-1) then @@ -417,15 +438,15 @@ begin else Dec(AuxRow); - cxGridView.DataController.SelectRows(AuxRow,AuxRow); - cxGridView.Controller.TopRowIndex := AuxTop; + _FocusedView.DataController.SelectRows(AuxRow,AuxRow); + _FocusedView.Controller.TopRowIndex := AuxTop; end; end finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; end; - SeleccionarRowActual; + SeleccionarFilaActual; end; procedure TfrViewDetallesBase.actEliminarUpdate(Sender: TObject); @@ -440,11 +461,11 @@ end; procedure TfrViewDetallesBase.actSubirUpdate(Sender: TObject); begin inherited; - if not Assigned(cxGridView.Controller.FocusedRow) then + if not Assigned(_FocusedView.Controller.FocusedRow) then (Sender as TAction).Enabled := False else (Sender as TAction).Enabled := (not ReadOnly) - and (not cxGridView.Controller.FocusedRow.IsFirst) + and (not _FocusedView.Controller.FocusedRow.IsFirst) end; procedure TfrViewDetallesBase.AjustarAncho; @@ -510,63 +531,6 @@ begin CurEdit := Nil; end; -procedure TfrViewDetallesBase.cxGridViewCustomDrawCell( - Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; - AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); -{var - R : TRect; - sVal : String ; - iFlag : Integer ;} -begin -{ R := AViewInfo.Bounds; - FillGradientRect(ACanvas.Handle, R, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False); - if AViewInfo.GridRecord.Values[TcxGridDBColumn(AViewInfo.Item).Index] <> Null then - begin - sVal := AViewInfo.GridRecord.Values[TcxGridDBColumn(AViewInfo.Item).Index]; - Dec(R.Right); - Inc(R.Left); - case TcxGridDBColumn(AViewInfo.Item).HeaderAlignmentHorz Of - taLeftJustify: iFlag := cxAlignLeft ; - taRightJustify: iFlag := cxAlignRight ; - taCenter: iFlag := cxAlignCenter ; - end;} - {// Draw text transparently - ACanvas.Brush.Style := bsClear ; - ACanvas.DrawTexT(sVal, r, cxAlignVCenter or iFlag);} -// end; - //ADone := True ; -end; - - -{var - ATipo : String; -begin - inherited; - - if not AViewInfo.Selected then - begin - - end; - - ATipo := DarTipoConcepto(AViewInfo.GridRecord); - if (ATipo = TIPO_DETALLE_SUBTOTAL) and - not (AViewInfo.Item.Index in [cxGridViewTIPO.Index, cxGridViewVISIBLE.Index]) then - begin - AViewInfo.EditViewInfo.Paint(ACanvas); - AViewInfo.Item.Focused - if not AViewInfo.Item.FocusWithSelection then - FillGradientRect(ACanvas.Handle, AViewInfo.Bounds, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False); - ACanvas.DrawComplexFrame(AViewInfo.Bounds, clBtnShadow, clBtnShadow, [bTop], 1); - ADone := True; - end - else begin - AViewInfo.EditViewInfo.Paint(ACanvas); - if not AViewInfo.Item.FocusWithSelection then - FillGradientRect(ACanvas.Handle, AViewInfo.Bounds, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False); - ADone := True; - end; -end;} - procedure TfrViewDetallesBase.cxGridViewEditing(Sender: TcxCustomGridTableView; AItem: TcxCustomGridTableItem; var AAllow: Boolean); begin @@ -867,6 +831,18 @@ begin Result := cxGrid; end; +procedure TfrViewDetallesBase.GotoFirst; +begin + if Assigned(_FocusedView) then + _FocusedView.DataController.GotoFirst; +end; + +procedure TfrViewDetallesBase.GotoLast; +begin + if Assigned(_FocusedView) then + _FocusedView.DataController.GotoLast; +end; + function TfrViewDetallesBase.HayQueRecalcular(AItem: TcxCustomGridTableItem): Boolean; begin Result := (AItem = cxGridViewTIPO) @@ -906,7 +882,7 @@ begin FGridStatus := TcxGridStatus.Create(_FocusedView); end; -procedure TfrViewDetallesBase.SeleccionarRowActual; +procedure TfrViewDetallesBase.SeleccionarFilaActual; begin //Quitamos lo que hubiera seleccionado cxGrid.ActiveView.DataController.ClearSelection; @@ -915,6 +891,14 @@ begin SelectRows(GetFocusedRowIndex,GetFocusedRowIndex); end; +procedure TfrViewDetallesBase.SeleccionarTodo; +begin + if Assigned(_FocusedView) then + begin + _FocusedView.Controller.SelectAll; + end; +end; + procedure TfrViewDetallesBase.SetController(const Value: IControllerDetallesBase); var AListaValores : TStringList; @@ -969,9 +953,8 @@ end; procedure TfrViewDetallesBase.TBXItem13Click(Sender: TObject); begin inherited; - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; - + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; end; procedure TfrViewDetallesBase.actAnadirUpdate(Sender: TObject); @@ -983,7 +966,7 @@ end; procedure TfrViewDetallesBase.actAnchoAutomaticoExecute(Sender: TObject); begin inherited; - cxGridView.ApplyBestFit; + AjustarAncho end; procedure TfrViewDetallesBase.actAnchoAutomaticoUpdate(Sender: TObject); @@ -994,16 +977,15 @@ end; procedure TfrViewDetallesBase.actBajarExecute(Sender: TObject); begin - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; - if Assigned(Controller) - and Assigned(FDetalles) then + if Assigned(Controller) and Assigned(FDetalles) then Controller.move(FDetalles, darListaSeleccionados, 1); finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; end; end; @@ -1017,17 +999,81 @@ begin and (not cxGridView.Controller.FocusedRow.IsLast) end; +procedure TfrViewDetallesBase.actDetallesCopiarExecute(Sender: TObject); +begin + ShowHourglassCursor; + try + CopiarSeleccionGridAlPortapapeles(_Grid); + finally + HideHourglassCursor; + end; +end; + +procedure TfrViewDetallesBase.actDetallesCopiarUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := Assigned(cxGridView.Controller.FocusedRow) +end; + +procedure TfrViewDetallesBase.actDetallesCortarExecute(Sender: TObject); +begin + ShowHourglassCursor; + try + CortarSeleccionGridAlPortapapeles(_Grid); + finally + HideHourglassCursor; + end; +end; + +procedure TfrViewDetallesBase.actDetallesCortarUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := Assigned(cxGridView.Controller.FocusedRow) +end; + +procedure TfrViewDetallesBase.actDetallesPegarExecute(Sender: TObject); +var + i : Integer; + AIndex : Integer; + ADataSet : TDataSet; +begin + ShowHourglassCursor; + try + PegarSeleccionGridDesdePortapapeles(_Grid); + finally + HideHourglassCursor; + end; +end; + +procedure TfrViewDetallesBase.actDetallesPegarUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := HayDatosEnPortapapeles; +end; + +procedure TfrViewDetallesBase.actSeleccionarTodoExecute(Sender: TObject); +begin + inherited; + SeleccionarTodo; +end; + +procedure TfrViewDetallesBase.actSeleccionarTodoUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := Assigned(DADataSource.DataTable); +end; + procedure TfrViewDetallesBase.actSubirExecute(Sender: TObject); begin - cxGridView.BeginUpdate; + _FocusedView.BeginUpdate; try - if cxGridView.Controller.EditingController.IsEditing then - cxGridView.Controller.EditingController.Edit.PostEditValue; + if _FocusedView.Controller.EditingController.IsEditing then + _FocusedView.Controller.EditingController.Edit.PostEditValue; if Assigned(Controller) and Assigned(FDetalles) then Controller.Move(FDetalles, DarListaSeleccionados, -1); finally - cxGridView.EndUpdate; + _FocusedView.EndUpdate; end; end; diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index 142eeb36..061bb902 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -178,7 +178,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39588.971240405100000000 + ReportDocument.CreationDate = 39594.399142789350000000 StyleManager = dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas index c4adffbe..034d6e5f 100644 --- a/Source/GUIBase/uViewGrid.pas +++ b/Source/GUIBase/uViewGrid.pas @@ -89,7 +89,7 @@ type procedure SetViewFiltros(const Value: IViewFiltroBase); override; function AddFilterGrid(const Operacion: tcxFilterBoolOperatorKind): TcxFilterCriteriaItemList; public - function esSeleccionCeldaDatos: Boolean; override; + function EsSeleccionCeldaDatos: Boolean; override; procedure Preview; override; procedure Print; override; constructor Create(AOwner: TComponent); override; diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas index 224cd640..e0c9e06d 100644 --- a/Source/GUIBase/uViewGridBase.pas +++ b/Source/GUIBase/uViewGridBase.pas @@ -16,7 +16,7 @@ uses cxDataStorage, cxEdit, DB, cxDBData, uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, Menus, ActnList, Grids, - DBGrids, JvComponent, JvFormAutoSize, uGridUtils, uViewFiltroBase, + DBGrids, JvComponent, JvFormAutoSize, uGridStatusUtils, uViewFiltroBase, uDAInterfaces; type diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm index 30d7c35b..9c6c5d27 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm @@ -160,10 +160,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente Left = 0 Top = 0 @@ -196,12 +192,14 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitLeft = 278 ExplicitTop = 0 end - inherited ToolButton14: TToolButton [4] + inherited ToolButton14: TToolButton Left = 334 Top = 0 + Wrap = False ExplicitLeft = 334 + ExplicitTop = 0 end - inherited FontName: TJvFontComboBox [5] + inherited FontName: TJvFontComboBox Left = 399 Top = 0 ExplicitLeft = 399 @@ -213,13 +211,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitLeft = 544 ExplicitTop = 0 end - inherited UpDown1: TUpDown - Left = 586 - Top = 0 - ExplicitLeft = 586 - ExplicitTop = 0 - end - inherited ToolButton13: TToolButton + inherited ToolButton13: TToolButton [7] Left = 0 Top = 0 Wrap = True @@ -227,49 +219,52 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitTop = 0 ExplicitHeight = 30 end - inherited ToolButton6: TToolButton [9] + inherited UpDown1: TUpDown [8] Left = 0 Top = 30 ExplicitLeft = 0 ExplicitTop = 30 end - inherited ToolButton7: TToolButton [10] - Left = 66 + inherited ToolButton6: TToolButton + Left = 17 Top = 30 - Wrap = False - ExplicitLeft = 66 + ExplicitLeft = 17 ExplicitTop = 30 end - inherited ToolButton8: TToolButton [11] - Left = 133 + inherited ToolButton7: TToolButton + Left = 83 Top = 30 - ExplicitLeft = 133 + ExplicitLeft = 83 ExplicitTop = 30 end - inherited ToolButton12: TToolButton [12] - Left = 216 + inherited ToolButton8: TToolButton + Left = 150 Top = 30 - Wrap = False - ExplicitLeft = 216 - ExplicitTop = 30 - ExplicitHeight = 22 - end - inherited ToolButton9: TToolButton [13] - Left = 224 - Top = 30 - ExplicitLeft = 224 + ExplicitLeft = 150 ExplicitTop = 30 end - inherited ToolButton10: TToolButton [14] - Left = 369 + inherited ToolButton12: TToolButton + Left = 233 Top = 30 - ExplicitLeft = 369 + ExplicitLeft = 233 ExplicitTop = 30 end - inherited ToolButton11: TToolButton [15] - Left = 494 + inherited ToolButton9: TToolButton + Left = 241 Top = 30 - ExplicitLeft = 494 + ExplicitLeft = 241 + ExplicitTop = 30 + end + inherited ToolButton10: TToolButton + Left = 386 + Top = 30 + ExplicitLeft = 386 + ExplicitTop = 30 + end + inherited ToolButton11: TToolButton + Left = 511 + Top = 30 + ExplicitLeft = 511 ExplicitTop = 30 end end @@ -277,40 +272,24 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Top = 77 Width = 751 Height = 301 - ExplicitTop = 72 + ExplicitTop = 77 ExplicitWidth = 751 - ExplicitHeight = 306 + ExplicitHeight = 301 end inherited TBXDock1: TTBXDock Top = 51 Width = 751 ExplicitTop = 51 - ExplicitWidth = 757 + ExplicitWidth = 751 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 626 end end - inherited cxGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewDetallesAlbaranCliente1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end - item - HitTypes = [] - Index = 1 - end> - end end end object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 @@ -329,7 +308,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitHeight = 378 inherited pnlSup: TPanel Width = 751 - ExplicitWidth = 757 + ExplicitWidth = 751 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end @@ -419,8 +398,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 164 ExplicitTop = 112 - ExplicitWidth = 93 - Width = 93 + ExplicitWidth = 188 + Width = 188 end inherited ImporteIVA: TcxDBCurrencyEdit Left = 555 @@ -433,8 +412,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 555 ExplicitTop = 38 - ExplicitWidth = 137 - Width = 137 + ExplicitWidth = 182 + Width = 182 end inherited ImporteTotal: TcxDBCurrencyEdit Left = 485 @@ -446,8 +425,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 485 ExplicitTop = 112 - ExplicitWidth = 137 - Width = 137 + ExplicitWidth = 252 + Width = 252 end inherited edtDescuento: TcxDBSpinEdit Left = 93 @@ -482,8 +461,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 484 ExplicitTop = 11 - ExplicitWidth = 92 - Width = 92 + ExplicitWidth = 253 + Width = 253 end inherited edtRE: TcxDBSpinEdit Left = 484 @@ -508,8 +487,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 555 ExplicitTop = 65 - ExplicitWidth = 56 - Width = 56 + ExplicitWidth = 182 + Width = 182 end inherited eImporteNeto: TcxDBCurrencyEdit Left = 93 @@ -521,8 +500,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 93 ExplicitTop = 11 - ExplicitWidth = 147 - Width = 147 + ExplicitWidth = 259 + Width = 259 end inherited ePorte: TcxDBCurrencyEdit Left = 93 @@ -535,8 +514,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 93 ExplicitTop = 139 - ExplicitWidth = 147 - Width = 147 + ExplicitWidth = 259 + Width = 259 end inherited eIVA: TcxDBLookupComboBox Left = 93 @@ -548,8 +527,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 93 ExplicitTop = 38 - ExplicitWidth = 81 - Width = 81 + ExplicitWidth = 121 + Width = 121 end inherited bTiposIVA: TButton Left = 220 @@ -568,8 +547,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 93 ExplicitTop = 65 - ExplicitWidth = 219 - Width = 219 + ExplicitWidth = 259 + Width = 259 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm index e66add9d..d909e772 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm @@ -135,18 +135,6 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Top = 51 ExplicitWidth = 751 end - inherited cxGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewDetallesAlbaranCliente1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end - item - HitTypes = [] - Index = 1 - end> - end end end inherited pagInicidencias: TTabSheet diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas index 9a812e59..662bcab1 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas @@ -88,7 +88,7 @@ uses // uFacturasClienteController, uBizFacturasCliente, uGenerarFacturasCliAlbCliUtils, // uInventarioController, uGenerarAlbaranesCliUtils, uEditorBase, - cxCustomData, uGridUtils, uDBSelectionListUtils; + cxCustomData, uGridStatusUtils, uDBSelectionListUtils; {$R *.dfm} diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas index 4ce9e0a5..56103f16 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas @@ -43,7 +43,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uEditorBase, uAlbaranesClienteController, cxGridLevel; + uGridStatusUtils, uEditorBase, uAlbaranesClienteController, cxGridLevel; {$R *.dfm} diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index 8ab0b4df..6b9296aa 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -1,21 +1,23 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente - Width = 822 + Width = 903 Height = 550 OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy - ExplicitWidth = 822 + ExplicitWidth = 903 ExplicitHeight = 550 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 822 + Width = 903 Height = 550 Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] + ExplicitWidth = 822 DesignSize = ( - 822 + 903 550) object Label1: TLabel Left = 22 @@ -40,21 +42,25 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.Shadow = False Style.ButtonStyle = bts3D Style.ButtonTransparency = ebtNone Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 - Width = 119 + Width = 294 end object memObservaciones: TcxDBMemo - Left = 440 + Left = 482 Top = 387 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' @@ -64,12 +70,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 21 - Height = 253 - Width = 186 + Height = 141 + Width = 360 end object eReferencia: TcxDBTextEdit Left = 116 @@ -86,21 +96,25 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.Color = clMenuBar StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 - Width = 143 + Width = 294 end inline frViewClienteAlbaran: TfrViewDatosYSeleccionCliente - Left = 440 + Left = 482 Top = 28 - Width = 350 + Width = 360 Height = 212 Align = alTop AutoSize = True @@ -112,37 +126,63 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente ParentFont = False TabOrder = 17 ReadOnly = False - ExplicitLeft = 440 + ExplicitLeft = 482 ExplicitTop = 28 + ExplicitWidth = 360 inherited dxLayoutControl1: TdxLayoutControl + Width = 360 Align = alTop inherited edtlNombre: TcxDBTextEdit - ExplicitWidth = 224 - Width = 224 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 286 + Width = 286 end inherited edtNIFCIF: TcxDBTextEdit - ExplicitWidth = 562 - Width = 562 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 286 + Width = 286 end inherited edtCalle: TcxDBTextEdit - ExplicitWidth = 562 - Width = 562 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 286 + Width = 286 end inherited edtPoblacion: TcxDBTextEdit - ExplicitWidth = 177 - Width = 177 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 168 + Width = 168 end inherited edtProvincia: TcxDBTextEdit - ExplicitWidth = 327 - Width = 327 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 286 + Width = 286 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 268 - ExplicitLeft = 268 + Left = 307 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 307 end inherited Button3: TBitBtn - Left = 158 - ExplicitLeft = 158 + Left = 197 + ExplicitLeft = 197 end end inherited DADataSource: TDADataSource @@ -172,14 +212,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 8 - Width = 263 + Width = 294 end object ePoblacion: TcxDBTextEdit Left = 116 @@ -191,17 +235,21 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 - Width = 162 + Width = 193 end object eCodigoPostal: TcxDBTextEdit - Left = 345 + Left = 387 Top = 251 DataBinding.DataField = 'CODIGO_POSTAL' DataBinding.DataSource = DADataSource @@ -210,12 +258,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 Width = 65 end @@ -229,14 +281,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 - Width = 263 + Width = 294 end object ePersonaContacto: TcxDBTextEdit Left = 116 @@ -249,14 +305,18 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 12 - Width = 84 + Width = 294 end object eTlfTrabajo: TcxDBTextEdit Left = 116 @@ -268,17 +328,21 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 13 - Width = 122 + Width = 294 end object bElegirDireccion: TBitBtn - Left = 238 + Left = 280 Top = 359 Width = 172 Height = 23 @@ -287,7 +351,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente TabOrder = 14 end object Button1: TButton - Left = 278 + Left = 320 Top = 138 Width = 132 Height = 23 @@ -307,15 +371,19 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 5 - Width = 16 + Width = 156 end object cbFormaPago: TcxDBLookupComboBox Left = 116 @@ -336,19 +404,23 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 3 - Width = 32 + Width = 156 end object bFormasPago: TButton - Left = 278 + Left = 320 Top = 109 Width = 132 Height = 23 @@ -357,7 +429,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente OnClick = bFormasPagoClick end object eFechaRecepcion: TcxDBDateEdit - Left = 574 + Left = 616 Top = 330 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_RECEPCION' @@ -370,16 +442,20 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 20 - Width = 123 + Width = 226 end object cbConAlmacen: TCheckBox Left = 32 @@ -409,16 +485,20 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 16 - Width = 69 + Width = 193 end object eRefFacturaCli: TcxDBTextEdit Left = 116 @@ -435,19 +515,23 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.Color = clMenuBar StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 7 - Width = 207 + Width = 294 end object eFechaPrevista: TcxDBDateEdit - Left = 574 + Left = 616 Top = 276 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_PREVISTA_ENVIO' @@ -460,18 +544,22 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.Shadow = False Style.ButtonStyle = bts3D Style.ButtonTransparency = ebtNone Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 18 - Width = 122 + Width = 226 end object eRefCliente: TcxDBTextEdit Left = 116 @@ -487,19 +575,23 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.Color = clMenuBar StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 - Width = 284 + Width = 294 end object eFechaEnvio: TcxDBDateEdit - Left = 574 + Left = 616 Top = 303 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_ENVIO' @@ -512,16 +604,20 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 19 - Width = 217 + Width = 226 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas index 6ec24540..19014478 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas @@ -15,7 +15,13 @@ uses // uBizPedidosCliente, uPedidosClienteController, ExtCtrls, cxLookupEdit, cxDBLookupEdit, uBizFormasPago, - cxDBLookupComboBox, uFormasPagoController, uAlmacenesController, uDAInterfaces; + cxDBLookupComboBox, uFormasPagoController, uAlmacenesController, uDAInterfaces, + dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, + dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter; type IViewAlbaranCliente = interface(IViewBase) diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm index 9836f313..fc6cac92 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm @@ -5,97 +5,146 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente ExplicitWidth = 299 end inherited edtFechaAlbaran: TcxDBDateEdit - ExplicitWidth = 119 - Width = 119 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited memObservaciones: TcxDBMemo - ExplicitWidth = 186 - ExplicitHeight = 253 - Height = 253 - Width = 186 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eReferencia: TcxDBTextEdit - ExplicitWidth = 143 - Width = 143 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited frViewClienteAlbaran: TfrViewDatosYSeleccionCliente - Width = 350 - ExplicitWidth = 350 inherited dxLayoutControl1: TdxLayoutControl - Width = 350 inherited edtlNombre: TcxDBTextEdit - ExplicitWidth = 224 - Width = 224 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtNIFCIF: TcxDBTextEdit - ExplicitWidth = 562 - Width = 562 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtCalle: TcxDBTextEdit - ExplicitWidth = 562 - Width = 562 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtPoblacion: TcxDBTextEdit - ExplicitWidth = 177 - Width = 177 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtProvincia: TcxDBTextEdit - ExplicitWidth = 327 - Width = 327 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtCodigoPostal: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end end end inherited eCalle: TcxDBTextEdit - ExplicitWidth = 263 - Width = 263 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited ePoblacion: TcxDBTextEdit - ExplicitWidth = 162 - Width = 162 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited eCodigoPostal: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eProvincia: TcxDBTextEdit - ExplicitWidth = 263 - Width = 263 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited ePersonaContacto: TcxDBTextEdit - ExplicitWidth = 84 - Width = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eTlfTrabajo: TcxDBTextEdit - ExplicitWidth = 122 - Width = 122 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eReferenciaPedidoCli: TcxTextEdit - ExplicitWidth = 16 - Width = 16 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited cbFormaPago: TcxDBLookupComboBox - ExplicitWidth = 32 - Width = 32 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eFechaRecepcion: TcxDBDateEdit - ExplicitWidth = 123 - Width = 123 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited cbAlmacen: TcxDBLookupComboBox - ExplicitWidth = 69 - Width = 69 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eRefFacturaCli: TcxDBTextEdit - ExplicitWidth = 207 - Width = 207 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eFechaPrevista: TcxDBDateEdit - ExplicitWidth = 122 - Width = 122 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eRefCliente: TcxDBTextEdit - ExplicitWidth = 284 - Width = 284 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eFechaEnvio: TcxDBDateEdit - ExplicitWidth = 217 - Width = 217 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group6: TdxLayoutGroup diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas index 0156044a..1cdc81dc 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas @@ -8,7 +8,13 @@ uses dxLayoutControl, StdCtrls, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxTextEdit, Buttons, uCustomView, uViewBase, uViewDatosYSeleccionCliente, cxDBEdit, cxMemo, cxContainer, cxEdit, - cxMaskEdit, cxCalendar, cxControls, uDAInterfaces; + cxMaskEdit, cxCalendar, cxControls, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinsdxLCPainter; type TfrViewAlbaranDevCliente = class(TfrViewAlbaranCliente) diff --git a/Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.cfg b/Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.cfg new file mode 100644 index 00000000..5aa842f2 --- /dev/null +++ b/Source/Modulos/Albaranes de proveedor/Plugin/AlbaranesProveedor_plugin.cfg @@ -0,0 +1,40 @@ +-$A8 +-$B- +-$C+ +-$D- +-$E- +-$F- +-$G+ +-$H+ +-$I+ +-$J- +-$K- +-$L- +-$M- +-$N+ +-$O+ +-$P+ +-$Q- +-$R- +-$S- +-$T- +-$U- +-$V+ +-$W- +-$X+ +-$Y- +-$Z1 +-cg +-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; +-H+ +-W+ +-$M16384,1048576 +-K$00400000 +-E"C:\Codigo Tecsitel\Output\Debug" +-LE"C:\Codigo Tecsitel\Output\Debug\Cliente" +-LN"C:\Codigo Tecsitel\Source\Modulos\Lib" +-U..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-O..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-I..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-R..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-GD diff --git a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.cfg b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.cfg new file mode 100644 index 00000000..5aa842f2 --- /dev/null +++ b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.cfg @@ -0,0 +1,40 @@ +-$A8 +-$B- +-$C+ +-$D- +-$E- +-$F- +-$G+ +-$H+ +-$I+ +-$J- +-$K- +-$L- +-$M- +-$N+ +-$O+ +-$P+ +-$Q- +-$R- +-$S- +-$T- +-$U- +-$V+ +-$W- +-$X+ +-$Y- +-$Z1 +-cg +-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; +-H+ +-W+ +-$M16384,1048576 +-K$00400000 +-E"C:\Codigo Tecsitel\Output\Debug" +-LE"C:\Codigo Tecsitel\Output\Debug\Cliente" +-LN"C:\Codigo Tecsitel\Source\Modulos\Lib" +-U..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-O..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-I..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-R..\..\..\Lib;..\..\Lib;"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-GD diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm index 402c1e3c..ff88d54d 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm @@ -156,18 +156,6 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor inherited TBXDock1: TTBXDock Top = 73 end - inherited cxGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewDetallesAlbaranProveedor1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end - item - HitTypes = [] - Index = 1 - end> - end end end inherited pagInicidencias: TTabSheet diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm index 31e9cd28..f2e5df28 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm @@ -248,18 +248,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ExplicitWidth = 626 end end - inherited cxGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewDetallesAlbaranProveedor1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end - item - HitTypes = [] - Index = 1 - end> - end end end object pagInicidencias: TTabSheet diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas index 230b8d68..bfbc2fb4 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas @@ -62,7 +62,7 @@ uses uDataModuleAlbaranesProveedor, uDataModuleUsuarios, uFactuGES_App, // uGenerarFacturasProvAlbProvUtils, uGenerarAlbaranesProvUtils, uEditorBase, schAlbaranesProveedorClient_Intf, - uGridUtils, uDBSelectionListUtils; + uGridStatusUtils, uDBSelectionListUtils; {$R *.dfm} diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas index 2fb48f47..4ebafb18 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas @@ -44,7 +44,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uEditorBase, uAlbaranesProveedorController; + uGridStatusUtils, uEditorBase, uAlbaranesProveedorController; {$R *.dfm} diff --git a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm index 5ce915d4..d1cfe5be 100644 --- a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm +++ b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.dfm @@ -147,14 +147,6 @@ inherited fEditorAlmacenes: TfEditorAlmacenes BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewAlmacenes1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] inherited actNuevo: TAction diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj index 37cc317b..b872dd49 100644 --- a/Source/Modulos/Articulos/Views/Articulos_view.dproj +++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj @@ -55,13 +55,13 @@ MainSource - - - - - - - + + + + + + +
fEditorArticulo
diff --git a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas index b23cfa4d..60656fbe 100644 --- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas +++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas @@ -44,7 +44,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uEditorBase, uArticulosController; + uGridStatusUtils, uEditorBase, uArticulosController; {$R *.dfm} diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm index 5a9b2015..ec531108 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm @@ -46,6 +46,8 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos end end inherited cxGrid: TcxGrid + ExplicitTop = 99 + ExplicitWidth = 935 ExplicitHeight = 205 inherited cxGridView: TcxGridDBTableView inherited cxGridViewTIPO: TcxGridDBColumn @@ -135,6 +137,8 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos end end inherited TBXDock1: TTBXDock + ExplicitTop = 73 + ExplicitWidth = 935 inherited TBXToolbar1: TTBXToolbar inherited TBXSubmenuItem1: TTBXSubmenuItem object TBXSeparatorItem8: TTBXSeparatorItem [4] diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas index b1267423..3822d4b6 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas @@ -80,7 +80,7 @@ begin cxGridView.EndUpdate; end; - SeleccionarRowActual; + SeleccionarFilaActual; end; procedure TfrViewDetallesArticulos.AnadirArticulosInterno; @@ -141,7 +141,7 @@ begin end; end; - SeleccionarRowActual; + SeleccionarFilaActual; end; procedure TfrViewDetallesArticulos.cxGridViewREFERENCIAPropertiesButtonClick( @@ -271,7 +271,7 @@ begin cxGridView.EndUpdate; end; - SeleccionarRowActual; + SeleccionarFilaActual; end; procedure TfrViewDetallesArticulos.actBuscarArticuloUpdate(Sender: TObject); diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index f32655ea..78579ed8 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -163,14 +163,6 @@ inherited fEditorClientes: TfEditorClientes BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewClientes1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas index 36bdd6da..91a078e1 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorClientes.pas @@ -34,7 +34,7 @@ type implementation uses - uGridUtils, uDataModuleContactos, uDMBase, uEditorGridBase, uBizContactos, + uGridStatusUtils, uDataModuleContactos, uDMBase, uEditorGridBase, uBizContactos, uDBSelectionListUtils, uDataModuleUsuarios, uDialogUtils, uFactuGES_App, uGruposClienteController, uBizGruposCliente, uClientesController; diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm index ddb12780..07ca46d4 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm @@ -219,14 +219,6 @@ inherited fEditorElegirClientes: TfEditorElegirClientes BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewClientes1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas index 05b933f9..cb468650 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas @@ -45,7 +45,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uEditorContactos, - uGridUtils, uEditorBase, cxControls, uDBSelectionListUtils, + uGridStatusUtils, uEditorBase, cxControls, uDBSelectionListUtils, uDialogUtils; {$R *.dfm} diff --git a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm index 4d82858a..05438996 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm @@ -221,14 +221,6 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewProveedores1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas index 3c2c1abe..7b3d16b9 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas +++ b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas @@ -44,7 +44,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uEditorContactos, - uGridUtils, uEditorBase, cxControls, uDBSelectionListUtils; + uGridStatusUtils, uEditorBase, cxControls, uDBSelectionListUtils; {$R *.dfm} diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm index 32a013f8..23b28d8b 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm +++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm @@ -167,14 +167,6 @@ inherited fEditorEmpleados: TfEditorEmpleados BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewEmpleados1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] Left = 72 diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas index 1bcd08b6..9d1fdc00 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleados.pas +++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.pas @@ -32,7 +32,7 @@ type implementation uses - uGridUtils, uEditorGridBase, uDataModuleUsuarios, uDialogUtils, uBizContactos, + uGridStatusUtils, uEditorGridBase, uDataModuleUsuarios, uDialogUtils, uBizContactos, uEmpleadosController, uDBSelectionListUtils, uFactuGES_App; {$R *.dfm} diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm index f31b0477..8783fdcd 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm @@ -142,14 +142,6 @@ inherited fEditorProveedores: TfEditorProveedores BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewProveedores1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.pas b/Source/Modulos/Contactos/Views/uEditorProveedores.pas index c3f7309a..191e25c6 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedores.pas +++ b/Source/Modulos/Contactos/Views/uEditorProveedores.pas @@ -31,7 +31,7 @@ type implementation uses - uGridUtils, uEditorGridBase, uDataModuleUsuarios, uDialogUtils, uBizContactos, + uGridStatusUtils, uEditorGridBase, uDataModuleUsuarios, uDialogUtils, uBizContactos, uDBSelectionListUtils, uProveedoresController, uFactuGES_App; {$R *.dfm} diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm index 6eeb2d58..bab1546c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm @@ -224,14 +224,6 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewFacturasCliente1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas index 71cfe3b0..a85b6f1c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas @@ -70,7 +70,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uDialogUtils, uEditorBase, uFacturasClienteController, uDateUtils; + uGridStatusUtils, uDialogUtils, uEditorBase, uFacturasClienteController, uDateUtils; {$R *.dfm} diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 8c26c33d..4e3d4092 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -343,15 +343,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 702 end end - inherited cxGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewDetallesFacturaCliente1.cxGridView - HitTypes = [gvhtNone, gvhtCell, gvhtRecord, gvhtRowIndicator] - Index = 0 - PopupMenu = frViewDetallesFacturaCliente1.GridGeneralPopupMenu - end> - end end end end diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm index ff428962..660b9d3c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm @@ -197,14 +197,6 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewFacturasCliente1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] Left = 136 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas index 8179e232..addea202 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas @@ -75,7 +75,7 @@ uses // uPedidosClienteController, uBizPedidosCliente, // uGenerarFacturasCliAlbCliUtils, uBizAlbaranesCliente, - uEditorBase, uGridUtils, uDBSelectionListUtils, udialogUtils; + uEditorBase, uGridStatusUtils, uDBSelectionListUtils, udialogUtils; {$R *.dfm} diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm index d1907270..5ea67dbd 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm @@ -1,88 +1,2 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente - inherited ToolBar1: TToolBar - Height = 95 - ExplicitHeight = 95 - inherited FontName: TJvFontComboBox [4] - Left = 56 - Top = 22 - ExplicitLeft = 56 - ExplicitTop = 22 - end - inherited ToolButton14: TToolButton [5] - Left = 201 - Wrap = False - ExplicitLeft = 201 - end - inherited FontSize: TEdit - Left = 266 - Top = 22 - ExplicitLeft = 266 - ExplicitTop = 22 - end - inherited UpDown1: TUpDown - Left = 308 - Top = 22 - ExplicitLeft = 308 - ExplicitTop = 22 - end - inherited ToolButton13: TToolButton - Left = 325 - Top = 22 - ExplicitLeft = 325 - ExplicitTop = 22 - end - inherited ToolButton11: TToolButton [9] - Left = 333 - Top = 22 - ExplicitLeft = 333 - ExplicitTop = 22 - end - inherited ToolButton12: TToolButton [10] - Left = 0 - Top = 22 - Wrap = True - ExplicitLeft = 0 - ExplicitTop = 22 - ExplicitHeight = 27 - end - inherited ToolButton9: TToolButton [11] - Left = 0 - Top = 49 - ExplicitLeft = 0 - ExplicitTop = 49 - end - inherited ToolButton10: TToolButton [12] - Left = 145 - Top = 49 - ExplicitLeft = 145 - ExplicitTop = 49 - end - inherited ToolButton6: TToolButton [13] - Left = 270 - Top = 49 - ExplicitLeft = 270 - ExplicitTop = 49 - end - inherited ToolButton7: TToolButton [14] - Left = 336 - Top = 49 - Wrap = True - ExplicitLeft = 336 - ExplicitTop = 49 - end - inherited ToolButton8: TToolButton [15] - Left = 0 - Top = 71 - ExplicitLeft = 0 - ExplicitTop = 71 - end - end - inherited cxGrid: TcxGrid - Top = 121 - Height = 183 - end - inherited TBXDock1: TTBXDock - Top = 95 - ExplicitTop = 68 - end end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas index ee6edfe7..428569ec 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas @@ -12,7 +12,14 @@ uses Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasCliente, - uDAInterfaces, cxDropDownEdit, cxButtonEdit; + uDAInterfaces, cxDropDownEdit, cxButtonEdit, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinscxPCPainter, Menus, cxGridCustomPopupMenu, + cxGridPopupMenu; type IViewDetallesFacturaCliente = interface(IViewDetallesArticulos) @@ -22,7 +29,7 @@ type property Factura: IBizFacturaCliente read GetFactura write SetFactura; end; - TfrViewDetallesFacturaCliente = class(TfrViewDetallesArticulos) + TfrViewDetallesFacturaCliente = class(TfrViewDetallesArticulos, IViewDetallesFacturaCliente) protected FFactura: IBizFacturaCliente; function GetFactura: IBizFacturaCliente; diff --git a/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm index a191833d..3c701c16 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.dfm @@ -13,16 +13,22 @@ inherited frViewElegirArticulosFacturasCliente: TfrViewElegirArticulosFacturasCl inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end end end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.pas index 5130076a..25ea5327 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.pas @@ -11,7 +11,13 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, - ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase; + ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, + dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, + dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinXmas2008Blue, dxSkinscxPCPainter, uDAInterfaces; type IViewElegirArticulosFacturasCliente = interface(IViewArticulos) diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index 7a1bfb9d..10c0ab47 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -14,6 +14,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 DesignSize = ( @@ -32,13 +33,17 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Style.Color = clInfoBk Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.Color = clMenuBar 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 = 0 - Width = 159 + Width = 158 end object edtFecha: TcxDBDateEdit Left = 124 @@ -51,15 +56,19 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Style.Color = clInfoBk Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.Shadow = False Style.ButtonStyle = bts3D Style.ButtonTransparency = ebtNone Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 - Width = 159 + Width = 158 end object memObservaciones: TcxDBMemo Left = 22 @@ -72,17 +81,21 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 - Height = 159 - Width = 301 + Height = 151 + Width = 260 end inline frViewClienteFactura: TfrViewDatosYSeleccionCliente Left = 310 Top = 30 - Width = 314 + Width = 119 Height = 215 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -94,41 +107,65 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ReadOnly = False ExplicitLeft = 310 ExplicitTop = 30 - ExplicitWidth = 314 + ExplicitWidth = 119 ExplicitHeight = 215 inherited dxLayoutControl1: TdxLayoutControl - Width = 314 + Width = 119 Height = 215 ExplicitWidth = 314 ExplicitHeight = 215 inherited edtlNombre: TcxDBTextEdit DataBinding.DataSource = DADataSource - ExplicitWidth = 224 - Width = 224 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 210 + Width = 210 end inherited edtNIFCIF: TcxDBTextEdit DataBinding.DataSource = DADataSource - ExplicitWidth = 562 - Width = 562 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 210 + Width = 210 end inherited edtCalle: TcxDBTextEdit DataBinding.DataSource = DADataSource - ExplicitWidth = 562 - Width = 562 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 210 + Width = 210 end inherited edtPoblacion: TcxDBTextEdit DataBinding.DataSource = DADataSource - ExplicitWidth = 177 - Width = 177 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 92 + Width = 92 end inherited edtProvincia: TcxDBTextEdit DataBinding.DataSource = DADataSource - ExplicitWidth = 327 - Width = 327 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 210 + Width = 210 end inherited edtCodigoPostal: TcxDBTextEdit Left = 192 DataBinding.DataSource = DADataSource + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 192 end inherited Button3: TBitBtn @@ -158,16 +195,20 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 - Width = 78 + Width = 20 end object bFormasPago: TButton Left = 150 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas index 4e779fd5..cf0935bf 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas @@ -9,7 +9,13 @@ uses cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, dxLayoutControl, cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxSpinEdit, StdCtrls, Mask, DBCtrls, cxGraphics, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit, - cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago; + cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago, + dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, + dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinXmas2008Blue, dxSkinsdxLCPainter; type IViewFacturaCliente = interface(IViewBase) diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm index d821006e..f02deaef 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm @@ -196,14 +196,6 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewFacturasProveedor1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] Left = 136 diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas index 1cab889a..ca1eea05 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas @@ -63,7 +63,7 @@ implementation uses uDataModuleFacturasProveedor, uDataModuleUsuarios, - uGridUtils, uDBSelectionListUtils, uFactuGES_App, + uGridStatusUtils, uDBSelectionListUtils, uFactuGES_App, uAlbaranesProveedorController, uBizAlbaranesProveedor, uEditorBase; diff --git a/Source/Modulos/Familias/Controller/Familias_controller.cfg b/Source/Modulos/Familias/Controller/Familias_controller.cfg new file mode 100644 index 00000000..9f3c652d --- /dev/null +++ b/Source/Modulos/Familias/Controller/Familias_controller.cfg @@ -0,0 +1,39 @@ +-$A8 +-$B- +-$C+ +-$D- +-$E- +-$F- +-$G+ +-$H+ +-$I+ +-$J- +-$K- +-$L- +-$M- +-$N+ +-$O+ +-$P+ +-$Q- +-$R- +-$S- +-$T- +-$U- +-$V+ +-$W- +-$X+ +-$Y- +-$Z1 +-cg +-AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; +-H+ +-W+ +-$M16384,1048576 +-K$00400000 +-E"C:\Codigo Tecsitel\Output\Debug" +-LE"C:\Codigo Tecsitel\Output\Debug\Cliente" +-LN"C:\Codigo Tecsitel\Source\Modulos\Lib" +-U"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-O"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-I"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; +-R"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Imports";"C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\Indy10";"C:\Codigo Tecsitel\Lib";"C:\Codigo Tecsitel\Lib\RemObjects\RemObjects_SDK";"C:\Codigo Tecsitel\Lib\RemObjects\Data_Abstract";"C:\Codigo Tecsitel\Lib\CCPack";"C:\Codigo Tecsitel\Lib\CFPack";"C:\Codigo Tecsitel\Lib\GUISDK";"C:\Codigo Tecsitel\Lib\PluginSDK";"C:\Codigo Tecsitel\Lib\DevExpressVCL";"C:\Codigo Tecsitel\Lib\FastReport4";"C:\Codigo Tecsitel\Lib\JCL";"C:\Codigo Tecsitel\Lib\JVCL";"C:\Codigo Tecsitel\Lib\PngComponents";"C:\Codigo Tecsitel\Lib\cxIntl6";"C:\Codigo Tecsitel\Lib\cxIntlPrintSys3";"C:\Codigo Tecsitel\Lib\TB2k+TBX";"C:\Codigo Tecsitel\Lib\Mustangpeak\MPCommonLib";"C:\Codigo Tecsitel\Lib\Mustangpeak\EasyListview";"C:\Codigo Tecsitel\Lib\JSDialog";"C:\Codigo Tecsitel\Lib\UserControl";;"C:\Codigo Tecsitel\Source\Lib"; diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm index 86ab9b14..cac701fb 100644 --- a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm +++ b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm @@ -268,14 +268,6 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewHistoricoMovimientos1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] Left = 88 diff --git a/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas b/Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.pas index 0d16f896f83a322729c8f081a20c4415e1a17e38..56e562dd823537c665bf7f3240af7e20b8d2e218 100644 GIT binary patch delta 19 acmaE7^TlQZA2(ZYNn%N9@n$~m1YrPAh6e2b delta 12 Tcmexj^Uh`iANOVv?gU`~Bwqw+ diff --git a/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm b/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm index 4f3fbc79..3b86b63f 100644 --- a/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm +++ b/Source/Modulos/Inventario/Views/uEditorDetalleReservas.dfm @@ -217,14 +217,6 @@ inherited fEditorDetalleReservas: TfEditorDetalleReservas BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewDetalleReservas1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] Left = 96 diff --git a/Source/Modulos/Inventario/Views/uEditorDetalleReservas.pas b/Source/Modulos/Inventario/Views/uEditorDetalleReservas.pas index cd52040930ecf6afd0d1c332ee089c950560a103..04dc85761d937ef7fd11e3789e4013b8417c7a26 100644 GIT binary patch delta 19 acmZ2tzRG-qFc({JNn%N9@n&JJiGlz{9tMU0 delta 12 TcmZ2wzQlZkFxO^Du8D#G9xVg{ diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm index 272426a3..e60701cf 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm @@ -223,14 +223,6 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewInventario1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas index fd31962d..c3870cff 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas @@ -46,7 +46,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uEditorBase, uInventarioController; + uGridStatusUtils, uEditorBase, uInventarioController; { TfEditorElegirArticulosAlmacen } diff --git a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm index 7b660549..2e8b4149 100644 --- a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm +++ b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm @@ -223,14 +223,6 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewListaArticulos.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.dfm b/Source/Modulos/Inventario/Views/uEditorInventario.dfm index ed3c92ff..0956afb0 100644 --- a/Source/Modulos/Inventario/Views/uEditorInventario.dfm +++ b/Source/Modulos/Inventario/Views/uEditorInventario.dfm @@ -215,14 +215,6 @@ inherited fEditorInventario: TfEditorInventario BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewInventario1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.pas b/Source/Modulos/Inventario/Views/uEditorInventario.pas index a6e191eb..4a702a71 100644 --- a/Source/Modulos/Inventario/Views/uEditorInventario.pas +++ b/Source/Modulos/Inventario/Views/uEditorInventario.pas @@ -87,7 +87,7 @@ implementation {$R *.DFM} uses - cxControls, uGridUtils, uDataModuleInventario, uDataModuleUsuarios, + cxControls, uGridStatusUtils, uDataModuleInventario, uDataModuleUsuarios, uEditorBase, uDBSelectionListUtils, cxGridDBTableView, cxGridCustomTableView, uAlmacenesController, uFactuGES_App, //uGenerarAlbaranesProvUtils, diff --git a/Source/Modulos/Obras/Views/uEditorObras.dfm b/Source/Modulos/Obras/Views/uEditorObras.dfm index 17df7202..178186d5 100644 --- a/Source/Modulos/Obras/Views/uEditorObras.dfm +++ b/Source/Modulos/Obras/Views/uEditorObras.dfm @@ -147,14 +147,6 @@ inherited fEditorObras: TfEditorObras BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewObras1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.cfb b/Source/Modulos/Pedidos a proveedor/Controller/PedidosProveedor_controller.cfb new file mode 100644 index 0000000000000000000000000000000000000000..92d515056842b40ff2d86951fc64a6d4ea4a6ef7 GIT binary patch literal 4178 pcmeIuF#!Mo0K%a4Pi+Q&h(KY$fB^#r3>YwAz<>b*1`HT@2L=#Q00961 literal 0 HcmV?d00001 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm index eba4a846..c20ab54b 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm @@ -207,14 +207,6 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewPedidosProveedor1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas index 6e0437b6..0c070f23 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas @@ -45,7 +45,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uEditorBase, uPedidosProveedorController; + uGridStatusUtils, uEditorBase, uPedidosProveedorController; {$R *.dfm} diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas index e7b8b8ad..0b5e16f1 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas @@ -72,7 +72,7 @@ type implementation uses - uViewDatosYSeleccionProveedor, uDataModuleUsuarios, uGridUtils, uDialogUtils, + uViewDatosYSeleccionProveedor, uDataModuleUsuarios, uGridStatusUtils, uDialogUtils, uFactuGES_App; {$R *.dfm} diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm index 8d414643..89fa7d90 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm @@ -177,14 +177,6 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewPedidosProveedor1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] Left = 16 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas index 708d6ae5..1becc22c 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas @@ -61,7 +61,7 @@ uses uDataModulePedidosProveedor, uDataModuleUsuarios, uFactuGES_App, uEditorDBBase, uGenerarAlbaranesProvUtils, // uInventarioController, uBizInventario, - uDialogUtils, uGridUtils, uDBSelectionListUtils; + uDialogUtils, uGridStatusUtils, uDBSelectionListUtils; // uAlbaranesProveedorController, uBizAlbaranesProveedor, // uGenerarPedidosProvUtils, ; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas index f3028ab6..7c8d5e7f 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas @@ -44,7 +44,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uEditorBase, uPresupuestosClienteController, + uGridStatusUtils, uEditorBase, uPresupuestosClienteController, cxGridLevel; {$R *.dfm} diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index 6c14fe43..26f01c0f 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -289,15 +289,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 702 end end - inherited cxGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewDetallesPresupuestoCliente1.cxGridView - HitTypes = [gvhtIndicator] - Index = 0 - PopupMenu = frViewDetallesPresupuestoCliente1.GridIndicatorPopupMenu - end> - end end end object pagPortada: TTabSheet diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas index b8d7653a..ca707c9d 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas @@ -76,7 +76,7 @@ uses // uBizAlbaranesCliente, uAlbaranesClienteController, uEditorBase, uEditorDBBase, uDialogUtils, // uFacturasClienteController, uBizFacturasCliente, - uGridUtils, uDBSelectionListUtils; + uGridStatusUtils, uDBSelectionListUtils; // uGenerarPresupuestosProvUtils, uGenerarAlbaranesCliUtils; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm index 29f994f9..19918a14 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm @@ -1,119 +1,68 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente inherited ToolBar1: TToolBar - Height = 100 - ExplicitHeight = 100 - inherited ToolButton14: TToolButton [1] - Left = 109 + inherited ToolButton13: TToolButton [1] + Left = 65 Wrap = False - ExplicitLeft = 109 + ExplicitLeft = 65 end - inherited ToolButton2: TToolButton [2] - Left = 174 - ExplicitLeft = 174 + inherited UpDown1: TUpDown [2] + Left = 73 + ExplicitLeft = 73 end - inherited ToolButton4: TToolButton - Left = 288 - ExplicitLeft = 288 - end - inherited ToolButton12: TToolButton [4] - Top = 0 - ExplicitTop = 0 - end - inherited ToolButton3: TToolButton [5] + inherited ToolButton12: TToolButton [3] Left = 0 - Top = 30 + Wrap = True ExplicitLeft = 0 - ExplicitTop = 30 + ExplicitHeight = 30 end - inherited FontName: TJvFontComboBox [6] - Left = 55 - Top = 30 - ExplicitLeft = 55 - ExplicitTop = 30 + inherited ToolButton11: TToolButton + Wrap = False end - inherited ToolButton9: TToolButton [7] - Left = 200 + inherited ToolButton9: TToolButton [6] + Left = 250 Top = 30 Wrap = True - ExplicitLeft = 200 + ExplicitLeft = 250 ExplicitTop = 30 end - inherited ToolButton11: TToolButton [8] - Left = 0 - ExplicitLeft = 0 + inherited ToolButton2: TToolButton [7] + end + inherited ToolButton4: TToolButton [8] + Left = 114 + ExplicitLeft = 114 end inherited FontSize: TEdit [9] - Left = 141 - Top = 52 - Width = 58 - ExplicitLeft = 141 - ExplicitTop = 52 - ExplicitWidth = 58 + Left = 170 + ExplicitLeft = 170 end - inherited UpDown1: TUpDown [10] - Left = 199 - Top = 52 - ExplicitLeft = 199 - ExplicitTop = 52 + inherited ToolButton6: TToolButton [10] + Left = 212 + Wrap = False + ExplicitLeft = 212 end - inherited ToolButton10: TToolButton [11] - Left = 216 - ExplicitLeft = 216 + inherited ToolButton3: TToolButton [11] + Left = 278 end - inherited ToolButton13: TToolButton [12] - Left = 341 - Top = 52 - ExplicitLeft = 341 - ExplicitTop = 52 + inherited ToolButton7: TToolButton + Left = 333 + Wrap = True + ExplicitLeft = 333 end - inherited ToolButton6: TToolButton [13] - Left = 349 - Top = 52 - ExplicitLeft = 349 - ExplicitTop = 52 + inherited FontName: TJvFontComboBox [13] + Left = 0 + Top = 74 + ExplicitLeft = 0 + ExplicitTop = 74 end - inherited ToolButton7: TToolButton [14] - Left = 415 - Top = 52 - ExplicitLeft = 415 - ExplicitTop = 52 + inherited ToolButton10: TToolButton [14] + Left = 145 + Top = 74 + ExplicitLeft = 145 + ExplicitTop = 74 end - inherited ToolButton8: TToolButton [15] - Left = 482 - Top = 52 - ExplicitLeft = 482 - ExplicitTop = 52 + inherited ToolButton8: TToolButton + Left = 270 + ExplicitLeft = 270 end end - inherited cxGrid: TcxGrid - Top = 126 - Height = 178 - ExplicitHeight = 178 - inherited cxGridView: TcxGridDBTableView - inherited cxGridViewREFERENCIA: TcxGridDBColumn - Width = 89 - end - inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn - Width = 82 - end - inherited cxGridViewDESCRIPCION: TcxGridDBColumn - Width = 315 - end - inherited cxGridViewCANTIDAD: TcxGridDBColumn - Width = 94 - end - inherited cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn - DataBinding.FieldName = 'UNIDAD_MEDIDA' - end - inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn - Width = 70 - end - inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn - Width = 69 - end - end - end - inherited TBXDock1: TTBXDock - Top = 100 - end end diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm index c8faa58827a373d6d8fda37697806bb1609a829e..193724fabb6b1716ce4d919226b616f070e2e5b8 100644 GIT binary patch literal 14084 zcmeHOZI9cy5&mAF|AD}L*cP}fB-!%IwO7EFt;FfR)%GO?7Db@7xV!4gqASZAZ;Sr- z&WIe6da=C;f*#OjfkYxXoEbhG4u?ZI$sT#06g+14(>N(aK27;UlF#`nxf9zUO?X!D zpV;z9>u-O3)+Y ztE4d11FXJD_B`F*@O+l7kb2m|+9lr??|Aa?SU{EA!76e0cfKmv`{##`$v>k!e#fJj z=Pu}8t75m#->?H?7yKUkm*Rn^*qDORLbYmXJyoHG9Ez+s4<4g@%aPY)8jgOsSbhrL zjpmE#Qp%~2id5u4xJo}JSu8%|NSahy+8ftxwq8YR4lK@=(W6*LC8T-^N_`f^ONtb? z_uH{ZV>R4Btk*D|uhQ5iJ*=@s)uOT0+ODxhpfy&yE?(AmB7KdjHl^0|9hgRn=3(Hq z=!~u%U!rR@lBzI04>A1PDts*xt!x!uxdyi9iz3H_+^G%fT zR4(swbyusTVv@hx?aHF&D}4=PAChfySFRCj)TBkNGgUX37`a?O%G` z(m|oeAyx{No;Q@VYM_nrF2{eJh}9D?R&SNj^%Z&z#Yl`A2+>h>gWe3JxZ7VwNhSp@ zg-GwBoQ6~H?t0}U;kXO~&~sMswJ$l~D|J5rI%8_ot$cdlh)<`L5t@FvYelPK1pA8^ z?F!+M!dfr=VulGgg-KfEq7^AMy%s=nCOmBjIIA}TeT3^M8)XbD=K>d!n%IMo(Nr`A zQA=H*QC-bYr`ratjmTeiNfG68n6Cxpl4rYCNJy`S?X`dl8ZOZay;e?Y%$<(Ljd<5v z6l?V`2rR&%?Y8462mbG$b;({^zN2irp)U!O0Bbs`uF-4RX_9evpMOaBXAqo6I!r>Z z(N@oHyGOzl-%~qRO&()H$mHti|a_rL3l1 zv=X9}Eqe1*qq~W66_ivrkY#jtokIi%wQAMOA)>p^(w8b70k7tRaG~l3KGdKUC!CCZ zynhabC@6T8@8lF3{8|t~`VdG9z;1Cy^E0L+F*%)|> zjE2URth&y)OK80(W00A0tfL`7s1OxV07uVUq$$tO7rXU3%3nao`)HRIZ*#HRs5%V6 zFwXd+=?tb-iObL#gd$%@c!E9q(K&YcD!s?()Q3bKh3TKl~^Jy>}Uw;a&FK?z- zi_zrTvP?OTHp|w76>3`nqfOL&8cyfat6(-lk>66D7Oh{5d})9($Q?)9@(@?AqwyVC z)h$g%hB~|9DlX5i=s@drB;%+LvG;^{e-XWiU7@@H@~l-EmW;LNhm%51=|Hm?La{F- zMoSUnnP;`f%nGIqZ7GbE(cSrl5Kp5l4mnTH7f(q>(O}KEOX5kgMPTAD>J*CAZu^CO z-ihM1GU~ASeJi9w+z78)gSIcEu_ueiMaWl=(JV{!v2nEruf_jgAoLt{V3E)m2x|=| zAq4>e$NQFyc7kLA9 z>c{F!0hfk9vv>_B*Gv>)Dk7_sOq~u?<^$N`sks^YfyB2)~viRo~kL)=BrdV9nvXvJVzgjrQ>pS z-v1^S8@v$W+wsn*VZFO~cRGtPhi@sw zcn9}l`esG>FSE(1O;2C5X#QP&q&1tc-j}USSf$C?KX&jP6eMkV_7G)1>10Uo$T188 z4`+v+*2r}70qPb-`I(YU2|F)*IrRkn<-p1k`9M1ra}ac!=n&TRb(-Im84Wy@t@f{n zvD<{PuUGNwU<3%+GtXAZ8ox~ukXbBpZs4?l(~N%|h@@TNE;&vL>+Vijm~U?WrHPsE zM6`+Z^xSJ~=!TOqc@YHj4);T?m-Utn%64{Nezd?|0Kl9Tkjv9nXu+n<`fd8Mc|6DD zItcj}nG|E4p3`;Uuj_Ru^p0ixgL3)j4dm064~L%kVmNuKRXs|s)v9JG3>}C58BSF5 zHP4Z6XQ!s1Vc&DQ!3g9`jVzn<6h;^NFxsgz41nHl`$jsAUF}QYdS>W2ZqJCsJTN^{_{S?^Hh+dx7CJ zgvs*;-Od$>A1VA6LyXD|WIJ=Y%tN75zmoN);4yt4ujNb)YoB~#!>-ktFUB;d>4WUdNHK%Z*of90Qumfn>rdu69 zDj()F4TA}C^245wbLfmZgDI4~UZ+2TQ4YO+&;yYTot)5GEie^8F&VV!MzRk*!!Wc) zhjIp;zBk5YsqDq;`%VaUrOWV@PJ*mDMdfG)ZHiWfC zvb&w`1T7M*WrDbLC%xemaH96!#PI_gub$ah81rG)X--JyYo92=j1Je)Aap~h)Ho2Q zVBoqT%wfm%yVEh~=Ab*Q(iu+Js|Q+st!`CLq(l8lqo!xQ9n0;UNH?0xV;qQUJ11(T z=W93~=R~?qy6zAFZ_ETq!sl^LL^&GteDqVK8`ay-*Kx9Y9D4uG>G+%xZr^eGZ{YNA z39}05)x+eaF`FWC8Cy2Kree3lYNptA)wxTZl7^~i_(5=blk?|fyNgo%Wd?-9k~z(G z>n8*HxKUv=TW@j*`@f7wV}$RYN1M$Ye&@0+@)tNz<&d`rt=g*Dtt)>m(qIyAF)oIv zImN!PxkG6ocKM1!AGZpU+ITAvH5lSohxyu8$0`HQPRX;;4Zm@^5u4pceR`|kp-b%x z(t&c0C-m4>rfZT!sdzwm7V;JN(sy2z>Z3%wVl2ahhNkbgG<^-8(iGadt7Nq_O8wd1 z0qc}(%5U&7LBCi>X(~&yg^u=qyUi+DV6fxeb`|BAe5#si05|pzBF9fq&m@gLKUrt3 zT1%1fo9uQeyBKwsK4?R-&;^wW$#(3Gmn1g!bhkffd*iuDMj6jF zcV@CNLKUKX6;+g~AN^VtRjiPrV^;WA|sh1n=%1XVurd82G{`N_Pv}SE# z@4ebaRW}^UswUYqSc`Owb!t~kgIEr^^MEnozF-fNbP0Wf+t}p7O*pWE0 z64ymTceWB&lw5VUXBr*DkpowiT+`Skrrjj0ZgsYl$1)n(b(V>-x#cK1^j8Jtwevfh z7md$irY{q$6P6$7FOIK}4M#xY zRhCPwc2z6HfT&5CI@vKV8kSBkbB<=B^B(56^3lOH+$G7RhPP-J$FQ}XzDcsl4ZBQD z9UZCAZWok$2scrnQQSo4LvA92ac&|Lk{dMB?swOzc_0`0D2!lYx??VbWlU}zu9ZRr z!eisN(~&X3MH;lYsl#JO5yrLRYto)?JB)*lB~Ju?MMk(4%6oc@tQaeznR5*5+;`_| zjCL!6>1>4Qd@!$3Ih*pWJRMAxI*zeJQnSH8gK?CYyStj**wil&<`^ApPL|z`4Z?`N z#PH?Rr0?3o9dBj*E_ch<2mJnN1);qHc=j6JX=00*fosPHxKAgZ4xL)PVA#gGNm5bl z05E|5ih}l%TD^-mNmBgEJ(74ri7}aQfeo~m(zNoUOSH4CdT&AXT1YiU?Aj<|S&l-Z z)Lh3*b=G%Rv0=q|QXcmR)g97J0W^O<7|7$Z5uH6dayIR){qWf&Hx!s8hdWLQf(I?R z4n4yqin5aic4~&{Fe>B3<04KRQ@OxRYAai!)uNY`v4CDoOUmO>`ITc4IRaij;`5RR zUOwd-4rY?(5IaIU#B$@>fyg+>HdiQD;~BwrVr?wO6!f{Eli)&a@J!b(W0nqD!hmm& z1+g$HK;rGO5wveA<8#^uyI_#ZfQjK?^UaMKjE3AqP6_DvG56F&31Wn$rm$J2jzhbX z2L_sqoE?sHSux=UxU}d+Bb!|4g|ti)GcT~FQW{=wFgPrfM5+a+M#D1u@ja6pJc_O; zQ~r+i2%bWFY0z(tQirg#-&h=$c1WKiFmX#sOl8NKTo3e%nY8bXG2xeqxRt*<7B!uc z@Jt>cO0QS2)gh*j<%}Y*jK{H@QDRueaC* zj_VNhzL5?R2lrr84eODfj$zTg?_iMx1&MtgvVhbVH^RW(`{D9oJ?bDedQ+M3-8`P^ zcy1maTon80W*7)P|4xj@%#ye{91;gS09J50I=knXp(o{Q(2o*dM0d5o*H*|5F&iSe zvgenGgAEhB*@jqUh;XOsPH&A`S=7*NBgDa31F>0EG z&9~id7qdQ4-N3HtoMY7Od1E{<+f!r78f9JV%+7)`?_Zc-SSbGf3om~BfuK45Nl2O0 z340rsr2>{yc2Bx&5)NIrYpD-Nn+>RYKIE*v+HAD6>LsnAl~xeCcOOP2*8iMET11RZ>;ehHXW#53Vkvn-O?qQl3%JcR-4tec4?^* z96lqK-W4uwRcqB&b*)k_aTKH11BQYZ%;hOm#x^NPm4^diARF=|z8=mWenfJw5gAHh zaA0x7vb?76uHZg(9nY)s1N{SuWO!0@0ls>1^SeVMUJb#DfFp;Dh2EoZ;+> zGl%Eag5Q~;kwa($yqCdbAZ37a3-*}pZPI54Pm5=H<|OnysFvxTWtKLX+rzvjBDRPj zuc2rJPP{f8F!)v-;`qOiAsdS0%e{{fdq==%kWKf1ThJY(-*DW`3=eUq&_w`iksf8v zieYUZ9R}mWg|Z77SKSH$(_C43Z$~s~&+V;35_F`q%fk>4iosYWXhFD1@hJ|X77vRU zsb#~_`aNQ2Q=2^d?eXjGS3ed2~J|MN$hjP`hW zM(p{91=YT_Nz@au1tEl-J}N9Xze4GD$)}S2RA=2n4#cRp1 zd9c(E#B_Rp&?rVputqzseF(x+0^umgD8AzYYMD9*GFKc46~z^;tsJoMwj2z(IWgX@=(bC`2Un`xF<6lDC1SB zbuY%Zrg9kKTN*;~kX>``>&z9#zIzI7Wt z!M-Wz-rfA0c%ME^#d$!tzrD)ETd zrY`G{tZws;xXO|orhEE_&dJ0`On6-yFD5%m+#gHHKvv9}_B-u4wBfdyg?6xI51srBGqHB`U+YGbR}b{Ctb z_=F=5#l&->&`G?Ekgx3wXuIs%9n8+8DsX$UNm)Oclq10bvdk7hjpBPx5yJ#^Fsgt diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas index 8666912c..91187c7b 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas @@ -37,7 +37,13 @@ uses uViewRecibosCliente, uEditorRecibosCliente, uBizRecibosCliente, uIEditorElegirRecibosCliente, Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls, - cxContainer, cxEdit, cxTextEdit, TBXDkPanels, JSDialog; + cxContainer, cxEdit, cxTextEdit, TBXDkPanels, JSDialog, dxSkinsCore, + dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, + dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, + dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, uDAInterfaces; type @@ -82,7 +88,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uDialogUtils, uEditorBase, uRecibosClienteController; + uGridStatusUtils, uDialogUtils, uEditorBase, uRecibosClienteController; {$R *.dfm} diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm index fd875495..754b189a 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm @@ -179,14 +179,6 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente BuiltInStyle = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewRecibosCliente1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end end inherited EditorActionList: TActionList [4] Left = 136 diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas index 94c56378..cba89e8f 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas @@ -74,7 +74,7 @@ implementation uses uDataModuleRecibosCliente, uDataModuleUsuarios, uFactuGES_App, - uGridUtils, uDBSelectionListUtils; + uGridStatusUtils, uDBSelectionListUtils; {$R *.dfm} diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm index 491a46be..5d62d9fd 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm @@ -216,14 +216,6 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewRecibosProveedor1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas index e8a727e3..6da8c99d 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas @@ -82,7 +82,7 @@ implementation uses uEditorGridBase, cxGridCustomTableView, uIntegerListUtils, uDBSelectionListUtils, - uGridUtils, uDialogUtils, uEditorBase, uRecibosProveedorController; + uGridStatusUtils, uDialogUtils, uEditorBase, uRecibosProveedorController; {$R *.dfm} diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm index 2b5f6145..a26fa227 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm @@ -162,14 +162,6 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor BuiltInReportLink = True end end - inherited cxViewGridPopupMenu: TcxGridPopupMenu - PopupMenus = < - item - GridView = frViewRecibosProveedor1.cxGridView - HitTypes = [gvhtCell] - Index = 0 - end> - end inherited dxPrintStyleManager1: TdxPrintStyleManager inherited dxPrintStyleManager1Style1: TdxPSPrintStyle BuiltInStyle = True diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas index d1f84d52..f69ce9a6 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesasCliente.pas @@ -60,7 +60,7 @@ implementation uses uCustomEditor, uDataModuleRemesasCliente, uDataModuleUsuarios, - uGridUtils, uDBSelectionListUtils, uFactuGES_App, + uGridStatusUtils, uDBSelectionListUtils, uFactuGES_App, uEditorDBBase, uBizFamilias, uFamiliasController, // uBancaElectronicaController, cxGrid, cxGridCustomTableView; //, uListaRemesasCliente; diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas index b855f958..b61dc430 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas +++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesasProveedor.pas @@ -60,7 +60,7 @@ implementation uses uCustomEditor, uDataModuleRemesasProveedor, uDataModuleUsuarios, - uGridUtils, uDBSelectionListUtils, uFactuGES_App, + uGridStatusUtils, uDBSelectionListUtils, uFactuGES_App, uEditorDBBase, uBizFamilias, uFamiliasController, // uBancaElectronicaController, cxGrid, cxGridCustomTableView; //, uListaRemesasProveedor; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 0fbbe60c4bc783f2841b5e0fc446ccfdb0a39a1d..feeac77f722ac7ec153030bc0dcd7f1ec180908e 100644 GIT binary patch delta 75 zcmbQUm2tsV#tnBO7?(`G8zB!Q|3*YJvP_PQRAziIxi+$zIfX%K^6yAl(K3cihE#?k dhCCoy%%H=dz+lW^Fj+H7li7s9aB^srI{+l77q9>T delta 71 zcmZ3mm2u8i#tnBO7#B>w8zB!Q|3*YJGE9z)RA#(0xi+$zIe|f8^6yAl!5oHChCGH; ahGGUC1_cHq2D8b!QJT!A3 diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index d788e301..b80ecc76 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.0.4.0\0" VALUE "ProductVersion", "1.0.4.0\0" - VALUE "CompileDate", "lunes, 26 de mayo de 2008 18:50\0" + VALUE "CompileDate", "viernes, 30 de mayo de 2008 18:41\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/uServerMainForm.dfm b/Source/Servidor/uServerMainForm.dfm index eb888d5f..69d4c5ae 100644 --- a/Source/Servidor/uServerMainForm.dfm +++ b/Source/Servidor/uServerMainForm.dfm @@ -3,8 +3,8 @@ object fServerForm: TfServerForm Top = 611 BorderStyle = bsDialog Caption = 'FactuGES Server' - ClientHeight = 140 - ClientWidth = 267 + ClientHeight = 159 + ClientWidth = 299 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -19,7 +19,7 @@ object fServerForm: TfServerForm object JvGradient1: TJvGradient Left = 0 Top = 57 - Width = 267 + Width = 299 Height = 4 Align = alTop StartColor = 2971346 @@ -29,15 +29,16 @@ object fServerForm: TfServerForm object Panel1: TPanel Left = 0 Top = 0 - Width = 267 + Width = 299 Height = 57 Align = alTop BevelOuter = bvNone TabOrder = 0 + ExplicitWidth = 267 object Image1: TImage Left = 0 Top = 0 - Width = 267 + Width = 299 Height = 57 Align = alClient Center = True