From 36a9de5e6de01136eaa5600a0920157576e560a1 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 20 May 2008 18:50:02 +0000 Subject: [PATCH] - Repaso general - Quitar warnings - Limpieza de PNGImageList en las vistas de grids. git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@374 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Installer/librerias.txt | 29 + .../Albaranes de cliente/16x16/Budget.png | Bin 0 -> 3143 bytes .../Albaranes de cliente/16x16/Devolucion.png | Bin 0 -> 607 bytes .../16x16/Letters patent.png | Bin .../16x16/pagado.png | Bin .../Albaranes de cliente/24x24/Budget.png | Bin 0 -> 3345 bytes .../Albaranes de cliente/24x24/Devolucion.png | Bin 0 -> 845 bytes .../24x24/Letters patent.png | Bin .../Albaranes de cliente/28x28/Budget.png | Bin 0 -> 3391 bytes .../Albaranes de cliente/28x28/Devolucion.png | Bin 0 -> 1070 bytes .../28x28/Letters patent.png | Bin .../Iconos/Inventario/16x16/articulos.png | Bin 0 -> 409 bytes Resources/Iconos/Inventario/16x16/liberar.png | Bin 0 -> 568 bytes Resources/Iconos/Inventario/24x24/Thumbs.db | Bin 0 -> 4608 bytes .../Iconos/Inventario/24x24/articulos.png | Bin 0 -> 467 bytes Resources/Iconos/Inventario/24x24/liberar.png | Bin 0 -> 654 bytes .../Iconos/Inventario/28x28/articulos.png | Bin 0 -> 452 bytes Resources/Iconos/Inventario/28x28/liberar.png | Bin 0 -> 652 bytes Source/ApplicationBase/ApplicationBase.dproj | 42 +- Source/Base/Base.dproj | 102 +- Source/Base/Base.res | Bin 4748 -> 384 bytes .../Controladores/uControllerDetallesBase.pas | 2 +- Source/Cliente/FactuGES.dproj | 10 +- Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 171984 -> 171984 bytes Source/Cliente/uNavPaneController.pas | 4 +- Source/GUIBase/GUIBase.dproj | 92 +- Source/GUIBase/uEditorDBItem.dfm | 4 + Source/GUIBase/uViewDetallesBase.dfm | 100 +- Source/GUIBase/uViewDetallesBase.pas | 29 +- Source/GUIBase/uViewDetallesDTO.dfm | 12 +- Source/GUIBase/uViewDetallesDTO.pas | 9 +- Source/GUIBase/uViewDetallesGenerico.dfm | 12 +- Source/GUIBase/uViewDetallesGenerico.pas | 8 +- Source/GUIBase/uViewGrid.dfm | 139 +- Source/GUIBase/uViewGrid.pas | 44 +- Source/GUIBase/uViewIncidencias.pas | 7 +- Source/GUIBase/uViewRichEditor.pas | 7 +- Source/GUIBase/uViewTotales.dfm | 75 +- Source/GUIBase/uViewTotales.pas | 8 +- .../AlbaranesCliente_controller.dproj | 12 +- .../uAlbaranesClienteController.pas | 16 +- .../uAlbaranesClienteReportController.pas | 3 +- .../Data/AlbaranesCliente_data.dproj | 20 +- .../Model/AlbaranesCliente_model.dproj | 8 +- .../Plugin/AlbaranesCliente_plugin.dproj | 50 +- .../Plugin/uPluginAlbaranesCliente.dfm | 210 ++- .../Views/uEditorAlbaranCliente.dfm | 224 ++-- .../Views/uEditorAlbaranCliente.pas | 3 - .../Views/uEditorAlbaranDevCliente.dfm | 439 ++++--- .../Views/uEditorAlbaranDevCliente.pas | 2 +- .../Views/uEditorAlbaranesCliente.pas | 4 +- .../Views/uEditorAlbaranesDevCliente.dfm | 1112 ++++++++++++---- .../Views/uEditorAlbaranesDevCliente.pas | 2 +- .../uEditorElegirArticulosAlbaranCliente.dfm | 3 +- .../uEditorElegirArticulosAlbaranCliente.pas | 2 +- .../Views/uViewAlbaranesCliente.dfm | 335 +++-- .../Views/uViewAlbaranesCliente.pas | 84 +- .../Views/uViewAlbaranesDevCliente.dfm | 145 ++- .../Views/uViewAlbaranesDevCliente.pas | Bin 1572 -> 2723 bytes .../Views/uViewDetallesAlbaranCliente.dfm | 23 +- .../Views/uViewDetallesAlbaranCliente.pas | 8 +- .../uAlbaranesProveedorController.pas | 12 +- .../Plugin/uPluginAlbaranesProveedor.dfm | 210 ++- .../Views/uEditorAlbaranDevProveedor.dfm | 330 +++-- .../Views/uEditorAlbaranDevProveedor.pas | 4 +- .../Views/uEditorAlbaranProveedor.dfm | 187 +-- .../Views/uEditorAlbaranProveedor.pas | 4 - .../Views/uEditorAlbaranesDevProveedor.dfm | 1130 +++++++++++++---- .../Views/uEditorAlbaranesDevProveedor.pas | 2 +- .../Views/uEditorAlbaranesProveedor.dfm | 45 +- .../Views/uEditorAlbaranesProveedor.pas | 12 +- ...EditorDireccionEntregaAlbaranProveedor.pas | 4 +- ...uEditorElegirArticulosAlbaranProveedor.dfm | 1 + ...uEditorElegirArticulosAlbaranProveedor.pas | 3 +- .../Views/uViewAlbaranProveedor.dfm | 61 + .../Views/uViewAlbaranProveedor.pas | 12 +- .../Views/uViewAlbaranesDevProveedor.dfm | 146 ++- .../Views/uViewAlbaranesDevProveedor.pas | 42 +- .../Views/uViewAlbaranesProveedor.dfm | 235 +++- .../Views/uViewAlbaranesProveedor.pas | 77 +- .../Views/uViewDetallesAlbaranProveedor.dfm | 24 +- .../Views/uViewDetallesAlbaranProveedor.pas | 8 +- .../uViewDireccionEntregaAlbaranProv.dfm | 7 +- .../uViewDireccionEntregaAlbaranProv.pas | 8 +- .../Controller/Almacenes_controller.rc | 22 + .../Controller/Almacenes_controller.res | Bin 5056 -> 384 bytes .../Modulos/Almacenes/Data/Almacenes_data.res | Bin 4748 -> 384 bytes .../Almacenes/Model/Almacenes_model.res | Bin 4748 -> 384 bytes .../Almacenes/Plugin/Almacenes_plugin.rc | 22 + .../Almacenes/Plugin/Almacenes_plugin.res | Bin 5056 -> 384 bytes .../Almacenes/Views/uEditorAlmacenes.dfm | 37 +- .../Almacenes/Views/uViewAlmacenes.dfm | 153 ++- .../Almacenes/Views/uViewAlmacenes.pas | 26 +- .../Controller/Articulos_controller.dproj | 12 +- .../Controller/uArticulosController.pas | 12 +- .../Articulos/Views/Articulos_view.dproj | 16 +- .../Modulos/Articulos/Views/uViewArticulo.dfm | 119 +- .../Modulos/Articulos/Views/uViewArticulo.pas | 8 +- .../Articulos/Views/uViewArticulos.dfm | 201 ++- .../Articulos/Views/uViewArticulos.pas | 63 +- .../Views/uViewDetallesArticulos.dfm | 65 +- .../Views/uViewDetallesArticulos.pas | 9 +- .../Controller/uClientesController.pas | 14 +- .../Controller/uContactosController.pas | 4 +- .../uDatosBancariosContactoController.pas | 2 +- .../uDireccionesContactoController.pas | 2 +- .../Controller/uEmpleadosController.pas | 11 +- .../uEtiquetasContactosReportController.pas | 2 +- .../uFichasEmpleadoReportController.pas | 2 +- .../Controller/uGruposClienteController.pas | 4 - .../Controller/uGruposEmpleadoController.pas | 4 - .../Controller/uGruposProveedorController.pas | 4 - .../uPersonalContactoController.pas | 2 +- .../Controller/uProveedoresController.pas | 10 +- .../Contactos/Views/Contactos_view.dproj | 64 +- .../Contactos/Views/uEditorCliente.dfm | 312 +++-- .../Contactos/Views/uEditorContacto.dfm | 25 + .../Contactos/Views/uEditorDireccion.pas | 7 +- .../Contactos/Views/uEditorEmpleados.dfm | 10 +- .../Contactos/Views/uEditorEmpleados.pas | 4 +- .../Modulos/Contactos/Views/uViewCliente.dfm | 180 ++- .../Modulos/Contactos/Views/uViewCliente.pas | 8 +- .../Views/uViewClienteDatosComerciales.dfm | 25 + .../Views/uViewClienteDatosComerciales.pas | 8 +- .../Views/uViewClienteDescuentos.pas | 8 +- .../Modulos/Contactos/Views/uViewClientes.dfm | 21 +- .../Modulos/Contactos/Views/uViewClientes.pas | 20 - .../Modulos/Contactos/Views/uViewContacto.dfm | 65 + .../Modulos/Contactos/Views/uViewContacto.pas | 8 +- .../uViewContactoListaDatosBancarios.dfm | 16 - .../uViewContactoListaDatosBancarios.pas | 8 +- .../Contactos/Views/uViewContactos.dfm | 114 +- .../Contactos/Views/uViewContactos.pas | 44 +- .../Views/uViewDatosYSeleccionCliente.dfm | 25 + .../Views/uViewDatosYSeleccionCliente.pas | 8 +- .../Views/uViewDatosYSeleccionProveedor.dfm | 25 + .../Views/uViewDatosYSeleccionProveedor.pas | 8 +- .../Views/uViewDireccionesEntrega.dfm | 16 - .../Views/uViewDireccionesEntrega.pas | 8 +- .../Contactos/Views/uViewEmpleados.dfm | 7 +- .../Contactos/Views/uViewPersonalContacto.dfm | 16 - .../Contactos/Views/uViewPersonalContacto.pas | 8 +- .../Contactos/Views/uViewProveedores.dfm | 8 +- .../Contactos/Views/uViewProveedores.pas | 4 +- .../Controller/uFacturasClienteController.pas | 14 +- .../uFacturasClienteReportController.pas | 4 +- .../Views/FacturasCliente_view.dproj | 2 +- .../Views/uEditorFacturasCliente.dfm | 40 +- .../Views/uEditorFacturasCliente.pas | 16 +- .../Views/uViewFacturasCliente.dfm | 24 +- .../Views/uViewFacturasCliente.pas | 17 +- .../uFacturasProveedorController.pas | 6 - .../Views/uEditorFacturasProveedor.dfm | 84 +- .../Views/uEditorFacturasProveedor.pas | 11 +- .../Views/uViewFacturasProveedor.dfm | 382 ++---- .../Views/uViewFacturasProveedor.pas | 17 +- .../Views/uEditorHistoricoMovimientos.dfm | 22 +- .../Views/uEditorHistoricoMovimientos.pas | Bin 7896 -> 7790 bytes .../Views/uViewHistoricoMovimientos.dfm | 177 ++- .../Views/uViewHistoricoMovimientos.pas | 16 +- .../Controller/Inventario_controller.dproj | 17 +- .../Controller/uInventarioController.pas | 10 +- .../Views/uEditorDetalleReservas.dfm | 28 +- .../Views/uEditorDetalleReservas.pas | Bin 7180 -> 7076 bytes .../Inventario/Views/uViewDetalleReservas.dfm | 22 +- .../Inventario/Views/uViewDetalleReservas.pas | 15 +- .../Inventario/Views/uViewInventario.dfm | 153 ++- .../Inventario/Views/uViewInventario.pas | 14 +- .../Obras/Controller/uObrasController.pas | 2 - Source/Modulos/Obras/Views/uViewObras.dfm | 54 +- Source/Modulos/Obras/Views/uViewObras.pas | 25 +- .../uPedidosProveedorController.pas | 12 +- .../uPedidosProveedorReportController.pas | 4 +- .../PedidosProveedor_Group.groupproj | 60 +- .../Views/uViewPedidosProveedor.dfm | 199 ++- .../Views/uViewPedidosProveedor.pas | 71 +- .../uPresupuestosClienteController.pas | 21 +- .../uPresupuestosClienteReportController.pas | 3 +- .../Views/PresupuestosCliente_view.dproj | 14 +- .../Views/uEditorPresupuestoCliente.dfm | 207 ++- .../Views/uEditorPresupuestoCliente.pas | 1 - .../Views/uEditorPresupuestosCliente.pas | 8 +- .../Views/uViewDetallesPresupuestoCliente.dfm | 137 +- .../Views/uViewDetallesPresupuestoCliente.pas | 9 +- ...ViewDireccionEntregaPresupuestoCliente.dfm | 33 +- ...ViewDireccionEntregaPresupuestoCliente.pas | 8 +- ...ViewElegirArticulosPresupuestosCliente.dfm | 18 +- ...ViewElegirArticulosPresupuestosCliente.pas | 8 +- .../Views/uViewPresupuestoCliente.dfm | 122 +- .../Views/uViewPresupuestoCliente.pas | 8 +- .../Views/uViewPresupuestosCliente.dfm | 269 +++- .../Views/uViewPresupuestosCliente.pas | 64 +- .../Controller/uPagosClienteController.pas | 5 +- .../Controller/uRecibosClienteController.pas | 17 +- .../Views/uEditorRecibosCliente.dfm | 36 +- .../Views/uEditorRecibosCliente.pas | 12 +- .../Views/uViewRecibosCliente.dfm | 175 ++- .../Views/uViewRecibosCliente.pas | 26 +- .../Controller/uPagosProveedorController.pas | 5 +- .../uRecibosProveedorController.pas | 12 +- .../Views/uViewRecibosProveedor.dfm | 170 ++- .../Views/uViewRecibosProveedor.pas | 27 +- .../Controller/uRemesasClienteController.pas | 10 +- .../Views/uEditorRemesaCliente.dfm | 120 +- .../Views/uEditorRemesaCliente.pas | 1 - .../Views/uEditorRemesasCliente.pas | 1 - .../Views/uViewRecibosRemesaCliente.pas | 8 +- .../Views/uViewRemesaCliente.dfm | 24 +- .../Views/uViewRemesaCliente.pas | 8 +- .../Views/uViewRemesasCliente.dfm | 88 +- .../Views/uViewRemesasCliente.pas | 27 +- .../uRemesasProveedorController.pas | 9 +- .../uRemesasProveedorReportController.pas | 13 +- .../Views/uEditorRemesaProveedor.dfm | 108 +- .../Views/uEditorRemesaProveedor.pas | 1 - .../Views/uEditorRemesasProveedor.pas | 1 - .../Views/uViewRecibosRemesaProveedor.pas | 8 +- .../Views/uViewRemesaProveedor.dfm | 24 +- .../Views/uViewRemesaProveedor.pas | 8 +- .../Views/uViewRemesasProveedor.dfm | 86 +- .../Views/uViewRemesasProveedor.pas | 26 +- Source/Servidor/FactuGES_Server.RES | Bin 23196 -> 23200 bytes Source/Servidor/FactuGES_Server.dproj | 2 +- Source/Servidor/FactuGES_Server.rc | 10 +- 225 files changed, 7565 insertions(+), 3869 deletions(-) create mode 100644 Resources/Iconos/Albaranes de cliente/16x16/Budget.png create mode 100644 Resources/Iconos/Albaranes de cliente/16x16/Devolucion.png rename Resources/Iconos/{Albaranes => Albaranes de cliente}/16x16/Letters patent.png (100%) rename Resources/Iconos/{Albaranes => Albaranes de cliente}/16x16/pagado.png (100%) create mode 100644 Resources/Iconos/Albaranes de cliente/24x24/Budget.png create mode 100644 Resources/Iconos/Albaranes de cliente/24x24/Devolucion.png rename Resources/Iconos/{Albaranes => Albaranes de cliente}/24x24/Letters patent.png (100%) create mode 100644 Resources/Iconos/Albaranes de cliente/28x28/Budget.png create mode 100644 Resources/Iconos/Albaranes de cliente/28x28/Devolucion.png rename Resources/Iconos/{Albaranes => Albaranes de cliente}/28x28/Letters patent.png (100%) create mode 100644 Resources/Iconos/Inventario/16x16/articulos.png create mode 100644 Resources/Iconos/Inventario/16x16/liberar.png create mode 100644 Resources/Iconos/Inventario/24x24/Thumbs.db create mode 100644 Resources/Iconos/Inventario/24x24/articulos.png create mode 100644 Resources/Iconos/Inventario/24x24/liberar.png create mode 100644 Resources/Iconos/Inventario/28x28/articulos.png create mode 100644 Resources/Iconos/Inventario/28x28/liberar.png diff --git a/Installer/librerias.txt b/Installer/librerias.txt index 5d27cb99..cd8e7f95 100644 --- a/Installer/librerias.txt +++ b/Installer/librerias.txt @@ -53,6 +53,35 @@ RemObjects_Core_D11.bpl tb2k_d10.bpl tbx_d10.bpl +dxSkinBlackD11.bpl +dxSkinBlueD11.bpl +dxSkinCaramelD11.bpl +dxSkinCoffeeD11.bpl +dxSkinGlassOceansD11.bpl +dxSkiniMaginaryD11.bpl +dxSkinLilianD11.bpl +dxSkinLiquidSkyD11.bpl +dxSkinLondonLiquidSkyD11.bpl +dxSkinMcSkinD11.bpl +dxSkinMoneyTwinsD11.bpl +dxSkinOffice2007BlackD11.bpl +dxSkinOffice2007BlueD11.bpl +dxSkinOffice2007GreenD11.bpl +dxSkinOffice2007PinkD11.bpl +dxSkinOffice2007SilverD11.bpl +dxSkinsCoreD11.bpl +dxSkinscxPCPainterD11.bpl +dxSkinscxScheduler3PainterD11.bpl +dxSkinsdxBarPainterD11.bpl +dxSkinsdxDLPainterD11.bpl +dxSkinsdxLCPainterD11.bpl +dxSkinsdxNavBar2PainterD11.bpl +dxSkinsdxRibbonPainterD11.bpl +dxSkinSilverD11.bpl +dxSkinStardustD11.bpl +dxSkinValentineD11.bpl +dxSkinXmas2008BlueD11.bpl + adortl100.bpl bdertl100.bpl dbrtl100.bpl diff --git a/Resources/Iconos/Albaranes de cliente/16x16/Budget.png b/Resources/Iconos/Albaranes de cliente/16x16/Budget.png new file mode 100644 index 0000000000000000000000000000000000000000..74922f8c6649b923d31eccd14f8db2576a68c76b GIT binary patch literal 3143 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 literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Albaranes de cliente/16x16/Devolucion.png b/Resources/Iconos/Albaranes de cliente/16x16/Devolucion.png new file mode 100644 index 0000000000000000000000000000000000000000..404988d614d0c00b08a1eb39ba05af5ce3bf3547 GIT binary patch literal 607 zcmV-l0-*hgP)gDun2dqm)(_7>I>Y5UVvP zl^NZK={BAB?$`ZYncH<{(Sgf7=X>t?e$St)2qCx`3Jd+xG?+Y|4`8uLLiz?y{7oqeJvKTP*D76-*yy zu0xXGW^DTIN;WZn zs)>^^3OkU6_n*G8EmWRsD)N|kEW!7d05Qe9!g>=7CQ literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Albaranes/16x16/Letters patent.png b/Resources/Iconos/Albaranes de cliente/16x16/Letters patent.png similarity index 100% rename from Resources/Iconos/Albaranes/16x16/Letters patent.png rename to Resources/Iconos/Albaranes de cliente/16x16/Letters patent.png diff --git a/Resources/Iconos/Albaranes/16x16/pagado.png b/Resources/Iconos/Albaranes de cliente/16x16/pagado.png similarity index 100% rename from Resources/Iconos/Albaranes/16x16/pagado.png rename to Resources/Iconos/Albaranes de cliente/16x16/pagado.png diff --git a/Resources/Iconos/Albaranes de cliente/24x24/Budget.png b/Resources/Iconos/Albaranes de cliente/24x24/Budget.png new file mode 100644 index 0000000000000000000000000000000000000000..da509973c1f33491a0005cb2d4b11b25950f1d4f GIT binary patch literal 3345 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 X?1to~t)(5s00000NkvXXu0mjfK6i+H literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Albaranes/24x24/Letters patent.png b/Resources/Iconos/Albaranes de cliente/24x24/Letters patent.png similarity index 100% rename from Resources/Iconos/Albaranes/24x24/Letters patent.png rename to Resources/Iconos/Albaranes de cliente/24x24/Letters patent.png diff --git a/Resources/Iconos/Albaranes de cliente/28x28/Budget.png b/Resources/Iconos/Albaranes de cliente/28x28/Budget.png new file mode 100644 index 0000000000000000000000000000000000000000..ff77e52725cf1878657fadb6d574422a4b4c0b23 GIT binary patch literal 3391 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 literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Inventario/24x24/articulos.png b/Resources/Iconos/Inventario/24x24/articulos.png new file mode 100644 index 0000000000000000000000000000000000000000..c638dfe6f2377ac3a97afe613793bfcb6a532c46 GIT binary patch literal 467 zcmV;^0WAKBP)z@%5w(33+yDRoAY({UO#lFHi~s<1XaE55!2ke-1^@tN zi2wlk_y7P%aR2}ul(R1~hX4QpNl8RORCwC7Ry%6LKoET!8+3`76zNo@b(Mg1374*X zg&0z#F!%<+Lg0f0xrnP=!0v)vu-9$ zcx{O)AOg|^pi?_uD^LWd2|&u7*9w$_)3ka+6K@nK2iKLr#Onl<3K8wbjfYKq9YkTY z!(udf`)Ka-`x^u%zOxVN`rNdfe9&oBxb(TjShRVa>h6Ok{3M6W+WWvNxkez^%$D&$)8|&nb6GFouZ~+E5S?zGOCZlJ z+tdchCvZOhP5veSM?k3%(fdOOqZv%3d$01FiN60TuFx~S2LKJjjGe0p_YD95002ov JPDHLkV1gU$z5M_H literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Inventario/24x24/liberar.png b/Resources/Iconos/Inventario/24x24/liberar.png new file mode 100644 index 0000000000000000000000000000000000000000..40be13943761d440c0c459aa6ccac01f6c797ca0 GIT binary patch literal 654 zcmV;90&)F`P)z@%5w(33+yDRoAY({UO#lFHi~s<1XaE55!2ke-1^@tN zi2wlk_y7P%aR2}ul(R1~hX4Qq1W80eRCwC7mcMHgVHn3hZxcxVh)U}u98?;iBu?!h z4#hI2Vm-{*P0&wcOx-klN={%1r1PM5E|1Xe@pmQ1*nsjdYgBEpYXqoVbu1cla{ zlDlulMTDS?dPK3<6C7u&%d9nMo9z#iME(H}m8d7QhI$RO&4ut#0$MFyH%x9$8vkLbO}D__dJi13X;S5AU-z>fOW43u@uiY0QOi&9ZL}5Kt71i&5}#s zU}hp>JpYAq3zf)WJ!Vw&-(H1VrRbOUU+tJcUxK7;h~K ze~<@Y{BFK8TsMZi1KSmBN3dPt=g9#8)i3Y(ZMXTQ+t@yW=%B+3HTiMg_gdAE(yp$QcS4oKVySRsDgRe;gM`r8p1 zza5sTwi_YCV#yAF^lv5{7n9E zquAw&4@#wtymO@*Yd`8fUj-&!ti5uEV^&)sP(9D{4!{s+@O1TaS?83{1OVt%xLg1L literal 0 HcmV?d00001 diff --git a/Resources/Iconos/Inventario/28x28/liberar.png b/Resources/Iconos/Inventario/28x28/liberar.png new file mode 100644 index 0000000000000000000000000000000000000000..bd5c233de0a661084eca52faffc53b7ca0ed2aba GIT binary patch literal 652 zcmV;70(1R|P)z@%5w(33+yDRoAY({UO#lFHi~s<1XaE55!2ke-1^@tN zi2wlk_y7P%aR2}ul(R1~hX4Qq0!c(cRCwC7ma%ISaTLctzb26U5tY_SIH)v2Nt{}+ zI20FgC<-DSM65_b5bTzr5Ji_z8d?gai(RaXOF$Y34%!k*lxWum;v51B_q)p_&!v}~ z2``-J$``+(+cS=O~pAiQ*S-o@vI0&el55tXIqvVT-2tQtoi`JXs7g}#h z;chrCBKT$8B}yb7VOd*!X01V+Y=4|4_78ZVL<6BUw3?tz&V>gOxXrC5Xp6{rAc42J z)f(I|3=bvnHv35sh6fQ?))w2Jt`98?!@~&Xcb3);hMk7l37+pPt-TJyhcb-f1JZ{B zd0{?C&Q5dke&(-bbMLySR9>XIqTFj^f#^0`5Vxi~1Tdydx-}Gl>*drkT0000 MainSource - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 8b91dde5..3ac2560d 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,58 +53,58 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Base/Controladores/uControllerDetallesBase.pas b/Source/Base/Controladores/uControllerDetallesBase.pas index 790b07b3..6dcd2531 100644 --- a/Source/Base/Controladores/uControllerDetallesBase.pas +++ b/Source/Base/Controladores/uControllerDetallesBase.pas @@ -48,7 +48,7 @@ type procedure EndUpdate(ADataTable: IDAStronglyTypedDataTable); //Si en los hijos existen campos a tener en cuenta se sobreescribira este metodo - procedure validarCampos(DataTable: TDADataTable); virtual; + procedure ValidarCampos(DataTable: TDADataTable); virtual; //Si sobreescribimos este método podremos tener en cuenta otras columnas para el calculo del importe total de un concepto function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; virtual; diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index baa4c9ee..e81dcda5 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -54,15 +54,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1030FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.3.0FactuGESFactuGES1.0.3.0 - - - - - - - - +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1040FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.0.4.0FactuGESFactuGES1.0.4.0 diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 72176d90..00f6baa7 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,0,3,0 -PRODUCTVERSION 1,0,3,0 +FILEVERSION 1,0,4,0 +PRODUCTVERSION 1,0,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.0.3.0\0" + VALUE "FileVersion", "1.0.4.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.0.3.0\0" + VALUE "ProductVersion", "1.0.4.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 97541b81add9f26486b0fa603c5280539b1df372..b93898c859a1f276292fcf10792d199d30ef0967 100644 GIT binary patch delta 42 wcmcbxpX MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index dd33b20b..9edf8834 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -47,6 +47,10 @@ 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 79d744ff..df60793f 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 = 73 + Height = 68 AutoSize = True ButtonWidth = 141 Caption = 'ToolBar1' @@ -42,29 +42,30 @@ inherited frViewDetallesBase: TfrViewDetallesBase Top = 0 Action = actSubir AutoSize = True + Wrap = True end object ToolButton4: TToolButton - Left = 184 - Top = 0 + Left = 0 + Top = 22 Action = actBajar AutoSize = True end object ToolButton14: TToolButton - Left = 240 - Top = 0 + Left = 56 + Top = 22 Action = FontEdit1 AutoSize = True Wrap = True end object FontName: TJvFontComboBox Left = 0 - Top = 22 + Top = 44 Width = 145 Height = 22 DroppedDownWidth = 145 MaxMRUCount = 0 FontName = 'Tahoma' - ItemIndex = 43 + ItemIndex = 42 Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg] Sorted = True TabOrder = 2 @@ -74,7 +75,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object FontSize: TEdit Left = 145 - Top = 22 + Top = 44 Width = 26 Height = 22 Hint = 'Font Size|Select font size' @@ -85,7 +86,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object UpDown1: TUpDown Left = 171 - Top = 22 + Top = 44 Width = 16 Height = 22 Associate = FontSize @@ -94,7 +95,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton13: TToolButton Left = 187 - Top = 22 + Top = 44 Width = 8 Caption = 'ToolButton13' ImageIndex = 10 @@ -102,59 +103,60 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton6: TToolButton Left = 195 - Top = 22 + Top = 44 Action = RichEditBold1 AutoSize = True end object ToolButton7: TToolButton Left = 261 - Top = 22 + Top = 44 Action = RichEditItalic1 AutoSize = True end object ToolButton8: TToolButton Left = 328 - Top = 22 + Top = 44 Action = RichEditUnderline1 AutoSize = True end object ToolButton12: TToolButton - Left = 0 - Top = 22 + Left = 411 + Top = 44 Width = 8 Caption = 'ToolButton12' ImageIndex = 10 - Wrap = True Style = tbsSeparator end object ToolButton9: TToolButton - Left = 0 - Top = 49 + Left = 419 + Top = 44 Action = RichEditAlignLeft1 AutoSize = True end object ToolButton10: TToolButton - Left = 145 - Top = 49 + Left = 564 + Top = 44 Action = RichEditAlignCenter1 AutoSize = True end object ToolButton11: TToolButton - Left = 270 - Top = 49 + Left = 689 + Top = 44 Action = RichEditAlignRight1 AutoSize = True end end object cxGrid: TcxGrid Left = 0 - Top = 99 + Top = 94 Width = 451 - Height = 205 + Height = 210 Align = alClient TabOrder = 1 LookAndFeel.Kind = lfStandard LookAndFeel.NativeStyle = True + ExplicitTop = 99 + ExplicitHeight = 205 object cxGridView: TcxGridDBTableView NavigatorButtons.ConfirmDelete = False FilterBox.Visible = fvNever @@ -197,6 +199,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase OptionsView.GridLines = glHorizontal OptionsView.GroupByBox = False OptionsView.HeaderEndEllipsis = True + OptionsView.Indicator = True Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle object cxGridViewID: TcxGridDBColumn DataBinding.FieldName = 'ID' @@ -272,9 +275,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase PropertiesClassName = 'TcxImageComboBoxProperties' Properties.ImmediatePost = True Properties.Items = <> - BestFitMaxWidth = 50 - MinWidth = 50 - Width = 50 + Properties.PostPopupValueOnTab = True + MinWidth = 45 + Options.HorzSizing = False + Options.Moving = False + Options.Sorting = False + Styles.Content = cxStyle_ESPECIALES + Width = 45 end object cxGridViewDESCRIPCION: TcxGridDBColumn Caption = 'Concepto' @@ -324,11 +331,12 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object TBXDock1: TTBXDock Left = 0 - Top = 73 + Top = 68 Width = 451 Height = 26 BackgroundOnToolbars = False UseParentBackground = True + ExplicitTop = 73 object TBXToolbar1: TTBXToolbar Left = 0 Top = 0 @@ -919,9 +927,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase Color = 15657963 end object cxStyle_ESPECIALES: TcxStyle - AssignedValues = [svColor, svTextColor] - Color = 552984534 - TextColor = 547699712 + AssignedValues = [svColor] + Color = 15657963 end object cxStyle_NORMAL_PAR: TcxStyle AssignedValues = [svColor] @@ -932,4 +939,35 @@ inherited frViewDetallesBase: TfrViewDetallesBase Color = clWindow end end + object cxGridPopupMenu: TcxGridPopupMenu + Grid = cxGrid + PopupMenus = < + item + GridView = cxGridView + HitTypes = [gvhtCell] + Index = 0 + end + item + HitTypes = [] + Index = 1 + end> + Left = 112 + Top = 136 + end + object GridIndicatorPopupMenu: TPopupMenu + Left = 144 + Top = 136 + object Eliminar1: TMenuItem + Action = actEliminar + end + object N1: TMenuItem + Caption = '-' + end + object dsds1: TMenuItem + Action = actSubir + end + object Bajar1: TMenuItem + Action = actBajar + end + end end diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas index c293dd46..5971ceee 100644 --- a/Source/GUIBase/uViewDetallesBase.pas +++ b/Source/GUIBase/uViewDetallesBase.pas @@ -11,7 +11,14 @@ uses PngImageList, cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, uGridUtils, uControllerDetallesBase, cxCurrencyEdit, ExtCtrls, Grids, DBGrids, StdCtrls, ExtActns, StdActns, cxRichEdit, JvExStdCtrls, JvCombobox, JvColorCombo, - TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces; + TB2Item, TBX, TB2Dock, TB2Toolbar, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinscxPCPainter, cxGridCustomPopupMenu, cxGridPopupMenu, + Menus; type IViewDetallesBase = interface(IViewBase) @@ -120,6 +127,12 @@ type TBXItem15: TTBXItem; TBXItem16: TTBXItem; TBXSeparatorItem7: TTBXSeparatorItem; + cxGridPopupMenu: TcxGridPopupMenu; + GridIndicatorPopupMenu: TPopupMenu; + dsds1: TMenuItem; + Bajar1: TMenuItem; + Eliminar1: TMenuItem; + N1: TMenuItem; procedure actAnadirExecute(Sender: TObject); procedure actEliminarExecute(Sender: TObject); procedure actSubirExecute(Sender: TObject); @@ -500,10 +513,10 @@ end; procedure TfrViewDetallesBase.cxGridViewCustomDrawCell( Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); -var +{var R : TRect; sVal : String ; - iFlag : Integer ; + iFlag : Integer ;} begin { R := AViewInfo.Bounds; FillGradientRect(ACanvas.Handle, R, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False); @@ -762,15 +775,13 @@ function TfrViewDetallesBase.DarPosicionCAMPO(const Nombre: String): Integer; var i: Integer; begin - Result := -1; - i:=0; - while ((cxGridView.Columns[i].DataBinding.FieldName <> Nombre) - and (i < cxGridView.ColumnCount)) do + while ((cxGridView.Columns[i].DataBinding.FieldName <> Nombre) and + (i < cxGridView.ColumnCount)) do inc(i); - if (i = cxGridView.ColumnCount) - then raise Exception.Create('El campo ' + Nombre + ' no se ha encontrado en el grid (uViewDetallesBase)'); + if (i = cxGridView.ColumnCount) then + raise Exception.Create('El campo ' + Nombre + ' no se ha encontrado en el grid (uViewDetallesBase)'); Result := i; end; diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm index f9a46bbd..b9d6c56c 100644 --- a/Source/GUIBase/uViewDetallesDTO.dfm +++ b/Source/GUIBase/uViewDetallesDTO.dfm @@ -1,8 +1,5 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO - Width = 582 - Height = 327 inherited ToolBar1: TToolBar - Width = 582 inherited ToolButton1: TToolButton ExplicitWidth = 109 end @@ -49,8 +46,8 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end inherited cxGrid: TcxGrid - Width = 582 - Height = 228 + ExplicitTop = 126 + ExplicitHeight = 210 inherited cxGridView: TcxGridDBTableView object cxGridViewDESCUENTO: TcxGridDBColumn [7] Caption = 'Dto' @@ -91,10 +88,7 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end inherited TBXDock1: TTBXDock - Width = 582 - inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 582 - end + ExplicitTop = 100 end inherited ActionListContenido: TActionList inherited actAnadir: TAction diff --git a/Source/GUIBase/uViewDetallesDTO.pas b/Source/GUIBase/uViewDetallesDTO.pas index 337697dc..89ad570f 100644 --- a/Source/GUIBase/uViewDetallesDTO.pas +++ b/Source/GUIBase/uViewDetallesDTO.pas @@ -10,7 +10,14 @@ uses StdActns, ExtActns, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, ComCtrls, StdCtrls, JvExStdCtrls, - JvCombobox, JvColorCombo, ToolWin, uDAInterfaces; + JvCombobox, JvColorCombo, ToolWin, uDAInterfaces, 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 IViewDetallesDTO = interface(IViewDetallesBase) diff --git a/Source/GUIBase/uViewDetallesGenerico.dfm b/Source/GUIBase/uViewDetallesGenerico.dfm index 3afdb87e..c672004e 100644 --- a/Source/GUIBase/uViewDetallesGenerico.dfm +++ b/Source/GUIBase/uViewDetallesGenerico.dfm @@ -73,19 +73,19 @@ inherited frViewDetallesGenerico: TfrViewDetallesGenerico Transparent = True object ToolButton1: TToolButton Left = 0 - Top = 2 + Top = 0 Action = actAnadir AutoSize = True end object ToolButton4: TToolButton Left = 62 - Top = 2 + Top = 0 Action = actModificar AutoSize = True end object ToolButton5: TToolButton Left = 136 - Top = 2 + Top = 0 Width = 8 Caption = 'ToolButton5' ImageIndex = 2 @@ -93,13 +93,13 @@ inherited frViewDetallesGenerico: TfrViewDetallesGenerico end object ToolButton2: TToolButton Left = 144 - Top = 2 + Top = 0 Action = actEliminar AutoSize = True end object ToolButton6: TToolButton Left = 211 - Top = 2 + Top = 0 Width = 8 Caption = 'ToolButton6' ImageIndex = 2 @@ -107,7 +107,7 @@ inherited frViewDetallesGenerico: TfrViewDetallesGenerico end object ToolButton7: TToolButton Left = 219 - Top = 2 + Top = 0 Action = actAnchoAutomatico AutoSize = True end diff --git a/Source/GUIBase/uViewDetallesGenerico.pas b/Source/GUIBase/uViewDetallesGenerico.pas index d2513866..fb512c7b 100644 --- a/Source/GUIBase/uViewDetallesGenerico.pas +++ b/Source/GUIBase/uViewDetallesGenerico.pas @@ -8,7 +8,13 @@ uses cxDataStorage, cxEdit, DB, cxDBData, cxTextEdit, ActnList, ImgList, PngImageList, uDADataTable, ComCtrls, ToolWin, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, - cxControls, cxGridCustomView, cxGrid, uDAInterfaces; + cxControls, cxGridCustomView, cxGrid, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinscxPCPainter; type IViewDetallesGenerico = interface(IViewBase) diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index 4ce1c83b..309fc983 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -18,6 +18,7 @@ inherited frViewGrid: TfrViewGrid TabOrder = 0 LookAndFeel.Kind = lfOffice11 LookAndFeel.NativeStyle = True + ExplicitTop = 104 object cxGridView: TcxGridDBTableView OnDblClick = cxGridViewDblClick NavigatorButtons.ConfirmDelete = False @@ -39,6 +40,7 @@ inherited frViewGrid: TfrViewGrid OptionsSelection.CellSelect = False OptionsSelection.UnselectFocusedRecordOnExit = False OptionsView.CellEndEllipsis = True + OptionsView.NoDataToDisplayInfoText = '' OptionsView.CellAutoHeight = True OptionsView.ColumnAutoWidth = True OptionsView.DataRowHeight = 22 @@ -46,10 +48,21 @@ inherited frViewGrid: TfrViewGrid OptionsView.GridLineColor = cl3DLight OptionsView.GridLines = glHorizontal OptionsView.GroupByBox = False + OptionsView.GroupRowStyle = grsOffice11 OptionsView.HeaderEndEllipsis = True Styles.Inactive = cxStyleSelection Styles.Selection = cxStyleSelection Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle + object cxGridViewICONO: TcxGridDBColumn + Caption = 'Icono' + OnCustomDrawCell = cxGridViewICONOCustomDrawCell + BestFitMaxWidth = 22 + MinWidth = 22 + Options.HorzSizing = False + Options.Sorting = False + Width = 22 + OnCustomDrawHeader = cxGridViewICONOCustomDrawHeader + end end object cxGridLevel: TcxGridLevel GridView = cxGridView @@ -166,7 +179,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39584.791125752320000000 + ReportDocument.CreationDate = 39588.472473043980000000 StyleManager = dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True @@ -237,26 +250,15 @@ inherited frViewGrid: TfrViewGrid Color = 549249528 end end - object cxViewGridPopupMenu: TcxGridPopupMenu - Grid = cxGrid - PopupMenus = <> - Left = 264 - Top = 128 - end object ActionList1: TActionList - Left = 400 - Top = 360 + Left = 144 + Top = 400 object actQuitarAgrupaciones: TAction Caption = 'Quitar agrupaciones' OnExecute = actQuitarAgrupacionesExecute OnUpdate = actQuitarAgrupacionesUpdate end end - object PngImageList10: TPngImageList - PngImages = <> - Left = 368 - Top = 360 - end object cxStyleRepositoryInforme: TcxStyleRepository Left = 368 Top = 160 @@ -350,4 +352,113 @@ inherited frViewGrid: TfrViewGrid BuiltInStyle = True end end + object GridPNGImageList: TPngImageList + PngImages = < + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 61000000097048597300000B1300000B1301009A9C1800000A4F694343505068 + 6F746F73686F70204943432070726F66696C65000078DA9D53675453E9163DF7 + DEF4424B8880944B6F5215082052428B801491262A2109104A8821A1D91551C1 + 114545041BC8A088038E8E808C15512C0C8A0AD807E421A28E83A3888ACAFBE1 + 7BA36BD6BCF7E6CDFEB5D73EE7ACF39DB3CF07C0080C9648335135800CA9421E + 11E083C7C4C6E1E42E40810A2470001008B3642173FD230100F87E3C3C2B22C0 + 07BE000178D30B0800C04D9BC0301C87FF0FEA42995C01808401C07491384B08 + 801400407A8E42A600404601809D98265300A0040060CB6362E300502D006027 + 7FE6D300809DF8997B01005B94211501A09100201365884400683B00ACCF568A + 450058300014664BC43900D82D00304957664800B0B700C0CE100BB200080C00 + 305188852900047B0060C8232378008499001446F2573CF12BAE10E72A000078 + 99B23CB9243945815B082D710757572E1E28CE49172B14366102619A402EC279 + 99193281340FE0F3CC0000A0911511E083F3FD78CE0EAECECE368EB60E5F2DEA + BF06FF226262E3FEE5CFAB70400000E1747ED1FE2C2FB31A803B06806DFEA225 + EE04685E0BA075F78B66B20F40B500A0E9DA57F370F87E3C3C45A190B9D9D9E5 + E4E4D84AC4425B61CA577DFE67C25FC057FD6CF97E3CFCF7F5E0BEE22481325D + 814704F8E0C2CCF44CA51CCF92098462DCE68F47FCB70BFFFC1DD322C44962B9 + 582A14E35112718E449A8CF332A52289429229C525D2FF64E2DF2CFB033EDF35 + 00B06A3E017B912DA85D6303F64B27105874C0E2F70000F2BB6FC1D428080380 + 6883E1CF77FFEF3FFD47A02500806649927100005E44242E54CAB33FC7080000 + 44A0812AB0411BF4C1182CC0061CC105DCC10BFC6036844224C4C24210420A64 + 801C726029AC82422886CDB01D2A602FD4401D34C051688693700E2EC255B80E + 3D700FFA61089EC128BC81090441C808136121DA8801628A58238E08179985F8 + 21C14804128B2420C9881451224B91354831528A542055481DF23D720239875C + 46BA913BC8003282FC86BC47319481B2513DD40CB543B9A8371A8446A20BD064 + 74319A8F16A09BD072B41A3D8C36A1E7D0AB680FDA8F3E43C730C0E8180733C4 + 6C302EC6C342B1382C099363CBB122AC0CABC61AB056AC03BB89F563CFB17704 + 128145C0093604774220611E4148584C584ED848A8201C243411DA0937090384 + 51C2272293A84BB426BA11F9C4186232318758482C23D6128F132F107B8843C4 + 37241289433227B9900249B1A454D212D246D26E5223E92CA99B34481A2393C9 + DA646BB20739942C202BC885E49DE4C3E433E41BE421F25B0A9D624071A4F853 + E22852CA6A4A19E510E534E5066598324155A39A52DDA8A15411358F5A42ADA1 + B652AF5187A81334759A39CD8316494BA5ADA295D31A681768F769AFE874BA11 + DD951E4E97D057D2CBE947E897E803F4770C0D861583C7886728199B18071867 + 197718AF984CA619D38B19C754303731EB98E7990F996F55582AB62A7C1591CA + 0A954A9526951B2A2F54A9AAA6AADEAA0B55F355CB548FA95E537DAE46553353 + E3A909D496AB55AA9D50EB531B5367A93BA887AA67A86F543FA47E59FD890659 + C34CC34F43A451A0B15FE3BCC6200B6319B3782C216B0DAB86758135C426B1CD + D97C762ABB98FD1DBB8B3DAAA9A13943334A3357B352F394663F07E39871F89C + 744E09E728A797F37E8ADE14EF29E2291BA6344CB931655C6BAA96979658AB48 + AB51AB47EBBD36AEEDA79DA6BD45BB59FB810E41C74A275C2747678FCE059DE7 + 53D953DDA70AA7164D3D3AF5AE2EAA6BA51BA1BB4477BF6EA7EE989EBE5E809E + 4C6FA7DE79BDE7FA1C7D2FFD54FD6DFAA7F5470C5806B30C2406DB0CCE183CC5 + 35716F3C1D2FC7DBF151435DC34043A561956197E18491B9D13CA3D5468D460F + 8C69C65CE324E36DC66DC6A326062621264B4DEA4DEE9A524DB9A629A63B4C3B + 4CC7CDCCCDA2CDD699359B3D31D732E79BE79BD79BDFB7605A785A2CB6A8B6B8 + 6549B2E45AA659EEB6BC6E855A3959A558555A5DB346AD9DAD25D6BBADBBA711 + A7B94E934EAB9ED667C3B0F1B6C9B6A9B719B0E5D806DBAEB66DB67D61676217 + 67B7C5AEC3EE93BD937DBA7D8DFD3D070D87D90EAB1D5A1D7E73B472143A563A + DE9ACE9CEE3F7DC5F496E92F6758CF10CFD833E3B613CB29C4699D539BD34767 + 1767B97383F3888B894B82CB2E973E2E9B1BC6DDC8BDE44A74F5715DE17AD2F5 + 9D9BB39BC2EDA8DBAFEE36EE69EE87DC9FCC349F299E593373D0C3C843E051E5 + D13F0B9F95306BDFAC7E4F434F8167B5E7232F632F9157ADD7B0B7A577AAF761 + EF173EF63E729FE33EE33C37DE32DE595FCC37C0B7C8B7CB4FC36F9E5F85DF43 + 7F23FF64FF7AFFD100A78025016703898141815B02FBF87A7C21BF8E3F3ADB65 + F6B2D9ED418CA0B94115418F82AD82E5C1AD2168C8EC90AD21F7E798CE91CE69 + 0E85507EE8D6D00761E6618BC37E0C2785878557863F8E7088581AD131973577 + D1DC4373DF44FA449644DE9B67314F39AF2D4A352A3EAA2E6A3CDA37BA34BA3F + C62E6659CCD5589D58496C4B1C392E2AAE366E6CBEDFFCEDF387E29DE20BE37B + 17982FC85D7079A1CEC2F485A716A92E122C3A96404C884E3894F041102AA816 + 8C25F21377258E0A79C21DC267222FD136D188D8435C2A1E4EF2482A4D7A92EC + 91BC357924C533A52CE5B98427A990BC4C0D4CDD9B3A9E169A76206D323D3ABD + 31839291907142AA214D93B667EA67E66676CBAC6585B2FEC56E8BB72F1E9507 + C96BB390AC05592D0AB642A6E8545A28D72A07B267655766BFCD89CA3996AB9E + 2BCDEDCCB3CADB90379CEF9FFFED12C212E192B6A5864B572D1D58E6BDAC6A39 + B23C7179DB0AE315052B865606AC3CB88AB62A6DD54FABED5797AE7EBD267A4D + 6B815EC1CA82C1B5016BEB0B550AE5857DEBDCD7ED5D4F582F59DFB561FA869D + 1B3E15898AAE14DB1797157FD828DC78E51B876FCABF99DC94B4A9ABC4B964CF + 66D266E9E6DE2D9E5B0E96AA97E6970E6E0DD9DAB40DDF56B4EDF5F645DB2F97 + CD28DBBB83B643B9A3BF3CB8BC65A7C9CECD3B3F54A454F454FA5436EED2DDB5 + 61D7F86ED1EE1B7BBCF634ECD5DB5BBCF7FD3EC9BEDB5501554DD566D565FB49 + FBB3F73FAE89AAE9F896FB6D5DAD4E6D71EDC703D203FD07230EB6D7B9D4D51D + D23D54528FD62BEB470EC71FBEFE9DEF772D0D360D558D9CC6E223704479E4E9 + F709DFF71E0D3ADA768C7BACE107D31F761D671D2F6A429AF29A469B539AFB5B + 625BBA4FCC3ED1D6EADE7AFC47DB1F0F9C343C59794AF354C969DAE982D39367 + F2CF8C9D959D7D7E2EF9DC60DBA2B67BE763CEDF6A0F6FEFBA1074E1D245FF8B + E73BBC3BCE5CF2B874F2B2DBE51357B8579AAF3A5F6DEA74EA3CFE93D34FC7BB + 9CBB9AAEB95C6BB9EE7ABDB57B66F7E91B9E37CEDDF4BD79F116FFD6D59E393D + DDBDF37A6FF7C5F7F5DF16DD7E7227FDCECBBBD97727EEADBC4FBC5FF440ED41 + D943DD87D53F5BFEDCD8EFDC7F6AC077A0F3D1DC47F7068583CFFE91F58F0F43 + 058F998FCB860D86EB9E383E3939E23F72FDE9FCA743CF64CF269E17FEA2FECB + AE17162F7EF8D5EBD7CED198D1A197F29793BF6D7CA5FDEAC0EB19AFDBC6C2C6 + 1EBEC97833315EF456FBEDC177DC771DEFA3DF0F4FE47C207F28FF68F9B1F553 + D0A7FB93199393FF040398F3FC63332DDB000000434944415478DA63FCFFFF3F + 03258011D900464646ACA601D530126D00BA6298A1B80C21CA0090183639925C + 80CB3B040DC0E69A510306BD010C04005E03C801036F00008D248BE16F9028BA + 0000000049454E44AE426082} + Name = 'Icono_header' + Background = clWindow + end> + Left = 296 + Top = 320 + Bitmap = {} + end + object cxViewGridPopupMenu: TcxGridPopupMenu + Grid = cxGrid + PopupMenus = < + item + HitTypes = [gvhtCell] + Index = 0 + end> + Left = 248 + Top = 128 + end end diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas index 034478bc..c4adffbe 100644 --- a/Source/GUIBase/uViewGrid.pas +++ b/Source/GUIBase/uViewGrid.pas @@ -43,11 +43,9 @@ type dxPSEngineController1: TdxPSEngineController; cxStyleRepository1: TcxStyleRepository; cxStyleSelection: TcxStyle; - cxViewGridPopupMenu: TcxGridPopupMenu; dxComponentPrinterLink: TdxGridReportLink; frViewFiltroBase1: TfrViewFiltroBase; ActionList1: TActionList; - PngImageList10: TPngImageList; actQuitarAgrupaciones: TAction; pnlAgrupaciones: TTBXDockablePanel; TBXAlignmentPanel1: TTBXAlignmentPanel; @@ -69,12 +67,20 @@ type cxStyle_FILTRADO_IMPAR: TcxStyle; cxStyle_FILTRADO_ORDENADO_PAR: TcxStyle; cxStyle_FILTRADO_ORDENADO_IMPAR: TcxStyle; + GridPNGImageList: TPngImageList; + cxViewGridPopupMenu: TcxGridPopupMenu; procedure cxGridViewStylesGetContentStyle( Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); procedure cxGridViewDblClick(Sender: TObject); procedure actQuitarAgrupacionesExecute(Sender: TObject); procedure actQuitarAgrupacionesUpdate(Sender: TObject); + procedure cxGridViewICONOCustomDrawCell(Sender: TcxCustomGridTableView; + ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; + var ADone: Boolean); + procedure cxGridViewICONOCustomDrawHeader(Sender: TcxGridTableView; + ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo; + var ADone: Boolean); protected function GetGrid : TcxGrid; override; function GetFocusedView : TcxGridDBTableView; override; @@ -188,6 +194,40 @@ begin FOnDblClick(Sender); end; +procedure TfrViewGrid.cxGridViewICONOCustomDrawCell( + Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; + AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +var + R : TRect; +begin + inherited; + R := AViewInfo.ContentBounds; + ACanvas.FillRect(R); + ACanvas.DrawImage(GridPNGImageList, R.Left + 2, R.Top + 2, 1); + ADone := True; +end; + +procedure TfrViewGrid.cxGridViewICONOCustomDrawHeader(Sender: TcxGridTableView; + ACanvas: TcxCanvas; AViewInfo: TcxGridColumnHeaderViewInfo; + var ADone: Boolean); +var + R : TRect; +begin + inherited; + with AViewInfo do + begin + LookAndFeelPainter.DrawHeader(ACanvas, Bounds, TextAreaBounds, Neighbors, + Borders, ButtonState, AlignmentHorz, AlignmentVert, MultiLine, + False, '', Params.Font, Params.TextColor, Params.Color); + + R := AViewInfo.ContentBounds; + ACanvas.FillRect(R); + ACanvas.DrawImage(GridPNGImageList, R.Left + 2, R.Top + 2, 0); + end; + + ADone := True; +end; + procedure TfrViewGrid.cxGridViewStylesGetContentStyle( Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/GUIBase/uViewIncidencias.pas b/Source/GUIBase/uViewIncidencias.pas index 056ba5ed..9243f65b 100644 --- a/Source/GUIBase/uViewIncidencias.pas +++ b/Source/GUIBase/uViewIncidencias.pas @@ -7,7 +7,12 @@ uses Dialogs, uViewBase, ExtCtrls, StdCtrls, DB, uDADataTable, cxGraphics, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit, - cxCheckBox, cxMemo, uDAInterfaces; + cxCheckBox, cxMemo, uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue; type TfrViewIncidencias = class(TfrViewBase) diff --git a/Source/GUIBase/uViewRichEditor.pas b/Source/GUIBase/uViewRichEditor.pas index 7c13a7b3..c2966701 100644 --- a/Source/GUIBase/uViewRichEditor.pas +++ b/Source/GUIBase/uViewRichEditor.pas @@ -9,7 +9,12 @@ uses cxTextEdit, cxDropDownEdit, cxColorComboBox, StdCtrls, cxButtons, ComCtrls, ToolWin, ImgList, ActnList, TBXExtItems, TB2ExtItems, TB2Item, TBX, TB2Dock, TB2Toolbar, PngImageList, cxMemo, cxRichEdit, ExtCtrls, DB, uDAInterfaces, - uDADataTable, cxDBRichEdit; + uDADataTable, cxDBRichEdit, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue; type IViewRichEditor = interface(IViewBase) diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index 739478ea..f54c3725 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,14 +1,14 @@ inherited frViewTotales: TfrViewTotales - Width = 880 + Width = 451 Height = 316 Align = alBottom - ExplicitWidth = 880 + ExplicitWidth = 451 ExplicitHeight = 316 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 880 + Width = 451 Height = 217 Margins.Left = 0 Margins.Top = 0 @@ -17,8 +17,9 @@ inherited frViewTotales: TfrViewTotales Align = alTop ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 451 + ExplicitWidth = 880 object Bevel1: TBevel Left = 104 Top = 109 @@ -27,14 +28,14 @@ inherited frViewTotales: TfrViewTotales Shape = bsBottomLine end object Bevel3: TBevel - Left = 434 + Left = 278 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 546 + Left = 390 Top = 109 Width = 192 Height = 9 @@ -61,18 +62,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 5 Height = 21 Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 617 + Left = 461 Top = 55 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -92,18 +97,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True 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 = 9 Height = 21 Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 547 + Left = 391 Top = 129 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' @@ -123,13 +132,17 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clActiveCaption Style.TextStyle = [fsBold] Style.IsFontAssigned = True 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 = 12 Height = 21 Width = 137 @@ -154,18 +167,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.ButtonStyle = bts3D Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 Height = 21 Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 546 + Left = 390 Top = 55 AutoSize = False DataBinding.DataField = 'IVA' @@ -187,22 +204,26 @@ inherited frViewTotales: TfrViewTotales Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.ButtonStyle = bts3D Style.IsFontAssigned = True 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 = 8 Height = 21 Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 546 + Left = 390 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -222,18 +243,22 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [fsBold] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 7 Height = 21 Width = 92 end object edtRE: TcxDBSpinEdit - Left = 546 + Left = 390 Top = 82 AutoSize = False DataBinding.DataField = 'RE' @@ -255,22 +280,26 @@ inherited frViewTotales: TfrViewTotales Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.ButtonStyle = bts3D Style.IsFontAssigned = True 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 = 10 Height = 21 Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 617 + Left = 461 Top = 82 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' @@ -290,12 +319,16 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True 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 = 11 Height = 21 Width = 56 @@ -321,12 +354,16 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [fsBold] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True 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 Height = 21 Width = 147 @@ -351,12 +388,16 @@ inherited frViewTotales: TfrViewTotales Style.Font.Style = [] Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 6 Height = 21 Width = 147 @@ -381,19 +422,23 @@ inherited frViewTotales: TfrViewTotales 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 = 1 Width = 81 end object bTiposIVA: TButton - Left = 286 + Left = 130 Top = 55 Width = 132 Height = 21 @@ -415,12 +460,16 @@ inherited frViewTotales: TfrViewTotales 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 = 3 Width = 219 end diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas index 8c992e4e..092fbb7b 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -8,7 +8,13 @@ uses cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit, ComCtrls, dxLayoutControl, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit, - cxDBLookupComboBox, cxCheckBox, uDAInterfaces; + cxDBLookupComboBox, cxCheckBox, 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 TfrViewTotales = class(TfrViewBase) diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj index 252da7f3..06a7230e 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj +++ b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj @@ -41,17 +41,17 @@ Delphi.Personality Package -FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0AlbaranesCliente_controller.dpk +FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0AlbaranesCliente_controller.dpk MainSource - - - - + + + + @@ -68,7 +68,7 @@