From 676a4e1439c4380b93648e1c5ee359f600ce73f8 Mon Sep 17 00:00:00 2001 From: david Date: Tue, 7 Oct 2008 17:02:23 +0000 Subject: [PATCH] Arreglos visuales en los grids. git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@667 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/GUIBase/GUIBase.dproj | 48 ++++----- Source/GUIBase/GUIBase.res | Bin 384 -> 4748 bytes Source/GUIBase/uViewGrid.dfm | 2 +- Source/GUIBase/uViewGrid.pas | 7 +- Source/GUIBase/uViewGridBase.pas | 11 +-- .../Views/uViewAlbaranesProveedor.dfm | 12 ++- .../Contactos/Views/Contactos_view.dproj | 92 +++++++++--------- .../Contactos/Views/Contactos_view.res | Bin 384 -> 4748 bytes .../Views/uViewPedidosProveedor.dfm | 68 +++++-------- .../Views/uViewPedidosProveedor.pas | 7 +- .../Views/uEditorRecibosProveedor.dfm | 24 ++++- .../Views/uEditorRecibosProveedor.pas | Bin 5512 -> 5510 bytes .../Views/uViewRecibosProveedor.dfm | 18 ++++ 13 files changed, 158 insertions(+), 131 deletions(-) diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 943c1950..7bf45318 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,30 +58,30 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch 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 delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index 792115ac..8b9d4f14 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -188,7 +188,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39687.693162951390000000 + ReportDocument.CreationDate = 39728.760640370370000000 StyleManager = dmBase.dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas index f4f89d68..3896e4b0 100644 --- a/Source/GUIBase/uViewGrid.pas +++ b/Source/GUIBase/uViewGrid.pas @@ -113,8 +113,11 @@ end; procedure TfrViewGrid.OnChangeValoresFiltro(Sender: TObject); begin cxGridView.DataController.Filter.BeginUpdate; - RefrescarFiltro; - cxGridView.DataController.Filter.EndUpdate; + try + RefrescarFiltro; + finally + cxGridView.DataController.Filter.EndUpdate; + end; end; procedure TfrViewGrid.Preview; diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas index c7d31b8b..d6e044f3 100644 --- a/Source/GUIBase/uViewGridBase.pas +++ b/Source/GUIBase/uViewGridBase.pas @@ -211,15 +211,10 @@ begin for i := 0 to _FocusedView.VisibleColumnCount-1 do begin _FocusedView.VisibleColumns[i].ApplyBestFit; - if _FocusedView.VisibleColumns[i].BestFitMaxWidth > 0 then - begin -// if (_FocusedView.VisibleColumns[i].Width > _FocusedView.VisibleColumns[i].BestFitMaxWidth) then -// begin + if (_FocusedView.VisibleColumns[i].BestFitMaxWidth > 0) and + (_FocusedView.VisibleColumns[i].Width > _FocusedView.VisibleColumns[i].BestFitMaxWidth) then _FocusedView.VisibleColumns[i].Width := _FocusedView.VisibleColumns[i].BestFitMaxWidth; -// end; - end; end; - finally _FocusedView.EndUpdate; HideHourglassCursor; @@ -230,7 +225,7 @@ procedure TfrViewGridBase.AjustarAncho; begin if Assigned(_FocusedView) then begin - BestFitAllColumns; + BestFitAllColumns; _FocusedView.ApplyBestFit; end; end; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index 264a1dad..81f5c656 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -63,10 +63,11 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor DataBinding.FieldName = 'REFERENCIA' SortIndex = 0 SortOrder = soDescending - Width = 65 + Width = 52 end object cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA_PROVEEDOR' + Width = 51 end object cxGridViewFECHA_ALBARAN: TcxGridDBColumn Caption = 'Fecha' @@ -75,7 +76,7 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor end object cxGridViewNOMBRE: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE' - Width = 160 + Width = 109 end object cxGridViewREF_PED_PROVEEDOR: TcxGridDBColumn DataBinding.FieldName = 'REF_PED_PROVEEDOR' @@ -89,7 +90,7 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor object cxGridViewCALLE: TcxGridDBColumn Caption = 'Direcci'#243'n de entrega' DataBinding.FieldName = 'CALLE' - Width = 59 + Width = 48 end object cxGridViewCODIGO_POSTAL: TcxGridDBColumn DataBinding.FieldName = 'CODIGO_POSTAL' @@ -117,13 +118,14 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor PropertiesClassName = 'TcxTextEditProperties' Properties.Alignment.Horz = taRightJustify HeaderAlignmentHorz = taRightJustify - Width = 24 + Width = 20 end object cxGridViewREF_FACTURA_PROV: TcxGridDBColumn DataBinding.FieldName = 'REF_FACTURA_PROV' PropertiesClassName = 'TcxTextEditProperties' Properties.Alignment.Horz = taRightJustify HeaderAlignmentHorz = taRightJustify + Width = 52 end object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn Caption = 'Importe total' @@ -132,7 +134,7 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor Properties.Alignment.Horz = taRightJustify FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify - Width = 114 + Width = 91 end object cxGridViewINCIDENCIAS: TcxGridDBColumn DataBinding.FieldName = 'INCIDENCIAS' diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj index a426e95e..47c4f912 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dproj +++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj @@ -49,52 +49,52 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorCliente
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch 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 delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index 89404074..e9b48096 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -1,15 +1,15 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor - Width = 770 - Height = 542 - ExplicitWidth = 770 - ExplicitHeight = 542 + Width = 839 + Height = 590 + ExplicitWidth = 839 + ExplicitHeight = 590 inherited cxGrid: TcxGrid - Width = 770 - Height = 414 + Width = 839 + Height = 462 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 839 - ExplicitHeight = 361 + ExplicitHeight = 462 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoSortByDisplayText, dcoGroupsAlwaysExpanded] @@ -63,47 +63,39 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor object cxGridViewREFERENCIA: TcxGridDBColumn Caption = 'Referencia' DataBinding.FieldName = 'REFERENCIA' - BestFitMaxWidth = 60 SortIndex = 0 SortOrder = soDescending - Width = 100 + Width = 89 end object cxGridViewSITUACION: TcxGridDBColumn + Caption = 'Situaci'#243'n' DataBinding.FieldName = 'SITUACION' - BestFitMaxWidth = 90 - Width = 150 + Width = 95 end object cxGridViewFECHA_PEDIDO: TcxGridDBColumn DataBinding.FieldName = 'FECHA_PEDIDO' - BestFitMaxWidth = 60 - Width = 65 + Width = 45 end object cxGridViewFECHA_ENVIO: TcxGridDBColumn DataBinding.FieldName = 'FECHA_ENVIO' - BestFitMaxWidth = 60 - Width = 65 + Width = 44 end object cxGridViewNOMBRE: TcxGridDBColumn Caption = 'Proveedor' DataBinding.FieldName = 'NOMBRE' - MinWidth = 0 - Width = 190 + Width = 128 end object cxGridViewFECHA_CONFIRMACION: TcxGridDBColumn DataBinding.FieldName = 'FECHA_CONFIRMACION' - BestFitMaxWidth = 60 - Width = 65 + Width = 46 end object cxGridViewFECHA_ENTREGA: TcxGridDBColumn DataBinding.FieldName = 'FECHA_ENTREGA' - BestFitMaxWidth = 60 - MinWidth = 0 - Width = 65 + Width = 44 end object cxGridViewNOMBRE_ALMACEN: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE_ALMACEN' - MinWidth = 0 - Width = 54 + Width = 58 end object cxGridViewCALLE: TcxGridDBColumn DataBinding.FieldName = 'CALLE' @@ -120,7 +112,6 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor object cxGridViewCODIGO_POSTAL: TcxGridDBColumn DataBinding.FieldName = 'CODIGO_POSTAL' Visible = False - BestFitMaxWidth = 50 end object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn DataBinding.FieldName = 'PERSONA_CONTACTO' @@ -129,18 +120,16 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor object cxGridViewTELEFONO: TcxGridDBColumn DataBinding.FieldName = 'TELEFONO' Visible = False - BestFitMaxWidth = 60 Width = 65 end object cxGridViewNOMBRE_OBRA: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE_OBRA' - MinWidth = 0 + Width = 54 end object cxGridViewREF_PED_CLIENTE: TcxGridDBColumn Caption = 'Ref. pedido cli.' DataBinding.FieldName = 'REF_PED_CLIENTE' Visible = False - BestFitMaxWidth = 60 VisibleForCustomization = False Width = 65 end @@ -149,22 +138,19 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor DataBinding.FieldName = 'IMPORTE_TOTAL' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify - BestFitMaxWidth = 90 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify - Width = 105 + Width = 67 end object cxGridViewINCIDENCIAS: TcxGridDBColumn DataBinding.FieldName = 'INCIDENCIAS' Visible = False - BestFitMaxWidth = 30 VisibleForCustomization = False end object cxGridViewREF_FACTURA_PROV: TcxGridDBColumn Caption = 'Ref. factura' DataBinding.FieldName = 'REF_FACTURA_PROV' - BestFitMaxWidth = 60 - Width = 150 + Width = 95 end end object cxGridDBTableView1: TcxGridDBTableView [1] @@ -187,12 +173,12 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 770 + Width = 839 ExplicitWidth = 839 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 839 inherited dxLayoutControl1: TdxLayoutControl - Width = 770 + Width = 839 ExplicitWidth = 839 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' @@ -232,25 +218,25 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 770 + Width = 839 ExplicitWidth = 839 inherited tbxBotones: TTBXToolbar - Width = 760 + Width = 829 ExplicitWidth = 829 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 516 + Top = 564 Visible = True - ExplicitTop = 463 + ExplicitTop = 564 ExplicitWidth = 839 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 770 + Width = 839 ExplicitWidth = 839 inherited TBXToolbar1: TTBXToolbar - Width = 760 + Width = 829 ExplicitWidth = 829 object TBXSeparatorItem2: TTBXSeparatorItem end diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas index 91565028..c8e96001 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas @@ -228,12 +228,13 @@ begin begin IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_PedidosProveedorSITUACION).Index; ASituacion := UPPERCASE(VarToStr(ARecord.DisplayTexts[IndiceCol])); + if (ASituacion = SITUACION_PEDIDO_PENDIENTE) then - AStyle := cxStylePendientes + AStyle.TextColor := cxStylePendientes.TextColor else if (ASituacion = SITUACION_PEDIDO_PARCIAL) then - AStyle := cxStyleParciales + AStyle.TextColor := cxStyleParciales.TextColor else if (ASituacion = SITUACION_PEDIDO_RECIBIDO) then - AStyle := cxStyleRecibidos; + AStyle.TextColor := cxStyleRecibidos.TextColor; end; end; diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm index 161a407e..6798bc82 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm @@ -41,7 +41,7 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor Width = 638 ExplicitWidth = 638 inherited tbxMain: TTBXToolbar - ExplicitWidth = 434 + ExplicitWidth = 577 end inherited tbxMenu: TTBXToolbar ExplicitWidth = 638 @@ -119,19 +119,41 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor Width = 638 ExplicitWidth = 638 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 541 Width = 541 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 190 Width = 190 end inherited edtFechaFinFiltro: TcxDateEdit Left = 294 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 294 ExplicitWidth = 334 Width = 334 end + inherited eLista: TcxComboBox + Left = 665 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 665 + ExplicitWidth = 215 + Width = 215 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 638 diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.pas index 0e852754b3df9784db2414ecc006bdc3abb1815d..3a08bc7dc8295fddc3c79d7588fbc6766fa07543 100644 GIT binary patch delta 7 OcmeCsZqwe-CJF!xJOZ!) delta 10 RcmZqE?$F-QCd$OX000wC0