From 40d7c0eb73688697b3d7e270a87e2c98ac8ad750 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 25 Sep 2008 11:58:14 +0000 Subject: [PATCH] Repaso de orden por defecto git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@621 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/GUIBase/uViewGridBase.pas | 17 ++-- .../Views/uViewAlbaranesCliente.dfm | 26 +++++- .../Views/uViewAlbaranesProveedor.dfm | 24 +++++ .../Views/uViewPedidosProveedor.dfm | 82 ++++++++++-------- .../Views/uViewPresupuestosCliente.dfm | 4 +- Source/Servidor/FactuGES_Server.RES | Bin 23216 -> 23208 bytes Source/Servidor/FactuGES_Server.rc | 2 +- 7 files changed, 106 insertions(+), 49 deletions(-) diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas index 333cafbf..c7d31b8b 100644 --- a/Source/GUIBase/uViewGridBase.pas +++ b/Source/GUIBase/uViewGridBase.pas @@ -202,19 +202,24 @@ end; procedure TfrViewGridBase.BestFitAllColumns; var i : Integer ; + begin ShowHourglassCursor; _FocusedView.BeginUpdate; + try - for i := 0 to _FocusedView.ColumnCount-1 do + for i := 0 to _FocusedView.VisibleColumnCount-1 do begin - _FocusedView.Columns[i].ApplyBestFit; - if _FocusedView.Columns[i].BestFitMaxWidth > 0 then + _FocusedView.VisibleColumns[i].ApplyBestFit; + if _FocusedView.VisibleColumns[i].BestFitMaxWidth > 0 then begin - if (_FocusedView.Columns[i].Width > _FocusedView.Columns[i].BestFitMaxWidth) then - _FocusedView.Columns[i].Width := _FocusedView.Columns[i].BestFitMaxWidth; +// if (_FocusedView.VisibleColumns[i].Width > _FocusedView.VisibleColumns[i].BestFitMaxWidth) then +// begin + _FocusedView.VisibleColumns[i].Width := _FocusedView.VisibleColumns[i].BestFitMaxWidth; +// end; end; end; + finally _FocusedView.EndUpdate; HideHourglassCursor; @@ -225,7 +230,7 @@ procedure TfrViewGridBase.AjustarAncho; begin if Assigned(_FocusedView) then begin - //BestFitAllColumns; + BestFitAllColumns; _FocusedView.ApplyBestFit; end; end; diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index ac604a81..aa92bf2a 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -64,6 +64,8 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' BestFitMaxWidth = 45 + SortIndex = 0 + SortOrder = soDescending Width = 57 end object cxGridViewSITUACION: TcxGridDBColumn @@ -76,8 +78,6 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente object cxGridViewFECHA_ALBARAN: TcxGridDBColumn DataBinding.FieldName = 'FECHA_ALBARAN' BestFitMaxWidth = 45 - SortIndex = 0 - SortOrder = soDescending Width = 68 end object cxGridViewNOMBRE: TcxGridDBColumn @@ -200,19 +200,41 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente Width = 802 ExplicitWidth = 802 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 705 Width = 705 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 228 Width = 228 end inherited edtFechaFinFiltro: TcxDateEdit Left = 332 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 332 ExplicitWidth = 460 Width = 460 end + inherited eLista: TcxComboBox + Left = 829 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 829 + ExplicitWidth = 215 + Width = 215 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 802 diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm index 763373b5..264a1dad 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm @@ -61,6 +61,8 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor end object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' + SortIndex = 0 + SortOrder = soDescending Width = 65 end object cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn @@ -151,19 +153,41 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor Width = 596 ExplicitWidth = 596 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 499 Width = 499 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 188 Width = 188 end inherited edtFechaFinFiltro: TcxDateEdit Left = 292 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 292 ExplicitWidth = 294 Width = 294 end + inherited eLista: TcxComboBox + Left = 623 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 623 + ExplicitWidth = 215 + Width = 215 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 596 diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm index 8c4f5528..89404074 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm @@ -1,11 +1,11 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor - Width = 839 - Height = 489 - ExplicitWidth = 839 - ExplicitHeight = 489 + Width = 770 + Height = 542 + ExplicitWidth = 770 + ExplicitHeight = 542 inherited cxGrid: TcxGrid - Width = 839 - Height = 361 + Width = 770 + Height = 414 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 839 @@ -33,6 +33,10 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor end> DataController.OnCompare = cxGridViewDataControllerCompare OptionsView.GroupFooters = gfAlwaysVisible + inherited cxGridViewICONO: TcxGridDBColumn + MinWidth = 30 + Width = 30 + end object cxGridViewINCIDENCIASACTIVAS: TcxGridDBColumn Caption = 'Incidencias' DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS' @@ -52,100 +56,100 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor Properties.ShowDescriptions = False OnGetCellHint = cxGridViewINCIDENCIASACTIVASGetCellHint BestFitMaxWidth = 22 - MinWidth = 22 + MinWidth = 30 Options.HorzSizing = False - Width = 22 + Width = 30 end object cxGridViewREFERENCIA: TcxGridDBColumn Caption = 'Referencia' DataBinding.FieldName = 'REFERENCIA' - BestFitMaxWidth = 40 - Width = 57 + BestFitMaxWidth = 60 + SortIndex = 0 + SortOrder = soDescending + Width = 100 end object cxGridViewSITUACION: TcxGridDBColumn DataBinding.FieldName = 'SITUACION' - BestFitMaxWidth = 40 - Width = 58 + BestFitMaxWidth = 90 + Width = 150 end object cxGridViewFECHA_PEDIDO: TcxGridDBColumn DataBinding.FieldName = 'FECHA_PEDIDO' - BestFitMaxWidth = 40 - SortIndex = 0 - SortOrder = soAscending + BestFitMaxWidth = 60 Width = 65 end object cxGridViewFECHA_ENVIO: TcxGridDBColumn DataBinding.FieldName = 'FECHA_ENVIO' - BestFitMaxWidth = 40 - Width = 62 + BestFitMaxWidth = 60 + Width = 65 end object cxGridViewNOMBRE: TcxGridDBColumn Caption = 'Proveedor' DataBinding.FieldName = 'NOMBRE' + MinWidth = 0 Width = 190 end object cxGridViewFECHA_CONFIRMACION: TcxGridDBColumn DataBinding.FieldName = 'FECHA_CONFIRMACION' - BestFitMaxWidth = 40 - Width = 64 + BestFitMaxWidth = 60 + Width = 65 end object cxGridViewFECHA_ENTREGA: TcxGridDBColumn DataBinding.FieldName = 'FECHA_ENTREGA' - BestFitMaxWidth = 40 - Width = 54 + BestFitMaxWidth = 60 + MinWidth = 0 + Width = 65 end object cxGridViewNOMBRE_ALMACEN: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE_ALMACEN' - BestFitMaxWidth = 60 + MinWidth = 0 Width = 54 end object cxGridViewCALLE: TcxGridDBColumn DataBinding.FieldName = 'CALLE' Visible = False - BestFitMaxWidth = 60 end object cxGridViewPOBLACION: TcxGridDBColumn DataBinding.FieldName = 'POBLACION' Visible = False - BestFitMaxWidth = 60 end object cxGridViewPROVINCIA: TcxGridDBColumn DataBinding.FieldName = 'PROVINCIA' Visible = False - BestFitMaxWidth = 60 end object cxGridViewCODIGO_POSTAL: TcxGridDBColumn DataBinding.FieldName = 'CODIGO_POSTAL' Visible = False - BestFitMaxWidth = 60 + BestFitMaxWidth = 50 end object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn DataBinding.FieldName = 'PERSONA_CONTACTO' Visible = False - BestFitMaxWidth = 60 end object cxGridViewTELEFONO: TcxGridDBColumn DataBinding.FieldName = 'TELEFONO' Visible = False BestFitMaxWidth = 60 + Width = 65 end object cxGridViewNOMBRE_OBRA: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE_OBRA' + MinWidth = 0 end object cxGridViewREF_PED_CLIENTE: TcxGridDBColumn Caption = 'Ref. pedido cli.' DataBinding.FieldName = 'REF_PED_CLIENTE' Visible = False - BestFitMaxWidth = 40 + BestFitMaxWidth = 60 VisibleForCustomization = False - Width = 41 + Width = 65 end object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn Caption = 'Importe total' DataBinding.FieldName = 'IMPORTE_TOTAL' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify - BestFitMaxWidth = 40 + BestFitMaxWidth = 90 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify Width = 105 @@ -153,12 +157,14 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor 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' - Width = 72 + BestFitMaxWidth = 60 + Width = 150 end end object cxGridDBTableView1: TcxGridDBTableView [1] @@ -181,12 +187,12 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 839 + Width = 770 ExplicitWidth = 839 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 839 inherited dxLayoutControl1: TdxLayoutControl - Width = 839 + Width = 770 ExplicitWidth = 839 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' @@ -226,25 +232,25 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 839 + Width = 770 ExplicitWidth = 839 inherited tbxBotones: TTBXToolbar - Width = 829 + Width = 760 ExplicitWidth = 829 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 463 + Top = 516 Visible = True ExplicitTop = 463 ExplicitWidth = 839 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 839 + Width = 770 ExplicitWidth = 839 inherited TBXToolbar1: TTBXToolbar - Width = 829 + Width = 760 ExplicitWidth = 829 object TBXSeparatorItem2: TTBXSeparatorItem end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm index 5c89ded3..41461c70 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm @@ -69,6 +69,8 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' BestFitMaxWidth = 25 + SortIndex = 0 + SortOrder = soDescending Width = 58 end object cxGridViewSITUACION: TcxGridDBColumn @@ -81,8 +83,6 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente Caption = 'Fecha presupuesto' DataBinding.FieldName = 'FECHA_PRESUPUESTO' BestFitMaxWidth = 25 - SortIndex = 0 - SortOrder = soDescending Width = 105 end object cxGridViewFECHA_DECISION: TcxGridDBColumn diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 40d84a86cf8d864df9bcb505057511b075c0de0d..3bb3da55965ff3018f7f514154563df2bc108920 100644 GIT binary patch delta 77 zcmdn6m2t&Z#tnBO7}rd`8zB!Q|3*YJ@=T75RAziJxi+$zIfp@Q^6yAl;VgzyhE#?! fATDOmVNhT&VlbU-7^Tl{$za7`%3wJ;Gs+zRVdoe! delta 85 zcmZ3nm2m?Q-HBk_GWl+VJdpew5zQzvIWkh2@x$cW$ZF;i2Cd1zBV{FX88R7OG88c+ nGvqVmFr+dRGw3iVFc>kIOxBLl=QLz6WUyi|W-y(c808KCMt>SF diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 59640e25..cef3a0ef 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.3.4.0\0" VALUE "ProductVersion", "1.3.4.0\0" - VALUE "CompileDate", "miércoles, 24 de septiembre de 2008 11:35\0" + VALUE "CompileDate", "jueves, 25 de septiembre de 2008 9:59\0" END END BLOCK "VarFileInfo"